summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2026-09-11 15:10:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2026-09-11 15:10:31 -0700
commit0fb234ce373a331a21c1d33cffef28e53cee4ddb (patch)
tree905161fe9c45d16ee4e0a8061ed94ce8ad8c383a
parent525f0f99a4f775060288b3069e12b1d3e2b576da (diff)
parentf77de4c33f0edbb33411f92a35d7196965597e6d (diff)
Merge tag 'spi-fix-v7.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi
Pull spi fix from Mark Brown: "New device ID for v7.3: update the DesignWare DT binding to say how to describe the UltraRISC DP1000 instance of the controller" * tag 'spi-fix-v7.3-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: spi: dt-bindings: snps,dw-apb-ssi: Add compatible for UltraRISC DP1000 SoC
-rw-r--r--Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml16
1 files changed, 16 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml b/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml
index 1e70c6804d5d..e8d6d5d858b6 100644
--- a/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml
+++ b/Documentation/devicetree/bindings/spi/snps,dw-apb-ssi.yaml
@@ -44,6 +44,21 @@ allOf:
else:
properties:
starfive,sfc-filter-syscon: false
+ - if:
+ properties:
+ compatible:
+ contains:
+ const: ultrarisc,dp1000-spi
+ then:
+ properties:
+ reg:
+ maxItems: 1
+ clocks:
+ minItems: 2
+ clock-names:
+ minItems: 2
+ required:
+ - clock-names
properties:
compatible:
@@ -63,6 +78,7 @@ properties:
- mscc,jaguar2-spi
- sophgo,sg2042-spi
- thead,th1520-spi
+ - ultrarisc,dp1000-spi
- const: snps,dw-apb-ssi
- description: Vendor controllers compatible with v1.01a
items: