From patchwork Sun Feb 7 23:12:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Damien Le Moal X-Patchwork-Id: 378165 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=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI,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 D3E8EC433DB for ; Sun, 7 Feb 2021 23:16:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B091964E31 for ; Sun, 7 Feb 2021 23:16:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229581AbhBGXQQ (ORCPT ); Sun, 7 Feb 2021 18:16:16 -0500 Received: from esa2.hgst.iphmx.com ([68.232.143.124]:64368 "EHLO esa2.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229522AbhBGXQQ (ORCPT ); Sun, 7 Feb 2021 18:16:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1612739817; x=1644275817; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=sry4Jcxj7WaCMHpIVu5N/bY5as1f1P4twJ4S9BPW/Dg=; b=ah+fe0HVD0bYZvK27ZtvjVu8b+at/BrRQpkILb86SvY1cShXXPN8uXTa j2otOHAXUJ/Bnh0U8Yaw9c10FJCcG6zK+6UQRMZ8rYUB70LKKsn5u+QBc MVlvAuQl9h8TrLId+vJ9iRhrdgpSPeqTsALID5G77BMIy6aEroAmRzR1I kO1Vg6TeRiZ7ARMAOFhNr3Dl6aecne46631PCN+7Yvoh+sV1GKd4KFE5s eHNkFBi3mOhI648Y0C+QO4GDHF6OZtSKKoP6OvP27kfIkxIJVhPd09Imc x0TEOuetotOpIJKajOrrVMBDt5nzB2y1puMoexJnzKCvYFqf9oi9AmMH6 Q==; IronPort-SDR: n+5X+WyHYvbDwmzb5oBMwTSgwCq65jM4S7Fi6INfv/LNs54GOkI5mYkng2S1D7ARXbdAxHlXIs mTDcNdVbF9aC1FEEFMmE/X7fBJypVXPCtMt/2/XbslYrMOLH7GZJS70/nSqVfqN0tWf8OGcyw8 yRyDyv5Y39f1Hu7WYLvtIFlhEFH7VMbSlAM6MuDwbqzG9cqAO3YeRNg7KlZhGmaqBPrnQxf8aU /2e+Z8gDpU13w2cGhXqwZxnT2FurlAg4Bu9uKAPfmjvyfTOavsExPskbYV5/1n/6MnEUoKdLrd OVs= X-IronPort-AV: E=Sophos;i="5.81,160,1610380800"; d="scan'208";a="263503258" Received: from uls-op-cesaip01.wdc.com (HELO uls-op-cesaep01.wdc.com) ([199.255.45.14]) by ob1.hgst.iphmx.com with ESMTP; 08 Feb 2021 07:32:38 +0800 IronPort-SDR: 6IEWDW9r5ttxR5qtA+dW8LAtGddtdenOCVvAHjHxRJvPZKDdW7A7j+uEhz1sjo9VZtIbFKhTs0 xloJ2YFXejCqJ4jE2XjadeDVL/TvClTBVvvCI4MXaDJdqIk422ZVmdnxgylnUJgfJzk54XTGA5 nQedZ8Wa5N/szZL6CnqIOgTjqoOmr1h9DlEYKZ3zeCxrxLnoF+xN4+P8BXl0O7ZP6FF1rfLciJ JKZ8AyGfp2Y4T+Jc1FrHIfcmHjJBjZuUrHZ6l8W6QBDaaExAeOSrwl9T/RLusXojNkx7rorgzL k5DofumSt/LkpS8r+F/cYme4 Received: from uls-op-cesaip02.wdc.com ([10.248.3.37]) by uls-op-cesaep01.wdc.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Feb 2021 14:57:06 -0800 IronPort-SDR: JmjKgpfXVkCBT+7bdnxfN8x4U3vKRwsyAkchQlhGhVz/Z8agTAvv30lBlgo3rkmiN2tS1J9KNL zmdKIJ7FtY21D89/J4z9cyIQFNxh/NPTXYCytci00BQqK6wNEmYJzIc9/ynWPipIPUVP2Ox1mb flBabxnbS+L3aetkWpjUwx2mhEvMfX2hiHy0y8rKlvq8a0z5ehLBf4JdLYoBGtjCK5/BUo7nt9 1fttqoBUu2YoSIi1BHwVXLEWSEnMtTV+54dgXSUo7WZV4x47zE1+ehtpj9t+SzACpnCjl68Pej R4Y= WDCIronportException: Internal Received: from phd004806.ad.shared (HELO twashi.fujisawa.hgst.com) ([10.84.71.69]) by uls-op-cesaip02.wdc.com with ESMTP; 07 Feb 2021 15:13:12 -0800 From: Damien Le Moal To: Palmer Dabbelt , linux-riscv@lists.infradead.org Cc: Atish Patra , Anup Patel , Sean Anderson , Paul Walmsley , Rob Herring , devicetree@vger.kernel.org Subject: [PATCH v17 07/16] dt-bindings: fix sifive gpio properties Date: Mon, 8 Feb 2021 08:12:47 +0900 Message-Id: <20210207231256.115130-8-damien.lemoal@wdc.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210207231256.115130-1-damien.lemoal@wdc.com> References: <20210207231256.115130-1-damien.lemoal@wdc.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The sifive gpio IP block supports up to 32 GPIOs. Reflect that in the interrupts property description and maxItems. Also add the standard ngpios property to describe the number of GPIOs available on the implementation. Also add the "canaan,k210-gpiohs" compatible string to indicate the use of this gpio controller in the Canaan Kendryte K210 SoC. If this compatible string is used, do not define the clocks property as required as the K210 SoC does not have a software controllable clock for the Sifive gpio IP block. Cc: Paul Walmsley Cc: Rob Herring Cc: devicetree@vger.kernel.org Signed-off-by: Damien Le Moal --- .../devicetree/bindings/gpio/sifive,gpio.yaml | 25 ++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/gpio/sifive,gpio.yaml b/Documentation/devicetree/bindings/gpio/sifive,gpio.yaml index ab22056f8b44..c2902aac2514 100644 --- a/Documentation/devicetree/bindings/gpio/sifive,gpio.yaml +++ b/Documentation/devicetree/bindings/gpio/sifive,gpio.yaml @@ -16,6 +16,7 @@ properties: - enum: - sifive,fu540-c000-gpio - sifive,fu740-c000-gpio + - canaan,k210-gpiohs - const: sifive,gpio0 reg: @@ -23,9 +24,9 @@ properties: interrupts: description: - interrupt mapping one per GPIO. Maximum 16 GPIOs. + Interrupt mapping, one per GPIO. Maximum 32 GPIOs. minItems: 1 - maxItems: 16 + maxItems: 32 interrupt-controller: true @@ -38,6 +39,14 @@ properties: "#gpio-cells": const: 2 + ngpios: + description: + The number of GPIOs available on the controller implementation. + It is 16 for the SiFive SoCs and 32 for the Canaan K210. + minimum: 1 + maximum: 32 + default: 16 + gpio-controller: true required: @@ -46,10 +55,20 @@ required: - interrupts - interrupt-controller - "#interrupt-cells" - - clocks - "#gpio-cells" - gpio-controller +if: + properties: + compatible: + contains: + enum: + - sifive,fu540-c000-gpio + - sifive,fu740-c000-gpio +then: + required: + - clocks + additionalProperties: false examples: