summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2011-07-11 14:33:51 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-07-27 17:55:51 -0300
commit8b9456ae04b1cb7adcaa57735324f7b518eae07d (patch)
tree34651cc01ba62fd5e83b359540a7e3422b22726a
parent5eee2bb270e34b2e8b245838faef3f9455c69ce6 (diff)
downloadop-kernel-dev-8b9456ae04b1cb7adcaa57735324f7b518eae07d.zip
op-kernel-dev-8b9456ae04b1cb7adcaa57735324f7b518eae07d.tar.gz
[media] em28xx: Change firmware name for Terratec H5 DRX-K
Use a name convention for the firmware file that matches on the current firmware namespacing. Also, add it to the firmware download script. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rwxr-xr-x[-rw-r--r--]Documentation/dvb/get_dvb_firmware15
-rw-r--r--drivers/media/video/em28xx/em28xx-dvb.c2
2 files changed, 15 insertions, 2 deletions
diff --git a/Documentation/dvb/get_dvb_firmware b/Documentation/dvb/get_dvb_firmware
index 224d9e6..c466f58 100644..100755
--- a/Documentation/dvb/get_dvb_firmware
+++ b/Documentation/dvb/get_dvb_firmware
@@ -27,7 +27,7 @@ use IO::Handle;
"or51211", "or51132_qam", "or51132_vsb", "bluebird",
"opera1", "cx231xx", "cx18", "cx23885", "pvrusb2", "mpc718",
"af9015", "ngene", "az6027", "lme2510_lg", "lme2510c_s7395",
- "lme2510c_s7395_old", "drxk");
+ "lme2510c_s7395_old", "drxk", "drxk_terratec_h5");
# Check args
syntax() if (scalar(@ARGV) != 1);
@@ -652,6 +652,19 @@ sub drxk {
"$fwfile"
}
+sub drxk_terratec_h5 {
+ my $url = "http://www.linuxtv.org/downloads/firmware/";
+ my $hash = "19000dada8e2741162ccc50cc91fa7f1";
+ my $fwfile = "dvb-usb-terratec-h5-drxk.fw";
+
+ checkstandard();
+
+ wgetfile($fwfile, $url . $fwfile);
+ verify($fwfile, $hash);
+
+ "$fwfile"
+}
+
# ---------------------------------------------------------------
# Utilities
diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index 9b2be03..f8617d2 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -305,7 +305,7 @@ struct drxk_config terratec_h5_drxk = {
.adr = 0x29,
.single_master = 1,
.no_i2c_bridge = 1,
- .microcode_name = "terratec_h5.fw",
+ .microcode_name = "dvb-usb-terratec-h5-drxk.fw",
};
static int drxk_gate_ctrl(struct dvb_frontend *fe, int enable)
OpenPOWER on IntegriCloud