pcmcia: soc_common: add CF socket state helper

Add a helper to get the voltage state of CF sockets, where the voltage
sense pins are not wired up.  Switch assabet and cerf to use this
helper.

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>

diff --git a/drivers/pcmcia/sa1100_assabet.c b/drivers/pcmcia/sa1100_assabet.c
index 44cfc4416e5402021ffadad45cad73093a1d007b..71ace6910d7ec2ac20968221ef2d18a0f9149d90 100644 (file)
--- a/drivers/pcmcia/sa1100_assabet.c
+++ b/drivers/pcmcia/sa1100_assabet.c
@@ -31,13 +31,6 @@ static int assabet_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
        return 0;
 }
 
-static void
-assabet_pcmcia_socket_state(struct soc_pcmcia_socket *skt, struct pcmcia_state *state)
-{
-       state->vs_3v  = 1; /* Can only apply 3.3V on Assabet. */
-       state->vs_Xv  = 0;
-}
-
 static int
 assabet_pcmcia_configure_socket(struct soc_pcmcia_socket *skt, const socket_state_t *state)
 {
@@ -90,7 +83,7 @@ static void assabet_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
 static struct pcmcia_low_level assabet_pcmcia_ops = { 
        .owner                  = THIS_MODULE,
        .hw_init                = assabet_pcmcia_hw_init,
-       .socket_state           = assabet_pcmcia_socket_state,
+       .socket_state           = soc_common_cf_socket_state,
        .configure_socket       = assabet_pcmcia_configure_socket,
        .socket_suspend         = assabet_pcmcia_socket_suspend,
 };

diff --git a/drivers/pcmcia/sa1100_cerf.c b/drivers/pcmcia/sa1100_cerf.c
index b3774e5d0396c0efde92620fffcfd57549d71e38..c3f67363f6a138433da4270f8bd39dec3f24910d 100644 (file)
--- a/drivers/pcmcia/sa1100_cerf.c
+++ b/drivers/pcmcia/sa1100_cerf.c
@@ -45,13 +45,6 @@ static void cerf_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
        gpio_free(CERF_GPIO_CF_RESET);
 }
 
-static void
-cerf_pcmcia_socket_state(struct soc_pcmcia_socket *skt, struct pcmcia_state *state)
-{
-       state->vs_3v    = 1;
-       state->vs_Xv    = 0;
-}
-
 static int
 cerf_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
                             const socket_state_t *state)
@@ -77,7 +70,7 @@ 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,
+       .socket_state           = soc_common_cf_socket_state,
        .configure_socket       = cerf_pcmcia_configure_socket,
 };
 

diff --git a/drivers/pcmcia/soc_common.c b/drivers/pcmcia/soc_common.c
index 9373d997d0cf5171ee2ad6d9ec9b636f1eb7f2a6..6d0ec291f475d2cc4065d3d63b3313c435a4e67d 100644 (file)
--- a/drivers/pcmcia/soc_common.c
+++ b/drivers/pcmcia/soc_common.c
@@ -229,6 +229,18 @@ static void soc_pcmcia_hw_disable(struct soc_pcmcia_socket *skt)
                        irq_set_irq_type(skt->stat[i].irq, IRQ_TYPE_NONE);
 }
 
+/*
+ * The CF 3.0 specification says that cards tie VS1 to ground and leave
+ * VS2 open.  Many implementations do not wire up the VS signals, so we
+ * provide hard-coded values as per the CF 3.0 spec.
+ */
+void soc_common_cf_socket_state(struct soc_pcmcia_socket *skt,
+       struct pcmcia_state *state)
+{
+       state->vs_3v = 1;
+}
+EXPORT_SYMBOL_GPL(soc_common_cf_socket_state);
+
 static unsigned int soc_common_pcmcia_skt_state(struct soc_pcmcia_socket *skt)
 {
        struct pcmcia_state state;

diff --git a/drivers/pcmcia/soc_common.h b/drivers/pcmcia/soc_common.h
index 686ba3238c76c22b3bde633978d29b9b22f80ce5..39c1e15167f389fa5b1b550c49bfb8b1562f3a4a 100644 (file)
--- a/drivers/pcmcia/soc_common.h
+++ b/drivers/pcmcia/soc_common.h
@@ -143,6 +143,8 @@ void soc_pcmcia_remove_one(struct soc_pcmcia_socket *skt);
 int soc_pcmcia_add_one(struct soc_pcmcia_socket *skt);
 int soc_pcmcia_request_gpiods(struct soc_pcmcia_socket *skt);
 
+void soc_common_cf_socket_state(struct soc_pcmcia_socket *skt,
+       struct pcmcia_state *state);
 
 #ifdef CONFIG_PCMCIA_DEBUG