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 X-Patchwork-Id: 2225141 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 0FA433FC8A for ; Wed, 6 Mar 2013 12:16:32 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758018Ab3CFMQb (ORCPT ); Wed, 6 Mar 2013 07:16:31 -0500 Received: from mailout2.samsung.com ([203.254.224.25]:63317 "EHLO mailout2.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757706Ab3CFMQb (ORCPT ); Wed, 6 Mar 2013 07:16:31 -0500 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> for linux-samsung-soc@vger.kernel.org; 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== Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org 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>; };