Merge tag 'regulator-3.4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[firefly-linux-kernel-4.4.55.git] / drivers / pcmcia / sa1100_cerf.c

diff --git a/drivers/pcmcia/sa1100_cerf.c b/drivers/pcmcia/sa1100_cerf.c
index 30560df8c76b6893151ae1f22654492177bdb78f..c59c44921a3a94f7093850660fd644c8b465a826 100644 (file)
--- a/drivers/pcmcia/sa1100_cerf.c
+++ b/drivers/pcmcia/sa1100_cerf.c
@@ -10,6 +10,7 @@
 #include <linux/device.h>
 #include <linux/init.h>
 #include <linux/delay.h>
+#include <linux/gpio.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
@@ -19,34 +20,34 @@
 
 #define CERF_SOCKET    1
 
-static struct pcmcia_irqs irqs[] = {
-       { CERF_SOCKET, CERF_IRQ_GPIO_CF_CD,   "CF_CD"   },
-       { CERF_SOCKET, CERF_IRQ_GPIO_CF_BVD2, "CF_BVD2" },
-       { CERF_SOCKET, CERF_IRQ_GPIO_CF_BVD1, "CF_BVD1" }
-};
-
 static int cerf_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 {
-       skt->socket.pci_irq = CERF_IRQ_GPIO_CF_IRQ;
+       int ret;
+
+       ret = gpio_request_one(CERF_GPIO_CF_RESET, GPIOF_OUT_INIT_LOW, "CF_RESET");
+       if (ret)
+               return ret;
+
+       skt->stat[SOC_STAT_CD].gpio = CERF_GPIO_CF_CD;
+       skt->stat[SOC_STAT_CD].name = "CF_CD";
+       skt->stat[SOC_STAT_BVD1].gpio = CERF_GPIO_CF_BVD1;
+       skt->stat[SOC_STAT_BVD1].name = "CF_BVD1";
+       skt->stat[SOC_STAT_BVD2].gpio = CERF_GPIO_CF_BVD2;
+       skt->stat[SOC_STAT_BVD2].name = "CF_BVD2";
+       skt->stat[SOC_STAT_RDY].gpio = CERF_GPIO_CF_IRQ;
+       skt->stat[SOC_STAT_RDY].name = "CF_IRQ";
 
-       return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
+       return 0;
 }
 
 static void cerf_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
 {
-       soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));
+       gpio_free(CERF_GPIO_CF_RESET);
 }
 
 static void
 cerf_pcmcia_socket_state(struct soc_pcmcia_socket *skt, struct pcmcia_state *state)
 {
-       unsigned long levels = GPLR;
-
-       state->detect   = (levels & CERF_GPIO_CF_CD)  ?0:1;
-       state->ready    = (levels & CERF_GPIO_CF_IRQ) ?1:0;
-       state->bvd1     = (levels & CERF_GPIO_CF_BVD1)?1:0;
-       state->bvd2     = (levels & CERF_GPIO_CF_BVD2)?1:0;
-       state->wrprot   = 0;
        state->vs_3v    = 1;
        state->vs_Xv    = 0;
 }
@@ -67,34 +68,17 @@ cerf_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
                return -1;
        }
 
-       if (state->flags & SS_RESET) {
-               GPSR = CERF_GPIO_CF_RESET;
-       } else {
-               GPCR = CERF_GPIO_CF_RESET;
-       }
+       gpio_set_value(CERF_GPIO_CF_RESET, !!(state->flags & SS_RESET));
 
        return 0;
 }
 
-static void cerf_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
-{
-       soc_pcmcia_enable_irqs(skt, irqs, ARRAY_SIZE(irqs));
-}
-
-static void cerf_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
-{
-       soc_pcmcia_disable_irqs(skt, irqs, ARRAY_SIZE(irqs));
-}
-
 static struct pcmcia_low_level cerf_pcmcia_ops = { 
        .owner                  = THIS_MODULE,
        .hw_init                = cerf_pcmcia_hw_init,
        .hw_shutdown            = cerf_pcmcia_hw_shutdown,
        .socket_state           = cerf_pcmcia_socket_state,
        .configure_socket       = cerf_pcmcia_configure_socket,
-
-       .socket_init            = cerf_pcmcia_socket_init,
-       .socket_suspend         = cerf_pcmcia_socket_suspend,
 };
 
 int __devinit pcmcia_cerf_init(struct device *dev)