| Message ID | 1577181575-25788-1-git-send-email-pillair@codeaurora.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v3] arm64: dts: qcom: sc7180: Add WCN3990 WLAN module device node | expand |
On Tue 24 Dec 01:59 PST 2019, 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 <pillair@codeaurora.org> > --- > This change is dependent on the below set of changes > arm64: dts: sc7180: Add qupv3_0 and qupv3_1 (https://lore.kernel.org/patchwork/patch/1150367/) It would be clearer if you linked to the series instead, but it doesn't matter at this point, this is merged already. What doesn't seem to be merged is the addition of the qcom,msa_fixed_perm property, so I presume I need to hold off on merging this? > --- > 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 189254f..b2ca143f 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts > +++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts > @@ -248,6 +248,11 @@ > status = "okay"; > }; > > +&wifi { > + status = "okay"; > + qcom,msa_fixed_perm; As remarked by Rob, properties should be using - instead of _. > +}; > + > /* PINCTRL - additions to nodes defined in sc7180.dtsi */ > > &qup_i2c2_default { > diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi > index 666e9b9..7efb97f 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi > @@ -42,6 +42,12 @@ > compatible = "qcom,cmd-db"; > no-map; > }; > + > + wlan_fw_mem: memory@93900000 { > + compatible = "removed-dma-pool"; > + no-map; > + reg = <0 0x93900000 0 0x200000>; > + }; > }; > > cpus { > @@ -1119,6 +1125,28 @@ > #clock-cells = <1>; > }; > }; > + > + wifi: wifi@18800000 { > + compatible = "qcom,wcn3990-wifi"; > + reg = <0 0x18800000 0 0x800000>; > + reg-names = "membase"; > + iommus = <&apps_smmu 0xC0 0x1>; Lowercase 'c' please. Regards, Bjorn > + 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"; > + }; > }; > > timer { > -- > 2.7.4 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Hi Bjorn, Thanks for the comments. I will post an updated patchset v4 after the patch bringing-in "qcom,msa-fixed-perm" is merged/approved. I will address all the comments together. Thanks, Rakesh Pillai. > -----Original Message----- > From: Bjorn Andersson <bjorn.andersson@linaro.org> > Sent: Sunday, December 29, 2019 8:44 AM > To: Rakesh Pillai <pillair@codeaurora.org> > Cc: devicetree@vger.kernel.org; linux-arm-msm@vger.kernel.org; linux- > kernel@vger.kernel.org; linux-arm-kernel@lists.infradead.org > Subject: Re: [PATCH v3] arm64: dts: qcom: sc7180: Add WCN3990 WLAN > module device node > > On Tue 24 Dec 01:59 PST 2019, 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 <pillair@codeaurora.org> > > --- > > This change is dependent on the below set of changes > > arm64: dts: sc7180: Add qupv3_0 and qupv3_1 > (https://lore.kernel.org/patchwork/patch/1150367/) > > It would be clearer if you linked to the series instead, but it doesn't > matter at this point, this is merged already. > > What doesn't seem to be merged is the addition of the > qcom,msa_fixed_perm property, so I presume I need to hold off on merging > this? > > > --- > > 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 189254f..b2ca143f 100644 > > --- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts > > +++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts > > @@ -248,6 +248,11 @@ > > status = "okay"; > > }; > > > > +&wifi { > > + status = "okay"; > > + qcom,msa_fixed_perm; > > As remarked by Rob, properties should be using - instead of _. > > > +}; > > + > > /* PINCTRL - additions to nodes defined in sc7180.dtsi */ > > > > &qup_i2c2_default { > > diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi > b/arch/arm64/boot/dts/qcom/sc7180.dtsi > > index 666e9b9..7efb97f 100644 > > --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi > > +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi > > @@ -42,6 +42,12 @@ > > compatible = "qcom,cmd-db"; > > no-map; > > }; > > + > > + wlan_fw_mem: memory@93900000 { > > + compatible = "removed-dma-pool"; > > + no-map; > > + reg = <0 0x93900000 0 0x200000>; > > + }; > > }; > > > > cpus { > > @@ -1119,6 +1125,28 @@ > > #clock-cells = <1>; > > }; > > }; > > + > > + wifi: wifi@18800000 { > > + compatible = "qcom,wcn3990-wifi"; > > + reg = <0 0x18800000 0 0x800000>; > > + reg-names = "membase"; > > + iommus = <&apps_smmu 0xC0 0x1>; > > Lowercase 'c' please. > > Regards, > Bjorn > > > + 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"; > > + }; > > }; > > > > timer { > > -- > > 2.7.4 > > > > > > _______________________________________________ > > linux-arm-kernel mailing list > > linux-arm-kernel@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts index 189254f..b2ca143f 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts @@ -248,6 +248,11 @@ status = "okay"; }; +&wifi { + status = "okay"; + qcom,msa_fixed_perm; +}; + /* PINCTRL - additions to nodes defined in sc7180.dtsi */ &qup_i2c2_default { diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi index 666e9b9..7efb97f 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -42,6 +42,12 @@ compatible = "qcom,cmd-db"; no-map; }; + + wlan_fw_mem: memory@93900000 { + compatible = "removed-dma-pool"; + no-map; + reg = <0 0x93900000 0 0x200000>; + }; }; cpus { @@ -1119,6 +1125,28 @@ #clock-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"; + }; }; timer {
Add device node for the ath10k SNOC platform driver probe and add resources required for WCN3990 on sc7180 soc. Signed-off-by: Rakesh Pillai <pillair@codeaurora.org> --- This change is dependent on the below set of changes arm64: dts: sc7180: Add qupv3_0 and qupv3_1 (https://lore.kernel.org/patchwork/patch/1150367/) --- arch/arm64/boot/dts/qcom/sc7180-idp.dts | 5 +++++ arch/arm64/boot/dts/qcom/sc7180.dtsi | 28 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+)