diff options
author | Stephen Warren <swarren@nvidia.com> | 2014-09-25 13:38:24 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-09-25 19:30:04 -0400 |
commit | 7b13e1aa6e144d8014eaf593259a3deb532d990a (patch) | |
tree | 9f508fd344c837bd807b67e78d15d5814999ce22 | |
parent | cb88e7cdd1547d280e1fe94502133daca2bfccc7 (diff) |
ARM: multi_v7_defconfig: add missing Tegra options
Add all HW-support options from tegra_defconfig that are missing from
multi_v7_defconfig.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index b84ae1cd8327..1b0af30ef950 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig | |||
@@ -76,6 +76,7 @@ CONFIG_PCI=y | |||
76 | CONFIG_PCI_MSI=y | 76 | CONFIG_PCI_MSI=y |
77 | CONFIG_PCI_MVEBU=y | 77 | CONFIG_PCI_MVEBU=y |
78 | CONFIG_PCI_TEGRA=y | 78 | CONFIG_PCI_TEGRA=y |
79 | CONFIG_PCIEPORTBUS=y | ||
79 | CONFIG_SMP=y | 80 | CONFIG_SMP=y |
80 | CONFIG_NR_CPUS=8 | 81 | CONFIG_NR_CPUS=8 |
81 | CONFIG_HIGHPTE=y | 82 | CONFIG_HIGHPTE=y |
@@ -123,7 +124,10 @@ CONFIG_CMA_SIZE_MBYTES=64 | |||
123 | CONFIG_OMAP_OCP2SCP=y | 124 | CONFIG_OMAP_OCP2SCP=y |
124 | CONFIG_MTD=y | 125 | CONFIG_MTD=y |
125 | CONFIG_MTD_M25P80=y | 126 | CONFIG_MTD_M25P80=y |
127 | CONFIG_MTD_SPI_NOR=y | ||
126 | CONFIG_BLK_DEV_LOOP=y | 128 | CONFIG_BLK_DEV_LOOP=y |
129 | CONFIG_AD525X_DPOT=y | ||
130 | CONFIG_AD525X_DPOT_I2C=y | ||
127 | CONFIG_ICS932S401=y | 131 | CONFIG_ICS932S401=y |
128 | CONFIG_APDS9802ALS=y | 132 | CONFIG_APDS9802ALS=y |
129 | CONFIG_ISL29003=y | 133 | CONFIG_ISL29003=y |
@@ -133,9 +137,11 @@ CONFIG_BLK_DEV_SD=y | |||
133 | CONFIG_BLK_DEV_SR=y | 137 | CONFIG_BLK_DEV_SR=y |
134 | CONFIG_SCSI_MULTI_LUN=y | 138 | CONFIG_SCSI_MULTI_LUN=y |
135 | CONFIG_ATA=y | 139 | CONFIG_ATA=y |
140 | CONFIG_SATA_AHCI=y | ||
136 | CONFIG_SATA_AHCI_PLATFORM=y | 141 | CONFIG_SATA_AHCI_PLATFORM=y |
137 | CONFIG_AHCI_ST=y | 142 | CONFIG_AHCI_ST=y |
138 | CONFIG_AHCI_SUNXI=y | 143 | CONFIG_AHCI_SUNXI=y |
144 | CONFIG_AHCI_TEGRA=y | ||
139 | CONFIG_SATA_HIGHBANK=y | 145 | CONFIG_SATA_HIGHBANK=y |
140 | CONFIG_SATA_MV=y | 146 | CONFIG_SATA_MV=y |
141 | CONFIG_NETDEVICES=y | 147 | CONFIG_NETDEVICES=y |
@@ -161,6 +167,7 @@ CONFIG_USB_NET_SMSC95XX=y | |||
161 | CONFIG_BRCMFMAC=m | 167 | CONFIG_BRCMFMAC=m |
162 | CONFIG_RT2X00=m | 168 | CONFIG_RT2X00=m |
163 | CONFIG_RT2800USB=m | 169 | CONFIG_RT2800USB=m |
170 | CONFIG_INPUT_JOYDEV=y | ||
164 | CONFIG_INPUT_EVDEV=y | 171 | CONFIG_INPUT_EVDEV=y |
165 | CONFIG_KEYBOARD_GPIO=y | 172 | CONFIG_KEYBOARD_GPIO=y |
166 | CONFIG_KEYBOARD_TEGRA=y | 173 | CONFIG_KEYBOARD_TEGRA=y |
@@ -169,6 +176,7 @@ CONFIG_KEYBOARD_ST_KEYSCAN=y | |||
169 | CONFIG_KEYBOARD_CROS_EC=y | 176 | CONFIG_KEYBOARD_CROS_EC=y |
170 | CONFIG_MOUSE_PS2_ELANTECH=y | 177 | CONFIG_MOUSE_PS2_ELANTECH=y |
171 | CONFIG_INPUT_TOUCHSCREEN=y | 178 | CONFIG_INPUT_TOUCHSCREEN=y |
179 | CONFIG_TOUCHSCREEN_ATMEL_MXT=y | ||
172 | CONFIG_TOUCHSCREEN_STMPE=y | 180 | CONFIG_TOUCHSCREEN_STMPE=y |
173 | CONFIG_INPUT_MISC=y | 181 | CONFIG_INPUT_MISC=y |
174 | CONFIG_INPUT_MPU3050=y | 182 | CONFIG_INPUT_MPU3050=y |
@@ -293,6 +301,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y | |||
293 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 301 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
294 | CONFIG_BACKLIGHT_PWM=y | 302 | CONFIG_BACKLIGHT_PWM=y |
295 | CONFIG_FRAMEBUFFER_CONSOLE=y | 303 | CONFIG_FRAMEBUFFER_CONSOLE=y |
304 | CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y | ||
296 | CONFIG_SOUND=y | 305 | CONFIG_SOUND=y |
297 | CONFIG_SND=y | 306 | CONFIG_SND=y |
298 | CONFIG_SND_SOC=y | 307 | CONFIG_SND_SOC=y |
@@ -345,7 +354,18 @@ CONFIG_MMC_DW=y | |||
345 | CONFIG_MMC_DW_EXYNOS=y | 354 | CONFIG_MMC_DW_EXYNOS=y |
346 | CONFIG_NEW_LEDS=y | 355 | CONFIG_NEW_LEDS=y |
347 | CONFIG_LEDS_CLASS=y | 356 | CONFIG_LEDS_CLASS=y |
357 | CONFIG_LEDS_GPIO=y | ||
348 | CONFIG_LEDS_PWM=y | 358 | CONFIG_LEDS_PWM=y |
359 | CONFIG_LEDS_TRIGGERS=y | ||
360 | CONFIG_LEDS_TRIGGER_TIMER=y | ||
361 | CONFIG_LEDS_TRIGGER_ONESHOT=y | ||
362 | CONFIG_LEDS_TRIGGER_HEARTBEAT=y | ||
363 | CONFIG_LEDS_TRIGGER_BACKLIGHT=y | ||
364 | CONFIG_LEDS_TRIGGER_CPU=y | ||
365 | CONFIG_LEDS_TRIGGER_GPIO=y | ||
366 | CONFIG_LEDS_TRIGGER_DEFAULT_ON=y | ||
367 | CONFIG_LEDS_TRIGGER_TRANSIENT=y | ||
368 | CONFIG_LEDS_TRIGGER_CAMERA=y | ||
349 | CONFIG_EDAC=y | 369 | CONFIG_EDAC=y |
350 | CONFIG_EDAC_MM_EDAC=y | 370 | CONFIG_EDAC_MM_EDAC=y |
351 | CONFIG_EDAC_HIGHBANK_MC=y | 371 | CONFIG_EDAC_HIGHBANK_MC=y |
@@ -385,6 +405,7 @@ CONFIG_MFD_NVEC=y | |||
385 | CONFIG_KEYBOARD_NVEC=y | 405 | CONFIG_KEYBOARD_NVEC=y |
386 | CONFIG_SERIO_NVEC_PS2=y | 406 | CONFIG_SERIO_NVEC_PS2=y |
387 | CONFIG_NVEC_POWER=y | 407 | CONFIG_NVEC_POWER=y |
408 | CONFIG_NVEC_PAZ00=y | ||
388 | CONFIG_QCOM_GSBI=y | 409 | CONFIG_QCOM_GSBI=y |
389 | CONFIG_COMMON_CLK_QCOM=y | 410 | CONFIG_COMMON_CLK_QCOM=y |
390 | CONFIG_MSM_GCC_8660=y | 411 | CONFIG_MSM_GCC_8660=y |