ASoC: update headers for upstream compliance

Update uapi header reference path to include
path prefix "audio/"

Change-Id: Ic7b1d22910b07be3ffe8d9f02514ed89facea974
Signed-off-by: Vignesh Kulothungan <vigneshk@codeaurora.org>

Makefile

@@ -27,6 +27,7 @@ USERINCLUDE     += \
 # Use LINUXINCLUDE when you must reference the include/ directory.
 # Needed to be compatible with the O= option
 LINUXINCLUDE    += \
+                -I$(srctree)/techpack/audio/include/uapi \
                 -I$(srctree)/techpack/audio/include/uapi/audio \
                 -I$(srctree)/techpack/audio/include
 

asoc/codecs/wcd9335.c

@@ -20,7 +20,7 @@
 #include <linux/pm_runtime.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include <audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>
 #include <soc/swr-wcd.h>
 #include <soc/snd_event.h>
 #include <sound/pcm.h>

asoc/codecs/wcd934x/wcd934x-mbhc.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
  */
 #include <linux/module.h>
 #include <linux/init.h>
@@ -12,7 +12,7 @@
 #include <linux/gpio.h>
 #include <linux/delay.h>
 #include <linux/regmap.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include <audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>

asoc/codecs/wcd934x/wcd934x.c

@@ -20,7 +20,7 @@
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
 #include <linux/regulator/consumer.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include <audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>
 #include <soc/swr-wcd.h>
 #include <soc/snd_event.h>
 #include <sound/pcm.h>

asoc/codecs/wcd9xxx-common-v2.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2018, 2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -8,7 +8,7 @@
 #include <sound/soc.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include <audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>
 #include <asoc/core.h>
 #include <asoc/wcd9xxx-common-v2.h>
 

asoc/codecs/wcd9xxx-core.c

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2011-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2011-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/kernel.h>
@@ -13,7 +13,7 @@
 #include <linux/debugfs.h>
 #include <linux/i2c.h>
 #include <linux/regmap.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include <audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>
 #include <sound/soc.h>
 #include <asoc/core.h>
 #include <asoc/pdata.h>

asoc/codecs/wcd9xxx-irq.c

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2011-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2011-2020, The Linux Foundation. All rights reserved.
  */
 #include <linux/bitops.h>
 #include <linux/kernel.h>
@@ -18,7 +18,7 @@
 #include <soc/qcom/pm.h>
 #include <linux/gpio.h>
 #include <linux/of_gpio.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include <audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>
 #include <asoc/core.h>
 #include <asoc/wcd9xxx-irq.h>
 

asoc/codecs/wcd9xxx-slimslave.c

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2012-2018, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2012-2018, 2020 The Linux Foundation. All rights reserved.
  */
 #include <linux/slab.h>
 #include <linux/mutex.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include <audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>
 #include <asoc/wcd9xxx-slimslave.h>
 
 struct wcd9xxx_slim_sch {

asoc/codecs/wcd_cpe_core.c

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2014-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2014-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -14,7 +14,7 @@
 #include <linux/dma-mapping.h>
 #include <sound/soc.h>
 #include <sound/info.h>
-#include <sound/lsm_params.h>
+#include <audio/sound/lsm_params.h>
 #include <soc/qcom/pm.h>
 #include <dsp/audio_cal_utils.h>
 #include <asoc/core.h>

asoc/codecs/wcdcal-hwdep.c

@@ -9,7 +9,7 @@
 #include <linux/ioctl.h>
 #include <linux/bitops.h>
 #include <sound/hwdep.h>
-#include <sound/msmcal-hwdep.h>
+#include <audio/sound/msmcal-hwdep.h>
 #include <sound/soc.h>
 #include <asoc/wcdcal-hwdep.h>
 

asoc/msm-audio-effects-q6-v2.c

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/slab.h>
 #include <linux/ratelimit.h>
 #include <sound/compress_params.h>
-#include <sound/devdep_params.h>
+#include <audio/sound/devdep_params.h>
 #include <dsp/apr_audio-v2.h>
 #include <dsp/q6asm-v2.h>
 #include <dsp/msm-audio-effects-q6-v2.h>

asoc/msm-compress-q6-v2.c

@@ -20,10 +20,10 @@
 #include <sound/initval.h>
 #include <sound/control.h>
 #include <sound/pcm_params.h>
-#include <sound/audio_effects.h>
+#include <audio/sound/audio_effects.h>
 #include <asm/dma.h>
 #include <linux/dma-mapping.h>
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 
 #include <sound/timer.h>
 #include <sound/tlv.h>

asoc/msm-cpe-lsm.c

@@ -15,7 +15,7 @@
 #include <linux/sched.h>
 #include <linux/freezer.h>
 #include <sound/soc.h>
-#include <sound/lsm_params.h>
+#include <audio/sound/lsm_params.h>
 #include <sound/pcm_params.h>
 #include "msm-slim-dma.h"
 #include "codecs/cpe_core.h"

asoc/msm-lsm-client.c

@@ -19,7 +19,7 @@
 #include <sound/timer.h>
 #include <sound/initval.h>
 #include <sound/control.h>
-#include <sound/lsm_params.h>
+#include <audio/sound/lsm_params.h>
 #include <sound/pcm_params.h>
 #include <dsp/msm_audio_ion.h>
 #include <dsp/q6lsm.h>

asoc/msm-pcm-q6-noirq.c

@@ -27,7 +27,7 @@
 #include <asm/dma.h>
 #include <sound/tlv.h>
 #include <sound/pcm_params.h>
-#include <sound/devdep_params.h>
+#include <audio/sound/devdep_params.h>
 #include <dsp/msm_audio_ion.h>
 #include <dsp/q6audio-v2.h>
 

asoc/msm-pcm-q6-v2.c

@@ -21,12 +21,12 @@
 #include <sound/timer.h>
 #include <asm/dma.h>
 #include <linux/dma-mapping.h>
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 
 #include <linux/of_device.h>
 #include <sound/tlv.h>
 #include <sound/pcm_params.h>
-#include <sound/devdep_params.h>
+#include <audio/sound/devdep_params.h>
 #include <dsp/msm_audio_ion.h>
 #include <dsp/q6audio-v2.h>
 #include <dsp/q6core.h>

asoc/msm-pcm-routing-devdep.c

@@ -7,7 +7,7 @@
 #include <linux/err.h>
 #include <linux/module.h>
 #include <sound/hwdep.h>
-#include <sound/devdep_params.h>
+#include <audio/sound/devdep_params.h>
 #include "msm-pcm-routing-devdep.h"
 #include "msm-ds2-dap-config.h"
 

asoc/msm-pcm-routing-v2.c

@@ -21,7 +21,7 @@
 #include <sound/asound.h>
 #include <sound/pcm_params.h>
 #include <sound/hwdep.h>
-#include <sound/audio_effects.h>
+#include <audio/sound/audio_effects.h>
 #include <dsp/msm-dts-srs-tm-config.h>
 #include <dsp/q6voice.h>
 #include <dsp/q6adm-v2.h>

asoc/msm-transcode-loopback-q6-v2.c

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2017-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2017-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/init.h>
@@ -17,7 +17,7 @@
 #include <sound/pcm.h>
 #include <sound/initval.h>
 #include <sound/control.h>
-#include <sound/audio_effects.h>
+#include <audio/sound/audio_effects.h>
 #include <sound/pcm_params.h>
 #include <sound/timer.h>
 #include <sound/tlv.h>

dsp/audio_slimslave.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2013-2014, 2017-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2014, 2017-2018, 2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/init.h>
@@ -9,7 +9,7 @@
 #include <linux/device.h>
 #include <linux/mutex.h>
 #include <linux/miscdevice.h>
-#include <sound/audio_slimslave.h>
+#include <audio/sound/audio_slimslave.h>
 #include <linux/slimbus/slimbus.h>
 #include <linux/pm_runtime.h>
 

dsp/avtimer.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2012-2015, 2017-2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2015, 2017-2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/kernel.h>
@@ -12,7 +12,7 @@
 #include <linux/device.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
-#include <linux/avtimer.h>
+#include <audio/linux/avtimer.h>
 #include <linux/slab.h>
 #include <linux/of.h>
 #include <linux/wait.h>

dsp/codecs/aac_in.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2010-2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2010-2017, 2020 The Linux Foundation. All rights reserved.
  */
 #include <linux/module.h>
 #include <linux/fs.h>
@@ -10,7 +10,7 @@
 #include <linux/wait.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
-#include <linux/msm_audio_aac.h>
+#include <audio/linux/msm_audio_aac.h>
 #include <linux/compat.h>
 #include <linux/atomic.h>
 #include <asm/ioctls.h>

dsp/codecs/amrnb_in.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2010-2012, 2014, 2016-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2010-2012, 2014, 2016-2017, 2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -11,7 +11,7 @@
 #include <linux/slab.h>
 #include <linux/wait.h>
 #include <linux/dma-mapping.h>
-#include <linux/msm_audio_amrnb.h>
+#include <audio/linux/msm_audio_amrnb.h>
 #include <linux/compat.h>
 #include <linux/atomic.h>
 #include <asm/ioctls.h>

dsp/codecs/amrwb_in.c

@@ -1,13 +1,13 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2011-2012, 2014, 2016-2017 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2012, 2014, 2016-2017, 2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/dma-mapping.h>
 #include <linux/fs.h>
 #include <linux/module.h>
 #include <linux/miscdevice.h>
-#include <linux/msm_audio_amrwb.h>
+#include <audio/linux/msm_audio_amrwb.h>
 #include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/uaccess.h>

dsp/codecs/audio_aac.c

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2008 Google, Inc.
  * Copyright (C) 2008 HTC Corporation
- * Copyright (c) 2010-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2010-2020, The Linux Foundation. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -16,7 +16,7 @@
  *
  */
 
-#include <linux/msm_audio_aac.h>
+#include <audio/linux/msm_audio_aac.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"
 

dsp/codecs/audio_alac.c

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/types.h>
-#include <linux/msm_audio_alac.h>
+#include <audio/linux/msm_audio_alac.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"
 

dsp/codecs/audio_amrwbplus.c

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2008 Google, Inc.
  * Copyright (C) 2008 HTC Corporation
- * Copyright (c) 2010-2017, 2019 The Linux Foundation. All rights reserved.
+ * Copyright (c) 2010-2017, 2019-2020 The Linux Foundation. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -15,7 +15,7 @@
  * GNU General Public License for more details.
  *
  */
-#include <linux/msm_audio_amrwbplus.h>
+#include <audio/linux/msm_audio_amrwbplus.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"
 

dsp/codecs/audio_ape.c

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2015-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/types.h>
-#include <linux/msm_audio_ape.h>
+#include <audio/linux/msm_audio_ape.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"
 

dsp/codecs/audio_g711alaw.c

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2016-2017, 2019 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, 2019-2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/types.h>
-#include <linux/msm_audio_g711_dec.h>
+#include <audio/linux/msm_audio_g711_dec.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"
 

dsp/codecs/audio_g711mlaw.c

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2016-2017, 2019 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2016-2017, 2019-2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/types.h>
-#include <linux/msm_audio_g711_dec.h>
+#include <audio/linux/msm_audio_g711_dec.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"
 

dsp/codecs/audio_hwacc_effects.c

@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014-2017, 2020 The Linux Foundation. All rights reserved.
  */
 
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/compat.h>
 #include "q6audio_common.h"
 #include <dsp/msm-audio-effects-q6-v2.h>

dsp/codecs/audio_multi_aac.c

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2008 Google, Inc.
  * Copyright (C) 2008 HTC Corporation
- * Copyright (c) 2011-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2011-2020, The Linux Foundation. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -16,7 +16,7 @@
  *
  */
 
-#include <linux/msm_audio_aac.h>
+#include <audio/linux/msm_audio_aac.h>
 #include <linux/compat.h>
 #include <soc/qcom/socinfo.h>
 #include "audio_utils_aio.h"

dsp/codecs/audio_utils.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
-/* Copyright (c) 2010-2015, 2017 The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2015, 2017, 2020 The Linux Foundation. All rights reserved.
  */
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/compat.h>
 #include "q6audio_common.h"
 

dsp/codecs/audio_utils_aio.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* Copyright (C) 2008 Google, Inc.
  * Copyright (C) 2008 HTC Corporation
- * Copyright (c) 2009-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2009-2018, 2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/fs.h>
@@ -11,7 +11,7 @@
 #include <linux/sched.h>
 #include <linux/uaccess.h>
 #include <linux/wait.h>
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/debugfs.h>
 #include <linux/list.h>
 #include <linux/slab.h>

dsp/codecs/audio_wma.c

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2008 Google, Inc.
  * Copyright (C) 2008 HTC Corporation
- * Copyright (c) 2009-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2009-2020, The Linux Foundation. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -17,7 +17,7 @@
  */
 
 #include <linux/types.h>
-#include <linux/msm_audio_wma.h>
+#include <audio/linux/msm_audio_wma.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"
 

dsp/codecs/audio_wmapro.c

@@ -3,7 +3,7 @@
  *
  * Copyright (C) 2008 Google, Inc.
  * Copyright (C) 2008 HTC Corporation
- * Copyright (c) 2009-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2009-2020, The Linux Foundation. All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -17,7 +17,7 @@
  */
 
 #include <linux/types.h>
-#include <linux/msm_audio_wmapro.h>
+#include <audio/linux/msm_audio_wmapro.h>
 #include <linux/compat.h>
 #include "audio_utils_aio.h"
 

dsp/codecs/evrc_in.c

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2010-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2017, 2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -10,7 +10,7 @@
 #include <linux/wait.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
-#include <linux/msm_audio_qcp.h>
+#include <audio/linux/msm_audio_qcp.h>
 #include <linux/atomic.h>
 #include <linux/compat.h>
 #include <asm/ioctls.h>

dsp/codecs/g711alaw_in.c

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2010-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2017, 2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -10,7 +10,7 @@
 #include <linux/wait.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
-#include <linux/msm_audio_g711.h>
+#include <audio/linux/msm_audio_g711.h>
 #include <linux/atomic.h>
 #include <linux/compat.h>
 #include <asm/ioctls.h>

dsp/codecs/g711mlaw_in.c

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2010-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2017, 2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -10,7 +10,7 @@
 #include <linux/wait.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
-#include <linux/msm_audio_g711.h>
+#include <audio/linux/msm_audio_g711.h>
 #include <linux/atomic.h>
 #include <linux/compat.h>
 #include <asm/ioctls.h>

dsp/codecs/qcelp_in.c

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2010-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2010-2017, 2020 The Linux Foundation. All rights reserved.
  */
 
 #include <linux/module.h>
@@ -10,7 +10,7 @@
 #include <linux/wait.h>
 #include <linux/dma-mapping.h>
 #include <linux/slab.h>
-#include <linux/msm_audio_qcp.h>
+#include <audio/linux/msm_audio_qcp.h>
 #include <linux/atomic.h>
 #include <linux/compat.h>
 #include <asm/ioctls.h>

dsp/q6afecal-hwdep.c

@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2015, 2017 - 2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015, 2017 - 2018, 2020 The Linux Foundation. All rights reserved.
  */
 #include <linux/kernel.h>
 #include <linux/platform_device.h>
 #include <linux/ioctl.h>
 #include <sound/hwdep.h>
-#include <sound/msmcal-hwdep.h>
+#include <audio/sound/msmcal-hwdep.h>
 #include <sound/soc.h>
 #include "q6afecal-hwdep.h"
 

dsp/q6afecal-hwdep.h

@@ -4,7 +4,7 @@
  */
 #ifndef __Q6AFECAL_HWDEP_H__
 #define __Q6AFECAL_HWDEP_H__
-#include <sound/msmcal-hwdep.h>
+#include <audio/sound/msmcal-hwdep.h>
 
 enum q6afe_cal_states {
 	Q6AFECAL_UNINITIALISED,

dsp/q6lsm.c

@@ -15,7 +15,7 @@
 #include <linux/debugfs.h>
 #include <linux/time.h>
 #include <linux/atomic.h>
-#include <sound/lsm_params.h>
+#include <audio/sound/lsm_params.h>
 #include <asm/ioctls.h>
 #include <linux/memory.h>
 #include <dsp/msm_audio_ion.h>

dsp/rtac.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/fs.h>
@@ -10,7 +10,7 @@
 #include <linux/uaccess.h>
 #include <linux/mutex.h>
 #include <linux/sched.h>
-#include <linux/msm_audio_calibration.h>
+#include <audio/linux/msm_audio_calibration.h>
 #include <linux/atomic.h>
 #include <linux/compat.h>
 #include <dsp/msm_audio_ion.h>

dsp/sp_params.c

@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <dsp/q6audio-v2.h>
 #include <dsp/q6afe-v2.h>
-#include <linux/msm_audio_calibration.h>
+#include <audio/linux/msm_audio_calibration.h>
 #include <dsp/sp_params.h>
 #include <linux/kernel.h>
 #include <linux/module.h>

include/asoc/cpe_core.h

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2013-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2018, 2020 The Linux Foundation. All rights reserved.
  */
 
 #ifndef __CPE_CORE_H__
@@ -9,7 +9,7 @@
 #include <linux/types.h>
 #include <linux/wait.h>
 #include <linux/dma-mapping.h>
-#include <sound/lsm_params.h>
+#include <audio/sound/lsm_params.h>
 
 enum {
 	CMD_INIT_STATE = 0,

include/asoc/wcd9xxx-resmgr-v2.h

@@ -1,11 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2015-2018, 2020 The Linux Foundation. All rights reserved.
  */
 #ifndef __WCD9XXX_COMMON_V2_H__
 #define __WCD9XXX_COMMON_V2_H__
 
-#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include <audio/audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>
 #include "core.h"
 
 enum wcd_clock_type {

include/asoc/wcdcal-hwdep.h

@@ -1,10 +1,10 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2014, 2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014, 2018, 2020 The Linux Foundation. All rights reserved.
  */
 #ifndef __WCD9XXX_HWDEP_H__
 #define __WCD9XXX_HWDEP_H__
-#include <sound/msmcal-hwdep.h>
+#include <audio/sound/msmcal-hwdep.h>
 
 enum wcd_cal_states {
 	WCDCAL_UNINITIALISED,

include/dsp/apr_audio-v2.h

@@ -8,7 +8,7 @@
 #define _APR_AUDIO_V2_H_
 
 #include <ipc/apr.h>
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 
 /* size of header needed for passing data out of band */
 #define APR_CMD_OB_HDR_SZ  12

include/dsp/audio_cal_utils.h

@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2014, 2018, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014, 2018, 2020 The Linux Foundation. All rights reserved.
  */
 #ifndef _AUDIO_CAL_UTILS_H
 #define _AUDIO_CAL_UTILS_H
 
 #include <linux/msm_ion.h>
-#include <linux/msm_audio_calibration.h>
+#include <audio/linux/msm_audio_calibration.h>
 #include <dsp/msm_audio_ion.h>
 #include <dsp/audio_calibration.h>
 

include/dsp/audio_calibration.h

@@ -1,11 +1,11 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2014, 2017, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2014, 2017, 2020 The Linux Foundation. All rights reserved.
  */
 #ifndef _AUDIO_CALIBRATION_H
 #define _AUDIO_CALIBRATION_H
 
-#include <linux/msm_audio_calibration.h>
+#include <audio/linux/msm_audio_calibration.h>
 
 /* Used by driver in buffer_number field to notify client
  * To update all blocks, for example: freeing all memory

include/dsp/msm-audio-effects-q6-v2.h

@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2013-2016, 2020 The Linux Foundation. All rights reserved.
  */
 
 #ifndef _MSM_AUDIO_EFFECTS_H
 #define _MSM_AUDIO_EFFECTS_H
 
-#include <sound/audio_effects.h>
+#include <audio/sound/audio_effects.h>
 
 #define MAX_PP_PARAMS_SZ   128
 

include/dsp/q6lsm.h

@@ -8,7 +8,7 @@
 #include <linux/list.h>
 #include <linux/msm_ion.h>
 #include <dsp/apr_audio-v2.h>
-#include <sound/lsm_params.h>
+#include <audio/sound/lsm_params.h>
 #include <ipc/apr.h>
 
 #define MAX_NUM_CONFIDENCE 20

include/dsp/q6voice.h

@@ -1,12 +1,12 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
- * Copyright (c) 2012-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2012-2020, The Linux Foundation. All rights reserved.
  */
 #ifndef __QDSP6VOICE_H__
 #define __QDSP6VOICE_H__
 
 #include <linux/msm_ion.h>
-#include <sound/voice_params.h>
+#include <audio/sound/voice_params.h>
 #include <dsp/rtac.h>
 #include <dsp/q6core.h>
 #include <ipc/apr.h>

include/uapi/audio/linux/mfd/wcd9xxx/wcd9320_registers.h

@@ -1,7 +1,7 @@
 #ifndef WCD9320_REGISTERS_H
 #define WCD9320_REGISTERS_H
 
-#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include <audio/linux/mfd/wcd9xxx/wcd9xxx_registers.h>
 
 #define TAIKO_A_CHIP_CTL			WCD9XXX_A_CHIP_CTL
 #define TAIKO_A_CHIP_CTL__POR			WCD9XXX_A_CHIP_CTL__POR

include/uapi/audio/linux/msm_audio_aac.h

@@ -1,7 +1,7 @@
 #ifndef _UAPI_MSM_AUDIO_AAC_H
 #define _UAPI_MSM_AUDIO_AAC_H
 
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/types.h>
 
 #define AUDIO_SET_AAC_CONFIG  _IOW(AUDIO_IOCTL_MAGIC, \

include/uapi/audio/linux/msm_audio_ac3.h

@@ -1,7 +1,7 @@
 #ifndef _UAPI_MSM_AUDIO_AC3_H
 #define _UAPI_MSM_AUDIO_AC3_H
 
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 
 #define AUDIO_SET_AC3_CONFIG  _IOW(AUDIO_IOCTL_MAGIC, \
 	(AUDIO_MAX_COMMON_IOCTL_NUM+0), unsigned int)

include/uapi/audio/linux/msm_audio_amrnb.h

@@ -1,7 +1,7 @@
 #ifndef _UAPI_MSM_AUDIO_AMRNB_H
 #define _UAPI_MSM_AUDIO_AMRNB_H
 
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/types.h>
 
 #define AUDIO_GET_AMRNB_ENC_CONFIG  _IOW(AUDIO_IOCTL_MAGIC, \

include/uapi/audio/linux/msm_audio_amrwb.h

@@ -1,7 +1,7 @@
 #ifndef _UAPI_MSM_AUDIO_AMRWB_H
 #define _UAPI_MSM_AUDIO_AMRWB_H
 
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/types.h>
 
 #define AUDIO_GET_AMRWB_ENC_CONFIG _IOW(AUDIO_IOCTL_MAGIC, \

include/uapi/audio/linux/msm_audio_g711.h

@@ -1,7 +1,7 @@
 #ifndef _UAPI_MSM_AUDIO_G711_H
 #define _UAPI_MSM_AUDIO_G711_H
 
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/types.h>
 
 struct msm_audio_g711_enc_config {

include/uapi/audio/linux/msm_audio_g711_dec.h

@@ -1,7 +1,7 @@
 #ifndef _UAPI_MSM_AUDIO_G711_H
 #define _UAPI_MSM_AUDIO_G711_H
 
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/types.h>
 
 struct msm_audio_g711_dec_config {

include/uapi/audio/linux/msm_audio_mvs.h

@@ -1,7 +1,7 @@
 #ifndef _UAPI_MSM_AUDIO_MVS_H
 #define _UAPI_MSM_AUDIO_MVS_H
 
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/types.h>
 
 #define AUDIO_GET_MVS_CONFIG _IOW(AUDIO_IOCTL_MAGIC, \

include/uapi/audio/linux/msm_audio_qcp.h

@@ -1,7 +1,7 @@
 #ifndef _UAPI_MSM_AUDIO_QCP_H
 #define _UAPI_MSM_AUDIO_QCP_H
 
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/types.h>
 
 #define AUDIO_SET_QCELP_ENC_CONFIG  _IOW(AUDIO_IOCTL_MAGIC, \

include/uapi/audio/linux/msm_audio_sbc.h

@@ -1,7 +1,7 @@
 #ifndef _UAPI_MSM_AUDIO_SBC_H
 #define _UAPI_MSM_AUDIO_SBC_H
 
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/types.h>
 
 #define AUDIO_SET_SBC_ENC_CONFIG  _IOW(AUDIO_IOCTL_MAGIC, \

include/uapi/audio/linux/msm_audio_voicememo.h

@@ -1,7 +1,7 @@
 #ifndef _UAPI_MSM_AUDIO_VOICEMEMO_H
 #define _UAPI_MSM_AUDIO_VOICEMEMO_H
 
-#include <linux/msm_audio.h>
+#include <audio/linux/msm_audio.h>
 #include <linux/types.h>
 
 #define AUDIO_GET_VOICEMEMO_CONFIG  _IOW(AUDIO_IOCTL_MAGIC, \

ipc/wcd-dsp-glink.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2016-2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/init.h>
@@ -16,7 +16,7 @@
 #include <linux/of_device.h>
 #include <linux/vmalloc.h>
 #include <linux/rpmsg.h>
-#include "sound/wcd-dsp-glink.h"
+#include "audio/sound/wcd-dsp-glink.h"
 
 #define WDSP_GLINK_DRIVER_NAME "wcd-dsp-glink"
 #define WDSP_MAX_WRITE_SIZE (256 * 1024)

soc/wcd-spi-ac.c

@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: GPL-2.0-only
-/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/init.h>
@@ -11,7 +11,7 @@
 #include <linux/poll.h>
 #include <linux/slab.h>
 #include <linux/notifier.h>
-#include <linux/wcd-spi-ac-params.h>
+#include <audio/linux/wcd-spi-ac-params.h>
 #include <soc/wcd-spi-ac.h>
 #include <soc/qcom/msm_qmi_interface.h>