aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-kernel/linux/linux-omap-psp-2.6.32/cam/0072-omap3beagle-camera-Fix-dual-sensor-registration.patch
blob: 409c08fb35c26193e8d7b7213bf004a097a16321 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
From 838aed68f8efa16e9915795ddb968157d40fca6b Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 22 Jul 2010 11:03:33 -0500
Subject: [PATCH 72/75] omap3beagle: camera: Fix dual sensor registration

dev_index should be different, which represents an internal index
in the master camera driver.

Also, make device video nodes be alloted with the "first free", by setting
dev_minor to -1.

Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
 arch/arm/mach-omap2/board-omap3beagle-camera.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-omap2/board-omap3beagle-camera.c b/arch/arm/mach-omap2/board-omap3beagle-camera.c
index 520e1d8..c0218e3 100644
--- a/arch/arm/mach-omap2/board-omap3beagle-camera.c
+++ b/arch/arm/mach-omap2/board-omap3beagle-camera.c
@@ -107,7 +107,7 @@ static int mt9v113_ifparm(struct v4l2_ifparm *p)
 
 static struct omap34xxcam_hw_config mt9v113_hwc = {
 	.dev_index		= 0,
-	.dev_minor		= 0,
+	.dev_minor		= -1,
 	.dev_type		= OMAP34XXCAM_SLAVE_SENSOR,
 	.u.sensor.sensor_isp	= 1,
 	.u.sensor.capture_mem	= MT9V113_MAX_FRAME_SIZE * 2,
@@ -259,8 +259,8 @@ static int mt9t112_ifparm(struct v4l2_ifparm *p)
 
 #if defined(CONFIG_VIDEO_OMAP3) || defined(CONFIG_VIDEO_OMAP3_MODULE)
 static struct omap34xxcam_hw_config mt9t112_hwc = {
-	.dev_index		= 0,
-	.dev_minor		= 0,
+	.dev_index		= 1,
+	.dev_minor		= -1,
 	.dev_type		= OMAP34XXCAM_SLAVE_SENSOR,
 	.u.sensor.sensor_isp	= 0,
 	.u.sensor.capture_mem	= MT9T112_BIGGEST_FRAME_BYTE_SIZE,
-- 
1.6.6.1