| Message ID | 1589914405-6674-1-git-send-email-pillair@codeaurora.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v10] arm64: dts: qcom: sc7180: Add WCN3990 WLAN module device node | expand |
Hi, On Tue, May 19, 2020 at 11:53 AM Rakesh Pillai <pillair@codeaurora.org> 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> > --- > Changes from v9: > - Place the wlan_fw_mem under reserved-memory node > --- > arch/arm64/boot/dts/qcom/sc7180-idp.dts | 7 +++++++ > arch/arm64/boot/dts/qcom/sc7180.dtsi | 27 +++++++++++++++++++++++++++ > 2 files changed, 34 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts > index 4e9149d..38b102e 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts > +++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts > @@ -389,6 +389,13 @@ > }; > }; > > +&wifi { > + status = "okay"; > + wifi-firmware { > + iommus = <&apps_smmu 0xc2 0x1>; > + }; > +}; > + > /* 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 f1280e0..19bd7d0 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi > @@ -106,6 +106,11 @@ > no-map; > }; > > + wlan_fw_mem: memory@94100000 { > + reg = <0 0x94100000 0 0x200000>; > + no-map; > + }; > + > rmtfs_mem: memory@84400000 { > compatible = "qcom,rmtfs-mem"; > reg = <0x0 0x84400000 0x0 0x200000>; This is less wrong than v9, but still a little wrong. You should be keeping these ordered by unit address. 94100000 comes after 84400000. -Doug
Hi, On Tue, May 19, 2020 at 11:53 AM Rakesh Pillai <pillair@codeaurora.org> wrote: > > + 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"; > + }; > + > config_noc: interconnect@1500000 { > compatible = "qcom,sc7180-config-noc"; > reg = <0 0x01500000 0 0x28000>; For completeness sake, I'll also point out that the WiFi node is also sorted incorrectly. 0x18800000 comes after 0x01500000. -Doug
Hey Rakesh, On 2020-05-20 00:23, 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> > --- > Changes from v9: > - Place the wlan_fw_mem under reserved-memory node > --- > arch/arm64/boot/dts/qcom/sc7180-idp.dts | 7 +++++++ > arch/arm64/boot/dts/qcom/sc7180.dtsi | 27 > +++++++++++++++++++++++++++ > 2 files changed, 34 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts > b/arch/arm64/boot/dts/qcom/sc7180-idp.dts > index 4e9149d..38b102e 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts > +++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts > @@ -389,6 +389,13 @@ > }; > }; > > +&wifi { > + status = "okay"; > + wifi-firmware { > + iommus = <&apps_smmu 0xc2 0x1>; > + }; > +}; > + > /* 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 f1280e0..19bd7d0 100644 > --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi > @@ -106,6 +106,11 @@ > no-map; > }; > > + wlan_fw_mem: memory@94100000 { > + reg = <0 0x94100000 0 0x200000>; > + no-map; > + }; > + You can skip ^^, its already present as wlan_mem in the board dts. > rmtfs_mem: memory@84400000 { > compatible = "qcom,rmtfs-mem"; > reg = <0x0 0x84400000 0x0 0x200000>; > @@ -944,6 +949,28 @@ > }; > }; > > + 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>; Its named as wlan_mem in sc7180-idp.dts > + status = "disabled"; > + }; > + > config_noc: interconnect@1500000 { > compatible = "qcom,sc7180-config-noc"; > reg = <0 0x01500000 0 0x28000>;
diff --git a/arch/arm64/boot/dts/qcom/sc7180-idp.dts b/arch/arm64/boot/dts/qcom/sc7180-idp.dts index 4e9149d..38b102e 100644 --- a/arch/arm64/boot/dts/qcom/sc7180-idp.dts +++ b/arch/arm64/boot/dts/qcom/sc7180-idp.dts @@ -389,6 +389,13 @@ }; }; +&wifi { + status = "okay"; + wifi-firmware { + iommus = <&apps_smmu 0xc2 0x1>; + }; +}; + /* 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 f1280e0..19bd7d0 100644 --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi @@ -106,6 +106,11 @@ no-map; }; + wlan_fw_mem: memory@94100000 { + reg = <0 0x94100000 0 0x200000>; + no-map; + }; + rmtfs_mem: memory@84400000 { compatible = "qcom,rmtfs-mem"; reg = <0x0 0x84400000 0x0 0x200000>; @@ -944,6 +949,28 @@ }; }; + 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"; + }; + config_noc: interconnect@1500000 { compatible = "qcom,sc7180-config-noc"; reg = <0 0x01500000 0 0x28000>;
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> --- Changes from v9: - Place the wlan_fw_mem under reserved-memory node --- arch/arm64/boot/dts/qcom/sc7180-idp.dts | 7 +++++++ arch/arm64/boot/dts/qcom/sc7180.dtsi | 27 +++++++++++++++++++++++++++ 2 files changed, 34 insertions(+)