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
|
From 26540d896b8fed3869f426de37c01fa2a913e09d Mon Sep 17 00:00:00 2001
From: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
Date: Tue, 12 Feb 2019 17:45:59 +0300
Subject: [PATCH 101/122] lvds: AR323: fix reset gpio nadling
This fixes gpio reset handling on AR0323 imager
GPIO0 - NRESET
GPIO1 - FSIN
kernel parameter requred: ti9x4.gpio0=1
Signed-off-by: Vladimir Barinov <vladimir.barinov@cogentembedded.com>
---
drivers/media/i2c/soc_camera/ar0323.c | 45 ++++++++++++++++++++--------------
drivers/media/i2c/soc_camera/ov106xx.c | 12 ++++-----
2 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/drivers/media/i2c/soc_camera/ar0323.c b/drivers/media/i2c/soc_camera/ar0323.c
index 467367b..d29f4ad 100644
--- a/drivers/media/i2c/soc_camera/ar0323.c
+++ b/drivers/media/i2c/soc_camera/ar0323.c
@@ -22,9 +22,10 @@
#include "ar0323.h"
-#define AR0323_I2C_ADDR 0x10
+static const int ar0323_i2c_addr[] = {0x10, 0x20};
#define AR0323_PID 0x3000
+#define AR0323_REV 0x300E
#define AR0323_VERSION_REG 0x0D56
#define AR0323_MEDIA_BUS_FMT MEDIA_BUS_FMT_SGRBG12_1X12
@@ -356,19 +357,32 @@ static int ar0323_initialize(struct i2c_client *client)
{
struct ar0323_priv *priv = to_ar0323(client);
u16 val = 0;
- u16 pid = 0;
+ u16 pid = 0, rev = 0;
int ret = 0;
-// int tmp_addr;
+ int tmp_addr;
+ int i;
+
+ for (i = 0; i < ARRAY_SIZE(ar0323_i2c_addr); i++) {
+ tmp_addr = client->addr;
+ if (priv->ti9x4_addr) {
+ client->addr = priv->ti9x4_addr;/* Deserializer I2C address */
+ reg8_write(client, 0x5d, ar0323_i2c_addr[i] << 1); /* Sensor native I2C address */
+ usleep_range(2000, 2500); /* wait 2ms */
+ }
+ client->addr = tmp_addr;
+
+ /* check model ID */
+ reg16_read16(client, AR0323_PID, &pid);
- /* check and show model ID */
- reg16_read16(client, AR0323_PID, &pid);
+ if (pid == AR0323_VERSION_REG)
+ break;
+ }
if (pid != AR0323_VERSION_REG) {
- dev_dbg(&client->dev, "Product ID error %x\n\n\n\n", pid);
+ dev_dbg(&client->dev, "Product ID error %x\n", pid);
ret = -ENODEV;
goto err;
}
-
#if 0
/* setup XCLK */
tmp_addr = client->addr;
@@ -381,7 +395,10 @@ static int ar0323_initialize(struct i2c_client *client)
}
client->addr = tmp_addr;
#endif
-
+ /* check revision */
+ reg16_read16(client, AR0323_REV, &rev);
+ /* Read OTP IDs */
+ ar0323_otp_id_read(client);
/* Program wizard registers */
ar0323_set_regs(client, ar0323_regs_wizard, ARRAY_SIZE(ar0323_regs_wizard));
@@ -390,11 +407,8 @@ static int ar0323_initialize(struct i2c_client *client)
val |= (1 << 2); // Set streamOn bit
reg16_write16(client, 0x301a, val); // Start Streaming
- /* Read OTP IDs */
- ar0323_otp_id_read(client);
-
- dev_info(&client->dev, "ar0323 PID %x, res %dx%d, OTP_ID %02x:%02x:%02x:%02x:%02x:%02x\n",
- pid, AR0323_MAX_WIDTH, AR0323_MAX_HEIGHT, priv->id[0], priv->id[1], priv->id[2], priv->id[3], priv->id[4], priv->id[5]);
+ dev_info(&client->dev, "ar0323 PID %x (rev %x), res %dx%d, OTP_ID %02x:%02x:%02x:%02x:%02x:%02x\n",
+ pid, rev, AR0323_MAX_WIDTH, AR0323_MAX_HEIGHT, priv->id[0], priv->id[1], priv->id[2], priv->id[3], priv->id[4], priv->id[5]);
err:
return ret;
}
@@ -437,14 +451,9 @@ static int ar0323_parse_dt(struct device_node *np, struct ar0323_priv *priv)
reg8_write(client, 0x4c, (priv->port << 4) | (1 << priv->port)); /* Select RX port number */
usleep_range(2000, 2500); /* wait 2ms */
reg8_write(client, 0x65, tmp_addr << 1); /* Sensor translated I2C address */
- reg8_write(client, 0x5d, AR0323_I2C_ADDR << 1); /* Sensor native I2C address */
-
-// reg8_write(client, 0x6e, 0xa9); /* GPIO0 - reset, GPIO1 - fsin ??????? */
}
client->addr = tmp_addr;
- mdelay(10);
-
return 0;
}
diff --git a/drivers/media/i2c/soc_camera/ov106xx.c b/drivers/media/i2c/soc_camera/ov106xx.c
index d06c1f0..8962ab9 100644
--- a/drivers/media/i2c/soc_camera/ov106xx.c
+++ b/drivers/media/i2c/soc_camera/ov106xx.c
@@ -67,6 +67,12 @@ static int ov106xx_probe(struct i2c_client *client,
goto out;
}
+ ret = ar0323_probe(client, did);
+ if (!ret) {
+ chip_id = ID_AR0323;
+ goto out;
+ }
+
ret = ov10640_probe(client, did);
if (!ret) {
chip_id = ID_OV10640;
@@ -115,12 +121,6 @@ static int ov106xx_probe(struct i2c_client *client,
goto out;
}
- ret = ar0323_probe(client, did);
- if (!ret) {
- chip_id = ID_AR0323;
- goto out;
- }
-
ret = ap0101_probe(client, did);
if (!ret) {
chip_id = ID_AP0101_AR014X;
--
2.7.4
|
