diff options
-rw-r--r-- | drivers/media/dvb/frontends/itd1000.c | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/drivers/media/dvb/frontends/itd1000.c b/drivers/media/dvb/frontends/itd1000.c index f7a40a18777a..aa9ccb821fa5 100644 --- a/drivers/media/dvb/frontends/itd1000.c +++ b/drivers/media/dvb/frontends/itd1000.c | |||
@@ -35,21 +35,18 @@ static int debug; | |||
35 | module_param(debug, int, 0644); | 35 | module_param(debug, int, 0644); |
36 | MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off)."); | 36 | MODULE_PARM_DESC(debug, "Turn on/off debugging (default:off)."); |
37 | 37 | ||
38 | #define deb(args...) do { \ | 38 | #define itd_dbg(args...) do { \ |
39 | if (debug) { \ | 39 | if (debug) { \ |
40 | printk(KERN_DEBUG "ITD1000: " args);\ | 40 | printk(KERN_DEBUG "ITD1000: " args);\ |
41 | printk("\n"); \ | ||
42 | } \ | 41 | } \ |
43 | } while (0) | 42 | } while (0) |
44 | 43 | ||
45 | #define warn(args...) do { \ | 44 | #define itd_warn(args...) do { \ |
46 | printk(KERN_WARNING "ITD1000: " args); \ | 45 | printk(KERN_WARNING "ITD1000: " args); \ |
47 | printk("\n"); \ | ||
48 | } while (0) | 46 | } while (0) |
49 | 47 | ||
50 | #define info(args...) do { \ | 48 | #define itd_info(args...) do { \ |
51 | printk(KERN_INFO "ITD1000: " args); \ | 49 | printk(KERN_INFO "ITD1000: " args); \ |
52 | printk("\n"); \ | ||
53 | } while (0) | 50 | } while (0) |
54 | 51 | ||
55 | /* don't write more than one byte with flexcop behind */ | 52 | /* don't write more than one byte with flexcop behind */ |
@@ -62,7 +59,7 @@ static int itd1000_write_regs(struct itd1000_state *state, u8 reg, u8 v[], u8 le | |||
62 | buf[0] = reg; | 59 | buf[0] = reg; |
63 | memcpy(&buf[1], v, len); | 60 | memcpy(&buf[1], v, len); |
64 | 61 | ||
65 | /* deb("wr %02x: %02x", reg, v[0]); */ | 62 | /* itd_dbg("wr %02x: %02x\n", reg, v[0]); */ |
66 | 63 | ||
67 | if (i2c_transfer(state->i2c, &msg, 1) != 1) { | 64 | if (i2c_transfer(state->i2c, &msg, 1) != 1) { |
68 | printk(KERN_WARNING "itd1000 I2C write failed\n"); | 65 | printk(KERN_WARNING "itd1000 I2C write failed\n"); |
@@ -83,7 +80,7 @@ static int itd1000_read_reg(struct itd1000_state *state, u8 reg) | |||
83 | itd1000_write_regs(state, (reg - 1) & 0xff, &state->shadow[(reg - 1) & 0xff], 1); | 80 | itd1000_write_regs(state, (reg - 1) & 0xff, &state->shadow[(reg - 1) & 0xff], 1); |
84 | 81 | ||
85 | if (i2c_transfer(state->i2c, msg, 2) != 2) { | 82 | if (i2c_transfer(state->i2c, msg, 2) != 2) { |
86 | warn("itd1000 I2C read failed"); | 83 | itd_warn("itd1000 I2C read failed\n"); |
87 | return -EREMOTEIO; | 84 | return -EREMOTEIO; |
88 | } | 85 | } |
89 | return val; | 86 | return val; |
@@ -127,14 +124,14 @@ static void itd1000_set_lpf_bw(struct itd1000_state *state, u32 symbol_rate) | |||
127 | u8 bbgvmin = itd1000_read_reg(state, BBGVMIN) & 0xf0; | 124 | u8 bbgvmin = itd1000_read_reg(state, BBGVMIN) & 0xf0; |
128 | u8 bw = itd1000_read_reg(state, BW) & 0xf0; | 125 | u8 bw = itd1000_read_reg(state, BW) & 0xf0; |
129 | 126 | ||
130 | deb("symbol_rate = %d", symbol_rate); | 127 | itd_dbg("symbol_rate = %d\n", symbol_rate); |
131 | 128 | ||
132 | /* not sure what is that ? - starting to download the table */ | 129 | /* not sure what is that ? - starting to download the table */ |
133 | itd1000_write_reg(state, CON1, con1 | (1 << 1)); | 130 | itd1000_write_reg(state, CON1, con1 | (1 << 1)); |
134 | 131 | ||
135 | for (i = 0; i < ARRAY_SIZE(itd1000_lpf_pga); i++) | 132 | for (i = 0; i < ARRAY_SIZE(itd1000_lpf_pga); i++) |
136 | if (symbol_rate < itd1000_lpf_pga[i].symbol_rate) { | 133 | if (symbol_rate < itd1000_lpf_pga[i].symbol_rate) { |
137 | deb("symrate: index: %d pgaext: %x, bbgvmin: %x", i, itd1000_lpf_pga[i].pgaext, itd1000_lpf_pga[i].bbgvmin); | 134 | itd_dbg("symrate: index: %d pgaext: %x, bbgvmin: %x\n", i, itd1000_lpf_pga[i].pgaext, itd1000_lpf_pga[i].bbgvmin); |
138 | itd1000_write_reg(state, PLLFH, pllfh | (itd1000_lpf_pga[i].pgaext << 4)); | 135 | itd1000_write_reg(state, PLLFH, pllfh | (itd1000_lpf_pga[i].pgaext << 4)); |
139 | itd1000_write_reg(state, BBGVMIN, bbgvmin | (itd1000_lpf_pga[i].bbgvmin)); | 136 | itd1000_write_reg(state, BBGVMIN, bbgvmin | (itd1000_lpf_pga[i].bbgvmin)); |
140 | itd1000_write_reg(state, BW, bw | (i & 0x0f)); | 137 | itd1000_write_reg(state, BW, bw | (i & 0x0f)); |
@@ -182,7 +179,7 @@ static void itd1000_set_vco(struct itd1000_state *state, u32 freq_khz) | |||
182 | 179 | ||
183 | adcout = itd1000_read_reg(state, PLLLOCK) & 0x0f; | 180 | adcout = itd1000_read_reg(state, PLLLOCK) & 0x0f; |
184 | 181 | ||
185 | deb("VCO: %dkHz: %d -> ADCOUT: %d %02x", freq_khz, itd1000_vcorg[i].vcorg, adcout, vco_chp1_i2c); | 182 | itd_dbg("VCO: %dkHz: %d -> ADCOUT: %d %02x\n", freq_khz, itd1000_vcorg[i].vcorg, adcout, vco_chp1_i2c); |
186 | 183 | ||
187 | if (adcout > 13) { | 184 | if (adcout > 13) { |
188 | if (!(itd1000_vcorg[i].vcorg == 7 || itd1000_vcorg[i].vcorg == 15)) | 185 | if (!(itd1000_vcorg[i].vcorg == 7 || itd1000_vcorg[i].vcorg == 15)) |
@@ -232,7 +229,7 @@ static void itd1000_set_lo(struct itd1000_state *state, u32 freq_khz) | |||
232 | pllf = (u32) tmp; | 229 | pllf = (u32) tmp; |
233 | 230 | ||
234 | state->frequency = ((plln * 1000) + (pllf * 1000)/1048576) * 2*FREF; | 231 | state->frequency = ((plln * 1000) + (pllf * 1000)/1048576) * 2*FREF; |
235 | deb("frequency: %dkHz (wanted) %dkHz (set), PLLF = %d, PLLN = %d", freq_khz, state->frequency, pllf, plln); | 232 | itd_dbg("frequency: %dkHz (wanted) %dkHz (set), PLLF = %d, PLLN = %d\n", freq_khz, state->frequency, pllf, plln); |
236 | 233 | ||
237 | itd1000_write_reg(state, PLLNH, 0x80); /* PLLNH */; | 234 | itd1000_write_reg(state, PLLNH, 0x80); /* PLLNH */; |
238 | itd1000_write_reg(state, PLLNL, plln & 0xff); | 235 | itd1000_write_reg(state, PLLNL, plln & 0xff); |
@@ -242,7 +239,7 @@ static void itd1000_set_lo(struct itd1000_state *state, u32 freq_khz) | |||
242 | 239 | ||
243 | for (i = 0; i < ARRAY_SIZE(itd1000_fre_values); i++) { | 240 | for (i = 0; i < ARRAY_SIZE(itd1000_fre_values); i++) { |
244 | if (freq_khz <= itd1000_fre_values[i].freq) { | 241 | if (freq_khz <= itd1000_fre_values[i].freq) { |
245 | deb("fre_values: %d", i); | 242 | itd_dbg("fre_values: %d\n", i); |
246 | itd1000_write_reg(state, RFTR, itd1000_fre_values[i].values[0]); | 243 | itd1000_write_reg(state, RFTR, itd1000_fre_values[i].values[0]); |
247 | for (j = 0; j < 9; j++) | 244 | for (j = 0; j < 9; j++) |
248 | itd1000_write_reg(state, RFST1+j, itd1000_fre_values[i].values[j+1]); | 245 | itd1000_write_reg(state, RFST1+j, itd1000_fre_values[i].values[j+1]); |
@@ -382,7 +379,7 @@ struct dvb_frontend *itd1000_attach(struct dvb_frontend *fe, struct i2c_adapter | |||
382 | kfree(state); | 379 | kfree(state); |
383 | return NULL; | 380 | return NULL; |
384 | } | 381 | } |
385 | info("successfully identified (ID: %d)", i); | 382 | itd_info("successfully identified (ID: %d)\n", i); |
386 | 383 | ||
387 | memset(state->shadow, 0xff, sizeof(state->shadow)); | 384 | memset(state->shadow, 0xff, sizeof(state->shadow)); |
388 | for (i = 0x65; i < 0x9c; i++) | 385 | for (i = 0x65; i < 0x9c; i++) |