summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntti Palosaari <crope@iki.fi>2013-03-01 03:14:38 +0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2013-03-22 01:59:17 +0400
commitc0d300a66979c7a836c75f6e2d33727543245368 (patch)
tree5a0f71918624eb12959dd02fa19f56aeb85bc7c0
parent108597979297c75646889e307e276db57aa6d5b8 (diff)
downloadlinux-c0d300a66979c7a836c75f6e2d33727543245368.tar.xz
[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)
/* LNA Scripts */
switch (state->tuner_type) {
- case IT9135_51:
+ case AF9033_TUNER_IT9135_51:
set_lna = it9135_51;
break;
- case IT9135_52:
+ case AF9033_TUNER_IT9135_52:
set_lna = it9135_52;
break;
- case IT9135_60:
+ case AF9033_TUNER_IT9135_60:
set_lna = it9135_60;
break;
- case IT9135_61:
+ case AF9033_TUNER_IT9135_61:
set_lna = it9135_61;
break;
- case IT9135_62:
+ case AF9033_TUNER_IT9135_62:
set_lna = it9135_62;
break;
- case IT9135_38:
+ case AF9033_TUNER_IT9135_38:
default:
set_lna = it9135_38;
}
@@ -444,14 +444,14 @@ struct dvb_frontend *it913x_attach(struct dvb_frontend *fe,
state->i2c_addr = i2c_addr;
switch (config) {
- case IT9135_38:
- case IT9135_51:
- case IT9135_52:
+ case AF9033_TUNER_IT9135_38:
+ case AF9033_TUNER_IT9135_51:
+ case AF9033_TUNER_IT9135_52:
state->chip_ver = 0x01;
break;
- case IT9135_60:
- case IT9135_61:
- case IT9135_62:
+ case AF9033_TUNER_IT9135_60:
+ case AF9033_TUNER_IT9135_61:
+ case AF9033_TUNER_IT9135_62:
state->chip_ver = 0x02;
break;
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 @@
#define IT913X_PRIV_H
#include "it913x.h"
-
-/* Build in tuner types */
-#define IT9137 0x38
-#define IT9135_38 0x38
-#define IT9135_51 0x51
-#define IT9135_52 0x52
-#define IT9135_60 0x60
-#define IT9135_61 0x61
-#define IT9135_62 0x62
+#include "af9033.h"
#define PRO_LINK 0x0
#define PRO_DMOD 0x1