[4/4] si2157: Add support for Si2148-A20
Commit Message
The Silicon Labs Si2148 tuner works as the Si2158, but does not contain analog tuner. A firmware is required for the tuner. Currently the Si2158-A20 firmware will work for Si2148-A20 as well, but as there are no guarantees that that will be the case in future, a unique file name is used for the firmware.
The datasheet is available on manufacturer's website:
http://www.silabs.com/Support%20Documents/TechnicalDocs/Si2148-short.pdf
Signed-off-by: Olli Salonen <olli.salonen@iki.fi>
---
drivers/media/tuners/si2157.c | 13 +++++++++----
drivers/media/tuners/si2157.h | 2 +-
drivers/media/tuners/si2157_priv.h | 3 ++-
3 files changed, 12 insertions(+), 6 deletions(-)
Comments
Moikka!
I decided apply old crazyCat version, even I originally asked that
firmware change! If I ever will ran problem with Si2148 / Si2158
firmware difference, I know who to blame ;p
That patch could be dropped.
PULL request already sent.
regards
Antti
On 11/24/2014 08:57 AM, Olli Salonen wrote:
> The Silicon Labs Si2148 tuner works as the Si2158, but does not contain analog tuner. A firmware is required for the tuner. Currently the Si2158-A20 firmware will work for Si2148-A20 as well, but as there are no guarantees that that will be the case in future, a unique file name is used for the firmware.
>
> The datasheet is available on manufacturer's website:
> http://www.silabs.com/Support%20Documents/TechnicalDocs/Si2148-short.pdf
>
> Signed-off-by: Olli Salonen <olli.salonen@iki.fi>
Moro Antti,
Allright, possibly there won't be new firmware for the previous
generation 2148/2158 anyway, who knows. Thanks for the reviews!
Cheers,
-olli
On 24 November 2014 at 15:39, Antti Palosaari <crope@iki.fi> wrote:
> Moikka!
> I decided apply old crazyCat version, even I originally asked that firmware
> change! If I ever will ran problem with Si2148 / Si2158 firmware difference,
> I know who to blame ;p
>
> That patch could be dropped.
> PULL request already sent.
>
> regards
> Antti
>
> On 11/24/2014 08:57 AM, Olli Salonen wrote:
>>
>> The Silicon Labs Si2148 tuner works as the Si2158, but does not contain
>> analog tuner. A firmware is required for the tuner. Currently the Si2158-A20
>> firmware will work for Si2148-A20 as well, but as there are no guarantees
>> that that will be the case in future, a unique file name is used for the
>> firmware.
>>
>> The datasheet is available on manufacturer's website:
>> http://www.silabs.com/Support%20Documents/TechnicalDocs/Si2148-short.pdf
>>
>> Signed-off-by: Olli Salonen <olli.salonen@iki.fi>
>
>
> --
> http://palosaari.fi/
--
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
@@ -1,5 +1,5 @@
/*
- * Silicon Labs Si2146/2147/2157/2158 silicon tuner driver
+ * Silicon Labs Si2146/2147/2148/2157/2158 silicon tuner driver
*
* Copyright (C) 2014 Antti Palosaari <crope@iki.fi>
*
@@ -118,6 +118,7 @@ static int si2157_init(struct dvb_frontend *fe)
#define SI2158_A20 ('A' << 24 | 58 << 16 | '2' << 8 | '0' << 0)
#define SI2157_A30 ('A' << 24 | 57 << 16 | '3' << 8 | '0' << 0)
+ #define SI2148_A20 ('A' << 24 | 48 << 16 | '2' << 8 | '0' << 0)
#define SI2147_A30 ('A' << 24 | 47 << 16 | '3' << 8 | '0' << 0)
#define SI2146_A10 ('A' << 24 | 46 << 16 | '1' << 8 | '0' << 0)
@@ -125,6 +126,9 @@ static int si2157_init(struct dvb_frontend *fe)
case SI2158_A20:
fw_file = SI2158_A20_FIRMWARE;
break;
+ case SI2148_A20:
+ fw_file = SI2148_A20_FIRMWARE;
+ break;
case SI2157_A30:
case SI2147_A30:
case SI2146_A10:
@@ -317,7 +321,7 @@ static int si2157_get_if_frequency(struct dvb_frontend *fe, u32 *frequency)
static const struct dvb_tuner_ops si2157_ops = {
.info = {
- .name = "Silicon Labs Si2146/2147/2157/2158",
+ .name = "Silicon Labs Si2146/2147/2148/2157/2158",
.frequency_min = 110000000,
.frequency_max = 862000000,
},
@@ -367,7 +371,7 @@ static int si2157_probe(struct i2c_client *client,
dev_info(&s->client->dev,
"Silicon Labs %s successfully attached\n",
s->chiptype == SI2157_CHIPTYPE_SI2146 ?
- "Si2146" : "Si2147/2157/2158");
+ "Si2146" : "Si2147/2148/2157/2158");
return 0;
err:
@@ -410,7 +414,8 @@ static struct i2c_driver si2157_driver = {
module_i2c_driver(si2157_driver);
-MODULE_DESCRIPTION("Silicon Labs Si2146/2147/2157/2158 silicon tuner driver");
+MODULE_DESCRIPTION("Silicon Labs Si2146/2147/2148/2157/2158 silicon tuner driver");
MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
MODULE_LICENSE("GPL");
+MODULE_FIRMWARE(SI2148_A20_FIRMWARE);
MODULE_FIRMWARE(SI2158_A20_FIRMWARE);
@@ -1,5 +1,5 @@
/*
- * Silicon Labs Si2146/2147/2157/2158 silicon tuner driver
+ * Silicon Labs Si2146/2147/2148/2157/2158 silicon tuner driver
*
* Copyright (C) 2014 Antti Palosaari <crope@iki.fi>
*
@@ -1,5 +1,5 @@
/*
- * Silicon Labs Si2146/2147/2157/2158 silicon tuner driver
+ * Silicon Labs Si2146/2147/2148/2157/2158 silicon tuner driver
*
* Copyright (C) 2014 Antti Palosaari <crope@iki.fi>
*
@@ -42,6 +42,7 @@ struct si2157_cmd {
unsigned rlen;
};
+#define SI2148_A20_FIRMWARE "dvb-tuner-si2148-a20-01.fw"
#define SI2158_A20_FIRMWARE "dvb-tuner-si2158-a20-01.fw"
#endif