Merge tag 'v3.17-rockchip-rk3288' of git://git.kernel.org/pub/scm/linux/kernel/git...

[firefly-linux-kernel-4.4.55.git] / arch / arm / boot / dts / keystone.dtsi

diff --git a/arch/arm/boot/dts/keystone.dtsi b/arch/arm/boot/dts/keystone.dtsi
index d9f99e7deb83d6da54af0a0fa911b8b1134adf2b..9e31fe7d31f8ed4401c0069074e83b1dd75f1e1b 100644 (file)
--- a/arch/arm/boot/dts/keystone.dtsi
+++ b/arch/arm/boot/dts/keystone.dtsi
@@ -66,9 +66,21 @@
                ranges = <0x0 0x0 0x0 0xc0000000>;
                dma-ranges = <0x80000000 0x8 0x00000000 0x80000000>;
 
+               pllctrl: pll-controller@02310000 {
+                       compatible = "ti,keystone-pllctrl", "syscon";
+                       reg = <0x02310000 0x200>;
+               };
+
+               devctrl: device-state-control@02620000 {
+                       compatible = "ti,keystone-devctrl", "syscon";
+                       reg = <0x02620000 0x1000>;
+               };
+
                rstctrl: reset-controller {
                        compatible = "ti,keystone-reset";
-                       reg = <0x023100e8 4>;   /* pll reset control reg */
+                       ti,syscon-pll = <&pllctrl 0xe4>;
+                       ti,syscon-dev = <&devctrl 0x328>;
+                       ti,wdt-list = <0>;
                };
 
                /include/ "keystone-clocks.dtsi"
@@ -254,5 +266,16 @@
                        ranges = <0 0 0x30000000 0x10000000
                                  1 0 0x21000A00 0x00000100>;
                };
+
+               mdio: mdio@02090300 {
+                       compatible      = "ti,keystone_mdio", "ti,davinci_mdio";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg             = <0x02090300 0x100>;
+                       status = "disabled";
+                       clocks = <&clkpa>;
+                       clock-names = "fck";
+                       bus_freq        = <2500000>;
+               };
        };
 };