mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-06-24 10:31:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Olof Johansson
2017-04-19 05:32:46 -07:00
parent e1c98a2720 565fbac18e
commit 309ed7e6e4
2 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm64/Kconfig.platforms
View File

@@ -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.

1
arch/arm64/configs/defconfig
View File

@@ -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