2020-01-29 07:01:49

by Rakesh Pillai

Subject: [PATCH v5] arm64: dts: qcom: sc7180: Add WCN3990 WLAN module device node

Add device node for the ath10k SNOC platform driver probe
and add resources required for WCN3990 on sc7180 soc.

Signed-off-by: Rakesh Pillai <[email protected]>
---
arch/arm64/boot/dts/qcom/sc7180-idp.dts | 5 +++++
arch/arm64/boot/dts/qcom/sc7180.dtsi | 28 ++++++++++++++++++++++++++++
2 files changed, 33 insertions(+)

diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
index 388f50a..167f68ac 100644
--- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts
+++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
@@ -287,6 +287,11 @@
vdda-pll-supply = <&vreg_l4a_0p8>;
};

+&wifi {
+ status = "okay";
+ qcom,msa-fixed-perm;
+};
+
/* PINCTRL - additions to nodes defined in sc7180.dtsi */

&qspi_clk {
diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
index 8011c5f..0a00c94 100644
--- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
+++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
@@ -75,6 +75,12 @@
reg = <0x0 0x80900000 0x0 0x200000>;
no-map;
};
+
+ wlan_fw_mem: memory@93900000 {
+ compatible = "removed-dma-pool";
+ no-map;
+ reg = <0 0x93900000 0 0x200000>;
+ };
};

cpus {
@@ -1490,6 +1496,28 @@

#freq-domain-cells = <1>;
};
+
+ wifi: wifi@18800000 {
+ compatible = "qcom,wcn3990-wifi";
+ reg = <0 0x18800000 0 0x800000>;
+ reg-names = "membase";
+ iommus = <&apps_smmu 0xc0 0x1>;
+ interrupts =
+ <GIC_SPI 414 IRQ_TYPE_LEVEL_HIGH /* CE0 */ >,
+ <GIC_SPI 415 IRQ_TYPE_LEVEL_HIGH /* CE1 */ >,
+ <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH /* CE2 */ >,
+ <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH /* CE3 */ >,
+ <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH /* CE4 */ >,
+ <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH /* CE5 */ >,
+ <GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH /* CE6 */ >,
+ <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH /* CE7 */ >,
+ <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH /* CE8 */ >,
+ <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH /* CE9 */ >,
+ <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH /* CE10 */>,
+ <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH /* CE11 */>;
+ memory-region = <&wlan_fw_mem>;
+ status = "disabled";
+ };
};

thermal-zones {
--
2.7.4

2020-02-03 19:09:57

by Bjorn Andersson

Subject: Re: [PATCH v5] arm64: dts: qcom: sc7180: Add WCN3990 WLAN module device node

On Tue 28 Jan 23:00 PST 2020, Rakesh Pillai wrote:

> Add device node for the ath10k SNOC platform driver probe
> and add resources required for WCN3990 on sc7180 soc.
>
> Signed-off-by: Rakesh Pillai <[email protected]>
> ---
> arch/arm64/boot/dts/qcom/sc7180-idp.dts | 5 +++++
> arch/arm64/boot/dts/qcom/sc7180.dtsi | 28 ++++++++++++++++++++++++++++
> 2 files changed, 33 insertions(+)
>
> diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
> index 388f50a..167f68ac 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts
> +++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
> @@ -287,6 +287,11 @@
> vdda-pll-supply = <&vreg_l4a_0p8>;
> };
>
> +&wifi {
> + status = "okay";
> + qcom,msa-fixed-perm;
> +};
> +
> /* PINCTRL - additions to nodes defined in sc7180.dtsi */
>
> &qspi_clk {
> diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> index 8011c5f..0a00c94 100644
> --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
> +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> @@ -75,6 +75,12 @@
> reg = <0x0 0x80900000 0x0 0x200000>;
> no-map;
> };
> +
> + wlan_fw_mem: memory@93900000 {
> + compatible = "removed-dma-pool";

Sorry for not spotting this earlier, the "removed-dma-pool" compatible
is a downstream thing and isn't defined upstream.

> + no-map;
> + reg = <0 0x93900000 0 0x200000>;

If you swap the order of no-map and reg in this node it will look like
all the others.


Apart from that the patch looks good.

Regards,
Bjorn

> + };
> };
>
> cpus {
> @@ -1490,6 +1496,28 @@
>
> #freq-domain-cells = <1>;
> };
> +
> + wifi: wifi@18800000 {
> + compatible = "qcom,wcn3990-wifi";
> + reg = <0 0x18800000 0 0x800000>;
> + reg-names = "membase";
> + iommus = <&apps_smmu 0xc0 0x1>;
> + interrupts =
> + <GIC_SPI 414 IRQ_TYPE_LEVEL_HIGH /* CE0 */ >,
> + <GIC_SPI 415 IRQ_TYPE_LEVEL_HIGH /* CE1 */ >,
> + <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH /* CE2 */ >,
> + <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH /* CE3 */ >,
> + <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH /* CE4 */ >,
> + <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH /* CE5 */ >,
> + <GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH /* CE6 */ >,
> + <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH /* CE7 */ >,
> + <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH /* CE8 */ >,
> + <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH /* CE9 */ >,
> + <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH /* CE10 */>,
> + <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH /* CE11 */>;
> + memory-region = <&wlan_fw_mem>;
> + status = "disabled";
> + };
> };
>
> thermal-zones {
> --
> 2.7.4
>

2020-02-04 16:38:24

by Rakesh Pillai

Subject: RE: [PATCH v5] arm64: dts: qcom: sc7180: Add WCN3990 WLAN module device node

Hi Bjorn,
I have addressed your comments and sent out the v6 for this patch.

Thanks,
Rakesh Pillai.

> -----Original Message-----
> From: Bjorn Andersson <[email protected]>
> Sent: Monday, February 3, 2020 11:05 PM
> To: Rakesh Pillai <[email protected]>
> Cc: [email protected]; [email protected];
linux-
> [email protected]; [email protected]
> Subject: Re: [PATCH v5] arm64: dts: qcom: sc7180: Add WCN3990 WLAN
> module device node
>
> On Tue 28 Jan 23:00 PST 2020, Rakesh Pillai wrote:
>
> > Add device node for the ath10k SNOC platform driver probe
> > and add resources required for WCN3990 on sc7180 soc.
> >
> > Signed-off-by: Rakesh Pillai <[email protected]>
> > ---
> > arch/arm64/boot/dts/qcom/sc7180-idp.dts | 5 +++++
> > arch/arm64/boot/dts/qcom/sc7180.dtsi | 28
> ++++++++++++++++++++++++++++
> > 2 files changed, 33 insertions(+)
> >
> > diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts
> b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
> > index 388f50a..167f68ac 100644
> > --- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts
> > +++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts
> > @@ -287,6 +287,11 @@
> > vdda-pll-supply = <&vreg_l4a_0p8>;
> > };
> >
> > +&wifi {
> > + status = "okay";
> > + qcom,msa-fixed-perm;
> > +};
> > +
> > /* PINCTRL - additions to nodes defined in sc7180.dtsi */
> >
> > &qspi_clk {
> > diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi
> b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> > index 8011c5f..0a00c94 100644
> > --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
> > @@ -75,6 +75,12 @@
> > reg = <0x0 0x80900000 0x0 0x200000>;
> > no-map;
> > };
> > +
> > + wlan_fw_mem: memory@93900000 {
> > + compatible = "removed-dma-pool";
>
> Sorry for not spotting this earlier, the "removed-dma-pool" compatible
> is a downstream thing and isn't defined upstream.
>
> > + no-map;
> > + reg = <0 0x93900000 0 0x200000>;
>
> If you swap the order of no-map and reg in this node it will look like
> all the others.
>
>
> Apart from that the patch looks good.
>
> Regards,
> Bjorn
>
> > + };
> > };
> >
> > cpus {
> > @@ -1490,6 +1496,28 @@
> >
> > #freq-domain-cells = <1>;
> > };
> > +
> > + wifi: wifi@18800000 {
> > + compatible = "qcom,wcn3990-wifi";
> > + reg = <0 0x18800000 0 0x800000>;
> > + reg-names = "membase";
> > + iommus = <&apps_smmu 0xc0 0x1>;
> > + interrupts =
> > + <GIC_SPI 414 IRQ_TYPE_LEVEL_HIGH /* CE0
> */ >,
> > + <GIC_SPI 415 IRQ_TYPE_LEVEL_HIGH /* CE1
> */ >,
> > + <GIC_SPI 416 IRQ_TYPE_LEVEL_HIGH /* CE2
> */ >,
> > + <GIC_SPI 417 IRQ_TYPE_LEVEL_HIGH /* CE3
> */ >,
> > + <GIC_SPI 418 IRQ_TYPE_LEVEL_HIGH /* CE4
> */ >,
> > + <GIC_SPI 419 IRQ_TYPE_LEVEL_HIGH /* CE5
> */ >,
> > + <GIC_SPI 420 IRQ_TYPE_LEVEL_HIGH /* CE6
> */ >,
> > + <GIC_SPI 421 IRQ_TYPE_LEVEL_HIGH /* CE7
> */ >,
> > + <GIC_SPI 422 IRQ_TYPE_LEVEL_HIGH /* CE8
> */ >,
> > + <GIC_SPI 423 IRQ_TYPE_LEVEL_HIGH /* CE9
> */ >,
> > + <GIC_SPI 424 IRQ_TYPE_LEVEL_HIGH /* CE10
> */>,
> > + <GIC_SPI 425 IRQ_TYPE_LEVEL_HIGH /* CE11
> */>;
> > + memory-region = <&wlan_fw_mem>;
> > + status = "disabled";
> > + };
> > };
> >
> > thermal-zones {
> > --
> > 2.7.4
> >