diff options
author | Stephen Warren <swarren@nvidia.com> | 2012-05-21 17:02:57 -0400 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2012-06-11 14:25:11 -0400 |
commit | dbebe1589d3a86658f32e74396611452c5f34481 (patch) | |
tree | 8f16a09b97af19235592ca12f7a3caba75fa7f63 /arch/arm/configs | |
parent | cfaf025112d3856637ff34a767ef785ef5cf2ca9 (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_defconfig | 13 |
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 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | 1 | CONFIG_EXPERIMENTAL=y |
2 | CONFIG_NO_HZ=y | ||
3 | CONFIG_HIGH_RES_TIMERS=y | ||
2 | CONFIG_IKCONFIG=y | 4 | CONFIG_IKCONFIG=y |
3 | CONFIG_IKCONFIG_PROC=y | 5 | CONFIG_IKCONFIG_PROC=y |
4 | CONFIG_CGROUPS=y | 6 | CONFIG_CGROUPS=y |
@@ -25,14 +27,9 @@ CONFIG_ARCH_TEGRA=y | |||
25 | CONFIG_ARCH_TEGRA_2x_SOC=y | 27 | CONFIG_ARCH_TEGRA_2x_SOC=y |
26 | CONFIG_ARCH_TEGRA_3x_SOC=y | 28 | CONFIG_ARCH_TEGRA_3x_SOC=y |
27 | CONFIG_MACH_HARMONY=y | 29 | CONFIG_MACH_HARMONY=y |
28 | CONFIG_MACH_KAEN=y | ||
29 | CONFIG_MACH_PAZ00=y | 30 | CONFIG_MACH_PAZ00=y |
30 | CONFIG_MACH_TRIMSLICE=y | 31 | CONFIG_MACH_TRIMSLICE=y |
31 | CONFIG_MACH_WARIO=y | ||
32 | CONFIG_MACH_VENTANA=y | ||
33 | CONFIG_TEGRA_EMC_SCALING_ENABLE=y | 32 | CONFIG_TEGRA_EMC_SCALING_ENABLE=y |
34 | CONFIG_NO_HZ=y | ||
35 | CONFIG_HIGH_RES_TIMERS=y | ||
36 | CONFIG_SMP=y | 33 | CONFIG_SMP=y |
37 | CONFIG_PREEMPT=y | 34 | CONFIG_PREEMPT=y |
38 | CONFIG_AEABI=y | 35 | CONFIG_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 |
104 | CONFIG_I2C=y | 101 | CONFIG_I2C=y |
105 | # CONFIG_I2C_COMPAT is not set | 102 | # CONFIG_I2C_COMPAT is not set |
103 | CONFIG_I2C_MUX=y | ||
104 | CONFIG_I2C_MUX_PINCTRL=y | ||
106 | CONFIG_I2C_TEGRA=y | 105 | CONFIG_I2C_TEGRA=y |
107 | CONFIG_SPI=y | 106 | CONFIG_SPI=y |
108 | CONFIG_SPI_TEGRA=y | 107 | CONFIG_SPI_TEGRA=y |
108 | CONFIG_GPIO_TPS65910=y | ||
109 | CONFIG_POWER_SUPPLY=y | 109 | CONFIG_POWER_SUPPLY=y |
110 | CONFIG_BATTERY_SBS=y | 110 | CONFIG_BATTERY_SBS=y |
111 | CONFIG_SENSORS_LM90=y | 111 | CONFIG_SENSORS_LM90=y |
112 | CONFIG_MFD_TPS6586X=y | 112 | CONFIG_MFD_TPS6586X=y |
113 | CONFIG_MFD_TPS65910=y | ||
113 | CONFIG_REGULATOR=y | 114 | CONFIG_REGULATOR=y |
114 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | 115 | CONFIG_REGULATOR_FIXED_VOLTAGE=y |
115 | CONFIG_REGULATOR_VIRTUAL_CONSUMER=y | 116 | CONFIG_REGULATOR_VIRTUAL_CONSUMER=y |
116 | CONFIG_REGULATOR_GPIO=y | 117 | CONFIG_REGULATOR_GPIO=y |
117 | CONFIG_REGULATOR_TPS62360=y | 118 | CONFIG_REGULATOR_TPS62360=y |
118 | CONFIG_REGULATOR_TPS6586X=y | 119 | CONFIG_REGULATOR_TPS6586X=y |
120 | CONFIG_REGULATOR_TPS65910=y | ||
119 | CONFIG_SOUND=y | 121 | CONFIG_SOUND=y |
120 | CONFIG_SND=y | 122 | CONFIG_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 |
127 | CONFIG_SND_SOC=y | 129 | CONFIG_SND_SOC=y |
128 | CONFIG_SND_SOC_TEGRA=y | 130 | CONFIG_SND_SOC_TEGRA=y |
131 | CONFIG_SND_SOC_TEGRA_WM8753=y | ||
129 | CONFIG_SND_SOC_TEGRA_WM8903=y | 132 | CONFIG_SND_SOC_TEGRA_WM8903=y |
130 | CONFIG_SND_SOC_TEGRA_TRIMSLICE=y | 133 | CONFIG_SND_SOC_TEGRA_TRIMSLICE=y |
131 | CONFIG_SND_SOC_TEGRA_ALC5632=y | 134 | CONFIG_SND_SOC_TEGRA_ALC5632=y |