mirror of
https://github.com/torvalds/linux.git
synced 2024-12-04 18:13:04 +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
...
194 lines
4.7 KiB
Plaintext
194 lines
4.7 KiB
Plaintext
config CLKSRC_OF
|
|
bool
|
|
|
|
config CLKSRC_I8253
|
|
bool
|
|
|
|
config CLKEVT_I8253
|
|
bool
|
|
|
|
config I8253_LOCK
|
|
bool
|
|
|
|
config CLKBLD_I8253
|
|
def_bool y if CLKSRC_I8253 || CLKEVT_I8253 || I8253_LOCK
|
|
|
|
config CLKSRC_MMIO
|
|
bool
|
|
|
|
config DW_APB_TIMER
|
|
bool
|
|
|
|
config DW_APB_TIMER_OF
|
|
bool
|
|
select DW_APB_TIMER
|
|
select CLKSRC_OF
|
|
|
|
config ARMADA_370_XP_TIMER
|
|
bool
|
|
select CLKSRC_OF
|
|
|
|
config ORION_TIMER
|
|
select CLKSRC_OF
|
|
select CLKSRC_MMIO
|
|
bool
|
|
|
|
config SUN4I_TIMER
|
|
select CLKSRC_MMIO
|
|
bool
|
|
|
|
config SUN5I_HSTIMER
|
|
select CLKSRC_MMIO
|
|
bool
|
|
|
|
config VT8500_TIMER
|
|
bool
|
|
|
|
config CADENCE_TTC_TIMER
|
|
bool
|
|
|
|
config CLKSRC_NOMADIK_MTU
|
|
bool
|
|
depends on (ARCH_NOMADIK || ARCH_U8500)
|
|
select CLKSRC_MMIO
|
|
help
|
|
Support for Multi Timer Unit. MTU provides access
|
|
to multiple interrupt generating programmable
|
|
32-bit free running decrementing counters.
|
|
|
|
config CLKSRC_NOMADIK_MTU_SCHED_CLOCK
|
|
bool
|
|
depends on CLKSRC_NOMADIK_MTU
|
|
help
|
|
Use the Multi Timer Unit as the sched_clock.
|
|
|
|
config CLKSRC_DBX500_PRCMU
|
|
bool "Clocksource PRCMU Timer"
|
|
depends on UX500_SOC_DB8500
|
|
default y
|
|
help
|
|
Use the always on PRCMU Timer as clocksource
|
|
|
|
config CLKSRC_DBX500_PRCMU_SCHED_CLOCK
|
|
bool "Clocksource PRCMU Timer sched_clock"
|
|
depends on (CLKSRC_DBX500_PRCMU && !CLKSRC_NOMADIK_MTU_SCHED_CLOCK)
|
|
default y
|
|
help
|
|
Use the always on PRCMU Timer as sched_clock
|
|
|
|
config CLKSRC_EFM32
|
|
bool "Clocksource for Energy Micro's EFM32 SoCs" if !ARCH_EFM32
|
|
depends on OF && ARM && (ARCH_EFM32 || COMPILE_TEST)
|
|
select CLKSRC_MMIO
|
|
default ARCH_EFM32
|
|
help
|
|
Support to use the timers of EFM32 SoCs as clock source and clock
|
|
event device.
|
|
|
|
config ARM_ARCH_TIMER
|
|
bool
|
|
select CLKSRC_OF if OF
|
|
|
|
config ARM_ARCH_TIMER_EVTSTREAM
|
|
bool "Support for ARM architected timer event stream generation"
|
|
default y if ARM_ARCH_TIMER
|
|
depends on ARM_ARCH_TIMER
|
|
help
|
|
This option enables support for event stream generation based on
|
|
the ARM architected timer. It is used for waking up CPUs executing
|
|
the wfe instruction at a frequency represented as a power-of-2
|
|
divisor of the clock rate.
|
|
The main use of the event stream is wfe-based timeouts of userspace
|
|
locking implementations. It might also be useful for imposing timeout
|
|
on wfe to safeguard against any programming errors in case an expected
|
|
event is not generated.
|
|
This must be disabled for hardware validation purposes to detect any
|
|
hardware anomalies of missing events.
|
|
|
|
config ARM_GLOBAL_TIMER
|
|
bool
|
|
select CLKSRC_OF if OF
|
|
help
|
|
This options enables support for the ARM global timer unit
|
|
|
|
config CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
|
|
bool
|
|
depends on ARM_GLOBAL_TIMER
|
|
default y
|
|
help
|
|
Use ARM global timer clock source as sched_clock
|
|
|
|
config CLKSRC_METAG_GENERIC
|
|
def_bool y if METAG
|
|
help
|
|
This option enables support for the Meta per-thread timers.
|
|
|
|
config CLKSRC_EXYNOS_MCT
|
|
def_bool y if ARCH_EXYNOS
|
|
help
|
|
Support for Multi Core Timer controller on Exynos SoCs.
|
|
|
|
config CLKSRC_SAMSUNG_PWM
|
|
bool
|
|
help
|
|
This is a new clocksource driver for the PWM timer found in
|
|
Samsung S3C, S5P and Exynos SoCs, replacing an earlier driver
|
|
for all devicetree enabled platforms. This driver will be
|
|
needed only on systems that do not have the Exynos MCT available.
|
|
|
|
config VF_PIT_TIMER
|
|
bool
|
|
help
|
|
Support for Period Interrupt Timer on Freescale Vybrid Family SoCs.
|
|
|
|
config SYS_SUPPORTS_SH_CMT
|
|
bool
|
|
|
|
config SYS_SUPPORTS_SH_MTU2
|
|
bool
|
|
|
|
config SYS_SUPPORTS_SH_TMU
|
|
bool
|
|
|
|
config SYS_SUPPORTS_EM_STI
|
|
bool
|
|
|
|
config SH_TIMER_CMT
|
|
bool "Renesas CMT timer driver" if COMPILE_TEST
|
|
depends on GENERIC_CLOCKEVENTS
|
|
default SYS_SUPPORTS_SH_CMT
|
|
help
|
|
This enables build of a clocksource and clockevent driver for
|
|
the Compare Match Timer (CMT) hardware available in 16/32/48-bit
|
|
variants on a wide range of Mobile and Automotive SoCs from Renesas.
|
|
|
|
config SH_TIMER_MTU2
|
|
bool "Renesas MTU2 timer driver" if COMPILE_TEST
|
|
depends on GENERIC_CLOCKEVENTS
|
|
default SYS_SUPPORTS_SH_MTU2
|
|
help
|
|
This enables build of a clockevent driver for the Multi-Function
|
|
Timer Pulse Unit 2 (TMU2) hardware available on SoCs from Renesas.
|
|
This hardware comes with 16 bit-timer registers.
|
|
|
|
config SH_TIMER_TMU
|
|
bool "Renesas TMU timer driver" if COMPILE_TEST
|
|
depends on GENERIC_CLOCKEVENTS
|
|
default SYS_SUPPORTS_SH_TMU
|
|
help
|
|
This enables build of a clocksource and clockevent driver for
|
|
the 32-bit Timer Unit (TMU) hardware available on a wide range
|
|
SoCs from Renesas.
|
|
|
|
config EM_TIMER_STI
|
|
bool "Renesas STI timer driver" if COMPILE_TEST
|
|
depends on GENERIC_CLOCKEVENTS
|
|
default SYS_SUPPORTS_EM_STI
|
|
help
|
|
This enables build of a clocksource and clockevent driver for
|
|
the 48-bit System Timer (STI) hardware available on a SoCs
|
|
such as EMEV2 from former NEC Electronics.
|
|
|
|
config CLKSRC_QCOM
|
|
bool
|