diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-10-25 15:57:16 +0900 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-10-25 15:57:16 +0900 |
| commit | 4d9374f39e40f7c7fc15acbfe01dceeee850509f (patch) | |
| tree | 31ec5c2ae0ae753a7bdb5a34f3a607fdda2db6c6 /arch/arm/mach-s3c64xx/setup-ide.c | |
| parent | dc6c0ca39daad44f3169656296ef81d39a6dc7f5 (diff) | |
| parent | dff2126c548d54b040997257407a69a6cdf7a5b6 (diff) | |
| download | talos-op-linux-4d9374f39e40f7c7fc15acbfe01dceeee850509f.tar.gz talos-op-linux-4d9374f39e40f7c7fc15acbfe01dceeee850509f.zip | |
Merge branch 'next-gpio-update' into for-next
Diffstat (limited to 'arch/arm/mach-s3c64xx/setup-ide.c')
| -rw-r--r-- | arch/arm/mach-s3c64xx/setup-ide.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/arch/arm/mach-s3c64xx/setup-ide.c b/arch/arm/mach-s3c64xx/setup-ide.c index c12c315f33bc..de645e99ba97 100644 --- a/arch/arm/mach-s3c64xx/setup-ide.c +++ b/arch/arm/mach-s3c64xx/setup-ide.c @@ -21,7 +21,6 @@ void s3c64xx_ide_setup_gpio(void) { u32 reg; - u32 gpio = 0; reg = readl(S3C_MEM_SYS_CFG) & (~0x3f); @@ -32,15 +31,12 @@ void s3c64xx_ide_setup_gpio(void) s3c_gpio_cfgpin(S3C64XX_GPB(4), S3C_GPIO_SFN(4)); /* Set XhiDATA[15:0] pins as CF Data[15:0] */ - for (gpio = S3C64XX_GPK(0); gpio <= S3C64XX_GPK(15); gpio++) - s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(5)); + s3c_gpio_cfgpin_range(S3C64XX_GPK(0), 16, S3C_GPIO_SFN(5)); /* Set XhiADDR[2:0] pins as CF ADDR[2:0] */ - for (gpio = S3C64XX_GPL(0); gpio <= S3C64XX_GPL(2); gpio++) - s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(6)); + s3c_gpio_cfgpin_range(S3C64XX_GPL(0), 3, S3C_GPIO_SFN(6)); /* Set Xhi ctrl pins as CF ctrl pins(IORDY, IOWR, IORD, CE[0:1]) */ s3c_gpio_cfgpin(S3C64XX_GPM(5), S3C_GPIO_SFN(1)); - for (gpio = S3C64XX_GPM(0); gpio <= S3C64XX_GPM(4); gpio++) - s3c_gpio_cfgpin(gpio, S3C_GPIO_SFN(6)); + s3c_gpio_cfgpin_range(S3C64XX_GPM(0), 5, S3C_GPIO_SFN(6)); } |
