| Message ID | 1374095551-3145-1-git-send-email-ljalvs@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 07/18/2013 12:12 AM, Luis Alves wrote: > v3: > Fixed issues reported by checkpatch script (thanks Antti). > Changed/fixed some stuff as sugested by Mauro Chehab. > Splited cx23885 changes to a separated patch. > > Signed-off-by: Luis Alves <ljalvs@gmail.com> The order of patches is wrong as it will now fail compilation because of missing demod driver. There was also minor comment about msleep() usage. It is not critical, but it could be nice if you will find out more suitable sleep. regards Antti > --- > drivers/media/pci/cx23885/Kconfig | 1 + > drivers/media/pci/cx23885/cx23885-cards.c | 68 +++++++++++++++++++++++++++++ > drivers/media/pci/cx23885/cx23885-dvb.c | 31 +++++++++++++ > drivers/media/pci/cx23885/cx23885-input.c | 12 +++++ > drivers/media/pci/cx23885/cx23885.h | 2 + > 5 files changed, 114 insertions(+) > > diff --git a/drivers/media/pci/cx23885/Kconfig b/drivers/media/pci/cx23885/Kconfig > index b3688aa..91b2ed7 100644 > --- a/drivers/media/pci/cx23885/Kconfig > +++ b/drivers/media/pci/cx23885/Kconfig > @@ -23,6 +23,7 @@ config VIDEO_CX23885 > select DVB_STB6100 if MEDIA_SUBDRV_AUTOSELECT > select DVB_STV6110 if MEDIA_SUBDRV_AUTOSELECT > select DVB_CX24116 if MEDIA_SUBDRV_AUTOSELECT > + select DVB_CX24117 if MEDIA_SUBDRV_AUTOSELECT > select DVB_STV0900 if MEDIA_SUBDRV_AUTOSELECT > select DVB_DS3000 if MEDIA_SUBDRV_AUTOSELECT > select DVB_TS2020 if MEDIA_SUBDRV_AUTOSELECT > diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c > index 7e923f8..d7800ac 100644 > --- a/drivers/media/pci/cx23885/cx23885-cards.c > +++ b/drivers/media/pci/cx23885/cx23885-cards.c > @@ -259,6 +259,16 @@ struct cx23885_board cx23885_boards[] = { > .name = "TurboSight TBS 6920", > .portb = CX23885_MPEG_DVB, > }, > + [CX23885_BOARD_TBS_6980] = { > + .name = "TurboSight TBS 6980", > + .portb = CX23885_MPEG_DVB, > + .portc = CX23885_MPEG_DVB, > + }, > + [CX23885_BOARD_TBS_6981] = { > + .name = "TurboSight TBS 6981", > + .portb = CX23885_MPEG_DVB, > + .portc = CX23885_MPEG_DVB, > + }, > [CX23885_BOARD_TEVII_S470] = { > .name = "TeVii S470", > .portb = CX23885_MPEG_DVB, > @@ -698,6 +708,14 @@ struct cx23885_subid cx23885_subids[] = { > .subdevice = 0x8888, > .card = CX23885_BOARD_TBS_6920, > }, { > + .subvendor = 0x6980, > + .subdevice = 0x8888, > + .card = CX23885_BOARD_TBS_6980, > + }, { > + .subvendor = 0x6981, > + .subdevice = 0x8888, > + .card = CX23885_BOARD_TBS_6981, > + }, { > .subvendor = 0xd470, > .subdevice = 0x9022, > .card = CX23885_BOARD_TEVII_S470, > @@ -1022,6 +1040,36 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data) > dev->name, tv.model); > } > > +/* some TBS cards require init */ > +static void tbs_card_init(struct cx23885_dev *dev) > +{ > + int i; > + const u8 buf[] = { > + 0xe0, 0x06, 0x66, 0x33, 0x65, > + 0x01, 0x17, 0x06, 0xde}; > + > + switch (dev->board) { > + case CX23885_BOARD_TBS_6980: > + case CX23885_BOARD_TBS_6981: > + cx_set(GP0_IO, 0x00070007); > + msleep(1); > + cx_clear(GP0_IO, 2); > + msleep(1); > + /* send init bitstream */ > + /* the bitstream is sent in a bitbanged spi */ > + /* attached to cx23995 GPIO port */ > + for (i = 0; i < 9 * 8; i++) { > + cx_clear(GP0_IO, 7); > + msleep(1); > + cx_set(GP0_IO, > + ((buf[i >> 3] >> (7 - (i & 7))) & 1) | 4); > + msleep(1); > + } > + cx_set(GP0_IO, 7); > + break; > + } > +} Didn't you ran checkpatch.pl? It should warn that small msleep. If I am not mistaken msleep could not sleep less than about 20ms. So that msleep(1) behaves actually like msleep(20). There is some timers.txt or like that in Documentation which will give a idea how to select proper delay. 72*20ms*2 = 2880 => ~3sec. It sounds a little bit long delay, but maybe it will not cause harm as it is done only once when driver is loaded? > + > int cx23885_tuner_callback(void *priv, int component, int command, int arg) > { > struct cx23885_tsport *port = priv; > @@ -1224,6 +1272,8 @@ void cx23885_gpio_setup(struct cx23885_dev *dev) > cx_set(GP0_IO, 0x00040004); > break; > case CX23885_BOARD_TBS_6920: > + case CX23885_BOARD_TBS_6980: > + case CX23885_BOARD_TBS_6981: > case CX23885_BOARD_PROF_8000: > cx_write(MC417_CTL, 0x00000036); > cx_write(MC417_OEN, 0x00001000); > @@ -1472,6 +1522,8 @@ int cx23885_ir_init(struct cx23885_dev *dev) > case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL: > case CX23885_BOARD_TEVII_S470: > case CX23885_BOARD_MYGICA_X8507: > + case CX23885_BOARD_TBS_6980: > + case CX23885_BOARD_TBS_6981: > if (!enable_885_ir) > break; > dev->sd_ir = cx23885_find_hw(dev, CX23885_HW_AV_CORE); > @@ -1515,6 +1567,8 @@ void cx23885_ir_fini(struct cx23885_dev *dev) > case CX23885_BOARD_TEVII_S470: > case CX23885_BOARD_HAUPPAUGE_HVR1250: > case CX23885_BOARD_MYGICA_X8507: > + case CX23885_BOARD_TBS_6980: > + case CX23885_BOARD_TBS_6981: > cx23885_irq_remove(dev, PCI_MSK_AV_CORE); > /* sd_ir is a duplicate pointer to the AV Core, just clear it */ > dev->sd_ir = NULL; > @@ -1560,6 +1614,8 @@ void cx23885_ir_pci_int_enable(struct cx23885_dev *dev) > case CX23885_BOARD_TEVII_S470: > case CX23885_BOARD_HAUPPAUGE_HVR1250: > case CX23885_BOARD_MYGICA_X8507: > + case CX23885_BOARD_TBS_6980: > + case CX23885_BOARD_TBS_6981: > if (dev->sd_ir) > cx23885_irq_add_enable(dev, PCI_MSK_AV_CORE); > break; > @@ -1675,6 +1731,16 @@ void cx23885_card_setup(struct cx23885_dev *dev) > ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */ > ts2->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO; > break; > + case CX23885_BOARD_TBS_6980: > + case CX23885_BOARD_TBS_6981: > + ts1->gen_ctrl_val = 0xc; /* Serial bus + punctured clock */ > + ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */ > + ts1->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO; > + ts2->gen_ctrl_val = 0xc; /* Serial bus + punctured clock */ > + ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */ > + ts2->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO; > + tbs_card_init(dev); > + break; > case CX23885_BOARD_MYGICA_X8506: > case CX23885_BOARD_MAGICPRO_PROHDTVE2: > ts1->gen_ctrl_val = 0x5; /* Parallel */ > @@ -1750,6 +1816,8 @@ void cx23885_card_setup(struct cx23885_dev *dev) > case CX23885_BOARD_MYGICA_X8507: > case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL: > case CX23885_BOARD_AVERMEDIA_HC81R: > + case CX23885_BOARD_TBS_6980: > + case CX23885_BOARD_TBS_6981: > dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev, > &dev->i2c_bus[2].i2c_adap, > "cx25840", 0x88 >> 1, NULL); > diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c > index 9c5ed10..bfb7e33 100644 > --- a/drivers/media/pci/cx23885/cx23885-dvb.c > +++ b/drivers/media/pci/cx23885/cx23885-dvb.c > @@ -51,6 +51,7 @@ > #include "stv6110.h" > #include "lnbh24.h" > #include "cx24116.h" > +#include "cx24117.h" > #include "cimax2.h" > #include "lgs8gxx.h" > #include "netup-eeprom.h" > @@ -468,6 +469,10 @@ static struct cx24116_config tbs_cx24116_config = { > .demod_address = 0x55, > }; > > +static struct cx24117_config tbs_cx24117_config = { > + .demod_address = 0x55, > +}; > + > static struct ds3000_config tevii_ds3000_config = { > .demod_address = 0x68, > }; > @@ -1027,6 +1032,32 @@ static int dvb_register(struct cx23885_tsport *port) > fe0->dvb.frontend->ops.set_voltage = f300_set_voltage; > > break; > + case CX23885_BOARD_TBS_6980: > + case CX23885_BOARD_TBS_6981: > + i2c_bus = &dev->i2c_bus[1]; > + > + switch (port->nr) { > + /* PORT B */ > + case 1: > + fe0->dvb.frontend = dvb_attach(cx24117_attach, > + &tbs_cx24117_config, > + &i2c_bus->i2c_adap, NULL); > + break; > + /* PORT C */ > + case 2: > + /* use fe1 pointer as temporary holder */ > + /* for the first frontend */ > + fe1 = videobuf_dvb_get_frontend( > + &port->dev->ts1.frontends, 1); > + > + fe0->dvb.frontend = dvb_attach(cx24117_attach, > + &tbs_cx24117_config, > + &i2c_bus->i2c_adap, fe1->dvb.frontend); > + /* we're done, so clear fe1 pointer */ > + fe1 = NULL; > + break; > + } > + break; > case CX23885_BOARD_TEVII_S470: > i2c_bus = &dev->i2c_bus[1]; > > diff --git a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx23885/cx23885-input.c > index 7875dfb..8a49e7c 100644 > --- a/drivers/media/pci/cx23885/cx23885-input.c > +++ b/drivers/media/pci/cx23885/cx23885-input.c > @@ -90,6 +90,8 @@ void cx23885_input_rx_work_handler(struct cx23885_dev *dev, u32 events) > case CX23885_BOARD_TEVII_S470: > case CX23885_BOARD_HAUPPAUGE_HVR1250: > case CX23885_BOARD_MYGICA_X8507: > + case CX23885_BOARD_TBS_6980: > + case CX23885_BOARD_TBS_6981: > /* > * The only boards we handle right now. However other boards > * using the CX2388x integrated IR controller should be similar > @@ -168,6 +170,8 @@ static int cx23885_input_ir_start(struct cx23885_dev *dev) > break; > case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL: > case CX23885_BOARD_TEVII_S470: > + case CX23885_BOARD_TBS_6980: > + case CX23885_BOARD_TBS_6981: > /* > * The IR controller on this board only returns pulse widths. > * Any other mode setting will fail to set up the device. > @@ -298,6 +302,14 @@ int cx23885_input_init(struct cx23885_dev *dev) > /* A guess at the remote */ > rc_map = RC_MAP_TOTAL_MEDIA_IN_HAND_02; > break; > + case CX23885_BOARD_TBS_6980: > + case CX23885_BOARD_TBS_6981: > + /* Integrated CX23885 IR controller */ > + driver_type = RC_DRIVER_IR_RAW; > + allowed_protos = RC_BIT_ALL; > + /* A guess at the remote */ > + rc_map = RC_MAP_TBS_NEC; > + break; > default: > return -ENODEV; > } > diff --git a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/cx23885/cx23885.h > index 5687d3f..ebcc63e 100644 > --- a/drivers/media/pci/cx23885/cx23885.h > +++ b/drivers/media/pci/cx23885/cx23885.h > @@ -93,6 +93,8 @@ > #define CX23885_BOARD_PROF_8000 37 > #define CX23885_BOARD_HAUPPAUGE_HVR4400 38 > #define CX23885_BOARD_AVERMEDIA_HC81R 39 > +#define CX23885_BOARD_TBS_6981 40 > +#define CX23885_BOARD_TBS_6980 41 > > #define GPIO_0 0x00000001 > #define GPIO_1 0x00000002 >
diff --git a/drivers/media/pci/cx23885/Kconfig b/drivers/media/pci/cx23885/Kconfig index b3688aa..91b2ed7 100644 --- a/drivers/media/pci/cx23885/Kconfig +++ b/drivers/media/pci/cx23885/Kconfig @@ -23,6 +23,7 @@ config VIDEO_CX23885 select DVB_STB6100 if MEDIA_SUBDRV_AUTOSELECT select DVB_STV6110 if MEDIA_SUBDRV_AUTOSELECT select DVB_CX24116 if MEDIA_SUBDRV_AUTOSELECT + select DVB_CX24117 if MEDIA_SUBDRV_AUTOSELECT select DVB_STV0900 if MEDIA_SUBDRV_AUTOSELECT select DVB_DS3000 if MEDIA_SUBDRV_AUTOSELECT select DVB_TS2020 if MEDIA_SUBDRV_AUTOSELECT diff --git a/drivers/media/pci/cx23885/cx23885-cards.c b/drivers/media/pci/cx23885/cx23885-cards.c index 7e923f8..d7800ac 100644 --- a/drivers/media/pci/cx23885/cx23885-cards.c +++ b/drivers/media/pci/cx23885/cx23885-cards.c @@ -259,6 +259,16 @@ struct cx23885_board cx23885_boards[] = { .name = "TurboSight TBS 6920", .portb = CX23885_MPEG_DVB, }, + [CX23885_BOARD_TBS_6980] = { + .name = "TurboSight TBS 6980", + .portb = CX23885_MPEG_DVB, + .portc = CX23885_MPEG_DVB, + }, + [CX23885_BOARD_TBS_6981] = { + .name = "TurboSight TBS 6981", + .portb = CX23885_MPEG_DVB, + .portc = CX23885_MPEG_DVB, + }, [CX23885_BOARD_TEVII_S470] = { .name = "TeVii S470", .portb = CX23885_MPEG_DVB, @@ -698,6 +708,14 @@ struct cx23885_subid cx23885_subids[] = { .subdevice = 0x8888, .card = CX23885_BOARD_TBS_6920, }, { + .subvendor = 0x6980, + .subdevice = 0x8888, + .card = CX23885_BOARD_TBS_6980, + }, { + .subvendor = 0x6981, + .subdevice = 0x8888, + .card = CX23885_BOARD_TBS_6981, + }, { .subvendor = 0xd470, .subdevice = 0x9022, .card = CX23885_BOARD_TEVII_S470, @@ -1022,6 +1040,36 @@ static void hauppauge_eeprom(struct cx23885_dev *dev, u8 *eeprom_data) dev->name, tv.model); } +/* some TBS cards require init */ +static void tbs_card_init(struct cx23885_dev *dev) +{ + int i; + const u8 buf[] = { + 0xe0, 0x06, 0x66, 0x33, 0x65, + 0x01, 0x17, 0x06, 0xde}; + + switch (dev->board) { + case CX23885_BOARD_TBS_6980: + case CX23885_BOARD_TBS_6981: + cx_set(GP0_IO, 0x00070007); + msleep(1); + cx_clear(GP0_IO, 2); + msleep(1); + /* send init bitstream */ + /* the bitstream is sent in a bitbanged spi */ + /* attached to cx23995 GPIO port */ + for (i = 0; i < 9 * 8; i++) { + cx_clear(GP0_IO, 7); + msleep(1); + cx_set(GP0_IO, + ((buf[i >> 3] >> (7 - (i & 7))) & 1) | 4); + msleep(1); + } + cx_set(GP0_IO, 7); + break; + } +} + int cx23885_tuner_callback(void *priv, int component, int command, int arg) { struct cx23885_tsport *port = priv; @@ -1224,6 +1272,8 @@ void cx23885_gpio_setup(struct cx23885_dev *dev) cx_set(GP0_IO, 0x00040004); break; case CX23885_BOARD_TBS_6920: + case CX23885_BOARD_TBS_6980: + case CX23885_BOARD_TBS_6981: case CX23885_BOARD_PROF_8000: cx_write(MC417_CTL, 0x00000036); cx_write(MC417_OEN, 0x00001000); @@ -1472,6 +1522,8 @@ int cx23885_ir_init(struct cx23885_dev *dev) case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL: case CX23885_BOARD_TEVII_S470: case CX23885_BOARD_MYGICA_X8507: + case CX23885_BOARD_TBS_6980: + case CX23885_BOARD_TBS_6981: if (!enable_885_ir) break; dev->sd_ir = cx23885_find_hw(dev, CX23885_HW_AV_CORE); @@ -1515,6 +1567,8 @@ void cx23885_ir_fini(struct cx23885_dev *dev) case CX23885_BOARD_TEVII_S470: case CX23885_BOARD_HAUPPAUGE_HVR1250: case CX23885_BOARD_MYGICA_X8507: + case CX23885_BOARD_TBS_6980: + case CX23885_BOARD_TBS_6981: cx23885_irq_remove(dev, PCI_MSK_AV_CORE); /* sd_ir is a duplicate pointer to the AV Core, just clear it */ dev->sd_ir = NULL; @@ -1560,6 +1614,8 @@ void cx23885_ir_pci_int_enable(struct cx23885_dev *dev) case CX23885_BOARD_TEVII_S470: case CX23885_BOARD_HAUPPAUGE_HVR1250: case CX23885_BOARD_MYGICA_X8507: + case CX23885_BOARD_TBS_6980: + case CX23885_BOARD_TBS_6981: if (dev->sd_ir) cx23885_irq_add_enable(dev, PCI_MSK_AV_CORE); break; @@ -1675,6 +1731,16 @@ void cx23885_card_setup(struct cx23885_dev *dev) ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */ ts2->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO; break; + case CX23885_BOARD_TBS_6980: + case CX23885_BOARD_TBS_6981: + ts1->gen_ctrl_val = 0xc; /* Serial bus + punctured clock */ + ts1->ts_clk_en_val = 0x1; /* Enable TS_CLK */ + ts1->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO; + ts2->gen_ctrl_val = 0xc; /* Serial bus + punctured clock */ + ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */ + ts2->src_sel_val = CX23885_SRC_SEL_PARALLEL_MPEG_VIDEO; + tbs_card_init(dev); + break; case CX23885_BOARD_MYGICA_X8506: case CX23885_BOARD_MAGICPRO_PROHDTVE2: ts1->gen_ctrl_val = 0x5; /* Parallel */ @@ -1750,6 +1816,8 @@ void cx23885_card_setup(struct cx23885_dev *dev) case CX23885_BOARD_MYGICA_X8507: case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL: case CX23885_BOARD_AVERMEDIA_HC81R: + case CX23885_BOARD_TBS_6980: + case CX23885_BOARD_TBS_6981: dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev, &dev->i2c_bus[2].i2c_adap, "cx25840", 0x88 >> 1, NULL); diff --git a/drivers/media/pci/cx23885/cx23885-dvb.c b/drivers/media/pci/cx23885/cx23885-dvb.c index 9c5ed10..bfb7e33 100644 --- a/drivers/media/pci/cx23885/cx23885-dvb.c +++ b/drivers/media/pci/cx23885/cx23885-dvb.c @@ -51,6 +51,7 @@ #include "stv6110.h" #include "lnbh24.h" #include "cx24116.h" +#include "cx24117.h" #include "cimax2.h" #include "lgs8gxx.h" #include "netup-eeprom.h" @@ -468,6 +469,10 @@ static struct cx24116_config tbs_cx24116_config = { .demod_address = 0x55, }; +static struct cx24117_config tbs_cx24117_config = { + .demod_address = 0x55, +}; + static struct ds3000_config tevii_ds3000_config = { .demod_address = 0x68, }; @@ -1027,6 +1032,32 @@ static int dvb_register(struct cx23885_tsport *port) fe0->dvb.frontend->ops.set_voltage = f300_set_voltage; break; + case CX23885_BOARD_TBS_6980: + case CX23885_BOARD_TBS_6981: + i2c_bus = &dev->i2c_bus[1]; + + switch (port->nr) { + /* PORT B */ + case 1: + fe0->dvb.frontend = dvb_attach(cx24117_attach, + &tbs_cx24117_config, + &i2c_bus->i2c_adap, NULL); + break; + /* PORT C */ + case 2: + /* use fe1 pointer as temporary holder */ + /* for the first frontend */ + fe1 = videobuf_dvb_get_frontend( + &port->dev->ts1.frontends, 1); + + fe0->dvb.frontend = dvb_attach(cx24117_attach, + &tbs_cx24117_config, + &i2c_bus->i2c_adap, fe1->dvb.frontend); + /* we're done, so clear fe1 pointer */ + fe1 = NULL; + break; + } + break; case CX23885_BOARD_TEVII_S470: i2c_bus = &dev->i2c_bus[1]; diff --git a/drivers/media/pci/cx23885/cx23885-input.c b/drivers/media/pci/cx23885/cx23885-input.c index 7875dfb..8a49e7c 100644 --- a/drivers/media/pci/cx23885/cx23885-input.c +++ b/drivers/media/pci/cx23885/cx23885-input.c @@ -90,6 +90,8 @@ void cx23885_input_rx_work_handler(struct cx23885_dev *dev, u32 events) case CX23885_BOARD_TEVII_S470: case CX23885_BOARD_HAUPPAUGE_HVR1250: case CX23885_BOARD_MYGICA_X8507: + case CX23885_BOARD_TBS_6980: + case CX23885_BOARD_TBS_6981: /* * The only boards we handle right now. However other boards * using the CX2388x integrated IR controller should be similar @@ -168,6 +170,8 @@ static int cx23885_input_ir_start(struct cx23885_dev *dev) break; case CX23885_BOARD_TERRATEC_CINERGY_T_PCIE_DUAL: case CX23885_BOARD_TEVII_S470: + case CX23885_BOARD_TBS_6980: + case CX23885_BOARD_TBS_6981: /* * The IR controller on this board only returns pulse widths. * Any other mode setting will fail to set up the device. @@ -298,6 +302,14 @@ int cx23885_input_init(struct cx23885_dev *dev) /* A guess at the remote */ rc_map = RC_MAP_TOTAL_MEDIA_IN_HAND_02; break; + case CX23885_BOARD_TBS_6980: + case CX23885_BOARD_TBS_6981: + /* Integrated CX23885 IR controller */ + driver_type = RC_DRIVER_IR_RAW; + allowed_protos = RC_BIT_ALL; + /* A guess at the remote */ + rc_map = RC_MAP_TBS_NEC; + break; default: return -ENODEV; } diff --git a/drivers/media/pci/cx23885/cx23885.h b/drivers/media/pci/cx23885/cx23885.h index 5687d3f..ebcc63e 100644 --- a/drivers/media/pci/cx23885/cx23885.h +++ b/drivers/media/pci/cx23885/cx23885.h @@ -93,6 +93,8 @@ #define CX23885_BOARD_PROF_8000 37 #define CX23885_BOARD_HAUPPAUGE_HVR4400 38 #define CX23885_BOARD_AVERMEDIA_HC81R 39 +#define CX23885_BOARD_TBS_6981 40 +#define CX23885_BOARD_TBS_6980 41 #define GPIO_0 0x00000001 #define GPIO_1 0x00000002
v3: Fixed issues reported by checkpatch script (thanks Antti). Changed/fixed some stuff as sugested by Mauro Chehab. Splited cx23885 changes to a separated patch. Signed-off-by: Luis Alves <ljalvs@gmail.com> --- drivers/media/pci/cx23885/Kconfig | 1 + drivers/media/pci/cx23885/cx23885-cards.c | 68 +++++++++++++++++++++++++++++ drivers/media/pci/cx23885/cx23885-dvb.c | 31 +++++++++++++ drivers/media/pci/cx23885/cx23885-input.c | 12 +++++ drivers/media/pci/cx23885/cx23885.h | 2 + 5 files changed, 114 insertions(+)