Skip to content

Commit

Permalink
[media] tuner-core: Change config from unsigned int to void *
Browse files Browse the repository at this point in the history 
config looks like a hack that was added to tuner-core to allow some
configuration of TDA8290 tuner (it's not used by any other driver).
But with the new configuration options of tda8290 driver (no_i2c_gate
and std_map), it's no longer sufficient.
Change config to be void * instead, which allows passing tuner-dependent
config struct to drivers.
Also update saa7134 driver to reflect this change (no other driver uses this).

Signed-off-by: Ondrej Zary <[email protected]>
Signed-off-by: Michael Krufky <[email protected]>
Signed-off-by: Mauro Carvalho Chehab <[email protected]>
  • Loading branch information
Ondrej Zary authored and Mauro Carvalho Chehab committed Apr 8, 2013
1 parent 5b0e535 commit cdcd141
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 35 deletions.
40 changes: 20 additions & 20 deletions drivers/media/pci/saa7134/saa7134-cards.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2760,7 +2760,7 @@ struct saa7134_board saa7134_boards[] = {
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.tuner_config = 0,
.tda829x_conf = { .lna_cfg = 0 },
.mpeg = SAA7134_MPEG_DVB,
.gpiomask = 0x0200000,
.inputs = {{
Expand Down Expand Up @@ -3291,7 +3291,7 @@ struct saa7134_board saa7134_boards[] = {
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.tuner_config = 1,
.tda829x_conf = { .lna_cfg = 1 },
.mpeg = SAA7134_MPEG_DVB,
.gpiomask = 0x000200000,
.inputs = {{
Expand Down Expand Up @@ -3395,7 +3395,7 @@ struct saa7134_board saa7134_boards[] = {
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.tuner_config = 1,
.tda829x_conf = { .lna_cfg = 1 },
.mpeg = SAA7134_MPEG_DVB,
.gpiomask = 0x0200100,
.inputs = {{
Expand Down Expand Up @@ -3426,7 +3426,7 @@ struct saa7134_board saa7134_boards[] = {
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.tuner_config = 3,
.tda829x_conf = { .lna_cfg = 3 },
.mpeg = SAA7134_MPEG_DVB,
.ts_type = SAA7134_MPEG_TS_SERIAL,
.ts_force_val = 1,
Expand Down Expand Up @@ -3459,7 +3459,7 @@ struct saa7134_board saa7134_boards[] = {
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.tuner_config = 3,
.tda829x_conf = { .lna_cfg = 3 },
.mpeg = SAA7134_MPEG_DVB,
.ts_type = SAA7134_MPEG_TS_SERIAL,
.gpiomask = 0x0800100, /* GPIO 21 is an INPUT */
Expand Down Expand Up @@ -3683,7 +3683,7 @@ struct saa7134_board saa7134_boards[] = {
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.tuner_config = 2,
.tda829x_conf = { .lna_cfg = 2 },
.mpeg = SAA7134_MPEG_DVB,
.gpiomask = 0x0200000,
.inputs = {{
Expand Down Expand Up @@ -3736,7 +3736,7 @@ struct saa7134_board saa7134_boards[] = {
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.tuner_config = 2,
.tda829x_conf = { .lna_cfg = 2 },
.mpeg = SAA7134_MPEG_DVB,
.gpiomask = 0x0200000,
.inputs = {{
Expand All @@ -3754,7 +3754,7 @@ struct saa7134_board saa7134_boards[] = {
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.tuner_config = 2,
.tda829x_conf = { .lna_cfg = 2 },
.gpiomask = 1 << 21,
.mpeg = SAA7134_MPEG_DVB,
.inputs = {{
Expand Down Expand Up @@ -3887,7 +3887,7 @@ struct saa7134_board saa7134_boards[] = {
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.tuner_config = 0,
.tda829x_conf = { .lna_cfg = 0 },
.mpeg = SAA7134_MPEG_DVB,
.inputs = {{
.name = name_tv, /* FIXME: analog tv untested */
Expand All @@ -3903,7 +3903,7 @@ struct saa7134_board saa7134_boards[] = {
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.tuner_config = 2,
.tda829x_conf = { .lna_cfg = 2 },
.gpiomask = 0x020200000,
.inputs = {{
.name = name_tv,
Expand Down Expand Up @@ -3937,7 +3937,7 @@ struct saa7134_board saa7134_boards[] = {
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.tuner_config = 0,
.tda829x_conf = { .lna_cfg = 0 },
.gpiomask = 0x020200000,
.inputs = {{
.name = name_tv,
Expand Down Expand Up @@ -4737,7 +4737,7 @@ struct saa7134_board saa7134_boards[] = {
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.tuner_config = 2,
.tda829x_conf = { .lna_cfg = 2 },
.mpeg = SAA7134_MPEG_DVB,
.gpiomask = 0x0200000,
.inputs = {{
Expand Down Expand Up @@ -4823,7 +4823,7 @@ struct saa7134_board saa7134_boards[] = {
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.tuner_config = 0,
.tda829x_conf = { .lna_cfg = 0 },
.mpeg = SAA7134_MPEG_DVB,
.inputs = {{
.name = name_tv,
Expand All @@ -4847,7 +4847,7 @@ struct saa7134_board saa7134_boards[] = {
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.tuner_config = 2,
.tda829x_conf = { .lna_cfg = 2 },
.mpeg = SAA7134_MPEG_DVB,
.gpiomask = 0x0200000,
.inputs = { {
Expand Down Expand Up @@ -5057,7 +5057,7 @@ struct saa7134_board saa7134_boards[] = {
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.tuner_config = 2,
.tda829x_conf = { .lna_cfg = 2 },
.gpiomask = 1 << 21,
.mpeg = SAA7134_MPEG_DVB,
.inputs = {{
Expand Down Expand Up @@ -5087,7 +5087,7 @@ struct saa7134_board saa7134_boards[] = {
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.tuner_config = 2,
.tda829x_conf = { .lna_cfg = 2 },
.gpiomask = 1 << 21,
.mpeg = SAA7134_MPEG_DVB,
.inputs = {{
Expand Down Expand Up @@ -5176,7 +5176,7 @@ struct saa7134_board saa7134_boards[] = {
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.tuner_config = 0,
.tda829x_conf = { .lna_cfg = 0 },
.mpeg = SAA7134_MPEG_DVB,
.gpiomask = 0x0200000,
.inputs = { {
Expand Down Expand Up @@ -5406,7 +5406,7 @@ struct saa7134_board saa7134_boards[] = {
.radio_type = UNSET,
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.tuner_config = 0,
.tda829x_conf = { .lna_cfg = 0 },
.mpeg = SAA7134_MPEG_DVB,
.ts_type = SAA7134_MPEG_TS_PARALLEL,
.inputs = {{
Expand Down Expand Up @@ -5629,7 +5629,7 @@ struct saa7134_board saa7134_boards[] = {
.audio_clock = 0x00187de7,
.tuner_type = TUNER_PHILIPS_TDA8290,
.radio_type = UNSET,
.tuner_config = 3,
.tda829x_conf = { .lna_cfg = 3 },
.tuner_addr = ADDR_UNSET,
.radio_addr = ADDR_UNSET,
.gpiomask = 0x02050000,
Expand Down Expand Up @@ -7633,7 +7633,7 @@ static void saa7134_tuner_setup(struct saa7134_dev *dev)
if ((dev->tuner_type != TUNER_ABSENT) && (dev->tuner_type != UNSET)) {
tun_setup.type = dev->tuner_type;
tun_setup.addr = dev->tuner_addr;
tun_setup.config = saa7134_boards[dev->board].tuner_config;
tun_setup.config = &saa7134_boards[dev->board].tda829x_conf;
tun_setup.tuner_callback = saa7134_tuner_callback;

tun_setup.mode_mask = mode_mask;
Expand Down
3 changes: 2 additions & 1 deletion drivers/media/pci/saa7134/saa7134.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
#if IS_ENABLED(CONFIG_VIDEO_SAA7134_DVB)
#include <media/videobuf-dvb.h>
#endif
#include "tda8290.h"

#define UNSET (-1U)

Expand Down Expand Up @@ -390,7 +391,7 @@ struct saa7134_board {
unsigned char rds_addr;

unsigned int tda9887_conf;
unsigned int tuner_config;
struct tda829x_config tda829x_conf;

/* peripheral I/O */
enum saa7134_video_out video_out;
Expand Down
20 changes: 7 additions & 13 deletions drivers/media/v4l2-core/tuner-core.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ struct tuner {
bool standby; /* Standby mode */

unsigned int type; /* chip type id */
unsigned int config;
void *config;
const char *name;
};

Expand Down Expand Up @@ -270,17 +270,16 @@ static const struct analog_demod_ops tuner_analog_ops = {
* @c: i2c_client descriptoy
* @type: type of the tuner (e. g. tuner number)
* @new_mode_mask: Indicates if tuner supports TV and/or Radio
* @new_config: an optional parameter ranging from 0-255 used by
a few tuners to adjust an internal parameter,
like LNA mode
* @new_config: an optional parameter used by a few tuners to adjust
internal parameters, like LNA mode
* @tuner_callback: an optional function to be called when switching
* to analog mode
*
* This function applys the tuner config to tuner specified
* by tun_setup structure. It contains several per-tuner initialization "magic"
*/
static void set_type(struct i2c_client *c, unsigned int type,
unsigned int new_mode_mask, unsigned int new_config,
unsigned int new_mode_mask, void *new_config,
int (*tuner_callback) (void *dev, int component, int cmd, int arg))
{
struct tuner *t = to_tuner(i2c_get_clientdata(c));
Expand All @@ -295,8 +294,7 @@ static void set_type(struct i2c_client *c, unsigned int type,
}

t->type = type;
/* prevent invalid config values */
t->config = new_config < 256 ? new_config : 0;
t->config = new_config;
if (tuner_callback != NULL) {
tuner_dbg("defining GPIO callback\n");
t->fe.callback = tuner_callback;
Expand All @@ -314,11 +312,8 @@ static void set_type(struct i2c_client *c, unsigned int type,
break;
case TUNER_PHILIPS_TDA8290:
{
struct tda829x_config cfg = {
.lna_cfg = t->config,
};
if (!dvb_attach(tda829x_attach, &t->fe, t->i2c->adapter,
t->i2c->addr, &cfg))
t->i2c->addr, t->config))
goto attach_failed;
break;
}
Expand Down Expand Up @@ -407,7 +402,6 @@ static void set_type(struct i2c_client *c, unsigned int type,
case TUNER_NXP_TDA18271:
{
struct tda18271_config cfg = {
.config = t->config,
.small_i2c = TDA18271_03_BYTE_CHUNK_INIT,
};

Expand Down Expand Up @@ -509,7 +503,7 @@ static int tuner_s_type_addr(struct v4l2_subdev *sd,
struct tuner *t = to_tuner(sd);
struct i2c_client *c = v4l2_get_subdevdata(sd);

tuner_dbg("Calling set_type_addr for type=%d, addr=0x%02x, mode=0x%02x, config=0x%02x\n",
tuner_dbg("Calling set_type_addr for type=%d, addr=0x%02x, mode=0x%02x, config=%p\n",
tun_setup->type,
tun_setup->addr,
tun_setup->mode_mask,
Expand Down
2 changes: 1 addition & 1 deletion include/media/tuner.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ struct tuner_setup {
unsigned short addr; /* I2C address */
unsigned int type; /* Tuner type */
unsigned int mode_mask; /* Allowed tuner modes */
unsigned int config; /* configuraion for more complex tuners */
void *config; /* configuraion for more complex tuners */
int (*tuner_callback) (void *dev, int component, int cmd, int arg);
};

Expand Down

0 comments on commit cdcd141

Please sign in to comment.