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

Allwinner arm64 config changes for 4.12

Two patches to change our Kconfig option and add new options in the
defconfig.

* tag 'sunxi-config64-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  arm64: defconfig: add Allwinner USB PHY
  arm64: only select PINCTRL for Allwinner platforms

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined arch/arm64/configs/defconfig
index ab4461b6b226b92b3ed8975785df5a6b4b94111c,6179ba6a656199f34eafb7f2736337274ae7c5e9..ea187ac2f55407188f3790eb29fdef954d8f908b
--- 1/arch/arm64/configs/defconfig
--- 2/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
@@@ -185,8 -185,6 +185,8 @@@ CONFIG_HNS_ENET=
  CONFIG_E1000E=y
  CONFIG_IGB=y
  CONFIG_IGBVF=y
 +CONFIG_MVPP2=y
 +CONFIG_MVNETA=y
  CONFIG_SKY2=y
  CONFIG_RAVB=y
  CONFIG_SMC91X=y
@@@ -251,10 -249,8 +251,10 @@@ CONFIG_I2C_DESIGNWARE_PLATFORM=
  CONFIG_I2C_IMX=y
  CONFIG_I2C_MESON=y
  CONFIG_I2C_MV64XXX=y
 +CONFIG_I2C_PXA=y
  CONFIG_I2C_QUP=y
  CONFIG_I2C_RK3X=y
 +CONFIG_I2C_SH_MOBILE=y
  CONFIG_I2C_TEGRA=y
  CONFIG_I2C_UNIPHIER_F=y
  CONFIG_I2C_RCAR=y
@@@ -402,14 -398,11 +402,14 @@@ CONFIG_MMC_DW_EXYNOS=
  CONFIG_MMC_DW_K3=y
  CONFIG_MMC_DW_ROCKCHIP=y
  CONFIG_MMC_SUNXI=y
 +CONFIG_MMC_BCM2835=y
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=y
  CONFIG_LEDS_GPIO=y
 +CONFIG_LEDS_PWM=y
  CONFIG_LEDS_SYSCON=y
  CONFIG_LEDS_TRIGGERS=y
 +CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
  CONFIG_LEDS_TRIGGER_HEARTBEAT=y
  CONFIG_LEDS_TRIGGER_CPU=y
  CONFIG_RTC_CLASS=y
@@@ -476,6 -469,7 +476,7 @@@ CONFIG_PHY_RCAR_GEN3_USB2=
  CONFIG_PHY_HI6220_USB=y
  CONFIG_PHY_ROCKCHIP_INNO_USB2=y
  CONFIG_PHY_ROCKCHIP_EMMC=y
+ CONFIG_PHY_SUN4I_USB=y
  CONFIG_PHY_XGENE=y
  CONFIG_PHY_TEGRA_XUSB=y
  CONFIG_ARM_SCPI_PROTOCOL=y