[PATCH] ARM: efm32: drop selecting CLKSRC_MMIO

[PATCH] ARM: efm32: drop selecting CLKSRC_MMIO

[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 <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
 	select COMMON_CLK
 	select CPU_V7M
-- 
1.8.5.2

[PATCH] ARM: efm32: drop selecting CLKSRC_MMIO

[Rob Herring]

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] clocksource: efm32: let CLKSRC_EFM32 select CLKSRC_OF

[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 <robherring2@gmail.com>
Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
---
 arch/arm/Kconfig            | 1 -
 drivers/clocksource/Kconfig | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ab438cb5af55..e345419fb112 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -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
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -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
-- 
1.9.1

[PATCH] clocksource: efm32: let CLKSRC_EFM32 select CLKSRC_OF

[Rob Herring]

On Wed, Apr 16, 2014 at 1:40 PM, Uwe Kleine-K?nig
<u.kleine-koenig@pengutronix.de> wrote:
> 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 <robherring2@gmail.com>
> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
> ---
>  arch/arm/Kconfig            | 1 -
>  drivers/clocksource/Kconfig | 1 +
>  2 files changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index ab438cb5af55..e345419fb112 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -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
> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
> --- a/drivers/clocksource/Kconfig
> +++ b/drivers/clocksource/Kconfig
> @@ -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

[PATCH] clocksource: efm32: let CLKSRC_EFM32 select CLKSRC_OF

[Uwe Kleine-König]

Hello,

On Wed, Apr 16, 2014 at 01:51:17PM -0500, Rob Herring wrote:
> On Wed, Apr 16, 2014 at 1:40 PM, Uwe Kleine-K?nig
> <u.kleine-koenig@pengutronix.de> wrote:
> > 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 <robherring2@gmail.com>
> > Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
> > ---
> > [...]
> > diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
> > --- a/drivers/clocksource/Kconfig
> > +++ b/drivers/clocksource/Kconfig
> > @@ -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 <robherring2@gmail.com>

Best regards
Uwe

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

[PATCH] clocksource: efm32: let CLKSRC_EFM32 select CLKSRC_OF

[Daniel Lezcano]

On 04/16/2014 09:30 PM, Uwe Kleine-K?nig wrote:
> Hello,
>
> On Wed, Apr 16, 2014 at 01:51:17PM -0500, Rob Herring wrote:
>> On Wed, Apr 16, 2014 at 1:40 PM, Uwe Kleine-K?nig
>> <u.kleine-koenig@pengutronix.de> wrote:
>>> 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 <robherring2@gmail.com>
>>> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
>>> ---
>>> [...]
>>> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
>>> --- a/drivers/clocksource/Kconfig
>>> +++ b/drivers/clocksource/Kconfig
>>> @@ -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 <robherring2@gmail.com>

Ok, thanks.


-- 
  <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] clocksource: efm32: let CLKSRC_EFM32 select CLKSRC_OF

[Daniel Lezcano]

On 04/16/2014 09:30 PM, Uwe Kleine-K?nig wrote:
> Hello,
>
> On Wed, Apr 16, 2014 at 01:51:17PM -0500, Rob Herring wrote:
>> On Wed, Apr 16, 2014 at 1:40 PM, Uwe Kleine-K?nig
>> <u.kleine-koenig@pengutronix.de> wrote:
>>> 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 <robherring2@gmail.com>
>>> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
>>> ---
>>> [...]
>>> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
>>> --- a/drivers/clocksource/Kconfig
>>> +++ b/drivers/clocksource/Kconfig
>>> @@ -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 <robherring2@gmail.com>

Hi Rob,

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



-- 
  <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] clocksource: efm32: let CLKSRC_EFM32 select CLKSRC_OF

[Rob Herring]

On Thu, Apr 17, 2014 at 2:36 AM, Daniel Lezcano
<daniel.lezcano@linaro.org> wrote:
> On 04/16/2014 09:30 PM, Uwe Kleine-K?nig wrote:
>>
>> Hello,
>>
>> On Wed, Apr 16, 2014 at 01:51:17PM -0500, Rob Herring wrote:
>>>
>>> On Wed, Apr 16, 2014 at 1:40 PM, Uwe Kleine-K?nig
>>> <u.kleine-koenig@pengutronix.de> wrote:
>>>>
>>>> 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 <robherring2@gmail.com>
>>>> Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>
>>>> ---
>>>> [...]
>>>> diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
>>>> --- a/drivers/clocksource/Kconfig
>>>> +++ b/drivers/clocksource/Kconfig
>>>> @@ -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 <robherring2@gmail.com>
>
>
> Hi Rob,
>
> shall I use the mail address above or robh at kernel.org ?

kernel.org please.

Rob