diff options
author | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 19:15:55 +0000 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-24 19:16:04 +0000 |
commit | 7d1206bc2859c6e9f46e35ae697c138e7d7858a7 (patch) | |
tree | 14af84e9a635e59293edf81aa562b6740c57d310 /arch/arm/boot/dts/kirkwood.dtsi | |
parent | f4eb28340771c12cdbf8b5ec149dbd3b0eef1687 (diff) | |
parent | c899445f9783309ac73073282d4c0ae27f51fa9a (diff) | |
download | talos-op-linux-7d1206bc2859c6e9f46e35ae697c138e7d7858a7.tar.gz talos-op-linux-7d1206bc2859c6e9f46e35ae697c138e7d7858a7.zip |
Merge branch 'kirkwood/dt' into next/dt2
This was part of the for-next branch earlier but for some reasons
a rebuild of the tree missed it, so I'm putting it back in now.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/kirkwood.dtsi')
-rw-r--r-- | arch/arm/boot/dts/kirkwood.dtsi | 36 |
1 files changed, 36 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi new file mode 100644 index 000000000000..3474ef890945 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood.dtsi @@ -0,0 +1,36 @@ +/include/ "skeleton.dtsi" + +/ { + compatible = "mrvl,kirkwood"; + + ocp@f1000000 { + compatible = "simple-bus"; + ranges = <0 0xf1000000 0x1000000>; + #address-cells = <1>; + #size-cells = <1>; + + serial@12000 { + compatible = "ns16550a"; + reg = <0x12000 0x100>; + reg-shift = <2>; + interrupts = <33>; + /* set clock-frequency in board dts */ + status = "disabled"; + }; + + serial@12100 { + compatible = "ns16550a"; + reg = <0x12100 0x100>; + reg-shift = <2>; + interrupts = <34>; + /* set clock-frequency in board dts */ + status = "disabled"; + }; + + rtc@10300 { + compatible = "mrvl,kirkwood-rtc", "mrvl,orion-rtc"; + reg = <0x10300 0x20>; + interrupts = <53>; + }; + }; +}; |