Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 221097
b: refs/heads/master
c: 2618b55
h: refs/heads/master
i:
  221095: 6e387ca
v: v3
  • Loading branch information
Ben Dooks authored and Kukjin Kim committed Oct 23, 2010
1 parent 94bb34a commit 529c0e4
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 43 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: f5321760ce1d65fd69facc982b8523b19edf07a0
refs/heads/master: 2618b555d2734df3c8ca71df319d318489318083
53 changes: 15 additions & 38 deletions trunk/arch/arm/mach-s3c64xx/dev-audio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,25 +24,22 @@

static int s3c64xx_i2sv3_cfg_gpio(struct platform_device *pdev)
{
unsigned int base;

switch (pdev->id) {
case 0:
s3c_gpio_cfgpin(S3C64XX_GPD(0), S3C_GPIO_SFN(3));
s3c_gpio_cfgpin(S3C64XX_GPD(1), S3C_GPIO_SFN(3));
s3c_gpio_cfgpin(S3C64XX_GPD(2), S3C_GPIO_SFN(3));
s3c_gpio_cfgpin(S3C64XX_GPD(3), S3C_GPIO_SFN(3));
s3c_gpio_cfgpin(S3C64XX_GPD(4), S3C_GPIO_SFN(3));
base = S3C64XX_GPD(0);
break;
case 1:
s3c_gpio_cfgpin(S3C64XX_GPE(0), S3C_GPIO_SFN(3));
s3c_gpio_cfgpin(S3C64XX_GPE(1), S3C_GPIO_SFN(3));
s3c_gpio_cfgpin(S3C64XX_GPE(2), S3C_GPIO_SFN(3));
s3c_gpio_cfgpin(S3C64XX_GPE(3), S3C_GPIO_SFN(3));
s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C_GPIO_SFN(3));
base = S3C64XX_GPE(0);
break;
default:
printk(KERN_DEBUG "Invalid I2S Controller number!");
return -EINVAL;
}

s3c_gpio_cfgpin_range(base, 5, S3C_GPIO_SFN(3));

return 0;
}

Expand All @@ -51,10 +48,7 @@ static int s3c64xx_i2sv4_cfg_gpio(struct platform_device *pdev)
s3c_gpio_cfgpin(S3C64XX_GPC(4), S3C_GPIO_SFN(5));
s3c_gpio_cfgpin(S3C64XX_GPC(5), S3C_GPIO_SFN(5));
s3c_gpio_cfgpin(S3C64XX_GPC(7), S3C_GPIO_SFN(5));
s3c_gpio_cfgpin(S3C64XX_GPH(6), S3C_GPIO_SFN(4));
s3c_gpio_cfgpin(S3C64XX_GPH(7), S3C_GPIO_SFN(4));
s3c_gpio_cfgpin(S3C64XX_GPH(8), S3C_GPIO_SFN(4));
s3c_gpio_cfgpin(S3C64XX_GPH(9), S3C_GPIO_SFN(4));
s3c_gpio_cfgpin_range(S3C64XX_GPH(6), 4, S3C_GPIO_SFN(4));

return 0;
}
Expand Down Expand Up @@ -163,26 +157,21 @@ EXPORT_SYMBOL(s3c64xx_device_iisv4);

static int s3c64xx_pcm_cfg_gpio(struct platform_device *pdev)
{
unsigned int base;

switch (pdev->id) {
case 0:
s3c_gpio_cfgpin(S3C64XX_GPD(0), S3C_GPIO_SFN(2));
s3c_gpio_cfgpin(S3C64XX_GPD(1), S3C_GPIO_SFN(2));
s3c_gpio_cfgpin(S3C64XX_GPD(2), S3C_GPIO_SFN(2));
s3c_gpio_cfgpin(S3C64XX_GPD(3), S3C_GPIO_SFN(2));
s3c_gpio_cfgpin(S3C64XX_GPD(4), S3C_GPIO_SFN(2));
base = S3C64XX_GPD(0);
break;
case 1:
s3c_gpio_cfgpin(S3C64XX_GPE(0), S3C_GPIO_SFN(2));
s3c_gpio_cfgpin(S3C64XX_GPE(1), S3C_GPIO_SFN(2));
s3c_gpio_cfgpin(S3C64XX_GPE(2), S3C_GPIO_SFN(2));
s3c_gpio_cfgpin(S3C64XX_GPE(3), S3C_GPIO_SFN(2));
s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C_GPIO_SFN(2));
base = S3C64XX_GPE(0);
break;
default:
printk(KERN_DEBUG "Invalid PCM Controller number!");
return -EINVAL;
}

s3c_gpio_cfgpin_range(base, 5, S3C_GPIO_SFN(2));
return 0;
}

Expand Down Expand Up @@ -256,24 +245,12 @@ EXPORT_SYMBOL(s3c64xx_device_pcm1);

static int s3c64xx_ac97_cfg_gpd(struct platform_device *pdev)
{
s3c_gpio_cfgpin(S3C64XX_GPD(0), S3C_GPIO_SFN(4));
s3c_gpio_cfgpin(S3C64XX_GPD(1), S3C_GPIO_SFN(4));
s3c_gpio_cfgpin(S3C64XX_GPD(2), S3C_GPIO_SFN(4));
s3c_gpio_cfgpin(S3C64XX_GPD(3), S3C_GPIO_SFN(4));
s3c_gpio_cfgpin(S3C64XX_GPD(4), S3C_GPIO_SFN(4));

return 0;
return s3c_gpio_cfgpin_range(S3C64XX_GPD(0), 5, S3C_GPIO_SFN(4));
}

static int s3c64xx_ac97_cfg_gpe(struct platform_device *pdev)
{
s3c_gpio_cfgpin(S3C64XX_GPE(0), S3C_GPIO_SFN(4));
s3c_gpio_cfgpin(S3C64XX_GPE(1), S3C_GPIO_SFN(4));
s3c_gpio_cfgpin(S3C64XX_GPE(2), S3C_GPIO_SFN(4));
s3c_gpio_cfgpin(S3C64XX_GPE(3), S3C_GPIO_SFN(4));
s3c_gpio_cfgpin(S3C64XX_GPE(4), S3C_GPIO_SFN(4));

return 0;
return s3c_gpio_cfgpin_range(S3C64XX_GPE(0), 5, S3C_GPIO_SFN(4));
}

static struct resource s3c64xx_ac97_resource[] = {
Expand Down
8 changes: 4 additions & 4 deletions trunk/arch/arm/mach-s3c64xx/setup-sdhci-gpio.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ void s3c64xx_setup_sdhci0_cfg_gpio(struct platform_device *dev, int width)
end = S3C64XX_GPG(2 + width);

/* Set all the necessary GPG pins to special-function 0 */
s3c_gpio_cfgpin_range(S3C64XX_GPG(0), 2 + width, S3C_GPIO_SFN(2));
for (gpio = S3C64XX_GPG(0); gpio < end; gpio++) {
s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2));
s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
}

Expand All @@ -50,8 +50,8 @@ void s3c64xx_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width)
end = S3C64XX_GPH(2 + width);

/* Set all the necessary GPG pins to special-function 0 */
s3c_gpio_cfgpin_range(S3C64XX_GPH(0), 2 + width, S3C_GPIO_SFN(2));
for (gpio = S3C64XX_GPH(0); gpio < end; gpio++) {
s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2));
s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
}

Expand All @@ -69,14 +69,14 @@ void s3c64xx_setup_sdhci2_cfg_gpio(struct platform_device *dev, int width)
end = S3C64XX_GPH(6 + width);

/* Set all the necessary GPH pins to special-function 1 */
s3c_gpio_cfgpin_range(S3C64XX_GPH(6), width, S3C_GPIO_SFN(3));
for (gpio = S3C64XX_GPH(6); gpio < end; gpio++) {
s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(3));
s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
}

/* Set all the necessary GPC pins to special-function 1 */
s3c_gpio_cfgpin_range(S3C64XX_GPC(4), 2, S3C_GPIO_SFN(3));
for (gpio = S3C64XX_GPC(4); gpio < S3C64XX_GPC(6); gpio++) {
s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(3));
s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE);
}
}

0 comments on commit 529c0e4

Please sign in to comment.