[PATCH 4/4] clocksource: armada-370-xp: Fix clock input in devicetree binding

[PATCH 4/4] clocksource: armada-370-xp: Fix clock input in devicetree binding

[Ezequiel Garcia]

This commit specifies the clock inputs available for the Armada XP
timer: namely the 'nbclk' (L2/coherency fabric) and the 'refclk'
(25 MHz fixed-clock).

Cc: devicetree at vger.kernel.org
Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
---
 .../devicetree/bindings/timer/marvell,armada-370-xp-timer.txt        | 5 +++--
 1 file changed, 3 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..8e719a1 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,7 @@ 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: clock driving the timer hardware.
 
 Examples:
 
@@ -29,4 +28,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 4/4] clocksource: armada-370-xp: Fix clock input in devicetree binding

[Stephen Warren]

On 08/19/2013 10:28 AM, Ezequiel Garcia wrote:
> This commit specifies the clock inputs available for the Armada XP
> timer: namely the 'nbclk' (L2/coherency fabric) and the 'refclk'
> (25 MHz fixed-clock).

> diff --git a/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt b/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt

> -- clocks: clock driving the timer hardware, only required for
> -  "marvell,armada-370-timer";
> +- clocks: clock driving the timer hardware.

The valid (and required?) entries for clock-names need to be documented
here in the list of properties, not just show up in the example below.

Didn't I see some other conflicting patch for this file just the other
day which was doing exactly that? Maybe I'm getting different patches
confused...

[PATCH 4/4] clocksource: armada-370-xp: Fix clock input in devicetree binding

[Ezequiel Garcia]

On Mon, Aug 19, 2013 at 03:51:26PM -0600, Stephen Warren wrote:
> On 08/19/2013 10:28 AM, Ezequiel Garcia wrote:
> > This commit specifies the clock inputs available for the Armada XP
> > timer: namely the 'nbclk' (L2/coherency fabric) and the 'refclk'
> > (25 MHz fixed-clock).
> 
> > diff --git a/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt b/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
> 
> > -- clocks: clock driving the timer hardware, only required for
> > -  "marvell,armada-370-timer";
> > +- clocks: clock driving the timer hardware.
> 
> The valid (and required?) entries for clock-names need to be documented
> here in the list of properties, not just show up in the example below.
> 

Argh, of course... I'll send a new version.

> Didn't I see some other conflicting patch for this file just the other
> day which was doing exactly that? Maybe I'm getting different patches
> confused...

Mmm.. probably the previous patchset (on which this one is based)?

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

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