apm821xx: fix pcie node numbers

The values provides are correct if after the @ it would be the bus
number and then device number. But it's actually, device and then
function for pcie devices.

Signed-off-by: Rosen Penev <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/19425
Signed-off-by: Christian Marangi <[email protected]>

diff --git a/target/linux/apm821xx/dts/meraki-mr24.dts b/target/linux/apm821xx/dts/meraki-mr24.dts
index c67faaaa3284ad6b53af3c9f6fcae32c5ed4573d..b056533184014bef647a1c62105bc4305726e32b 100644 (file)
--- a/target/linux/apm821xx/dts/meraki-mr24.dts
+++ b/target/linux/apm821xx/dts/meraki-mr24.dts
@@ -227,13 +227,13 @@
         *
         */
 
-       bridge@64,0 {
+       bridge@0,0 {
                reg = <0x00400000 0 0 0 0>;
                #address-cells = <3>;
                #size-cells = <2>;
                ranges;
 
-               bridge@65,0 {
+               bridge@0,0 {
                        /* IDT PES3T3 PCI Express Switch */
                        compatible = "pci111d,8039";
                        reg = <0x00410000 0 0 0 0>;
@@ -241,14 +241,14 @@
                        #size-cells = <2>;
                        ranges;
 
-                       bridge@66,2 {
+                       bridge@2,0 {
                                compatible = "pci111d,8039";
                                reg = <0x00421000 0 0 0 0>;
                                #address-cells = <3>;
                                #size-cells = <2>;
                                ranges;
 
-                               wifi0: wifi@67,0 {
+                               wifi0: wifi@0,0 {
                                        /* Atheros AR9380 2.4GHz */
                                        compatible = "pci168c,0030";
                                        reg = <0x00430000 0 0 0 0>;
@@ -256,14 +256,14 @@
                                };
                        };
 
-                       bridge@66,3 {
+                       bridge@3,0 {
                                compatible = "pci111d,8039";
                                reg = <0x00421800 0 0 0 0>;
                                #address-cells = <3>;
                                #size-cells = <2>;
                                ranges;
 
-                               wifi1: wifi@68,0 {
+                               wifi1: wifi@0,0 {
                                        /* Atheros AR9380 5GHz */
                                        compatible = "pci168c,0030";
                                        reg = <0x00440000 0 0 0 0>;

diff --git a/target/linux/apm821xx/dts/meraki-mx60.dts b/target/linux/apm821xx/dts/meraki-mx60.dts
index 534b5ac183f800559c63aa438ba4554804ab6aaf..dd0ac652ab33271de7ebda688984a637254c5cfa 100644 (file)
--- a/target/linux/apm821xx/dts/meraki-mx60.dts
+++ b/target/linux/apm821xx/dts/meraki-mx60.dts
@@ -443,13 +443,13 @@
         *      -+-[0000:40]---00.0-[41-7f]----00.0
         */
 
-       bridge@64,0 {
+       bridge@0,0 {
                reg = <0x00400000 0 0 0 0>;
                #address-cells = <3>;
                #size-cells = <2>;
                ranges;
 
-               wifi0: wifi@65,0 {
+               wifi0: wifi@0,0 {
                        /* Atheros AR9380 2.4/5GHz */
                        compatible = "pci168c,0030";
                        reg = <0x00410000 0 0 0 0>;

diff --git a/target/linux/apm821xx/dts/netgear-wndap620.dts b/target/linux/apm821xx/dts/netgear-wndap620.dts
index 50e1d0cf178d14e0e9593ca7f793714bbb5efa3b..c99569bf1fafe2b13bd1f8571703272403d89c9e 100644 (file)
--- a/target/linux/apm821xx/dts/netgear-wndap620.dts
+++ b/target/linux/apm821xx/dts/netgear-wndap620.dts
@@ -31,13 +31,13 @@
         *      -+-[0000:40]---00.0-[41-7f]----00.0
         */
 
-       bridge@64,0 {
+       bridge@0,0 {
                reg = <0x00400000 0 0 0 0>;
                #address-cells = <3>;
                #size-cells = <2>;
                ranges;
 
-               wifi0: wifi@65,0 {
+               wifi0: wifi@0,0 {
                        /* Atheros AR9380 5GHz */
                        compatible = "pci168c,0030";
                        reg = <0x00410000 0 0 0 0>;

diff --git a/target/linux/apm821xx/dts/netgear-wndap660.dts b/target/linux/apm821xx/dts/netgear-wndap660.dts
index 7cef1f5a452b4e9c952ef86d1cbf532ce82e5300..2c3b07813f1af538bd4210c961d40f0c2f3f7885 100644 (file)
--- a/target/linux/apm821xx/dts/netgear-wndap660.dts
+++ b/target/linux/apm821xx/dts/netgear-wndap660.dts
@@ -48,13 +48,13 @@
         *
         */
 
-       bridge@64,0 {
+       bridge@0,0 {
                reg = <0x00400000 0 0 0 0>;
                #address-cells = <3>;
                #size-cells = <2>;
                ranges;
 
-               bridge@65,0 {
+               bridge@0,0 {
                        /* IDT PES3T3 PCI Express Switch */
                        compatible = "pci111d,8039";
                        reg = <0x00410000 0 0 0 0>;
@@ -62,14 +62,14 @@
                        #size-cells = <2>;
                        ranges;
 
-                       bridge@66,2 {
+                       bridge@2,0 {
                                compatible = "pci111d,8039";
                                reg = <0x00421000 0 0 0 0>;
                                #address-cells = <3>;
                                #size-cells = <2>;
                                ranges;
 
-                               wifi0: wifi@67,0 {
+                               wifi0: wifi@0,0 {
                                        /* Atheros AR9380 2.4/5GHz */
                                        compatible = "pci168c,0030";
                                        reg = <0x00430000 0 0 0 0>;
@@ -77,14 +77,14 @@
                                };
                        };
 
-                       bridge@66,3 {
+                       bridge@3,0 {
                                compatible = "pci111d,8039";
                                reg = <0x00421800 0 0 0 0>;
                                #address-cells = <3>;
                                #size-cells = <2>;
                                ranges;
 
-                               wifi1: wifi@68,0 {
+                               wifi1: wifi@0,0 {
                                        /* Atheros AR9380 2.4/5GHz */
                                        compatible = "pci168c,0030";
                                        reg = <0x00440000 0 0 0 0>;

diff --git a/target/linux/apm821xx/dts/netgear-wndr4700.dts b/target/linux/apm821xx/dts/netgear-wndr4700.dts
index 6f4463fea4b68f8f5db183c868d3bff3e34867c9..c5bb3111edec68bfdb07c4f93c5cb0de7e6aec39 100644 (file)
--- a/target/linux/apm821xx/dts/netgear-wndr4700.dts
+++ b/target/linux/apm821xx/dts/netgear-wndr4700.dts
@@ -568,13 +568,13 @@
         *
         */
 
-       bridge@64,0 {
+       bridge@0,0 {
                reg = <0x00400000 0 0 0 0>;
                #address-cells = <3>;
                #size-cells = <2>;
                ranges;
 
-               bridge@65,0 {
+               bridge@0,0 {
                        /* IDT PES4T4 PCI Express Switch */
                        compatible = "pci111d,803a";
                        reg = <0x00410000 0 0 0 0>;
@@ -582,14 +582,14 @@
                        #size-cells = <2>;
                        ranges;
 
-                       bridge@66,2 {
+                       bridge@2,0 {
                                compatible = "pci111d,803a";
                                reg = <0x00421000 0 0 0 0>;
                                #address-cells = <3>;
                                #size-cells = <2>;
                                ranges;
 
-                               wifi0: wifi@67,0 {
+                               wifi0: wifi@0,0 {
                                        /* Atheros AR9380 5GHz */
                                        compatible = "pci168c,0030";
                                        reg = <0x00430000 0 0 0 0>;
@@ -605,14 +605,14 @@
                                };
                        };
 
-                       bridge@66,3 {
+                       bridge@3,0 {
                                compatible = "pci111d,803a";
                                reg = <0x00421800 0 0 0 0>;
                                #address-cells = <3>;
                                #size-cells = <2>;
                                ranges;
 
-                               wifi1: wifi@68,0 {
+                               wifi1: wifi@0,0 {
                                        /* Atheros AR9381 2.4GHz */
                                        compatible = "pci168c,0033";
                                        reg = <0x00440000 0 0 0 0>;
@@ -622,14 +622,14 @@
                                };
                        };
 
-                       bridge@66,4 {
+                       bridge@4,0 {
                                compatible = "pci111d,803a";
                                reg = <0x00422000 0 0 0 0>;
                                #address-cells = <3>;
                                #size-cells = <2>;
                                ranges;
 
-                               usb1: usb@69,0 {
+                               usb1: usb@0,0 {
                                        /* Renesas uPD720202 */
                                        compatible = "pci1912,0015";
                                        reg = <0x00450000 0 0 0 0>;