git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob

   1 From e3c6e1aaa5db7822524f5b1355960fd732910068 Mon Sep 17 00:00:00 2001
   2 From: Danny Wood <danwood76@gmail.com>
   3 Date: Sun, 20 Sep 2009 12:14:21 -0300
   4 Subject: V4L/DVB (13168): Add support for Asus Europa Hybrid DVB-T card (SAA7134 SubVendor ID: 0x1043 Device ID: 0x4847)
   5
   6 From: Danny Wood <danwood76@gmail.com>
   7
   8 commit e3c6e1aaa5db7822524f5b1355960fd732910068 upstream.
   9
  10 Adds the device IDs and driver linking to allow the Asus Europa DVB-T
  11 card to operate with these drivers.
  12 The device has a SAA7134 chipset with a TD1316 Hybrid Tuner.
  13 All inputs work on the card including switching between DVB-T and
  14 Analogue TV, there is also no IR with this card.
  15
  16 [mchehab@redhat.com: CodingStyle fixes]
  17
  18 Signed-off-by: Danny Wood <danwood76@gmail.com>
  19 Cc: Ben Hutchings <ben@decadent.org.uk>
  20 Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  21 Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  22
  23 ---
  24  Documentation/video4linux/CARDLIST.saa7134  |    1
  25  drivers/media/video/saa7134/saa7134-cards.c |   31 ++++++++++++++++++++++++++++
  26  drivers/media/video/saa7134/saa7134-dvb.c   |    1
  27  drivers/media/video/saa7134/saa7134.h       |    1
  28  4 files changed, 34 insertions(+)
  29
  30 --- a/Documentation/video4linux/CARDLIST.saa7134
  31 +++ b/Documentation/video4linux/CARDLIST.saa7134
  32 @@ -172,3 +172,4 @@
  33  171 -> Beholder BeholdTV X7                     [5ace:7595]
  34  172 -> RoverMedia TV Link Pro FM                [19d1:0138]
  35  173 -> Zolid Hybrid TV Tuner PCI                [1131:2004]
  36 +174 -> Asus Europa Hybrid OEM                   [1043:4847]
  37 --- a/drivers/media/video/saa7134/saa7134-cards.c
  38 +++ b/drivers/media/video/saa7134/saa7134-cards.c
  39 @@ -5279,6 +5279,30 @@ struct saa7134_board saa7134_boards[] =
  40                         .amux = TV,
  41                 },
  42         },
  43 +       [SAA7134_BOARD_ASUS_EUROPA_HYBRID] = {
  44 +               .name           = "Asus Europa Hybrid OEM",
  45 +               .audio_clock    = 0x00187de7,
  46 +               .tuner_type     = TUNER_PHILIPS_TD1316,
  47 +               .radio_type     = UNSET,
  48 +               .tuner_addr     = 0x61,
  49 +               .radio_addr     = ADDR_UNSET,
  50 +               .tda9887_conf   = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
  51 +               .mpeg           = SAA7134_MPEG_DVB,
  52 +               .inputs = { {
  53 +                       .name   = name_tv,
  54 +                       .vmux   = 3,
  55 +                       .amux   = TV,
  56 +                       .tv     = 1,
  57 +               }, {
  58 +                       .name   = name_comp1,
  59 +                       .vmux   = 4,
  60 +                       .amux   = LINE2,
  61 +               }, {
  62 +                       .name   = name_svideo,
  63 +                       .vmux   = 8,
  64 +                       .amux   = LINE2,
  65 +               } },
  66 +       },
  67
  68  };
  69
  70 @@ -6418,6 +6442,12 @@ struct pci_device_id saa7134_pci_tbl[] =
  71                 .subdevice    = 0x2004,
  72                 .driver_data  = SAA7134_BOARD_ZOLID_HYBRID_PCI,
  73         }, {
  74 +               .vendor       = PCI_VENDOR_ID_PHILIPS,
  75 +               .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
  76 +               .subvendor    = 0x1043,
  77 +               .subdevice    = 0x4847,
  78 +               .driver_data  = SAA7134_BOARD_ASUS_EUROPA_HYBRID,
  79 +       }, {
  80                 /* --- boards without eeprom + subsystem ID --- */
  81                 .vendor       = PCI_VENDOR_ID_PHILIPS,
  82                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
  83 @@ -7079,6 +7109,7 @@ int saa7134_board_init2(struct saa7134_d
  84                 /* break intentionally omitted */
  85         case SAA7134_BOARD_VIDEOMATE_DVBT_300:
  86         case SAA7134_BOARD_ASUS_EUROPA2_HYBRID:
  87 +       case SAA7134_BOARD_ASUS_EUROPA_HYBRID:
  88         {
  89
  90                 /* The Philips EUROPA based hybrid boards have the tuner
  91 --- a/drivers/media/video/saa7134/saa7134-dvb.c
  92 +++ b/drivers/media/video/saa7134/saa7134-dvb.c
  93 @@ -1116,6 +1116,7 @@ static int dvb_init(struct saa7134_dev *
  94                 break;
  95         case SAA7134_BOARD_PHILIPS_EUROPA:
  96         case SAA7134_BOARD_VIDEOMATE_DVBT_300:
  97 +       case SAA7134_BOARD_ASUS_EUROPA_HYBRID:
  98                 fe0->dvb.frontend = dvb_attach(tda10046_attach,
  99                                                &philips_europa_config,
 100                                                &dev->i2c_adap);
 101 --- a/drivers/media/video/saa7134/saa7134.h
 102 +++ b/drivers/media/video/saa7134/saa7134.h
 103 @@ -297,6 +297,7 @@ struct saa7134_format {
 104  #define SAA7134_BOARD_BEHOLD_X7             171
 105  #define SAA7134_BOARD_ROVERMEDIA_LINK_PRO_FM 172
 106  #define SAA7134_BOARD_ZOLID_HYBRID_PCI         173
 107 +#define SAA7134_BOARD_ASUS_EUROPA_HYBRID       174
 108
 109  #define SAA7134_MAXBOARDS 32
 110  #define SAA7134_INPUT_MAX 8