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

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

diff --combined arch/arm64/configs/defconfig
index a70b128a535f3b9b92338a95e02e9485e922565b,a5eb1b723e3992d4fbac46bf535d500c3caa16c2..459e96aec8184528e44488df706b2957147e33ce
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -16,6 -16,7 +16,6 @@@ CONFIG_IKCONFIG_PROC=
  CONFIG_LOG_BUF_SHIFT=14
  CONFIG_MEMCG=y
  CONFIG_MEMCG_SWAP=y
 -CONFIG_MEMCG_KMEM=y
  CONFIG_CGROUP_HUGETLB=y
  # CONFIG_UTS_NS is not set
  # CONFIG_IPC_NS is not set
@@@ -30,44 -31,37 +30,44 @@@ CONFIG_MODULES=
  CONFIG_MODULE_UNLOAD=y
  # CONFIG_BLK_DEV_BSG is not set
  # CONFIG_IOSCHED_DEADLINE is not set
 +CONFIG_ARCH_SUNXI=y
 +CONFIG_ARCH_ALPINE=y
  CONFIG_ARCH_BCM_IPROC=y
  CONFIG_ARCH_BERLIN=y
  CONFIG_ARCH_EXYNOS7=y
  CONFIG_ARCH_LAYERSCAPE=y
  CONFIG_ARCH_HISI=y
  CONFIG_ARCH_MEDIATEK=y
 +CONFIG_ARCH_MVEBU=y
 +CONFIG_ARCH_QCOM=y
  CONFIG_ARCH_ROCKCHIP=y
  CONFIG_ARCH_SEATTLE=y
  CONFIG_ARCH_RENESAS=y
  CONFIG_ARCH_R8A7795=y
  CONFIG_ARCH_STRATIX10=y
  CONFIG_ARCH_TEGRA=y
 -CONFIG_ARCH_TEGRA_132_SOC=y
 -CONFIG_ARCH_TEGRA_210_SOC=y
 -CONFIG_ARCH_QCOM=y
  CONFIG_ARCH_SPRD=y
  CONFIG_ARCH_THUNDER=y
  CONFIG_ARCH_UNIPHIER=y
  CONFIG_ARCH_VEXPRESS=y
 +CONFIG_ARCH_VULCAN=y
  CONFIG_ARCH_XGENE=y
  CONFIG_ARCH_ZYNQMP=y
  CONFIG_PCI=y
  CONFIG_PCI_MSI=y
 +CONFIG_PCI_IOV=y
 +CONFIG_PCI_RCAR_GEN2_PCIE=y
  CONFIG_PCI_HOST_GENERIC=y
  CONFIG_PCI_XGENE=y
 -CONFIG_SMP=y
 +CONFIG_PCI_LAYERSCAPE=y
 +CONFIG_PCI_HISI=y
 +CONFIG_PCIE_QCOM=y
  CONFIG_SCHED_MC=y
  CONFIG_PREEMPT=y
  CONFIG_KSM=y
  CONFIG_TRANSPARENT_HUGEPAGE=y
  CONFIG_CMA=y
 +CONFIG_XEN=y
  CONFIG_CMDLINE="console=ttyAMA0"
  # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
  CONFIG_COMPAT=y
@@@ -99,7 -93,6 +99,7 @@@ CONFIG_ATA=
  CONFIG_SATA_AHCI=y
  CONFIG_SATA_AHCI_PLATFORM=y
  CONFIG_AHCI_CEVA=y
 +CONFIG_AHCI_MVEBU=y
  CONFIG_AHCI_XGENE=y
  CONFIG_SATA_RCAR=y
  CONFIG_PATA_PLATFORM=y
@@@ -107,11 -100,7 +107,11 @@@ CONFIG_PATA_OF_PLATFORM=
  CONFIG_NETDEVICES=y
  CONFIG_TUN=y
  CONFIG_VIRTIO_NET=y
 +CONFIG_AMD_XGBE=y
  CONFIG_NET_XGENE=y
 +CONFIG_E1000E=y
 +CONFIG_IGB=y
 +CONFIG_IGBVF=y
  CONFIG_SKY2=y
  CONFIG_RAVB=y
  CONFIG_SMC91X=y
@@@ -128,46 -117,40 +128,47 @@@ CONFIG_SERIAL_8250_CONSOLE=
  CONFIG_SERIAL_8250_DW=y
  CONFIG_SERIAL_8250_MT6577=y
  CONFIG_SERIAL_8250_UNIPHIER=y
 +CONFIG_SERIAL_OF_PLATFORM=y
  CONFIG_SERIAL_AMBA_PL011=y
  CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
  CONFIG_SERIAL_SAMSUNG=y
 -CONFIG_SERIAL_SAMSUNG_UARTS_4=y
 -CONFIG_SERIAL_SAMSUNG_UARTS=4
  CONFIG_SERIAL_SAMSUNG_CONSOLE=y
 +CONFIG_SERIAL_TEGRA=y
  CONFIG_SERIAL_SH_SCI=y
  CONFIG_SERIAL_SH_SCI_NR_UARTS=11
  CONFIG_SERIAL_SH_SCI_CONSOLE=y
 -CONFIG_SERIAL_TEGRA=y
  CONFIG_SERIAL_MSM=y
  CONFIG_SERIAL_MSM_CONSOLE=y
 -CONFIG_SERIAL_OF_PLATFORM=y
  CONFIG_SERIAL_XILINX_PS_UART=y
  CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y
 +CONFIG_SERIAL_MVEBU_UART=y
  CONFIG_VIRTIO_CONSOLE=y
  # CONFIG_HW_RANDOM is not set
  CONFIG_I2C=y
 +CONFIG_I2C_CHARDEV=y
 +CONFIG_I2C_MV64XXX=y
  CONFIG_I2C_QUP=y
 +CONFIG_I2C_UNIPHIER_F=y
  CONFIG_I2C_RCAR=y
  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
  CONFIG_POWER_RESET_XGENE=y
  CONFIG_POWER_RESET_SYSCON=y
  # CONFIG_HWMON is not set
 +CONFIG_MFD_SPMI_PMIC=y
  CONFIG_REGULATOR=y
  CONFIG_REGULATOR_FIXED_VOLTAGE=y
  CONFIG_REGULATOR_QCOM_SMD_RPM=y
 +CONFIG_REGULATOR_QCOM_SPMI=y
  CONFIG_FB=y
  CONFIG_FB_ARMCLCD=y
  CONFIG_FRAMEBUFFER_CONSOLE=y
@@@ -180,33 -163,23 +181,33 @@@ CONFIG_SND_SOC=
  CONFIG_SND_SOC_RCAR=y
  CONFIG_SND_SOC_AK4613=y
  CONFIG_USB=y
 +CONFIG_USB_OTG=y
 +CONFIG_USB_XHCI_HCD=y
 +CONFIG_USB_XHCI_PLATFORM=y
  CONFIG_USB_EHCI_HCD=y
 +CONFIG_USB_EHCI_MSM=y
  CONFIG_USB_EHCI_HCD_PLATFORM=y
  CONFIG_USB_OHCI_HCD=y
  CONFIG_USB_OHCI_HCD_PLATFORM=y
  CONFIG_USB_STORAGE=y
 +CONFIG_USB_CHIPIDEA=y
 +CONFIG_USB_CHIPIDEA_UDC=y
 +CONFIG_USB_CHIPIDEA_HOST=y
  CONFIG_USB_ISP1760=y
 +CONFIG_USB_HSIC_USB3503=y
 +CONFIG_USB_MSM_OTG=y
  CONFIG_USB_ULPI=y
 +CONFIG_USB_GADGET=y
  CONFIG_MMC=y
  CONFIG_MMC_ARMMMCI=y
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_PLTFM=y
  CONFIG_MMC_SDHCI_TEGRA=y
  CONFIG_MMC_SPI=y
 +CONFIG_MMC_SUNXI=y
  CONFIG_MMC_DW=y
 -CONFIG_MMC_DW_IDMAC=y
 -CONFIG_MMC_DW_PLTFM=y
  CONFIG_MMC_DW_EXYNOS=y
 +CONFIG_MMC_BLOCK_MINORS=16
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=y
  CONFIG_LEDS_SYSCON=y
@@@ -215,36 -188,28 +216,36 @@@ CONFIG_LEDS_TRIGGER_HEARTBEAT=
  CONFIG_LEDS_TRIGGER_CPU=y
  CONFIG_RTC_CLASS=y
  CONFIG_RTC_DRV_EFI=y
 +CONFIG_RTC_DRV_PL031=y
 +CONFIG_RTC_DRV_SUN6I=y
  CONFIG_RTC_DRV_XGENE=y
  CONFIG_DMADEVICES=y
 -CONFIG_RCAR_DMAC=y
  CONFIG_QCOM_BAM_DMA=y
  CONFIG_TEGRA20_APB_DMA=y
 +CONFIG_RCAR_DMAC=y
 +CONFIG_VFIO=y
 +CONFIG_VFIO_PCI=y
  CONFIG_VIRTIO_PCI=y
  CONFIG_VIRTIO_BALLOON=y
  CONFIG_VIRTIO_MMIO=y
 +CONFIG_XEN_GNTDEV=y
 +CONFIG_XEN_GRANT_DEV_ALLOC=y
  CONFIG_COMMON_CLK_CS2000_CP=y
  CONFIG_COMMON_CLK_QCOM=y
  CONFIG_MSM_GCC_8916=y
  CONFIG_HWSPINLOCK_QCOM=y
 -# CONFIG_IOMMU_SUPPORT is not set
 +CONFIG_ARM_SMMU=y
  CONFIG_QCOM_SMEM=y
  CONFIG_QCOM_SMD=y
  CONFIG_QCOM_SMD_RPM=y
 +CONFIG_ARCH_TEGRA_132_SOC=y
 +CONFIG_ARCH_TEGRA_210_SOC=y
 +CONFIG_HISILICON_IRQ_MBIGEN=y
 +CONFIG_EXTCON_USB_GPIO=y
 +CONFIG_PHY_RCAR_GEN3_USB2=y
  CONFIG_PHY_XGENE=y
  CONFIG_EXT2_FS=y
  CONFIG_EXT3_FS=y
 -# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
 -# CONFIG_EXT3_FS_XATTR is not set
 -CONFIG_EXT4_FS=y
  CONFIG_FANOTIFY=y
  CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
  CONFIG_QUOTA=y
@@@ -275,7 -240,6 +276,7 @@@ CONFIG_LOCKUP_DETECTOR=
  # CONFIG_FTRACE is not set
  CONFIG_MEMTEST=y
  CONFIG_SECURITY=y
 +CONFIG_CRYPTO_ECHAINIV=y
  CONFIG_CRYPTO_ANSI_CPRNG=y
  CONFIG_ARM64_CRYPTO=y
  CONFIG_CRYPTO_SHA1_ARM64_CE=y