Patched in Tegra support.

1 files changed, 46 insertions, 8 deletions

diff --git a/drivers/pcmcia/pxa2xx_viper.c b/drivers/pcmcia/pxa2xx_viper.c
index a76f495953a..1064b1c2869 100644
--- a/drivers/pcmcia/pxa2xx_viper.c
+++ b/drivers/pcmcia/pxa2xx_viper.c
@@ -25,13 +25,20 @@
 
 #include <asm/irq.h>
 
-#include <linux/platform_data/pcmcia-pxa2xx_viper.h>
+#include <mach/arcom-pcmcia.h>
 
 #include "soc_common.h"
 #include "pxa2xx_base.h"
 
 static struct platform_device *arcom_pcmcia_dev;
 
+static struct pcmcia_irqs irqs[] = {
+        {
+                .sock   = 0,
+                .str    = "PCMCIA_CD",
+        },
+};
+
 static inline struct arcom_pcmcia_pdata *viper_get_pdata(void)
 {
         return arcom_pcmcia_dev->dev.platform_data;
@@ -42,28 +49,38 @@ static int viper_pcmcia_hw_init(struct soc_pcmcia_socket *skt)
         struct arcom_pcmcia_pdata *pdata = viper_get_pdata();
         unsigned long flags;
 
-        skt->stat[SOC_STAT_CD].gpio = pdata->cd_gpio;
-        skt->stat[SOC_STAT_CD].name = "PCMCIA_CD";
-        skt->stat[SOC_STAT_RDY].gpio = pdata->rdy_gpio;
-        skt->stat[SOC_STAT_RDY].name = "CF ready";
+        skt->socket.pci_irq = gpio_to_irq(pdata->rdy_gpio);
+        irqs[0].irq = gpio_to_irq(pdata->cd_gpio);
+
+        if (gpio_request(pdata->cd_gpio, "CF detect"))
+                goto err_request_cd;
+
+        if (gpio_request(pdata->rdy_gpio, "CF ready"))
+                goto err_request_rdy;
 
         if (gpio_request(pdata->pwr_gpio, "CF power"))
                 goto err_request_pwr;
 
         local_irq_save(flags);
 
-        if (gpio_direction_output(pdata->pwr_gpio, 0)) {
+        if (gpio_direction_output(pdata->pwr_gpio, 0) ||
+            gpio_direction_input(pdata->cd_gpio) ||
+            gpio_direction_input(pdata->rdy_gpio)) {
                 local_irq_restore(flags);
                 goto err_dir;
         }
 
         local_irq_restore(flags);
 
-        return 0;
+        return soc_pcmcia_request_irqs(skt, irqs, ARRAY_SIZE(irqs));
 
 err_dir:
         gpio_free(pdata->pwr_gpio);
 err_request_pwr:
+        gpio_free(pdata->rdy_gpio);
+err_request_rdy:
+        gpio_free(pdata->cd_gpio);
+err_request_cd:
         dev_err(&arcom_pcmcia_dev->dev, "Failed to setup PCMCIA GPIOs\n");
         return -1;
 }
@@ -75,12 +92,22 @@ static void viper_pcmcia_hw_shutdown(struct soc_pcmcia_socket *skt)
 {
         struct arcom_pcmcia_pdata *pdata = viper_get_pdata();
 
+        soc_pcmcia_free_irqs(skt, irqs, ARRAY_SIZE(irqs));
         gpio_free(pdata->pwr_gpio);
+        gpio_free(pdata->rdy_gpio);
+        gpio_free(pdata->cd_gpio);
 }
 
 static void viper_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
                                       struct pcmcia_state *state)
 {
+        struct arcom_pcmcia_pdata *pdata = viper_get_pdata();
+
+        state->detect = !gpio_get_value(pdata->cd_gpio);
+        state->ready  = !!gpio_get_value(pdata->rdy_gpio);
+        state->bvd1   = 1;
+        state->bvd2   = 1;
+        state->wrprot = 0;
         state->vs_3v  = 1; /* Can only apply 3.3V */
         state->vs_Xv  = 0;
 }
@@ -177,7 +204,18 @@ static struct platform_driver viper_pcmcia_driver = {
         .id_table       = viper_pcmcia_id_table,
 };
 
-module_platform_driver(viper_pcmcia_driver);
+static int __init viper_pcmcia_init(void)
+{
+        return platform_driver_register(&viper_pcmcia_driver);
+}
+
+static void __exit viper_pcmcia_exit(void)
+{
+        return platform_driver_unregister(&viper_pcmcia_driver);
+}
+
+module_init(viper_pcmcia_init);
+module_exit(viper_pcmcia_exit);
 
 MODULE_DEVICE_TABLE(platform, viper_pcmcia_id_table);
 MODULE_LICENSE("GPL");