diff options
author | Grygorii Strashko <grygorii.strashko@linaro.org> | 2014-12-29 13:51:29 -0500 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2015-01-14 16:25:29 -0500 |
commit | 6e4d61d923944b81775b8a43b65750c5912d20d8 (patch) | |
tree | 91a4929c1b9f6e7a24e3fd61a58ee76dad11ea89 /arch/arm/configs | |
parent | 15e89691a41de6b415ea1e8e24372f0de572827c (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_defconfig | 12 |
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 | |||
78 | CONFIG_ARCH_ZYNQ=y | 78 | CONFIG_ARCH_ZYNQ=y |
79 | CONFIG_TRUSTED_FOUNDATIONS=y | 79 | CONFIG_TRUSTED_FOUNDATIONS=y |
80 | CONFIG_PCI=y | 80 | CONFIG_PCI=y |
81 | CONFIG_PCI_KEYSTONE=y | ||
81 | CONFIG_PCI_MSI=y | 82 | CONFIG_PCI_MSI=y |
82 | CONFIG_PCI_MVEBU=y | 83 | CONFIG_PCI_MVEBU=y |
83 | CONFIG_PCI_TEGRA=y | 84 | CONFIG_PCI_TEGRA=y |
@@ -132,6 +133,7 @@ CONFIG_MTD_CMDLINE_PARTS=y | |||
132 | CONFIG_MTD_BLOCK=y | 133 | CONFIG_MTD_BLOCK=y |
133 | CONFIG_MTD_M25P80=y | 134 | CONFIG_MTD_M25P80=y |
134 | CONFIG_MTD_NAND=y | 135 | CONFIG_MTD_NAND=y |
136 | CONFIG_MTD_NAND_DAVINCI=y | ||
135 | CONFIG_MTD_SPI_NOR=y | 137 | CONFIG_MTD_SPI_NOR=y |
136 | CONFIG_MTD_UBI=y | 138 | CONFIG_MTD_UBI=y |
137 | CONFIG_BLK_DEV_LOOP=y | 139 | CONFIG_BLK_DEV_LOOP=y |
@@ -221,6 +223,7 @@ CONFIG_SERIAL_FSL_LPUART_CONSOLE=y | |||
221 | CONFIG_SERIAL_ST_ASC=y | 223 | CONFIG_SERIAL_ST_ASC=y |
222 | CONFIG_SERIAL_ST_ASC_CONSOLE=y | 224 | CONFIG_SERIAL_ST_ASC_CONSOLE=y |
223 | CONFIG_I2C_CHARDEV=y | 225 | CONFIG_I2C_CHARDEV=y |
226 | CONFIG_I2C_DAVINCI=y | ||
224 | CONFIG_I2C_MUX=y | 227 | CONFIG_I2C_MUX=y |
225 | CONFIG_I2C_MUX_PCA954x=y | 228 | CONFIG_I2C_MUX_PCA954x=y |
226 | CONFIG_I2C_MUX_PINCTRL=y | 229 | CONFIG_I2C_MUX_PINCTRL=y |
@@ -234,6 +237,7 @@ CONFIG_I2C_TEGRA=y | |||
234 | CONFIG_I2C_ST=y | 237 | CONFIG_I2C_ST=y |
235 | CONFIG_SPI=y | 238 | CONFIG_SPI=y |
236 | CONFIG_I2C_XILINX=y | 239 | CONFIG_I2C_XILINX=y |
240 | CONFIG_SPI_DAVINCI=y | ||
237 | CONFIG_SPI_CADENCE=y | 241 | CONFIG_SPI_CADENCE=y |
238 | CONFIG_SPI_OMAP24XX=y | 242 | CONFIG_SPI_OMAP24XX=y |
239 | CONFIG_SPI_ORION=y | 243 | CONFIG_SPI_ORION=y |
@@ -252,23 +256,27 @@ CONFIG_PINCTRL_APQ8084=y | |||
252 | CONFIG_GPIO_SYSFS=y | 256 | CONFIG_GPIO_SYSFS=y |
253 | CONFIG_GPIO_GENERIC_PLATFORM=y | 257 | CONFIG_GPIO_GENERIC_PLATFORM=y |
254 | CONFIG_GPIO_DWAPB=y | 258 | CONFIG_GPIO_DWAPB=y |
259 | CONFIG_GPIO_DAVINCI=y | ||
255 | CONFIG_GPIO_XILINX=y | 260 | CONFIG_GPIO_XILINX=y |
256 | CONFIG_GPIO_ZYNQ=y | 261 | CONFIG_GPIO_ZYNQ=y |
257 | CONFIG_GPIO_PCA953X=y | 262 | CONFIG_GPIO_PCA953X=y |
258 | CONFIG_GPIO_PCA953X_IRQ=y | 263 | CONFIG_GPIO_PCA953X_IRQ=y |
259 | CONFIG_GPIO_TWL4030=y | 264 | CONFIG_GPIO_TWL4030=y |
260 | CONFIG_GPIO_PALMAS=y | 265 | CONFIG_GPIO_PALMAS=y |
266 | CONFIG_GPIO_SYSCON=y | ||
261 | CONFIG_GPIO_TPS6586X=y | 267 | CONFIG_GPIO_TPS6586X=y |
262 | CONFIG_GPIO_TPS65910=y | 268 | CONFIG_GPIO_TPS65910=y |
263 | CONFIG_BATTERY_SBS=y | 269 | CONFIG_BATTERY_SBS=y |
264 | CONFIG_CHARGER_TPS65090=y | 270 | CONFIG_CHARGER_TPS65090=y |
265 | CONFIG_POWER_RESET_AS3722=y | 271 | CONFIG_POWER_RESET_AS3722=y |
266 | CONFIG_POWER_RESET_GPIO=y | 272 | CONFIG_POWER_RESET_GPIO=y |
273 | CONFIG_POWER_RESET_KEYSTONE=y | ||
267 | CONFIG_POWER_RESET_SUN6I=y | 274 | CONFIG_POWER_RESET_SUN6I=y |
268 | CONFIG_SENSORS_LM90=y | 275 | CONFIG_SENSORS_LM90=y |
269 | CONFIG_SENSORS_LM95245=y | 276 | CONFIG_SENSORS_LM95245=y |
270 | CONFIG_THERMAL=y | 277 | CONFIG_THERMAL=y |
271 | CONFIG_ARMADA_THERMAL=y | 278 | CONFIG_ARMADA_THERMAL=y |
279 | CONFIG_DAVINCI_WATCHDOG | ||
272 | CONFIG_ST_THERMAL_SYSCFG=y | 280 | CONFIG_ST_THERMAL_SYSCFG=y |
273 | CONFIG_ST_THERMAL_MEMMAP=y | 281 | CONFIG_ST_THERMAL_MEMMAP=y |
274 | CONFIG_WATCHDOG=y | 282 | CONFIG_WATCHDOG=y |
@@ -348,9 +356,11 @@ CONFIG_USB_OHCI_HCD=y | |||
348 | CONFIG_USB_OHCI_HCD_STI=y | 356 | CONFIG_USB_OHCI_HCD_STI=y |
349 | CONFIG_USB_OHCI_HCD_PLATFORM=y | 357 | CONFIG_USB_OHCI_HCD_PLATFORM=y |
350 | CONFIG_USB_STORAGE=y | 358 | CONFIG_USB_STORAGE=y |
359 | CONFIG_USB_DWC3=y | ||
351 | CONFIG_USB_CHIPIDEA=y | 360 | CONFIG_USB_CHIPIDEA=y |
352 | CONFIG_USB_CHIPIDEA_HOST=y | 361 | CONFIG_USB_CHIPIDEA_HOST=y |
353 | CONFIG_AB8500_USB=y | 362 | CONFIG_AB8500_USB=y |
363 | CONFIG_KEYSTONE_USB_PHY=y | ||
354 | CONFIG_OMAP_USB3=y | 364 | CONFIG_OMAP_USB3=y |
355 | CONFIG_SAMSUNG_USB2PHY=y | 365 | CONFIG_SAMSUNG_USB2PHY=y |
356 | CONFIG_SAMSUNG_USB3PHY=y | 366 | CONFIG_SAMSUNG_USB3PHY=y |
@@ -446,6 +456,7 @@ CONFIG_MSM_MMCC_8974=y | |||
446 | CONFIG_TEGRA_IOMMU_GART=y | 456 | CONFIG_TEGRA_IOMMU_GART=y |
447 | CONFIG_TEGRA_IOMMU_SMMU=y | 457 | CONFIG_TEGRA_IOMMU_SMMU=y |
448 | CONFIG_MEMORY=y | 458 | CONFIG_MEMORY=y |
459 | CONFIG_TI_AEMIF=y | ||
449 | CONFIG_IIO=y | 460 | CONFIG_IIO=y |
450 | CONFIG_XILINX_XADC=y | 461 | CONFIG_XILINX_XADC=y |
451 | CONFIG_AK8975=y | 462 | CONFIG_AK8975=y |
@@ -482,3 +493,4 @@ CONFIG_MAGIC_SYSRQ=y | |||
482 | CONFIG_LOCKUP_DETECTOR=y | 493 | CONFIG_LOCKUP_DETECTOR=y |
483 | CONFIG_CRYPTO_DEV_TEGRA_AES=y | 494 | CONFIG_CRYPTO_DEV_TEGRA_AES=y |
484 | CONFIG_CPUFREQ_DT=y | 495 | CONFIG_CPUFREQ_DT=y |
496 | CONFIG_KEYSTONE_IRQ=y | ||