Merge tag 'trace-seq-buf-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...

[cascardo/linux.git] / arch / arm / boot / dts / berlin2q.dtsi

diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi
index 891d56b..35253c9 100644 (file)
--- a/arch/arm/boot/dts/berlin2q.dtsi
+++ b/arch/arm/boot/dts/berlin2q.dtsi
@@ -114,6 +114,40 @@
                        #interrupt-cells = <3>;
                };
 
+               usb_phy2: phy@a2f400 {
+                       compatible = "marvell,berlin2-usb-phy";
+                       reg = <0xa2f400 0x128>;
+                       #phy-cells = <0>;
+                       resets = <&chip 0x104 14>;
+                       status = "disabled";
+               };
+
+               usb2: usb@a30000 {
+                       compatible = "chipidea,usb2";
+                       reg = <0xa30000 0x10000>;
+                       interrupts = <GIC_SPI 52 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&chip CLKID_USB2>;
+                       phys = <&usb_phy2>;
+                       phy-names = "usb-phy";
+                       status = "disabled";
+               };
+
+               usb_phy0: phy@b74000 {
+                       compatible = "marvell,berlin2-usb-phy";
+                       reg = <0xb74000 0x128>;
+                       #phy-cells = <0>;
+                       resets = <&chip 0x104 12>;
+                       status = "disabled";
+               };
+
+               usb_phy1: phy@b78000 {
+                       compatible = "marvell,berlin2-usb-phy";
+                       reg = <0xb78000 0x128>;
+                       #phy-cells = <0>;
+                       resets = <&chip 0x104 13>;
+                       status = "disabled";
+               };
+
                eth0: ethernet@b90000 {
                        compatible = "marvell,pxa168-eth";
                        reg = <0xb90000 0x10000>;
@@ -123,6 +157,7 @@
                        local-mac-address = [00 00 00 00 00 00];
                        #address-cells = <1>;
                        #size-cells = <0>;
+                       phy-connection-type = "mii";
                        phy-handle = <&ethphy0>;
                        status = "disabled";
 
@@ -255,7 +290,6 @@
                                reg = <0x2c14 0x14>;
                                clocks = <&chip CLKID_CFG>;
                                clock-names = "timer";
-                               status = "disabled";
                        };
 
                        timer2: timer@2c28 {
@@ -349,6 +383,7 @@
                chip: chip-control@ea0000 {
                        compatible = "marvell,berlin2q-chip-ctrl";
                        #clock-cells = <1>;
+                       #reset-cells = <2>;
                        reg = <0xea0000 0x400>, <0xdd0170 0x10>;
                        clocks = <&refclk>;
                        clock-names = "refclk";
@@ -364,6 +399,65 @@
                        };
                };
 
+               ahci: sata@e90000 {
+                       compatible = "marvell,berlin2q-ahci", "generic-ahci";
+                       reg = <0xe90000 0x1000>;
+                       interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&chip CLKID_SATA>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       sata0: sata-port@0 {
+                               reg = <0>;
+                               phys = <&sata_phy 0>;
+                               status = "disabled";
+                       };
+
+                       sata1: sata-port@1 {
+                               reg = <1>;
+                               phys = <&sata_phy 1>;
+                               status = "disabled";
+                       };
+               };
+
+               sata_phy: phy@e900a0 {
+                       compatible = "marvell,berlin2q-sata-phy";
+                       reg = <0xe900a0 0x200>;
+                       clocks = <&chip CLKID_SATA>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       #phy-cells = <1>;
+                       status = "disabled";
+
+                       sata-phy@0 {
+                               reg = <0>;
+                       };
+
+                       sata-phy@1 {
+                               reg = <1>;
+                       };
+               };
+
+               usb0: usb@ed0000 {
+                       compatible = "chipidea,usb2";
+                       reg = <0xed0000 0x10000>;
+                       interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&chip CLKID_USB0>;
+                       phys = <&usb_phy0>;
+                       phy-names = "usb-phy";
+                       status = "disabled";
+               };
+
+               usb1: usb@ee0000 {
+                       compatible = "chipidea,usb2";
+                       reg = <0xee0000 0x10000>;
+                       interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;
+                       clocks = <&chip CLKID_USB1>;
+                       phys = <&usb_phy1>;
+                       phy-names = "usb-phy";
+                       status = "disabled";
+               };
+
                apb@fc0000 {
                        compatible = "simple-bus";
                        #address-cells = <1>;