From afef897a259d2bad618e87b718728c830e29f9b8 Mon Sep 17 00:00:00 2001 From: Gregory CLEMENT Date: Fri, 25 Jan 2013 18:32:45 +0100 Subject: [PATCH] --- yaml --- r: 359948 b: refs/heads/master c: 37dd39513c33d518ccd8ea39ebe43d0f117590da h: refs/heads/master v: v3 --- [refs] | 2 +- .../marvell,armada-370-xp-timer.txt} | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) rename trunk/Documentation/devicetree/bindings/{arm/armada-370-xp-timer.txt => timer/marvell,armada-370-xp-timer.txt} (55%) diff --git a/[refs] b/[refs] index 480eb3daebd2..30b30e2398eb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e1dd464901080ecf7ebd3fd27dfc5735719055f4 +refs/heads/master: 37dd39513c33d518ccd8ea39ebe43d0f117590da diff --git a/trunk/Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt b/trunk/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt similarity index 55% rename from trunk/Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt rename to trunk/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt index 64830118b013..36381129d141 100644 --- a/trunk/Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt +++ b/trunk/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt @@ -1,10 +1,13 @@ -Marvell Armada 370 and Armada XP Global Timers ----------------------------------------------- +Marvell Armada 370 and Armada XP Timers +--------------------------------------- Required properties: - compatible: Should be "marvell,armada-370-xp-timer" -- interrupts: Should contain the list of Global Timer interrupts -- reg: Should contain the base address of the Global Timer registers +- interrupts: Should contain the list of Global Timer interrupts and + then local timer interrupts +- 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 Optional properties: