From patchwork Mon Jul 27 14:58:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kgene@kernel.org X-Patchwork-Id: 6874771 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id F326D9F358 for ; Mon, 27 Jul 2015 14:58:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2144F20561 for ; Mon, 27 Jul 2015 14:58:50 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B635B2051C for ; Mon, 27 Jul 2015 14:58:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753792AbbG0O6r (ORCPT ); Mon, 27 Jul 2015 10:58:47 -0400 Received: from mailout4.samsung.com ([203.254.224.34]:56891 "EHLO mailout4.samsung.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752831AbbG0O6q (ORCPT ); Mon, 27 Jul 2015 10:58:46 -0400 Received: from epcpsbgr4.samsung.com (u144.gpu120.samsung.co.kr [203.254.230.144]) by mailout4.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NS5027FWIXXUMC0@mailout4.samsung.com> for linux-samsung-soc@vger.kernel.org; Mon, 27 Jul 2015 23:58:45 +0900 (KST) Received: from epcpsbgm1new.samsung.com ( [172.20.52.132]) by epcpsbgr4.samsung.com (EPCPMTA) with SMTP id 02.5C.20564.42746B55; Mon, 27 Jul 2015 23:58:45 +0900 (KST) X-AuditID: cbfee690-f796f6d000005054-9c-55b647240078 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1new.samsung.com (EPCPMTA) with SMTP id 5C.44.23663.42746B55; Mon, 27 Jul 2015 23:58:44 +0900 (KST) Received: from DOKGENEKIM04 ([12.36.165.190]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NS500845IXWTY50@mmp2.samsung.com>; Mon, 27 Jul 2015 23:58:44 +0900 (KST) From: Kukjin Kim To: linux-samsung-soc@vger.kernel.org Cc: Krzysztof Kozlowski Subject: [PATCH 09/12] ARM: SAMSUNG: local keypad header in mach-s3c64xx Date: Mon, 27 Jul 2015 23:58:44 +0900 Message-id: <014201d0c87c$bbc9d150$335d73f0$@kernel.org> MIME-version: 1.0 Content-type: text/plain; charset=us-ascii Content-transfer-encoding: 7bit X-Mailer: Microsoft Outlook 14.0 Thread-index: AdDIfLh0ajFuFL2+SlaZXqu1RR7nFQ== Content-language: ko X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprAIsWRmVeSWpSXmKPExsWyRsSkRVfVfVuowc4si9cvDC1mnN/H5MDk 0bdlFaPH501yAUxRXDYpqTmZZalF+nYJXBlPOl8zFkwUrvj2ZCt7A+N0gS5GTg4JAROJye+u sUDYYhIX7q1nA7GFBFYwSvy9JgZTc+f2RKYuRi6g+CxGiX9/9jJDOO8ZJRb9OwjUzcHBJqAs 0dikD9IgLKAlsXBLE9hQEQFVic9tC9hBbGYBQ4mf7/6wQ9R4SMz6t4UZxGYBqvn/8i8TiM0r YCFx4ulRKFtQ4sfkeywQvVoS63ceZ4Kw5SU2r3nLDHGcgsSOs68ZIXbpSXQde8cGUSMise/F O0aQOyUEFrFLfJi7lw1imYDEt8mHwG6WEJCV2HQAao6kxMEVN1gmMIrPQrJ6FpLVs5CsnoVk xQJGllWMoqkFyQXFSelFJnrFibnFpXnpesn5uZsYgRF1+t+zCTsY7x2wPsQowMGoxMN7QWVr qBBrYllxZe4hRlOgiyYyS4km5wPjNq8k3tDYzMjC1MTU2Mjc0kxJnPe11M9gIYH0xJLU7NTU gtSi+KLSnNTiQ4xMHJxSDYxVErKrKuy+zVZeumfjLKkTr8rb2bP/sjc8zH255NoPfekzMVH3 g/qe//XYfNFJvVc4uoozaP3xY/eKlsmzFnL0HvBzaX4ZacfUxydovrB6ZWp12RLuTnOvo3ci ei1W/e9T/GDazOUhcvXjxJ08hRq6Td95Mr/mbujg09Vm/ir0ea+t54vvj5VYijMSDbWYi4oT AfvtcOOjAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrPIsWRmVeSWpSXmKPExsVy+t9jQV0V922hBuearCxevzC0mHF+H5MD k0ffllWMHp83yQUwRTUw2mSkJqakFimk5iXnp2TmpdsqeQfHO8ebmhkY6hpaWpgrKeQl5qba Krn4BOi6ZeYAjVdSKEvMKQUKBSQWFyvp22GaEBripmsB0xih6xsSBNdjZIAGEtYxZjzpfM1Y MFG44tuTrewNjNMFuhg5OSQETCTu3J7IBGGLSVy4t56ti5GLQ0hgFqPEvz97mSGc94wSi/4d ZOli5OBgE1CWaGzSB2kQFtCSWLiliQXEFhFQlfjctoAdxGYWMJT4+e4PO0SNh8Ssf1uYQWwW oJr/L/+CLeMVsJA48fQolC0o8WPyPRaIXi2J9TuPM0HY8hKb17xlhjhOQWLH2deMELv0JLqO vWODqBGR2PfiHeMERsFZSEbNQjJqFpJRs5C0LGBkWcUokVqQXFCclJ5rmJdarlecmFtcmpeu l5yfu4kRHLnPpHYwHtzlfohRgINRiYf3gsrWUCHWxLLiytxDjBIczEoivKZ220KFeFMSK6tS i/Lji0pzUosPMZoCPTuRWUo0OR+YVPJK4g2NTcyMLI3MLIxMzM2VxHllN2wOFRJITyxJzU5N LUgtgulj4uCUamCss/aNfNpZ3Xx/uZT0GxaWqa3drru8zdsmFseYM5+M3XArcs2v+i4Wxy+/ /tQf/NMTntv9ciPjg2/WZx/9Wv5Fx0j7u/TVnXue/ZFYFZcj1vvEudkp9ugC6f/Hl8W2LOje 9+FAcXNayLcF/0vPdk7eF3RVYFVRQUZMOO+V1JLLMq13j+brnepTYinOSDTUYi4qTgQAWMCw P/ICAAA= 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=-8.2 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 moves keypad header file into mach-s3c64xx. Cc: Krzysztof Kozlowski Signed-off-by: Kukjin Kim --- arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/keypad.h | 0 arch/arm/mach-s3c64xx/mach-crag6410.c | 2 +- arch/arm/mach-s3c64xx/mach-smdk6410.c | 2 +- arch/arm/mach-s3c64xx/setup-keypad.c | 3 ++- 4 files changed, 4 insertions(+), 3 deletions(-) rename arch/arm/{plat-samsung/include/plat => mach-s3c64xx}/keypad.h (100%) diff --git a/arch/arm/plat-samsung/include/plat/keypad.h b/arch/arm/mach-s3c64xx/keypad.h similarity index 100% rename from arch/arm/plat-samsung/include/plat/keypad.h rename to arch/arm/mach-s3c64xx/keypad.h diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c index 65c426b..098c144 100644 --- a/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/arch/arm/mach-s3c64xx/mach-crag6410.c @@ -57,7 +57,6 @@ #include #include -#include #include #include #include @@ -67,6 +66,7 @@ #include "common.h" #include "crag6410.h" +#include "keypad.h" #include "regs-gpio-memport.h" #include "regs-modem.h" #include "regs-sys.h" diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c index d590b88..4bb8b8b 100644 --- a/arch/arm/mach-s3c64xx/mach-smdk6410.c +++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c @@ -67,11 +67,11 @@ #include #include #include -#include #include #include "backlight.h" #include "common.h" +#include "keypad.h" #include "regs-modem.h" #include "regs-srom.h" #include "regs-sys.h" diff --git a/arch/arm/mach-s3c64xx/setup-keypad.c b/arch/arm/mach-s3c64xx/setup-keypad.c index 6ad9a89..128a803 100644 --- a/arch/arm/mach-s3c64xx/setup-keypad.c +++ b/arch/arm/mach-s3c64xx/setup-keypad.c @@ -12,9 +12,10 @@ #include #include -#include #include +#include "keypad.h" + void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols) { /* Set all the necessary GPK pins to special-function 3: KP_ROW[x] */