4 files changed, 23 insertions, 45 deletions

diff --git a/drivers/pcmcia/au1000_generic.c b/drivers/pcmcia/au1000_generic.c
index 02088704ac2c..171c8a654887 100644
--- a/drivers/pcmcia/au1000_generic.c
+++ b/drivers/pcmcia/au1000_generic.c
@@ -405,18 +405,16 @@ int au1x00_pcmcia_socket_probe(struct device *dev, struct pcmcia_low_level *ops,
                         skt->virt_io = (void *)
                                 (ioremap((phys_t)AU1X_SOCK0_IO, 0x1000) -
                                 (u32)mips_io_port_base);
-                        skt->phys_attr = AU1X_SOCK0_PSEUDO_PHYS_ATTR;
-                        skt->phys_mem = AU1X_SOCK0_PSEUDO_PHYS_MEM;
+                        skt->phys_attr = AU1X_SOCK0_PHYS_ATTR;
+                        skt->phys_mem = AU1X_SOCK0_PHYS_MEM;
                 }
-#ifndef CONFIG_MIPS_XXS1500
                 else  {
                         skt->virt_io = (void *)
                                 (ioremap((phys_t)AU1X_SOCK1_IO, 0x1000) -
                                 (u32)mips_io_port_base);
-                        skt->phys_attr = AU1X_SOCK1_PSEUDO_PHYS_ATTR;
-                        skt->phys_mem = AU1X_SOCK1_PSEUDO_PHYS_MEM;
+                        skt->phys_attr = AU1X_SOCK1_PHYS_ATTR;
+                        skt->phys_mem = AU1X_SOCK1_PHYS_MEM;
                 }
-#endif
                 pcmcia_base_vaddrs[i] = (u32 *)skt->virt_io;
                 ret = ops->hw_init(skt);
 
diff --git a/drivers/pcmcia/au1000_generic.h b/drivers/pcmcia/au1000_generic.h
index aa743f6875bd..a324d329dea6 100644
--- a/drivers/pcmcia/au1000_generic.h
+++ b/drivers/pcmcia/au1000_generic.h
@@ -36,10 +36,6 @@
 #define AU1X_SOCK0_IO        0xF00000000ULL
 #define AU1X_SOCK0_PHYS_ATTR 0xF40000000ULL
 #define AU1X_SOCK0_PHYS_MEM  0xF80000000ULL
-/* pseudo 32 bit phys addresses, which get fixed up to the
- * real 36 bit address in fixup_bigphys_addr() */
-#define AU1X_SOCK0_PSEUDO_PHYS_ATTR 0xF4000000
-#define AU1X_SOCK0_PSEUDO_PHYS_MEM  0xF8000000
 
 /* pcmcia socket 1 needs external glue logic so the memory map
  * differs from board to board.
@@ -48,8 +44,6 @@
 #define AU1X_SOCK1_IO        0xF08000000ULL
 #define AU1X_SOCK1_PHYS_ATTR 0xF48000000ULL
 #define AU1X_SOCK1_PHYS_MEM  0xF88000000ULL
-#define AU1X_SOCK1_PSEUDO_PHYS_ATTR 0xF4800000
-#define AU1X_SOCK1_PSEUDO_PHYS_MEM  0xF8800000
 #endif
 
 struct pcmcia_state {
diff --git a/drivers/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c
index b35b72b0d5b5..3889cf07d6ce 100644
--- a/drivers/pcmcia/db1xxx_ss.c
+++ b/drivers/pcmcia/db1xxx_ss.c
@@ -43,9 +43,9 @@ struct db1x_pcmcia_sock {
         void            *virt_io;
 
         /* the "pseudo" addresses of the PCMCIA space. */
-        unsigned long   phys_io;
-        unsigned long   phys_attr;
-        unsigned long   phys_mem;
+        phys_addr_t     phys_io;
+        phys_addr_t     phys_attr;
+        phys_addr_t     phys_mem;
 
         /* previous flags for set_socket() */
         unsigned int old_flags;
@@ -404,7 +404,6 @@ static int __devinit db1x_pcmcia_socket_probe(struct platform_device *pdev)
 {
         struct db1x_pcmcia_sock *sock;
         struct resource *r;
-        phys_t physio;
         int ret, bid;
 
         sock = kzalloc(sizeof(struct db1x_pcmcia_sock), GFP_KERNEL);
@@ -465,7 +464,7 @@ static int __devinit db1x_pcmcia_socket_probe(struct platform_device *pdev)
          * for this socket (usually the 36bit address shifted 4 to the
          * right).
          */
-        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pseudo-attr");
+        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-attr");
         if (!r) {
                 printk(KERN_ERR "pcmcia%d has no 'pseudo-attr' resource!\n",
                         sock->nr);
@@ -477,7 +476,7 @@ static int __devinit db1x_pcmcia_socket_probe(struct platform_device *pdev)
          * pseudo-mem:  The 32bit address of the PCMCIA memory space for
          * this socket (usually the 36bit address shifted 4 to the right)
          */
-        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pseudo-mem");
+        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-mem");
         if (!r) {
                 printk(KERN_ERR "pcmcia%d has no 'pseudo-mem' resource!\n",
                         sock->nr);
@@ -489,7 +488,7 @@ static int __devinit db1x_pcmcia_socket_probe(struct platform_device *pdev)
          * pseudo-io:  The 32bit address of the PCMCIA IO space for this
          * socket (usually the 36bit address shifted 4 to the right).
          */
-        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pseudo-io");
+        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-io");
         if (!r) {
                 printk(KERN_ERR "pcmcia%d has no 'pseudo-io' resource!\n",
                         sock->nr);
@@ -497,12 +496,6 @@ static int __devinit db1x_pcmcia_socket_probe(struct platform_device *pdev)
         }
         sock->phys_io = r->start;
 
-
-        /* IO: we must remap the full 36bit address (for reference see
-         * alchemy/common/setup.c::__fixup_bigphys_addr())
-         */
-        physio = ((phys_t)sock->phys_io) << 4;
-
         /*
          * PCMCIA client drivers use the inb/outb macros to access
          * the IO registers.  Since mips_io_port_base is added
@@ -511,7 +504,7 @@ static int __devinit db1x_pcmcia_socket_probe(struct platform_device *pdev)
          * to access the I/O or MEM address directly, without
          * going through this "mips_io_port_base" mechanism.
          */
-        sock->virt_io = (void *)(ioremap(physio, IO_MAP_SIZE) -
+        sock->virt_io = (void *)(ioremap(sock->phys_io, IO_MAP_SIZE) -
                                  mips_io_port_base);
 
         if (!sock->virt_io) {
@@ -547,8 +540,8 @@ static int __devinit db1x_pcmcia_socket_probe(struct platform_device *pdev)
                 goto out2;
         }
 
-        printk(KERN_INFO "Alchemy Db/Pb1xxx pcmcia%d @ io/attr/mem %08lx"
-                "(%p) %08lx %08lx  card/insert/stschg/eject irqs @ %d "
+        printk(KERN_INFO "Alchemy Db/Pb1xxx pcmcia%d @ io/attr/mem %09llx"
+                "(%p) %09llx %09llx  card/insert/stschg/eject irqs @ %d "
                 "%d %d %d\n", sock->nr, sock->phys_io, sock->virt_io,
                 sock->phys_attr, sock->phys_mem, sock->card_irq,
                 sock->insert_irq, sock->stschg_irq, sock->eject_irq);
diff --git a/drivers/pcmcia/xxs1500_ss.c b/drivers/pcmcia/xxs1500_ss.c
index 4e36930b51ce..61560cd6e287 100644
--- a/drivers/pcmcia/xxs1500_ss.c
+++ b/drivers/pcmcia/xxs1500_ss.c
@@ -56,10 +56,9 @@ struct xxs1500_pcmcia_sock {
         struct pcmcia_socket    socket;
         void            *virt_io;
 
-        /* the "pseudo" addresses of the PCMCIA space. */
-        unsigned long   phys_io;
-        unsigned long   phys_attr;
-        unsigned long   phys_mem;
+        phys_addr_t     phys_io;
+        phys_addr_t     phys_attr;
+        phys_addr_t     phys_mem;
 
         /* previous flags for set_socket() */
         unsigned int old_flags;
@@ -211,7 +210,6 @@ static int __devinit xxs1500_pcmcia_probe(struct platform_device *pdev)
 {
         struct xxs1500_pcmcia_sock *sock;
         struct resource *r;
-        phys_t physio;
         int ret, irq;
 
         sock = kzalloc(sizeof(struct xxs1500_pcmcia_sock), GFP_KERNEL);
@@ -225,9 +223,9 @@ static int __devinit xxs1500_pcmcia_probe(struct platform_device *pdev)
          * for this socket (usually the 36bit address shifted 4 to the
          * right).
          */
-        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pseudo-attr");
+        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-attr");
         if (!r) {
-                dev_err(&pdev->dev, "missing 'pseudo-attr' resource!\n");
+                dev_err(&pdev->dev, "missing 'pcmcia-attr' resource!\n");
                 goto out0;
         }
         sock->phys_attr = r->start;
@@ -236,9 +234,9 @@ static int __devinit xxs1500_pcmcia_probe(struct platform_device *pdev)
          * pseudo-mem:  The 32bit address of the PCMCIA memory space for
          * this socket (usually the 36bit address shifted 4 to the right)
          */
-        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pseudo-mem");
+        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-mem");
         if (!r) {
-                dev_err(&pdev->dev, "missing 'pseudo-mem' resource!\n");
+                dev_err(&pdev->dev, "missing 'pcmcia-mem' resource!\n");
                 goto out0;
         }
         sock->phys_mem = r->start;
@@ -247,19 +245,14 @@ static int __devinit xxs1500_pcmcia_probe(struct platform_device *pdev)
          * pseudo-io:  The 32bit address of the PCMCIA IO space for this
          * socket (usually the 36bit address shifted 4 to the right).
          */
-        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pseudo-io");
+        r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-io");
         if (!r) {
-                dev_err(&pdev->dev, "missing 'pseudo-io' resource!\n");
+                dev_err(&pdev->dev, "missing 'pcmcia-io' resource!\n");
                 goto out0;
         }
         sock->phys_io = r->start;
 
 
-        /* for io must remap the full 36bit address (for reference see
-         * alchemy/common/setup.c::__fixup_bigphys_addr)
-         */
-        physio = ((phys_t)sock->phys_io) << 4;
-
         /*
          * PCMCIA client drivers use the inb/outb macros to access
          * the IO registers.  Since mips_io_port_base is added
@@ -268,7 +261,7 @@ static int __devinit xxs1500_pcmcia_probe(struct platform_device *pdev)
          * to access the I/O or MEM address directly, without
          * going through this "mips_io_port_base" mechanism.
          */
-        sock->virt_io = (void *)(ioremap(physio, IO_MAP_SIZE) -
+        sock->virt_io = (void *)(ioremap(sock->phys_io, IO_MAP_SIZE) -
                                  mips_io_port_base);
 
         if (!sock->virt_io) {