From 5a22a0834183b18f614be99ac7b0c07da76d55de Mon Sep 17 00:00:00 2001 From: Kukjin Kim Date: Fri, 1 Oct 2010 20:20:37 +0900 Subject: [PATCH] --- yaml --- r: 221119 b: refs/heads/master c: 3e9b7261502e78e351fc6a61a9b7241433c779c4 h: refs/heads/master i: 221117: faeb0e50f4f4d9eefc0c78dba92826050ae08af8 221115: e87a709995f5ed55db80fc5aa4d0510a51c87a13 221111: 4be237e6f69631416e42c34152133fd59044c207 221103: f781b802e0254b7a7271ada1a54dc6e56ac24dc2 221087: 32e8b689f599a9862224112af85c97236e44c6c3 221055: d49e8b6eacf4ea6fa8abbef120399fdd5eb9ae55 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-s3c64xx/setup-fb-24bpp.c | 7 ++----- trunk/arch/arm/mach-s3c64xx/setup-keypad.c | 6 ++---- 3 files changed, 5 insertions(+), 10 deletions(-) diff --git a/[refs] b/[refs] index 8d8698979759..d5d24241316f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5a350da428daace38b0762b63d42f4b441e8bad4 +refs/heads/master: 3e9b7261502e78e351fc6a61a9b7241433c779c4 diff --git a/trunk/arch/arm/mach-s3c64xx/setup-fb-24bpp.c b/trunk/arch/arm/mach-s3c64xx/setup-fb-24bpp.c index 3b0dd124d49a..8f3091182f9c 100644 --- a/trunk/arch/arm/mach-s3c64xx/setup-fb-24bpp.c +++ b/trunk/arch/arm/mach-s3c64xx/setup-fb-24bpp.c @@ -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)); } diff --git a/trunk/arch/arm/mach-s3c64xx/setup-keypad.c b/trunk/arch/arm/mach-s3c64xx/setup-keypad.c index cc9b09c335f3..d1fd7228ee75 100644 --- a/trunk/arch/arm/mach-s3c64xx/setup-keypad.c +++ b/trunk/arch/arm/mach-s3c64xx/setup-keypad.c @@ -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)); }