redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

ARM: S5PV210: 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: Ben Dooks <ben-linux@fluff.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
hifive-unleashed-5.1
Ben Dooks 2010-05-27 17:25:47 +09:00 committed by Kukjin Kim
parent 8f89d5b3b1
commit 5a350da428
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arch/arm/mach-s5pv210/setup-sdhci-gpio.c
View File

@ -34,12 +34,10 @@ void s5pv210_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
switch (width) {
case 8:
/* GPG1[3:6] special-funtion 3 */
s3c_gpio_cfgall_range(S5PV210_GPG1(3), 4,
S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
s3c_gpio_cfgrange_nopull(S5PV210_GPG1(3), 4, S3C_GPIO_SFN(3));
case 4:
/* GPG0[3:6] special-funtion 2 */
s3c_gpio_cfgall_range(S5PV210_GPG0(3), 4,
S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
s3c_gpio_cfgrange_nopull(S5PV210_GPG0(3), 4, S3C_GPIO_SFN(2));
default:
break;
}
@ -55,12 +53,10 @@ void s5pv210_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width)
struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
/* Set all the necessary GPG1[0:1] pins to special-function 2 */
s3c_gpio_cfgall_range(S5PV210_GPG1(0), 2,
S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
s3c_gpio_cfgrange_nopull(S5PV210_GPG1(0), 2, S3C_GPIO_SFN(2));
/* Data pin GPG1[3:6] to special-function 2 */
s3c_gpio_cfgall_range(S5PV210_GPG1(3), 4,
S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
s3c_gpio_cfgrange_nopull(S5PV210_GPG1(3), 4, S3C_GPIO_SFN(2));
if (pdata->cd_type == S3C_SDHCI_CD_INTERNAL) {
s3c_gpio_setpull(S5PV210_GPG1(2), S3C_GPIO_PULL_UP);
@ -73,18 +69,15 @@ void s5pv210_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
struct s3c_sdhci_platdata *pdata = dev->dev.platform_data;
/* Set all the necessary GPG2[0:1] pins to special-function 2 */
s3c_gpio_cfgall_range(S5PV210_GPG2(0), 2,
S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
s3c_gpio_cfgrange_nopull(S5PV210_GPG2(0), 2, S3C_GPIO_SFN(2));
switch (width) {
case 8:
/* Data pin GPG3[3:6] to special-function 3 */
s3c_gpio_cfgall_range(S5PV210_GPG3(3), 4,
S3C_GPIO_SFN(3), S3C_GPIO_PULL_NONE);
s3c_gpio_cfgrange_nopull(S5PV210_GPG3(3), 4, S3C_GPIO_SFN(3));
case 4:
/* Data pin GPG2[3:6] to special-function 2 */
s3c_gpio_cfgall_range(S5PV210_GPG2(3), 4,
S3C_GPIO_SFN(2), S3C_GPIO_PULL_NONE);
s3c_gpio_cfgrange_nopull(S5PV210_GPG2(3), 4, S3C_GPIO_SFN(2));
default:
break;
}