Merge branch 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping

[karo-tx-linux.git] / arch / arm / boot / dts / highbank.dts

diff --git a/arch/arm/boot/dts/highbank.dts b/arch/arm/boot/dts/highbank.dts
index 7414577c177fce867038a717b29cb3c3ea3545fe..0c6fc34821f93f336fd705626c35da8b9cbba9f3 100644 (file)
--- a/arch/arm/boot/dts/highbank.dts
+++ b/arch/arm/boot/dts/highbank.dts
@@ -121,6 +121,9 @@
                        compatible = "calxeda,hb-ahci";
                        reg = <0xffe08000 0x10000>;
                        interrupts = <0 83 4>;
+                       calxeda,port-phys = <&combophy5 0 &combophy0 0
+                                            &combophy0 1 &combophy0 2
+                                            &combophy0 3>;
                        dma-coherent;
                };
 
@@ -307,5 +310,19 @@
                        reg = <0xfff51000 0x1000>;
                        interrupts = <0 80 4  0 81 4  0 82 4>;
                };
+
+               combophy0: combo-phy@fff58000 {
+                       compatible = "calxeda,hb-combophy";
+                       #phy-cells = <1>;
+                       reg = <0xfff58000 0x1000>;
+                       phydev = <5>;
+               };
+
+               combophy5: combo-phy@fff5d000 {
+                       compatible = "calxeda,hb-combophy";
+                       #phy-cells = <1>;
+                       reg = <0xfff5d000 0x1000>;
+                       phydev = <31>;
+               };
        };
 };