From: Kukjin Kim <kgene@kernel.org>
To: linux-samsung-soc@vger.kernel.org
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Subject: [PATCH 09/12] ARM: SAMSUNG: local keypad header in mach-s3c64xx
Date: Mon, 27 Jul 2015 23:58:44 +0900 [thread overview]
Message-ID: <014201d0c87c$bbc9d150$335d73f0$@kernel.org> (raw)
This patch moves keypad header file into mach-s3c64xx.
Cc: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Signed-off-by: Kukjin Kim <kgene@kernel.org>
---
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 <plat/gpio-cfg.h>
#include <linux/platform_data/spi-s3c64xx.h>
-#include <plat/keypad.h>
#include <plat/devs.h>
#include <plat/cpu.h>
#include <plat/adc.h>
@@ -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 <plat/cpu.h>
#include <plat/adc.h>
#include <linux/platform_data/touchscreen-s3c2410.h>
-#include <plat/keypad.h>
#include <plat/samsung-time.h>
#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 <linux/gpio.h>
#include <plat/gpio-cfg.h>
-#include <plat/keypad.h>
#include <mach/gpio-samsung.h>
+#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] */
--
2.0.0
reply other threads:[~2015-07-27 14:58 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='014201d0c87c$bbc9d150$335d73f0$@kernel.org' \
--to=kgene@kernel.org \
--cc=k.kozlowski@samsung.com \
--cc=linux-samsung-soc@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox