Merge tag 'sunxi-config64-for-4.6' of https://git.kernel.org/pub/scm/linux/kernel...

Merge "Allwinner configuration changes for ARM64, 4.6 edition" from Maxime Ripard:

Not a lot of changes for this kernel release, just a new Kconfig option and
some changes to the arm64 defconfig to add Allwinner drivers

* tag 'sunxi-config64-for-4.6' of https://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  arm64: add defconfig options for Allwinner SoCs
  arm64: Introduce Allwinner SoC config option

diff --cc arch/arm64/Kconfig.platforms
index c617777f3c9a8948becb694ab24290d9d127ab55,3f9d5ed96cc825764c901520ebf1b0331a69c97e..21cf8e620b7048e3dcc8ee1bac42128813616c4f
--- 1/arch/arm64/Kconfig.platforms
--- 2/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@@ -1,17 -1,12 +1,22 @@@
  menu "Platform selection"
  
+ config ARCH_SUNXI
+       bool "Allwinner sunxi 64-bit SoC Family"
+       help
+         This enables support for Allwinner sunxi based SoCs like the A64.
+ 
 +config ARCH_ALPINE
 +      bool "Annapurna Labs Alpine platform"
 +      select ALPINE_MSI
 +      help
 +        This enables support for the Annapurna Labs Alpine
 +        Soc family.
 +
  config ARCH_BCM_IPROC
        bool "Broadcom iProc SoC Family"
 +      select COMMON_CLK_IPROC
 +      select PINCTRL
 +      select ARCH_REQUIRE_GPIOLIB
        help
          This enables support for Broadcom iProc based SoCs
  

diff --cc arch/arm64/configs/defconfig
index 73db43c2e71f31163054f7c89c45e08b593f9018,7acadce74d4d2ab369665b64bf20f8e89a95e5b0..a70b128a535f3b9b92338a95e02e9485e922565b
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -30,7 -31,7 +30,8 @@@ 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
@@@ -136,22 -127,24 +137,26 @@@ CONFIG_SERIAL_TEGRA=
  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_PL061=y
  CONFIG_GPIO_RCAR=y
  CONFIG_GPIO_XGENE=y
@@@ -198,8 -179,12 +203,10 @@@ CONFIG_MMC_SDHCI=
  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
@@@ -208,14 -193,12 +215,15 @@@ 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