Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6

[safe/jmp/linux-2.6] / drivers / pcmcia / pxa2xx_base.c

diff --git a/drivers/pcmcia/pxa2xx_base.c b/drivers/pcmcia/pxa2xx_base.c
index 325c992..bb9ddb9 100644 (file)
--- a/drivers/pcmcia/pxa2xx_base.c
+++ b/drivers/pcmcia/pxa2xx_base.c
@@ -18,24 +18,24 @@
 
 #include <linux/module.h>
 #include <linux/init.h>
-#include <linux/config.h>
 #include <linux/cpufreq.h>
 #include <linux/ioport.h>
 #include <linux/kernel.h>
 #include <linux/spinlock.h>
+#include <linux/platform_device.h>
 
-#include <asm/hardware.h>
+#include <mach/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
 #include <asm/system.h>
-#include <asm/arch/pxa-regs.h>
+#include <mach/pxa-regs.h>
+#include <mach/pxa2xx-regs.h>
+#include <asm/mach-types.h>
 
 #include <pcmcia/cs_types.h>
 #include <pcmcia/ss.h>
-#include <pcmcia/bulkmem.h>
 #include <pcmcia/cistpl.h>
 
-#include "cs_internal.h"
 #include "soc_common.h"
 #include "pxa2xx_base.h"
 
@@ -58,7 +58,7 @@ static inline u_int pxa2xx_mcxx_asst(u_int pcmcia_cycle_ns,
                                     u_int mem_clk_10khz)
 {
        u_int code = pcmcia_cycle_ns * mem_clk_10khz;
-       return (code / 300000) + ((code % 300000) ? 1 : 0) - 1;
+       return (code / 300000) + ((code % 300000) ? 1 : 0) + 1;
 }
 
 static inline u_int pxa2xx_mcxx_setup(u_int pcmcia_cycle_ns,
@@ -166,18 +166,32 @@ pxa2xx_pcmcia_frequency_change(struct soc_pcmcia_socket *skt,
 }
 #endif
 
-int pxa2xx_drv_pcmcia_probe(struct device *dev)
+static void pxa2xx_configure_sockets(struct device *dev)
+{
+       struct pcmcia_low_level *ops = dev->platform_data;
+
+       /*
+        * We have at least one socket, so set MECR:CIT
+        * (Card Is There)
+        */
+       MECR |= MECR_CIT;
+
+       /* Set MECR:NOS (Number Of Sockets) */
+       if (ops->nr > 1 || machine_is_viper())
+               MECR |= MECR_NOS;
+       else
+               MECR &= ~MECR_NOS;
+}
+
+int __pxa2xx_drv_pcmcia_probe(struct device *dev)
 {
        int ret;
        struct pcmcia_low_level *ops;
-       int first, nr;
 
        if (!dev || !dev->platform_data)
                return -ENODEV;
 
        ops = (struct pcmcia_low_level *)dev->platform_data;
-       first = ops->first;
-       nr = ops->nr;
 
        /* Provide our PXA2xx specific timing routines. */
        ops->set_timing  = pxa2xx_pcmcia_set_timing;
@@ -185,65 +199,56 @@ int pxa2xx_drv_pcmcia_probe(struct device *dev)
        ops->frequency_change = pxa2xx_pcmcia_frequency_change;
 #endif
 
-       ret = soc_common_drv_pcmcia_probe(dev, ops, first, nr);
+       ret = soc_common_drv_pcmcia_probe(dev, ops, ops->first, ops->nr);
 
-       if (ret == 0) {
-               /*
-                * We have at least one socket, so set MECR:CIT
-                * (Card Is There)
-                */
-               MECR |= MECR_CIT;
-
-               /* Set MECR:NOS (Number Of Sockets) */
-               if (nr > 1)
-                       MECR |= MECR_NOS;
-               else
-                       MECR &= ~MECR_NOS;
-       }
+       if (!ret)
+               pxa2xx_configure_sockets(dev);
 
        return ret;
 }
-EXPORT_SYMBOL(pxa2xx_drv_pcmcia_probe);
+EXPORT_SYMBOL(__pxa2xx_drv_pcmcia_probe);
 
-static int pxa2xx_drv_pcmcia_suspend(struct device *dev, pm_message_t state, u32 level)
+
+static int pxa2xx_drv_pcmcia_probe(struct platform_device *dev)
 {
-       int ret = 0;
-       if (level == SUSPEND_SAVE_STATE)
-               ret = pcmcia_socket_dev_suspend(dev, state);
-       return ret;
+       return __pxa2xx_drv_pcmcia_probe(&dev->dev);
 }
 
-static int pxa2xx_drv_pcmcia_resume(struct device *dev, u32 level)
+static int pxa2xx_drv_pcmcia_remove(struct platform_device *dev)
 {
-       int ret = 0;
-       if (level == RESUME_RESTORE_STATE)
-       {
-               struct pcmcia_low_level *ops = dev->platform_data;
-               int nr = ops ? ops->nr : 0;
+       return soc_common_drv_pcmcia_remove(&dev->dev);
+}
 
-               MECR = nr > 1 ? MECR_CIT | MECR_NOS : (nr > 0 ? MECR_CIT : 0);
-               ret = pcmcia_socket_dev_resume(dev);
-       }
-       return ret;
+static int pxa2xx_drv_pcmcia_suspend(struct platform_device *dev, pm_message_t state)
+{
+       return pcmcia_socket_dev_suspend(&dev->dev, state);
+}
+
+static int pxa2xx_drv_pcmcia_resume(struct platform_device *dev)
+{
+       pxa2xx_configure_sockets(&dev->dev);
+       return pcmcia_socket_dev_resume(&dev->dev);
 }
 
-static struct device_driver pxa2xx_pcmcia_driver = {
+static struct platform_driver pxa2xx_pcmcia_driver = {
        .probe          = pxa2xx_drv_pcmcia_probe,
-       .remove         = soc_common_drv_pcmcia_remove,
+       .remove         = pxa2xx_drv_pcmcia_remove,
        .suspend        = pxa2xx_drv_pcmcia_suspend,
        .resume         = pxa2xx_drv_pcmcia_resume,
-       .name           = "pxa2xx-pcmcia",
-       .bus            = &platform_bus_type,
+       .driver         = {
+               .name   = "pxa2xx-pcmcia",
+               .owner  = THIS_MODULE,
+       },
 };
 
 static int __init pxa2xx_pcmcia_init(void)
 {
-       return driver_register(&pxa2xx_pcmcia_driver);
+       return platform_driver_register(&pxa2xx_pcmcia_driver);
 }
 
 static void __exit pxa2xx_pcmcia_exit(void)
 {
-       driver_unregister(&pxa2xx_pcmcia_driver);
+       platform_driver_unregister(&pxa2xx_pcmcia_driver);
 }
 
 fs_initcall(pxa2xx_pcmcia_init);
@@ -252,3 +257,4 @@ module_exit(pxa2xx_pcmcia_exit);
 MODULE_AUTHOR("Stefan Eletzhofer <stefan.eletzhofer@inquant.de> and Ian Molton <spyro@f2s.com>");
 MODULE_DESCRIPTION("Linux PCMCIA Card Services: PXA2xx core socket driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pxa2xx-pcmcia");