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

Commit 2211f28c authored by Naveen Krishna Ch's avatar Naveen Krishna Ch Committed by Kukjin Kim
Browse files

ARM: S5PC100: Add keypad device to the SMDKC100 board 



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

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

arch/arm/mach-s5pc100/Kconfig

+7 −0
Original line number Diff line number Diff line
@@ -30,6 +30,11 @@ config S5PC100_SETUP_IDE 
	help

	  Common setup code for S5PC100 IDE GPIO configurations



config S5PC100_SETUP_KEYPAD

	bool

	help

	  Common setup code for KEYPAD GPIO configurations.



config S5PC100_SETUP_SDHCI

	bool

	select S5PC100_SETUP_SDHCI_GPIO
@@ -51,12 +56,14 @@ config MACH_SMDKC100 
	select S3C_DEV_HSMMC

	select S3C_DEV_HSMMC1

	select S3C_DEV_HSMMC2

	select SAMSUNG_DEV_KEYPAD

	select SAMSUNG_DEV_TS

	select S3C_DEV_WDT

	select HAVE_S3C2410_WATCHDOG

	select S5PC100_SETUP_FB_24BPP

	select S5PC100_SETUP_I2C1

	select S5PC100_SETUP_IDE

	select S5PC100_SETUP_KEYPAD

	select S5PC100_SETUP_SDHCI

	help

	  Machine support for the Samsung SMDKC100

arch/arm/mach-s5pc100/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ obj-$(CONFIG_CPU_S5PC100) += dma.o 
obj-$(CONFIG_S5PC100_SETUP_FB_24BPP)	+= setup-fb-24bpp.o

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

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

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

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

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

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

+2 −0
Original line number Diff line number Diff line
@@ -137,11 +137,13 @@ 
#define S3C_PA_HSMMC2		S5PC100_PA_HSMMC(2)

#define S3C_PA_KEYPAD		S5PC100_PA_KEYPAD

#define S3C_PA_WDT		S5PC100_PA_WATCHDOG

#define S3C_PA_TSADC		S5PC100_PA_TSADC

#define S3C_PA_ONENAND		S5PC100_PA_ONENAND

#define S3C_PA_ONENAND_BUF	S5PC100_PA_ONENAND_BUF

#define S3C_SZ_ONENAND_BUF	S5PC100_SZ_ONENAND_BUF



#define SAMSUNG_PA_ADC		S5PC100_PA_TSADC

#define SAMSUNG_PA_CFCON	S5PC100_PA_CFCON

#define SAMSUNG_PA_KEYPAD	S5PC100_PA_KEYPAD



#endif /* __ASM_ARCH_C100_MAP_H */

arch/arm/mach-s5pc100/mach-smdkc100.c

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

#include <linux/fb.h>

#include <linux/delay.h>

#include <linux/input.h>



#include <asm/mach/arch.h>

#include <asm/mach/map.h>
@@ -44,6 +45,7 @@ 
#include <plat/iic.h>

#include <plat/ata.h>

#include <plat/adc.h>

#include <plat/keypad.h>

#include <plat/ts.h>



/* Following are default values for UCON, ULCON and UFCON UART registers */
@@ -156,6 +158,25 @@ static struct s3c_ide_platdata smdkc100_ide_pdata __initdata = { 
	.setup_gpio	= s5pc100_ide_setup_gpio,

};



static uint32_t smdkc100_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 smdkc100_keymap_data __initdata = {

	.keymap		= smdkc100_keymap,

	.keymap_size	= ARRAY_SIZE(smdkc100_keymap),

};



static struct samsung_keypad_platdata smdkc100_keypad_data __initdata = {

	.keymap_data	= &smdkc100_keymap_data,

	.rows		= 2,

	.cols		= 8,

};



static struct platform_device *smdkc100_devices[] __initdata = {

	&s3c_device_adc,

	&s3c_device_cfcon,
@@ -169,6 +190,7 @@ static struct platform_device *smdkc100_devices[] __initdata = { 
	&s3c_device_wdt,

	&smdkc100_lcd_powerdev,

	&s5pc100_device_iis0,

	&samsung_device_keypad,

	&s5pc100_device_ac97,

};
@@ -198,6 +220,8 @@ static void __init smdkc100_machine_init(void) 
	s3c_fb_set_platdata(&smdkc100_lcd_pdata);

	s3c_ide_set_platdata(&smdkc100_ide_pdata);



	samsung_keypad_set_platdata(&smdkc100_keypad_data);



	/* LCD init */

	gpio_request(S5PC100_GPD(0), "GPD");

	gpio_request(S5PC100_GPH0(6), "GPH0");

arch/arm/mach-s5pc100/setup-keypad.c

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/* linux/arch/arm/mach-s5pc100/setup-keypad.c

 *

 * Copyright (c) 2010 Samsung Electronics Co., Ltd.

 *		http://www.samsung.com/

 *

 * GPIO configuration for S5PC100 KeyPad device

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

*/



#include <linux/gpio.h>

#include <plat/gpio-cfg.h>



void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols)

{

	unsigned int gpio;

	unsigned int end;



	/* Set all the necessary GPH3 pins to special-function 3: KP_ROW[x] */

	end = S5PC100_GPH3(rows);

	for (gpio = S5PC100_GPH3(0); gpio < end; gpio++) {

		s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(3));

		s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);

	}



	/* Set all the necessary GPH2 pins to special-function 3: KP_COL[x] */

	end = S5PC100_GPH2(cols);

	for (gpio = S5PC100_GPH2(0); gpio < end; gpio++) {

		s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(3));

		s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);

	}

}