qualcommax: ipq50xx: Linksys MX remove superfluous properties and fix indentation

On the ipq50xx platform, the internal GE PHY at phy address 7 on mdio0
must be enabled as it's used to detect the virtual switch in qca-ssdk.
This is a platform wide condition and is therefore part of the dtsi.
However, by enabling the mdio0 bus in board-specific dts files, the ge_phy
is implicitly enabled. So, let's remove the superfluous status property
in the dts files for Linksys MX2000 and MX5500.

While at it, remove the redundant phy-mode property as it's set to sgmii
by default in the ipq5018-ess.dtsi file and fix indentation in the
firmware property of the q5v6_wcss node.

Signed-off-by: George Moussalem <george.moussalem@outlook.com>
Link: https://github.com/openwrt/openwrt/pull/18029
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts
index e563cca779ed343807394b36c53d7f10c0e22c21..ce1040516490a636e7553f92c676e7371cf29a4e 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx2000.dts
@@ -49,8 +49,6 @@
 &dp2 {
        status = "okay";
 
-       phy-mode = "sgmii";
-
        nvmem-cells = <&hw_mac_addr 0>;
        nvmem-cell-names = "mac-address";
 
@@ -64,13 +62,6 @@
        status = "okay";
 };
 
-/* IPQ5018 GE Phy -> Not connected 
- * needs to be enabled for QSDK to identify the IPQ5018 dummy switch
- */
-&ge_phy {
-       status = "okay";
-};
-
 &mdio1 {
        status = "okay";
 
@@ -159,8 +150,8 @@
 
        memory-region = <&q6_mem_regions>;
        firmware-name = "ath11k/IPQ5018/hw1.0/q6_fw.mdt",
-                                       "ath11k/IPQ5018/hw1.0/m3_fw.mdt",
-                                       "ath11k/QCN6122/hw1.0/m3_fw.mdt";
+                       "ath11k/IPQ5018/hw1.0/m3_fw.mdt",
+                       "ath11k/QCN6122/hw1.0/m3_fw.mdt";
 
        /* The QCN6102 radio should map to UPD ID 2. Without       */
        /* bootargs, the firmware will expect it to be on UPD ID 3 */

diff --git a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts
index ab3e00a9ccda343f932c2949de3298bd448c83e7..4792ed5d43a6e47512d4fa5bd07753cc683a3bf6 100644 (file)
--- a/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts
+++ b/target/linux/qualcommax/files/arch/arm64/boot/dts/qcom/ipq5018-mx5500.dts
@@ -49,8 +49,6 @@
 &dp2 {
        status = "okay";
 
-       phy-mode = "sgmii";
-
        nvmem-cells = <&hw_mac_addr 0>;
        nvmem-cell-names = "mac-address";
 
@@ -64,13 +62,6 @@
        status = "okay";
 };
 
-/* IPQ5018 GE Phy -> Not connected 
- * needs to be enabled for QSDK to identify the IPQ5018 dummy switch
- */
-&ge_phy {
-       status = "okay";
-};
-
 &mdio1 {
        status = "okay";
 
@@ -186,7 +177,7 @@
 
        memory-region = <&q6_mem_regions>;
        firmware-name = "ath11k/IPQ5018/hw1.0/q6_fw.mdt",
-                                       "ath11k/IPQ5018/hw1.0/m3_fw.mdt";
+                       "ath11k/IPQ5018/hw1.0/m3_fw.mdt";
 
        // IPQ5018
        q6_wcss_pd1: pd-1 {