aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@ti.com>2013-05-08 19:48:02 -0400
committerTony Lindgren <tony@atomide.com>2013-05-08 20:07:40 -0400
commit827897c05c3da95dcd0ae44549563525a3554e00 (patch)
treeda7685171fb47d5fb55f21cf783edba07f66aade /arch/arm
parentd240ef3056528785a28ad9b3e5013205b06e7d03 (diff)
ARM: OMAP4+: omap2plus_defconfig: Enable audio via TWL6040 as module
Boards supported upstream all use TWL6040 as audio codec, enable the common ASoC machine driver by default for them. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Tested-by: Jyri Sarha <jsarha@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/omap2plus_defconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index 33903ca0d879..3838ce0f13f7 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -153,6 +153,7 @@ CONFIG_OMAP_WATCHDOG=y
153CONFIG_TWL4030_WATCHDOG=y 153CONFIG_TWL4030_WATCHDOG=y
154CONFIG_MFD_TPS65217=y 154CONFIG_MFD_TPS65217=y
155CONFIG_MFD_TPS65910=y 155CONFIG_MFD_TPS65910=y
156CONFIG_TWL6040_CORE=y
156CONFIG_REGULATOR_TWL4030=y 157CONFIG_REGULATOR_TWL4030=y
157CONFIG_REGULATOR_TPS65023=y 158CONFIG_REGULATOR_TPS65023=y
158CONFIG_REGULATOR_TPS6507X=y 159CONFIG_REGULATOR_TPS6507X=y
@@ -195,6 +196,7 @@ CONFIG_SND_USB_AUDIO=m
195CONFIG_SND_SOC=m 196CONFIG_SND_SOC=m
196CONFIG_SND_OMAP_SOC=m 197CONFIG_SND_OMAP_SOC=m
197CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m 198CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
199CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
198CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m 200CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
199CONFIG_USB=y 201CONFIG_USB=y
200CONFIG_USB_DEBUG=y 202CONFIG_USB_DEBUG=y