Commit f6301b5d70513721bb301b1f1e46670bbbddf549

Authored by Antti Palosaari
Committed by Greg Kroah-Hartman
1 parent bcab62227f

media: tda10071: force modulation to QPSK on DVB-S

commit db4175ae2095634dbecd4c847da439f9c83e1b3b upstream.

Only supported modulation for DVB-S is QPSK. Modulation parameter
contains invalid value for DVB-S on some cases, which leads driver
refusing tuning attempt. Due to that, hard code modulation to QPSK
in case of DVB-S.

Signed-off-by: Antti Palosaari <crope@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Showing 1 changed file with 5 additions and 1 deletions Inline Diff

drivers/media/dvb-frontends/tda10071.c
1 /* 1 /*
2 * NXP TDA10071 + Conexant CX24118A DVB-S/S2 demodulator + tuner driver 2 * NXP TDA10071 + Conexant CX24118A DVB-S/S2 demodulator + tuner driver
3 * 3 *
4 * Copyright (C) 2011 Antti Palosaari <crope@iki.fi> 4 * Copyright (C) 2011 Antti Palosaari <crope@iki.fi>
5 * 5 *
6 * This program is free software; you can redistribute it and/or modify 6 * This program is free software; you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License as published by 7 * it under the terms of the GNU General Public License as published by
8 * the Free Software Foundation; either version 2 of the License, or 8 * the Free Software Foundation; either version 2 of the License, or
9 * (at your option) any later version. 9 * (at your option) any later version.
10 * 10 *
11 * This program is distributed in the hope that it will be useful, 11 * This program is distributed in the hope that it will be useful,
12 * but WITHOUT ANY WARRANTY; without even the implied warranty of 12 * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 13 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 * GNU General Public License for more details. 14 * GNU General Public License for more details.
15 * 15 *
16 * You should have received a copy of the GNU General Public License along 16 * You should have received a copy of the GNU General Public License along
17 * with this program; if not, write to the Free Software Foundation, Inc., 17 * with this program; if not, write to the Free Software Foundation, Inc.,
18 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 18 * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19 */ 19 */
20 20
21 #include "tda10071_priv.h" 21 #include "tda10071_priv.h"
22 22
23 /* Max transfer size done by I2C transfer functions */ 23 /* Max transfer size done by I2C transfer functions */
24 #define MAX_XFER_SIZE 64 24 #define MAX_XFER_SIZE 64
25 25
26 static struct dvb_frontend_ops tda10071_ops; 26 static struct dvb_frontend_ops tda10071_ops;
27 27
28 /* write multiple registers */ 28 /* write multiple registers */
29 static int tda10071_wr_regs(struct tda10071_priv *priv, u8 reg, u8 *val, 29 static int tda10071_wr_regs(struct tda10071_priv *priv, u8 reg, u8 *val,
30 int len) 30 int len)
31 { 31 {
32 int ret; 32 int ret;
33 u8 buf[MAX_XFER_SIZE]; 33 u8 buf[MAX_XFER_SIZE];
34 struct i2c_msg msg[1] = { 34 struct i2c_msg msg[1] = {
35 { 35 {
36 .addr = priv->cfg.demod_i2c_addr, 36 .addr = priv->cfg.demod_i2c_addr,
37 .flags = 0, 37 .flags = 0,
38 .len = 1 + len, 38 .len = 1 + len,
39 .buf = buf, 39 .buf = buf,
40 } 40 }
41 }; 41 };
42 42
43 if (1 + len > sizeof(buf)) { 43 if (1 + len > sizeof(buf)) {
44 dev_warn(&priv->i2c->dev, 44 dev_warn(&priv->i2c->dev,
45 "%s: i2c wr reg=%04x: len=%d is too big!\n", 45 "%s: i2c wr reg=%04x: len=%d is too big!\n",
46 KBUILD_MODNAME, reg, len); 46 KBUILD_MODNAME, reg, len);
47 return -EINVAL; 47 return -EINVAL;
48 } 48 }
49 49
50 buf[0] = reg; 50 buf[0] = reg;
51 memcpy(&buf[1], val, len); 51 memcpy(&buf[1], val, len);
52 52
53 ret = i2c_transfer(priv->i2c, msg, 1); 53 ret = i2c_transfer(priv->i2c, msg, 1);
54 if (ret == 1) { 54 if (ret == 1) {
55 ret = 0; 55 ret = 0;
56 } else { 56 } else {
57 dev_warn(&priv->i2c->dev, 57 dev_warn(&priv->i2c->dev,
58 "%s: i2c wr failed=%d reg=%02x len=%d\n", 58 "%s: i2c wr failed=%d reg=%02x len=%d\n",
59 KBUILD_MODNAME, ret, reg, len); 59 KBUILD_MODNAME, ret, reg, len);
60 ret = -EREMOTEIO; 60 ret = -EREMOTEIO;
61 } 61 }
62 return ret; 62 return ret;
63 } 63 }
64 64
65 /* read multiple registers */ 65 /* read multiple registers */
66 static int tda10071_rd_regs(struct tda10071_priv *priv, u8 reg, u8 *val, 66 static int tda10071_rd_regs(struct tda10071_priv *priv, u8 reg, u8 *val,
67 int len) 67 int len)
68 { 68 {
69 int ret; 69 int ret;
70 u8 buf[MAX_XFER_SIZE]; 70 u8 buf[MAX_XFER_SIZE];
71 struct i2c_msg msg[2] = { 71 struct i2c_msg msg[2] = {
72 { 72 {
73 .addr = priv->cfg.demod_i2c_addr, 73 .addr = priv->cfg.demod_i2c_addr,
74 .flags = 0, 74 .flags = 0,
75 .len = 1, 75 .len = 1,
76 .buf = &reg, 76 .buf = &reg,
77 }, { 77 }, {
78 .addr = priv->cfg.demod_i2c_addr, 78 .addr = priv->cfg.demod_i2c_addr,
79 .flags = I2C_M_RD, 79 .flags = I2C_M_RD,
80 .len = len, 80 .len = len,
81 .buf = buf, 81 .buf = buf,
82 } 82 }
83 }; 83 };
84 84
85 if (len > sizeof(buf)) { 85 if (len > sizeof(buf)) {
86 dev_warn(&priv->i2c->dev, 86 dev_warn(&priv->i2c->dev,
87 "%s: i2c wr reg=%04x: len=%d is too big!\n", 87 "%s: i2c wr reg=%04x: len=%d is too big!\n",
88 KBUILD_MODNAME, reg, len); 88 KBUILD_MODNAME, reg, len);
89 return -EINVAL; 89 return -EINVAL;
90 } 90 }
91 91
92 ret = i2c_transfer(priv->i2c, msg, 2); 92 ret = i2c_transfer(priv->i2c, msg, 2);
93 if (ret == 2) { 93 if (ret == 2) {
94 memcpy(val, buf, len); 94 memcpy(val, buf, len);
95 ret = 0; 95 ret = 0;
96 } else { 96 } else {
97 dev_warn(&priv->i2c->dev, 97 dev_warn(&priv->i2c->dev,
98 "%s: i2c rd failed=%d reg=%02x len=%d\n", 98 "%s: i2c rd failed=%d reg=%02x len=%d\n",
99 KBUILD_MODNAME, ret, reg, len); 99 KBUILD_MODNAME, ret, reg, len);
100 ret = -EREMOTEIO; 100 ret = -EREMOTEIO;
101 } 101 }
102 return ret; 102 return ret;
103 } 103 }
104 104
105 /* write single register */ 105 /* write single register */
106 static int tda10071_wr_reg(struct tda10071_priv *priv, u8 reg, u8 val) 106 static int tda10071_wr_reg(struct tda10071_priv *priv, u8 reg, u8 val)
107 { 107 {
108 return tda10071_wr_regs(priv, reg, &val, 1); 108 return tda10071_wr_regs(priv, reg, &val, 1);
109 } 109 }
110 110
111 /* read single register */ 111 /* read single register */
112 static int tda10071_rd_reg(struct tda10071_priv *priv, u8 reg, u8 *val) 112 static int tda10071_rd_reg(struct tda10071_priv *priv, u8 reg, u8 *val)
113 { 113 {
114 return tda10071_rd_regs(priv, reg, val, 1); 114 return tda10071_rd_regs(priv, reg, val, 1);
115 } 115 }
116 116
117 /* write single register with mask */ 117 /* write single register with mask */
118 static int tda10071_wr_reg_mask(struct tda10071_priv *priv, 118 static int tda10071_wr_reg_mask(struct tda10071_priv *priv,
119 u8 reg, u8 val, u8 mask) 119 u8 reg, u8 val, u8 mask)
120 { 120 {
121 int ret; 121 int ret;
122 u8 tmp; 122 u8 tmp;
123 123
124 /* no need for read if whole reg is written */ 124 /* no need for read if whole reg is written */
125 if (mask != 0xff) { 125 if (mask != 0xff) {
126 ret = tda10071_rd_regs(priv, reg, &tmp, 1); 126 ret = tda10071_rd_regs(priv, reg, &tmp, 1);
127 if (ret) 127 if (ret)
128 return ret; 128 return ret;
129 129
130 val &= mask; 130 val &= mask;
131 tmp &= ~mask; 131 tmp &= ~mask;
132 val |= tmp; 132 val |= tmp;
133 } 133 }
134 134
135 return tda10071_wr_regs(priv, reg, &val, 1); 135 return tda10071_wr_regs(priv, reg, &val, 1);
136 } 136 }
137 137
138 /* read single register with mask */ 138 /* read single register with mask */
139 static int tda10071_rd_reg_mask(struct tda10071_priv *priv, 139 static int tda10071_rd_reg_mask(struct tda10071_priv *priv,
140 u8 reg, u8 *val, u8 mask) 140 u8 reg, u8 *val, u8 mask)
141 { 141 {
142 int ret, i; 142 int ret, i;
143 u8 tmp; 143 u8 tmp;
144 144
145 ret = tda10071_rd_regs(priv, reg, &tmp, 1); 145 ret = tda10071_rd_regs(priv, reg, &tmp, 1);
146 if (ret) 146 if (ret)
147 return ret; 147 return ret;
148 148
149 tmp &= mask; 149 tmp &= mask;
150 150
151 /* find position of the first bit */ 151 /* find position of the first bit */
152 for (i = 0; i < 8; i++) { 152 for (i = 0; i < 8; i++) {
153 if ((mask >> i) & 0x01) 153 if ((mask >> i) & 0x01)
154 break; 154 break;
155 } 155 }
156 *val = tmp >> i; 156 *val = tmp >> i;
157 157
158 return 0; 158 return 0;
159 } 159 }
160 160
161 /* execute firmware command */ 161 /* execute firmware command */
162 static int tda10071_cmd_execute(struct tda10071_priv *priv, 162 static int tda10071_cmd_execute(struct tda10071_priv *priv,
163 struct tda10071_cmd *cmd) 163 struct tda10071_cmd *cmd)
164 { 164 {
165 int ret, i; 165 int ret, i;
166 u8 tmp; 166 u8 tmp;
167 167
168 if (!priv->warm) { 168 if (!priv->warm) {
169 ret = -EFAULT; 169 ret = -EFAULT;
170 goto error; 170 goto error;
171 } 171 }
172 172
173 /* write cmd and args for firmware */ 173 /* write cmd and args for firmware */
174 ret = tda10071_wr_regs(priv, 0x00, cmd->args, cmd->len); 174 ret = tda10071_wr_regs(priv, 0x00, cmd->args, cmd->len);
175 if (ret) 175 if (ret)
176 goto error; 176 goto error;
177 177
178 /* start cmd execution */ 178 /* start cmd execution */
179 ret = tda10071_wr_reg(priv, 0x1f, 1); 179 ret = tda10071_wr_reg(priv, 0x1f, 1);
180 if (ret) 180 if (ret)
181 goto error; 181 goto error;
182 182
183 /* wait cmd execution terminate */ 183 /* wait cmd execution terminate */
184 for (i = 1000, tmp = 1; i && tmp; i--) { 184 for (i = 1000, tmp = 1; i && tmp; i--) {
185 ret = tda10071_rd_reg(priv, 0x1f, &tmp); 185 ret = tda10071_rd_reg(priv, 0x1f, &tmp);
186 if (ret) 186 if (ret)
187 goto error; 187 goto error;
188 188
189 usleep_range(200, 5000); 189 usleep_range(200, 5000);
190 } 190 }
191 191
192 dev_dbg(&priv->i2c->dev, "%s: loop=%d\n", __func__, i); 192 dev_dbg(&priv->i2c->dev, "%s: loop=%d\n", __func__, i);
193 193
194 if (i == 0) { 194 if (i == 0) {
195 ret = -ETIMEDOUT; 195 ret = -ETIMEDOUT;
196 goto error; 196 goto error;
197 } 197 }
198 198
199 return ret; 199 return ret;
200 error: 200 error:
201 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret); 201 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
202 return ret; 202 return ret;
203 } 203 }
204 204
205 static int tda10071_set_tone(struct dvb_frontend *fe, 205 static int tda10071_set_tone(struct dvb_frontend *fe,
206 fe_sec_tone_mode_t fe_sec_tone_mode) 206 fe_sec_tone_mode_t fe_sec_tone_mode)
207 { 207 {
208 struct tda10071_priv *priv = fe->demodulator_priv; 208 struct tda10071_priv *priv = fe->demodulator_priv;
209 struct tda10071_cmd cmd; 209 struct tda10071_cmd cmd;
210 int ret; 210 int ret;
211 u8 tone; 211 u8 tone;
212 212
213 if (!priv->warm) { 213 if (!priv->warm) {
214 ret = -EFAULT; 214 ret = -EFAULT;
215 goto error; 215 goto error;
216 } 216 }
217 217
218 dev_dbg(&priv->i2c->dev, "%s: tone_mode=%d\n", __func__, 218 dev_dbg(&priv->i2c->dev, "%s: tone_mode=%d\n", __func__,
219 fe_sec_tone_mode); 219 fe_sec_tone_mode);
220 220
221 switch (fe_sec_tone_mode) { 221 switch (fe_sec_tone_mode) {
222 case SEC_TONE_ON: 222 case SEC_TONE_ON:
223 tone = 1; 223 tone = 1;
224 break; 224 break;
225 case SEC_TONE_OFF: 225 case SEC_TONE_OFF:
226 tone = 0; 226 tone = 0;
227 break; 227 break;
228 default: 228 default:
229 dev_dbg(&priv->i2c->dev, "%s: invalid fe_sec_tone_mode\n", 229 dev_dbg(&priv->i2c->dev, "%s: invalid fe_sec_tone_mode\n",
230 __func__); 230 __func__);
231 ret = -EINVAL; 231 ret = -EINVAL;
232 goto error; 232 goto error;
233 } 233 }
234 234
235 cmd.args[0] = CMD_LNB_PCB_CONFIG; 235 cmd.args[0] = CMD_LNB_PCB_CONFIG;
236 cmd.args[1] = 0; 236 cmd.args[1] = 0;
237 cmd.args[2] = 0x00; 237 cmd.args[2] = 0x00;
238 cmd.args[3] = 0x00; 238 cmd.args[3] = 0x00;
239 cmd.args[4] = tone; 239 cmd.args[4] = tone;
240 cmd.len = 5; 240 cmd.len = 5;
241 ret = tda10071_cmd_execute(priv, &cmd); 241 ret = tda10071_cmd_execute(priv, &cmd);
242 if (ret) 242 if (ret)
243 goto error; 243 goto error;
244 244
245 return ret; 245 return ret;
246 error: 246 error:
247 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret); 247 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
248 return ret; 248 return ret;
249 } 249 }
250 250
251 static int tda10071_set_voltage(struct dvb_frontend *fe, 251 static int tda10071_set_voltage(struct dvb_frontend *fe,
252 fe_sec_voltage_t fe_sec_voltage) 252 fe_sec_voltage_t fe_sec_voltage)
253 { 253 {
254 struct tda10071_priv *priv = fe->demodulator_priv; 254 struct tda10071_priv *priv = fe->demodulator_priv;
255 struct tda10071_cmd cmd; 255 struct tda10071_cmd cmd;
256 int ret; 256 int ret;
257 u8 voltage; 257 u8 voltage;
258 258
259 if (!priv->warm) { 259 if (!priv->warm) {
260 ret = -EFAULT; 260 ret = -EFAULT;
261 goto error; 261 goto error;
262 } 262 }
263 263
264 dev_dbg(&priv->i2c->dev, "%s: voltage=%d\n", __func__, fe_sec_voltage); 264 dev_dbg(&priv->i2c->dev, "%s: voltage=%d\n", __func__, fe_sec_voltage);
265 265
266 switch (fe_sec_voltage) { 266 switch (fe_sec_voltage) {
267 case SEC_VOLTAGE_13: 267 case SEC_VOLTAGE_13:
268 voltage = 0; 268 voltage = 0;
269 break; 269 break;
270 case SEC_VOLTAGE_18: 270 case SEC_VOLTAGE_18:
271 voltage = 1; 271 voltage = 1;
272 break; 272 break;
273 case SEC_VOLTAGE_OFF: 273 case SEC_VOLTAGE_OFF:
274 voltage = 0; 274 voltage = 0;
275 break; 275 break;
276 default: 276 default:
277 dev_dbg(&priv->i2c->dev, "%s: invalid fe_sec_voltage\n", 277 dev_dbg(&priv->i2c->dev, "%s: invalid fe_sec_voltage\n",
278 __func__); 278 __func__);
279 ret = -EINVAL; 279 ret = -EINVAL;
280 goto error; 280 goto error;
281 } 281 }
282 282
283 cmd.args[0] = CMD_LNB_SET_DC_LEVEL; 283 cmd.args[0] = CMD_LNB_SET_DC_LEVEL;
284 cmd.args[1] = 0; 284 cmd.args[1] = 0;
285 cmd.args[2] = voltage; 285 cmd.args[2] = voltage;
286 cmd.len = 3; 286 cmd.len = 3;
287 ret = tda10071_cmd_execute(priv, &cmd); 287 ret = tda10071_cmd_execute(priv, &cmd);
288 if (ret) 288 if (ret)
289 goto error; 289 goto error;
290 290
291 return ret; 291 return ret;
292 error: 292 error:
293 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret); 293 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
294 return ret; 294 return ret;
295 } 295 }
296 296
297 static int tda10071_diseqc_send_master_cmd(struct dvb_frontend *fe, 297 static int tda10071_diseqc_send_master_cmd(struct dvb_frontend *fe,
298 struct dvb_diseqc_master_cmd *diseqc_cmd) 298 struct dvb_diseqc_master_cmd *diseqc_cmd)
299 { 299 {
300 struct tda10071_priv *priv = fe->demodulator_priv; 300 struct tda10071_priv *priv = fe->demodulator_priv;
301 struct tda10071_cmd cmd; 301 struct tda10071_cmd cmd;
302 int ret, i; 302 int ret, i;
303 u8 tmp; 303 u8 tmp;
304 304
305 if (!priv->warm) { 305 if (!priv->warm) {
306 ret = -EFAULT; 306 ret = -EFAULT;
307 goto error; 307 goto error;
308 } 308 }
309 309
310 dev_dbg(&priv->i2c->dev, "%s: msg_len=%d\n", __func__, 310 dev_dbg(&priv->i2c->dev, "%s: msg_len=%d\n", __func__,
311 diseqc_cmd->msg_len); 311 diseqc_cmd->msg_len);
312 312
313 if (diseqc_cmd->msg_len < 3 || diseqc_cmd->msg_len > 6) { 313 if (diseqc_cmd->msg_len < 3 || diseqc_cmd->msg_len > 6) {
314 ret = -EINVAL; 314 ret = -EINVAL;
315 goto error; 315 goto error;
316 } 316 }
317 317
318 /* wait LNB TX */ 318 /* wait LNB TX */
319 for (i = 500, tmp = 0; i && !tmp; i--) { 319 for (i = 500, tmp = 0; i && !tmp; i--) {
320 ret = tda10071_rd_reg_mask(priv, 0x47, &tmp, 0x01); 320 ret = tda10071_rd_reg_mask(priv, 0x47, &tmp, 0x01);
321 if (ret) 321 if (ret)
322 goto error; 322 goto error;
323 323
324 usleep_range(10000, 20000); 324 usleep_range(10000, 20000);
325 } 325 }
326 326
327 dev_dbg(&priv->i2c->dev, "%s: loop=%d\n", __func__, i); 327 dev_dbg(&priv->i2c->dev, "%s: loop=%d\n", __func__, i);
328 328
329 if (i == 0) { 329 if (i == 0) {
330 ret = -ETIMEDOUT; 330 ret = -ETIMEDOUT;
331 goto error; 331 goto error;
332 } 332 }
333 333
334 ret = tda10071_wr_reg_mask(priv, 0x47, 0x00, 0x01); 334 ret = tda10071_wr_reg_mask(priv, 0x47, 0x00, 0x01);
335 if (ret) 335 if (ret)
336 goto error; 336 goto error;
337 337
338 cmd.args[0] = CMD_LNB_SEND_DISEQC; 338 cmd.args[0] = CMD_LNB_SEND_DISEQC;
339 cmd.args[1] = 0; 339 cmd.args[1] = 0;
340 cmd.args[2] = 0; 340 cmd.args[2] = 0;
341 cmd.args[3] = 0; 341 cmd.args[3] = 0;
342 cmd.args[4] = 2; 342 cmd.args[4] = 2;
343 cmd.args[5] = 0; 343 cmd.args[5] = 0;
344 cmd.args[6] = diseqc_cmd->msg_len; 344 cmd.args[6] = diseqc_cmd->msg_len;
345 memcpy(&cmd.args[7], diseqc_cmd->msg, diseqc_cmd->msg_len); 345 memcpy(&cmd.args[7], diseqc_cmd->msg, diseqc_cmd->msg_len);
346 cmd.len = 7 + diseqc_cmd->msg_len; 346 cmd.len = 7 + diseqc_cmd->msg_len;
347 ret = tda10071_cmd_execute(priv, &cmd); 347 ret = tda10071_cmd_execute(priv, &cmd);
348 if (ret) 348 if (ret)
349 goto error; 349 goto error;
350 350
351 return ret; 351 return ret;
352 error: 352 error:
353 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret); 353 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
354 return ret; 354 return ret;
355 } 355 }
356 356
357 static int tda10071_diseqc_recv_slave_reply(struct dvb_frontend *fe, 357 static int tda10071_diseqc_recv_slave_reply(struct dvb_frontend *fe,
358 struct dvb_diseqc_slave_reply *reply) 358 struct dvb_diseqc_slave_reply *reply)
359 { 359 {
360 struct tda10071_priv *priv = fe->demodulator_priv; 360 struct tda10071_priv *priv = fe->demodulator_priv;
361 struct tda10071_cmd cmd; 361 struct tda10071_cmd cmd;
362 int ret, i; 362 int ret, i;
363 u8 tmp; 363 u8 tmp;
364 364
365 if (!priv->warm) { 365 if (!priv->warm) {
366 ret = -EFAULT; 366 ret = -EFAULT;
367 goto error; 367 goto error;
368 } 368 }
369 369
370 dev_dbg(&priv->i2c->dev, "%s:\n", __func__); 370 dev_dbg(&priv->i2c->dev, "%s:\n", __func__);
371 371
372 /* wait LNB RX */ 372 /* wait LNB RX */
373 for (i = 500, tmp = 0; i && !tmp; i--) { 373 for (i = 500, tmp = 0; i && !tmp; i--) {
374 ret = tda10071_rd_reg_mask(priv, 0x47, &tmp, 0x02); 374 ret = tda10071_rd_reg_mask(priv, 0x47, &tmp, 0x02);
375 if (ret) 375 if (ret)
376 goto error; 376 goto error;
377 377
378 usleep_range(10000, 20000); 378 usleep_range(10000, 20000);
379 } 379 }
380 380
381 dev_dbg(&priv->i2c->dev, "%s: loop=%d\n", __func__, i); 381 dev_dbg(&priv->i2c->dev, "%s: loop=%d\n", __func__, i);
382 382
383 if (i == 0) { 383 if (i == 0) {
384 ret = -ETIMEDOUT; 384 ret = -ETIMEDOUT;
385 goto error; 385 goto error;
386 } 386 }
387 387
388 /* reply len */ 388 /* reply len */
389 ret = tda10071_rd_reg(priv, 0x46, &tmp); 389 ret = tda10071_rd_reg(priv, 0x46, &tmp);
390 if (ret) 390 if (ret)
391 goto error; 391 goto error;
392 392
393 reply->msg_len = tmp & 0x1f; /* [4:0] */ 393 reply->msg_len = tmp & 0x1f; /* [4:0] */
394 if (reply->msg_len > sizeof(reply->msg)) 394 if (reply->msg_len > sizeof(reply->msg))
395 reply->msg_len = sizeof(reply->msg); /* truncate API max */ 395 reply->msg_len = sizeof(reply->msg); /* truncate API max */
396 396
397 /* read reply */ 397 /* read reply */
398 cmd.args[0] = CMD_LNB_UPDATE_REPLY; 398 cmd.args[0] = CMD_LNB_UPDATE_REPLY;
399 cmd.args[1] = 0; 399 cmd.args[1] = 0;
400 cmd.len = 2; 400 cmd.len = 2;
401 ret = tda10071_cmd_execute(priv, &cmd); 401 ret = tda10071_cmd_execute(priv, &cmd);
402 if (ret) 402 if (ret)
403 goto error; 403 goto error;
404 404
405 ret = tda10071_rd_regs(priv, cmd.len, reply->msg, reply->msg_len); 405 ret = tda10071_rd_regs(priv, cmd.len, reply->msg, reply->msg_len);
406 if (ret) 406 if (ret)
407 goto error; 407 goto error;
408 408
409 return ret; 409 return ret;
410 error: 410 error:
411 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret); 411 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
412 return ret; 412 return ret;
413 } 413 }
414 414
415 static int tda10071_diseqc_send_burst(struct dvb_frontend *fe, 415 static int tda10071_diseqc_send_burst(struct dvb_frontend *fe,
416 fe_sec_mini_cmd_t fe_sec_mini_cmd) 416 fe_sec_mini_cmd_t fe_sec_mini_cmd)
417 { 417 {
418 struct tda10071_priv *priv = fe->demodulator_priv; 418 struct tda10071_priv *priv = fe->demodulator_priv;
419 struct tda10071_cmd cmd; 419 struct tda10071_cmd cmd;
420 int ret, i; 420 int ret, i;
421 u8 tmp, burst; 421 u8 tmp, burst;
422 422
423 if (!priv->warm) { 423 if (!priv->warm) {
424 ret = -EFAULT; 424 ret = -EFAULT;
425 goto error; 425 goto error;
426 } 426 }
427 427
428 dev_dbg(&priv->i2c->dev, "%s: fe_sec_mini_cmd=%d\n", __func__, 428 dev_dbg(&priv->i2c->dev, "%s: fe_sec_mini_cmd=%d\n", __func__,
429 fe_sec_mini_cmd); 429 fe_sec_mini_cmd);
430 430
431 switch (fe_sec_mini_cmd) { 431 switch (fe_sec_mini_cmd) {
432 case SEC_MINI_A: 432 case SEC_MINI_A:
433 burst = 0; 433 burst = 0;
434 break; 434 break;
435 case SEC_MINI_B: 435 case SEC_MINI_B:
436 burst = 1; 436 burst = 1;
437 break; 437 break;
438 default: 438 default:
439 dev_dbg(&priv->i2c->dev, "%s: invalid fe_sec_mini_cmd\n", 439 dev_dbg(&priv->i2c->dev, "%s: invalid fe_sec_mini_cmd\n",
440 __func__); 440 __func__);
441 ret = -EINVAL; 441 ret = -EINVAL;
442 goto error; 442 goto error;
443 } 443 }
444 444
445 /* wait LNB TX */ 445 /* wait LNB TX */
446 for (i = 500, tmp = 0; i && !tmp; i--) { 446 for (i = 500, tmp = 0; i && !tmp; i--) {
447 ret = tda10071_rd_reg_mask(priv, 0x47, &tmp, 0x01); 447 ret = tda10071_rd_reg_mask(priv, 0x47, &tmp, 0x01);
448 if (ret) 448 if (ret)
449 goto error; 449 goto error;
450 450
451 usleep_range(10000, 20000); 451 usleep_range(10000, 20000);
452 } 452 }
453 453
454 dev_dbg(&priv->i2c->dev, "%s: loop=%d\n", __func__, i); 454 dev_dbg(&priv->i2c->dev, "%s: loop=%d\n", __func__, i);
455 455
456 if (i == 0) { 456 if (i == 0) {
457 ret = -ETIMEDOUT; 457 ret = -ETIMEDOUT;
458 goto error; 458 goto error;
459 } 459 }
460 460
461 ret = tda10071_wr_reg_mask(priv, 0x47, 0x00, 0x01); 461 ret = tda10071_wr_reg_mask(priv, 0x47, 0x00, 0x01);
462 if (ret) 462 if (ret)
463 goto error; 463 goto error;
464 464
465 cmd.args[0] = CMD_LNB_SEND_TONEBURST; 465 cmd.args[0] = CMD_LNB_SEND_TONEBURST;
466 cmd.args[1] = 0; 466 cmd.args[1] = 0;
467 cmd.args[2] = burst; 467 cmd.args[2] = burst;
468 cmd.len = 3; 468 cmd.len = 3;
469 ret = tda10071_cmd_execute(priv, &cmd); 469 ret = tda10071_cmd_execute(priv, &cmd);
470 if (ret) 470 if (ret)
471 goto error; 471 goto error;
472 472
473 return ret; 473 return ret;
474 error: 474 error:
475 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret); 475 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
476 return ret; 476 return ret;
477 } 477 }
478 478
479 static int tda10071_read_status(struct dvb_frontend *fe, fe_status_t *status) 479 static int tda10071_read_status(struct dvb_frontend *fe, fe_status_t *status)
480 { 480 {
481 struct tda10071_priv *priv = fe->demodulator_priv; 481 struct tda10071_priv *priv = fe->demodulator_priv;
482 int ret; 482 int ret;
483 u8 tmp; 483 u8 tmp;
484 484
485 *status = 0; 485 *status = 0;
486 486
487 if (!priv->warm) { 487 if (!priv->warm) {
488 ret = 0; 488 ret = 0;
489 goto error; 489 goto error;
490 } 490 }
491 491
492 ret = tda10071_rd_reg(priv, 0x39, &tmp); 492 ret = tda10071_rd_reg(priv, 0x39, &tmp);
493 if (ret) 493 if (ret)
494 goto error; 494 goto error;
495 495
496 /* 0x39[0] tuner PLL */ 496 /* 0x39[0] tuner PLL */
497 if (tmp & 0x02) /* demod PLL */ 497 if (tmp & 0x02) /* demod PLL */
498 *status |= FE_HAS_SIGNAL | FE_HAS_CARRIER; 498 *status |= FE_HAS_SIGNAL | FE_HAS_CARRIER;
499 if (tmp & 0x04) /* viterbi or LDPC*/ 499 if (tmp & 0x04) /* viterbi or LDPC*/
500 *status |= FE_HAS_VITERBI; 500 *status |= FE_HAS_VITERBI;
501 if (tmp & 0x08) /* RS or BCH */ 501 if (tmp & 0x08) /* RS or BCH */
502 *status |= FE_HAS_SYNC | FE_HAS_LOCK; 502 *status |= FE_HAS_SYNC | FE_HAS_LOCK;
503 503
504 priv->fe_status = *status; 504 priv->fe_status = *status;
505 505
506 return ret; 506 return ret;
507 error: 507 error:
508 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret); 508 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
509 return ret; 509 return ret;
510 } 510 }
511 511
512 static int tda10071_read_snr(struct dvb_frontend *fe, u16 *snr) 512 static int tda10071_read_snr(struct dvb_frontend *fe, u16 *snr)
513 { 513 {
514 struct tda10071_priv *priv = fe->demodulator_priv; 514 struct tda10071_priv *priv = fe->demodulator_priv;
515 int ret; 515 int ret;
516 u8 buf[2]; 516 u8 buf[2];
517 517
518 if (!priv->warm || !(priv->fe_status & FE_HAS_LOCK)) { 518 if (!priv->warm || !(priv->fe_status & FE_HAS_LOCK)) {
519 *snr = 0; 519 *snr = 0;
520 ret = 0; 520 ret = 0;
521 goto error; 521 goto error;
522 } 522 }
523 523
524 ret = tda10071_rd_regs(priv, 0x3a, buf, 2); 524 ret = tda10071_rd_regs(priv, 0x3a, buf, 2);
525 if (ret) 525 if (ret)
526 goto error; 526 goto error;
527 527
528 /* Es/No dBx10 */ 528 /* Es/No dBx10 */
529 *snr = buf[0] << 8 | buf[1]; 529 *snr = buf[0] << 8 | buf[1];
530 530
531 return ret; 531 return ret;
532 error: 532 error:
533 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret); 533 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
534 return ret; 534 return ret;
535 } 535 }
536 536
537 static int tda10071_read_signal_strength(struct dvb_frontend *fe, u16 *strength) 537 static int tda10071_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
538 { 538 {
539 struct tda10071_priv *priv = fe->demodulator_priv; 539 struct tda10071_priv *priv = fe->demodulator_priv;
540 struct tda10071_cmd cmd; 540 struct tda10071_cmd cmd;
541 int ret; 541 int ret;
542 u8 tmp; 542 u8 tmp;
543 543
544 if (!priv->warm || !(priv->fe_status & FE_HAS_LOCK)) { 544 if (!priv->warm || !(priv->fe_status & FE_HAS_LOCK)) {
545 *strength = 0; 545 *strength = 0;
546 ret = 0; 546 ret = 0;
547 goto error; 547 goto error;
548 } 548 }
549 549
550 cmd.args[0] = CMD_GET_AGCACC; 550 cmd.args[0] = CMD_GET_AGCACC;
551 cmd.args[1] = 0; 551 cmd.args[1] = 0;
552 cmd.len = 2; 552 cmd.len = 2;
553 ret = tda10071_cmd_execute(priv, &cmd); 553 ret = tda10071_cmd_execute(priv, &cmd);
554 if (ret) 554 if (ret)
555 goto error; 555 goto error;
556 556
557 /* input power estimate dBm */ 557 /* input power estimate dBm */
558 ret = tda10071_rd_reg(priv, 0x50, &tmp); 558 ret = tda10071_rd_reg(priv, 0x50, &tmp);
559 if (ret) 559 if (ret)
560 goto error; 560 goto error;
561 561
562 if (tmp < 181) 562 if (tmp < 181)
563 tmp = 181; /* -75 dBm */ 563 tmp = 181; /* -75 dBm */
564 else if (tmp > 236) 564 else if (tmp > 236)
565 tmp = 236; /* -20 dBm */ 565 tmp = 236; /* -20 dBm */
566 566
567 /* scale value to 0x0000-0xffff */ 567 /* scale value to 0x0000-0xffff */
568 *strength = (tmp-181) * 0xffff / (236-181); 568 *strength = (tmp-181) * 0xffff / (236-181);
569 569
570 return ret; 570 return ret;
571 error: 571 error:
572 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret); 572 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
573 return ret; 573 return ret;
574 } 574 }
575 575
576 static int tda10071_read_ber(struct dvb_frontend *fe, u32 *ber) 576 static int tda10071_read_ber(struct dvb_frontend *fe, u32 *ber)
577 { 577 {
578 struct tda10071_priv *priv = fe->demodulator_priv; 578 struct tda10071_priv *priv = fe->demodulator_priv;
579 struct tda10071_cmd cmd; 579 struct tda10071_cmd cmd;
580 int ret, i, len; 580 int ret, i, len;
581 u8 tmp, reg, buf[8]; 581 u8 tmp, reg, buf[8];
582 582
583 if (!priv->warm || !(priv->fe_status & FE_HAS_LOCK)) { 583 if (!priv->warm || !(priv->fe_status & FE_HAS_LOCK)) {
584 *ber = priv->ber = 0; 584 *ber = priv->ber = 0;
585 ret = 0; 585 ret = 0;
586 goto error; 586 goto error;
587 } 587 }
588 588
589 switch (priv->delivery_system) { 589 switch (priv->delivery_system) {
590 case SYS_DVBS: 590 case SYS_DVBS:
591 reg = 0x4c; 591 reg = 0x4c;
592 len = 8; 592 len = 8;
593 i = 1; 593 i = 1;
594 break; 594 break;
595 case SYS_DVBS2: 595 case SYS_DVBS2:
596 reg = 0x4d; 596 reg = 0x4d;
597 len = 4; 597 len = 4;
598 i = 0; 598 i = 0;
599 break; 599 break;
600 default: 600 default:
601 *ber = priv->ber = 0; 601 *ber = priv->ber = 0;
602 return 0; 602 return 0;
603 } 603 }
604 604
605 ret = tda10071_rd_reg(priv, reg, &tmp); 605 ret = tda10071_rd_reg(priv, reg, &tmp);
606 if (ret) 606 if (ret)
607 goto error; 607 goto error;
608 608
609 if (priv->meas_count[i] == tmp) { 609 if (priv->meas_count[i] == tmp) {
610 dev_dbg(&priv->i2c->dev, "%s: meas not ready=%02x\n", __func__, 610 dev_dbg(&priv->i2c->dev, "%s: meas not ready=%02x\n", __func__,
611 tmp); 611 tmp);
612 *ber = priv->ber; 612 *ber = priv->ber;
613 return 0; 613 return 0;
614 } else { 614 } else {
615 priv->meas_count[i] = tmp; 615 priv->meas_count[i] = tmp;
616 } 616 }
617 617
618 cmd.args[0] = CMD_BER_UPDATE_COUNTERS; 618 cmd.args[0] = CMD_BER_UPDATE_COUNTERS;
619 cmd.args[1] = 0; 619 cmd.args[1] = 0;
620 cmd.args[2] = i; 620 cmd.args[2] = i;
621 cmd.len = 3; 621 cmd.len = 3;
622 ret = tda10071_cmd_execute(priv, &cmd); 622 ret = tda10071_cmd_execute(priv, &cmd);
623 if (ret) 623 if (ret)
624 goto error; 624 goto error;
625 625
626 ret = tda10071_rd_regs(priv, cmd.len, buf, len); 626 ret = tda10071_rd_regs(priv, cmd.len, buf, len);
627 if (ret) 627 if (ret)
628 goto error; 628 goto error;
629 629
630 if (priv->delivery_system == SYS_DVBS) { 630 if (priv->delivery_system == SYS_DVBS) {
631 *ber = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]; 631 *ber = (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3];
632 priv->ucb += (buf[4] << 8) | buf[5]; 632 priv->ucb += (buf[4] << 8) | buf[5];
633 } else { 633 } else {
634 *ber = (buf[0] << 8) | buf[1]; 634 *ber = (buf[0] << 8) | buf[1];
635 } 635 }
636 priv->ber = *ber; 636 priv->ber = *ber;
637 637
638 return ret; 638 return ret;
639 error: 639 error:
640 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret); 640 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
641 return ret; 641 return ret;
642 } 642 }
643 643
644 static int tda10071_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks) 644 static int tda10071_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
645 { 645 {
646 struct tda10071_priv *priv = fe->demodulator_priv; 646 struct tda10071_priv *priv = fe->demodulator_priv;
647 int ret = 0; 647 int ret = 0;
648 648
649 if (!priv->warm || !(priv->fe_status & FE_HAS_LOCK)) { 649 if (!priv->warm || !(priv->fe_status & FE_HAS_LOCK)) {
650 *ucblocks = 0; 650 *ucblocks = 0;
651 goto error; 651 goto error;
652 } 652 }
653 653
654 /* UCB is updated when BER is read. Assume BER is read anyway. */ 654 /* UCB is updated when BER is read. Assume BER is read anyway. */
655 655
656 *ucblocks = priv->ucb; 656 *ucblocks = priv->ucb;
657 657
658 return ret; 658 return ret;
659 error: 659 error:
660 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret); 660 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
661 return ret; 661 return ret;
662 } 662 }
663 663
664 static int tda10071_set_frontend(struct dvb_frontend *fe) 664 static int tda10071_set_frontend(struct dvb_frontend *fe)
665 { 665 {
666 struct tda10071_priv *priv = fe->demodulator_priv; 666 struct tda10071_priv *priv = fe->demodulator_priv;
667 struct tda10071_cmd cmd; 667 struct tda10071_cmd cmd;
668 struct dtv_frontend_properties *c = &fe->dtv_property_cache; 668 struct dtv_frontend_properties *c = &fe->dtv_property_cache;
669 int ret, i; 669 int ret, i;
670 u8 mode, rolloff, pilot, inversion, div; 670 u8 mode, rolloff, pilot, inversion, div;
671 fe_modulation_t modulation;
671 672
672 dev_dbg(&priv->i2c->dev, 673 dev_dbg(&priv->i2c->dev,
673 "%s: delivery_system=%d modulation=%d frequency=%d symbol_rate=%d inversion=%d pilot=%d rolloff=%d\n", 674 "%s: delivery_system=%d modulation=%d frequency=%d symbol_rate=%d inversion=%d pilot=%d rolloff=%d\n",
674 __func__, c->delivery_system, c->modulation, 675 __func__, c->delivery_system, c->modulation,
675 c->frequency, c->symbol_rate, c->inversion, c->pilot, 676 c->frequency, c->symbol_rate, c->inversion, c->pilot,
676 c->rolloff); 677 c->rolloff);
677 678
678 priv->delivery_system = SYS_UNDEFINED; 679 priv->delivery_system = SYS_UNDEFINED;
679 680
680 if (!priv->warm) { 681 if (!priv->warm) {
681 ret = -EFAULT; 682 ret = -EFAULT;
682 goto error; 683 goto error;
683 } 684 }
684 685
685 switch (c->inversion) { 686 switch (c->inversion) {
686 case INVERSION_OFF: 687 case INVERSION_OFF:
687 inversion = 1; 688 inversion = 1;
688 break; 689 break;
689 case INVERSION_ON: 690 case INVERSION_ON:
690 inversion = 0; 691 inversion = 0;
691 break; 692 break;
692 case INVERSION_AUTO: 693 case INVERSION_AUTO:
693 /* 2 = auto; try first on then off 694 /* 2 = auto; try first on then off
694 * 3 = auto; try first off then on */ 695 * 3 = auto; try first off then on */
695 inversion = 3; 696 inversion = 3;
696 break; 697 break;
697 default: 698 default:
698 dev_dbg(&priv->i2c->dev, "%s: invalid inversion\n", __func__); 699 dev_dbg(&priv->i2c->dev, "%s: invalid inversion\n", __func__);
699 ret = -EINVAL; 700 ret = -EINVAL;
700 goto error; 701 goto error;
701 } 702 }
702 703
703 switch (c->delivery_system) { 704 switch (c->delivery_system) {
704 case SYS_DVBS: 705 case SYS_DVBS:
706 modulation = QPSK;
705 rolloff = 0; 707 rolloff = 0;
706 pilot = 2; 708 pilot = 2;
707 break; 709 break;
708 case SYS_DVBS2: 710 case SYS_DVBS2:
711 modulation = c->modulation;
712
709 switch (c->rolloff) { 713 switch (c->rolloff) {
710 case ROLLOFF_20: 714 case ROLLOFF_20:
711 rolloff = 2; 715 rolloff = 2;
712 break; 716 break;
713 case ROLLOFF_25: 717 case ROLLOFF_25:
714 rolloff = 1; 718 rolloff = 1;
715 break; 719 break;
716 case ROLLOFF_35: 720 case ROLLOFF_35:
717 rolloff = 0; 721 rolloff = 0;
718 break; 722 break;
719 case ROLLOFF_AUTO: 723 case ROLLOFF_AUTO:
720 default: 724 default:
721 dev_dbg(&priv->i2c->dev, "%s: invalid rolloff\n", 725 dev_dbg(&priv->i2c->dev, "%s: invalid rolloff\n",
722 __func__); 726 __func__);
723 ret = -EINVAL; 727 ret = -EINVAL;
724 goto error; 728 goto error;
725 } 729 }
726 730
727 switch (c->pilot) { 731 switch (c->pilot) {
728 case PILOT_OFF: 732 case PILOT_OFF:
729 pilot = 0; 733 pilot = 0;
730 break; 734 break;
731 case PILOT_ON: 735 case PILOT_ON:
732 pilot = 1; 736 pilot = 1;
733 break; 737 break;
734 case PILOT_AUTO: 738 case PILOT_AUTO:
735 pilot = 2; 739 pilot = 2;
736 break; 740 break;
737 default: 741 default:
738 dev_dbg(&priv->i2c->dev, "%s: invalid pilot\n", 742 dev_dbg(&priv->i2c->dev, "%s: invalid pilot\n",
739 __func__); 743 __func__);
740 ret = -EINVAL; 744 ret = -EINVAL;
741 goto error; 745 goto error;
742 } 746 }
743 break; 747 break;
744 default: 748 default:
745 dev_dbg(&priv->i2c->dev, "%s: invalid delivery_system\n", 749 dev_dbg(&priv->i2c->dev, "%s: invalid delivery_system\n",
746 __func__); 750 __func__);
747 ret = -EINVAL; 751 ret = -EINVAL;
748 goto error; 752 goto error;
749 } 753 }
750 754
751 for (i = 0, mode = 0xff; i < ARRAY_SIZE(TDA10071_MODCOD); i++) { 755 for (i = 0, mode = 0xff; i < ARRAY_SIZE(TDA10071_MODCOD); i++) {
752 if (c->delivery_system == TDA10071_MODCOD[i].delivery_system && 756 if (c->delivery_system == TDA10071_MODCOD[i].delivery_system &&
753 c->modulation == TDA10071_MODCOD[i].modulation && 757 modulation == TDA10071_MODCOD[i].modulation &&
754 c->fec_inner == TDA10071_MODCOD[i].fec) { 758 c->fec_inner == TDA10071_MODCOD[i].fec) {
755 mode = TDA10071_MODCOD[i].val; 759 mode = TDA10071_MODCOD[i].val;
756 dev_dbg(&priv->i2c->dev, "%s: mode found=%02x\n", 760 dev_dbg(&priv->i2c->dev, "%s: mode found=%02x\n",
757 __func__, mode); 761 __func__, mode);
758 break; 762 break;
759 } 763 }
760 } 764 }
761 765
762 if (mode == 0xff) { 766 if (mode == 0xff) {
763 dev_dbg(&priv->i2c->dev, "%s: invalid parameter combination\n", 767 dev_dbg(&priv->i2c->dev, "%s: invalid parameter combination\n",
764 __func__); 768 __func__);
765 ret = -EINVAL; 769 ret = -EINVAL;
766 goto error; 770 goto error;
767 } 771 }
768 772
769 if (c->symbol_rate <= 5000000) 773 if (c->symbol_rate <= 5000000)
770 div = 14; 774 div = 14;
771 else 775 else
772 div = 4; 776 div = 4;
773 777
774 ret = tda10071_wr_reg(priv, 0x81, div); 778 ret = tda10071_wr_reg(priv, 0x81, div);
775 if (ret) 779 if (ret)
776 goto error; 780 goto error;
777 781
778 ret = tda10071_wr_reg(priv, 0xe3, div); 782 ret = tda10071_wr_reg(priv, 0xe3, div);
779 if (ret) 783 if (ret)
780 goto error; 784 goto error;
781 785
782 cmd.args[0] = CMD_CHANGE_CHANNEL; 786 cmd.args[0] = CMD_CHANGE_CHANNEL;
783 cmd.args[1] = 0; 787 cmd.args[1] = 0;
784 cmd.args[2] = mode; 788 cmd.args[2] = mode;
785 cmd.args[3] = (c->frequency >> 16) & 0xff; 789 cmd.args[3] = (c->frequency >> 16) & 0xff;
786 cmd.args[4] = (c->frequency >> 8) & 0xff; 790 cmd.args[4] = (c->frequency >> 8) & 0xff;
787 cmd.args[5] = (c->frequency >> 0) & 0xff; 791 cmd.args[5] = (c->frequency >> 0) & 0xff;
788 cmd.args[6] = ((c->symbol_rate / 1000) >> 8) & 0xff; 792 cmd.args[6] = ((c->symbol_rate / 1000) >> 8) & 0xff;
789 cmd.args[7] = ((c->symbol_rate / 1000) >> 0) & 0xff; 793 cmd.args[7] = ((c->symbol_rate / 1000) >> 0) & 0xff;
790 cmd.args[8] = (tda10071_ops.info.frequency_tolerance >> 8) & 0xff; 794 cmd.args[8] = (tda10071_ops.info.frequency_tolerance >> 8) & 0xff;
791 cmd.args[9] = (tda10071_ops.info.frequency_tolerance >> 0) & 0xff; 795 cmd.args[9] = (tda10071_ops.info.frequency_tolerance >> 0) & 0xff;
792 cmd.args[10] = rolloff; 796 cmd.args[10] = rolloff;
793 cmd.args[11] = inversion; 797 cmd.args[11] = inversion;
794 cmd.args[12] = pilot; 798 cmd.args[12] = pilot;
795 cmd.args[13] = 0x00; 799 cmd.args[13] = 0x00;
796 cmd.args[14] = 0x00; 800 cmd.args[14] = 0x00;
797 cmd.len = 15; 801 cmd.len = 15;
798 ret = tda10071_cmd_execute(priv, &cmd); 802 ret = tda10071_cmd_execute(priv, &cmd);
799 if (ret) 803 if (ret)
800 goto error; 804 goto error;
801 805
802 priv->delivery_system = c->delivery_system; 806 priv->delivery_system = c->delivery_system;
803 807
804 return ret; 808 return ret;
805 error: 809 error:
806 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret); 810 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
807 return ret; 811 return ret;
808 } 812 }
809 813
810 static int tda10071_get_frontend(struct dvb_frontend *fe) 814 static int tda10071_get_frontend(struct dvb_frontend *fe)
811 { 815 {
812 struct tda10071_priv *priv = fe->demodulator_priv; 816 struct tda10071_priv *priv = fe->demodulator_priv;
813 struct dtv_frontend_properties *c = &fe->dtv_property_cache; 817 struct dtv_frontend_properties *c = &fe->dtv_property_cache;
814 int ret, i; 818 int ret, i;
815 u8 buf[5], tmp; 819 u8 buf[5], tmp;
816 820
817 if (!priv->warm || !(priv->fe_status & FE_HAS_LOCK)) { 821 if (!priv->warm || !(priv->fe_status & FE_HAS_LOCK)) {
818 ret = -EFAULT; 822 ret = -EFAULT;
819 goto error; 823 goto error;
820 } 824 }
821 825
822 ret = tda10071_rd_regs(priv, 0x30, buf, 5); 826 ret = tda10071_rd_regs(priv, 0x30, buf, 5);
823 if (ret) 827 if (ret)
824 goto error; 828 goto error;
825 829
826 tmp = buf[0] & 0x3f; 830 tmp = buf[0] & 0x3f;
827 for (i = 0; i < ARRAY_SIZE(TDA10071_MODCOD); i++) { 831 for (i = 0; i < ARRAY_SIZE(TDA10071_MODCOD); i++) {
828 if (tmp == TDA10071_MODCOD[i].val) { 832 if (tmp == TDA10071_MODCOD[i].val) {
829 c->modulation = TDA10071_MODCOD[i].modulation; 833 c->modulation = TDA10071_MODCOD[i].modulation;
830 c->fec_inner = TDA10071_MODCOD[i].fec; 834 c->fec_inner = TDA10071_MODCOD[i].fec;
831 c->delivery_system = TDA10071_MODCOD[i].delivery_system; 835 c->delivery_system = TDA10071_MODCOD[i].delivery_system;
832 } 836 }
833 } 837 }
834 838
835 switch ((buf[1] >> 0) & 0x01) { 839 switch ((buf[1] >> 0) & 0x01) {
836 case 0: 840 case 0:
837 c->inversion = INVERSION_OFF; 841 c->inversion = INVERSION_OFF;
838 break; 842 break;
839 case 1: 843 case 1:
840 c->inversion = INVERSION_ON; 844 c->inversion = INVERSION_ON;
841 break; 845 break;
842 } 846 }
843 847
844 switch ((buf[1] >> 7) & 0x01) { 848 switch ((buf[1] >> 7) & 0x01) {
845 case 0: 849 case 0:
846 c->pilot = PILOT_OFF; 850 c->pilot = PILOT_OFF;
847 break; 851 break;
848 case 1: 852 case 1:
849 c->pilot = PILOT_ON; 853 c->pilot = PILOT_ON;
850 break; 854 break;
851 } 855 }
852 856
853 c->frequency = (buf[2] << 16) | (buf[3] << 8) | (buf[4] << 0); 857 c->frequency = (buf[2] << 16) | (buf[3] << 8) | (buf[4] << 0);
854 858
855 ret = tda10071_rd_regs(priv, 0x52, buf, 3); 859 ret = tda10071_rd_regs(priv, 0x52, buf, 3);
856 if (ret) 860 if (ret)
857 goto error; 861 goto error;
858 862
859 c->symbol_rate = (buf[0] << 16) | (buf[1] << 8) | (buf[2] << 0); 863 c->symbol_rate = (buf[0] << 16) | (buf[1] << 8) | (buf[2] << 0);
860 864
861 return ret; 865 return ret;
862 error: 866 error:
863 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret); 867 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
864 return ret; 868 return ret;
865 } 869 }
866 870
867 static int tda10071_init(struct dvb_frontend *fe) 871 static int tda10071_init(struct dvb_frontend *fe)
868 { 872 {
869 struct tda10071_priv *priv = fe->demodulator_priv; 873 struct tda10071_priv *priv = fe->demodulator_priv;
870 struct tda10071_cmd cmd; 874 struct tda10071_cmd cmd;
871 int ret, i, len, remaining, fw_size; 875 int ret, i, len, remaining, fw_size;
872 const struct firmware *fw; 876 const struct firmware *fw;
873 u8 *fw_file = TDA10071_FIRMWARE; 877 u8 *fw_file = TDA10071_FIRMWARE;
874 u8 tmp, buf[4]; 878 u8 tmp, buf[4];
875 struct tda10071_reg_val_mask tab[] = { 879 struct tda10071_reg_val_mask tab[] = {
876 { 0xcd, 0x00, 0x07 }, 880 { 0xcd, 0x00, 0x07 },
877 { 0x80, 0x00, 0x02 }, 881 { 0x80, 0x00, 0x02 },
878 { 0xcd, 0x00, 0xc0 }, 882 { 0xcd, 0x00, 0xc0 },
879 { 0xce, 0x00, 0x1b }, 883 { 0xce, 0x00, 0x1b },
880 { 0x9d, 0x00, 0x01 }, 884 { 0x9d, 0x00, 0x01 },
881 { 0x9d, 0x00, 0x02 }, 885 { 0x9d, 0x00, 0x02 },
882 { 0x9e, 0x00, 0x01 }, 886 { 0x9e, 0x00, 0x01 },
883 { 0x87, 0x00, 0x80 }, 887 { 0x87, 0x00, 0x80 },
884 { 0xce, 0x00, 0x08 }, 888 { 0xce, 0x00, 0x08 },
885 { 0xce, 0x00, 0x10 }, 889 { 0xce, 0x00, 0x10 },
886 }; 890 };
887 struct tda10071_reg_val_mask tab2[] = { 891 struct tda10071_reg_val_mask tab2[] = {
888 { 0xf1, 0x70, 0xff }, 892 { 0xf1, 0x70, 0xff },
889 { 0x88, priv->cfg.pll_multiplier, 0x3f }, 893 { 0x88, priv->cfg.pll_multiplier, 0x3f },
890 { 0x89, 0x00, 0x10 }, 894 { 0x89, 0x00, 0x10 },
891 { 0x89, 0x10, 0x10 }, 895 { 0x89, 0x10, 0x10 },
892 { 0xc0, 0x01, 0x01 }, 896 { 0xc0, 0x01, 0x01 },
893 { 0xc0, 0x00, 0x01 }, 897 { 0xc0, 0x00, 0x01 },
894 { 0xe0, 0xff, 0xff }, 898 { 0xe0, 0xff, 0xff },
895 { 0xe0, 0x00, 0xff }, 899 { 0xe0, 0x00, 0xff },
896 { 0x96, 0x1e, 0x7e }, 900 { 0x96, 0x1e, 0x7e },
897 { 0x8b, 0x08, 0x08 }, 901 { 0x8b, 0x08, 0x08 },
898 { 0x8b, 0x00, 0x08 }, 902 { 0x8b, 0x00, 0x08 },
899 { 0x8f, 0x1a, 0x7e }, 903 { 0x8f, 0x1a, 0x7e },
900 { 0x8c, 0x68, 0xff }, 904 { 0x8c, 0x68, 0xff },
901 { 0x8d, 0x08, 0xff }, 905 { 0x8d, 0x08, 0xff },
902 { 0x8e, 0x4c, 0xff }, 906 { 0x8e, 0x4c, 0xff },
903 { 0x8f, 0x01, 0x01 }, 907 { 0x8f, 0x01, 0x01 },
904 { 0x8b, 0x04, 0x04 }, 908 { 0x8b, 0x04, 0x04 },
905 { 0x8b, 0x00, 0x04 }, 909 { 0x8b, 0x00, 0x04 },
906 { 0x87, 0x05, 0x07 }, 910 { 0x87, 0x05, 0x07 },
907 { 0x80, 0x00, 0x20 }, 911 { 0x80, 0x00, 0x20 },
908 { 0xc8, 0x01, 0xff }, 912 { 0xc8, 0x01, 0xff },
909 { 0xb4, 0x47, 0xff }, 913 { 0xb4, 0x47, 0xff },
910 { 0xb5, 0x9c, 0xff }, 914 { 0xb5, 0x9c, 0xff },
911 { 0xb6, 0x7d, 0xff }, 915 { 0xb6, 0x7d, 0xff },
912 { 0xba, 0x00, 0x03 }, 916 { 0xba, 0x00, 0x03 },
913 { 0xb7, 0x47, 0xff }, 917 { 0xb7, 0x47, 0xff },
914 { 0xb8, 0x9c, 0xff }, 918 { 0xb8, 0x9c, 0xff },
915 { 0xb9, 0x7d, 0xff }, 919 { 0xb9, 0x7d, 0xff },
916 { 0xba, 0x00, 0x0c }, 920 { 0xba, 0x00, 0x0c },
917 { 0xc8, 0x00, 0xff }, 921 { 0xc8, 0x00, 0xff },
918 { 0xcd, 0x00, 0x04 }, 922 { 0xcd, 0x00, 0x04 },
919 { 0xcd, 0x00, 0x20 }, 923 { 0xcd, 0x00, 0x20 },
920 { 0xe8, 0x02, 0xff }, 924 { 0xe8, 0x02, 0xff },
921 { 0xcf, 0x20, 0xff }, 925 { 0xcf, 0x20, 0xff },
922 { 0x9b, 0xd7, 0xff }, 926 { 0x9b, 0xd7, 0xff },
923 { 0x9a, 0x01, 0x03 }, 927 { 0x9a, 0x01, 0x03 },
924 { 0xa8, 0x05, 0x0f }, 928 { 0xa8, 0x05, 0x0f },
925 { 0xa8, 0x65, 0xf0 }, 929 { 0xa8, 0x65, 0xf0 },
926 { 0xa6, 0xa0, 0xf0 }, 930 { 0xa6, 0xa0, 0xf0 },
927 { 0x9d, 0x50, 0xfc }, 931 { 0x9d, 0x50, 0xfc },
928 { 0x9e, 0x20, 0xe0 }, 932 { 0x9e, 0x20, 0xe0 },
929 { 0xa3, 0x1c, 0x7c }, 933 { 0xa3, 0x1c, 0x7c },
930 { 0xd5, 0x03, 0x03 }, 934 { 0xd5, 0x03, 0x03 },
931 }; 935 };
932 936
933 if (priv->warm) { 937 if (priv->warm) {
934 /* warm state - wake up device from sleep */ 938 /* warm state - wake up device from sleep */
935 939
936 for (i = 0; i < ARRAY_SIZE(tab); i++) { 940 for (i = 0; i < ARRAY_SIZE(tab); i++) {
937 ret = tda10071_wr_reg_mask(priv, tab[i].reg, 941 ret = tda10071_wr_reg_mask(priv, tab[i].reg,
938 tab[i].val, tab[i].mask); 942 tab[i].val, tab[i].mask);
939 if (ret) 943 if (ret)
940 goto error; 944 goto error;
941 } 945 }
942 946
943 cmd.args[0] = CMD_SET_SLEEP_MODE; 947 cmd.args[0] = CMD_SET_SLEEP_MODE;
944 cmd.args[1] = 0; 948 cmd.args[1] = 0;
945 cmd.args[2] = 0; 949 cmd.args[2] = 0;
946 cmd.len = 3; 950 cmd.len = 3;
947 ret = tda10071_cmd_execute(priv, &cmd); 951 ret = tda10071_cmd_execute(priv, &cmd);
948 if (ret) 952 if (ret)
949 goto error; 953 goto error;
950 } else { 954 } else {
951 /* cold state - try to download firmware */ 955 /* cold state - try to download firmware */
952 956
953 /* request the firmware, this will block and timeout */ 957 /* request the firmware, this will block and timeout */
954 ret = request_firmware(&fw, fw_file, priv->i2c->dev.parent); 958 ret = request_firmware(&fw, fw_file, priv->i2c->dev.parent);
955 if (ret) { 959 if (ret) {
956 dev_err(&priv->i2c->dev, 960 dev_err(&priv->i2c->dev,
957 "%s: did not find the firmware file. (%s) Please see linux/Documentation/dvb/ for more details on firmware-problems. (%d)\n", 961 "%s: did not find the firmware file. (%s) Please see linux/Documentation/dvb/ for more details on firmware-problems. (%d)\n",
958 KBUILD_MODNAME, fw_file, ret); 962 KBUILD_MODNAME, fw_file, ret);
959 goto error; 963 goto error;
960 } 964 }
961 965
962 /* init */ 966 /* init */
963 for (i = 0; i < ARRAY_SIZE(tab2); i++) { 967 for (i = 0; i < ARRAY_SIZE(tab2); i++) {
964 ret = tda10071_wr_reg_mask(priv, tab2[i].reg, 968 ret = tda10071_wr_reg_mask(priv, tab2[i].reg,
965 tab2[i].val, tab2[i].mask); 969 tab2[i].val, tab2[i].mask);
966 if (ret) 970 if (ret)
967 goto error_release_firmware; 971 goto error_release_firmware;
968 } 972 }
969 973
970 /* download firmware */ 974 /* download firmware */
971 ret = tda10071_wr_reg(priv, 0xe0, 0x7f); 975 ret = tda10071_wr_reg(priv, 0xe0, 0x7f);
972 if (ret) 976 if (ret)
973 goto error_release_firmware; 977 goto error_release_firmware;
974 978
975 ret = tda10071_wr_reg(priv, 0xf7, 0x81); 979 ret = tda10071_wr_reg(priv, 0xf7, 0x81);
976 if (ret) 980 if (ret)
977 goto error_release_firmware; 981 goto error_release_firmware;
978 982
979 ret = tda10071_wr_reg(priv, 0xf8, 0x00); 983 ret = tda10071_wr_reg(priv, 0xf8, 0x00);
980 if (ret) 984 if (ret)
981 goto error_release_firmware; 985 goto error_release_firmware;
982 986
983 ret = tda10071_wr_reg(priv, 0xf9, 0x00); 987 ret = tda10071_wr_reg(priv, 0xf9, 0x00);
984 if (ret) 988 if (ret)
985 goto error_release_firmware; 989 goto error_release_firmware;
986 990
987 dev_info(&priv->i2c->dev, 991 dev_info(&priv->i2c->dev,
988 "%s: found a '%s' in cold state, will try to load a firmware\n", 992 "%s: found a '%s' in cold state, will try to load a firmware\n",
989 KBUILD_MODNAME, tda10071_ops.info.name); 993 KBUILD_MODNAME, tda10071_ops.info.name);
990 dev_info(&priv->i2c->dev, 994 dev_info(&priv->i2c->dev,
991 "%s: downloading firmware from file '%s'\n", 995 "%s: downloading firmware from file '%s'\n",
992 KBUILD_MODNAME, fw_file); 996 KBUILD_MODNAME, fw_file);
993 997
994 /* do not download last byte */ 998 /* do not download last byte */
995 fw_size = fw->size - 1; 999 fw_size = fw->size - 1;
996 1000
997 for (remaining = fw_size; remaining > 0; 1001 for (remaining = fw_size; remaining > 0;
998 remaining -= (priv->cfg.i2c_wr_max - 1)) { 1002 remaining -= (priv->cfg.i2c_wr_max - 1)) {
999 len = remaining; 1003 len = remaining;
1000 if (len > (priv->cfg.i2c_wr_max - 1)) 1004 if (len > (priv->cfg.i2c_wr_max - 1))
1001 len = (priv->cfg.i2c_wr_max - 1); 1005 len = (priv->cfg.i2c_wr_max - 1);
1002 1006
1003 ret = tda10071_wr_regs(priv, 0xfa, 1007 ret = tda10071_wr_regs(priv, 0xfa,
1004 (u8 *) &fw->data[fw_size - remaining], len); 1008 (u8 *) &fw->data[fw_size - remaining], len);
1005 if (ret) { 1009 if (ret) {
1006 dev_err(&priv->i2c->dev, 1010 dev_err(&priv->i2c->dev,
1007 "%s: firmware download failed=%d\n", 1011 "%s: firmware download failed=%d\n",
1008 KBUILD_MODNAME, ret); 1012 KBUILD_MODNAME, ret);
1009 goto error_release_firmware; 1013 goto error_release_firmware;
1010 } 1014 }
1011 } 1015 }
1012 release_firmware(fw); 1016 release_firmware(fw);
1013 1017
1014 ret = tda10071_wr_reg(priv, 0xf7, 0x0c); 1018 ret = tda10071_wr_reg(priv, 0xf7, 0x0c);
1015 if (ret) 1019 if (ret)
1016 goto error; 1020 goto error;
1017 1021
1018 ret = tda10071_wr_reg(priv, 0xe0, 0x00); 1022 ret = tda10071_wr_reg(priv, 0xe0, 0x00);
1019 if (ret) 1023 if (ret)
1020 goto error; 1024 goto error;
1021 1025
1022 /* wait firmware start */ 1026 /* wait firmware start */
1023 msleep(250); 1027 msleep(250);
1024 1028
1025 /* firmware status */ 1029 /* firmware status */
1026 ret = tda10071_rd_reg(priv, 0x51, &tmp); 1030 ret = tda10071_rd_reg(priv, 0x51, &tmp);
1027 if (ret) 1031 if (ret)
1028 goto error; 1032 goto error;
1029 1033
1030 if (tmp) { 1034 if (tmp) {
1031 dev_info(&priv->i2c->dev, "%s: firmware did not run\n", 1035 dev_info(&priv->i2c->dev, "%s: firmware did not run\n",
1032 KBUILD_MODNAME); 1036 KBUILD_MODNAME);
1033 ret = -EFAULT; 1037 ret = -EFAULT;
1034 goto error; 1038 goto error;
1035 } else { 1039 } else {
1036 priv->warm = 1; 1040 priv->warm = 1;
1037 } 1041 }
1038 1042
1039 cmd.args[0] = CMD_GET_FW_VERSION; 1043 cmd.args[0] = CMD_GET_FW_VERSION;
1040 cmd.len = 1; 1044 cmd.len = 1;
1041 ret = tda10071_cmd_execute(priv, &cmd); 1045 ret = tda10071_cmd_execute(priv, &cmd);
1042 if (ret) 1046 if (ret)
1043 goto error; 1047 goto error;
1044 1048
1045 ret = tda10071_rd_regs(priv, cmd.len, buf, 4); 1049 ret = tda10071_rd_regs(priv, cmd.len, buf, 4);
1046 if (ret) 1050 if (ret)
1047 goto error; 1051 goto error;
1048 1052
1049 dev_info(&priv->i2c->dev, "%s: firmware version %d.%d.%d.%d\n", 1053 dev_info(&priv->i2c->dev, "%s: firmware version %d.%d.%d.%d\n",
1050 KBUILD_MODNAME, buf[0], buf[1], buf[2], buf[3]); 1054 KBUILD_MODNAME, buf[0], buf[1], buf[2], buf[3]);
1051 dev_info(&priv->i2c->dev, "%s: found a '%s' in warm state\n", 1055 dev_info(&priv->i2c->dev, "%s: found a '%s' in warm state\n",
1052 KBUILD_MODNAME, tda10071_ops.info.name); 1056 KBUILD_MODNAME, tda10071_ops.info.name);
1053 1057
1054 ret = tda10071_rd_regs(priv, 0x81, buf, 2); 1058 ret = tda10071_rd_regs(priv, 0x81, buf, 2);
1055 if (ret) 1059 if (ret)
1056 goto error; 1060 goto error;
1057 1061
1058 cmd.args[0] = CMD_DEMOD_INIT; 1062 cmd.args[0] = CMD_DEMOD_INIT;
1059 cmd.args[1] = ((priv->cfg.xtal / 1000) >> 8) & 0xff; 1063 cmd.args[1] = ((priv->cfg.xtal / 1000) >> 8) & 0xff;
1060 cmd.args[2] = ((priv->cfg.xtal / 1000) >> 0) & 0xff; 1064 cmd.args[2] = ((priv->cfg.xtal / 1000) >> 0) & 0xff;
1061 cmd.args[3] = buf[0]; 1065 cmd.args[3] = buf[0];
1062 cmd.args[4] = buf[1]; 1066 cmd.args[4] = buf[1];
1063 cmd.args[5] = priv->cfg.pll_multiplier; 1067 cmd.args[5] = priv->cfg.pll_multiplier;
1064 cmd.args[6] = priv->cfg.spec_inv; 1068 cmd.args[6] = priv->cfg.spec_inv;
1065 cmd.args[7] = 0x00; 1069 cmd.args[7] = 0x00;
1066 cmd.len = 8; 1070 cmd.len = 8;
1067 ret = tda10071_cmd_execute(priv, &cmd); 1071 ret = tda10071_cmd_execute(priv, &cmd);
1068 if (ret) 1072 if (ret)
1069 goto error; 1073 goto error;
1070 1074
1071 if (priv->cfg.tuner_i2c_addr) 1075 if (priv->cfg.tuner_i2c_addr)
1072 tmp = priv->cfg.tuner_i2c_addr; 1076 tmp = priv->cfg.tuner_i2c_addr;
1073 else 1077 else
1074 tmp = 0x14; 1078 tmp = 0x14;
1075 1079
1076 cmd.args[0] = CMD_TUNER_INIT; 1080 cmd.args[0] = CMD_TUNER_INIT;
1077 cmd.args[1] = 0x00; 1081 cmd.args[1] = 0x00;
1078 cmd.args[2] = 0x00; 1082 cmd.args[2] = 0x00;
1079 cmd.args[3] = 0x00; 1083 cmd.args[3] = 0x00;
1080 cmd.args[4] = 0x00; 1084 cmd.args[4] = 0x00;
1081 cmd.args[5] = tmp; 1085 cmd.args[5] = tmp;
1082 cmd.args[6] = 0x00; 1086 cmd.args[6] = 0x00;
1083 cmd.args[7] = 0x03; 1087 cmd.args[7] = 0x03;
1084 cmd.args[8] = 0x02; 1088 cmd.args[8] = 0x02;
1085 cmd.args[9] = 0x02; 1089 cmd.args[9] = 0x02;
1086 cmd.args[10] = 0x00; 1090 cmd.args[10] = 0x00;
1087 cmd.args[11] = 0x00; 1091 cmd.args[11] = 0x00;
1088 cmd.args[12] = 0x00; 1092 cmd.args[12] = 0x00;
1089 cmd.args[13] = 0x00; 1093 cmd.args[13] = 0x00;
1090 cmd.args[14] = 0x00; 1094 cmd.args[14] = 0x00;
1091 cmd.len = 15; 1095 cmd.len = 15;
1092 ret = tda10071_cmd_execute(priv, &cmd); 1096 ret = tda10071_cmd_execute(priv, &cmd);
1093 if (ret) 1097 if (ret)
1094 goto error; 1098 goto error;
1095 1099
1096 cmd.args[0] = CMD_MPEG_CONFIG; 1100 cmd.args[0] = CMD_MPEG_CONFIG;
1097 cmd.args[1] = 0; 1101 cmd.args[1] = 0;
1098 cmd.args[2] = priv->cfg.ts_mode; 1102 cmd.args[2] = priv->cfg.ts_mode;
1099 cmd.args[3] = 0x00; 1103 cmd.args[3] = 0x00;
1100 cmd.args[4] = 0x04; 1104 cmd.args[4] = 0x04;
1101 cmd.args[5] = 0x00; 1105 cmd.args[5] = 0x00;
1102 cmd.len = 6; 1106 cmd.len = 6;
1103 ret = tda10071_cmd_execute(priv, &cmd); 1107 ret = tda10071_cmd_execute(priv, &cmd);
1104 if (ret) 1108 if (ret)
1105 goto error; 1109 goto error;
1106 1110
1107 ret = tda10071_wr_reg_mask(priv, 0xf0, 0x01, 0x01); 1111 ret = tda10071_wr_reg_mask(priv, 0xf0, 0x01, 0x01);
1108 if (ret) 1112 if (ret)
1109 goto error; 1113 goto error;
1110 1114
1111 cmd.args[0] = CMD_LNB_CONFIG; 1115 cmd.args[0] = CMD_LNB_CONFIG;
1112 cmd.args[1] = 0; 1116 cmd.args[1] = 0;
1113 cmd.args[2] = 150; 1117 cmd.args[2] = 150;
1114 cmd.args[3] = 3; 1118 cmd.args[3] = 3;
1115 cmd.args[4] = 22; 1119 cmd.args[4] = 22;
1116 cmd.args[5] = 1; 1120 cmd.args[5] = 1;
1117 cmd.args[6] = 1; 1121 cmd.args[6] = 1;
1118 cmd.args[7] = 30; 1122 cmd.args[7] = 30;
1119 cmd.args[8] = 30; 1123 cmd.args[8] = 30;
1120 cmd.args[9] = 30; 1124 cmd.args[9] = 30;
1121 cmd.args[10] = 30; 1125 cmd.args[10] = 30;
1122 cmd.len = 11; 1126 cmd.len = 11;
1123 ret = tda10071_cmd_execute(priv, &cmd); 1127 ret = tda10071_cmd_execute(priv, &cmd);
1124 if (ret) 1128 if (ret)
1125 goto error; 1129 goto error;
1126 1130
1127 cmd.args[0] = CMD_BER_CONTROL; 1131 cmd.args[0] = CMD_BER_CONTROL;
1128 cmd.args[1] = 0; 1132 cmd.args[1] = 0;
1129 cmd.args[2] = 14; 1133 cmd.args[2] = 14;
1130 cmd.args[3] = 14; 1134 cmd.args[3] = 14;
1131 cmd.len = 4; 1135 cmd.len = 4;
1132 ret = tda10071_cmd_execute(priv, &cmd); 1136 ret = tda10071_cmd_execute(priv, &cmd);
1133 if (ret) 1137 if (ret)
1134 goto error; 1138 goto error;
1135 } 1139 }
1136 1140
1137 return ret; 1141 return ret;
1138 error_release_firmware: 1142 error_release_firmware:
1139 release_firmware(fw); 1143 release_firmware(fw);
1140 error: 1144 error:
1141 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret); 1145 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
1142 return ret; 1146 return ret;
1143 } 1147 }
1144 1148
1145 static int tda10071_sleep(struct dvb_frontend *fe) 1149 static int tda10071_sleep(struct dvb_frontend *fe)
1146 { 1150 {
1147 struct tda10071_priv *priv = fe->demodulator_priv; 1151 struct tda10071_priv *priv = fe->demodulator_priv;
1148 struct tda10071_cmd cmd; 1152 struct tda10071_cmd cmd;
1149 int ret, i; 1153 int ret, i;
1150 struct tda10071_reg_val_mask tab[] = { 1154 struct tda10071_reg_val_mask tab[] = {
1151 { 0xcd, 0x07, 0x07 }, 1155 { 0xcd, 0x07, 0x07 },
1152 { 0x80, 0x02, 0x02 }, 1156 { 0x80, 0x02, 0x02 },
1153 { 0xcd, 0xc0, 0xc0 }, 1157 { 0xcd, 0xc0, 0xc0 },
1154 { 0xce, 0x1b, 0x1b }, 1158 { 0xce, 0x1b, 0x1b },
1155 { 0x9d, 0x01, 0x01 }, 1159 { 0x9d, 0x01, 0x01 },
1156 { 0x9d, 0x02, 0x02 }, 1160 { 0x9d, 0x02, 0x02 },
1157 { 0x9e, 0x01, 0x01 }, 1161 { 0x9e, 0x01, 0x01 },
1158 { 0x87, 0x80, 0x80 }, 1162 { 0x87, 0x80, 0x80 },
1159 { 0xce, 0x08, 0x08 }, 1163 { 0xce, 0x08, 0x08 },
1160 { 0xce, 0x10, 0x10 }, 1164 { 0xce, 0x10, 0x10 },
1161 }; 1165 };
1162 1166
1163 if (!priv->warm) { 1167 if (!priv->warm) {
1164 ret = -EFAULT; 1168 ret = -EFAULT;
1165 goto error; 1169 goto error;
1166 } 1170 }
1167 1171
1168 cmd.args[0] = CMD_SET_SLEEP_MODE; 1172 cmd.args[0] = CMD_SET_SLEEP_MODE;
1169 cmd.args[1] = 0; 1173 cmd.args[1] = 0;
1170 cmd.args[2] = 1; 1174 cmd.args[2] = 1;
1171 cmd.len = 3; 1175 cmd.len = 3;
1172 ret = tda10071_cmd_execute(priv, &cmd); 1176 ret = tda10071_cmd_execute(priv, &cmd);
1173 if (ret) 1177 if (ret)
1174 goto error; 1178 goto error;
1175 1179
1176 for (i = 0; i < ARRAY_SIZE(tab); i++) { 1180 for (i = 0; i < ARRAY_SIZE(tab); i++) {
1177 ret = tda10071_wr_reg_mask(priv, tab[i].reg, tab[i].val, 1181 ret = tda10071_wr_reg_mask(priv, tab[i].reg, tab[i].val,
1178 tab[i].mask); 1182 tab[i].mask);
1179 if (ret) 1183 if (ret)
1180 goto error; 1184 goto error;
1181 } 1185 }
1182 1186
1183 return ret; 1187 return ret;
1184 error: 1188 error:
1185 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret); 1189 dev_dbg(&priv->i2c->dev, "%s: failed=%d\n", __func__, ret);
1186 return ret; 1190 return ret;
1187 } 1191 }
1188 1192
1189 static int tda10071_get_tune_settings(struct dvb_frontend *fe, 1193 static int tda10071_get_tune_settings(struct dvb_frontend *fe,
1190 struct dvb_frontend_tune_settings *s) 1194 struct dvb_frontend_tune_settings *s)
1191 { 1195 {
1192 s->min_delay_ms = 8000; 1196 s->min_delay_ms = 8000;
1193 s->step_size = 0; 1197 s->step_size = 0;
1194 s->max_drift = 0; 1198 s->max_drift = 0;
1195 1199
1196 return 0; 1200 return 0;
1197 } 1201 }
1198 1202
1199 static void tda10071_release(struct dvb_frontend *fe) 1203 static void tda10071_release(struct dvb_frontend *fe)
1200 { 1204 {
1201 struct tda10071_priv *priv = fe->demodulator_priv; 1205 struct tda10071_priv *priv = fe->demodulator_priv;
1202 kfree(priv); 1206 kfree(priv);
1203 } 1207 }
1204 1208
1205 struct dvb_frontend *tda10071_attach(const struct tda10071_config *config, 1209 struct dvb_frontend *tda10071_attach(const struct tda10071_config *config,
1206 struct i2c_adapter *i2c) 1210 struct i2c_adapter *i2c)
1207 { 1211 {
1208 int ret; 1212 int ret;
1209 struct tda10071_priv *priv = NULL; 1213 struct tda10071_priv *priv = NULL;
1210 u8 tmp; 1214 u8 tmp;
1211 1215
1212 /* allocate memory for the internal priv */ 1216 /* allocate memory for the internal priv */
1213 priv = kzalloc(sizeof(struct tda10071_priv), GFP_KERNEL); 1217 priv = kzalloc(sizeof(struct tda10071_priv), GFP_KERNEL);
1214 if (priv == NULL) { 1218 if (priv == NULL) {
1215 ret = -ENOMEM; 1219 ret = -ENOMEM;
1216 goto error; 1220 goto error;
1217 } 1221 }
1218 1222
1219 /* make sure demod i2c address is specified */ 1223 /* make sure demod i2c address is specified */
1220 if (!config->demod_i2c_addr) { 1224 if (!config->demod_i2c_addr) {
1221 dev_dbg(&i2c->dev, "%s: invalid demod i2c address\n", __func__); 1225 dev_dbg(&i2c->dev, "%s: invalid demod i2c address\n", __func__);
1222 ret = -EINVAL; 1226 ret = -EINVAL;
1223 goto error; 1227 goto error;
1224 } 1228 }
1225 1229
1226 /* make sure tuner i2c address is specified */ 1230 /* make sure tuner i2c address is specified */
1227 if (!config->tuner_i2c_addr) { 1231 if (!config->tuner_i2c_addr) {
1228 dev_dbg(&i2c->dev, "%s: invalid tuner i2c address\n", __func__); 1232 dev_dbg(&i2c->dev, "%s: invalid tuner i2c address\n", __func__);
1229 ret = -EINVAL; 1233 ret = -EINVAL;
1230 goto error; 1234 goto error;
1231 } 1235 }
1232 1236
1233 /* setup the priv */ 1237 /* setup the priv */
1234 priv->i2c = i2c; 1238 priv->i2c = i2c;
1235 memcpy(&priv->cfg, config, sizeof(struct tda10071_config)); 1239 memcpy(&priv->cfg, config, sizeof(struct tda10071_config));
1236 1240
1237 /* chip ID */ 1241 /* chip ID */
1238 ret = tda10071_rd_reg(priv, 0xff, &tmp); 1242 ret = tda10071_rd_reg(priv, 0xff, &tmp);
1239 if (ret || tmp != 0x0f) 1243 if (ret || tmp != 0x0f)
1240 goto error; 1244 goto error;
1241 1245
1242 /* chip type */ 1246 /* chip type */
1243 ret = tda10071_rd_reg(priv, 0xdd, &tmp); 1247 ret = tda10071_rd_reg(priv, 0xdd, &tmp);
1244 if (ret || tmp != 0x00) 1248 if (ret || tmp != 0x00)
1245 goto error; 1249 goto error;
1246 1250
1247 /* chip version */ 1251 /* chip version */
1248 ret = tda10071_rd_reg(priv, 0xfe, &tmp); 1252 ret = tda10071_rd_reg(priv, 0xfe, &tmp);
1249 if (ret || tmp != 0x01) 1253 if (ret || tmp != 0x01)
1250 goto error; 1254 goto error;
1251 1255
1252 /* create dvb_frontend */ 1256 /* create dvb_frontend */
1253 memcpy(&priv->fe.ops, &tda10071_ops, sizeof(struct dvb_frontend_ops)); 1257 memcpy(&priv->fe.ops, &tda10071_ops, sizeof(struct dvb_frontend_ops));
1254 priv->fe.demodulator_priv = priv; 1258 priv->fe.demodulator_priv = priv;
1255 1259
1256 return &priv->fe; 1260 return &priv->fe;
1257 error: 1261 error:
1258 dev_dbg(&i2c->dev, "%s: failed=%d\n", __func__, ret); 1262 dev_dbg(&i2c->dev, "%s: failed=%d\n", __func__, ret);
1259 kfree(priv); 1263 kfree(priv);
1260 return NULL; 1264 return NULL;
1261 } 1265 }
1262 EXPORT_SYMBOL(tda10071_attach); 1266 EXPORT_SYMBOL(tda10071_attach);
1263 1267
1264 static struct dvb_frontend_ops tda10071_ops = { 1268 static struct dvb_frontend_ops tda10071_ops = {
1265 .delsys = { SYS_DVBS, SYS_DVBS2 }, 1269 .delsys = { SYS_DVBS, SYS_DVBS2 },
1266 .info = { 1270 .info = {
1267 .name = "NXP TDA10071", 1271 .name = "NXP TDA10071",
1268 .frequency_min = 950000, 1272 .frequency_min = 950000,
1269 .frequency_max = 2150000, 1273 .frequency_max = 2150000,
1270 .frequency_tolerance = 5000, 1274 .frequency_tolerance = 5000,
1271 .symbol_rate_min = 1000000, 1275 .symbol_rate_min = 1000000,
1272 .symbol_rate_max = 45000000, 1276 .symbol_rate_max = 45000000,
1273 .caps = FE_CAN_INVERSION_AUTO | 1277 .caps = FE_CAN_INVERSION_AUTO |
1274 FE_CAN_FEC_1_2 | 1278 FE_CAN_FEC_1_2 |
1275 FE_CAN_FEC_2_3 | 1279 FE_CAN_FEC_2_3 |
1276 FE_CAN_FEC_3_4 | 1280 FE_CAN_FEC_3_4 |
1277 FE_CAN_FEC_4_5 | 1281 FE_CAN_FEC_4_5 |
1278 FE_CAN_FEC_5_6 | 1282 FE_CAN_FEC_5_6 |
1279 FE_CAN_FEC_6_7 | 1283 FE_CAN_FEC_6_7 |
1280 FE_CAN_FEC_7_8 | 1284 FE_CAN_FEC_7_8 |
1281 FE_CAN_FEC_8_9 | 1285 FE_CAN_FEC_8_9 |
1282 FE_CAN_FEC_AUTO | 1286 FE_CAN_FEC_AUTO |
1283 FE_CAN_QPSK | 1287 FE_CAN_QPSK |
1284 FE_CAN_RECOVER | 1288 FE_CAN_RECOVER |
1285 FE_CAN_2G_MODULATION 1289 FE_CAN_2G_MODULATION
1286 }, 1290 },
1287 1291
1288 .release = tda10071_release, 1292 .release = tda10071_release,
1289 1293
1290 .get_tune_settings = tda10071_get_tune_settings, 1294 .get_tune_settings = tda10071_get_tune_settings,
1291 1295
1292 .init = tda10071_init, 1296 .init = tda10071_init,
1293 .sleep = tda10071_sleep, 1297 .sleep = tda10071_sleep,
1294 1298
1295 .set_frontend = tda10071_set_frontend, 1299 .set_frontend = tda10071_set_frontend,
1296 .get_frontend = tda10071_get_frontend, 1300 .get_frontend = tda10071_get_frontend,
1297 1301
1298 .read_status = tda10071_read_status, 1302 .read_status = tda10071_read_status,
1299 .read_snr = tda10071_read_snr, 1303 .read_snr = tda10071_read_snr,
1300 .read_signal_strength = tda10071_read_signal_strength, 1304 .read_signal_strength = tda10071_read_signal_strength,
1301 .read_ber = tda10071_read_ber, 1305 .read_ber = tda10071_read_ber,
1302 .read_ucblocks = tda10071_read_ucblocks, 1306 .read_ucblocks = tda10071_read_ucblocks,
1303 1307
1304 .diseqc_send_master_cmd = tda10071_diseqc_send_master_cmd, 1308 .diseqc_send_master_cmd = tda10071_diseqc_send_master_cmd,
1305 .diseqc_recv_slave_reply = tda10071_diseqc_recv_slave_reply, 1309 .diseqc_recv_slave_reply = tda10071_diseqc_recv_slave_reply,
1306 .diseqc_send_burst = tda10071_diseqc_send_burst, 1310 .diseqc_send_burst = tda10071_diseqc_send_burst,
1307 1311
1308 .set_tone = tda10071_set_tone, 1312 .set_tone = tda10071_set_tone,
1309 .set_voltage = tda10071_set_voltage, 1313 .set_voltage = tda10071_set_voltage,
1310 }; 1314 };
1311 1315
1312 MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>"); 1316 MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
1313 MODULE_DESCRIPTION("NXP TDA10071 DVB-S/S2 demodulator driver"); 1317 MODULE_DESCRIPTION("NXP TDA10071 DVB-S/S2 demodulator driver");
1314 MODULE_LICENSE("GPL"); 1318 MODULE_LICENSE("GPL");
1315 MODULE_FIRMWARE(TDA10071_FIRMWARE); 1319 MODULE_FIRMWARE(TDA10071_FIRMWARE);
1316 1320