Skip to content

L
linux
Commit 2dc81a0e authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files
Options

Merge branch 'remove-label-cpu-from-dsa-dt-bindings' 

Vladimir Oltean says:

====================
Remove label = "cpu" from DSA dt-bindings

As explained in more detail in patch 1/3, label = "cpu" is not part of
DSA's device tree bindings, yet we have some checks in the dt-schema for
mt7530 which are written as if it was.

Reformulate those checks, and remove all occurrences of this seemingly
used, but actually unused, property from the binding examples.
====================

Link: https://lore.kernel.org/r/20220912175058.280386-1-vladimir.oltean@nxp.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f0bd32c8 9cc115d8
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 37 deletions
Documentation/devicetree/bindings/net/dsa/ar9331.txt
View file @ 2dc81a0e
......@@ -76,7 +76,6 @@ eth1: ethernet@1a000000 {
switch_port0: port@0 {
reg = <0x0>;
label = "cpu";
ethernet = <&eth1>;
phy-mode = "gmii";
......
Documentation/devicetree/bindings/net/dsa/arrow,xrs700x.yaml
View file @ 2dc81a0e
......@@ -61,7 +61,6 @@ examples:
};
ethernet-port@3 {
reg = <3>;
label = "cpu";
ethernet = <&fec1>;
phy-mode = "rgmii-id";
......
Documentation/devicetree/bindings/net/dsa/brcm,b53.yaml
View file @ 2dc81a0e
......@@ -169,7 +169,6 @@ examples:
port@8 {
reg = <8>;
label = "cpu";
phy-mode = "rgmii-txid";
ethernet = <&eth0>;
fixed-link {
......@@ -252,7 +251,6 @@ examples:
port@8 {
ethernet = <&amac2>;
label = "cpu";
reg = <8>;
phy-mode = "internal";
......
Documentation/devicetree/bindings/net/dsa/hirschmann,hellcreek.yaml
View file @ 2dc81a0e
......@@ -91,7 +91,6 @@ examples:
port@0 {
reg = <0>;
label = "cpu";
ethernet = <&gmac0>;
phy-mode = "mii";
......
Documentation/devicetree/bindings/net/dsa/lan9303.txt
View file @ 2dc81a0e
......@@ -46,7 +46,6 @@ I2C managed mode:
port@0 { /* RMII fixed link to master */
reg = <0>;
label = "cpu";
ethernet = <&master>;
};
......@@ -83,7 +82,6 @@ MDIO managed mode:
port@0 {
reg = <0>;
label = "cpu";
ethernet = <&master>;
};
......
Documentation/devicetree/bindings/net/dsa/lantiq-gswip.txt
View file @ 2dc81a0e
......@@ -96,7 +96,6 @@ switch@e108000 {
port@6 {
reg = <0x6>;
label = "cpu";
ethernet = <&eth0>;
};
};
......
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml
View file @ 2dc81a0e
......@@ -163,13 +163,8 @@ patternProperties:
allOf:
- $ref: dsa-port.yaml#
- if:
properties:
label:
const: cpu
required: [ ethernet ]
then:
required:
- phy-mode
properties:
reg:
enum:
......@@ -187,9 +182,7 @@ $defs:
patternProperties:
"^(ethernet-)?port@[0-9]+$":
if:
properties:
label:
const: cpu
required: [ ethernet ]
then:
if:
properties:
......@@ -215,9 +208,7 @@ $defs:
patternProperties:
"^(ethernet-)?port@[0-9]+$":
if:
properties:
label:
const: cpu
required: [ ethernet ]
then:
if:
properties:
......@@ -334,7 +325,6 @@ examples:
port@6 {
reg = <6>;
label = "cpu";
ethernet = <&gmac0>;
phy-mode = "rgmii";
......@@ -398,7 +388,6 @@ examples:
port@6 {
reg = <6>;
label = "cpu";
ethernet = <&gmac0>;
phy-mode = "trgmii";
......@@ -463,7 +452,6 @@ examples:
port@6 {
reg = <6>;
label = "cpu";
ethernet = <&gmac0>;
phy-mode = "2500base-x";
......@@ -530,7 +518,6 @@ examples:
port@6 {
reg = <6>;
label = "cpu";
ethernet = <&gmac0>;
phy-mode = "trgmii";
......@@ -619,7 +606,6 @@ examples:
port@6 {
reg = <6>;
label = "cpu";
ethernet = <&gmac0>;
phy-mode = "trgmii";
......@@ -708,7 +694,6 @@ examples:
port@6 {
reg = <6>;
label = "cpu";
ethernet = <&gmac0>;
phy-mode = "trgmii";
......@@ -796,7 +781,6 @@ examples:
port@6 {
reg = <6>;
label = "cpu";
ethernet = <&gmac0>;
phy-mode = "trgmii";
......
Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml
View file @ 2dc81a0e
......@@ -107,7 +107,6 @@ examples:
};
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&eth0>;
phy-mode = "rgmii";
......@@ -146,7 +145,6 @@ examples:
};
port@6 {
reg = <6>;
label = "cpu";
ethernet = <&eth0>;
phy-mode = "rgmii";
......
Documentation/devicetree/bindings/net/dsa/qca8k.yaml
View file @ 2dc81a0e
......@@ -159,7 +159,6 @@ examples:
port@0 {
reg = <0>;
label = "cpu";
ethernet = <&gmac1>;
phy-mode = "rgmii";
......@@ -221,7 +220,6 @@ examples:
port@0 {
reg = <0>;
label = "cpu";
ethernet = <&gmac1>;
phy-mode = "rgmii";
......@@ -268,7 +266,6 @@ examples:
port@6 {
reg = <0>;
label = "cpu";
ethernet = <&gmac1>;
phy-mode = "sgmii";
......
Documentation/devicetree/bindings/net/dsa/realtek.yaml
View file @ 2dc81a0e
......@@ -189,7 +189,6 @@ examples:
};
port@5 {
reg = <5>;
label = "cpu";
ethernet = <&gmac0>;
phy-mode = "rgmii";
fixed-link {
......@@ -277,7 +276,6 @@ examples:
};
port@6 {
reg = <6>;
label = "cpu";
ethernet = <&fec1>;
phy-mode = "rgmii";
tx-internal-delay-ps = <2000>;
......
Documentation/devicetree/bindings/net/dsa/renesas,rzn1-a5psw.yaml
View file @ 2dc81a0e
......@@ -130,7 +130,6 @@ examples:
port@4 {
reg = <4>;
ethernet = <&gmac2>;
label = "cpu";
phy-mode = "internal";
fixed-link {
......
Documentation/devicetree/bindings/net/dsa/vitesse,vsc73xx.txt
View file @ 2dc81a0e
......@@ -75,7 +75,6 @@ switch@0 {
};
vsc: port@6 {
reg = <6>;
label = "cpu";
ethernet = <&gmac1>;
phy-mode = "rgmii";
fixed-link {
......@@ -117,7 +116,6 @@ switch@2,0 {
};
vsc: port@6 {
reg = <6>;
label = "cpu";
ethernet = <&enet0>;
phy-mode = "rgmii";
fixed-link {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7