ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 12:43:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tbsdtv_linux_media/latest' into tbsdtv_linux_media/gse

Browse Source
This commit is contained in:
CrazyCat
2024-10-08 20:07:56 +03:00
parent 2bf57c1842 a2e856bfb2
commit 93d076c24b
6 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/dvb-frontends/stv0367_priv.h
View File

@@ -25,8 +25,11 @@
#endif #endif
/* MACRO definitions */ /* MACRO definitions */
#ifndef MIN
#define MAX(X, Y) ((X) >= (Y) ? (X) : (Y)) #define MAX(X, Y) ((X) >= (Y) ? (X) : (Y))
#define MIN(X, Y) ((X) <= (Y) ? (X) : (Y)) #define MIN(X, Y) ((X) <= (Y) ? (X) : (Y))
#endif
#define INRANGE(X, Y, Z) \ #define INRANGE(X, Y, Z) \
((((X) <= (Y)) && ((Y) <= (Z))) || \ ((((X) <= (Y)) && ((Y) <= (Z))) || \
(((Z) <= (Y)) && ((Y) <= (X))) ? 1 : 0) (((Z) <= (Y)) && ((Y) <= (X))) ? 1 : 0)

4
drivers/media/pci/bt8xx/bttv-gpio.c
View File

@@ -28,9 +28,9 @@
/* ----------------------------------------------------------------------- */ /* ----------------------------------------------------------------------- */
/* internal: the bttv "bus" */ /* internal: the bttv "bus" */
static int bttv_sub_bus_match(struct device *dev, struct device_driver *drv) static int bttv_sub_bus_match(struct device *dev, const struct device_driver *drv)
{ {
struct bttv_sub_driver *sub = to_bttv_sub_drv(drv); const struct bttv_sub_driver *sub = to_bttv_sub_drv(drv);
int len = strlen(sub->wanted); int len = strlen(sub->wanted);
if (0 == strncmp(dev_name(dev), sub->wanted, len)) if (0 == strncmp(dev_name(dev), sub->wanted, len))

25
drivers/media/pci/tbsecp3/tbsecp3-cards.c
View File

@@ -1070,6 +1070,31 @@ struct tbsecp3_board tbsecp3_boards[] = {
}, },
} }
}, },
[TBSECP3_BOARD_TBS6324] = {
.board_id = TBSECP3_BOARD_TBS6324,
.name = "TurboSight TBS 6324 SDI Capture ",
.adapters = 4,
.i2c_speed = 39,
.eeprom_i2c = 1,
.adap_config = {
{
.ts_in = 0,
.i2c_bus_nr = 3,
},
{
.ts_in = 1,
.i2c_bus_nr = 2,
},
{
.ts_in = 2,
.i2c_bus_nr = 1,
},
{
.ts_in = 3,
.i2c_bus_nr = 0,
},
}
},
[TBSECP3_BOARD_TBS690a] = { [TBSECP3_BOARD_TBS690a] = {
.board_id = TBSECP3_BOARD_TBS690a, .board_id = TBSECP3_BOARD_TBS690a,
.name = "TurboSight TBS 690a ASI Capture ", .name = "TurboSight TBS 690a ASI Capture ",

3
drivers/media/pci/tbsecp3/tbsecp3-core.c
View File

@@ -399,7 +399,8 @@ static const struct pci_device_id tbsecp3_id_table[] = {
TBSECP3_ID(TBSECP3_BOARD_TBS6522H,0x6522,0x0004), TBSECP3_ID(TBSECP3_BOARD_TBS6522H,0x6522,0x0004),
TBSECP3_ID(TBSECP3_BOARD_TBS6504H,0x6504,0x0008), TBSECP3_ID(TBSECP3_BOARD_TBS6504H,0x6504,0x0008),
TBSECP3_ID(TBSECP3_BOARD_TBS6590SE,0x6590,0x0002), TBSECP3_ID(TBSECP3_BOARD_TBS6590SE,0x6590,0x0002),
TBSECP3_ID(TBSECP3_BOARD_TBS6916,0x6916,0x0001), TBSECP3_ID(TBSECP3_BOARD_TBS6916,0x6916,0x0001),
TBSECP3_ID(TBSECP3_BOARD_TBS6324,0x6324,0x0010),
{0} {0}
}; };
MODULE_DEVICE_TABLE(pci, tbsecp3_id_table); MODULE_DEVICE_TABLE(pci, tbsecp3_id_table);

1
drivers/media/pci/tbsecp3/tbsecp3-dvb.c
View File

@@ -1915,6 +1915,7 @@ static int tbsecp3_frontend_attach(struct tbsecp3_adapter *adapter)
break; break;
case TBSECP3_BOARD_TBS6304X: case TBSECP3_BOARD_TBS6304X:
case TBSECP3_BOARD_TBS6304T: case TBSECP3_BOARD_TBS6304T:
case TBSECP3_BOARD_TBS6324:
adapter->fe = dvb_attach(tas2971_attach, &tbs6304x_demod_cfg, i2c); adapter->fe = dvb_attach(tas2971_attach, &tbs6304x_demod_cfg, i2c);
if (adapter->fe == NULL) if (adapter->fe == NULL)
goto frontend_atach_fail; goto frontend_atach_fail;

1
drivers/media/pci/tbsecp3/tbsecp3.h
View File

@@ -90,6 +90,7 @@
#define TBSECP3_BOARD_TBS6308X 46 #define TBSECP3_BOARD_TBS6308X 46
#define TBSECP3_BOARD_TBS6916 47 #define TBSECP3_BOARD_TBS6916 47
#define TBSECP3_BOARD_TBS6312X 48 #define TBSECP3_BOARD_TBS6312X 48
#define TBSECP3_BOARD_TBS6324 49
#define TBSECP3_MAX_ADAPTERS (16) #define TBSECP3_MAX_ADAPTERS (16)