* [PATCH 1/2] clocksource: sunxi: Add new compatibles @ 2014-02-02 13:37 Maxime Ripard 2014-02-02 13:38 ` [PATCH 2/2] ARM: sunxi: dt: Convert to the new clocksource compatible Maxime Ripard 2014-02-03 16:36 ` [PATCH 1/2] clocksource: sunxi: Add new compatibles Daniel Lezcano 0 siblings, 2 replies; 9+ messages in thread From: Maxime Ripard @ 2014-02-02 13:37 UTC (permalink / raw) To: linux-arm-kernel The Allwinner A10 compatibles were following a slightly different compatible patterns than the rest of the SoCs for historical reasons. Add compatibles matching the other pattern to the timer driver for consistency, and keep the older one for backward compatibility. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt | 5 +++-- drivers/clocksource/sun4i_timer.c | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt b/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt index 48aeb78..d9e35ae 100644 --- a/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt +++ b/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt @@ -2,7 +2,8 @@ Allwinner A1X SoCs Timer Controller Required properties: -- compatible : should be "allwinner,sun4i-timer" +- compatible : should be "allwinner,sun4i-a10-timer" + (Deprecated "allwinner,sun4i-timer") - reg : Specifies base physical address and size of the registers. - interrupts : The interrupt of the first timer - clocks: phandle to the source clock (usually a 24 MHz fixed clock) @@ -10,7 +11,7 @@ Required properties: Example: timer { - compatible = "allwinner,sun4i-timer"; + compatible = "allwinner,sun4i-a10-timer"; reg = <0x01c20c00 0x400>; interrupts = <22>; clocks = <&osc>; diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c index bf497af..de03895 100644 --- a/drivers/clocksource/sun4i_timer.c +++ b/drivers/clocksource/sun4i_timer.c @@ -196,5 +196,9 @@ static void __init sun4i_timer_init(struct device_node *node) clockevents_config_and_register(&sun4i_clockevent, rate, TIMER_SYNC_TICKS, 0xffffffff); } +CLOCKSOURCE_OF_DECLARE(sun4i, "allwinner,sun4i-a10-timer", + sun4i_timer_init); + +/* Deprecated */ CLOCKSOURCE_OF_DECLARE(sun4i, "allwinner,sun4i-timer", sun4i_timer_init); -- 1.8.4.2 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/2] ARM: sunxi: dt: Convert to the new clocksource compatible 2014-02-02 13:37 [PATCH 1/2] clocksource: sunxi: Add new compatibles Maxime Ripard @ 2014-02-02 13:38 ` Maxime Ripard 2014-02-03 16:36 ` [PATCH 1/2] clocksource: sunxi: Add new compatibles Daniel Lezcano 1 sibling, 0 replies; 9+ messages in thread From: Maxime Ripard @ 2014-02-02 13:38 UTC (permalink / raw) To: linux-arm-kernel Switch the device tree to the new compatibles introduced in the timer driver to have a common pattern accross all Allwinner SoCs. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> --- arch/arm/boot/dts/sun4i-a10.dtsi | 2 +- arch/arm/boot/dts/sun5i-a10s.dtsi | 2 +- arch/arm/boot/dts/sun5i-a13.dtsi | 2 +- arch/arm/boot/dts/sun6i-a31.dtsi | 2 +- arch/arm/boot/dts/sun7i-a20.dtsi | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi index 040bb0e..dd64cc0 100644 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -403,7 +403,7 @@ }; timer at 01c20c00 { - compatible = "allwinner,sun4i-timer"; + compatible = "allwinner,sun4i-a10-timer"; reg = <0x01c20c00 0x90>; interrupts = <22>; clocks = <&osc24M>; diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi index ea16054..9cee110 100644 --- a/arch/arm/boot/dts/sun5i-a10s.dtsi +++ b/arch/arm/boot/dts/sun5i-a10s.dtsi @@ -366,7 +366,7 @@ }; timer at 01c20c00 { - compatible = "allwinner,sun4i-timer"; + compatible = "allwinner,sun4i-a10-timer"; reg = <0x01c20c00 0x90>; interrupts = <22>; clocks = <&osc24M>; diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi index 320335a..f5cba63 100644 --- a/arch/arm/boot/dts/sun5i-a13.dtsi +++ b/arch/arm/boot/dts/sun5i-a13.dtsi @@ -329,7 +329,7 @@ }; timer at 01c20c00 { - compatible = "allwinner,sun4i-timer"; + compatible = "allwinner,sun4i-a10-timer"; reg = <0x01c20c00 0x90>; interrupts = <22>; clocks = <&osc24M>; diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi index 5256ad9..996fff5 100644 --- a/arch/arm/boot/dts/sun6i-a31.dtsi +++ b/arch/arm/boot/dts/sun6i-a31.dtsi @@ -231,7 +231,7 @@ }; timer at 01c20c00 { - compatible = "allwinner,sun4i-timer"; + compatible = "allwinner,sun4i-a10-timer"; reg = <0x01c20c00 0xa0>; interrupts = <0 18 4>, <0 19 4>, diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index 119f066..4bc5c6f 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -435,7 +435,7 @@ }; timer at 01c20c00 { - compatible = "allwinner,sun4i-timer"; + compatible = "allwinner,sun4i-a10-timer"; reg = <0x01c20c00 0x90>; interrupts = <0 22 4>, <0 23 4>, -- 1.8.4.2 ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 1/2] clocksource: sunxi: Add new compatibles 2014-02-02 13:37 [PATCH 1/2] clocksource: sunxi: Add new compatibles Maxime Ripard 2014-02-02 13:38 ` [PATCH 2/2] ARM: sunxi: dt: Convert to the new clocksource compatible Maxime Ripard @ 2014-02-03 16:36 ` Daniel Lezcano 2014-02-03 19:45 ` Maxime Ripard 1 sibling, 1 reply; 9+ messages in thread From: Daniel Lezcano @ 2014-02-03 16:36 UTC (permalink / raw) To: linux-arm-kernel On 02/02/2014 02:37 PM, Maxime Ripard wrote: > The Allwinner A10 compatibles were following a slightly different compatible > patterns than the rest of the SoCs for historical reasons. Add compatibles > matching the other pattern to the timer driver for consistency, and keep the > older one for backward compatibility. Hi Maxime, is it really needed to keep the old pattern ? > Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt | 5 +++-- > drivers/clocksource/sun4i_timer.c | 4 ++++ > 2 files changed, 7 insertions(+), 2 deletions(-) > > diff --git a/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt b/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt > index 48aeb78..d9e35ae 100644 > --- a/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt > +++ b/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt > @@ -2,7 +2,8 @@ Allwinner A1X SoCs Timer Controller > > Required properties: > > -- compatible : should be "allwinner,sun4i-timer" > +- compatible : should be "allwinner,sun4i-a10-timer" > + (Deprecated "allwinner,sun4i-timer") > - reg : Specifies base physical address and size of the registers. > - interrupts : The interrupt of the first timer > - clocks: phandle to the source clock (usually a 24 MHz fixed clock) > @@ -10,7 +11,7 @@ Required properties: > Example: > > timer { > - compatible = "allwinner,sun4i-timer"; > + compatible = "allwinner,sun4i-a10-timer"; > reg = <0x01c20c00 0x400>; > interrupts = <22>; > clocks = <&osc>; > diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c > index bf497af..de03895 100644 > --- a/drivers/clocksource/sun4i_timer.c > +++ b/drivers/clocksource/sun4i_timer.c > @@ -196,5 +196,9 @@ static void __init sun4i_timer_init(struct device_node *node) > clockevents_config_and_register(&sun4i_clockevent, rate, > TIMER_SYNC_TICKS, 0xffffffff); > } > +CLOCKSOURCE_OF_DECLARE(sun4i, "allwinner,sun4i-a10-timer", > + sun4i_timer_init); > + > +/* Deprecated */ > CLOCKSOURCE_OF_DECLARE(sun4i, "allwinner,sun4i-timer", > sun4i_timer_init); > -- <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] 9+ messages in thread
* [PATCH 1/2] clocksource: sunxi: Add new compatibles 2014-02-03 16:36 ` [PATCH 1/2] clocksource: sunxi: Add new compatibles Daniel Lezcano @ 2014-02-03 19:45 ` Maxime Ripard 2014-02-03 20:11 ` Rob Herring 2014-02-03 20:17 ` Daniel Lezcano 0 siblings, 2 replies; 9+ messages in thread From: Maxime Ripard @ 2014-02-03 19:45 UTC (permalink / raw) To: linux-arm-kernel Hi Daniel, (Adding DT mailing-list in CC) On Mon, Feb 03, 2014 at 05:36:03PM +0100, Daniel Lezcano wrote: > On 02/02/2014 02:37 PM, Maxime Ripard wrote: > >The Allwinner A10 compatibles were following a slightly different compatible > >patterns than the rest of the SoCs for historical reasons. Add compatibles > >matching the other pattern to the timer driver for consistency, and keep the > >older one for backward compatibility. > > Hi Maxime, > > is it really needed to keep the old pattern ? We agreed during the ARM Kernel Summit to consider the DT as a stable ABI. While I'd be ok with removing the older ones, that also means that we would break the boot of newer kernels with older DT, so yes, we actually need to keep the old compatibles. > >Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > >--- > > Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt | 5 +++-- > > drivers/clocksource/sun4i_timer.c | 4 ++++ > > 2 files changed, 7 insertions(+), 2 deletions(-) > > > >diff --git a/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt b/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt > >index 48aeb78..d9e35ae 100644 > >--- a/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt > >+++ b/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt > >@@ -2,7 +2,8 @@ Allwinner A1X SoCs Timer Controller > > > > Required properties: > > > >-- compatible : should be "allwinner,sun4i-timer" > >+- compatible : should be "allwinner,sun4i-a10-timer" > >+ (Deprecated "allwinner,sun4i-timer") > > - reg : Specifies base physical address and size of the registers. > > - interrupts : The interrupt of the first timer > > - clocks: phandle to the source clock (usually a 24 MHz fixed clock) > >@@ -10,7 +11,7 @@ Required properties: > > Example: > > > > timer { > >- compatible = "allwinner,sun4i-timer"; > >+ compatible = "allwinner,sun4i-a10-timer"; > > reg = <0x01c20c00 0x400>; > > interrupts = <22>; > > clocks = <&osc>; > >diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c > >index bf497af..de03895 100644 > >--- a/drivers/clocksource/sun4i_timer.c > >+++ b/drivers/clocksource/sun4i_timer.c > >@@ -196,5 +196,9 @@ static void __init sun4i_timer_init(struct device_node *node) > > clockevents_config_and_register(&sun4i_clockevent, rate, > > TIMER_SYNC_TICKS, 0xffffffff); > > } > >+CLOCKSOURCE_OF_DECLARE(sun4i, "allwinner,sun4i-a10-timer", > >+ sun4i_timer_init); > >+ > >+/* Deprecated */ > > CLOCKSOURCE_OF_DECLARE(sun4i, "allwinner,sun4i-timer", > > sun4i_timer_init); > > > > > -- > <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 > -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140203/63754870/attachment.sig> ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] clocksource: sunxi: Add new compatibles 2014-02-03 19:45 ` Maxime Ripard @ 2014-02-03 20:11 ` Rob Herring 2014-02-04 8:41 ` Maxime Ripard 2014-02-03 20:17 ` Daniel Lezcano 1 sibling, 1 reply; 9+ messages in thread From: Rob Herring @ 2014-02-03 20:11 UTC (permalink / raw) To: linux-arm-kernel On Mon, Feb 3, 2014 at 1:45 PM, Maxime Ripard <maxime.ripard@free-electrons.com> wrote: > Hi Daniel, > > (Adding DT mailing-list in CC) > > On Mon, Feb 03, 2014 at 05:36:03PM +0100, Daniel Lezcano wrote: >> On 02/02/2014 02:37 PM, Maxime Ripard wrote: >> >The Allwinner A10 compatibles were following a slightly different compatible >> >patterns than the rest of the SoCs for historical reasons. Add compatibles >> >matching the other pattern to the timer driver for consistency, and keep the >> >older one for backward compatibility. >> >> Hi Maxime, >> >> is it really needed to keep the old pattern ? > > We agreed during the ARM Kernel Summit to consider the DT as a stable > ABI. > > While I'd be ok with removing the older ones, that also means that we > would break the boot of newer kernels with older DT, so yes, we > actually need to keep the old compatibles. It all depends if that would really cause problems for a given platform. So if Allwinner DT support is a moving target, then changing is probably okay. For example, if anyone using the platform is going to need to update their DTB to add more nodes to get various features anyway, then breaking it is not all that important. Rob ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] clocksource: sunxi: Add new compatibles 2014-02-03 20:11 ` Rob Herring @ 2014-02-04 8:41 ` Maxime Ripard 0 siblings, 0 replies; 9+ messages in thread From: Maxime Ripard @ 2014-02-04 8:41 UTC (permalink / raw) To: linux-arm-kernel Hi Rob, On Mon, Feb 03, 2014 at 02:11:28PM -0600, Rob Herring wrote: > On Mon, Feb 3, 2014 at 1:45 PM, Maxime Ripard > <maxime.ripard@free-electrons.com> wrote: > > Hi Daniel, > > > > (Adding DT mailing-list in CC) > > > > On Mon, Feb 03, 2014 at 05:36:03PM +0100, Daniel Lezcano wrote: > >> On 02/02/2014 02:37 PM, Maxime Ripard wrote: > >> >The Allwinner A10 compatibles were following a slightly different compatible > >> >patterns than the rest of the SoCs for historical reasons. Add compatibles > >> >matching the other pattern to the timer driver for consistency, and keep the > >> >older one for backward compatibility. > >> > >> Hi Maxime, > >> > >> is it really needed to keep the old pattern ? > > > > We agreed during the ARM Kernel Summit to consider the DT as a stable > > ABI. > > > > While I'd be ok with removing the older ones, that also means that we > > would break the boot of newer kernels with older DT, so yes, we > > actually need to keep the old compatibles. > > It all depends if that would really cause problems for a given > platform. So if Allwinner DT support is a moving target, then changing > is probably okay. For example, if anyone using the platform is going > to need to update their DTB to add more nodes to get various features > anyway, then breaking it is not all that important. We keep adding new stuff to the DT, yes, so I guess we can be considered a moving target. Thanks for your input! Maxime -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140204/b4f57920/attachment.sig> ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] clocksource: sunxi: Add new compatibles 2014-02-03 19:45 ` Maxime Ripard 2014-02-03 20:11 ` Rob Herring @ 2014-02-03 20:17 ` Daniel Lezcano 2014-02-04 8:13 ` Gregory CLEMENT 2014-02-04 8:45 ` Maxime Ripard 1 sibling, 2 replies; 9+ messages in thread From: Daniel Lezcano @ 2014-02-03 20:17 UTC (permalink / raw) To: linux-arm-kernel On 02/03/2014 08:45 PM, Maxime Ripard wrote: > Hi Daniel, > > (Adding DT mailing-list in CC) > > On Mon, Feb 03, 2014 at 05:36:03PM +0100, Daniel Lezcano wrote: >> On 02/02/2014 02:37 PM, Maxime Ripard wrote: >>> The Allwinner A10 compatibles were following a slightly different compatible >>> patterns than the rest of the SoCs for historical reasons. Add compatibles >>> matching the other pattern to the timer driver for consistency, and keep the >>> older one for backward compatibility. >> >> Hi Maxime, >> >> is it really needed to keep the old pattern ? > > We agreed during the ARM Kernel Summit to consider the DT as a stable > ABI. > > While I'd be ok with removing the older ones, that also means that we > would break the boot of newer kernels with older DT, so yes, we > actually need to keep the old compatibles. Thanks for the clarification. So these old compatibles will stay there 'ad vitam aeternam', right ? >>> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> >>> --- >>> Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt | 5 +++-- >>> drivers/clocksource/sun4i_timer.c | 4 ++++ >>> 2 files changed, 7 insertions(+), 2 deletions(-) >>> >>> diff --git a/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt b/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt >>> index 48aeb78..d9e35ae 100644 >>> --- a/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt >>> +++ b/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt >>> @@ -2,7 +2,8 @@ Allwinner A1X SoCs Timer Controller >>> >>> Required properties: >>> >>> -- compatible : should be "allwinner,sun4i-timer" >>> +- compatible : should be "allwinner,sun4i-a10-timer" >>> + (Deprecated "allwinner,sun4i-timer") >>> - reg : Specifies base physical address and size of the registers. >>> - interrupts : The interrupt of the first timer >>> - clocks: phandle to the source clock (usually a 24 MHz fixed clock) >>> @@ -10,7 +11,7 @@ Required properties: >>> Example: >>> >>> timer { >>> - compatible = "allwinner,sun4i-timer"; >>> + compatible = "allwinner,sun4i-a10-timer"; >>> reg = <0x01c20c00 0x400>; >>> interrupts = <22>; >>> clocks = <&osc>; >>> diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c >>> index bf497af..de03895 100644 >>> --- a/drivers/clocksource/sun4i_timer.c >>> +++ b/drivers/clocksource/sun4i_timer.c >>> @@ -196,5 +196,9 @@ static void __init sun4i_timer_init(struct device_node *node) >>> clockevents_config_and_register(&sun4i_clockevent, rate, >>> TIMER_SYNC_TICKS, 0xffffffff); >>> } >>> +CLOCKSOURCE_OF_DECLARE(sun4i, "allwinner,sun4i-a10-timer", >>> + sun4i_timer_init); >>> + >>> +/* Deprecated */ >>> CLOCKSOURCE_OF_DECLARE(sun4i, "allwinner,sun4i-timer", >>> sun4i_timer_init); >>> >> >> >> -- >> <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 >> > -- <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] 9+ messages in thread
* [PATCH 1/2] clocksource: sunxi: Add new compatibles 2014-02-03 20:17 ` Daniel Lezcano @ 2014-02-04 8:13 ` Gregory CLEMENT 2014-02-04 8:45 ` Maxime Ripard 1 sibling, 0 replies; 9+ messages in thread From: Gregory CLEMENT @ 2014-02-04 8:13 UTC (permalink / raw) To: linux-arm-kernel Hi Daniel, On 03/02/2014 21:17, Daniel Lezcano wrote: > On 02/03/2014 08:45 PM, Maxime Ripard wrote: >> Hi Daniel, >> >> (Adding DT mailing-list in CC) >> >> On Mon, Feb 03, 2014 at 05:36:03PM +0100, Daniel Lezcano wrote: >>> On 02/02/2014 02:37 PM, Maxime Ripard wrote: >>>> The Allwinner A10 compatibles were following a slightly different compatible >>>> patterns than the rest of the SoCs for historical reasons. Add compatibles >>>> matching the other pattern to the timer driver for consistency, and keep the >>>> older one for backward compatibility. >>> >>> Hi Maxime, >>> >>> is it really needed to keep the old pattern ? >> >> We agreed during the ARM Kernel Summit to consider the DT as a stable >> ABI. >> >> While I'd be ok with removing the older ones, that also means that we >> would break the boot of newer kernels with older DT, so yes, we >> actually need to keep the old compatibles. > > Thanks for the clarification. > > So these old compatibles will stay there 'ad vitam aeternam', right ? >From what I have understood during the ARM Kernel Summit, it was acceptable to remove them after a few release. Gregory > > >>>> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> >>>> --- >>>> Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt | 5 +++-- >>>> drivers/clocksource/sun4i_timer.c | 4 ++++ >>>> 2 files changed, 7 insertions(+), 2 deletions(-) >>>> >>>> diff --git a/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt b/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt >>>> index 48aeb78..d9e35ae 100644 >>>> --- a/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt >>>> +++ b/Documentation/devicetree/bindings/timer/allwinner,sun4i-timer.txt >>>> @@ -2,7 +2,8 @@ Allwinner A1X SoCs Timer Controller >>>> >>>> Required properties: >>>> >>>> -- compatible : should be "allwinner,sun4i-timer" >>>> +- compatible : should be "allwinner,sun4i-a10-timer" >>>> + (Deprecated "allwinner,sun4i-timer") >>>> - reg : Specifies base physical address and size of the registers. >>>> - interrupts : The interrupt of the first timer >>>> - clocks: phandle to the source clock (usually a 24 MHz fixed clock) >>>> @@ -10,7 +11,7 @@ Required properties: >>>> Example: >>>> >>>> timer { >>>> - compatible = "allwinner,sun4i-timer"; >>>> + compatible = "allwinner,sun4i-a10-timer"; >>>> reg = <0x01c20c00 0x400>; >>>> interrupts = <22>; >>>> clocks = <&osc>; >>>> diff --git a/drivers/clocksource/sun4i_timer.c b/drivers/clocksource/sun4i_timer.c >>>> index bf497af..de03895 100644 >>>> --- a/drivers/clocksource/sun4i_timer.c >>>> +++ b/drivers/clocksource/sun4i_timer.c >>>> @@ -196,5 +196,9 @@ static void __init sun4i_timer_init(struct device_node *node) >>>> clockevents_config_and_register(&sun4i_clockevent, rate, >>>> TIMER_SYNC_TICKS, 0xffffffff); >>>> } >>>> +CLOCKSOURCE_OF_DECLARE(sun4i, "allwinner,sun4i-a10-timer", >>>> + sun4i_timer_init); >>>> + >>>> +/* Deprecated */ >>>> CLOCKSOURCE_OF_DECLARE(sun4i, "allwinner,sun4i-timer", >>>> sun4i_timer_init); >>>> >>> >>> >>> -- >>> <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 >>> >> > > -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH 1/2] clocksource: sunxi: Add new compatibles 2014-02-03 20:17 ` Daniel Lezcano 2014-02-04 8:13 ` Gregory CLEMENT @ 2014-02-04 8:45 ` Maxime Ripard 1 sibling, 0 replies; 9+ messages in thread From: Maxime Ripard @ 2014-02-04 8:45 UTC (permalink / raw) To: linux-arm-kernel Hi, On Mon, Feb 03, 2014 at 09:17:46PM +0100, Daniel Lezcano wrote: > On 02/03/2014 08:45 PM, Maxime Ripard wrote: > >Hi Daniel, > > > >(Adding DT mailing-list in CC) > > > >On Mon, Feb 03, 2014 at 05:36:03PM +0100, Daniel Lezcano wrote: > >>On 02/02/2014 02:37 PM, Maxime Ripard wrote: > >>>The Allwinner A10 compatibles were following a slightly different compatible > >>>patterns than the rest of the SoCs for historical reasons. Add compatibles > >>>matching the other pattern to the timer driver for consistency, and keep the > >>>older one for backward compatibility. > >> > >>Hi Maxime, > >> > >>is it really needed to keep the old pattern ? > > > >We agreed during the ARM Kernel Summit to consider the DT as a stable > >ABI. > > > >While I'd be ok with removing the older ones, that also means that we > >would break the boot of newer kernels with older DT, so yes, we > >actually need to keep the old compatibles. > > Thanks for the clarification. > > So these old compatibles will stay there 'ad vitam aeternam', right ? Except for what Rob told, yep, that was my feeling, but Gregory and I seem to have a different interpretation of this rule :) Maxime -- Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140204/418b5e4f/attachment-0001.sig> ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2014-02-04 8:45 UTC | newest] Thread overview: 9+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2014-02-02 13:37 [PATCH 1/2] clocksource: sunxi: Add new compatibles Maxime Ripard 2014-02-02 13:38 ` [PATCH 2/2] ARM: sunxi: dt: Convert to the new clocksource compatible Maxime Ripard 2014-02-03 16:36 ` [PATCH 1/2] clocksource: sunxi: Add new compatibles Daniel Lezcano 2014-02-03 19:45 ` Maxime Ripard 2014-02-03 20:11 ` Rob Herring 2014-02-04 8:41 ` Maxime Ripard 2014-02-03 20:17 ` Daniel Lezcano 2014-02-04 8:13 ` Gregory CLEMENT 2014-02-04 8:45 ` Maxime Ripard
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).