Patchwork ARM: efm32: drop selecting CLKSRC_MMIO

login
register
mail settings
Submitter Uwe Kleine-König
Date Feb. 20, 2014, 8:55 a.m.
Message ID <1392886514-6577-1-git-send-email-u.kleine-koenig@pengutronix.de>
Download mbox | patch
Permalink /patch/322087/
State New
Headers show

Comments

Uwe Kleine-König - Feb. 20, 2014, 8:55 a.m.
CLKSRC_MMIO is needed on efm32 because the clocksource driver
(CLKSRC_EFM32) uses clocksource_mmio_init() and
clocksource_mmio_readl_up(). Since commit 09ca27579ee5 (clocksource:
time-efm32: Select CLKSRC_MMIO) CLKSRC_EFM32 does the necessary select
itself and ARCH_EFM32 doesn't need to select it explicitly any more.

Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 arch/arm/Kconfig | 3 ---
 1 file changed, 3 deletions(-)
Rob Herring - April 16, 2014, 1:58 p.m.
On Thu, Feb 20, 2014 at 2:55 AM, Uwe Kleine-König
<u.kleine-koenig@pengutronix.de> wrote:
> CLKSRC_MMIO is needed on efm32 because the clocksource driver
> (CLKSRC_EFM32) uses clocksource_mmio_init() and
> clocksource_mmio_readl_up(). Since commit 09ca27579ee5 (clocksource:
> time-efm32: Select CLKSRC_MMIO) CLKSRC_EFM32 does the necessary select
> itself and ARCH_EFM32 doesn't need to select it explicitly any more.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
> ---
>  arch/arm/Kconfig | 3 ---
>  1 file changed, 3 deletions(-)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index c5e0fa693fbd..44881c07883b 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -421,9 +421,6 @@ config ARCH_EFM32
>         depends on !MMU
>         select ARCH_REQUIRE_GPIOLIB
>         select ARM_NVIC
> -       # CLKSRC_MMIO is wrong here, but needed until a proper fix is merged,
> -       # i.e. CLKSRC_EFM32 selecting CLKSRC_MMIO
> -       select CLKSRC_MMIO
>         select CLKSRC_OF

The same applies to CLKSRC_OF. It should be selected by CLKSRC_EFM32.

Rob

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c5e0fa693fbd..44881c07883b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -421,9 +421,6 @@  config ARCH_EFM32
 	depends on !MMU
 	select ARCH_REQUIRE_GPIOLIB
 	select ARM_NVIC
-	# CLKSRC_MMIO is wrong here, but needed until a proper fix is merged,
-	# i.e. CLKSRC_EFM32 selecting CLKSRC_MMIO
-	select CLKSRC_MMIO
 	select CLKSRC_OF
 	select COMMON_CLK
 	select CPU_V7M