aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2012-05-21 17:02:57 -0400
committerStephen Warren <swarren@nvidia.com>2012-06-11 14:25:11 -0400
commitdbebe1589d3a86658f32e74396611452c5f34481 (patch)
tree8f16a09b97af19235592ca12f7a3caba75fa7f63 /arch/arm/configs
parentcfaf025112d3856637ff34a767ef785ef5cf2ca9 (diff)
ARM: tegra: defconfig updates
Enable: * SND_SOC_TEGRA_WM8753 (new feature) * TPS65910 (Cardhu regulator) * CONFIG_I2C_MUX (dependency of:) * CONFIG_I2C_MUX_PINCTRL (for Seaboard) Remove some deleted options: * MACH_KAEN * MACH_VENTANA * MACH_WARIO Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com> Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/tegra_defconfig13
1 files changed, 8 insertions, 5 deletions
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 1198dd61c7c4..4be9c1e80ee6 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -1,4 +1,6 @@
1CONFIG_EXPERIMENTAL=y 1CONFIG_EXPERIMENTAL=y
2CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y
2CONFIG_IKCONFIG=y 4CONFIG_IKCONFIG=y
3CONFIG_IKCONFIG_PROC=y 5CONFIG_IKCONFIG_PROC=y
4CONFIG_CGROUPS=y 6CONFIG_CGROUPS=y
@@ -25,14 +27,9 @@ CONFIG_ARCH_TEGRA=y
25CONFIG_ARCH_TEGRA_2x_SOC=y 27CONFIG_ARCH_TEGRA_2x_SOC=y
26CONFIG_ARCH_TEGRA_3x_SOC=y 28CONFIG_ARCH_TEGRA_3x_SOC=y
27CONFIG_MACH_HARMONY=y 29CONFIG_MACH_HARMONY=y
28CONFIG_MACH_KAEN=y
29CONFIG_MACH_PAZ00=y 30CONFIG_MACH_PAZ00=y
30CONFIG_MACH_TRIMSLICE=y 31CONFIG_MACH_TRIMSLICE=y
31CONFIG_MACH_WARIO=y
32CONFIG_MACH_VENTANA=y
33CONFIG_TEGRA_EMC_SCALING_ENABLE=y 32CONFIG_TEGRA_EMC_SCALING_ENABLE=y
34CONFIG_NO_HZ=y
35CONFIG_HIGH_RES_TIMERS=y
36CONFIG_SMP=y 33CONFIG_SMP=y
37CONFIG_PREEMPT=y 34CONFIG_PREEMPT=y
38CONFIG_AEABI=y 35CONFIG_AEABI=y
@@ -103,19 +100,24 @@ CONFIG_SERIAL_OF_PLATFORM=y
103# CONFIG_HW_RANDOM is not set 100# CONFIG_HW_RANDOM is not set
104CONFIG_I2C=y 101CONFIG_I2C=y
105# CONFIG_I2C_COMPAT is not set 102# CONFIG_I2C_COMPAT is not set
103CONFIG_I2C_MUX=y
104CONFIG_I2C_MUX_PINCTRL=y
106CONFIG_I2C_TEGRA=y 105CONFIG_I2C_TEGRA=y
107CONFIG_SPI=y 106CONFIG_SPI=y
108CONFIG_SPI_TEGRA=y 107CONFIG_SPI_TEGRA=y
108CONFIG_GPIO_TPS65910=y
109CONFIG_POWER_SUPPLY=y 109CONFIG_POWER_SUPPLY=y
110CONFIG_BATTERY_SBS=y 110CONFIG_BATTERY_SBS=y
111CONFIG_SENSORS_LM90=y 111CONFIG_SENSORS_LM90=y
112CONFIG_MFD_TPS6586X=y 112CONFIG_MFD_TPS6586X=y
113CONFIG_MFD_TPS65910=y
113CONFIG_REGULATOR=y 114CONFIG_REGULATOR=y
114CONFIG_REGULATOR_FIXED_VOLTAGE=y 115CONFIG_REGULATOR_FIXED_VOLTAGE=y
115CONFIG_REGULATOR_VIRTUAL_CONSUMER=y 116CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
116CONFIG_REGULATOR_GPIO=y 117CONFIG_REGULATOR_GPIO=y
117CONFIG_REGULATOR_TPS62360=y 118CONFIG_REGULATOR_TPS62360=y
118CONFIG_REGULATOR_TPS6586X=y 119CONFIG_REGULATOR_TPS6586X=y
120CONFIG_REGULATOR_TPS65910=y
119CONFIG_SOUND=y 121CONFIG_SOUND=y
120CONFIG_SND=y 122CONFIG_SND=y
121# CONFIG_SND_SUPPORT_OLD_API is not set 123# CONFIG_SND_SUPPORT_OLD_API is not set
@@ -126,6 +128,7 @@ CONFIG_SND=y
126# CONFIG_SND_USB is not set 128# CONFIG_SND_USB is not set
127CONFIG_SND_SOC=y 129CONFIG_SND_SOC=y
128CONFIG_SND_SOC_TEGRA=y 130CONFIG_SND_SOC_TEGRA=y
131CONFIG_SND_SOC_TEGRA_WM8753=y
129CONFIG_SND_SOC_TEGRA_WM8903=y 132CONFIG_SND_SOC_TEGRA_WM8903=y
130CONFIG_SND_SOC_TEGRA_TRIMSLICE=y 133CONFIG_SND_SOC_TEGRA_TRIMSLICE=y
131CONFIG_SND_SOC_TEGRA_ALC5632=y 134CONFIG_SND_SOC_TEGRA_ALC5632=y