1 files changed, 54 insertions, 157 deletions

diff --git a/drivers/media/video/tiler/dmm.c b/drivers/media/video/tiler/dmm.c
index 8663b36a5e7..685a1935a7f 100644
--- a/drivers/media/video/tiler/dmm.c
+++ b/drivers/media/video/tiler/dmm.c
@@ -3,6 +3,9 @@
  *
  * DMM driver support functions for TI OMAP processors.
  *
+ * Authors: David Sin <davidsin@ti.com>
+ *          Lajos Molnar <molnar@ti.com>
+ *
  * Copyright (C) 2009-2010 Texas Instruments, Inc.
  *
  * This package is free software; you can redistribute it and/or modify
@@ -16,10 +19,6 @@
 
 #include <linux/init.h>
 #include <linux/module.h>
-#include <linux/cdev.h>            /* struct cdev */
-#include <linux/kdev_t.h>          /* MKDEV() */
-#include <linux/fs.h>              /* register_chrdev_region() */
-#include <linux/device.h>          /* struct class */
 #include <linux/platform_device.h> /* platform_device() */
 #include <linux/err.h>             /* IS_ERR() */
 #include <linux/io.h>              /* ioremap() */
@@ -29,10 +28,10 @@
 #include <mach/dmm.h>
 
 #undef __DEBUG__
-#define BITS_32(in_NbBits) ((((u32)1 << in_NbBits) - 1) | ((u32)1 << in_NbBits))
-#define BITFIELD_32(in_UpBit, in_LowBit)\
-        (BITS_32(in_UpBit) & ~((BITS_32(in_LowBit)) >> 1))
-#define BF BITFIELD_32
+
+#define MASK(msb, lsb) (((1 << ((msb) + 1 - (lsb))) - 1) << (lsb))
+#define SET_FLD(reg, msb, lsb, val) \
+(((reg) & ~MASK((msb), (lsb))) | (((val) << (lsb)) & MASK((msb), (lsb))))
 
 #ifdef __DEBUG__
 #define DEBUG(x, y) printk(KERN_NOTICE "%s()::%d:%s=(0x%08x)\n", \
@@ -41,16 +40,6 @@
 #define DEBUG(x, y)
 #endif
 
-static s32 dmm_major;
-static s32 dmm_minor;
-
-struct dmm_dev {
-        struct cdev cdev;
-};
-
-static struct dmm_dev *dmm_device;
-static struct class *dmmdev_class;
-
 static struct platform_driver dmm_driver_ldm = {
         .driver = {
                 .owner = THIS_MODULE,
@@ -63,18 +52,15 @@ static struct platform_driver dmm_driver_ldm = {
 
 s32 dmm_pat_refill(struct dmm *dmm, struct pat *pd, enum pat_mode mode)
 {
-        void __iomem *r = NULL;
-        u32 v = -1, w = -1;
+        void __iomem *r;
+        u32 v;
 
         /* Only manual refill supported */
         if (mode != MANUAL)
                 return -EFAULT;
 
-        /*
-         * Check that the DMM_PAT_STATUS register
-         * has not reported an error.
-        */
-        r = (void __iomem *)((u32)dmm->base | DMM_PAT_STATUS__0);
+        /* Check that the DMM_PAT_STATUS register has not reported an error */
+        r = dmm->base + DMM_PAT_STATUS__0;
         v = __raw_readl(r);
         if ((v & 0xFC00) != 0) {
                 while (1)
@@ -82,28 +68,19 @@ s32 dmm_pat_refill(struct dmm *dmm, struct pat *pd, enum pat_mode mode)
         }
 
         /* Set "next" register to NULL */
-        r = (void __iomem *)((u32)dmm->base | DMM_PAT_DESCR__0);
+        r = dmm->base + DMM_PAT_DESCR__0;
         v = __raw_readl(r);
-        w = (v & (~(BF(31, 4)))) | ((((u32)NULL) << 4) & BF(31, 4));
-        __raw_writel(w, r);
+        v = SET_FLD(v, 31, 4, (u32) NULL);
+        __raw_writel(v, r);
 
         /* Set area to be refilled */
-        r = (void __iomem *)((u32)dmm->base | DMM_PAT_AREA__0);
-        v = __raw_readl(r);
-        w = (v & (~(BF(30, 24)))) | ((((s8)pd->area.y1) << 24) & BF(30, 24));
-        __raw_writel(w, r);
-
-        v = __raw_readl(r);
-        w = (v & (~(BF(23, 16)))) | ((((s8)pd->area.x1) << 16) & BF(23, 16));
-        __raw_writel(w, r);
-
-        v = __raw_readl(r);
-        w = (v & (~(BF(14, 8)))) | ((((s8)pd->area.y0) << 8) & BF(14, 8));
-        __raw_writel(w, r);
-
+        r = dmm->base + DMM_PAT_AREA__0;
         v = __raw_readl(r);
-        w = (v & (~(BF(7, 0)))) | ((((s8)pd->area.x0) << 0) & BF(7, 0));
-        __raw_writel(w, r);
+        v = SET_FLD(v, 30, 24, pd->area.y1);
+        v = SET_FLD(v, 23, 16, pd->area.x1);
+        v = SET_FLD(v, 14, 8, pd->area.y0);
+        v = SET_FLD(v, 7, 0, pd->area.x0);
+        __raw_writel(v, r);
         wmb();
 
 #ifdef __DEBUG__
@@ -115,92 +92,71 @@ s32 dmm_pat_refill(struct dmm *dmm, struct pat *pd, enum pat_mode mode)
 #endif
 
         /* First, clear the DMM_PAT_IRQSTATUS register */
-        r = (void __iomem *)((u32)dmm->base | (u32)DMM_PAT_IRQSTATUS);
+        r = dmm->base + DMM_PAT_IRQSTATUS;
         __raw_writel(0xFFFFFFFF, r);
         wmb();
 
-        r = (void __iomem *)((u32)dmm->base | (u32)DMM_PAT_IRQSTATUS_RAW);
-        v = 0xFFFFFFFF;
-
-        while (v != 0x0) {
+        r = dmm->base + DMM_PAT_IRQSTATUS_RAW;
+        do {
                 v = __raw_readl(r);
                 DEBUG("DMM_PAT_IRQSTATUS_RAW", v);
-        }
+        } while (v != 0x0);
 
         /* Fill data register */
-        r = (void __iomem *)((u32)dmm->base | DMM_PAT_DATA__0);
+        r = dmm->base + DMM_PAT_DATA__0;
         v = __raw_readl(r);
 
-        /* Apply 4 bit left shft to counter the 4 bit right shift */
-        w = (v & (~(BF(31, 4)))) | ((((u32)(pd->data >> 4)) << 4) & BF(31, 4));
-        __raw_writel(w, r);
+        /* pd->data must be 16 aligned */
+        BUG_ON(pd->data & 15);
+        v = SET_FLD(v, 31, 4, pd->data >> 4);
+        __raw_writel(v, r);
         wmb();
 
         /* Read back PAT_DATA__0 to see if write was successful */
-        v = 0x0;
-        while (v != pd->data) {
+        do {
                 v = __raw_readl(r);
                 DEBUG("DMM_PAT_DATA__0", v);
-        }
-
-        r = (void __iomem *)((u32)dmm->base | (u32)DMM_PAT_CTRL__0);
-        v = __raw_readl(r);
-
-        w = (v & (~(BF(31, 28)))) | ((((u32)pd->ctrl.ini) << 28) & BF(31, 28));
-        __raw_writel(w, r);
-
-        v = __raw_readl(r);
-        w = (v & (~(BF(16, 16)))) | ((((u32)pd->ctrl.sync) << 16) & BF(16, 16));
-        __raw_writel(w, r);
-
-        v = __raw_readl(r);
-        w = (v & (~(BF(9, 8)))) | ((((u32)pd->ctrl.lut_id) << 8) & BF(9, 8));
-        __raw_writel(w, r);
-
-        v = __raw_readl(r);
-        w = (v & (~(BF(6, 4)))) | ((((u32)pd->ctrl.dir) << 4) & BF(6, 4));
-        __raw_writel(w, r);
+        } while (v != pd->data);
 
+        r = dmm->base + DMM_PAT_CTRL__0;
         v = __raw_readl(r);
-        w = (v & (~(BF(0, 0)))) | ((((u32)pd->ctrl.start) << 0) & BF(0, 0));
-        __raw_writel(w, r);
+        v = SET_FLD(v, 31, 28, pd->ctrl.ini);
+        v = SET_FLD(v, 16, 16, pd->ctrl.sync);
+        v = SET_FLD(v, 9, 8, pd->ctrl.lut_id);
+        v = SET_FLD(v, 6, 4, pd->ctrl.dir);
+        v = SET_FLD(v, 0, 0, pd->ctrl.start);
+        __raw_writel(v, r);
         wmb();
 
-        /*
-         * Now, check if PAT_IRQSTATUS_RAW has been
-         * set after the PAT has been refilled
-         */
-        r = (void __iomem *)((u32)dmm->base | (u32)DMM_PAT_IRQSTATUS_RAW);
-        v = 0x0;
-        while ((v & 0x3) != 0x3) {
+        /* Check if PAT_IRQSTATUS_RAW is set after the PAT has been refilled */
+        r = dmm->base + DMM_PAT_IRQSTATUS_RAW;
+        do {
                 v = __raw_readl(r);
                 DEBUG("DMM_PAT_IRQSTATUS_RAW", v);
-        }
+        } while ((v & 0x3) != 0x3);
 
         /* Again, clear the DMM_PAT_IRQSTATUS register */
-        r = (void __iomem *)((u32)dmm->base | (u32)DMM_PAT_IRQSTATUS);
+        r = dmm->base + DMM_PAT_IRQSTATUS;
         __raw_writel(0xFFFFFFFF, r);
         wmb();
 
-        r = (void __iomem *)((u32)dmm->base | (u32)DMM_PAT_IRQSTATUS_RAW);
-        v = 0xFFFFFFFF;
-
-        while (v != 0x0) {
+        r = dmm->base + DMM_PAT_IRQSTATUS_RAW;
+        do {
                 v = __raw_readl(r);
                 DEBUG("DMM_PAT_IRQSTATUS_RAW", v);
-        }
+        } while (v != 0x0);
 
         /* Again, set "next" register to NULL to clear any PAT STATUS errors */
-        r = (void __iomem *)((u32)dmm->base | DMM_PAT_DESCR__0);
+        r = dmm->base + DMM_PAT_DESCR__0;
         v = __raw_readl(r);
-        w = (v & (~(BF(31, 4)))) | ((((u32)NULL) << 4) & BF(31, 4));
-        __raw_writel(w, r);
+        v = SET_FLD(v, 31, 4, (u32) NULL);
+        __raw_writel(v, r);
 
         /*
          * Now, check that the DMM_PAT_STATUS register
          * has not reported an error before exiting.
         */
-        r = (void __iomem *)((u32)dmm->base | DMM_PAT_STATUS__0);
+        r = dmm->base + DMM_PAT_STATUS__0;
         v = __raw_readl(r);
         if ((v & 0xFC00) != 0) {
                 while (1)
@@ -211,25 +167,10 @@ s32 dmm_pat_refill(struct dmm *dmm, struct pat *pd, enum pat_mode mode)
 }
 EXPORT_SYMBOL(dmm_pat_refill);
 
-static s32 dmm_open(struct inode *ip, struct file *filp)
-{
-        return 0;
-}
-
-static s32 dmm_release(struct inode *ip, struct file *filp)
-{
-        return 0;
-}
-
-static const struct file_operations dmm_fops = {
-        .open    = dmm_open,
-        .release = dmm_release,
-};
-
 struct dmm *dmm_pat_init(u32 id)
 {
-        u32 base = 0;
-        struct dmm *dmm = NULL;
+        u32 base;
+        struct dmm *dmm;
         switch (id) {
         case 0:
                 /* only support id 0 for now */
@@ -276,60 +217,16 @@ EXPORT_SYMBOL(dmm_pat_release);
 
 static s32 __init dmm_init(void)
 {
-        dev_t dev  = 0;
-        s32 r = -1;
-        struct device *device = NULL;
-
-        if (dmm_major) {
-                dev = MKDEV(dmm_major, dmm_minor);
-                r = register_chrdev_region(dev, 1, "dmm");
-        } else {
-                r = alloc_chrdev_region(&dev, dmm_minor, 1, "dmm");
-                dmm_major = MAJOR(dev);
-        }
-
-        dmm_device = kmalloc(sizeof(*dmm_device), GFP_KERNEL);
-        if (!dmm_device) {
-                unregister_chrdev_region(dev, 1);
-                return -ENOMEM;
-        }
-        memset(dmm_device, 0x0, sizeof(struct dmm_dev));
-
-        cdev_init(&dmm_device->cdev, &dmm_fops);
-        dmm_device->cdev.owner = THIS_MODULE;
-        dmm_device->cdev.ops = &dmm_fops;
-
-        r = cdev_add(&dmm_device->cdev, dev, 1);
-        if (r)
-                printk(KERN_ERR "cdev_add():failed\n");
-
-        dmmdev_class = class_create(THIS_MODULE, "dmm");
-
-        if (IS_ERR(dmmdev_class)) {
-                printk(KERN_ERR "class_create():failed\n");
-                goto EXIT;
-        }
-
-        device = device_create(dmmdev_class, NULL, dev, NULL, "dmm");
-        if (device == NULL)
-                printk(KERN_ERR "device_create() fail\n");
-
-        r = platform_driver_register(&dmm_driver_ldm);
-
-EXIT:
-        return r;
+        return platform_driver_register(&dmm_driver_ldm);
 }
 
 static void __exit dmm_exit(void)
 {
         platform_driver_unregister(&dmm_driver_ldm);
-        cdev_del(&dmm_device->cdev);
-        kfree(dmm_device);
-        device_destroy(dmmdev_class, MKDEV(dmm_major, dmm_minor));
-        class_destroy(dmmdev_class);
 }
 
 MODULE_LICENSE("GPL v2");
 MODULE_AUTHOR("davidsin@ti.com");
+MODULE_AUTHOR("molnar@ti.com");
 module_init(dmm_init);
 module_exit(dmm_exit);