openwrt-mirror/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2026-06-17 14:50:15 +04:00
Code Issues Packages Projects Releases Wiki Activity

realtek: dts: convert to upstream switch notation

Browse Source 
There is currently a difference how upstream and downstream define
the switch in the dts. Downstream holds the switch as a member
node below a root switchcore parent. Upstream uses the switch as
the parent.

Upstream:

  ethernet-switch@1b000000 {
    mdio-controller@ca00 { };
    ethernet { };
    ethernet-ports { };
  }

Downstream:

  switchcore@1b000000 {
    ethernet-switch {
      ethernet-ports { };
    };
    mdio-controller@ca00 { };
    ethernet { };
  }

Align downstream to upstream and merge the ethernet-switch into
the parent node. For this to work adapt the port lookup in the MDIO
and PCS driver.

Remark! With this commit the boot process will give the spurious
error message "rtl838x_eth 1b000000.ethernet-switch:ethernet eth0:
Failed to create a device link to DSA switch 1b000000.ethernet-switch"
This comes from the fact that the switch is the parent of the ethernet
device. Thus a link back from ethernet device to the switch is no
longer possible. Testing shows that the error is just cosmetic.

Link: https://github.com/openwrt/openwrt/pull/23599
Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
This commit is contained in:
Markus Stockhausen
2026-05-31 16:35:35 +02:00
parent 07a5e432c8
commit 82ddc472d7
6 changed files with 21 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
target/linux/realtek/dts/rtl838x.dtsi
+4 -10
View File
@@ -199,9 +199,11 @@
};
};
switchcore@1b000000 {
compatible = "syscon", "simple-mfd";
switch0: ethernet-switch@1b000000 {
compatible = "realtek,rtl8380-switch", "realtek,otto-switch", "syscon", "simple-mfd";
reg = <0x1b000000 0x10000>;
interrupt-parent = <&intc>;
interrupts = <20 2>;
#address-cells = <1>;
#size-cells = <1>;
@@ -280,14 +282,6 @@
compatible = "realtek,rtl8380-thermal";
#thermal-sensor-cells = <0>;
};
switch0: ethernet-switch {
compatible = "realtek,rtl8380-switch", "realtek,otto-switch";
status = "okay";
interrupt-parent = <&intc>;
interrupts = <20 2>;
};
};
pinmux@1b000144 {
target/linux/realtek/dts/rtl839x.dtsi
+4 -10
View File
@@ -207,9 +207,11 @@
};
switchcore@1b000000 {
compatible = "syscon", "simple-mfd";
switch0: ethernet-switch@1b000000 {
compatible = "realtek,rtl8392-switch", "realtek,otto-switch", "syscon", "simple-mfd";
reg = <0x1b000000 0x10000>;
interrupt-parent = <&intc>;
interrupts = <20 2>;
#address-cells = <1>;
#size-cells = <1>;
@@ -325,14 +327,6 @@
compatible = "realtek,rtl8390-thermal";
#thermal-sensor-cells = <0>;
};
switch0: ethernet-switch {
compatible = "realtek,rtl8392-switch", "realtek,otto-switch";
status = "okay";
interrupt-parent = <&intc>;
interrupts = <20 2>;
};
};
pinmux@1b000004 {
target/linux/realtek/dts/rtl930x.dtsi
+4 -10
View File
@@ -167,9 +167,11 @@
};
switchcore@1b000000 {
compatible = "syscon", "simple-mfd";
switch0: ethernet-switch@1b000000 {
compatible = "realtek,rtl9301-switch", "realtek,otto-switch", "syscon", "simple-mfd";
reg = <0x1b000000 0x10000>;
interrupt-parent = <&intc>;
interrupts = <23 2>;
#address-cells = <1>;
#size-cells = <1>;
@@ -304,14 +306,6 @@
compatible = "realtek,rtl9300-thermal";
#thermal-sensor-cells = <0>;
};
switch0: ethernet-switch {
compatible = "realtek,rtl9301-switch", "realtek,otto-switch";
status = "okay";
interrupt-parent = <&intc>;
interrupts = <23 2>;
};
};
pinmux@1b000200 {
target/linux/realtek/dts/rtl931x.dtsi
+5 -11
View File
@@ -194,9 +194,12 @@
};
};
switchcore@1b000000 {
compatible = "syscon", "simple-mfd";
switch0: ethernet-switch@1b000000 {
compatible = "realtek,rtl9311-switch", "realtek,otto-switch", "syscon", "simple-mfd";
reg = <0x1b000000 0x10000>;
interrupt-parent = <&gic>;
interrupts = <GIC_SHARED 15 IRQ_TYPE_LEVEL_HIGH>;
#interrupt-cells = <3>;
#address-cells = <1>;
#size-cells = <1>;
@@ -339,15 +342,6 @@
#pcs-cells = <1>;
};
};
switch0: ethernet-switch {
compatible = "realtek,rtl9311-switch", "realtek,otto-switch";
status = "okay";
interrupt-parent = <&gic>;
#interrupt-cells = <3>;
interrupts = <GIC_SHARED 15 IRQ_TYPE_LEVEL_HIGH>;
};
};
pinmux@1b00103c {
target/linux/realtek/files-6.18/drivers/net/mdio/mdio-realtek-otto.c
+2 -7
View File
@@ -976,14 +976,9 @@ static int rtmd_map_ports(struct device *dev)
struct rtmd_ctrl *ctrl = dev_get_drvdata(dev);
int smi_bus, smi_addr, pn;
struct fwnode_handle *fw_parent __free(fwnode_handle) = fwnode_get_parent(fw_dev);
if (!fw_parent)
return -ENODEV;
struct fwnode_handle *fw_switch __free(fwnode_handle) =
fwnode_get_named_child_node(fw_parent, "ethernet-switch");
struct fwnode_handle *fw_switch __free(fwnode_handle) = fwnode_get_parent(fw_dev);
if (!fw_switch)
return dev_err_probe(dev, -ENODEV, "%pfwP missing ethernet-switch\n", fw_parent);
return -ENODEV;
struct fwnode_handle *fw_ports __free(fwnode_handle) =
fwnode_get_named_child_node(fw_switch, "ethernet-ports");
target/linux/realtek/files-6.18/drivers/net/pcs/pcs-rtl-otto.c
+2 -7
View File
@@ -4247,14 +4247,9 @@ static struct rtpcs_serdes *rtpcs_find_serdes(struct rtpcs_ctrl *ctrl,
static int rtpcs_map_links(struct device *dev, struct rtpcs_ctrl *ctrl)
{
struct fwnode_handle *fw_dev = dev_fwnode(dev);
struct fwnode_handle *fw_parent __free(fwnode_handle) = fwnode_get_parent(fw_dev);
if (!fw_parent)
return -ENODEV;
struct fwnode_handle *fw_switch __free(fwnode_handle) =
fwnode_get_named_child_node(fw_parent, "ethernet-switch");
struct fwnode_handle *fw_switch __free(fwnode_handle) = fwnode_get_parent(fw_dev);
if (!fw_switch)
return dev_err_probe(dev, -ENODEV, "%pfwP missing ethernet-switch\n", fw_parent);
return -ENODEV;
struct fwnode_handle *fw_ports __free(fwnode_handle) =
fwnode_get_named_child_node(fw_switch, "ethernet-ports");