diff options
| author | Olof Johansson <olof@lixom.net> | 2015-10-23 10:16:12 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2015-10-23 10:16:12 -0700 |
| commit | df3e6906d361e90bfbb3b3ef127bd2b4e667e2e9 (patch) | |
| tree | 67d60b9e14d950587aae9898a6ccaaed5436a223 /arch | |
| parent | b52d2320276cfeb8e8eccdc1b87a3c078da255cf (diff) | |
| parent | ea592ed290c7b4f398227a3025f6e1ff94e767f0 (diff) | |
| download | linux-stable-df3e6906d361e90bfbb3b3ef127bd2b4e667e2e9.tar.gz linux-stable-df3e6906d361e90bfbb3b3ef127bd2b4e667e2e9.tar.bz2 linux-stable-df3e6906d361e90bfbb3b3ef127bd2b4e667e2e9.zip | |
Merge tag 'mvebu-config-4.4-1' of git://git.infradead.org/linux-mvebu into next/defconfig
mvebu config for 4.4 (part 1)
Update the v7 defconfig witth usefull config for the Seagate NAS
* tag 'mvebu-config-4.4-1' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: enable options for Seagate NAS in mvebu_v7_defconfig
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/mvebu_v7_defconfig | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/configs/mvebu_v7_defconfig b/arch/arm/configs/mvebu_v7_defconfig index 13fcd020e375..c6729bf0a8dd 100644 --- a/arch/arm/configs/mvebu_v7_defconfig +++ b/arch/arm/configs/mvebu_v7_defconfig @@ -61,6 +61,7 @@ CONFIG_MTD_SPI_NOR=y CONFIG_EEPROM_AT24=y CONFIG_BLK_DEV_SD=y CONFIG_ATA=y +CONFIG_SATA_AHCI=y CONFIG_AHCI_MVEBU=y CONFIG_SATA_MV=y CONFIG_NETDEVICES=y @@ -85,6 +86,9 @@ CONFIG_SPI=y CONFIG_SPI_ORION=y CONFIG_GPIO_SYSFS=y CONFIG_GPIO_PCA953X=y +CONFIG_POWER_SUPPLY=y +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_GPIO=y CONFIG_SENSORS_GPIO_FAN=y CONFIG_THERMAL=y CONFIG_ARMADA_THERMAL=y @@ -111,12 +115,15 @@ CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_DOVE=y CONFIG_MMC_SDHCI_PXAV3=y CONFIG_MMC_MVSDIO=y -CONFIG_LEDS_GPIO=y +CONFIG_NEW_LEDS=y CONFIG_LEDS_CLASS=y +CONFIG_LEDS_GPIO=y CONFIG_LEDS_TRIGGERS=y CONFIG_LEDS_TRIGGER_TIMER=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_DS1307=y +CONFIG_RTC_DRV_PCF8563=y CONFIG_RTC_DRV_S35390A=y CONFIG_RTC_DRV_MV=y CONFIG_RTC_DRV_ARMADA38X=y |