aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Warren <swarren@nvidia.com>2014-09-25 13:38:24 -0400
committerArnd Bergmann <arnd@arndb.de>2014-09-25 19:30:04 -0400
commit7b13e1aa6e144d8014eaf593259a3deb532d990a (patch)
tree9f508fd344c837bd807b67e78d15d5814999ce22
parentcb88e7cdd1547d280e1fe94502133daca2bfccc7 (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_defconfig21
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
76CONFIG_PCI_MSI=y 76CONFIG_PCI_MSI=y
77CONFIG_PCI_MVEBU=y 77CONFIG_PCI_MVEBU=y
78CONFIG_PCI_TEGRA=y 78CONFIG_PCI_TEGRA=y
79CONFIG_PCIEPORTBUS=y
79CONFIG_SMP=y 80CONFIG_SMP=y
80CONFIG_NR_CPUS=8 81CONFIG_NR_CPUS=8
81CONFIG_HIGHPTE=y 82CONFIG_HIGHPTE=y
@@ -123,7 +124,10 @@ CONFIG_CMA_SIZE_MBYTES=64
123CONFIG_OMAP_OCP2SCP=y 124CONFIG_OMAP_OCP2SCP=y
124CONFIG_MTD=y 125CONFIG_MTD=y
125CONFIG_MTD_M25P80=y 126CONFIG_MTD_M25P80=y
127CONFIG_MTD_SPI_NOR=y
126CONFIG_BLK_DEV_LOOP=y 128CONFIG_BLK_DEV_LOOP=y
129CONFIG_AD525X_DPOT=y
130CONFIG_AD525X_DPOT_I2C=y
127CONFIG_ICS932S401=y 131CONFIG_ICS932S401=y
128CONFIG_APDS9802ALS=y 132CONFIG_APDS9802ALS=y
129CONFIG_ISL29003=y 133CONFIG_ISL29003=y
@@ -133,9 +137,11 @@ CONFIG_BLK_DEV_SD=y
133CONFIG_BLK_DEV_SR=y 137CONFIG_BLK_DEV_SR=y
134CONFIG_SCSI_MULTI_LUN=y 138CONFIG_SCSI_MULTI_LUN=y
135CONFIG_ATA=y 139CONFIG_ATA=y
140CONFIG_SATA_AHCI=y
136CONFIG_SATA_AHCI_PLATFORM=y 141CONFIG_SATA_AHCI_PLATFORM=y
137CONFIG_AHCI_ST=y 142CONFIG_AHCI_ST=y
138CONFIG_AHCI_SUNXI=y 143CONFIG_AHCI_SUNXI=y
144CONFIG_AHCI_TEGRA=y
139CONFIG_SATA_HIGHBANK=y 145CONFIG_SATA_HIGHBANK=y
140CONFIG_SATA_MV=y 146CONFIG_SATA_MV=y
141CONFIG_NETDEVICES=y 147CONFIG_NETDEVICES=y
@@ -161,6 +167,7 @@ CONFIG_USB_NET_SMSC95XX=y
161CONFIG_BRCMFMAC=m 167CONFIG_BRCMFMAC=m
162CONFIG_RT2X00=m 168CONFIG_RT2X00=m
163CONFIG_RT2800USB=m 169CONFIG_RT2800USB=m
170CONFIG_INPUT_JOYDEV=y
164CONFIG_INPUT_EVDEV=y 171CONFIG_INPUT_EVDEV=y
165CONFIG_KEYBOARD_GPIO=y 172CONFIG_KEYBOARD_GPIO=y
166CONFIG_KEYBOARD_TEGRA=y 173CONFIG_KEYBOARD_TEGRA=y
@@ -169,6 +176,7 @@ CONFIG_KEYBOARD_ST_KEYSCAN=y
169CONFIG_KEYBOARD_CROS_EC=y 176CONFIG_KEYBOARD_CROS_EC=y
170CONFIG_MOUSE_PS2_ELANTECH=y 177CONFIG_MOUSE_PS2_ELANTECH=y
171CONFIG_INPUT_TOUCHSCREEN=y 178CONFIG_INPUT_TOUCHSCREEN=y
179CONFIG_TOUCHSCREEN_ATMEL_MXT=y
172CONFIG_TOUCHSCREEN_STMPE=y 180CONFIG_TOUCHSCREEN_STMPE=y
173CONFIG_INPUT_MISC=y 181CONFIG_INPUT_MISC=y
174CONFIG_INPUT_MPU3050=y 182CONFIG_INPUT_MPU3050=y
@@ -293,6 +301,7 @@ CONFIG_BACKLIGHT_LCD_SUPPORT=y
293CONFIG_BACKLIGHT_CLASS_DEVICE=y 301CONFIG_BACKLIGHT_CLASS_DEVICE=y
294CONFIG_BACKLIGHT_PWM=y 302CONFIG_BACKLIGHT_PWM=y
295CONFIG_FRAMEBUFFER_CONSOLE=y 303CONFIG_FRAMEBUFFER_CONSOLE=y
304CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
296CONFIG_SOUND=y 305CONFIG_SOUND=y
297CONFIG_SND=y 306CONFIG_SND=y
298CONFIG_SND_SOC=y 307CONFIG_SND_SOC=y
@@ -345,7 +354,18 @@ CONFIG_MMC_DW=y
345CONFIG_MMC_DW_EXYNOS=y 354CONFIG_MMC_DW_EXYNOS=y
346CONFIG_NEW_LEDS=y 355CONFIG_NEW_LEDS=y
347CONFIG_LEDS_CLASS=y 356CONFIG_LEDS_CLASS=y
357CONFIG_LEDS_GPIO=y
348CONFIG_LEDS_PWM=y 358CONFIG_LEDS_PWM=y
359CONFIG_LEDS_TRIGGERS=y
360CONFIG_LEDS_TRIGGER_TIMER=y
361CONFIG_LEDS_TRIGGER_ONESHOT=y
362CONFIG_LEDS_TRIGGER_HEARTBEAT=y
363CONFIG_LEDS_TRIGGER_BACKLIGHT=y
364CONFIG_LEDS_TRIGGER_CPU=y
365CONFIG_LEDS_TRIGGER_GPIO=y
366CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
367CONFIG_LEDS_TRIGGER_TRANSIENT=y
368CONFIG_LEDS_TRIGGER_CAMERA=y
349CONFIG_EDAC=y 369CONFIG_EDAC=y
350CONFIG_EDAC_MM_EDAC=y 370CONFIG_EDAC_MM_EDAC=y
351CONFIG_EDAC_HIGHBANK_MC=y 371CONFIG_EDAC_HIGHBANK_MC=y
@@ -385,6 +405,7 @@ CONFIG_MFD_NVEC=y
385CONFIG_KEYBOARD_NVEC=y 405CONFIG_KEYBOARD_NVEC=y
386CONFIG_SERIO_NVEC_PS2=y 406CONFIG_SERIO_NVEC_PS2=y
387CONFIG_NVEC_POWER=y 407CONFIG_NVEC_POWER=y
408CONFIG_NVEC_PAZ00=y
388CONFIG_QCOM_GSBI=y 409CONFIG_QCOM_GSBI=y
389CONFIG_COMMON_CLK_QCOM=y 410CONFIG_COMMON_CLK_QCOM=y
390CONFIG_MSM_GCC_8660=y 411CONFIG_MSM_GCC_8660=y