linux.git/drivers/media, branch v3.0-rc7

Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6

2011-07-11T23:43:27+00:00

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6:
  [media] msp3400: fill in v4l2_tuner based on vt->type field
  [media] tuner-core.c: don't change type field in g_tuner or g_frequency
  [media] cx18/ivtv: fix g_tuner support
  [media] tuner-core: power up tuner when called with s_power(1)
  [media] v4l2-ioctl.c: check for valid tuner type in S_HW_FREQ_SEEK
  [media] tuner-core: simplify the standard fixup
  [media] tuner-core/v4l2-subdev: document that the type field has to be filled in
  [media] v4l2-subdev.h: remove unused s_mode tuner op
  [media] feature-removal-schedule: change in how radio device nodes are handled
  [media] bttv: fix s_tuner for radio
  [media] pvrusb2: fix g/s_tuner support
  [media] v4l2-ioctl.c: prefill tuner type for g_frequency and g/s_tuner
  [media] tuner-core: fix tuner_resume: use t->mode instead of t->type
  [media] tuner-core: fix s_std and s_tuner

[media] msp3400: fill in v4l2_tuner based on vt->type field

2011-07-07T20:28:30+00:00

The vt->type field determines how the msp3400 should fill in the
tuner data, not whether the msp3400 is in radio mode or not.

Signed-off-by: Hans Verkuil 
Signed-off-by: Mauro Carvalho Chehab

[media] tuner-core.c: don't change type field in g_tuner or g_frequency

2011-07-07T20:20:04+00:00

The tuner core should not silently change the type field in g_tuner and
g_frequency. If the tuner is in a different mode than the one that was
requested, then just fill in what you can and don't attempt to read afc,
signal or rxsubchans values.

Signed-off-by: Hans Verkuil 
Signed-off-by: Mauro Carvalho Chehab

[media] cx18/ivtv: fix g_tuner support

2011-07-07T18:07:43+00:00

The driver shouldn't override vt->type, and the tuner name should be
based on vt->type as well.

Signed-off-by: Hans Verkuil 
Signed-off-by: Mauro Carvalho Chehab

[media] tuner-core: power up tuner when called with s_power(1)

2011-07-07T18:07:01+00:00

Drivers must be able to rely on s_power to power up subdevices.

Note that at this moment no driver attempts to power up tuners. This probably
isn't surprising since s_power(1) was never implemented in tuner-core.c until
now.

Signed-off-by: Hans Verkuil 
Signed-off-by: Mauro Carvalho Chehab

[media] v4l2-ioctl.c: check for valid tuner type in S_HW_FREQ_SEEK

2011-07-07T18:06:12+00:00

Prohibit attempts to change the tuner to a type that is different
from the device node the ioctl is called from. I.e. the type must
be RADIO for a radio node and ANALOG_TV for a video/vbi node.

Signed-off-by: Hans Verkuil 
Signed-off-by: Mauro Carvalho Chehab

[media] tuner-core: simplify the standard fixup

2011-07-07T18:04:41+00:00

Get rid of a number of unnecessary tuner_dbg messages by simplifying
the std fixup function.

Signed-off-by: Hans Verkuil 
Signed-off-by: Mauro Carvalho Chehab

[media] tuner-core/v4l2-subdev: document that the type field has to be filled in

2011-07-07T18:04:23+00:00

The tuner ops g_frequency, g_tuner and s_tuner require that the tuner type
field is filled in. Document this.

The tuner-core doc is based on a patch from Mauro Carvalho Chehab .

Signed-off-by: Hans Verkuil 
Signed-off-by: Mauro Carvalho Chehab

[media] bttv: fix s_tuner for radio

2011-07-07T18:03:00+00:00

Fix typo: g_tuner should have been s_tuner.

Tested with a bttv card.

Cc: stable@kernel.org
Signed-off-by: Hans Verkuil 
Signed-off-by: Mauro Carvalho Chehab

[media] pvrusb2: fix g/s_tuner support

2011-07-07T18:02:40+00:00

The tuner-core subdev requires that the type field of v4l2_tuner is
filled in correctly. This is done in v4l2-ioctl.c, but pvrusb2 doesn't
use that yet, so we have to do it manually based on whether the current
input is radio or not.

Tested with my pvrusb2.

Signed-off-by: Hans Verkuil 
Acked-by: Mike Isely 
Cc: stable@kernel.org
Signed-off-by: Mauro Carvalho Chehab