Merge commit 'v2.6.27-rc1' into for-linus

11 files changed, 216 insertions, 72 deletions

diff --git a/arch/powerpc/sysdev/axonram.c b/arch/powerpc/sysdev/axonram.c
index 7f59188cd9a1..9e105cbc5e5f 100644
--- a/arch/powerpc/sysdev/axonram.c
+++ b/arch/powerpc/sysdev/axonram.c
@@ -57,6 +57,8 @@
 #define AXON_RAM_SECTOR_SIZE            1 << AXON_RAM_SECTOR_SHIFT
 #define AXON_RAM_IRQ_FLAGS              IRQF_SHARED | IRQF_TRIGGER_RISING
 
+static int azfs_major, azfs_minor;
+
 struct axon_ram_bank {
         struct of_device        *device;
         struct gendisk          *disk;
@@ -148,7 +150,10 @@ axon_ram_direct_access(struct block_device *device, sector_t sector,
         struct axon_ram_bank *bank = device->bd_disk->private_data;
         loff_t offset;
 
-        offset = sector << AXON_RAM_SECTOR_SHIFT;
+        offset = sector;
+        if (device->bd_part != NULL)
+                offset += device->bd_part->start_sect;
+        offset <<= AXON_RAM_SECTOR_SHIFT;
         if (offset >= bank->size) {
                 dev_err(&bank->device->dev, "Access outside of address space\n");
                 return -ERANGE;
@@ -227,19 +232,14 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id)
                 goto failed;
         }
 
-        bank->disk->first_minor = 0;
+        bank->disk->major = azfs_major;
+        bank->disk->first_minor = azfs_minor;
         bank->disk->fops = &axon_ram_devops;
         bank->disk->private_data = bank;
         bank->disk->driverfs_dev = &device->dev;
 
         sprintf(bank->disk->disk_name, "%s%d",
                         AXON_RAM_DEVICE_NAME, axon_ram_bank_id);
-        bank->disk->major = register_blkdev(0, bank->disk->disk_name);
-        if (bank->disk->major < 0) {
-                dev_err(&device->dev, "Cannot register block device\n");
-                rc = -EFAULT;
-                goto failed;
-        }
 
         bank->disk->queue = blk_alloc_queue(GFP_KERNEL);
         if (bank->disk->queue == NULL) {
@@ -276,6 +276,8 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id)
                 goto failed;
         }
 
+        azfs_minor += bank->disk->minors;
+
         return 0;
 
 failed:
@@ -310,7 +312,6 @@ axon_ram_remove(struct of_device *device)
 
         device_remove_file(&device->dev, &dev_attr_ecc);
         free_irq(bank->irq_id, device);
-        unregister_blkdev(bank->disk->major, bank->disk->disk_name);
         del_gendisk(bank->disk);
         iounmap((void __iomem *) bank->io_addr);
         kfree(bank);
@@ -341,6 +342,14 @@ static struct of_platform_driver axon_ram_driver = {
 static int __init
 axon_ram_init(void)
 {
+        azfs_major = register_blkdev(azfs_major, AXON_RAM_DEVICE_NAME);
+        if (azfs_major < 0) {
+                printk(KERN_ERR "%s cannot become block device major number\n",
+                                AXON_RAM_MODULE_NAME);
+                return -EFAULT;
+        }
+        azfs_minor = 0;
+
         return of_register_platform_driver(&axon_ram_driver);
 }
 
@@ -351,6 +360,7 @@ static void __exit
 axon_ram_exit(void)
 {
         of_unregister_platform_driver(&axon_ram_driver);
+        unregister_blkdev(azfs_major, AXON_RAM_DEVICE_NAME);
 }
 
 module_init(axon_ram_init);
diff --git a/arch/powerpc/sysdev/dart_iommu.c b/arch/powerpc/sysdev/dart_iommu.c
index 005c2ecf976f..89639ecbf381 100644
--- a/arch/powerpc/sysdev/dart_iommu.c
+++ b/arch/powerpc/sysdev/dart_iommu.c
@@ -147,9 +147,10 @@ static void dart_flush(struct iommu_table *tbl)
         }
 }
 
-static void dart_build(struct iommu_table *tbl, long index,
+static int dart_build(struct iommu_table *tbl, long index,
                        long npages, unsigned long uaddr,
-                       enum dma_data_direction direction)
+                       enum dma_data_direction direction,
+                       struct dma_attrs *attrs)
 {
         unsigned int *dp;
         unsigned int rpn;
@@ -183,6 +184,7 @@ static void dart_build(struct iommu_table *tbl, long index,
         } else {
                 dart_dirty = 1;
         }
+        return 0;
 }
 
 
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 87b0aa13ab48..61e6d77efa4f 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -27,6 +27,7 @@
 #include <sysdev/fsl_soc.h>
 #include <sysdev/fsl_pci.h>
 
+#if defined(CONFIG_PPC_85xx) || defined(CONFIG_PPC_86xx)
 /* atmu setup for fsl pci/pcie controller */
 void __init setup_pci_atmu(struct pci_controller *hose, struct resource *rsrc)
 {
@@ -248,3 +249,63 @@ DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8536, quirk_fsl_pcie_header);
 DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8641, quirk_fsl_pcie_header);
 DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8641D, quirk_fsl_pcie_header);
 DECLARE_PCI_FIXUP_HEADER(0x1957, PCI_DEVICE_ID_MPC8610, quirk_fsl_pcie_header);
+#endif /* CONFIG_PPC_85xx || CONFIG_PPC_86xx */
+
+#if defined(CONFIG_PPC_83xx)
+int __init mpc83xx_add_bridge(struct device_node *dev)
+{
+        int len;
+        struct pci_controller *hose;
+        struct resource rsrc;
+        const int *bus_range;
+        int primary = 1, has_address = 0;
+        phys_addr_t immr = get_immrbase();
+
+        pr_debug("Adding PCI host bridge %s\n", dev->full_name);
+
+        /* Fetch host bridge registers address */
+        has_address = (of_address_to_resource(dev, 0, &rsrc) == 0);
+
+        /* Get bus range if any */
+        bus_range = of_get_property(dev, "bus-range", &len);
+        if (bus_range == NULL || len < 2 * sizeof(int)) {
+                printk(KERN_WARNING "Can't get bus-range for %s, assume"
+                       " bus 0\n", dev->full_name);
+        }
+
+        ppc_pci_flags |= PPC_PCI_REASSIGN_ALL_BUS;
+        hose = pcibios_alloc_controller(dev);
+        if (!hose)
+                return -ENOMEM;
+
+        hose->first_busno = bus_range ? bus_range[0] : 0;
+        hose->last_busno = bus_range ? bus_range[1] : 0xff;
+
+        /* MPC83xx supports up to two host controllers one at 0x8500 from immrbar
+         * the other at 0x8600, we consider the 0x8500 the primary controller
+         */
+        /* PCI 1 */
+        if ((rsrc.start & 0xfffff) == 0x8500) {
+                setup_indirect_pci(hose, immr + 0x8300, immr + 0x8304, 0);
+        }
+        /* PCI 2 */
+        if ((rsrc.start & 0xfffff) == 0x8600) {
+                setup_indirect_pci(hose, immr + 0x8380, immr + 0x8384, 0);
+                primary = 0;
+        }
+
+        printk(KERN_INFO "Found MPC83xx PCI host bridge at 0x%016llx. "
+               "Firmware bus number: %d->%d\n",
+               (unsigned long long)rsrc.start, hose->first_busno,
+               hose->last_busno);
+
+        pr_debug(" ->Hose at 0x%p, cfg_addr=0x%p,cfg_data=0x%p\n",
+            hose, hose->cfg_addr, hose->cfg_data);
+
+        /* Interpret the "ranges" property */
+        /* This also maps the I/O region and sets isa_io/mem_base */
+        pci_process_bridge_OF_ranges(hose, dev, primary);
+
+        return 0;
+}
+#endif /* CONFIG_PPC_83xx */
diff --git a/arch/powerpc/sysdev/fsl_pci.h b/arch/powerpc/sysdev/fsl_pci.h
index 37b04ad26571..13f30c2a61e7 100644
--- a/arch/powerpc/sysdev/fsl_pci.h
+++ b/arch/powerpc/sysdev/fsl_pci.h
@@ -83,6 +83,7 @@ struct ccsr_pci {
 
 extern int fsl_add_bridge(struct device_node *dev, int is_primary);
 extern void fsl_pcibios_fixup_bus(struct pci_bus *bus);
+extern int mpc83xx_add_bridge(struct device_node *dev);
 
 #endif /* __POWERPC_FSL_PCI_H */
 #endif /* __KERNEL__ */
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index ebcec7362f95..214388e11807 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -207,66 +207,58 @@ static int __init of_add_fixed_phys(void)
 arch_initcall(of_add_fixed_phys);
 #endif /* CONFIG_FIXED_PHY */
 
-static int __init gfar_mdio_of_init(void)
+static int gfar_mdio_of_init_one(struct device_node *np)
 {
-        struct device_node *np = NULL;
+        int k;
+        struct device_node *child = NULL;
+        struct gianfar_mdio_data mdio_data;
         struct platform_device *mdio_dev;
         struct resource res;
         int ret;
 
-        np = of_find_compatible_node(np, NULL, "fsl,gianfar-mdio");
+        memset(&res, 0, sizeof(res));
+        memset(&mdio_data, 0, sizeof(mdio_data));
 
-        /* try the deprecated version */
-        if (!np)
-                np = of_find_compatible_node(np, "mdio", "gianfar");
+        ret = of_address_to_resource(np, 0, &res);
+        if (ret)
+                return ret;
 
-        if (np) {
-                int k;
-                struct device_node *child = NULL;
-                struct gianfar_mdio_data mdio_data;
+        mdio_dev = platform_device_register_simple("fsl-gianfar_mdio",
+                        res.start&0xfffff, &res, 1);
+        if (IS_ERR(mdio_dev))
+                return PTR_ERR(mdio_dev);
 
-                memset(&res, 0, sizeof(res));
-                memset(&mdio_data, 0, sizeof(mdio_data));
+        for (k = 0; k < 32; k++)
+                mdio_data.irq[k] = PHY_POLL;
 
-                ret = of_address_to_resource(np, 0, &res);
-                if (ret)
-                        goto err;
-
-                mdio_dev =
-                    platform_device_register_simple("fsl-gianfar_mdio",
-                                                    res.start, &res, 1);
-                if (IS_ERR(mdio_dev)) {
-                        ret = PTR_ERR(mdio_dev);
-                        goto err;
+        while ((child = of_get_next_child(np, child)) != NULL) {
+                int irq = irq_of_parse_and_map(child, 0);
+                if (irq != NO_IRQ) {
+                        const u32 *id = of_get_property(child, "reg", NULL);
+                        mdio_data.irq[*id] = irq;
                 }
+        }
 
-                for (k = 0; k < 32; k++)
-                        mdio_data.irq[k] = PHY_POLL;
+        ret = platform_device_add_data(mdio_dev, &mdio_data,
+                                sizeof(struct gianfar_mdio_data));
+        if (ret)
+                platform_device_unregister(mdio_dev);
 
-                while ((child = of_get_next_child(np, child)) != NULL) {
-                        int irq = irq_of_parse_and_map(child, 0);
-                        if (irq != NO_IRQ) {
-                                const u32 *id = of_get_property(child,
-                                                        "reg", NULL);
-                                mdio_data.irq[*id] = irq;
-                        }
-                }
+        return ret;
+}
 
-                ret =
-                    platform_device_add_data(mdio_dev, &mdio_data,
-                                             sizeof(struct gianfar_mdio_data));
-                if (ret)
-                        goto unreg;
-        }
+static int __init gfar_mdio_of_init(void)
+{
+        struct device_node *np = NULL;
 
-        of_node_put(np);
-        return 0;
+        for_each_compatible_node(np, NULL, "fsl,gianfar-mdio")
+                gfar_mdio_of_init_one(np);
 
-unreg:
-        platform_device_unregister(mdio_dev);
-err:
-        of_node_put(np);
-        return ret;
+        /* try the deprecated version */
+        for_each_compatible_node(np, "mdio", "gianfar");
+                gfar_mdio_of_init_one(np);
+
+        return 0;
 }
 
 arch_initcall(gfar_mdio_of_init);
@@ -296,6 +288,9 @@ static int __init gfar_of_init(void)
                 const phandle *ph;
                 int n_res = 2;
 
+                if (!of_device_is_available(np))
+                        continue;
+
                 memset(r, 0, sizeof(r));
                 memset(&gfar_data, 0, sizeof(gfar_data));
 
@@ -357,6 +352,9 @@ static int __init gfar_of_init(void)
                 else
                         gfar_data.interface = PHY_INTERFACE_MODE_MII;
 
+                if (of_get_property(np, "fsl,magic-packet", NULL))
+                        gfar_data.device_flags |= FSL_GIANFAR_DEV_HAS_MAGIC_PACKET;
+
                 ph = of_get_property(np, "phy-handle", NULL);
                 if (ph == NULL) {
                         u32 *fixed_link;
@@ -390,7 +388,7 @@ static int __init gfar_of_init(void)
 
                         gfar_data.phy_id = *id;
                         snprintf(gfar_data.bus_id, MII_BUS_ID_SIZE, "%llx",
-                                 (unsigned long long)res.start);
+                                 (unsigned long long)res.start&0xfffff);
 
                         of_node_put(phy);
                         of_node_put(mdio);
diff --git a/arch/powerpc/sysdev/fsl_soc.h b/arch/powerpc/sysdev/fsl_soc.h
index 52c831fa1886..024299887352 100644
--- a/arch/powerpc/sysdev/fsl_soc.h
+++ b/arch/powerpc/sysdev/fsl_soc.h
@@ -10,6 +10,7 @@ extern u32 get_baudrate(void);
 extern u32 fsl_get_sys_freq(void);
 
 struct spi_board_info;
+struct device_node;
 
 extern int fsl_spi_init(struct spi_board_info *board_infos,
                         unsigned int num_board_infos,
diff --git a/arch/powerpc/sysdev/ipic.c b/arch/powerpc/sysdev/ipic.c
index caba1c0be5a7..88a983ece5c9 100644
--- a/arch/powerpc/sysdev/ipic.c
+++ b/arch/powerpc/sysdev/ipic.c
@@ -22,6 +22,7 @@
 #include <linux/device.h>
 #include <linux/bootmem.h>
 #include <linux/spinlock.h>
+#include <linux/fsl_devices.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 #include <asm/prom.h>
@@ -889,8 +890,78 @@ unsigned int ipic_get_irq(void)
         return irq_linear_revmap(primary_ipic->irqhost, irq);
 }
 
+#ifdef CONFIG_PM
+static struct {
+        u32 sicfr;
+        u32 siprr[2];
+        u32 simsr[2];
+        u32 sicnr;
+        u32 smprr[2];
+        u32 semsr;
+        u32 secnr;
+        u32 sermr;
+        u32 sercr;
+} ipic_saved_state;
+
+static int ipic_suspend(struct sys_device *sdev, pm_message_t state)
+{
+        struct ipic *ipic = primary_ipic;
+
+        ipic_saved_state.sicfr = ipic_read(ipic->regs, IPIC_SICFR);
+        ipic_saved_state.siprr[0] = ipic_read(ipic->regs, IPIC_SIPRR_A);
+        ipic_saved_state.siprr[1] = ipic_read(ipic->regs, IPIC_SIPRR_D);
+        ipic_saved_state.simsr[0] = ipic_read(ipic->regs, IPIC_SIMSR_H);
+        ipic_saved_state.simsr[1] = ipic_read(ipic->regs, IPIC_SIMSR_L);
+        ipic_saved_state.sicnr = ipic_read(ipic->regs, IPIC_SICNR);
+        ipic_saved_state.smprr[0] = ipic_read(ipic->regs, IPIC_SMPRR_A);
+        ipic_saved_state.smprr[1] = ipic_read(ipic->regs, IPIC_SMPRR_B);
+        ipic_saved_state.semsr = ipic_read(ipic->regs, IPIC_SEMSR);
+        ipic_saved_state.secnr = ipic_read(ipic->regs, IPIC_SECNR);
+        ipic_saved_state.sermr = ipic_read(ipic->regs, IPIC_SERMR);
+        ipic_saved_state.sercr = ipic_read(ipic->regs, IPIC_SERCR);
+
+        if (fsl_deep_sleep()) {
+                /* In deep sleep, make sure there can be no
+                 * pending interrupts, as this can cause
+                 * problems on 831x.
+                 */
+                ipic_write(ipic->regs, IPIC_SIMSR_H, 0);
+                ipic_write(ipic->regs, IPIC_SIMSR_L, 0);
+                ipic_write(ipic->regs, IPIC_SEMSR, 0);
+                ipic_write(ipic->regs, IPIC_SERMR, 0);
+        }
+
+        return 0;
+}
+
+static int ipic_resume(struct sys_device *sdev)
+{
+        struct ipic *ipic = primary_ipic;
+
+        ipic_write(ipic->regs, IPIC_SICFR, ipic_saved_state.sicfr);
+        ipic_write(ipic->regs, IPIC_SIPRR_A, ipic_saved_state.siprr[0]);
+        ipic_write(ipic->regs, IPIC_SIPRR_D, ipic_saved_state.siprr[1]);
+        ipic_write(ipic->regs, IPIC_SIMSR_H, ipic_saved_state.simsr[0]);
+        ipic_write(ipic->regs, IPIC_SIMSR_L, ipic_saved_state.simsr[1]);
+        ipic_write(ipic->regs, IPIC_SICNR, ipic_saved_state.sicnr);
+        ipic_write(ipic->regs, IPIC_SMPRR_A, ipic_saved_state.smprr[0]);
+        ipic_write(ipic->regs, IPIC_SMPRR_B, ipic_saved_state.smprr[1]);
+        ipic_write(ipic->regs, IPIC_SEMSR, ipic_saved_state.semsr);
+        ipic_write(ipic->regs, IPIC_SECNR, ipic_saved_state.secnr);
+        ipic_write(ipic->regs, IPIC_SERMR, ipic_saved_state.sermr);
+        ipic_write(ipic->regs, IPIC_SERCR, ipic_saved_state.sercr);
+
+        return 0;
+}
+#else
+#define ipic_suspend NULL
+#define ipic_resume NULL
+#endif
+
 static struct sysdev_class ipic_sysclass = {
         .name = "ipic",
+        .suspend = ipic_suspend,
+        .resume = ipic_resume,
 };
 
 static struct sys_device device_ipic = {
diff --git a/arch/powerpc/sysdev/qe_lib/Kconfig b/arch/powerpc/sysdev/qe_lib/Kconfig
index 4bb18f57901e..1ce546462be5 100644
--- a/arch/powerpc/sysdev/qe_lib/Kconfig
+++ b/arch/powerpc/sysdev/qe_lib/Kconfig
@@ -29,7 +29,7 @@ config QE_GPIO
         bool "QE GPIO support"
         depends on QUICC_ENGINE
         select GENERIC_GPIO
-        select HAVE_GPIO_LIB
+        select ARCH_REQUIRE_GPIOLIB
         help
           Say Y here if you're going to use hardware that connects to the
           QE GPIOs.
diff --git a/arch/powerpc/sysdev/qe_lib/qe.c b/arch/powerpc/sysdev/qe_lib/qe.c
index 9e82d7e725a5..b3b73ae57d6d 100644
--- a/arch/powerpc/sysdev/qe_lib/qe.c
+++ b/arch/powerpc/sysdev/qe_lib/qe.c
@@ -64,7 +64,7 @@ static phys_addr_t qebase = -1;
 phys_addr_t get_qe_base(void)
 {
         struct device_node *qe;
-        unsigned int size;
+        int size;
         const u32 *prop;
 
         if (qebase != -1)
@@ -158,7 +158,7 @@ static unsigned int brg_clk = 0;
 unsigned int qe_get_brg_clk(void)
 {
         struct device_node *qe;
-        unsigned int size;
+        int size;
         const u32 *prop;
 
         if (brg_clk)
@@ -305,7 +305,7 @@ EXPORT_SYMBOL(qe_put_snum);
 
 static int qe_sdma_init(void)
 {
-        struct sdma *sdma = &qe_immr->sdma;
+        struct sdma __iomem *sdma = &qe_immr->sdma;
         unsigned long sdma_buf_offset;
 
         if (!sdma)
diff --git a/arch/powerpc/sysdev/qe_lib/ucc.c b/arch/powerpc/sysdev/qe_lib/ucc.c
index d3c7f5af9bc8..1d78071aad7d 100644
--- a/arch/powerpc/sysdev/qe_lib/ucc.c
+++ b/arch/powerpc/sysdev/qe_lib/ucc.c
@@ -88,7 +88,7 @@ int ucc_set_type(unsigned int ucc_num, enum ucc_speed_type speed)
         return 0;
 }
 
-static void get_cmxucr_reg(unsigned int ucc_num, __be32 **cmxucr,
+static void get_cmxucr_reg(unsigned int ucc_num, __be32 __iomem **cmxucr,
         unsigned int *reg_num, unsigned int *shift)
 {
         unsigned int cmx = ((ucc_num & 1) << 1) + (ucc_num > 3);
@@ -100,7 +100,7 @@ static void get_cmxucr_reg(unsigned int ucc_num, __be32 **cmxucr,
 
 int ucc_mux_set_grant_tsa_bkpt(unsigned int ucc_num, int set, u32 mask)
 {
-        __be32 *cmxucr;
+        __be32 __iomem *cmxucr;
         unsigned int reg_num;
         unsigned int shift;
 
@@ -121,7 +121,7 @@ int ucc_mux_set_grant_tsa_bkpt(unsigned int ucc_num, int set, u32 mask)
 int ucc_set_qe_mux_rxtx(unsigned int ucc_num, enum qe_clock clock,
         enum comm_dir mode)
 {
-        __be32 *cmxucr;
+        __be32 __iomem *cmxucr;
         unsigned int reg_num;
         unsigned int shift;
         u32 clock_bits = 0;
diff --git a/arch/powerpc/sysdev/qe_lib/ucc_fast.c b/arch/powerpc/sysdev/qe_lib/ucc_fast.c
index bcf88e6ce962..1aecb075a72e 100644
--- a/arch/powerpc/sysdev/qe_lib/ucc_fast.c
+++ b/arch/powerpc/sysdev/qe_lib/ucc_fast.c
@@ -46,7 +46,7 @@ void ucc_fast_dump_regs(struct ucc_fast_private * uccf)
         printk(KERN_INFO "uccm  : addr=0x%p, val=0x%08x\n",
                   &uccf->uf_regs->uccm, in_be32(&uccf->uf_regs->uccm));
         printk(KERN_INFO "uccs  : addr=0x%p, val=0x%02x\n",
-                  &uccf->uf_regs->uccs, uccf->uf_regs->uccs);
+                  &uccf->uf_regs->uccs, in_8(&uccf->uf_regs->uccs));
         printk(KERN_INFO "urfb  : addr=0x%p, val=0x%08x\n",
                   &uccf->uf_regs->urfb, in_be32(&uccf->uf_regs->urfb));
         printk(KERN_INFO "urfs  : addr=0x%p, val=0x%04x\n",
@@ -68,7 +68,7 @@ void ucc_fast_dump_regs(struct ucc_fast_private * uccf)
         printk(KERN_INFO "urtry : addr=0x%p, val=0x%08x\n",
                   &uccf->uf_regs->urtry, in_be32(&uccf->uf_regs->urtry));
         printk(KERN_INFO "guemr : addr=0x%p, val=0x%02x\n",
-                  &uccf->uf_regs->guemr, uccf->uf_regs->guemr);
+                  &uccf->uf_regs->guemr, in_8(&uccf->uf_regs->guemr));
 }
 EXPORT_SYMBOL(ucc_fast_dump_regs);
 
@@ -96,7 +96,7 @@ EXPORT_SYMBOL(ucc_fast_transmit_on_demand);
 
 void ucc_fast_enable(struct ucc_fast_private * uccf, enum comm_dir mode)
 {
-        struct ucc_fast *uf_regs;
+        struct ucc_fast __iomem *uf_regs;
         u32 gumr;
 
         uf_regs = uccf->uf_regs;
@@ -117,7 +117,7 @@ EXPORT_SYMBOL(ucc_fast_enable);
 
 void ucc_fast_disable(struct ucc_fast_private * uccf, enum comm_dir mode)
 {
-        struct ucc_fast *uf_regs;
+        struct ucc_fast __iomem *uf_regs;
         u32 gumr;
 
         uf_regs = uccf->uf_regs;
@@ -139,7 +139,7 @@ EXPORT_SYMBOL(ucc_fast_disable);
 int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** uccf_ret)
 {
         struct ucc_fast_private *uccf;
-        struct ucc_fast *uf_regs;
+        struct ucc_fast __iomem *uf_regs;
         u32 gumr;
         int ret;
 
@@ -216,10 +216,10 @@ int ucc_fast_init(struct ucc_fast_info * uf_info, struct ucc_fast_private ** ucc
         uccf->stopped_tx = 0;
         uccf->stopped_rx = 0;
         uf_regs = uccf->uf_regs;
-        uccf->p_ucce = (u32 *) & (uf_regs->ucce);
-        uccf->p_uccm = (u32 *) & (uf_regs->uccm);
+        uccf->p_ucce = &uf_regs->ucce;
+        uccf->p_uccm = &uf_regs->uccm;
 #ifdef CONFIG_UGETH_TX_ON_DEMAND
-        uccf->p_utodr = (u16 *) & (uf_regs->utodr);
+        uccf->p_utodr = &uf_regs->utodr;
 #endif
 #ifdef STATISTICS
         uccf->tx_frames = 0;