ARM: SAMSUNG: local keypad header in mach-s3c64xx

PATCH In review Kukjin Kim 1 participant 1 message Jul 27, 2015

Subsystems (3)

Arm (32-bit) Arm sub-architectures Arm Samsung Exynos

lore

Share & tools

lore

Kukjin Kim

author

2015-07-27 14:58 UTC #0 lore raw

PATCH 9/12 ARM: SAMSUNG: local keypad header in mach-s3c64xx

This patch moves keypad header file into mach-s3c64xx.

Cc Krzysztof Kozlowski <[email protected]>

Signed-off-by Kukjin Kim <[email protected]>

---
 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%)

arch/arm/mach-s3c64xx/keypad.h renamed from arch/arm/plat-samsung/include/plat/keypad.h +0 -0

similarity index 100%
rename from arch/arm/plat-samsung/include/plat/keypad.h
rename to arch/arm/mach-s3c64xx/keypad.h

arch/arm/mach-s3c64xx/mach-crag6410.c +1 -1

index 65c426b..098c144 100644
@@ -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"

arch/arm/mach-s3c64xx/mach-smdk6410.c +1 -1

index d590b88..4bb8b8b 100644
@@ -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"

arch/arm/mach-s3c64xx/setup-keypad.c +2 -1

index 6ad9a89..128a803 100644
@@ -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] */

Signature · 1 line

2.0.0