Skip to contentSkip to conversation

dts: arm64/sdm845: Add clocks to WCN3990 WLAN module device node

PATCH New Douglas Anderson 3 participants 3 messages Jan 19, 2019 – Feb 1, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dts: arm64/sdm845: Add clocks to WCN3990 WLAN module device node

When commit be7019103469 ("dts: arm64/sdm845: Add WCN3990 WLAN module device node") was posted upstream no clocks were specified. However, when the pack was picked into the Chrome OS kernel tree (allegedly directly from the mailing list post) it had clock properties.

I presume that the clock should be there, so let's add it.

Fixes be7019103469 ("dts: arm64/sdm845: Add WCN3990 WLAN module device node")

---

 arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm64/boot/dts/qcom/sdm845.dtsi +2 -0
index e4156ea320aa..f99424fc4df2 100644
@@ -2211,6 +2211,8 @@
 			reg = <0 0x18800000 0 0x800000>;
 			reg-names = "membase";
 			memory-region = <&wlan_msa_mem>;
+			clock-names = "cxo_ref_clk_pin";
+			clocks = <&rpmhcc RPMH_RF_CLK2>;
 			interrupts =
 				<GIC_SPI 414 IRQ_TYPE_LEVEL_HIGH>,
 				<GIC_SPI 415 IRQ_TYPE_LEVEL_HIGH>,
Signature · 1 line
2.20.1.321.g9e740568ce-goog
#1 lore raw

PATCH v2 1/1 arm64: dts: qcom: sdm845: Add clocks and iommus to WCN3990 WLAN node

From: Douglas Anderson <[email protected]>

When commit be7019103469 ("dts: arm64/sdm845: Add WCN3990 WLAN module device node") was posted upstream no clocks were specified. However, when the pack was picked into the Chrome OS kernel tree (allegedly directly from the mailing list post) it had clock properties.

I presume that the clock should be there, so let's add it.

Fixes be7019103469 ("dts: arm64/sdm845: Add WCN3990 WLAN module device node")
[bjorn: Add also the required iommus property]

---

Hijacking Doug's fixup patch to also add the missing iommus property. Without this the MTP reboots once the ath10k is trying to exercise the copyengine.

 arch/arm64/boot/dts/qcom/sdm845.dtsi | 3 +++
 1 file changed, 3 insertions(+)
arch/arm64/boot/dts/qcom/sdm845.dtsi +3 -0
index cba09899282e..58f034664336 100644
@@ -2422,6 +2422,8 @@
 			reg = <0 0x18800000 0 0x800000>;
 			reg-names = "membase";
 			memory-region = <&wlan_msa_mem>;
+			clock-names = "cxo_ref_clk_pin";
+			clocks = <&rpmhcc RPMH_RF_CLK2>;
 			interrupts =
 				<GIC_SPI 414 IRQ_TYPE_LEVEL_HIGH>,
 				<GIC_SPI 415 IRQ_TYPE_LEVEL_HIGH>,
@@ -2435,6 +2437,7 @@
 				<GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,
 				<GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,
 				<GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>;
+			iommus = <&apps_smmu 0x0040 0x1>;
 		};
 	};
 
Signature · 1 line
2.18.0
Tested-by on v2 1/1
#2 lore raw

Re: [PATCH v2] arm64: dts: qcom: sdm845: Add clocks and iommus to WCN3990 WLAN node

Quoted 8 lines · Bjorn Andersson

From: Douglas Anderson <[email protected]>

When commit be7019103469 ("dts: arm64/sdm845: Add WCN3990 WLAN module device node") was posted upstream no clocks were specified. However, when the pack was picked into the Chrome OS kernel tree (allegedly directly from the mailing list post) it had clock properties.

I presume that the clock should be there, so let's add it.

Quoted 34 lines
Fixes be7019103469 ("dts: arm64/sdm845: Add WCN3990 WLAN module device node")
[bjorn: Add also the required iommus property]

---

Hijacking Doug's fixup patch to also add the missing iommus property. Without this the MTP reboots once the ath10k is trying to exercise the copyengine.

 arch/arm64/boot/dts/qcom/sdm845.dtsi | 3 +++
 1 file changed, 3 insertions(+)
arch/arm64/boot/dts/qcom/sdm845.dtsi +3 -0
index cba09899282e..58f034664336 100644
@@ -2422,6 +2422,8 @@
 			reg = <0 0x18800000 0 0x800000>;
 			reg-names = "membase";
 			memory-region = <&wlan_msa_mem>;
+			clock-names = "cxo_ref_clk_pin";
+			clocks = <&rpmhcc RPMH_RF_CLK2>;
 			interrupts =
 				<GIC_SPI 414 IRQ_TYPE_LEVEL_HIGH>,
 				<GIC_SPI 415 IRQ_TYPE_LEVEL_HIGH>,
@@ -2435,6 +2437,7 @@
 				<GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,
 				<GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,
 				<GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>;
+			iommus = <&apps_smmu 0x0040 0x1>;
 		};
 	};
Signature · 3 lines
-- Sibi Sankar --
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project.