diff options
| author | Olof Johansson <olof@lixom.net> | 2013-10-28 13:42:02 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-10-28 13:42:02 -0700 |
| commit | 7a54698fa6c5ee066f5b7a621a07ca4cd494a667 (patch) | |
| tree | 1044055de7931b6b515a7c250fbfe15e69b7af6b /arch/arm/boot/dts | |
| parent | 0f56438038e08e4daa460e1fdccae6d29f13e874 (diff) | |
| parent | f039dfb51b36a2d7e4ac25e65ffbd03e3ac77a0c (diff) | |
Merge tag 'dt-3.13-4' of git://git.infradead.org/linux-mvebu into next/dt
From Jason Cooper, mvebu dt changes for v3.13 (round 4):
- mvebu
- core divider clock driver dt binding and nodes
* tag 'dt-3.13-4' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: Add the core-divider clock to Armada 370/XP
ARM: mvebu: Add a 2 GHz fixed-clock Armada 370/XP
ARM: mvebu: Add Core Divider clock device-tree binding
Diffstat (limited to 'arch/arm/boot/dts')
| -rw-r--r-- | arch/arm/boot/dts/armada-370-xp.dtsi | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi index 534e1be80df2..00d6a798c705 100644 --- a/arch/arm/boot/dts/armada-370-xp.dtsi +++ b/arch/arm/boot/dts/armada-370-xp.dtsi @@ -138,6 +138,14 @@ status = "disabled"; }; + coredivclk: corediv-clock@18740 { + compatible = "marvell,armada-370-corediv-clock"; + reg = <0x18740 0xc>; + #clock-cells = <1>; + clocks = <&mainpll>; + clock-output-names = "nand"; + }; + timer@20300 { reg = <0x20300 0x30>, <0x21040 0x30>; interrupts = <37>, <38>, <39>, <40>, <5>, <6>; @@ -251,4 +259,13 @@ }; }; + + clocks { + /* 2 GHz fixed main PLL */ + mainpll: mainpll { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <2000000000>; + }; + }; }; |