aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuis Alves <ljalvs@gmail.com>2014-07-17 18:43:37 -0400
committerMauro Carvalho Chehab <m.chehab@samsung.com>2014-07-21 20:26:18 -0400
commit635a90cf9385721dcb9c7f5c59a2873ef0279c8b (patch)
treeb7403ca9a17bb9f96a1d89086a1574f16631815a
parent2da2e18513b4f2de00c5f6ff4925bb011d6a8127 (diff)
[media] si2168: Support Si2168-A20 firmware downloading
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 Signed-off-by: Luis Alves <ljalvs@gmail.com> Signed-off-by: Antti Palosaari <crope@iki.fi> Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
-rw-r--r--drivers/media/dvb-frontends/si2168.c5
-rw-r--r--drivers/media/dvb-frontends/si2168_priv.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/dvb-frontends/si2168.c b/drivers/media/dvb-frontends/si2168.c
index 84db613f6e90..97c46797aea6 100644
--- a/drivers/media/dvb-frontends/si2168.c
+++ b/drivers/media/dvb-frontends/si2168.c
@@ -398,10 +398,14 @@ static int si2168_init(struct dvb_frontend *fe)
398 chip_id = cmd.args[1] << 24 | cmd.args[2] << 16 | cmd.args[3] << 8 | 398 chip_id = cmd.args[1] << 24 | cmd.args[2] << 16 | cmd.args[3] << 8 |
399 cmd.args[4] << 0; 399 cmd.args[4] << 0;
400 400
401 #define SI2168_A20 ('A' << 24 | 68 << 16 | '2' << 8 | '0' << 0)
401 #define SI2168_A30 ('A' << 24 | 68 << 16 | '3' << 8 | '0' << 0) 402 #define SI2168_A30 ('A' << 24 | 68 << 16 | '3' << 8 | '0' << 0)
402 #define SI2168_B40 ('B' << 24 | 68 << 16 | '4' << 8 | '0' << 0) 403 #define SI2168_B40 ('B' << 24 | 68 << 16 | '4' << 8 | '0' << 0)
403 404
404 switch (chip_id) { 405 switch (chip_id) {
406 case SI2168_A20:
407 fw_file = SI2168_A20_FIRMWARE;
408 break;
405 case SI2168_A30: 409 case SI2168_A30:
406 fw_file = SI2168_A30_FIRMWARE; 410 fw_file = SI2168_A30_FIRMWARE;
407 break; 411 break;
@@ -693,5 +697,6 @@ module_i2c_driver(si2168_driver);
693MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>"); 697MODULE_AUTHOR("Antti Palosaari <crope@iki.fi>");
694MODULE_DESCRIPTION("Silicon Labs Si2168 DVB-T/T2/C demodulator driver"); 698MODULE_DESCRIPTION("Silicon Labs Si2168 DVB-T/T2/C demodulator driver");
695MODULE_LICENSE("GPL"); 699MODULE_LICENSE("GPL");
700MODULE_FIRMWARE(SI2168_A20_FIRMWARE);
696MODULE_FIRMWARE(SI2168_A30_FIRMWARE); 701MODULE_FIRMWARE(SI2168_A30_FIRMWARE);
697MODULE_FIRMWARE(SI2168_B40_FIRMWARE); 702MODULE_FIRMWARE(SI2168_B40_FIRMWARE);
diff --git a/drivers/media/dvb-frontends/si2168_priv.h b/drivers/media/dvb-frontends/si2168_priv.h
index d606915dea14..c1f7a4c39ab5 100644
--- a/drivers/media/dvb-frontends/si2168_priv.h
+++ b/drivers/media/dvb-frontends/si2168_priv.h
@@ -22,6 +22,7 @@
22#include <linux/firmware.h> 22#include <linux/firmware.h>
23#include <linux/i2c-mux.h> 23#include <linux/i2c-mux.h>
24 24
25#define SI2168_A20_FIRMWARE "dvb-demod-si2168-a20-01.fw"
25#define SI2168_A30_FIRMWARE "dvb-demod-si2168-a30-01.fw" 26#define SI2168_A30_FIRMWARE "dvb-demod-si2168-a30-01.fw"
26#define SI2168_B40_FIRMWARE "dvb-demod-si2168-b40-01.fw" 27#define SI2168_B40_FIRMWARE "dvb-demod-si2168-b40-01.fw"
27#define SI2168_B40_FIRMWARE_FALLBACK "dvb-demod-si2168-01.fw" 28#define SI2168_B40_FIRMWARE_FALLBACK "dvb-demod-si2168-01.fw"