From patchwork Wed Aug 9 08:21:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Horman X-Patchwork-Id: 799561 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-gpio-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=verge.net.au header.i=@verge.net.au header.b="T221DHBE"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3xS43s158sz9s4s for ; Wed, 9 Aug 2017 18:21:29 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752213AbdHIIV1 (ORCPT ); Wed, 9 Aug 2017 04:21:27 -0400 Received: from kirsty.vergenet.net ([202.4.237.240]:53641 "EHLO kirsty.vergenet.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752067AbdHIIV1 (ORCPT ); Wed, 9 Aug 2017 04:21:27 -0400 Received: from reginn.horms.nl (52D9BC73.cm-11-1c.dynamic.ziggo.nl [82.217.188.115]) by kirsty.vergenet.net (Postfix) with ESMTPA id 7BB7825B7C3; Wed, 9 Aug 2017 18:21:25 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=verge.net.au; s=mail; t=1502266885; bh=e6IQ01Gqt6LyIhvsCADOSOPsYqk/Rfbv5MJUrVS5uMU=; h=From:To:Cc:Subject:Date:From; b=T221DHBET1xtNeJC4mlP95lKMuTc4GmA3SS4aoyXdniIu/cI5PqJIwPSYxCNJsy0k rIoHbXFS+iUTDwOwMGVpmp/Zhll8+cKH6FbIcJ95FrCO16qGnSCLRC0ijiQhVxengf bFzZ2BW2j6CoaYGwT72HRl6ol4Qs+mc+NpbcXDro= Received: by reginn.horms.nl (Postfix, from userid 7100) id 3D8259402D2; Wed, 9 Aug 2017 10:21:23 +0200 (CEST) From: Simon Horman To: Geert Uytterhoeven Cc: Linus Walleij , Magnus Damm , linux-gpio@vger.kernel.org, linux-renesas-soc@vger.kernel.org, Simon Horman Subject: [PATCH] gpio: rcar: reinstate generic compat string Date: Wed, 9 Aug 2017 10:21:06 +0200 Message-Id: <1502266866-11277-1-git-send-email-horms+renesas@verge.net.au> X-Mailer: git-send-email 2.1.4 Sender: linux-gpio-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-gpio@vger.kernel.org commit d10bbd156926 ("gpio: rcar: add gen[123] fallback compatibility strings") deprecated the generic compat string, renesas,gpio-rcar. After further discussion this appears not to have been desirable as that compat string is compatible with all R-Car SoCs supported in upstream. This commit partially reverts that commit, and updates related documentation and examples. Fixes: d10bbd156926 ("gpio: rcar: add gen[123] fallback compatibility strings") Signed-off-by: Simon Horman --- .../devicetree/bindings/gpio/renesas,gpio-rcar.txt | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt b/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt index 48634b01f1bf..347d8ede2982 100644 --- a/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt +++ b/Documentation/devicetree/bindings/gpio/renesas,gpio-rcar.txt @@ -16,11 +16,13 @@ Required Properties: - "renesas,rcar-gen1-gpio": for a generic R-Car Gen1 GPIO controller. - "renesas,rcar-gen2-gpio": for a generic R-Car Gen2 or RZ/G1 GPIO controller. - "renesas,rcar-gen3-gpio": for a generic R-Car Gen3 GPIO controller. - - "renesas,gpio-rcar": deprecated. + - "renesas,gpio-rcar": for generic R-Car GPIO controller. - When compatible with the generic version nodes must list the - SoC-specific version corresponding to the platform first followed by - the generic version. + Nodes should list all of the following that are compatible + in this order: + - A SoC-specific version + - A generic R-Car generation version + - The generic R-Car version - reg: Base address and length of each memory resource used by the GPIO controller hardware module. @@ -50,7 +52,9 @@ interrupt-controller/interrupts.txt. Example: R8A7779 (R-Car H1) GPIO controller nodes gpio0: gpio@ffc40000 { - compatible = "renesas,gpio-r8a7779", "renesas,rcar-gen1-gpio"; + compatible = "renesas,gpio-r8a7779", + "renesas,rcar-gen1-gpio", + "renesas,gpio-rcar"; reg = <0xffc40000 0x2c>; interrupt-parent = <&gic>; interrupts = <0 141 0x4>; @@ -62,7 +66,9 @@ Example: R8A7779 (R-Car H1) GPIO controller nodes }; ... gpio6: gpio@ffc46000 { - compatible = "renesas,gpio-r8a7779", "renesas,rcar-gen1-gpio"; + compatible = "renesas,gpio-r8a7779", + "renesas,rcar-gen1-gpio", + "renesas,gpio-rcar"; reg = <0xffc46000 0x2c>; interrupt-parent = <&gic>; interrupts = <0 147 0x4>;