clockevents: last minute 4.5 fixes
Hi Thomas,
here is a couple of fixes to be applied on top of tip/timers/core where the Kconfig dependency is fixed for the fsl_ftm timer and for the architecture not having the iomem API.
- Select the CLKSRC_MMIO when the fsl_ftm_timer is enabled withCOMPILE_TEST (Daniel Lezcano)
- Prevent to compile timers using the 'iomem' API when the
architecture has not HAS_IOMEM set (Richard Weinberger)
Thanks !
-- Daniel
The following changes since commit 01414888eaf725a677171605cb051b1c6311e6ab:
clocksource/drivers/acpi_pm: Convert to pr_* macros (2015-12-29
12:52:57 +0100)
are available in the git repository at:
http://git.linaro.org/people/daniel.lezcano/linux.git
clockevents/4.5-fixes
for you to fetch changes up to e736f67872126f7b24803883f10ad7d621221d01:
clocksource/drivers/fsl_ftm_timer: Fix CLKSRC_MMIO dependency
(2016-01-08 14:21:31 +0100)
----------------------------------------------------------------
Daniel Lezcano (1):
clocksource/drivers/fsl_ftm_timer: Fix CLKSRC_MMIO dependency
Richard Weinberger (1):
clocksource/drivers: Fix dependencies for !HAS_IOMEM archs
drivers/clocksource/Kconfig | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog
PATCH 1/2 clocksource/drivers: Fix dependencies for !HAS_IOMEM archs
From: Richard Weinberger <[email protected]>
Not every arch has io memory.
So, unbreak the build by fixing the dependencies.
--- drivers/clocksource/Kconfig | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/clocksource/Kconfig +7 -5
@@ -152,7 +152,7 @@ config CLKSRC_EFM32 config CLKSRC_LPC32XX bool "Clocksource for LPC32XX" if COMPILE_TEST - depends on GENERIC_CLOCKEVENTS + depends on GENERIC_CLOCKEVENTS && HAS_IOMEM select CLKSRC_MMIO select CLKSRC_OF help
@@ -160,6 +160,7 @@ config CLKSRC_LPC32XX config CLKSRC_PISTACHIO bool "Clocksource for Pistachio SoC" if COMPILE_TEST + depends on HAS_IOMEM select CLKSRC_OF help Enables the clocksource for the Pistachio SoC.
@@ -269,7 +270,7 @@ config SYS_SUPPORTS_SH_CMT config MTK_TIMER bool "Mediatek timer driver" if COMPILE_TEST - depends on GENERIC_CLOCKEVENTS + depends on GENERIC_CLOCKEVENTS && HAS_IOMEM select CLKSRC_OF select CLKSRC_MMIO help
@@ -365,20 +366,20 @@ config CLKSRC_PXA config H8300_TMR8 bool "Clockevent timer for the H8300 platform" if COMPILE_TEST - depends on GENERIC_CLOCKEVENTS + depends on GENERIC_CLOCKEVENTS && HAS_IOMEM help This enables the 8 bits timer for the H8300 platform. config H8300_TMR16 bool "Clockevent timer for the H83069 platform" if COMPILE_TEST - depends on GENERIC_CLOCKEVENTS + depends on GENERIC_CLOCKEVENTS && HAS_IOMEM help This enables the 16 bits timer for the H8300 platform with the H83069 cpu. config H8300_TPU bool "Clocksource for the H8300 platform" if COMPILE_TEST - depends on GENERIC_CLOCKEVENTS + depends on GENERIC_CLOCKEVENTS && HAS_IOMEM help This enables the clocksource for the H8300 platform with the H8S2678 cpu.
@@ -391,6 +392,7 @@ config CLKSRC_IMX_GPT config CLKSRC_ST_LPC bool "Low power clocksource found in the LPC" if COMPILE_TEST select CLKSRC_OF if OF + depends on HAS_IOMEM help Enable this option to use the Low Power controller timer as clocksource.
Signature · 1 line
1.9.1
PATCH 2/2 clocksource/drivers/fsl_ftm_timer: Fix CLKSRC_MMIO dependency
Select CLKSRC_MMIO when FSL_FTM_TIMER is enabled. Otherwise it fails to compile on i386 with COMPILE_TEST=y.
"
on i386:
when CLKSRC_MMIO is not enabled:
drivers/built-in.o: In function `ftm_timer_init':
fsl_ftm_timer.c:(.init.text+0x6842): undefined reference to clocksource_mmio_readl_up' fsl_ftm_timer.c:(.init.text+0x6855): undefined reference to clocksource_mmio_init' "
--- drivers/clocksource/Kconfig | 1 + 1 file changed, 1 insertion(+)
drivers/clocksource/Kconfig +1 -0
@@ -257,6 +257,7 @@ config CLKSRC_SAMSUNG_PWM config FSL_FTM_TIMER bool "Freescale FlexTimer Module driver" if COMPILE_TEST depends on GENERIC_CLOCKEVENTS + select CLKSRC_MMIO help Support for Freescale FlexTimer Module (FTM) timer.
Signature · 1 line
1.9.1
Re: [PATCH 1/2] clocksource/drivers: Fix dependencies for !HAS_IOMEM archs
In reply to Daniel LezcanoAm 11.01.2016 um 17:45 schrieb Daniel Lezcano:
Quoted 9 lines
From: Richard Weinberger <[email protected]>
Not every arch has io memory.
So, unbreak the build by fixing the dependencies.
Signed-off-by Richard Weinberger <[email protected]>Signed-off-by Daniel Lezcano <[email protected]>---
[...]
drivers/clocksource/Kconfig config CLKSRC_IMX_GPT · line 395
Quoted 4 lines
config
CLKSRC_ST_LPCdrivers/clocksource/Kconfig +1
-0bool "Low power clocksource found in the LPC" if COMPILE_TEST select CLKSRC_OF if OF + depends on HAS_IOMEM
Sorry guys. Looks like I've added whitespace pollution here. Shall I resend?
Thanks,
//richard
Re: [PATCH 1/2] clocksource/drivers: Fix dependencies for !HAS_IOMEM archs
Quoted 13 lines · Richard Weinberger
Am 11.01.2016 um 17:45 schrieb Daniel Lezcano:
Quoted 9 lines
From: Richard Weinberger <[email protected]>
Not every arch has io memory.
So, unbreak the build by fixing the dependencies.
Signed-off-by Richard Weinberger <[email protected]>Signed-off-by Daniel Lezcano <[email protected]>---
[...]
Quoted 7 lines
Quoted 4 lines
config
CLKSRC_ST_LPC
bool "Low power clocksource found in the LPC" ifCOMPILE_TESTselectCLKSRC_OFif OF
+ depends onHAS_IOMEMSorry guys. Looks like I've added whitespace pollution here. Shall I resend?
No, it is ok. I fixed the whitespace and pushed the branch again.
Thanks !
-- Daniel
Signature · 5 lines
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook | <http://twitter.com/#!/linaroorg> Twitter | <http://www.linaro.org/linaro-blog/> Blog