aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2013-03-21 09:47:43 -0400
committerStephen Warren <swarren@nvidia.com>2013-04-03 16:35:55 -0400
commite1eee65f1a0cce8e49624104b3497ba3f8d35199 (patch)
tree6c443c9722ad5f991a37de39be978130a83c2e04 /arch
parent6dbe51c251a327e012439c4772097a13df43c5b8 (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_defconfig18
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 @@
1CONFIG_EXPERIMENTAL=y
2CONFIG_NO_HZ=y 1CONFIG_NO_HZ=y
3CONFIG_HIGH_RES_TIMERS=y 2CONFIG_HIGH_RES_TIMERS=y
4CONFIG_IKCONFIG=y 3CONFIG_IKCONFIG=y
@@ -20,15 +19,14 @@ CONFIG_MODULE_UNLOAD=y
20CONFIG_MODULE_FORCE_UNLOAD=y 19CONFIG_MODULE_FORCE_UNLOAD=y
21# CONFIG_BLK_DEV_BSG is not set 20# CONFIG_BLK_DEV_BSG is not set
22CONFIG_PARTITION_ADVANCED=y 21CONFIG_PARTITION_ADVANCED=y
23CONFIG_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
26CONFIG_ARCH_TEGRA=y 24CONFIG_ARCH_TEGRA=y
27CONFIG_GPIO_PCA953X=y 25CONFIG_GPIO_PCA953X=y
28CONFIG_ARCH_TEGRA_2x_SOC=y 26CONFIG_ARCH_TEGRA_2x_SOC=y
29CONFIG_ARCH_TEGRA_3x_SOC=y 27CONFIG_ARCH_TEGRA_3x_SOC=y
28CONFIG_ARCH_TEGRA_114_SOC=y
30CONFIG_TEGRA_PCI=y 29CONFIG_TEGRA_PCI=y
31CONFIG_TEGRA_DEBUG_UART_AUTO_ODMDATA=y
32CONFIG_TEGRA_EMC_SCALING_ENABLE=y 30CONFIG_TEGRA_EMC_SCALING_ENABLE=y
33CONFIG_SMP=y 31CONFIG_SMP=y
34CONFIG_PREEMPT=y 32CONFIG_PREEMPT=y
@@ -37,8 +35,8 @@ CONFIG_AEABI=y
37CONFIG_HIGHMEM=y 35CONFIG_HIGHMEM=y
38CONFIG_ZBOOT_ROM_TEXT=0x0 36CONFIG_ZBOOT_ROM_TEXT=0x0
39CONFIG_ZBOOT_ROM_BSS=0x0 37CONFIG_ZBOOT_ROM_BSS=0x0
40CONFIG_AUTO_ZRELADDR=y
41CONFIG_KEXEC=y 38CONFIG_KEXEC=y
39CONFIG_AUTO_ZRELADDR=y
42CONFIG_CPU_FREQ=y 40CONFIG_CPU_FREQ=y
43CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y 41CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
44CONFIG_CPU_IDLE=y 42CONFIG_CPU_IDLE=y
@@ -108,6 +106,7 @@ CONFIG_RT2X00=y
108CONFIG_RT2800USB=m 106CONFIG_RT2800USB=m
109CONFIG_INPUT_EVDEV=y 107CONFIG_INPUT_EVDEV=y
110CONFIG_KEYBOARD_TEGRA=y 108CONFIG_KEYBOARD_TEGRA=y
109CONFIG_KEYBOARD_GPIO=y
111CONFIG_INPUT_MISC=y 110CONFIG_INPUT_MISC=y
112CONFIG_INPUT_MPU3050=y 111CONFIG_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
117CONFIG_SERIAL_TEGRA=y 116CONFIG_SERIAL_TEGRA=y
118CONFIG_SERIAL_OF_PLATFORM=y 117CONFIG_SERIAL_OF_PLATFORM=y
119# CONFIG_HW_RANDOM is not set 118# CONFIG_HW_RANDOM is not set
120CONFIG_I2C=y
121# CONFIG_I2C_COMPAT is not set 119# CONFIG_I2C_COMPAT is not set
122CONFIG_I2C_MUX=y 120CONFIG_I2C_MUX=y
123CONFIG_I2C_MUX_PINCTRL=y 121CONFIG_I2C_MUX_PINCTRL=y
@@ -126,6 +124,7 @@ CONFIG_SPI=y
126CONFIG_SPI_TEGRA20_SFLASH=y 124CONFIG_SPI_TEGRA20_SFLASH=y
127CONFIG_SPI_TEGRA20_SLINK=y 125CONFIG_SPI_TEGRA20_SLINK=y
128CONFIG_GPIO_PCA953X_IRQ=y 126CONFIG_GPIO_PCA953X_IRQ=y
127CONFIG_GPIO_PALMAS=y
129CONFIG_GPIO_TPS6586X=y 128CONFIG_GPIO_TPS6586X=y
130CONFIG_GPIO_TPS65910=y 129CONFIG_GPIO_TPS65910=y
131CONFIG_POWER_SUPPLY=y 130CONFIG_POWER_SUPPLY=y
@@ -136,12 +135,17 @@ CONFIG_SENSORS_LM90=y
136CONFIG_MFD_TPS6586X=y 135CONFIG_MFD_TPS6586X=y
137CONFIG_MFD_TPS65910=y 136CONFIG_MFD_TPS65910=y
138CONFIG_MFD_MAX8907=y 137CONFIG_MFD_MAX8907=y
138CONFIG_MFD_TPS65090=y
139CONFIG_MFD_PALMAS=y
139CONFIG_REGULATOR=y 140CONFIG_REGULATOR=y
140CONFIG_REGULATOR_FIXED_VOLTAGE=y 141CONFIG_REGULATOR_FIXED_VOLTAGE=y
141CONFIG_REGULATOR_VIRTUAL_CONSUMER=y 142CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
142CONFIG_REGULATOR_GPIO=y 143CONFIG_REGULATOR_GPIO=y
143CONFIG_REGULATOR_MAX8907=y 144CONFIG_REGULATOR_MAX8907=y
145CONFIG_REGULATOR_PALMAS=y
146CONFIG_REGULATOR_TPS51632=y
144CONFIG_REGULATOR_TPS62360=y 147CONFIG_REGULATOR_TPS62360=y
148CONFIG_REGULATOR_TPS65090=y
145CONFIG_REGULATOR_TPS6586X=y 149CONFIG_REGULATOR_TPS6586X=y
146CONFIG_REGULATOR_TPS65910=y 150CONFIG_REGULATOR_TPS65910=y
147CONFIG_MEDIA_SUPPORT=y 151CONFIG_MEDIA_SUPPORT=y
@@ -187,10 +191,8 @@ CONFIG_LEDS_GPIO=y
187CONFIG_LEDS_TRIGGERS=y 191CONFIG_LEDS_TRIGGERS=y
188CONFIG_LEDS_TRIGGER_GPIO=y 192CONFIG_LEDS_TRIGGER_GPIO=y
189CONFIG_RTC_CLASS=y 193CONFIG_RTC_CLASS=y
190CONFIG_RTC_INTF_SYSFS=y
191CONFIG_RTC_INTF_PROC=y
192CONFIG_RTC_INTF_DEV=y
193CONFIG_RTC_DRV_MAX8907=y 194CONFIG_RTC_DRV_MAX8907=y
195CONFIG_RTC_DRV_PALMAS=y
194CONFIG_RTC_DRV_TPS6586X=y 196CONFIG_RTC_DRV_TPS6586X=y
195CONFIG_RTC_DRV_TPS65910=y 197CONFIG_RTC_DRV_TPS65910=y
196CONFIG_RTC_DRV_EM3027=y 198CONFIG_RTC_DRV_EM3027=y