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@xxxxxxxxxxxxxx> > --- 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.