Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/v4l-dvb: V4L/DVB (6028): Turn an unnecessary mdelay() into msleep(). V4L/DVB (6027): Get rid of an ill-behaved msleep in i2c write V4L/DVB (6026): Avoid powering up the camera on resume V4L/DVB (6016): get_dvb_firmware: update script for new location of tda10046 firmware V4L/DVB (5991): dvb-pll: Set minimum and maximum frequency properly V4L/DVB (5969): ivtv: report ivtv version in status log V4L/DVB (5967): ivtv: fix VIDIOC_S_FBUF:new OSD values where never set V4L/DVB (5968): videodev2.h: remove superfluous FBUF GLOBAL_INV_ALPHA support
This commit is contained in:
Linus Torvalds
Коммит
09d4b9aa90
|
|
@ -111,21 +111,21 @@ sub tda10045 {
|
|||
}
|
||||
|
||||
sub tda10046 {
|
||||
my $sourcefile = "tt_budget_217g.zip";
|
||||
my $url = "http://www.technotrend.de/new/217g/$sourcefile";
|
||||
my $hash = "6a7e1e2f2644b162ff0502367553c72d";
|
||||
my $outfile = "dvb-fe-tda10046.fw";
|
||||
my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);
|
||||
my $sourcefile = "TT_PCI_2.19h_28_11_2006.zip";
|
||||
my $url = "http://technotrend-online.com/download/software/219/$sourcefile";
|
||||
my $hash = "6a7e1e2f2644b162ff0502367553c72d";
|
||||
my $outfile = "dvb-fe-tda10046.fw";
|
||||
my $tmpdir = tempdir(DIR => "/tmp", CLEANUP => 1);
|
||||
|
||||
checkstandard();
|
||||
checkstandard();
|
||||
|
||||
wgetfile($sourcefile, $url);
|
||||
unzip($sourcefile, $tmpdir);
|
||||
extract("$tmpdir/software/OEM/PCI/App/ttlcdacc.dll", 0x3f731, 24478, "$tmpdir/fwtmp");
|
||||
verify("$tmpdir/fwtmp", $hash);
|
||||
copy("$tmpdir/fwtmp", $outfile);
|
||||
wgetfile($sourcefile, $url);
|
||||
unzip($sourcefile, $tmpdir);
|
||||
extract("$tmpdir/TT_PCI_2.19h_28_11_2006/software/OEM/PCI/App/ttlcdacc.dll", 0x65389, 24478, "$tmpdir/fwtmp");
|
||||
verify("$tmpdir/fwtmp", $hash);
|
||||
copy("$tmpdir/fwtmp", $outfile);
|
||||
|
||||
$outfile;
|
||||
$outfile;
|
||||
}
|
||||
|
||||
sub tda10046lifeview {
|
||||
|
|
|
|||
|
|
@ -784,7 +784,7 @@ struct dvb_frontend *dvb_pll_attach(struct dvb_frontend *fe, int pll_addr,
|
|||
strncpy(fe->ops.tuner_ops.info.name, desc->name,
|
||||
sizeof(fe->ops.tuner_ops.info.name));
|
||||
fe->ops.tuner_ops.info.frequency_min = desc->min;
|
||||
fe->ops.tuner_ops.info.frequency_min = desc->max;
|
||||
fe->ops.tuner_ops.info.frequency_max = desc->max;
|
||||
if (!desc->initdata)
|
||||
fe->ops.tuner_ops.init = NULL;
|
||||
if (!desc->sleepdata)
|
||||
|
|
|
|||
|
|
@ -356,6 +356,7 @@ static int cafe_smbus_write_data(struct cafe_camera *cam,
|
|||
{
|
||||
unsigned int rval;
|
||||
unsigned long flags;
|
||||
DEFINE_WAIT(the_wait);
|
||||
|
||||
spin_lock_irqsave(&cam->dev_lock, flags);
|
||||
rval = TWSIC0_EN | ((addr << TWSIC0_SID_SHIFT) & TWSIC0_SID);
|
||||
|
|
@ -369,10 +370,29 @@ static int cafe_smbus_write_data(struct cafe_camera *cam,
|
|||
rval = value | ((command << TWSIC1_ADDR_SHIFT) & TWSIC1_ADDR);
|
||||
cafe_reg_write(cam, REG_TWSIC1, rval);
|
||||
spin_unlock_irqrestore(&cam->dev_lock, flags);
|
||||
msleep(2); /* Required or things flake */
|
||||
|
||||
/*
|
||||
* Time to wait for the write to complete. THIS IS A RACY
|
||||
* WAY TO DO IT, but the sad fact is that reading the TWSIC1
|
||||
* register too quickly after starting the operation sends
|
||||
* the device into a place that may be kinder and better, but
|
||||
* which is absolutely useless for controlling the sensor. In
|
||||
* practice we have plenty of time to get into our sleep state
|
||||
* before the interrupt hits, and the worst case is that we
|
||||
* time out and then see that things completed, so this seems
|
||||
* the best way for now.
|
||||
*/
|
||||
do {
|
||||
prepare_to_wait(&cam->smbus_wait, &the_wait,
|
||||
TASK_UNINTERRUPTIBLE);
|
||||
schedule_timeout(1); /* even 1 jiffy is too long */
|
||||
finish_wait(&cam->smbus_wait, &the_wait);
|
||||
} while (!cafe_smbus_write_done(cam));
|
||||
|
||||
#ifdef IF_THE_CAFE_HARDWARE_WORKED_RIGHT
|
||||
wait_event_timeout(cam->smbus_wait, cafe_smbus_write_done(cam),
|
||||
CAFE_SMBUS_TIMEOUT);
|
||||
#endif
|
||||
spin_lock_irqsave(&cam->dev_lock, flags);
|
||||
rval = cafe_reg_read(cam, REG_TWSIC1);
|
||||
spin_unlock_irqrestore(&cam->dev_lock, flags);
|
||||
|
|
@ -710,7 +730,7 @@ static void cafe_ctlr_init(struct cafe_camera *cam)
|
|||
* Here we must wait a bit for the controller to come around.
|
||||
*/
|
||||
spin_unlock_irqrestore(&cam->dev_lock, flags);
|
||||
mdelay(5); /* FIXME revisit this */
|
||||
msleep(5);
|
||||
spin_lock_irqsave(&cam->dev_lock, flags);
|
||||
|
||||
cafe_reg_write(cam, REG_GL_CSR, GCSR_CCIC_EN|GCSR_SRC|GCSR_MRC);
|
||||
|
|
@ -2233,12 +2253,21 @@ static int cafe_pci_resume(struct pci_dev *pdev)
|
|||
if (ret)
|
||||
return ret;
|
||||
ret = pci_enable_device(pdev);
|
||||
|
||||
if (ret) {
|
||||
cam_warn(cam, "Unable to re-enable device on resume!\n");
|
||||
return ret;
|
||||
}
|
||||
cafe_ctlr_init(cam);
|
||||
cafe_ctlr_power_up(cam);
|
||||
cafe_ctlr_power_down(cam);
|
||||
|
||||
mutex_lock(&cam->s_mutex);
|
||||
if (cam->users > 0) {
|
||||
cafe_ctlr_power_up(cam);
|
||||
__cafe_cam_reset(cam);
|
||||
}
|
||||
mutex_unlock(&cam->s_mutex);
|
||||
|
||||
set_bit(CF_CONFIG_NEEDED, &cam->flags);
|
||||
if (cam->state == S_SPECREAD)
|
||||
cam->state = S_IDLE; /* Don't bother restarting */
|
||||
|
|
|
|||
|
|
@ -1190,6 +1190,7 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
|
|||
itv->osd_global_alpha_state = (fb->flags & V4L2_FBUF_FLAG_GLOBAL_ALPHA) != 0;
|
||||
itv->osd_local_alpha_state = (fb->flags & V4L2_FBUF_FLAG_LOCAL_ALPHA) != 0;
|
||||
itv->osd_color_key_state = (fb->flags & V4L2_FBUF_FLAG_CHROMAKEY) != 0;
|
||||
ivtv_set_osd_alpha(itv);
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -1234,7 +1235,7 @@ int ivtv_v4l2_ioctls(struct ivtv *itv, struct file *filp, unsigned int cmd, void
|
|||
IVTV_INFO("Tuner: %s\n",
|
||||
test_bit(IVTV_F_I_RADIO_USER, &itv->i_flags) ? "Radio" : "TV");
|
||||
cx2341x_log_status(&itv->params, itv->name);
|
||||
IVTV_INFO("Status flags: 0x%08lx\n", itv->i_flags);
|
||||
IVTV_INFO("Version: %s Status flags: 0x%08lx\n", IVTV_VERSION, itv->i_flags);
|
||||
for (i = 0; i < IVTV_MAX_STREAMS; i++) {
|
||||
struct ivtv_stream *s = &itv->streams[i];
|
||||
|
||||
|
|
|
|||
|
|
@ -416,7 +416,10 @@ static int ov7670_read(struct i2c_client *c, unsigned char reg,
|
|||
static int ov7670_write(struct i2c_client *c, unsigned char reg,
|
||||
unsigned char value)
|
||||
{
|
||||
return i2c_smbus_write_byte_data(c, reg, value);
|
||||
int ret = i2c_smbus_write_byte_data(c, reg, value);
|
||||
if (reg == REG_COM7 && (value & COM7_RESET))
|
||||
msleep(2); /* Wait for reset to run */
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -617,7 +617,6 @@ struct v4l2_framebuffer
|
|||
#define V4L2_FBUF_CAP_LOCAL_ALPHA 0x0010
|
||||
#define V4L2_FBUF_CAP_GLOBAL_ALPHA 0x0020
|
||||
#define V4L2_FBUF_CAP_LOCAL_INV_ALPHA 0x0040
|
||||
#define V4L2_FBUF_CAP_GLOBAL_INV_ALPHA 0x0080
|
||||
/* Flags for the 'flags' field. */
|
||||
#define V4L2_FBUF_FLAG_PRIMARY 0x0001
|
||||
#define V4L2_FBUF_FLAG_OVERLAY 0x0002
|
||||
|
|
@ -625,7 +624,6 @@ struct v4l2_framebuffer
|
|||
#define V4L2_FBUF_FLAG_LOCAL_ALPHA 0x0008
|
||||
#define V4L2_FBUF_FLAG_GLOBAL_ALPHA 0x0010
|
||||
#define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA 0x0020
|
||||
#define V4L2_FBUF_FLAG_GLOBAL_INV_ALPHA 0x0040
|
||||
|
||||
struct v4l2_clip
|
||||
{
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче