ARM: dts: BCM5301X: add root pcie bridges

They are always required and instead of duplicating a definition in each
dts file, place it in dtsi with labels and work based on that.

Also changed each bridge@ to pcie@ to get extra dtc static analysis.

Fixed bridge numbers as a result.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
Link: https://lore.kernel.org/r/20260302000736.592422-1-rosenp@gmail.com
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>

diff --git a/arch/arm/boot/dts/broadcom/bcm-ns.dtsi b/arch/arm/boot/dts/broadcom/bcm-ns.dtsi
index 3fb1b762e492aae28aa695d6d6c29cec09de30c5..392a257136696488cd361f0a5dee02a7448d3824 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm-ns.dtsi
+++ b/arch/arm/boot/dts/broadcom/bcm-ns.dtsi
@@ -196,6 +196,16 @@
                        #interrupt-cells = <1>;
                        #address-cells = <3>;
                        #size-cells = <2>;
+
+                       pcie_bridge0: pcie@0 {
+                               device_type = "pci";
+                               reg = <0x0000 0 0 0 0>;
+                               bus-range = <0x00 0xff>;
+
+                               #address-cells = <3>;
+                               #size-cells = <2>;
+                               ranges;
+                       };
                };
 
                pcie1: pcie@13000 {
@@ -210,6 +220,16 @@
                        #interrupt-cells = <1>;
                        #address-cells = <3>;
                        #size-cells = <2>;
+
+                       pcie_bridge1: pcie@0 {
+                               device_type = "pci";
+                               reg = <0x0000 0 0 0 0>;
+                               bus-range = <0x00 0xff>;
+
+                               #address-cells = <3>;
+                               #size-cells = <2>;
+                               ranges;
+                       };
                };
 
                pcie2: pcie@14000 {
@@ -224,6 +244,16 @@
                        #interrupt-cells = <1>;
                        #address-cells = <3>;
                        #size-cells = <2>;
+
+                       pcie_bridge2: pcie@0 {
+                               device_type = "pci";
+                               reg = <0x0000 0 0 0 0>;
+                               bus-range = <0x00 0xff>;
+
+                               #address-cells = <3>;
+                               #size-cells = <2>;
+                               ranges;
+                       };
                };
 
                usb2: usb2@21000 {

diff --git a/arch/arm/boot/dts/broadcom/bcm4709-netgear-r8000.dts b/arch/arm/boot/dts/broadcom/bcm4709-netgear-r8000.dts
index 127ca87412201aae6b32812f9c4dcff7ae4bfa28..d170c71cbd763ac8f7af38d7ae87ced1ed51c8c3 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm4709-netgear-r8000.dts
+++ b/arch/arm/boot/dts/broadcom/bcm4709-netgear-r8000.dts
@@ -126,66 +126,53 @@
        };
 };
 
-&pcie0 {
-       #address-cells = <3>;
-       #size-cells = <2>;
-
-       bridge@0,0,0 {
+&pcie_bridge0 {
+       wifi@0,0 {
+               compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
                reg = <0x0000 0 0 0 0>;
-
-               #address-cells = <3>;
-               #size-cells = <2>;
-
-               wifi@0,1,0 {
-                       compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
-                       reg = <0x0000 0 0 0 0>;
-                       ieee80211-freq-limit = <5735000 5835000>;
-                       brcm,ccode-map = "JP-JP-78", "US-Q2-86";
-               };
+               ieee80211-freq-limit = <5735000 5835000>;
+               brcm,ccode-map = "JP-JP-78", "US-Q2-86";
        };
 };
 
-&pcie1 {
-       #address-cells = <3>;
-       #size-cells = <2>;
-
-       bridge@1,0,0 {
+&pcie_bridge1 {
+       pcie@0,0 {
+               device_type = "pci";
                reg = <0x0000 0 0 0 0>;
+               bus-range = <0x01 0xff>;
 
                #address-cells = <3>;
                #size-cells = <2>;
+               ranges;
 
-               bridge@1,1,0 {
-                       reg = <0x0000 0 0 0 0>;
+               pcie@1,0 {
+                       device_type = "pci";
+                       reg = <0x800 0 0 0 0>;
 
                        #address-cells = <3>;
                        #size-cells = <2>;
+                       ranges;
 
-                       bridge@1,0 {
-                               reg = <0x800 0 0 0 0>;
-
-                               #address-cells = <3>;
-                               #size-cells = <2>;
-
-                               wifi@0,0 {
-                                       compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
-                                       reg = <0x0000 0 0 0 0>;
-                                       brcm,ccode-map = "JP-JP-78", "US-Q2-86";
-                               };
+                       wifi@0,0 {
+                               compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
+                               reg = <0x0000 0 0 0 0>;
+                               brcm,ccode-map = "JP-JP-78", "US-Q2-86";
                        };
+               };
 
-                       bridge@1,2,2 {
-                               reg = <0x1000 0 0 0 0>;
+               pcie@2,0 {
+                       device_type = "pci";
+                       reg = <0x1000 0 0 0 0>;
 
-                               #address-cells = <3>;
-                               #size-cells = <2>;
+                       #address-cells = <3>;
+                       #size-cells = <2>;
+                       ranges;
 
-                               wifi@1,4,0 {
-                                       compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
-                                       reg = <0x0000 0 0 0 0>;
-                                       ieee80211-freq-limit = <5170000 5730000>;
-                                       brcm,ccode-map = "JP-JP-78", "US-Q2-86";
-                               };
+                       wifi@0,0 {
+                               compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
+                               reg = <0x0000 0 0 0 0>;
+                               ieee80211-freq-limit = <5170000 5730000>;
+                               brcm,ccode-map = "JP-JP-78", "US-Q2-86";
                        };
                };
        };

diff --git a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xap-1610.dts b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xap-1610.dts
index badafa024d24c56e15fda3295bbd3f96d0a93081..3a33705c29693a106a069b7e58442fbff5e282b3 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xap-1610.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xap-1610.dts
@@ -65,39 +65,19 @@
 };
 
 
-&pcie0 {
-       #address-cells = <3>;
-       #size-cells = <2>;
-
-       bridge@0,0 {
+&pcie_bridge0 {
+       wifi@0,0 {
+               compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
                reg = <0x0000 0 0 0 0>;
-
-               #address-cells = <3>;
-               #size-cells = <2>;
-
-               wifi@0,0 {
-                       compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
-                       reg = <0x0000 0 0 0 0>;
-                       brcm,ccode-map = "AU-AU-920", "CA-CA-892", "GB-DE-964", "NZ-AU-920", "US-US-825";
-               };
+               brcm,ccode-map = "AU-AU-920", "CA-CA-892", "GB-DE-964", "NZ-AU-920", "US-US-825";
        };
 };
 
-&pcie1 {
-       #address-cells = <3>;
-       #size-cells = <2>;
-
-       bridge@0,0 {
+&pcie_bridge1 {
+       wifi@0,0 {
+               compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
                reg = <0x0000 0 0 0 0>;
-
-               #address-cells = <3>;
-               #size-cells = <2>;
-
-               wifi@0,0 {
-                       compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
-                       reg = <0x0000 0 0 0 0>;
-                       brcm,ccode-map = "AU-AU-920", "CA-CA-892", "GB-DE-964", "NZ-AU-920", "US-US-825";
-               };
+               brcm,ccode-map = "AU-AU-920", "CA-CA-892", "GB-DE-964", "NZ-AU-920", "US-US-825";
        };
 };
 

diff --git a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3150-v1.dts b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3150-v1.dts
index 83c429afc2974d8e0fc3ce872171b408f6dae786..8e487f60a2ccad541c48c8980f48a54e0e3fac34 100644 (file)
--- a/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3150-v1.dts
+++ b/arch/arm/boot/dts/broadcom/bcm47094-luxul-xwr-3150-v1.dts
@@ -81,39 +81,19 @@
        nvmem-cell-names = "mac-address";
 };
 
-&pcie0 {
-       #address-cells = <3>;
-       #size-cells = <2>;
-
-       bridge@0,0 {
+&pcie_bridge0 {
+       wifi@0,0 {
+               compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
                reg = <0x0000 0 0 0 0>;
-
-               #address-cells = <3>;
-               #size-cells = <2>;
-
-               wifi@0,0 {
-                       compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
-                       reg = <0x0000 0 0 0 0>;
-                       brcm,ccode-map = "AU-AU-953", "CA-CA-946", "GB-E0-846", "NZ-AU-953", "US-Q2-930";
-               };
+               brcm,ccode-map = "AU-AU-953", "CA-CA-946", "GB-E0-846", "NZ-AU-953", "US-Q2-930";
        };
 };
 
-&pcie1 {
-       #address-cells = <3>;
-       #size-cells = <2>;
-
-       bridge@0,0 {
+&pcie_bridge1 {
+       wifi@0,0 {
+               compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
                reg = <0x0000 0 0 0 0>;
-
-               #address-cells = <3>;
-               #size-cells = <2>;
-
-               wifi@0,0 {
-                       compatible = "brcm,bcm4366-fmac", "brcm,bcm4329-fmac";
-                       reg = <0x0000 0 0 0 0>;
-                       brcm,ccode-map = "AU-AU-953", "CA-CA-946", "GB-E0-846", "NZ-AU-953", "US-Q2-930";
-               };
+               brcm,ccode-map = "AU-AU-953", "CA-CA-946", "GB-E0-846", "NZ-AU-953", "US-Q2-930";
        };
 };