media: rc: mceusb: add support for 1b80:d3b2

Evromedia USB Full Hybrid Full HD (1b80:d3b2) has IR on Interface 0.
Remote controller supplied with this tuner fully compatible
with RC_MAP_MSI_DIGIVOX_III.

Signed-off-by: Oleh Kravchenko <oleg@kaa.org.ua>
Signed-off-by: Sean Young <sean@mess.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c
index 67c1ff099eb4b3204e92751e810637ac2db70bbe..9486994087648908e31a06b78a892a05cbe2e012 100644 (file)
--- a/drivers/media/rc/mceusb.c
+++ b/drivers/media/rc/mceusb.c
@@ -188,6 +188,7 @@ enum mceusb_model_type {
        TIVO_KIT,
        MCE_GEN2_NO_TX,
        HAUPPAUGE_CX_HYBRID_TV,
+       EVROMEDIA_FULL_HYBRID_FULLHD,
 };
 
 struct mceusb_model {
@@ -247,6 +248,11 @@ static const struct mceusb_model mceusb_model[] = {
                .mce_gen2 = 1,
                .rc_map = RC_MAP_TIVO,
        },
+       [EVROMEDIA_FULL_HYBRID_FULLHD] = {
+               .name = "Evromedia USB Full Hybrid Full HD",
+               .no_tx = 1,
+               .rc_map = RC_MAP_MSI_DIGIVOX_III,
+       },
 };
 
 static const struct usb_device_id mceusb_dev_table[] = {
@@ -398,6 +404,9 @@ static const struct usb_device_id mceusb_dev_table[] = {
          .driver_info = HAUPPAUGE_CX_HYBRID_TV },
        /* Adaptec / HP eHome Receiver */
        { USB_DEVICE(VENDOR_ADAPTEC, 0x0094) },
+       /* Evromedia USB Full Hybrid Full HD */
+       { USB_DEVICE(0x1b80, 0xd3b2),
+         .driver_info = EVROMEDIA_FULL_HYBRID_FULLHD },
 
        /* Terminating entry */
        { }

diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
index 9b742d569fb511db5d4de93538205d41f6ff42ea..f124b677d5a006883471d1281315a406b320e6e5 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-cards.c
+++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
@@ -847,7 +847,6 @@ struct cx231xx_board cx231xx_boards[] = {
                .demod_addr = 0x64, /* 0xc8 >> 1 */
                .demod_i2c_master = I2C_1_MUX_3,
                .has_dvb = 1,
-               .ir_i2c_master = I2C_0,
                .norm = V4L2_STD_PAL,
                .output_mode = OUT_MODE_VIP11,
                .tuner_addr = 0x60, /* 0xc0 >> 1 */