[1/1,v2] si2168: Support Si2168-A20 firmware downloading.

Message ID 1405637017-24036-1-git-send-email-ljalvs@gmail.com (mailing list archive)
State Superseded, archived
Delegated to: Michael Krufky
Headers

Commit Message

Luis Alves July 17, 2014, 10:43 p.m. UTC
  (ignore the previous one, it was incomplete)

This adds support for the Si2168-A20 firmware download.
Extracting the firmware:

wget http://www.tbsdtv.com/download/document/tbs6281/tbs6281-t2-t-driver_v1.0.0.6.zip
unzip tbs6281-t2-t-driver_v1.0.0.6.zip
dd if=tbs-6281_x64/tbs6281_64.sys of=dvb-demod-si2168-a20-01.fw count=28656 bs=1 skip=1625088

md5sum:
32e06713b33915f674bfb2c209beaea5 /lib/firmware/dvb-demod-si2168-a20-01.fw

Regards,
Luis


Signed-off-by: Luis Alves <ljalvs@gmail.com>
---
 drivers/media/dvb-frontends/si2168.c      | 5 +++++
 drivers/media/dvb-frontends/si2168_priv.h | 1 +
 2 files changed, 6 insertions(+)
  

Comments

Antti Palosaari July 17, 2014, 10:56 p.m. UTC | #1
Thank for the patch! I will apply that sure too.
Driver supports now all Si2168 versions?

regards
Antti

On 07/18/2014 01:43 AM, Luis Alves wrote:
> (ignore the previous one, it was incomplete)
>
> This adds support for the Si2168-A20 firmware download.
> Extracting the firmware:
>
> wget http://www.tbsdtv.com/download/document/tbs6281/tbs6281-t2-t-driver_v1.0.0.6.zip
> unzip tbs6281-t2-t-driver_v1.0.0.6.zip
> dd if=tbs-6281_x64/tbs6281_64.sys of=dvb-demod-si2168-a20-01.fw count=28656 bs=1 skip=1625088
>
> md5sum:
> 32e06713b33915f674bfb2c209beaea5 /lib/firmware/dvb-demod-si2168-a20-01.fw
>
> Regards,
> Luis
>
>
> Signed-off-by: Luis Alves <ljalvs@gmail.com>
> ---
>   drivers/media/dvb-frontends/si2168.c      | 5 +++++
>   drivers/media/dvb-frontends/si2168_priv.h | 1 +
>   2 files changed, 6 insertions(+)
>
> diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c
> index 7e45eeab..50c4a91 100644
> --- a/drivers/media/dvb-frontends/si2168.c
> +++ b/drivers/media/dvb-frontends/si2168.c
> @@ -377,10 +377,14 @@ static int si2168_init(struct dvb_frontend *fe)
>   	chip_id = cmd.args[1] << 24 | cmd.args[2] << 16 | cmd.args[3] << 8 |
>   			cmd.args[4] << 0;
>
> +	#define SI2168_A20 ('A' << 24 | 68 << 16 | '2' << 8 | '0' << 0)
>   	#define SI2168_A30 ('A' << 24 | 68 << 16 | '3' << 8 | '0' << 0)
>   	#define SI2168_B40 ('B' << 24 | 68 << 16 | '4' << 8 | '0' << 0)
>
>   	switch (chip_id) {
> +	case SI2168_A20:
> +		fw_file = SI2168_A20_FIRMWARE;
> +		break;
>   	case SI2168_A30:
>   		fw_file = SI2168_A30_FIRMWARE;
>   		break;
> @@ -672,5 +676,6 @@ module_i2c_driver(si2168_driver);
>   MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
>   MODULE_DESCRIPTION("Silicon Labs Si2168 DVB-T/T2/C demodulator driver");
>   MODULE_LICENSE("GPL");
> +MODULE_FIRMWARE(SI2168_A20_FIRMWARE);
>   MODULE_FIRMWARE(SI2168_A30_FIRMWARE);
>   MODULE_FIRMWARE(SI2168_B40_FIRMWARE);
> diff --git a/drivers/media/dvb-frontends/si2168_priv.h b/drivers/media/dvb-frontends/si2168_priv.h
> index bebb68a..ebbf502 100644
> --- a/drivers/media/dvb-frontends/si2168_priv.h
> +++ b/drivers/media/dvb-frontends/si2168_priv.h
> @@ -22,6 +22,7 @@
>   #include <linux/firmware.h>
>   #include <linux/i2c-mux.h>
>
> +#define SI2168_A20_FIRMWARE "dvb-demod-si2168-a20-01.fw"
>   #define SI2168_A30_FIRMWARE "dvb-demod-si2168-a30-01.fw"
>   #define SI2168_B40_FIRMWARE "dvb-demod-si2168-b40-01.fw"
>   #define SI2168_B40_FIRMWARE_FALLBACK "dvb-demod-si2168-02.fw"
>
  
Luis Alves July 17, 2014, 11:04 p.m. UTC | #2
I think so... at least the known ones.

On Thu, Jul 17, 2014 at 11:56 PM, Antti Palosaari <crope@iki.fi> wrote:
> Thank for the patch! I will apply that sure too.
> Driver supports now all Si2168 versions?
>
> regards
> Antti
>
>
> On 07/18/2014 01:43 AM, Luis Alves wrote:
>>
>> (ignore the previous one, it was incomplete)
>>
>> This adds support for the Si2168-A20 firmware download.
>> Extracting the firmware:
>>
>> wget
>> http://www.tbsdtv.com/download/document/tbs6281/tbs6281-t2-t-driver_v1.0.0.6.zip
>> unzip tbs6281-t2-t-driver_v1.0.0.6.zip
>> dd if=tbs-6281_x64/tbs6281_64.sys of=dvb-demod-si2168-a20-01.fw
>> count=28656 bs=1 skip=1625088
>>
>> md5sum:
>> 32e06713b33915f674bfb2c209beaea5 /lib/firmware/dvb-demod-si2168-a20-01.fw
>>
>> Regards,
>> Luis
>>
>>
>> Signed-off-by: Luis Alves <ljalvs@gmail.com>
>> ---
>>   drivers/media/dvb-frontends/si2168.c      | 5 +++++
>>   drivers/media/dvb-frontends/si2168_priv.h | 1 +
>>   2 files changed, 6 insertions(+)
>>
>> diff --git a/drivers/media/dvb-frontends/si2168.c
>> b/drivers/media/dvb-frontends/si2168.c
>> index 7e45eeab..50c4a91 100644
>> --- a/drivers/media/dvb-frontends/si2168.c
>> +++ b/drivers/media/dvb-frontends/si2168.c
>> @@ -377,10 +377,14 @@ static int si2168_init(struct dvb_frontend *fe)
>>         chip_id = cmd.args[1] << 24 | cmd.args[2] << 16 | cmd.args[3] << 8
>> |
>>                         cmd.args[4] << 0;
>>
>> +       #define SI2168_A20 ('A' << 24 | 68 << 16 | '2' << 8 | '0' << 0)
>>         #define SI2168_A30 ('A' << 24 | 68 << 16 | '3' << 8 | '0' << 0)
>>         #define SI2168_B40 ('B' << 24 | 68 << 16 | '4' << 8 | '0' << 0)
>>
>>         switch (chip_id) {
>> +       case SI2168_A20:
>> +               fw_file = SI2168_A20_FIRMWARE;
>> +               break;
>>         case SI2168_A30:
>>                 fw_file = SI2168_A30_FIRMWARE;
>>                 break;
>> @@ -672,5 +676,6 @@ module_i2c_driver(si2168_driver);
>>   MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
>>   MODULE_DESCRIPTION("Silicon Labs Si2168 DVB-T/T2/C demodulator driver");
>>   MODULE_LICENSE("GPL");
>> +MODULE_FIRMWARE(SI2168_A20_FIRMWARE);
>>   MODULE_FIRMWARE(SI2168_A30_FIRMWARE);
>>   MODULE_FIRMWARE(SI2168_B40_FIRMWARE);
>> diff --git a/drivers/media/dvb-frontends/si2168_priv.h
>> b/drivers/media/dvb-frontends/si2168_priv.h
>> index bebb68a..ebbf502 100644
>> --- a/drivers/media/dvb-frontends/si2168_priv.h
>> +++ b/drivers/media/dvb-frontends/si2168_priv.h
>> @@ -22,6 +22,7 @@
>>   #include <linux/firmware.h>
>>   #include <linux/i2c-mux.h>
>>
>> +#define SI2168_A20_FIRMWARE "dvb-demod-si2168-a20-01.fw"
>>   #define SI2168_A30_FIRMWARE "dvb-demod-si2168-a30-01.fw"
>>   #define SI2168_B40_FIRMWARE "dvb-demod-si2168-b40-01.fw"
>>   #define SI2168_B40_FIRMWARE_FALLBACK "dvb-demod-si2168-02.fw"
>>
>
> --
> 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
  

Patch

diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c
index 7e45eeab..50c4a91 100644
--- a/drivers/media/dvb-frontends/si2168.c
+++ b/drivers/media/dvb-frontends/si2168.c
@@ -377,10 +377,14 @@  static int si2168_init(struct dvb_frontend *fe)
 	chip_id = cmd.args[1] << 24 | cmd.args[2] << 16 | cmd.args[3] << 8 |
 			cmd.args[4] << 0;
 
+	#define SI2168_A20 ('A' << 24 | 68 << 16 | '2' << 8 | '0' << 0)
 	#define SI2168_A30 ('A' << 24 | 68 << 16 | '3' << 8 | '0' << 0)
 	#define SI2168_B40 ('B' << 24 | 68 << 16 | '4' << 8 | '0' << 0)
 
 	switch (chip_id) {
+	case SI2168_A20:
+		fw_file = SI2168_A20_FIRMWARE;
+		break;
 	case SI2168_A30:
 		fw_file = SI2168_A30_FIRMWARE;
 		break;
@@ -672,5 +676,6 @@  module_i2c_driver(si2168_driver);
 MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
 MODULE_DESCRIPTION("Silicon Labs Si2168 DVB-T/T2/C demodulator driver");
 MODULE_LICENSE("GPL");
+MODULE_FIRMWARE(SI2168_A20_FIRMWARE);
 MODULE_FIRMWARE(SI2168_A30_FIRMWARE);
 MODULE_FIRMWARE(SI2168_B40_FIRMWARE);
diff --git a/drivers/media/dvb-frontends/si2168_priv.h b/drivers/media/dvb-frontends/si2168_priv.h
index bebb68a..ebbf502 100644
--- a/drivers/media/dvb-frontends/si2168_priv.h
+++ b/drivers/media/dvb-frontends/si2168_priv.h
@@ -22,6 +22,7 @@ 
 #include <linux/firmware.h>
 #include <linux/i2c-mux.h>
 
+#define SI2168_A20_FIRMWARE "dvb-demod-si2168-a20-01.fw"
 #define SI2168_A30_FIRMWARE "dvb-demod-si2168-a30-01.fw"
 #define SI2168_B40_FIRMWARE "dvb-demod-si2168-b40-01.fw"
 #define SI2168_B40_FIRMWARE_FALLBACK "dvb-demod-si2168-02.fw"