From patchwork Sun Dec 23 02:35:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nobuhiro Iwamatsu X-Patchwork-Id: 1906731 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id DBB223FCA5 for ; Sun, 23 Dec 2012 02:34:08 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TmbKo-0003uQ-8d; Sun, 23 Dec 2012 02:30:38 +0000 Received: from mail-pa0-f54.google.com ([209.85.220.54]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TmbKj-0003t5-W7 for linux-arm-kernel@lists.infradead.org; Sun, 23 Dec 2012 02:30:35 +0000 Received: by mail-pa0-f54.google.com with SMTP id bi5so3514863pad.13 for ; Sat, 22 Dec 2012 18:30:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer :x-gm-message-state; bh=Mvj49npSpMAM3vcvHoPluz5lXDsavO2WixmnIWS6EQ4=; b=LT1QnGPXQFR8C2bc8wVkp/2UAy5GSgy656m6/sx1rSe2SoVm1W96Amf06BcOybo4eH TJW9TGrodoKJrt74lh23e9dHFpMZpOcmRExbVWkSKv2tS+DKW0exBHQEz3cow4Z2QikH 1/ZllT1N0FT0+GSqPGFWDxVD9oVIMCv+QW9CtU92GI6eUXBep4jyHU6YeRWLzJew6WBF yBTr3PnXF/dgsBolwIPszE/VdT3qiyng9rfabA0jwR9fNN0pDa0PBBU8+gl2S0rqrnFs 5sZE0stE5KZpoOQsseLasOBZFKpx7VOy8C+ZnyYhglYgNE4qWnYVm7GO8DCp+e0Z0XNu o+Tg== X-Received: by 10.66.75.66 with SMTP id a2mr50437812paw.65.1356229832514; Sat, 22 Dec 2012 18:30:32 -0800 (PST) Received: from guhya (u062077.dynamic.ppp.asahi-net.or.jp. [203.212.62.77]) by mx.google.com with ESMTPS id gv9sm9727561pbc.21.2012.12.22.18.30.30 (version=TLSv1/SSLv3 cipher=OTHER); Sat, 22 Dec 2012 18:30:31 -0800 (PST) Received: from iwamatsu by guhya with local (Exim 4.80) (envelope-from ) id 1TmbPq-00041X-KA; Sun, 23 Dec 2012 11:35:50 +0900 From: Nobuhiro Iwamatsu To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] ARM: Kirkwood: Bundle the common pinctrl of 88f6281 and 88f6282 Date: Sun, 23 Dec 2012 11:35:49 +0900 Message-Id: <1356230149-15437-1-git-send-email-iwamatsu@nigauri.org> X-Mailer: git-send-email 1.7.10.4 X-Gm-Message-State: ALoCoQmZGdEFaiD4n5wOESeYlWX4wL/+CNxddDwE5nKekIIitC7xqG88WYfznXhUk5frZjwHLH8X X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121222_213034_165020_6FDB7563 X-CRM114-Status: UNSURE ( 9.44 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.1 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- 1.5 URIBL_RHS_DOB Contains an URI of a new domain (Day Old Bread) [URIs: nigauri.org] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.220.54 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: jason@lakedaemon.net, Nobuhiro Iwamatsu X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 88f6281 and 88f6282 has common pinctrl. This buldles the common pincrtl of these to kirkwood-628x-base.dtsi. Signed-off-by: Nobuhiro Iwamatsu --- arch/arm/boot/dts/kirkwood-6281.dtsi | 38 ++------------------------ arch/arm/boot/dts/kirkwood-6282.dtsi | 35 ++---------------------- arch/arm/boot/dts/kirkwood-628x-base.dtsi | 41 +++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 69 deletions(-) create mode 100644 arch/arm/boot/dts/kirkwood-628x-base.dtsi diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi index d6c9d65..c8fe885 100644 --- a/arch/arm/boot/dts/kirkwood-6281.dtsi +++ b/arch/arm/boot/dts/kirkwood-6281.dtsi @@ -1,44 +1,10 @@ +/include/ "kirkwood-628x-base.dtsi" + / { ocp@f1000000 { pinctrl: pinctrl@10000 { compatible = "marvell,88f6281-pinctrl"; reg = <0x10000 0x20>; - - pmx_nand: pmx-nand { - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3", - "mpp4", "mpp5", "mpp18", - "mpp19"; - marvell,function = "nand"; - }; - pmx_sata0: pmx-sata0 { - marvell,pins = "mpp5", "mpp21", "mpp23"; - marvell,function = "sata0"; - }; - pmx_sata1: pmx-sata1 { - marvell,pins = "mpp4", "mpp20", "mpp22"; - marvell,function = "sata1"; - }; - pmx_spi: pmx-spi { - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3"; - marvell,function = "spi"; - }; - pmx_twsi0: pmx-twsi0 { - marvell,pins = "mpp8", "mpp9"; - marvell,function = "twsi0"; - }; - pmx_uart0: pmx-uart0 { - marvell,pins = "mpp10", "mpp11"; - marvell,function = "uart0"; - }; - pmx_uart1: pmx-uart1 { - marvell,pins = "mpp13", "mpp14"; - marvell,function = "uart1"; - }; - pmx_sdio: pmx-sdio { - marvell,pins = "mpp12", "mpp13", "mpp14", - "mpp15", "mpp16", "mpp17"; - marvell,function = "sdio"; - }; }; }; }; diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi index e0a779c..7ce9614 100644 --- a/arch/arm/boot/dts/kirkwood-6282.dtsi +++ b/arch/arm/boot/dts/kirkwood-6282.dtsi @@ -1,3 +1,5 @@ +/include/ "kirkwood-628x-base.dtsi" + / { ocp@f1000000 { @@ -5,43 +7,10 @@ compatible = "marvell,88f6282-pinctrl"; reg = <0x10000 0x20>; - pmx_nand: pmx-nand { - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3", - "mpp4", "mpp5", "mpp18", "mpp19"; - marvell,function = "nand"; - }; - - pmx_sata0: pmx-sata0 { - marvell,pins = "mpp5", "mpp21", "mpp23"; - marvell,function = "sata0"; - }; - pmx_sata1: pmx-sata1 { - marvell,pins = "mpp4", "mpp20", "mpp22"; - marvell,function = "sata1"; - }; - pmx_spi: pmx-spi { - marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3"; - marvell,function = "spi"; - }; - pmx_twsi0: pmx-twsi0 { - marvell,pins = "mpp8", "mpp9"; - marvell,function = "twsi0"; - }; - pmx_twsi1: pmx-twsi1 { marvell,pins = "mpp36", "mpp37"; marvell,function = "twsi1"; }; - - pmx_uart0: pmx-uart0 { - marvell,pins = "mpp10", "mpp11"; - marvell,function = "uart0"; - }; - - pmx_uart1: pmx-uart1 { - marvell,pins = "mpp13", "mpp14"; - marvell,function = "uart1"; - }; }; i2c@11100 { diff --git a/arch/arm/boot/dts/kirkwood-628x-base.dtsi b/arch/arm/boot/dts/kirkwood-628x-base.dtsi new file mode 100644 index 0000000..c8103b6 --- /dev/null +++ b/arch/arm/boot/dts/kirkwood-628x-base.dtsi @@ -0,0 +1,41 @@ +/ { + ocp@f1000000 { + pinctrl: pinctrl@10000 { + pmx_nand: pmx-nand { + marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3", + "mpp4", "mpp5", "mpp18", + "mpp19"; + marvell,function = "nand"; + }; + pmx_sata0: pmx-sata0 { + marvell,pins = "mpp5", "mpp21", "mpp23"; + marvell,function = "sata0"; + }; + pmx_sata1: pmx-sata1 { + marvell,pins = "mpp4", "mpp20", "mpp22"; + marvell,function = "sata1"; + }; + pmx_spi: pmx-spi { + marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3"; + marvell,function = "spi"; + }; + pmx_twsi0: pmx-twsi0 { + marvell,pins = "mpp8", "mpp9"; + marvell,function = "twsi0"; + }; + pmx_uart0: pmx-uart0 { + marvell,pins = "mpp10", "mpp11"; + marvell,function = "uart0"; + }; + pmx_uart1: pmx-uart1 { + marvell,pins = "mpp13", "mpp14"; + marvell,function = "uart1"; + }; + pmx_sdio: pmx-sdio { + marvell,pins = "mpp12", "mpp13", "mpp14", + "mpp15", "mpp16", "mpp17"; + marvell,function = "sdio"; + }; + }; + }; +};