MIPS: RB532: GPIO register offsets are relative to GPIOBASE

[linux-2.6-omap-h63xx.git] / arch / mips / rb532 / devices.c

diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
index 31619c601b113632b6f47aa5beb4603f01785653..c1c29181bd4641de62977a19107a4d5ad64734c0 100644 (file)
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
@@ -118,7 +118,7 @@ static struct platform_device cf_slot0 = {
 /* Resources and device for NAND */
 static int rb532_dev_ready(struct mtd_info *mtd)
 {
-       return readl(IDT434_REG_BASE + GPIOD) & GPIO_RDY;
+       return gpio_get_value(GPIO_RDY);
 }
 
 static void rb532_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
@@ -280,7 +280,7 @@ static int __init plat_setup_devices(void)
 {
        /* Look for the CF card reader */
        if (!readl(IDT434_REG_BASE + DEV1MASK))
-               rb532_devs[1] = NULL;
+               rb532_devs[2] = NULL;   /* disable cf_slot0 at index 2 */
        else {
                cf_slot0_res[0].start =
                    readl(IDT434_REG_BASE + DEV1BASE);