realtek: use Realtek PSE MCU driver for Engenius EWS2910P

Convert both v1 and v3 to PSE MCU driver. Tested on a v3.

Signed-off-by: Russell Senior <russell@personaltelco.net>
Link: https://github.com/openwrt/openwrt/pull/24383
Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>

diff --git a/target/linux/realtek/base-files/etc/board.d/02_network b/target/linux/realtek/base-files/etc/board.d/02_network
index e672c276f89817c7dcf15bfe7ca887f0bc99c579..0b1ffa8f72a29da5e886d6874bb9302ec83d73c0 100644 (file)
--- a/target/linux/realtek/base-files/etc/board.d/02_network
+++ b/target/linux/realtek/base-files/etc/board.d/02_network
@@ -203,10 +203,6 @@ realtek_setup_poe()
        datto,l8)
                ucidef_set_poe 55 "lan5 lan6 lan7 lan8 lan4 lan3 lan2 lan1"
                ;;
-       engenius,ews2910p-v1|\
-       engenius,ews2910p-v3)
-               ucidef_set_poe 60 "$(filter_port_list "$lan_list" "lan9 lan10")"
-               ;;
        hpe,1920-8g-poe-65w)
                ucidef_set_poe 65 "$(filter_port_list_reverse "$lan_list" "lan9 lan10")"
                ;;

diff --git a/target/linux/realtek/dts/rtl8380_engenius_ews2910p-v1.dts b/target/linux/realtek/dts/rtl8380_engenius_ews2910p-v1.dts
index 72f9ea7a90624146584f218e58db6700abed5a9a..526a2971119bb658fb0b544544eded51b6f05670 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_engenius_ews2910p-v1.dts
+++ b/target/linux/realtek/dts/rtl8380_engenius_ews2910p-v1.dts
@@ -11,3 +11,8 @@
        compatible = "openwrt,uimage";
        openwrt,ih-magic = <0x03802910>;
 };
+
+&pse {
+       compatible = "engenius,ews2910p-v1-pse", "realtek,pse-mcu-gen1";
+       current-speed = <19200>;
+};

diff --git a/target/linux/realtek/dts/rtl8380_engenius_ews2910p-v3.dts b/target/linux/realtek/dts/rtl8380_engenius_ews2910p-v3.dts
index eeab91e731393eae20cc32dd0bf0feea470b8e9d..4e2eec94bdcdee3f38535c717726345c37b2bdd8 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_engenius_ews2910p-v3.dts
+++ b/target/linux/realtek/dts/rtl8380_engenius_ews2910p-v3.dts
@@ -11,3 +11,8 @@
        compatible = "openwrt,uimage";
        openwrt,ih-magic = <0x03010500>;
 };
+
+&pse {
+       compatible = "engenius,ews2910p-v3-pse", "realtek,pse-mcu-gen2";
+       current-speed = <115200>;
+};

diff --git a/target/linux/realtek/dts/rtl8380_engenius_ews2910p.dtsi b/target/linux/realtek/dts/rtl8380_engenius_ews2910p.dtsi
index 74f51e63c9146af7a4632b92a865920e699c79bb..13cbf0da263ccdf48f4208cf87d70338648f27a0 100644 (file)
--- a/target/linux/realtek/dts/rtl8380_engenius_ews2910p.dtsi
+++ b/target/linux/realtek/dts/rtl8380_engenius_ews2910p.dtsi
@@ -230,4 +230,31 @@
 
 &uart1 {
        status = "okay";
+
+       /* PoE MCU; compatible and current-speed are set per variant */
+       pse: ethernet-pse {
+               pse-pis {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       PSE_PI(0)
+                       PSE_PI(1)
+                       PSE_PI(2)
+                       PSE_PI(3)
+                       PSE_PI(4)
+                       PSE_PI(5)
+                       PSE_PI(6)
+                       PSE_PI(7)
+               };
+       };
 };
+
+/* Copper ports lan1..lan8 (phy8..phy15) -> MCU PoE ports 0..7 */
+&phy8  { pses = <&pse_pi0>; };
+&phy9  { pses = <&pse_pi1>; };
+&phy10 { pses = <&pse_pi2>; };
+&phy11 { pses = <&pse_pi3>; };
+&phy12 { pses = <&pse_pi4>; };
+&phy13 { pses = <&pse_pi5>; };
+&phy14 { pses = <&pse_pi6>; };
+&phy15 { pses = <&pse_pi7>; };

diff --git a/target/linux/realtek/image/rtl838x.mk b/target/linux/realtek/image/rtl838x.mk
index 0564a9fdda19d210d2c0ddbdeb28ed35501e33e2..4e92c41eb7f0942fdab4a88a7785bb1daefe14be 100644 (file)
--- a/target/linux/realtek/image/rtl838x.mk
+++ b/target/linux/realtek/image/rtl838x.mk
@@ -109,7 +109,7 @@ define Device/engenius_ews2910p-v1
   SOC := rtl8380
   DEVICE_MODEL := EWS2910P
   DEVICE_VARIANT := v1
-  DEVICE_PACKAGES += realtek-poe
+  DEVICE_PACKAGES += kmod-pse-realtek-mcu-uart
   UIMAGE_MAGIC := 0x03802910
   SUPPORTED_DEVICES += engenius,ews2910p
 endef
@@ -120,6 +120,7 @@ define Device/engenius_ews2910p-v3
   SOC := rtl8380
   DEVICE_MODEL := EWS2910P
   DEVICE_VARIANT := v3
+  DEVICE_PACKAGES += kmod-pse-realtek-mcu-uart
   UIMAGE_MAGIC := 0x03010500
 endef
 TARGET_DEVICES += engenius_ews2910p-v3