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

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