| Message ID | 20170101172823.7654-1-oleg@kaa.org.ua (mailing list archive) |
|---|---|
| State | Deferred, archived |
| Headers | show |
Tested with Kaffeine https://kaffeine.kde.org/ dmesg output: usb 3-4: new high-speed USB device number 3 using ehci-pci usb 3-4: New USB device found, idVendor=1b80, idProduct=d3b2 usb 3-4: New USB device strings: Mfr=1, Product=2, SerialNumber=3 usb 3-4: Product: Polaris AV Capture usb 3-4: Manufacturer: Conexant Corporation usb 3-4: SerialNumber: 0000000000 cx231xx 3-4:1.1: New device Conexant Corporation Polaris AV Capture @ 480 Mbps (1b80:d3b2) with 7 interfaces cx231xx 3-4:1.1: Identified as Evromedia USB Full Hybrid Full HD (card=23) i2c i2c-6: Added multiplexed i2c bus 8 i2c i2c-6: Added multiplexed i2c bus 9 cx231xx 3-4:1.1: v4l2 driver version 0.0.3 cx231xx 3-4:1.1: Unknown tuner type configuring SIF cx231xx 3-4:1.1: Registered video device video1 [v4l2] cx231xx 3-4:1.1: Registered VBI device vbi0 cx231xx 3-4:1.1: audio EndPoint Addr 0x83, Alternate settings: 3 i2c i2c-9: Added multiplexed i2c bus 10 si2168 9-0064: Silicon Labs Si2168-A30 successfully identified si2168 9-0064: firmware version: A 3.0.2 si2157 7-0060: Silicon Labs Si2147/2148/2157/2158 successfully attached DVB: registering new adapter (cx231xx #0) cx231xx 3-4:1.1: DVB: registering adapter 0 frontend 0 (Silicon Labs Si2168)... cx231xx 3-4:1.1: Successfully loaded cx231xx-dvb cx231xx 3-4:1.1: video EndPoint Addr 0x84, Alternate settings: 5 cx231xx 3-4:1.1: VBI EndPoint Addr 0x85, Alternate settings: 2 cx231xx 3-4:1.1: sliced CC EndPoint Addr 0x86, Alternate settings: 2 cx231xx 3-4:1.1: TS EndPoint Addr 0x81, Alternate settings: 6 si2168 9-0064: downloading firmware from file 'dvb-demod-si2168-a30-01.fw' si2168 9-0064: firmware version: A 3.0.19 si2157 7-0060: found a 'Silicon Labs Si2158-A20' si2157 7-0060: downloading firmware from file 'dvb-tuner-si2158-a20-01.fw' si2157 7-0060: firmware version: 2.1.9 Tested-by: Oleh Kravchenko <oleg@kaa.org.ua> On 01.01.17 19:28, Oleh Kravchenko wrote: > Add initial support for the Evromedia USB Full Hybrid Full HD > with USB ID 1b80:d3b2. > > Status: > - DVB-T2 works fine; > - Analog not implemented. > > Signed-off-by: Oleh Kravchenko <oleg@kaa.org.ua> > --- > drivers/media/usb/cx231xx/Kconfig | 1 + > drivers/media/usb/cx231xx/cx231xx-cards.c | 16 +++++++ > drivers/media/usb/cx231xx/cx231xx-dvb.c | 74 +++++++++++++++++++++++++++++++ > drivers/media/usb/cx231xx/cx231xx-i2c.c | 37 ++++++++++++++++ > drivers/media/usb/cx231xx/cx231xx.h | 1 + > 5 files changed, 129 insertions(+) > > diff --git a/drivers/media/usb/cx231xx/Kconfig b/drivers/media/usb/cx231xx/Kconfig > index 0cced3e..58de80b 100644 > --- 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 36bc254..380aff7 100644 > --- a/drivers/media/usb/cx231xx/cx231xx-cards.c > +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c > @@ -841,6 +841,20 @@ struct cx231xx_board cx231xx_boards[] = { > .gpio = NULL, > } }, > }, > + [CX231XX_BOARD_EVROMEDIA_FULL_HYBRID_FULLHD] = { > + .name = "Evromedia USB Full Hybrid Full HD", > + .tuner_type = TUNER_ABSENT, > + .has_dvb = 1, > + .demod_i2c_master = I2C_1_MUX_3, > + .demod_addr = 0xc8 >> 1, > + .tuner_i2c_master = I2C_2, > + .tuner_addr = 0xc0 >> 1, > + .input = {{ > + .type = CX231XX_VMUX_TELEVISION, > + .vmux = 0, > + .amux = CX231XX_AMUX_VIDEO, > + } }, > + }, > }; > const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards); > > @@ -908,6 +922,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 1417515..131c1e2 100644 > --- 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,79 @@ 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 */ > + memset(&si2168_config, 0, sizeof(si2168_config)); > + 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; > + > + memset(&info, 0, sizeof(info)); > + strlcpy(info.type, "si2168", I2C_NAME_SIZE); > + 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 || dev->dvb->frontend == NULL) { > + dev_err(dev->dev, "Failed to attach Si2168 front end\n"); > + result = -EINVAL; > + 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; > + dev->dvb->frontend->ops.i2c_gate_ctrl = NULL; > + dvb->frontend->callback = cx231xx_tuner_callback; > + > + /* attach tuner chip */ > + memset(&si2157_config, 0, sizeof(si2157_config)); > + 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", I2C_NAME_SIZE); > + info.addr = dev->board.tuner_addr; > + info.platform_data = &si2157_config; > + > + request_module("si2157"); > + client = i2c_new_device(tuner_i2c, &info); > + > + if (client == NULL || client->dev.driver == NULL) { > + dvb_frontend_detach(dev->dvb->frontend); > + result = -ENODEV; > + goto out_free; > + } > + > + if (!try_module_get(client->dev.driver->owner)) { > + i2c_unregister_device(client); > + dvb_frontend_detach(dev->dvb->frontend); > + 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-i2c.c b/drivers/media/usb/cx231xx/cx231xx-i2c.c > index 35e9acf..6860c91 100644 > --- a/drivers/media/usb/cx231xx/cx231xx-i2c.c > +++ b/drivers/media/usb/cx231xx/cx231xx-i2c.c > @@ -171,6 +171,43 @@ static int cx231xx_i2c_send_bytes(struct i2c_adapter *i2c_adap, > bus->i2c_nostop = 0; > bus->i2c_reserve = 0; > > + } else if (dev->model == CX231XX_BOARD_EVROMEDIA_FULL_HYBRID_FULLHD > + && msg->addr == dev->tuner_addr > + && msg->len > 4) { > + /* special case for Evromedia USB Full Hybrid Full HD tuner chip */ > + size = msg->len; > + saddr_len = 1; > + > + /* adjust the length to correct length */ > + size -= saddr_len; > + > + buf_ptr = (u8*)(msg->buf + 1); > + > + do { > + /* prepare xfer_data struct */ > + req_data.dev_addr = msg->addr; > + req_data.direction = msg->flags; > + req_data.saddr_len = saddr_len; > + req_data.saddr_dat = msg->buf[0]; > + req_data.buf_size = size > 4 ? 4 : size; > + req_data.p_buffer = (u8*)(buf_ptr + loop * 4); > + > + bus->i2c_nostop = (size > 4) ? 1 : 0; > + bus->i2c_reserve = (loop == 0) ? 0 : 1; > + > + /* usb send command */ > + status = dev->cx231xx_send_usb_command(bus, &req_data); > + ++ loop; > + > + if (size >= 4) { > + size -= 4; > + } else { > + size = 0; > + } > + } while (size > 0); > + > + bus->i2c_nostop = 0; > + bus->i2c_reserve = 0; > } else { /* regular case */ > > /* prepare xfer_data struct */ > diff --git a/drivers/media/usb/cx231xx/cx231xx.h b/drivers/media/usb/cx231xx/cx231xx.h > index 90c8676..d9792ea 100644 > --- 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 > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 01/01/2017 06:28 PM, Oleh Kravchenko wrote: > Add initial support for the Evromedia USB Full Hybrid Full HD > with USB ID 1b80:d3b2. > > Status: > - DVB-T2 works fine; > - Analog not implemented. > > Signed-off-by: Oleh Kravchenko <oleg@kaa.org.ua> > --- > drivers/media/usb/cx231xx/Kconfig | 1 + > drivers/media/usb/cx231xx/cx231xx-cards.c | 16 +++++++ > drivers/media/usb/cx231xx/cx231xx-dvb.c | 74 +++++++++++++++++++++++++++++++ > drivers/media/usb/cx231xx/cx231xx-i2c.c | 37 ++++++++++++++++ > drivers/media/usb/cx231xx/cx231xx.h | 1 + > 5 files changed, 129 insertions(+) > > diff --git a/drivers/media/usb/cx231xx/Kconfig b/drivers/media/usb/cx231xx/Kconfig > index 0cced3e..58de80b 100644 > --- 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 36bc254..380aff7 100644 > --- a/drivers/media/usb/cx231xx/cx231xx-cards.c > +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c > @@ -841,6 +841,20 @@ struct cx231xx_board cx231xx_boards[] = { > .gpio = NULL, > } }, > }, > + [CX231XX_BOARD_EVROMEDIA_FULL_HYBRID_FULLHD] = { > + .name = "Evromedia USB Full Hybrid Full HD", > + .tuner_type = TUNER_ABSENT, > + .has_dvb = 1, > + .demod_i2c_master = I2C_1_MUX_3, > + .demod_addr = 0xc8 >> 1, > + .tuner_i2c_master = I2C_2, > + .tuner_addr = 0xc0 >> 1, > + .input = {{ > + .type = CX231XX_VMUX_TELEVISION, > + .vmux = 0, > + .amux = CX231XX_AMUX_VIDEO, > + } }, > + }, > }; > const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards); > > @@ -908,6 +922,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 1417515..131c1e2 100644 > --- 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,79 @@ 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; Zero these explicitly: struct si2157_config si2157_config = { }; struct si2168_config si2168_config = { }; struct i2c_board_info info = { }; And drop the corresponding memsets below. > + struct i2c_client *client; > + struct i2c_adapter *adapter; > + > + /* attach demodulator chip */ > + memset(&si2168_config, 0, sizeof(si2168_config)); > + 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; > + > + memset(&info, 0, sizeof(info)); > + strlcpy(info.type, "si2168", I2C_NAME_SIZE); use 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 || dev->dvb->frontend == NULL) { > + dev_err(dev->dev, "Failed to attach Si2168 front end\n"); > + result = -EINVAL; > + 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; > + dev->dvb->frontend->ops.i2c_gate_ctrl = NULL; > + dvb->frontend->callback = cx231xx_tuner_callback; > + > + /* attach tuner chip */ > + memset(&si2157_config, 0, sizeof(si2157_config)); > + 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)); except for this memset :-) > + strlcpy(info.type, "si2157", I2C_NAME_SIZE); Use sizeof(info.type). > + info.addr = dev->board.tuner_addr; > + info.platform_data = &si2157_config; > + > + request_module("si2157"); > + client = i2c_new_device(tuner_i2c, &info); > + > + if (client == NULL || client->dev.driver == NULL) { > + dvb_frontend_detach(dev->dvb->frontend); > + result = -ENODEV; > + goto out_free; > + } > + > + if (!try_module_get(client->dev.driver->owner)) { > + i2c_unregister_device(client); > + dvb_frontend_detach(dev->dvb->frontend); > + 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-i2c.c b/drivers/media/usb/cx231xx/cx231xx-i2c.c > index 35e9acf..6860c91 100644 > --- a/drivers/media/usb/cx231xx/cx231xx-i2c.c > +++ b/drivers/media/usb/cx231xx/cx231xx-i2c.c > @@ -171,6 +171,43 @@ static int cx231xx_i2c_send_bytes(struct i2c_adapter *i2c_adap, > bus->i2c_nostop = 0; > bus->i2c_reserve = 0; > > + } else if (dev->model == CX231XX_BOARD_EVROMEDIA_FULL_HYBRID_FULLHD > + && msg->addr == dev->tuner_addr > + && msg->len > 4) { > + /* special case for Evromedia USB Full Hybrid Full HD tuner chip */ > + size = msg->len; > + saddr_len = 1; > + > + /* adjust the length to correct length */ > + size -= saddr_len; > + > + buf_ptr = (u8*)(msg->buf + 1); > + > + do { > + /* prepare xfer_data struct */ > + req_data.dev_addr = msg->addr; > + req_data.direction = msg->flags; > + req_data.saddr_len = saddr_len; > + req_data.saddr_dat = msg->buf[0]; > + req_data.buf_size = size > 4 ? 4 : size; > + req_data.p_buffer = (u8*)(buf_ptr + loop * 4); > + > + bus->i2c_nostop = (size > 4) ? 1 : 0; > + bus->i2c_reserve = (loop == 0) ? 0 : 1; > + > + /* usb send command */ > + status = dev->cx231xx_send_usb_command(bus, &req_data); > + ++ loop; loop++ is the preferred style. > + > + if (size >= 4) { > + size -= 4; > + } else { > + size = 0; > + } > + } while (size > 0); > + > + bus->i2c_nostop = 0; > + bus->i2c_reserve = 0; > } else { /* regular case */ > > /* prepare xfer_data struct */ > diff --git a/drivers/media/usb/cx231xx/cx231xx.h b/drivers/media/usb/cx231xx/cx231xx.h > index 90c8676..d9792ea 100644 > --- 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 > Regards, Hans -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/usb/cx231xx/Kconfig b/drivers/media/usb/cx231xx/Kconfig index 0cced3e..58de80b 100644 --- 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 36bc254..380aff7 100644 --- a/drivers/media/usb/cx231xx/cx231xx-cards.c +++ b/drivers/media/usb/cx231xx/cx231xx-cards.c @@ -841,6 +841,20 @@ struct cx231xx_board cx231xx_boards[] = { .gpio = NULL, } }, }, + [CX231XX_BOARD_EVROMEDIA_FULL_HYBRID_FULLHD] = { + .name = "Evromedia USB Full Hybrid Full HD", + .tuner_type = TUNER_ABSENT, + .has_dvb = 1, + .demod_i2c_master = I2C_1_MUX_3, + .demod_addr = 0xc8 >> 1, + .tuner_i2c_master = I2C_2, + .tuner_addr = 0xc0 >> 1, + .input = {{ + .type = CX231XX_VMUX_TELEVISION, + .vmux = 0, + .amux = CX231XX_AMUX_VIDEO, + } }, + }, }; const unsigned int cx231xx_bcount = ARRAY_SIZE(cx231xx_boards); @@ -908,6 +922,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 1417515..131c1e2 100644 --- 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,79 @@ 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 */ + memset(&si2168_config, 0, sizeof(si2168_config)); + 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; + + memset(&info, 0, sizeof(info)); + strlcpy(info.type, "si2168", I2C_NAME_SIZE); + 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 || dev->dvb->frontend == NULL) { + dev_err(dev->dev, "Failed to attach Si2168 front end\n"); + result = -EINVAL; + 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; + dev->dvb->frontend->ops.i2c_gate_ctrl = NULL; + dvb->frontend->callback = cx231xx_tuner_callback; + + /* attach tuner chip */ + memset(&si2157_config, 0, sizeof(si2157_config)); + 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", I2C_NAME_SIZE); + info.addr = dev->board.tuner_addr; + info.platform_data = &si2157_config; + + request_module("si2157"); + client = i2c_new_device(tuner_i2c, &info); + + if (client == NULL || client->dev.driver == NULL) { + dvb_frontend_detach(dev->dvb->frontend); + result = -ENODEV; + goto out_free; + } + + if (!try_module_get(client->dev.driver->owner)) { + i2c_unregister_device(client); + dvb_frontend_detach(dev->dvb->frontend); + 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-i2c.c b/drivers/media/usb/cx231xx/cx231xx-i2c.c index 35e9acf..6860c91 100644 --- a/drivers/media/usb/cx231xx/cx231xx-i2c.c +++ b/drivers/media/usb/cx231xx/cx231xx-i2c.c @@ -171,6 +171,43 @@ static int cx231xx_i2c_send_bytes(struct i2c_adapter *i2c_adap, bus->i2c_nostop = 0; bus->i2c_reserve = 0; + } else if (dev->model == CX231XX_BOARD_EVROMEDIA_FULL_HYBRID_FULLHD + && msg->addr == dev->tuner_addr + && msg->len > 4) { + /* special case for Evromedia USB Full Hybrid Full HD tuner chip */ + size = msg->len; + saddr_len = 1; + + /* adjust the length to correct length */ + size -= saddr_len; + + buf_ptr = (u8*)(msg->buf + 1); + + do { + /* prepare xfer_data struct */ + req_data.dev_addr = msg->addr; + req_data.direction = msg->flags; + req_data.saddr_len = saddr_len; + req_data.saddr_dat = msg->buf[0]; + req_data.buf_size = size > 4 ? 4 : size; + req_data.p_buffer = (u8*)(buf_ptr + loop * 4); + + bus->i2c_nostop = (size > 4) ? 1 : 0; + bus->i2c_reserve = (loop == 0) ? 0 : 1; + + /* usb send command */ + status = dev->cx231xx_send_usb_command(bus, &req_data); + ++ loop; + + if (size >= 4) { + size -= 4; + } else { + size = 0; + } + } while (size > 0); + + bus->i2c_nostop = 0; + bus->i2c_reserve = 0; } else { /* regular case */ /* prepare xfer_data struct */ diff --git a/drivers/media/usb/cx231xx/cx231xx.h b/drivers/media/usb/cx231xx/cx231xx.h index 90c8676..d9792ea 100644 --- 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
Add initial support for the Evromedia USB Full Hybrid Full HD with USB ID 1b80:d3b2. Status: - DVB-T2 works fine; - Analog not implemented. Signed-off-by: Oleh Kravchenko <oleg@kaa.org.ua> --- drivers/media/usb/cx231xx/Kconfig | 1 + drivers/media/usb/cx231xx/cx231xx-cards.c | 16 +++++++ drivers/media/usb/cx231xx/cx231xx-dvb.c | 74 +++++++++++++++++++++++++++++++ drivers/media/usb/cx231xx/cx231xx-i2c.c | 37 ++++++++++++++++ drivers/media/usb/cx231xx/cx231xx.h | 1 + 5 files changed, 129 insertions(+)