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

Commit e7d0628c authored by Joonyoung Shim's avatar Joonyoung Shim Committed by Kukjin Kim
Browse files

ARM: S5PV210: Add keypad device helpers 



This patch adds the keypad device platform helpers for S5PV210 cpu.

Signed-off-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent 6901bbc8

arch/arm/mach-s5pv210/Kconfig

+5 −0
Original line number Diff line number Diff line
@@ -37,6 +37,11 @@ config S5PV210_SETUP_FB_24BPP 
	help

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



config S5PV210_SETUP_KEYPAD

	bool

	help

	  Common setup code for keypad.



config S5PV210_SETUP_SDHCI

        bool

        select S5PV210_SETUP_SDHCI_GPIO

arch/arm/mach-s5pv210/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -32,5 +32,6 @@ obj-$(CONFIG_S5PV210_SETUP_FB_24BPP) += setup-fb-24bpp.o 
obj-$(CONFIG_S5PV210_SETUP_I2C1) 	+= setup-i2c1.o

obj-$(CONFIG_S5PV210_SETUP_I2C2) 	+= setup-i2c2.o

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

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

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

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

arch/arm/mach-s5pv210/cpu.c

+4 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <plat/s5pv210.h>

#include <plat/ata-core.h>

#include <plat/iic-core.h>

#include <plat/keypad-core.h>

#include <plat/sdhci.h>



/* Initial IO mappings */
@@ -93,6 +94,9 @@ void __init s5pv210_map_io(void) 
	s3c_i2c0_setname("s3c2440-i2c");

	s3c_i2c1_setname("s3c2440-i2c");

	s3c_i2c2_setname("s3c2440-i2c");



	/* Use s5pv210-keypad instead of samsung-keypad */

	samsung_keypad_setname("s5pv210-keypad");

}



void __init s5pv210_init_clocks(int xtal)

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

+3 −0
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ 
#define S5PV210_PA_SPI0		0xE1300000

#define S5PV210_PA_SPI1		0xE1400000



#define S5PV210_PA_KEYPAD	(0xE1600000)



#define S5PV210_PA_IIC0		(0xE1800000)

#define S5PV210_PA_IIC1		(0xFAB00000)

#define S5PV210_PA_IIC2		(0xE1A00000)
@@ -107,5 +109,6 @@ 


#define SAMSUNG_PA_ADC		S5PV210_PA_ADC

#define SAMSUNG_PA_CFCON	S5PV210_PA_CFCON

#define SAMSUNG_PA_KEYPAD	S5PV210_PA_KEYPAD



#endif /* __ASM_ARCH_MAP_H */

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

0 → 100644
+34 −0
Original line number Diff line number Diff line 
/*

 * linux/arch/arm/mach-s5pv210/setup-keypad.c

 *

 * Copyright (C) 2010 Samsung Electronics Co.Ltd

 * Author: Joonyoung Shim <jy0922.shim@samsung.com>

 *

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

 *  under  the terms of  the GNU General  Public License as published by the

 *  Free Software Foundation;  either version 2 of the  License, or (at your

 *  option) any later version.

 *

 */



#include <linux/gpio.h>

#include <plat/gpio-cfg.h>



void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols)

{

	unsigned int gpio, end;



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

	end = S5PV210_GPH3(rows);

	for (gpio = S5PV210_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 = S5PV210_GPH2(cols);

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

		s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(3));

		s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);

	}

}