frodovdr/dddvb
1
0
Fork 0
mirror of https://github.com/DigitalDevices/dddvb.git synced 2023-10-10 13:37:43 +02:00
Code Issues Releases Wiki Activity

add ids and structs for Octopus GT Mini

Browse Source
This commit is contained in:
Ralph Metzler 2018-08-13 15:05:43 +02:00
parent bf3cad1094
commit b52eb4bd17
3 changed files with 54 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ddbridge/ddbridge-core.c
View File

@ -4337,9 +4337,11 @@ static int ddb_gtl_init_link(struct ddb *dev, u32 l)
if (1 & ddbreadl(dev, regs)) if (1 & ddbreadl(dev, regs))
break; break;
} }
if (c == 5) if (c == 5) {
ddbwritel(dev, 8, regs);
return -1; return -1;
} }
}
id = ddbreadl(dev, DDB_LINK_TAG(l) | 8); id = ddbreadl(dev, DDB_LINK_TAG(l) | 8);
subid = ddbreadl(dev, DDB_LINK_TAG(l) | 12); subid = ddbreadl(dev, DDB_LINK_TAG(l) | 12);
link->info = get_ddb_info(id & 0xffff, id >> 16, link->info = get_ddb_info(id & 0xffff, id >> 16,

50
ddbridge/ddbridge-hw.c
View File

@ -181,6 +181,33 @@ static const struct ddb_regset octopro_gtl = {
/****************************************************************************/ /****************************************************************************/
/****************************************************************************/ /****************************************************************************/
static const struct ddb_regset gtl_mini_input = {
.base = 0x400,
.num = 0x14,
.size = 0x10,
};
static const struct ddb_regset gtl_mini_idma = {
.base = 0x800,
.num = 0x40,
.size = 0x10,
};
static const struct ddb_regset gtl_mini_idma_buf = {
.base = 0x4000,
.num = 0x40,
.size = 0x100,
};
static const struct ddb_regset gtl_mini_gtl = {
.base = 0xe00,
.num = 0x03,
.size = 0x40,
};
/****************************************************************************/
/****************************************************************************/
static const struct ddb_regmap octopus_map = { static const struct ddb_regmap octopus_map = {
.irq_version = 1, .irq_version = 1,
.irq_base_i2c = 0, .irq_base_i2c = 0,
@ -193,6 +220,7 @@ static const struct ddb_regmap octopus_map = {
.odma = &octopus_odma, .odma = &octopus_odma,
.odma_buf = &octopus_odma_buf, .odma_buf = &octopus_odma_buf,
.input = &octopus_input, .input = &octopus_input,
.output = &octopus_output, .output = &octopus_output,
}; };
@ -258,6 +286,18 @@ static const struct ddb_regmap octopus_sdr_map = {
.channel = &octopus_mod_2_channel, .channel = &octopus_mod_2_channel,
}; };
static const struct ddb_regmap gtl_mini = {
.irq_version = 2,
.irq_base_i2c = 32,
.irq_base_idma = 64,
.irq_base_odma = 128,
.irq_base_gtl = 8,
.idma = &gtl_mini_idma,
.idma_buf = &gtl_mini_idma_buf,
.input = &gtl_mini_input,
.gtl = &gtl_mini_gtl,
};
/****************************************************************************/ /****************************************************************************/
/****************************************************************************/ /****************************************************************************/
@ -599,6 +639,15 @@ static const struct ddb_info ddb_m4 = {
.temp_num = 1, .temp_num = 1,
}; };
static const struct ddb_info ddb_gtl_mini = {
.type = DDB_OCTONET,
.name = "Digital Devices Octopus GT Mini",
.regmap = &gtl_mini,
.port_num = 0,
.i2c_mask = 0x00,
.ns_num = 0,
};
/****************************************************************************/ /****************************************************************************/
/****************************************************************************/ /****************************************************************************/
@ -717,6 +766,7 @@ static const struct ddb_device_id ddb_device_ids[] = {
DDB_DEVID(0x0012, 0x0042, ddb_ci), DDB_DEVID(0x0012, 0x0042, ddb_ci),
DDB_DEVID(0x0013, 0x0043, ddb_ci_s2_pro), DDB_DEVID(0x0013, 0x0043, ddb_ci_s2_pro),
DDB_DEVID(0x0013, 0x0044, ddb_ci_s2_pro_a), DDB_DEVID(0x0013, 0x0044, ddb_ci_s2_pro_a),
DDB_DEVID(0x0020, 0x0012, ddb_gtl_mini),
/* Modulators */ /* Modulators */
DDB_DEVID(0x0201, 0x0001, ddb_mod), DDB_DEVID(0x0201, 0x0001, ddb_mod),

1
ddbridge/ddbridge-main.c
View File

@ -419,6 +419,7 @@ static const struct pci_device_id ddb_id_table[] __devinitconst = {
DDB_DEVICE_ANY(0x0011), DDB_DEVICE_ANY(0x0011),
DDB_DEVICE_ANY(0x0012), DDB_DEVICE_ANY(0x0012),
DDB_DEVICE_ANY(0x0013), DDB_DEVICE_ANY(0x0013),
DDB_DEVICE_ANY(0x0020),
DDB_DEVICE_ANY(0x0201), DDB_DEVICE_ANY(0x0201),
DDB_DEVICE_ANY(0x0203), DDB_DEVICE_ANY(0x0203),
DDB_DEVICE_ANY(0x0210), DDB_DEVICE_ANY(0x0210),