MIPS: Alchemy: use 36bit addresses for PCMCIA resources.

On Alchemy the PCMCIA area lies at the end of the chips 36bit system bus
area.  Currently, addresses at the far end of the 32bit area are assumed
to belong to the PCMCIA area and fixed up to the real 36bit address before
being passed to ioremap().

A previous commit enabled 64 bit physical size for the resource datatype on
Alchemy and this allows to use the correct 36bit addresses when registering
the PCMCIA sockets.

This patch removes the 32-to-36bit address fixup and registers the Alchemy
demo board pcmcia socket with the correct 36bit physical addresses.

Tested on DB1200, with a CF card (ide-cs driver) and a 3c589 PCMCIA ethernet
card.

Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
To: Linux-MIPS <linux-mips@linux-mips.org>
Cc: Manuel Lauss <manuel.lauss@gmail.com>
Patchwork: http://patchwork.linux-mips.org/patch/994/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 4 insertions, 6 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);