From: Arnd Bergmann <arnd@arndb.de>
Date: Mon, 29 Feb 2016 23:30:30 +0000 (+0100)
Subject: Merge tag 'hip05-config-for-4.6' of git://github.com/hisilicon/linux-hisi into next... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=31cf19a14ce1d046983d638b84bf44cc9ddffe57;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'hip05-config-for-4.6' of git://github.com/hisilicon/linux-hisi into next/arm64

ARM64: Hip05: configure updates for 4.6

- Enable DesignWare APB GPIO controller

* tag 'hip05-config-for-4.6' of git://github.com/hisilicon/linux-hisi:
  arm64: defconfig: Enable DesignWare APB GPIO controller
---

31cf19a14ce1d046983d638b84bf44cc9ddffe57
diff --cc arch/arm64/configs/defconfig
index a70b128a535f,a5eb1b723e39..459e96aec818
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -153,10 -140,8 +153,11 @@@ CONFIG_I2C_RCAR=
  CONFIG_SPI=y
  CONFIG_SPI_PL022=y
  CONFIG_SPI_QUP=y
 +CONFIG_SPMI=y
  CONFIG_PINCTRL_MSM8916=y
 +CONFIG_PINCTRL_QCOM_SPMI_PMIC=y
 +CONFIG_GPIO_SYSFS=y
+ CONFIG_GPIO_DWAPB=y
  CONFIG_GPIO_PL061=y
  CONFIG_GPIO_RCAR=y
  CONFIG_GPIO_XGENE=y