diff options
author | Stephen Warren <swarren@nvidia.com> | 2013-03-21 09:47:43 -0400 |
---|---|---|
committer | Stephen Warren <swarren@nvidia.com> | 2013-04-03 16:35:55 -0400 |
commit | e1eee65f1a0cce8e49624104b3497ba3f8d35199 (patch) | |
tree | 6c443c9722ad5f991a37de39be978130a83c2e04 /arch | |
parent | 6dbe51c251a327e012439c4772097a13df43c5b8 (diff) |
ARM: tegra: defconfig updates
Update tegra_defconfig to:
* Enable CONFIG_ARCH_TEGRA_114_SOC.
* Enable various PMIC and related options for Tegra114 platforms Dalmore
and pluto: Palmas, TPS51362, TPS65090.
* Enable KEYBOARD_GPIO, mainly as a suspend wakeup source.
* Rebuild tegra_defconfig based on v3.9-rc1, hence picking up various
move/remove changes, and removing some entries for now-default or
selected options.
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/configs/tegra_defconfig | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig index aba4881d20e5..a5f0485133cf 100644 --- a/arch/arm/configs/tegra_defconfig +++ b/arch/arm/configs/tegra_defconfig | |||
@@ -1,4 +1,3 @@ | |||
1 | CONFIG_EXPERIMENTAL=y | ||
2 | CONFIG_NO_HZ=y | 1 | CONFIG_NO_HZ=y |
3 | CONFIG_HIGH_RES_TIMERS=y | 2 | CONFIG_HIGH_RES_TIMERS=y |
4 | CONFIG_IKCONFIG=y | 3 | CONFIG_IKCONFIG=y |
@@ -20,15 +19,14 @@ CONFIG_MODULE_UNLOAD=y | |||
20 | CONFIG_MODULE_FORCE_UNLOAD=y | 19 | CONFIG_MODULE_FORCE_UNLOAD=y |
21 | # CONFIG_BLK_DEV_BSG is not set | 20 | # CONFIG_BLK_DEV_BSG is not set |
22 | CONFIG_PARTITION_ADVANCED=y | 21 | CONFIG_PARTITION_ADVANCED=y |
23 | CONFIG_EFI_PARTITION=y | ||
24 | # CONFIG_IOSCHED_DEADLINE is not set | 22 | # CONFIG_IOSCHED_DEADLINE is not set |
25 | # CONFIG_IOSCHED_CFQ is not set | 23 | # CONFIG_IOSCHED_CFQ is not set |
26 | CONFIG_ARCH_TEGRA=y | 24 | CONFIG_ARCH_TEGRA=y |
27 | CONFIG_GPIO_PCA953X=y | 25 | CONFIG_GPIO_PCA953X=y |
28 | CONFIG_ARCH_TEGRA_2x_SOC=y | 26 | CONFIG_ARCH_TEGRA_2x_SOC=y |
29 | CONFIG_ARCH_TEGRA_3x_SOC=y | 27 | CONFIG_ARCH_TEGRA_3x_SOC=y |
28 | CONFIG_ARCH_TEGRA_114_SOC=y | ||
30 | CONFIG_TEGRA_PCI=y | 29 | CONFIG_TEGRA_PCI=y |
31 | CONFIG_TEGRA_DEBUG_UART_AUTO_ODMDATA=y | ||
32 | CONFIG_TEGRA_EMC_SCALING_ENABLE=y | 30 | CONFIG_TEGRA_EMC_SCALING_ENABLE=y |
33 | CONFIG_SMP=y | 31 | CONFIG_SMP=y |
34 | CONFIG_PREEMPT=y | 32 | CONFIG_PREEMPT=y |
@@ -37,8 +35,8 @@ CONFIG_AEABI=y | |||
37 | CONFIG_HIGHMEM=y | 35 | CONFIG_HIGHMEM=y |
38 | CONFIG_ZBOOT_ROM_TEXT=0x0 | 36 | CONFIG_ZBOOT_ROM_TEXT=0x0 |
39 | CONFIG_ZBOOT_ROM_BSS=0x0 | 37 | CONFIG_ZBOOT_ROM_BSS=0x0 |
40 | CONFIG_AUTO_ZRELADDR=y | ||
41 | CONFIG_KEXEC=y | 38 | CONFIG_KEXEC=y |
39 | CONFIG_AUTO_ZRELADDR=y | ||
42 | CONFIG_CPU_FREQ=y | 40 | CONFIG_CPU_FREQ=y |
43 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y | 41 | CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y |
44 | CONFIG_CPU_IDLE=y | 42 | CONFIG_CPU_IDLE=y |
@@ -108,6 +106,7 @@ CONFIG_RT2X00=y | |||
108 | CONFIG_RT2800USB=m | 106 | CONFIG_RT2800USB=m |
109 | CONFIG_INPUT_EVDEV=y | 107 | CONFIG_INPUT_EVDEV=y |
110 | CONFIG_KEYBOARD_TEGRA=y | 108 | CONFIG_KEYBOARD_TEGRA=y |
109 | CONFIG_KEYBOARD_GPIO=y | ||
111 | CONFIG_INPUT_MISC=y | 110 | CONFIG_INPUT_MISC=y |
112 | CONFIG_INPUT_MPU3050=y | 111 | CONFIG_INPUT_MPU3050=y |
113 | # CONFIG_LEGACY_PTYS is not set | 112 | # CONFIG_LEGACY_PTYS is not set |
@@ -117,7 +116,6 @@ CONFIG_SERIAL_8250_CONSOLE=y | |||
117 | CONFIG_SERIAL_TEGRA=y | 116 | CONFIG_SERIAL_TEGRA=y |
118 | CONFIG_SERIAL_OF_PLATFORM=y | 117 | CONFIG_SERIAL_OF_PLATFORM=y |
119 | # CONFIG_HW_RANDOM is not set | 118 | # CONFIG_HW_RANDOM is not set |
120 | CONFIG_I2C=y | ||
121 | # CONFIG_I2C_COMPAT is not set | 119 | # CONFIG_I2C_COMPAT is not set |
122 | CONFIG_I2C_MUX=y | 120 | CONFIG_I2C_MUX=y |
123 | CONFIG_I2C_MUX_PINCTRL=y | 121 | CONFIG_I2C_MUX_PINCTRL=y |
@@ -126,6 +124,7 @@ CONFIG_SPI=y | |||
126 | CONFIG_SPI_TEGRA20_SFLASH=y | 124 | CONFIG_SPI_TEGRA20_SFLASH=y |
127 | CONFIG_SPI_TEGRA20_SLINK=y | 125 | CONFIG_SPI_TEGRA20_SLINK=y |
128 | CONFIG_GPIO_PCA953X_IRQ=y | 126 | CONFIG_GPIO_PCA953X_IRQ=y |
127 | CONFIG_GPIO_PALMAS=y | ||
129 | CONFIG_GPIO_TPS6586X=y | 128 | CONFIG_GPIO_TPS6586X=y |
130 | CONFIG_GPIO_TPS65910=y | 129 | CONFIG_GPIO_TPS65910=y |
131 | CONFIG_POWER_SUPPLY=y | 130 | CONFIG_POWER_SUPPLY=y |
@@ -136,12 +135,17 @@ CONFIG_SENSORS_LM90=y | |||
136 | CONFIG_MFD_TPS6586X=y | 135 | CONFIG_MFD_TPS6586X=y |
137 | CONFIG_MFD_TPS65910=y | 136 | CONFIG_MFD_TPS65910=y |
138 | CONFIG_MFD_MAX8907=y | 137 | CONFIG_MFD_MAX8907=y |
138 | CONFIG_MFD_TPS65090=y | ||
139 | CONFIG_MFD_PALMAS=y | ||
139 | CONFIG_REGULATOR=y | 140 | CONFIG_REGULATOR=y |
140 | CONFIG_REGULATOR_FIXED_VOLTAGE=y | 141 | CONFIG_REGULATOR_FIXED_VOLTAGE=y |
141 | CONFIG_REGULATOR_VIRTUAL_CONSUMER=y | 142 | CONFIG_REGULATOR_VIRTUAL_CONSUMER=y |
142 | CONFIG_REGULATOR_GPIO=y | 143 | CONFIG_REGULATOR_GPIO=y |
143 | CONFIG_REGULATOR_MAX8907=y | 144 | CONFIG_REGULATOR_MAX8907=y |
145 | CONFIG_REGULATOR_PALMAS=y | ||
146 | CONFIG_REGULATOR_TPS51632=y | ||
144 | CONFIG_REGULATOR_TPS62360=y | 147 | CONFIG_REGULATOR_TPS62360=y |
148 | CONFIG_REGULATOR_TPS65090=y | ||
145 | CONFIG_REGULATOR_TPS6586X=y | 149 | CONFIG_REGULATOR_TPS6586X=y |
146 | CONFIG_REGULATOR_TPS65910=y | 150 | CONFIG_REGULATOR_TPS65910=y |
147 | CONFIG_MEDIA_SUPPORT=y | 151 | CONFIG_MEDIA_SUPPORT=y |
@@ -187,10 +191,8 @@ CONFIG_LEDS_GPIO=y | |||
187 | CONFIG_LEDS_TRIGGERS=y | 191 | CONFIG_LEDS_TRIGGERS=y |
188 | CONFIG_LEDS_TRIGGER_GPIO=y | 192 | CONFIG_LEDS_TRIGGER_GPIO=y |
189 | CONFIG_RTC_CLASS=y | 193 | CONFIG_RTC_CLASS=y |
190 | CONFIG_RTC_INTF_SYSFS=y | ||
191 | CONFIG_RTC_INTF_PROC=y | ||
192 | CONFIG_RTC_INTF_DEV=y | ||
193 | CONFIG_RTC_DRV_MAX8907=y | 194 | CONFIG_RTC_DRV_MAX8907=y |
195 | CONFIG_RTC_DRV_PALMAS=y | ||
194 | CONFIG_RTC_DRV_TPS6586X=y | 196 | CONFIG_RTC_DRV_TPS6586X=y |
195 | CONFIG_RTC_DRV_TPS65910=y | 197 | CONFIG_RTC_DRV_TPS65910=y |
196 | CONFIG_RTC_DRV_EM3027=y | 198 | CONFIG_RTC_DRV_EM3027=y |