[PATCH v2] treewide: remove label = "cpu" from DSA dt-binding
Arınç ÜNAL
arinc.unal at arinc9.com
Wed Nov 30 10:00:13 PST 2022
This is not used by the DSA dt-binding, so remove it from all devicetrees.
Link: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=9cc115d8d6f73dd260de1609182f3645844d6907
Signed-off-by: Arınç ÜNAL <arinc.unal at arinc9.com>
---
Here's how I did it, for the interested (or suggestions):
Find the targets which have got 'label = "cpu";' defined.
grep -rnw target/ -e 'label = "cpu";'
Remove the line where 'label = "cpu";' is included.
sed -i /'label = "cpu";'/,+d target/linux/*/dts/*.dts*
sed -i /'label = "cpu";'/,+d target/linux/kirkwood/files/arch/arm/boot/dts/*
sed -i /'label = "cpu";'/,+d target/linux/mvebu/files/arch/arm64/boot/dts/marvell/*
sed -i /'label = "cpu";'/,+d target/linux/qoriq/files/arch/powerpc/boot/dts/fsl/*
sed -i /'label = "cpu";'/,+d target/linux/lantiq/files/arch/mips/boot/dts/lantiq/*
sed -i /'label = "cpu";'/,+d target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/*
v2: Bindings on the DTs below are not DSA dt-bindings so drop them.
target/linux/bcm63xx/dts/bcm63169-comtrend-vg-8050.dts
target/linux/bcm63xx/dts/bcm6362-huawei-hg253s-v2.dts
target/linux/bcm63xx/dts/bcm6368-netgear-dgnd3700-v1.dts
target/linux/bcm63xx/dts/bcm6369-comtrend-wap-5813n.dts
target/linux/mpc85xx/files/arch/powerpc/boot/dts/panda.dts
Arınç
---
target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts | 1 -
target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts | 1 -
target/linux/bmips/dts/bcm6318.dtsi | 1 -
target/linux/bmips/dts/bcm63268.dtsi | 1 -
target/linux/bmips/dts/bcm6328.dtsi | 1 -
target/linux/bmips/dts/bcm6362.dtsi | 1 -
target/linux/bmips/dts/bcm6368.dtsi | 1 -
.../kirkwood/files/arch/arm/boot/dts/kirkwood-4i-edge-200.dts | 1 -
.../linux/kirkwood/files/arch/arm/boot/dts/kirkwood-ea3500.dts | 1 -
target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9.dtsi | 1 -
target/linux/mediatek/dts/mt7622-elecom-wrc-x3200gst3.dts | 1 -
target/linux/mediatek/dts/mt7622-linksys-e8450.dtsi | 1 -
target/linux/mediatek/dts/mt7622-ruijie-rg-ew3200gx-pro.dts | 1 -
target/linux/mediatek/dts/mt7622-xiaomi-redmi-router-ax6s.dts | 1 -
target/linux/mediatek/dts/mt7623a-unielec-u7623-02.dtsi | 1 -
target/linux/mediatek/dts/mt7629-iptime-a6004mx.dts | 1 -
target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3.dts | 1 -
.../linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dts | 1 -
.../files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi | 1 -
.../files-5.15/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 1 -
.../arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts | 1 -
.../files/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts | 1 -
.../files/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts | 1 -
.../files/arch/powerpc/boot/dts/fsl/watchguard-firebox-m300.dts | 2 --
target/linux/ramips/dts/mt7621.dtsi | 1 -
25 files changed, 26 deletions(-)
diff --git a/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts b/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts
index 915b4414dd..2ee7ab56c5 100644
--- a/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts
+++ b/target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts
@@ -160,7 +160,6 @@
phy0: port8 at 8 {
reg = <8>;
- label = "cpu";
ethernet = <ð0>;
fixed-link {
diff --git a/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts b/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
index 58586eb036..106ca56e7e 100644
--- a/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
+++ b/target/linux/ath79/dts/ar9132_tplink_tl-wr941-v2.dts
@@ -99,7 +99,6 @@
port at 5 {
reg = <5>;
- label = "cpu";
ethernet = <ð0>;
};
};
diff --git a/target/linux/bmips/dts/bcm6318.dtsi b/target/linux/bmips/dts/bcm6318.dtsi
index 9f613ad47a..13e1bf1144 100644
--- a/target/linux/bmips/dts/bcm6318.dtsi
+++ b/target/linux/bmips/dts/bcm6318.dtsi
@@ -400,7 +400,6 @@
port at 8 {
reg = <8>;
- label = "cpu";
phy-mode = "internal";
ethernet = <ðernet>;
diff --git a/target/linux/bmips/dts/bcm63268.dtsi b/target/linux/bmips/dts/bcm63268.dtsi
index 2ab14e5a33..2bc86d26f9 100644
--- a/target/linux/bmips/dts/bcm63268.dtsi
+++ b/target/linux/bmips/dts/bcm63268.dtsi
@@ -521,7 +521,6 @@
port at 8 {
reg = <8>;
- label = "cpu";
phy-mode = "internal";
ethernet = <ðernet>;
diff --git a/target/linux/bmips/dts/bcm6328.dtsi b/target/linux/bmips/dts/bcm6328.dtsi
index c8e9138ccb..dfd603b7c6 100644
--- a/target/linux/bmips/dts/bcm6328.dtsi
+++ b/target/linux/bmips/dts/bcm6328.dtsi
@@ -418,7 +418,6 @@
port at 8 {
reg = <8>;
- label = "cpu";
phy-mode = "internal";
ethernet = <ðernet>;
diff --git a/target/linux/bmips/dts/bcm6362.dtsi b/target/linux/bmips/dts/bcm6362.dtsi
index 77473c22bb..d66a602df7 100644
--- a/target/linux/bmips/dts/bcm6362.dtsi
+++ b/target/linux/bmips/dts/bcm6362.dtsi
@@ -515,7 +515,6 @@
port at 8 {
reg = <8>;
- label = "cpu";
phy-mode = "internal";
ethernet = <ðernet>;
diff --git a/target/linux/bmips/dts/bcm6368.dtsi b/target/linux/bmips/dts/bcm6368.dtsi
index b50a572fd0..5ba9092193 100644
--- a/target/linux/bmips/dts/bcm6368.dtsi
+++ b/target/linux/bmips/dts/bcm6368.dtsi
@@ -529,7 +529,6 @@
port at 8 {
reg = <8>;
- label = "cpu";
phy-mode = "internal";
ethernet = <ðernet>;
diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-4i-edge-200.dts b/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-4i-edge-200.dts
index 143dac97fe..8e6c198c5e 100644
--- a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-4i-edge-200.dts
+++ b/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-4i-edge-200.dts
@@ -112,7 +112,6 @@
port at 5 {
reg = <5>;
- label = "cpu";
phy-mode = "rgmii-id";
ethernet = <ð0port>;
diff --git a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-ea3500.dts b/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-ea3500.dts
index f8f940dfc6..d0f2e35343 100644
--- a/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-ea3500.dts
+++ b/target/linux/kirkwood/files/arch/arm/boot/dts/kirkwood-ea3500.dts
@@ -125,7 +125,6 @@
port at 5 {
reg = <5>;
- label = "cpu";
ethernet = <ð0port>;
fixed-link {
speed = <1000>;
diff --git a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9.dtsi b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9.dtsi
index 7fa2fac1ef..e4c9be8f87 100644
--- a/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9.dtsi
+++ b/target/linux/lantiq/files/arch/mips/boot/dts/lantiq/vr9.dtsi
@@ -447,7 +447,6 @@
port at 6 {
reg = <0x6>;
- label = "cpu";
phy-mode = "internal";
ethernet = <ð0>;
diff --git a/target/linux/mediatek/dts/mt7622-elecom-wrc-x3200gst3.dts b/target/linux/mediatek/dts/mt7622-elecom-wrc-x3200gst3.dts
index fdbcbc18bc..c7e11c80b0 100644
--- a/target/linux/mediatek/dts/mt7622-elecom-wrc-x3200gst3.dts
+++ b/target/linux/mediatek/dts/mt7622-elecom-wrc-x3200gst3.dts
@@ -258,7 +258,6 @@
port at 6 {
reg = <6>;
- label = "cpu";
ethernet = <&gmac0>;
phy-mode = "2500base-x";
diff --git a/target/linux/mediatek/dts/mt7622-linksys-e8450.dtsi b/target/linux/mediatek/dts/mt7622-linksys-e8450.dtsi
index 1fe839575e..abac02a72d 100644
--- a/target/linux/mediatek/dts/mt7622-linksys-e8450.dtsi
+++ b/target/linux/mediatek/dts/mt7622-linksys-e8450.dtsi
@@ -181,7 +181,6 @@
port at 6 {
reg = <6>;
- label = "cpu";
ethernet = <&gmac0>;
phy-mode = "2500base-x";
diff --git a/target/linux/mediatek/dts/mt7622-ruijie-rg-ew3200gx-pro.dts b/target/linux/mediatek/dts/mt7622-ruijie-rg-ew3200gx-pro.dts
index fba9a1b8f7..32115dda6a 100644
--- a/target/linux/mediatek/dts/mt7622-ruijie-rg-ew3200gx-pro.dts
+++ b/target/linux/mediatek/dts/mt7622-ruijie-rg-ew3200gx-pro.dts
@@ -141,7 +141,6 @@
port at 6 {
reg = <6>;
- label = "cpu";
ethernet = <&gmac0>;
phy-mode = "2500base-x";
diff --git a/target/linux/mediatek/dts/mt7622-xiaomi-redmi-router-ax6s.dts b/target/linux/mediatek/dts/mt7622-xiaomi-redmi-router-ax6s.dts
index 73ee41bb2d..f9ead123af 100644
--- a/target/linux/mediatek/dts/mt7622-xiaomi-redmi-router-ax6s.dts
+++ b/target/linux/mediatek/dts/mt7622-xiaomi-redmi-router-ax6s.dts
@@ -196,7 +196,6 @@
port at 6 {
reg = <6>;
- label = "cpu";
ethernet = <&gmac0>;
phy-mode = "2500base-x";
diff --git a/target/linux/mediatek/dts/mt7623a-unielec-u7623-02.dtsi b/target/linux/mediatek/dts/mt7623a-unielec-u7623-02.dtsi
index 50c7f3e88e..a4e443a0fb 100644
--- a/target/linux/mediatek/dts/mt7623a-unielec-u7623-02.dtsi
+++ b/target/linux/mediatek/dts/mt7623a-unielec-u7623-02.dtsi
@@ -178,7 +178,6 @@
cpu_port0: port at 6 {
reg = <6>;
- label = "cpu";
ethernet = <&gmac0>;
phy-mode = "trgmii";
diff --git a/target/linux/mediatek/dts/mt7629-iptime-a6004mx.dts b/target/linux/mediatek/dts/mt7629-iptime-a6004mx.dts
index b40ac52848..dc1868a066 100644
--- a/target/linux/mediatek/dts/mt7629-iptime-a6004mx.dts
+++ b/target/linux/mediatek/dts/mt7629-iptime-a6004mx.dts
@@ -161,7 +161,6 @@
port at 6 {
reg = <6>;
- label = "cpu";
ethernet = <&gmac0>;
phy-mode = "2500base-x";
diff --git a/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3.dts b/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3.dts
index 8e47cb8579..4d118b0fbc 100644
--- a/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3.dts
+++ b/target/linux/mediatek/dts/mt7986a-bananapi-bpi-r3.dts
@@ -223,7 +223,6 @@
port at 6 {
reg = <6>;
- label = "cpu";
ethernet = <&gmac0>;
phy-mode = "2500base-x";
diff --git a/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dts b/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dts
index 7c590d22e2..5817840332 100644
--- a/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dts
+++ b/target/linux/mediatek/dts/mt7986a-xiaomi-redmi-router-ax6000.dts
@@ -229,7 +229,6 @@
port at 6 {
reg = <6>;
- label = "cpu";
ethernet = <&gmac0>;
phy-mode = "2500base-x";
diff --git a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi
index 3fbe288dae..b63692c161 100644
--- a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi
+++ b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986a-rfb.dtsi
@@ -350,7 +350,6 @@
port at 6 {
reg = <6>;
- label = "cpu";
ethernet = <&gmac0>;
phy-mode = "2500base-x";
diff --git a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts
index 52b6c152fe..85465223cf 100644
--- a/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts
+++ b/target/linux/mediatek/files-5.15/arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts
@@ -139,7 +139,6 @@
port at 6 {
reg = <6>;
- label = "cpu";
ethernet = <&gmac0>;
phy-mode = "2500base-x";
diff --git a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
index 669b67e5a9..1a6594e3cd 100644
--- a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
+++ b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-espressobin-ultra.dts
@@ -184,7 +184,6 @@
switch0port0: port at 0 {
reg = <0>;
- label = "cpu";
ethernet = <ð0>;
};
diff --git a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
index acf15e8ca9..acbe80c28a 100644
--- a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
+++ b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-3720-gl-mv1000.dts
@@ -157,7 +157,6 @@
port at 0 {
reg = <0>;
- label = "cpu";
ethernet = <ð0>;
};
diff --git a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
index c198061af7..38f24c11cb 100644
--- a/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
+++ b/target/linux/mvebu/files/arch/arm64/boot/dts/marvell/armada-7040-mochabin.dts
@@ -339,7 +339,6 @@
port at 5 {
reg = <5>;
- label = "cpu";
ethernet = <&cp0_eth1>;
phy-mode = "2500base-x";
managed = "in-band-status";
diff --git a/target/linux/qoriq/files/arch/powerpc/boot/dts/fsl/watchguard-firebox-m300.dts b/target/linux/qoriq/files/arch/powerpc/boot/dts/fsl/watchguard-firebox-m300.dts
index 15dc5f445e..c611263099 100644
--- a/target/linux/qoriq/files/arch/powerpc/boot/dts/fsl/watchguard-firebox-m300.dts
+++ b/target/linux/qoriq/files/arch/powerpc/boot/dts/fsl/watchguard-firebox-m300.dts
@@ -269,7 +269,6 @@
status = "disabled";
reg = "<5>";
- label = "cpu";
ethernet = <&enet2>;
phy-mode = "rgmii-id";
@@ -281,7 +280,6 @@
port at 6 {
reg = <6>;
- label = "cpu";
ethernet = <&enet3>;
phy-mode = "rgmii-id";
diff --git a/target/linux/ramips/dts/mt7621.dtsi b/target/linux/ramips/dts/mt7621.dtsi
index 0eae4bb871..0f513f313c 100644
--- a/target/linux/ramips/dts/mt7621.dtsi
+++ b/target/linux/ramips/dts/mt7621.dtsi
@@ -558,7 +558,6 @@
port at 6 {
reg = <6>;
- label = "cpu";
ethernet = <&gmac0>;
phy-mode = "rgmii";
--
2.34.1
More information about the openwrt-devel
mailing list