diff options
| author | Peter Ujfalusi <peter.ujfalusi@ti.com> | 2012-04-03 04:56:51 -0400 |
|---|---|---|
| committer | Samuel Ortiz <sameo@linux.intel.com> | 2012-04-16 10:45:34 -0400 |
| commit | 8eaeb9393397be8eb700ab38a69c450975463b77 (patch) | |
| tree | 1f6b9d8d8197b16c19ed0ed03d55886e0c519ba5 /sound/soc/omap/Kconfig | |
| parent | 4accdff7a3e397b43e50f605ee561ba7994745c7 (diff) | |
mfd: Convert twl6040 to i2c driver, and separate it from twl core
Complete the separation of the twl6040 from the twl core since
it is a separate chip, not part of the twl6030 PMIC.
Make the needed Kconfig changes for the depending drivers at the
same time to avoid breaking the kernel build (vibra, ASoC components).
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Reviewed-by: Mark Brown <broonie@opensource.wolfsonicro.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Dmitry Torokhov <dtor@mail.ru>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Diffstat (limited to 'sound/soc/omap/Kconfig')
| -rw-r--r-- | sound/soc/omap/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index e00dd0b1139c..deafbfaacdbf 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig | |||
| @@ -97,7 +97,7 @@ config SND_OMAP_SOC_SDP3430 | |||
| 97 | 97 | ||
| 98 | config SND_OMAP_SOC_OMAP_ABE_TWL6040 | 98 | config SND_OMAP_SOC_OMAP_ABE_TWL6040 |
| 99 | tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec" | 99 | tristate "SoC Audio support for OMAP boards using ABE and twl6040 codec" |
| 100 | depends on TWL4030_CORE && SND_OMAP_SOC && ARCH_OMAP4 | 100 | depends on TWL6040_CORE && SND_OMAP_SOC && ARCH_OMAP4 |
| 101 | select SND_OMAP_SOC_DMIC | 101 | select SND_OMAP_SOC_DMIC |
| 102 | select SND_OMAP_SOC_MCPDM | 102 | select SND_OMAP_SOC_MCPDM |
| 103 | select SND_SOC_TWL6040 | 103 | select SND_SOC_TWL6040 |