iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

V4L/DVB (3665): Add new NEC uPD64031A and uPD64083 i2c drivers

Browse Source 
- Add support for the uPD64031A NEC Electronics Ghost Reduction i2c device
- Add support for the uPD6408x NEC Electronics 3-Dimensional Y/C separation
  i2c device.

Signed-off-by: Takahiro Adachi <tadachi@tadachi-net.com>
Signed-off-by: Takeru Komoriya <komoriya@paken.org>
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Hans Verkuil 2006-03-29 14:56:17 -03:00 committed by Mauro Carvalho Chehab
parent 7061561e64
commit add953cecb
6 changed files with 681 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
drivers/media/video/Kconfig
View File

@ -300,7 +300,7 @@ config VIDEO_OVCAMCHIP
camera drivers.
To compile this driver as a module, choose M here: the
module will be called ovcamchip
module will be called ovcamchip.
config VIDEO_M32R_AR
tristate "AR devices"
@ -330,7 +330,7 @@ config VIDEO_MSP3400
Support for the Micronas MSP34xx series of audio decoders.
To compile this driver as a module, choose M here: the
module will be called msp3400
module will be called msp3400.
config VIDEO_CS53L32A
tristate "Cirrus Logic CS53L32A audio ADC"
@ -340,7 +340,7 @@ config VIDEO_CS53L32A
stereo A/D converter.
To compile this driver as a module, choose M here: the
module will be called cs53l32a
module will be called cs53l32a.
config VIDEO_WM8775
tristate "Wolfson Microelectronics WM8775 audio ADC with input mixer"
@ -350,7 +350,7 @@ config VIDEO_WM8775
performance stereo A/D Converter with a 4 channel input mixer.
To compile this driver as a module, choose M here: the
module will be called wm8775
module will be called wm8775.
config VIDEO_WM8739
tristate "Wolfson Microelectronics WM8739 stereo audio ADC"
@ -360,7 +360,7 @@ config VIDEO_WM8739
stereo A/D Converter.
To compile this driver as a module, choose M here: the
module will be called wm8739
module will be called wm8739.
source "drivers/media/video/cx25840/Kconfig"
@ -371,7 +371,7 @@ config VIDEO_SAA711X
Support for the Philips SAA7113/4/5 video decoders.
To compile this driver as a module, choose M here: the
module will be called saa7115
module will be called saa7115.
config VIDEO_SAA7127
tristate "Philips SAA7127/9 digital video encoders"
@ -380,7 +380,30 @@ config VIDEO_SAA7127
Support for the Philips SAA7127/9 digital video encoders.
To compile this driver as a module, choose M here: the
module will be called saa7127
module will be called saa7127.
config VIDEO_UPD64031A
tristate "NEC Electronics uPD64031A Ghost Reduction"
depends on VIDEO_DEV && I2C && EXPERIMENTAL
---help---
Support for the NEC Electronics uPD64031A Ghost Reduction
video chip. It is most often found in NTSC TV cards made for
Japan and is used to reduce the 'ghosting' effect that can
be present in analog TV broadcasts.
To compile this driver as a module, choose M here: the
module will be called upd64031a.
config VIDEO_UPD64083
tristate "NEC Electronics uPD64083 3-Dimensional Y/C separation"
depends on VIDEO_DEV && I2C && EXPERIMENTAL
---help---
Support for the NEC Electronics uPD64083 3-Dimensional Y/C
separation video chip. It is used to improve the quality of
the colors of a composite signal.
To compile this driver as a module, choose M here: the
module will be called upd64083.
endmenu # encoder / decoder chips

2
drivers/media/video/Makefile
View File

@ -65,6 +65,8 @@ obj-$(CONFIG_VIDEO_M32R_AR_M64278) += arv.o
obj-$(CONFIG_VIDEO_CX25840) += cx25840/
obj-$(CONFIG_VIDEO_SAA711X) += saa7115.o
obj-$(CONFIG_VIDEO_SAA7127) += saa7127.o
obj-$(CONFIG_VIDEO_UPD64031A) += upd64031a.o
obj-$(CONFIG_VIDEO_UPD64083) += upd64083.o
obj-$(CONFIG_USB_DABUSB) += dabusb.o
obj-$(CONFIG_USB_DSBR) += dsbr100.o

287
drivers/media/video/upd64031a.c Normal file
View File

@ -0,0 +1,287 @@
/*
* upd64031A - NEC Electronics Ghost Reduction for NTSC in Japan
*
* 2003 by T.Adachi <tadachi@tadachi-net.com>
* 2003 by Takeru KOMORIYA <komoriya@paken.org>
* 2006 by Hans Verkuil <hverkuil@xs4all.nl>
*
* 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/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
#include <media/v4l2-common.h>
#include <media/upd64031a.h>
// --------------------- read registers functions define -----------------------
/* bit masks */
#define GR_MODE_MASK 0xc0
#define DIRECT_3DYCS_CONNECT_MASK 0xc0
#define SYNC_CIRCUIT_MASK 0xa0
// -----------------------------------------------------------------------------
MODULE_DESCRIPTION("uPD64031A driver");
MODULE_AUTHOR("T. Adachi, Takeru KOMORIYA, Hans Verkuil");
MODULE_LICENSE("GPL");
static int debug = 0;
module_param(debug, int, 0644);
MODULE_PARM_DESC(debug, "Debug level (0-1)");
static unsigned short normal_i2c[] = { 0x24 >> 1, 0x26 >> 1, I2C_CLIENT_END };
I2C_CLIENT_INSMOD;
enum {
R00 = 0, R01, R02, R03, R04,
R05, R06, R07, R08, R09,
R0A, R0B, R0C, R0D, R0E, R0F,
/* unused registers
R10, R11, R12, R13, R14,
R15, R16, R17,
*/
TOT_REGS
};
struct upd64031a_state {
u8 regs[TOT_REGS];
u8 gr_mode;
u8 direct_3dycs_connect;
u8 ext_comp_sync;
u8 ext_vert_sync;
};
static u8 upd64031a_init[] = {
0x00, 0xb8, 0x48, 0xd2, 0xe6,
0x03, 0x10, 0x0b, 0xaf, 0x7f,
0x00, 0x00, 0x1d, 0x5e, 0x00,
0xd0
};
/* ------------------------------------------------------------------------ */
static u8 upd64031a_read(struct i2c_client *client, u8 reg)
{
u8 buf[2];
if (reg >= sizeof(buf))
return 0xff;
i2c_master_recv(client, buf, 2);
return buf[reg];
}
/* ------------------------------------------------------------------------ */
static void upd64031a_write(struct i2c_client *client, u8 reg, u8 val)
{
u8 buf[2];
buf[0] = reg;
buf[1] = val;
v4l_dbg(1, debug, client, "writing reg addr: %02X val: %02X\n", reg, val);
if (i2c_master_send(client, buf, 2) != 2)
v4l_err(client, "I/O error write 0x%02x/0x%02x\n", reg, val);
}
/* ------------------------------------------------------------------------ */
/* The input changed due to new input or channel changed */
static void upd64031a_change(struct i2c_client *client)
{
struct upd64031a_state *state = i2c_get_clientdata(client);
u8 reg = state->regs[R00];
v4l_dbg(1, debug, client, "changed input or channel\n");
upd64031a_write(client, R00, reg | 0x10);
upd64031a_write(client, R00, reg & ~0x10);
}
/* ------------------------------------------------------------------------ */
static int upd64031a_command(struct i2c_client *client, unsigned int cmd, void *arg)
{
struct upd64031a_state *state = i2c_get_clientdata(client);
struct v4l2_routing *route = arg;
switch (cmd) {
case VIDIOC_S_FREQUENCY:
upd64031a_change(client);
break;
case VIDIOC_INT_G_VIDEO_ROUTING:
route->input = (state->gr_mode >> 6) |
(state->direct_3dycs_connect >> 4) |
(state->ext_comp_sync >> 1) |
(state->ext_vert_sync >> 2);
route->output = 0;
break;
case VIDIOC_INT_S_VIDEO_ROUTING:
{
u8 r00, r05, r08;
state->gr_mode = (route->input & 3) << 6;
state->direct_3dycs_connect = (route->input & 0xc) << 4;
state->ext_comp_sync = (route->input & UPD64031A_COMPOSITE_EXTERNAL) << 1;
state->ext_vert_sync = (route->input & UPD64031A_VERTICAL_EXTERNAL) << 2;
r00 = (state->regs[R00] & ~GR_MODE_MASK) | state->gr_mode;
r05 = (state->regs[R00] & ~SYNC_CIRCUIT_MASK) |
state->ext_comp_sync | state->ext_vert_sync;
r08 = (state->regs[R08] & ~DIRECT_3DYCS_CONNECT_MASK) |
state->direct_3dycs_connect;
upd64031a_write(client, R00, r00);
upd64031a_write(client, R05, r05);
upd64031a_write(client, R08, r08);
upd64031a_change(client);
break;
}
case VIDIOC_LOG_STATUS:
v4l_info(client, "Status: SA00=0x%02x SA01=0x%02x\n",
upd64031a_read(client, 0), upd64031a_read(client, 1));
break;
#ifdef CONFIG_VIDEO_ADV_DEBUG
case VIDIOC_INT_G_REGISTER:
{
struct v4l2_register *reg = arg;
if (reg->i2c_id != I2C_DRIVERID_UPD64031A)
return -EINVAL;
reg->val = upd64031a_read(client, reg->reg & 0xff);
break;
}
case VIDIOC_INT_S_REGISTER:
{
struct v4l2_register *reg = arg;
u8 addr = reg->reg & 0xff;
u8 val = reg->val & 0xff;
if (reg->i2c_id != I2C_DRIVERID_UPD64031A)
return -EINVAL;
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
upd64031a_write(client, addr, val);
break;
}
#endif
default:
break;
}
return 0;
}
/* ------------------------------------------------------------------------ */
/* i2c implementation */
static struct i2c_driver i2c_driver;
static int upd64031a_attach(struct i2c_adapter *adapter, int address, int kind)
{
struct i2c_client *client;
struct upd64031a_state *state;
int i;
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
return 0;
client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
if (client == NULL) {
return -ENOMEM;
}
client->addr = address;
client->adapter = adapter;
client->driver = &i2c_driver;
snprintf(client->name, sizeof(client->name) - 1, "uPD64031A");
v4l_info(client, "chip found @ 0x%x (%s)\n", address << 1, adapter->name);
state = kmalloc(sizeof(struct upd64031a_state), GFP_KERNEL);
if (state == NULL) {
kfree(client);
return -ENOMEM;
}
i2c_set_clientdata(client, state);
memcpy(state->regs, upd64031a_init, sizeof(state->regs));
state->gr_mode = UPD64031A_GR_ON << 6;
state->direct_3dycs_connect = UPD64031A_3DYCS_COMPOSITE << 4;
state->ext_comp_sync = state->ext_vert_sync = 0;
for (i = 0; i < TOT_REGS; i++) {
upd64031a_write(client, i, state->regs[i]);
}
i2c_attach_client(client);
return 0;
}
static int upd64031a_probe(struct i2c_adapter *adapter)
{
if (adapter->class & I2C_CLASS_TV_ANALOG)
return i2c_probe(adapter, &addr_data, upd64031a_attach);
return 0;
}
static int upd64031a_detach(struct i2c_client *client)
{
int err;
err = i2c_detach_client(client);
if (err)
return err;
kfree(client);
return 0;
}
/* ----------------------------------------------------------------------- */
/* i2c implementation */
static struct i2c_driver i2c_driver = {
.driver = {
.name = "upd64031a",
},
.id = I2C_DRIVERID_UPD64031A,
.attach_adapter = upd64031a_probe,
.detach_client = upd64031a_detach,
.command = upd64031a_command,
};
static int __init upd64031a_init_module(void)
{
return i2c_add_driver(&i2c_driver);
}
static void __exit upd64031a_exit_module(void)
{
i2c_del_driver(&i2c_driver);
}
module_init(upd64031a_init_module);
module_exit(upd64031a_exit_module);

262
drivers/media/video/upd64083.c Normal file
View File

@ -0,0 +1,262 @@
/*
* upd6408x - NEC Electronics 3-Dimensional Y/C separation driver
*
* 2003 by T.Adachi (tadachi@tadachi-net.com)
* 2003 by Takeru KOMORIYA <komoriya@paken.org>
* 2006 by Hans Verkuil <hverkuil@xs4all.nl>
*
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <linux/version.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/i2c.h>
#include <linux/videodev2.h>
#include <media/v4l2-common.h>
#include <media/upd64083.h>
MODULE_DESCRIPTION("uPD64083 driver");
MODULE_AUTHOR("T. Adachi, Takeru KOMORIYA, Hans Verkuil");
MODULE_LICENSE("GPL");
static int debug = 0;
module_param(debug, bool, 0644);
MODULE_PARM_DESC(debug, "Debug level (0-1)");
static unsigned short normal_i2c[] = { 0xb8 >> 1, 0xba >> 1, I2C_CLIENT_END };
I2C_CLIENT_INSMOD;
enum {
R00 = 0, R01, R02, R03, R04,
R05, R06, R07, R08, R09,
R0A, R0B, R0C, R0D, R0E, R0F,
R10, R11, R12, R13, R14,
R15, R16,
TOT_REGS
};
struct upd64083_state {
u8 mode;
u8 ext_y_adc;
u8 regs[TOT_REGS];
};
/* Initial values when used in combination with the
NEC upd64031a ghost reduction chip. */
static u8 upd64083_init[] = {
0x1f, 0x01, 0xa0, 0x2d, 0x29, /* we use EXCSS=0 */
0x36, 0xdd, 0x05, 0x56, 0x48,
0x00, 0x3a, 0xa0, 0x05, 0x08,
0x44, 0x60, 0x08, 0x52, 0xf8,
0x53, 0x60, 0x10
};
/* ------------------------------------------------------------------------ */
static void upd64083_log_status(struct i2c_client *client)
{
u8 buf[7];
i2c_master_recv(client, buf, 7);
v4l_info(client, "Status: SA00=%02x SA01=%02x SA02=%02x SA03=%02x "
"SA04=%02x SA05=%02x SA06=%02x\n",
buf[0], buf[1], buf[2], buf[3], buf[4], buf[5], buf[6]);
}
/* ------------------------------------------------------------------------ */
static void upd64083_write(struct i2c_client *client, u8 reg, u8 val)
{
u8 buf[2];
buf[0] = reg;
buf[1] = val;
v4l_dbg(1, debug, client, "writing reg addr: %02x val: %02x\n", reg, val);
if (i2c_master_send(client, buf, 2) != 2)
v4l_err(client, "I/O error write 0x%02x/0x%02x\n", reg, val);
}
/* ------------------------------------------------------------------------ */
#ifdef CONFIG_VIDEO_ADV_DEBUG
static u8 upd64083_read(struct i2c_client *client, u8 reg)
{
u8 buf[7];
if (reg >= sizeof(buf))
return 0xff;
i2c_master_recv(client, buf, sizeof(buf));
return buf[reg];
}
#endif
/* ------------------------------------------------------------------------ */
static int upd64083_command(struct i2c_client *client, unsigned int cmd, void *arg)
{
struct upd64083_state *state = i2c_get_clientdata(client);
struct v4l2_routing *route = arg;
switch (cmd) {
case VIDIOC_INT_G_VIDEO_ROUTING:
route->input = (state->mode >> 6) | (state->ext_y_adc >> 3);
route->output = 0;
break;
case VIDIOC_INT_S_VIDEO_ROUTING:
{
u8 r00, r02;
if (route->input > 7 || (route->input & 6) == 6)
return -EINVAL;
state->mode = (route->input & 3) << 6;
state->ext_y_adc = (route->input & UPD64083_EXT_Y_ADC) << 3;
r00 = (state->regs[R00] & ~(3 << 6)) | state->mode;
r02 = (state->regs[R02] & ~(1 << 5)) | state->ext_y_adc;
upd64083_write(client, R00, r00);
upd64083_write(client, R02, r02);
break;
}
case VIDIOC_LOG_STATUS:
upd64083_log_status(client);
break;
#ifdef CONFIG_VIDEO_ADV_DEBUG
case VIDIOC_INT_G_REGISTER:
{
struct v4l2_register *reg = arg;
if (reg->i2c_id != I2C_DRIVERID_UPD64083)
return -EINVAL;
reg->val = upd64083_read(client, reg->reg & 0xff);
break;
}
case VIDIOC_INT_S_REGISTER:
{
struct v4l2_register *reg = arg;
u8 addr = reg->reg & 0xff;
u8 val = reg->val & 0xff;
if (reg->i2c_id != I2C_DRIVERID_UPD64083)
return -EINVAL;
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
upd64083_write(client, addr, val);
break;
}
#endif
default:
break;
}
return 0;
}
/* ------------------------------------------------------------------------ */
/* i2c implementation */
static struct i2c_driver i2c_driver;
static int upd64083_attach(struct i2c_adapter *adapter, int address, int kind)
{
struct i2c_client *client;
struct upd64083_state *state;
int i;
if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
return 0;
client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
if (client == NULL) {
return -ENOMEM;
}
client->addr = address;
client->adapter = adapter;
client->driver = &i2c_driver;
snprintf(client->name, sizeof(client->name) - 1, "uPD64083");
v4l_info(client, "chip found @ 0x%x (%s)\n", address << 1, adapter->name);
state = kmalloc(sizeof(struct upd64083_state), GFP_KERNEL);
if (state == NULL) {
kfree(client);
return -ENOMEM;
}
i2c_set_clientdata(client, state);
/* Initially assume that a ghost reduction chip is present */
state->mode = 0; /* YCS mode */
state->ext_y_adc = (1 << 5);
memcpy(state->regs, upd64083_init, TOT_REGS);
for (i = 0; i < TOT_REGS; i++) {
upd64083_write(client, i, state->regs[i]);
}
i2c_attach_client(client);
return 0;
}
static int upd64083_probe(struct i2c_adapter *adapter)
{
if (adapter->class & I2C_CLASS_TV_ANALOG)
return i2c_probe(adapter, &addr_data, upd64083_attach);
return 0;
}
static int upd64083_detach(struct i2c_client *client)
{
int err;
err = i2c_detach_client(client);
if (err)
return err;
kfree(client);
return 0;
}
/* ----------------------------------------------------------------------- */
/* i2c implementation */
static struct i2c_driver i2c_driver = {
.driver = {
.name = "upd64083",
},
.id = I2C_DRIVERID_UPD64083,
.attach_adapter = upd64083_probe,
.detach_client = upd64083_detach,
.command = upd64083_command,
};
static int __init upd64083_init_module(void)
{
return i2c_add_driver(&i2c_driver);
}
static void __exit upd64083_exit_module(void)
{
i2c_del_driver(&i2c_driver);
}
module_init(upd64083_init_module);
module_exit(upd64083_exit_module);

41
include/media/upd64031a.h Normal file
View File

@ -0,0 +1,41 @@
/*
* upd64031a - NEC Electronics Ghost Reduction input defines
*
* 2006 by Hans Verkuil (hverkuil@xs4all.nl)
*
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef _UPD64031A_H_
#define _UPD64031A_H_
/* Ghost reduction modes */
#define UPD64031A_GR_ON 0
#define UPD64031A_GR_OFF 1
#define UPD64031A_GR_THROUGH 3
/* Direct 3D/YCS Connection */
#define UPD64031A_3DYCS_DISABLE (0 << 2)
#define UPD64031A_3DYCS_COMPOSITE (2 << 2)
#define UPD64031A_3DYCS_SVIDEO (3 << 2)
/* Composite sync digital separation circuit */
#define UPD64031A_COMPOSITE_EXTERNAL (1 << 4)
/* Vertical sync digital separation circuit */
#define UPD64031A_VERTICAL_EXTERNAL (1 << 5)
#endif

59
include/media/upd64083.h Normal file
View File

@ -0,0 +1,59 @@
/*
* upd6408x - NEC Electronics 3-Dimensional Y/C separation input defines
*
* 2006 by Hans Verkuil (hverkuil@xs4all.nl)
*
* 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#ifndef _UPD64083_H_
#define _UPD64083_H_
/* There are two bits of information that the driver needs in order
to select the correct routing: the operating mode and the selection
of the Y input (external or internal).
The first two operating modes expect a composite signal on the Y input,
the second two operating modes use both the Y and C inputs.
Normally YCS_MODE is used for tuner and composite inputs, and the
YCNR mode is used for S-Video inputs.
The external Y-ADC is selected when the composite input comes from a
upd64031a ghost reduction device. If this device is not present, or
the input is a S-Video signal, then the internal Y-ADC input should
be used. */
/* Operating modes: */
/* YCS mode: Y/C separation (burst locked clocking) */
#define UPD64083_YCS_MODE 0
/* YCS+ mode: 2D Y/C separation and YCNR (burst locked clocking) */
#define UPD64083_YCS_PLUS_MODE 1
/* Note: the following two modes cannot be used in combination with the
external Y-ADC. */
/* MNNR mode: frame comb type YNR+C delay (line locked clocking) */
#define UPD64083_MNNR_MODE 2
/* YCNR mode: frame recursive YCNR (burst locked clocking) */
#define UPD64083_YCNR_MODE 3
/* Select external Y-ADC: this should be set if this device is used in
combination with the upd64031a ghost reduction device.
Otherwise leave at 0 (use internal Y-ADC). */
#define UPD64083_EXT_Y_ADC (1 << 2)
#endif