From patchwork Wed Mar 23 09:13:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Carlo Caione X-Patchwork-Id: 8648061 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 E2DC59F3D1 for ; Wed, 23 Mar 2016 09:16:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CCFDC203A5 for ; Wed, 23 Mar 2016 09:16:28 +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 E0A3D2038A for ; Wed, 23 Mar 2016 09:16:27 +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 1aiesh-0002kX-Td; Wed, 23 Mar 2016 09:15:11 +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 1aiesS-00028j-3I for linux-arm-kernel@lists.infradead.org; Wed, 23 Mar 2016 09:14:56 +0000 Received: by mail-wm0-x241.google.com with SMTP id p65so2622749wmp.1 for ; Wed, 23 Mar 2016 02:14:35 -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 :mime-version:content-transfer-encoding; bh=27gE6R/FzvLlAzSNxC+c+fYupT+i54YeSl8tTbPK8EM=; b=k9cCuqlTvcH2GmGRxByUQn6n1Df4qxTsxrq3FYigMLNm7okg0ywls0MZScH7k2rJln /+6u37/eyIjz8Alwlzt/8i3ry4GZ0+J9fQYBoZbyFExHLEF0LnpUybpQBEGy3seau6Oh COrpqHatag8vQhwZjcv/jD3p+pbi5d3nykuyeL8omrVXnDT7ZtUJeRhyyDHzah94Rdp5 qXeLWuP/jWaNYYFyeAjCVQ7GyJr/OuL/aTKklaqLAKa3j6D0UtMTLw20t681NQRLqDzH 0p+yytfGXNXWjLcEfEYOWZGOcUR5jhUq4tK3APpRHNrMqJ5CuA5otNfkMteMIVlSHzFA t9yA== 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:mime-version:content-transfer-encoding; bh=27gE6R/FzvLlAzSNxC+c+fYupT+i54YeSl8tTbPK8EM=; b=HtAbPwRVpgVsXI2oYOnQPdEytsj0LLcbsNaTnveNijtS5ksRj9CPGSnuD3XKIgrz6n vz1kmnLRAeEidTbNDHzu4M4JxJvBqSW9UR1coR+T3OtGS8UPYSSNZWDfgoGRNGTgtd64 f33dBOz9gO0B1orHc8cdtea+BSql3KvoCE5tQLgNns4F715QEnyM6dB8Bb5dv+GJJM3R LriwP1N6m6aUeCWXYM9G48ifSrd3XR9zTYEEDMPrD+rZxppzEbVym91z4KtEglhUTcN6 GS1c/Kh7YNdS/CQ2qW37WNvbzyVrdZWXaxDZuXG2oTUnPcyhF6apuswHWJVKXeynklub 3nrw== X-Gm-Message-State: AD7BkJIb9ysPCGqKu9/Nv3AMIP3Gw6gd8HdM9SeRgVyQn649++pWbIganN8vcPMXZfno6g== X-Received: by 10.28.54.156 with SMTP id y28mr2666786wmh.63.1458724474497; Wed, 23 Mar 2016 02:14:34 -0700 (PDT) Received: from localhost.localdomain ([212.91.95.170]) by smtp.gmail.com with ESMTPSA id gb9sm1531330wjb.26.2016.03.23.02.14.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 23 Mar 2016 02:14:33 -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 1/2] ARM: dts: amlogic: Split pinctrl device for Meson8 / Meson8b Date: Wed, 23 Mar 2016 10:13:59 +0100 Message-Id: <1458724440-32228-2-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> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160323_021456_311497_A441D2E2 X-CRM114-Status: GOOD ( 11.30 ) 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 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 Signed-off-by: Carlo Caione Reviewed-by: Andreas Färber Acked-by: Linus Walleij --- 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>,