Merge tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / arch / arm / boot / dts / intel-ixp43x-gateworks-gw2358.dts

diff --git a/arch/arm/boot/dts/intel-ixp43x-gateworks-gw2358.dts b/arch/arm/boot/dts/intel-ixp43x-gateworks-gw2358.dts
index 130a245..60a1228 100644 (file)
--- a/arch/arm/boot/dts/intel-ixp43x-gateworks-gw2358.dts
+++ b/arch/arm/boot/dts/intel-ixp43x-gateworks-gw2358.dts
@@ -76,23 +76,25 @@
                };
        };
 
-       flash@50000000 {
-               compatible = "intel,ixp4xx-flash", "cfi-flash";
-               bank-width = <2>;
-               /*
-                * 32 MB of Flash in 0x20000 byte blocks
-                * mapped in at 0x50000000
-                */
-               reg = <0x50000000 0x2000000>;
-
-               partitions {
-                       compatible = "redboot-fis";
-                       /* Eraseblock at 0x1fe0000 */
-                       fis-index-block = <0xff>;
+       soc {
+               bus@50000000 {
+                       flash@0 {
+                               compatible = "intel,ixp4xx-flash", "cfi-flash";
+                               bank-width = <2>;
+                               /*
+                                * 32 MB of Flash in 0x20000 byte blocks
+                                * mapped in at CS0.
+                                */
+                               reg = <0x00000000 0x2000000>;
+
+                               partitions {
+                                       compatible = "redboot-fis";
+                                       /* Eraseblock at 0x1fe0000 */
+                                       fis-index-block = <0xff>;
+                               };
+                       };
                };
-       };
 
-       soc {
                pci@c0000000 {
                        status = "ok";
 
@@ -151,7 +153,20 @@
                                phy1: ethernet-phy@1 {
                                        reg = <1>;
                                };
+
+                               phy2: ethernet-phy@2 {
+                                       reg = <2>;
+                               };
                        };
                };
+
+               ethernet@c800c000 {
+                       status = "ok";
+                       queue-rx = <&qmgr 2>;
+                       queue-txready = <&qmgr 19>;
+                       phy-mode = "rgmii";
+                       phy-handle = <&phy2>;
+                       intel,npe-handle = <&npe 0>;
+               };
        };
 };