Unverified Commit f2055e14 authored by Peter Ujfalusi's avatar Peter Ujfalusi Committed by Mark Brown
Browse files

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: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
For sound/soc/{omap => ti}:
Tested-by: default avatarJarkko Nikula <jarkko.nikula@bitmer.com>
Acked-by: default avatarJarkko Nikula <jarkko.nikula@bitmer.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0718f87b

sound/soc/Kconfig

+1 −2
Original line number Diff line number Diff line
@@ -46,13 +46,11 @@ source "sound/soc/atmel/Kconfig" 
source "sound/soc/au1x/Kconfig"

source "sound/soc/bcm/Kconfig"

source "sound/soc/cirrus/Kconfig"

source "sound/soc/davinci/Kconfig"

source "sound/soc/dwc/Kconfig"

source "sound/soc/fsl/Kconfig"

source "sound/soc/hisilicon/Kconfig"

source "sound/soc/jz4740/Kconfig"

source "sound/soc/nuc900/Kconfig"

source "sound/soc/omap/Kconfig"

source "sound/soc/kirkwood/Kconfig"

source "sound/soc/img/Kconfig"

source "sound/soc/intel/Kconfig"
@@ -70,6 +68,7 @@ source "sound/soc/sti/Kconfig" 
source "sound/soc/stm/Kconfig"

source "sound/soc/sunxi/Kconfig"

source "sound/soc/tegra/Kconfig"

source "sound/soc/ti/Kconfig"

source "sound/soc/txx9/Kconfig"

source "sound/soc/uniphier/Kconfig"

source "sound/soc/ux500/Kconfig"

sound/soc/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ obj-$(CONFIG_SND_SOC) += atmel/ 
obj-$(CONFIG_SND_SOC)	+= au1x/

obj-$(CONFIG_SND_SOC)	+= bcm/

obj-$(CONFIG_SND_SOC)	+= cirrus/

obj-$(CONFIG_SND_SOC)	+= davinci/

obj-$(CONFIG_SND_SOC)	+= dwc/

obj-$(CONFIG_SND_SOC)	+= fsl/

obj-$(CONFIG_SND_SOC)	+= hisilicon/
@@ -41,7 +40,6 @@ obj-$(CONFIG_SND_SOC) += mediatek/ 
obj-$(CONFIG_SND_SOC)	+= meson/

obj-$(CONFIG_SND_SOC)	+= mxs/

obj-$(CONFIG_SND_SOC)	+= nuc900/

obj-$(CONFIG_SND_SOC)	+= omap/

obj-$(CONFIG_SND_SOC)	+= kirkwood/

obj-$(CONFIG_SND_SOC)	+= pxa/

obj-$(CONFIG_SND_SOC)	+= qcom/
@@ -54,6 +52,7 @@ obj-$(CONFIG_SND_SOC) += sti/ 
obj-$(CONFIG_SND_SOC)	+= stm/

obj-$(CONFIG_SND_SOC)	+= sunxi/

obj-$(CONFIG_SND_SOC)	+= tegra/

obj-$(CONFIG_SND_SOC)	+= ti/

obj-$(CONFIG_SND_SOC)	+= txx9/

obj-$(CONFIG_SND_SOC)	+= uniphier/

obj-$(CONFIG_SND_SOC)	+= ux500/

sound/soc/davinci/Kconfig

deleted100644 → 0
+0 −106
Original line number Diff line number Diff line 
config SND_DAVINCI_SOC

	tristate

	depends on ARCH_DAVINCI

	select SND_EDMA_SOC



config SND_EDMA_SOC

	tristate "SoC Audio for Texas Instruments chips using eDMA"

	depends on TI_EDMA

	select SND_SOC_GENERIC_DMAENGINE_PCM

	help

	  Say Y or M here if you want audio support for TI SoC which uses eDMA.

	  The following line of SoCs are supported by this platform driver:

	  - daVinci devices

	  - AM335x

	  - AM437x/AM438x

	  - DRA7xx family



config SND_DAVINCI_SOC_I2S

	tristate "DaVinci Multichannel Buffered Serial Port (McBSP) support"

	depends on SND_EDMA_SOC

	help

	  Say Y or M here if you want to have support for McBSP IP found in

	  Texas Instruments DaVinci DA850 SoCs.



config SND_DAVINCI_SOC_MCASP

	tristate "Multichannel Audio Serial Port (McASP) support"

	depends on SND_SDMA_SOC || SND_EDMA_SOC

	help

	  Say Y or M here if you want to have support for McASP IP found in

	  various Texas Instruments SoCs like:

	  - daVinci devices

	  - Sitara line of SoCs (AM335x, AM438x, etc)

	  - DRA7x devices



config SND_DAVINCI_SOC_VCIF

	tristate



config SND_DAVINCI_SOC_GENERIC_EVM

	tristate

	select SND_SOC_TLV320AIC3X

	select SND_DAVINCI_SOC_MCASP



config SND_AM33XX_SOC_EVM

	tristate "SoC Audio for the AM33XX chip based boards"

	depends on SND_EDMA_SOC && SOC_AM33XX && I2C

	select SND_DAVINCI_SOC_GENERIC_EVM

	help

	  Say Y or M if you want to add support for SoC audio on AM33XX

	  boards using McASP and TLV320AIC3X codec. For example AM335X-EVM,

	  AM335X-EVMSK, and BeagelBone with AudioCape boards have this

	  setup.



config SND_DAVINCI_SOC_EVM

	tristate "SoC Audio support for DaVinci DM6446, DM355 or DM365 EVM"

	depends on SND_EDMA_SOC && I2C

	depends on MACH_DAVINCI_EVM || MACH_DAVINCI_DM355_EVM || MACH_DAVINCI_DM365_EVM

	select SND_DAVINCI_SOC_GENERIC_EVM

	help

	  Say Y if you want to add support for SoC audio on TI

	  DaVinci DM6446, DM355 or DM365 EVM platforms.



choice

	prompt "DM365 codec select"

	depends on SND_DAVINCI_SOC_EVM

	depends on MACH_DAVINCI_DM365_EVM



config SND_DM365_AIC3X_CODEC

	tristate "Audio Codec - AIC3101"

	help

	  Say Y if you want to add support for AIC3101 audio codec



config SND_DM365_VOICE_CODEC

	tristate "Voice Codec - CQ93VC"

	select MFD_DAVINCI_VOICECODEC

	select SND_DAVINCI_SOC_VCIF

	select SND_SOC_CQ0093VC

	help

	  Say Y if you want to add support for SoC On-chip voice codec

endchoice



config  SND_DM6467_SOC_EVM

	tristate "SoC Audio support for DaVinci DM6467 EVM"

	depends on SND_EDMA_SOC && MACH_DAVINCI_DM6467_EVM && I2C

	select SND_DAVINCI_SOC_GENERIC_EVM

	select SND_SOC_SPDIF



	help

	  Say Y if you want to add support for SoC audio on TI



config  SND_DA830_SOC_EVM

	tristate "SoC Audio support for DA830/OMAP-L137 EVM"

	depends on SND_EDMA_SOC && MACH_DAVINCI_DA830_EVM && I2C

	select SND_DAVINCI_SOC_GENERIC_EVM



	help

	  Say Y if you want to add support for SoC audio on TI

	  DA830/OMAP-L137 EVM



config  SND_DA850_SOC_EVM

	tristate "SoC Audio support for DA850/OMAP-L138 EVM"

	depends on SND_EDMA_SOC && MACH_DAVINCI_DA850_EVM && I2C

	select SND_DAVINCI_SOC_GENERIC_EVM

	help

	  Say Y if you want to add support for SoC audio on TI

	  DA850/OMAP-L138 EVM

sound/soc/davinci/Makefile

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

# DAVINCI Platform Support

snd-soc-edma-objs := edma-pcm.o

snd-soc-davinci-i2s-objs := davinci-i2s.o

snd-soc-davinci-mcasp-objs:= davinci-mcasp.o

snd-soc-davinci-vcif-objs:= davinci-vcif.o



obj-$(CONFIG_SND_EDMA_SOC) += snd-soc-edma.o

obj-$(CONFIG_SND_DAVINCI_SOC_I2S) += snd-soc-davinci-i2s.o

obj-$(CONFIG_SND_DAVINCI_SOC_MCASP) += snd-soc-davinci-mcasp.o

obj-$(CONFIG_SND_DAVINCI_SOC_VCIF) += snd-soc-davinci-vcif.o



# Generic DAVINCI/AM33xx Machine Support

snd-soc-evm-objs := davinci-evm.o



obj-$(CONFIG_SND_DAVINCI_SOC_GENERIC_EVM) += snd-soc-evm.o

sound/soc/omap/Kconfig

deleted100644 → 0
+0 −120
Original line number Diff line number Diff line 
config SND_OMAP_SOC

	tristate "SoC Audio for Texas Instruments OMAP chips (deprecated)"

	depends on (ARCH_OMAP && DMA_OMAP) || (ARM && COMPILE_TEST)

	select SND_SDMA_SOC



config SND_SDMA_SOC

	tristate "SoC Audio for Texas Instruments chips using sDMA"

	depends on DMA_OMAP || COMPILE_TEST

	select SND_SOC_GENERIC_DMAENGINE_PCM



config SND_OMAP_SOC_DMIC

	tristate



config SND_OMAP_SOC_MCBSP

	tristate



config SND_OMAP_SOC_MCPDM

	tristate



config SND_OMAP_SOC_HDMI_AUDIO

	tristate "HDMI audio support for OMAP4+ based SoCs"

	depends on SND_SDMA_SOC

	help

	  For HDMI audio to work OMAPDSS HDMI support should be

	  enabled.

	  The hdmi audio driver implements cpu-dai component using the

	  callbacks provided by OMAPDSS and registers the component

	  under DSS HDMI device. Omap-pcm is registered for platform

	  component also under DSS HDMI device. Dummy codec is used as

	  as codec component. The hdmi audio driver implements also

	  the card and registers it under its own platform device.

	  The device for the driver is registered by OMAPDSS hdmi

	  driver.



config SND_OMAP_SOC_N810

	tristate "SoC Audio support for Nokia N810"

	depends on SND_SDMA_SOC && MACH_NOKIA_N810 && I2C

	select SND_OMAP_SOC_MCBSP

	select SND_SOC_TLV320AIC3X

	help

	  Say Y if you want to add support for SoC audio on Nokia N810.



config SND_OMAP_SOC_RX51

	tristate "SoC Audio support for Nokia N900 (RX-51)"

	depends on SND_SDMA_SOC && ARM && I2C

	select SND_OMAP_SOC_MCBSP

	select SND_SOC_TLV320AIC3X

	select SND_SOC_TPA6130A2

	depends on GPIOLIB

	help

	  Say Y if you want to add support for SoC audio on Nokia N900

	  cellphone.



config SND_OMAP_SOC_AMS_DELTA

	tristate "SoC Audio support for Amstrad E3 (Delta) videophone"

	depends on SND_SDMA_SOC && MACH_AMS_DELTA && TTY

	select SND_OMAP_SOC_MCBSP

	select SND_SOC_CX20442

	help

	  Say Y  if you want to add support  for SoC audio device  connected to

	  a handset and a speakerphone found on Amstrad E3 (Delta) videophone.



	  Note that in order to get those devices fully supported,  you have to

	  build  the kernel  with  standard  serial port  driver  included  and

	  configured for at least 4 ports.  Then, from userspace, you must load

	  a line discipline #19 on the modem (ttyS3) serial line.  The simplest

	  way to achieve this is to install util-linux-ng  and use the included

	  ldattach  utility.  This  can be  started  automatically  from  udev,

	  a simple rule like this one should do the trick (it does for me):

	  	ACTION=="add", KERNEL=="controlC0", \

				RUN+="/usr/sbin/ldattach 19 /dev/ttyS3"



config SND_OMAP_SOC_OSK5912

	tristate "SoC Audio support for omap osk5912"

	depends on SND_SDMA_SOC && MACH_OMAP_OSK && I2C

	select SND_OMAP_SOC_MCBSP

	select SND_SOC_TLV320AIC23_I2C

	help

	  Say Y if you want to add support for SoC audio on osk5912.



config SND_OMAP_SOC_OMAP_TWL4030

	tristate "SoC Audio support for TI SoC based boards with twl4030 codec"

	depends on TWL4030_CORE && SND_SDMA_SOC

	select SND_OMAP_SOC_MCBSP

	select SND_SOC_TWL4030

	help

	  Say Y if you want to add support for SoC audio on TI SoC based boards

	  using twl4030 as c codec. This driver currently supports:

	  - Beagleboard or Devkit8000

	  - Gumstix Overo or CompuLab CM-T35/CM-T3730

	  - IGEP v2

	  - OMAP3EVM

	  - SDP3430

	  - Zoom2



config SND_OMAP_SOC_OMAP_ABE_TWL6040

	tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec"

	depends on TWL6040_CORE && SND_SDMA_SOC && COMMON_CLK

	depends on ARCH_OMAP4 || (SOC_OMAP5 && MFD_PALMAS) || COMPILE_TEST

	select SND_OMAP_SOC_DMIC

	select SND_OMAP_SOC_MCPDM

	select SND_SOC_TWL6040

	select SND_SOC_DMIC

	select COMMON_CLK_PALMAS if (SOC_OMAP5 && MFD_PALMAS)

	select CLK_TWL6040

	help

	  Say Y if you want to add support for SoC audio on OMAP boards using

	  ABE and twl6040 codec. This driver currently supports:

	  - SDP4430/Blaze boards

	  - PandaBoard (4430)

	  - PandaBoardES (4460)

	  - omap5-uevm (5432)



config SND_OMAP_SOC_OMAP3_PANDORA

	tristate "SoC Audio support for OMAP3 Pandora"

	depends on TWL4030_CORE && SND_SDMA_SOC && MACH_OMAP3_PANDORA

	select SND_OMAP_SOC_MCBSP

	select SND_SOC_TWL4030

	help

	  Say Y if you want to add support for SoC audio on the OMAP3 Pandora.

CRA Git | Maintained and supported by SUSTech CRA and CCSE