[PATCH v3 0/5] Armada XP clocks for timer

[PATCH v3 0/5] Armada XP clocks for timer

[Ezequiel Garcia]

After the recent discussion on the device tree binding for the Armada 370/XP
clocksource driver, Stephen Warren, Tomasz Figa and others suggested
that the reference 25 MHz fixed-clock (aka refclk) should have a proper
device tree representation.

(Although that's still debatable, given the 25 MHz fixed-clock seems to be
used only by the timer/watchdog IP block.)

In addition to that and to be accurate, both timer clock inputs: nbclk and
refclk should be exposed in the DT node for the Armada XP timer.

Following an excellent suggestion from Sebastian Hesselbarth, here's a
patchset to accurately model the clock inputs for the timer.

Considering this is very minor improvemente from my previous patchset [1],
I dare ask about v3.12 inclusion. On the other side, maybe it's too late already
and it's best to keep it for v3.13.

Patches 1 and 2 apply on v3.11-rc4 plus the commit:
"ARM: mvebu: Fix the Armada 370/XP timer compatible strings"
that's already in mvebu/dt.

Patch 3, 4 and 5 applies on tip/timers/core plus the recent series [1].

[1] http://comments.gmane.org/gmane.linux.ports.arm.kernel/260179

Changes from v2:

  * Replace WARN_ON with BUG_ON. As noted in the patch, it's wrong
    to only WARN() as the kernel cannot keep going without a working timer.

Changes from v1:

  * Improve the devicetree binding as the requirements were very
    badly stated.

Ezequiel Garcia (5):
  ARM: mvebu: Add the reference 25 MHz fixed-clock to Armada XP
  ARM: mvebu: Add clock properties to Armada XP timer node
  clocksource: armada-370-xp: Replace WARN_ON with BUG_ON
  clocksource: armada-370-xp: Get reference fixed-clock by name
  clocksource: armada-370-xp: Add detailed clock requirements in
    devicetree binding

 .../bindings/timer/marvell,armada-370-xp-timer.txt          | 13 +++++++++++--
 arch/arm/boot/dts/armada-xp.dtsi                            | 11 +++++++++++
 drivers/clocksource/time-armada-370-xp.c                    |  9 ++++++---
 3 files changed, 28 insertions(+), 5 deletions(-)

-- 
1.8.1.5

[PATCH v3 1/5] ARM: mvebu: Add the reference 25 MHz fixed-clock to Armada XP

[Ezequiel Garcia]

The Armada XP SoC has a reference 25 MHz fixed-clock that is used in
some controllers such as the timer and the watchdog. This commit adds
a DT representation of this clock through a fixed-clock compatible node.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
 arch/arm/boot/dts/armada-xp.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 549151e..50e404e 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -162,4 +162,13 @@
 			};
 		};
 	};
+
+	clocks {
+		/* 25 MHz reference crystal */
+		refclk: oscillator {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <25000000>;
+		};
+	};
 };
-- 
1.8.1.5

[PATCH v3 1/5] ARM: mvebu: Add the reference 25 MHz fixed-clock to Armada XP

[Mike Turquette]

Quoting Ezequiel Garcia (2013-08-20 08:45:50)
> The Armada XP SoC has a reference 25 MHz fixed-clock that is used in
> some controllers such as the timer and the watchdog. This commit adds
> a DT representation of this clock through a fixed-clock compatible node.
> 
> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>

Looks good to me.

Reviewed-by: Mike Turquette <mturquette@linaro.org>

> ---
>  arch/arm/boot/dts/armada-xp.dtsi | 9 +++++++++
>  1 file changed, 9 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
> index 549151e..50e404e 100644
> --- a/arch/arm/boot/dts/armada-xp.dtsi
> +++ b/arch/arm/boot/dts/armada-xp.dtsi
> @@ -162,4 +162,13 @@
>                         };
>                 };
>         };
> +
> +       clocks {
> +               /* 25 MHz reference crystal */
> +               refclk: oscillator {
> +                       compatible = "fixed-clock";
> +                       #clock-cells = <0>;
> +                       clock-frequency = <25000000>;
> +               };
> +       };
>  };
> -- 
> 1.8.1.5
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH v3 2/5] ARM: mvebu: Add clock properties to Armada XP timer node

[Ezequiel Garcia]

With the addition of the Armada XP reference clock, we can now model
accurately the available clock inputs for the timer: namely, nbclk
and refclk. For each of this clock inputs we assign a name, for the
driver to select as appropriate.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
 arch/arm/boot/dts/armada-xp.dtsi | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 50e404e..2642f55 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -63,6 +63,8 @@
 
 			timer at 20300 {
 				compatible = "marvell,armada-xp-timer";
+				clocks = <&coreclk 2>, <&refclk>;
+				clock-names = "nbclk", "fixed";
 			};
 
 			coreclk: mvebu-sar at 18230 {
-- 
1.8.1.5

[PATCH v3 2/5] ARM: mvebu: Add clock properties to Armada XP timer node

[Mike Turquette]

Quoting Ezequiel Garcia (2013-08-20 08:45:51)
> With the addition of the Armada XP reference clock, we can now model
> accurately the available clock inputs for the timer: namely, nbclk
> and refclk. For each of this clock inputs we assign a name, for the
> driver to select as appropriate.
> 
> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>

Looks good to me.

Reviewed-by: Mike Turquette <mturquette@linaro.org>

> ---
>  arch/arm/boot/dts/armada-xp.dtsi | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
> index 50e404e..2642f55 100644
> --- a/arch/arm/boot/dts/armada-xp.dtsi
> +++ b/arch/arm/boot/dts/armada-xp.dtsi
> @@ -63,6 +63,8 @@
>  
>                         timer at 20300 {
>                                 compatible = "marvell,armada-xp-timer";
> +                               clocks = <&coreclk 2>, <&refclk>;
> +                               clock-names = "nbclk", "fixed";
>                         };
>  
>                         coreclk: mvebu-sar at 18230 {
> -- 
> 1.8.1.5
> 
> 
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

[PATCH v3 3/5] clocksource: armada-370-xp: Replace WARN_ON with BUG_ON

[Ezequiel Garcia]

If the clock fails to be obtained and the timer fails to be properly
registered, the kernel will freeze real soon. Instead, let's BUG()
where the actual problem is located.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
 drivers/clocksource/time-armada-370-xp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c
index 11d91e5..fca318f 100644
--- a/drivers/clocksource/time-armada-370-xp.c
+++ b/drivers/clocksource/time-armada-370-xp.c
@@ -304,7 +304,7 @@ static void __init armada_370_timer_init(struct device_node *np)
 {
 	struct clk *clk = of_clk_get(np, 0);
 
-	WARN_ON(IS_ERR(clk));
+	BUG_ON(IS_ERR(clk));
 	timer_clk = clk_get_rate(clk) / TIMER_DIVIDER;
 	timer25Mhz = false;
 
-- 
1.8.1.5

[PATCH v3 4/5] clocksource: armada-370-xp: Get reference fixed-clock by name

[Ezequiel Garcia]

The Armada XP timer has two mandatory clock inputs: nbclk and refclk,
as specified by the device-tree binding.

This commit fixes the clock selection. Instead of hard-coding the clock
rate for the 25 MHz reference fixed-clock, obtain the clock by its name.

Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
 drivers/clocksource/time-armada-370-xp.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/drivers/clocksource/time-armada-370-xp.c b/drivers/clocksource/time-armada-370-xp.c
index fca318f..99f9a41 100644
--- a/drivers/clocksource/time-armada-370-xp.c
+++ b/drivers/clocksource/time-armada-370-xp.c
@@ -292,8 +292,11 @@ static void __init armada_370_xp_timer_common_init(struct device_node *np)
 
 static void __init armada_xp_timer_init(struct device_node *np)
 {
-	/* The fixed 25MHz timer is required, timer25Mhz is true by default */
-	timer_clk = 25000000;
+	struct clk *clk = of_clk_get_by_name(np, "fixed");
+
+	/* The 25Mhz fixed clock is mandatory, and must always be available */
+	BUG_ON(IS_ERR(clk));
+	timer_clk = clk_get_rate(clk);
 
 	armada_370_xp_timer_common_init(np);
 }
-- 
1.8.1.5

[PATCH v3 5/5] clocksource: armada-370-xp: Add detailed clock requirements in devicetree binding

[Ezequiel Garcia]

Specifies the required clock inputs for each supported compatible.
Armada 370 requires a single clock phandle, and Armada XP requires
two clock phandles with clock-names "nbclk" and "fixed".

Cc: devicetree at vger.kernel.org
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
No changes from v2.

 .../bindings/timer/marvell,armada-370-xp-timer.txt          | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt b/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
index 4c453b2..f455182 100644
--- a/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
+++ b/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
@@ -9,8 +9,15 @@ Required properties:
 - reg: Should contain location and length for timers register. First
   pair for the Global Timer registers, second pair for the
   local/private timers.
-- clocks: clock driving the timer hardware, only required for
-  "marvell,armada-370-timer";
+
+Clocks required for compatible = "marvell,armada-370-timer":
+- clocks : Must contain a single entry describing the clock input
+
+Clocks required for compatible = "marvell,armada-xp-timer":
+- clocks : Must contain an entry for each entry in clock-names.
+- clock-names : Must include the following entries:
+  "nbclk" (L2/coherency fabric clock),
+  "fixed" (Reference 25 MHz fixed-clock).
 
 Examples:
 
@@ -29,4 +36,6 @@ Examples:
 		compatible = "marvell,armada-xp-timer";
 		reg = <0x20300 0x30>, <0x21040 0x30>;
 		interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
+		clocks = <&coreclk 2>, <&refclk>;
+		clock-names = "nbclk", "fixed";
 	};
-- 
1.8.1.5

[PATCH v3 5/5] clocksource: armada-370-xp: Add detailed clock requirements in devicetree binding

[Stephen Warren]

On 08/20/2013 09:45 AM, Ezequiel Garcia wrote:
> Specifies the required clock inputs for each supported compatible.
> Armada 370 requires a single clock phandle, and Armada XP requires
> two clock phandles with clock-names "nbclk" and "fixed".

This patch,
Acked-by: Stephen Warren <swarren@nvidia.com>

(although the requirement for Armada XP to have entries in
clocks/clock-names isn't backwards-compatible...)

[PATCH v3 5/5] clocksource: armada-370-xp: Add detailed clock requirements in devicetree binding

[Ezequiel Garcia]

On Tue, Aug 20, 2013 at 02:32:10PM -0600, Stephen Warren wrote:
> On 08/20/2013 09:45 AM, Ezequiel Garcia wrote:
> > Specifies the required clock inputs for each supported compatible.
> > Armada 370 requires a single clock phandle, and Armada XP requires
> > two clock phandles with clock-names "nbclk" and "fixed".
> 
> This patch,
> Acked-by: Stephen Warren <swarren@nvidia.com>
> 

Thanks!
-- 
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com

[PATCH v3 0/5] Armada XP clocks for timer

[Gregory CLEMENT]

On 20/08/2013 17:45, Ezequiel Garcia wrote:
> After the recent discussion on the device tree binding for the Armada 370/XP
> clocksource driver, Stephen Warren, Tomasz Figa and others suggested
> that the reference 25 MHz fixed-clock (aka refclk) should have a proper
> device tree representation.
> 
> (Although that's still debatable, given the 25 MHz fixed-clock seems to be
> used only by the timer/watchdog IP block.)
> 
> In addition to that and to be accurate, both timer clock inputs: nbclk and
> refclk should be exposed in the DT node for the Armada XP timer.
> 
> Following an excellent suggestion from Sebastian Hesselbarth, here's a
> patchset to accurately model the clock inputs for the timer.
> 
> Considering this is very minor improvemente from my previous patchset [1],
> I dare ask about v3.12 inclusion. On the other side, maybe it's too late already
> and it's best to keep it for v3.13.
> 
> Patches 1 and 2 apply on v3.11-rc4 plus the commit:
> "ARM: mvebu: Fix the Armada 370/XP timer compatible strings"
> that's already in mvebu/dt.
> 
> Patch 3, 4 and 5 applies on tip/timers/core plus the recent series [1].
> 
> [1] http://comments.gmane.org/gmane.linux.ports.arm.kernel/260179
> 
> Changes from v2:
> 
>   * Replace WARN_ON with BUG_ON. As noted in the patch, it's wrong
>     to only WARN() as the kernel cannot keep going without a working timer.
> 
> Changes from v1:
> 
>   * Improve the devicetree binding as the requirements were very
>     badly stated.
> 
> Ezequiel Garcia (5):
>   ARM: mvebu: Add the reference 25 MHz fixed-clock to Armada XP
>   ARM: mvebu: Add clock properties to Armada XP timer node
>   clocksource: armada-370-xp: Replace WARN_ON with BUG_ON
>   clocksource: armada-370-xp: Get reference fixed-clock by name
>   clocksource: armada-370-xp: Add detailed clock requirements in
>     devicetree binding

For the whole series you can add my

Acked-by: Gregory CLEMENT <gregory.clement@free-electrons.com>

> 
>  .../bindings/timer/marvell,armada-370-xp-timer.txt          | 13 +++++++++++--
>  arch/arm/boot/dts/armada-xp.dtsi                            | 11 +++++++++++
>  drivers/clocksource/time-armada-370-xp.c                    |  9 ++++++---
>  3 files changed, 28 insertions(+), 5 deletions(-)
> 


-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com

[PATCH v3 0/5] Armada XP clocks for timer

[Ezequiel Garcia]

Hi Jason and Daniel:

(I forgot to Cc Daniel on these series, sorry about that!)

So, now that we have all the acks we need...

On Tue, Aug 20, 2013 at 12:45:49PM -0300, Ezequiel Garcia wrote:
[...]
> 
> Ezequiel Garcia (5):
>   ARM: mvebu: Add the reference 25 MHz fixed-clock to Armada XP
>   ARM: mvebu: Add clock properties to Armada XP timer node

Jason: I assume these are ready to get merged through mvebu, right?

>   clocksource: armada-370-xp: Replace WARN_ON with BUG_ON
>   clocksource: armada-370-xp: Get reference fixed-clock by name
>   clocksource: armada-370-xp: Add detailed clock requirements in
>     devicetree binding
> 

Daniel: Will you pick these?

BTW: Is there any chance you can add your clocksource tree to linux-next?

Otherwise, our linux-next builds fail to boot whenever Jason pick some
mvebu commits and therefore appears in linux-next, but the corresponding
clocksource commit is taken by you and missing from linux-next.

Thanks!
-- 
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com

[PATCH v3 0/5] Armada XP clocks for timer

[Jason Cooper]

On Tue, Aug 27, 2013 at 05:52:43AM -0300, Ezequiel Garcia wrote:
> Hi Jason and Daniel:
> 
> (I forgot to Cc Daniel on these series, sorry about that!)
> 
> So, now that we have all the acks we need...
> 
> On Tue, Aug 20, 2013 at 12:45:49PM -0300, Ezequiel Garcia wrote:
> [...]
> > 
> > Ezequiel Garcia (5):
> >   ARM: mvebu: Add the reference 25 MHz fixed-clock to Armada XP
> >   ARM: mvebu: Add clock properties to Armada XP timer node
> 
> Jason: I assume these are ready to get merged through mvebu, right?

Yep.

> >   clocksource: armada-370-xp: Replace WARN_ON with BUG_ON
> >   clocksource: armada-370-xp: Get reference fixed-clock by name
> >   clocksource: armada-370-xp: Add detailed clock requirements in
> >     devicetree binding
> > 
> 
> Daniel: Will you pick these?

For these three:

Acked-by: Jason Cooper <jason@lakedaemon.net>

thx,

Jason.

[PATCH v3 0/5] Armada XP clocks for timer

[Ezequiel Garcia]

On Tue, Aug 27, 2013 at 05:52:42AM -0300, Ezequiel Garcia wrote:
> Hi Jason and Daniel:
> 
> (I forgot to Cc Daniel on these series, sorry about that!)
> 
> So, now that we have all the acks we need...
> 
> On Tue, Aug 20, 2013 at 12:45:49PM -0300, Ezequiel Garcia wrote:
> [...]
> > 
> > Ezequiel Garcia (5):
> >   ARM: mvebu: Add the reference 25 MHz fixed-clock to Armada XP
> >   ARM: mvebu: Add clock properties to Armada XP timer node
> 
> Jason: I assume these are ready to get merged through mvebu, right?
> 
> >   clocksource: armada-370-xp: Replace WARN_ON with BUG_ON
> >   clocksource: armada-370-xp: Get reference fixed-clock by name
> >   clocksource: armada-370-xp: Add detailed clock requirements in
> >     devicetree binding
> > 
> 
> Daniel: Will you pick these?
> 
> BTW: Is there any chance you can add your clocksource tree to linux-next?
> 
> Otherwise, our linux-next builds fail to boot whenever Jason pick some
> mvebu commits and therefore appears in linux-next, but the corresponding
> clocksource commit is taken by you and missing from linux-next.
> 

Daniel,

Any updates on this? The merge is really close now, and I'd like
to know if you're going to pick these (and where!) for v3.12.

Notice that Jason already took the devicetree patches, so unless
you merge the clocksource driver changes for v3.12, we'll have
to revert the former.

Regards,
-- 
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com

[PATCH v3 0/5] Armada XP clocks for timer

[Jason Cooper]

On Mon, Sep 02, 2013 at 11:26:26AM -0300, Ezequiel Garcia wrote:
> On Tue, Aug 27, 2013 at 05:52:42AM -0300, Ezequiel Garcia wrote:
> > Hi Jason and Daniel:
> > 
> > (I forgot to Cc Daniel on these series, sorry about that!)
> > 
> > So, now that we have all the acks we need...
> > 
> > On Tue, Aug 20, 2013 at 12:45:49PM -0300, Ezequiel Garcia wrote:
> > [...]
> > > 
> > > Ezequiel Garcia (5):
> > >   ARM: mvebu: Add the reference 25 MHz fixed-clock to Armada XP
> > >   ARM: mvebu: Add clock properties to Armada XP timer node
> > 
> > Jason: I assume these are ready to get merged through mvebu, right?
> > 
> > >   clocksource: armada-370-xp: Replace WARN_ON with BUG_ON
> > >   clocksource: armada-370-xp: Get reference fixed-clock by name
> > >   clocksource: armada-370-xp: Add detailed clock requirements in
> > >     devicetree binding
> > > 
> > 
> > Daniel: Will you pick these?
> > 
> > BTW: Is there any chance you can add your clocksource tree to linux-next?
> > 
> > Otherwise, our linux-next builds fail to boot whenever Jason pick some
> > mvebu commits and therefore appears in linux-next, but the corresponding
> > clocksource commit is taken by you and missing from linux-next.
> > 
> 
> Daniel,
> 
> Any updates on this? The merge is really close now, and I'd like
> to know if you're going to pick these (and where!) for v3.12.
> 
> Notice that Jason already took the devicetree patches, so unless
> you merge the clocksource driver changes for v3.12, we'll have
> to revert the former.

I saw Daniel's pull, so I just sent the last pull for mvebu/dt including
these changes.

thx,

Jason.

[PATCH v3 0/5] Armada XP clocks for timer

[Ezequiel Garcia]

On Tue, Sep 03, 2013 at 08:46:33AM -0400, Jason Cooper wrote:
> On Mon, Sep 02, 2013 at 11:26:26AM -0300, Ezequiel Garcia wrote:
> > On Tue, Aug 27, 2013 at 05:52:42AM -0300, Ezequiel Garcia wrote:
> > > Hi Jason and Daniel:
> > > 
> > > (I forgot to Cc Daniel on these series, sorry about that!)
> > > 
> > > So, now that we have all the acks we need...
> > > 
> > > On Tue, Aug 20, 2013 at 12:45:49PM -0300, Ezequiel Garcia wrote:
> > > [...]
> > > > 
> > > > Ezequiel Garcia (5):
> > > >   ARM: mvebu: Add the reference 25 MHz fixed-clock to Armada XP
> > > >   ARM: mvebu: Add clock properties to Armada XP timer node
> > > 
> > > Jason: I assume these are ready to get merged through mvebu, right?
> > > 
> > > >   clocksource: armada-370-xp: Replace WARN_ON with BUG_ON
> > > >   clocksource: armada-370-xp: Get reference fixed-clock by name
> > > >   clocksource: armada-370-xp: Add detailed clock requirements in
> > > >     devicetree binding
> > > > 
> > > 
> > > Daniel: Will you pick these?
> > > 
> > > BTW: Is there any chance you can add your clocksource tree to linux-next?
> > > 
> > > Otherwise, our linux-next builds fail to boot whenever Jason pick some
> > > mvebu commits and therefore appears in linux-next, but the corresponding
> > > clocksource commit is taken by you and missing from linux-next.
> > > 
> > 
> > Daniel,
> > 
> > Any updates on this? The merge is really close now, and I'd like
> > to know if you're going to pick these (and where!) for v3.12.
> > 
> > Notice that Jason already took the devicetree patches, so unless
> > you merge the clocksource driver changes for v3.12, we'll have
> > to revert the former.
> 
> I saw Daniel's pull, so I just sent the last pull for mvebu/dt including
> these changes.
> 

Aweseome.

Thanks,
-- 
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com

[PATCH v3 0/5] Armada XP clocks for timer

[Jason Cooper]

On Tue, Sep 03, 2013 at 08:46:33AM -0400, Jason Cooper wrote:
> On Mon, Sep 02, 2013 at 11:26:26AM -0300, Ezequiel Garcia wrote:
> > On Tue, Aug 27, 2013 at 05:52:42AM -0300, Ezequiel Garcia wrote:
> > > Hi Jason and Daniel:
> > > 
> > > (I forgot to Cc Daniel on these series, sorry about that!)
> > > 
> > > So, now that we have all the acks we need...
> > > 
> > > On Tue, Aug 20, 2013 at 12:45:49PM -0300, Ezequiel Garcia wrote:
> > > [...]
> > > > 
> > > > Ezequiel Garcia (5):
> > > >   ARM: mvebu: Add the reference 25 MHz fixed-clock to Armada XP
> > > >   ARM: mvebu: Add clock properties to Armada XP timer node
> > > 
> > > Jason: I assume these are ready to get merged through mvebu, right?
> > > 
> > > >   clocksource: armada-370-xp: Replace WARN_ON with BUG_ON
> > > >   clocksource: armada-370-xp: Get reference fixed-clock by name
> > > >   clocksource: armada-370-xp: Add detailed clock requirements in
> > > >     devicetree binding
> > > > 
> > > 
> > > Daniel: Will you pick these?
> > > 
> > > BTW: Is there any chance you can add your clocksource tree to linux-next?
> > > 
> > > Otherwise, our linux-next builds fail to boot whenever Jason pick some
> > > mvebu commits and therefore appears in linux-next, but the corresponding
> > > clocksource commit is taken by you and missing from linux-next.
> > > 
> > 
> > Daniel,
> > 
> > Any updates on this? The merge is really close now, and I'd like
> > to know if you're going to pick these (and where!) for v3.12.
> > 
> > Notice that Jason already took the devicetree patches, so unless
> > you merge the clocksource driver changes for v3.12, we'll have
> > to revert the former.
> 
> I saw Daniel's pull, so I just sent the last pull for mvebu/dt including
> these changes.

Daniel, did your changes make it in?  If so, I'll have to send these as a
fix for -rc1...

thx,

Jason.

[PATCH v3 0/5] Armada XP clocks for timer

[Daniel Lezcano]

On 09/03/2013 09:26 PM, Jason Cooper wrote:
> On Tue, Sep 03, 2013 at 08:46:33AM -0400, Jason Cooper wrote:
>> On Mon, Sep 02, 2013 at 11:26:26AM -0300, Ezequiel Garcia wrote:
>>> On Tue, Aug 27, 2013 at 05:52:42AM -0300, Ezequiel Garcia wrote:
>>>> Hi Jason and Daniel:
>>>>
>>>> (I forgot to Cc Daniel on these series, sorry about that!)
>>>>
>>>> So, now that we have all the acks we need...
>>>>
>>>> On Tue, Aug 20, 2013 at 12:45:49PM -0300, Ezequiel Garcia wrote:
>>>> [...]
>>>>>
>>>>> Ezequiel Garcia (5):
>>>>>   ARM: mvebu: Add the reference 25 MHz fixed-clock to Armada XP
>>>>>   ARM: mvebu: Add clock properties to Armada XP timer node
>>>>
>>>> Jason: I assume these are ready to get merged through mvebu, right?
>>>>
>>>>>   clocksource: armada-370-xp: Replace WARN_ON with BUG_ON
>>>>>   clocksource: armada-370-xp: Get reference fixed-clock by name
>>>>>   clocksource: armada-370-xp: Add detailed clock requirements in
>>>>>     devicetree binding
>>>>>
>>>>
>>>> Daniel: Will you pick these?
>>>>
>>>> BTW: Is there any chance you can add your clocksource tree to linux-next?
>>>>
>>>> Otherwise, our linux-next builds fail to boot whenever Jason pick some
>>>> mvebu commits and therefore appears in linux-next, but the corresponding
>>>> clocksource commit is taken by you and missing from linux-next.
>>>>
>>>
>>> Daniel,
>>>
>>> Any updates on this? The merge is really close now, and I'd like
>>> to know if you're going to pick these (and where!) for v3.12.
>>>
>>> Notice that Jason already took the devicetree patches, so unless
>>> you merge the clocksource driver changes for v3.12, we'll have
>>> to revert the former.
>>
>> I saw Daniel's pull, so I just sent the last pull for mvebu/dt including
>> these changes.
> 
> Daniel, did your changes make it in?  If so, I'll have to send these as a
> fix for -rc1...

Not yet.


-- 
 <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 v3 0/5] Armada XP clocks for timer

[Ezequiel Garcia]

On Wed, Sep 04, 2013 at 10:21:34AM +0200, Daniel Lezcano wrote:
> On 09/03/2013 09:26 PM, Jason Cooper wrote:
> > On Tue, Sep 03, 2013 at 08:46:33AM -0400, Jason Cooper wrote:
> >> On Mon, Sep 02, 2013 at 11:26:26AM -0300, Ezequiel Garcia wrote:
> >>> On Tue, Aug 27, 2013 at 05:52:42AM -0300, Ezequiel Garcia wrote:
> >>>> Hi Jason and Daniel:
> >>>>
> >>>> (I forgot to Cc Daniel on these series, sorry about that!)
> >>>>
> >>>> So, now that we have all the acks we need...
> >>>>
> >>>> On Tue, Aug 20, 2013 at 12:45:49PM -0300, Ezequiel Garcia wrote:
> >>>> [...]
> >>>>>
> >>>>> Ezequiel Garcia (5):
> >>>>>   ARM: mvebu: Add the reference 25 MHz fixed-clock to Armada XP
> >>>>>   ARM: mvebu: Add clock properties to Armada XP timer node
> >>>>
> >>>> Jason: I assume these are ready to get merged through mvebu, right?
> >>>>
> >>>>>   clocksource: armada-370-xp: Replace WARN_ON with BUG_ON
> >>>>>   clocksource: armada-370-xp: Get reference fixed-clock by name
> >>>>>   clocksource: armada-370-xp: Add detailed clock requirements in
> >>>>>     devicetree binding
> >>>>>
> >>>>
> >>>> Daniel: Will you pick these?
> >>>>
> >>>> BTW: Is there any chance you can add your clocksource tree to linux-next?
> >>>>
> >>>> Otherwise, our linux-next builds fail to boot whenever Jason pick some
> >>>> mvebu commits and therefore appears in linux-next, but the corresponding
> >>>> clocksource commit is taken by you and missing from linux-next.
> >>>>
> >>>
> >>> Daniel,
> >>>
> >>> Any updates on this? The merge is really close now, and I'd like
> >>> to know if you're going to pick these (and where!) for v3.12.
> >>>
> >>> Notice that Jason already took the devicetree patches, so unless
> >>> you merge the clocksource driver changes for v3.12, we'll have
> >>> to revert the former.
> >>
> >> I saw Daniel's pull, so I just sent the last pull for mvebu/dt including
> >> these changes.
> > 
> > Daniel, did your changes make it in?  If so, I'll have to send these as a
> > fix for -rc1...
> 
> Not yet.
> 

And given Ingo sent the timer pull in September 3rd, it seems none of that
clocksource stuff will make it for v3.12.

Jason: If that's the case, then we'll have to ask Olof to revert any patches
that were included in this two patchsets, and that have been taken by you
and pulled in arm-soc.

In other words, this one:

commit 5d3b883071763e6448386b875f04fcb201b6e12d
Author: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
Date:   Tue Aug 13 11:43:15 2013 -0300

    ARM: mvebu: Fix the Armada 370/XP timer compatible strings
---

Right now, Armada 370/XP boards won't boot using Linus' master,
because of the above patch.

That said, discussing this with Olof he pointed out it was a very bad
decision to change the compatible while not retaining the old one,
since we created precisely this kind of break risk! My bad.

Thanks,
-- 
Ezequiel Garc?a, Free Electrons
Embedded Linux, Kernel and Android Engineering
http://free-electrons.com

[PATCH v3 0/5] Armada XP clocks for timer

[Jason Cooper]

On Tue, Aug 20, 2013 at 12:45:49PM -0300, Ezequiel Garcia wrote:
> After the recent discussion on the device tree binding for the Armada 370/XP
> clocksource driver, Stephen Warren, Tomasz Figa and others suggested
> that the reference 25 MHz fixed-clock (aka refclk) should have a proper
> device tree representation.
> 
> (Although that's still debatable, given the 25 MHz fixed-clock seems to be
> used only by the timer/watchdog IP block.)
> 
> In addition to that and to be accurate, both timer clock inputs: nbclk and
> refclk should be exposed in the DT node for the Armada XP timer.
> 
> Following an excellent suggestion from Sebastian Hesselbarth, here's a
> patchset to accurately model the clock inputs for the timer.
> 
> Considering this is very minor improvemente from my previous patchset [1],
> I dare ask about v3.12 inclusion. On the other side, maybe it's too late already
> and it's best to keep it for v3.13.
> 
> Patches 1 and 2 apply on v3.11-rc4 plus the commit:
> "ARM: mvebu: Fix the Armada 370/XP timer compatible strings"
> that's already in mvebu/dt.

Patches 1 and 2 applied to mvebu/dt with Mike's Reviewed-by and
Gregory's Ack.

thx,

Jason.