[media] drxk: Make the QAM demodulator command parameters configurable

Currently there are two different implementations (in the firmware) for
the QAM demodulator command: one takes 4 and the other takes 2
parameters. The driver shows an error in dmesg When using the
4-parameter command with firmware that implements the 2-parameter
command. Unfortunately this happens every time when chaning the
frequency (on DVB-C).

This patch simply makes configurable, how many command parameters will
be used. All existing drxk_config instances using the "drxk_a3.mc" were
updated because this firmware is the only loadable firmware where the
QAM demodulator command takes 4 parameters. Some firmwares in the ROM
might also use it. The drxk instances in the em28xx-dvb driver were also
updated to silence the warnings.

If no qam_demod_parameter_count is given in the drxk_config struct, then
the correct number of parameters will be auto-detected.

[mchehab@redhat.com: Fix a small CodingStyle issue at one comment]
Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
Tested-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

1 files changed, 4 insertions, 0 deletions

diff --git a/drivers/media/video/em28xx/em28xx-dvb.c b/drivers/media/video/em28xx/em28xx-dvb.c
index f8ffe102d295..a16531fa937a 100644
--- a/drivers/media/video/em28xx/em28xx-dvb.c
+++ b/drivers/media/video/em28xx/em28xx-dvb.c
@@ -315,6 +315,7 @@ static struct drxk_config terratec_h5_drxk = {
         .single_master = 1,
         .no_i2c_bridge = 1,
         .microcode_name = "dvb-usb-terratec-h5-drxk.fw",
+        .qam_demod_parameter_count = 2,
 };
 
 static struct drxk_config hauppauge_930c_drxk = {
@@ -323,6 +324,7 @@ static struct drxk_config hauppauge_930c_drxk = {
         .no_i2c_bridge = 1,
         .microcode_name = "dvb-usb-hauppauge-hvr930c-drxk.fw",
         .chunk_size = 56,
+        .qam_demod_parameter_count = 2,
 };
 
 struct drxk_config terratec_htc_stick_drxk = {
@@ -331,6 +333,7 @@ struct drxk_config terratec_htc_stick_drxk = {
         .no_i2c_bridge = 1,
         .microcode_name = "dvb-usb-terratec-htc-stick-drxk.fw",
         .chunk_size = 54,
+        .qam_demod_parameter_count = 2,
         /* Required for the antenna_gpio to disable LNA. */
         .antenna_dvbt = true,
         /* The windows driver uses the same. This will disable LNA. */
@@ -347,6 +350,7 @@ static struct drxk_config pctv_520e_drxk = {
         .adr = 0x29,
         .single_master = 1,
         .microcode_name = "dvb-demod-drxk-pctv.fw",
+        .qam_demod_parameter_count = 2,
         .chunk_size = 58,
         .antenna_dvbt = true, /* disable LNA */
         .antenna_gpio = (1 << 2), /* disable LNA */