Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752685AbcL2Ine (ORCPT ); Thu, 29 Dec 2016 03:43:34 -0500 Received: from mailout1.samsung.com ([203.254.224.24]:60803 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752436AbcL2Im0 (ORCPT ); Thu, 29 Dec 2016 03:42:26 -0500 X-AuditID: b6c32a3c-f79646d000004d82-45-5864cc6e7f5e From: Andi Shyti To: Tomasz Figa , Chanwoo Choi , Krzysztof Kozlowski , Sylwester Nawrocki , Rob Herring , Mark Rutland , Catalin Marinas , Will Deacon , Kukjin Kim , Javier Martinez Canillas Cc: devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org, Andi Shyti , Andi Shyti Subject: [PATCH 3/4] ARM64: dts: TM2: comply to the samsung pinctrl naming convention Date: Thu, 29 Dec 2016 17:42:10 +0900 Message-id: <20161229084211.20442-4-andi.shyti@samsung.com> X-Mailer: git-send-email 2.11.0 In-reply-to: <20161229084211.20442-1-andi.shyti@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAAzVSWUwTURT1zXTDWDMpLs8CSsYYt1A7tcBTi0sE0wQ/MBLFLXVCJxTtZqcg qFFRUdxAjVvckVpjxagVQasYLUSMVYqiNoqAK7UoGrfEBdFpp/6dc8+55777ciW4rFcol+Sb 7YzNTBtJUX9BbcPYCUnme/ocZYkzAdU1dglR1Y8ghj45dwAU+BYUouONzUL0oacaQxWv3+PI 778gRu7XT4So1XNEhA76b2DoVOABhkrrG8Wo4cMWIXJ5egEKfb4jmE5oq49VA23A8QXXXj3U Lta6XVtF2kuOddqaCo6V17iA9qt7eJZkIaMxMLSesSUy5lyLPt+cl0ZmztXN1CWnKKkkahJK JRPNtIlJI9NnZyXNyjdyG5CJhbSxgCtl0SxLTpiqsVkK7EyiwcLa08hFFKVSUMpUhUqlUqgn LpmsSuYsSxlDZZ9fZN04p6jnVuZ60D5tG4iRQEINm96Vi3k8BLZ0nBeFsYy4AuDFkH4b6M/h LRh8fKxJ9L/hsKcL8MJpAJ8338d58hlAz95dWNglIsbCDW0/RGFhELEHh7sbvgjCBCfuA/iq /mVkYCwxH4ZqT0Y6BMQo2FnaJQxjKTEF9ni90UeNgJ7NDyL1GEIDg8HaSCokboth65t2TpBw JAG6b+K8Px0G9r8U8DgWdjfVRHPioKvvGcbjlfDcrTqMz9kE4O/Q4+hyE2Hni45IEE4MhB+/ 74jmS2HZZhlv0cJrvcFo5gx44PonMb9+BYC++nLBLhB/AvRzgSGMlTXlMSxlRQqWNrEF5jxF rsXkBpHLG6e5Ah42z/YCQgLIAVIYr8+RCelCttjkBVCCk4OkR+9wJameLl7F2Cw6W4GRYb0g mfun3bh8cK6Fu2OzXUepUyi1Sk1RqSqlihwqdZZMyZERebSdWc4wVsb2vw+TxMjXgzWjF18b eGGGcmjKL0Pc+D7f5KWxj962FrHOhN/+eKzScFA+ZuS+DWXZTcYxdmfb3o61SfNWnzlbLs6Y WXm5W3emPr0ts9RTtyct27Eu0NBau+An9eTXimoftb24pWb19xfekpa7ZSMcmoySV/K1nX99 oWVV4+u+WR0O39NhO/UZf+JJAWugqXG4jaX/AdveY0yPAwAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrJIsWRmVeSWpSXmKPExsVy+t9jAd28MykRBk/OsltsP/KM1WLxj+dM Fu+X9TBaXP/ynNVi/pFzrBZv3q5hsuh//JrZ4vz5DewWmx5fY7W4vGsOm8WM8/uYLJZev8hk 0br3CLvF4TftrBardv1htHj58QSLg4DHmnlrGD2uL/nE7LFz1l12j02rOtk8Ni+p99jSD+T1 bVnF6PF5k1wAR5SbTUZqYkpqkUJqXnJ+SmZeuq1SaIibroWSQl5ibqqtUoSub0iQkkJZYk4p kGdkgAYcnAPcg5X07RLcMhb+O89W0BxY8fagdwPjXfsuRk4OCQETidm7njFC2GISF+6tZ+ti 5OIQEljKKPFjzjMmCOcjo8T7/R9ZQarYBDQlmm7/AKsSEZjCLPHvyimwKmaBs0At0+cxg1QJ C4RLvNy2iAnEZhFQlbjf+gysm1fAWuLtoUPsEPvkJXa1XQSLcwrYSDx/vo0NxBYCqpnS2s88 gZF3ASPDKkaJ1ILkguKk9FzDvNRyveLE3OLSvHS95PzcTYzgaHomtYPx4C73Q4wCHIxKPLwS MikRQqyJZcWVuYcYJTiYlUR4554ACvGmJFZWpRblxxeV5qQWH2I0BTpsIrOUaHI+MNLzSuIN TcxNzI0NLMwtLU2MlMR5G2c/CxcSSE8sSc1OTS1ILYLpY+LglGpgdK4wEl/94qZbiqKgTFkD j15w0OpDW7evahTSP2ttJmua+738n+g6vd4DEys+Ze6ar37w+hNdm8MZZ1+x9+9TDlG7fkWE Q/YMh5iu4LbcZxe129dHnMlaPKFvcn/RvhCN6iXfDz1Yd2LvGZ9prydb/DAJlGDavjenWyvO euGby07uG77I6vbnKrEUZyQaajEXFScCACApAY+8AgAA X-MTR: 20000000000000000@CPGS X-CMS-MailID: 20161229084222epcas1p4c0db2fd327fc92bfe123442f44b88ab5 X-Msg-Generator: CA X-Sender-IP: 203.254.230.26 X-Local-Sender: =?UTF-8?B?7JWI65SUG1RpemVuIFBsYXRmb3JtIExhYihTL1fshLzthLAp?= =?UTF-8?B?G+yCvOyEseyghOyekBvssYXsnoQ=?= X-Global-Sender: =?UTF-8?B?QW5kaSBTaHl0aRtUaXplbiBQbGF0Zm9ybSBMYWIuG1NhbXN1?= =?UTF-8?B?bmcgRWxlY3Ryb25pY3MbU2VuaW9yIEVuZ2luZWVy?= X-Sender-Code: =?UTF-8?B?QzEwG1NUQUYbQzEwVjgxMTE=?= CMS-TYPE: 101P DLP-Filter: Pass X-CFilter-Loop: Reflected X-HopCount: 7 X-CMS-RootMailID: 20161229084222epcas1p4c0db2fd327fc92bfe123442f44b88ab5 X-RootMTR: 20161229084222epcas1p4c0db2fd327fc92bfe123442f44b88ab5 References: <20161229084211.20442-1-andi.shyti@samsung.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 10009 Lines: 360 Change the PIN() macro definition so that it can use the macros from pinctrl/samsung.h header file. Signed-off-by: Andi Shyti --- arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi | 12 +- arch/arm64/boot/dts/exynos/exynos5433-tm2.dts | 254 ++++++++++----------- 2 files changed, 133 insertions(+), 133 deletions(-) diff --git a/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi b/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi index 36da7dce409a..9afed9fcf7e1 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi +++ b/arch/arm64/boot/dts/exynos/exynos5433-pinctrl.dtsi @@ -27,12 +27,12 @@ #define PIN_OUT 1 #define PIN_FUNC1 2 -#define PIN(_func, _pin, _pull, _drv) \ - _pin { \ - samsung,pins = #_pin; \ - samsung,pin-function = ; \ - samsung,pin-pud = ; \ - samsung,pin-drv = ; \ +#define PIN(_func, _pin, _pull, _drv) \ + _pin { \ + samsung,pins = #_pin; \ + samsung,pin-function = ; \ + samsung,pin-pud = ; \ + samsung,pin-drv = ; \ } &pinctrl_alive { diff --git a/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts b/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts index f21bdc2ff834..a2bc8e48eca4 100644 --- a/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts +++ b/arch/arm64/boot/dts/exynos/exynos5433-tm2.dts @@ -742,77 +742,77 @@ pinctrl-0 = <&initial_alive>; initial_alive: initial-state { - PIN(IN, gpa0-0, DOWN, LV1); - PIN(IN, gpa0-1, NONE, LV1); - PIN(IN, gpa0-2, DOWN, LV1); - PIN(IN, gpa0-3, NONE, LV1); - PIN(IN, gpa0-4, NONE, LV1); - PIN(IN, gpa0-5, DOWN, LV1); - PIN(IN, gpa0-6, NONE, LV1); - PIN(IN, gpa0-7, NONE, LV1); - - PIN(IN, gpa1-0, UP, LV1); - PIN(IN, gpa1-1, NONE, LV1); - PIN(IN, gpa1-2, NONE, LV1); - PIN(IN, gpa1-3, DOWN, LV1); - PIN(IN, gpa1-4, DOWN, LV1); - PIN(IN, gpa1-5, NONE, LV1); - PIN(IN, gpa1-6, NONE, LV1); - PIN(IN, gpa1-7, NONE, LV1); - - PIN(IN, gpa2-0, NONE, LV1); - PIN(IN, gpa2-1, NONE, LV1); - PIN(IN, gpa2-2, NONE, LV1); - PIN(IN, gpa2-3, DOWN, LV1); - PIN(IN, gpa2-4, NONE, LV1); - PIN(IN, gpa2-5, DOWN, LV1); - PIN(IN, gpa2-6, DOWN, LV1); - PIN(IN, gpa2-7, NONE, LV1); - - PIN(IN, gpa3-0, DOWN, LV1); - PIN(IN, gpa3-1, DOWN, LV1); - PIN(IN, gpa3-2, NONE, LV1); - PIN(IN, gpa3-3, DOWN, LV1); - PIN(IN, gpa3-4, NONE, LV1); - PIN(IN, gpa3-5, DOWN, LV1); - PIN(IN, gpa3-6, DOWN, LV1); - PIN(IN, gpa3-7, DOWN, LV1); - - PIN(IN, gpf1-0, NONE, LV1); - PIN(IN, gpf1-1, NONE, LV1); - PIN(IN, gpf1-2, DOWN, LV1); - PIN(IN, gpf1-4, UP, LV1); - PIN(OUT, gpf1-5, NONE, LV1); - PIN(IN, gpf1-6, DOWN, LV1); - PIN(IN, gpf1-7, DOWN, LV1); - - PIN(IN, gpf2-0, DOWN, LV1); - PIN(IN, gpf2-1, DOWN, LV1); - PIN(IN, gpf2-2, DOWN, LV1); - PIN(IN, gpf2-3, DOWN, LV1); - - PIN(IN, gpf3-0, DOWN, LV1); - PIN(IN, gpf3-1, DOWN, LV1); - PIN(IN, gpf3-2, NONE, LV1); - PIN(IN, gpf3-3, DOWN, LV1); - - PIN(IN, gpf4-0, DOWN, LV1); - PIN(IN, gpf4-1, DOWN, LV1); - PIN(IN, gpf4-2, DOWN, LV1); - PIN(IN, gpf4-3, DOWN, LV1); - PIN(IN, gpf4-4, DOWN, LV1); - PIN(IN, gpf4-5, DOWN, LV1); - PIN(IN, gpf4-6, DOWN, LV1); - PIN(IN, gpf4-7, DOWN, LV1); - - PIN(IN, gpf5-0, DOWN, LV1); - PIN(IN, gpf5-1, DOWN, LV1); - PIN(IN, gpf5-2, DOWN, LV1); - PIN(IN, gpf5-3, DOWN, LV1); - PIN(OUT, gpf5-4, NONE, LV1); - PIN(IN, gpf5-5, DOWN, LV1); - PIN(IN, gpf5-6, DOWN, LV1); - PIN(IN, gpf5-7, DOWN, LV1); + PIN(INPUT, gpa0-0, DOWN, LV1); + PIN(INPUT, gpa0-1, NONE, LV1); + PIN(INPUT, gpa0-2, DOWN, LV1); + PIN(INPUT, gpa0-3, NONE, LV1); + PIN(INPUT, gpa0-4, NONE, LV1); + PIN(INPUT, gpa0-5, DOWN, LV1); + PIN(INPUT, gpa0-6, NONE, LV1); + PIN(INPUT, gpa0-7, NONE, LV1); + + PIN(INPUT, gpa1-0, UP, LV1); + PIN(INPUT, gpa1-1, NONE, LV1); + PIN(INPUT, gpa1-2, NONE, LV1); + PIN(INPUT, gpa1-3, DOWN, LV1); + PIN(INPUT, gpa1-4, DOWN, LV1); + PIN(INPUT, gpa1-5, NONE, LV1); + PIN(INPUT, gpa1-6, NONE, LV1); + PIN(INPUT, gpa1-7, NONE, LV1); + + PIN(INPUT, gpa2-0, NONE, LV1); + PIN(INPUT, gpa2-1, NONE, LV1); + PIN(INPUT, gpa2-2, NONE, LV1); + PIN(INPUT, gpa2-3, DOWN, LV1); + PIN(INPUT, gpa2-4, NONE, LV1); + PIN(INPUT, gpa2-5, DOWN, LV1); + PIN(INPUT, gpa2-6, DOWN, LV1); + PIN(INPUT, gpa2-7, NONE, LV1); + + PIN(INPUT, gpa3-0, DOWN, LV1); + PIN(INPUT, gpa3-1, DOWN, LV1); + PIN(INPUT, gpa3-2, NONE, LV1); + PIN(INPUT, gpa3-3, DOWN, LV1); + PIN(INPUT, gpa3-4, NONE, LV1); + PIN(INPUT, gpa3-5, DOWN, LV1); + PIN(INPUT, gpa3-6, DOWN, LV1); + PIN(INPUT, gpa3-7, DOWN, LV1); + + PIN(INPUT, gpf1-0, NONE, LV1); + PIN(INPUT, gpf1-1, NONE, LV1); + PIN(INPUT, gpf1-2, DOWN, LV1); + PIN(INPUT, gpf1-4, UP, LV1); + PIN(OUTPUT, gpf1-5, NONE, LV1); + PIN(INPUT, gpf1-6, DOWN, LV1); + PIN(INPUT, gpf1-7, DOWN, LV1); + + PIN(INPUT, gpf2-0, DOWN, LV1); + PIN(INPUT, gpf2-1, DOWN, LV1); + PIN(INPUT, gpf2-2, DOWN, LV1); + PIN(INPUT, gpf2-3, DOWN, LV1); + + PIN(INPUT, gpf3-0, DOWN, LV1); + PIN(INPUT, gpf3-1, DOWN, LV1); + PIN(INPUT, gpf3-2, NONE, LV1); + PIN(INPUT, gpf3-3, DOWN, LV1); + + PIN(INPUT, gpf4-0, DOWN, LV1); + PIN(INPUT, gpf4-1, DOWN, LV1); + PIN(INPUT, gpf4-2, DOWN, LV1); + PIN(INPUT, gpf4-3, DOWN, LV1); + PIN(INPUT, gpf4-4, DOWN, LV1); + PIN(INPUT, gpf4-5, DOWN, LV1); + PIN(INPUT, gpf4-6, DOWN, LV1); + PIN(INPUT, gpf4-7, DOWN, LV1); + + PIN(INPUT, gpf5-0, DOWN, LV1); + PIN(INPUT, gpf5-1, DOWN, LV1); + PIN(INPUT, gpf5-2, DOWN, LV1); + PIN(INPUT, gpf5-3, DOWN, LV1); + PIN(OUTPUT, gpf5-4, NONE, LV1); + PIN(INPUT, gpf5-5, DOWN, LV1); + PIN(INPUT, gpf5-6, DOWN, LV1); + PIN(INPUT, gpf5-7, DOWN, LV1); }; te_irq: te_irq { @@ -826,8 +826,8 @@ pinctrl-0 = <&initial_cpif>; initial_cpif: initial-state { - PIN(IN, gpv6-0, DOWN, LV1); - PIN(IN, gpv6-1, DOWN, LV1); + PIN(INPUT, gpv6-0, DOWN, LV1); + PIN(INPUT, gpv6-1, DOWN, LV1); }; }; @@ -836,9 +836,9 @@ pinctrl-0 = <&initial_ese>; initial_ese: initial-state { - PIN(IN, gpj2-0, DOWN, LV1); - PIN(IN, gpj2-1, DOWN, LV1); - PIN(IN, gpj2-2, DOWN, LV1); + PIN(INPUT, gpj2-0, DOWN, LV1); + PIN(INPUT, gpj2-1, DOWN, LV1); + PIN(INPUT, gpj2-2, DOWN, LV1); }; }; @@ -847,11 +847,11 @@ pinctrl-0 = <&initial_fsys>; initial_fsys: initial-state { - PIN(IN, gpr3-0, NONE, LV1); - PIN(IN, gpr3-1, DOWN, LV1); - PIN(IN, gpr3-2, DOWN, LV1); - PIN(IN, gpr3-3, DOWN, LV1); - PIN(IN, gpr3-7, NONE, LV1); + PIN(INPUT, gpr3-0, NONE, LV1); + PIN(INPUT, gpr3-1, DOWN, LV1); + PIN(INPUT, gpr3-2, DOWN, LV1); + PIN(INPUT, gpr3-3, DOWN, LV1); + PIN(INPUT, gpr3-7, NONE, LV1); }; }; @@ -860,14 +860,14 @@ pinctrl-0 = <&initial_imem>; initial_imem: initial-state { - PIN(IN, gpf0-0, UP, LV1); - PIN(IN, gpf0-1, UP, LV1); - PIN(IN, gpf0-2, DOWN, LV1); - PIN(IN, gpf0-3, UP, LV1); - PIN(IN, gpf0-4, DOWN, LV1); - PIN(IN, gpf0-5, NONE, LV1); - PIN(IN, gpf0-6, DOWN, LV1); - PIN(IN, gpf0-7, UP, LV1); + PIN(INPUT, gpf0-0, UP, LV1); + PIN(INPUT, gpf0-1, UP, LV1); + PIN(INPUT, gpf0-2, DOWN, LV1); + PIN(INPUT, gpf0-3, UP, LV1); + PIN(INPUT, gpf0-4, DOWN, LV1); + PIN(INPUT, gpf0-5, NONE, LV1); + PIN(INPUT, gpf0-6, DOWN, LV1); + PIN(INPUT, gpf0-7, UP, LV1); }; }; @@ -876,7 +876,7 @@ pinctrl-0 = <&initial_nfc>; initial_nfc: initial-state { - PIN(IN, gpj0-2, DOWN, LV1); + PIN(INPUT, gpj0-2, DOWN, LV1); }; }; @@ -885,54 +885,54 @@ pinctrl-0 = <&initial_peric>; initial_peric: initial-state { - PIN(IN, gpv7-0, DOWN, LV1); - PIN(IN, gpv7-1, DOWN, LV1); - PIN(IN, gpv7-2, NONE, LV1); - PIN(IN, gpv7-3, DOWN, LV1); - PIN(IN, gpv7-4, DOWN, LV1); - PIN(IN, gpv7-5, DOWN, LV1); + PIN(INPUT, gpv7-0, DOWN, LV1); + PIN(INPUT, gpv7-1, DOWN, LV1); + PIN(INPUT, gpv7-2, NONE, LV1); + PIN(INPUT, gpv7-3, DOWN, LV1); + PIN(INPUT, gpv7-4, DOWN, LV1); + PIN(INPUT, gpv7-5, DOWN, LV1); - PIN(IN, gpb0-4, DOWN, LV1); + PIN(INPUT, gpb0-4, DOWN, LV1); - PIN(IN, gpc0-2, DOWN, LV1); - PIN(IN, gpc0-5, DOWN, LV1); - PIN(IN, gpc0-7, DOWN, LV1); + PIN(INPUT, gpc0-2, DOWN, LV1); + PIN(INPUT, gpc0-5, DOWN, LV1); + PIN(INPUT, gpc0-7, DOWN, LV1); - PIN(IN, gpc1-1, DOWN, LV1); + PIN(INPUT, gpc1-1, DOWN, LV1); - PIN(IN, gpc3-4, NONE, LV1); - PIN(IN, gpc3-5, NONE, LV1); - PIN(IN, gpc3-6, NONE, LV1); - PIN(IN, gpc3-7, NONE, LV1); + PIN(INPUT, gpc3-4, NONE, LV1); + PIN(INPUT, gpc3-5, NONE, LV1); + PIN(INPUT, gpc3-6, NONE, LV1); + PIN(INPUT, gpc3-7, NONE, LV1); - PIN(OUT, gpg0-0, NONE, LV1); - PIN(FUNC1, gpg0-1, DOWN, LV1); + PIN(OUTPUT, gpg0-0, NONE, LV1); + PIN(2, gpg0-1, DOWN, LV1); - PIN(IN, gpd2-5, DOWN, LV1); + PIN(INPUT, gpd2-5, DOWN, LV1); - PIN(IN, gpd4-0, NONE, LV1); - PIN(IN, gpd4-1, DOWN, LV1); - PIN(IN, gpd4-2, DOWN, LV1); - PIN(IN, gpd4-3, DOWN, LV1); - PIN(IN, gpd4-4, DOWN, LV1); + PIN(INPUT, gpd4-0, NONE, LV1); + PIN(INPUT, gpd4-1, DOWN, LV1); + PIN(INPUT, gpd4-2, DOWN, LV1); + PIN(INPUT, gpd4-3, DOWN, LV1); + PIN(INPUT, gpd4-4, DOWN, LV1); - PIN(IN, gpd6-3, DOWN, LV1); + PIN(INPUT, gpd6-3, DOWN, LV1); - PIN(IN, gpd8-1, UP, LV1); + PIN(INPUT, gpd8-1, UP, LV1); - PIN(IN, gpg1-0, DOWN, LV1); - PIN(IN, gpg1-1, DOWN, LV1); - PIN(IN, gpg1-2, DOWN, LV1); - PIN(IN, gpg1-3, DOWN, LV1); - PIN(IN, gpg1-4, DOWN, LV1); + PIN(INPUT, gpg1-0, DOWN, LV1); + PIN(INPUT, gpg1-1, DOWN, LV1); + PIN(INPUT, gpg1-2, DOWN, LV1); + PIN(INPUT, gpg1-3, DOWN, LV1); + PIN(INPUT, gpg1-4, DOWN, LV1); - PIN(IN, gpg2-0, DOWN, LV1); - PIN(IN, gpg2-1, DOWN, LV1); + PIN(INPUT, gpg2-0, DOWN, LV1); + PIN(INPUT, gpg2-1, DOWN, LV1); - PIN(IN, gpg3-0, DOWN, LV1); - PIN(IN, gpg3-1, DOWN, LV1); - PIN(IN, gpg3-5, DOWN, LV1); - PIN(IN, gpg3-7, DOWN, LV1); + PIN(INPUT, gpg3-0, DOWN, LV1); + PIN(INPUT, gpg3-1, DOWN, LV1); + PIN(INPUT, gpg3-5, DOWN, LV1); + PIN(INPUT, gpg3-7, DOWN, LV1); }; }; @@ -941,7 +941,7 @@ pinctrl-0 = <&initial_touch>; initial_touch: initial-state { - PIN(IN, gpj1-2, DOWN, LV1); + PIN(INPUT, gpj1-2, DOWN, LV1); }; }; -- 2.11.0