Commit c3eda330 authored by Daniel Scheller's avatar Daniel Scheller Committed by Mauro Carvalho Chehab
Browse files

media: ddbridge: add hardware defs and PCI IDs for MCI cards 



Add PCI IDs and ddb_info for the new MCI-based MaxSX8 cards. Also add
needed defines so the cards can be hooked up into ddbridge's probe and
attach handling.

Picked up from the upstream dddvb-0.9.33 release.

Signed-off-by: default avatarDaniel Scheller <d.scheller@gmx.net>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent b4b5b8dc

drivers/media/pci/ddbridge/ddbridge-hw.c

+11 −0
Original line number Diff line number Diff line
@@ -311,6 +311,16 @@ static const struct ddb_info ddb_s2_48 = { 
	.tempmon_irq = 24,

};



static const struct ddb_info ddb_s2x_48 = {

	.type     = DDB_OCTOPUS_MCI,

	.name     = "Digital Devices MAX SX8",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x00,

	.tempmon_irq = 24,

	.mci      = 4

};



/****************************************************************************/

/****************************************************************************/

/****************************************************************************/
@@ -346,6 +356,7 @@ static const struct ddb_device_id ddb_device_ids[] = { 
	DDB_DEVID(0x0008, 0x0036, ddb_isdbt_8),

	DDB_DEVID(0x0008, 0x0037, ddb_c2t2i_v0_8),

	DDB_DEVID(0x0008, 0x0038, ddb_c2t2i_8),

	DDB_DEVID(0x0009, 0x0025, ddb_s2x_48),

	DDB_DEVID(0x0006, 0x0039, ddb_ctv7),

	DDB_DEVID(0x0011, 0x0040, ddb_ci),

	DDB_DEVID(0x0011, 0x0041, ddb_cis),

drivers/media/pci/ddbridge/ddbridge-main.c

+1 −0
Original line number Diff line number Diff line
@@ -264,6 +264,7 @@ static const struct pci_device_id ddb_id_table[] = { 
	DDB_DEVICE_ANY(0x0006),

	DDB_DEVICE_ANY(0x0007),

	DDB_DEVICE_ANY(0x0008),

	DDB_DEVICE_ANY(0x0009),

	DDB_DEVICE_ANY(0x0011),

	DDB_DEVICE_ANY(0x0012),

	DDB_DEVICE_ANY(0x0013),

drivers/media/pci/ddbridge/ddbridge.h

+7 −4
Original line number Diff line number Diff line
@@ -117,6 +117,7 @@ struct ddb_info { 
#define DDB_OCTOPUS_CI      2

#define DDB_OCTOPUS_MAX     5

#define DDB_OCTOPUS_MAX_CT  6

#define DDB_OCTOPUS_MCI     9

	char *name;

	u32   i2c_mask;

	u8    port_num;
@@ -133,6 +134,7 @@ struct ddb_info { 
#define TS_QUIRK_REVERSED 2

#define TS_QUIRK_ALT_OSC  8

	u32   tempmon_irq;

	u8    mci;

	const struct ddb_regmap *regmap;

};
@@ -253,6 +255,7 @@ struct ddb_port { 
#define DDB_CI_EXTERNAL_XO2_B    13

#define DDB_TUNER_DVBS_STV0910_PR 14

#define DDB_TUNER_DVBC2T2I_SONY_P 15

#define DDB_TUNER_MCI            16



#define DDB_TUNER_XO2            32

#define DDB_TUNER_DVBS_STV0910   (DDB_TUNER_XO2 + 0)

CRA Git | Maintained and supported by SUSTech CRA and CCSE