3 files changed, 42 insertions, 0 deletions

diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index f205ad6354e7..a602ac800a4f 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -702,6 +702,44 @@ static int cx23885_init_tsport(struct cx23885_dev *dev, struct cx23885_tsport *p
         return 0;
 }
 
+static void cx23885_dev_checkrevision(struct cx23885_dev *dev)
+{
+        switch (cx_read(RDR_CFG2) & 0xff) {
+        case 0x00:
+                /* cx23885 */
+                dev->hwrevision = 0xa0;
+                break;
+        case 0x01:
+                /* CX23885-12Z */
+                dev->hwrevision = 0xa1;
+                break;
+        case 0x02:
+                /* CX23885-13Z */
+                dev->hwrevision = 0xb0;
+                break;
+        case 0x03:
+                /* CX23888-22Z */
+                dev->hwrevision = 0xc0;
+                break;
+        case 0x0e:
+                /* CX23887-15Z */
+                dev->hwrevision = 0xc0;
+        case 0x0f:
+                /* CX23887-14Z */
+                dev->hwrevision = 0xb1;
+                break;
+        default:
+                printk(KERN_ERR "%s() New hardware revision found 0x%x\n",
+                        __FUNCTION__, dev->hwrevision);
+        }
+        if (dev->hwrevision)
+                printk(KERN_INFO "%s() Hardware revision = 0x%02x\n",
+                        __FUNCTION__, dev->hwrevision);
+        else
+                printk(KERN_ERR "%s() Hardware revision unknown 0x%x\n",
+                        __FUNCTION__, dev->hwrevision);
+}
+
 static int cx23885_dev_setup(struct cx23885_dev *dev)
 {
         int i;
@@ -832,6 +870,8 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
                 }
         }
 
+        cx23885_dev_checkrevision(dev);
+
         return 0;
 }
 
diff --git a/drivers/media/video/cx23885/cx23885-reg.h b/drivers/media/video/cx23885/cx23885-reg.h
index 162169f9091b..38abf49b63a1 100644
--- a/drivers/media/video/cx23885/cx23885-reg.h
+++ b/drivers/media/video/cx23885/cx23885-reg.h
@@ -276,6 +276,7 @@ Channel manager Data Structure entry = 20 DWORD
 
 #define RDR_CFG0        0x00050000
 #define RDR_CFG1        0x00050004
+#define RDR_CFG2        0x00050008
 #define RDR_TLCTL0      0x00050318
 
 /* APB DMAC Current Buffer Pointer */
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 974ec14782d7..48d0c87ddbc2 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -191,6 +191,7 @@ struct cx23885_dev {
         u32                        __iomem *lmmio;
         u8                         __iomem *bmmio;
         int                        pci_irqmask;
+        int                        hwrevision;
 
         /* I2C adapters: Master 1 & 2 (External) & Master 3 (Internal only) */
         struct cx23885_i2c         i2c_bus[3];