add support for MAX SX8 V2

This commit is contained in:
rjkm
2025-12-01 10:24:42 +01:00
parent 8d6b3deeea
commit 77fc8eb0d7
5 changed files with 17 additions and 6 deletions

View File

@@ -720,6 +720,19 @@ static const struct ddb_info ddb_s2x_48 = {
.lnb_base = 0x400,
};
static const struct ddb_info ddb_s2x_48_v2 = {
.type = DDB_OCTOPUS_MCI,
.name = "Digital Devices MAX SX8 V2",
.regmap = &octopus_mci_map,
.port_num = 4,
.i2c_mask = 0x00,
.tempmon_irq = 24,
.mci_ports = 4,
.mci_type = DDB_TUNER_MCI_SX8,
.temp_num = 1,
.lnb_base = 0x400,
};
static const struct ddb_info ddb_s2x_48_b = {
.type = DDB_OCTOPUS_MCI,
.name = "Digital Devices MAX SX8 Basic",
@@ -942,6 +955,7 @@ static const struct ddb_device_id ddb_device_ids[] = {
DDB_DEVID(0x0014, 0x0045, ddb_ci_m2),
DDB_DEVID(0x0020, 0x0012, ddb_gtl_mini),
DDB_DEVID(0x0022, 0x0052, ddb_m8),
DDB_DEVID(0x0023, 0x0027, ddb_s2x_48_v2),
DDB_DEVID(0x0024, 0x0053, ddb_m8a),
DDB_DEVID(0x0025, 0x0054, ddb_m2),
DDB_DEVID(0x0026, 0x0055, ddb_m8e),

View File

@@ -420,6 +420,7 @@ static const struct pci_device_id ddb_id_table[] __devinitconst = {
DDB_DEVICE_ANY(0x0014),
DDB_DEVICE_ANY(0x0020),
DDB_DEVICE_ANY(0x0022),
DDB_DEVICE_ANY(0x0023),
DDB_DEVICE_ANY(0x0024),
DDB_DEVICE_ANY(0x0025),
DDB_DEVICE_ANY(0x0026),

View File

@@ -197,9 +197,6 @@ int mci_init(struct ddb_link *link)
result = mci_reset(link);
if (result < 0)
return result;
if (link->ids.device == 0x0009 || link->ids.device == 0x000b)
ddblwritel(link, SX8_TSCONFIG_MODE_NORMAL, SX8_TSCONFIG);
ddb_irq_set(link->dev, link->nr,
link->info->regmap->irq_base_mci,
mci_handler, link);

View File

@@ -126,8 +126,6 @@ static int ddb_mci_tsconfig(struct mci *state, u32 config)
{
struct ddb_link *link = state->base->link;
if (link->ids.device != 0x0009 && link->ids.device != 0x000b)
return -EINVAL;
ddblwritel(link, config, SX8_TSCONFIG);
return 0;
}
@@ -374,8 +372,8 @@ unlock:
cmd.demod = state->mci.demod;
cmd.output = p->stream_id & 0x0f;
ddb_mci_cmd(&state->mci, &cmd, NULL);
ddb_mci_tsconfig(&state->mci, ts_config);
}
ddb_mci_tsconfig(&state->mci, ts_config);
if (p->stream_id != NO_STREAM_ID_FILTER && !(p->stream_id & 0xf0000000))
flags |= 0x80;
//printk("bw %u\n", p->bandwidth_hz);