* [PATCH] clocksource: efm32: use $vendor,$device scheme for compatible string
@ 2014-03-25 14:25 Uwe Kleine-König
2014-03-25 14:50 ` [PATCH v2] " Uwe Kleine-König
0 siblings, 1 reply; 5+ messages in thread
From: Uwe Kleine-König @ 2014-03-25 14:25 UTC (permalink / raw)
To: Daniel Lezcano, Thomas Gleixner; +Cc: linux-kernel, kernel
Wolfgang Sang pointed out that "efm32,$device" is non-standard. So use the
common scheme and prefix device with "efm32-". The old compatible string
is left in place until arch/arm/boot/dts/efm32* is fixed.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
drivers/clocksource/time-efm32.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/clocksource/time-efm32.c b/drivers/clocksource/time-efm32.c
index 1a6205b7bed3..bba62f9deefb 100644
--- a/drivers/clocksource/time-efm32.c
+++ b/drivers/clocksource/time-efm32.c
@@ -272,4 +272,5 @@ static void __init efm32_timer_init(struct device_node *np)
}
}
}
-CLOCKSOURCE_OF_DECLARE(efm32, "efm32,timer", efm32_timer_init);
+CLOCKSOURCE_OF_DECLARE(efm32compat, "efm32,timer", efm32_timer_init);
+CLOCKSOURCE_OF_DECLARE(efm32, "energymicro,efm32-timer", efm32_timer_init);
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH v2] clocksource: efm32: use $vendor,$device scheme for compatible string
2014-03-25 14:25 [PATCH] clocksource: efm32: use $vendor,$device scheme for compatible string Uwe Kleine-König
@ 2014-03-25 14:50 ` Uwe Kleine-König
2014-03-25 16:21 ` Wolfram Sang
2014-04-15 16:52 ` Daniel Lezcano
0 siblings, 2 replies; 5+ messages in thread
From: Uwe Kleine-König @ 2014-03-25 14:50 UTC (permalink / raw)
To: Daniel Lezcano, Thomas Gleixner; +Cc: linux-kernel, kernel, Wolfram Sang
Wolfgang Sang pointed out that "efm32,$device" is non-standard. So use the
common scheme and prefix device with "efm32-". The old compatible string
is left in place until arch/arm/boot/dts/efm32* is fixed.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
Changes since (implicit) v1, sent with
Message-Id: 1395757522-6431-1-git-send-email-u.kleine-koenig@pengutronix.de:
- fix binding doc accordingly
.../bindings/timer/{efm32,timer.txt => energymicro,efm32-timer.txt} | 4 ++--
drivers/clocksource/time-efm32.c | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
rename Documentation/devicetree/bindings/timer/{efm32,timer.txt => energymicro,efm32-timer.txt} (87%)
diff --git a/Documentation/devicetree/bindings/timer/efm32,timer.txt b/Documentation/devicetree/bindings/timer/energymicro,efm32-timer.txt
similarity index 87%
rename from Documentation/devicetree/bindings/timer/efm32,timer.txt
rename to Documentation/devicetree/bindings/timer/energymicro,efm32-timer.txt
index 97a568f696c9..e502c11b2211 100644
--- a/Documentation/devicetree/bindings/timer/efm32,timer.txt
+++ b/Documentation/devicetree/bindings/timer/energymicro,efm32-timer.txt
@@ -6,7 +6,7 @@ channels and can be used as PWM or Quadrature Decoder. Available clock sources
are the cpu's HFPERCLK (with a 10-bit prescaler) or an external pin.
Required properties:
-- compatible : Should be efm32,timer
+- compatible : Should be "energymicro,efm32-timer"
- reg : Address and length of the register set
- clocks : Should contain a reference to the HFPERCLK
@@ -16,7 +16,7 @@ Optional properties:
Example:
timer@40010c00 {
- compatible = "efm32,timer";
+ compatible = "energymicro,efm32-timer";
reg = <0x40010c00 0x400>;
interrupts = <14>;
clocks = <&cmu clk_HFPERCLKTIMER3>;
diff --git a/drivers/clocksource/time-efm32.c b/drivers/clocksource/time-efm32.c
index 1a6205b7bed3..bba62f9deefb 100644
--- a/drivers/clocksource/time-efm32.c
+++ b/drivers/clocksource/time-efm32.c
@@ -272,4 +272,5 @@ static void __init efm32_timer_init(struct device_node *np)
}
}
}
-CLOCKSOURCE_OF_DECLARE(efm32, "efm32,timer", efm32_timer_init);
+CLOCKSOURCE_OF_DECLARE(efm32compat, "efm32,timer", efm32_timer_init);
+CLOCKSOURCE_OF_DECLARE(efm32, "energymicro,efm32-timer", efm32_timer_init);
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH v2] clocksource: efm32: use $vendor,$device scheme for compatible string
2014-03-25 14:50 ` [PATCH v2] " Uwe Kleine-König
@ 2014-03-25 16:21 ` Wolfram Sang
2014-04-15 16:52 ` Daniel Lezcano
1 sibling, 0 replies; 5+ messages in thread
From: Wolfram Sang @ 2014-03-25 16:21 UTC (permalink / raw)
To: Uwe Kleine-König
Cc: Daniel Lezcano, Thomas Gleixner, linux-kernel, kernel
[-- Attachment #1: Type: text/plain, Size: 461 bytes --]
On Tue, Mar 25, 2014 at 03:50:44PM +0100, Uwe Kleine-König wrote:
> Wolfgang Sang pointed out that "efm32,$device" is non-standard. So use the
> common scheme and prefix device with "efm32-". The old compatible string
> is left in place until arch/arm/boot/dts/efm32* is fixed.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
"Wolfram" please, next time. No need to resend, though.
Acked-by: Wolfram Sang <wsa@the-dreams.de>
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] clocksource: efm32: use $vendor,$device scheme for compatible string
2014-03-25 14:50 ` [PATCH v2] " Uwe Kleine-König
2014-03-25 16:21 ` Wolfram Sang
@ 2014-04-15 16:52 ` Daniel Lezcano
2014-04-15 17:56 ` Uwe Kleine-König
1 sibling, 1 reply; 5+ messages in thread
From: Daniel Lezcano @ 2014-04-15 16:52 UTC (permalink / raw)
To: Uwe Kleine-König, Thomas Gleixner; +Cc: linux-kernel, kernel, Wolfram Sang
On 03/25/2014 03:50 PM, Uwe Kleine-König wrote:
> Wolfgang Sang pointed out that "efm32,$device" is non-standard. So use the
> common scheme and prefix device with "efm32-". The old compatible string
> is left in place until arch/arm/boot/dts/efm32* is fixed.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de
Applied for 3.16 (and fixed Wolfgang => Wolfram)
Thanks !
-- Daniel
--
<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
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH v2] clocksource: efm32: use $vendor,$device scheme for compatible string
2014-04-15 16:52 ` Daniel Lezcano
@ 2014-04-15 17:56 ` Uwe Kleine-König
0 siblings, 0 replies; 5+ messages in thread
From: Uwe Kleine-König @ 2014-04-15 17:56 UTC (permalink / raw)
To: Daniel Lezcano; +Cc: Thomas Gleixner, linux-kernel, kernel, Wolfram Sang
Hello Daniel,
On Tue, Apr 15, 2014 at 06:52:39PM +0200, Daniel Lezcano wrote:
> On 03/25/2014 03:50 PM, Uwe Kleine-König wrote:
> >Wolfgang Sang pointed out that "efm32,$device" is non-standard. So use the
> >common scheme and prefix device with "efm32-". The old compatible string
> >is left in place until arch/arm/boot/dts/efm32* is fixed.
> >
> >Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de
>
> Applied for 3.16 (and fixed Wolfgang => Wolfram)
thanks for the s/gang/ram/ fix. I'm still mortified.
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-04-15 17:57 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-03-25 14:25 [PATCH] clocksource: efm32: use $vendor,$device scheme for compatible string Uwe Kleine-König
2014-03-25 14:50 ` [PATCH v2] " Uwe Kleine-König
2014-03-25 16:21 ` Wolfram Sang
2014-04-15 16:52 ` Daniel Lezcano
2014-04-15 17:56 ` Uwe Kleine-König
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.