Merge branch 'master' of git://git.denx.de/u-boot-usb

[oweals/u-boot.git] / arch / arm / dts / armada-cp110-slave.dtsi

diff --git a/arch/arm/dts/armada-cp110-slave.dtsi b/arch/arm/dts/armada-cp110-slave.dtsi
index 92ef55cf267218834f9e63dcee0f4c5826d31d23..b426a4eb691008d89d2138a3c54cff5211020217 100644 (file)
--- a/arch/arm/dts/armada-cp110-slave.dtsi
+++ b/arch/arm/dts/armada-cp110-slave.dtsi
@@ -61,6 +61,53 @@
                        interrupt-parent = <&gic>;
                        ranges = <0x0 0x0 0xf4000000 0x2000000>;
 
+                       cps_ethernet: ethernet@0 {
+                               compatible = "marvell,armada-7k-pp22";
+                               reg = <0x0 0x100000>, <0x129000 0xb000>;
+                               clocks = <&cps_syscon0 1 3>, <&cps_syscon0 1 9>, <&cps_syscon0 1 5>;
+                               clock-names = "pp_clk", "gop_clk", "mg_clk";
+                               status = "disabled";
+                               dma-coherent;
+
+                               cps_eth0: eth0 {
+                                       interrupts = <GIC_SPI 261 IRQ_TYPE_LEVEL_HIGH>;
+                                       port-id = <0>;
+                                       gop-port-id = <0>;
+                                       status = "disabled";
+                               };
+
+                               cps_eth1: eth1 {
+                                       interrupts = <GIC_SPI 262 IRQ_TYPE_LEVEL_HIGH>;
+                                       port-id = <1>;
+                                       gop-port-id = <2>;
+                                       status = "disabled";
+                               };
+
+                               cps_eth2: eth2 {
+                                       interrupts = <GIC_SPI 263 IRQ_TYPE_LEVEL_HIGH>;
+                                       port-id = <2>;
+                                       gop-port-id = <3>;
+                                       status = "disabled";
+                               };
+                       };
+
+                       cps_mdio: mdio@12a200 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               compatible = "marvell,orion-mdio";
+                               reg = <0x12a200 0x10>;
+                               device-name = "cps-mdio";
+                       };
+
+                       cps_xmdio: mdio@12a600 {
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               compatible = "marvell,xmdio";
+                               reg = <0x12a600 0x16>;
+                               status = "disabled";
+                               device-name = "cps-xmdio";
+                       };
+
                        cps_syscon0: system-controller@440000 {
                                compatible = "marvell,cp110-system-controller0",
                                             "syscon";
@@ -83,7 +130,7 @@
 
                        cps_pinctl: cps-pinctl@440000 {
                                compatible = "marvell,mvebu-pinctrl",
-                                            "marvell,a80x0-cp1-pinctrl";
+                                            "marvell,armada-8k-cps-pinctrl";
                                bank-name ="cp1-110";
                                reg = <0x440000 0x20>;
                                pin-count = <63>;
@@ -100,6 +147,24 @@
                                };
                        };
 
+                       cps_gpio0: gpio@440100 {
+                               compatible = "marvell,orion-gpio";
+                               reg = <0x440100 0x40>;
+                               ngpios = <32>;
+                               gpiobase = <20>;
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                       };
+
+                       cps_gpio1: gpio@440140 {
+                               compatible = "marvell,orion-gpio";
+                               reg = <0x440140 0x40>;
+                               ngpios = <31>;
+                               gpiobase = <52>;
+                               gpio-controller;
+                               #gpio-cells = <2>;
+                       };
+
                        cps_sata0: sata@540000 {
                                compatible = "marvell,armada-8k-ahci";
                                reg = <0x540000 0x30000>;
@@ -199,7 +264,7 @@
                                reg = <0x580000 0x1000>,        /* utmi-unit */
                                      <0x440420 0x4>,           /* usb-cfg */
                                      <0x440440 0x4>;           /* utmi-cfg */
-                               utmi-port = <UTMI_PHY_TO_USB_HOST0>;
+                               utmi-port = <UTMI_PHY_TO_USB3_HOST0>;
                                status = "disabled";
                        };
                };