[PATCH] S3C64XX: Fix keypad setup to configure correct number of rows

Kukjin Kim kgene.kim at samsung.com
Wed Mar 2 01:46:02 EST 2011


Mark Brown wrote:
> 
> From: Ben Dooks <ben-linux at fluff.org>
> 
> The call to s3c_gpio_cfgrange_nopull() takes a size and base
> but this looks like it is trying to do base and end. This means
> it is configuring too many GPIOs and on the case of the Cragganmore
> means we're seeing an overflow of the ROW pins causing problems
> with the keyboard driver.
> 
> Signed-off-by: Ben Dooks <ben-linux at fluff.org>
> Signed-off-by: Mark Brown <broonie at opensource.wolfsonmicro.com>
> ---
>  arch/arm/mach-s3c64xx/setup-keypad.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/arm/mach-s3c64xx/setup-keypad.c b/arch/arm/mach-
> s3c64xx/setup-keypad.c
> index f8ed0d2..1d4d0ee 100644
> --- a/arch/arm/mach-s3c64xx/setup-keypad.c
> +++ b/arch/arm/mach-s3c64xx/setup-keypad.c
> @@ -17,7 +17,7 @@
>  void samsung_keypad_cfg_gpio(unsigned int rows, unsigned int cols)
>  {
>  	/* Set all the necessary GPK pins to special-function 3: KP_ROW[x]
*/
> -	s3c_gpio_cfgrange_nopull(S3C64XX_GPK(8), 8 + rows, S3C_GPIO_SFN(3));
> +	s3c_gpio_cfgrange_nopull(S3C64XX_GPK(8), rows, S3C_GPIO_SFN(3));
> 
>  	/* Set all the necessary GPL pins to special-function 3: KP_COL[x]
*/
>  	s3c_gpio_cfgrange_nopull(S3C64XX_GPL(0), cols, S3C_GPIO_SFN(3));
> --
> 1.7.2.3

Oops, you're right.

Applied into s5p-fixes-for-linus for 38.
Thanks.

Best regards,
Kgene.
--
Kukjin Kim <kgene.kim at samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.




More information about the linux-arm-kernel mailing list