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

media: ddbridge: split off hardware definitions and mappings 



Further cleanup of ddbridge-core and ddbridge-main, and moves all such
hw definitions into one single place, making things easier to maintain.

Signed-off-by: default avatarDaniel Scheller <d.scheller@gmx.net>
Tested-by: default avatarRichard Scobie <r.scobie@clear.net.nz>
Tested-by: default avatarJasmin Jessich <jasmin@anw.at>
Tested-by: default avatarDietmar Spingler <d_spingler@freenet.de>
Tested-by: default avatarManfred Knick <Manfred.Knick@t-online.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 14e27a10

drivers/media/pci/ddbridge/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 
# Makefile for the ddbridge device driver

#



ddbridge-objs := ddbridge-main.o ddbridge-core.o ddbridge-i2c.o

ddbridge-objs := ddbridge-main.o ddbridge-core.o ddbridge-hw.o \

		ddbridge-i2c.o



obj-$(CONFIG_DVB_DDBRIDGE) += ddbridge.o

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

+0 −68
Original line number Diff line number Diff line
@@ -67,74 +67,6 @@ static struct ddb *ddbs[DDB_MAX_ADAPTER]; 
/****************************************************************************/

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



static struct ddb_regset octopus_input = {

	.base = 0x200,

	.num  = 0x08,

	.size = 0x10,

};



static struct ddb_regset octopus_output = {

	.base = 0x280,

	.num  = 0x08,

	.size = 0x10,

};



static struct ddb_regset octopus_idma = {

	.base = 0x300,

	.num  = 0x08,

	.size = 0x10,

};



static struct ddb_regset octopus_idma_buf = {

	.base = 0x2000,

	.num  = 0x08,

	.size = 0x100,

};



static struct ddb_regset octopus_odma = {

	.base = 0x380,

	.num  = 0x04,

	.size = 0x10,

};



static struct ddb_regset octopus_odma_buf = {

	.base = 0x2800,

	.num  = 0x04,

	.size = 0x100,

};



static struct ddb_regset octopus_i2c = {

	.base = 0x80,

	.num  = 0x04,

	.size = 0x20,

};



static struct ddb_regset octopus_i2c_buf = {

	.base = 0x1000,

	.num  = 0x04,

	.size = 0x200,

};



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



struct ddb_regmap octopus_map = {

	.irq_base_i2c = 0,

	.irq_base_idma = 8,

	.irq_base_odma = 16,

	.i2c = &octopus_i2c,

	.i2c_buf = &octopus_i2c_buf,

	.idma = &octopus_idma,

	.idma_buf = &octopus_idma_buf,

	.odma = &octopus_odma,

	.odma_buf = &octopus_odma_buf,

	.input = &octopus_input,

	.output = &octopus_output,

};



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

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

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



static void ddb_set_dma_table(struct ddb_io *io)

{

	struct ddb *dev = io->port->dev;

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

0 → 100644
+299 −0
Original line number Diff line number Diff line 
/*

 * ddbridge-hw.c: Digital Devices bridge hardware maps

 *

 * Copyright (C) 2010-2017 Digital Devices GmbH

 *                         Ralph Metzler <rjkm@metzlerbros.de>

 *                         Marcus Metzler <mocm@metzlerbros.de>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * version 2 only, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */



#include "ddbridge.h"



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



static struct ddb_regset octopus_input = {

	.base = 0x200,

	.num  = 0x08,

	.size = 0x10,

};



static struct ddb_regset octopus_output = {

	.base = 0x280,

	.num  = 0x08,

	.size = 0x10,

};



static struct ddb_regset octopus_idma = {

	.base = 0x300,

	.num  = 0x08,

	.size = 0x10,

};



static struct ddb_regset octopus_idma_buf = {

	.base = 0x2000,

	.num  = 0x08,

	.size = 0x100,

};



static struct ddb_regset octopus_odma = {

	.base = 0x380,

	.num  = 0x04,

	.size = 0x10,

};



static struct ddb_regset octopus_odma_buf = {

	.base = 0x2800,

	.num  = 0x04,

	.size = 0x100,

};



static struct ddb_regset octopus_i2c = {

	.base = 0x80,

	.num  = 0x04,

	.size = 0x20,

};



static struct ddb_regset octopus_i2c_buf = {

	.base = 0x1000,

	.num  = 0x04,

	.size = 0x200,

};



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



static struct ddb_regmap octopus_map = {

	.irq_base_i2c = 0,

	.irq_base_idma = 8,

	.irq_base_odma = 16,

	.i2c = &octopus_i2c,

	.i2c_buf = &octopus_i2c_buf,

	.idma = &octopus_idma,

	.idma_buf = &octopus_idma_buf,

	.odma = &octopus_odma,

	.odma_buf = &octopus_odma_buf,

	.input = &octopus_input,

	.output = &octopus_output,

};



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



const struct ddb_info ddb_none = {

	.type     = DDB_NONE,

	.name     = "unknown Digital Devices PCIe card, install newer driver",

	.regmap   = &octopus_map,

};



const struct ddb_info ddb_octopus = {

	.type     = DDB_OCTOPUS,

	.name     = "Digital Devices Octopus DVB adapter",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

};



const struct ddb_info ddb_octopusv3 = {

	.type     = DDB_OCTOPUS,

	.name     = "Digital Devices Octopus V3 DVB adapter",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

};



const struct ddb_info ddb_octopus_le = {

	.type     = DDB_OCTOPUS,

	.name     = "Digital Devices Octopus LE DVB adapter",

	.regmap   = &octopus_map,

	.port_num = 2,

	.i2c_mask = 0x03,

};



const struct ddb_info ddb_octopus_oem = {

	.type     = DDB_OCTOPUS,

	.name     = "Digital Devices Octopus OEM",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

	.led_num  = 1,

	.fan_num  = 1,

	.temp_num = 1,

	.temp_bus = 0,

};



const struct ddb_info ddb_octopus_mini = {

	.type     = DDB_OCTOPUS,

	.name     = "Digital Devices Octopus Mini",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

};



const struct ddb_info ddb_v6 = {

	.type     = DDB_OCTOPUS,

	.name     = "Digital Devices Cine S2 V6 DVB adapter",

	.regmap   = &octopus_map,

	.port_num = 3,

	.i2c_mask = 0x07,

};



const struct ddb_info ddb_v6_5 = {

	.type     = DDB_OCTOPUS,

	.name     = "Digital Devices Cine S2 V6.5 DVB adapter",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

};



const struct ddb_info ddb_v7 = {

	.type     = DDB_OCTOPUS,

	.name     = "Digital Devices Cine S2 V7 DVB adapter",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

	.board_control   = 2,

	.board_control_2 = 4,

	.ts_quirks = TS_QUIRK_REVERSED,

};



const struct ddb_info ddb_v7a = {

	.type     = DDB_OCTOPUS,

	.name     = "Digital Devices Cine S2 V7 Advanced DVB adapter",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

	.board_control   = 2,

	.board_control_2 = 4,

	.ts_quirks = TS_QUIRK_REVERSED,

};



const struct ddb_info ddb_ctv7 = {

	.type     = DDB_OCTOPUS,

	.name     = "Digital Devices Cine CT V7 DVB adapter",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

	.board_control   = 3,

	.board_control_2 = 4,

};



const struct ddb_info ddb_satixS2v3 = {

	.type     = DDB_OCTOPUS,

	.name     = "Mystique SaTiX-S2 V3 DVB adapter",

	.regmap   = &octopus_map,

	.port_num = 3,

	.i2c_mask = 0x07,

};



const struct ddb_info ddb_ci = {

	.type     = DDB_OCTOPUS_CI,

	.name     = "Digital Devices Octopus CI",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x03,

};



const struct ddb_info ddb_cis = {

	.type     = DDB_OCTOPUS_CI,

	.name     = "Digital Devices Octopus CI single",

	.regmap   = &octopus_map,

	.port_num = 3,

	.i2c_mask = 0x03,

};



const struct ddb_info ddb_ci_s2_pro = {

	.type     = DDB_OCTOPUS_CI,

	.name     = "Digital Devices Octopus CI S2 Pro",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x01,

	.board_control   = 2,

	.board_control_2 = 4,

};



const struct ddb_info ddb_ci_s2_pro_a = {

	.type     = DDB_OCTOPUS_CI,

	.name     = "Digital Devices Octopus CI S2 Pro Advanced",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x01,

	.board_control   = 2,

	.board_control_2 = 4,

};



const struct ddb_info ddb_dvbct = {

	.type     = DDB_OCTOPUS,

	.name     = "Digital Devices DVBCT V6.1 DVB adapter",

	.regmap   = &octopus_map,

	.port_num = 3,

	.i2c_mask = 0x07,

};



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



const struct ddb_info ddb_ct2_8 = {

	.type     = DDB_OCTOPUS_MAX_CT,

	.name     = "Digital Devices MAX A8 CT2",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

	.board_control   = 0x0ff,

	.board_control_2 = 0xf00,

	.ts_quirks = TS_QUIRK_SERIAL,

	.tempmon_irq = 24,

};



const struct ddb_info ddb_c2t2_8 = {

	.type     = DDB_OCTOPUS_MAX_CT,

	.name     = "Digital Devices MAX A8 C2T2",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

	.board_control   = 0x0ff,

	.board_control_2 = 0xf00,

	.ts_quirks = TS_QUIRK_SERIAL,

	.tempmon_irq = 24,

};



const struct ddb_info ddb_isdbt_8 = {

	.type     = DDB_OCTOPUS_MAX_CT,

	.name     = "Digital Devices MAX A8 ISDBT",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

	.board_control   = 0x0ff,

	.board_control_2 = 0xf00,

	.ts_quirks = TS_QUIRK_SERIAL,

	.tempmon_irq = 24,

};



const struct ddb_info ddb_c2t2i_v0_8 = {

	.type     = DDB_OCTOPUS_MAX_CT,

	.name     = "Digital Devices MAX A8 C2T2I V0",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

	.board_control   = 0x0ff,

	.board_control_2 = 0xf00,

	.ts_quirks = TS_QUIRK_SERIAL | TS_QUIRK_ALT_OSC,

	.tempmon_irq = 24,

};



const struct ddb_info ddb_c2t2i_8 = {

	.type     = DDB_OCTOPUS_MAX_CT,

	.name     = "Digital Devices MAX A8 C2T2I",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

	.board_control   = 0x0ff,

	.board_control_2 = 0xf00,

	.ts_quirks = TS_QUIRK_SERIAL,

	.tempmon_irq = 24,

};

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

0 → 100644
+52 −0
Original line number Diff line number Diff line 
/*

 * ddbridge-hw.h: Digital Devices bridge hardware maps

 *

 * Copyright (C) 2010-2017 Digital Devices GmbH

 *                         Ralph Metzler <rjkm@metzlerbros.de>

 *                         Marcus Metzler <mocm@metzlerbros.de>

 *

 * This program is free software; you can redistribute it and/or

 * modify it under the terms of the GNU General Public License

 * version 2 only, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */



#ifndef _DDBRIDGE_HW_H_

#define _DDBRIDGE_HW_H_



#include "ddbridge.h"



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



extern const struct ddb_info ddb_none;

extern const struct ddb_info ddb_octopus;

extern const struct ddb_info ddb_octopusv3;

extern const struct ddb_info ddb_octopus_le;

extern const struct ddb_info ddb_octopus_oem;

extern const struct ddb_info ddb_octopus_mini;

extern const struct ddb_info ddb_v6;

extern const struct ddb_info ddb_v6_5;

extern const struct ddb_info ddb_v7;

extern const struct ddb_info ddb_v7a;

extern const struct ddb_info ddb_ctv7;

extern const struct ddb_info ddb_satixS2v3;

extern const struct ddb_info ddb_ci;

extern const struct ddb_info ddb_cis;

extern const struct ddb_info ddb_ci_s2_pro;

extern const struct ddb_info ddb_ci_s2_pro_a;

extern const struct ddb_info ddb_dvbct;



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



extern const struct ddb_info ddb_ct2_8;

extern const struct ddb_info ddb_c2t2_8;

extern const struct ddb_info ddb_isdbt_8;

extern const struct ddb_info ddb_c2t2i_v0_8;

extern const struct ddb_info ddb_c2t2i_8;



#endif /* _DDBRIDGE_HW_H */

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

+1 −216
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "ddbridge.h"

#include "ddbridge-i2c.h"

#include "ddbridge-regs.h"

#include "ddbridge-hw.h"

#include "ddbridge-io.h"



/****************************************************************************/
@@ -278,222 +279,6 @@ static int ddb_probe(struct pci_dev *pdev, 
/****************************************************************************/

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



static const struct ddb_info ddb_none = {

	.type     = DDB_NONE,

	.name     = "unknown Digital Devices PCIe card, install newer driver",

	.regmap   = &octopus_map,

};



static const struct ddb_info ddb_octopus = {

	.type     = DDB_OCTOPUS,

	.name     = "Digital Devices Octopus DVB adapter",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

};



static const struct ddb_info ddb_octopusv3 = {

	.type     = DDB_OCTOPUS,

	.name     = "Digital Devices Octopus V3 DVB adapter",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

};



static const struct ddb_info ddb_octopus_le = {

	.type     = DDB_OCTOPUS,

	.name     = "Digital Devices Octopus LE DVB adapter",

	.regmap   = &octopus_map,

	.port_num = 2,

	.i2c_mask = 0x03,

};



static const struct ddb_info ddb_octopus_oem = {

	.type     = DDB_OCTOPUS,

	.name     = "Digital Devices Octopus OEM",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

	.led_num  = 1,

	.fan_num  = 1,

	.temp_num = 1,

	.temp_bus = 0,

};



static const struct ddb_info ddb_octopus_mini = {

	.type     = DDB_OCTOPUS,

	.name     = "Digital Devices Octopus Mini",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

};



static const struct ddb_info ddb_v6 = {

	.type     = DDB_OCTOPUS,

	.name     = "Digital Devices Cine S2 V6 DVB adapter",

	.regmap   = &octopus_map,

	.port_num = 3,

	.i2c_mask = 0x07,

};



static const struct ddb_info ddb_v6_5 = {

	.type     = DDB_OCTOPUS,

	.name     = "Digital Devices Cine S2 V6.5 DVB adapter",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

};



static const struct ddb_info ddb_v7 = {

	.type     = DDB_OCTOPUS,

	.name     = "Digital Devices Cine S2 V7 DVB adapter",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

	.board_control   = 2,

	.board_control_2 = 4,

	.ts_quirks = TS_QUIRK_REVERSED,

};



static const struct ddb_info ddb_v7a = {

	.type     = DDB_OCTOPUS,

	.name     = "Digital Devices Cine S2 V7 Advanced DVB adapter",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

	.board_control   = 2,

	.board_control_2 = 4,

	.ts_quirks = TS_QUIRK_REVERSED,

};



static const struct ddb_info ddb_ctv7 = {

	.type     = DDB_OCTOPUS,

	.name     = "Digital Devices Cine CT V7 DVB adapter",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

	.board_control   = 3,

	.board_control_2 = 4,

};



static const struct ddb_info ddb_satixS2v3 = {

	.type     = DDB_OCTOPUS,

	.name     = "Mystique SaTiX-S2 V3 DVB adapter",

	.regmap   = &octopus_map,

	.port_num = 3,

	.i2c_mask = 0x07,

};



static const struct ddb_info ddb_ci = {

	.type     = DDB_OCTOPUS_CI,

	.name     = "Digital Devices Octopus CI",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x03,

};



static const struct ddb_info ddb_cis = {

	.type     = DDB_OCTOPUS_CI,

	.name     = "Digital Devices Octopus CI single",

	.regmap   = &octopus_map,

	.port_num = 3,

	.i2c_mask = 0x03,

};



static const struct ddb_info ddb_ci_s2_pro = {

	.type     = DDB_OCTOPUS_CI,

	.name     = "Digital Devices Octopus CI S2 Pro",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x01,

	.board_control   = 2,

	.board_control_2 = 4,

};



static const struct ddb_info ddb_ci_s2_pro_a = {

	.type     = DDB_OCTOPUS_CI,

	.name     = "Digital Devices Octopus CI S2 Pro Advanced",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x01,

	.board_control   = 2,

	.board_control_2 = 4,

};



static const struct ddb_info ddb_dvbct = {

	.type     = DDB_OCTOPUS,

	.name     = "Digital Devices DVBCT V6.1 DVB adapter",

	.regmap   = &octopus_map,

	.port_num = 3,

	.i2c_mask = 0x07,

};



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



static struct ddb_info ddb_ct2_8 = {

	.type     = DDB_OCTOPUS_MAX_CT,

	.name     = "Digital Devices MAX A8 CT2",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

	.board_control   = 0x0ff,

	.board_control_2 = 0xf00,

	.ts_quirks = TS_QUIRK_SERIAL,

	.tempmon_irq = 24,

};



static struct ddb_info ddb_c2t2_8 = {

	.type     = DDB_OCTOPUS_MAX_CT,

	.name     = "Digital Devices MAX A8 C2T2",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

	.board_control   = 0x0ff,

	.board_control_2 = 0xf00,

	.ts_quirks = TS_QUIRK_SERIAL,

	.tempmon_irq = 24,

};



static struct ddb_info ddb_isdbt_8 = {

	.type     = DDB_OCTOPUS_MAX_CT,

	.name     = "Digital Devices MAX A8 ISDBT",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

	.board_control   = 0x0ff,

	.board_control_2 = 0xf00,

	.ts_quirks = TS_QUIRK_SERIAL,

	.tempmon_irq = 24,

};



static struct ddb_info ddb_c2t2i_v0_8 = {

	.type     = DDB_OCTOPUS_MAX_CT,

	.name     = "Digital Devices MAX A8 C2T2I V0",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

	.board_control   = 0x0ff,

	.board_control_2 = 0xf00,

	.ts_quirks = TS_QUIRK_SERIAL | TS_QUIRK_ALT_OSC,

	.tempmon_irq = 24,

};



static struct ddb_info ddb_c2t2i_8 = {

	.type     = DDB_OCTOPUS_MAX_CT,

	.name     = "Digital Devices MAX A8 C2T2I",

	.regmap   = &octopus_map,

	.port_num = 4,

	.i2c_mask = 0x0f,

	.board_control   = 0x0ff,

	.board_control_2 = 0xf00,

	.ts_quirks = TS_QUIRK_SERIAL,

	.tempmon_irq = 24,

};



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

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

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



#define DDVID 0xdd01 /* Digital Devices Vendor ID */



#define DDB_DEVICE(_device, _subdevice, _driver_data) { \