The patch number 13215 was added via Michael Krufky <mkru...@kernellabs.com>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
Linux Media Mailing List <linux-me...@vger.kernel.org>
------
From: Michael Krufky <mkru...@kernellabs.com>
tda18271: add support for the set_config method
Add the set_config method to allow drivers to configure the
tda18271 driver options after attach.
Priority: normal
Signed-off-by: Michael Krufky <mkru...@kernellabs.com>
---
linux/drivers/media/common/tuners/tda18271-fe.c | 39 ++++++++++------
1 file changed, 26 insertions(+), 13 deletions(-)
diff -r b069d2b76ee4 -r f73b8d660576
linux/drivers/media/common/tuners/tda18271-fe.c
--- a/linux/drivers/media/common/tuners/tda18271-fe.c Fri Oct 23 01:47:49
2009 -0400
+++ b/linux/drivers/media/common/tuners/tda18271-fe.c Fri Oct 23 02:20:45
2009 -0400
@@ -1186,6 +1186,26 @@
return ret;
}
+static int tda18271_set_config(struct dvb_frontend *fe, void *priv_cfg)
+{
+ struct tda18271_priv *priv = fe->tuner_priv;
+ struct tda18271_config *cfg = (struct tda18271_config *) priv_cfg;
+
+ priv->gate = (cfg) ? cfg->gate : TDA18271_GATE_AUTO;
+ priv->role = (cfg) ? cfg->role : TDA18271_MASTER;
+ priv->config = (cfg) ? cfg->config : 0;
+ priv->small_i2c = (cfg) ?
+ cfg->small_i2c : TDA18271_39_BYTE_CHUNK_INIT;
+ priv->output_opt = (cfg) ?
+ cfg->output_opt : TDA18271_OUTPUT_LT_XT_ON;
+
+ /* override default std map with values in config struct */
+ if ((cfg) && (cfg->std_map))
+ tda18271_update_std_map(fe, cfg->std_map);
+
+ return 0;
+}
+
static struct dvb_tuner_ops tda18271_tuner_ops = {
.info = {
.name = "NXP TDA18271HD",
@@ -1198,6 +1218,7 @@
.set_params = tda18271_set_params,
.set_analog_params = tda18271_set_analog_params,
.release = tda18271_release,
+ .set_config = tda18271_set_config,
.get_frequency = tda18271_get_frequency,
.get_bandwidth = tda18271_get_bandwidth,
};
@@ -1222,13 +1243,9 @@
/* new tuner instance */
int rf_cal_on_startup;
- priv->gate = (cfg) ? cfg->gate : TDA18271_GATE_AUTO;
- priv->role = (cfg) ? cfg->role : TDA18271_MASTER;
- priv->config = (cfg) ? cfg->config : 0;
- priv->small_i2c = (cfg) ?
- cfg->small_i2c : TDA18271_39_BYTE_CHUNK_INIT;
- priv->output_opt = (cfg) ?
- cfg->output_opt : TDA18271_OUTPUT_LT_XT_ON;
+ fe->tuner_priv = priv;
+
+ tda18271_set_config(fe, cfg);
/* tda18271_cal_on_startup == -1 when cal
* module option is unset */
@@ -1244,8 +1261,6 @@
priv->cal_initialized = false;
mutex_init(&priv->lock);
- fe->tuner_priv = priv;
-
if (tda_fail(tda18271_get_id(fe)))
goto fail;
@@ -1277,14 +1292,12 @@
priv->small_i2c = cfg->small_i2c;
if (cfg->output_opt)
priv->output_opt = cfg->output_opt;
+ if (cfg->std_map)
+ tda18271_update_std_map(fe, cfg->std_map);
}
break;
}
- /* override default std map with values in config struct */
- if ((cfg) && (cfg->std_map))
- tda18271_update_std_map(fe, cfg->std_map);
-
mutex_unlock(&tda18271_list_mutex);
memcpy(&fe->ops.tuner_ops, &tda18271_tuner_ops,
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/f73b8d660576a35afa9f63daaf592aaeb4c4a89b
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
