Armada XP clocks for timer

PATCH Superseded Ezequiel Garcia 6 participants 20 messages Aug 20, 2013 – Sep 11, 2013

Subsystems (2)

Device tree bindings Clocksource, clockevent drivers

lore

Share & tools

lore

Ezequiel Garcia

author

2013-08-20 15:45 UTC #0 lore raw

v3 cover Armada XP clocks for timer

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(-)

Signature · 1 line

1.8.1.5

Ezequiel Garcia

author

2013-08-20 15:45 UTC #1 lore raw

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

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

---
 arch/arm/boot/dts/armada-xp.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)

arch/arm/boot/dts/armada-xp.dtsi +9 -0

index 549151e..50e404e 100644
@@ -162,4 +162,13 @@
 			};
 		};
 	};
+
+	clocks {
+		/* 25 MHz reference crystal */
+		refclk: oscillator {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <25000000>;
+		};
+	};
 };

Signature · 1 line

1.8.1.5

Mike Turquette

2013-08-20 19:25 UTC #2 lore raw

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

Quoting Ezequiel Garcia (2013-08-20 08:45:50)

Quoted 5 lines

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

Looks good to me.

Reviewed-by Mike Turquette <[email protected]>

Quoted 30 lines

---
 arch/arm/boot/dts/armada-xp.dtsi | 9 +++++++++
 1 file changed, 9 insertions(+)

arch/arm/boot/dts/armada-xp.dtsi +9 -0

index 549151e..50e404e 100644
@@ -162,4 +162,13 @@
                        };
                };
        };
+
+       clocks {
+               /* 25 MHz reference crystal */
+               refclk: oscillator {
+                       compatible = "fixed-clock";
+                       #clock-cells = <0>;
+                       clock-frequency = <25000000>;
+               };
+       };
 };

Signature · 7 lines

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

Ezequiel Garcia

author

2013-08-20 15:45 UTC #3 lore raw

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

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

---
 arch/arm/boot/dts/armada-xp.dtsi | 2 ++
 1 file changed, 2 insertions(+)

arch/arm/boot/dts/armada-xp.dtsi +2 -0

index 50e404e..2642f55 100644
@@ -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 {

Signature · 1 line

1.8.1.5

Mike Turquette

2013-08-20 19:26 UTC #4 lore raw

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

Quoting Ezequiel Garcia (2013-08-20 08:45:51)

Quoted 6 lines

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

Looks good to me.

Reviewed-by Mike Turquette <[email protected]>

Quoted 25 lines

---
 arch/arm/boot/dts/armada-xp.dtsi | 2 ++
 1 file changed, 2 insertions(+)

arch/arm/boot/dts/armada-xp.dtsi +2 -0

index 50e404e..2642f55 100644
@@ -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 {

Signature · 7 lines

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

Ezequiel Garcia

author

2013-08-20 15:45 UTC #5 lore raw

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

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

---
 drivers/clocksource/time-armada-370-xp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

drivers/clocksource/time-armada-370-xp.c +1 -1

index 11d91e5..fca318f 100644
@@ -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;

Signature · 1 line

1.8.1.5

Ezequiel Garcia

author

2013-08-20 15:45 UTC #6 lore raw

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

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

---
 drivers/clocksource/time-armada-370-xp.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

drivers/clocksource/time-armada-370-xp.c +5 -2

index fca318f..99f9a41 100644
@@ -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);
 }

Signature · 1 line

1.8.1.5

Ezequiel Garcia

author

2013-08-20 15:45 UTC #7 lore raw

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

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

---
No changes from v2.

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

Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt +11 -2

index 4c453b2..f455182 100644
@@ -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";
 	};

Signature · 1 line

1.8.1.5

Stephen Warren

2013-08-20 20:32 UTC #8 lore raw

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

Quoted 3 lines · 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".

This patch,

Acked-by Stephen Warren <[email protected]>

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

Ezequiel Garcia

author

2013-08-20 20:50 UTC #9 lore raw

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

Quoted 8 lines · Stephen Warren

Quoted 3 lines · 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".
This patch,
Acked-by Stephen Warren <[email protected]>

Thanks!

Signature · 3 lines

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

Gregory CLEMENT

2013-08-22 08:07 UTC #10 lore raw

v3 cover Armada XP clocks for timer

In reply to Ezequiel Garcia

Quoted 36 lines · 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.

Quoted 7 lines

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

Quoted 6 lines

 .../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(-)

Signature · 4 lines

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

Ezequiel Garcia

author

2013-08-27 08:52 UTC #11 lore raw

v3 cover Armada XP clocks for timer

In reply to 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:
[...]

Quoted 4 lines

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?

Quoted 5 lines

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!

Signature · 3 lines

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

Jason Cooper

2013-08-27 14:49 UTC #12 lore raw

v3 cover Armada XP clocks for timer

Quoted 6 lines · 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...

Quoted 8 lines

On Tue, Aug 20, 2013 at 12:45:49PM -0300, Ezequiel Garcia wrote:
[...]
Quoted 4 lines
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.

Quoted 7 lines

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

thx,

Jason.

Ezequiel Garcia

author

2013-09-02 14:26 UTC #13 lore raw

v3 cover Armada XP clocks for timer

In reply to Ezequiel Garcia

Quoted 21 lines · 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:
[...]
Quoted 4 lines
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?
Quoted 5 lines
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

Quoted 8 lines

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,

Signature · 3 lines

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

Jason Cooper

2013-09-03 12:46 UTC #14 lore raw

v3 cover Armada XP clocks for timer

Quoted 31 lines · Ezequiel Garcia

Quoted 21 lines · 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:
[...]
Quoted 4 lines
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?
Quoted 5 lines
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
Quoted 8 lines
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.

Quoted 8 lines

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.

Ezequiel Garcia

author

2013-09-03 12:51 UTC #15 lore raw

v3 cover Armada XP clocks for timer

Quoted 37 lines · Jason Cooper

Quoted 36 lines · Ezequiel Garcia
Quoted 21 lines · 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:
[...]
Quoted 4 lines
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?
Quoted 5 lines
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
Quoted 8 lines
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.

Quoted 7 lines

Quoted 3 lines
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,

Signature · 3 lines

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

Jason Cooper

2013-09-03 19:26 UTC #16 lore raw

v3 cover Armada XP clocks for timer

In reply to Jason Cooper

Quoted 37 lines · Jason Cooper

Quoted 36 lines · Ezequiel Garcia
Quoted 21 lines · 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:
[...]
Quoted 4 lines
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?
Quoted 5 lines
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
Quoted 8 lines
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.

Quoted 6 lines

Quoted 3 lines
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.

Daniel Lezcano

2013-09-04 08:21 UTC #17 lore raw

v3 cover Armada XP clocks for timer

Quoted 42 lines · Jason Cooper

Quoted 41 lines · Jason Cooper
Quoted 39 lines · Ezequiel Garcia
Quoted 21 lines · 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:
[...]
Quoted 4 lines
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?
Quoted 5 lines
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
Quoted 8 lines
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.

Quoted 5 lines

Quoted 2 lines
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.

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

Ezequiel Garcia

author

2013-09-11 18:00 UTC #18 lore raw

v3 cover Armada XP clocks for timer

Quoted 43 lines · Daniel Lezcano

Quoted 42 lines · Jason Cooper
Quoted 41 lines · Jason Cooper
Quoted 39 lines · Ezequiel Garcia
Quoted 21 lines · 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:
[...]
Quoted 4 lines
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?
Quoted 5 lines
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
Quoted 8 lines
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.

Quoted 8 lines

Quoted 5 lines
Quoted 2 lines
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 <[email protected]>
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,

Signature · 3 lines

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

Jason Cooper

2013-08-27 14:53 UTC #19 lore raw

v3 cover Armada XP clocks for timer

In reply to Ezequiel Garcia

Quoted 14 lines · 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.

Quoted 7 lines

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.