kernel: rtl8367b: remove unnecessary cpu_port setting

Set the appropriate cpu_port value based on the use of realtek,extif0 to extif2
instead of the additional cpu_port parameter.

Signed-off-by: Mieczyslaw Nalewaj <namiltd@yahoo.com>
Link: https://github.com/openwrt/openwrt/pull/15033
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi b/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi
index 2921bfedb91370be4816d5ec5221be4592258546..9d987766264c8eaff10415520c4c83f8618b5b3a 100644 (file)
--- a/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi
+++ b/target/linux/apm821xx/dts/netgear-wndap6x0.dtsi
@@ -224,7 +224,6 @@
 
        rtl8367b {
                compatible = "realtek,rtl8367b";
-               cpu_port = <5>;
                realtek,extif0 = <1 2 1 1 1 1 1 1 2>;
                mii-bus = <&mdio0>;
        };

diff --git a/target/linux/generic/files/drivers/net/phy/rtl8367b.c b/target/linux/generic/files/drivers/net/phy/rtl8367b.c
index cd0d58cbfa33c79901290fceeea9fc530b942e5b..04c790e924569b729d116ee67d2e87dcde571636 100644 (file)
--- a/target/linux/generic/files/drivers/net/phy/rtl8367b.c
+++ b/target/linux/generic/files/drivers/net/phy/rtl8367b.c
@@ -1583,6 +1583,13 @@ static int rtl8367b_detect(struct rtl8366_smi *smi)
 
        dev_info(smi->parent, "RTL%s chip found\n", chip_name);
 
+       if (of_property_present(smi->parent->of_node, "realtek,extif2"))
+               smi->cpu_port = RTL8367B_CPU_PORT_NUM + 2;
+       else if (of_property_present(smi->parent->of_node, "realtek,extif1") && (chip_ver != 0x1010)) /* for the RTL8367R-VB chip, extif1 corresponds to cpu_port 5 */ 
+               smi->cpu_port = RTL8367B_CPU_PORT_NUM + 1;
+
+       dev_info(smi->parent, "CPU port: %u\n", smi->cpu_port);
+
        return 0;
 }
 
@@ -1621,9 +1628,7 @@ static int  rtl8367b_probe(struct platform_device *pdev)
        smi->cmd_write = 0xb8;
        smi->ops = &rtl8367b_smi_ops;
        smi->num_ports = RTL8367B_NUM_PORTS;
-       if (of_property_read_u32(pdev->dev.of_node, "cpu_port", &smi->cpu_port)
-           || smi->cpu_port >= smi->num_ports)
-               smi->cpu_port = RTL8367B_CPU_PORT_NUM;
+       smi->cpu_port = RTL8367B_CPU_PORT_NUM;
        smi->num_vlan_mc = RTL8367B_NUM_VLANS;
        smi->mib_counters = rtl8367b_mib_counters;
        smi->num_mib_counters = ARRAY_SIZE(rtl8367b_mib_counters);

diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts
index b134398f44525c0cc17402184f9bcff065a46aef..45cafdbcd153b7441f701f538197977b57dca1f3 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c2-v1.dts
@@ -55,7 +55,6 @@
 
        rtl8367rb {
                compatible = "realtek,rtl8367b";
-               cpu_port = <6>;
                realtek,extif1 = <1 0 1 1 1 1 1 1 2>;
                mii-bus = <&mdio0>;
        };

diff --git a/target/linux/ramips/dts/mt7620a_tplink_archer-c5-v4.dts b/target/linux/ramips/dts/mt7620a_tplink_archer-c5-v4.dts
index 1ed156e8af9279e4e97c4bb5047dd7a515aa86dc..855e06e9f6a11b34cde9496b6cedab7f7d97fddb 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_tplink_archer-c5-v4.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_archer-c5-v4.dts
@@ -74,7 +74,6 @@
 
        rtl8367s {
                compatible = "realtek,rtl8367b";
-               cpu_port = <7>;
                realtek,extif2 = <1 0 1 1 1 1 1 1 2>;
                mii-bus = <&mdio0>;
                phy-id = <29>;

diff --git a/target/linux/ramips/dts/mt7620a_tplink_ec220-g5-v2.dts b/target/linux/ramips/dts/mt7620a_tplink_ec220-g5-v2.dts
index 6ac1a9c5d561da14dee4ccba9bcddf8702ce0097..7fc075aeddbc5dc9339a255edc7b34648e35e677 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_tplink_ec220-g5-v2.dts
+++ b/target/linux/ramips/dts/mt7620a_tplink_ec220-g5-v2.dts
@@ -82,7 +82,6 @@
 
        rtl8367s {
                compatible = "realtek,rtl8367b";
-               cpu_port = <7>;
                realtek,extif2 = <1 0 1 1 1 1 1 1 2>;
                mii-bus = <&mdio0>;
                phy-id = <29>;

diff --git a/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts b/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts
index e96ca9ace698b865947d3ffb85df2cd7512658e5..0630e8a16088f0ada182051aa4160f6d3ba66825 100644 (file)
--- a/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts
+++ b/target/linux/ramips/dts/mt7620a_zyxel_keenetic-viva.dts
@@ -85,7 +85,6 @@
 
        rtl8367rb {
                compatible = "realtek,rtl8367b";
-               cpu_port = <7>;
                realtek,extif2 = <1 0 1 1 1 1 1 1 2>;
                mii-bus = <&mdio0>;
        };