diff mbox series

[3/6] spi: dt-bindings: spi-controller: explicitly require #address-cells=<0> for slave mode

Message ID 20201013160845.1772-4-thunder.leizhen@huawei.com
State Accepted
Headers show
Series fix all errors except one reported by dt_binding_check | expand

Checks

Context Check Description
robh/dt-meta-schema success
robh/checkpatch success

Commit Message

Zhen Lei Oct. 13, 2020, 4:08 p.m. UTC
scripts/dtc/checks.c:
if (get_property(node, "spi-slave"))
	spi_addr_cells = 0;
if (node_addr_cells(node) != spi_addr_cells)
	FAIL(c, dti, node, "incorrect #address-cells for SPI bus");
if (node_size_cells(node) != 0)
	FAIL(c, dti, node, "incorrect #size-cells for SPI bus");

The above code in check_spi_bus_bridge() require that the number of address
cells must be 0. So we should explicitly declare "#address-cells = <0>".

Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
---
 .../devicetree/bindings/spi/spi-controller.yaml      | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

Comments

Rob Herring Oct. 14, 2020, 1:41 p.m. UTC | #1
On Wed, 14 Oct 2020 00:08:42 +0800, Zhen Lei wrote:
> scripts/dtc/checks.c:
> if (get_property(node, "spi-slave"))
> 	spi_addr_cells = 0;
> if (node_addr_cells(node) != spi_addr_cells)
> 	FAIL(c, dti, node, "incorrect #address-cells for SPI bus");
> if (node_size_cells(node) != 0)
> 	FAIL(c, dti, node, "incorrect #size-cells for SPI bus");
> 
> The above code in check_spi_bus_bridge() require that the number of address
> cells must be 0. So we should explicitly declare "#address-cells = <0>".
> 
> Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
> ---
>  .../devicetree/bindings/spi/spi-controller.yaml      | 20 ++++++++++++++------
>  1 file changed, 14 insertions(+), 6 deletions(-)
> 

Applied, thanks!

Note that I tried fixing this in dtc, but that was rejected. So this 
gets the schema in sync with dtc.

Rob
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/spi/spi-controller.yaml b/Documentation/devicetree/bindings/spi/spi-controller.yaml
index 2b154803b181c8b..1b56d5e40f1fcde 100644
--- a/Documentation/devicetree/bindings/spi/spi-controller.yaml
+++ b/Documentation/devicetree/bindings/spi/spi-controller.yaml
@@ -20,7 +20,7 @@  properties:
     pattern: "^spi(@.*|-[0-9a-f])*$"
 
   "#address-cells":
-    const: 1
+    enum: [0, 1]
 
   "#size-cells":
     const: 0
@@ -52,11 +52,19 @@  properties:
     description:
       The SPI controller acts as a slave, instead of a master.
 
-oneOf:
-  - required:
-      - "#address-cells"
-  - required:
-      - spi-slave
+allOf:
+  - if:
+      not:
+        required:
+          - spi-slave
+    then:
+      properties:
+        "#address-cells":
+          const: 1
+    else:
+      properties:
+        "#address-cells":
+          const: 0
 
 patternProperties:
   "^slave$":