Skip to content

Commit

Permalink
ARM: S3C64XX: Change to using s3c_gpio_cfgrange_nopull()
Browse files Browse the repository at this point in the history
Change code setting special-function and no pull-up to use
the s3c_gpio_cfgrange_nopull() wrapper.

Signed-off-by: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
  • Loading branch information
Ben Dooks authored and Kukjin Kim committed Oct 23, 2010
1 parent e594ea3 commit 2a1309b
Showing 1 changed file with 4 additions and 8 deletions.
12 changes: 4 additions & 8 deletions arch/arm/mach-s3c64xx/setup-sdhci-gpio.c
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ void s3c64xx_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;

/* Set all the necessary GPG pins to special-function 2 */
s3c_gpio_cfgall_range(S3C64XX_GPG(0), 2 + width,
S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
s3c_gpio_cfgrange_nopull(S3C64XX_GPG(0), 2 + width, S3C_GPIO_SFN(2));

if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
s3c_gpio_setpull(S3C64XX_GPG(6), S3C_GPIO_PULL_UP);
Expand All @@ -40,8 +39,7 @@ void s3c64xx_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width)
struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;

/* Set all the necessary GPH pins to special-function 2 */
s3c_gpio_cfgall_range(S3C64XX_GPH(0), 2 + width,
S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
s3c_gpio_cfgrange_nopull(S3C64XX_GPH(0), 2 + width, S3C_GPIO_SFN(2));

if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
s3c_gpio_setpull(S3C64XX_GPG(6), S3C_GPIO_PULL_UP);
Expand All @@ -52,10 +50,8 @@ void s3c64xx_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width)
void s3c64xx_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
{
/* Set all the necessary GPH pins to special-function 3 */
s3c_gpio_cfgall_range(S3C64XX_GPH(6), width,
S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
s3c_gpio_cfgrange_nopull(S3C64XX_GPH(6), width, S3C_GPIO_SFN(3));

/* Set all the necessary GPC pins to special-function 3 */
s3c_gpio_cfgall_range(S3C64XX_GPC(4), 2,
S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
s3c_gpio_cfgrange_nopull(S3C64XX_GPC(4), 2, S3C_GPIO_SFN(3));
}

0 comments on commit 2a1309b

Please sign in to comment.