| Message ID | 1576741521-30102-1-git-send-email-pillair@codeaurora.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2] arm64: dts: qcom: sc7180: Add WCN3990 WLAN module device node | expand |
On Thu, Dec 19, 2019 at 01:15:21PM +0530, 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 does not apply cleanly against the current qcom/arm64-for-5.6 or for-next branch, looks like you need to rebase. > 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; What is the status of the patch adding this flag? > +}; > + > /* 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..ce2d2a5 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 { > + status = "disabled"; nit: the convention seems to be to add this at the end of the node, which IMO makes sense since most other fields provide more 'interesting' information.
Hi MItthias, > -----Original Message----- > From: Matthias Kaehlcke <mka@chromium.org> > Sent: Thursday, December 19, 2019 11:18 PM > To: Rakesh Pillai <pillair@codeaurora.org> > Cc: devicetree@vger.kernel.org; linux-arm-kernel@lists.infradead.org; linux- > kernel@vger.kernel.org; linux-arm-msm@vger.kernel.org > Subject: Re: [PATCH v2] arm64: dts: qcom: sc7180: Add WCN3990 WLAN > module device node > > On Thu, Dec 19, 2019 at 01:15:21PM +0530, 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 does not apply cleanly against the current qcom/arm64-for-5.6 > or for-next branch, looks like you need to rebase. > > > 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; > > What is the status of the patch adding this flag? This patch is currently under review (https://patchwork.kernel.org/patch/11236535/) It hasn’t been acked yet. > > > +}; > > + > > /* 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..ce2d2a5 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 { > > + status = "disabled"; > > nit: the convention seems to be to add this at the end of the node, > which IMO makes sense since most other fields provide more 'interesting' > information. I will send out an updated patchset, moving "status=disabled" down
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..ce2d2a5 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 { + status = "disabled"; + 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>; + }; }; 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> --- arch/arm64/boot/dts/qcom/sc7180-idp.dts | 5 +++++ arch/arm64/boot/dts/qcom/sc7180.dtsi | 28 ++++++++++++++++++++++++++++ 2 files changed, 33 insertions(+)