[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
The patch number 13942 was added via Mauro Carvalho Chehab mche...@redhat.com
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/mx1_camera.c |2 +-
linux/drivers/media/video/rj54n1cb0c.c |2 +-
linux/drivers/media/video/sh_mobile_ceu_camera.c |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff -r 9f2b96a560c1 -r d490d84a64ac linux/drivers/media/video/mx1_camera.c
--- a/linux/drivers/media/video/mx1_camera.cWed Jan 13 12:08:13 2010 -0200
+++ b/linux/drivers/media/video/mx1_camera.cWed Jan 13 12:11:34 2010 -0200
@@ -718,7 +718,7 @@
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
irq = platform_get_irq(pdev, 0);
- if (!res || !irq) {
+ if (!res || (int)irq = 0) {
err = -ENODEV;
goto exit;
}
diff -r 9f2b96a560c1 -r d490d84a64ac linux/drivers/media/video/rj54n1cb0c.c
--- a/linux/drivers/media/video/rj54n1cb0c.cWed Jan 13 12:08:13 2010 -0200
+++ b/linux/drivers/media/video/rj54n1cb0c.cWed Jan 13 12:11:34 2010 -0200
@@ -563,7 +563,7 @@
struct i2c_client *client = sd-priv;
struct rj54n1 *rj54n1 = to_rj54n1(client);
struct v4l2_rect *rect = a-c;
- unsigned int dummy, output_w, output_h,
+ unsigned int dummy = 0, output_w, output_h,
input_w = rect-width, input_h = rect-height;
int ret;
diff -r 9f2b96a560c1 -r d490d84a64ac
linux/drivers/media/video/sh_mobile_ceu_camera.c
--- a/linux/drivers/media/video/sh_mobile_ceu_camera.c Wed Jan 13 12:08:13
2010 -0200
+++ b/linux/drivers/media/video/sh_mobile_ceu_camera.c Wed Jan 13 12:11:34
2010 -0200
@@ -1828,7 +1828,7 @@
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
irq = platform_get_irq(pdev, 0);
- if (!res || !irq) {
+ if (!res || (int)irq = 0) {
dev_err(pdev-dev, Not enough CEU platform resources.\n);
err = -ENODEV;
goto exit;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/d490d84a64ac0b33bc942707c81e5c5e3b40c30c
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
The patch number 13672 was added via Mauro Carvalho Chehab mche...@redhat.com to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/Documentation/video4linux/sh_mobile_ceu_camera.txt | 157 + linux/arch/sh/boards/board-ap325rxa.c| 606 - linux/arch/sh/boards/mach-ap325rxa/setup.c | 662 + linux/arch/sh/boards/mach-kfr2r09/setup.c| 631 + linux/arch/sh/boards/mach-migor/setup.c | 32 linux/drivers/media/video/Kconfig|6 linux/drivers/media/video/Makefile |3 linux/drivers/media/video/mt9m001.c | 205 + linux/drivers/media/video/mt9m111.c | 213 + linux/drivers/media/video/mt9t031.c | 281 +- linux/drivers/media/video/mt9t112.c | 1177 ++ linux/drivers/media/video/mt9v022.c | 228 + linux/drivers/media/video/mx1_camera.c | 126 - linux/drivers/media/video/mx3_camera.c | 298 +- linux/drivers/media/video/ov772x.c | 233 - linux/drivers/media/video/ov9640.c | 107 linux/drivers/media/video/pxa_camera.c | 337 +- linux/drivers/media/video/rj54n1cb0c.c | 472 +++- linux/drivers/media/video/sh_mobile_ceu_camera.c | 522 ++-- linux/drivers/media/video/soc_camera.c | 102 linux/drivers/media/video/soc_camera_platform.c | 46 linux/drivers/media/video/soc_mediabus.c | 157 + linux/drivers/media/video/tw9910.c | 337 +- linux/include/linux/videodev2.h |7 linux/include/media/mt9t112.h| 30 linux/include/media/ov772x.h |4 linux/include/media/rj54n1cb0c.h | 19 linux/include/media/sh_mobile_ceu.h |2 linux/include/media/soc_camera.h | 30 linux/include/media/soc_camera_platform.h|3 linux/include/media/soc_mediabus.h | 65 linux/include/media/tw9910.h |1 linux/include/media/v4l2-chip-ident.h|2 linux/include/media/v4l2-mediabus.h | 61 linux/include/media/v4l2-subdev.h| 40 35 files changed, 5184 insertions(+), 2018 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/3047cc2787725debb5fed0b1f406e4cb8de9e0ef ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
The patch number 13346 was added via Mauro Carvalho Chehab mche...@redhat.com
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/mx1_camera.c |1
linux/drivers/media/video/mx3_camera.c |1
linux/drivers/media/video/sh_mobile_ceu_camera.c |6 -
linux/drivers/media/video/soc_camera.c | 17 ++-
linux/drivers/media/video/videobuf-dma-contig.c |1
5 files changed, 20 insertions(+), 6 deletions(-)
diff -r 0076f0714e34 -r 859534a27a3a linux/drivers/media/video/mx1_camera.c
--- a/linux/drivers/media/video/mx1_camera.cTue Nov 17 19:10:55 2009 -0200
+++ b/linux/drivers/media/video/mx1_camera.cTue Nov 17 20:18:22 2009 -0200
@@ -28,6 +28,7 @@
#include linux/moduleparam.h
#include linux/mutex.h
#include linux/platform_device.h
+#include linux/sched.h
#include linux/time.h
#include linux/version.h
#include linux/videodev2.h
diff -r 0076f0714e34 -r 859534a27a3a linux/drivers/media/video/mx3_camera.c
--- a/linux/drivers/media/video/mx3_camera.cTue Nov 17 19:10:55 2009 -0200
+++ b/linux/drivers/media/video/mx3_camera.cTue Nov 17 20:18:22 2009 -0200
@@ -17,6 +17,7 @@
#include linux/clk.h
#include linux/vmalloc.h
#include linux/interrupt.h
+#include linux/sched.h
#include media/v4l2-common.h
#include media/v4l2-dev.h
diff -r 0076f0714e34 -r 859534a27a3a
linux/drivers/media/video/sh_mobile_ceu_camera.c
--- a/linux/drivers/media/video/sh_mobile_ceu_camera.c Tue Nov 17 19:10:55
2009 -0200
+++ b/linux/drivers/media/video/sh_mobile_ceu_camera.c Tue Nov 17 20:18:22
2009 -0200
@@ -31,6 +31,7 @@
#include linux/platform_device.h
#include linux/videodev2.h
#include linux/pm_runtime.h
+#include linux/sched.h
#include media/v4l2-common.h
#include media/v4l2-dev.h
@@ -1779,10 +1780,12 @@
err = soc_camera_host_register(pcdev-ici);
if (err)
- goto exit_free_irq;
+ goto exit_free_clk;
return 0;
+exit_free_clk:
+ pm_runtime_disable(pdev-dev);
exit_free_irq:
free_irq(pcdev-irq, pcdev);
exit_release_mem:
@@ -1803,6 +1806,7 @@
struct sh_mobile_ceu_dev, ici);
soc_camera_host_unregister(soc_host);
+ pm_runtime_disable(pdev-dev);
free_irq(pcdev-irq, pcdev);
if (platform_get_resource(pdev, IORESOURCE_MEM, 1))
dma_release_declared_memory(pdev-dev);
diff -r 0076f0714e34 -r 859534a27a3a linux/drivers/media/video/soc_camera.c
--- a/linux/drivers/media/video/soc_camera.cTue Nov 17 19:10:55 2009 -0200
+++ b/linux/drivers/media/video/soc_camera.cTue Nov 17 20:18:22 2009 -0200
@@ -1098,6 +1098,13 @@
return v4l2_subdev_call(sd, video, s_crop, a);
}
+static void soc_camera_device_init(struct device *dev, void *pdata)
+{
+ dev-platform_data = pdata;
+ dev-bus= soc_camera_bus_type;
+ dev-release= dummy_release;
+}
+
int soc_camera_host_register(struct soc_camera_host *ici)
{
struct soc_camera_host *ix;
@@ -1159,6 +1166,7 @@
list_for_each_entry(icd, devices, list) {
if (icd-iface == ici-nr) {
+ void *pdata = icd-dev.platform_data;
/* The bus-remove will be called */
device_unregister(icd-dev);
/*
@@ -1170,6 +1178,7 @@
* device private data.
*/
memset(icd-dev, 0, sizeof(icd-dev));
+ soc_camera_device_init(icd-dev, pdata);
}
}
@@ -1201,10 +1210,7 @@
* man, stay reasonable... */
return -ENOMEM;
- icd-devnum = num;
- icd-dev.bus = soc_camera_bus_type;
-
- icd-dev.release= dummy_release;
+ icd-devnum = num;
icd-use_count = 0;
icd-host_priv = NULL;
mutex_init(icd-video_lock);
@@ -1312,12 +1318,13 @@
icd-iface = icl-bus_id;
icd-pdev = pdev-dev;
platform_set_drvdata(pdev, icd);
- icd-dev.platform_data = icl;
ret = soc_camera_device_register(icd);
if (ret 0)
goto escdevreg;
+ soc_camera_device_init(icd-dev, icl);
+
icd-user_width = DEFAULT_WIDTH;
icd-user_height= DEFAULT_HEIGHT;
diff -r 0076f0714e34 -r 859534a27a3a
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
The patch number 12710 was added via Mauro Carvalho Chehab mche...@redhat.com to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/arch/sh/boards/board-ap325rxa.c |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -r 629bb4593946 -r 55dd1e8e3797 linux/arch/sh/boards/board-ap325rxa.c --- a/linux/arch/sh/boards/board-ap325rxa.c Mon Sep 07 01:46:36 2009 -0300 +++ b/linux/arch/sh/boards/board-ap325rxa.c Mon Sep 07 01:52:38 2009 -0300 @@ -359,8 +359,8 @@ return; platform_device_unregister(camera_device); - memset(migor_camera_device.dev.kobj, 0, - sizeof(migor_camera_device.dev.kobj)); + memset(camera_device.dev.kobj, 0, + sizeof(camera_device.dev.kobj)); } #endif /* CONFIG_I2C */ --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/55dd1e8e3797af6069bd64a1926e4e020986 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
The patch number 12581 was added via Mauro Carvalho Chehab mche...@redhat.com to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/drivers/media/video/soc_camera.c |1 - linux/drivers/media/video/soc_camera_platform.c |1 - 2 files changed, 2 deletions(-) diff -r 5495bf077cd8 -r 9b52c44965e3 linux/drivers/media/video/soc_camera.c --- a/linux/drivers/media/video/soc_camera.cSun Aug 30 18:56:14 2009 -0300 +++ b/linux/drivers/media/video/soc_camera.cSun Aug 30 19:04:22 2009 -0300 @@ -857,7 +857,6 @@ goto ei2cnd; } - subdev-grp_id = (__u32)icd; client = subdev-priv; /* Use to_i2c_client(dev) to recover the i2c client */ diff -r 5495bf077cd8 -r 9b52c44965e3 linux/drivers/media/video/soc_camera_platform.c --- a/linux/drivers/media/video/soc_camera_platform.c Sun Aug 30 18:56:14 2009 -0300 +++ b/linux/drivers/media/video/soc_camera_platform.c Sun Aug 30 19:04:22 2009 -0300 @@ -137,7 +137,6 @@ v4l2_subdev_init(priv-subdev, platform_subdev_ops); v4l2_set_subdevdata(priv-subdev, p); - priv-subdev.grp_id = (__u32)icd; strncpy(priv-subdev.name, dev_name(pdev-dev), V4L2_SUBDEV_NAME_SIZE); ret = v4l2_device_register_subdev(ici-v4l2_dev, priv-subdev); --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/9b52c44965e3919c666201aba5a3c518366107bf ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
The patch number 12539 was added via Mauro Carvalho Chehab mche...@redhat.com to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/Documentation/video4linux/soc-camera.txt | 40 linux/arch/arm/mach-pxa/pcm990-baseboard.c | 54 linux/arch/sh/boards/board-ap325rxa.c| 58 linux/drivers/media/video/mt9m001.c | 447 +++--- linux/drivers/media/video/mt9m111.c | 520 +++ linux/drivers/media/video/mt9t031.c | 509 +++ linux/drivers/media/video/mt9v022.c | 430 +++--- linux/drivers/media/video/mx1_camera.c | 78 - linux/drivers/media/video/mx3_camera.c | 207 +- linux/drivers/media/video/ov772x.c | 383 +++-- linux/drivers/media/video/pxa_camera.c | 420 +++-- linux/drivers/media/video/sh_mobile_ceu_camera.c | 1060 +-- linux/drivers/media/video/soc_camera.c | 754 ++ linux/drivers/media/video/soc_camera_platform.c | 164 +- linux/drivers/media/video/tw9910.c | 361 ++--- linux/include/linux/videodev2.h |3 linux/include/media/soc_camera.h | 113 - linux/include/media/soc_camera_platform.h|9 v4l2-spec/controls.sgml |8 v4l2-spec/v4l2.sgml |9 20 files changed, 3608 insertions(+), 2019 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/e2bda4278cac733367e6e05765c8234d53432541 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
The patch number 12425 was added via Mauro Carvalho Chehab mche...@redhat.com
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/mx1_camera.c |6
linux/drivers/media/video/mx3_camera.c | 19 +++
linux/drivers/media/video/pxa_camera.c |6
linux/drivers/media/video/sh_mobile_ceu_camera.c |5 ---
4 files changed, 13 insertions(+), 23 deletions(-)
diff -r 81f12bd9b79b -r 1d7fea812926 linux/drivers/media/video/mx1_camera.c
--- a/linux/drivers/media/video/mx1_camera.cWed Aug 05 13:07:10 2009 -0300
+++ b/linux/drivers/media/video/mx1_camera.cTue Aug 11 10:05:30 2009 -0300
@@ -234,6 +234,7 @@
return ret;
}
+/* Called under spinlock_irqsave(pcdev-lock, ...) */
static void mx1_videobuf_queue(struct videobuf_queue *vq,
struct videobuf_buffer *vb)
{
@@ -241,13 +242,10 @@
struct soc_camera_host *ici = to_soc_camera_host(icd-dev.parent);
struct mx1_camera_dev *pcdev = ici-priv;
struct mx1_buffer *buf = container_of(vb, struct mx1_buffer, vb);
- unsigned long flags;
dev_dbg(icd-dev, %s (vb=0x%p) 0x%08lx %d\n, __func__,
vb, vb-baddr, vb-bsize);
- spin_lock_irqsave(pcdev-lock, flags);
-
list_add_tail(vb-queue, pcdev-capture);
vb-state = VIDEOBUF_ACTIVE;
@@ -264,8 +262,6 @@
__raw_writel(temp, pcdev-base + CSICR1);
}
}
-
- spin_unlock_irqrestore(pcdev-lock, flags);
}
static void mx1_videobuf_release(struct videobuf_queue *vq,
diff -r 81f12bd9b79b -r 1d7fea812926 linux/drivers/media/video/mx3_camera.c
--- a/linux/drivers/media/video/mx3_camera.cWed Aug 05 13:07:10 2009 -0300
+++ b/linux/drivers/media/video/mx3_camera.cTue Aug 11 10:05:30 2009 -0300
@@ -332,7 +332,10 @@
}
}
-/* Called with .vb_lock held */
+/*
+ * Called with .vb_lock mutex held and
+ * under spinlock_irqsave(mx3_cam-lock, ...)
+ */
static void mx3_videobuf_queue(struct videobuf_queue *vq,
struct videobuf_buffer *vb)
{
@@ -346,7 +349,8 @@
struct idmac_video_param *video = ichan-params.video;
const struct soc_camera_data_format *data_fmt = icd-current_fmt;
dma_cookie_t cookie;
- unsigned long flags;
+
+ BUG_ON(!irqs_disabled());
/* This is the configuration of one sg-element */
video-out_pixel_fmt= fourcc_to_ipu_pix(data_fmt-fourcc);
@@ -359,8 +363,6 @@
memset((void *)vb-baddr, 0xaa, vb-bsize);
#endif
- spin_lock_irqsave(mx3_cam-lock, flags);
-
list_add_tail(vb-queue, mx3_cam-capture);
if (!mx3_cam-active) {
@@ -370,24 +372,23 @@
vb-state = VIDEOBUF_QUEUED;
}
- spin_unlock_irqrestore(mx3_cam-lock, flags);
+ spin_unlock_irq(mx3_cam-lock);
cookie = txd-tx_submit(txd);
dev_dbg(icd-dev, Submitted cookie %d DMA 0x%08x\n, cookie,
sg_dma_address(buf-sg));
+
+ spin_lock_irq(mx3_cam-lock);
+
if (cookie = 0)
return;
/* Submit error */
vb-state = VIDEOBUF_PREPARED;
- spin_lock_irqsave(mx3_cam-lock, flags);
-
list_del_init(vb-queue);
if (mx3_cam-active == buf)
mx3_cam-active = NULL;
-
- spin_unlock_irqrestore(mx3_cam-lock, flags);
}
/* Called with .vb_lock held */
diff -r 81f12bd9b79b -r 1d7fea812926 linux/drivers/media/video/pxa_camera.c
--- a/linux/drivers/media/video/pxa_camera.cWed Aug 05 13:07:10 2009 -0300
+++ b/linux/drivers/media/video/pxa_camera.cTue Aug 11 10:05:30 2009 -0300
@@ -624,6 +624,7 @@
dev_dbg(pcdev-soc_host.dev, %s\n, __func__);
}
+/* Called under spinlock_irqsave(pcdev-lock, ...) */
static void pxa_videobuf_queue(struct videobuf_queue *vq,
struct videobuf_buffer *vb)
{
@@ -631,13 +632,10 @@
struct soc_camera_host *ici = to_soc_camera_host(icd-dev.parent);
struct pxa_camera_dev *pcdev = ici-priv;
struct pxa_buffer *buf = container_of(vb, struct pxa_buffer, vb);
- unsigned long flags;
dev_dbg(icd-dev, %s (vb=0x%p) 0x%08lx %d active=%p\n, __func__,
vb, vb-baddr, vb-bsize, pcdev-active);
- spin_lock_irqsave(pcdev-lock, flags);
-
list_add_tail(vb-queue, pcdev-capture);
vb-state = VIDEOBUF_ACTIVE;
@@ -645,8 +643,6 @@
if
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
The patch number 12161 was added via Mauro Carvalho Chehab mche...@redhat.com
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/soc_camera.c | 18 +++---
linux/include/media/v4l2-subdev.h |3 +++
2 files changed, 14 insertions(+), 7 deletions(-)
diff -r fa37f31b0c06 -r d443ccd3d58f linux/drivers/media/video/soc_camera.c
--- a/linux/drivers/media/video/soc_camera.cTue Jun 30 16:36:08 2009 -0300
+++ b/linux/drivers/media/video/soc_camera.cTue Jun 30 16:37:54 2009 -0300
@@ -238,11 +238,11 @@ static int soc_camera_init_user_formats(
return -ENOMEM;
icd-num_user_formats = fmts;
+
+ dev_dbg(icd-dev, Found %d supported formats.\n, fmts);
+
+ /* Second pass - actually fill data formats */
fmts = 0;
-
- dev_dbg(icd-dev, Found %d supported formats.\n, fmts);
-
- /* Second pass - actually fill data formats */
for (i = 0; i icd-num_formats; i++)
if (!ici-ops-get_formats) {
icd-user_formats[i].host_fmt = icd-formats + i;
@@ -878,8 +878,11 @@ static int soc_camera_probe(struct devic
(unsigned short)~0;
ret = soc_camera_init_user_formats(icd);
- if (ret 0)
+ if (ret 0) {
+ if (icd-ops-remove)
+ icd-ops-remove(icd);
goto eiufmt;
+ }
icd-height = DEFAULT_HEIGHT;
icd-width = DEFAULT_WIDTH;
@@ -903,8 +906,10 @@ static int soc_camera_remove(struct devi
{
struct soc_camera_device *icd = to_soc_camera_dev(dev);
+ mutex_lock(icd-video_lock);
if (icd-ops-remove)
icd-ops-remove(icd);
+ mutex_unlock(icd-video_lock);
soc_camera_free_user_formats(icd);
@@ -1146,6 +1151,7 @@ evidallocd:
}
EXPORT_SYMBOL(soc_camera_video_start);
+/* Called from client .remove() methods with .video_lock held */
void soc_camera_video_stop(struct soc_camera_device *icd)
{
struct video_device *vdev = icd-vdev;
@@ -1155,10 +1161,8 @@ void soc_camera_video_stop(struct soc_ca
if (!icd-dev.parent || !vdev)
return;
- mutex_lock(icd-video_lock);
video_unregister_device(vdev);
icd-vdev = NULL;
- mutex_unlock(icd-video_lock);
}
EXPORT_SYMBOL(soc_camera_video_stop);
diff -r fa37f31b0c06 -r d443ccd3d58f linux/include/media/v4l2-subdev.h
--- a/linux/include/media/v4l2-subdev.h Tue Jun 30 16:36:08 2009 -0300
+++ b/linux/include/media/v4l2-subdev.h Tue Jun 30 16:37:54 2009 -0300
@@ -220,6 +220,9 @@ struct v4l2_subdev_video_ops {
int (*g_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
int (*try_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
int (*s_fmt)(struct v4l2_subdev *sd, struct v4l2_format *fmt);
+ int (*cropcap)(struct v4l2_subdev *sd, struct v4l2_cropcap *cc);
+ int (*g_crop)(struct v4l2_subdev *sd, struct v4l2_crop *crop);
+ int (*s_crop)(struct v4l2_subdev *sd, struct v4l2_crop *crop);
int (*g_parm)(struct v4l2_subdev *sd, struct v4l2_streamparm *param);
int (*s_parm)(struct v4l2_subdev *sd, struct v4l2_streamparm *param);
int (*enum_framesizes)(struct v4l2_subdev *sd, struct v4l2_frmsizeenum
*fsize);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/d443ccd3d58f300e42ab0ffb9b3fff591c84ed1e
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
The patch number 11706 was added via Mauro Carvalho Chehab mche...@redhat.com
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List linux-me...@vger.kernel.org
--
From: Mauro Carvalho Chehab mche...@redhat.com
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com
---
linux/drivers/media/video/soc_camera.c | 77 ++---
linux/include/media/soc_camera.h |5 +
2 files changed, 74 insertions(+), 8 deletions(-)
diff -r f459f515b1b6 -r 9e27a1001246 linux/drivers/media/video/soc_camera.c
--- a/linux/drivers/media/video/soc_camera.cSat May 09 05:45:44 2009 -0300
+++ b/linux/drivers/media/video/soc_camera.cSat May 09 05:48:08 2009 -0300
@@ -16,19 +16,21 @@
* published by the Free Software Foundation.
*/
+#include linux/device.h
+#include linux/err.h
+#include linux/i2c.h
+#include linux/init.h
+#include linux/list.h
#include linux/module.h
-#include linux/init.h
-#include linux/device.h
-#include linux/list.h
-#include linux/err.h
#include linux/mutex.h
+#include linux/platform_device.h
#include linux/vmalloc.h
+#include media/soc_camera.h
#include media/v4l2-common.h
+#include media/v4l2-dev.h
#include media/v4l2-ioctl.h
-#include media/v4l2-dev.h
#include media/videobuf-core.h
-#include media/soc_camera.h
#include compat.h
/* Default to VGA resolution */
@@ -1160,6 +1162,57 @@ void soc_camera_video_stop(struct soc_ca
}
EXPORT_SYMBOL(soc_camera_video_stop);
+static int __devinit soc_camera_pdrv_probe(struct platform_device *pdev)
+{
+ struct soc_camera_link *icl = pdev-dev.platform_data;
+ struct i2c_adapter *adap;
+ struct i2c_client *client;
+
+ if (!icl)
+ return -EINVAL;
+
+ adap = i2c_get_adapter(icl-i2c_adapter_id);
+ if (!adap) {
+ dev_warn(pdev-dev, Cannot get adapter #%d. No driver?\n,
+icl-i2c_adapter_id);
+ /* -ENODEV and -ENXIO do not produce an error on probe()... */
+ return -ENOENT;
+ }
+
+ icl-board_info-platform_data = icl;
+ client = i2c_new_device(adap, icl-board_info);
+ if (!client) {
+ i2c_put_adapter(adap);
+ return -ENOMEM;
+ }
+
+ platform_set_drvdata(pdev, client);
+
+ return 0;
+}
+
+static int __devexit soc_camera_pdrv_remove(struct platform_device *pdev)
+{
+ struct i2c_client *client = platform_get_drvdata(pdev);
+
+ if (!client)
+ return -ENODEV;
+
+ i2c_unregister_device(client);
+ i2c_put_adapter(client-adapter);
+
+ return 0;
+}
+
+static struct platform_driver soc_camera_pdrv = {
+ .probe = soc_camera_pdrv_probe,
+ .remove = __exit_p(soc_camera_pdrv_remove),
+ .driver = {
+ .name = soc-camera-pdrv,
+ .owner = THIS_MODULE,
+ },
+};
+
static int __init soc_camera_init(void)
{
int ret = bus_register(soc_camera_bus_type);
@@ -1169,8 +1222,14 @@ static int __init soc_camera_init(void)
if (ret)
goto edrvr;
- return 0;
-
+ ret = platform_driver_register(soc_camera_pdrv);
+ if (ret)
+ goto epdr;
+
+ return 0;
+
+epdr:
+ driver_unregister(ic_drv);
edrvr:
bus_unregister(soc_camera_bus_type);
return ret;
@@ -1178,6 +1237,7 @@ edrvr:
static void __exit soc_camera_exit(void)
{
+ platform_driver_unregister(soc_camera_pdrv);
driver_unregister(ic_drv);
bus_unregister(soc_camera_bus_type);
}
@@ -1188,3 +1248,4 @@ MODULE_DESCRIPTION(Image capture bus dr
MODULE_DESCRIPTION(Image capture bus driver);
MODULE_AUTHOR(Guennadi Liakhovetski ker...@pengutronix.de);
MODULE_LICENSE(GPL);
+MODULE_ALIAS(platform:soc-camera-pdrv);
diff -r f459f515b1b6 -r 9e27a1001246 linux/include/media/soc_camera.h
--- a/linux/include/media/soc_camera.h Sat May 09 05:45:44 2009 -0300
+++ b/linux/include/media/soc_camera.h Sat May 09 05:48:08 2009 -0300
@@ -92,11 +92,16 @@ struct soc_camera_host_ops {
#define SOCAM_SENSOR_INVERT_VSYNC (1 3)
#define SOCAM_SENSOR_INVERT_DATA (1 4)
+struct i2c_board_info;
+
struct soc_camera_link {
/* Camera bus id, used to match a camera and a bus */
int bus_id;
/* Per camera SOCAM_SENSOR_* bus flags */
unsigned long flags;
+ int i2c_adapter_id;
+ struct i2c_board_info *board_info;
+ const char *module_name;
/* Optional callbacks to power on or off and reset the sensor */
int (*power)(struct device *, int);
int (*reset)(struct device *);
---
Patch is available at:
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
The patch number 11614 was added via Mauro Carvalho Chehab mche...@redhat.com to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/Documentation/video4linux/pxa_camera.txt | 49 linux/arch/arm/mach-pxa/pcm990-baseboard.c | 60 + linux/drivers/media/video/Makefile |9 linux/drivers/media/video/mt9m001.c | 120 +- linux/drivers/media/video/mt9m111.c | 97 linux/drivers/media/video/mt9t031.c | 177 +++ linux/drivers/media/video/mt9v022.c | 166 +++--- linux/drivers/media/video/mx1_camera.c | 50 +--- linux/drivers/media/video/mx3_camera.c | 44 +-- linux/drivers/media/video/pxa_camera.c | 120 -- linux/drivers/media/video/sh_mobile_ceu_camera.c | 29 +- linux/drivers/media/video/soc_camera.c | 37 --- linux/include/media/soc_camera.h |5 13 files changed, 500 insertions(+), 463 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/910fecb1d521edbfa4c40b2524ac8ba7ff80e548 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
The patch number 11036 was added via Mauro Carvalho Chehab mche...@redhat.com to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/arch/arm/mach-pxa/pcm990-baseboard.c | 53 +++ linux/drivers/media/video/Kconfig| 14 linux/drivers/media/video/mt9m001.c | 170 linux/drivers/media/video/mt9m111.c | 68 +++- linux/drivers/media/video/mt9t031.c | 96 -- linux/drivers/media/video/mt9v022.c | 211 ++- linux/drivers/media/video/mx3_camera.c | 177 +++- linux/drivers/media/video/ov772x.c | 37 ++ linux/drivers/media/video/pxa_camera.c | 69 +++- linux/drivers/media/video/sh_mobile_ceu_camera.c | 35 +- linux/drivers/media/video/soc_camera.c | 141 ++ linux/drivers/media/video/soc_camera_platform.c |9 linux/drivers/media/video/tw9910.c | 45 ++- linux/include/media/soc_camera.h | 16 - 14 files changed, 642 insertions(+), 499 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/21128a66493ca5cef0a6cd56d67f7b199c8af216 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
The patch number 10677 was added via Mauro Carvalho Chehab mche...@redhat.com to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: Linux Media Mailing List linux-me...@vger.kernel.org -- From: Mauro Carvalho Chehab mche...@redhat.com merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb Priority: normal Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/arch/arm/plat-mxc/include/mach/mx3_camera.h | 52 linux/arch/sh/boards/board-ap325rxa.c | 526 ++ linux/arch/sh/boards/mach-migor/setup.c | 579 ++ linux/drivers/media/video/Kconfig |7 linux/drivers/media/video/Makefile|5 linux/drivers/media/video/mt9m001.c |2 linux/drivers/media/video/mt9m111.c |8 linux/drivers/media/video/mt9t031.c | 139 + linux/drivers/media/video/mt9v022.c |2 linux/drivers/media/video/mx3_camera.c| 1183 ++ linux/drivers/media/video/ov772x.c| 293 ++- linux/drivers/media/video/pxa_camera.c| 31 linux/drivers/media/video/sh_mobile_ceu_camera.c | 62 linux/drivers/media/video/tw9910.c|4 linux/include/media/ov772x.h |5 linux/include/media/sh_mobile_ceu.h |5 linux/include/media/soc_camera.h | 10 17 files changed, 2709 insertions(+), 204 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/818c8b74e975a817d1199d25a140a8810bfa2ebe ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
The patch number 10100 was added via Mauro Carvalho Chehab mche...@redhat.com to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: v4l-dvb-maintai...@linuxtv.org -- From: Mauro Carvalho Chehab mche...@redhat.com merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb Signed-off-by: Mauro Carvalho Chehab mche...@redhat.com --- linux/drivers/media/video/Kconfig| 16 linux/drivers/media/video/Makefile |2 linux/drivers/media/video/mt9m001.c | 48 linux/drivers/media/video/mt9m111.c | 111 + linux/drivers/media/video/mt9t031.c | 736 +++ linux/drivers/media/video/mt9v022.c | 32 linux/drivers/media/video/ov772x.c | 147 +- linux/drivers/media/video/pxa_camera.c | 350 - linux/drivers/media/video/sh_mobile_ceu_camera.c | 333 - linux/drivers/media/video/soc_camera.c | 262 ++-- linux/drivers/media/video/soc_camera_platform.c |7 linux/drivers/media/video/tw9910.c | 951 +++ linux/include/asm-arm/arch-pxa/pxa-regs.h| 95 - linux/include/linux/videodev2.h |2 linux/include/media/soc_camera.h | 71 - linux/include/media/tw9910.h | 39 linux/include/media/v4l2-chip-ident.h|8 17 files changed, 2745 insertions(+), 465 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/a847ac651a036a221e90e2467d5cfac8c7bcbd20 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
The patch number 9792 was added via Mauro Carvalho Chehab [EMAIL PROTECTED] to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: [EMAIL PROTECTED] -- From: Mauro Carvalho Chehab [EMAIL PROTECTED] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED] --- linux/drivers/media/video/mt9m001.c | 14 linux/drivers/media/video/mt9m111.c | 12 linux/drivers/media/video/mt9v022.c | 14 linux/drivers/media/video/ov772x.c | 97 +++--- linux/drivers/media/video/pxa_camera.c | 211 +-- linux/drivers/media/video/sh_mobile_ceu_camera.c | 60 +++- linux/drivers/media/video/soc_camera.c | 178 linux/drivers/media/video/soc_camera_platform.c | 20 - linux/include/media/soc_camera.h | 42 ++ 9 files changed, 460 insertions(+), 188 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/60b13219f5ac175557b37ff60d587375210a688c ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
The patch number 9489 was added via Mauro Carvalho Chehab [EMAIL PROTECTED] to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: [EMAIL PROTECTED] -- From: Mauro Carvalho Chehab [EMAIL PROTECTED] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb Priority: normal Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED] --- linux/drivers/media/video/Kconfig |6 linux/drivers/media/video/Makefile|1 linux/drivers/media/video/ov772x.c| 966 ++ linux/include/media/ov772x.h | 21 linux/include/media/v4l2-chip-ident.h |1 5 files changed, 995 insertions(+) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/010b54353ab48bfa66d223b2d07d6b17dbcd99b7 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
The patch number 9246 was added via Mauro Carvalho Chehab [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Mauro Carvalho Chehab [EMAIL PROTECTED]
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
Priority: normal
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/drivers/media/video/sh_mobile_ceu_camera.c | 96 +--
linux/drivers/media/video/soc_camera_platform.c | 20 +--
linux/include/media/soc_camera_platform.h| 11 +
3 files changed, 83 insertions(+), 44 deletions(-)
diff -r 62801afa4887 -r 55ada4147e73
linux/drivers/media/video/sh_mobile_ceu_camera.c
--- a/linux/drivers/media/video/sh_mobile_ceu_camera.c Wed Oct 15 17:47:36
2008 +
+++ b/linux/drivers/media/video/sh_mobile_ceu_camera.c Fri Oct 17 09:24:24
2008 -0300
@@ -40,39 +40,39 @@
/* register offsets for sh7722 / sh7723 */
-#define CAPSR 0x00
-#define CAPCR 0x04
-#define CAMCR 0x08
-#define CMCYR 0x0c
-#define CAMOR 0x10
-#define CAPWR 0x14
-#define CAIFR 0x18
-#define CSTCR 0x20 /* not on sh7723 */
-#define CSECR 0x24 /* not on sh7723 */
-#define CRCNTR 0x28
-#define CRCMPR 0x2c
-#define CFLCR 0x30
-#define CFSZR 0x34
-#define CDWDR 0x38
-#define CDAYR 0x3c
-#define CDACR 0x40
-#define CDBYR 0x44
-#define CDBCR 0x48
-#define CBDSR 0x4c
-#define CFWCR 0x5c
-#define CLFCR 0x60
-#define CDOCR 0x64
-#define CDDCR 0x68
-#define CDDAR 0x6c
-#define CEIER 0x70
-#define CETCR 0x74
-#define CSTSR 0x7c
-#define CSRTR 0x80
-#define CDSSR 0x84
-#define CDAYR2 0x90
-#define CDACR2 0x94
-#define CDBYR2 0x98
-#define CDBCR2 0x9c
+#define CAPSR 0x00 /* Capture start register */
+#define CAPCR 0x04 /* Capture control register */
+#define CAMCR 0x08 /* Capture interface control register */
+#define CMCYR 0x0c /* Capture interface cycle register */
+#define CAMOR 0x10 /* Capture interface offset register */
+#define CAPWR 0x14 /* Capture interface width register */
+#define CAIFR 0x18 /* Capture interface input format register */
+#define CSTCR 0x20 /* Camera strobe control register (= sh7722) */
+#define CSECR 0x24 /* Camera strobe emission count register (= sh7722) */
+#define CRCNTR 0x28 /* CEU register control register */
+#define CRCMPR 0x2c /* CEU register forcible control register */
+#define CFLCR 0x30 /* Capture filter control register */
+#define CFSZR 0x34 /* Capture filter size clip register */
+#define CDWDR 0x38 /* Capture destination width register */
+#define CDAYR 0x3c /* Capture data address Y register */
+#define CDACR 0x40 /* Capture data address C register */
+#define CDBYR 0x44 /* Capture data bottom-field address Y register */
+#define CDBCR 0x48 /* Capture data bottom-field address C register */
+#define CBDSR 0x4c /* Capture bundle destination size register */
+#define CFWCR 0x5c /* Firewall operation control register */
+#define CLFCR 0x60 /* Capture low-pass filter control register */
+#define CDOCR 0x64 /* Capture data output control register */
+#define CDDCR 0x68 /* Capture data complexity level register */
+#define CDDAR 0x6c /* Capture data complexity level address register */
+#define CEIER 0x70 /* Capture event interrupt enable register */
+#define CETCR 0x74 /* Capture event flag clear register */
+#define CSTSR 0x7c /* Capture status register */
+#define CSRTR 0x80 /* Capture software reset register */
+#define CDSSR 0x84 /* Capture data size register */
+#define CDAYR2 0x90 /* Capture data address Y register 2 */
+#define CDACR2 0x94 /* Capture data address C register 2 */
+#define CDBYR2 0x98 /* Capture data bottom-field address Y register 2 */
+#define CDBCR2 0x9c /* Capture data bottom-field address C register 2 */
static DEFINE_MUTEX(camera_lock);
@@ -165,6 +165,7 @@ static void sh_mobile_ceu_capture(struct
ceu_write(pcdev, CETCR, 0x0317f313 ^ 0x10);
if (pcdev-active) {
+ pcdev-active-state = VIDEOBUF_ACTIVE;
ceu_write(pcdev, CDAYR, videobuf_to_dma_contig(pcdev-active));
ceu_write(pcdev, CAPSR, 0x1); /* start capture */
}
@@ -236,7 +237,7 @@ static void sh_mobile_ceu_videobuf_queue
dev_dbg(icd-dev, %s (vb=0x%p) 0x%08lx %zd\n, __func__,
vb, vb-baddr, vb-bsize);
- vb-state = VIDEOBUF_ACTIVE;
+ vb-state = VIDEOBUF_QUEUED;
spin_lock_irqsave(pcdev-lock, flags);
list_add_tail(vb-queue, pcdev-capture);
@@ -323,12 +324,24 @@ static void sh_mobile_ceu_remove_device(
{
struct soc_camera_host *ici = to_soc_camera_host(icd-dev.parent);
struct sh_mobile_ceu_dev *pcdev = ici-priv;
+ unsigned long flags;
BUG_ON(icd != pcdev-icd);
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
The patch number 8802 was added via Mauro Carvalho Chehab [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Mauro Carvalho Chehab [EMAIL PROTECTED]
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/drivers/media/video/Kconfig |2 +-
linux/drivers/media/video/mt9m111.c |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff -r e2196aab3e6a -r c7d8eeb5f548 linux/drivers/media/video/Kconfig
--- a/linux/drivers/media/video/Kconfig Fri Aug 29 20:16:31 2008 +0200
+++ b/linux/drivers/media/video/Kconfig Fri Aug 29 18:40:09 2008 -0300
@@ -822,7 +822,7 @@ config VIDEO_PXA27x
config VIDEO_SH_MOBILE_CEU
tristate SuperH Mobile CEU Interface driver
- depends on VIDEO_DEV SOC_CAMERA
+ depends on VIDEO_DEV SOC_CAMERA HAS_DMA
select VIDEOBUF_DMA_CONTIG
---help---
This is a v4l2 driver for the SuperH Mobile CEU Interface
diff -r e2196aab3e6a -r c7d8eeb5f548 linux/drivers/media/video/mt9m111.c
--- a/linux/drivers/media/video/mt9m111.c Fri Aug 29 20:16:31 2008 +0200
+++ b/linux/drivers/media/video/mt9m111.c Fri Aug 29 18:40:09 2008 -0300
@@ -755,7 +755,7 @@ static int mt9m111_set_control(struct so
return ret;
}
-int mt9m111_restore_state(struct soc_camera_device *icd)
+static int mt9m111_restore_state(struct soc_camera_device *icd)
{
struct mt9m111 *mt9m111 = container_of(icd, struct mt9m111, icd);
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/c7d8eeb5f5489349dc81a9923a002135e4cf271b
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
The patch number 8688 was added via Mauro Carvalho Chehab [EMAIL PROTECTED] to http://linuxtv.org/hg/v4l-dvb master development tree. Kernel patches in this development tree may be modified to be backward compatible with older kernels. Compatibility modifications will be removed before inclusion into the mainstream Kernel If anyone has any objections, please let us know by sending a message to: [EMAIL PROTECTED] -- From: Mauro Carvalho Chehab [EMAIL PROTECTED] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED] --- linux/drivers/media/video/Kconfig|6 linux/drivers/media/video/Makefile |1 linux/drivers/media/video/mt9m001.c | 61 linux/drivers/media/video/mt9m111.c | 973 +++ linux/drivers/media/video/mt9v022.c | 52 linux/drivers/media/video/pxa_camera.c | 24 linux/drivers/media/video/sh_mobile_ceu_camera.c |5 linux/include/asm-arm/arch-pxa/camera.h |2 linux/include/media/sh_mobile_ceu.h |2 linux/include/media/soc_camera.h |3 linux/include/media/v4l2-chip-ident.h|1 11 files changed, 1065 insertions(+), 65 deletions(-) diff discarded since it is too big --- Patch is available at: http://linuxtv.org/hg/v4l-dvb/rev/7ca73655dadb01aa791f71dde7e08a932cda4278 ___ linuxtv-commits mailing list linuxtv-commits@linuxtv.org http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
The patch number 8426 was added via Mauro Carvalho Chehab [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Mauro Carvalho Chehab [EMAIL PROTECTED]
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/drivers/media/video/sh_mobile_ceu_camera.c |1 +
linux/drivers/media/video/videobuf-dma-contig.c |8
2 files changed, 5 insertions(+), 4 deletions(-)
diff -r dbf11a308e97 -r 57fdbaeec956
linux/drivers/media/video/sh_mobile_ceu_camera.c
--- a/linux/drivers/media/video/sh_mobile_ceu_camera.c Sun Jul 20 08:31:29
2008 -0300
+++ b/linux/drivers/media/video/sh_mobile_ceu_camera.c Sun Jul 20 08:33:59
2008 -0300
@@ -91,6 +91,7 @@ struct sh_mobile_ceu_dev {
void __iomem *base;
unsigned long video_limit;
+ /* lock used to protect videobuf */
spinlock_t lock;
struct list_head capture;
struct videobuf_buffer *active;
diff -r dbf11a308e97 -r 57fdbaeec956
linux/drivers/media/video/videobuf-dma-contig.c
--- a/linux/drivers/media/video/videobuf-dma-contig.c Sun Jul 20 08:31:29
2008 -0300
+++ b/linux/drivers/media/video/videobuf-dma-contig.c Sun Jul 20 08:33:59
2008 -0300
@@ -29,10 +29,10 @@ struct videobuf_dma_contig_memory {
};
#define MAGIC_DC_MEM 0x0733ac61
-#define MAGIC_CHECK(is, should)
\
- if (unlikely((is) != (should))) { \
- pr_err(magic mismatch: %x expected %x\n, is, should); \
- BUG(); \
+#define MAGIC_CHECK(is, should)
\
+ if (unlikely((is) != (should))) { \
+ pr_err(magic mismatch: %x expected %x\n, (is), (should)); \
+ BUG(); \
}
static void
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/57fdbaeec956cedb940fbd785e324969225507f1
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
[linuxtv-commits] [hg:v4l-dvb] merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
The patch number 7860 was added via Mauro Carvalho Chehab [EMAIL PROTECTED]
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
--
From: Mauro Carvalho Chehab [EMAIL PROTECTED]
merge: http://linuxtv.org/hg/~gliakhovetski/v4l-dvb
Signed-off-by: Mauro Carvalho Chehab [EMAIL PROTECTED]
---
linux/drivers/media/video/mt9m001.c |5 +
linux/drivers/media/video/mt9v022.c |7 ++-
2 files changed, 3 insertions(+), 9 deletions(-)
diff -r 74620b840e12 -r 0a072dd11cd8 linux/drivers/media/video/mt9m001.c
--- a/linux/drivers/media/video/mt9m001.c Mon Apr 28 15:39:09 2008 +
+++ b/linux/drivers/media/video/mt9m001.c Wed May 07 15:42:54 2008 -0300
@@ -12,14 +12,11 @@
#include linux/slab.h
#include linux/i2c.h
#include linux/log2.h
+#include linux/gpio.h
#include media/v4l2-common.h
#include media/v4l2-chip-ident.h
#include media/soc_camera.h
-
-#ifdef CONFIG_MT9M001_PCA9536_SWITCH
-#include asm/gpio.h
-#endif
/* mt9m001 i2c address 0x5d
* The platform has to define i2c_board_info
diff -r 74620b840e12 -r 0a072dd11cd8 linux/drivers/media/video/mt9v022.c
--- a/linux/drivers/media/video/mt9v022.c Mon Apr 28 15:39:09 2008 +
+++ b/linux/drivers/media/video/mt9v022.c Wed May 07 15:42:54 2008 -0300
@@ -13,14 +13,11 @@
#include linux/i2c.h
#include linux/delay.h
#include linux/log2.h
+#include linux/gpio.h
#include media/v4l2-common.h
#include media/v4l2-chip-ident.h
#include media/soc_camera.h
-
-#ifdef CONFIG_MT9M001_PCA9536_SWITCH
-#include asm/gpio.h
-#endif
/* mt9v022 i2c address 0x48, 0x4c, 0x58, 0x5c
* The platform has to define i2c_board_info
@@ -91,7 +88,7 @@ struct mt9v022 {
struct mt9v022 {
struct i2c_client *client;
struct soc_camera_device icd;
- int model; /* V4L2_IDENT_MT9M001* codes from v4l2-chip-ident.h */
+ int model; /* V4L2_IDENT_MT9V022* codes from v4l2-chip-ident.h */
int switch_gpio;
u16 chip_control;
unsigned char datawidth;
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/0a072dd11cd82af302e061fb40494285d8534915
___
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
