Revert "ARM: tegra: tegratab: dummy change"
[linux-2.6.git] / drivers / pcmcia / pxa2xx_balloon3.c
index 453c54c..2ef576c 100644 (file)
 
 #include <mach/balloon3.h>
 
-#include "soc_common.h"
+#include <asm/mach-types.h>
 
-/*
- * These are a list of interrupt sources that provokes a polled
- * check of status
- */
-static struct pcmcia_irqs irqs[] = {
-       { 0, BALLOON3_S0_CD_IRQ, "PCMCIA0 CD" },
-       { 0, BALLOON3_BP_NSTSCHG_IRQ, "PCMCIA0 STSCHG" },
-};
+#include "soc_common.h"
 
 static int balloon3_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
 {
@@ -47,12 +40,12 @@ static int balloon3_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
                        ver);
 
        skt->socket.pci_irq = BALLOON3_BP_CF_NRDY_IRQ;
-       return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
-}
+       skt->stat[SOC_STAT_CD].gpio = BALLOON3_GPIO_S0_CD;
+       skt->stat[SOC_STAT_CD].name = "PCMCIA0 CD";
+       skt->stat[SOC_STAT_BVD1].irq = BALLOON3_BP_NSTSCHG_IRQ;
+       skt->stat[SOC_STAT_BVD1].name = "PCMCIA0 STSCHG";
 
-static void balloon3_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
-{
-       soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));
+       return 0;
 }
 
 static unsigned long balloon3_pcmcia_status[2] = {
@@ -83,40 +76,27 @@ static void balloon3_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
                        disable_irq(BALLOON3_BP_NSTSCHG_IRQ);
        }
 
-       state->detect   = !gpio_get_value(BALLOON3_GPIO_S0_CD);
        state->ready    = !!(status & BALLOON3_CF_nIRQ);
        state->bvd1     = !!(status & BALLOON3_CF_nSTSCHG_BVD1);
        state->bvd2     = 0;    /* not available */
        state->vs_3v    = 1;    /* Always true its a CF card */
        state->vs_Xv    = 0;    /* not available */
-       state->wrprot   = 0;    /* not available */
 }
 
 static int balloon3_pcmcia_configure_socket(struct soc_pcmcia_socket *skt,
                                       const socket_state_t *state)
 {
-       __raw_writew(BALLOON3_CF_RESET, BALLOON3_CF_CONTROL_REG |
+       __raw_writew(BALLOON3_CF_RESET, BALLOON3_CF_CONTROL_REG +
                        ((state->flags & SS_RESET) ?
                        BALLOON3_FPGA_SETnCLR : 0));
        return 0;
 }
 
-static void balloon3_pcmcia_socket_init(struct soc_pcmcia_socket *skt)
-{
-}
-
-static void balloon3_pcmcia_socket_suspend(struct soc_pcmcia_socket *skt)
-{
-}
-
 static struct pcmcia_low_level balloon3_pcmcia_ops = {
        .owner                  = THIS_MODULE,
        .hw_init                = balloon3_pcmcia_hw_init,
-       .hw_shutdown            = balloon3_pcmcia_hw_shutdown,
        .socket_state           = balloon3_pcmcia_socket_state,
        .configure_socket       = balloon3_pcmcia_configure_socket,
-       .socket_init            = balloon3_pcmcia_socket_init,
-       .socket_suspend         = balloon3_pcmcia_socket_suspend,
        .first                  = 0,
        .nr                     = 1,
 };
@@ -127,6 +107,9 @@ static int __init balloon3_pcmcia_init(void)
 {
        int ret;
 
+       if (!machine_is_balloon3())
+               return -ENODEV;
+
        balloon3_pcmcia_device = platform_device_alloc("pxa2xx-pcmcia", -1);
        if (!balloon3_pcmcia_device)
                return -ENOMEM;