Merge branch 'sa1111' into sa11x0

Conflicts:
	arch/arm/common/sa1111.c
	arch/arm/mach-sa1100/neponset.c

Fixed:
	arch/arm/mach-sa1100/assabet.c
for the neponset changes

1 files changed, 48 insertions, 7 deletions

diff --git a/drivers/pcmcia/sa1111_generic.c b/drivers/pcmcia/sa1111_generic.c
index 27f2fe3b7fb4..33568e18998b 100644
--- a/drivers/pcmcia/sa1111_generic.c
+++ b/drivers/pcmcia/sa1111_generic.c
@@ -22,6 +22,40 @@
 
 #include "sa1111_generic.h"
 
+/*
+ * These are offsets from the above base.
+ */
+#define PCCR    0x0000
+#define PCSSR   0x0004
+#define PCSR    0x0008
+
+#define PCSR_S0_READY   (1<<0)
+#define PCSR_S1_READY   (1<<1)
+#define PCSR_S0_DETECT  (1<<2)
+#define PCSR_S1_DETECT  (1<<3)
+#define PCSR_S0_VS1     (1<<4)
+#define PCSR_S0_VS2     (1<<5)
+#define PCSR_S1_VS1     (1<<6)
+#define PCSR_S1_VS2     (1<<7)
+#define PCSR_S0_WP      (1<<8)
+#define PCSR_S1_WP      (1<<9)
+#define PCSR_S0_BVD1    (1<<10)
+#define PCSR_S0_BVD2    (1<<11)
+#define PCSR_S1_BVD1    (1<<12)
+#define PCSR_S1_BVD2    (1<<13)
+
+#define PCCR_S0_RST     (1<<0)
+#define PCCR_S1_RST     (1<<1)
+#define PCCR_S0_FLT     (1<<2)
+#define PCCR_S1_FLT     (1<<3)
+#define PCCR_S0_PWAITEN (1<<4)
+#define PCCR_S1_PWAITEN (1<<5)
+#define PCCR_S0_PSE     (1<<6)
+#define PCCR_S1_PSE     (1<<7)
+
+#define PCSSR_S0_SLEEP  (1<<0)
+#define PCSSR_S1_SLEEP  (1<<1)
+
 #define IDX_IRQ_S0_READY_NINT   (0)
 #define IDX_IRQ_S0_CD_VALID     (1)
 #define IDX_IRQ_S0_BVD1_STSCHG  (2)
@@ -49,7 +83,7 @@ static void sa1111_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
 void sa1111_pcmcia_socket_state(struct soc_pcmcia_socket *skt, struct pcmcia_state *state)
 {
         struct sa1111_pcmcia_socket *s = to_skt(skt);
-        unsigned long status = sa1111_readl(s->dev->mapbase + SA1111_PCSR);
+        unsigned long status = sa1111_readl(s->dev->mapbase + PCSR);
 
         switch (skt->nr) {
         case 0:
@@ -105,10 +139,10 @@ int sa1111_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_s
                 pccr_set_mask |= PCCR_S0_FLT|PCCR_S1_FLT;
 
         local_irq_save(flags);
-        val = sa1111_readl(s->dev->mapbase + SA1111_PCCR);
+        val = sa1111_readl(s->dev->mapbase + PCCR);
         val &= ~pccr_skt_mask;
         val |= pccr_set_mask & pccr_skt_mask;
-        sa1111_writel(val, s->dev->mapbase + SA1111_PCCR);
+        sa1111_writel(val, s->dev->mapbase + PCCR);
         local_irq_restore(flags);
 
         return 0;
@@ -163,12 +197,18 @@ int sa1111_pcmcia_add(struct sa1111_dev *dev, struct pcmcia_low_level *ops,
 static int pcmcia_probe(struct sa1111_dev *dev)
 {
         void __iomem *base;
+        int ret;
+
+        ret = sa1111_enable_device(dev);
+        if (ret)
+                return ret;
 
         dev_set_drvdata(&dev->dev, NULL);
 
-        if (!request_mem_region(dev->res.start, 512,
-                                SA1111_DRIVER_NAME(dev)))
+        if (!request_mem_region(dev->res.start, 512, SA1111_DRIVER_NAME(dev))) {
+                sa1111_disable_device(dev);
                 return -EBUSY;
+        }
 
         base = dev->mapbase;
 
@@ -181,8 +221,8 @@ static int pcmcia_probe(struct sa1111_dev *dev)
         /*
          * Initialise the suspend state.
          */
-        sa1111_writel(PCSSR_S0_SLEEP | PCSSR_S1_SLEEP, base + SA1111_PCSSR);
-        sa1111_writel(PCCR_S0_FLT | PCCR_S1_FLT, base + SA1111_PCCR);
+        sa1111_writel(PCSSR_S0_SLEEP | PCSSR_S1_SLEEP, base + PCSSR);
+        sa1111_writel(PCCR_S0_FLT | PCCR_S1_FLT, base + PCCR);
 
 #ifdef CONFIG_SA1100_BADGE4
         pcmcia_badge4_init(&dev->dev);
@@ -212,6 +252,7 @@ static int __devexit pcmcia_remove(struct sa1111_dev *dev)
         }
 
         release_mem_region(dev->res.start, 512);
+        sa1111_disable_device(dev);
         return 0;
 }