From patchwork Wed Mar 6 12:36:37 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: thomas.abraham@linaro.org X-Patchwork-Id: 15262 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id B897623E24 for ; Wed, 6 Mar 2013 12:16:33 +0000 (UTC) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by fiordland.canonical.com (Postfix) with ESMTP id 5979DA186E3 for ; Wed, 6 Mar 2013 12:16:33 +0000 (UTC) Received: by mail-ve0-f179.google.com with SMTP id da11so6756071veb.10 for ; Wed, 06 Mar 2013 04:16:32 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-auditid:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-brightmail-tracker:x-gm-message-state; bh=N2+Od+636wL0XH9gu99SpaqCwM8Y3QTvdPzmdcVkuDI=; b=M+RVe8mLFAN7Ugc1fBXt+Y340TuYjqO26V8PVCR1x1J+XFAcCf+2z7UQ0dnWVkQ/jJ fQteE2S1rbGXWq2PR2Z9kseyzRcFpEg5OoambOZPu7P8jOyJ8QjqMvzzTmdd2il5vrbK /0AbYXqb/4kAPvIKIGq4gTUEOm/AHiIMv3+fzoZ7ph/JF0Qr6dfu2vOlD7pOyLYFQJEk slQG3SU6GfH3naBHfx7ZGCYr+qedt8kNRPgYx66lSEWbr0JVFEFDL3uZiHWcgfIuNTv2 rcDuuec0rogD95keS/NVXhC3Q3PPS5JGCi40ecp9AH4b5Osix6XmB0GRMjqWeoLsjQSa jZEw== X-Received: by 10.221.11.135 with SMTP id pe7mr11175797vcb.41.1362572192848; Wed, 06 Mar 2013 04:16:32 -0800 (PST) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp12098veb; Wed, 6 Mar 2013 04:16:31 -0800 (PST) X-Received: by 10.68.229.104 with SMTP id sp8mr46394282pbc.68.1362572191180; Wed, 06 Mar 2013 04:16:31 -0800 (PST) Received: from mailout2.samsung.com (mailout2.samsung.com. [203.254.224.25]) by mx.google.com with ESMTP id ns4si33129612pbc.140.2013.03.06.04.16.30; Wed, 06 Mar 2013 04:16:31 -0800 (PST) Received-SPF: neutral (google.com: 203.254.224.25 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) client-ip=203.254.224.25; Authentication-Results: mx.google.com; spf=neutral (google.com: 203.254.224.25 is neither permitted nor denied by best guess record for domain of thomas.abraham@linaro.org) smtp.mail=thomas.abraham@linaro.org Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MJ800GL9NEW4G10@mailout2.samsung.com>; Wed, 06 Mar 2013 21:16:29 +0900 (KST) X-AuditID: cbfee61a-b7f7d6d000000f4e-00-5137339d4491 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id C0.70.03918.D9337315; Wed, 06 Mar 2013 21:16:29 +0900 (KST) Received: from localhost.localdomain ([107.108.73.37]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MJ8000MSNCE6B00@mmp2.samsung.com>; Wed, 06 Mar 2013 21:16:29 +0900 (KST) From: Thomas Abraham To: linux-arm-kernel@lists.infradead.org, devicetree-discuss@lists.ozlabs.org Cc: linux-samsung-soc@vger.kernel.org, kgene.kim@samsung.com, t.figa@samsung.com, heiko@sntech.de, linus.walleij@linaro.org, patches@linaro.org Subject: [PATCH 1/2] ARM: dts: add pin state information in client nodes for Exynos4 platforms Date: Wed, 06 Mar 2013 18:06:37 +0530 Message-id: <1362573398-15126-2-git-send-email-thomas.abraham@linaro.org> X-Mailer: git-send-email 1.6.6.rc2 In-reply-to: <1362573398-15126-1-git-send-email-thomas.abraham@linaro.org> References: <1362573398-15126-1-git-send-email-thomas.abraham@linaro.org> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprLLMWRmVeSWpSXmKPExsVy+t9jQd25xuaBBpc3a1ocmP2Q1eL/o9es Fr0LrrJZTPmznMli0+NrrBYzzu9jsphy+AuLxfoZr1kcODzuXNvD5rF5Sb3H+RkLGT36tqxi 9Nh+bR6zx+dNcgFsUVw2Kak5mWWpRfp2CVwZh3aEFNyUr3i/bRZjA+Np8S5GTg4JAROJzoPd LBC2mMSFe+vZuhi5OIQEpjNK3Op7xg7htDFJzOyaywhSxSZgIPFo4Tt2EFtEwFdi/bx7jCBF zAKTGSXapj1kA0kICyRIfJk2mRXEZhFQlfi+4z4ziM0r4Cmxb3MvI8Q6JYkNvUeZQGxOAS+J dVPXgJ0hBFTT9mkD6wRG3gWMDKsYRVMLkguKk9JzDfWKE3OLS/PS9ZLzczcxggPtmdQOxpUN FocYBTgYlXh4LZTMAoVYE8uKK3MPMUpwMCuJ8G6VNg8U4k1JrKxKLcqPLyrNSS0+xCjNwaIk zst46kmAkEB6YklqdmpqQWoRTJaJg1OqgZH1unpB1PKXsRd+MJx1s0vYNNl2Q4163Ne9Rx8V 9bh3Ha0wVA7w53rKU6j9b9Kjhm0flV7nbJyeeNU8zMvtVfuhuS9lfj9YJ8Bp+GpL7dm1+2d8 v6Yb7c6y/kxhydXYx/UmE105u39sjGaMjv/t/fbEg38VVZELhFtNEufL6Ley7XRZGz75630l luKMREMt5qLiRACZfYfwMAIAAA== X-Gm-Message-State: ALoCoQkoYBaWSuVcFeZhEw/kklKdeFKus979uPdxFWrKDkPrENolZ1ccKOSn8Up2i9GqndqbOVRQ Add default pin state information for all client nodes that require pin configuration support using pinctrl interface. Signed-off-by: Thomas Abraham --- arch/arm/boot/dts/exynos4.dtsi | 10 +++++ arch/arm/boot/dts/exynos4210-smdkv310.dts | 53 +++++++++++++---------------- 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index e1347fc..d160892 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -165,6 +165,8 @@ compatible = "samsung,s3c2440-i2c"; reg = <0x13860000 0x100>; interrupts = <0 58 0>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c0_bus>; status = "disabled"; }; @@ -174,6 +176,8 @@ compatible = "samsung,s3c2440-i2c"; reg = <0x13870000 0x100>; interrupts = <0 59 0>; + pinctrl-names = "default"; + pinctrl-0 = <&i2c1_bus>; status = "disabled"; }; @@ -239,6 +243,8 @@ rx-dma-channel = <&pdma0 6>; /* preliminary */ #address-cells = <1>; #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&spi0_bus>; status = "disabled"; }; @@ -250,6 +256,8 @@ rx-dma-channel = <&pdma1 6>; /* preliminary */ #address-cells = <1>; #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&spi1_bus>; status = "disabled"; }; @@ -261,6 +269,8 @@ rx-dma-channel = <&pdma0 8>; /* preliminary */ #address-cells = <1>; #size-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&spi2_bus>; status = "disabled"; }; diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts index f634907..55442a5 100644 --- a/arch/arm/boot/dts/exynos4210-smdkv310.dts +++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts @@ -30,16 +30,9 @@ }; sdhci@12530000 { - 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>; + bus-width = <4>; + pinctrl-names = "default"; + pinctrl-0 = <&sd2_clk &sd2_cmd &sd2_cd &sd2_bus4>; status = "okay"; }; @@ -59,25 +52,32 @@ status = "okay"; }; + pinctrl@11000000 { + keypad_rows: keypad-rows { + samsung,pins = "gpx2-0", "gpx2-1"; + samsung,pin-function = <3>; + samsung,pin-pud = <3>; + samsung,pin-drv = <0>; + }; + + keypad_cols: keypad-cols { + samsung,pins = "gpx1-0", "gpx1-1", "gpx1-2", "gpx1-3", + "gpx1-4", "gpx1-5", "gpx1-6", "gpx1-7"; + samsung,pin-function = <3>; + samsung,pin-pud = <0>; + samsung,pin-drv = <0>; + }; + }; + keypad@100A0000 { samsung,keypad-num-rows = <2>; samsung,keypad-num-columns = <8>; linux,keypad-no-autorepeat; linux,keypad-wakeup; + pinctrl-names = "default"; + pinctrl-0 = <&keypad_rows &keypad_cols>; status = "okay"; - row-gpios = <&gpx2 0 3 3 0>, - <&gpx2 1 3 3 0>; - - col-gpios = <&gpx1 0 3 0 0>, - <&gpx1 1 3 0 0>, - <&gpx1 2 3 0 0>, - <&gpx1 3 3 0 0>, - <&gpx1 4 3 0 0>, - <&gpx1 5 3 0 0>, - <&gpx1 6 3 0 0>, - <&gpx1 7 3 0 0>; - key_1 { keypad,row = <0>; keypad,column = <3>; @@ -143,9 +143,7 @@ #address-cells = <1>; #size-cells = <0>; samsung,i2c-sda-delay = <100>; - samsung,i2c-max-bus-freq = <20000>; - gpios = <&gpd1 0 2 3 0>, - <&gpd1 1 2 3 0>; + samsung,i2c-max-bus-freq = <100000>; status = "okay"; eeprom@50 { @@ -160,9 +158,6 @@ }; spi_2: spi@13940000 { - gpios = <&gpc1 1 5 3 0>, - <&gpc1 3 5 3 0>, - <&gpc1 4 5 3 0>; status = "okay"; w25x80@0 { @@ -173,7 +168,7 @@ spi-max-frequency = <1000000>; controller-data { - cs-gpio = <&gpc1 2 1 0 3>; + cs-gpio = <&gpc1 2 0>; samsung,spi-feedback-delay = <0>; };