]> asedeno.scripts.mit.edu Git - linux.git/commit
ASoC: ti: Merge davinci and omap directories
authorPeter Ujfalusi <peter.ujfalusi@ti.com>
Mon, 17 Dec 2018 12:21:34 +0000 (14:21 +0200)
committerMark Brown <broonie@kernel.org>
Tue, 18 Dec 2018 12:22:43 +0000 (12:22 +0000)
commitf2055e145f2975a75dace8e386fad9364828cdb4
tree447c549b6c72d4a8cedd34db1cb7b94691c21a16
parent0718f87b0df49570cdcb96179997bd372cac1742
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>
34 files changed:
sound/soc/Kconfig
sound/soc/Makefile
sound/soc/davinci/Kconfig [deleted file]
sound/soc/davinci/Makefile [deleted file]
sound/soc/omap/Kconfig [deleted file]
sound/soc/omap/Makefile [deleted file]
sound/soc/ti/Kconfig [new file with mode: 0644]
sound/soc/ti/Makefile [new file with mode: 0644]
sound/soc/ti/ams-delta.c [moved from sound/soc/omap/ams-delta.c with 100% similarity]
sound/soc/ti/davinci-evm.c [moved from sound/soc/davinci/davinci-evm.c with 99% similarity]
sound/soc/ti/davinci-i2s.c [moved from sound/soc/davinci/davinci-i2s.c with 100% similarity]
sound/soc/ti/davinci-i2s.h [moved from sound/soc/davinci/davinci-i2s.h with 100% similarity]
sound/soc/ti/davinci-mcasp.c [moved from sound/soc/davinci/davinci-mcasp.c with 99% similarity]
sound/soc/ti/davinci-mcasp.h [moved from sound/soc/davinci/davinci-mcasp.h with 100% similarity]
sound/soc/ti/davinci-vcif.c [moved from sound/soc/davinci/davinci-vcif.c with 100% similarity]
sound/soc/ti/edma-pcm.c [moved from sound/soc/davinci/edma-pcm.c with 100% similarity]
sound/soc/ti/edma-pcm.h [moved from sound/soc/davinci/edma-pcm.h with 91% similarity]
sound/soc/ti/n810.c [moved from sound/soc/omap/n810.c with 100% similarity]
sound/soc/ti/omap-abe-twl6040.c [moved from sound/soc/omap/omap-abe-twl6040.c with 100% similarity]
sound/soc/ti/omap-dmic.c [moved from sound/soc/omap/omap-dmic.c with 100% similarity]
sound/soc/ti/omap-dmic.h [moved from sound/soc/omap/omap-dmic.h with 100% similarity]
sound/soc/ti/omap-hdmi.c [moved from sound/soc/omap/omap-hdmi-audio.c with 100% similarity]
sound/soc/ti/omap-mcbsp-priv.h [moved from sound/soc/omap/omap-mcbsp-priv.h with 100% similarity]
sound/soc/ti/omap-mcbsp-st.c [moved from sound/soc/omap/omap-mcbsp-st.c with 100% similarity]
sound/soc/ti/omap-mcbsp.c [moved from sound/soc/omap/omap-mcbsp.c with 100% similarity]
sound/soc/ti/omap-mcbsp.h [moved from sound/soc/omap/omap-mcbsp.h with 100% similarity]
sound/soc/ti/omap-mcpdm.c [moved from sound/soc/omap/omap-mcpdm.c with 100% similarity]
sound/soc/ti/omap-mcpdm.h [moved from sound/soc/omap/omap-mcpdm.h with 100% similarity]
sound/soc/ti/omap-twl4030.c [moved from sound/soc/omap/omap-twl4030.c with 100% similarity]
sound/soc/ti/omap3pandora.c [moved from sound/soc/omap/omap3pandora.c with 100% similarity]
sound/soc/ti/osk5912.c [moved from sound/soc/omap/osk5912.c with 100% similarity]
sound/soc/ti/rx51.c [moved from sound/soc/omap/rx51.c with 100% similarity]
sound/soc/ti/sdma-pcm.c [moved from sound/soc/omap/sdma-pcm.c with 100% similarity]
sound/soc/ti/sdma-pcm.h [moved from sound/soc/omap/sdma-pcm.h with 85% similarity]