Skip to content

Commit

Permalink
ARM: S3C64XX: 2nd Change to using s3c_gpio_cfgrange_nopull()
Browse files Browse the repository at this point in the history
This patch changes code setting special-function and no pull-up
to use the s3c_gpio_cfgrange_nopull() wrapper.
NOTE: This is for missed things from the previous patch.

Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  • Loading branch information
Kukjin Kim committed Oct 23, 2010
1 parent 5a350da commit 3e9b726
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 9 deletions.
7 changes: 2 additions & 5 deletions arch/arm/mach-s3c64xx/setup-fb-24bpp.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@

extern void s3c64xx_fb_gpio_setup_24bpp(void)
{
s3c_gpio_cfgall_range(S3C64XX_GPI(0), 16,
S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);

s3c_gpio_cfgall_range(S3C64XX_GPJ(0), 12,
S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
s3c_gpio_cfgrange_nopull(S3C64XX_GPI(0), 16, S3C_GPIO_SFN(2));
s3c_gpio_cfgrange_nopull(S3C64XX_GPJ(0), 12, S3C_GPIO_SFN(2));
}
6 changes: 2 additions & 4 deletions arch/arm/mach-s3c64xx/setup-keypad.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@
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_cfgall_range(S3C64XX_GPK(8), 8 + rows,
S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
s3c_gpio_cfgrange_nopull(S3C64XX_GPK(8), 8 + rows, S3C_GPIO_SFN(3));

/* Set all the necessary GPL pins to special-function 3: KP_COL[x] */
s3c_gpio_cfgall_range(S3C64XX_GPL(0), cols,
S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
s3c_gpio_cfgrange_nopull(S3C64XX_GPL(0), cols, S3C_GPIO_SFN(3));
}

0 comments on commit 3e9b726

Please sign in to comment.