Commit 16ae66cc authored by Olof Johansson's avatar Olof Johansson

Merge tag 'sunxi-core-for-3.16' of https://github.com/mripard/linux into next/soc

Merge "Allwinner SoCs core additions for 3.16" from Maxime Ripard:

Refactor the Kconfig options to have one Kconfig option per machine.

* tag 'sunxi-core-for-3.16' of https://github.com/mripard/linux:
  ARM: sunxi: select MFD_SUN6I_PRCM when sun6i arch support is enabled
  ARM: sunxi: Split the various SoCs support in Kconfig
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 96c2ac4c 324da938
config ARCH_SUNXI
bool "Allwinner A1X SOCs" if ARCH_MULTI_V7
select ARCH_HAS_RESET_CONTROLLER
menuconfig ARCH_SUNXI
bool "Allwinner SoCs" if ARCH_MULTI_V7
select ARCH_REQUIRE_GPIOLIB
select ARM_GIC
select ARM_PSCI
select CLKSRC_MMIO
select GENERIC_IRQ_CHIP
select HAVE_ARM_ARCH_TIMER
select PINCTRL
select PINCTRL_SUNXI
select RESET_CONTROLLER
select SUN4I_TIMER
if ARCH_SUNXI
config MACH_SUN4I
bool "Allwinner A10 (sun4i) SoCs support"
default ARCH_SUNXI
config MACH_SUN5I
bool "Allwinner A10s / A13 (sun5i) SoCs support"
default ARCH_SUNXI
select SUN5I_HSTIMER
config MACH_SUN6I
bool "Allwinner A31 (sun6i) SoCs support"
default ARCH_SUNXI
select ARCH_HAS_RESET_CONTROLLER
select ARM_GIC
select MFD_SUN6I_PRCM
select RESET_CONTROLLER
select SUN5I_HSTIMER
config MACH_SUN7I
bool "Allwinner A20 (sun7i) SoCs support"
default ARCH_SUNXI
select ARM_GIC
select ARM_PSCI
select HAVE_ARM_ARCH_TIMER
select SUN5I_HSTIMER
endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment