Joonyoung Shim wrote: > > This patch adds the keypad device platform helpers for S5PV210 cpu. > > Signed-off-by: Joonyoung Shim <jy0922.s...@samsung.com> > Signed-off-by: Kyungmin Park <kyungmin.p...@samsung.com> > --- > arch/arm/mach-s5pv210/Kconfig | 5 ++++ > arch/arm/mach-s5pv210/Makefile | 1 + > arch/arm/mach-s5pv210/cpu.c | 4 +++ > arch/arm/mach-s5pv210/include/mach/map.h | 3 ++ > arch/arm/mach-s5pv210/setup-keypad.c | 34 > ++++++++++++++++++++++++++++++ > 5 files changed, 47 insertions(+), 0 deletions(-) > create mode 100644 arch/arm/mach-s5pv210/setup-keypad.c > > diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig > index 0761eac..692d01c 100644 > --- a/arch/arm/mach-s5pv210/Kconfig > +++ b/arch/arm/mach-s5pv210/Kconfig > @@ -32,6 +32,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 > diff --git a/arch/arm/mach-s5pv210/Makefile b/arch/arm/mach-s5pv210/Makefile > index 30be9a6..aae592a 100644 > --- a/arch/arm/mach-s5pv210/Makefile > +++ b/arch/arm/mach-s5pv210/Makefile > @@ -31,5 +31,6 @@ obj-$(CONFIG_S5PC110_DEV_ONENAND) += dev-onenand.o > 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_KEYPAD) += setup-keypad.o > obj-$(CONFIG_S5PV210_SETUP_SDHCI) += setup-sdhci.o > obj-$(CONFIG_S5PV210_SETUP_SDHCI_GPIO) += setup-sdhci-gpio.o > diff --git a/arch/arm/mach-s5pv210/cpu.c b/arch/arm/mach-s5pv210/cpu.c > index 411a4a9..a3034ac 100644 > --- a/arch/arm/mach-s5pv210/cpu.c > +++ b/arch/arm/mach-s5pv210/cpu.c > @@ -80,6 +80,10 @@ void __init s5pv210_map_io(void) > s3c_device_adc.name = "s3c64xx-adc"; > #endif > > +#ifdef CONFIG_SAMSUNG_DEV_KEYPAD > + samsung_device_keypad.name = "s5pv210-keypad"; > +#endif > +
Please use one method. See Kyungmin Park's prev. comments on the subject. > iotable_init(s5pv210_iodesc, ARRAY_SIZE(s5pv210_iodesc)); > > /* initialise device information early */ > diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach- > s5pv210/include/mach/map.h > index 34eb168..e2f6e2a 100644 > --- a/arch/arm/mach-s5pv210/include/mach/map.h > +++ b/arch/arm/mach-s5pv210/include/mach/map.h > @@ -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) > @@ -104,5 +106,6 @@ > #define S3C_PA_WDT S5PV210_PA_WATCHDOG > > #define SAMSUNG_PA_ADC S5PV210_PA_ADC > +#define SAMSUNG_PA_KEYPAD S5PV210_PA_KEYPAD > > #endif /* __ASM_ARCH_MAP_H */ > diff --git a/arch/arm/mach-s5pv210/setup-keypad.c b/arch/arm/mach-s5pv210/setup- > keypad.c > new file mode 100644 > index 0000000..f51bf8d > --- /dev/null > +++ b/arch/arm/mach-s5pv210/setup-keypad.c > @@ -0,0 +1,34 @@ > +/* > + * linux/arch/arm/mach-s5pv210/setup-keypad.c > + * > + * Copyright (C) 2010 Samsung Electronics Co.Ltd > + * Author: Joonyoung Shim <jy0922.s...@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 */ What's the special-function 3? How about 'special function KP_ROWs'? > + 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 */ How about 'special function KP_COLs'? > + 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); > + } > +} > -- Thanks. Best regards, Kgene. -- Kukjin Kim <kgene....@samsung.com>, Senior Engineer, SW Solution Development Team, Samsung Electronics Co., Ltd. -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html