summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2018-12-17 07:21:34 -0500
committerMark Brown <broonie@kernel.org>2018-12-18 07:22:43 -0500
commitf2055e145f2975a75dace8e386fad9364828cdb4 (patch)
tree447c549b6c72d4a8cedd34db1cb7b94691c21a16
parent0718f87b0df49570cdcb96179997bd372cac1742 (diff)
ASoC: ti: Merge davinci and omap directories
Create new directory to contain all Texas Instruments specific DAI, platform and machine drivers instead of scattering them under davinci and omap directories. There is already inter dependency between the two directories becasue of McASP (on dra7x it is serviced by sDMA, not EDMA). With the upcoming AM654 we will need to introduce new platform driver for UDMA and it does not fit under davinci, nor under omap. With the move I have restructured the Kconfig to be more usable in the era of simple-sound-card: CPU DAIs can be selected individually and they will select the platform driver they can be served with. To avoid breakage, I have moved over deprecated Kconfig options so defconfig builds will work without regression. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> For sound/soc/{omap => ti}: Tested-by: Jarkko Nikula <jarkko.nikula@bitmer.com> Acked-by: Jarkko Nikula <jarkko.nikula@bitmer.com> Acked-by: Tony Lindgren <tony@atomide.com> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/Kconfig3
-rw-r--r--sound/soc/Makefile3
-rw-r--r--sound/soc/davinci/Kconfig106
-rw-r--r--sound/soc/davinci/Makefile16
-rw-r--r--sound/soc/omap/Kconfig120
-rw-r--r--sound/soc/omap/Makefile30
-rw-r--r--sound/soc/ti/Kconfig368
-rw-r--r--sound/soc/ti/Makefile44
-rw-r--r--sound/soc/ti/ams-delta.c (renamed from sound/soc/omap/ams-delta.c)0
-rw-r--r--sound/soc/ti/davinci-evm.c (renamed from sound/soc/davinci/davinci-evm.c)4
-rw-r--r--sound/soc/ti/davinci-i2s.c (renamed from sound/soc/davinci/davinci-i2s.c)0
-rw-r--r--sound/soc/ti/davinci-i2s.h (renamed from sound/soc/davinci/davinci-i2s.h)0
-rw-r--r--sound/soc/ti/davinci-mcasp.c (renamed from sound/soc/davinci/davinci-mcasp.c)14
-rw-r--r--sound/soc/ti/davinci-mcasp.h (renamed from sound/soc/davinci/davinci-mcasp.h)0
-rw-r--r--sound/soc/ti/davinci-vcif.c (renamed from sound/soc/davinci/davinci-vcif.c)0
-rw-r--r--sound/soc/ti/edma-pcm.c (renamed from sound/soc/davinci/edma-pcm.c)0
-rw-r--r--sound/soc/ti/edma-pcm.h (renamed from sound/soc/davinci/edma-pcm.h)4
-rw-r--r--sound/soc/ti/n810.c (renamed from sound/soc/omap/n810.c)0
-rw-r--r--sound/soc/ti/omap-abe-twl6040.c (renamed from sound/soc/omap/omap-abe-twl6040.c)0
-rw-r--r--sound/soc/ti/omap-dmic.c (renamed from sound/soc/omap/omap-dmic.c)0
-rw-r--r--sound/soc/ti/omap-dmic.h (renamed from sound/soc/omap/omap-dmic.h)0
-rw-r--r--sound/soc/ti/omap-hdmi.c (renamed from sound/soc/omap/omap-hdmi-audio.c)0
-rw-r--r--sound/soc/ti/omap-mcbsp-priv.h (renamed from sound/soc/omap/omap-mcbsp-priv.h)0
-rw-r--r--sound/soc/ti/omap-mcbsp-st.c (renamed from sound/soc/omap/omap-mcbsp-st.c)0
-rw-r--r--sound/soc/ti/omap-mcbsp.c (renamed from sound/soc/omap/omap-mcbsp.c)0
-rw-r--r--sound/soc/ti/omap-mcbsp.h (renamed from sound/soc/omap/omap-mcbsp.h)0
-rw-r--r--sound/soc/ti/omap-mcpdm.c (renamed from sound/soc/omap/omap-mcpdm.c)0
-rw-r--r--sound/soc/ti/omap-mcpdm.h (renamed from sound/soc/omap/omap-mcpdm.h)0
-rw-r--r--sound/soc/ti/omap-twl4030.c (renamed from sound/soc/omap/omap-twl4030.c)0
-rw-r--r--sound/soc/ti/omap3pandora.c (renamed from sound/soc/omap/omap3pandora.c)0
-rw-r--r--sound/soc/ti/osk5912.c (renamed from sound/soc/omap/osk5912.c)0
-rw-r--r--sound/soc/ti/rx51.c (renamed from sound/soc/omap/rx51.c)0
-rw-r--r--sound/soc/ti/sdma-pcm.c (renamed from sound/soc/omap/sdma-pcm.c)0
-rw-r--r--sound/soc/ti/sdma-pcm.h (renamed from sound/soc/omap/sdma-pcm.h)4
34 files changed, 427 insertions, 289 deletions
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index d21659f5a7e2..6592a422a047 100644
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -46,13 +46,11 @@ source "sound/soc/atmel/Kconfig"
46source "sound/soc/au1x/Kconfig" 46source "sound/soc/au1x/Kconfig"
47source "sound/soc/bcm/Kconfig" 47source "sound/soc/bcm/Kconfig"
48source "sound/soc/cirrus/Kconfig" 48source "sound/soc/cirrus/Kconfig"
49source "sound/soc/davinci/Kconfig"
50source "sound/soc/dwc/Kconfig" 49source "sound/soc/dwc/Kconfig"
51source "sound/soc/fsl/Kconfig" 50source "sound/soc/fsl/Kconfig"
52source "sound/soc/hisilicon/Kconfig" 51source "sound/soc/hisilicon/Kconfig"
53source "sound/soc/jz4740/Kconfig" 52source "sound/soc/jz4740/Kconfig"
54source "sound/soc/nuc900/Kconfig" 53source "sound/soc/nuc900/Kconfig"
55source "sound/soc/omap/Kconfig"
56source "sound/soc/kirkwood/Kconfig" 54source "sound/soc/kirkwood/Kconfig"
57source "sound/soc/img/Kconfig" 55source "sound/soc/img/Kconfig"
58source "sound/soc/intel/Kconfig" 56source "sound/soc/intel/Kconfig"
@@ -70,6 +68,7 @@ source "sound/soc/sti/Kconfig"
70source "sound/soc/stm/Kconfig" 68source "sound/soc/stm/Kconfig"
71source "sound/soc/sunxi/Kconfig" 69source "sound/soc/sunxi/Kconfig"
72source "sound/soc/tegra/Kconfig" 70source "sound/soc/tegra/Kconfig"
71source "sound/soc/ti/Kconfig"
73source "sound/soc/txx9/Kconfig" 72source "sound/soc/txx9/Kconfig"
74source "sound/soc/uniphier/Kconfig" 73source "sound/soc/uniphier/Kconfig"
75source "sound/soc/ux500/Kconfig" 74source "sound/soc/ux500/Kconfig"
diff --git a/sound/soc/Makefile b/sound/soc/Makefile
index aff7b1989436..48c48c1c893c 100644
--- a/sound/soc/Makefile
+++ b/sound/soc/Makefile
@@ -30,7 +30,6 @@ obj-$(CONFIG_SND_SOC) += atmel/
30obj-$(CONFIG_SND_SOC) += au1x/ 30obj-$(CONFIG_SND_SOC) += au1x/
31obj-$(CONFIG_SND_SOC) += bcm/ 31obj-$(CONFIG_SND_SOC) += bcm/
32obj-$(CONFIG_SND_SOC) += cirrus/ 32obj-$(CONFIG_SND_SOC) += cirrus/
33obj-$(CONFIG_SND_SOC) += davinci/
34obj-$(CONFIG_SND_SOC) += dwc/ 33obj-$(CONFIG_SND_SOC) += dwc/
35obj-$(CONFIG_SND_SOC) += fsl/ 34obj-$(CONFIG_SND_SOC) += fsl/
36obj-$(CONFIG_SND_SOC) += hisilicon/ 35obj-$(CONFIG_SND_SOC) += hisilicon/
@@ -41,7 +40,6 @@ obj-$(CONFIG_SND_SOC) += mediatek/
41obj-$(CONFIG_SND_SOC) += meson/ 40obj-$(CONFIG_SND_SOC) += meson/
42obj-$(CONFIG_SND_SOC) += mxs/ 41obj-$(CONFIG_SND_SOC) += mxs/
43obj-$(CONFIG_SND_SOC) += nuc900/ 42obj-$(CONFIG_SND_SOC) += nuc900/
44obj-$(CONFIG_SND_SOC) += omap/
45obj-$(CONFIG_SND_SOC) += kirkwood/ 43obj-$(CONFIG_SND_SOC) += kirkwood/
46obj-$(CONFIG_SND_SOC) += pxa/ 44obj-$(CONFIG_SND_SOC) += pxa/
47obj-$(CONFIG_SND_SOC) += qcom/ 45obj-$(CONFIG_SND_SOC) += qcom/
@@ -54,6 +52,7 @@ obj-$(CONFIG_SND_SOC) += sti/
54obj-$(CONFIG_SND_SOC) += stm/ 52obj-$(CONFIG_SND_SOC) += stm/
55obj-$(CONFIG_SND_SOC) += sunxi/ 53obj-$(CONFIG_SND_SOC) += sunxi/
56obj-$(CONFIG_SND_SOC) += tegra/ 54obj-$(CONFIG_SND_SOC) += tegra/
55obj-$(CONFIG_SND_SOC) += ti/
57obj-$(CONFIG_SND_SOC) += txx9/ 56obj-$(CONFIG_SND_SOC) += txx9/
58obj-$(CONFIG_SND_SOC) += uniphier/ 57obj-$(CONFIG_SND_SOC) += uniphier/
59obj-$(CONFIG_SND_SOC) += ux500/ 58obj-$(CONFIG_SND_SOC) += ux500/
diff --git a/sound/soc/davinci/Kconfig b/sound/soc/davinci/Kconfig
deleted file mode 100644
index 778faff28e0e..000000000000
--- a/sound/soc/davinci/Kconfig
+++ /dev/null
@@ -1,106 +0,0 @@
1config SND_DAVINCI_SOC
2 tristate
3 depends on ARCH_DAVINCI
4 select SND_EDMA_SOC
5
6config SND_EDMA_SOC
7 tristate "SoC Audio for Texas Instruments chips using eDMA"
8 depends on TI_EDMA
9 select SND_SOC_GENERIC_DMAENGINE_PCM
10 help
11 Say Y or M here if you want audio support for TI SoC which uses eDMA.
12 The following line of SoCs are supported by this platform driver:
13 - daVinci devices
14 - AM335x
15 - AM437x/AM438x
16 - DRA7xx family
17
18config SND_DAVINCI_SOC_I2S
19 tristate "DaVinci Multichannel Buffered Serial Port (McBSP) support"
20 depends on SND_EDMA_SOC
21 help
22 Say Y or M here if you want to have support for McBSP IP found in
23 Texas Instruments DaVinci DA850 SoCs.
24
25config SND_DAVINCI_SOC_MCASP
26 tristate "Multichannel Audio Serial Port (McASP) support"
27 depends on SND_SDMA_SOC || SND_EDMA_SOC
28 help
29 Say Y or M here if you want to have support for McASP IP found in
30 various Texas Instruments SoCs like:
31 - daVinci devices
32 - Sitara line of SoCs (AM335x, AM438x, etc)
33 - DRA7x devices
34
35config SND_DAVINCI_SOC_VCIF
36 tristate
37
38config SND_DAVINCI_SOC_GENERIC_EVM
39 tristate
40 select SND_SOC_TLV320AIC3X
41 select SND_DAVINCI_SOC_MCASP
42
43config SND_AM33XX_SOC_EVM
44 tristate "SoC Audio for the AM33XX chip based boards"
45 depends on SND_EDMA_SOC && SOC_AM33XX && I2C
46 select SND_DAVINCI_SOC_GENERIC_EVM
47 help
48 Say Y or M if you want to add support for SoC audio on AM33XX
49 boards using McASP and TLV320AIC3X codec. For example AM335X-EVM,
50 AM335X-EVMSK, and BeagelBone with AudioCape boards have this
51 setup.
52
53config SND_DAVINCI_SOC_EVM
54 tristate "SoC Audio support for DaVinci DM6446, DM355 or DM365 EVM"
55 depends on SND_EDMA_SOC && I2C
56 depends on MACH_DAVINCI_EVM || MACH_DAVINCI_DM355_EVM || MACH_DAVINCI_DM365_EVM
57 select SND_DAVINCI_SOC_GENERIC_EVM
58 help
59 Say Y if you want to add support for SoC audio on TI
60 DaVinci DM6446, DM355 or DM365 EVM platforms.
61
62choice
63 prompt "DM365 codec select"
64 depends on SND_DAVINCI_SOC_EVM
65 depends on MACH_DAVINCI_DM365_EVM
66
67config SND_DM365_AIC3X_CODEC
68 tristate "Audio Codec - AIC3101"
69 help
70 Say Y if you want to add support for AIC3101 audio codec
71
72config SND_DM365_VOICE_CODEC
73 tristate "Voice Codec - CQ93VC"
74 select MFD_DAVINCI_VOICECODEC
75 select SND_DAVINCI_SOC_VCIF
76 select SND_SOC_CQ0093VC
77 help
78 Say Y if you want to add support for SoC On-chip voice codec
79endchoice
80
81config SND_DM6467_SOC_EVM
82 tristate "SoC Audio support for DaVinci DM6467 EVM"
83 depends on SND_EDMA_SOC && MACH_DAVINCI_DM6467_EVM && I2C
84 select SND_DAVINCI_SOC_GENERIC_EVM
85 select SND_SOC_SPDIF
86
87 help
88 Say Y if you want to add support for SoC audio on TI
89
90config SND_DA830_SOC_EVM
91 tristate "SoC Audio support for DA830/OMAP-L137 EVM"
92 depends on SND_EDMA_SOC && MACH_DAVINCI_DA830_EVM && I2C
93 select SND_DAVINCI_SOC_GENERIC_EVM
94
95 help
96 Say Y if you want to add support for SoC audio on TI
97 DA830/OMAP-L137 EVM
98
99config SND_DA850_SOC_EVM
100 tristate "SoC Audio support for DA850/OMAP-L138 EVM"
101 depends on SND_EDMA_SOC && MACH_DAVINCI_DA850_EVM && I2C
102 select SND_DAVINCI_SOC_GENERIC_EVM
103 help
104 Say Y if you want to add support for SoC audio on TI
105 DA850/OMAP-L138 EVM
106
diff --git a/sound/soc/davinci/Makefile b/sound/soc/davinci/Makefile
deleted file mode 100644
index 23c6592eb31a..000000000000
--- a/sound/soc/davinci/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
1# SPDX-License-Identifier: GPL-2.0
2# DAVINCI Platform Support
3snd-soc-edma-objs := edma-pcm.o
4snd-soc-davinci-i2s-objs := davinci-i2s.o
5snd-soc-davinci-mcasp-objs:= davinci-mcasp.o
6snd-soc-davinci-vcif-objs:= davinci-vcif.o
7
8obj-$(CONFIG_SND_EDMA_SOC) += snd-soc-edma.o
9obj-$(CONFIG_SND_DAVINCI_SOC_I2S) += snd-soc-davinci-i2s.o
10obj-$(CONFIG_SND_DAVINCI_SOC_MCASP) += snd-soc-davinci-mcasp.o
11obj-$(CONFIG_SND_DAVINCI_SOC_VCIF) += snd-soc-davinci-vcif.o
12
13# Generic DAVINCI/AM33xx Machine Support
14snd-soc-evm-objs := davinci-evm.o
15
16obj-$(CONFIG_SND_DAVINCI_SOC_GENERIC_EVM) += snd-soc-evm.o
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
deleted file mode 100644
index 3d418482d242..000000000000
--- a/sound/soc/omap/Kconfig
+++ /dev/null
@@ -1,120 +0,0 @@
1config SND_OMAP_SOC
2 tristate "SoC Audio for Texas Instruments OMAP chips (deprecated)"
3 depends on (ARCH_OMAP && DMA_OMAP) || (ARM && COMPILE_TEST)
4 select SND_SDMA_SOC
5
6config SND_SDMA_SOC
7 tristate "SoC Audio for Texas Instruments chips using sDMA"
8 depends on DMA_OMAP || COMPILE_TEST
9 select SND_SOC_GENERIC_DMAENGINE_PCM
10
11config SND_OMAP_SOC_DMIC
12 tristate
13
14config SND_OMAP_SOC_MCBSP
15 tristate
16
17config SND_OMAP_SOC_MCPDM
18 tristate
19
20config SND_OMAP_SOC_HDMI_AUDIO
21 tristate "HDMI audio support for OMAP4+ based SoCs"
22 depends on SND_SDMA_SOC
23 help
24 For HDMI audio to work OMAPDSS HDMI support should be
25 enabled.
26 The hdmi audio driver implements cpu-dai component using the
27 callbacks provided by OMAPDSS and registers the component
28 under DSS HDMI device. Omap-pcm is registered for platform
29 component also under DSS HDMI device. Dummy codec is used as
30 as codec component. The hdmi audio driver implements also
31 the card and registers it under its own platform device.
32 The device for the driver is registered by OMAPDSS hdmi
33 driver.
34
35config SND_OMAP_SOC_N810
36 tristate "SoC Audio support for Nokia N810"
37 depends on SND_SDMA_SOC && MACH_NOKIA_N810 && I2C
38 select SND_OMAP_SOC_MCBSP
39 select SND_SOC_TLV320AIC3X
40 help
41 Say Y if you want to add support for SoC audio on Nokia N810.
42
43config SND_OMAP_SOC_RX51
44 tristate "SoC Audio support for Nokia N900 (RX-51)"
45 depends on SND_SDMA_SOC && ARM && I2C
46 select SND_OMAP_SOC_MCBSP
47 select SND_SOC_TLV320AIC3X
48 select SND_SOC_TPA6130A2
49 depends on GPIOLIB
50 help
51 Say Y if you want to add support for SoC audio on Nokia N900
52 cellphone.
53
54config SND_OMAP_SOC_AMS_DELTA
55 tristate "SoC Audio support for Amstrad E3 (Delta) videophone"
56 depends on SND_SDMA_SOC && MACH_AMS_DELTA && TTY
57 select SND_OMAP_SOC_MCBSP
58 select SND_SOC_CX20442
59 help
60 Say Y if you want to add support for SoC audio device connected to
61 a handset and a speakerphone found on Amstrad E3 (Delta) videophone.
62
63 Note that in order to get those devices fully supported, you have to
64 build the kernel with standard serial port driver included and
65 configured for at least 4 ports. Then, from userspace, you must load
66 a line discipline #19 on the modem (ttyS3) serial line. The simplest
67 way to achieve this is to install util-linux-ng and use the included
68 ldattach utility. This can be started automatically from udev,
69 a simple rule like this one should do the trick (it does for me):
70 ACTION=="add", KERNEL=="controlC0", \
71 RUN+="/usr/sbin/ldattach 19 /dev/ttyS3"
72
73config SND_OMAP_SOC_OSK5912
74 tristate "SoC Audio support for omap osk5912"
75 depends on SND_SDMA_SOC && MACH_OMAP_OSK && I2C
76 select SND_OMAP_SOC_MCBSP
77 select SND_SOC_TLV320AIC23_I2C
78 help
79 Say Y if you want to add support for SoC audio on osk5912.
80
81config SND_OMAP_SOC_OMAP_TWL4030
82 tristate "SoC Audio support for TI SoC based boards with twl4030 codec"
83 depends on TWL4030_CORE && SND_SDMA_SOC
84 select SND_OMAP_SOC_MCBSP
85 select SND_SOC_TWL4030
86 help
87 Say Y if you want to add support for SoC audio on TI SoC based boards
88 using twl4030 as c codec. This driver currently supports:
89 - Beagleboard or Devkit8000
90 - Gumstix Overo or CompuLab CM-T35/CM-T3730
91 - IGEP v2
92 - OMAP3EVM
93 - SDP3430
94 - Zoom2
95
96config SND_OMAP_SOC_OMAP_ABE_TWL6040
97 tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec"
98 depends on TWL6040_CORE && SND_SDMA_SOC && COMMON_CLK
99 depends on ARCH_OMAP4 || (SOC_OMAP5 && MFD_PALMAS) || COMPILE_TEST
100 select SND_OMAP_SOC_DMIC
101 select SND_OMAP_SOC_MCPDM
102 select SND_SOC_TWL6040
103 select SND_SOC_DMIC
104 select COMMON_CLK_PALMAS if (SOC_OMAP5 && MFD_PALMAS)
105 select CLK_TWL6040
106 help
107 Say Y if you want to add support for SoC audio on OMAP boards using
108 ABE and twl6040 codec. This driver currently supports:
109 - SDP4430/Blaze boards
110 - PandaBoard (4430)
111 - PandaBoardES (4460)
112 - omap5-uevm (5432)
113
114config SND_OMAP_SOC_OMAP3_PANDORA
115 tristate "SoC Audio support for OMAP3 Pandora"
116 depends on TWL4030_CORE && SND_SDMA_SOC && MACH_OMAP3_PANDORA
117 select SND_OMAP_SOC_MCBSP
118 select SND_SOC_TWL4030
119 help
120 Say Y if you want to add support for SoC audio on the OMAP3 Pandora.
diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile
deleted file mode 100644
index d005338dd13c..000000000000
--- a/sound/soc/omap/Makefile
+++ /dev/null
@@ -1,30 +0,0 @@
1# SPDX-License-Identifier: GPL-2.0
2# OMAP Platform Support
3snd-soc-sdma-objs := sdma-pcm.o
4snd-soc-omap-dmic-objs := omap-dmic.o
5snd-soc-omap-mcbsp-objs := omap-mcbsp.o omap-mcbsp-st.o
6snd-soc-omap-mcpdm-objs := omap-mcpdm.o
7snd-soc-omap-hdmi-audio-objs := omap-hdmi-audio.o
8
9obj-$(CONFIG_SND_SDMA_SOC) += snd-soc-sdma.o
10obj-$(CONFIG_SND_OMAP_SOC_DMIC) += snd-soc-omap-dmic.o
11obj-$(CONFIG_SND_OMAP_SOC_MCBSP) += snd-soc-omap-mcbsp.o
12obj-$(CONFIG_SND_OMAP_SOC_MCPDM) += snd-soc-omap-mcpdm.o
13obj-$(CONFIG_SND_OMAP_SOC_HDMI_AUDIO) += snd-soc-omap-hdmi-audio.o
14
15# OMAP Machine Support
16snd-soc-n810-objs := n810.o
17snd-soc-rx51-objs := rx51.o
18snd-soc-ams-delta-objs := ams-delta.o
19snd-soc-osk5912-objs := osk5912.o
20snd-soc-omap-abe-twl6040-objs := omap-abe-twl6040.o
21snd-soc-omap-twl4030-objs := omap-twl4030.o
22snd-soc-omap3pandora-objs := omap3pandora.o
23
24obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o
25obj-$(CONFIG_SND_OMAP_SOC_RX51) += snd-soc-rx51.o
26obj-$(CONFIG_SND_OMAP_SOC_AMS_DELTA) += snd-soc-ams-delta.o
27obj-$(CONFIG_SND_OMAP_SOC_OSK5912) += snd-soc-osk5912.o
28obj-$(CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040) += snd-soc-omap-abe-twl6040.o
29obj-$(CONFIG_SND_OMAP_SOC_OMAP_TWL4030) += snd-soc-omap-twl4030.o
30obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o
diff --git a/sound/soc/ti/Kconfig b/sound/soc/ti/Kconfig
new file mode 100644
index 000000000000..698810c770f0
--- /dev/null
+++ b/sound/soc/ti/Kconfig
@@ -0,0 +1,368 @@
1menu "Audio support for Texas Instruments SoCs"
2depends on DMA_OMAP || TI_EDMA || COMPILE_TEST
3
4config SND_SOC_TI_EDMA_PCM
5 tristate
6 select SND_SOC_GENERIC_DMAENGINE_PCM
7
8config SND_SOC_TI_SDMA_PCM
9 tristate
10 select SND_SOC_GENERIC_DMAENGINE_PCM
11
12comment "Texas Instruments DAI support for:"
13config SND_SOC_DAVINCI_ASP
14 tristate "daVinci Audio Serial Port (ASP) or McBSP suport"
15 depends on ARCH_DAVINCI || COMPILE_TEST
16 select SND_SOC_TI_EDMA_PCM
17 help
18 Say Y or M here if you want audio support via daVinci ASP or McBSP.
19 The driver only implements the ASP support which is a subset of
20 daVinci McBSP (w/o the multichannel support).
21
22config SND_SOC_DAVINCI_MCASP
23 tristate "Multichannel Audio Serial Port (McASP) support"
24 select SND_SOC_TI_EDMA_PCM if TI_EDMA
25 select SND_SOC_TI_SDMA_PCM if DMA_OMAP
26 help
27 Say Y or M here if you want to have support for McASP IP found in
28 various Texas Instruments SoCs like:
29 - daVinci devices
30 - Sitara line of SoCs (AM335x, AM438x, etc)
31 - DRA7x devices
32 - Keystone devices
33
34config SND_SOC_DAVINCI_VCIF
35 tristate "daVinci Voice Interface (VCIF) suport"
36 depends on ARCH_DAVINCI || COMPILE_TEST
37 select SND_SOC_TI_EDMA_PCM
38 help
39 Say Y or M here if you want audio support via daVinci VCIF.
40
41config SND_SOC_OMAP_DMIC
42 tristate "Digital Microphone Module (DMIC) support"
43 depends on ARCH_OMAP4 || SOC_OMAP5 || COMPILE_TEST
44 select SND_SOC_TI_SDMA_PCM
45 help
46 Say Y or M here if you want to have support for DMIC IP found in
47 OMAP4 and OMAP5.
48
49config SND_OMAP_SOC_MCBSP
50 tristate
51
52config SND_SOC_OMAP_MCBSP
53 tristate "Multichannel Buffered Serial Port (McBSP) support"
54 depends on ARCH_OMAP || ARCH_OMAP1 || COMPILE_TEST
55 select SND_SOC_TI_SDMA_PCM
56 select SND_OMAP_SOC_MCBSP
57 help
58 Say Y or M here if you want to have support for McBSP IP found in
59 Texas Instruments OMAP1/2/3/4/5 SoCs.
60
61config SND_SOC_OMAP_MCPDM
62 tristate "Multichannel PDM Controller (McPDM) support"
63 depends on ARCH_OMAP4 || SOC_OMAP5 || COMPILE_TEST
64 select SND_SOC_TI_SDMA_PCM
65 help
66 Say Y or M here if you want to have support for McPDM IP found in
67 OMAP4 and OMAP5.
68
69comment "Audio support for boards with Texas Instruments SoCs"
70config SND_SOC_NOKIA_N810
71 tristate "SoC Audio support for Nokia N810"
72 depends on MACH_NOKIA_N810 && I2C
73 select SND_SOC_OMAP_MCBSP
74 select SND_SOC_TLV320AIC3X
75 help
76 Say Y or M if you want to add support for SoC audio on Nokia N810.
77
78config SND_SOC_NOKIA_RX51
79 tristate "SoC Audio support for Nokia RX-51"
80 depends on ARCH_OMAP3 && I2C && GPIOLIB
81 select SND_SOC_OMAP_MCBSP
82 select SND_SOC_TLV320AIC3X
83 select SND_SOC_TPA6130A2
84 help
85 Say Y or M if you want to add support for SoC audio on Nokia RX-51
86 hardware. This is also known as Nokia N900 product.
87
88config SND_SOC_OMAP3_PANDORA
89 tristate "SoC Audio support for OMAP3 Pandora"
90 depends on ARCH_OMAP3
91 depends on TWL4030_CORE
92 select SND_SOC_OMAP_MCBSP
93 select SND_SOC_TWL4030
94 help
95 Say Y or M if you want to add support for SoC audio on the OMAP3 Pandora.
96
97config SND_SOC_OMAP3_TWL4030
98 tristate "SoC Audio support for OMAP3 based boards with twl4030 codec"
99 depends on ARCH_OMAP3 || COMPILE_TEST
100 depends on TWL4030_CORE
101 select SND_SOC_OMAP_MCBSP
102 select SND_SOC_TWL4030
103 help
104 Say Y or M if you want to add support for SoC audio on OMAP3 based
105 boards using twl4030 as codec. This driver currently supports:
106 - Beagleboard or Devkit8000
107 - Gumstix Overo or CompuLab CM-T35/CM-T3730
108 - IGEP v2
109 - OMAP3EVM
110 - SDP3430
111 - Zoom2
112
113config SND_SOC_OMAP_ABE_TWL6040
114 tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec"
115 depends on TWL6040_CORE && COMMON_CLK
116 depends on ARCH_OMAP4 || (SOC_OMAP5 && MFD_PALMAS) || COMPILE_TEST
117 select SND_SOC_OMAP_DMIC
118 select SND_SOC_OMAP_MCPDM
119 select SND_SOC_TWL6040
120 help
121 Say Y or M if you want to add support for SoC audio on OMAP boards
122 using ABE and twl6040 codec. This driver currently supports:
123 - SDP4430/Blaze boards
124 - PandaBoard (4430)
125 - PandaBoardES (4460)
126 - OMAP5 uEVM
127
128config SND_SOC_OMAP_AMS_DELTA
129 tristate "SoC Audio support for Amstrad E3 (Delta) videophone"
130 depends on MACH_AMS_DELTA && TTY
131 select SND_SOC_OMAP_MCBSP
132 select SND_SOC_CX20442
133 help
134 Say Y or M if you want to add support for SoC audio device
135 connected to a handset and a speakerphone found on Amstrad E3 (Delta)
136 videophone.
137
138 Note that in order to get those devices fully supported, you have to
139 build the kernel with standard serial port driver included and
140 configured for at least 4 ports. Then, from userspace, you must load
141 a line discipline #19 on the modem (ttyS3) serial line. The simplest
142 way to achieve this is to install util-linux-ng and use the included
143 ldattach utility. This can be started automatically from udev,
144 a simple rule like this one should do the trick (it does for me):
145 ACTION=="add", KERNEL=="controlC0", \
146 RUN+="/usr/sbin/ldattach 19 /dev/ttyS3"
147
148config SND_SOC_OMAP_HDMI
149 tristate "OMAP4/5 HDMI audio support"
150 depends on OMAP4_DSS_HDMI || OMAP5_DSS_HDMI || COMPILE_TEST
151 select SND_SOC_TI_SDMA_PCM
152 help
153 For HDMI audio to work OMAPDSS HDMI support should be
154 enabled.
155 The hdmi audio driver implements cpu-dai component using the
156 callbacks provided by OMAPDSS and registers the component
157 under DSS HDMI device. Omap-pcm is registered for platform
158 component also under DSS HDMI device. Dummy codec is used as
159 as codec component. The hdmi audio driver implements also
160 the card and registers it under its own platform device.
161 The device for the driver is registered by OMAPDSS hdmi
162 driver.
163
164config SND_SOC_OMAP_OSK5912
165 tristate "SoC Audio support for omap osk5912"
166 depends on MACH_OMAP_OSK && I2C
167 select SND_SOC_OMAP_MCBSP
168 select SND_SOC_TLV320AIC23_I2C
169 help
170 Say Y or M if you want to add support for SoC audio on osk5912.
171
172config SND_SOC_DAVINCI_EVM
173 tristate "SoC Audio support for DaVinci EVMs"
174 depends on ARCH_DAVINCI && I2C
175 select SND_SOC_DAVINCI_ASP if MACH_DAVINCI_DM355_EVM
176 select SND_SOC_DAVINCI_ASP if SND_SOC_DM365_AIC3X_CODEC
177 select SND_SOC_DAVINCI_VCIF if SND_SOC_DM365_VOICE_CODEC
178 select SND_SOC_DAVINCI_ASP if MACH_DAVINCI_EVM # DM6446
179 select SND_SOC_DAVINCI_MCASP if MACH_DAVINCI_DM6467_EVM
180 select SND_SOC_SPDIF if MACH_DAVINCI_DM6467_EVM
181 select SND_SOC_DAVINCI_MCASP if MACH_DAVINCI_DA830_EVM
182 select SND_SOC_DAVINCI_MCASP if MACH_DAVINCI_DA850_EVM
183 select SND_SOC_TLV320AIC3X
184 help
185 Say Y if you want to add support for SoC audio on the following TI
186 DaVinci EVM platforms:
187 - DM355
188 - DM365
189 - DM6446
190 - DM6447
191 - DM830
192 - DM850
193
194choice
195 prompt "DM365 codec select"
196 depends on SND_SOC_DAVINCI_EVM
197 depends on MACH_DAVINCI_DM365_EVM
198
199config SND_SOC_DM365_AIC3X_CODEC
200 bool "Audio Codec - AIC3101"
201 help
202 Say Y if you want to add support for AIC3101 audio codec
203
204config SND_SOC_DM365_VOICE_CODEC
205 bool "Voice Codec - CQ93VC"
206 select MFD_DAVINCI_VOICECODEC
207 select SND_SOC_CQ0093VC
208 help
209 Say Y if you want to add support for SoC On-chip voice codec
210endchoice
211
212menu "Deprecated kconfig options:"
213
214config SND_AM33XX_SOC_EVM
215 tristate "SoC Audio for the AM33XX chip based boards"
216 depends on SOC_AM33XX && I2C
217 select SND_SOC_TLV320AIC3X
218 select SND_SOC_DAVINCI_MCASP
219 help
220 Say Y or M if you want to add support for SoC audio on AM33XX
221 boards using McASP and TLV320AIC3X codec. For example AM335X-EVM,
222 AM335X-EVMSK, and BeagelBone with AudioCape boards have this
223 setup.
224
225config SND_DAVINCI_SOC_EVM
226 tristate "SoC Audio support for DaVinci DM6446, DM355 or DM365 EVM"
227 depends on ARCH_DAVINCI && I2C
228 depends on MACH_DAVINCI_EVM || MACH_DAVINCI_DM355_EVM || MACH_DAVINCI_DM365_EVM
229 select SND_SOC_DAVINCI_EVM
230 help
231 Say Y if you want to add support for SoC audio on TI
232 DaVinci DM6446, DM355 or DM365 EVM platforms.
233
234choice
235 prompt "DM365 codec select"
236 depends on SND_DAVINCI_SOC_EVM
237 depends on MACH_DAVINCI_DM365_EVM
238
239config SND_DM365_AIC3X_CODEC
240 tristate "Audio Codec - AIC3101"
241 select SND_SOC_DM365_AIC3X_CODEC
242 help
243 Say Y if you want to add support for AIC3101 audio codec
244
245config SND_DM365_VOICE_CODEC
246 tristate "Voice Codec - CQ93VC"
247 select SND_SOC_DM365_VOICE_CODEC
248 help
249 Say Y if you want to add support for SoC On-chip voice codec
250endchoice
251
252config SND_DM6467_SOC_EVM
253 tristate "SoC Audio support for DaVinci DM6467 EVM"
254 depends on MACH_DAVINCI_DM6467_EVM && I2C
255 select SND_SOC_DAVINCI_EVM
256
257 help
258 Say Y if you want to add support for SoC audio on TI
259
260config SND_DA830_SOC_EVM
261 tristate "SoC Audio support for DA830/OMAP-L137 EVM"
262 depends on MACH_DAVINCI_DA830_EVM && I2C
263 select SND_SOC_DAVINCI_EVM
264
265 help
266 Say Y if you want to add support for SoC audio on TI
267 DA830/OMAP-L137 EVM
268
269config SND_DA850_SOC_EVM
270 tristate "SoC Audio support for DA850/OMAP-L138 EVM"
271 depends on MACH_DAVINCI_DA850_EVM && I2C
272 select SND_SOC_DAVINCI_EVM
273 help
274 Say Y if you want to add support for SoC audio on TI
275 DA850/OMAP-L138 EVM
276
277config SND_OMAP_SOC_HDMI_AUDIO
278 tristate "HDMI audio support for OMAP4+ based SoCs"
279 select SND_SOC_OMAP_HDMI
280 help
281 For HDMI audio to work OMAPDSS HDMI support should be
282 enabled.
283 The hdmi audio driver implements cpu-dai component using the
284 callbacks provided by OMAPDSS and registers the component
285 under DSS HDMI device. Omap-pcm is registered for platform
286 component also under DSS HDMI device. Dummy codec is used as
287 as codec component. The hdmi audio driver implements also
288 the card and registers it under its own platform device.
289 The device for the driver is registered by OMAPDSS hdmi
290 driver.
291
292config SND_OMAP_SOC_N810
293 tristate "SoC Audio support for Nokia N810"
294 depends on MACH_NOKIA_N810 && I2C
295 select SND_SOC_NOKIA_N810
296 help
297 Say Y if you want to add support for SoC audio on Nokia N810.
298
299config SND_OMAP_SOC_RX51
300 tristate "SoC Audio support for Nokia N900 (RX-51)"
301 depends on ARM && I2C && GPIOLIB && ARCH_OMAP3
302 select SND_SOC_NOKIA_RX51
303 help
304 Say Y if you want to add support for SoC audio on Nokia N900
305 cellphone.
306
307config SND_OMAP_SOC_AMS_DELTA
308 tristate "SoC Audio support for Amstrad E3 (Delta) videophone"
309 depends on MACH_AMS_DELTA && TTY
310 select SND_SOC_OMAP_AMS_DELTA
311 help
312 Say Y if you want to add support for SoC audio device connected to
313 a handset and a speakerphone found on Amstrad E3 (Delta) videophone.
314
315 Note that in order to get those devices fully supported, you have to
316 build the kernel with standard serial port driver included and
317 configured for at least 4 ports. Then, from userspace, you must load
318 a line discipline #19 on the modem (ttyS3) serial line. The simplest
319 way to achieve this is to install util-linux-ng and use the included
320 ldattach utility. This can be started automatically from udev,
321 a simple rule like this one should do the trick (it does for me):
322 ACTION=="add", KERNEL=="controlC0", \
323 RUN+="/usr/sbin/ldattach 19 /dev/ttyS3"
324
325config SND_OMAP_SOC_OSK5912
326 tristate "SoC Audio support for omap osk5912"
327 depends on MACH_OMAP_OSK && I2C
328 select SND_SOC_OMAP_OSK5912
329 help
330 Say Y if you want to add support for SoC audio on osk5912.
331
332config SND_OMAP_SOC_OMAP_TWL4030
333 tristate "SoC Audio support for TI SoC based boards with twl4030 codec"
334 depends on TWL4030_CORE
335 select SND_SOC_OMAP3_TWL4030
336 help
337 Say Y if you want to add support for SoC audio on TI SoC based boards
338 using twl4030 as c codec. This driver currently supports:
339 - Beagleboard or Devkit8000
340 - Gumstix Overo or CompuLab CM-T35/CM-T3730
341 - IGEP v2
342 - OMAP3EVM
343 - SDP3430
344 - Zoom2
345
346config SND_OMAP_SOC_OMAP_ABE_TWL6040
347 tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec"
348 depends on TWL6040_CORE && COMMON_CLK
349 depends on ARCH_OMAP4 || (SOC_OMAP5 && MFD_PALMAS) || COMPILE_TEST
350 select SND_SOC_OMAP_ABE_TWL6040
351 help
352 Say Y if you want to add support for SoC audio on OMAP boards using
353 ABE and twl6040 codec. This driver currently supports:
354 - SDP4430/Blaze boards
355 - PandaBoard (4430)
356 - PandaBoardES (4460)
357 - omap5-uevm (5432)
358
359config SND_OMAP_SOC_OMAP3_PANDORA
360 tristate "SoC Audio support for OMAP3 Pandora"
361 depends on TWL4030_CORE
362 select SND_SOC_OMAP3_PANDORA
363 help
364 Say Y if you want to add support for SoC audio on the OMAP3 Pandora.
365endmenu
366
367endmenu
368
diff --git a/sound/soc/ti/Makefile b/sound/soc/ti/Makefile
new file mode 100644
index 000000000000..08c44d56ef3e
--- /dev/null
+++ b/sound/soc/ti/Makefile
@@ -0,0 +1,44 @@
1# SPDX-License-Identifier: GPL-2.0
2
3# Platform drivers
4snd-soc-ti-edma-objs := edma-pcm.o
5snd-soc-ti-sdma-objs := sdma-pcm.o
6
7obj-$(CONFIG_SND_SOC_TI_EDMA_PCM) += snd-soc-ti-edma.o
8obj-$(CONFIG_SND_SOC_TI_SDMA_PCM) += snd-soc-ti-sdma.o
9
10# CPU DAI drivers
11snd-soc-davinci-asp-objs := davinci-i2s.o
12snd-soc-davinci-mcasp-objs := davinci-mcasp.o
13snd-soc-davinci-vcif-objs := davinci-vcif.o
14snd-soc-omap-dmic-objs := omap-dmic.o
15snd-soc-omap-mcbsp-objs := omap-mcbsp.o omap-mcbsp-st.o
16snd-soc-omap-mcpdm-objs := omap-mcpdm.o
17
18obj-$(CONFIG_SND_SOC_DAVINCI_ASP) += snd-soc-davinci-asp.o
19obj-$(CONFIG_SND_SOC_DAVINCI_MCASP) += snd-soc-davinci-mcasp.o
20obj-$(CONFIG_SND_SOC_DAVINCI_VCIF) += snd-soc-davinci-vcif.o
21obj-$(CONFIG_SND_SOC_OMAP_DMIC) += snd-soc-omap-dmic.o
22obj-$(CONFIG_SND_SOC_OMAP_MCBSP) += snd-soc-omap-mcbsp.o
23obj-$(CONFIG_SND_SOC_OMAP_MCPDM) += snd-soc-omap-mcpdm.o
24
25# Machine drivers
26snd-soc-davinci-evm-objs := davinci-evm.o
27snd-soc-n810-objs := n810.o
28snd-soc-rx51-objs := rx51.o
29snd-soc-omap3pandora-objs := omap3pandora.o
30snd-soc-omap-twl4030-objs := omap-twl4030.o
31snd-soc-omap-abe-twl6040-objs := omap-abe-twl6040.o
32snd-soc-ams-delta-objs := ams-delta.o
33snd-soc-omap-hdmi-objs := omap-hdmi.o
34snd-soc-osk5912-objs := osk5912.o
35
36obj-$(CONFIG_SND_SOC_DAVINCI_EVM) += snd-soc-davinci-evm.o
37obj-$(CONFIG_SND_SOC_NOKIA_N810) += snd-soc-n810.o
38obj-$(CONFIG_SND_SOC_NOKIA_RX51) += snd-soc-rx51.o
39obj-$(CONFIG_SND_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o
40obj-$(CONFIG_SND_SOC_OMAP3_TWL4030) += snd-soc-omap-twl4030.o
41obj-$(CONFIG_SND_SOC_OMAP_ABE_TWL6040) += snd-soc-omap-abe-twl6040.o
42obj-$(CONFIG_SND_SOC_OMAP_AMS_DELTA) += snd-soc-ams-delta.o
43obj-$(CONFIG_SND_SOC_OMAP_HDMI) += snd-soc-omap-hdmi.o
44obj-$(CONFIG_SND_SOC_OMAP_OSK5912) += snd-soc-osk5912.o
diff --git a/sound/soc/omap/ams-delta.c b/sound/soc/ti/ams-delta.c
index 4dce494dfbd3..4dce494dfbd3 100644
--- a/sound/soc/omap/ams-delta.c
+++ b/sound/soc/ti/ams-delta.c
diff --git a/sound/soc/davinci/davinci-evm.c b/sound/soc/ti/davinci-evm.c
index 7a369e0f2093..4869d6311510 100644
--- a/sound/soc/davinci/davinci-evm.c
+++ b/sound/soc/ti/davinci-evm.c
@@ -170,7 +170,7 @@ static struct snd_soc_dai_link dm355_evm_dai = {
170}; 170};
171 171
172static struct snd_soc_dai_link dm365_evm_dai = { 172static struct snd_soc_dai_link dm365_evm_dai = {
173#ifdef CONFIG_SND_DM365_AIC3X_CODEC 173#ifdef CONFIG_SND_SOC_DM365_AIC3X_CODEC
174 .name = "TLV320AIC3X", 174 .name = "TLV320AIC3X",
175 .stream_name = "AIC3X", 175 .stream_name = "AIC3X",
176 .cpu_dai_name = "davinci-mcbsp", 176 .cpu_dai_name = "davinci-mcbsp",
@@ -181,7 +181,7 @@ static struct snd_soc_dai_link dm365_evm_dai = {
181 .ops = &evm_ops, 181 .ops = &evm_ops,
182 .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_CBM_CFM | 182 .dai_fmt = SND_SOC_DAIFMT_DSP_B | SND_SOC_DAIFMT_CBM_CFM |
183 SND_SOC_DAIFMT_IB_NF, 183 SND_SOC_DAIFMT_IB_NF,
184#elif defined(CONFIG_SND_DM365_VOICE_CODEC) 184#elif defined(CONFIG_SND_SOC_DM365_VOICE_CODEC)
185 .name = "Voice Codec - CQ93VC", 185 .name = "Voice Codec - CQ93VC",
186 .stream_name = "CQ93", 186 .stream_name = "CQ93",
187 .cpu_dai_name = "davinci-vcif", 187 .cpu_dai_name = "davinci-vcif",
diff --git a/sound/soc/davinci/davinci-i2s.c b/sound/soc/ti/davinci-i2s.c
index a3206e65e5e5..a3206e65e5e5 100644
--- a/sound/soc/davinci/davinci-i2s.c
+++ b/sound/soc/ti/davinci-i2s.c
diff --git a/sound/soc/davinci/davinci-i2s.h b/sound/soc/ti/davinci-i2s.h
index 48dac3e2521a..48dac3e2521a 100644
--- a/sound/soc/davinci/davinci-i2s.h
+++ b/sound/soc/ti/davinci-i2s.h
diff --git a/sound/soc/davinci/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c
index 40d3a916fb74..eeda6d5565bc 100644
--- a/sound/soc/davinci/davinci-mcasp.c
+++ b/sound/soc/ti/davinci-mcasp.c
@@ -39,7 +39,7 @@
39#include <sound/dmaengine_pcm.h> 39#include <sound/dmaengine_pcm.h>
40 40
41#include "edma-pcm.h" 41#include "edma-pcm.h"
42#include "../omap/sdma-pcm.h" 42#include "sdma-pcm.h"
43#include "davinci-mcasp.h" 43#include "davinci-mcasp.h"
44 44
45#define MCASP_MAX_AFIFO_DEPTH 64 45#define MCASP_MAX_AFIFO_DEPTH 64
@@ -2149,9 +2149,9 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
2149 ret = davinci_mcasp_get_dma_type(mcasp); 2149 ret = davinci_mcasp_get_dma_type(mcasp);
2150 switch (ret) { 2150 switch (ret) {
2151 case PCM_EDMA: 2151 case PCM_EDMA:
2152#if IS_BUILTIN(CONFIG_SND_EDMA_SOC) || \ 2152#if IS_BUILTIN(CONFIG_SND_SOC_TI_EDMA_PCM) || \
2153 (IS_MODULE(CONFIG_SND_DAVINCI_SOC_MCASP) && \ 2153 (IS_MODULE(CONFIG_SND_SOC_DAVINCI_MCASP) && \
2154 IS_MODULE(CONFIG_SND_EDMA_SOC)) 2154 IS_MODULE(CONFIG_SND_SOC_TI_EDMA_PCM))
2155 ret = edma_pcm_platform_register(&pdev->dev); 2155 ret = edma_pcm_platform_register(&pdev->dev);
2156#else 2156#else
2157 dev_err(&pdev->dev, "Missing SND_EDMA_SOC\n"); 2157 dev_err(&pdev->dev, "Missing SND_EDMA_SOC\n");
@@ -2160,9 +2160,9 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
2160#endif 2160#endif
2161 break; 2161 break;
2162 case PCM_SDMA: 2162 case PCM_SDMA:
2163#if IS_BUILTIN(CONFIG_SND_SDMA_SOC) || \ 2163#if IS_BUILTIN(CONFIG_SND_SOC_TI_SDMA_PCM) || \
2164 (IS_MODULE(CONFIG_SND_DAVINCI_SOC_MCASP) && \ 2164 (IS_MODULE(CONFIG_SND_SOC_DAVINCI_MCASP) && \
2165 IS_MODULE(CONFIG_SND_SDMA_SOC)) 2165 IS_MODULE(CONFIG_SND_SOC_TI_SDMA_PCM))
2166 ret = sdma_pcm_platform_register(&pdev->dev, NULL, NULL); 2166 ret = sdma_pcm_platform_register(&pdev->dev, NULL, NULL);
2167#else 2167#else
2168 dev_err(&pdev->dev, "Missing SND_SDMA_SOC\n"); 2168 dev_err(&pdev->dev, "Missing SND_SDMA_SOC\n");
diff --git a/sound/soc/davinci/davinci-mcasp.h b/sound/soc/ti/davinci-mcasp.h
index 5e4060d8fe56..5e4060d8fe56 100644
--- a/sound/soc/davinci/davinci-mcasp.h
+++ b/sound/soc/ti/davinci-mcasp.h
diff --git a/sound/soc/davinci/davinci-vcif.c b/sound/soc/ti/davinci-vcif.c
index 5415b72393fa..5415b72393fa 100644
--- a/sound/soc/davinci/davinci-vcif.c
+++ b/sound/soc/ti/davinci-vcif.c
diff --git a/sound/soc/davinci/edma-pcm.c b/sound/soc/ti/edma-pcm.c
index 59e588abe54b..59e588abe54b 100644
--- a/sound/soc/davinci/edma-pcm.c
+++ b/sound/soc/ti/edma-pcm.c
diff --git a/sound/soc/davinci/edma-pcm.h b/sound/soc/ti/edma-pcm.h
index b0957744851c..8058bdb0f032 100644
--- a/sound/soc/davinci/edma-pcm.h
+++ b/sound/soc/ti/edma-pcm.h
@@ -20,13 +20,13 @@
20#ifndef __EDMA_PCM_H__ 20#ifndef __EDMA_PCM_H__
21#define __EDMA_PCM_H__ 21#define __EDMA_PCM_H__
22 22
23#if IS_ENABLED(CONFIG_SND_EDMA_SOC) 23#if IS_ENABLED(CONFIG_SND_SOC_TI_EDMA_PCM)
24int edma_pcm_platform_register(struct device *dev); 24int edma_pcm_platform_register(struct device *dev);
25#else 25#else
26static inline int edma_pcm_platform_register(struct device *dev) 26static inline int edma_pcm_platform_register(struct device *dev)
27{ 27{
28 return 0; 28 return 0;
29} 29}
30#endif /* CONFIG_SND_EDMA_SOC */ 30#endif /* CONFIG_SND_SOC_TI_EDMA_PCM */
31 31
32#endif /* __EDMA_PCM_H__ */ 32#endif /* __EDMA_PCM_H__ */
diff --git a/sound/soc/omap/n810.c b/sound/soc/ti/n810.c
index 9cfefe44a75f..9cfefe44a75f 100644
--- a/sound/soc/omap/n810.c
+++ b/sound/soc/ti/n810.c
diff --git a/sound/soc/omap/omap-abe-twl6040.c b/sound/soc/ti/omap-abe-twl6040.c
index fed45b41f9d3..fed45b41f9d3 100644
--- a/sound/soc/omap/omap-abe-twl6040.c
+++ b/sound/soc/ti/omap-abe-twl6040.c
diff --git a/sound/soc/omap/omap-dmic.c b/sound/soc/ti/omap-dmic.c
index cba9645b6487..cba9645b6487 100644
--- a/sound/soc/omap/omap-dmic.c
+++ b/sound/soc/ti/omap-dmic.c
diff --git a/sound/soc/omap/omap-dmic.h b/sound/soc/ti/omap-dmic.h
index 231e728bff0e..231e728bff0e 100644
--- a/sound/soc/omap/omap-dmic.h
+++ b/sound/soc/ti/omap-dmic.h
diff --git a/sound/soc/omap/omap-hdmi-audio.c b/sound/soc/ti/omap-hdmi.c
index 673a9eb153b2..673a9eb153b2 100644
--- a/sound/soc/omap/omap-hdmi-audio.c
+++ b/sound/soc/ti/omap-hdmi.c
diff --git a/sound/soc/omap/omap-mcbsp-priv.h b/sound/soc/ti/omap-mcbsp-priv.h
index 7865cda4bf0a..7865cda4bf0a 100644
--- a/sound/soc/omap/omap-mcbsp-priv.h
+++ b/sound/soc/ti/omap-mcbsp-priv.h
diff --git a/sound/soc/omap/omap-mcbsp-st.c b/sound/soc/ti/omap-mcbsp-st.c
index 1a3fe854e856..1a3fe854e856 100644
--- a/sound/soc/omap/omap-mcbsp-st.c
+++ b/sound/soc/ti/omap-mcbsp-st.c
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/ti/omap-mcbsp.c
index a395598f1f20..a395598f1f20 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/ti/omap-mcbsp.c
diff --git a/sound/soc/omap/omap-mcbsp.h b/sound/soc/ti/omap-mcbsp.h
index 7911d24898c9..7911d24898c9 100644
--- a/sound/soc/omap/omap-mcbsp.h
+++ b/sound/soc/ti/omap-mcbsp.h
diff --git a/sound/soc/omap/omap-mcpdm.c b/sound/soc/ti/omap-mcpdm.c
index 7d5bdc5a2890..7d5bdc5a2890 100644
--- a/sound/soc/omap/omap-mcpdm.c
+++ b/sound/soc/ti/omap-mcpdm.c
diff --git a/sound/soc/omap/omap-mcpdm.h b/sound/soc/ti/omap-mcpdm.h
index de8cf26595b1..de8cf26595b1 100644
--- a/sound/soc/omap/omap-mcpdm.h
+++ b/sound/soc/ti/omap-mcpdm.h
diff --git a/sound/soc/omap/omap-twl4030.c b/sound/soc/ti/omap-twl4030.c
index cccc316743fa..cccc316743fa 100644
--- a/sound/soc/omap/omap-twl4030.c
+++ b/sound/soc/ti/omap-twl4030.c
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/ti/omap3pandora.c
index 4e3de712159c..4e3de712159c 100644
--- a/sound/soc/omap/omap3pandora.c
+++ b/sound/soc/ti/omap3pandora.c
diff --git a/sound/soc/omap/osk5912.c b/sound/soc/ti/osk5912.c
index e4096779ca05..e4096779ca05 100644
--- a/sound/soc/omap/osk5912.c
+++ b/sound/soc/ti/osk5912.c
diff --git a/sound/soc/omap/rx51.c b/sound/soc/ti/rx51.c
index 57448bd5ad77..57448bd5ad77 100644
--- a/sound/soc/omap/rx51.c
+++ b/sound/soc/ti/rx51.c
diff --git a/sound/soc/omap/sdma-pcm.c b/sound/soc/ti/sdma-pcm.c
index 21a9c2499d48..21a9c2499d48 100644
--- a/sound/soc/omap/sdma-pcm.c
+++ b/sound/soc/ti/sdma-pcm.c
diff --git a/sound/soc/omap/sdma-pcm.h b/sound/soc/ti/sdma-pcm.h
index 34a7f90b2587..cb0627c8dd34 100644
--- a/sound/soc/omap/sdma-pcm.h
+++ b/sound/soc/ti/sdma-pcm.h
@@ -7,7 +7,7 @@
7#ifndef __SDMA_PCM_H__ 7#ifndef __SDMA_PCM_H__
8#define __SDMA_PCM_H__ 8#define __SDMA_PCM_H__
9 9
10#if IS_ENABLED(CONFIG_SND_SDMA_SOC) 10#if IS_ENABLED(CONFIG_SND_SOC_TI_SDMA_PCM)
11int sdma_pcm_platform_register(struct device *dev, 11int sdma_pcm_platform_register(struct device *dev,
12 char *txdmachan, char *rxdmachan); 12 char *txdmachan, char *rxdmachan);
13#else 13#else
@@ -16,6 +16,6 @@ static inline int sdma_pcm_platform_register(struct device *dev,
16{ 16{
17 return -ENODEV; 17 return -ENODEV;
18} 18}
19#endif /* CONFIG_SND_SDMA_SOC */ 19#endif /* CONFIG_SND_SOC_TI_SDMA_PCM */
20 20
21#endif /* __SDMA_PCM_H__ */ 21#endif /* __SDMA_PCM_H__ */