[media] em28xx: Improve support for the Terratec Cinergy HTC Stick HD

The windows driver used different values for the GPIOs and analog
decoder configuration. The values from the windows driver are now
used.
It also seems that the windows driver has LNA always disabled.
Thus we are doing the same (using the same flags as on windows).

I (only) tested with DVB-T and it worked quite well.

[mchehab@redhat.com: Fix merge conflicts and tested with DVB-C]
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, 2 insertions, 6 deletions

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 20a7e24de6fb..12bc54af431e 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -974,12 +974,8 @@ struct em28xx_board em28xx_boards[] = {
         [EM2884_BOARD_CINERGY_HTC_STICK] = {
                 .name         = "Terratec Cinergy HTC Stick",
                 .has_dvb      = 1,
-#if 0
-                .tuner_type   = TUNER_PHILIPS_TDA8290,
-                .tuner_addr   = 0x41,
-                .dvb_gpio     = terratec_h5_digital, /* FIXME: probably wrong */
-                .tuner_gpio   = terratec_h5_gpio,
-#endif
+                .ir_codes     = RC_MAP_NEC_TERRATEC_CINERGY_XS,
+                .tuner_type   = TUNER_ABSENT,
                 .i2c_speed    = EM2874_I2C_SECONDARY_BUS_SELECT |
                                 EM28XX_I2C_CLK_WAIT_ENABLE |
                                 EM28XX_I2C_FREQ_400_KHZ,