diff options
author | Sakari Ailus <sakari.ailus@maxwell.research.nokia.com> | 2012-04-26 12:39:44 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-05-20 11:47:25 -0400 |
commit | 27b2e76dbca0b84cdae1b23c90fb353e63bb2fbb (patch) | |
tree | eb8361ecfc2eb0be2049ca4f0f14b1eeea947f3e /drivers/media | |
parent | 3de886e0e4e1a981442e26edca5a32777299b079 (diff) |
[media] smiapp: Allow generic quirk registers
Implement more generic quirk registers than just limit and capability
registers. This comes with the expense of a little bit more access time so
these should be only used when really needed.
Signed-off-by: Sakari Ailus <sakari.ailus@maxwell.research.nokia.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
-rw-r--r-- | drivers/media/video/smiapp/smiapp-quirk.c | 46 | ||||
-rw-r--r-- | drivers/media/video/smiapp/smiapp-quirk.h | 10 | ||||
-rw-r--r-- | drivers/media/video/smiapp/smiapp-regs.c | 4 |
3 files changed, 60 insertions, 0 deletions
diff --git a/drivers/media/video/smiapp/smiapp-quirk.c b/drivers/media/video/smiapp/smiapp-quirk.c index 81c2be3d47c..55e87950dce 100644 --- a/drivers/media/video/smiapp/smiapp-quirk.c +++ b/drivers/media/video/smiapp/smiapp-quirk.c | |||
@@ -81,6 +81,52 @@ int smiapp_replace_limit_at(struct smiapp_sensor *sensor, | |||
81 | return -EINVAL; | 81 | return -EINVAL; |
82 | } | 82 | } |
83 | 83 | ||
84 | bool smiapp_quirk_reg(struct smiapp_sensor *sensor, | ||
85 | u32 reg, u32 *val) | ||
86 | { | ||
87 | struct i2c_client *client = v4l2_get_subdevdata(&sensor->src->sd); | ||
88 | const struct smia_reg *sreg; | ||
89 | |||
90 | if (!sensor->minfo.quirk) | ||
91 | return false; | ||
92 | |||
93 | sreg = sensor->minfo.quirk->regs; | ||
94 | |||
95 | if (!sreg) | ||
96 | return false; | ||
97 | |||
98 | while (sreg->type) { | ||
99 | u16 type = reg >> 16; | ||
100 | u16 reg16 = reg; | ||
101 | |||
102 | if (sreg->type != type || sreg->reg != reg16) { | ||
103 | sreg++; | ||
104 | continue; | ||
105 | } | ||
106 | |||
107 | switch ((u8)type) { | ||
108 | case SMIA_REG_8BIT: | ||
109 | dev_dbg(&client->dev, "quirk: 0x%8.8x: 0x%2.2x\n", | ||
110 | reg, sreg->val); | ||
111 | break; | ||
112 | case SMIA_REG_16BIT: | ||
113 | dev_dbg(&client->dev, "quirk: 0x%8.8x: 0x%4.4x\n", | ||
114 | reg, sreg->val); | ||
115 | break; | ||
116 | case SMIA_REG_32BIT: | ||
117 | dev_dbg(&client->dev, "quirk: 0x%8.8x: 0x%8.8x\n", | ||
118 | reg, sreg->val); | ||
119 | break; | ||
120 | } | ||
121 | |||
122 | *val = sreg->val; | ||
123 | |||
124 | return true; | ||
125 | } | ||
126 | |||
127 | return false; | ||
128 | } | ||
129 | |||
84 | static int jt8ew9_limits(struct smiapp_sensor *sensor) | 130 | static int jt8ew9_limits(struct smiapp_sensor *sensor) |
85 | { | 131 | { |
86 | if (sensor->minfo.revision_number_major < 0x03) | 132 | if (sensor->minfo.revision_number_major < 0x03) |
diff --git a/drivers/media/video/smiapp/smiapp-quirk.h b/drivers/media/video/smiapp/smiapp-quirk.h index de82cdf43a8..f4dcaabaefe 100644 --- a/drivers/media/video/smiapp/smiapp-quirk.h +++ b/drivers/media/video/smiapp/smiapp-quirk.h | |||
@@ -41,6 +41,7 @@ struct smiapp_quirk { | |||
41 | int (*post_poweron)(struct smiapp_sensor *sensor); | 41 | int (*post_poweron)(struct smiapp_sensor *sensor); |
42 | int (*pre_streamon)(struct smiapp_sensor *sensor); | 42 | int (*pre_streamon)(struct smiapp_sensor *sensor); |
43 | int (*post_streamoff)(struct smiapp_sensor *sensor); | 43 | int (*post_streamoff)(struct smiapp_sensor *sensor); |
44 | const struct smia_reg *regs; | ||
44 | unsigned long flags; | 45 | unsigned long flags; |
45 | }; | 46 | }; |
46 | 47 | ||
@@ -55,6 +56,15 @@ struct smiapp_reg_8 { | |||
55 | 56 | ||
56 | void smiapp_replace_limit(struct smiapp_sensor *sensor, | 57 | void smiapp_replace_limit(struct smiapp_sensor *sensor, |
57 | u32 limit, u32 val); | 58 | u32 limit, u32 val); |
59 | bool smiapp_quirk_reg(struct smiapp_sensor *sensor, | ||
60 | u32 reg, u32 *val); | ||
61 | |||
62 | #define SMIAPP_MK_QUIRK_REG(_reg, _val) \ | ||
63 | { \ | ||
64 | .type = (_reg >> 16), \ | ||
65 | .reg = (u16)_reg, \ | ||
66 | .val = _val, \ | ||
67 | } | ||
58 | 68 | ||
59 | #define smiapp_call_quirk(_sensor, _quirk, ...) \ | 69 | #define smiapp_call_quirk(_sensor, _quirk, ...) \ |
60 | (_sensor->minfo.quirk && \ | 70 | (_sensor->minfo.quirk && \ |
diff --git a/drivers/media/video/smiapp/smiapp-regs.c b/drivers/media/video/smiapp/smiapp-regs.c index 9c430647b04..b1812b17a40 100644 --- a/drivers/media/video/smiapp/smiapp-regs.c +++ b/drivers/media/video/smiapp/smiapp-regs.c | |||
@@ -172,6 +172,9 @@ static int __smiapp_read(struct smiapp_sensor *sensor, u32 reg, u32 *val, | |||
172 | && len != SMIA_REG_32BIT) | 172 | && len != SMIA_REG_32BIT) |
173 | return -EINVAL; | 173 | return -EINVAL; |
174 | 174 | ||
175 | if (smiapp_quirk_reg(sensor, reg, val)) | ||
176 | goto found_quirk; | ||
177 | |||
175 | if (len == SMIA_REG_8BIT && !only8) | 178 | if (len == SMIA_REG_8BIT && !only8) |
176 | rval = ____smiapp_read(sensor, (u16)reg, len, val); | 179 | rval = ____smiapp_read(sensor, (u16)reg, len, val); |
177 | else | 180 | else |
@@ -179,6 +182,7 @@ static int __smiapp_read(struct smiapp_sensor *sensor, u32 reg, u32 *val, | |||
179 | if (rval < 0) | 182 | if (rval < 0) |
180 | return rval; | 183 | return rval; |
181 | 184 | ||
185 | found_quirk: | ||
182 | if (reg & SMIA_REG_FLAG_FLOAT) | 186 | if (reg & SMIA_REG_FLAG_FLOAT) |
183 | *val = float_to_u32_mul_1000000(client, *val); | 187 | *val = float_to_u32_mul_1000000(client, *val); |
184 | 188 | ||