6a59d64c5c
The cx88 driver state stored the ID of the board type in core->board. Every time the driver need to get some information about the board configuration, it uses the board number as an index into board configuration array. This patch changes it so that the board number is in core->boardnr, and core->board is a copy of the board configuration information. This allows access to board information without the extra indirection. e.g. cx88_boards[core->board].mpeg becomes core->board.mpeg. This has a number of advantages: - The code is simpler to write. - It compiles to be smaller and faster, without needing the extra array lookup to get at the board information. - The cx88_boards array no longer needs to be exported to all cx88 modules. - The boards array can be made const - It should be possible to avoid keeping the (large) cx88_boards array around after the module is loaded. - If module parameters or eeprom info override some board configuration setting, it's not necessary to modify the boards array, which would affect all boards of the same type. Signed-off-by: Trent Piepho <xyzzy@speakeasy.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
164 lines
4.3 KiB
C
164 lines
4.3 KiB
C
/*
|
|
|
|
cx88-vp3054-i2c.c -- support for the secondary I2C bus of the
|
|
DNTV Live! DVB-T Pro (VP-3054), wired as:
|
|
GPIO[0] -> SCL, GPIO[1] -> SDA
|
|
|
|
(c) 2005 Chris Pascoe <c.pascoe@itee.uq.edu.au>
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
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.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/moduleparam.h>
|
|
#include <linux/init.h>
|
|
|
|
#include <asm/io.h>
|
|
|
|
#include "cx88.h"
|
|
#include "cx88-vp3054-i2c.h"
|
|
|
|
|
|
MODULE_DESCRIPTION("driver for cx2388x VP3054 design");
|
|
MODULE_AUTHOR("Chris Pascoe <c.pascoe@itee.uq.edu.au>");
|
|
MODULE_LICENSE("GPL");
|
|
|
|
/* ----------------------------------------------------------------------- */
|
|
|
|
static void vp3054_bit_setscl(void *data, int state)
|
|
{
|
|
struct cx8802_dev *dev = data;
|
|
struct cx88_core *core = dev->core;
|
|
struct vp3054_i2c_state *vp3054_i2c = dev->card_priv;
|
|
|
|
if (state) {
|
|
vp3054_i2c->state |= 0x0001; /* SCL high */
|
|
vp3054_i2c->state &= ~0x0100; /* external pullup */
|
|
} else {
|
|
vp3054_i2c->state &= ~0x0001; /* SCL low */
|
|
vp3054_i2c->state |= 0x0100; /* drive pin */
|
|
}
|
|
cx_write(MO_GP0_IO, 0x010000 | vp3054_i2c->state);
|
|
cx_read(MO_GP0_IO);
|
|
}
|
|
|
|
static void vp3054_bit_setsda(void *data, int state)
|
|
{
|
|
struct cx8802_dev *dev = data;
|
|
struct cx88_core *core = dev->core;
|
|
struct vp3054_i2c_state *vp3054_i2c = dev->card_priv;
|
|
|
|
if (state) {
|
|
vp3054_i2c->state |= 0x0002; /* SDA high */
|
|
vp3054_i2c->state &= ~0x0200; /* tristate pin */
|
|
} else {
|
|
vp3054_i2c->state &= ~0x0002; /* SDA low */
|
|
vp3054_i2c->state |= 0x0200; /* drive pin */
|
|
}
|
|
cx_write(MO_GP0_IO, 0x020000 | vp3054_i2c->state);
|
|
cx_read(MO_GP0_IO);
|
|
}
|
|
|
|
static int vp3054_bit_getscl(void *data)
|
|
{
|
|
struct cx8802_dev *dev = data;
|
|
struct cx88_core *core = dev->core;
|
|
u32 state;
|
|
|
|
state = cx_read(MO_GP0_IO);
|
|
return (state & 0x01) ? 1 : 0;
|
|
}
|
|
|
|
static int vp3054_bit_getsda(void *data)
|
|
{
|
|
struct cx8802_dev *dev = data;
|
|
struct cx88_core *core = dev->core;
|
|
u32 state;
|
|
|
|
state = cx_read(MO_GP0_IO);
|
|
return (state & 0x02) ? 1 : 0;
|
|
}
|
|
|
|
/* ----------------------------------------------------------------------- */
|
|
|
|
static const struct i2c_algo_bit_data vp3054_i2c_algo_template = {
|
|
.setsda = vp3054_bit_setsda,
|
|
.setscl = vp3054_bit_setscl,
|
|
.getsda = vp3054_bit_getsda,
|
|
.getscl = vp3054_bit_getscl,
|
|
.udelay = 16,
|
|
.timeout = 200,
|
|
};
|
|
|
|
/* ----------------------------------------------------------------------- */
|
|
|
|
int vp3054_i2c_probe(struct cx8802_dev *dev)
|
|
{
|
|
struct cx88_core *core = dev->core;
|
|
struct vp3054_i2c_state *vp3054_i2c;
|
|
int rc;
|
|
|
|
if (core->boardnr != CX88_BOARD_DNTV_LIVE_DVB_T_PRO)
|
|
return 0;
|
|
|
|
dev->card_priv = kzalloc(sizeof(*vp3054_i2c), GFP_KERNEL);
|
|
if (dev->card_priv == NULL)
|
|
return -ENOMEM;
|
|
vp3054_i2c = dev->card_priv;
|
|
|
|
memcpy(&vp3054_i2c->algo, &vp3054_i2c_algo_template,
|
|
sizeof(vp3054_i2c->algo));
|
|
|
|
vp3054_i2c->adap.class |= I2C_CLASS_TV_DIGITAL;
|
|
|
|
vp3054_i2c->adap.dev.parent = &dev->pci->dev;
|
|
strlcpy(vp3054_i2c->adap.name, core->name,
|
|
sizeof(vp3054_i2c->adap.name));
|
|
vp3054_i2c->adap.owner = THIS_MODULE;
|
|
vp3054_i2c->adap.id = I2C_HW_B_CX2388x;
|
|
vp3054_i2c->algo.data = dev;
|
|
i2c_set_adapdata(&vp3054_i2c->adap, dev);
|
|
vp3054_i2c->adap.algo_data = &vp3054_i2c->algo;
|
|
|
|
vp3054_bit_setscl(dev,1);
|
|
vp3054_bit_setsda(dev,1);
|
|
|
|
rc = i2c_bit_add_bus(&vp3054_i2c->adap);
|
|
if (0 != rc) {
|
|
printk("%s: vp3054_i2c register FAILED\n", core->name);
|
|
|
|
kfree(dev->card_priv);
|
|
dev->card_priv = NULL;
|
|
}
|
|
|
|
return rc;
|
|
}
|
|
|
|
void vp3054_i2c_remove(struct cx8802_dev *dev)
|
|
{
|
|
struct vp3054_i2c_state *vp3054_i2c = dev->card_priv;
|
|
|
|
if (vp3054_i2c == NULL ||
|
|
dev->core->boardnr != CX88_BOARD_DNTV_LIVE_DVB_T_PRO)
|
|
return;
|
|
|
|
i2c_del_adapter(&vp3054_i2c->adap);
|
|
kfree(vp3054_i2c);
|
|
}
|
|
|
|
EXPORT_SYMBOL(vp3054_i2c_probe);
|
|
EXPORT_SYMBOL(vp3054_i2c_remove);
|