From patchwork Wed Mar 23 09:14:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Carlo Caione X-Patchwork-Id: 8648071 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 A3BBF9F3D1 for ; Wed, 23 Mar 2016 09:16:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 9ECF1203AC for ; Wed, 23 Mar 2016 09:16:41 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B4B1B2038A for ; Wed, 23 Mar 2016 09:16:40 +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 1aiesr-0003Ap-2P; Wed, 23 Mar 2016 09:15:21 +0000 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aiesT-00028v-6U for linux-arm-kernel@lists.infradead.org; Wed, 23 Mar 2016 09:14:58 +0000 Received: by mail-wm0-x244.google.com with SMTP id u125so2621754wmg.0 for ; Wed, 23 Mar 2016 02:14:36 -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=pz1JAiZk5HRbVi+LtCLDJOFT8aOcGdiLUu21/rVaKZ8=; b=FxhOePCSqIHavXRAQsSNy38UjYFu/xc072Qaobi17FC5ylf4Pxg4tXq824//j6nztV zUkoz2mYV5VzUrs+gFC/hnqq8u/nwY91tACapIc+rDRb5rutLe28vHyyXzbnlv0IEOSX DfQgBRnvHXPthkPyvRDKUqfoXvEgDocnvLU1PCx/9i/y6XJ2GMe2SUHC4JWvibnfMDmY iSgQCI8P+zccfSpTkpkwsSlz9CWImWlsHDsEM3DjNu11tHSm/QJC9NouoR7ZTiRlnxkK sB+VW8iYgE8s1n+PeRHarbbn+MwmEm/doGc9Cv7LLMWVketSaCwWJ2dcdAumeRd9PJVv bM0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=pz1JAiZk5HRbVi+LtCLDJOFT8aOcGdiLUu21/rVaKZ8=; b=gy74fFJvSDnPVJdsDYSFrNHkN18hJArHc5TpOyP0qhbr4AuhY1/3wUvncAiP6wUnBh 9cCMJ0zCB/gRzx45Qb87p2tM7+A4M8r5b/cDfc0kXthfz4fim2pcR97L2QJ6S0IPwK7J ewLlgyDjZzVGF5eSkQItJ6SuexLZq61MOkLX/PekCoIp7doTOQ7YHNWiAR6lHFMyKvuQ /yl9R7/2U3Phc+WHFoGlga7D43gqBSnQ2/hxw28DyIDr03xPHw9rKwas0y6ZkKqqXWS7 EgvC5kAqH3AlpR8+XWyG+x5828zFz2+oKzWxMiHfKCBqGlsYGt9tMC2xRMjokEamTI94 InWw== X-Gm-Message-State: AD7BkJIcNMVIp+wrRYpiqvc6ED2MsMKDvgwtjnfREi1L6ltiSVc5uu+6c8Bh9tRs6KoXBg== X-Received: by 10.28.158.149 with SMTP id h143mr2504214wme.61.1458724475638; Wed, 23 Mar 2016 02:14:35 -0700 (PDT) Received: from localhost.localdomain ([212.91.95.170]) by smtp.gmail.com with ESMTPSA id gb9sm1531330wjb.26.2016.03.23.02.14.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Mar 2016 02:14:34 -0700 (PDT) From: Carlo Caione To: linux-arm-kernel@lists.infradead.org, linux@endlessm.com, linux-meson@googlegroups.com, afaerber@suse.de, robh+dt@kernel.org, linus.walleij@linaro.org, khilman@baylibre.com, pawel.moll@arm.com, devicetree@vger.kernel.org Subject: [PATCH v3 2/2] documentation: Fix pinctrl documentation for Meson8 / Meson8b Date: Wed, 23 Mar 2016 10:14:00 +0100 Message-Id: <1458724440-32228-3-git-send-email-carlo@caione.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1458724440-32228-1-git-send-email-carlo@caione.org> References: <1458724440-32228-1-git-send-email-carlo@caione.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160323_021457_396468_38254E1A X-CRM114-Status: GOOD ( 12.81 ) X-Spam-Score: -2.4 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Carlo Caione 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=unavailable 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 Fix pin controller documentation introducing the new compatibles for the pinctrl drivers specific for aobus / cbus. This is needed because we have changed the pin controller driver: we have now a single specialized pinctrl driver / compatible for each bus the controller is attached to, instead of one single driver dealing with all the controllers we have on different buses. Signed-off-by: Carlo Caione Reviewed-by: Andreas Färber Acked-by: Rob Herring --- .../devicetree/bindings/pinctrl/meson,pinctrl.txt | 38 ++++------------------ 1 file changed, 7 insertions(+), 31 deletions(-) diff --git a/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt b/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt index 3f6a524..32f4a2d 100644 --- a/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt +++ b/Documentation/devicetree/bindings/pinctrl/meson,pinctrl.txt @@ -1,13 +1,16 @@ == Amlogic Meson pinmux controller == Required properties for the root node: - - compatible: "amlogic,meson8-pinctrl" or "amlogic,meson8b-pinctrl" + - compatible: one of "amlogic,meson8-cbus-pinctrl" + "amlogic,meson8b-cbus-pinctrl" + "amlogic,meson8-aobus-pinctrl" + "amlogic,meson8b-aobus-pinctrl" - reg: address and size of registers controlling irq functionality === GPIO sub-nodes === -The 2 power domains of the controller (regular and always-on) are -represented as sub-nodes and each of them acts as a GPIO controller. +The GPIO bank for the controller is represented as a sub-node and it acts as a +GPIO controller. Required properties for sub-nodes are: - reg: should contain address and size for mux, pull-enable, pull and @@ -18,10 +21,6 @@ Required properties for sub-nodes are: - gpio-controller: identifies the node as a gpio controller - #gpio-cells: must be 2 -Valid sub-node names are: - - "banks" for the regular domain - - "ao-bank" for the always-on domain - === Other sub-nodes === Child nodes without the "gpio-controller" represent some desired @@ -45,7 +44,7 @@ pinctrl-bindings.txt === Example === pinctrl: pinctrl@c1109880 { - compatible = "amlogic,meson8-pinctrl"; + compatible = "amlogic,meson8-cbus-pinctrl"; reg = <0xc1109880 0x10>; #address-cells = <1>; #size-cells = <1>; @@ -61,15 +60,6 @@ pinctrl-bindings.txt #gpio-cells = <2>; }; - gpio_ao: ao-bank@c1108030 { - reg = <0xc8100014 0x4>, - <0xc810002c 0x4>, - <0xc8100024 0x8>; - reg-names = "mux", "pull", "gpio"; - gpio-controller; - #gpio-cells = <2>; - }; - nand { mux { groups = "nand_io", "nand_io_ce0", "nand_io_ce1", @@ -79,18 +69,4 @@ pinctrl-bindings.txt function = "nand"; }; }; - - uart_ao_a { - mux { - groups = "uart_tx_ao_a", "uart_rx_ao_a", - "uart_cts_ao_a", "uart_rts_ao_a"; - function = "uart_ao"; - }; - - conf { - pins = "GPIOAO_0", "GPIOAO_1", - "GPIOAO_2", "GPIOAO_3"; - bias-disable; - }; - }; };