From 1024f9d1fd44ef073b47efac545a4d16b4ced8f7 Mon Sep 17 00:00:00 2001
From: Steven Toth <stoth@kernellabs.com>
Date: Thu, 25 Jun 2009 22:43:31 -0400
Subject: cx23885: Remove hardcoded gpio bits from the encoder driver
From: Steven Toth <stoth@kernellabs.com>
The encoder driver has hardcoded GPIO bits set for the HVR1800, regardless
of whether it's being used by a HVR1800 or not. I've implemented some generic
GPIO manipulation routines and I'm calling them only when appropriate.
Priority: normal
Signed-off-by: Steven Toth <stoth@kernellabs.com>
---
linux/drivers/media/video/cx23885/cx23885.h | 9 +++++++++
1 file changed, 9 insertions(+)
(limited to 'linux/drivers/media/video/cx23885/cx23885.h')
diff --git a/linux/drivers/media/video/cx23885/cx23885.h b/linux/drivers/media/video/cx23885/cx23885.h
index 2a384e6aa..a507af77a 100644
--- a/linux/drivers/media/video/cx23885/cx23885.h
+++ b/linux/drivers/media/video/cx23885/cx23885.h
@@ -89,6 +89,12 @@
#define GPIO_7 0x00000080
#define GPIO_8 0x00000100
#define GPIO_9 0x00000200
+#define GPIO_10 0x00000400
+#define GPIO_11 0x00000800
+#define GPIO_12 0x00001000
+#define GPIO_13 0x00002000
+#define GPIO_14 0x00004000
+#define GPIO_15 0x00008000
/* Currently unsupported by the driver: PAL/H, NTSC/Kr, SECAM B/G/H/LC */
#define CX23885_NORMS (\
@@ -506,6 +512,9 @@ extern void cx23885_417_check_encoder(struct cx23885_dev *dev);
extern void cx23885_mc417_init(struct cx23885_dev *dev);
extern int mc417_memory_read(struct cx23885_dev *dev, u32 address, u32 *value);
extern int mc417_memory_write(struct cx23885_dev *dev, u32 address, u32 value);
+extern void mc417_gpio_set(struct cx23885_dev *dev, u32 mask);
+extern void mc417_gpio_clear(struct cx23885_dev *dev, u32 mask);
+extern void mc417_gpio_enable(struct cx23885_dev *dev, u32 mask, int asoutput);
/* ----------------------------------------------------------- */
--
cgit v1.2.3
From 7991d8e7d32620e4b6f0fd92a78e4a090b4a09ee Mon Sep 17 00:00:00 2001
From: Steven Toth <stoth@kernellabs.com>
Date: Mon, 20 Jul 2009 14:37:25 -0400
Subject: cx23885: Add support for ATSC/QAM on Hauppauge HVR-1850
From: Steven Toth <stoth@kernellabs.com>
cx23885: Add support for ATSC/QAM on Hauppauge HVR-1850
Priority: normal
Signed-off-by: Steven Toth <stoth@kernellabs.com>
---
linux/drivers/media/video/cx23885/cx23885.h | 1 +
1 file changed, 1 insertion(+)
(limited to 'linux/drivers/media/video/cx23885/cx23885.h')
diff --git a/linux/drivers/media/video/cx23885/cx23885.h b/linux/drivers/media/video/cx23885/cx23885.h
index a507af77a..f71277845 100644
--- a/linux/drivers/media/video/cx23885/cx23885.h
+++ b/linux/drivers/media/video/cx23885/cx23885.h
@@ -78,6 +78,7 @@
#define CX23885_BOARD_HAUPPAUGE_HVR1210 21
#define CX23885_BOARD_MYGICA_X8506 22
#define CX23885_BOARD_MAGICPRO_PROHDTVE2 23
+#define CX23885_BOARD_HAUPPAUGE_HVR1850 24
#define GPIO_0 0x00000001
#define GPIO_1 0x00000002
--
cgit v1.2.3
From 988cd25daffa554b51e3f0d5858cb1727f8a9c09 Mon Sep 17 00:00:00 2001
From: Steven Toth <stoth@kernellabs.com>
Date: Mon, 20 Jul 2009 14:40:31 -0400
Subject: cx23885: Modify hardware revision detection for newer silicon
From: Steven Toth <stoth@kernellabs.com>
cx23885: Modify hardware revision detection for newer silicon
Priority: normal
Signed-off-by: Steven Toth <stoth@kernellabs.com>
---
linux/drivers/media/video/cx23885/cx23885.h | 1 +
1 file changed, 1 insertion(+)
(limited to 'linux/drivers/media/video/cx23885/cx23885.h')
diff --git a/linux/drivers/media/video/cx23885/cx23885.h b/linux/drivers/media/video/cx23885/cx23885.h
index f71277845..6ddabc263 100644
--- a/linux/drivers/media/video/cx23885/cx23885.h
+++ b/linux/drivers/media/video/cx23885/cx23885.h
@@ -340,6 +340,7 @@ struct cx23885_dev {
CX23885_BRIDGE_UNDEFINED = 0,
CX23885_BRIDGE_885 = 885,
CX23885_BRIDGE_887 = 887,
+ CX23885_BRIDGE_888 = 888,
} bridge;
/* Analog video */
--
cgit v1.2.3