aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/dvb/frontends/zl10353.c14
-rw-r--r--drivers/media/dvb/frontends/zl10353_priv.h7
2 files changed, 14 insertions, 7 deletions
diff --git a/drivers/media/dvb/frontends/zl10353.c b/drivers/media/dvb/frontends/zl10353.c
index dbb53ba6f414..245f9b7dddfa 100644
--- a/drivers/media/dvb/frontends/zl10353.c
+++ b/drivers/media/dvb/frontends/zl10353.c
@@ -258,9 +258,9 @@ static int zl10353_read_ber(struct dvb_frontend *fe, u32 *ber)
258{ 258{
259 struct zl10353_state *state = fe->demodulator_priv; 259 struct zl10353_state *state = fe->demodulator_priv;
260 260
261 *ber = zl10353_read_register(state, 0x11) << 16 | 261 *ber = zl10353_read_register(state, RS_ERR_CNT_2) << 16 |
262 zl10353_read_register(state, 0x12) << 8 | 262 zl10353_read_register(state, RS_ERR_CNT_1) << 8 |
263 zl10353_read_register(state, 0x13); 263 zl10353_read_register(state, RS_ERR_CNT_0);
264 264
265 return 0; 265 return 0;
266} 266}
@@ -269,8 +269,8 @@ static int zl10353_read_signal_strength(struct dvb_frontend *fe, u16 *strength)
269{ 269{
270 struct zl10353_state *state = fe->demodulator_priv; 270 struct zl10353_state *state = fe->demodulator_priv;
271 271
272 u16 signal = zl10353_read_register(state, 0x0a) << 10 | 272 u16 signal = zl10353_read_register(state, AGC_GAIN_1) << 10 |
273 zl10353_read_register(state, 0x0b) << 2 | 3; 273 zl10353_read_register(state, AGC_GAIN_0) << 2 | 3;
274 274
275 *strength = ~signal; 275 *strength = ~signal;
276 276
@@ -295,8 +295,8 @@ static int zl10353_read_ucblocks(struct dvb_frontend *fe, u32 *ucblocks)
295{ 295{
296 struct zl10353_state *state = fe->demodulator_priv; 296 struct zl10353_state *state = fe->demodulator_priv;
297 297
298 *ucblocks = zl10353_read_register(state, 0x14) << 8 | 298 *ucblocks = zl10353_read_register(state, RS_UBC_1) << 8 |
299 zl10353_read_register(state, 0x15); 299 zl10353_read_register(state, RS_UBC_0);
300 300
301 return 0; 301 return 0;
302} 302}
diff --git a/drivers/media/dvb/frontends/zl10353_priv.h b/drivers/media/dvb/frontends/zl10353_priv.h
index d2186927f8f1..4962434b35e7 100644
--- a/drivers/media/dvb/frontends/zl10353_priv.h
+++ b/drivers/media/dvb/frontends/zl10353_priv.h
@@ -38,7 +38,14 @@ enum zl10353_reg_addr {
38 STATUS_7 = 0x07, 38 STATUS_7 = 0x07,
39 STATUS_8 = 0x08, 39 STATUS_8 = 0x08,
40 STATUS_9 = 0x09, 40 STATUS_9 = 0x09,
41 AGC_GAIN_1 = 0x0A,
42 AGC_GAIN_0 = 0x0B,
41 SNR = 0x10, 43 SNR = 0x10,
44 RS_ERR_CNT_2 = 0x11,
45 RS_ERR_CNT_1 = 0x12,
46 RS_ERR_CNT_0 = 0x13,
47 RS_UBC_1 = 0x14,
48 RS_UBC_0 = 0x15,
42 TRL_NOMINAL_RATE_1 = 0x65, 49 TRL_NOMINAL_RATE_1 = 0x65,
43 TRL_NOMINAL_RATE_0 = 0x66, 50 TRL_NOMINAL_RATE_0 = 0x66,
44 CHIP_ID = 0x7F, 51 CHIP_ID = 0x7F,