diff options
| author | Andy Green <andy@openmoko.com> | 2008-11-21 11:56:56 +0000 |
|---|---|---|
| committer | Andy Green <agreen@pads.home.warmcat.com> | 2008-11-21 11:56:56 +0000 |
| commit | 0bb3d4b86c7e1847fe072d0953f858136cbda08e (patch) | |
| tree | 933b4f6c1e04805407d83f973be284d5dd873104 /arch/arm/mach-s3c6410/setup-sdhci.c | |
| parent | 41a07b0e8f1c2dcb4eed14a4754324a1a578e44b (diff) | |
meddle-try-get-sdio-wlan-up.patch
Signed-off-by: Andy Green <andy@openmoko.com>
Diffstat (limited to 'arch/arm/mach-s3c6410/setup-sdhci.c')
| -rw-r--r-- | arch/arm/mach-s3c6410/setup-sdhci.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-s3c6410/setup-sdhci.c b/arch/arm/mach-s3c6410/setup-sdhci.c index a254bcb9502..413a3819d82 100644 --- a/arch/arm/mach-s3c6410/setup-sdhci.c +++ b/arch/arm/mach-s3c6410/setup-sdhci.c @@ -80,7 +80,7 @@ void s3c6410_setup_sdhci0_cfg_card(struct platform_device *dev, else ctrl3 = (S3C_SDHCI_CTRL3_FCSEL1 | S3C_SDHCI_CTRL3_FCSEL0); - printk(KERN_INFO "%s: CTRL 2=%08x, 3=%08x\n", __func__, ctrl2, ctrl3); + printk(KERN_INFO "%s: %p CTRL 2=%08x, 3=%08x\n", __func__, r, ctrl2, ctrl3); writel(ctrl2, r + S3C_SDHCI_CONTROL2); writel(ctrl3, r + S3C_SDHCI_CONTROL3); } @@ -95,7 +95,7 @@ void s3c6410_setup_sdhci1_cfg_gpio(struct platform_device *dev, int width) /* Set all the necessary GPG pins to special-function 0 */ for (gpio = S3C64XX_GPH(0); gpio < end; gpio++) { s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(2)); - s3c_gpio_setpull(gpio, S3C_GPIO_PULL_NONE); + s3c_gpio_setpull(gpio, S3C_GPIO_PULL_UP); } // s3c_gpio_setpull(S3C64XX_GPG(6), S3C_GPIO_PULL_UP); |