[openwrt/openwrt] bcm53xx: simplify patch adding switch ports
LEDE Commits
lede-commits at lists.infradead.org
Thu Oct 26 00:21:06 PDT 2023
rmilecki pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/a1e3ec0ff647adbb08580e68372b411d34a8f1e9
commit a1e3ec0ff647adbb08580e68372b411d34a8f1e9
Author: Rafał Miłecki <rafal at milecki.pl>
AuthorDate: Fri Oct 13 12:57:35 2023 +0200
bcm53xx: simplify patch adding switch ports
We now have all raw ports defined in bcm-ns.dtsi. Leave only lables in
custom device files.
Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
(cherry picked from commit 08ce0c76d7d7daad5e9382d51960d69f4b8b8f3a)
---
...5301X-Specify-switch-ports-for-remaining-.patch | 152 +++------------------
1 file changed, 16 insertions(+), 136 deletions(-)
diff --git a/target/linux/bcm53xx/patches-5.15/304-ARM-dts-BCM5301X-Specify-switch-ports-for-remaining-.patch b/target/linux/bcm53xx/patches-5.15/304-ARM-dts-BCM5301X-Specify-switch-ports-for-remaining-.patch
index e0832524f4..6779dfb8fe 100644
--- a/target/linux/bcm53xx/patches-5.15/304-ARM-dts-BCM5301X-Specify-switch-ports-for-remaining-.patch
+++ b/target/linux/bcm53xx/patches-5.15/304-ARM-dts-BCM5301X-Specify-switch-ports-for-remaining-.patch
@@ -10,7 +10,7 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac56u.dts
-@@ -92,3 +92,40 @@
+@@ -92,3 +92,33 @@
&usb3_phy {
status = "okay";
};
@@ -20,40 +20,33 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+
+ ports {
+ port at 0 {
-+ reg = <0>;
+ label = "lan1";
+ };
+
+ port at 1 {
-+ reg = <1>;
+ label = "lan2";
+ };
+
+ port at 2 {
-+ reg = <2>;
+ label = "lan3";
+ };
+
+ port at 3 {
-+ reg = <3>;
+ label = "lan4";
+ };
+
+ port at 4 {
-+ reg = <4>;
+ label = "wan";
+ };
+
+ port at 5 {
-+ reg = <5>;
+ label = "cpu";
-+ ethernet = <&gmac0>;
+ };
+ };
+};
--- a/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
+++ b/arch/arm/boot/dts/bcm4708-asus-rt-ac68u.dts
-@@ -83,3 +83,40 @@
+@@ -83,3 +83,33 @@
&usb3_phy {
status = "okay";
};
@@ -63,40 +56,33 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+
+ ports {
+ port at 0 {
-+ reg = <0>;
+ label = "wan";
+ };
+
+ port at 1 {
-+ reg = <1>;
+ label = "lan1";
+ };
+
+ port at 2 {
-+ reg = <2>;
+ label = "lan2";
+ };
+
+ port at 3 {
-+ reg = <3>;
+ label = "lan3";
+ };
+
+ port at 4 {
-+ reg = <4>;
+ label = "lan4";
+ };
+
+ port at 5 {
-+ reg = <5>;
+ label = "cpu";
-+ ethernet = <&gmac0>;
+ };
+ };
+};
--- a/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
+++ b/arch/arm/boot/dts/bcm4708-buffalo-wzr-1750dhp.dts
-@@ -149,3 +149,40 @@
+@@ -149,3 +149,33 @@
&usb3_phy {
status = "okay";
};
@@ -106,40 +92,33 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+
+ ports {
+ port at 0 {
-+ reg = <0>;
+ label = "lan1";
+ };
+
+ port at 1 {
-+ reg = <1>;
+ label = "lan2";
+ };
+
+ port at 2 {
-+ reg = <2>;
+ label = "lan3";
+ };
+
+ port at 3 {
-+ reg = <3>;
+ label = "lan4";
+ };
+
+ port at 4 {
-+ reg = <4>;
+ label = "wan";
+ };
+
+ port at 5 {
-+ reg = <5>;
+ label = "cpu";
-+ ethernet = <&gmac0>;
+ };
+ };
+};
--- a/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
+++ b/arch/arm/boot/dts/bcm4708-linksys-ea6300-v1.dts
-@@ -46,3 +46,40 @@
+@@ -46,3 +46,33 @@
&usb3_phy {
status = "okay";
};
@@ -149,40 +128,33 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+
+ ports {
+ port at 0 {
-+ reg = <0>;
+ label = "lan1";
+ };
+
+ port at 1 {
-+ reg = <1>;
+ label = "lan2";
+ };
+
+ port at 2 {
-+ reg = <2>;
+ label = "lan3";
+ };
+
+ port at 3 {
-+ reg = <3>;
+ label = "lan4";
+ };
+
+ port at 4 {
-+ reg = <4>;
+ label = "wan";
+ };
+
+ port at 5 {
-+ reg = <5>;
+ label = "cpu";
-+ ethernet = <&gmac0>;
+ };
+ };
+};
--- a/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
+++ b/arch/arm/boot/dts/bcm4708-linksys-ea6500-v2.dts
-@@ -43,3 +43,40 @@
+@@ -43,3 +43,33 @@
&usb3_phy {
status = "okay";
};
@@ -192,40 +164,33 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+
+ ports {
+ port at 0 {
-+ reg = <0>;
+ label = "lan1";
+ };
+
+ port at 1 {
-+ reg = <1>;
+ label = "lan2";
+ };
+
+ port at 2 {
-+ reg = <2>;
+ label = "lan3";
+ };
+
+ port at 3 {
-+ reg = <3>;
+ label = "lan4";
+ };
+
+ port at 4 {
-+ reg = <4>;
+ label = "wan";
+ };
+
+ port at 5 {
-+ reg = <5>;
+ label = "cpu";
-+ ethernet = <&gmac0>;
+ };
+ };
+};
--- a/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
+++ b/arch/arm/boot/dts/bcm4708-netgear-r6300-v2.dts
-@@ -86,3 +86,40 @@
+@@ -86,3 +86,33 @@
&usb3_phy {
status = "okay";
};
@@ -235,40 +200,33 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+
+ ports {
+ port at 0 {
-+ reg = <0>;
+ label = "lan1";
+ };
+
+ port at 1 {
-+ reg = <1>;
+ label = "lan2";
+ };
+
+ port at 2 {
-+ reg = <2>;
+ label = "lan3";
+ };
+
+ port at 3 {
-+ reg = <3>;
+ label = "lan4";
+ };
+
+ port at 4 {
-+ reg = <4>;
+ label = "wan";
+ };
+
+ port at 5 {
-+ reg = <5>;
+ label = "cpu";
-+ ethernet = <&gmac0>;
+ };
+ };
+};
--- a/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
+++ b/arch/arm/boot/dts/bcm47081-asus-rt-n18u.dts
-@@ -77,3 +77,40 @@
+@@ -77,3 +77,33 @@
&usb3_phy {
status = "okay";
};
@@ -278,40 +236,33 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+
+ ports {
+ port at 0 {
-+ reg = <0>;
+ label = "wan";
+ };
+
+ port at 1 {
-+ reg = <1>;
+ label = "lan1";
+ };
+
+ port at 2 {
-+ reg = <2>;
+ label = "lan2";
+ };
+
+ port at 3 {
-+ reg = <3>;
+ label = "lan3";
+ };
+
+ port at 4 {
-+ reg = <4>;
+ label = "lan4";
+ };
+
+ port at 5 {
-+ reg = <5>;
+ label = "cpu";
-+ ethernet = <&gmac0>;
+ };
+ };
+};
--- a/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
+++ b/arch/arm/boot/dts/bcm4709-asus-rt-ac87u.dts
-@@ -66,6 +66,38 @@
+@@ -66,6 +66,32 @@
status = "okay";
};
@@ -320,29 +271,23 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+
+ ports {
+ port at 0 {
-+ reg = <0>;
+ label = "wan";
+ };
+
+ port at 1 {
-+ reg = <1>;
+ label = "lan1";
+ };
+
+ port at 2 {
-+ reg = <2>;
+ label = "lan2";
+ };
+
+ port at 3 {
-+ reg = <3>;
+ label = "lan3";
+ };
+
+ port at 7 {
-+ reg = <7>;
+ label = "cpu";
-+ ethernet = <&gmac1>;
+ };
+ };
+};
@@ -352,7 +297,7 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
compatible = "fixed-partitions";
--- a/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
+++ b/arch/arm/boot/dts/bcm4709-buffalo-wxr-1900dhp.dts
-@@ -130,3 +130,40 @@
+@@ -130,3 +130,33 @@
&usb3_phy {
status = "okay";
};
@@ -362,40 +307,33 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+
+ ports {
+ port at 0 {
-+ reg = <0>;
+ label = "lan1";
+ };
+
+ port at 1 {
-+ reg = <1>;
+ label = "lan2";
+ };
+
+ port at 2 {
-+ reg = <2>;
+ label = "lan3";
+ };
+
+ port at 3 {
-+ reg = <3>;
+ label = "lan4";
+ };
+
+ port at 4 {
-+ reg = <4>;
+ label = "wan";
+ };
+
+ port at 5 {
-+ reg = <5>;
+ label = "cpu";
-+ ethernet = <&gmac0>;
+ };
+ };
+};
--- a/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
+++ b/arch/arm/boot/dts/bcm4709-linksys-ea9200.dts
-@@ -47,3 +47,45 @@
+@@ -47,3 +47,33 @@
&usb3_phy {
status = "okay";
};
@@ -405,45 +343,33 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+
+ ports {
+ port at 0 {
-+ reg = <0>;
+ label = "lan1";
+ };
+
+ port at 1 {
-+ reg = <1>;
+ label = "lan2";
+ };
+
+ port at 2 {
-+ reg = <2>;
+ label = "lan3";
+ };
+
+ port at 3 {
-+ reg = <3>;
+ label = "lan4";
+ };
+
+ port at 4 {
-+ reg = <4>;
+ label = "wan";
+ };
+
+ port at 8 {
-+ reg = <8>;
+ label = "cpu";
-+ ethernet = <&gmac2>;
-+
-+ fixed-link {
-+ speed = <1000>;
-+ full-duplex;
-+ };
+ };
+ };
+};
--- a/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
+++ b/arch/arm/boot/dts/bcm4709-netgear-r7000.dts
-@@ -104,3 +104,40 @@
+@@ -104,3 +104,33 @@
&usb3_phy {
status = "okay";
};
@@ -453,40 +379,33 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+
+ ports {
+ port at 0 {
-+ reg = <0>;
+ label = "wan";
+ };
+
+ port at 1 {
-+ reg = <1>;
+ label = "lan1";
+ };
+
+ port at 2 {
-+ reg = <2>;
+ label = "lan2";
+ };
+
+ port at 3 {
-+ reg = <3>;
+ label = "lan3";
+ };
+
+ port at 4 {
-+ reg = <4>;
+ label = "lan4";
+ };
+
+ port at 5 {
-+ reg = <5>;
+ label = "cpu";
-+ ethernet = <&gmac0>;
+ };
+ };
+};
--- a/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
+++ b/arch/arm/boot/dts/bcm47094-netgear-r8500.dts
-@@ -94,3 +94,45 @@
+@@ -94,3 +94,33 @@
&usb3_phy {
status = "okay";
};
@@ -496,45 +415,33 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+
+ ports {
+ port at 0 {
-+ reg = <0>;
+ label = "wan";
+ };
+
+ port at 1 {
-+ reg = <1>;
+ label = "lan1";
+ };
+
+ port at 2 {
-+ reg = <2>;
+ label = "lan2";
+ };
+
+ port at 3 {
-+ reg = <3>;
+ label = "lan3";
+ };
+
+ port at 4 {
-+ reg = <4>;
+ label = "lan4";
+ };
+
+ port at 8 {
-+ reg = <8>;
+ label = "cpu";
-+ ethernet = <&gmac2>;
-+
-+ fixed-link {
-+ speed = <1000>;
-+ full-duplex;
-+ };
+ };
+ };
+};
--- a/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
+++ b/arch/arm/boot/dts/bcm47094-phicomm-k3.dts
-@@ -38,6 +38,38 @@
+@@ -38,6 +38,32 @@
status = "okay";
};
@@ -543,29 +450,23 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+
+ ports {
+ port at 0 {
-+ reg = <0>;
+ label = "lan1";
+ };
+
+ port at 1 {
-+ reg = <1>;
+ label = "lan2";
+ };
+
+ port at 2 {
-+ reg = <2>;
+ label = "lan3";
+ };
+
+ port at 3 {
-+ reg = <3>;
+ label = "wan";
+ };
+
+ port at 5 {
-+ reg = <5>;
+ label = "cpu";
-+ ethernet = <&gmac0>;
+ };
+ };
+};
@@ -575,7 +476,7 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
compatible = "fixed-partitions";
--- a/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
+++ b/arch/arm/boot/dts/bcm47081-tplink-archer-c5-v2.dts
-@@ -91,6 +91,43 @@
+@@ -91,6 +91,36 @@
};
};
@@ -584,34 +485,27 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+
+ ports {
+ port at 0 {
-+ reg = <0>;
+ label = "wan";
+ };
+
+ port at 1 {
-+ reg = <1>;
+ label = "lan1";
+ };
+
+ port at 2 {
-+ reg = <2>;
+ label = "lan2";
+ };
+
+ port at 3 {
-+ reg = <3>;
+ label = "lan3";
+ };
+
+ port at 4 {
-+ reg = <4>;
+ label = "lan4";
+ };
+
+ port at 5 {
-+ reg = <5>;
+ label = "cpu";
-+ ethernet = <&gmac0>;
+ };
+ };
+};
@@ -621,7 +515,7 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
--- a/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
+++ b/arch/arm/boot/dts/bcm4709-tplink-archer-c9-v1.dts
-@@ -100,6 +100,43 @@
+@@ -100,6 +100,36 @@
vcc-gpio = <&chipcommon 12 GPIO_ACTIVE_HIGH>;
};
@@ -630,34 +524,27 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+
+ ports {
+ port at 0 {
-+ reg = <0>;
+ label = "wan";
+ };
+
+ port at 1 {
-+ reg = <1>;
+ label = "lan1";
+ };
+
+ port at 2 {
-+ reg = <2>;
+ label = "lan2";
+ };
+
+ port at 3 {
-+ reg = <3>;
+ label = "lan3";
+ };
+
+ port at 4 {
-+ reg = <4>;
+ label = "lan4";
+ };
+
+ port at 5 {
-+ reg = <5>;
+ label = "cpu";
-+ ethernet = <&gmac0>;
+ };
+ };
+};
@@ -667,7 +554,7 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
--- a/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
+++ b/arch/arm/boot/dts/bcm47081-buffalo-wzr-900dhp.dts
-@@ -107,3 +107,41 @@
+@@ -107,3 +107,34 @@
&usb3_phy {
status = "okay";
};
@@ -677,34 +564,27 @@ Signed-off-by: Rafał Miłecki <rafal at milecki.pl>
+
+ ports {
+ port at 0 {
-+ reg = <0>;
+ label = "lan1";
+ };
+
+ port at 1 {
-+ reg = <1>;
+ label = "lan2";
+ };
+
+ port at 2 {
-+ reg = <2>;
+ label = "lan3";
+ };
+
+ port at 3 {
-+ reg = <3>;
+ label = "lan4";
+ };
+
+ port at 4 {
-+ reg = <4>;
+ label = "wan";
+ };
+
+ port at 5 {
-+ reg = <5>;
+ label = "cpu";
-+ ethernet = <&gmac0>;
+ };
+ };
+};
More information about the lede-commits
mailing list