All of lore.kernel.org
 help / color / mirror / Atom feed
From: Antti Palosaari <crope@iki.fi>
To: linux-media@vger.kernel.org
Cc: Antti Palosaari <crope@iki.fi>
Subject: [REVIEW PATCH 20/41] it913x: include tuner IDs from af9033.h
Date: Sun, 10 Mar 2013 04:03:12 +0200	[thread overview]
Message-ID: <1362881013-5271-20-git-send-email-crope@iki.fi> (raw)
In-Reply-To: <1362881013-5271-1-git-send-email-crope@iki.fi>

Signed-off-by: Antti Palosaari <crope@iki.fi>
---
 drivers/media/tuners/it913x.c      | 24 ++++++++++++------------
 drivers/media/tuners/it913x_priv.h | 10 +---------
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/drivers/media/tuners/it913x.c b/drivers/media/tuners/it913x.c
index 6ae9d5a..1cb9709 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 315ff6c..1491bf8 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
-- 
1.7.11.7


  parent reply	other threads:[~2013-03-10  2:04 UTC|newest]

Thread overview: 45+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-03-10  2:02 [REVIEW PATCH 01/41] ITE IT913X silicon tuner driver Antti Palosaari
2013-03-10  2:02 ` [REVIEW PATCH 02/41] af9033: support for it913x tuners Antti Palosaari
2013-03-10  2:02 ` [REVIEW PATCH 03/41] af9035: add support for 1st gen it9135 Antti Palosaari
2013-03-10  2:02 ` [REVIEW PATCH 04/41] af9035: add auto configuration heuristic for it9135 Antti Palosaari
2013-03-10  2:02 ` [REVIEW PATCH 05/41] af9035: fix af9033 demod sampling frequency Antti Palosaari
2013-03-10  2:02 ` [REVIEW PATCH 06/41] af9015: reject device TerraTec Cinergy T Stick Dual RC (rev. 2) Antti Palosaari
2013-03-10  2:02 ` [REVIEW PATCH 07/41] af9035: [0ccd:0099] " Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 08/41] af9035: constify clock tables Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 09/41] af9035: USB1.1 support (== PID filters) Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 10/41] af9035: merge af9035 and it9135 eeprom read routines Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 11/41] af9035: basic support for IT9135 v2 chips Antti Palosaari
2013-03-21 21:54   ` Mauro Carvalho Chehab
2013-03-21 23:45     ` Antti Palosaari
2013-03-22  9:30       ` Mauro Carvalho Chehab
2013-03-22 10:45         ` Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 12/41] af9033: IT9135 v2 supported related changes Antti Palosaari
2013-03-10  2:03 ` =?y?q?=5BREVIEW=20PATCH=2013/41=5D=20af9035=3A=20IT9135=20dual=20tuner=20related=20changes?= Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 14/41] it913x: merge it913x_fe_start() to it913x_init_tuner() Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 15/41] it913x: merge it913x_fe_suspend() to it913x_fe_sleep() Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 16/41] it913x: rename functions and variables Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 17/41] it913x: tuner power up routines Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 18/41] it913x: get rid of it913x config struct Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 19/41] it913x: remove unused variables Antti Palosaari
2013-03-10  2:03 ` Antti Palosaari [this message]
2013-03-10  2:03 ` [REVIEW PATCH 21/41] it913x: use dev_foo() logging Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 22/41] af9033: add IT9135 demod reg init tables Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 23/41] it913x: remove demod init reg tables Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 24/41] af9035: select firmware loader according to firmware Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 25/41] af9035: use already detected eeprom base addr Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 26/41] af9035: set demod TS mode config in read_config() Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 27/41] af9035: enable remote controller for IT9135 too Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 28/41] af9035: change dual mode boolean to bit field Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 29/41] af9033: add IT9135 tuner config "38" init table Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 30/41] af9033: add IT9135 tuner config "51" " Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 31/41] af9033: add IT9135 tuner config "52" " Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 32/41] af9033: add IT9135 tuner config "60" " Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 33/41] af9033: add IT9135 tuner config "61" " Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 34/41] af9033: add IT9135 tuner config "62" " Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 35/41] it913x: remove unused af9033 demod tuner config inits Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 36/41] af9033: move code from it913x to af9033 Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 37/41] af9033: sleep on attach() Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 38/41] af9033: implement i/o optimized reg table writer Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 39/41] af9035: check I/O errors on IR polling Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 40/41] af9035: style changes for remote controller polling Antti Palosaari
2013-03-10  2:03 ` [REVIEW PATCH 41/41] MAINTAINERS: add drivers/media/tuners/it913x* Antti Palosaari

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1362881013-5271-20-git-send-email-crope@iki.fi \
    --to=crope@iki.fi \
    --cc=linux-media@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.