Commit 4634129a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-fixes-5.16-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull ARM SoC fixes from Olof Johansson:
 "A few more fixes have come in, nothing overly severe but would be good
  to get in by final release:

   - More specific compatible fields on the qspi controller for socfpga,
     to enable quirks in the driver

   - A runtime PM fix for Renesas to fix mismatched reference counts on
     errors"

* tag 'soc-fixes-5.16-4' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  ARM: dts: socfpga: change qspi to "intel,socfpga-qspi"
  dt-bindings: spi: cadence-quadspi: document "intel,socfpga-qspi"
  reset: renesas: Fix Runtime PM usage
parents 21f35d2c 8922bb65

Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ properties: 
              - ti,am654-ospi

              - intel,lgm-qspi

              - xlnx,versal-ospi-1.0

              - intel,socfpga-qspi

          - const: cdns,qspi-nor

      - const: cdns,qspi-nor

arch/arm/boot/dts/socfpga.dtsi

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



		qspi: spi@ff705000 {

			compatible = "cdns,qspi-nor";

			compatible = "intel,socfpga-qspi", "cdns,qspi-nor";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0xff705000 0x1000>,

arch/arm/boot/dts/socfpga_arria10.dtsi

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



		qspi: spi@ff809000 {

			compatible = "cdns,qspi-nor";

			compatible = "intel,socfpga-qspi", "cdns,qspi-nor";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0xff809000 0x100>,

arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi

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



		qspi: spi@ff8d2000 {

			compatible = "cdns,qspi-nor";

			compatible =  "intel,socfpga-qspi", "cdns,qspi-nor";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0xff8d2000 0x100>,

arch/arm64/boot/dts/intel/socfpga_agilex.dtsi

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



		qspi: spi@ff8d2000 {

			compatible = "cdns,qspi-nor";

			compatible = "intel,socfpga-qspi", "cdns,qspi-nor";

			#address-cells = <1>;

			#size-cells = <0>;

			reg = <0xff8d2000 0x100>,