diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-05-12 18:03:34 +0300 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-05-12 18:03:34 +0300 |
| commit | 3ef9866f2d645634cab65a5846e78fd27f69e2aa (patch) | |
| tree | e6976b3bacf0ac9bfb251772a433e4e83f3872a6 /arch | |
| parent | 1a7f4473dd4d51736a8c99d7b5c050d88dcf7e9a (diff) | |
| parent | ecda6547d7e4410c00168abae56d6fa4271d0a7e (diff) | |
| download | linux-3ef9866f2d645634cab65a5846e78fd27f69e2aa.tar.xz | |
Merge tag 'hip04-config-for-4.2' of git://github.com/hisilicon/linux-hisi into next/defconfig
Merge "ARM: HIP04: configure updates for 4.2" from Wei Xu:
- Enable ethernet on hip04 SoC
- Enable Sysnopsis GPIO controller on hip04 SoC
* tag 'hip04-config-for-4.2' of git://github.com/hisilicon/linux-hisi:
ARM: defconfig: hisi: enable HiSilicon hip04 ethernet controller
ARM: hip04: add GPIO configure in hisi_defconfig
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/configs/hisi_defconfig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/configs/hisi_defconfig b/arch/arm/configs/hisi_defconfig index c34da5878b6c..5997dbc69822 100644 --- a/arch/arm/configs/hisi_defconfig +++ b/arch/arm/configs/hisi_defconfig @@ -33,6 +33,7 @@ CONFIG_ATA=y CONFIG_SATA_AHCI_PLATFORM=y CONFIG_NETDEVICES=y CONFIG_HIX5HD2_GMAC=y +CONFIG_HIP04_ETH=y CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y CONFIG_SERIAL_8250_CONSOLE=y @@ -51,6 +52,7 @@ CONFIG_GPIO_SYSFS=y CONFIG_GPIOLIB=y CONFIG_GPIO_GENERIC_PLATFORM=y CONFIG_REGULATOR_GPIO=y +CONFIG_GPIO_DWAPB=y CONFIG_MFD_SYSCON=y CONFIG_POWER_RESET_SYSCON=y CONFIG_DRM=y |