mirror of
https://github.com/torvalds/linux.git
synced 2024-11-06 20:21:57 +00:00
dfc25e4503
These cleanup patches are mainly move stuff around and should all
be harmless. They are mainly split out so that other branches can
be based on top to avoid conflicts.
Notable changes are:
* We finally remove all mach/timex.h, after CLOCK_TICK_RATE is no
longer used. (Uwe Kleine-König)
* The Qualcomm MSM platform is split out into legacy mach-msm and
new-style mach-qcom, to allow easier maintainance of the new
hardware support without regressions. (Kumar Gala)
* A rework of some of the Kconfig logic to simplify multiplatform
support (Rob Herring)
* Samsung Exynos gets closer to supporting multiplatform (Sachin
Kamat and others)
* mach-bcm3528 gets merged into mach-bcm (Stephen Warren)
* at91 gains some common clock framework support (Alexandre Belloni,
Jean-Jacques Hiblot and other French people).
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIVAwUAUz/yOWCrR//JCVInAQLOPBAAwTMkMrD8S8ggz6vfiQHZNdRPAC7NUJ46
+eYKmBVi5d6EdnjNuRElWENsh0ZosSAUFHrXsIC2NdH9sAJ9HOqWNNLymuA59Jo9
HZ/Ze6xQXDPNV7TROPoXuIli/2OCOXyyQHJsfI7h9V3PCx31qo0B5OdCxU0mtXK6
r1giREhnJFwfQMF/FTdnzhalFJoSjWwv/nkpNmQDJKRLKj9GzwQqItqw68gV6RzU
Gnt6YK+9xC1B0cfWTFhAm6kbr9i7mvHoMG5tE3no2uuJMn4K7TgeMqOyvPWhmUeB
EZi656szT1m5VfRWOqG+7coZO2VM4GO4NI0Xfin3GHllugOYls1il/FAfCPMLiwh
RvuOmQGCkLIpdkuHop5QaI/h1EzlHA59nzTjmGf1+wWPsm0CIg08XOD9izQbRnN9
EmRqn1/8POIi17xcWyeMp8LB0APsTI+IflZFaYprEY9VlLLA/Pd+7udULhs8Bq8y
1l6fB6aPZKnDKCBy/PEIR+y+EHFEbwfrx6zm/pxVDX6P5DlQMFWL78pdBoJUa2h8
3pm/bSzNU5OSz1nJMLJv2jBTtnM5BvFgQBUi2qJ9Lr+nUhJXKCJ80kE/nOlXoCIU
J952p3OhkYTQQcjuUVQeTXvRUOGB7mKok0pDFZNE6c7faqxTCudMABQq/KbMFstU
eE3cH5FyYj4=
=GcBb
-----END PGP SIGNATURE-----
Merge tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Pull ARM SoC cleanups from Arnd Bergmann:
"These cleanup patches are mainly move stuff around and should all be
harmless. They are mainly split out so that other branches can be
based on top to avoid conflicts.
Notable changes are:
- We finally remove all mach/timex.h, after CLOCK_TICK_RATE is no
longer used (Uwe Kleine-König)
- The Qualcomm MSM platform is split out into legacy mach-msm and
new-style mach-qcom, to allow easier maintainance of the new
hardware support without regressions (Kumar Gala)
- A rework of some of the Kconfig logic to simplify multiplatform
support (Rob Herring)
- Samsung Exynos gets closer to supporting multiplatform (Sachin
Kamat and others)
- mach-bcm3528 gets merged into mach-bcm (Stephen Warren)
- at91 gains some common clock framework support (Alexandre Belloni,
Jean-Jacques Hiblot and other French people)"
* tag 'cleanup-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (89 commits)
ARM: hisi: select HAVE_ARM_SCU only for SMP
ARM: efm32: allow uncompress debug output
ARM: prima2: build reset code standalone
ARM: at91: add PWM clock
ARM: at91: move sam9261 SoC to common clk
ARM: at91: prepare common clk transition for sam9261 SoC
ARM: at91: updated the at91_dt_defconfig with support for the ADS7846
ARM: at91: dt: sam9261: Device Tree support for the at91sam9261ek
ARM: at91: dt: defconfig: Added the sam9261 to the list of DT-enabled SOCs
ARM: at91: dt: Add at91sam9261 dt SoC support
ARM: at91: switch sam9rl to common clock framework
ARM: at91/dt: define main clk frequency of at91sam9rlek
ARM: at91/dt: define at91sam9rl clocks
ARM: at91: prepare common clk transition for sam9rl SoCs
ARM: at91: prepare sam9 dt boards transition to common clk
ARM: at91: dt: sam9rl: Device Tree for the at91sam9rlek
ARM: at91/defconfig: Add the sam9rl to the list of DT-enabled SOCs
ARM: at91: Add at91sam9rl DT SoC support
ARM: at91: prepare at91sam9rl DT transition
ARM: at91/defconfig: refresh at91sam9260_9g20_defconfig
...
94 lines
2.0 KiB
Plaintext
94 lines
2.0 KiB
Plaintext
#
|
|
# SPEAr Platform configuration file
|
|
#
|
|
|
|
menuconfig PLAT_SPEAR
|
|
bool "ST SPEAr Family" if ARCH_MULTI_V7 || ARCH_MULTI_V5
|
|
default PLAT_SPEAR_SINGLE
|
|
select ARCH_REQUIRE_GPIOLIB
|
|
select ARM_AMBA
|
|
select CLKSRC_MMIO
|
|
|
|
if PLAT_SPEAR
|
|
|
|
config ARCH_SPEAR13XX
|
|
bool "ST SPEAr13xx"
|
|
depends on ARCH_MULTI_V7 || PLAT_SPEAR_SINGLE
|
|
select ARCH_HAS_CPUFREQ
|
|
select ARM_GIC
|
|
select GPIO_SPEAR_SPICS
|
|
select HAVE_ARM_SCU if SMP
|
|
select HAVE_ARM_TWD if SMP
|
|
select PINCTRL
|
|
help
|
|
Supports for ARM's SPEAR13XX family
|
|
|
|
if ARCH_SPEAR13XX
|
|
|
|
config MACH_SPEAR1310
|
|
bool "SPEAr1310 Machine support with Device Tree"
|
|
select PINCTRL_SPEAR1310
|
|
help
|
|
Supports ST SPEAr1310 machine configured via the device-tree
|
|
|
|
config MACH_SPEAR1340
|
|
bool "SPEAr1340 Machine support with Device Tree"
|
|
select PINCTRL_SPEAR1340
|
|
help
|
|
Supports ST SPEAr1340 machine configured via the device-tree
|
|
|
|
endif #ARCH_SPEAR13XX
|
|
|
|
config ARCH_SPEAR3XX
|
|
bool "ST SPEAr3xx"
|
|
depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE
|
|
depends on !ARCH_SPEAR13XX
|
|
select ARM_VIC
|
|
select PINCTRL
|
|
help
|
|
Supports for ARM's SPEAR3XX family
|
|
|
|
if ARCH_SPEAR3XX
|
|
|
|
config MACH_SPEAR300
|
|
bool "SPEAr300 Machine support with Device Tree"
|
|
select PINCTRL_SPEAR300
|
|
help
|
|
Supports ST SPEAr300 machine configured via the device-tree
|
|
|
|
config MACH_SPEAR310
|
|
bool "SPEAr310 Machine support with Device Tree"
|
|
select PINCTRL_SPEAR310
|
|
help
|
|
Supports ST SPEAr310 machine configured via the device-tree
|
|
|
|
config MACH_SPEAR320
|
|
bool "SPEAr320 Machine support with Device Tree"
|
|
select PINCTRL_SPEAR320
|
|
help
|
|
Supports ST SPEAr320 machine configured via the device-tree
|
|
|
|
endif
|
|
|
|
config ARCH_SPEAR6XX
|
|
bool "ST SPEAr6XX"
|
|
depends on ARCH_MULTI_V5 || PLAT_SPEAR_SINGLE
|
|
depends on !ARCH_SPEAR13XX
|
|
select ARM_VIC
|
|
help
|
|
Supports for ARM's SPEAR6XX family
|
|
|
|
config MACH_SPEAR600
|
|
def_bool y
|
|
depends on ARCH_SPEAR6XX
|
|
help
|
|
Supports ST SPEAr600 boards configured via the device-tree
|
|
|
|
config ARCH_SPEAR_AUTO
|
|
def_bool PLAT_SPEAR_SINGLE
|
|
depends on !ARCH_SPEAR13XX && !ARCH_SPEAR6XX
|
|
select ARCH_SPEAR3XX
|
|
|
|
endif
|
|
|