audio-lnx: Rename folders to new flat structure.

Kernel audio drivers can be categorised into below folders.
asoc - ALSA based drivers,
asoc/codecs - codec drivers,
ipc - APR IPC communication drivers,
dsp - DSP low level drivers/Audio ION/ADSP Loader,
dsp/codecs - Native encoders and decoders,
soc - SoC based drivers(pinctrl/regmap/soundwire)

Restructure drivers to above folder format.
Include directories also follow above format.

Change-Id: I8fa0857baaacd47db126fb5c1f1f5ed7e886dbc0
Signed-off-by: Laxminath Kasam <lkasam@codeaurora.org>

Makefile

@@ -19,5 +19,7 @@ LINUXINCLUDE    += \
                 -include $(srctree)/techpack/audio/config/sdm845autoconf.h
 endif
 
-obj-y           += drivers/
+obj-y += asoc/
-obj-y           += sound/
+obj-y += dsp/
+obj-y += ipc/
+obj-y += soc/

asoc/Makefile

@@ -3,7 +3,6 @@
 snd-soc-hostless-pcm-objs := msm-pcm-hostless.o
 obj-$(CONFIG_SND_SOC_MSM_HOSTLESS_PCM) += snd-soc-hostless-pcm.o
 
-obj-$(CONFIG_SND_SOC_MSM_QDSP6V2_INTF) += qdsp6v2/
 
 snd-soc-qdsp6v2-objs := msm-dai-fe.o
 obj-$(CONFIG_SND_SOC_QDSP6V2) += snd-soc-qdsp6v2.o
@@ -37,3 +36,20 @@ obj-$(CONFIG_SND_SOC_EXT_CODEC) += snd-soc-ext-codec.o
 # for SDM845 sound card driver
 snd-soc-sdm845-objs := sdm845.o
 obj-$(CONFIG_SND_SOC_MACHINE_SDM845) += snd-soc-sdm845.o
+
+snd-soc-qdsp6v2-objs += msm-dai-q6-v2.o msm-pcm-q6-v2.o \
+			msm-pcm-routing-v2.o msm-compress-q6-v2.o \
+			msm-pcm-afe-v2.o msm-pcm-voip-v2.o \
+			msm-pcm-voice-v2.o msm-dai-q6-hdmi-v2.o \
+			msm-lsm-client.o msm-pcm-host-voice-v2.o \
+			msm-audio-effects-q6-v2.o msm-pcm-loopback-v2.o \
+			msm-dai-slim.o msm-transcode-loopback-q6-v2.o msm-pcm-q6-noirq.o
+obj-$(CONFIG_SND_SOC_QDSP6V2) += snd-soc-qdsp6v2.o msm-pcm-dtmf-v2.o \
+				 msm-dai-stub-v2.o
+obj-$(CONFIG_SND_HWDEP) += msm-pcm-routing-devdep.o
+obj-$(CONFIG_DOLBY_DAP) += msm-dolby-dap-config.o
+obj-$(CONFIG_DOLBY_DS2) += msm-ds2-dap-config.o
+obj-$(CONFIG_DOLBY_LICENSE) += msm-ds2-dap-config.o
+obj-$(CONFIG_DTS_SRS_TM) += msm-dts-srs-tm-config.o
+obj-$(CONFIG_QTI_PP) += msm-qti-pp-config.o
+obj-y += codecs/

asoc/codecs/Makefile

@@ -1,4 +1,3 @@
-snd-soc-wcd934x-objs := wcd934x.o
 snd-soc-wcd9xxx-v2-objs := wcd9xxx-common-v2.o wcd9xxx-resmgr-v2.o wcdcal-hwdep.o wcd9xxx-soc-init.o
 snd-soc-wcd-cpe-objs := wcd_cpe_services.o wcd_cpe_core.o
 snd-soc-wsa881x-objs := wsa881x.o wsa881x-tables.o wsa881x-regmap.o wsa881x-temp-sensor.o
@@ -24,3 +23,10 @@ obj-$(CONFIG_SND_SOC_WCD_SPI)  += snd-soc-wcd-spi.o
 
 snd-soc-msm-stub-objs := msm_stub.o
 obj-$(CONFIG_SND_SOC_MSM_STUB)  += snd-soc-msm-stub.o
+
+wcd-core-objs                  := wcd9xxx-rst.o wcd9xxx-core-init.o \
+				wcd9xxx-core.o wcd9xxx-irq.o \
+				wcd9xxx-slimslave.o wcd9xxx-utils.o \
+				wcd9335-regmap.o wcd9335-tables.o \
+				msm-cdc-pinctrl.o msm-cdc-supply.o
+obj-$(CONFIG_WCD9XXX_CODEC_CORE) += wcd-core.o

asoc/codecs/audio-ext-clk-up.c

@@ -22,7 +22,7 @@
 #include <linux/gpio.h>
 #include <linux/of_gpio.h>
 #include <dt-bindings/clock/qcom,audio-ext-clk.h>
-#include <sound/q6afe-v2.h>
+#include <dsp/q6afe-v2.h>
 #include "audio-ext-clk-up.h"
 
 enum audio_clk_mux {

asoc/codecs/msm-cdc-pinctrl.c

@@ -19,7 +19,7 @@
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
 #include <linux/of_gpio.h>
-#include <linux/mfd/msm-cdc-pinctrl.h>
+#include "msm-cdc-pinctrl.h"
 
 struct msm_cdc_pinctrl_info {
 	struct pinctrl *pinctrl;

asoc/codecs/msm-cdc-supply.c

@@ -16,7 +16,7 @@
 #include <linux/of_irq.h>
 #include <linux/of_device.h>
 #include <linux/slab.h>
-#include <linux/mfd/msm-cdc-supply.h>
+#include "msm-cdc-supply.h"
 #include <linux/regulator/consumer.h>
 
 #define CODEC_DT_MAX_PROP_SIZE 40

asoc/codecs/pdata.h

@@ -15,7 +15,7 @@
 #define __MFD_WCD9XXX_PDATA_H__
 
 #include <linux/slimbus/slimbus.h>
-#include <linux/mfd/msm-cdc-supply.h>
+#include "msm-cdc-supply.h"
 
 #define MICBIAS_EXT_BYP_CAP 0x00
 #define MICBIAS_NO_EXT_BYP_CAP 0x01

asoc/codecs/sdm660_cdc/msm-analog-cdc.c

@@ -16,22 +16,22 @@
 #include <linux/debugfs.h>
 #include <linux/delay.h>
 #include <linux/regulator/consumer.h>
-#include <linux/qdsp6v2/apr.h>
 #include <linux/workqueue.h>
 #include <linux/regmap.h>
-#include <linux/qdsp6v2/audio_notifier.h>
-#include <sound/q6afe-v2.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 #include <sound/tlv.h>
-#include <sound/q6core.h>
+#include <dsp/audio_notifier.h>
+#include <dsp/q6afe-v2.h>
+#include <dsp/q6core.h>
+#include <ipc/apr.h>
 #include "msm-analog-cdc.h"
+#include "msm-cdc-common.h"
 #include "sdm660-cdc-irq.h"
 #include "sdm660-cdc-registers.h"
-#include "msm-cdc-common.h"
+#include "../../sdm660-common.h"
-#include "../../msm/sdm660-common.h"
 #include "../wcd-mbhc-v2-api.h"
 
 #define DRV_NAME "pmic_analog_codec"

asoc/codecs/sdm660_cdc/msm-analog-cdc.h

@@ -14,7 +14,7 @@
 
 #include <sound/soc.h>
 #include <sound/jack.h>
-#include <sound/q6afe-v2.h>
+#include <dsp/q6afe-v2.h>
 #include "../wcd-mbhc-v2.h"
 #include "../wcdcal-hwdep.h"
 #include "sdm660-cdc-registers.h"

asoc/codecs/sdm660_cdc/msm-digital-cdc.c

@@ -17,20 +17,20 @@
 #include <linux/printk.h>
 #include <linux/debugfs.h>
 #include <linux/delay.h>
-#include <linux/qdsp6v2/apr.h>
 #include <linux/workqueue.h>
 #include <linux/regmap.h>
-#include <sound/q6afe-v2.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 #include <sound/tlv.h>
+#include <dsp/q6afe-v2.h>
+#include <ipc/apr.h>
+#include <soc/internal.h>
 #include "sdm660-cdc-registers.h"
 #include "msm-digital-cdc.h"
 #include "msm-cdc-common.h"
-#include "../../msm/sdm660-common.h"
+#include "../../sdm660-common.h"
-#include "../../../../drivers/base/regmap/internal.h"
 
 #define DRV_NAME "msm_digital_codec"
 #define MCLK_RATE_9P6MHZ        9600000

asoc/codecs/wcd-mbhc-v2.c

@@ -25,9 +25,9 @@
 #include <linux/input.h>
 #include <linux/firmware.h>
 #include <linux/completion.h>
-#include <linux/mfd/msm-cdc-pinctrl.h>
 #include <sound/soc.h>
 #include <sound/jack.h>
+#include "msm-cdc-pinctrl.h"
 #include "wcdcal-hwdep.h"
 #include "wcd-mbhc-legacy.h"
 #include "wcd-mbhc-adc.h"

asoc/codecs/wcd9335-regmap.c

@@ -11,11 +11,11 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mfd/wcd9xxx/core.h>
-#include <linux/mfd/wcd9335/registers.h>
 #include <linux/regmap.h>
 #include <linux/device.h>
+#include "core.h"
 #include "wcd9xxx-regmap.h"
+#include "wcd9335_registers.h"
 
 static const struct reg_sequence wcd9335_1_x_defaults[] = {
 	{ WCD9335_CODEC_RPM_CLK_GATE,                     0x03,  0x00 },

asoc/codecs/wcd9335-tables.c

@@ -12,7 +12,7 @@
  */
 
 #include <linux/types.h>
-#include <linux/mfd/wcd9335/registers.h>
+#include "wcd9335_registers.h"
 
 #define WCD9335_REG(reg)  ((reg) & 0xFF)
 

asoc/codecs/wcd9335.c

@@ -22,29 +22,29 @@
 #include <linux/wait.h>
 #include <linux/bitops.h>
 #include <linux/regmap.h>
-#include <linux/mfd/wcd9xxx/core.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx-irq.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
-#include <linux/mfd/wcd9335/registers.h>
-#include <linux/mfd/wcd9335/irq.h>
-#include <linux/mfd/wcd9xxx/pdata.h>
 #include <linux/regulator/consumer.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
 #include <linux/pm_runtime.h>
 #include <linux/kernel.h>
 #include <linux/gpio.h>
-#include <linux/soundwire/swr-wcd.h>
+#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include <soc/swr-wcd.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 #include <sound/tlv.h>
 #include <sound/info.h>
+#include "core.h"
+#include "pdata.h"
 #include "wcd9335.h"
 #include "wcd-mbhc-v2.h"
 #include "wcd9xxx-common-v2.h"
 #include "wcd9xxx-resmgr-v2.h"
+#include "wcd9xxx-irq.h"
+#include "wcd9335_registers.h"
+#include "wcd9335_irq.h"
 #include "wcd_cpe_core.h"
 #include "wcdcal-hwdep.h"
 #include "wcd-mbhc-v2-api.h"

asoc/codecs/wcd9335.h

@@ -15,8 +15,8 @@
 
 #include <sound/soc.h>
 #include <sound/jack.h>
-#include <sound/apr_audio-v2.h>
+#include <dsp/apr_audio-v2.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx-slimslave.h>
+#include "wcd9xxx-slimslave.h"
 #include "wcd-mbhc-v2.h"
 
 #define TASHA_REG_VAL(reg, val)      {reg, 0, val}

asoc/codecs/wcd934x/Makefile

@@ -2,5 +2,6 @@
 # Makefile for wcd934x codec driver.
 #
 snd-soc-wcd934x-objs := wcd934x.o wcd934x-dsp-cntl.o \
-			wcd934x-mbhc.o wcd934x-dsd.o
+			wcd934x-mbhc.o wcd934x-dsd.o \
+			wcd934x-regmap.o wcd934x-tables.o
 obj-$(CONFIG_SND_SOC_WCD934X) += snd-soc-wcd934x.o

asoc/codecs/wcd934x/wcd934x-dsd.c

@@ -12,9 +12,9 @@
 
 #include <linux/module.h>
 #include <linux/delay.h>
-#include <linux/mfd/wcd934x/registers.h>
 #include <sound/tlv.h>
 #include <sound/control.h>
+#include <asoc/wcd934x_registers.h>
 #include "wcd934x-dsd.h"
 
 #define DSD_VOLUME_MAX_0dB      0

asoc/codecs/wcd934x/wcd934x-dsp-cntl.c

@@ -15,13 +15,13 @@
 #include <linux/delay.h>
 #include <linux/component.h>
 #include <linux/debugfs.h>
-#include <linux/mfd/wcd9xxx/core.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx-irq.h>
-#include <linux/mfd/wcd934x/registers.h>
 #include <sound/soc.h>
 #include <sound/wcd-dsp-mgr.h>
+#include <asoc/wcd934x_registers.h>
 #include "wcd934x.h"
 #include "wcd934x-dsp-cntl.h"
+#include "../wcd9xxx-irq.h"
+#include "../core.h"
 
 #define WCD_CNTL_DIR_NAME_LEN_MAX 32
 #define WCD_CPE_FLL_MAX_RETRIES 5

asoc/codecs/wcd934x/wcd934x-mbhc.c

@@ -20,18 +20,18 @@
 #include <linux/gpio.h>
 #include <linux/delay.h>
 #include <linux/regmap.h>
-#include <linux/mfd/wcd9xxx/core.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx-irq.h>
 #include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
-#include <linux/mfd/wcd934x/registers.h>
-#include <linux/mfd/wcd934x/irq.h>
-#include <linux/mfd/wcd9xxx/pdata.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 #include "wcd934x.h"
 #include "wcd934x-mbhc.h"
+#include <asoc/wcd934x_registers.h>
+#include "wcd934x_irq.h"
+#include "../core.h"
+#include "../pdata.h"
+#include "../wcd9xxx-irq.h"
 #include "../wcdcal-hwdep.h"
 #include "../wcd-mbhc-v2-api.h"
 

asoc/codecs/wcd934x/wcd934x-regmap.c

@@ -11,11 +11,11 @@
  * GNU General Public License for more details.
  */
 
-#include <linux/mfd/wcd9xxx/core.h>
-#include <linux/mfd/wcd934x/registers.h>
 #include <linux/regmap.h>
 #include <linux/device.h>
-#include "wcd9xxx-regmap.h"
+#include <asoc/wcd934x_registers.h>
+#include "../core.h"
+#include "../wcd9xxx-regmap.h"
 
 
 static const struct reg_sequence wcd934x_1_1_defaults[] = {

asoc/codecs/wcd934x/wcd934x-tables.c

@@ -12,7 +12,7 @@
  */
 
 #include <linux/types.h>
-#include <linux/mfd/wcd934x/registers.h>
+#include <asoc/wcd934x_registers.h>
 
 #define WCD934X_REG(reg)  ((reg) & 0xFF)
 

asoc/codecs/wcd934x/wcd934x.c

@@ -27,24 +27,24 @@
 #include <linux/gpio.h>
 #include <linux/regmap.h>
 #include <linux/spi/spi.h>
-#include <linux/mfd/wcd9xxx/core.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx-irq.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
-#include <linux/mfd/wcd934x/registers.h>
-#include <linux/mfd/wcd934x/irq.h>
-#include <linux/mfd/wcd9xxx/pdata.h>
 #include <linux/regulator/consumer.h>
-#include <linux/soundwire/swr-wcd.h>
+#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include <soc/swr-wcd.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 #include <sound/tlv.h>
 #include <sound/info.h>
+#include <asoc/wcd934x_registers.h>
 #include "wcd934x.h"
 #include "wcd934x-mbhc.h"
 #include "wcd934x-routing.h"
 #include "wcd934x-dsp-cntl.h"
+#include "wcd934x_irq.h"
+#include "../core.h"
+#include "../pdata.h"
+#include "../wcd9xxx-irq.h"
 #include "../wcd9xxx-common-v2.h"
 #include "../wcd9xxx-resmgr-v2.h"
 #include "../wcdcal-hwdep.h"

asoc/codecs/wcd934x/wcd934x.h

@@ -13,9 +13,9 @@
 #ifndef WCD934X_H
 #define WCD934X_H
 
-#include <sound/apr_audio-v2.h>
+#include <dsp/apr_audio-v2.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx-slimslave.h>
 #include "wcd934x-dsp-cntl.h"
+#include "../wcd9xxx-slimslave.h"
 #include "../wcd9xxx-common-v2.h"
 #include "../wcd-mbhc-v2.h"
 

asoc/codecs/wcd9xxx-common-v2.c

@@ -16,8 +16,8 @@
 #include <sound/soc.h>
 #include <linux/kernel.h>
 #include <linux/delay.h>
-#include <linux/mfd/wcd9xxx/core.h>
 #include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include "core.h"
 #include "wcd9xxx-common-v2.h"
 
 #define WCD_USLEEP_RANGE 50

asoc/codecs/wcd9xxx-core-init.c

@@ -11,9 +11,9 @@
  */
 
 #include <linux/module.h>
-#include <linux/mfd/msm-cdc-pinctrl.h>
+#include "msm-cdc-pinctrl.h"
-#include <linux/mfd/wcd9xxx/wcd9xxx-irq.h>
+#include "wcd9xxx-irq.h"
-#include <linux/mfd/wcd9xxx/core.h>
+#include "core.h"
 
 #define NUM_DRIVERS_REG_RET 3
 

asoc/codecs/wcd9xxx-core.c

@@ -16,21 +16,21 @@
 #include <linux/slab.h>
 #include <linux/ratelimit.h>
 #include <linux/mfd/core.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx-slimslave.h>
-#include <linux/mfd/wcd9xxx/core.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx-irq.h>
-#include <linux/mfd/wcd9xxx/pdata.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
-#include <linux/mfd/msm-cdc-pinctrl.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx-utils.h>
-#include <linux/mfd/msm-cdc-supply.h>
 #include <linux/delay.h>
 #include <linux/gpio.h>
 #include <linux/debugfs.h>
 #include <linux/i2c.h>
 #include <linux/regmap.h>
+#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
 #include <sound/soc.h>
+#include "core.h"
+#include "pdata.h"
+#include "msm-cdc-pinctrl.h"
+#include "msm-cdc-supply.h"
+#include "wcd9xxx-irq.h"
+#include "wcd9xxx-utils.h"
 #include "wcd9xxx-regmap.h"
+#include "wcd9xxx-slimslave.h"
 
 #define WCD9XXX_REGISTER_START_OFFSET 0x800
 #define WCD9XXX_SLIM_RW_MAX_TRIES 3

asoc/codecs/wcd9xxx-irq.c

@@ -16,9 +16,6 @@
 #include <linux/irq.h>
 #include <linux/mfd/core.h>
 #include <linux/regmap.h>
-#include <linux/mfd/wcd9xxx/core.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx-irq.h>
 #include <linux/delay.h>
 #include <linux/irqdomain.h>
 #include <linux/interrupt.h>
@@ -29,6 +26,9 @@
 #include <soc/qcom/pm.h>
 #include <linux/gpio.h>
 #include <linux/of_gpio.h>
+#include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include "core.h"
+#include "wcd9xxx-irq.h"
 
 #define BYTE_BIT_MASK(nr)		(1UL << ((nr) % BITS_PER_BYTE))
 #define BIT_BYTE(nr)			((nr) / BITS_PER_BYTE)

asoc/codecs/wcd9xxx-irq.h

@@ -11,7 +11,7 @@
  */
 
 #include <linux/types.h>
-#include <linux/mfd/wcd9xxx/core.h>
+#include "core.h"
 
 #ifndef __MFD_WCD9XXX_IRQ_H
 #define __MFD_WCD9XXX_IRQ_H

asoc/codecs/wcd9xxx-regmap.h

@@ -15,7 +15,7 @@
 #define _WCD9XXX_REGMAP_
 
 #include <linux/regmap.h>
-#include <linux/mfd/wcd9xxx/core.h>
+#include "core.h"
 
 typedef int (*regmap_patch_fptr)(struct regmap *, int);
 

asoc/codecs/wcd9xxx-resmgr-v2.c

@@ -14,11 +14,11 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/delay.h>
-#include <linux/mfd/wcd9xxx/core.h>
-#include <linux/mfd/wcd9335/registers.h>
-#include <linux/mfd/wcd934x/registers.h>
 #include <sound/soc.h>
 #include "wcd9xxx-resmgr-v2.h"
+#include "core.h"
+#include "wcd9335_registers.h"
+#include <asoc/wcd934x_registers.h>
 
 #define WCD9XXX_RCO_CALIBRATION_DELAY_INC_US 5000
 #define WCD93XX_ANA_BIAS 0x0601

asoc/codecs/wcd9xxx-resmgr-v2.h

@@ -13,8 +13,8 @@
 #ifndef __WCD9XXX_COMMON_V2_H__
 #define __WCD9XXX_COMMON_V2_H__
 
-#include <linux/mfd/wcd9xxx/core.h>
 #include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include "core.h"
 
 enum wcd_clock_type {
 	WCD_CLK_OFF,

asoc/codecs/wcd9xxx-rst.c

@@ -15,13 +15,13 @@
 #include <linux/device.h>
 #include <linux/regmap.h>
 #include <linux/delay.h>
-#include <linux/mfd/wcd9xxx/pdata.h>
+#include "core.h"
-#include <linux/mfd/wcd9xxx/core.h>
+#include "pdata.h"
-#include <linux/mfd/wcd9xxx/wcd9xxx-utils.h>
+#include "wcd9xxx-utils.h"
-#include <linux/mfd/wcd9335/registers.h>
+#include "wcd9335_registers.h"
-#include <linux/mfd/wcd934x/registers.h>
+#include "wcd9335_irq.h"
-#include <linux/mfd/wcd9335/irq.h>
+#include <asoc/wcd934x_registers.h>
-#include <linux/mfd/wcd934x/irq.h>
+#include "wcd934x/wcd934x_irq.h"
 
 /* wcd9335 interrupt table  */
 static const struct intr_data wcd9335_intr_table[] = {

asoc/codecs/wcd9xxx-slimslave.c

@@ -11,8 +11,8 @@
  */
 #include <linux/slab.h>
 #include <linux/mutex.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx-slimslave.h>
 #include <linux/mfd/wcd9xxx/wcd9xxx_registers.h>
+#include "wcd9xxx-slimslave.h"
 
 struct wcd9xxx_slim_sch {
 	u16 rx_port_ch_reg_base;

asoc/codecs/wcd9xxx-slimslave.h

@@ -10,11 +10,11 @@
  * GNU General Public License for more details.
  */
 
-#ifndef __WCD9310_SLIMSLAVE_H_
+#ifndef __WCD9XXX_SLIMSLAVE_H_
-#define __WCD9310_SLIMSLAVE_H_
+#define __WCD9XXX_SLIMSLAVE_H_
 
 #include <linux/slimbus/slimbus.h>
-#include <linux/mfd/wcd9xxx/core.h>
+#include "core.h"
 
 
 /*
@@ -116,4 +116,4 @@ int wcd9xxx_rx_vport_validation(u32 port_id,
 int wcd9xxx_tx_vport_validation(u32 vtable, u32 port_id,
 				struct wcd9xxx_codec_dai_data *codec_dai,
 				u32 num_codec_dais);
-#endif /* __WCD9310_SLIMSLAVE_H_ */
+#endif /* __WCD9XXX_SLIMSLAVE_H_ */

asoc/codecs/wcd9xxx-utils.c

@@ -20,12 +20,12 @@
 #include <linux/delay.h>
 #include <linux/sched.h>
 #include <linux/mfd/core.h>
-#include <linux/mfd/wcd9xxx/pdata.h>
+#include "core.h"
-#include <linux/mfd/wcd9xxx/core.h>
+#include "msm-cdc-supply.h"
-#include <linux/mfd/wcd9xxx/wcd9xxx-irq.h>
+#include "msm-cdc-pinctrl.h"
-#include <linux/mfd/msm-cdc-supply.h>
+#include "pdata.h"
-#include <linux/mfd/msm-cdc-pinctrl.h>
+#include "wcd9xxx-irq.h"
-#include <linux/mfd/wcd9xxx/wcd9xxx-utils.h>
+#include "wcd9xxx-utils.h"
 
 #define REG_BYTES 2
 #define VAL_BYTES 1

asoc/codecs/wcd9xxx-utils.h

@@ -16,8 +16,8 @@
 #include <linux/kernel.h>
 #include <linux/device.h>
 #include <linux/regmap.h>
-#include <linux/mfd/wcd9xxx/pdata.h>
+#include "pdata.h"
-#include <linux/mfd/wcd9xxx/core.h>
+#include "core.h"
 
 struct wcd9xxx_pdata *wcd9xxx_populate_dt_data(struct device *dev);
 int wcd9xxx_bringup(struct device *dev);

asoc/codecs/wcd_cpe_core.c

@@ -23,16 +23,16 @@
 #include <sound/soc.h>
 #include <sound/info.h>
 #include <sound/lsm_params.h>
-#include <sound/cpe_core.h>
 #include <sound/cpe_cmi.h>
-#include <sound/cpe_err.h>
 #include <soc/qcom/pm.h>
-#include <linux/mfd/wcd9xxx/core.h>
+#include <dsp/audio_cal_utils.h>
-#include <linux/mfd/wcd9xxx/wcd9xxx-irq.h>
+#include "core.h"
-#include <sound/audio_cal_utils.h>
+#include "cpe_core.h"
+#include "cpe_err.h"
 #include "wcd_cpe_core.h"
 #include "wcd_cpe_services.h"
 #include "wcd_cmi_api.h"
+#include "wcd9xxx-irq.h"
 
 #define CMI_CMD_TIMEOUT (10 * HZ)
 #define WCD_CPE_LSM_MAX_SESSIONS 2

asoc/codecs/wcd_cpe_services.c

@@ -17,10 +17,11 @@
 #include <linux/completion.h>
 #include <linux/kthread.h>
 #include <linux/delay.h>
-#include <linux/mfd/wcd9xxx/core.h>
-#include <sound/cpe_cmi.h>
 #include <sound/soc.h>
+#include <linux/mfd/wcd9xxx/wcd9330_registers.h>
 #include <linux/mfd/wcd9335/registers.h>
+#include "core.h"
+#include "cpe_cmi.h"
 #include "wcd_cpe_services.h"
 #include "wcd_cmi_api.h"
 

asoc/codecs/wsa881x.c

@@ -26,13 +26,13 @@
 #include <linux/of_gpio.h>
 #include <linux/regmap.h>
 #include <linux/debugfs.h>
-#include <linux/soundwire/soundwire.h>
+#include <soc/soundwire.h>
-#include <linux/mfd/msm-cdc-pinctrl.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
 #include <sound/soc.h>
 #include <sound/soc-dapm.h>
 #include <sound/tlv.h>
+#include "msm-cdc-pinctrl.h"
 #include "wsa881x.h"
 #include "wsa881x-temp-sensor.h"