aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorGrygorii Strashko <grygorii.strashko@linaro.org>2014-12-29 13:51:29 -0500
committerOlof Johansson <olof@lixom.net>2015-01-14 16:25:29 -0500
commit6e4d61d923944b81775b8a43b65750c5912d20d8 (patch)
tree91a4929c1b9f6e7a24e3fd61a58ee76dad11ea89 /arch/arm/configs
parent15e89691a41de6b415ea1e8e24372f0de572827c (diff)
ARM: config: multi_v7: Update it for Keystone defconfig
Sync multi_v7_defconfig with the current keystone_defconfig with recent updates. CONFIG_PCI_KEYSTONE=y CONFIG_MTD_NAND_DAVINCI=y CONFIG_I2C_DAVINCI=y CONFIG_SPI_DAVINCI=y CONFIG_GPIO_DAVINCI=y CONFIG_GPIO_SYSCON=y CONFIG_POWER_RESET_KEYSTONE=y CONFIG_DAVINCI_WATCHDOG CONFIG_USB_DWC3=y CONFIG_KEYSTONE_USB_PHY=y CONFIG_TI_AEMIF=y CONFIG_KEYSTONE_IRQ=y Cc: Arnd Bergmann <arnd@arndb.de> Signed-off-by: Grygorii Strashko <grygorii.strashko@linaro.org> Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org> Reviewed-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/multi_v7_defconfig12
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 3ac2a62979db..6fef31745689 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -78,6 +78,7 @@ CONFIG_ARCH_WM8850=y
78CONFIG_ARCH_ZYNQ=y 78CONFIG_ARCH_ZYNQ=y
79CONFIG_TRUSTED_FOUNDATIONS=y 79CONFIG_TRUSTED_FOUNDATIONS=y
80CONFIG_PCI=y 80CONFIG_PCI=y
81CONFIG_PCI_KEYSTONE=y
81CONFIG_PCI_MSI=y 82CONFIG_PCI_MSI=y
82CONFIG_PCI_MVEBU=y 83CONFIG_PCI_MVEBU=y
83CONFIG_PCI_TEGRA=y 84CONFIG_PCI_TEGRA=y
@@ -132,6 +133,7 @@ CONFIG_MTD_CMDLINE_PARTS=y
132CONFIG_MTD_BLOCK=y 133CONFIG_MTD_BLOCK=y
133CONFIG_MTD_M25P80=y 134CONFIG_MTD_M25P80=y
134CONFIG_MTD_NAND=y 135CONFIG_MTD_NAND=y
136CONFIG_MTD_NAND_DAVINCI=y
135CONFIG_MTD_SPI_NOR=y 137CONFIG_MTD_SPI_NOR=y
136CONFIG_MTD_UBI=y 138CONFIG_MTD_UBI=y
137CONFIG_BLK_DEV_LOOP=y 139CONFIG_BLK_DEV_LOOP=y
@@ -221,6 +223,7 @@ CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
221CONFIG_SERIAL_ST_ASC=y 223CONFIG_SERIAL_ST_ASC=y
222CONFIG_SERIAL_ST_ASC_CONSOLE=y 224CONFIG_SERIAL_ST_ASC_CONSOLE=y
223CONFIG_I2C_CHARDEV=y 225CONFIG_I2C_CHARDEV=y
226CONFIG_I2C_DAVINCI=y
224CONFIG_I2C_MUX=y 227CONFIG_I2C_MUX=y
225CONFIG_I2C_MUX_PCA954x=y 228CONFIG_I2C_MUX_PCA954x=y
226CONFIG_I2C_MUX_PINCTRL=y 229CONFIG_I2C_MUX_PINCTRL=y
@@ -234,6 +237,7 @@ CONFIG_I2C_TEGRA=y
234CONFIG_I2C_ST=y 237CONFIG_I2C_ST=y
235CONFIG_SPI=y 238CONFIG_SPI=y
236CONFIG_I2C_XILINX=y 239CONFIG_I2C_XILINX=y
240CONFIG_SPI_DAVINCI=y
237CONFIG_SPI_CADENCE=y 241CONFIG_SPI_CADENCE=y
238CONFIG_SPI_OMAP24XX=y 242CONFIG_SPI_OMAP24XX=y
239CONFIG_SPI_ORION=y 243CONFIG_SPI_ORION=y
@@ -252,23 +256,27 @@ CONFIG_PINCTRL_APQ8084=y
252CONFIG_GPIO_SYSFS=y 256CONFIG_GPIO_SYSFS=y
253CONFIG_GPIO_GENERIC_PLATFORM=y 257CONFIG_GPIO_GENERIC_PLATFORM=y
254CONFIG_GPIO_DWAPB=y 258CONFIG_GPIO_DWAPB=y
259CONFIG_GPIO_DAVINCI=y
255CONFIG_GPIO_XILINX=y 260CONFIG_GPIO_XILINX=y
256CONFIG_GPIO_ZYNQ=y 261CONFIG_GPIO_ZYNQ=y
257CONFIG_GPIO_PCA953X=y 262CONFIG_GPIO_PCA953X=y
258CONFIG_GPIO_PCA953X_IRQ=y 263CONFIG_GPIO_PCA953X_IRQ=y
259CONFIG_GPIO_TWL4030=y 264CONFIG_GPIO_TWL4030=y
260CONFIG_GPIO_PALMAS=y 265CONFIG_GPIO_PALMAS=y
266CONFIG_GPIO_SYSCON=y
261CONFIG_GPIO_TPS6586X=y 267CONFIG_GPIO_TPS6586X=y
262CONFIG_GPIO_TPS65910=y 268CONFIG_GPIO_TPS65910=y
263CONFIG_BATTERY_SBS=y 269CONFIG_BATTERY_SBS=y
264CONFIG_CHARGER_TPS65090=y 270CONFIG_CHARGER_TPS65090=y
265CONFIG_POWER_RESET_AS3722=y 271CONFIG_POWER_RESET_AS3722=y
266CONFIG_POWER_RESET_GPIO=y 272CONFIG_POWER_RESET_GPIO=y
273CONFIG_POWER_RESET_KEYSTONE=y
267CONFIG_POWER_RESET_SUN6I=y 274CONFIG_POWER_RESET_SUN6I=y
268CONFIG_SENSORS_LM90=y 275CONFIG_SENSORS_LM90=y
269CONFIG_SENSORS_LM95245=y 276CONFIG_SENSORS_LM95245=y
270CONFIG_THERMAL=y 277CONFIG_THERMAL=y
271CONFIG_ARMADA_THERMAL=y 278CONFIG_ARMADA_THERMAL=y
279CONFIG_DAVINCI_WATCHDOG
272CONFIG_ST_THERMAL_SYSCFG=y 280CONFIG_ST_THERMAL_SYSCFG=y
273CONFIG_ST_THERMAL_MEMMAP=y 281CONFIG_ST_THERMAL_MEMMAP=y
274CONFIG_WATCHDOG=y 282CONFIG_WATCHDOG=y
@@ -348,9 +356,11 @@ CONFIG_USB_OHCI_HCD=y
348CONFIG_USB_OHCI_HCD_STI=y 356CONFIG_USB_OHCI_HCD_STI=y
349CONFIG_USB_OHCI_HCD_PLATFORM=y 357CONFIG_USB_OHCI_HCD_PLATFORM=y
350CONFIG_USB_STORAGE=y 358CONFIG_USB_STORAGE=y
359CONFIG_USB_DWC3=y
351CONFIG_USB_CHIPIDEA=y 360CONFIG_USB_CHIPIDEA=y
352CONFIG_USB_CHIPIDEA_HOST=y 361CONFIG_USB_CHIPIDEA_HOST=y
353CONFIG_AB8500_USB=y 362CONFIG_AB8500_USB=y
363CONFIG_KEYSTONE_USB_PHY=y
354CONFIG_OMAP_USB3=y 364CONFIG_OMAP_USB3=y
355CONFIG_SAMSUNG_USB2PHY=y 365CONFIG_SAMSUNG_USB2PHY=y
356CONFIG_SAMSUNG_USB3PHY=y 366CONFIG_SAMSUNG_USB3PHY=y
@@ -446,6 +456,7 @@ CONFIG_MSM_MMCC_8974=y
446CONFIG_TEGRA_IOMMU_GART=y 456CONFIG_TEGRA_IOMMU_GART=y
447CONFIG_TEGRA_IOMMU_SMMU=y 457CONFIG_TEGRA_IOMMU_SMMU=y
448CONFIG_MEMORY=y 458CONFIG_MEMORY=y
459CONFIG_TI_AEMIF=y
449CONFIG_IIO=y 460CONFIG_IIO=y
450CONFIG_XILINX_XADC=y 461CONFIG_XILINX_XADC=y
451CONFIG_AK8975=y 462CONFIG_AK8975=y
@@ -482,3 +493,4 @@ CONFIG_MAGIC_SYSRQ=y
482CONFIG_LOCKUP_DETECTOR=y 493CONFIG_LOCKUP_DETECTOR=y
483CONFIG_CRYPTO_DEV_TEGRA_AES=y 494CONFIG_CRYPTO_DEV_TEGRA_AES=y
484CONFIG_CPUFREQ_DT=y 495CONFIG_CPUFREQ_DT=y
496CONFIG_KEYSTONE_IRQ=y