[media] cx231xx: Initial support Evromedia USB Full Hybrid Full HD

This patch provide only digital support.
The device is based on Si2168 30-demodulator,
Si2158-20 tuner and CX23102-11Z chipset;
USB id: 1b80:d3b2.

Status:
- DVB-T2 works fine;
- Composite and SVideo works fine;
- Analog not implemented.

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

diff --git a/drivers/media/usb/cx231xx/Kconfig b/drivers/media/usb/cx231xx/Kconfig
index 0cced3e5b040bfddc8696d030aa3752003108e9f..58de80bff4c761296d85ae942899e87c1317476e 100644 (file)
--- a/drivers/media/usb/cx231xx/Kconfig
+++ b/drivers/media/usb/cx231xx/Kconfig
@@ -50,6 +50,7 @@ config VIDEO_CX231XX_DVB
        select DVB_LGDT3306A if MEDIA_SUBDRV_AUTOSELECT
        select DVB_TDA18271C2DD if MEDIA_SUBDRV_AUTOSELECT
        select DVB_SI2165 if MEDIA_SUBDRV_AUTOSELECT
+       select DVB_SI2168 if MEDIA_SUBDRV_AUTOSELECT
        select MEDIA_TUNER_SI2157 if MEDIA_SUBDRV_AUTOSELECT
 
        ---help---

diff --git a/drivers/media/usb/cx231xx/cx231xx-cards.c b/drivers/media/usb/cx231xx/cx231xx-cards.c
index 36bc25494319dbf1b48d2414c1e0b3f76965dc64..f730fdbc915670225ff2ca08a9f4cc60340523ed 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-cards.c
+++ b/drivers/media/usb/cx231xx/cx231xx-cards.c
@@ -841,6 +841,33 @@ struct cx231xx_board cx231xx_boards[] = {
                        .gpio = NULL,
                } },
        },
+       [CX231XX_BOARD_EVROMEDIA_FULL_HYBRID_FULLHD] = {
+               .name = "Evromedia USB Full Hybrid Full HD",
+               .tuner_type = TUNER_ABSENT,
+               .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 */
+               .tuner_i2c_master = I2C_2,
+               .input = {{
+                       .type = CX231XX_VMUX_TELEVISION,
+                       .vmux = 0,
+                       .amux = CX231XX_AMUX_VIDEO,
+               }, {
+                       .type = CX231XX_VMUX_COMPOSITE1,
+                       .vmux = CX231XX_VIN_2_1,
+                       .amux = CX231XX_AMUX_LINE_IN,
+               }, {
+                       .type = CX231XX_VMUX_SVIDEO,
+                       .vmux = CX231XX_VIN_1_1 |
+                               (CX231XX_VIN_1_2 << 8) |
+                               CX25840_SVIDEO_ON,
+                       .amux = CX231XX_AMUX_LINE_IN,
+               } },
+       },
 };
 const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards);
 
@@ -908,6 +935,8 @@ struct usb_device_id cx231xx_id_table[] = {
         .driver_info = CX231XX_BOARD_OTG102},
        {USB_DEVICE(USB_VID_TERRATEC, 0x00a6),
         .driver_info = CX231XX_BOARD_TERRATEC_GRABBY},
+       {USB_DEVICE(0x1b80, 0xd3b2),
+       .driver_info = CX231XX_BOARD_EVROMEDIA_FULL_HYBRID_FULLHD},
        {},
 };
 

diff --git a/drivers/media/usb/cx231xx/cx231xx-dvb.c b/drivers/media/usb/cx231xx/cx231xx-dvb.c
index 2868546999caff703a4a1c2a5ebc7a7af339f24e..46427fd3b220dc211f8a29bcd04a747ead171089 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx-dvb.c
+++ b/drivers/media/usb/cx231xx/cx231xx-dvb.c
@@ -33,6 +33,7 @@
 #include "s5h1411.h"
 #include "lgdt3305.h"
 #include "si2165.h"
+#include "si2168.h"
 #include "mb86a20s.h"
 #include "si2157.h"
 #include "lgdt3306a.h"
@@ -949,6 +950,75 @@ static int dvb_init(struct cx231xx *dev)
                           &pv_tda18271_config);
                break;
 
+       case CX231XX_BOARD_EVROMEDIA_FULL_HYBRID_FULLHD:
+       {
+               struct si2157_config si2157_config = {};
+               struct si2168_config si2168_config = {};
+               struct i2c_board_info info = {};
+               struct i2c_client *client;
+               struct i2c_adapter *adapter;
+
+               /* attach demodulator chip */
+               si2168_config.ts_mode = SI2168_TS_SERIAL; /* from *.inf file */
+               si2168_config.fe = &dev->dvb->frontend;
+               si2168_config.i2c_adapter = &adapter;
+               si2168_config.ts_clock_inv = true;
+
+               strlcpy(info.type, "si2168", sizeof(info.type));
+               info.addr = dev->board.demod_addr;
+               info.platform_data = &si2168_config;
+
+               request_module(info.type);
+               client = i2c_new_device(demod_i2c, &info);
+
+               if (client == NULL || client->dev.driver == NULL) {
+                       result = -ENODEV;
+                       goto out_free;
+               }
+
+               if (!try_module_get(client->dev.driver->owner)) {
+                       i2c_unregister_device(client);
+                       result = -ENODEV;
+                       goto out_free;
+               }
+
+               dvb->i2c_client_demod = client;
+
+               /* attach tuner chip */
+               si2157_config.fe = dev->dvb->frontend;
+#ifdef CONFIG_MEDIA_CONTROLLER_DVB
+               si2157_config.mdev = dev->media_dev;
+#endif
+               si2157_config.if_port = 1;
+               si2157_config.inversion = false;
+
+               memset(&info, 0, sizeof(info));
+               strlcpy(info.type, "si2157", sizeof(info.type));
+               info.addr = dev->board.tuner_addr;
+               info.platform_data = &si2157_config;
+
+               request_module(info.type);
+               client = i2c_new_device(tuner_i2c, &info);
+
+               if (client == NULL || client->dev.driver == NULL) {
+                       module_put(dvb->i2c_client_demod->dev.driver->owner);
+                       i2c_unregister_device(dvb->i2c_client_demod);
+                       result = -ENODEV;
+                       goto out_free;
+               }
+
+               if (!try_module_get(client->dev.driver->owner)) {
+                       i2c_unregister_device(client);
+                       module_put(dvb->i2c_client_demod->dev.driver->owner);
+                       i2c_unregister_device(dvb->i2c_client_demod);
+                       result = -ENODEV;
+                       goto out_free;
+               }
+
+               dev->cx231xx_reset_analog_tuner = NULL;
+               dev->dvb->i2c_client_tuner = client;
+               break;
+       }
        default:
                dev_err(dev->dev,
                        "%s/2: The frontend of your DVB/ATSC card isn't supported yet\n",

diff --git a/drivers/media/usb/cx231xx/cx231xx.h b/drivers/media/usb/cx231xx/cx231xx.h
index 90c867683076017f818a81d6db15dfb0c97adb95..d9792ea4bbc63ea2882e4b196af0040185d561c3 100644 (file)
--- a/drivers/media/usb/cx231xx/cx231xx.h
+++ b/drivers/media/usb/cx231xx/cx231xx.h
@@ -78,6 +78,7 @@
 #define CX231XX_BOARD_HAUPPAUGE_930C_HD_1114xx 20
 #define CX231XX_BOARD_HAUPPAUGE_955Q 21
 #define CX231XX_BOARD_TERRATEC_GRABBY 22
+#define CX231XX_BOARD_EVROMEDIA_FULL_HYBRID_FULLHD 23
 
 /* Limits minimum and default number of buffers */
 #define CX231XX_MIN_BUF                 4