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
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
|
From f7b09cb5f7037445ccd5b3b0062d5d6f56164b58 Mon Sep 17 00:00:00 2001
From: Sergio Aguirre <saaguirre@ti.com>
Date: Thu, 15 Jul 2010 15:47:23 -0500
Subject: [PATCH 55/71] omap3beagle: camera: Change MT9T111 references to new MT9T112 driver
Signed-off-by: Sergio Aguirre <saaguirre@ti.com>
---
arch/arm/mach-omap2/board-omap3beagle-camera.c | 52 ++++++++++++------------
arch/arm/mach-omap2/board-omap3beagle.c | 12 +++---
2 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/arch/arm/mach-omap2/board-omap3beagle-camera.c b/arch/arm/mach-omap2/board-omap3beagle-camera.c
index 2e49158..0b4dff7 100644
--- a/arch/arm/mach-omap2/board-omap3beagle-camera.c
+++ b/arch/arm/mach-omap2/board-omap3beagle-camera.c
@@ -203,29 +203,29 @@ struct mt9v113_platform_data mt9v113_pdata = {
#endif /* #ifdef CONFIG_VIDEO_MT9V113 */
-#if defined(CONFIG_VIDEO_MT9T111) || defined(CONFIG_VIDEO_MT9T111_MODULE)
-#include <media/mt9t111.h>
+#if defined(CONFIG_VIDEO_MT9T112) || defined(CONFIG_VIDEO_MT9T112_MODULE)
+#include <media/mt9t112.h>
-#define ISP_MT9T111_MCLK 216000000
+#define ISP_MT9T112_MCLK 216000000
/* Arbitrary memory handling limit */
-#define MT9T111_BIGGEST_FRAME_BYTE_SIZE PAGE_ALIGN((2048 * 2) * 1536 * 4)
+#define MT9T112_BIGGEST_FRAME_BYTE_SIZE PAGE_ALIGN((2048 * 2) * 1536 * 4)
-static struct isp_interface_config mt9t111_if_config = {
+static struct isp_interface_config mt9t112_if_config = {
.ccdc_par_ser = ISP_PARLL,
.dataline_shift = 0x2,
.hsvs_syncdetect = ISPCTRL_SYNC_DETECT_VSRISE,
.strobe = 0x0,
.prestrobe = 0x0,
.shutter = 0x0,
- .cam_mclk = ISP_MT9T111_MCLK,
+ .cam_mclk = ISP_MT9T112_MCLK,
.wenlog = ISPCCDC_CFG_WENLOG_AND,
.wait_hs_vs = 2,
.u.par.par_bridge = 0x3,
.u.par.par_clk_pol = 0x0,
};
-static struct v4l2_ifparm mt9t111_ifparm_s = {
+static struct v4l2_ifparm mt9t112_ifparm_s = {
.if_type = V4L2_IF_TYPE_RAW,
.u = {
.raw = {
@@ -235,47 +235,47 @@ static struct v4l2_ifparm mt9t111_ifparm_s = {
.latch_clk_inv = 0,
.nobt_hs_inv = 0, /* active high */
.nobt_vs_inv = 0, /* active high */
- .clock_min = MT9T111_CLK_MIN,
- .clock_max = MT9T111_CLK_MAX,
+ .clock_min = MT9T112_CLK_MIN,
+ .clock_max = MT9T112_CLK_MAX,
},
},
};
/**
- * @brief mt9t111_ifparm - Returns the mt9t111 interface parameters
+ * @brief mt9t112_ifparm - Returns the mt9t112 interface parameters
*
* @param p - pointer to v4l2_ifparm structure
*
* @return result of operation - 0 is success
*/
-static int mt9t111_ifparm(struct v4l2_ifparm *p)
+static int mt9t112_ifparm(struct v4l2_ifparm *p)
{
if (p == NULL)
return -EINVAL;
- *p = mt9t111_ifparm_s;
+ *p = mt9t112_ifparm_s;
return 0;
}
#if defined(CONFIG_VIDEO_OMAP3) || defined(CONFIG_VIDEO_OMAP3_MODULE)
-static struct omap34xxcam_hw_config mt9t111_hwc = {
+static struct omap34xxcam_hw_config mt9t112_hwc = {
.dev_index = 0,
.dev_minor = 0,
.dev_type = OMAP34XXCAM_SLAVE_SENSOR,
.u.sensor.sensor_isp = 0,
- .u.sensor.capture_mem = MT9T111_BIGGEST_FRAME_BYTE_SIZE,
+ .u.sensor.capture_mem = MT9T112_BIGGEST_FRAME_BYTE_SIZE,
.u.sensor.ival_default = { 1, 10 },
};
#endif
/**
- * @brief mt9t111_set_prv_data - Returns mt9t111 omap34xx driver private data
+ * @brief mt9t112_set_prv_data - Returns mt9t112 omap34xx driver private data
*
* @param priv - pointer to omap34xxcam_hw_config structure
*
* @return result of operation - 0 is success
*/
-static int mt9t111_set_prv_data(void *priv)
+static int mt9t112_set_prv_data(void *priv)
{
#if defined(CONFIG_VIDEO_OMAP3) || defined(CONFIG_VIDEO_OMAP3_MODULE)
struct omap34xxcam_hw_config *hwc = priv;
@@ -283,7 +283,7 @@ static int mt9t111_set_prv_data(void *priv)
if (priv == NULL)
return -EINVAL;
- *hwc = mt9t111_hwc;
+ *hwc = mt9t112_hwc;
return 0;
#else
return -EINVAL;
@@ -291,13 +291,13 @@ static int mt9t111_set_prv_data(void *priv)
}
/**
- * @brief mt9t111_power_set - Power-on or power-off TVP5146 device
+ * @brief mt9t112_power_set - Power-on or power-off TVP5146 device
*
* @param power - enum, Power on/off, resume/standby
*
* @return result of operation - 0 is success
*/
-static int mt9t111_power_set(struct v4l2_int_device *s, enum v4l2_power power)
+static int mt9t112_power_set(struct v4l2_int_device *s, enum v4l2_power power)
{
struct omap34xxcam_videodev *vdev = s->u.slave->master->priv;
@@ -314,7 +314,7 @@ static int mt9t111_power_set(struct v4l2_int_device *s, enum v4l2_power power)
case V4L2_POWER_ON:
#if defined(CONFIG_VIDEO_OMAP3) || defined(CONFIG_VIDEO_OMAP3_MODULE)
- isp_configure_interface(vdev->cam->isp, &mt9t111_if_config);
+ isp_configure_interface(vdev->cam->isp, &mt9t112_if_config);
#endif
/* Set RESET_BAR to 0 */
@@ -331,7 +331,7 @@ static int mt9t111_power_set(struct v4l2_int_device *s, enum v4l2_power power)
mdelay(50);
/* Enable EXTCLK */
- isp_set_xclk(vdev->cam->isp, MT9T111_CLK_MIN, CAM_USE_XCLKA);
+ isp_set_xclk(vdev->cam->isp, MT9T112_CLK_MIN, CAM_USE_XCLKA);
/*
* Wait at least 70 CLK cycles (w/EXTCLK = 6MHz, or CLK_MIN):
@@ -359,14 +359,14 @@ static int mt9t111_power_set(struct v4l2_int_device *s, enum v4l2_power power)
return 0;
}
-struct mt9t111_platform_data mt9t111_pdata = {
+struct mt9t112_platform_data mt9t112_pdata = {
.master = "omap34xxcam",
- .power_set = mt9t111_power_set,
- .priv_data_set = mt9t111_set_prv_data,
- .ifparm = mt9t111_ifparm,
+ .power_set = mt9t112_power_set,
+ .priv_data_set = mt9t112_set_prv_data,
+ .ifparm = mt9t112_ifparm,
};
-#endif /* #ifdef CONFIG_VIDEO_MT9T111 */
+#endif /* #ifdef CONFIG_VIDEO_MT9T112 */
static int beagle_cam_probe(struct platform_device *pdev)
{
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 0e7e8b2..7c9e40a 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -77,10 +77,10 @@ static struct omap_opp * _omap37x_l3_rate_table = NULL;
extern struct mt9v113_platform_data mt9v113_pdata;
#endif
-#if defined(CONFIG_VIDEO_MT9T111) || defined(CONFIG_VIDEO_MT9T111_MODULE)
+#if defined(CONFIG_VIDEO_MT9T112) || defined(CONFIG_VIDEO_MT9T112_MODULE)
#include <media/v4l2-int-device.h>
-#include <media/mt9t111.h>
-extern struct mt9t111_platform_data mt9t111_pdata;
+#include <media/mt9t112.h>
+extern struct mt9t112_platform_data mt9t112_pdata;
#endif
#define GPMC_CS0_BASE 0x60
@@ -602,10 +602,10 @@ static struct i2c_board_info __initdata beagle_i2c2_boardinfo[] = {
.platform_data = &mt9v113_pdata,
},
#endif
-#if defined(CONFIG_VIDEO_MT9T111) || defined(CONFIG_VIDEO_MT9T111_MODULE)
+#if defined(CONFIG_VIDEO_MT9T112) || defined(CONFIG_VIDEO_MT9T112_MODULE)
{
- I2C_BOARD_INFO("mt9t111", MT9T111_I2C_ADDR),
- .platform_data = &mt9t111_pdata,
+ I2C_BOARD_INFO("mt9t112", MT9T112_I2C_ADDR),
+ .platform_data = &mt9t112_pdata,
},
#endif
};
--
1.6.6.1
|
