From: George Moussalem Date: Wed, 19 Feb 2025 09:08:49 +0000 (+0400) Subject: qualcommax: ipq50xx: Linksys MX remove superfluous properties and fix indentation X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=b790989dffb274f43e3442210b902bcbccc0eac4;p=openwrt%2Fopenwrt.git 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 Link: https://github.com/openwrt/openwrt/pull/18029 Signed-off-by: Robert Marko --- 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 e563cca779..ce10405164 100644 --- 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 ab3e00a9cc..4792ed5d43 100644 --- 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 {