aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2013-02-28 18:14:38 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-21 17:59:17 -0400
commitc0d300a66979c7a836c75f6e2d33727543245368 (patch)
tree5a0f71918624eb12959dd02fa19f56aeb85bc7c0
parent108597979297c75646889e307e276db57aa6d5b8 (diff)
[media] it913x: include tuner IDs from af9033.h
Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/tuners/it913x.c24
-rw-r--r--drivers/media/tuners/it913x_priv.h10
2 files changed, 13 insertions, 21 deletions
diff --git a/drivers/media/tuners/it913x.c b/drivers/media/tuners/it913x.c
index 6ae9d5ae9654..1cb97092f562 100644
--- a/drivers/media/tuners/it913x.c
+++ b/drivers/media/tuners/it913x.c
@@ -156,22 +156,22 @@ static int it913x_init(struct dvb_frontend *fe)
156 156
157 /* LNA Scripts */ 157 /* LNA Scripts */
158 switch (state->tuner_type) { 158 switch (state->tuner_type) {
159 case IT9135_51: 159 case AF9033_TUNER_IT9135_51:
160 set_lna = it9135_51; 160 set_lna = it9135_51;
161 break; 161 break;
162 case IT9135_52: 162 case AF9033_TUNER_IT9135_52:
163 set_lna = it9135_52; 163 set_lna = it9135_52;
164 break; 164 break;
165 case IT9135_60: 165 case AF9033_TUNER_IT9135_60:
166 set_lna = it9135_60; 166 set_lna = it9135_60;
167 break; 167 break;
168 case IT9135_61: 168 case AF9033_TUNER_IT9135_61:
169 set_lna = it9135_61; 169 set_lna = it9135_61;
170 break; 170 break;
171 case IT9135_62: 171 case AF9033_TUNER_IT9135_62:
172 set_lna = it9135_62; 172 set_lna = it9135_62;
173 break; 173 break;
174 case IT9135_38: 174 case AF9033_TUNER_IT9135_38:
175 default: 175 default:
176 set_lna = it9135_38; 176 set_lna = it9135_38;
177 } 177 }
@@ -444,14 +444,14 @@ struct dvb_frontend *it913x_attach(struct dvb_frontend *fe,
444 state->i2c_addr = i2c_addr; 444 state->i2c_addr = i2c_addr;
445 445
446 switch (config) { 446 switch (config) {
447 case IT9135_38: 447 case AF9033_TUNER_IT9135_38:
448 case IT9135_51: 448 case AF9033_TUNER_IT9135_51:
449 case IT9135_52: 449 case AF9033_TUNER_IT9135_52:
450 state->chip_ver = 0x01; 450 state->chip_ver = 0x01;
451 break; 451 break;
452 case IT9135_60: 452 case AF9033_TUNER_IT9135_60:
453 case IT9135_61: 453 case AF9033_TUNER_IT9135_61:
454 case IT9135_62: 454 case AF9033_TUNER_IT9135_62:
455 state->chip_ver = 0x02; 455 state->chip_ver = 0x02;
456 break; 456 break;
457 default: 457 default:
diff --git a/drivers/media/tuners/it913x_priv.h b/drivers/media/tuners/it913x_priv.h
index 315ff6c72c53..1491bf85dc34 100644
--- a/drivers/media/tuners/it913x_priv.h
+++ b/drivers/media/tuners/it913x_priv.h
@@ -24,15 +24,7 @@
24#define IT913X_PRIV_H 24#define IT913X_PRIV_H
25 25
26#include "it913x.h" 26#include "it913x.h"
27 27#include "af9033.h"
28/* Build in tuner types */
29#define IT9137 0x38
30#define IT9135_38 0x38
31#define IT9135_51 0x51
32#define IT9135_52 0x52
33#define IT9135_60 0x60
34#define IT9135_61 0x61
35#define IT9135_62 0x62
36 28
37#define PRO_LINK 0x0 29#define PRO_LINK 0x0
38#define PRO_DMOD 0x1 30#define PRO_DMOD 0x1