Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2a1309b4 authored by Ben Dooks's avatar Ben Dooks Committed by Kukjin Kim
Browse files

ARM: S3C64XX: Change to using s3c_gpio_cfgrange_nopull() 



Change code setting special-function and no pull-up to use
the s3c_gpio_cfgrange_nopull() wrapper.

Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
Signed-off-by: default avatarKukjin Kim <kgene.kim@samsung.com>
parent e594ea3e

arch/arm/mach-s3c64xx/setup-sdhci-gpio.c

+4 −8
Original line number Diff line number Diff line
@@ -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);
@@ -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);
@@ -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));

}