From patchwork Thu Sep 1 07:23:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 9308487 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 53BF460756 for ; Thu, 1 Sep 2016 07:27:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 447C62921F for ; Thu, 1 Sep 2016 07:27:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3912829225; Thu, 1 Sep 2016 07:27:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=unavailable version=3.3.1 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.wl.linuxfoundation.org (Postfix) with ESMTPS id 4D4132921F for ; Thu, 1 Sep 2016 07:27:05 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1bfMNB-0005NR-7j; Thu, 01 Sep 2016 07:25:17 +0000 Received: from mailout3.w1.samsung.com ([210.118.77.13]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bfMMX-0004Os-Ad for linux-arm-kernel@lists.infradead.org; Thu, 01 Sep 2016 07:24:48 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OCT00MP5DWDEJ20@mailout3.w1.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 01 Sep 2016 08:24:13 +0100 (BST) X-AuditID: cbfec7f4-f79cb6d000001359-c8-57c7d79da86b Received: from eusync3.samsung.com ( [203.254.199.213]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id 89.0A.04953.D97D7C75; Thu, 1 Sep 2016 08:24:13 +0100 (BST) Received: from AMDC2174.DIGITAL.local ([106.120.53.17]) by eusync3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OCT00GQQDW8E630@eusync3.samsung.com>; Thu, 01 Sep 2016 08:24:13 +0100 (BST) From: Krzysztof Kozlowski To: Tomasz Figa , Krzysztof Kozlowski , Sylwester Nawrocki , Rob Herring , Mark Rutland , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, devicetree@vger.kernel.org, Kukjin Kim Subject: [PATCH v2 02/10] ARM: dts: exynos: Use common macros for pinctrl configuration Date: Thu, 01 Sep 2016 09:23:50 +0200 Message-id: <1472714638-15676-3-git-send-email-k.kozlowski@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1472714638-15676-1-git-send-email-k.kozlowski@samsung.com> References: <1472714638-15676-1-git-send-email-k.kozlowski@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrILMWRmVeSWpSXmKPExsVy+t/xq7pzrx8PN5ixUMni76Rj7BYbZ6xn tZh/5ByrxZu3a5gsXr8wtOh//JrZ4vz5DewWU/4sZ7LY9Pgaq8XlXXPYLGac38dksfT6RSaL 1r1H2C0Ov2lntVi16w+jA7/HmnlrGD1+/5rE6LFz1l12j02rOtk87lzbw+axeUm9x5Z+oFDf llWMHp83yQVwRnHZpKTmZJalFunbJXBl9D37x1KwspOx4s/O18wNjNtzuxg5OSQETCT+XVzM AmGLSVy4t56ti5GLQ0hgKaNEx4MN7BBOI5PEnv/L2ECq2ASMJTYvXwJWJSLwhkniX+sGRhCH WeAco8STy0/AqoQFIiV67vxiArFZBFQlGqb9YwWxeQXcJWbOOskIsU9O4uSxyWBxTgEPiZl3 /rOD2EJANStO/GCewMi7gJFhFaNoamlyQXFSeq6hXnFibnFpXrpecn7uJkZIQH/Zwbj4mNUh RgEORiUeXoc3x8KFWBPLiitzDzFKcDArifAqXzoeLsSbklhZlVqUH19UmpNafIhRmoNFSZx3 7q73IUIC6YklqdmpqQWpRTBZJg5OqQbGOWHV7x1NfjEtj2u9v0oqZu3qGX8q++eKic/ttzze 8X/+p/eb8p6Y5nQ8qKuc2246L/3X9nUvs/5cdTukMm9zoPn7/9wM06f/8zou2ZLklf1MmOHA 0zenZQIMZUO2BppGsCh5n2UNWRBsU+ElasM39/3O3EPJonKOp058NLevMC7fppnzZ8UJJZbi jERDLeai4kQAMa3NEmQCAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160901_002437_755228_507DB971 X-CRM114-Status: GOOD ( 15.60 ) 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: javier@osg.samsung.com, Linus Walleij , Krzysztof Kozlowski , Arnd Bergmann , Bartlomiej Zolnierkiewicz MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Replace duplicated macros in each DTSI file with a common macro coming from header. Include the header in each pinctrl DTSI so further changes could use it. Although PIN_FUNC_SPC_2 does not bring much information about the function itself, it still is more descriptive then hard-coded number <2>. Signed-off-by: Krzysztof Kozlowski --- arch/arm/boot/dts/exynos3250-pinctrl.dtsi | 76 +++++++++++------------- arch/arm/boot/dts/exynos4210-pinctrl.dtsi | 2 + arch/arm/boot/dts/exynos4415-pinctrl.dtsi | 2 + arch/arm/boot/dts/exynos4x12-pinctrl.dtsi | 21 +++---- arch/arm/boot/dts/exynos5250-pinctrl.dtsi | 2 + arch/arm/boot/dts/exynos5260-pinctrl.dtsi | 96 +++++++++++++++---------------- arch/arm/boot/dts/exynos5410-pinctrl.dtsi | 2 + arch/arm/boot/dts/exynos5420-pinctrl.dtsi | 2 + 8 files changed, 96 insertions(+), 107 deletions(-) diff --git a/arch/arm/boot/dts/exynos3250-pinctrl.dtsi b/arch/arm/boot/dts/exynos3250-pinctrl.dtsi index 40ea7de44933..ed22d94f4fe5 100644 --- a/arch/arm/boot/dts/exynos3250-pinctrl.dtsi +++ b/arch/arm/boot/dts/exynos3250-pinctrl.dtsi @@ -12,58 +12,46 @@ * published by the Free Software Foundation. */ -#define PIN_PULL_NONE 0 -#define PIN_PULL_DOWN 1 -#define PIN_PULL_UP 3 - -#define PIN_DRV_LV1 0 -#define PIN_DRV_LV2 2 -#define PIN_DRV_LV3 1 -#define PIN_DRV_LV4 3 - -#define PIN_PDN_OUT0 0 -#define PIN_PDN_OUT1 1 -#define PIN_PDN_INPUT 2 -#define PIN_PDN_PREV 3 - -#define PIN_IN(_pin, _pull, _drv) \ - _pin { \ - samsung,pins = #_pin; \ - samsung,pin-function = <0>; \ - samsung,pin-pud = ; \ - samsung,pin-drv = ; \ +#include + +#define PIN_IN(_pin, _pull, _drv) \ + _pin { \ + samsung,pins = #_pin; \ + samsung,pin-function = ; \ + samsung,pin-pud = ; \ + samsung,pin-drv = ; \ } -#define PIN_OUT(_pin, _drv) \ - _pin { \ - samsung,pins = #_pin; \ - samsung,pin-function = <1>; \ - samsung,pin-pud = <0>; \ - samsung,pin-drv = ; \ +#define PIN_OUT(_pin, _drv) \ + _pin { \ + samsung,pins = #_pin; \ + samsung,pin-function = ; \ + samsung,pin-pud = ; \ + samsung,pin-drv = ; \ } -#define PIN_OUT_SET(_pin, _val, _drv) \ - _pin { \ - samsung,pins = #_pin; \ - samsung,pin-function = <1>; \ - samsung,pin-pud = <0>; \ - samsung,pin-drv = ; \ - samsung,pin-val = <_val>; \ +#define PIN_OUT_SET(_pin, _val, _drv) \ + _pin { \ + samsung,pins = #_pin; \ + samsung,pin-function = ; \ + samsung,pin-pud = ; \ + samsung,pin-drv = ; \ + samsung,pin-val = <_val>; \ } -#define PIN_CFG(_pin, _sel, _pull, _drv) \ - _pin { \ - samsung,pins = #_pin; \ - samsung,pin-function = <_sel>; \ - samsung,pin-pud = ; \ - samsung,pin-drv = ; \ +#define PIN_CFG(_pin, _sel, _pull, _drv) \ + _pin { \ + samsung,pins = #_pin; \ + samsung,pin-function = <_sel>; \ + samsung,pin-pud = ; \ + samsung,pin-drv = ; \ } -#define PIN_SLP(_pin, _mode, _pull) \ - _pin { \ - samsung,pins = #_pin; \ - samsung,pin-con-pdn = ; \ - samsung,pin-pud-pdn = ; \ +#define PIN_SLP(_pin, _mode, _pull) \ + _pin { \ + samsung,pins = #_pin; \ + samsung,pin-con-pdn = ; \ + samsung,pin-pud-pdn = ; \ } &pinctrl_0 { diff --git a/arch/arm/boot/dts/exynos4210-pinctrl.dtsi b/arch/arm/boot/dts/exynos4210-pinctrl.dtsi index 9331c6252eff..cc65537ff79b 100644 --- a/arch/arm/boot/dts/exynos4210-pinctrl.dtsi +++ b/arch/arm/boot/dts/exynos4210-pinctrl.dtsi @@ -14,6 +14,8 @@ * published by the Free Software Foundation. */ +#include + / { pinctrl@11400000 { gpa0: gpa0 { diff --git a/arch/arm/boot/dts/exynos4415-pinctrl.dtsi b/arch/arm/boot/dts/exynos4415-pinctrl.dtsi index 75af9c56123e..63714445dddb 100644 --- a/arch/arm/boot/dts/exynos4415-pinctrl.dtsi +++ b/arch/arm/boot/dts/exynos4415-pinctrl.dtsi @@ -11,6 +11,8 @@ * published by the Free Software Foundation. */ +#include + &pinctrl_0 { gpa0: gpa0 { gpio-controller; diff --git a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi index 856b29254374..b5ded0ccce07 100644 --- a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi +++ b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi @@ -12,20 +12,13 @@ * published by the Free Software Foundation. */ -#define PIN_PULL_NONE 0 -#define PIN_PULL_DOWN 1 -#define PIN_PULL_UP 3 - -#define PIN_PDN_OUT0 0 -#define PIN_PDN_OUT1 1 -#define PIN_PDN_INPUT 2 -#define PIN_PDN_PREV 3 - -#define PIN_SLP(_pin, _mode, _pull) \ - _pin { \ - samsung,pins = #_pin; \ - samsung,pin-con-pdn = ; \ - samsung,pin-pud-pdn = ; \ +#include + +#define PIN_SLP(_pin, _mode, _pull) \ + _pin { \ + samsung,pins = #_pin; \ + samsung,pin-con-pdn = ; \ + samsung,pin-pud-pdn = ; \ } / { diff --git a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi index 880917e508b2..d1a4ea0fb838 100644 --- a/arch/arm/boot/dts/exynos5250-pinctrl.dtsi +++ b/arch/arm/boot/dts/exynos5250-pinctrl.dtsi @@ -12,6 +12,8 @@ * published by the Free Software Foundation. */ +#include + &pinctrl_0 { gpa0: gpa0 { gpio-controller; diff --git a/arch/arm/boot/dts/exynos5260-pinctrl.dtsi b/arch/arm/boot/dts/exynos5260-pinctrl.dtsi index f6ee55ea0708..39c046758029 100644 --- a/arch/arm/boot/dts/exynos5260-pinctrl.dtsi +++ b/arch/arm/boot/dts/exynos5260-pinctrl.dtsi @@ -12,9 +12,7 @@ * published by the Free Software Foundation. */ -#define PIN_PULL_NONE 0 -#define PIN_PULL_DOWN 1 -#define PIN_PULL_UP 3 +#include &pinctrl_0 { gpa0: gpa0 { @@ -188,56 +186,56 @@ uart0_data: uart0-data { samsung,pins = "gpa0-0", "gpa0-1"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; uart0_fctl: uart0-fctl { samsung,pins = "gpa0-2", "gpa0-3"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; uart1_data: uart1-data { samsung,pins = "gpa1-0", "gpa1-1"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; uart1_fctl: uart1-fctl { samsung,pins = "gpa1-2", "gpa1-3"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; uart2_data: uart2-data { samsung,pins = "gpa1-4", "gpa1-5"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; spi0_bus: spi0-bus { samsung,pins = "gpa2-0", "gpa2-2", "gpa2-3"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; spi1_bus: spi1-bus { samsung,pins = "gpa2-4", "gpa2-6", "gpa2-7"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; usb3_vbus0_en: usb3-vbus0-en { samsung,pins = "gpa2-4"; samsung,pin-function = <1>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; @@ -245,7 +243,7 @@ samsung,pins = "gpb0-0", "gpb0-1", "gpb0-2", "gpb0-3", "gpb0-4"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; @@ -253,105 +251,105 @@ samsung,pins = "gpb0-0", "gpb0-1", "gpb0-2", "gpb0-3", "gpb0-4"; samsung,pin-function = <3>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; spdif1_bus: spdif1-bus { samsung,pins = "gpb0-0", "gpb0-1", "gpb0-2"; samsung,pin-function = <4>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; spi2_bus: spi2-bus { samsung,pins = "gpb1-0", "gpb1-2", "gpb1-3"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; i2c0_hs_bus: i2c0-hs-bus { samsung,pins = "gpb3-0", "gpb3-1"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; i2c1_hs_bus: i2c1-hs-bus { samsung,pins = "gpb3-2", "gpb3-3"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; i2c2_hs_bus: i2c2-hs-bus { samsung,pins = "gpb3-4", "gpb3-5"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; i2c3_hs_bus: i2c3-hs-bus { samsung,pins = "gpb3-6", "gpb3-7"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; i2c4_bus: i2c4-bus { samsung,pins = "gpb4-0", "gpb4-1"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; i2c5_bus: i2c5-bus { samsung,pins = "gpb4-2", "gpb4-3"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; i2c6_bus: i2c6-bus { samsung,pins = "gpb4-4", "gpb4-5"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; i2c7_bus: i2c7-bus { samsung,pins = "gpb4-6", "gpb4-7"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; i2c8_bus: i2c8-bus { samsung,pins = "gpb5-0", "gpb5-1"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; i2c9_bus: i2c9-bus { samsung,pins = "gpb5-2", "gpb5-3"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; i2c10_bus: i2c10-bus { samsung,pins = "gpb5-4", "gpb5-5"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; i2c11_bus: i2c11-bus { samsung,pins = "gpb5-6", "gpb5-7"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; @@ -360,7 +358,7 @@ "gpe0-4", "gpe0-5", "gpe0-6", "gpe0-7", "gpe1-0", "gpe1-1"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; @@ -368,35 +366,35 @@ samsung,pins = "gpf0-0", "gpf0-1", "gpf0-2", "gpf0-3", "gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3"; samsung,pin-function = <3>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; cam_i2c1_bus: cam-i2c1-bus { samsung,pins = "gpf0-2", "gpf0-3"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; cam_i2c0_bus: cam-i2c0-bus { samsung,pins = "gpf0-0", "gpf0-1"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; cam_spi0_bus: cam-spi0-bus { samsung,pins = "gpf1-0", "gpf1-1", "gpf1-2", "gpf1-3"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; cam_spi1_bus: cam-spi1-bus { samsung,pins = "gpf1-4", "gpf1-5", "gpf1-6", "gpf1-7"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <0>; }; }; @@ -445,112 +443,112 @@ sd0_clk: sd0-clk { samsung,pins = "gpc0-0"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <3>; }; sd0_cmd: sd0-cmd { samsung,pins = "gpc0-1"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <3>; }; sd0_bus1: sd0-bus-width1 { samsung,pins = "gpc0-2"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <3>; }; sd0_bus4: sd0-bus-width4 { samsung,pins = "gpc0-3", "gpc0-4", "gpc0-5"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <3>; }; sd0_bus8: sd0-bus-width8 { samsung,pins = "gpc3-0", "gpc3-1", "gpc3-2", "gpc3-3"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <3>; }; sd0_rdqs: sd0-rdqs { samsung,pins = "gpc0-6"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <3>; }; sd1_clk: sd1-clk { samsung,pins = "gpc1-0"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <3>; }; sd1_cmd: sd1-cmd { samsung,pins = "gpc1-1"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <3>; }; sd1_bus1: sd1-bus-width1 { samsung,pins = "gpc1-2"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <3>; }; sd1_bus4: sd1-bus-width4 { samsung,pins = "gpc1-3", "gpc1-4", "gpc1-5"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <3>; }; sd1_bus8: sd1-bus-width8 { samsung,pins = "gpc4-0", "gpc4-1", "gpc4-2", "gpc4-3"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <3>; }; sd2_clk: sd2-clk { samsung,pins = "gpc2-0"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <3>; }; sd2_cmd: sd2-cmd { samsung,pins = "gpc2-1"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <3>; }; sd2_cd: sd2-cd { samsung,pins = "gpc2-2"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <3>; }; sd2_bus1: sd2-bus-width1 { samsung,pins = "gpc2-3"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <3>; }; sd2_bus4: sd2-bus-width4 { samsung,pins = "gpc2-4", "gpc2-5", "gpc2-6"; samsung,pin-function = <2>; - samsung,pin-pud = ; + samsung,pin-pud = ; samsung,pin-drv = <3>; }; }; diff --git a/arch/arm/boot/dts/exynos5410-pinctrl.dtsi b/arch/arm/boot/dts/exynos5410-pinctrl.dtsi index b58a0f29f42c..bf43792efe27 100644 --- a/arch/arm/boot/dts/exynos5410-pinctrl.dtsi +++ b/arch/arm/boot/dts/exynos5410-pinctrl.dtsi @@ -9,6 +9,8 @@ * published by the Free Software Foundation. */ +#include + &pinctrl_0 { gpa0: gpa0 { gpio-controller; diff --git a/arch/arm/boot/dts/exynos5420-pinctrl.dtsi b/arch/arm/boot/dts/exynos5420-pinctrl.dtsi index 14beb7e07323..cf7d2986780a 100644 --- a/arch/arm/boot/dts/exynos5420-pinctrl.dtsi +++ b/arch/arm/boot/dts/exynos5420-pinctrl.dtsi @@ -12,6 +12,8 @@ * published by the Free Software Foundation. */ +#include + &pinctrl_0 { gpy7: gpy7 { gpio-controller;