target/linux/mvebu/patches-3.10/0193-clocksource-armada-370-xp-Fix-device-tree-binding.patch

   1 From ba47ab198541f6ed822b3c9691b392d83edba8b4 Mon Sep 17 00:00:00 2001
   2 From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
   3 Date: Tue, 13 Aug 2013 11:43:14 -0300
   4 Subject: [PATCH 193/203] clocksource: armada-370-xp: Fix device-tree binding
   5
   6 This commit fixes the DT binding for the Armada 370/XP SoC timer.
   7 The previous "marvell,armada-370-xp-timer" compatible is removed and
   8 two new compatible strings are introduced: "marvell,armada-xp-timer"
   9 and "marvell,armada-370-timer".
  10
  11 The rationale behind this change is that the Armada 370 SoC and the
  12 Armada XP SoC timers are not really compatible:
  13
  14   * Armada 370 has no 25 MHz fixed timer.
  15
  16   * Armada XP cannot work properly without such 25 MHz fixed timer
  17     as doing otherwise leads to using a clocksource whose frequency
  18     varies when doing cpufreq frequency changes.
  19
  20 This commit also removes the "marvell,timer-25Mhz" property, given
  21 it's now meaningless.
  22
  23 Cc: devicetree@vger.kernel.org
  24 Acked-by: Jason Cooper <jason@lakedaemon.net>
  25 Reviewed-by: Andrew Lunn <andrew@lunn.ch>
  26 Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com>
  27 Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
  28 ---
  29  .../bindings/timer/marvell,armada-370-xp-timer.txt | 27 ++++++++++++++++++----
  30  1 file changed, 22 insertions(+), 5 deletions(-)
  31
  32 --- a/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
  33 +++ b/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt
  34 @@ -2,14 +2,31 @@ Marvell Armada 370 and Armada XP Timers
  35  ---------------------------------------
  36
  37  Required properties:
  38 -- compatible: Should be "marvell,armada-370-xp-timer"
  39 +- compatible: Should be either "marvell,armada-370-timer" or
  40 +  "marvell,armada-xp-timer" as appropriate.
  41  - interrupts: Should contain the list of Global Timer interrupts and
  42    then local timer interrupts
  43  - reg: Should contain location and length for timers register. First
  44    pair for the Global Timer registers, second pair for the
  45    local/private timers.
  46 -- clocks: clock driving the timer hardware
  47 +- clocks: clock driving the timer hardware, only required for
  48 +  "marvell,armada-370-timer";
  49
  50 -Optional properties:
  51 -- marvell,timer-25Mhz: Tells whether the Global timer supports the 25
  52 -  Mhz fixed mode (available on Armada XP and not on Armada 370)
  53 +Examples:
  54 +
  55 +- Armada 370:
  56 +
  57 +       timer {
  58 +               compatible = "marvell,armada-370-timer";
  59 +               reg = <0x20300 0x30>, <0x21040 0x30>;
  60 +               interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
  61 +               clocks = <&coreclk 2>;
  62 +       };
  63 +
  64 +- Armada XP:
  65 +
  66 +       timer {
  67 +               compatible = "marvell,armada-xp-timer";
  68 +               reg = <0x20300 0x30>, <0x21040 0x30>;
  69 +               interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
  70 +       };