From patchwork Thu Mar 19 21:34:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlo Caione X-Patchwork-Id: 6052431 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 56E019F399 for ; Thu, 19 Mar 2015 21:38:33 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7867420522 for ; Thu, 19 Mar 2015 21:38:32 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B11B62050B for ; Thu, 19 Mar 2015 21:38:31 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YYi6N-0005A7-7I; Thu, 19 Mar 2015 21:35:39 +0000 Received: from mail-pa0-x231.google.com ([2607:f8b0:400e:c03::231]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YYi5e-0003Yv-78 for linux-arm-kernel@lists.infradead.org; Thu, 19 Mar 2015 21:34:55 +0000 Received: by pacwe9 with SMTP id we9so87250451pac.1 for ; Thu, 19 Mar 2015 14:34:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=uGb02JCYoExEUGZSUs7mdTILqCm7QEs8mmjXnKhhQpo=; b=Xh9B+5/EtNdDyMtOVhYdNU1qzDNbHZbyoRidkarUF9HQPyBCNMHqoqkSYQocTNnxCS TqMQEWdyw2AML6H647wS/NEAEp3PMRV12Lmdl4NSbNcVpAg4L8heUmdqytua3oCaVede NZ451nXg8zzSDaWZ8h6kxNVNJbA1GG76civ3qShLvUa5QXZzq2GhYmwns1YS8D1xwEvE zJ4cRD5K4ZOlNf3SRTWU2oF2K1rQZejQyUcSc2XysAo9DhJXpqOVYETyIVtY+SywrUz1 yO0WnPksyTAUxfkPNberx0K1c49zksrqvduq0nyr29r2HlFUi2j0LUjdfVVIHSifwwfc um7A== X-Received: by 10.66.175.107 with SMTP id bz11mr37886478pac.91.1426800873012; Thu, 19 Mar 2015 14:34:33 -0700 (PDT) Received: from nuc.endlessm-sf.com (2-238-57-164.ip242.fastwebnet.it. [2.238.57.164]) by mx.google.com with ESMTPSA id i11sm4568807pdj.61.2015.03.19.14.34.28 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 19 Mar 2015 14:34:32 -0700 (PDT) From: Carlo Caione To: linus.walleij@linaro.org, linux-arm-kernel@lists.infradead.org, b.galvani@gmail.com, drake@endlessm.com, jstpierre@mecheye.net, jerry.cao@amlogic.com, victor.wan@amlogic.com, ben.dooks@codethink.co.uk, violeta.menendez@codethink.co.uk, edward.cragg@codethink.co.uk Subject: [PATCH v3 2/3] documentation: Extend pinctrl docs for Meson8b Date: Thu, 19 Mar 2015 22:34:11 +0100 Message-Id: <1426800852-1235-3-git-send-email-carlo@caione.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426800852-1235-1-git-send-email-carlo@caione.org> References: <1426800852-1235-1-git-send-email-carlo@caione.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150319_143454_333726_7F890413 X-CRM114-Status: GOOD ( 11.52 ) X-Spam-Score: -0.5 (/) Cc: Carlo Caione X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Carlo Caione Add the compatible string for Meson8b in Meson pinctrl documentation and add new information for Meson8b in source code comments. Signed-off-by: Carlo Caione Acked-by: Beniamino Galvani --- Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt | 2 +- drivers/pinctrl/meson/pinctrl-meson.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt index 17e7240..3f6a524 100644 --- a/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt @@ -1,7 +1,7 @@ == Amlogic Meson pinmux controller == Required properties for the root node: - - compatible: "amlogic,meson8-pinctrl" + - compatible: "amlogic,meson8-pinctrl" or "amlogic,meson8b-pinctrl" - reg: address and size of registers controlling irq functionality === GPIO sub-nodes === diff --git a/drivers/pinctrl/meson/pinctrl-meson.c b/drivers/pinctrl/meson/pinctrl-meson.c index a2bf49c..e0195c1 100644 --- a/drivers/pinctrl/meson/pinctrl-meson.c +++ b/drivers/pinctrl/meson/pinctrl-meson.c @@ -13,8 +13,9 @@ /* * The available pins are organized in banks (A,B,C,D,E,X,Y,Z,AO, - * BOOT,CARD for meson6 and X,Y,DV,H,Z,AO,BOOT,CARD for meson8) and - * each bank has a variable number of pins. + * BOOT,CARD for meson6, X,Y,DV,H,Z,AO,BOOT,CARD for meson8 and + * X,Y,DV,H,AO,BOOT,CARD,DIF for meson8b) and each bank has a + * variable number of pins. * * The AO bank is special because it belongs to the Always-On power * domain which can't be powered off; the bank also uses a set of