linux-toradex.git/drivers/media/video/davinci, branch v3.3.2

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

2012-03-16T00:06:05+00:00

Pull media fixes from Mauro Carvalho Chehab:
 "For 4 fixes for 3.3 (all trivial):
       - uvc video driver: fixes a division by zero;
       - davinci: add module.h to fix compilation;
       - smsusb: fix the delivery system setting;
       - smsdvb: the get_frontend implementation there is broken.

  The smsdvb patch has 127 lines, but it is trivial: instead of
  returning a cache of the set_frontend (with is wrong, as it doesn't
  have the updated values for the data, and the implementation there is
  buggy), it copies the information of the detected DVB parameters from
  the smsdvb private structures into the corresponding DVBv5 struct
  fields."

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] smsdvb: fix get_frontend
  [media] smsusb: fix the default delivery system setting
  [media] media: davinci: added module.h to resolve unresolved macros
  [media] [FOR,v3.3] uvcvideo: Avoid division by 0 in timestamp calculation

[media] media: davinci: added module.h to resolve unresolved macros

2012-02-28T20:06:54+00:00

Included module.h explicitly to resolve the macros THIS_MODULE and
MODULE_LICENSE. This avoids compilations errors as those defines were not
declared.

Signed-off-by: Henrique Camargo 
Signed-off-by: Diogo Luvizon 
Signed-off-by: Mauro Carvalho Chehab

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

2012-01-15T20:49:56+00:00

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (655 commits)
  [media] revert patch: HDIC HD29L2 DMB-TH USB2.0 reference design driver
  mb86a20s: Add a few more register settings at the init seq
  mb86a20s: Group registers into the same line
  [media] [PATCH] don't reset the delivery system on DTV_CLEAR
  [media] [BUG] it913x-fe fix typo error making SNR levels unstable
  [media] cx23885: Query the CX25840 during enum_input for status
  [media] cx25840: Add support for g_input_status
  [media] rc-videomate-m1f.c Rename to match remote controler name
  [media] drivers: media: au0828: Fix dependency for VIDEO_AU0828
  [media] convert drivers/media/* to use module_platform_driver()
  [media] drivers: video: cx231xx: Fix dependency for VIDEO_CX231XX_DVB
  [media] Exynos4 JPEG codec v4l2 driver
  [media] doc: v4l: selection: choose pixels as units for selection rectangles
  [media] v4l: s5p-tv: mixer: fix setup of VP scaling
  [media] v4l: s5p-tv: mixer: add support for selection API
  [media] v4l: emulate old crop API using extended crop/compose API
  [media] doc: v4l: add documentation for selection API
  [media] doc: v4l: add binary images for selection API
  [media] v4l: add support for selection api
  [media] hd29l2: fix review findings
  ...

[media] convert drivers/media/* to use module_platform_driver()

2012-01-11T01:27:13+00:00

This patch converts the drivers in drivers/media/* to use the
module_platform_driver() macro which makes the code smaller and a bit
simpler.

Cc: Mauro Carvalho Chehab 
Cc: Laurent Pinchart 
Cc: Kyungmin Park 
Cc: Hans Verkuil 
Cc: "Richard Röjfors" 
Cc: "Matti J. Aaltonen" 
Cc: Lucas De Marchi 
Cc: Manjunath Hadli 
Cc: Muralidharan Karicheri 
Cc: Anatolij Gustschin 
Cc: Guennadi Liakhovetski 
Cc: Marek Szyprowski 
Cc: Robert Jarzmik 
Cc: Jonathan Corbet 
Cc: Daniel Drake 
Signed-off-by: Axel Lin 
Acked-by: Laurent Pinchart 
Acked-by: Guennadi Liakhovetski 
Acked-by: Marek Szyprowski 
Acked-by: Matti J. Aaltonen 
Signed-off-by: Mauro Carvalho Chehab

[media] vpif_capture.c: v4l2_device_register() is called too late in vpif_probe()

2012-01-06T13:48:22+00:00

The function v4l2_device_register() is called too late in vpif_probe().
This meant that vpif_obj.v4l2_dev is accessed before it is initialized
which caused a crash.

This used to work in the past, but video_register_device() is now actually
using the v4l2_dev pointer.

Note that vpif_display.c doesn't have this bug, there v4l2_device_register()
is called at the beginning of vpif_probe.

Signed-off-by: Georgios Plakaris 
Signed-off-by: Hans Verkuil 
Acked-by: Manjunath Hadli 
Signed-off-by: Mauro Carvalho Chehab

[media] drivers/media/video/davinci/vpbe.c: introduce missing kfree

2012-01-06T13:13:05+00:00

vpbe_dev needs to be freed before leaving the function in an error case.

A simplified version of the semantic match that finds the problem is as
follows: (http://coccinelle.lip6.fr)

// 
@r exists@
local idexpression x;
statement S;
identifier f1;
position p1,p2;
expression *ptr != NULL;
@@

x@p1 = \(kmalloc\|kzalloc\|kcalloc\)(...);
...
if (x == NULL) S
<... when != x
     when != if (...) { <+...x...+> }
x->f1
...>
(
 return \(0\|<+...x...+>\|ptr\);
|
 return@p2 ...;
)

@script:python@
p1 << r.p1;
p2 << r.p2;
@@

print "* file: %s kmalloc %s return %s" % (p1[0].file,p1[0].line,p2[0].line)
// 

Signed-off-by: Julia Lawall 
Signed-off-by: Mauro Carvalho Chehab

[media] davinci vpbe: add VENC block changes to enable dm365 and dm355

2012-01-06T12:09:26+00:00

This patch implements necessary changes for enabling  dm365 and
dm355 hardware for vpbe. The patch contains additional HD mode
support for dm365 (720p60, 1080i30) and appropriate register
modifications based on version numbers.

VPBE_VERSION_2 = dm365 specific
VPBE_VERSION_3 = dm355 specific

Signed-off-by: Manjunath Hadli 
Acked-by: Hans Verkuil 
Signed-off-by: Mauro Carvalho Chehab

[media] davinci vpbe: add dm365 and dm355 specific OSD changes

2012-01-06T12:00:56+00:00

Add OSD block changes to enable dm365 and dm355 for vpbe driver.
Changes are based on version number of OSD, which have incremental
changes over 644x OSD hardware interms of few registers.

VPBE_VERSION_2 = dm365 specific
VPBE_VERSION_3 = dm355 specific

Acked-by: Hans Verkuil 
Signed-off-by: Manjunath Hadli 
Signed-off-by: Mauro Carvalho Chehab

[media] davinci vpbe: add dm365 VPBE display driver changes

2012-01-06T11:42:46+00:00

This patch implements the core additions to the display driver,
mainly controlling the VENC and other encoders for dm365.
This patch also includes addition of amplifier subdevice to the
vpbe driver and interfacing with venc subdevice.

Signed-off-by: Manjunath Hadli 
Acked-by: Hans Verkuil 
Signed-off-by: Mauro Carvalho Chehab

ARM: davinci: vpif: move code to driver core header from platform

2011-12-02T19:03:50+00:00

Move vpif related definitions for capture and display drivers
from dm646x platform header file to vpif_types.h inside
the driver as these definitions are related to driver code
rather than the platform or board.

This enables reusing this IP across platforms.

Signed-off-by: Manjunath Hadli 
Acked-by: Mauro Carvalho Chehab 
Signed-off-by: Sekhar Nori