1 files changed, 137 insertions, 7 deletions

diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
index da03733690bd..fe00da105e77 100644
--- a/drivers/media/usb/cx231xx/cx231xx-cards.c
+++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
@@ -776,6 +776,45 @@ struct cx231xx_board cx231xx_boards[] = {
                         .gpio = NULL,
                 } },
         },
+        [CX231XX_BOARD_HAUPPAUGE_955Q] = {
+                .name = "Hauppauge WinTV-HVR-955Q (111401)",
+                .tuner_type = TUNER_ABSENT,
+                .tuner_addr = 0x60,
+                .tuner_gpio = RDE250_XCV_TUNER,
+                .tuner_sif_gpio = 0x05,
+                .tuner_scl_gpio = 0x1a,
+                .tuner_sda_gpio = 0x1b,
+                .decoder = CX231XX_AVDECODER,
+                .output_mode = OUT_MODE_VIP11,
+                .demod_xfer_mode = 0,
+                .ctl_pin_status_mask = 0xFFFFFFC4,
+                .agc_analog_digital_select_gpio = 0x0c,
+                .gpio_pin_status_mask = 0x4001000,
+                .tuner_i2c_master = I2C_1_MUX_3,
+                .demod_i2c_master = I2C_2,
+                .has_dvb = 1,
+                .demod_addr = 0x0e,
+                .norm = V4L2_STD_NTSC,
+
+                .input = {{
+                        .type = CX231XX_VMUX_TELEVISION,
+                        .vmux = CX231XX_VIN_3_1,
+                        .amux = CX231XX_AMUX_VIDEO,
+                        .gpio = NULL,
+                }, {
+                        .type = CX231XX_VMUX_COMPOSITE1,
+                        .vmux = CX231XX_VIN_2_1,
+                        .amux = CX231XX_AMUX_LINE_IN,
+                        .gpio = NULL,
+                }, {
+                        .type = CX231XX_VMUX_SVIDEO,
+                        .vmux = CX231XX_VIN_1_1 |
+                                (CX231XX_VIN_1_2 << 8) |
+                                CX25840_SVIDEO_ON,
+                        .amux = CX231XX_AMUX_LINE_IN,
+                        .gpio = NULL,
+                } },
+        },
 };
 const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards);
 
@@ -805,6 +844,8 @@ struct usb_device_id cx231xx_id_table[] = {
          .driver_info = CX231XX_BOARD_HAUPPAUGE_USB2_FM_NTSC},
         {USB_DEVICE(0x2040, 0xb120),
          .driver_info = CX231XX_BOARD_HAUPPAUGE_EXETER},
+        {USB_DEVICE(0x2040, 0xb123),
+         .driver_info = CX231XX_BOARD_HAUPPAUGE_955Q},
         {USB_DEVICE(0x2040, 0xb130),
          .driver_info = CX231XX_BOARD_HAUPPAUGE_930C_HD_1113xx},
         {USB_DEVICE(0x2040, 0xb131),
@@ -912,9 +953,6 @@ static inline void cx231xx_set_model(struct cx231xx *dev)
  */
 void cx231xx_pre_card_setup(struct cx231xx *dev)
 {
-
-        cx231xx_set_model(dev);
-
         dev_info(dev->dev, "Identified as %s (card=%d)\n",
                 dev->board.name, dev->model);
 
@@ -1052,6 +1090,7 @@ void cx231xx_card_setup(struct cx231xx *dev)
         switch (dev->model) {
         case CX231XX_BOARD_HAUPPAUGE_930C_HD_1113xx:
         case CX231XX_BOARD_HAUPPAUGE_930C_HD_1114xx:
+        case CX231XX_BOARD_HAUPPAUGE_955Q:
                 {
                         struct tveeprom tvee;
                         static u8 eeprom[256];
@@ -1092,6 +1131,17 @@ void cx231xx_config_i2c(struct cx231xx *dev)
         call_all(dev, video, s_stream, 1);
 }
 
+static void cx231xx_unregister_media_device(struct cx231xx *dev)
+{
+#ifdef CONFIG_MEDIA_CONTROLLER
+        if (dev->media_dev) {
+                media_device_unregister(dev->media_dev);
+                kfree(dev->media_dev);
+                dev->media_dev = NULL;
+        }
+#endif
+}
+
 /*
  * cx231xx_realease_resources()
  * unregisters the v4l2,i2c and usb devices
@@ -1099,6 +1149,8 @@ void cx231xx_config_i2c(struct cx231xx *dev)
 */
 void cx231xx_release_resources(struct cx231xx *dev)
 {
+        cx231xx_unregister_media_device(dev);
+
         cx231xx_release_analog_resources(dev);
 
         cx231xx_remove_from_devlist(dev);
@@ -1117,6 +1169,74 @@ void cx231xx_release_resources(struct cx231xx *dev)
         clear_bit(dev->devno, &cx231xx_devused);
 }
 
+static void cx231xx_media_device_register(struct cx231xx *dev,
+                                          struct usb_device *udev)
+{
+#ifdef CONFIG_MEDIA_CONTROLLER
+        struct media_device *mdev;
+        int ret;
+
+        mdev = kzalloc(sizeof(*mdev), GFP_KERNEL);
+        if (!mdev)
+                return;
+
+        mdev->dev = dev->dev;
+        strlcpy(mdev->model, dev->board.name, sizeof(mdev->model));
+        if (udev->serial)
+                strlcpy(mdev->serial, udev->serial, sizeof(mdev->serial));
+        strcpy(mdev->bus_info, udev->devpath);
+        mdev->hw_revision = le16_to_cpu(udev->descriptor.bcdDevice);
+        mdev->driver_version = LINUX_VERSION_CODE;
+
+        ret = media_device_register(mdev);
+        if (ret) {
+                dev_err(dev->dev,
+                        "Couldn't create a media device. Error: %d\n",
+                        ret);
+                kfree(mdev);
+                return;
+        }
+
+        dev->media_dev = mdev;
+#endif
+}
+
+static void cx231xx_create_media_graph(struct cx231xx *dev)
+{
+#ifdef CONFIG_MEDIA_CONTROLLER
+        struct media_device *mdev = dev->media_dev;
+        struct media_entity *entity;
+        struct media_entity *tuner = NULL, *decoder = NULL;
+
+        if (!mdev)
+                return;
+
+        media_device_for_each_entity(entity, mdev) {
+                switch (entity->type) {
+                case MEDIA_ENT_T_V4L2_SUBDEV_TUNER:
+                        tuner = entity;
+                        break;
+                case MEDIA_ENT_T_V4L2_SUBDEV_DECODER:
+                        decoder = entity;
+                        break;
+                }
+        }
+
+        /* Analog setup, using tuner as a link */
+
+        if (!decoder)
+                return;
+
+        if (tuner)
+                media_entity_create_link(tuner, 0, decoder, 0,
+                                         MEDIA_LNK_FL_ENABLED);
+        media_entity_create_link(decoder, 1, &dev->vdev.entity, 0,
+                                 MEDIA_LNK_FL_ENABLED);
+        media_entity_create_link(decoder, 2, &dev->vbi_dev.entity, 0,
+                                 MEDIA_LNK_FL_ENABLED);
+#endif
+}
+
 /*
  * cx231xx_init_dev()
  * allocates and inits the device structs, registers i2c bus and v4l device
@@ -1225,10 +1345,8 @@ static int cx231xx_init_dev(struct cx231xx *dev, struct usb_device *udev,
         }
 
         retval = cx231xx_register_analog_devices(dev);
-        if (retval) {
-                cx231xx_release_analog_resources(dev);
+        if (retval)
                 goto err_analog;
-        }
 
         cx231xx_ir_init(dev);
 
@@ -1236,6 +1354,8 @@ static int cx231xx_init_dev(struct cx231xx *dev, struct usb_device *udev,
 
         return 0;
 err_analog:
+        cx231xx_unregister_media_device(dev);
+        cx231xx_release_analog_resources(dev);
         cx231xx_remove_from_devlist(dev);
 err_dev_init:
         cx231xx_dev_uninit(dev);
@@ -1438,6 +1558,8 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
         dev->video_mode.alt = -1;
         dev->dev = d;
 
+        cx231xx_set_model(dev);
+
         dev->interface_count++;
         /* reset gpio dir and value */
         dev->gpio_dir = 0;
@@ -1502,7 +1624,13 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
         /* save our data pointer in this interface device */
         usb_set_intfdata(interface, dev);
 
+        /* Register the media controller */
+        cx231xx_media_device_register(dev, udev);
+
         /* Create v4l2 device */
+#ifdef CONFIG_MEDIA_CONTROLLER
+        dev->v4l2_dev.mdev = dev->media_dev;
+#endif
         retval = v4l2_device_register(&interface->dev, &dev->v4l2_dev);
         if (retval) {
                 dev_err(d, "v4l2_device_register failed\n");
@@ -1568,6 +1696,8 @@ static int cx231xx_usb_probe(struct usb_interface *interface,
         /* load other modules required */
         request_modules(dev);
 
+        cx231xx_create_media_graph(dev);
+
         return 0;
 err_video_alt:
         /* cx231xx_uninit_dev: */
@@ -1618,7 +1748,7 @@ static void cx231xx_usb_disconnect(struct usb_interface *interface)
         if (dev->users) {
                 dev_warn(dev->dev,
                          "device %s is open! Deregistration and memory deallocation are deferred on close.\n",
-                         video_device_node_name(dev->vdev));
+                         video_device_node_name(&dev->vdev));
 
                 /* Even having users, it is safe to remove the RC i2c driver */
                 cx231xx_ir_exit(dev);