diff options
| author | Olof Johansson <olof@lixom.net> | 2015-07-17 20:09:14 +0300 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-07-17 20:09:14 +0300 |
| commit | 30e714c18c9b5fba273648b46003836a738a0a5f (patch) | |
| tree | 1b274c6e9d926b8d2dc1a901bb18d3d4995a5c72 /arch/arm/configs | |
| parent | 91e2213bdb23e7ca863fba53c82fcd094aeddd24 (diff) | |
| parent | adfe5f267dd005d0bbe8d71820a7fa38945d08bd (diff) | |
| download | linux-30e714c18c9b5fba273648b46003836a738a0a5f.tar.xz | |
Merge tag 'mvebu-config-4.3-1' of git://git.infradead.org/linux-mvebu into next/defconfig
Merge "ARM: mvebu: config changes for v4.3" from Gregory Clement:
mvebu config changes for v4.3 (part #1)
update mvebu_v7_defconfig with features needed for Armada 388 GP
* tag 'mvebu-config-4.3-1' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: update mvebu_v7_defconfig with features needed for Armada 388 GP
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
| -rw-r--r-- | arch/arm/configs/mvebu_v7_defconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig index cacc9f4055a7..13fcd020e375 100644 --- a/arch/arm/configs/mvebu_v7_defconfig +++ b/arch/arm/configs/mvebu_v7_defconfig @@ -58,6 +58,7 @@ CONFIG_MTD_M25P80=y CONFIG_MTD_NAND=y CONFIG_MTD_NAND_PXA3xx=y CONFIG_MTD_SPI_NOR=y +CONFIG_EEPROM_AT24=y CONFIG_BLK_DEV_SD=y CONFIG_ATA=y CONFIG_AHCI_MVEBU=y @@ -83,11 +84,14 @@ CONFIG_I2C_MV64XXX=y CONFIG_SPI=y CONFIG_SPI_ORION=y CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_PCA953X=y CONFIG_SENSORS_GPIO_FAN=y CONFIG_THERMAL=y CONFIG_ARMADA_THERMAL=y CONFIG_WATCHDOG=y CONFIG_ORION_WATCHDOG=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_SOUND=y CONFIG_SND=y CONFIG_SND_SOC=y |