diff options
author | Mark Brown <broonie@kernel.org> | 2018-10-21 17:00:14 +0100 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2018-10-21 17:00:14 +0100 |
commit | 4b51c747e4a52175e63d125db8365b38b06f0343 (patch) | |
tree | cd03133d8efbf5a039c7cb369aa7eaa8c27d8ebe /Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt | |
parent | 92d58fd13af269552b65853d2c3a63970c4090bf (diff) | |
parent | 0c903aafc8529f64d24d2cd6df32f2bf16aad20b (diff) |
Merge branch 'spi-4.20' into spi-next
Diffstat (limited to 'Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt')
-rw-r--r-- | Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt b/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt index 642d3fb1ef85..2864bc6b659c 100644 --- a/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt +++ b/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.txt @@ -2,7 +2,7 @@ Synopsys DesignWare AMBA 2.0 Synchronous Serial Interface. Required properties: - compatible : "snps,dw-apb-ssi" or "mscc,<soc>-spi", where soc is "ocelot" or - "jaguar2" + "jaguar2", or "amazon,alpine-dw-apb-ssi" - reg : The register base for the controller. For "mscc,<soc>-spi", a second register set is required (named ICPU_CFG:SPI_MST) - interrupts : One interrupt, used by the controller. |