| Message ID | 1358790842-2986-7-git-send-email-gregory.clement@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Monday 21 January 2013, Gregory CLEMENT wrote: > + > +Required properties: > +- compatible: Should be "marvell,armada-370-xp-timer" > +- 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: > +- marvell,timer-25Mhz: Tells whether the Global timer supports the 25 > + Mhz fixed mode (available on Armada XP and not on Armada 370) This works fine, but I would consider it slightly cleaner to kill the marvell,timer-25Mhz property and instead have separate marvell,armada-370-timer and marvell,armada-xp-timer compatible strings, since the two timers are actually different, rather than wired differently. Arnd
On 01/21/2013 07:22 PM, Arnd Bergmann wrote: > On Monday 21 January 2013, Gregory CLEMENT wrote: >> + >> +Required properties: >> +- compatible: Should be "marvell,armada-370-xp-timer" >> +- 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: >> +- marvell,timer-25Mhz: Tells whether the Global timer supports the 25 >> + Mhz fixed mode (available on Armada XP and not on Armada 370) > > This works fine, but I would consider it slightly cleaner to kill > the marvell,timer-25Mhz property and instead have separate > marvell,armada-370-timer and marvell,armada-xp-timer compatible > strings, since the two timers are actually different, rather than wired > differently. Hum, I am not sure they are different. From my point of view it is the same IP, but the one on Armada XP can use a 25MHz fix source clock. Apart from this, all the registers are the same. Moreover currently with this property we still have the possibility to not use the 25MHz clock source on Armada XP which is totally valid. The use of this source clock is not mandatory for the Armada XP SoCs. For now I prefer to keep this property. Gregory
On Monday 21 January 2013, Gregory CLEMENT wrote: > Hum, I am not sure they are different. From my point of view it is the same IP, > but the one on Armada XP can use a 25MHz fix source clock. Apart from this, > all the registers are the same. Moreover currently with this property we still have > the possibility to not use the 25MHz clock source on Armada XP which is totally valid. > The use of this source clock is not mandatory for the Armada XP SoCs. > > For now I prefer to keep this property. Ok, fair enough. Arnd
diff --git a/Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt b/Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt deleted file mode 100644 index 6483011..0000000 --- a/Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt +++ /dev/null @@ -1,12 +0,0 @@ -Marvell Armada 370 and Armada XP Global 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 -- clocks: clock driving the timer hardware - -Optional properties: -- marvell,timer-25Mhz: Tells whether the Global timer supports the 25 - Mhz fixed mode (available on Armada XP and not on Armada 370) diff --git a/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt b/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt new file mode 100644 index 0000000..3638112 --- /dev/null +++ b/Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt @@ -0,0 +1,15 @@ +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 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: +- marvell,timer-25Mhz: Tells whether the Global timer supports the 25 + Mhz fixed mode (available on Armada XP and not on Armada 370)
Timer driver for Armada 370 and Armada XP have gained local timers support. So it needs new resources information regarding the IRQs and the registers. Also move the documentation in the new and more accurate directory Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com> --- .../bindings/arm/armada-370-xp-timer.txt | 12 ------------ .../bindings/timer/marvell,armada-370-xp-timer.txt | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 12 deletions(-) delete mode 100644 Documentation/devicetree/bindings/arm/armada-370-xp-timer.txt create mode 100644 Documentation/devicetree/bindings/timer/marvell,armada-370-xp-timer.txt