korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-08 03:24:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

media: ddbridge/mci: store mci type and number of ports in the hwinfo

Browse Source 
For better support for future MCI based cards, rename the mci struct
member to mci_ports to carry the number of ports on the cards, and add a
mci_type member to identify the card type to handle differing hardware.

Picked up from the upstream dddvb GIT.

Signed-off-by: Daniel Scheller <d.scheller@gmx.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
Daniel Scheller 2018-06-23 11:36:09 -04:00 committed by Mauro Carvalho Chehab
parent 6094cbed4e
commit 07b12de212
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/media/pci/ddbridge/ddbridge-core.c
View File

@ -1893,12 +1893,12 @@ static void ddb_port_probe(struct ddb_port *port)
} }
if (link->info->type == DDB_OCTOPUS_MCI) { if (link->info->type == DDB_OCTOPUS_MCI) {
if (port->nr >= link->info->mci) if (port->nr >= link->info->mci_ports)
return; return;
port->name = "DUAL MCI"; port->name = "DUAL MCI";
port->type_name = "MCI"; port->type_name = "MCI";
port->class = DDB_PORT_TUNER; port->class = DDB_PORT_TUNER;
port->type = DDB_TUNER_MCI_SX8; port->type = DDB_TUNER_MCI + link->info->mci_type;
return; return;
} }

3
drivers/media/pci/ddbridge/ddbridge-hw.c
View File

@ -318,7 +318,8 @@ static const struct ddb_info ddb_s2x_48 = {
.port_num = 4, .port_num = 4,
.i2c_mask = 0x00, .i2c_mask = 0x00,
.tempmon_irq = 24, .tempmon_irq = 24,
.mci = 4 .mci_ports = 4,
.mci_type = 0,
}; };
/****************************************************************************/ /****************************************************************************/

9
drivers/media/pci/ddbridge/ddbridge.h
View File

@ -120,20 +120,23 @@ struct ddb_info {
#define DDB_OCTOPUS_MCI 9 #define DDB_OCTOPUS_MCI 9
char *name; char *name;
u32 i2c_mask; u32 i2c_mask;
u32 board_control;
u32 board_control_2;
u8 port_num; u8 port_num;
u8 led_num; u8 led_num;
u8 fan_num; u8 fan_num;
u8 temp_num; u8 temp_num;
u8 temp_bus; u8 temp_bus;
u32 board_control;
u32 board_control_2;
u8 con_clock; /* use a continuous clock */ u8 con_clock; /* use a continuous clock */
u8 ts_quirks; u8 ts_quirks;
#define TS_QUIRK_SERIAL 1 #define TS_QUIRK_SERIAL 1
#define TS_QUIRK_REVERSED 2 #define TS_QUIRK_REVERSED 2
#define TS_QUIRK_ALT_OSC 8 #define TS_QUIRK_ALT_OSC 8
u8 mci_ports;
u8 mci_type;
u32 tempmon_irq; u32 tempmon_irq;
u8 mci;
const struct ddb_regmap *regmap; const struct ddb_regmap *regmap;
}; };