Support mt7531 on BPI-R2 Pro
Subsystems (7)
v3 cover Support mt7531 on BPI-R2 Pro
From: Frank Wunderlich <[email protected]>
This Series add Support for the mt7531 switch on Bananapi R2 Pro board.
This board uses port5 of the switch to conect to the gmac0 of the rk3568 SoC.
Currently CPU-Port is hardcoded in the mt7530 driver to port 6.
Compared to v1 the reset-Patch was dropped as it was not needed and CPU-Port-changes are completely rewriten based on suggestions/code from Vladimir Oltean (many thanks to this).
In DTS Patch i only dropped the status-property that was not needed/ignored by driver.
Due to the Changes i also made a regression Test on mt7623 bpi-r2 using mt7530 with cpu-port 6. Tests were done directly (ipv4 config on dsa user port) and with vlan-aware bridge including vlan that was tagged outgoing on dsa user port.
Main change is that i now include the binding-changes into the patchset which i posted separately.
Frank Wunderlich (6):
dt-bindings: net: dsa: convert binding for mediatek switches
net: dsa: mt7530: rework mt7530_hw_vlan_{add,del}
net: dsa: mt7530: rework mt753[01]_setup
net: dsa: mt7530: get cpu-port via dp->cpu_dp instead of constant
dt-bindings: net: dsa: make reset optional and add rgmii-mode to
mt7531
arm64: dts: rockchip: Add mt7531 dsa node to BPI-R2-Pro board
.../bindings/net/dsa/mediatek,mt7530.yaml | 421 ++++++++++++++++++ .../devicetree/bindings/net/dsa/mt7530.txt | 327 -------------- .../boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 48 ++ drivers/net/dsa/mt7530.c | 82 ++-- drivers/net/dsa/mt7530.h | 1 - 5 files changed, 522 insertions(+), 357 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml delete mode 100644 Documentation/devicetree/bindings/net/dsa/mt7530.txt
Signature · 7 lines
2.25.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v3 2/6 net: dsa: mt7530: rework mt7530_hw_vlan_{add,del}
From: Frank Wunderlich <[email protected]>
Rework vlan_add/vlan_del functions in preparation for dynamic cpu port.
Currently BIT(MT7530_CPU_PORT) is added to new_members, even though mt7530_port_vlan_add() will be called on the CPU port too.
Let DSA core decide when to call port_vlan_add for the CPU port, rather than doing it implicitly.
We can do autonomous forwarding in a certain VLAN, but not add br0 to that VLAN and avoid flooding the CPU with those packets, if software knows it doesn't need to process them.
---
v2: new patch
--- drivers/net/dsa/mt7530.c | 30 ++++++++++++------------------ 1 file changed, 12 insertions(+), 18 deletions(-)
drivers/net/dsa/mt7530.c +12 -18
@@ -1522,11 +1522,11 @@ static void mt7530_hw_vlan_add(struct mt7530_priv *priv, struct mt7530_hw_vlan_entry *entry) { + struct dsa_port *dp = dsa_to_port(priv->ds, entry->port);u8 new_members;u32 val; - new_members = entry->old_members |BIT (entry->port) | -BIT (MT7530_CPU_PORT ); + new_members = entry->old_members |BIT (entry->port);/* Validate the entry with independent learning, create egress tag per * VLAN and joining the port as one of the port members.
@@ -1537,22 +1537,20 @@ mt7530_hw_vlan_add(struct mt7530_priv *priv,/* Decide whether adding tag or not for those outgoing packets from the * port inside the VLAN. -*/ - val = entry->untagged ?MT7530_VLAN_EGRESS_UNTAG : -MT7530_VLAN_EGRESS_TAG ; -mt7530_rmw (priv,MT7530_VAWD2 , -ETAG_CTRL_P_MASK (entry->port), -ETAG_CTRL_P (entry->port, val)); - -/* CPU port is always taken as a tagged port for serving more than one +* CPU port is always taken as a tagged port for serving more than one * VLANs across and also being applied with egress type stack mode for * that VLAN tags would be appended after hardware special tag used as * DSA tag. */ +if (dsa_port_is_cpu (dp)) + val =MT7530_VLAN_EGRESS_STACK ; +else if (entry->untagged) + val =MT7530_VLAN_EGRESS_UNTAG ; +else + val =MT7530_VLAN_EGRESS_TAG ;mt7530_rmw (priv,MT7530_VAWD2 , -ETAG_CTRL_P_MASK (MT7530_CPU_PORT ), -ETAG_CTRL_P (MT7530_CPU_PORT , -MT7530_VLAN_EGRESS_STACK )); +ETAG_CTRL_P_MASK (entry->port), +ETAG_CTRL_P (entry->port, val)); } static void
@@ -1571,11 +1569,7 @@ mt7530_hw_vlan_del(struct mt7530_priv *priv,return ; } -/* If certain member apart from CPU port is still alive in the VLAN, -* the entry would be kept valid. Otherwise, the entry is got to be -* disabled. -*/ -if (new_members && new_members !=BIT (MT7530_CPU_PORT )) { +if (new_members) { val =IVL_MAC |VTAG_EN |PORT_MEM (new_members) |VLAN_VALID ;mt7530_write (priv,MT7530_VAWD1 , val);
Signature · 7 lines
2.25.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
PATCH v3 1/6 dt-bindings: net: dsa: convert binding for mediatek switches
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Convert txt binding to yaml binding for Mediatek switches.
---
v3:
- include standalone patch in mt7530 series
- drop some descriptions (gpio-cells,reset-gpios,reset-names)
- drop | from descriptions
- move patternProperties above allOf
v2:
- rename mediatek.yaml => mediatek,mt7530.yaml
- drop "boolean" in description
- drop description for interrupt-properties
- drop #interrupt-cells as requirement
- example: eth=>ethernet,mdio0=>mdio,comment indention
- replace 0 by GPIO_ACTIVE_HIGH in first example
- use port(s)-pattern from dsa.yaml
- adress/size-cells not added to required because this is defined at mdio-level inc current dts , not switch level
--- .../bindings/net/dsa/mediatek,mt7530.yaml | 423 ++++++++++++++++++ .../devicetree/bindings/net/dsa/mt7530.txt | 327 -------------- 2 files changed, 423 insertions(+), 327 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml delete mode 100644 Documentation/devicetree/bindings/net/dsa/mt7530.txt
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +423 -0
@@ -0,0 +1,423 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/dsa/mediatek,mt7530.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Mediatek MT7530 Ethernet switch + +maintainers: + - Sean Wang <[email protected]> + - Landen Chao <[email protected]> + - DENG Qingfang <[email protected]> + +description: | + Port 5 of mt7530 and mt7621 switch is muxed between: + 1. GMAC5: GMAC5 can interface with another external MAC or PHY. + 2. PHY of port 0 or port 4: PHY interfaces with an external MAC like 2nd GMAC + of the SOC. Used in many setups where port 0/4 becomes the WAN port. + Note: On a MT7621 SOC with integrated switch: 2nd GMAC can only connected to + GMAC5 when the gpios for RGMII2 (GPIO 22-33) are not used and not + connected to external component! + + Port 5 modes/configurations: + 1. Port 5 is disabled and isolated: An external phy can interface to the 2nd + GMAC of the SOC. + In the case of a build-in MT7530 switch, port 5 shares the RGMII bus with 2nd + GMAC and an optional external phy. Mind the GPIO/pinctl settings of the SOC! + 2. Port 5 is muxed to PHY of port 0/4: Port 0/4 interfaces with 2nd GMAC. + It is a simple MAC to PHY interface, port 5 needs to be setup for xMII mode + and RGMII delay. + 3. Port 5 is muxed to GMAC5 and can interface to an external phy. + Port 5 becomes an extra switch port. + Only works on platform where external phy TX<->RX lines are swapped. + Like in the Ubiquiti ER-X-SFP. + 4. Port 5 is muxed to GMAC5 and interfaces with the 2nd GAMC as 2nd CPU port. + Currently a 2nd CPU port is not supported by DSA code. + + Depending on how the external PHY is wired: + 1. normal: The PHY can only connect to 2nd GMAC but not to the switch + 2. swapped: RGMII TX, RX are swapped; external phy interface with the switch as + a ethernet port. But can't interface to the 2nd GMAC. + + Based on the DT the port 5 mode is configured. + + Driver tries to lookup the phy-handle of the 2nd GMAC of the master device. + When phy-handle matches PHY of port 0 or 4 then port 5 set-up as mode 2. + phy-mode must be set, see also example 2 below! + * mt7621: phy-mode = "rgmii-txid"; + * mt7623: phy-mode = "rgmii"; + + CPU-Ports need a phy-mode property: + Allowed values on mt7530 and mt7621: + - "rgmii" + - "trgmii" + On mt7531: + - "1000base-x" + - "2500base-x" + - "sgmii" + + +properties: + compatible: + enum: + - mediatek,mt7530 + - mediatek,mt7531 + - mediatek,mt7621 + + "#address-cells": + const: 1 + + "#size-cells": + const: 0 + + core-supply: + description: + Phandle to the regulator node necessary for the core power. + + "#gpio-cells": + const: 2 + + gpio-controller: + type: boolean + description: + if defined, MT7530's LED controller will run on GPIO mode. + + "#interrupt-cells": + const: 1 + + interrupt-controller: + type: boolean + + interrupts: + maxItems: 1 + + io-supply: + description: + Phandle to the regulator node necessary for the I/O power. + See Documentation/devicetree/bindings/regulator/mt6323-regulator.txt + for details for the regulator setup on these boards. + + mediatek,mcm: + type: boolean + description: + if defined, indicates that either MT7530 is the part on multi-chip + module belong to MT7623A has or the remotely standalone chip as the + function MT7623N reference board provided for. + + reset-gpios: + maxItems: 1 + + reset-names: + const: mcm + + resets: + description: + Phandle pointing to the system reset controller with line index for + the ethsys. + maxItems: 1 + +patternProperties: + "^(ethernet-)?ports$": + type: object + + patternProperties: + "^(ethernet-)?port@[0-9]+$": + type: object + description: Ethernet switch ports + + unevaluatedProperties: false + + properties: + reg: + description: + Port address described must be 5 or 6 for CPU port and from 0 + to 5 for user ports. + + allOf: + - $ref: dsa-port.yaml# + - if: + properties: + label: + items: + - const: cpu + then: + required: + - reg + - phy-mode + +required: + - compatible + - reg + +allOf: + - $ref: "dsa.yaml#" + - if: + required: + - mediatek,mcm + then: + required: + - resets + - reset-names + else: + required: + - reset-gpios + + - if: + required: + - interrupt-controller + then: + required: + - interrupts + + - if: + properties: + compatible: + items: + - const: mediatek,mt7530 + then: + required: + - core-supply + - io-supply + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + mdio { + #address-cells = <1>; + #size-cells = <0>; + switch@0 { + compatible = "mediatek,mt7530"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + core-supply = <&mt6323_vpa_reg>; + io-supply = <&mt6323_vemc3v3_reg>; + reset-gpios = <&pio 33 GPIO_ACTIVE_HIGH>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + port@0 { + reg = <0>; + label = "lan0"; + }; + + port@1 { + reg = <1>; + label = "lan1"; + }; + + port@2 { + reg = <2>; + label = "lan2"; + }; + + port@3 { + reg = <3>; + label = "lan3"; + }; + + port@4 { + reg = <4>; + label = "wan"; + }; + + port@6 { + reg = <6>; + label = "cpu"; + ethernet = <&gmac0>; + phy-mode = "trgmii"; + fixed-link { + speed = <1000>; + full-duplex; + }; + }; + }; + }; + }; + + - | + //Example 2: MT7621: Port 4 is WAN port: 2nd GMAC -> Port 5 -> PHY port 4. + + ethernet { + #address-cells = <1>; + #size-cells = <0>; + gmac0: mac@0 { + compatible = "mediatek,eth-mac"; + reg = <0>; + phy-mode = "rgmii"; + + fixed-link { + speed = <1000>; + full-duplex; + pause; + }; + }; + + gmac1: mac@1 { + compatible = "mediatek,eth-mac"; + reg = <1>; + phy-mode = "rgmii-txid"; + phy-handle = <&phy4>; + }; + + mdio: mdio-bus { + #address-cells = <1>; + #size-cells = <0>; + + /* Internal phy */ + phy4: ethernet-phy@4 { + reg = <4>; + }; + + mt7530: switch@1f { + compatible = "mediatek,mt7621"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x1f>; + mediatek,mcm; + + resets = <&rstctrl 2>; + reset-names = "mcm"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + label = "lan0"; + }; + + port@1 { + reg = <1>; + label = "lan1"; + }; + + port@2 { + reg = <2>; + label = "lan2"; + }; + + port@3 { + reg = <3>; + label = "lan3"; + }; + + /* Commented out. Port 4 is handled by 2nd GMAC. + port@4 { + reg = <4>; + label = "lan4"; + }; + */ + + port@6 { + reg = <6>; + label = "cpu"; + ethernet = <&gmac0>; + phy-mode = "rgmii"; + + fixed-link { + speed = <1000>; + full-duplex; + pause; + }; + }; + }; + }; + }; + }; + + - | + //Example 3: MT7621: Port 5 is connected to external PHY: Port 5 -> external PHY. + + ethernet { + #address-cells = <1>; + #size-cells = <0>; + gmac_0: mac@0 { + compatible = "mediatek,eth-mac"; + reg = <0>; + phy-mode = "rgmii"; + + fixed-link { + speed = <1000>; + full-duplex; + pause; + }; + }; + + mdio0: mdio-bus { + #address-cells = <1>; + #size-cells = <0>; + + /* External phy */ + ephy5: ethernet-phy@7 { + reg = <7>; + }; + + switch@1f { + compatible = "mediatek,mt7621"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0x1f>; + mediatek,mcm; + + resets = <&rstctrl 2>; + reset-names = "mcm"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + label = "lan0"; + }; + + port@1 { + reg = <1>; + label = "lan1"; + }; + + port@2 { + reg = <2>; + label = "lan2"; + }; + + port@3 { + reg = <3>; + label = "lan3"; + }; + + port@4 { + reg = <4>; + label = "lan4"; + }; + + port@5 { + reg = <5>; + label = "lan5"; + phy-mode = "rgmii"; + phy-handle = <&ephy5>; + }; + + cpu_port0: port@6 { + reg = <6>; + label = "cpu"; + ethernet = <&gmac_0>; + phy-mode = "rgmii"; + + fixed-link { + speed = <1000>; + full-duplex; + pause; + }; + }; + }; + }; + }; + };
Documentation/devicetree/bindings/net/dsa/mt7530.txt deleted +0 -327
327 lines not on this page · raw message
Signature · 1 line
2.25.1
PATCH v3 3/6 net: dsa: mt7530: rework mt753[01]_setup
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Enumerate available cpu-ports instead of using hardcoded constant.
--- drivers/net/dsa/mt7530.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-)
drivers/net/dsa/mt7530.c +21 -4
@@ -2087,11 +2087,12 @@ static int mt7530_setup(struct dsa_switch *ds) {struct mt7530_priv *priv = ds->priv; +struct device_node *dn =NULL ;struct device_node *phy_node;struct device_node *mac_np;struct mt7530_dummy_poll p;phy_interface_t interface; -struct device_node *dn; +struct dsa_port *cpu_dp;u32 id, val;int ret, i;
@@ -2099,7 +2100,19 @@ mt7530_setup(struct dsa_switch *ds)* controller also is the container for two GMACs nodes representing * as two netdev instances. */ - dn =dsa_to_port (ds,MT7530_CPU_PORT )->master->dev.of_node->parent; +dsa_switch_for_each_cpu_port (cpu_dp, ds) { + dn = cpu_dp->master->dev.of_node->parent; +/* It doesn't matter which CPU port is found first, +* their masters should share the same parent OF node +*/ +break ; + } + +if (!dn) { +dev_err (ds->dev,"parent OF node of DSA master not found" ); +return -EINVAL ; + } + ds->assisted_learning_on_cpu_port = true; ds->mtu_enforcement_ingress = true;
@@ -2260,6 +2273,7 @@ mt7531_setup(struct dsa_switch *ds) {struct mt7530_priv *priv = ds->priv;struct mt7530_dummy_poll p; +struct dsa_port *cpu_dp;u32 val, id;int ret, i;
@@ -2332,8 +2346,11 @@ mt7531_setup(struct dsa_switch *ds) CORE_PLL_GROUP4, val);/* BPDU to CPU port */ -mt7530_rmw (priv,MT7531_CFC ,MT7531_CPU_PMAP_MASK , -BIT (MT7530_CPU_PORT )); +dsa_switch_for_each_cpu_port (cpu_dp, ds) { +mt7530_rmw (priv,MT7531_CFC ,MT7531_CPU_PMAP_MASK , +BIT (cpu_dp->index)); +break ; + }mt7530_rmw (priv,MT753X_BPC ,MT753X_BPDU_PORT_FW_MASK ,MT753X_BPDU_CPU_ONLY );
Signature · 1 line
2.25.1
PATCH v3 4/6 net: dsa: mt7530: get cpu-port via dp->cpu_dp instead of constant
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Replace last occurences of hardcoded cpu-port by cpu_dp member of dsa_port struct.
Now the constant can be dropped.
--- drivers/net/dsa/mt7530.c | 27 ++++++++++++++++++++------- drivers/net/dsa/mt7530.h | 1 - 2 files changed, 20 insertions(+), 8 deletions(-)
drivers/net/dsa/mt7530.c +20 -7
@@ -1033,6 +1033,7 @@ static int mt7530_port_enable(struct dsa_switch *ds, int port, struct phy_device *phy) { + struct dsa_port *dp = dsa_to_port(ds, port);struct mt7530_priv *priv = ds->priv;mutex_lock (&priv->reg_mutex);
@@ -1041,7 +1042,11 @@ mt7530_port_enable(struct dsa_switch *ds, int port,* restore the port matrix if the port is the member of a certain * bridge. */ - priv->ports[port].pm |=PCR_MATRIX (BIT (MT7530_CPU_PORT )); +if (dsa_port_is_user (dp)) { +struct dsa_port *cpu_dp = dp->cpu_dp; + + priv->ports[port].pm |=PCR_MATRIX (BIT (cpu_dp->index)); + } priv->ports[port].enable = true;mt7530_rmw (priv,MT7530_PCR_P (port),PCR_MATRIX_MASK , priv->ports[port].pm);
@@ -1190,7 +1195,8 @@ mt7530_port_bridge_join(struct dsa_switch *ds, int port, struct netlink_ext_ack *extack) {struct dsa_port *dp =dsa_to_port (ds, port), *other_dp; -u32 port_bitmap =BIT (MT7530_CPU_PORT ); +struct dsa_port *cpu_dp = dp->cpu_dp; +u32 port_bitmap =BIT (cpu_dp->index);struct mt7530_priv *priv = ds->priv;mutex_lock (&priv->reg_mutex);
@@ -1267,9 +1273,12 @@ mt7530_port_set_vlan_unaware(struct dsa_switch *ds, int port)* the CPU port get out of VLAN filtering mode. */ if (all_user_ports_removed) { -mt7530_write (priv,MT7530_PCR_P (MT7530_CPU_PORT ), +struct dsa_port *dp =dsa_to_port (ds, port); +struct dsa_port *cpu_dp = dp->cpu_dp; + +mt7530_write (priv,MT7530_PCR_P (cpu_dp->index),PCR_MATRIX (dsa_user_ports (priv->ds))); -mt7530_write (priv,MT7530_PVC_P (MT7530_CPU_PORT ),PORT_SPEC_TAG +mt7530_write (priv,MT7530_PVC_P (cpu_dp->index),PORT_SPEC_TAG |PVC_EG_TAG (MT7530_VLAN_EG_CONSISTENT )); } }
@@ -1307,6 +1316,7 @@ mt7530_port_bridge_leave(struct dsa_switch *ds, int port, struct dsa_bridge bridge) {struct dsa_port *dp =dsa_to_port (ds, port), *other_dp; +struct dsa_port *cpu_dp = dp->cpu_dp;struct mt7530_priv *priv = ds->priv;mutex_lock (&priv->reg_mutex);
@@ -1335,8 +1345,8 @@ mt7530_port_bridge_leave(struct dsa_switch *ds, int port,*/ if (priv->ports[port].enable)mt7530_rmw (priv,MT7530_PCR_P (port),PCR_MATRIX_MASK , -PCR_MATRIX (BIT (MT7530_CPU_PORT ))); - priv->ports[port].pm =PCR_MATRIX (BIT (MT7530_CPU_PORT )); +PCR_MATRIX (BIT (cpu_dp->index))); + priv->ports[port].pm =PCR_MATRIX (BIT (cpu_dp->index));/* When a port is removed from the bridge, the port would be set up * back to the default as is at initial boot which is a VLAN-unaware
@@ -1503,6 +1513,9 @@ static int mt7530_port_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering, struct netlink_ext_ack *extack) { + struct dsa_port *dp = dsa_to_port(ds, port); +struct dsa_port *cpu_dp = dp->cpu_dp; +if (vlan_filtering) {/* The port is being kept as VLAN-unaware port when bridge is * set up with vlan_filtering not being set, Otherwise, the
@@ -1510,7 +1523,7 @@ mt7530_port_vlan_filtering(struct dsa_switch *ds, int port, bool vlan_filtering,* for becoming a VLAN-aware port. */ mt7530_port_set_vlan_aware (ds, port); -mt7530_port_set_vlan_aware (ds,MT7530_CPU_PORT ); +mt7530_port_set_vlan_aware (ds, cpu_dp->index); }else {mt7530_port_set_vlan_unaware (ds, port); }
drivers/net/dsa/mt7530.h +0 -1
@@ -8,7 +8,6 @@#define MT7530_NUM_PORTS 7#define MT7530_NUM_PHYS 5 -#define MT7530_CPU_PORT 6#define MT7530_NUM_FDB_RECORDS 2048#define MT7530_ALL_MEMBERS 0xff
Signature · 1 line
2.25.1
PATCH v3 5/6 dt-bindings: net: dsa: make reset optional and add rgmii-mode to mt7531
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Make reset optional as driver already supports it, allow port 5 as cpu-port and phy-mode rgmii for mt7531 cpu-port.
--- .../devicetree/bindings/net/dsa/mediatek,mt7530.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml +1 -3
@@ -55,6 +55,7 @@ description: | On mt7531: - "1000base-x" - "2500base-x" + - "rgmii" - "sgmii"
@@ -159,9 +160,6 @@ allOf: required: - resets - reset-names - else: - required: - - reset-gpios - if: required:
Signature · 1 line
2.25.1
PATCH v3 6/6 arm64: dts: rockchip: Add mt7531 dsa node to BPI-R2-Pro board
In reply to Frank WunderlichFrom: Frank Wunderlich <[email protected]>
Add Device Tree node for mt7531 switch connected to gmac0.
---
v2:
- drop status=disabled
--- .../boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+)
arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts +48 -0
@@ -454,6 +454,54 @@ &i2c5 { status = "disabled"; }; +&mdio0 { + #address-cells = <1>; + #size-cells = <0>; + + switch@0 { + compatible = "mediatek,mt7531"; + reg = <0>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@1 { + reg = <1>; + label = "lan0"; + }; + + port@2 { + reg = <2>; + label = "lan1"; + }; + + port@3 { + reg = <3>; + label = "lan2"; + }; + + port@4 { + reg = <4>; + label = "lan3"; + }; + + port@5 { + reg = <5>; + label = "cpu"; + ethernet = <&gmac0>; + phy-mode = "rgmii"; + + fixed-link { + speed = <1000>; + full-duplex; + pause; + }; + }; + }; + }; +}; + &mdio1 { rgmii_phy1: ethernet-phy@0 { compatible = "ethernet-phy-ieee802.3-c22";
Signature · 1 line
2.25.1
Re: [PATCH v3 1/6] dt-bindings: net: dsa: convert binding for mediatek switches
In reply to Frank WunderlichQuoted 35 lines · Frank Wunderlich
From: Frank Wunderlich <[email protected]>
Convert txt binding to yaml binding for Mediatek switches.
Signed-off-by Frank Wunderlich <[email protected]>---
v3:
- include standalone patch in mt7530 series
- drop some descriptions (gpio-cells,reset-gpios,reset-names)
- drop | from descriptions
- move patternProperties above allOfv2:
- renamemediatek.yaml=> mediatek,mt7530.yaml
- drop "boolean" in description
- drop description for interrupt-properties
- drop #interrupt-cells as requirement
- example: eth=>ethernet,mdio0=>mdio,comment indention
- replace 0 byGPIO_ACTIVE_HIGHin first example
- use port(s)-pattern fromdsa.yaml
- adress/size-cells not added to required because this is defined at mdio-level inc current dts , not switch level--- .../bindings/net/dsa/mediatek,mt7530.yaml | 423 ++++++++++++++++++ .../devicetree/bindings/net/dsa/mt7530.txt | 327 -------------- 2 files changed, 423 insertions(+), 327 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml delete mode 100644 Documentation/devicetree/bindings/net/dsa/mt7530.txtDocumentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +0
-0
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml line 1
Quoted 1 line
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +1
-0@@ -0,0 +1,423 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
I don't see any acks here so that part is unresolved.
Rest looks good:
Best regards,
Krzysztof
Re: [PATCH v3 5/6] dt-bindings: net: dsa: make reset optional and add rgmii-mode to mt7531
In reply to Frank WunderlichQuoted 3 lines · Frank Wunderlich
From: Frank Wunderlich <[email protected]>
Make reset optional as driver already supports it,
I do not see the connection between hardware needing or not needing a reset GPIO and a driver supporting it or not... What does it mean?
Quoted 2 lines
allow port 5 as
cpu-port
How do you allow it here?
Quoted 12 lines
and phy-mode rgmii for mt7531 cpu-port.
Signed-off-by Frank Wunderlich <[email protected]>--- .../devicetree/bindings/net/dsa/mediatek,mt7530.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml +0
-0
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml description: | · line 59
Quoted 5 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml +1
-0@@ -55,6 +55,7 @@ description: | On mt7531: - "1000base-x" - "2500base-x" + - "rgmii" - "sgmii"
Best regards,
Krzysztof
Re: [PATCH v3 5/6] dt-bindings: net: dsa: make reset optional and add rgmii-mode to mt7531
Am 7. Mai 2022 22:01:22 MESZ schrieb Krzysztof Kozlowski <[email protected]>:
Quoted 7 lines · Frank Wunderlich
Quoted 3 lines
From: Frank Wunderlich <[email protected]>
Make reset optional as driver already supports it,
I do not see the connection between hardware needing or not needing a reset GPIO and a driver supporting it or not... What does it mean?
My board has a shared gpio-reset between gmac and switch, so both will resetted if it is asserted. Currently it is set to the gmac and is aquired exclusive. Adding it to switch results in 2 problems:
- due to exclusive and already mapped to gmac, switch driver exits as it cannot get the reset-gpio again.
- if i drop the reset from gmac and add to switch, it resets the gmac and this takes too long for switch to get up. Of course i can increase the wait time after reset,but dropping reset here was the easier way.
Using reset only on gmac side brings the switch up.
Quoted 4 lines
Quoted 2 lines
allow port 5 as
cpu-portHow do you allow it here?
Argh, seems i accidentally removed this part and have not recognized while checking :(
It should only change description of reg for ports to:
"Port address described must be 5 or 6 for CPU port and from 0 to 5 for user ports."
regards Frank
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Heiko Stuebner
maintainerRe: [PATCH v3 5/6] dt-bindings: net: dsa: make reset optional and add rgmii-mode to mt7531
Am Sonntag, 8. Mai 2022, 08:24:37 CEST schrieb Frank Wunderlich:
Quoted 9 lines
Am 7. Mai 2022 22:01:22 MESZ schrieb Krzysztof Kozlowski <[email protected]>:
Quoted 7 lines · Frank Wunderlich
Quoted 3 lines
From: Frank Wunderlich <[email protected]>
Make reset optional as driver already supports it,
I do not see the connection between hardware needing or not needing a reset GPIO and a driver supporting it or not... What does it mean?
Quoted 6 lines
My board has a shared gpio-reset between gmac and switch, so both will resetted if it is asserted. Currently it is set to the gmac and is aquired exclusive. Adding it to switch results in 2 problems:
- due to exclusive and already mapped to gmac, switch driver exits as it cannot get the reset-gpio again.
- if i drop the reset from gmac and add to switch, it resets the gmac and this takes too long for switch to get up. Of course i can increase the wait time after reset,but dropping reset here was the easier way.Using reset only on gmac side brings the switch up.
I think the issue is more for the description itself.
Devicetree is only meant to describe the hardware and does in general don't care how any firmware (Linux-kernel, *BSD, etc) handles it. So going with "the kernel does it this way" is not a valid reason for a binding change ;-) .
Instead in general want to reason that there are boards without this reset facility and thus make it optional for those.
Heiko
Quoted 5 lines
Quoted 4 lines
Quoted 2 lines
allow port 5 as
cpu-portHow do you allow it here?
Quoted 8 lines
Argh, seems i accidentally removed this part and have not recognized while checking :(
It should only change description of reg for ports to:
"Port address described must be 5 or 6 for CPU port and from 0 to 5 for user ports."
regards Frank
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Aw: Re: [PATCH v3 5/6] dt-bindings: net: dsa: make reset optional and add rgmii-mode to mt7531
Hi Heiko
Quoted 21 lines
Gesendet: Sonntag, 08. Mai 2022 um 11:41 Uhr
Von: "Heiko Stuebner" <[email protected]>
Am Sonntag, 8. Mai 2022, 08:24:37 CEST schrieb Frank Wunderlich:Quoted 9 lines
Am 7. Mai 2022 22:01:22 MESZ schrieb Krzysztof Kozlowski <[email protected]>:
Quoted 7 lines · Frank Wunderlich
Quoted 3 lines
From: Frank Wunderlich <[email protected]>
Make reset optional as driver already supports it,
I do not see the connection between hardware needing or not needing a reset GPIO and a driver supporting it or not... What does it mean?
Quoted 8 lines
My board has a shared gpio-reset between gmac and switch, so both will resetted if it
is asserted. Currently it is set to the gmac and is aquired exclusive. Adding it to switch results in 2 problems:- due to exclusive and already mapped to gmac, switch driver exits as it cannot get the reset-gpio again.
- if i drop the reset from gmac and add to switch, it resets the gmac and this takes too long for switch to get up. Of course i can increase the wait time after reset,but dropping reset here was the easier way.Using reset only on gmac side brings the switch up.
Quoted 8 lines
I think the issue is more for the description itself.
Devicetree is only meant to describe the hardware and does in general don't care how any firmware (Linux-kernel, *BSD, etc) handles it. So going with "the kernel does it this way" is not a valid reason for a binding change ;-) .
Instead in general want to reason that there are boards without this reset facility and thus make it optional for those.
if only the wording is the problem i try to rephrase it from hardware PoV.
maybe something like this?
Another way is maybe increasing the delay after the reset (to give more time all come up again), but imho it is no good idea resetting the gmac/mdio-bus from the child device.
have not looked into the gmac driver if this always does the initial reset to have a "clean state". In this initial reset the switch will be resetted too and does not need an additional one which needs the gmac/mdio initialization to be done again.
Quoted 10 lines
Quoted 10 lines
Quoted 4 lines
Quoted 2 lines
allow port 5 as
cpu-portHow do you allow it here?
Argh, seems i accidentally removed this part and have not recognized while checking :(
It should only change description of reg for ports to:
"Port address described must be 5 or 6 for CPU port and from 0 to 5 for user ports."
noticed that the target-phase is not removed but squashed in the first bindings-patch. This was a rebasing error and not intented...will fix in next version.
regards Frank
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Re: Re: [PATCH v3 5/6] dt-bindings: net: dsa: make reset optional and add rgmii-mode to mt7531
Quoted 39 lines · Frank Wunderlich
Hi Heiko
Quoted 21 lines
Gesendet: Sonntag, 08. Mai 2022 um 11:41 Uhr
Von: "Heiko Stuebner" <[email protected]>
Am Sonntag, 8. Mai 2022, 08:24:37 CEST schrieb Frank Wunderlich:Quoted 9 lines
Am 7. Mai 2022 22:01:22 MESZ schrieb Krzysztof Kozlowski <[email protected]>:
Quoted 7 lines · Frank Wunderlich
Quoted 3 lines
From: Frank Wunderlich <[email protected]>
Make reset optional as driver already supports it,
I do not see the connection between hardware needing or not needing a reset GPIO and a driver supporting it or not... What does it mean?
Quoted 8 lines
My board has a shared gpio-reset between gmac and switch, so both will resetted if it
is asserted. Currently it is set to the gmac and is aquired exclusive. Adding it to switch results in 2 problems:- due to exclusive and already mapped to gmac, switch driver exits as it cannot get the reset-gpio again.
- if i drop the reset from gmac and add to switch, it resets the gmac and this takes too long for switch to get up. Of course i can increase the wait time after reset,but dropping reset here was the easier way.Using reset only on gmac side brings the switch up.
Quoted 8 lines
I think the issue is more for the description itself.
Devicetree is only meant to describe the hardware and does in general don't care how any firmware (Linux-kernel, *BSD, etc) handles it. So going with "the kernel does it this way" is not a valid reason for a binding change ;-) .
Instead in general want to reason that there are boards without this reset facility and thus make it optional for those.
if only the wording is the problem i try to rephrase it from hardware PoV.
maybe something like this?
Quoted 8 lines
Another way is maybe increasing the delay after the reset (to give more time all come up again), but imho it is no good idea resetting the gmac/mdio-bus from the child device.
have not looked into the gmac driver if this always does the initial reset to have a "clean state". In this initial reset the switch will be resetted too and does not need an additional one which needs the gmac/mdio initialization to be done again.
For clarification, the reset gpio line is purely to reset the phy. If having the switch driver own the reset gpio instead of the gmac breaks initialization that means there's a bug in the gmac driver handling phy init.
In testing I've seen issues moving the reset line to the mdio node with other phys and the stmmac gmac driver, so I do believe this is the case.
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 5 lines
Quoted 3 lines
allow port 5 as
cpu-portHow do you allow it here?
Argh, seems i accidentally removed this part and have not recognized while checking :(
Quoted 8 lines
Quoted 3 lines
Quoted 3 lines
It should only change description of reg for ports to:
"Port address described must be 5 or 6 for CPU port and from 0 to 5 for user ports."
noticed that the target-phase is not removed but squashed in the first bindings-patch. This was a rebasing error and not intented...will fix in next version.
regards Frank
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Re: [PATCH v3 5/6] dt-bindings: net: dsa: make reset optional and add rgmii-mode to mt7531
Quoted 7 lines · Peter Geis
Quoted 6 lines · Frank Wunderlich
Quoted 6 lines
I think the issue is more for the description itself.
Devicetree is only meant to describe the hardware and does in general don't care how any firmware (Linux-kernel, *BSD, etc) handles it. So going with "the kernel does it this way" is not a valid reason for a binding change ;-) .
Exactly. The argument in commit msg was not matching the change, because driver implementation should not be (mostly) a reason for such changes.
Quoted 9 lines
Quoted 9 lines
Quoted 3 lines
Instead in general want to reason that there are boards without this reset facility and thus make it optional for those.
if only the wording is the problem i try to rephrase it from hardware PoV.
maybe something like this?
Looks ok.
Quoted 10 lines
Quoted 9 lines
Another way is maybe increasing the delay after the reset (to give more time all come up again), but imho it is no good idea resetting the gmac/mdio-bus from the child device.
have not looked into the gmac driver if this always does the initial reset to have a "clean state". In this initial reset the switch will be resetted too and does not need an additional one which needs the gmac/mdio initialization to be done again.
Quoted 7 lines
For clarification, the reset gpio line is purely to reset the phy. If having the switch driver own the reset gpio instead of the gmac breaks initialization that means there's a bug in the gmac driver handling phy init.
In testing I've seen issues moving the reset line to the mdio node with other phys and the stmmac gmac driver, so I do believe this is the case.
Yes, this seems reasonable, although Frank mentioned that reset is shared with gmac, so it resets some part of it as well?
Best regards,
Krzysztof
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Re: [PATCH v3 5/6] dt-bindings: net: dsa: make reset optional and add rgmii-mode to mt7531
Quoted 43 lines · Krzysztof Kozlowski
Quoted 7 lines · Peter Geis
Quoted 6 lines · Frank Wunderlich
Quoted 6 lines
I think the issue is more for the description itself.
Devicetree is only meant to describe the hardware and does in general don't care how any firmware (Linux-kernel, *BSD, etc) handles it. So going with "the kernel does it this way" is not a valid reason for a binding change ;-) .
Exactly. The argument in commit msg was not matching the change, because driver implementation should not be (mostly) a reason for such changes.
Quoted 9 lines
Quoted 9 lines
Quoted 3 lines
Instead in general want to reason that there are boards without this reset facility and thus make it optional for those.
if only the wording is the problem i try to rephrase it from hardware PoV.
maybe something like this?
Looks ok.
Quoted 10 lines
Quoted 9 lines
Another way is maybe increasing the delay after the reset (to give more time all come up again), but imho it is no good idea resetting the gmac/mdio-bus from the child device.
have not looked into the gmac driver if this always does the initial reset to have a "clean state". In this initial reset the switch will be resetted too and does not need an additional one which needs the gmac/mdio initialization to be done again.
Quoted 7 lines
For clarification, the reset gpio line is purely to reset the phy. If having the switch driver own the reset gpio instead of the gmac breaks initialization that means there's a bug in the gmac driver handling phy init.
In testing I've seen issues moving the reset line to the mdio node with other phys and the stmmac gmac driver, so I do believe this is the case.
Quoted 2 lines
Yes, this seems reasonable, although Frank mentioned that reset is shared with gmac, so it resets some part of it as well?
No, the gpio-reset line is purely to reset the phy. The stmmac gmac driver handles it because it seems initialization failures occur if it's handled by the mdio drivers. I suspect this is due to a difference between when the driver initializes the phy vs when the driver triggers the reset.
They had tried to attach the gpio binding to both the gmac node and the mdio node at the same time when only one can own it. Having it owned by the switch driver on the mdio node leads to the same initialization failures we see in other mdio drivers.
Quoted 6 lines
Best regards,
Krzysztof
Rob Herring
maintainerRe: [PATCH v3 1/6] dt-bindings: net: dsa: convert binding for mediatek switches
In reply to Frank WunderlichQuoted 98 lines · Frank Wunderlich
From: Frank Wunderlich <[email protected]>
Convert txt binding to yaml binding for Mediatek switches.
Signed-off-by Frank Wunderlich <[email protected]>---
v3:
- include standalone patch in mt7530 series
- drop some descriptions (gpio-cells,reset-gpios,reset-names)
- drop | from descriptions
- move patternProperties above allOfv2:
- renamemediatek.yaml=> mediatek,mt7530.yaml
- drop "boolean" in description
- drop description for interrupt-properties
- drop #interrupt-cells as requirement
- example: eth=>ethernet,mdio0=>mdio,comment indention
- replace 0 byGPIO_ACTIVE_HIGHin first example
- use port(s)-pattern fromdsa.yaml
- adress/size-cells not added to required because this is defined at mdio-level inc current dts , not switch level--- .../bindings/net/dsa/mediatek,mt7530.yaml | 423 ++++++++++++++++++ .../devicetree/bindings/net/dsa/mt7530.txt | 327 -------------- 2 files changed, 423 insertions(+), 327 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml delete mode 100644 Documentation/devicetree/bindings/net/dsa/mt7530.txtDocumentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +63
-0@@ -0,0 +1,423 @@ +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/net/dsa/mediatek,mt7530.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Mediatek MT7530 Ethernet switch + +maintainers: + - Sean Wang <[email protected]> + - Landen Chao <[email protected]> + - DENG Qingfang <[email protected]> + +description: | + Port 5 of mt7530 and mt7621 switch is muxed between: + 1. GMAC5: GMAC5 can interface with another external MAC or PHY. + 2. PHY of port 0 or port 4: PHY interfaces with an external MAC like 2nd GMAC + of the SOC. Used in many setups where port 0/4 becomes the WAN port. + Note: On a MT7621 SOC with integrated switch: 2nd GMAC can only connected to + GMAC5 when the gpios for RGMII2 (GPIO 22-33) are not used and not + connected to external component! + + Port 5 modes/configurations: + 1. Port 5 is disabled and isolated: An external phy can interface to the 2nd + GMAC of the SOC. + In the case of a build-in MT7530 switch, port 5 shares the RGMII bus with 2nd + GMAC and an optional external phy. Mind the GPIO/pinctl settings of the SOC! + 2. Port 5 is muxed to PHY of port 0/4: Port 0/4 interfaces with 2nd GMAC. + It is a simple MAC to PHY interface, port 5 needs to be setup for xMII mode + and RGMII delay. + 3. Port 5 is muxed to GMAC5 and can interface to an external phy. + Port 5 becomes an extra switch port. + Only works on platform where external phy TX<->RX lines are swapped. + Like in the Ubiquiti ER-X-SFP. + 4. Port 5 is muxed to GMAC5 and interfaces with the 2nd GAMC as 2nd CPU port. + Currently a 2nd CPU port is not supported by DSA code. + + Depending on how the external PHY is wired: + 1. normal: The PHY can only connect to 2nd GMAC but not to the switch + 2. swapped: RGMII TX, RX are swapped; external phy interface with the switch as + a ethernet port. But can't interface to the 2nd GMAC. + + Based on the DT the port 5 mode is configured. + + Driver tries to lookup the phy-handle of the 2nd GMAC of the master device. + When phy-handle matches PHY of port 0 or 4 then port 5 set-up as mode 2. + phy-mode must be set, see also example 2 below! + * mt7621: phy-mode = "rgmii-txid"; + * mt7623: phy-mode = "rgmii"; + + CPU-Ports need a phy-mode property: + Allowed values on mt7530 and mt7621: + - "rgmii" + - "trgmii" + On mt7531: + - "1000base-x" + - "2500base-x" + - "sgmii" + + +properties: + compatible: + enum:
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml line 72
Quoted 10 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +9
-0+ - mediatek,mt7530 + - mediatek,mt7531 + - mediatek,mt7621 + + "#address-cells": + const: 1 + + "#size-cells": + const: 0
I don't see any child nodes with addresses, so these can be removed.
Quoted 8 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +8
-0+ + core-supply: + description: + Phandle to the regulator node necessary for the core power. + + "#gpio-cells": + const: 2 +
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml line 90
Quoted 10 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +10
-0+ gpio-controller: + type: boolean + description: + if defined, MT7530's LED controller will run on GPIO mode. + + "#interrupt-cells": + const: 1 + + interrupt-controller: + type: boolean
Already has a type. Just:
interrupt-controller: true
Quoted 22 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +22
-0+ + interrupts: + maxItems: 1 + + io-supply: + description: + Phandle to the regulator node necessary for the I/O power. + See Documentation/devicetree/bindings/regulator/mt6323-regulator.txt + for details for the regulator setup on these boards. + + mediatek,mcm: + type: boolean + description: + if defined, indicates that either MT7530 is the part on multi-chip + module belong to MT7623A has or the remotely standalone chip as the + function MT7623N reference board provided for. + + reset-gpios: + maxItems: 1 + + reset-names: + const: mcm
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml line 122
Quoted 10 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +10
-0+ + resets: + description: + Phandle pointing to the system reset controller with line index for + the ethsys. + maxItems: 1 + +patternProperties: + "^(ethernet-)?ports$": + type: object
additionalProperties: false
Quoted 39 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +39
-0+ + patternProperties: + "^(ethernet-)?port@[0-9]+$": + type: object + description: Ethernet switch ports + + unevaluatedProperties: false + + properties: + reg: + description: + Port address described must be 5 or 6 for CPU port and from 0 + to 5 for user ports. + + allOf: + - $ref: dsa-port.yaml# + - if: + properties: + label: + items: + - const: cpu + then: + required: + - reg + - phy-mode + +required: + - compatible + - reg + +allOf: + - $ref: "dsa.yaml#" + - if: + required: + - mediatek,mcm + then: + required: + - resets + - reset-names
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml line 171
Quoted 10 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +10
-0+ else: + required: + - reset-gpios + + - if: + required: + - interrupt-controller + then: + required: + - interrupts
This can be expressed as:
dependencies:
interrupt-controller: [ interrupts ]
Quoted 20 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +20
-0+ + - if: + properties: + compatible: + items: + - const: mediatek,mt7530 + then: + required: + - core-supply + - io-supply + +unevaluatedProperties: false + +examples: + - | + #include <dt-bindings/gpio/gpio.h> + mdio { + #address-cells = <1>; + #size-cells = <0>; + switch@0 {
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml line 201
Quoted 10 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +10
-0+ compatible = "mediatek,mt7530"; + #address-cells = <1>; + #size-cells = <0>; + reg = <0>; + + core-supply = <&mt6323_vpa_reg>; + io-supply = <&mt6323_vemc3v3_reg>; + reset-gpios = <&pio 33 GPIO_ACTIVE_HIGH>; + + ports {
Use the preferred form: ethernet-ports
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml line 204
Quoted 3 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +3
-0+ #address-cells = <1>; + #size-cells = <0>; + port@0 {
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Aw: Re: [PATCH v3 1/6] dt-bindings: net: dsa: convert binding for mediatek switches
Hi
thanks for review
Quoted 15 lines
Gesendet: Dienstag, 10. Mai 2022 um 20:44 Uhr
Von: "Rob Herring" <[email protected]>Quoted 11 lines · Frank Wunderlich
From: Frank Wunderlich <[email protected]>
+++
b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yamlDocumentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +7
-0+properties: + compatible: + enum: + - mediatek,mt7530 + - mediatek,mt7531 + - mediatek,mt7621 +
Quoted 7 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml line 72
Quoted 5 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +5
-0+ "#address-cells": + const: 1 + + "#size-cells": + const: 0I don't see any child nodes with addresses, so these can be removed.
dropping this (and address-cells/size-cells from examples) causes errors like this (address-/size-cells set in mdio node, so imho it should inherite):
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.example.dts:34.25-35: Warning (reg_format):
/example-0/mdio/switch@0/ports/port@0:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1) Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.example.dtb: Warning (pci_device_reg): Failed prerequisite 'reg_format'
Quoted 11 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ interrupt-controller: + type: booleanAlready has a type. Just:
interrupt-controller: true
Quoted 3 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +3
-0+ + interrupts: + maxItems: 1
Quoted 5 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml line 122
Quoted 3 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +3
-0+patternProperties: + "^(ethernet-)?ports$": + type: objectadditionalProperties: false
imho this will block address-/size-cells from this level too. looks like it is needed here too (for port-regs).
Quoted 34 lines
Quoted 23 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +23
-0+ + patternProperties: + "^(ethernet-)?port@[0-9]+$": + type: object + description: Ethernet switch ports + + unevaluatedProperties: false + + properties: + reg: + description: + Port address described must be 5 or 6 for CPU port and from 0 + to 5 for user ports. + + allOf: + - $ref: dsa-port.yaml# + - if: + properties: + label: + items: + - const: cpu + then: + required:Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml line 171
Quoted 10 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +9
-0+ - reg + - phy-mode + + - if: + required: + - interrupt-controller + then: + required: + - interrupts
Quoted 4 lines
This can be expressed as:
dependencies:
interrupt-controller: [ interrupts ]
ok, i will change this
Quoted 3 lines
Quoted 1 line
+ ports {
Use the preferred form: ethernet-ports
current implementation in all existing dts and examples from old binding are "ports" only. should they changed too?
Quoted 3 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml line 204
Quoted 3 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +3
-0+ #address-cells = <1>; + #size-cells = <0>; + port@0 {
regards Frank
Rob Herring
maintainerRe: Re: [PATCH v3 1/6] dt-bindings: net: dsa: convert binding for mediatek switches
Quoted 25 lines · Frank Wunderlich
Hi
thanks for review
Quoted 21 lines
Gesendet: Dienstag, 10. Mai 2022 um 20:44 Uhr
Von: "Rob Herring" <[email protected]>Quoted 17 lines · Frank Wunderlich
From: Frank Wunderlich <[email protected]>
+++
b/Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yamlDocumentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +12
-0+properties: + compatible: + enum: + - mediatek,mt7530 + - mediatek,mt7531 + - mediatek,mt7621 + + "#address-cells": + const: 1 + + "#size-cells": + const: 0
Quoted 4 lines
Quoted 1 line
I don't see any child nodes with addresses, so these can be removed.
dropping this (and address-cells/size-cells from examples) causes errors like this (address-/size-cells set in mdio node, so imho it should inherite):
I think you are off a level.
Quoted 2 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.example.dts:34.25-35: Warning (
reg_format):
/example-0/mdio/switch@0/ports/port@0:reg: property has invalid length (4 bytes) (#address-cells == 2, #size-cells == 1)
That's for yet another level where 'ports' node need the properties.
Quoted 60 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.example.dtb: Warning (pci_device_reg): Failed prerequisite 'reg_format'Quoted 11 lines
Review
Quoted 2 lines
(quoted diff) +2
-0+ interrupt-controller: + type: booleanAlready has a type. Just:
interrupt-controller: true
Quoted 3 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +3
-0+ + interrupts: + maxItems: 1Quoted 5 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml line 122
Quoted 3 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +3
-0+patternProperties: + "^(ethernet-)?ports$": + type: objectadditionalProperties: false
imho this will block address-/size-cells from this level too. looks like it is needed here too (for port-regs).
Quoted 34 lines
Quoted 23 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +23
-0+ + patternProperties: + "^(ethernet-)?port@[0-9]+$": + type: object + description: Ethernet switch ports + + unevaluatedProperties: false + + properties: + reg: + description: + Port address described must be 5 or 6 for CPU port and from 0 + to 5 for user ports. + + allOf: + - $ref: dsa-port.yaml# + - if: + properties: + label: + items: + - const: cpu + then: + required:Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml line 171
Quoted 10 lines
Documentation/devicetree/bindings/net/dsa/mediatek,mt7530.yaml new file +9
-0+ - reg + - phy-mode + + - if: + required: + - interrupt-controller + then: + required: + - interruptsQuoted 4 lines
This can be expressed as:
dependencies:
interrupt-controller: [ interrupts ]
Quoted 8 lines
ok, i will change this
Quoted 3 lines
Quoted 1 line
+ ports {
Use the preferred form: ethernet-ports
current implementation in all existing dts and examples from old binding are "ports" only. should they changed too?
They don't have to be the schema allows both, but the example should be best practice.
Rob
just a gentle ping, is anything missing/wrong?
regards Frank
_______________________________________________
Linux-mediatek mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-mediatek
Jakub Kicinski
maintainerQuoted 1 line · On Wed, 8 Jun 2022 19:38:30 +0200 Frank Wunderlich wrote:
just a gentle ping, is anything missing/wrong?
In your case:
https://patchwork.kernel.org/project/netdevbpf/list/?series=639420&state=*
I haven't double checked but even if the feedback you received was waved the patch didn't apply when it was posted, so you gotta repost.