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@xxxxxxxxxxxxx>
> ---
Reviewed-by: Konrad Dybcio <konrad.dybcio@xxxxxxxxxx>
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,
