Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b0e5350 authored by Ondrej Zary's avatar Ondrej Zary Committed by Mauro Carvalho Chehab
Browse files

[media] tda8290: Allow custom std_map for tda18271 



Allow specifying a custom std_map for tda18271 by external configuration.
This is required by cards that require custom std_map for analog TV or radio,
like AverMedia A706.

Signed-off-by: default avatarOndrej Zary <linux@rainbow-software.org>
Signed-off-by: default avatarMichael Krufky <mkrufky@linuxtv.org>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 2f719f7a

drivers/media/tuners/tda8290.c

+6 −2
Original line number Original line Diff line number Diff line
@@ -54,6 +54,7 @@ struct tda8290_priv { 
#define TDA18271 16

#define TDA18271 16





	struct tda827x_config cfg;

	struct tda827x_config cfg;

	struct tda18271_std_map *tda18271_std_map;

};

};





/*---------------------------------------------------------------------*/

/*---------------------------------------------------------------------*/
@@ -635,6 +636,7 @@ static int tda829x_find_tuner(struct dvb_frontend *fe) 
	if ((data == 0x83) || (data == 0x84)) {

	if ((data == 0x83) || (data == 0x84)) {

		priv->ver |= TDA18271;

		priv->ver |= TDA18271;

		tda829x_tda18271_config.config = priv->cfg.config;

		tda829x_tda18271_config.config = priv->cfg.config;

		tda829x_tda18271_config.std_map = priv->tda18271_std_map;

		dvb_attach(tda18271_attach, fe, priv->tda827x_addr,

		dvb_attach(tda18271_attach, fe, priv->tda827x_addr,

			   priv->i2c_props.adap, &tda829x_tda18271_config);

			   priv->i2c_props.adap, &tda829x_tda18271_config);

	} else {

	} else {
@@ -746,8 +748,10 @@ struct dvb_frontend *tda829x_attach(struct dvb_frontend *fe, 
	priv->i2c_props.addr     = i2c_addr;

	priv->i2c_props.addr     = i2c_addr;

	priv->i2c_props.adap     = i2c_adap;

	priv->i2c_props.adap     = i2c_adap;

	priv->i2c_props.name     = "tda829x";

	priv->i2c_props.name     = "tda829x";

	if (cfg)

	if (cfg) {

		priv->cfg.config = cfg->lna_cfg;

		priv->cfg.config = cfg->lna_cfg;

		priv->tda18271_std_map = cfg->tda18271_std_map;

	}





	if (tda8290_probe(&priv->i2c_props) == 0) {

	if (tda8290_probe(&priv->i2c_props) == 0) {

		priv->ver = TDA8290;

		priv->ver = TDA8290;

drivers/media/tuners/tda8290.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -19,6 +19,7 @@ 




#include <linux/i2c.h>

#include <linux/i2c.h>

#include "dvb_frontend.h"

#include "dvb_frontend.h"

#include "tda18271.h"





struct tda829x_config {

struct tda829x_config {

	unsigned int lna_cfg;

	unsigned int lna_cfg;
@@ -27,6 +28,7 @@ struct tda829x_config { 
#define TDA829X_PROBE_TUNER 0

#define TDA829X_PROBE_TUNER 0

#define TDA829X_DONT_PROBE  1

#define TDA829X_DONT_PROBE  1

	unsigned int no_i2c_gate:1;

	unsigned int no_i2c_gate:1;

	struct tda18271_std_map *tda18271_std_map;

};

};





#if IS_ENABLED(CONFIG_MEDIA_TUNER_TDA8290)

#if IS_ENABLED(CONFIG_MEDIA_TUNER_TDA8290)