7 files changed, 90 insertions, 86 deletions

diff --git a/drivers/media/video/cx23885/Kconfig b/drivers/media/video/cx23885/Kconfig
index e1367b35647..6b4a516addf 100644
--- a/drivers/media/video/cx23885/Kconfig
+++ b/drivers/media/video/cx23885/Kconfig
@@ -5,7 +5,7 @@ config VIDEO_CX23885
         select VIDEO_BTCX
         select VIDEO_TUNER
         select VIDEO_TVEEPROM
-        depends on IR_CORE
+        depends on RC_CORE
         select VIDEOBUF_DVB
         select VIDEOBUF_DMA_SG
         select VIDEO_CX25840
diff --git a/drivers/media/video/cx23885/cimax2.c b/drivers/media/video/cx23885/cimax2.c
index c95e7bc1474..209b971bd26 100644
--- a/drivers/media/video/cx23885/cimax2.c
+++ b/drivers/media/video/cx23885/cimax2.c
@@ -368,7 +368,7 @@ static void netup_read_ci_status(struct work_struct *work)
                                 DVB_CA_EN50221_POLL_CAM_READY;
                 else
                         state->status = 0;
-        };
+        }
 }
 
 /* CI irq handler */
@@ -377,16 +377,24 @@ int netup_ci_slot_status(struct cx23885_dev *dev, u32 pci_status)
         struct cx23885_tsport *port = NULL;
         struct netup_ci_state *state = NULL;
 
-        if (pci_status & PCI_MSK_GPIO0)
-                port = &dev->ts1;
-        else if (pci_status & PCI_MSK_GPIO1)
-                port = &dev->ts2;
-        else /* who calls ? */
+        ci_dbg_print("%s:\n", __func__);
+
+        if (0 == (pci_status & (PCI_MSK_GPIO0 | PCI_MSK_GPIO1)))
                 return 0;
 
-        state = port->port_priv;
+        if (pci_status & PCI_MSK_GPIO0) {
+                port = &dev->ts1;
+                state = port->port_priv;
+                schedule_work(&state->work);
+                ci_dbg_print("%s: Wakeup CI0\n", __func__);
+        }
 
-        schedule_work(&state->work);
+        if (pci_status & PCI_MSK_GPIO1) {
+                port = &dev->ts2;
+                state = port->port_priv;
+                schedule_work(&state->work);
+                ci_dbg_print("%s: Wakeup CI1\n", __func__);
+        }
 
         return 1;
 }
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index db054004e46..b298b730943 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -309,6 +309,26 @@ struct cx23885_board cx23885_boards[] = {
                                   CX25840_COMPONENT_ON,
                 } },
         },
+        [CX23885_BOARD_GOTVIEW_X5_3D_HYBRID] = {
+                .name           = "GoTView X5 3D Hybrid",
+                .tuner_type     = TUNER_XC5000,
+                .tuner_addr     = 0x64,
+                .porta          = CX23885_ANALOG_VIDEO,
+                .portb          = CX23885_MPEG_DVB,
+                .input          = {{
+                        .type   = CX23885_VMUX_TELEVISION,
+                        .vmux   = CX25840_VIN2_CH1 |
+                                  CX25840_VIN5_CH2,
+                        .gpio0  = 0x02,
+                }, {
+                        .type   = CX23885_VMUX_COMPOSITE1,
+                        .vmux   = CX23885_VMUX_COMPOSITE1,
+                }, {
+                        .type   = CX23885_VMUX_SVIDEO,
+                        .vmux   = CX25840_SVIDEO_LUMA3 |
+                                  CX25840_SVIDEO_CHROMA4,
+                } },
+        },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
 
@@ -496,6 +516,10 @@ struct cx23885_subid cx23885_subids[] = {
                 .subvendor = 0x107d,
                 .subdevice = 0x6f22,
                 .card      = CX23885_BOARD_LEADTEK_WINFAST_PXTV1200,
+        }, {
+                .subvendor = 0x5654,
+                .subdevice = 0x2390,
+                .card      = CX23885_BOARD_GOTVIEW_X5_3D_HYBRID,
         },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -712,6 +736,10 @@ int cx23885_tuner_callback(void *priv, int component, int command, int arg)
                 else if (port->nr == 2)
                         bitmask = 0x04;
                 break;
+        case CX23885_BOARD_GOTVIEW_X5_3D_HYBRID:
+                /* Tuner Reset Command */
+                bitmask = 0x02;
+                break;
         }
 
         if (bitmask) {
@@ -967,6 +995,9 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                 /* CX24228 GPIO */
                 /* Connected to IF / Mux */
                 break;
+        case CX23885_BOARD_GOTVIEW_X5_3D_HYBRID:
+                cx_set(GP0_IO, 0x00010001); /* Bring the part out of reset */
+                break;
         }
 }
 
@@ -1218,6 +1249,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1850:
         case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
         case CX23885_BOARD_HAUPPAUGE_HVR1290:
+        case CX23885_BOARD_GOTVIEW_X5_3D_HYBRID:
         default:
                 ts2->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
                 ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
@@ -1245,9 +1277,10 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_MAGICPRO_PROHDTVE2:
         case CX23885_BOARD_HAUPPAUGE_HVR1290:
         case CX23885_BOARD_LEADTEK_WINFAST_PXTV1200:
+        case CX23885_BOARD_GOTVIEW_X5_3D_HYBRID:
                 dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                 &dev->i2c_bus[2].i2c_adap,
-                                NULL, "cx25840", 0x88 >> 1, NULL);
+                                "cx25840", 0x88 >> 1, NULL);
                 if (dev->sd_cx25840) {
                         dev->sd_cx25840->grp_id = CX23885_HW_AV_CORE;
                         v4l2_subdev_call(dev->sd_cx25840, core, load_fw);
diff --git a/drivers/media/video/cx23885/cx23885-input.c b/drivers/media/video/cx23885/cx23885-input.c
index 4a326fe0b01..199b9964bbe 100644
--- a/drivers/media/video/cx23885/cx23885-input.c
+++ b/drivers/media/video/cx23885/cx23885-input.c
@@ -35,9 +35,8 @@
  *  02110-1301, USA.
  */
 
-#include <linux/input.h>
 #include <linux/slab.h>
-#include <media/ir-core.h>
+#include <media/rc-core.h>
 #include <media/v4l2-subdev.h>
 
 #include "cx23885.h"
@@ -62,16 +61,16 @@ static void cx23885_input_process_measurements(struct cx23885_dev *dev,
                 count = num / sizeof(struct ir_raw_event);
 
                 for (i = 0; i < count; i++) {
-                        ir_raw_event_store(kernel_ir->inp_dev,
+                        ir_raw_event_store(kernel_ir->rc,
                                            &ir_core_event[i]);
                         handle = true;
                 }
         } while (num != 0);
 
         if (overrun)
-                ir_raw_event_reset(kernel_ir->inp_dev);
+                ir_raw_event_reset(kernel_ir->rc);
         else if (handle)
-                ir_raw_event_handle(kernel_ir->inp_dev);
+                ir_raw_event_handle(kernel_ir->rc);
 }
 
 void cx23885_input_rx_work_handler(struct cx23885_dev *dev, u32 events)
@@ -197,9 +196,9 @@ static int cx23885_input_ir_start(struct cx23885_dev *dev)
         return 0;
 }
 
-static int cx23885_input_ir_open(void *priv)
+static int cx23885_input_ir_open(struct rc_dev *rc)
 {
-        struct cx23885_kernel_ir *kernel_ir = priv;
+        struct cx23885_kernel_ir *kernel_ir = rc->priv;
 
         if (kernel_ir->cx == NULL)
                 return -ENODEV;
@@ -232,9 +231,9 @@ static void cx23885_input_ir_stop(struct cx23885_dev *dev)
         }
 }
 
-static void cx23885_input_ir_close(void *priv)
+static void cx23885_input_ir_close(struct rc_dev *rc)
 {
-        struct cx23885_kernel_ir *kernel_ir = priv;
+        struct cx23885_kernel_ir *kernel_ir = rc->priv;
 
         if (kernel_ir->cx != NULL)
                 cx23885_input_ir_stop(kernel_ir->cx);
@@ -243,9 +242,7 @@ static void cx23885_input_ir_close(void *priv)
 int cx23885_input_init(struct cx23885_dev *dev)
 {
         struct cx23885_kernel_ir *kernel_ir;
-        struct input_dev *inp_dev;
-        struct ir_dev_props *props;
-
+        struct rc_dev *rc;
         char *rc_map;
         enum rc_driver_type driver_type;
         unsigned long allowed_protos;
@@ -265,14 +262,14 @@ int cx23885_input_init(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1250:
                 /* Integrated CX2388[58] IR controller */
                 driver_type = RC_DRIVER_IR_RAW;
-                allowed_protos = IR_TYPE_ALL;
+                allowed_protos = RC_TYPE_ALL;
                 /* The grey Hauppauge RC-5 remote */
                 rc_map = RC_MAP_RC5_HAUPPAUGE_NEW;
                 break;
         case CX23885_BOARD_TEVII_S470:
                 /* Integrated CX23885 IR controller */
                 driver_type = RC_DRIVER_IR_RAW;
-                allowed_protos = IR_TYPE_ALL;
+                allowed_protos = RC_TYPE_ALL;
                 /* A guess at the remote */
                 rc_map = RC_MAP_TEVII_NEC;
                 break;
@@ -292,37 +289,36 @@ int cx23885_input_init(struct cx23885_dev *dev)
                                     pci_name(dev->pci));
 
         /* input device */
-        inp_dev = input_allocate_device();
-        if (inp_dev == NULL) {
+        rc = rc_allocate_device();
+        if (!rc) {
                 ret = -ENOMEM;
                 goto err_out_free;
         }
 
-        kernel_ir->inp_dev = inp_dev;
-        inp_dev->name = kernel_ir->name;
-        inp_dev->phys = kernel_ir->phys;
-        inp_dev->id.bustype = BUS_PCI;
-        inp_dev->id.version = 1;
+        kernel_ir->rc = rc;
+        rc->input_name = kernel_ir->name;
+        rc->input_phys = kernel_ir->phys;
+        rc->input_id.bustype = BUS_PCI;
+        rc->input_id.version = 1;
         if (dev->pci->subsystem_vendor) {
-                inp_dev->id.vendor  = dev->pci->subsystem_vendor;
-                inp_dev->id.product = dev->pci->subsystem_device;
+                rc->input_id.vendor  = dev->pci->subsystem_vendor;
+                rc->input_id.product = dev->pci->subsystem_device;
         } else {
-                inp_dev->id.vendor  = dev->pci->vendor;
-                inp_dev->id.product = dev->pci->device;
+                rc->input_id.vendor  = dev->pci->vendor;
+                rc->input_id.product = dev->pci->device;
         }
-        inp_dev->dev.parent = &dev->pci->dev;
-
-        /* kernel ir device properties */
-        props = &kernel_ir->props;
-        props->driver_type = driver_type;
-        props->allowed_protos = allowed_protos;
-        props->priv = kernel_ir;
-        props->open = cx23885_input_ir_open;
-        props->close = cx23885_input_ir_close;
+        rc->dev.parent = &dev->pci->dev;
+        rc->driver_type = driver_type;
+        rc->allowed_protos = allowed_protos;
+        rc->priv = kernel_ir;
+        rc->open = cx23885_input_ir_open;
+        rc->close = cx23885_input_ir_close;
+        rc->map_name = rc_map;
+        rc->driver_name = MODULE_NAME;
 
         /* Go */
         dev->kernel_ir = kernel_ir;
-        ret = ir_input_register(inp_dev, rc_map, props, MODULE_NAME);
+        ret = rc_register_device(rc);
         if (ret)
                 goto err_out_stop;
 
@@ -331,7 +327,7 @@ int cx23885_input_init(struct cx23885_dev *dev)
 err_out_stop:
         cx23885_input_ir_stop(dev);
         dev->kernel_ir = NULL;
-        /* TODO: double check clean-up of kernel_ir->inp_dev */
+        rc_free_device(rc);
 err_out_free:
         kfree(kernel_ir->phys);
         kfree(kernel_ir->name);
@@ -346,7 +342,7 @@ void cx23885_input_fini(struct cx23885_dev *dev)
 
         if (dev->kernel_ir == NULL)
                 return;
-        ir_input_unregister(dev->kernel_ir->inp_dev);
+        rc_unregister_device(dev->kernel_ir->rc);
         kfree(dev->kernel_ir->phys);
         kfree(dev->kernel_ir->name);
         kfree(dev->kernel_ir);
diff --git a/drivers/media/video/cx23885/cx23885-video.c b/drivers/media/video/cx23885/cx23885-video.c
index 3cc9f462d08..644fcb808c0 100644
--- a/drivers/media/video/cx23885/cx23885-video.c
+++ b/drivers/media/video/cx23885/cx23885-video.c
@@ -1024,35 +1024,6 @@ static int vidioc_enum_fmt_vid_cap(struct file *file, void  *priv,
         return 0;
 }
 
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-static int vidiocgmbuf(struct file *file, void *priv,
-        struct video_mbuf *mbuf)
-{
-        struct cx23885_fh *fh = priv;
-        struct videobuf_queue *q;
-        struct v4l2_requestbuffers req;
-        unsigned int i;
-        int err;
-
-        q = get_queue(fh);
-        memset(&req, 0, sizeof(req));
-        req.type   = q->type;
-        req.count  = 8;
-        req.memory = V4L2_MEMORY_MMAP;
-        err = videobuf_reqbufs(q, &req);
-        if (err < 0)
-                return err;
-
-        mbuf->frames = req.count;
-        mbuf->size   = 0;
-        for (i = 0; i < mbuf->frames; i++) {
-                mbuf->offsets[i]  = q->bufs[i]->boff;
-                mbuf->size       += q->bufs[i]->bsize;
-        }
-        return 0;
-}
-#endif
-
 static int vidioc_reqbufs(struct file *file, void *priv,
         struct v4l2_requestbuffers *p)
 {
@@ -1155,7 +1126,6 @@ static int cx23885_enum_input(struct cx23885_dev *dev, struct v4l2_input *i)
         if (0 == INPUT(n)->type)
                 return -EINVAL;
 
-        memset(i, 0, sizeof(*i));
         i->index = n;
         i->type  = V4L2_INPUT_TYPE_CAMERA;
         strcpy(i->name, iname[INPUT(n)->type]);
@@ -1427,9 +1397,6 @@ static const struct v4l2_ioctl_ops video_ioctl_ops = {
         .vidioc_s_ctrl        = vidioc_s_ctrl,
         .vidioc_streamon      = vidioc_streamon,
         .vidioc_streamoff     = vidioc_streamoff,
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-        .vidiocgmbuf          = vidiocgmbuf,
-#endif
         .vidioc_g_tuner       = vidioc_g_tuner,
         .vidioc_s_tuner       = vidioc_s_tuner,
         .vidioc_g_frequency   = vidioc_g_frequency,
@@ -1507,10 +1474,10 @@ int cx23885_video_register(struct cx23885_dev *dev)
                 if (dev->tuner_addr)
                         sd = v4l2_i2c_new_subdev(&dev->v4l2_dev,
                                 &dev->i2c_bus[1].i2c_adap,
-                                NULL, "tuner", dev->tuner_addr, NULL);
+                                "tuner", dev->tuner_addr, NULL);
                 else
                         sd = v4l2_i2c_new_subdev(&dev->v4l2_dev,
-                                &dev->i2c_bus[1].i2c_adap, NULL,
+                                &dev->i2c_bus[1].i2c_adap,
                                 "tuner", 0, v4l2_i2c_tuner_addrs(ADDRS_TV));
                 if (sd) {
                         struct tuner_setup tun_setup;
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index ed94b17dd8a..62e41ab6581 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -30,7 +30,7 @@
 #include <media/tveeprom.h>
 #include <media/videobuf-dma-sg.h>
 #include <media/videobuf-dvb.h>
-#include <media/ir-core.h>
+#include <media/rc-core.h>
 
 #include "btcx-risc.h"
 #include "cx23885-reg.h"
@@ -84,6 +84,7 @@
 #define CX23885_BOARD_HAUPPAUGE_HVR1290        26
 #define CX23885_BOARD_MYGICA_X8558PRO          27
 #define CX23885_BOARD_LEADTEK_WINFAST_PXTV1200 28
+#define CX23885_BOARD_GOTVIEW_X5_3D_HYBRID     29
 
 #define GPIO_0 0x00000001
 #define GPIO_1 0x00000002
@@ -310,8 +311,7 @@ struct cx23885_kernel_ir {
         char                    *name;
         char                    *phys;
 
-        struct input_dev        *inp_dev;
-        struct ir_dev_props     props;
+        struct rc_dev           *rc;
 };
 
 struct cx23885_dev {
diff --git a/drivers/media/video/cx23885/cx23888-ir.c b/drivers/media/video/cx23885/cx23888-ir.c
index e78e3e4c811..e37be6fcf67 100644
--- a/drivers/media/video/cx23885/cx23888-ir.c
+++ b/drivers/media/video/cx23885/cx23888-ir.c
@@ -26,7 +26,7 @@
 
 #include <media/v4l2-device.h>
 #include <media/v4l2-chip-ident.h>
-#include <media/ir-core.h>
+#include <media/rc-core.h>
 
 #include "cx23885.h"