From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D406EC3F2DA for ; Tue, 3 Mar 2020 09:45:30 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B9B0D2166E for ; Tue, 3 Mar 2020 09:45:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727830AbgCCJpa (ORCPT ); Tue, 3 Mar 2020 04:45:30 -0500 Received: from xavier.telenet-ops.be ([195.130.132.52]:52820 "EHLO xavier.telenet-ops.be" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727835AbgCCJpa (ORCPT ); Tue, 3 Mar 2020 04:45:30 -0500 Received: from ramsan ([84.195.182.253]) by xavier.telenet-ops.be with bizsmtp id 9llT2200a5USYZQ01llTh5; Tue, 03 Mar 2020 10:45:28 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan with esmtp (Exim 4.90_1) (envelope-from ) id 1j947D-0006hy-RK; Tue, 03 Mar 2020 10:45:27 +0100 Received: from geert by rox.of.borg with local (Exim 4.90_1) (envelope-from ) id 1j947D-00062h-P6; Tue, 03 Mar 2020 10:45:27 +0100 From: Geert Uytterhoeven To: Mark Brown , Rob Herring , Maxime Ripard Cc: Yoshihiro Shimoda , linux-spi@vger.kernel.org, devicetree@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v2 1/2] spi: dt-bindings: spi-controller: Fix #address-cells for slave mode Date: Tue, 3 Mar 2020 10:45:21 +0100 Message-Id: <20200303094522.23180-2-geert+renesas@glider.be> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200303094522.23180-1-geert+renesas@glider.be> References: <20200303094522.23180-1-geert+renesas@glider.be> Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org Currently, the DT bindings for an SPI controller specify that "#address-cells" must be fixed to one. However, that applies to an SPI controller in master mode only. When running in SPI slave mode, "#address-cells" should be zero. Fix this making the value of "#address-cells" dependent on the presence of "spi-slave". Fixes: 0a1b929356830257 ("spi: Add YAML schemas for the generic SPI options") Reported-by: Yoshihiro Shimoda Signed-off-by: Geert Uytterhoeven --- v2: - Use "enum: [0, 1]" instead of min/max limit, - use "- spi-slave" instead of "[ spi-slave ]". As of dtc commit 403cc79f06a135ae ("checks: Update SPI bus check for 'spi-slave'") and Linux commit c2e7075ca8303631 ("scripts/dtc: Update to upstream version v1.4.7-57-gf267e674d145"), dtc knows about SPI slave. However, when using "#address-cells = <0>" with W=1: Warning (avoid_unnecessary_addr_size): /soc/spi@e6e10000: unnecessary #address-cells/#size-cells without "ranges" or child "reg" property Just removing #address-cells (using /delete-property/ in the board DTS) to fix this warning causes: Warning (spi_bus_bridge): /soc/spi@e6e10000: incorrect #address-cells for SPI bus as spi_bus_bridge() uses node_addr_cells(), which defaults to 2 (due to dtc's ppc64 heritage? But node_size_cells() defaults to 1, not 2?). How should this be fixed? Should "#address-cells = <0>" be left out or not? Should node_{addr,size}_cells() in dtc default to zero? Thanks! --- .../devicetree/bindings/spi/spi-controller.yaml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/spi/spi-controller.yaml b/Documentation/devicetree/bindings/spi/spi-controller.yaml index 1e0ca6ccf64bbd0a..401d41a97562dc8d 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,6 +52,18 @@ properties: description: The SPI controller acts as a slave, instead of a master. +if: + required: + - spi-slave +then: + properties: + "#address-cells": + const: 0 +else: + properties: + "#address-cells": + const: 1 + patternProperties: "^slave$": type: object -- 2.17.1