aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/media/dvb/dvb-core/dvb_frontend.h1
-rw-r--r--drivers/media/dvb/frontends/bsbe1.h123
-rw-r--r--drivers/media/dvb/frontends/lnbp21.h139
-rw-r--r--drivers/media/dvb/ttpci/budget.c141
4 files changed, 267 insertions, 137 deletions
diff --git a/drivers/media/dvb/dvb-core/dvb_frontend.h b/drivers/media/dvb/dvb-core/dvb_frontend.h
index 70a6d14efda7..d5aee5ad67a0 100644
--- a/drivers/media/dvb/dvb-core/dvb_frontend.h
+++ b/drivers/media/dvb/dvb-core/dvb_frontend.h
@@ -104,6 +104,7 @@ struct dvb_frontend {
104 struct dvb_adapter *dvb; 104 struct dvb_adapter *dvb;
105 void* demodulator_priv; 105 void* demodulator_priv;
106 void* frontend_priv; 106 void* frontend_priv;
107 void* misc_priv;
107}; 108};
108 109
109extern int dvb_register_frontend(struct dvb_adapter* dvb, 110extern int dvb_register_frontend(struct dvb_adapter* dvb,
diff --git a/drivers/media/dvb/frontends/bsbe1.h b/drivers/media/dvb/frontends/bsbe1.h
new file mode 100644
index 000000000000..78573b22ada9
--- /dev/null
+++ b/drivers/media/dvb/frontends/bsbe1.h
@@ -0,0 +1,123 @@
1/*
2 * bsbe1.h - ALPS BSBE1 tuner support (moved from av7110.c)
3 *
4 * This program is free software; you can redistribute it and/or
5 * modify it under the terms of the GNU General Public License
6 * as published by the Free Software Foundation; either version 2
7 * of the License, or (at your option) any later version.
8 *
9 *
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 *
16 * You should have received a copy of the GNU General Public License
17 * along with this program; if not, write to the Free Software
18 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
19 * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
20 *
21 *
22 * the project's page is at http://www.linuxtv.org
23 */
24
25#ifndef BSBE1_H
26#define BSBE1_H
27
28static u8 alps_bsbe1_inittab[] = {
29 0x01, 0x15,
30 0x02, 0x30,
31 0x03, 0x00,
32 0x04, 0x7d, /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */
33 0x05, 0x35, /* I2CT = 0, SCLT = 1, SDAT = 1 */
34 0x06, 0x40, /* DAC not used, set to high impendance mode */
35 0x07, 0x00, /* DAC LSB */
36 0x08, 0x40, /* DiSEqC off, LNB power on OP2/LOCK pin on */
37 0x09, 0x00, /* FIFO */
38 0x0c, 0x51, /* OP1 ctl = Normal, OP1 val = 1 (LNB Power ON) */
39 0x0d, 0x82, /* DC offset compensation = ON, beta_agc1 = 2 */
40 0x0e, 0x23, /* alpha_tmg = 2, beta_tmg = 3 */
41 0x10, 0x3f, // AGC2 0x3d
42 0x11, 0x84,
43 0x12, 0xb9,
44 0x15, 0xc9, // lock detector threshold
45 0x16, 0x00,
46 0x17, 0x00,
47 0x18, 0x00,
48 0x19, 0x00,
49 0x1a, 0x00,
50 0x1f, 0x50,
51 0x20, 0x00,
52 0x21, 0x00,
53 0x22, 0x00,
54 0x23, 0x00,
55 0x28, 0x00, // out imp: normal out type: parallel FEC mode:0
56 0x29, 0x1e, // 1/2 threshold
57 0x2a, 0x14, // 2/3 threshold
58 0x2b, 0x0f, // 3/4 threshold
59 0x2c, 0x09, // 5/6 threshold
60 0x2d, 0x05, // 7/8 threshold
61 0x2e, 0x01,
62 0x31, 0x1f, // test all FECs
63 0x32, 0x19, // viterbi and synchro search
64 0x33, 0xfc, // rs control
65 0x34, 0x93, // error control
66 0x0f, 0x92,
67 0xff, 0xff
68};
69
70
71static int alps_bsbe1_set_symbol_rate(struct dvb_frontend* fe, u32 srate, u32 ratio)
72{
73 u8 aclk = 0;
74 u8 bclk = 0;
75
76 if (srate < 1500000) { aclk = 0xb7; bclk = 0x47; }
77 else if (srate < 3000000) { aclk = 0xb7; bclk = 0x4b; }
78 else if (srate < 7000000) { aclk = 0xb7; bclk = 0x4f; }
79 else if (srate < 14000000) { aclk = 0xb7; bclk = 0x53; }
80 else if (srate < 30000000) { aclk = 0xb6; bclk = 0x53; }
81 else if (srate < 45000000) { aclk = 0xb4; bclk = 0x51; }
82
83 stv0299_writereg(fe, 0x13, aclk);
84 stv0299_writereg(fe, 0x14, bclk);
85 stv0299_writereg(fe, 0x1f, (ratio >> 16) & 0xff);
86 stv0299_writereg(fe, 0x20, (ratio >> 8) & 0xff);
87 stv0299_writereg(fe, 0x21, (ratio ) & 0xf0);
88
89 return 0;
90}
91
92static int alps_bsbe1_pll_set(struct dvb_frontend* fe, struct i2c_adapter *i2c, struct dvb_frontend_parameters* params)
93{
94 int ret;
95 u8 data[4];
96 u32 div;
97 struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };
98
99 if ((params->frequency < 950000) || (params->frequency > 2150000))
100 return -EINVAL;
101
102 div = (params->frequency + (125 - 1)) / 125; // round correctly
103 data[0] = (div >> 8) & 0x7f;
104 data[1] = div & 0xff;
105 data[2] = 0x80 | ((div & 0x18000) >> 10) | 4;
106 data[3] = (params->frequency > 1530000) ? 0xE0 : 0xE4;
107
108 ret = i2c_transfer(i2c, &msg, 1);
109 return (ret != 1) ? -EIO : 0;
110}
111
112static struct stv0299_config alps_bsbe1_config = {
113 .demod_address = 0x68,
114 .inittab = alps_bsbe1_inittab,
115 .mclk = 88000000UL,
116 .invert = 1,
117 .skip_reinit = 0,
118 .min_delay_ms = 100,
119 .set_symbol_rate = alps_bsbe1_set_symbol_rate,
120 .pll_set = alps_bsbe1_pll_set,
121};
122
123#endif
diff --git a/drivers/media/dvb/frontends/lnbp21.h b/drivers/media/dvb/frontends/lnbp21.h
new file mode 100644
index 000000000000..0dcbe61b61b1
--- /dev/null
+++ b/drivers/media/dvb/frontends/lnbp21.h
@@ -0,0 +1,139 @@
1/*
2 * lnbp21.h - driver for lnb supply and control ic lnbp21
3 *
4 * Copyright (C) 2006 Oliver Endriss
5 *
6 * This program is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU General Public License
8 * as published by the Free Software Foundation; either version 2
9 * of the License, or (at your option) any later version.
10 *
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details.
16 *
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
21 * Or, point your browser to http://www.gnu.org/copyleft/gpl.html
22 *
23 *
24 * the project's page is at http://www.linuxtv.org
25 */
26
27#ifndef _LNBP21_H
28#define _LNBP21_H
29
30/* system register */
31#define LNBP21_OLF 0x01
32#define LNBP21_OTF 0x02
33#define LNBP21_EN 0x04
34#define LNBP21_VSEL 0x08
35#define LNBP21_LLC 0x10
36#define LNBP21_TEN 0x20
37#define LNBP21_ISEL 0x40
38#define LNBP21_PCL 0x80
39
40struct lnbp21 {
41 u8 config;
42 u8 override_or;
43 u8 override_and;
44 struct i2c_adapter *i2c;
45 void (*release_chain)(struct dvb_frontend* fe);
46};
47
48static int lnbp21_set_voltage(struct dvb_frontend *fe, fe_sec_voltage_t voltage)
49{
50 struct lnbp21 *lnbp21 = (struct lnbp21 *) fe->misc_priv;
51 struct i2c_msg msg = { .addr = 0x08, .flags = 0,
52 .buf = &lnbp21->config,
53 .len = sizeof(lnbp21->config) };
54
55 lnbp21->config &= ~(LNBP21_VSEL | LNBP21_EN);
56
57 switch(voltage) {
58 case SEC_VOLTAGE_OFF:
59 break;
60 case SEC_VOLTAGE_13:
61 lnbp21->config |= LNBP21_EN;
62 break;
63 case SEC_VOLTAGE_18:
64 lnbp21->config |= (LNBP21_EN | LNBP21_VSEL);
65 break;
66 default:
67 return -EINVAL;
68 };
69
70 lnbp21->config |= lnbp21->override_or;
71 lnbp21->config &= lnbp21->override_and;
72
73 return (i2c_transfer(lnbp21->i2c, &msg, 1) == 1) ? 0 : -EIO;
74}
75
76static int lnbp21_enable_high_lnb_voltage(struct dvb_frontend *fe, long arg)
77{
78 struct lnbp21 *lnbp21 = (struct lnbp21 *) fe->misc_priv;
79 struct i2c_msg msg = { .addr = 0x08, .flags = 0,
80 .buf = &lnbp21->config,
81 .len = sizeof(lnbp21->config) };
82
83 if (arg)
84 lnbp21->config |= LNBP21_LLC;
85 else
86 lnbp21->config &= ~LNBP21_LLC;
87
88 lnbp21->config |= lnbp21->override_or;
89 lnbp21->config &= lnbp21->override_and;
90
91 return (i2c_transfer(lnbp21->i2c, &msg, 1) == 1) ? 0 : -EIO;
92}
93
94static void lnbp21_exit(struct dvb_frontend *fe)
95{
96 struct lnbp21 *lnbp21 = (struct lnbp21 *) fe->misc_priv;
97
98 /* LNBP power off */
99 lnbp21_set_voltage(fe, SEC_VOLTAGE_OFF);
100
101 /* free data & call next release routine */
102 fe->ops->release = lnbp21->release_chain;
103 kfree(fe->misc_priv);
104 fe->misc_priv = NULL;
105 if (fe->ops->release)
106 fe->ops->release(fe);
107}
108
109static int lnbp21_init(struct dvb_frontend *fe, struct i2c_adapter *i2c, u8 override_set, u8 override_clear)
110{
111 struct lnbp21 *lnbp21 = kmalloc(sizeof(struct lnbp21), GFP_KERNEL);
112
113 if (!lnbp21)
114 return -ENOMEM;
115
116 /* default configuration */
117 lnbp21->config = LNBP21_ISEL;
118
119 /* bits which should be forced to '1' */
120 lnbp21->override_or = override_set;
121
122 /* bits which should be forced to '0' */
123 lnbp21->override_and = ~override_clear;
124
125 /* install release callback */
126 lnbp21->release_chain = fe->ops->release;
127 fe->ops->release = lnbp21_exit;
128
129 /* override frontend ops */
130 fe->ops->set_voltage = lnbp21_set_voltage;
131 fe->ops->enable_high_lnb_voltage = lnbp21_enable_high_lnb_voltage;
132
133 lnbp21->i2c = i2c;
134 fe->misc_priv = lnbp21;
135
136 return lnbp21_set_voltage(fe, SEC_VOLTAGE_OFF);
137}
138
139#endif
diff --git a/drivers/media/dvb/ttpci/budget.c b/drivers/media/dvb/ttpci/budget.c
index 238c77b52f89..2a0e3efd81c7 100644
--- a/drivers/media/dvb/ttpci/budget.c
+++ b/drivers/media/dvb/ttpci/budget.c
@@ -41,6 +41,8 @@
41#include "l64781.h" 41#include "l64781.h"
42#include "tda8083.h" 42#include "tda8083.h"
43#include "s5h1420.h" 43#include "s5h1420.h"
44#include "lnbp21.h"
45#include "bsbe1.h"
44 46
45static void Set22K (struct budget *budget, int state) 47static void Set22K (struct budget *budget, int state)
46{ 48{
@@ -184,64 +186,6 @@ static int budget_diseqc_send_burst(struct dvb_frontend* fe, fe_sec_mini_cmd_t m
184 return 0; 186 return 0;
185} 187}
186 188
187static int lnbp21_set_voltage(struct dvb_frontend* fe, fe_sec_voltage_t voltage)
188{
189 struct budget* budget = (struct budget*) fe->dvb->priv;
190 u8 buf;
191 struct i2c_msg msg = { .addr = 0x08, .flags = I2C_M_RD, .buf = &buf, .len = sizeof(buf) };
192
193 if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
194
195 switch(voltage) {
196 case SEC_VOLTAGE_13:
197 buf = (buf & 0xf7) | 0x04;
198 break;
199
200 case SEC_VOLTAGE_18:
201 buf = (buf & 0xf7) | 0x0c;
202 break;
203
204 case SEC_VOLTAGE_OFF:
205 buf = buf & 0xf0;
206 break;
207 }
208
209 msg.flags = 0;
210 if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
211
212 return 0;
213}
214
215static int lnbp21_enable_high_lnb_voltage(struct dvb_frontend* fe, long arg)
216{
217 struct budget* budget = (struct budget*) fe->dvb->priv;
218 u8 buf;
219 struct i2c_msg msg = { .addr = 0x08, .flags = I2C_M_RD, .buf = &buf, .len = sizeof(buf) };
220
221 if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
222
223 if (arg) {
224 buf = buf | 0x10;
225 } else {
226 buf = buf & 0xef;
227 }
228
229 msg.flags = 0;
230 if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1) return -EIO;
231
232 return 0;
233}
234
235static int lnbp21_init(struct budget* budget)
236{
237 u8 buf = 0x00;
238 struct i2c_msg msg = { .addr = 0x08, .flags = 0, .buf = &buf, .len = sizeof(buf) };
239
240 if (i2c_transfer (&budget->i2c_adap, &msg, 1) != 1)
241 return -EIO;
242 return 0;
243}
244
245static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) 189static int alps_bsrv2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
246{ 190{
247 struct budget* budget = (struct budget*) fe->dvb->priv; 191 struct budget* budget = (struct budget*) fe->dvb->priv;
@@ -374,79 +318,6 @@ static struct stv0299_config alps_bsru6_config = {
374 .pll_set = alps_bsru6_pll_set, 318 .pll_set = alps_bsru6_pll_set,
375}; 319};
376 320
377static u8 alps_bsbe1_inittab[] = {
378 0x01, 0x15,
379 0x02, 0x30,
380 0x03, 0x00,
381 0x04, 0x7d, /* F22FR = 0x7d, F22 = f_VCO / 128 / 0x7d = 22 kHz */
382 0x05, 0x35, /* I2CT = 0, SCLT = 1, SDAT = 1 */
383 0x06, 0x40, /* DAC not used, set to high impendance mode */
384 0x07, 0x00, /* DAC LSB */
385 0x08, 0x40, /* DiSEqC off, LNB power on OP2/LOCK pin on */
386 0x09, 0x00, /* FIFO */
387 0x0c, 0x51, /* OP1 ctl = Normal, OP1 val = 1 (LNB Power ON) */
388 0x0d, 0x82, /* DC offset compensation = ON, beta_agc1 = 2 */
389 0x0e, 0x23, /* alpha_tmg = 2, beta_tmg = 3 */
390 0x10, 0x3f, // AGC2 0x3d
391 0x11, 0x84,
392 0x12, 0xb9,
393 0x15, 0xc9, // lock detector threshold
394 0x16, 0x00,
395 0x17, 0x00,
396 0x18, 0x00,
397 0x19, 0x00,
398 0x1a, 0x00,
399 0x1f, 0x50,
400 0x20, 0x00,
401 0x21, 0x00,
402 0x22, 0x00,
403 0x23, 0x00,
404 0x28, 0x00, // out imp: normal out type: parallel FEC mode:0
405 0x29, 0x1e, // 1/2 threshold
406 0x2a, 0x14, // 2/3 threshold
407 0x2b, 0x0f, // 3/4 threshold
408 0x2c, 0x09, // 5/6 threshold
409 0x2d, 0x05, // 7/8 threshold
410 0x2e, 0x01,
411 0x31, 0x1f, // test all FECs
412 0x32, 0x19, // viterbi and synchro search
413 0x33, 0xfc, // rs control
414 0x34, 0x93, // error control
415 0x0f, 0x92, // 0x80 = inverse AGC
416 0xff, 0xff
417};
418
419static int alps_bsbe1_pll_set(struct dvb_frontend* fe, struct i2c_adapter *i2c, struct dvb_frontend_parameters* params)
420{
421 int ret;
422 u8 data[4];
423 u32 div;
424 struct i2c_msg msg = { .addr = 0x61, .flags = 0, .buf = data, .len = sizeof(data) };
425
426 if ((params->frequency < 950000) || (params->frequency > 2150000))
427 return -EINVAL;
428
429 div = (params->frequency + (125 - 1)) / 125; // round correctly
430 data[0] = (div >> 8) & 0x7f;
431 data[1] = div & 0xff;
432 data[2] = 0x80 | ((div & 0x18000) >> 10) | 4;
433 data[3] = (params->frequency > 1530000) ? 0xE0 : 0xE4;
434
435 ret = i2c_transfer(i2c, &msg, 1);
436 return (ret != 1) ? -EIO : 0;
437}
438
439static struct stv0299_config alps_bsbe1_config = {
440 .demod_address = 0x68,
441 .inittab = alps_bsbe1_inittab,
442 .mclk = 88000000UL,
443 .invert = 1,
444 .skip_reinit = 0,
445 .min_delay_ms = 100,
446 .set_symbol_rate = alps_bsru6_set_symbol_rate,
447 .pll_set = alps_bsbe1_pll_set,
448};
449
450static int alps_tdbe2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params) 321static int alps_tdbe2_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
451{ 322{
452 struct budget* budget = (struct budget*) fe->dvb->priv; 323 struct budget* budget = (struct budget*) fe->dvb->priv;
@@ -584,10 +455,8 @@ static void frontend_init(struct budget *budget)
584 // try the ALPS BSBE1 now 455 // try the ALPS BSBE1 now
585 budget->dvb_frontend = stv0299_attach(&alps_bsbe1_config, &budget->i2c_adap); 456 budget->dvb_frontend = stv0299_attach(&alps_bsbe1_config, &budget->i2c_adap);
586 if (budget->dvb_frontend) { 457 if (budget->dvb_frontend) {
587 budget->dvb_frontend->ops->set_voltage = lnbp21_set_voltage;
588 budget->dvb_frontend->ops->enable_high_lnb_voltage = lnbp21_enable_high_lnb_voltage;
589 budget->dvb_frontend->ops->dishnetwork_send_legacy_command = NULL; 458 budget->dvb_frontend->ops->dishnetwork_send_legacy_command = NULL;
590 if (lnbp21_init(budget)) { 459 if (lnbp21_init(budget->dvb_frontend, &budget->i2c_adap, LNBP21_LLC, 0)) {
591 printk("%s: No LNBP21 found!\n", __FUNCTION__); 460 printk("%s: No LNBP21 found!\n", __FUNCTION__);
592 goto error_out; 461 goto error_out;
593 } 462 }
@@ -646,9 +515,7 @@ static void frontend_init(struct budget *budget)
646 case 0x1016: // Hauppauge/TT Nova-S SE (samsung s5h1420/????(tda8260)) 515 case 0x1016: // Hauppauge/TT Nova-S SE (samsung s5h1420/????(tda8260))
647 budget->dvb_frontend = s5h1420_attach(&s5h1420_config, &budget->i2c_adap); 516 budget->dvb_frontend = s5h1420_attach(&s5h1420_config, &budget->i2c_adap);
648 if (budget->dvb_frontend) { 517 if (budget->dvb_frontend) {
649 budget->dvb_frontend->ops->set_voltage = lnbp21_set_voltage; 518 if (lnbp21_init(budget->dvb_frontend, &budget->i2c_adap, 0, 0)) {
650 budget->dvb_frontend->ops->enable_high_lnb_voltage = lnbp21_enable_high_lnb_voltage;
651 if (lnbp21_init(budget)) {
652 printk("%s: No LNBP21 found!\n", __FUNCTION__); 519 printk("%s: No LNBP21 found!\n", __FUNCTION__);
653 goto error_out; 520 goto error_out;
654 } 521 }
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-25 07:01:05 -0500