| Message ID | 1429823471-21835-3-git-send-email-olli.salonen@iki.fi (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Olli, Em Fri, 24 Apr 2015 00:11:02 +0300 Olli Salonen <olli.salonen@iki.fi> escreveu: > The chips supported by the si2157 driver have two IF outputs (either > pins 12+13 or pins 9+11). Instead of hardcoding the output to be used > add an option to choose which output shall be used. > > Signed-off-by: Olli Salonen <olli.salonen@iki.fi> > --- > drivers/media/tuners/si2157.c | 4 +++- > drivers/media/tuners/si2157.h | 6 ++++++ > drivers/media/tuners/si2157_priv.h | 1 + > 3 files changed, 10 insertions(+), 1 deletion(-) > > diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c > index d74ae26..cdaf687 100644 > --- a/drivers/media/tuners/si2157.c > +++ b/drivers/media/tuners/si2157.c > @@ -298,7 +298,8 @@ static int si2157_set_params(struct dvb_frontend *fe) > if (dev->chiptype == SI2157_CHIPTYPE_SI2146) > memcpy(cmd.args, "\x14\x00\x02\x07\x00\x01", 6); > else > - memcpy(cmd.args, "\x14\x00\x02\x07\x01\x00", 6); > + memcpy(cmd.args, "\x14\x00\x02\x07\x00\x00", 6); As you're changing the default, you should fold the patches that use si2157_config.if_port = 1 on this patch (e.g. patches 4-10), as we don't want to break git bisectability. Regards, Mauro > + cmd.args[4] = dev->if_port; > cmd.wlen = 6; > cmd.rlen = 4; > ret = si2157_cmd_execute(client, &cmd); > @@ -378,6 +379,7 @@ static int si2157_probe(struct i2c_client *client, > i2c_set_clientdata(client, dev); > dev->fe = cfg->fe; > dev->inversion = cfg->inversion; > + dev->if_port = cfg->if_port; > dev->fw_loaded = false; > dev->chiptype = (u8)id->driver_data; > dev->if_frequency = 5000000; /* default value of property 0x0706 */ > diff --git a/drivers/media/tuners/si2157.h b/drivers/media/tuners/si2157.h > index a564c4a..4db97ab 100644 > --- a/drivers/media/tuners/si2157.h > +++ b/drivers/media/tuners/si2157.h > @@ -34,6 +34,12 @@ struct si2157_config { > * Spectral Inversion > */ > bool inversion; > + > + /* > + * Port selection > + * Select the RF interface to use (pins 9+11 or 12+13) > + */ > + u8 if_port; > }; > > #endif > diff --git a/drivers/media/tuners/si2157_priv.h b/drivers/media/tuners/si2157_priv.h > index cd8fa5b..71a5f8c 100644 > --- a/drivers/media/tuners/si2157_priv.h > +++ b/drivers/media/tuners/si2157_priv.h > @@ -28,6 +28,7 @@ struct si2157_dev { > bool fw_loaded; > bool inversion; > u8 chiptype; > + u8 if_port; > u32 if_frequency; > }; > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/tuners/si2157.c b/drivers/media/tuners/si2157.c index d74ae26..cdaf687 100644 --- a/drivers/media/tuners/si2157.c +++ b/drivers/media/tuners/si2157.c @@ -298,7 +298,8 @@ static int si2157_set_params(struct dvb_frontend *fe) if (dev->chiptype == SI2157_CHIPTYPE_SI2146) memcpy(cmd.args, "\x14\x00\x02\x07\x00\x01", 6); else - memcpy(cmd.args, "\x14\x00\x02\x07\x01\x00", 6); + memcpy(cmd.args, "\x14\x00\x02\x07\x00\x00", 6); + cmd.args[4] = dev->if_port; cmd.wlen = 6; cmd.rlen = 4; ret = si2157_cmd_execute(client, &cmd); @@ -378,6 +379,7 @@ static int si2157_probe(struct i2c_client *client, i2c_set_clientdata(client, dev); dev->fe = cfg->fe; dev->inversion = cfg->inversion; + dev->if_port = cfg->if_port; dev->fw_loaded = false; dev->chiptype = (u8)id->driver_data; dev->if_frequency = 5000000; /* default value of property 0x0706 */ diff --git a/drivers/media/tuners/si2157.h b/drivers/media/tuners/si2157.h index a564c4a..4db97ab 100644 --- a/drivers/media/tuners/si2157.h +++ b/drivers/media/tuners/si2157.h @@ -34,6 +34,12 @@ struct si2157_config { * Spectral Inversion */ bool inversion; + + /* + * Port selection + * Select the RF interface to use (pins 9+11 or 12+13) + */ + u8 if_port; }; #endif diff --git a/drivers/media/tuners/si2157_priv.h b/drivers/media/tuners/si2157_priv.h index cd8fa5b..71a5f8c 100644 --- a/drivers/media/tuners/si2157_priv.h +++ b/drivers/media/tuners/si2157_priv.h @@ -28,6 +28,7 @@ struct si2157_dev { bool fw_loaded; bool inversion; u8 chiptype; + u8 if_port; u32 if_frequency; };
The chips supported by the si2157 driver have two IF outputs (either pins 12+13 or pins 9+11). Instead of hardcoding the output to be used add an option to choose which output shall be used. Signed-off-by: Olli Salonen <olli.salonen@iki.fi> --- drivers/media/tuners/si2157.c | 4 +++- drivers/media/tuners/si2157.h | 6 ++++++ drivers/media/tuners/si2157_priv.h | 1 + 3 files changed, 10 insertions(+), 1 deletion(-)