MIPS: RB532: Use physical addresses for gpio and device controller registers

[sfrench/cifs-2.6.git] / arch / mips / rb532 / gpio.c

diff --git a/arch/mips/rb532/gpio.c b/arch/mips/rb532/gpio.c
index b2fe82dba0a561848e70aad5fee6a2a7bc834f1a..11d7127655e3e131569f389033fef6cf932a38e4 100644 (file)
--- a/arch/mips/rb532/gpio.c
+++ b/arch/mips/rb532/gpio.c
@@ -47,8 +47,8 @@ struct mpmc_device dev3;
 static struct resource rb532_gpio_reg0_res[] = {
        {
                .name   = "gpio_reg0",
-               .start  = (u32)(IDT434_REG_BASE + GPIOBASE),
-               .end    = (u32)(IDT434_REG_BASE + GPIOBASE + sizeof(struct rb532_gpio_reg)),
+               .start  = REGBASE + GPIOBASE,
+               .end    = REGBASE + GPIOBASE + sizeof(struct rb532_gpio_reg) - 1,
                .flags  = IORESOURCE_MEM,
        }
 };
@@ -56,15 +56,16 @@ static struct resource rb532_gpio_reg0_res[] = {
 static struct resource rb532_dev3_ctl_res[] = {
        {
                .name   = "dev3_ctl",
-               .start  = (u32)(IDT434_REG_BASE + DEV3BASE),
-               .end    = (u32)(IDT434_REG_BASE + DEV3BASE + sizeof(struct dev_reg)),
+               .start  = REGBASE + DEV3BASE,
+               .end    = REGBASE + DEV3BASE + sizeof(struct dev_reg) - 1,
                .flags  = IORESOURCE_MEM,
        }
 };
 
 void set_434_reg(unsigned reg_offs, unsigned bit, unsigned len, unsigned val)
 {
-       unsigned flags, data;
+       unsigned long flags;
+       unsigned data;
        unsigned i = 0;
 
        spin_lock_irqsave(&dev3.lock, flags);
@@ -90,7 +91,7 @@ EXPORT_SYMBOL(get_434_reg);
 
 void set_latch_u5(unsigned char or_mask, unsigned char nand_mask)
 {
-       unsigned flags;
+       unsigned long flags;
 
        spin_lock_irqsave(&dev3.lock, flags);