Terratec Cinergy Hybrid T USB XS FR

Commit Message

Catimimi Oct. 4, 2010, 7:32 p.m. UTC

None

Patch

diff -Nru v4l-dvb-1da5fed5c8b2-orig/linux/drivers/media/video/em28xx/em28xx-cards.c 
v4l-dvb-1da5fed5c8b2-new/linux/drivers/media/video/em28xx/em28xx-cards.c
--- v4l-dvb-1da5fed5c8b2-orig/linux/drivers/media/video/em28xx/em28xx-cards.c    2010-09-19 07:23:09.000000000 +0200
+++ v4l-dvb-1da5fed5c8b2-new/linux/drivers/media/video/em28xx/em28xx-cards.c    2010-10-04 19:05:11.000000000 +0200
@@ -200,6 +200,18 @@ 
      {    -1,        -1,    -1,        -1},
  };

+static struct em28xx_reg_seq terratec_cinergy_USB_XS_analog[] = {
+    {EM28XX_R08_GPIO,    0x6d,    ~EM_GPIO_4,    10},
+    {EM2880_R04_GPO,    0x00,    0xff,        10},
+    { -1,            -1,    -1,        -1},
+};
+
+static struct em28xx_reg_seq terratec_cinergy_USB_XS_digital[] = {
+    {EM28XX_R08_GPIO,    0x6e,    ~EM_GPIO_4,    10},
+    {EM2880_R04_GPO,    0x08,    0xff,        10},
+    { -1,            -1,    -1,        -1},
+};
+
  /* eb1a:2868 Reddo DVB-C USB TV Box
     GPIO4 - CU1216L NIM
     Other GPIOs seems to be don't care. */
@@ -824,22 +836,22 @@ 
          .tuner_gpio   = default_tuner_gpio,
          .decoder      = EM28XX_TVP5150,
          .has_dvb      = 1,
-        .dvb_gpio     = default_digital,
+        .dvb_gpio     = terratec_cinergy_USB_XS_digital,
          .input        = { {
              .type     = EM28XX_VMUX_TELEVISION,
              .vmux     = TVP5150_COMPOSITE0,
              .amux     = EM28XX_AMUX_VIDEO,
-            .gpio     = default_analog,
+            .gpio     = terratec_cinergy_USB_XS_analog,
          }, {
              .type     = EM28XX_VMUX_COMPOSITE1,
              .vmux     = TVP5150_COMPOSITE1,
              .amux     = EM28XX_AMUX_LINE_IN,
-            .gpio     = default_analog,
+            .gpio     = terratec_cinergy_USB_XS_analog,
          }, {
              .type     = EM28XX_VMUX_SVIDEO,
              .vmux     = TVP5150_SVIDEO,
              .amux     = EM28XX_AMUX_LINE_IN,
-            .gpio     = default_analog,
+            .gpio     = terratec_cinergy_USB_XS_analog,
          } },
      },
      [EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900] = {
@@ -2259,6 +2271,7 @@ 
          ctl->demod = XC3028_FE_ZARLINK456;
          break;
      case EM2880_BOARD_TERRATEC_HYBRID_XS:
+    case EM2880_BOARD_TERRATEC_HYBRID_XS_FR:
      case EM2881_BOARD_PINNACLE_HYBRID_PRO:
          ctl->demod = XC3028_FE_ZARLINK456;
          break;