* [PATCH] arm64: dts: qcom: sm6350: Move wifi node to correct place
@ 2023-05-16 6:56 Luca Weiss
2023-05-16 12:05 ` Konrad Dybcio
2023-05-25 4:54 ` Bjorn Andersson
0 siblings, 2 replies; 3+ messages in thread
From: Luca Weiss @ 2023-05-16 6:56 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: ~postmarketos/upstreaming, phone-devel, linux-arm-msm,
devicetree, linux-kernel, Luca Weiss
Somehow wifi was placed further up in the file than where it should be.
Move it down so the nodes are sorted by reg again.
Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
---
arch/arm64/boot/dts/qcom/sm6350.dtsi | 44 ++++++++++++++++++------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi
index 18c4616848ce..4dffd7974fa3 100644
--- a/arch/arm64/boot/dts/qcom/sm6350.dtsi
+++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi
@@ -1891,28 +1891,6 @@ frame@17c2d000 {
};
};
- wifi: wifi@18800000 {
- compatible = "qcom,wcn3990-wifi";
- reg = <0 0x18800000 0 0x800000>;
- reg-names = "membase";
- memory-region = <&wlan_fw_mem>;
- interrupts = <GIC_SPI 414 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 415 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,
- <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>;
- iommus = <&apps_smmu 0x20 0x1>;
- qcom,msa-fixed-perm;
- status = "disabled";
- };
-
apps_rsc: rsc@18200000 {
compatible = "qcom,rpmh-rsc";
label = "apps_rsc";
@@ -2010,6 +1988,28 @@ cpufreq_hw: cpufreq@18323000 {
#freq-domain-cells = <1>;
#clock-cells = <1>;
};
+
+ wifi: wifi@18800000 {
+ compatible = "qcom,wcn3990-wifi";
+ reg = <0 0x18800000 0 0x800000>;
+ reg-names = "membase";
+ memory-region = <&wlan_fw_mem>;
+ interrupts = <GIC_SPI 414 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 415 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,
+ <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>;
+ iommus = <&apps_smmu 0x20 0x1>;
+ qcom,msa-fixed-perm;
+ status = "disabled";
+ };
};
timer {
---
base-commit: f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6
change-id: 20230516-sm6350-order-f9a836dc7247
Best regards,
--
Luca Weiss <luca.weiss@fairphone.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] arm64: dts: qcom: sm6350: Move wifi node to correct place
2023-05-16 6:56 [PATCH] arm64: dts: qcom: sm6350: Move wifi node to correct place Luca Weiss
@ 2023-05-16 12:05 ` Konrad Dybcio
2023-05-25 4:54 ` Bjorn Andersson
1 sibling, 0 replies; 3+ messages in thread
From: Konrad Dybcio @ 2023-05-16 12:05 UTC (permalink / raw)
To: Luca Weiss, Andy Gross, Bjorn Andersson, Rob Herring,
Krzysztof Kozlowski, Conor Dooley
Cc: ~postmarketos/upstreaming, phone-devel, linux-arm-msm,
devicetree, linux-kernel
On 16.05.2023 08:56, Luca Weiss wrote:
> Somehow wifi was placed further up in the file than where it should be.
> Move it down so the nodes are sorted by reg again.
>
> Signed-off-by: Luca Weiss <luca.weiss@fairphone.com>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Konrad
> arch/arm64/boot/dts/qcom/sm6350.dtsi | 44 ++++++++++++++++++------------------
> 1 file changed, 22 insertions(+), 22 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi
> index 18c4616848ce..4dffd7974fa3 100644
> --- a/arch/arm64/boot/dts/qcom/sm6350.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi
> @@ -1891,28 +1891,6 @@ frame@17c2d000 {
> };
> };
>
> - wifi: wifi@18800000 {
> - compatible = "qcom,wcn3990-wifi";
> - reg = <0 0x18800000 0 0x800000>;
> - reg-names = "membase";
> - memory-region = <&wlan_fw_mem>;
> - interrupts = <GIC_SPI 414 IRQ_TYPE_LEVEL_HIGH>,
> - <GIC_SPI 415 IRQ_TYPE_LEVEL_HIGH>,
> - <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH>,
> - <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH>,
> - <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH>,
> - <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH>,
> - <GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH>,
> - <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>,
> - <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>,
> - <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,
> - <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,
> - <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>;
> - iommus = <&apps_smmu 0x20 0x1>;
> - qcom,msa-fixed-perm;
> - status = "disabled";
> - };
> -
> apps_rsc: rsc@18200000 {
> compatible = "qcom,rpmh-rsc";
> label = "apps_rsc";
> @@ -2010,6 +1988,28 @@ cpufreq_hw: cpufreq@18323000 {
> #freq-domain-cells = <1>;
> #clock-cells = <1>;
> };
> +
> + wifi: wifi@18800000 {
> + compatible = "qcom,wcn3990-wifi";
> + reg = <0 0x18800000 0 0x800000>;
> + reg-names = "membase";
> + memory-region = <&wlan_fw_mem>;
> + interrupts = <GIC_SPI 414 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 415 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH>,
> + <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH>;
> + iommus = <&apps_smmu 0x20 0x1>;
> + qcom,msa-fixed-perm;
> + status = "disabled";
> + };
> };
>
> timer {
>
> ---
> base-commit: f1fcbaa18b28dec10281551dfe6ed3a3ed80e3d6
> change-id: 20230516-sm6350-order-f9a836dc7247
>
> Best regards,
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] arm64: dts: qcom: sm6350: Move wifi node to correct place
2023-05-16 6:56 [PATCH] arm64: dts: qcom: sm6350: Move wifi node to correct place Luca Weiss
2023-05-16 12:05 ` Konrad Dybcio
@ 2023-05-25 4:54 ` Bjorn Andersson
1 sibling, 0 replies; 3+ messages in thread
From: Bjorn Andersson @ 2023-05-25 4:54 UTC (permalink / raw)
To: Krzysztof Kozlowski, Konrad Dybcio, Rob Herring, Andy Gross,
Luca Weiss, Conor Dooley
Cc: linux-kernel, linux-arm-msm, devicetree,
~postmarketos/upstreaming, phone-devel
On Tue, 16 May 2023 08:56:14 +0200, Luca Weiss wrote:
> Somehow wifi was placed further up in the file than where it should be.
> Move it down so the nodes are sorted by reg again.
>
>
Applied, thanks!
[1/1] arm64: dts: qcom: sm6350: Move wifi node to correct place
commit: fbd47f83c5a94f6e3772b4087c97292601857e68
Best regards,
--
Bjorn Andersson <andersson@kernel.org>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-05-25 5:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-05-16 6:56 [PATCH] arm64: dts: qcom: sm6350: Move wifi node to correct place Luca Weiss
2023-05-16 12:05 ` Konrad Dybcio
2023-05-25 4:54 ` Bjorn Andersson
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome