From 56ba5fc96e01e60f327a03e4a7c3257e64bd8ed9 Mon Sep 17 00:00:00 2001 From: Antti Palosaari Date: Fri, 13 Aug 2010 03:49:24 -0300 Subject: [PATCH] --- yaml --- r: 219049 b: refs/heads/master c: 2158e5090b5cc99ba05b43657a35d567cf077fe3 h: refs/heads/master i: 219047: 77d36d1136301b827a5c9197e6d52a773d0368da v: v3 --- [refs] | 2 +- trunk/drivers/media/dvb/frontends/af9013.c | 14 ++++++++++++++ trunk/drivers/media/dvb/frontends/af9013_priv.h | 5 +++-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 9eac0f388e8d..932391e1985d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 51ff2e2c8eaf0cc25c024849743613680b87778c +refs/heads/master: 2158e5090b5cc99ba05b43657a35d567cf077fe3 diff --git a/trunk/drivers/media/dvb/frontends/af9013.c b/trunk/drivers/media/dvb/frontends/af9013.c index dac917f7bb7f..a780c32ebce4 100644 --- a/trunk/drivers/media/dvb/frontends/af9013.c +++ b/trunk/drivers/media/dvb/frontends/af9013.c @@ -486,6 +486,19 @@ static int af9013_set_freq_ctrl(struct af9013_state *state, fe_bandwidth_t bw) if_sample_freq = 4300000; /* 4.3 MHz */ break; } + } else if (state->config.tuner == AF9013_TUNER_TDA18218) { + switch (bw) { + case BANDWIDTH_6_MHZ: + if_sample_freq = 3000000; /* 3 MHz */ + break; + case BANDWIDTH_7_MHZ: + if_sample_freq = 3500000; /* 3.5 MHz */ + break; + case BANDWIDTH_8_MHZ: + default: + if_sample_freq = 4000000; /* 4 MHz */ + break; + } } while (if_sample_freq > (adc_freq / 2)) @@ -1393,6 +1406,7 @@ static int af9013_init(struct dvb_frontend *fe) init = tuner_init_mt2060_2; break; case AF9013_TUNER_TDA18271: + case AF9013_TUNER_TDA18218: len = ARRAY_SIZE(tuner_init_tda18271); init = tuner_init_tda18271; break; diff --git a/trunk/drivers/media/dvb/frontends/af9013_priv.h b/trunk/drivers/media/dvb/frontends/af9013_priv.h index 0fd42b7e248e..0dcca60f0668 100644 --- a/trunk/drivers/media/dvb/frontends/af9013_priv.h +++ b/trunk/drivers/media/dvb/frontends/af9013_priv.h @@ -791,8 +791,9 @@ static struct regdesc tuner_init_unknown[] = { { 0x9bd9, 0, 8, 0x08 }, }; -/* NXP TDA18271 tuner init - AF9013_TUNER_TDA18271 = 156 */ +/* NXP TDA18271 & TDA18218 tuner init + AF9013_TUNER_TDA18271 = 156 + AF9013_TUNER_TDA18218 = 179 */ static struct regdesc tuner_init_tda18271[] = { { 0x9bd5, 0, 8, 0x01 }, { 0x9bd6, 0, 8, 0x04 },