diff options
| author | Olof Johansson <olof@lixom.net> | 2017-04-19 05:32:46 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-04-19 05:32:46 -0700 |
| commit | 309ed7e6e4497ee55bc242cfc6517d805eeb1893 (patch) | |
| tree | 35b96d7b2b76ecec24c23d784b372ead4f4e799f | |
| parent | e1c98a27208268dd0484218dd74706ec832cd0d2 (diff) | |
| parent | 565fbac18efef447a6a97325664c77ddcbe82936 (diff) | |
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>
| -rw-r--r-- | arch/arm64/Kconfig.platforms | 1 | ||||
| -rw-r--r-- | arch/arm64/configs/defconfig | 1 |
2 files changed, 1 insertions, 1 deletions
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. diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index ab4461b6b226..ea187ac2f554 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -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 |