3 files changed, 84 insertions, 0 deletions

diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 98364d171def..3c2f09fb0446 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -4409,6 +4409,36 @@ struct saa7134_board saa7134_boards[] = {
                 /* no DVB support for now */
                 /* .mpeg           = SAA7134_MPEG_DVB, */
         },
+        [SAA7134_BOARD_ASUSTeK_TIGER_3IN1] = {
+                .name           = "Asus Tiger 3in1",
+                .audio_clock    = 0x00187de7,
+                .tuner_type     = TUNER_PHILIPS_TDA8290,
+                .radio_type     = UNSET,
+                .tuner_addr     = ADDR_UNSET,
+                .radio_addr     = ADDR_UNSET,
+                .tuner_config   = 2,
+                .gpiomask       = 1 << 21,
+                .mpeg           = SAA7134_MPEG_DVB,
+                .inputs         = {{
+                        .name = name_tv,
+                        .vmux = 1,
+                        .amux = TV,
+                        .tv   = 1,
+                }, {
+                        .name = name_comp,
+                        .vmux = 0,
+                        .amux = LINE2,
+                }, {
+                        .name = name_svideo,
+                        .vmux = 8,
+                        .amux = LINE2,
+                } },
+                .radio = {
+                        .name = name_radio,
+                        .amux = TV,
+                        .gpio = 0x0200000,
+                },
+        },
 };
 
 const unsigned int saa7134_bcount = ARRAY_SIZE(saa7134_boards);
@@ -5432,6 +5462,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                 .subdevice    = 0xf636,
                 .driver_data  = SAA7134_BOARD_AVERMEDIA_M103,
         }, {
+                .vendor       = PCI_VENDOR_ID_PHILIPS,
+                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+                .subvendor    = 0x1043,
+                .subdevice    = 0x4878, /* REV:1.02G */
+                .driver_data  = SAA7134_BOARD_ASUSTeK_TIGER_3IN1,
+        }, {
                 /* --- boards without eeprom + subsystem ID --- */
                 .vendor       = PCI_VENDOR_ID_PHILIPS,
                 .device       = PCI_DEVICE_ID_PHILIPS_SAA7134,
@@ -6002,6 +6038,14 @@ int saa7134_board_init2(struct saa7134_dev *dev)
                 i2c_transfer(&dev->i2c_adap, &msg, 1);
                 break;
         }
+        case SAA7134_BOARD_ASUSTeK_TIGER_3IN1:
+        {
+                u8 data[] = { 0x3c, 0x33, 0x60};
+                struct i2c_msg msg = {.addr = 0x0b, .flags = 0, .buf = data,
+                                                        .len = sizeof(data)};
+                i2c_transfer(&dev->i2c_adap, &msg, 1);
+                break;
+        }
         case SAA7134_BOARD_FLYDVB_TRIO:
         {
                 u8 data[] = { 0x3c, 0x33, 0x62};
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index be48b9b66a67..7fa6ce76642b 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -799,6 +799,20 @@ static struct tda1004x_config twinhan_dtv_dvb_3056_config = {
         .request_firmware = philips_tda1004x_request_firmware
 };
 
+static struct tda1004x_config asus_tiger_3in1_config = {
+        .demod_address = 0x0b,
+        .invert        = 1,
+        .invert_oclk   = 0,
+        .xtal_freq     = TDA10046_XTAL_16M,
+        .agc_config    = TDA10046_AGC_TDA827X,
+        .gpio_config   = TDA10046_GP11_I,
+        .if_freq       = TDA10046_FREQ_045,
+        .i2c_gate      = 0x4b,
+        .tuner_address = 0x61,
+        .antenna_switch = 1,
+        .request_firmware = philips_tda1004x_request_firmware
+};
+
 /* ------------------------------------------------------------------
  * special case: this card uses saa713x GPIO22 for the mode switch
  */
@@ -1300,6 +1314,31 @@ static int dvb_init(struct saa7134_dev *dev)
                                                 &dev->i2c_adap);
                 attach_xc3028 = 1;
                 break;
+        case SAA7134_BOARD_ASUSTeK_TIGER_3IN1:
+                if (!use_frontend) {     /* terrestrial */
+                        if (configure_tda827x_fe(dev, &asus_tiger_3in1_config,
+                                                        &tda827x_cfg_2) < 0)
+                                goto dettach_frontend;
+                } else {                /* satellite */
+                        dev->dvb.frontend = dvb_attach(tda10086_attach,
+                                                &flydvbs, &dev->i2c_adap);
+                        if (dev->dvb.frontend) {
+                                if (dvb_attach(tda826x_attach,
+                                                dev->dvb.frontend, 0x60,
+                                                &dev->i2c_adap, 0) == NULL) {
+                                        wprintk("%s: Asus Tiger 3in1, no "
+                                                "tda826x found!\n", __func__);
+                                        goto dettach_frontend;
+                                }
+                                if (dvb_attach(lnbp21_attach, dev->dvb.frontend,
+                                                &dev->i2c_adap, 0, 0) == NULL) {
+                                        wprintk("%s: Asus Tiger 3in1, no lnbp21"
+                                                " found!\n", __func__);
+                                        goto dettach_frontend;
+                                }
+                        }
+                }
+                break;
         default:
                 wprintk("Huh? unknown DVB card?\n");
                 break;
diff --git a/drivers/media/video/saa7134/saa7134.h b/drivers/media/video/saa7134/saa7134.h
index 5e7fc731fab1..cbfdac27b69e 100644
--- a/drivers/media/video/saa7134/saa7134.h
+++ b/drivers/media/video/saa7134/saa7134.h
@@ -269,6 +269,7 @@ struct saa7134_format {
 #define SAA7134_BOARD_BEHOLD_M6_EXTRA    144
 #define SAA7134_BOARD_AVERMEDIA_M103    145
 #define SAA7134_BOARD_ASUSTeK_P7131_ANALOG 146
+#define SAA7134_BOARD_ASUSTeK_TIGER_3IN1   147
 
 #define SAA7134_MAXBOARDS 8
 #define SAA7134_INPUT_MAX 8