Commit 0f56e657 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm-fixes-6.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC fixes from Arnd Bergmann:
 "The final bug fixes for Qualcomm and Rockchips came in, all of them
  for devicetree files:

   - Devices on Qualcomm SC7180/SC7280 that are cache coherent are now
     marked so correctly to fix a regression after a change in kernel
     behavior

   - Rockchips has a few minor changes for correctness of regulator and
     cache properties, as well as fixes for incorrect behavior of the
     RK3568 PCI controller and reset pins on two boards"

* tag 'arm-fixes-6.4-3' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  arm64: dts: qcom: sc7280: Mark SCM as dma-coherent for chrome devices
  arm64: dts: qcom: sc7180: Mark SCM as dma-coherent for trogdor
  arm64: dts: qcom: sc7180: Mark SCM as dma-coherent for IDP
  dt-bindings: firmware: qcom,scm: Document that SCM can be dma-coherent
  arm64: dts: rockchip: Fix rk356x PCIe register and range mappings
  arm64: dts: rockchip: fix button reset pin for nanopi r5c
  arm64: dts: rockchip: fix nEXTRST on SOQuartz
  arm64: dts: rockchip: add missing cache properties
  arm64: dts: rockchip: fix USB regulator on ROCK64
parents 569fa939 ed8ff046

Documentation/devicetree/bindings/firmware/qcom,scm.yaml

+2 −0
Original line number Diff line number Diff line
@@ -71,6 +71,8 @@ properties: 
    minItems: 1

    maxItems: 3



  dma-coherent: true



  interconnects:

    maxItems: 1

arch/arm64/boot/dts/qcom/sc7180-idp.dts

+5 −0
Original line number Diff line number Diff line
@@ -393,6 +393,11 @@ 
	qcom,spare-regs = <&tcsr_regs_2 0xb3e4>;

};



&scm {

	/* TF-A firmware maps memory cached so mark dma-coherent to match. */

	dma-coherent;

};



&sdhc_1 {

	status = "okay";

arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -892,6 +892,11 @@ hp_i2c: &i2c9 { 
	qcom,spare-regs = <&tcsr_regs_2 0xb3e4>;

};



&scm {

	/* TF-A firmware maps memory cached so mark dma-coherent to match. */

	dma-coherent;

};



&sdhc_1 {

	status = "okay";

arch/arm64/boot/dts/qcom/sc7180.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -369,7 +369,7 @@ 
	};



	firmware {

		scm {

		scm: scm {

			compatible = "qcom,scm-sc7180", "qcom,scm";

		};

	};

arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -79,6 +79,11 @@ 
	firmware-name = "ath11k/WCN6750/hw1.0/wpss.mdt";

};



&scm {

	/* TF-A firmware maps memory cached so mark dma-coherent to match. */

	dma-coherent;

};



&wifi {

	status = "okay";