diff options
author | Olof Johansson <olof@lixom.net> | 2014-07-20 12:23:56 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2014-07-20 12:23:56 -0700 |
commit | 185829efb867120683b7245c60baf06f831aabf6 (patch) | |
tree | 3629275406d5986ab2fc4031b42246dd100697f6 /arch/arm/boot/dts/kirkwood-net5big.dts | |
parent | 87adf92b95715ece8c8102e465d0682d57037d22 (diff) | |
parent | 3843607838cc5436d02a6771e661969a54c2fee0 (diff) |
Merge tag 'mvebu-dt-3.17-2' of git://git.infradead.org/linux-mvebu into next/dt
Merge "ARM: mvebu: DT changes for v3.17 (round 2)" from Jason Cooper:
mvebu DT changes for v3.17 (round 2):
- kirkwood
* Add d2 Network v2 board
- mvebu
* Add Armada 375 ethernet node
* Add CA9 MPcore SoC controller node
* Add support for dynamic freq scaling on Armada XP
* tag 'mvebu-dt-3.17-2' of git://git.infradead.org/linux-mvebu:
ARM: mvebu: update Armada XP DT for dynamic frequency scaling
ARM: mvebu: add CA9 MPcore SoC Controller node
ARM: mvebu: Enable the network controller in Armada 375 DB board
ARM: mvebu: Add support for the network controller in Armada 375 SoC
ARM: Kirkwood: add DT support for d2 Network v2
ARM: Kirkwood: allow to use netxbig DTSI for d2net_v2 DTS
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/kirkwood-net5big.dts')
-rw-r--r-- | arch/arm/boot/dts/kirkwood-net5big.dts | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/kirkwood-net5big.dts b/arch/arm/boot/dts/kirkwood-net5big.dts index d2887ed493f2..36155b749d9f 100644 --- a/arch/arm/boot/dts/kirkwood-net5big.dts +++ b/arch/arm/boot/dts/kirkwood-net5big.dts @@ -31,6 +31,18 @@ }; ®ulators { + regulator@2 { + compatible = "regulator-fixed"; + reg = <2>; + regulator-name = "hdd1power"; + regulator-min-microvolt = <5000000>; + regulator-max-microvolt = <5000000>; + enable-active-high; + regulator-always-on; + regulator-boot-on; + gpio = <&gpio0 17 GPIO_ACTIVE_HIGH>; + }; + regulator@3 { compatible = "regulator-fixed"; reg = <3>; @@ -66,6 +78,14 @@ regulator-boot-on; gpio = <&gpio1 11 GPIO_ACTIVE_HIGH>; }; + + clocks { + g762_clk: g762-oscillator { + compatible = "fixed-clock"; + #clock-cells = <0>; + clock-frequency = <32768>; + }; + }; }; &mdio { @@ -81,3 +101,11 @@ }; }; + +&i2c0 { + g762@3e { + compatible = "gmt,g762"; + reg = <0x3e>; + clocks = <&g762_clk>; + }; +}; |