ARM: efm32: drop selecting CLKSRC_MMIO

PATCH New Uwe Kleine-König 3 participants 8 messages Feb 20, 2014 – Apr 17, 2014

Subsystems (2)

Arm (32-bit) Clocksource, clockevent drivers

lore

Share & tools

lore

Uwe Kleine-König

author

2014-02-20 08:55 UTC #0 lore raw

PATCH 1/1 ARM: efm32: drop selecting CLKSRC_MMIO

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 <[email protected]>

---
 arch/arm/Kconfig | 3 ---
 1 file changed, 3 deletions(-)

arch/arm/Kconfig +0 -3

index c5e0fa693fbd..44881c07883b 100644
@@ -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

Signature · 1 line

1.8.5.2

Rob Herring

2014-04-16 13:58 UTC #1 lore raw

PATCH 1/1 ARM: efm32: drop selecting CLKSRC_MMIO

Quoted 16 lines · Uwe Kleine-K?nig

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 <[email protected]>
---
 arch/arm/Kconfig | 3 ---
 1 file changed, 3 deletions(-)
arch/arm/Kconfig +0 -0
index c5e0fa693fbd..44881c07883b 100644

arch/arm/Kconfig config ARCH_EFM32 · line 424

Quoted 7 lines

arch/arm/Kconfig +0 -3

@@ -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

Uwe Kleine-König

author

2014-04-16 18:40 UTC #2 lore raw

PATCH 1/1 clocksource: efm32: let CLKSRC_EFM32 select CLKSRC_OF

The efm32 timer driver is only usable with CLKSRC_OF, so it makes sense to let its Kconfig symbol select it. For compile coverage testing it's not needed though, so only select it if ARCH_EFM32 is enabled.

This allows to drop ARCH_EFM32 selecting CLKSRC_OF which is done here for simplicity, too.

Reported-by Rob Herring <[email protected]>

Signed-off-by Uwe Kleine-K?nig <[email protected]>

---
 arch/arm/Kconfig            | 1 -
 drivers/clocksource/Kconfig | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

arch/arm/Kconfig +0 -1

index ab438cb5af55..e345419fb112 100644
@@ -424,7 +424,6 @@ config ARCH_EFM32
 	select ARCH_REQUIRE_GPIOLIB
 	select AUTO_ZRELADDR
 	select ARM_NVIC
-	select CLKSRC_OF
 	select COMMON_CLK
 	select CPU_V7M
 	select GENERIC_CLOCKEVENTS

drivers/clocksource/Kconfig +1 -0

@@ -80,6 +80,7 @@ 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
+	select CLKSRC_OF if ARCH_EFM32
 	default ARCH_EFM32
 	help
 	  Support to use the timers of EFM32 SoCs as clock source and clock

Signature · 1 line

1.9.1

Rob Herring

2014-04-16 18:51 UTC #3 lore raw

PATCH 1/1 clocksource: efm32: let CLKSRC_EFM32 select CLKSRC_OF

Quoted 30 lines · Uwe Kleine-K?nig

The efm32 timer driver is only usable with CLKSRC_OF, so it makes sense to let its Kconfig symbol select it. For compile coverage testing it's not needed though, so only select it if ARCH_EFM32 is enabled.
This allows to drop ARCH_EFM32 selecting CLKSRC_OF which is done here for simplicity, too.
Reported-by Rob Herring <[email protected]>
Signed-off-by Uwe Kleine-K?nig <[email protected]>
---
 arch/arm/Kconfig            | 1 -
 drivers/clocksource/Kconfig | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
arch/arm/Kconfig +0 -1
index ab438cb5af55..e345419fb112 100644
@@ -424,7 +424,6 @@ config ARCH_EFM32
        select ARCH_REQUIRE_GPIOLIB
        select AUTO_ZRELADDR
        select ARM_NVIC
-       select CLKSRC_OF
        select COMMON_CLK
        select CPU_V7M
        select GENERIC_CLOCKEVENTS

drivers/clocksource/Kconfig config CLKSRC_EFM32 · line 83

Quoted 4 lines

drivers/clocksource/Kconfig +1 -0

@@ -80,6 +80,7 @@ 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
+       select CLKSRC_OF if ARCH_EFM32

You already depend on OF, so I believe you don't need the if here.

Rob

Uwe Kleine-König

author

2014-04-16 19:30 UTC #4 lore raw

PATCH 1/1 clocksource: efm32: let CLKSRC_EFM32 select CLKSRC_OF

Hello,

Quoted 9 lines · Rob Herring

Quoted 7 lines · Uwe Kleine-K?nig
The efm32 timer driver is only usable with CLKSRC_OF, so it makes sense to let its Kconfig symbol select it. For compile coverage testing it's not needed though, so only select it if ARCH_EFM32 is enabled.
This allows to drop ARCH_EFM32 selecting CLKSRC_OF which is done here for simplicity, too.

Quoted 14 lines

drivers/clocksource/Kconfig config CLKSRC_EFM32 · line 83
Quoted 12 lines
Reported-by Rob Herring <[email protected]>
Signed-off-by Uwe Kleine-K?nig <[email protected]>
---
[...]
drivers/clocksource/Kconfig +1 -0
@@ -80,6 +80,7 @@ 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
+       select CLKSRC_OF if ARCH_EFM32
You already depend on OF, so I believe you don't need the if here.

Rob and I discussed this shortly on irc, the summary is that the if is not needed to prevent Kconfig breakage but adds more flexibility for the COMPILE_TEST case. In the end Rob said:

	1397676012 < robher> you can add my ack.

which would be:

Acked-by Rob Herring <[email protected]>

Best regards
Uwe

Signature · 2 lines

Pengutronix e.K.                           | Uwe Kleine-K?nig            |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

Daniel Lezcano

2014-04-16 19:56 UTC #5 lore raw

PATCH 1/1 clocksource: efm32: let CLKSRC_EFM32 select CLKSRC_OF

Quoted 30 lines · Uwe Kleine-K?nig

Hello,
Quoted 9 lines · Rob Herring
Quoted 7 lines · Uwe Kleine-K?nig
The efm32 timer driver is only usable with CLKSRC_OF, so it makes sense to let its Kconfig symbol select it. For compile coverage testing it's not needed though, so only select it if ARCH_EFM32 is enabled.
This allows to drop ARCH_EFM32 selecting CLKSRC_OF which is done here for simplicity, too.
Quoted 14 lines
drivers/clocksource/Kconfig config CLKSRC_EFM32 · line 83
Quoted 12 lines
Reported-by Rob Herring <[email protected]>
Signed-off-by Uwe Kleine-K?nig <[email protected]>
---
[...]
drivers/clocksource/Kconfig +1 -0
@@ -80,6 +80,7 @@ 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
+       select CLKSRC_OF if ARCH_EFM32
You already depend on OF, so I believe you don't need the if here.
Rob and I discussed this shortly on irc, the summary is that the if is not needed to prevent Kconfig breakage but adds more flexibility for the COMPILE_TEST case. In the end Rob said:

Quoted 5 lines

	1397676012 < robher> you can add my ack.
which would be:
Acked-by Rob Herring <[email protected]>

Ok, thanks.

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

Daniel Lezcano

2014-04-17 07:36 UTC #6 lore raw

PATCH 1/1 clocksource: efm32: let CLKSRC_EFM32 select CLKSRC_OF

In reply to Uwe Kleine-König

Quoted 30 lines · Uwe Kleine-K?nig

Hello,
Quoted 9 lines · Rob Herring
Quoted 7 lines · Uwe Kleine-K?nig
The efm32 timer driver is only usable with CLKSRC_OF, so it makes sense to let its Kconfig symbol select it. For compile coverage testing it's not needed though, so only select it if ARCH_EFM32 is enabled.
This allows to drop ARCH_EFM32 selecting CLKSRC_OF which is done here for simplicity, too.
Quoted 14 lines
drivers/clocksource/Kconfig config CLKSRC_EFM32 · line 83
Quoted 12 lines
Reported-by Rob Herring <[email protected]>
Signed-off-by Uwe Kleine-K?nig <[email protected]>
---
[...]
drivers/clocksource/Kconfig +1 -0
@@ -80,6 +80,7 @@ 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
+       select CLKSRC_OF if ARCH_EFM32
You already depend on OF, so I believe you don't need the if here.
Rob and I discussed this shortly on irc, the summary is that the if is not needed to prevent Kconfig breakage but adds more flexibility for the COMPILE_TEST case. In the end Rob said:

Quoted 5 lines

	1397676012 < robher> you can add my ack.
which would be:
Acked-by Rob Herring <[email protected]>

Hi Rob,

shall I use the mail address above or robh at kernel.org ?

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

Rob Herring

2014-04-17 14:01 UTC #7 lore raw

PATCH 1/1 clocksource: efm32: let CLKSRC_EFM32 select CLKSRC_OF

Quoted 39 lines · Daniel Lezcano

Quoted 38 lines · Uwe Kleine-K?nig
Hello,
Quoted 12 lines · Rob Herring
Quoted 9 lines · Uwe Kleine-K?nig
The efm32 timer driver is only usable with CLKSRC_OF, so it makes sense to let its Kconfig symbol select it. For compile coverage testing it's not
needed though, so only select it if ARCH_EFM32 is enabled.
This allows to drop ARCH_EFM32 selecting CLKSRC_OF which is done here for simplicity, too.
Quoted 15 lines
drivers/clocksource/Kconfig config CLKSRC_EFM32 · line 83
Quoted 12 lines
Reported-by Rob Herring <[email protected]>
Signed-off-by Uwe Kleine-K?nig <[email protected]>
---
[...]
drivers/clocksource/Kconfig +1 -0
@@ -80,6 +80,7 @@ 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
+       select CLKSRC_OF if ARCH_EFM32
You already depend on OF, so I believe you don't need the if here.
Rob and I discussed this shortly on irc, the summary is that the if is not needed to prevent Kconfig breakage but adds more flexibility for the COMPILE_TEST case. In the end Rob said:
        1397676012 < robher> you can add my ack.

Quoted 8 lines

Quoted 3 lines
which would be:
Acked-by Rob Herring <[email protected]>
Hi Rob,
shall I use the mail address above or robh at kernel.org ?

kernel.org please.

Rob