mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-05 08:26:59 +00:00
Code Issues Releases Wiki Activity

Allwinner SoCs core additions for 3.16

Browse source 
Refactor the Kconfig options to have one Kconfig option per machine.
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABAgAGBQJTdehEAAoJEBx+YmzsjxAgp4gQAKblJMMaz7vEN/H/FO3Jn/dI
 7uAMuTWL/m2RDOIE/oOuxipRg0dvoL+lEOR4BiuPiSjRKHO5Lzw+OWvh18xfPXZg
 sfoIoutDa5a8DuBpQMTmgbr/8BMDV5jlJOG8VLE8I3l4gtU1buZM9uxJWLzfv7vs
 s/rhPBW5O+vmQ/wdD7CKyxPo57Cz5Y0fbgv7tE91zbKidN9bp8YEFT2UFwtoh/Xh
 0YtLTDduz38wzpfMco17hDVK6lNg1Y10kb6k8dos2QOrsUDFTx6lDBeMPI5NqsXI
 hEjGRWmGm3tqF4LfaDkYyYXkmnhCdEonKN9r7YzavtbI6xpKtBmKB60acqVMusL7
 i4zirrl6F42y84troeZafdPbEWS/NmT9k2oSCZZnEoRtpd9w/G7XaCaAY8saQwVT
 Lw4AaxoY5TlpWELV8t6deN2D0dVRwcxobvaOmJMAZ6g480hEnQ5z84U6Vqrs/rkc
 szbmAx0UxJEr87IXORDKCLIud6OORPM/ccRzgiGNf76fKxwPcCYwjL/PaDcKHSJf
 BAHL2IAN1oSpj+CrfXKN13RHIMK6VZ9W/dUqsqD0YnU3iNI7njAW3JONM85fwgQS
 bniSLMFC/G4GvIq3D2GPQ8yx5pVlyZ49gU0tlvTV98yCxp1WNMv1xndt22Z9I6Mw
 +AgfQZ6ef1sFQgVQ8wBq
 =so0P
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2014-05-21 14:35:04 -07:00
commit 16ae66cc33
1 changed files with 31 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
arch/arm/mach-sunxi/Kconfig
View file

@ -1,14 +1,38 @@
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