From patchwork Mon Nov 19 14:46:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 1765061 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork2.kernel.org (Postfix) with ESMTP id ED76FDF264 for ; Mon, 19 Nov 2012 14:53:21 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TaSfO-0006zG-5r; Mon, 19 Nov 2012 14:49:42 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TaSci-0005Qp-Iy for linux-arm-kernel@lists.infradead.org; Mon, 19 Nov 2012 14:46:58 +0000 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MDQ00039P1ZFY40@mailout1.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 19 Nov 2012 23:46:54 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-e1-50aa465e1d50 Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id F2.22.12699.E564AA05; Mon, 19 Nov 2012 23:46:54 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MDQ009FTP1R53A0@mmp1.samsung.com> for linux-arm-kernel@lists.infradead.org; Mon, 19 Nov 2012 23:46:54 +0900 (KST) From: Tomasz Figa To: linux-samsung-soc@vger.kernel.org Subject: [PATCH 2/4] ARM: dts: exynos4210-origen: Update for pinctrl-samsung driver Date: Mon, 19 Nov 2012 15:46:34 +0100 Message-id: <1353336396-21161-3-git-send-email-t.figa@samsung.com> X-Mailer: git-send-email 1.7.10 In-reply-to: <1353336396-21161-1-git-send-email-t.figa@samsung.com> References: <1353336396-21161-1-git-send-email-t.figa@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrIJMWRmVeSWpSXmKPExsVy+t9jAd04t1UBBvtnyllsenyN1YHRY/OS +gDGKC6blNSczLLUIn27BK6Mfyv62Qv+C1U0Xd7B1MD4ireLkZNDQsBE4tqTmywQtpjEhXvr 2UBsIYFFjBKPp6h0MXIB2ZuZJPb8vw9WxCagJvG54RFYkYiAqsTntgXsIEXMAlcYJV41TGQF SQgLhErs+TyRHcRmASq68OgOUAMHB6+Ak8TM/TEQy+Qlnt7vA5vDKeAs0Xn7EjPEYieJ6R2v 2SYw8i5gZFjFKJpakFxQnJSea6RXnJhbXJqXrpecn7uJEezxZ9I7GFc1WBxiFOBgVOLh9Ziw MkCINbGsuDL3EKMEB7OSCO8rpVUBQrwpiZVVqUX58UWlOanFhxilOViUxHmbPVIChATSE0tS s1NTC1KLYLJMHJxSDYy83jW+s2QWnOqy8qivLl2lf/PEU2kptaUb72U8/yDh5fp+AbOE/SsL u3PHTmdNZlz0I8stzsKge5FzAcd23UVRt498lFqcnKWj73255D17xVXOjMfpl5TTPrxNU6p9 zKq0/d2fx1XWl+qMOg1N/zLE/f3Pe7sj8I0X4xVP6clpr2tdDqWL2ymxFGckGmoxFxUnAgA+ xVIy9AEAAA== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20121119_094657_483940_BEA07546 X-CRM114-Status: UNSURE ( 8.20 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -7.6 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.24 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: kgene.kim@samsung.com, t.figa@samsung.com, jhkim@insignal.co.kr, tomasz.figa@gmail.com, kyungmin.park@samsung.com, thomas.abraham@linaro.org, linux-arm-kernel@lists.infradead.org, m.szyprowski@samsung.com 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 This patch updates all parts of Origen dts related to pin configuration to use new GPIO and pinctrl bindings, instead of (now unsupported on Exynos4) legacy gpio-samsung bindings. Signed-off-by: Tomasz Figa Signed-off-by: Kyungmin Park --- arch/arm/boot/dts/exynos4210-origen.dts | 30 ++++++++++-------------------- 1 file changed, 10 insertions(+), 20 deletions(-) diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts index 392d9de..2eb1332 100644 --- a/arch/arm/boot/dts/exynos4210-origen.dts +++ b/arch/arm/boot/dts/exynos4210-origen.dts @@ -36,13 +36,8 @@ samsung,sdhci-bus-width = <4>; linux,mmc_cap_4_bit_data; samsung,sdhci-cd-internal; - gpio-cd = <&gpk2 2 2 3 3>; - gpios = <&gpk2 0 2 0 3>, - <&gpk2 1 2 0 3>, - <&gpk2 3 2 3 3>, - <&gpk2 4 2 3 3>, - <&gpk2 5 2 3 3>, - <&gpk2 6 2 3 3>; + pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_bus4 &sd2_cd>; + pinctrl-names = "default"; status = "okay"; }; @@ -50,13 +45,8 @@ samsung,sdhci-bus-width = <4>; linux,mmc_cap_4_bit_data; samsung,sdhci-cd-internal; - gpio-cd = <&gpk0 2 2 3 3>; - gpios = <&gpk0 0 2 0 3>, - <&gpk0 1 2 0 3>, - <&gpk0 3 2 3 3>, - <&gpk0 4 2 3 3>, - <&gpk0 5 2 3 3>, - <&gpk0 6 2 3 3>; + pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus4 &sd0_cd>; + pinctrl-names = "default"; status = "okay"; }; @@ -83,35 +73,35 @@ up { label = "Up"; - gpios = <&gpx2 0 0 0x10000 2>; + gpios = <&gpx2 0 1>; linux,code = <103>; gpio-key,wakeup; }; down { label = "Down"; - gpios = <&gpx2 1 0 0x10000 2>; + gpios = <&gpx2 1 1>; linux,code = <108>; gpio-key,wakeup; }; back { label = "Back"; - gpios = <&gpx1 7 0 0x10000 2>; + gpios = <&gpx1 7 1>; linux,code = <158>; gpio-key,wakeup; }; home { label = "Home"; - gpios = <&gpx1 6 0 0x10000 2>; + gpios = <&gpx1 6 1>; linux,code = <102>; gpio-key,wakeup; }; menu { label = "Menu"; - gpios = <&gpx1 5 0 0x10000 2>; + gpios = <&gpx1 5 1>; linux,code = <139>; gpio-key,wakeup; }; @@ -120,7 +110,7 @@ leds { compatible = "gpio-leds"; status { - gpios = <&gpx1 3 0 0x10000 2>; + gpios = <&gpx1 3 1>; linux,default-trigger = "heartbeat"; }; };