git://git.onelab.eu / linux-2.6.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
vserver 2.0 rc7
[linux-2.6.git] / arch / arm / common / scoop.c
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index 811c554..cfd0d3e 100644 (file)
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -15,47 +15,52 @@
 #include <asm/io.h>
 #include <asm/hardware/scoop.h>
 
-static void __iomem *scoop_io_base;
+#define SCOOP_REG(d,adr) (*(volatile unsigned short*)(d +(adr)))
 
-#define SCOOP_REG(adr) (*(volatile unsigned short*)(scoop_io_base+(adr)))
+struct  scoop_dev {
+       void  *base;
+       spinlock_t scoop_lock;
+       u32 scoop_gpwr;
+};
 
-void reset_scoop(void)
+void reset_scoop(struct device *dev)
 {
-       SCOOP_REG(SCOOP_MCR) = 0x0100;  // 00
-       SCOOP_REG(SCOOP_CDR) = 0x0000;  // 04
-       SCOOP_REG(SCOOP_CPR) = 0x0000;  // 0C
-       SCOOP_REG(SCOOP_CCR) = 0x0000;  // 10
-       SCOOP_REG(SCOOP_IMR) = 0x0000;  // 18
-       SCOOP_REG(SCOOP_IRM) = 0x00FF;  // 14
-       SCOOP_REG(SCOOP_ISR) = 0x0000;  // 1C
-       SCOOP_REG(SCOOP_IRM) = 0x0000;
+       struct scoop_dev *sdev = dev_get_drvdata(dev);
+
+       SCOOP_REG(sdev->base,SCOOP_MCR) = 0x0100;  // 00
+       SCOOP_REG(sdev->base,SCOOP_CDR) = 0x0000;  // 04
+       SCOOP_REG(sdev->base,SCOOP_CPR) = 0x0000;  // 0C
+       SCOOP_REG(sdev->base,SCOOP_CCR) = 0x0000;  // 10
+       SCOOP_REG(sdev->base,SCOOP_IMR) = 0x0000;  // 18
+       SCOOP_REG(sdev->base,SCOOP_IRM) = 0x00FF;  // 14
+       SCOOP_REG(sdev->base,SCOOP_ISR) = 0x0000;  // 1C
+       SCOOP_REG(sdev->base,SCOOP_IRM) = 0x0000;
 }
 
-static DEFINE_SPINLOCK(scoop_lock);
-static u32 scoop_gpwr;
-
-unsigned short set_scoop_gpio(unsigned short bit)
+unsigned short set_scoop_gpio(struct device *dev, unsigned short bit)
 {
        unsigned short gpio_bit;
        unsigned long flag;
+       struct scoop_dev *sdev = dev_get_drvdata(dev);
 
-       spin_lock_irqsave(&scoop_lock, flag);
-       gpio_bit = SCOOP_REG(SCOOP_GPWR) | bit;
-       SCOOP_REG(SCOOP_GPWR) = gpio_bit;
-       spin_unlock_irqrestore(&scoop_lock, flag);
+       spin_lock_irqsave(&sdev->scoop_lock, flag);
+       gpio_bit = SCOOP_REG(sdev->base, SCOOP_GPWR) | bit;
+       SCOOP_REG(sdev->base, SCOOP_GPWR) = gpio_bit;
+       spin_unlock_irqrestore(&sdev->scoop_lock, flag);
 
        return gpio_bit;
 }
 
-unsigned short reset_scoop_gpio(unsigned short bit)
+unsigned short reset_scoop_gpio(struct device *dev, unsigned short bit)
 {
        unsigned short gpio_bit;
        unsigned long flag;
+       struct scoop_dev *sdev = dev_get_drvdata(dev);
 
-       spin_lock_irqsave(&scoop_lock, flag);
-       gpio_bit = SCOOP_REG(SCOOP_GPWR) & ~bit;
-       SCOOP_REG(SCOOP_GPWR) = gpio_bit;
-       spin_unlock_irqrestore(&scoop_lock, flag);
+       spin_lock_irqsave(&sdev->scoop_lock, flag);
+       gpio_bit = SCOOP_REG(sdev->base, SCOOP_GPWR) & ~bit;
+       SCOOP_REG(sdev->base,SCOOP_GPWR) = gpio_bit;
+       spin_unlock_irqrestore(&sdev->scoop_lock, flag);
 
        return gpio_bit;
 }
@@ -63,25 +68,30 @@ unsigned short reset_scoop_gpio(unsigned short bit)
 EXPORT_SYMBOL(set_scoop_gpio);
 EXPORT_SYMBOL(reset_scoop_gpio);
 
-unsigned short read_scoop_reg(unsigned short reg)
+unsigned short read_scoop_reg(struct device *dev, unsigned short reg)
 {
-       return SCOOP_REG(reg);
+       struct scoop_dev *sdev = dev_get_drvdata(dev);
+       return SCOOP_REG(sdev->base,reg);
 }
 
-void write_scoop_reg(unsigned short reg, unsigned short data)
+void write_scoop_reg(struct device *dev, unsigned short reg, unsigned short data)
 {
-       SCOOP_REG(reg)=data;
+       struct scoop_dev *sdev = dev_get_drvdata(dev);
+       SCOOP_REG(sdev->base,reg)=data;
 }
 
 EXPORT_SYMBOL(reset_scoop);
 EXPORT_SYMBOL(read_scoop_reg);
 EXPORT_SYMBOL(write_scoop_reg);
 
+#ifdef CONFIG_PM
 static int scoop_suspend(struct device *dev, uint32_t state, uint32_t level)
 {
        if (level == SUSPEND_POWER_DOWN) {
-               scoop_gpwr = SCOOP_REG(SCOOP_GPWR);
-               SCOOP_REG(SCOOP_GPWR) = 0;
+               struct scoop_dev *sdev = dev_get_drvdata(dev);
+
+               sdev->scoop_gpwr = SCOOP_REG(sdev->base,SCOOP_GPWR);
+               SCOOP_REG(sdev->base,SCOOP_GPWR) = 0;
        }
        return 0;
 }
@@ -89,13 +99,20 @@ static int scoop_suspend(struct device *dev, uint32_t state, uint32_t level)
 static int scoop_resume(struct device *dev, uint32_t level)
 {
        if (level == RESUME_POWER_ON) {
-               SCOOP_REG(SCOOP_GPWR) = scoop_gpwr;
+               struct scoop_dev *sdev = dev_get_drvdata(dev);
+
+               SCOOP_REG(sdev->base,SCOOP_GPWR) = sdev->scoop_gpwr;
        }
        return 0;
 }
+#else
+#define scoop_suspend  NULL
+#define scoop_resume   NULL
+#endif
 
 int __init scoop_probe(struct device *dev)
 {
+       struct scoop_dev *devptr;
        struct scoop_config *inf;
        struct platform_device *pdev = to_platform_device(dev);
        struct resource *mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -103,25 +120,50 @@ int __init scoop_probe(struct device *dev)
        if (!mem)
                return -EINVAL;
 
+       devptr = kmalloc(sizeof(struct scoop_dev), GFP_KERNEL);
+
+       if (!devptr)
+               return  -ENOMEM;
+
+       memset(devptr, 0, sizeof(struct scoop_dev));
+       spin_lock_init(&devptr->scoop_lock);
+
        inf = dev->platform_data;
-       scoop_io_base = ioremap(mem->start, 0x1000);
-       if (!scoop_io_base)
+       devptr->base = ioremap(mem->start, mem->end - mem->start + 1);
+
+       if (!devptr->base) {
+               kfree(devptr);
                return -ENOMEM;
+       }
 
-       SCOOP_REG(SCOOP_MCR) = 0x0140;
+       dev_set_drvdata(dev, devptr);
 
-       reset_scoop();
+       printk("Sharp Scoop Device found at 0x%08x -> 0x%08x\n",(unsigned int)mem->start,(unsigned int)devptr->base);
 
-       SCOOP_REG(SCOOP_GPCR) = inf->io_dir & 0xffff;
-       SCOOP_REG(SCOOP_GPWR) = inf->io_out & 0xffff;
+       SCOOP_REG(devptr->base, SCOOP_MCR) = 0x0140;
+       reset_scoop(dev);
+       SCOOP_REG(devptr->base, SCOOP_GPCR) = inf->io_dir & 0xffff;
+       SCOOP_REG(devptr->base, SCOOP_GPWR) = inf->io_out & 0xffff;
 
        return 0;
 }
 
+static int scoop_remove(struct device *dev)
+{
+       struct scoop_dev *sdev = dev_get_drvdata(dev);
+       if (sdev) {
+               iounmap(sdev->base);
+               kfree(sdev);
+               dev_set_drvdata(dev, NULL);
+       }
+       return 0;
+}
+
 static struct device_driver scoop_driver = {
        .name           = "sharp-scoop",
        .bus            = &platform_bus_type,
        .probe          = scoop_probe,
+       .remove         = scoop_remove,
        .suspend        = scoop_suspend,
        .resume         = scoop_resume,
 };
linux-2.6