summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2022-01-08 23:56:16 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2022-01-08 23:56:16 +0300
commit4634129ad9fdc89d10b597fc6f8f4336fb61e105 (patch)
tree934c1fdce1a28d8da918d31cd6fa929852351864 /Documentation
parent21f35d2ca83e64603b9f543b537491d333b69c51 (diff)
parent8922bb6526ac4b20bd8de7f47d6e77808670f6c4 (diff)
downloadlinux-4634129ad9fdc89d10b597fc6f8f4336fb61e105.tar.xz
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
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml b/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml
index ca155abbda7a..037f41f58503 100644
--- a/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml
+++ b/Documentation/devicetree/bindings/spi/cdns,qspi-nor.yaml
@@ -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