diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2011-12-07 08:38:38 -0500 |
|---|---|---|
| committer | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-01-26 08:38:47 -0500 |
| commit | e15422edd463fbba7f38ffd8a2e2ca8564da1160 (patch) | |
| tree | 69be91bd1e8f967aa952190c5d87697c59654c3e /sound/soc/omap | |
| parent | 8747a6b7d5685ebb64f1ec4d58d9b1969df3e34d (diff) | |
ASoC: OMAP4: Rename the sdp4430 machine driver
The same machine driver will support other boards
with similar audio configuration (OMAP4, ABE, twl6040).
Rename the driver to have more generic name.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/omap')
| -rw-r--r-- | sound/soc/omap/Kconfig | 2 | ||||
| -rw-r--r-- | sound/soc/omap/Makefile | 4 | ||||
| -rw-r--r-- | sound/soc/omap/omap-abe-twl6040.c (renamed from sound/soc/omap/sdp4430.c) | 0 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index fb1bf2581ef..4eae92987fe 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig | |||
| @@ -97,7 +97,7 @@ config SND_OMAP_SOC_SDP3430 | |||
| 97 | Say Y if you want to add support for SoC audio on Texas Instruments | 97 | Say Y if you want to add support for SoC audio on Texas Instruments |
| 98 | SDP3430. | 98 | SDP3430. |
| 99 | 99 | ||
| 100 | config SND_OMAP_SOC_SDP4430 | 100 | config SND_OMAP_SOC_OMAP_ABE_TWL6040 |
| 101 | tristate "SoC Audio support for Texas Instruments SDP4430" | 101 | tristate "SoC Audio support for Texas Instruments SDP4430" |
| 102 | depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP_4430SDP | 102 | depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP_4430SDP |
| 103 | select SND_OMAP_SOC_DMIC | 103 | select SND_OMAP_SOC_DMIC |
diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile index 1fd723fb559..123ac18303e 100644 --- a/sound/soc/omap/Makefile +++ b/sound/soc/omap/Makefile | |||
| @@ -20,7 +20,7 @@ snd-soc-overo-objs := overo.o | |||
| 20 | snd-soc-omap3evm-objs := omap3evm.o | 20 | snd-soc-omap3evm-objs := omap3evm.o |
| 21 | snd-soc-am3517evm-objs := am3517evm.o | 21 | snd-soc-am3517evm-objs := am3517evm.o |
| 22 | snd-soc-sdp3430-objs := sdp3430.o | 22 | snd-soc-sdp3430-objs := sdp3430.o |
| 23 | snd-soc-sdp4430-objs := sdp4430.o | 23 | snd-soc-omap-abe-twl6040-objs := omap-abe-twl6040.o |
| 24 | snd-soc-omap3pandora-objs := omap3pandora.o | 24 | snd-soc-omap3pandora-objs := omap3pandora.o |
| 25 | snd-soc-omap3beagle-objs := omap3beagle.o | 25 | snd-soc-omap3beagle-objs := omap3beagle.o |
| 26 | snd-soc-zoom2-objs := zoom2.o | 26 | snd-soc-zoom2-objs := zoom2.o |
| @@ -36,7 +36,7 @@ obj-$(CONFIG_SND_OMAP_SOC_OMAP2EVM) += snd-soc-omap2evm.o | |||
| 36 | obj-$(CONFIG_SND_OMAP_SOC_OMAP3EVM) += snd-soc-omap3evm.o | 36 | obj-$(CONFIG_SND_OMAP_SOC_OMAP3EVM) += snd-soc-omap3evm.o |
| 37 | obj-$(CONFIG_SND_OMAP_SOC_AM3517EVM) += snd-soc-am3517evm.o | 37 | obj-$(CONFIG_SND_OMAP_SOC_AM3517EVM) += snd-soc-am3517evm.o |
| 38 | obj-$(CONFIG_SND_OMAP_SOC_SDP3430) += snd-soc-sdp3430.o | 38 | obj-$(CONFIG_SND_OMAP_SOC_SDP3430) += snd-soc-sdp3430.o |
| 39 | obj-$(CONFIG_SND_OMAP_SOC_SDP4430) += snd-soc-sdp4430.o | 39 | obj-$(CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040) += snd-soc-omap-abe-twl6040.o |
| 40 | obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o | 40 | obj-$(CONFIG_SND_OMAP_SOC_OMAP3_PANDORA) += snd-soc-omap3pandora.o |
| 41 | obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o | 41 | obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o |
| 42 | obj-$(CONFIG_SND_OMAP_SOC_ZOOM2) += snd-soc-zoom2.o | 42 | obj-$(CONFIG_SND_OMAP_SOC_ZOOM2) += snd-soc-zoom2.o |
diff --git a/sound/soc/omap/sdp4430.c b/sound/soc/omap/omap-abe-twl6040.c index ceadb137bf4..ceadb137bf4 100644 --- a/sound/soc/omap/sdp4430.c +++ b/sound/soc/omap/omap-abe-twl6040.c | |||