From patchwork Wed Jun 11 13:01:49 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Beomho Seo X-Patchwork-Id: 4336221 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 5E9A2BEEAA for ; Wed, 11 Jun 2014 13:02:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EDA81201DD for ; Wed, 11 Jun 2014 13:02:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id ED26F201EF for ; Wed, 11 Jun 2014 13:02:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751965AbaFKNCA (ORCPT ); Wed, 11 Jun 2014 09:02:00 -0400 Received: from mailout1.samsung.com ([203.254.224.24]:38567 "EHLO mailout1.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750929AbaFKNB7 (ORCPT ); Wed, 11 Jun 2014 09:01:59 -0400 Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N7000FOI9J23Z90@mailout1.samsung.com>; Wed, 11 Jun 2014 22:01:50 +0900 (KST) Received: from epcpsbgm1.samsung.com ( [172.20.52.116]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 5F.0A.24374.E3358935; Wed, 11 Jun 2014 22:01:50 +0900 (KST) X-AuditID: cbfee68d-b7fd46d000005f36-b6-5398533eb54b Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 17.D4.08203.E3358935; Wed, 11 Jun 2014 22:01:50 +0900 (KST) Received: from localhost.localdomain ([10.252.81.134]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N70001P49J2OK70@mmp2.samsung.com>; Wed, 11 Jun 2014 22:01:50 +0900 (KST) From: Beomho Seo To: linux-samsung-soc@vger.kernel.org, devicetree@vger.kernel.org Cc: kgene.kim@samsung.com, t.figa@samsung.com, sachin.kamat@linaro.org, myungjoo.ham@samsung.com, cw00.choi@samsung.com, jh80.chung@samsung.com, Beomho Seo Subject: [PATCH] ARM: dts: use key code macros on exynos4 series boards Date: Wed, 11 Jun 2014 22:01:49 +0900 Message-id: <1402491709-29490-1-git-send-email-beomho.seo@samsung.com> X-Mailer: git-send-email 1.7.9.5 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrHLMWRmVeSWpSXmKPExsWyRsSkRNcueEawQeMZY4vTn7axW1z/8pzV Yv6Rc6wWN361sVr0LrjKZjHj/D4mi9uNK9gsTv7pZbRYP+M1iwOnx51re9g8+rasYvT4vEku gDmKyyYlNSezLLVI3y6BK+PgqnnMBdesK37NP8LWwPhMu4uRk0NCwERi08tV7BC2mMSFe+vZ uhi5OIQEljJKbP58lA2maOeto+wQiemMEs8vLIZy2pgkXi7YwQRSxSagKfF+yhUWEFtEwFFi x5x/TCBFzAI7GCUefrkLViQs4C6xZFMfI4jNIqAqMWfyNaA4BwevgJvEnt+lIKaEgILEnEk2 IK0SAu3sEqc232SGKBeQ+Db5EAtEjazEpgPMEMdJShxccYNlAqPgAkaGVYyiqQXJBcVJ6UWG esWJucWleel6yfm5mxiBYXv637PeHYy3D1gfYkwGGjeRWUo0OR8Y9nkl8YbGZkYWpiamxkbm lmakCSuJ8yY9TAoSEkhPLEnNTk0tSC2KLyrNSS0+xMjEwSnVwHgvqfZZekqu08Iz7g/ao3f9 95/a1VoaHZ+3iPuQEKc/+37PDf0axrzGMx2bfguv2iqgtyfp++4POxuOnrkz49609xtaReX/ fzHcfza05b6aq4jZZOVlGz7OruGeWHyE/Zbb4/pXR072Gj/uF7kodccjKfH0z5dTLqZlHVi1 QHY2F8MRn3Vx+18rsRRnJBpqMRcVJwIAi1OEG3ECAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrNIsWRmVeSWpSXmKPExsVy+t9jQV274BnBBkeWq1mc/rSN3eL6l+es FvOPnGO1uPGrjdWid8FVNosZ5/cxWdxuXMFmcfJPL6PF+hmvWRw4Pe5c28Pm0bdlFaPH501y AcxRDYw2GamJKalFCql5yfkpmXnptkrewfHO8aZmBoa6hpYW5koKeYm5qbZKLj4Bum6ZOUB3 KCmUJeaUAoUCEouLlfTtME0IDXHTtYBpjND1DQmC6zEyQAMJaxgzDq6ax1xwzbri1/wjbA2M z7S7GDk5JARMJHbeOsoOYYtJXLi3nq2LkYtDSGA6o8TzC4vZIZw2JomXC3YwgVSxCWhKvJ9y hQXEFhFwlNgx5x8TSBGzwA5GiYdf7oIVCQu4SyzZ1McIYrMIqErMmXwNKM7BwSvgJrHndymI KSGgIDFnks0ERu4FjAyrGEVTC5ILipPScw31ihNzi0vz0vWS83M3MYKj4pnUDsaVDRaHGAU4 GJV4eA9ITA8WYk0sK67MPcQowcGsJMIbFjAjWIg3JbGyKrUoP76oNCe1+BBjMtDuicxSosn5 wIjNK4k3NDYxM7I0Mje0MDI2J01YSZz3QKt1oJBAemJJanZqakFqEcwWJg5OqQbG3gfhYQ9/ X+16uqvuQVfdnZpP85eEacpGm9V9MPZ7dn4Hp4GKQNK0TuaXvevCVot90HvoESMVd79h36NX AT/rtxlq7Zv89V1pTdtFzo1f97xn0ZpU/qVUaLr9mrX72l6WWHnvnL6KXbY6bu/2aUezK1I5 z5xKv9gsZnhymxA37wU5502TeAwVlFiKMxINtZiLihMBCGnPxM4CAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch use key code macros on exynos4 series boards. Using macros improve readability on device tree. Signed-off-by: Beomho Seo --- arch/arm/boot/dts/exynos4.dtsi | 1 + arch/arm/boot/dts/exynos4210-origen.dts | 1 - arch/arm/boot/dts/exynos4210-smdkv310.dts | 20 ++++++++++---------- arch/arm/boot/dts/exynos4210-trats.dts | 8 ++++---- arch/arm/boot/dts/exynos4210-universal_c210.dts | 12 ++++++------ arch/arm/boot/dts/exynos4412-smdk4412.dts | 20 ++++++++++---------- arch/arm/boot/dts/exynos4412-trats2.dts | 8 ++++---- 7 files changed, 35 insertions(+), 35 deletions(-) diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi index b8ece4b..00bf06e 100644 --- a/arch/arm/boot/dts/exynos4.dtsi +++ b/arch/arm/boot/dts/exynos4.dtsi @@ -21,6 +21,7 @@ #include #include +#include #include "skeleton.dtsi" / { diff --git a/arch/arm/boot/dts/exynos4210-origen.dts b/arch/arm/boot/dts/exynos4210-origen.dts index f767c42..b8440da 100644 --- a/arch/arm/boot/dts/exynos4210-origen.dts +++ b/arch/arm/boot/dts/exynos4210-origen.dts @@ -16,7 +16,6 @@ /dts-v1/; #include "exynos4210.dtsi" -#include / { model = "Insignal Origen evaluation board based on Exynos4210"; diff --git a/arch/arm/boot/dts/exynos4210-smdkv310.dts b/arch/arm/boot/dts/exynos4210-smdkv310.dts index 636d166..cc78ca2 100644 --- a/arch/arm/boot/dts/exynos4210-smdkv310.dts +++ b/arch/arm/boot/dts/exynos4210-smdkv310.dts @@ -91,61 +91,61 @@ key_1 { keypad,row = <0>; keypad,column = <3>; - linux,code = <2>; + linux,code = ; }; key_2 { keypad,row = <0>; keypad,column = <4>; - linux,code = <3>; + linux,code = ; }; key_3 { keypad,row = <0>; keypad,column = <5>; - linux,code = <4>; + linux,code = ; }; key_4 { keypad,row = <0>; keypad,column = <6>; - linux,code = <5>; + linux,code = ; }; key_5 { keypad,row = <0>; keypad,column = <7>; - linux,code = <6>; + linux,code = ; }; key_a { keypad,row = <1>; keypad,column = <3>; - linux,code = <30>; + linux,code = ; }; key_b { keypad,row = <1>; keypad,column = <4>; - linux,code = <48>; + linux,code = ; }; key_c { keypad,row = <1>; keypad,column = <5>; - linux,code = <46>; + linux,code = ; }; key_d { keypad,row = <1>; keypad,column = <6>; - linux,code = <32>; + linux,code = ; }; key_e { keypad,row = <1>; keypad,column = <7>; - linux,code = <18>; + linux,code = ; }; }; diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts index f516da9..0d9d143 100644 --- a/arch/arm/boot/dts/exynos4210-trats.dts +++ b/arch/arm/boot/dts/exynos4210-trats.dts @@ -128,21 +128,21 @@ vol-down-key { gpios = <&gpx2 1 1>; - linux,code = <114>; + linux,code = ; label = "volume down"; debounce-interval = <10>; }; vol-up-key { gpios = <&gpx2 0 1>; - linux,code = <115>; + linux,code = ; label = "volume up"; debounce-interval = <10>; }; power-key { gpios = <&gpx2 7 1>; - linux,code = <116>; + linux,code = ; label = "power"; debounce-interval = <10>; gpio-key,wakeup; @@ -150,7 +150,7 @@ ok-key { gpios = <&gpx3 5 1>; - linux,code = <352>; + linux,code = ; label = "ok"; debounce-interval = <10>; }; diff --git a/arch/arm/boot/dts/exynos4210-universal_c210.dts b/arch/arm/boot/dts/exynos4210-universal_c210.dts index d50eb3a..43a7bba 100644 --- a/arch/arm/boot/dts/exynos4210-universal_c210.dts +++ b/arch/arm/boot/dts/exynos4210-universal_c210.dts @@ -132,21 +132,21 @@ vol-up-key { gpios = <&gpx2 0 1>; - linux,code = <115>; + linux,code = ; label = "volume up"; debounce-interval = <1>; }; vol-down-key { gpios = <&gpx2 1 1>; - linux,code = <114>; + linux,code = ; label = "volume down"; debounce-interval = <1>; }; config-key { gpios = <&gpx2 2 1>; - linux,code = <171>; + linux,code = ; label = "config"; debounce-interval = <1>; gpio-key,wakeup; @@ -154,14 +154,14 @@ camera-key { gpios = <&gpx2 3 1>; - linux,code = <212>; + linux,code = ; label = "camera"; debounce-interval = <1>; }; power-key { gpios = <&gpx2 7 1>; - linux,code = <116>; + linux,code = ; label = "power"; debounce-interval = <1>; gpio-key,wakeup; @@ -169,7 +169,7 @@ ok-key { gpios = <&gpx3 5 1>; - linux,code = <352>; + linux,code = ; label = "ok"; debounce-interval = <1>; }; diff --git a/arch/arm/boot/dts/exynos4412-smdk4412.dts b/arch/arm/boot/dts/exynos4412-smdk4412.dts index ded0b70..5ff6985 100644 --- a/arch/arm/boot/dts/exynos4412-smdk4412.dts +++ b/arch/arm/boot/dts/exynos4412-smdk4412.dts @@ -60,61 +60,61 @@ key_1 { keypad,row = <1>; keypad,column = <3>; - linux,code = <2>; + linux,code = ; }; key_2 { keypad,row = <1>; keypad,column = <4>; - linux,code = <3>; + linux,code = ; }; key_3 { keypad,row = <1>; keypad,column = <5>; - linux,code = <4>; + linux,code = ; }; key_4 { keypad,row = <1>; keypad,column = <6>; - linux,code = <5>; + linux,code = ; }; key_5 { keypad,row = <1>; keypad,column = <7>; - linux,code = <6>; + linux,code = ; }; key_A { keypad,row = <2>; keypad,column = <6>; - linux,code = <30>; + linux,code = ; }; key_B { keypad,row = <2>; keypad,column = <7>; - linux,code = <48>; + linux,code = ; }; key_C { keypad,row = <0>; - keypad,column = <5>; + keypad,column = ; linux,code = <46>; }; key_D { keypad,row = <2>; keypad,column = <5>; - linux,code = <32>; + linux,code = ; }; key_E { keypad,row = <0>; keypad,column = <7>; - linux,code = <18>; + linux,code = ; }; }; diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts index 106a705..718436d 100644 --- a/arch/arm/boot/dts/exynos4412-trats2.dts +++ b/arch/arm/boot/dts/exynos4412-trats2.dts @@ -115,21 +115,21 @@ key-down { gpios = <&gpx3 3 1>; - linux,code = <114>; + linux,code = ; label = "volume down"; debounce-interval = <10>; }; key-up { gpios = <&gpx2 2 1>; - linux,code = <115>; + linux,code = ; label = "volume up"; debounce-interval = <10>; }; key-power { gpios = <&gpx2 7 1>; - linux,code = <116>; + linux,code = ; label = "power"; debounce-interval = <10>; gpio-key,wakeup; @@ -137,7 +137,7 @@ key-ok { gpios = <&gpx0 1 1>; - linux,code = <139>; + linux,code = ; label = "ok"; debounce-inteval = <10>; gpio-key,wakeup;