From 28ebb7700c650d59d321fd71db119feb7f8dda0a Mon Sep 17 00:00:00 2001 From: Icenowy Zheng Date: Thu, 2 Mar 2017 02:01:08 +0800 Subject: [PATCH 1/2] arm64: only select PINCTRL for Allwinner platforms As the pinctrl driver selecting is refactored in Kconfig file of pinctrl-sunxi, now we can select only PINCTRL for Allwinner platform, and the default value of several pinctrl drivers useful on ARM64 Allwinner SoCs will become Y. This is the situation of 32-bit ARM ARCH_SUNXI option. Drop the select of per-SoC pinctrl choices, but keep selecting PINCTRL. Signed-off-by: Icenowy Zheng Acked-by: Linus Walleij Signed-off-by: Maxime Ripard --- arch/arm64/Kconfig.platforms | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms index 129cc5ae4091..ff867b8d7810 100644 --- a/arch/arm64/Kconfig.platforms +++ b/arch/arm64/Kconfig.platforms @@ -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. From 565fbac18efef447a6a97325664c77ddcbe82936 Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Fri, 24 Mar 2017 00:20:02 +0000 Subject: [PATCH 2/2] arm64: defconfig: add Allwinner USB PHY The arm64 defconfig covers the Allwinner A64 SoC boards quite well, but USB support is not enabled. Add the PHY config symbol to allow defconfig kernels to use USB. Signed-off-by: Andre Przywara Signed-off-by: Maxime Ripard --- arch/arm64/configs/defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 7c48028ec64a..6179ba6a6561 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -469,6 +469,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