From patchwork Tue Mar 1 22:04:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Carlo Caione X-Patchwork-Id: 8470841 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 28DBDC0553 for ; Tue, 1 Mar 2016 22:07:14 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3B3E92034A for ; Tue, 1 Mar 2016 22:07:13 +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 54250202B8 for ; Tue, 1 Mar 2016 22:07:12 +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 1aasQF-0008BQ-I5; Tue, 01 Mar 2016 22:05:39 +0000 Received: from mail-wm0-x241.google.com ([2a00:1450:400c:c09::241]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aasPo-0006tn-0u for linux-arm-kernel@lists.infradead.org; Tue, 01 Mar 2016 22:05:14 +0000 Received: by mail-wm0-x241.google.com with SMTP id 1so6436284wmg.2 for ; Tue, 01 Mar 2016 14:04:52 -0800 (PST) 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=ioh+FS2bru7VJOG3CeKHukokawQu6OJMNz4LJvN2xBg=; b=AjdXxqtDoA2cSPfSDMk54AKK0nE8pTR867yaxhlddbY+F6edN+0YBfhjNxWK6DcNpI 19/DAC6Sp6hVLn/WV3jbIYJ6nUVWztT5sHNiWJbWhL5L6Ud2H7qSW88xabpwXuaOB4a+ /fsrX823w9h7/6WIOgOy7+1aAH5rD2DuX+DQwuwfoYM4q85XeEbma5GJzgvPOcX8GOCo WUFpPzMaBevr/l8me8mDyWZm1VIJff5wMXOo3QGH250rfnKT5SgYk5tVt32hpoiz+OmN 6mRtuM7tghoP6q1WjIWTXG+Bye7rqvJtqi3/+3bTdQ1D8f/gYnLgEhp9wCKjgwa++eW4 5XIw== 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=ioh+FS2bru7VJOG3CeKHukokawQu6OJMNz4LJvN2xBg=; b=PzioAGq3lSp0A/xLKcRrl15/QZ3HBflSiuJNdm6PsutXhARl5qmdKZfH1b0HFHZo1W CVJEK8BVf8Cz9u+fq7eudc9f7+A2t4TGAJJeoz8+WIjwpZkGzaAc7bSIgXqjx0VEIIOC 2uXcOheGnxMz82MxPRotOkV5F42qjfRPFtc3BcalQclbqDMc5PYMoEFw1Akt1MfSpFRy 0uG6QNIjrwYWz9/oC4h1ubZwxSolaXK0vjYWlZNQWgEMqJO9aF0D9ZHucDLeFb263bO/ P2HYUy6m3s4m72ATIvV5WxQRtWD3obPMDjAeZ6XHZQMYZPc/1oieRYXU+isjxL7aRpzT lY2g== X-Gm-Message-State: AD7BkJINOJT6lIqukQP9YahuivoihlEaOBvqD8vFdLP7DW+Ns7DJtxgIvKKl4V9VwcVPrA== X-Received: by 10.194.90.229 with SMTP id bz5mr24924189wjb.143.1456869891621; Tue, 01 Mar 2016 14:04:51 -0800 (PST) Received: from localhost.localdomain (2-238-57-164.ip242.fastwebnet.it. [2.238.57.164]) by smtp.gmail.com with ESMTPSA id 63sm1136107wms.1.2016.03.01.14.04.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 01 Mar 2016 14:04:50 -0800 (PST) From: Carlo Caione To: linus.walleij@linaro.org, b.galvani@gmail.com, linux-arm-kernel@lists.infradead.org, linux-meson@googlegroups.com, robh+dt@kernel.org, devicetree@vger.kernel.org, linux@endlessm.com, arnd@arndb.de Subject: [PATCH 3/4] ARM: dts: amlogic: Split pinctrl device for Meson8 / Meson8b Date: Tue, 1 Mar 2016 23:04:35 +0100 Message-Id: <1456869876-19320-4-git-send-email-carlo@caione.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456869876-19320-1-git-send-email-carlo@caione.org> References: <1456869876-19320-1-git-send-email-carlo@caione.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160301_140512_390875_505817A5 X-CRM114-Status: GOOD ( 11.19 ) 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,RP_MATCHES_RCVD,T_DKIM_INVALID,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 Signed-off-by: Carlo Caione Reviewed-by: Andreas Färber --- arch/arm/boot/dts/meson8.dtsi | 57 ++++++++++++++++++++++++------------------ arch/arm/boot/dts/meson8b.dtsi | 12 +++++++-- 2 files changed, 42 insertions(+), 27 deletions(-) diff --git a/arch/arm/boot/dts/meson8.dtsi b/arch/arm/boot/dts/meson8.dtsi index a2ddcb8..45619f6 100644 --- a/arch/arm/boot/dts/meson8.dtsi +++ b/arch/arm/boot/dts/meson8.dtsi @@ -91,8 +91,8 @@ clock-frequency = <141666666>; }; - pinctrl: pinctrl@c1109880 { - compatible = "amlogic,meson8-pinctrl"; + pinctrl_cbus: pinctrl@c1109880 { + compatible = "amlogic,meson8-cbus-pinctrl"; reg = <0xc1109880 0x10>; #address-cells = <1>; #size-cells = <1>; @@ -108,29 +108,6 @@ #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>; - }; - - uart_ao_a_pins: uart_ao_a { - mux { - groups = "uart_tx_ao_a", "uart_rx_ao_a"; - function = "uart_ao"; - }; - }; - - i2c_ao_pins: i2c_mst_ao { - mux { - groups = "i2c_mst_sck_ao", "i2c_mst_sda_ao"; - function = "i2c_mst_ao"; - }; - }; - spi_nor_pins: nor { mux { groups = "nor_d", "nor_q", "nor_c", "nor_cs"; @@ -157,4 +134,34 @@ }; }; + pinctrl_aobus: pinctrl@c8100084 { + compatible = "amlogic,meson8-aobus-pinctrl"; + reg = <0xc8100084 0xc>; + #address-cells = <1>; + #size-cells = <1>; + ranges; + + gpio_ao: ao-bank@c1108030 { + reg = <0xc8100014 0x4>, + <0xc810002c 0x4>, + <0xc8100024 0x8>; + reg-names = "mux", "pull", "gpio"; + gpio-controller; + #gpio-cells = <2>; + }; + + uart_ao_a_pins: uart_ao_a { + mux { + groups = "uart_tx_ao_a", "uart_rx_ao_a"; + function = "uart_ao"; + }; + }; + + i2c_ao_pins: i2c_mst_ao { + mux { + groups = "i2c_mst_sck_ao", "i2c_mst_sda_ao"; + function = "i2c_mst_ao"; + }; + }; + }; }; /* end of / */ diff --git a/arch/arm/boot/dts/meson8b.dtsi b/arch/arm/boot/dts/meson8b.dtsi index 8bad557..2bfe401 100644 --- a/arch/arm/boot/dts/meson8b.dtsi +++ b/arch/arm/boot/dts/meson8b.dtsi @@ -155,8 +155,8 @@ reg = <0xc1108000 0x4>, <0xc1104000 0x460>; }; - pinctrl: pinctrl@c1109880 { - compatible = "amlogic,meson8b-pinctrl"; + pinctrl_cbus: pinctrl@c1109880 { + compatible = "amlogic,meson8b-cbus-pinctrl"; reg = <0xc1109880 0x10>; #address-cells = <1>; #size-cells = <1>; @@ -171,6 +171,14 @@ gpio-controller; #gpio-cells = <2>; }; + }; + + pinctrl_aobus: pinctrl@c8100084 { + compatible = "amlogic,meson8b-aobus-pinctrl"; + reg = <0xc8100084 0xc>; + #address-cells = <1>; + #size-cells = <1>; + ranges; gpio_ao: ao-bank@c1108030 { reg = <0xc8100014 0x4>,