Age | Commit message (Collapse) | Author |
|
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Cc: Paul Mundt <lethal@linux-sh.org>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Priority: low
---
arch/sh/boards/board-ap325rxa.c | 3 ++-
drivers/media/video/mt9m111.c | 9 +++++----
drivers/media/video/mt9v022.c | 5 ++++-
drivers/media/video/mx1_camera.c | 3 ++-
drivers/media/video/ov772x.c | 6 ++++--
drivers/media/video/pxa_camera.c | 3 ++-
drivers/media/video/soc_camera.c | 14 +++++++++++---
drivers/media/video/soc_camera_platform.c | 3 ++-
drivers/media/video/tw9910.c | 3 ++-
include/media/soc_camera.h | 15 ++++++++++-----
10 files changed, 44 insertions(+), 20 deletions(-)
|
|
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
This makes the soc-camera interface for V4L2 subdevices thinner yet. Handle
gain and exposure internally in each driver just like all other controls.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Priority: low
---
drivers/media/video/mt9m001.c | 43 ++++++++++++++++++++++++-------------
drivers/media/video/mt9m111.c | 20 ++++++++++++++---
drivers/media/video/mt9t031.c | 37 +++++++++++++++++++++-----------
drivers/media/video/mt9v022.c | 43 ++++++++++++++++++++++++++++---------
drivers/media/video/soc_camera.c | 19 ----------------
include/media/soc_camera.h | 2 -
6 files changed, 100 insertions(+), 64 deletions(-)
|
|
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Remove unneeded soc-camera operations, this also makes the soc-camera API to
v4l2 subdevices thinner.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Priority: low
---
drivers/media/video/mt9m001.c | 22 ++++++--------------
drivers/media/video/mt9m111.c | 40 +++++++------------------------------
drivers/media/video/mt9t031.c | 23 +++++----------------
drivers/media/video/mt9v022.c | 8 ++++--
drivers/media/video/soc_camera.c | 11 ----------
include/media/soc_camera.h | 4 ---
6 files changed, 26 insertions(+), 82 deletions(-)
|
|
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
The initial soc-camera scaling and cropping implementation turned out to be
incompliant with the V4L2 API, e.g., it expected the user to specify cropping
in output window pixels, instead of input window pixels. This patch converts
the soc-camera core and all drivers to comply with the standard.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Priority: low
|
|
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Priority: low
---
drivers/media/video/mt9m001.c | 20 +++++++++++---------
drivers/media/video/mt9m111.c | 11 +++++------
drivers/media/video/mt9t031.c | 16 ++++++++--------
drivers/media/video/mt9v022.c | 16 ++++++++--------
drivers/media/video/ov772x.c | 6 +++---
drivers/media/video/tw9910.c | 6 +++---
6 files changed, 38 insertions(+), 37 deletions(-)
|
|
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Remove set_crop soc-camera device method and switch to s_crop from v4l2-subdev
video operations. Also extend non-i2c drivers to also hold a pointer to their
v4l2-subdev instance in control device driver-data, i.e., in
dev_get_drvdata((struct device *)to_soc_camera_control(icd))
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Priority: low
---
drivers/media/video/mt9m001.c | 23 +++---
drivers/media/video/mt9m111.c | 9 +-
drivers/media/video/mt9t031.c | 9 +-
drivers/media/video/mt9v022.c | 23 +++---
drivers/media/video/mx1_camera.c | 8 ++-
drivers/media/video/mx3_camera.c | 7 +-
drivers/media/video/ov772x.c | 19 -----
drivers/media/video/pxa_camera.c | 7 +-
drivers/media/video/sh_mobile_ceu_camera.c | 110 ++++++++++++++-------------
drivers/media/video/soc_camera.c | 4 +-
drivers/media/video/soc_camera_platform.c | 28 ++++----
drivers/media/video/tw9910.c | 31 ++++----
include/media/soc_camera.h | 3 +-
13 files changed, 142 insertions(+), 139 deletions(-)
|
|
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Switch to using struct v4l2_rect in struct soc_camera_device for uniformity and
simplicity.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Priority: low
|
|
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Convert the soc-camera framework to use the v4l2-(sub)dev API. Start using
v4l2-subdev operations. Only a part of the interface between the
soc_camera core, soc_camera host drivers on one side and soc_camera device
drivers on the other side is replaced so far. The rest of the interface
will be replaced in incremental steps, and will require extensions and,
possibly, modifications to the v4l2-subdev code.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Priority: low
|
|
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Convert soc-camera core and all drivers to platform device API. We already
converted platforms to register a platform device for each soc-camera client,
now we remove the compatibility code and switch completely to the new scheme.
This is a preparatory step for the v4l2-subdev conversion.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Priority: low
|
|
From: Trent Piepho <xyzzy@speakeasy.org>
The v4l function has a better algorithm for aligning image size.
Priority: normal
Signed-off-by: Trent Piepho <xyzzy@speakeasy.org>
CC: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
|
|
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Register access routines only need the I2C client, not the soc-camera device
context.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/mt9m001.c | 105 +++++++++++++++++---------------
drivers/media/video/mt9m111.c | 73 ++++++++++++----------
drivers/media/video/mt9t031.c | 135 +++++++++++++++++++++-------------------
drivers/media/video/mt9v022.c | 135 +++++++++++++++++++++--------------------
4 files changed, 236 insertions(+), 212 deletions(-)
|
|
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Currently pcm990 camera bus-width management functions request a GPIO and never
free it again. With this approach the GPIO extender driver cannot be unloaded
once camera drivers have been loaded, also unloading theb i2c-pxa bus driver
produces errors, because the GPIO extender driver cannot unregister properly.
Another problem is, that if camera drivers are once loaded before the GPIO
extender driver, the platform code marks the GPIO unavailable and only a reboot
helps to recover. Adding an explicit free_bus method and using it in mt9m001
and mt9v022 drivers fixes these problems.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Acked-by: Eric Miao <eric.miao@marvell.com>
---
arch/arm/mach-pxa/pcm990-baseboard.c | 23 ++++++++++++++++-------
drivers/media/video/mt9m001.c | 3 +++
drivers/media/video/mt9v022.c | 3 +++
include/media/soc_camera.h | 1 +
4 files changed, 23 insertions(+), 7 deletions(-)
|
|
From: Hans Verkuil <hverkuil@xs4all.nl>
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
|
|
From: Sascha Hauer <s.hauer@pengutronix.de>
This patch removes the phytec specific setting of the bus width
and switches to the more generic query_bus_param/set_bus_param
hooks
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/Kconfig | 7 --
drivers/media/video/mt9v022.c | 141 ++++++++++++-----------------------------
2 files changed, 42 insertions(+), 106 deletions(-)
|
|
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
As host and camera drivers become more complex, differences between S_FMT and
S_CROP functionality grow, this patch separates them.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/mt9m001.c | 19 +++-
drivers/media/video/mt9m111.c | 56 +++++++---
drivers/media/video/mt9t031.c | 84 ++++++++++------
drivers/media/video/mt9v022.c | 62 +++++++----
drivers/media/video/mx3_camera.c | 157 +++++++++++++++++-----------
drivers/media/video/ov772x.c | 31 +++++-
drivers/media/video/pxa_camera.c | 67 +++++++++---
drivers/media/video/sh_mobile_ceu_camera.c | 17 ++-
drivers/media/video/soc_camera.c | 20 ++--
drivers/media/video/soc_camera_platform.c | 9 ++-
drivers/media/video/tw9910.c | 45 +++++---
include/media/soc_camera.h | 6 +-
12 files changed, 381 insertions(+), 192 deletions(-)
|
|
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
All soc-camera camera and host drivers must specify supported data signal
polarity, after all drivers are fixed, we'll add a suitable test to
soc_camera_bus_param_compatible().
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
arch/sh/boards/board-ap325rxa.c | 3 ++-
arch/sh/boards/mach-migor/setup.c | 5 +++--
drivers/media/video/mt9m001.c | 2 +-
drivers/media/video/mt9m111.c | 2 +-
drivers/media/video/mt9v022.c | 2 +-
drivers/media/video/ov772x.c | 2 +-
drivers/media/video/pxa_camera.c | 1 +
7 files changed, 10 insertions(+), 7 deletions(-)
|
|
From: Hans Verkuil <hverkuil@xs4all.nl>
Since the i2c driver ID will be removed in the near future we have to
modify the v4l2 debugging API to use the driver name instead of driver ID.
Note that this API is not used in applications other than v4l2-dbg.cpp
as it is for debugging and testing only.
Should anyone use the old VIDIOC_G_CHIP_IDENT, then this will be logged
with a warning that it is deprecated and will be removed in 2.6.30.
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
|
|
From: Guennadi Liakhovetski <lg@denx.de>
Signed-off-by: Guennadi Liakhovetski <lg@denx.de>
|
|
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Simplify multiple drivers by replacing f->fmt.pix.* with a single pointer
dereference, merge some needlessly broken lines, verify host and camera
operations pointers on registration.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/mt9m001.c | 20 ++++----
drivers/media/video/mt9m111.c | 10 ++--
drivers/media/video/mt9v022.c | 20 ++++----
drivers/media/video/pxa_camera.c | 21 +++-----
drivers/media/video/soc_camera.c | 74 +++++++++++++++++------------
drivers/media/video/soc_camera_platform.c | 5 +-
6 files changed, 81 insertions(+), 69 deletions(-)
|
|
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
As reported by Antonio Ospite <ospite@studenti.unina.it> two platforms with a
mt9m111 camera require opposite pixel clock polarity, which means one of them
inverts it. This patch adds support for inversion flags and switches all
available camera drivers to using them.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/mt9m001.c | 15 +++++++--------
drivers/media/video/mt9m111.c | 6 +++++-
drivers/media/video/mt9v022.c | 3 +++
drivers/media/video/ov772x.c | 10 +++++-----
drivers/media/video/soc_camera.c | 34 ++++++++++++++++++++++++++++++++++
include/media/soc_camera.h | 11 +++++++++++
6 files changed, 65 insertions(+), 14 deletions(-)
|
|
From: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Testing for non-NULL platform-data is not enough, we have to check if the GPIO
in the platform data is valid or not. Also see my earlier patch:
[ARM] pxa/pcm990: use negative number for an invalid GPIO in camera data
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/mt9m001.c | 5 +++--
drivers/media/video/mt9v022.c | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
|
|
We anyway don't follow the s_fmt_vid_cap / g_fmt_vid_cap / try_fmt_vid_cap
naming, and soc-camera is so far only about video capture, let's simplify
operation names a bit further. set_fmt_cap / try_fmt_cap wasn't a very good
choice too.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/mt9m001.c | 14 +++++++-------
drivers/media/video/mt9m111.c | 12 ++++++------
drivers/media/video/mt9v022.c | 14 +++++++-------
drivers/media/video/ov772x.c | 14 +++++++-------
drivers/media/video/pxa_camera.c | 16 ++++++++--------
drivers/media/video/sh_mobile_ceu_camera.c | 16 ++++++++--------
drivers/media/video/soc_camera.c | 6 +++---
drivers/media/video/soc_camera_platform.c | 12 ++++++------
include/media/soc_camera.h | 10 ++++------
9 files changed, 56 insertions(+), 58 deletions(-)
|
|
From: Mauro Carvalho Chehab <mchehab@redhat.com>
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
|
|
Make .power and .reset callbacks per camera instead of per host, also move
their invocation to camera drivers.
Signed-off-by: Stefan Herbrechtsmeier <hbmeier@hni.uni-paderborn.de>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/mt9m001.c | 33 +++++++++++++++++++++++++--
drivers/media/video/mt9m111.c | 15 ++++++++++++
drivers/media/video/mt9v022.c | 24 +++++++++++++++++++-
drivers/media/video/pxa_camera.c | 24 --------------------
drivers/media/video/sh_mobile_ceu_camera.c | 5 ----
include/asm-arm/arch-pxa/camera.h | 2 -
include/media/sh_mobile_ceu.h | 2 -
include/media/soc_camera.h | 3 ++
8 files changed, 71 insertions(+), 37 deletions(-)
|
|
i2c_smbus_write_word_data() returns 0 or a negative error, hence no need to
check for "> 0".
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/mt9m001.c | 24 ++++++++++++------------
drivers/media/video/mt9v022.c | 28 ++++++++++++++--------------
2 files changed, 26 insertions(+), 26 deletions(-)
|
|
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
|
|
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/mt9v022.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
|
|
x86.git testing found the following build bug on latest -git:
CC [M] drivers/media/video/mt9v022.o
drivers/media/video/mt9v022.c: In function 'bus_switch_request':
drivers/media/video/mt9v022.c:199: error: implicit declaration of function 'gpio_is_valid'
drivers/media/video/mt9v022.c:201: error: implicit declaration of function 'gpio_request'
drivers/media/video/mt9v022.c:207: error: implicit declaration of function 'gpio_direction_output'
drivers/media/video/mt9v022.c:211: error: implicit declaration of function 'gpio_free'
drivers/media/video/mt9v022.c: In function 'bus_switch_act':
drivers/media/video/mt9v022.c:237: error: implicit declaration of function 'gpio_set_value_cansleep'
make[2]: *** [drivers/media/video] Error 2
make[1]: *** [drivers/media] Error 2
make[1]: *** Waiting for unfinished jobs....
make: *** [drivers] Error 2
with this config:
http://redhat.com/~mingo/misc/config-Sat_May__3_16_08_39_CEST_2008.bad
the bug was that the driver uses GPIO functionality but only includes
the GPIO interface definitions for the CONFIG_MT9M001_PCA9536_SWITCH
case, which was not set in this config.
The quick fix seems to be to include linux/gpio.h unconditionally. (this
seems like a small cleanup as well as it removes and #ifdef is more
robust than an inclusion of asm/gpio.h) Not tested too much yet, so
please have another look in any case.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/mt9m001.c | 5 +----
drivers/media/video/mt9v022.c | 5 +----
2 files changed, 2 insertions(+), 8 deletions(-)
|
|
From: Mauro Carvalho Chehab <mchehab@infradead.org>
kernel-sync:
Author: Jean Delvare <khali@linux-fr.org>
Date: Tue Apr 29 23:11:39 2008 +0200
i2c: Add support for device alias names
Based on earlier work by Jon Smirl and Jochen Friedrich.
This patch allows new-style i2c chip drivers to have alias names using
the official kernel aliasing system and MODULE_DEVICE_TABLE(). At this
point, the old i2c driver binding scheme (driver_name/type) is still
supported.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
|
|
Author: Jean Delvare <khali@linux-fr.org>
Date: Tue Apr 29 23:11:40 2008 +0200
i2c: Convert most new-style drivers to use module aliasing
Based on earlier work by Jon Smirl and Jochen Friedrich.
Update most new-style i2c drivers to use standard module aliasing
instead of the old driver_name/type driver matching scheme. I've
left the video drivers apart (except for SoC camera drivers) as
they're a bit more diffcult to deal with, they'll have their own
patch later.
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
|
|
This patch makes the needlessly global mt9{m001,v022}_controls[] static.
Signed-off-by: Adrian Bunk <bunk@kernel.org>
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
---
drivers/media/video/mt9m001.c | 2 +-
drivers/media/video/mt9v022.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
d7560162fe24391e091574b08b25ac124369fb7b diff --git a/linux/drivers/media/video/mt9m001.c b/linux/drivers/media/video/mt9m001.c
index 3fb5f63..04864cf 100644
|
|
From: Mauro Carvalho Chehab <mchehab@infradead.org>
The proper fix were applied at -git. Re-apply the missing parts with the new
base.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
|
|
> keep those changes on hold, until I get a confirmation that the PXA side is
> committed on mainstream.
Reverted several changes on soc_camera
From: Mauro Carvalho Chehab <mchehab@infradead.org>
As asked by Guennadi:
Mauro, please, drop commits 2f4a87873f13924871d7bb82e27d02d0e16fbe02 and
9b7d577c508e7765860e599c0e98d4ac3fbaa2aa from your tree and replace
5f1e5244ee6b9f139a262d5e7a930a41488afbbe with the version below.
Due to that change, that happened on v4l-dvb -git tree, several patches broke.
This patch reverts all broken stuff, keeping this tree in sync with v4l-dvb
-git tree.
I'm waiting for Guennadi to fix the broken patches and ask me to pull them
again.
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
|
|
From: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
In case of muliple cameras, handled by the same driver, they can support
different picture formats, therefore formats and num_formats cannot belong
to soc_camera_ops, which is only one per driver, move them to
soc_camera_device, which is one per device instance. OTOH, probe and
remove methods are always the same, move them to soc_camera_ops.
Thanks to Eric Miao for making me look at this code again:-)
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
|
|
From: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Improve hardware parameter negotiation between the camera host driver and
camera drivers. Parameters like horizontal and vertical synchronisation,
pixel clock polarity shall be set depending on capabilities of the
parties.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
|
|
From: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Only advertise pixel formats, that we actually can support in the
present configuration.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
|
|
From: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Both camera drivers can function without GPIO support, in which case they
will only support the 10 bit data width mode. But the two respective switch
have to depend on CONFIG_GENERIC_GPIO. Additionally remove redundant
gpio_is_valid tests - they are repeated in bus_switch_request() functions.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
|
|
From: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Upon suggestion by David Brownell use a gpio_is_valid() predicate
instead of an explicit NO_GPIO macro. The respective patch to
include/asm-generic/gpio.h has been accepted upstream.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
|
|
From: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
This driver supports Micron MT9V022 colour camera.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@pengutronix.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
|