Commit 309ed7e6 authored Apr 19, 2017 by Olof Johansson

Merge tag 'sunxi-config64-for-4.12' of...

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

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>

parents e1c98a27 565fbac1

arch/arm64/Kconfig.platforms

+0 −1

Original line number	Diff line number	Diff line
		@@ -4,7 +4,6 @@ config ARCH_SUNXI
		bool "Allwinner sunxi 64-bit SoC Family"
		select GENERIC_IRQ_CHIP
		select PINCTRL
		select PINCTRL_SUN50I_A64
		help
		This enables support for Allwinner sunxi based SoCs like the A64.

arch/arm64/configs/defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -476,6 +476,7 @@ CONFIG_PHY_RCAR_GEN3_USB2=y
		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

Admin message