Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 290d0983 authored by Naveen Krishna Ch's avatar Naveen Krishna Ch Committed by Kukjin Kim
Browse files

ARM: S3C64XX: Add keypad device to the SMDK6410 board 



This patch is to support keypad device to the SMDK6410 board.

Signed-off-by: default avatarNaveen Krishna Ch <ch.naveen@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 995c48ad

arch/arm/mach-s3c64xx/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -67,6 +67,11 @@ config S3C64XX_SETUP_FB_24BPP 
	help

	  Common setup code for S3C64XX with an 24bpp RGB display helper.



config S3C64XX_SETUP_KEYPAD

	bool

	help

	  Common setup code for S3C64XX KEYPAD GPIO configurations



config S3C64XX_SETUP_SDHCI_GPIO

	bool

	help
@@ -107,11 +112,13 @@ config MACH_SMDK6410 
	select S3C_DEV_USB_HOST

	select S3C_DEV_USB_HSOTG

	select S3C_DEV_WDT

	select SAMSUNG_DEV_KEYPAD

	select HAVE_S3C2410_WATCHDOG

	select S3C64XX_SETUP_SDHCI

	select S3C64XX_SETUP_I2C1

	select S3C64XX_SETUP_IDE

	select S3C64XX_SETUP_FB_24BPP

	select S3C64XX_SETUP_KEYPAD

	help

	  Machine support for the Samsung SMDK6410

arch/arm/mach-s3c64xx/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ obj-$(CONFIG_S3C64XX_DMA) += dma.o 
obj-$(CONFIG_S3C64XX_SETUP_I2C0) += setup-i2c0.o

obj-$(CONFIG_S3C64XX_SETUP_I2C1) += setup-i2c1.o

obj-$(CONFIG_S3C64XX_SETUP_IDE) += setup-ide.o

obj-$(CONFIG_S3C64XX_SETUP_KEYPAD) += setup-keypad.o

obj-$(CONFIG_S3C64XX_SETUP_SDHCI) += setup-sdhci.o

obj-$(CONFIG_S3C64XX_SETUP_FB_24BPP) += setup-fb-24bpp.o

obj-$(CONFIG_S3C64XX_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o

arch/arm/mach-s3c64xx/clock.c

+6 −0
Original line number Diff line number Diff line
@@ -171,6 +171,12 @@ static struct clk init_clocks_disable[] = { 
		.ctrlbit	= S3C6410_CLKCON_PCLK_IIS2,

	}, {

#endif

		.name		= "keypad",

		.id		= -1,

		.parent		= &clk_p,

		.enable		= s3c64xx_pclk_ctrl,

		.ctrlbit	= S3C_CLKCON_PCLK_KEYPAD,

	}, {

		.name		= "spi",

		.id		= 0,

		.parent		= &clk_p,

arch/arm/mach-s3c64xx/include/mach/map.h

+2 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ 
#define S3C64XX_PA_USB_HSOTG	(0x7C000000)

#define S3C64XX_PA_WATCHDOG	(0x7E004000)

#define S3C64XX_PA_RTC		(0x7E005000)

#define S3C64XX_PA_KEYPAD	(0x7E00A000)

#define S3C64XX_PA_ADC		(0x7E00B000)

#define S3C64XX_PA_SYSCON	(0x7E00F000)

#define S3C64XX_PA_AC97		(0x7F001000)
@@ -124,5 +125,6 @@ 


#define SAMSUNG_PA_ADC		S3C64XX_PA_ADC

#define SAMSUNG_PA_CFCON	S3C64XX_PA_CFCON

#define SAMSUNG_PA_KEYPAD	S3C64XX_PA_KEYPAD



#endif /* __ASM_ARCH_6400_MAP_H */

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

+24 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/list.h>

#include <linux/timer.h>

#include <linux/init.h>

#include <linux/input.h>

#include <linux/serial_core.h>

#include <linux/platform_device.h>

#include <linux/io.h>
@@ -67,6 +68,7 @@ 
#include <plat/cpu.h>

#include <plat/adc.h>

#include <plat/ts.h>

#include <plat/keypad.h>



#define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK

#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
@@ -247,6 +249,25 @@ static struct s3c_ide_platdata smdk6410_ide_pdata __initdata = { 
	.setup_gpio	= s3c64xx_ide_setup_gpio,

};



static uint32_t smdk6410_keymap[] __initdata = {

	/* KEY(row, col, keycode) */

	KEY(0, 3, KEY_1), KEY(0, 4, KEY_2), KEY(0, 5, KEY_3),

	KEY(0, 6, KEY_4), KEY(0, 7, KEY_5),

	KEY(1, 3, KEY_A), KEY(1, 4, KEY_B), KEY(1, 5, KEY_C),

	KEY(1, 6, KEY_D), KEY(1, 7, KEY_E)

};



static struct matrix_keymap_data smdk6410_keymap_data __initdata = {

	.keymap		= smdk6410_keymap,

	.keymap_size	= ARRAY_SIZE(smdk6410_keymap),

};



static struct samsung_keypad_platdata smdk6410_keypad_data __initdata = {

	.keymap_data	= &smdk6410_keymap_data,

	.rows		= 2,

	.cols		= 8,

};



static struct map_desc smdk6410_iodesc[] = {};



static struct platform_device *smdk6410_devices[] __initdata = {
@@ -262,6 +283,7 @@ static struct platform_device *smdk6410_devices[] __initdata = { 
	&s3c_device_ohci,

	&s3c_device_usb_hsotg,

	&s3c64xx_device_iisv4,

	&samsung_device_keypad,



#ifdef CONFIG_REGULATOR

	&smdk6410_b_pwr_5v,
@@ -643,6 +665,8 @@ static void __init smdk6410_machine_init(void) 
	s3c_i2c1_set_platdata(NULL);

	s3c_fb_set_platdata(&smdk6410_lcd_pdata);



	samsung_keypad_set_platdata(&smdk6410_keypad_data);



	s3c24xx_ts_set_platdata(&s3c_ts_platform);



	/* configure nCS1 width to 16 bits */