From patchwork Sun Mar 29 10:56:41 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlo Caione X-Patchwork-Id: 6115091 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 A8DB09F389 for ; Sun, 29 Mar 2015 10:59:38 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C2B2A2026C for ; Sun, 29 Mar 2015 10:59:37 +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 3B98220251 for ; Sun, 29 Mar 2015 10:59:36 +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 1YcAu2-0004mG-N1; Sun, 29 Mar 2015 10:57:14 +0000 Received: from mail-wi0-x235.google.com ([2a00:1450:400c:c05::235]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YcAty-0004jD-L8 for linux-arm-kernel@lists.infradead.org; Sun, 29 Mar 2015 10:57:11 +0000 Received: by wixm2 with SMTP id m2so64388593wix.0 for ; Sun, 29 Mar 2015 03:56:51 -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=ffPCRTxadABpV/xlVXfGzaBJPFGAYzmjNQRMZ+OMhiI=; b=Gk5P7K+HcdWV2nATfF+BDbQhEUxYMo2azJHQ8WVZPV6tUq133VQcBUpevWrDywL9ZO QsOVRhfedFO3o3CSgEQpYTi02voOaEx+QU3ltLM2eRNi4RqYhnt/vci0+eCTm/MP+dCI DXgjlyCKGcihy0TrxCFOZbMRkwFdD9DsSt2ZlGTNnM4SnvoMqUnTXY3O19fuVXnYQLvH f3XQLgjzZceu4ijnjJhw9rCAdXfKD/KYRnFNoYahjKIGMs0UM4UBLaW2DcAwEsfdCWzh LvcNJHylBCxBUr9Pk/K499MfZkTOLR7LoIPXBgFz7uOaVtaI+KpoJuM/jtqQZfzfxah6 M6qg== X-Received: by 10.181.11.202 with SMTP id ek10mr12144847wid.37.1427626611034; Sun, 29 Mar 2015 03:56:51 -0700 (PDT) Received: from localhost.localdomain (2-238-57-164.ip242.fastwebnet.it. [2.238.57.164]) by mx.google.com with ESMTPSA id hn8sm10725259wib.18.2015.03.29.03.56.49 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 29 Mar 2015 03:56:50 -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 v4 2/3] documentation: Extend pinctrl docs for Meson8b Date: Sun, 29 Mar 2015 12:56:41 +0200 Message-Id: <1427626602-9656-3-git-send-email-carlo@caione.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1427626602-9656-1-git-send-email-carlo@caione.org> References: <1427626602-9656-1-git-send-email-carlo@caione.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150329_035710_873337_9753E4A0 X-CRM114-Status: GOOD ( 11.23 ) 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. Acked-by: Beniamino Galvani Signed-off-by: Carlo Caione --- 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