--- budget.c.orig	2009-04-16 19:39:36.000000000 +0200
+++ budget.c	2009-04-16 20:04:31.000000000 +0200
@@ -47,6 +47,11 @@
 #include "bsru6.h"
 #include "bsbe1.h"
 #include "tdhd1.h"
+#include "stv6110x.h"
+#include "stv090x.h"
+#include "isl6423.h"
+
+
 
 static int diseqc_method;
 module_param(diseqc_method, int, 0444);
@@ -401,6 +406,49 @@
 }
 
 
+static struct stv090x_config tt1600_stv090x_config = {
+        .device                 = STV0903,
+        .demod_mode             = STV090x_SINGLE,
+        .clk_mode               = STV090x_CLK_EXT,
+
+        .xtal                   = 27000000,
+        .address                = 0x68,
+        .ref_clk                = 27000000,
+
+        .ts1_mode               = STV090x_TSMODE_PARALLEL_PUNCTURED,
+        .ts2_mode               = STV090x_TSMODE_SERIAL_PUNCTURED,
+
+        .repeater_level         = STV090x_RPTLEVEL_16,
+
+        .tuner_init             = NULL,
+        .tuner_set_mode         = NULL,
+        .tuner_set_frequency    = NULL,
+        .tuner_get_frequency    = NULL,
+        .tuner_set_bandwidth    = NULL,
+        .tuner_get_bandwidth    = NULL,
+        .tuner_set_bbgain       = NULL,
+        .tuner_get_bbgain       = NULL,
+        .tuner_set_refclk       = NULL,
+        .tuner_get_status       = NULL,
+};
+
+static struct stv6110x_config tt1600_stv6110x_config = {
+        .addr                   = 0x60,
+        .refclk                 = 27000000,
+};
+
+
+
+static struct isl6423_config tt1600_isl6423_config = {
+        .current_max            = SEC_CURRENT_515m,
+        .curlim                 = SEC_CURRENT_LIM_ON,
+        .mod_extern             = 1,
+        .addr                   = 0x08,
+};
+
+
+
+
 static int i2c_readreg(struct i2c_adapter *i2c, u8 adr, u8 reg)
 {
 	u8 val;
@@ -475,6 +523,50 @@
 		}
 		break;
 
+
+          case 0x101c: { /* TT S2-1600 */
+                        struct stv6110x_devctl *ctl;
+                        /* TODO! must verify with Andreas */
+                        saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTLO);
+                        msleep(50);
+                        saa7146_setgpio(budget->dev, 2, SAA7146_GPIO_OUTHI);
+                        msleep(250);
+
+                        budget->dvb_frontend = dvb_attach(stv090x_attach,
+                                                                    &tt1600_stv090x_config,
+                                                                    &budget->i2c_adap,
+                                                                    STV090x_DEMODULATOR_0);
+
+                        if (budget->dvb_frontend) {
+
+                                ctl = dvb_attach(stv6110x_attach,
+                                                 budget->dvb_frontend,
+                                                 &tt1600_stv6110x_config,
+                                                 &budget->i2c_adap);
+
+                                tt1600_stv090x_config.tuner_init          = ctl->tuner_init;
+                                tt1600_stv090x_config.tuner_set_mode      = ctl->tuner_set_mode;
+                                tt1600_stv090x_config.tuner_set_frequency = ctl->tuner_set_frequency;
+                                tt1600_stv090x_config.tuner_get_frequency = ctl->tuner_get_frequency;
+                                tt1600_stv090x_config.tuner_set_bandwidth = ctl->tuner_set_bandwidth;
+                                tt1600_stv090x_config.tuner_get_bandwidth = ctl->tuner_get_bandwidth;
+                                tt1600_stv090x_config.tuner_set_bbgain    = ctl->tuner_set_bbgain;
+                                tt1600_stv090x_config.tuner_get_bbgain    = ctl->tuner_get_bbgain;
+                                tt1600_stv090x_config.tuner_set_refclk    = ctl->tuner_set_refclk;
+                                tt1600_stv090x_config.tuner_get_status    = ctl->tuner_get_status;
+
+                                dvb_attach(isl6423_attach,
+                                        budget->dvb_frontend,
+                                        &budget->i2c_adap,
+                                        &tt1600_isl6423_config);
+
+                        } else {
+                                dvb_frontend_detach(budget->dvb_frontend);
+                                budget->dvb_frontend = NULL;
+                        }
+                }
+		break;
+
 	case 0x4f60: /* Fujitsu Siemens Activy Budget-S PCI rev AL (stv0299/tsa5059) */
 	{
 		int subtype = i2c_readreg(&budget->i2c_adap, 0x50, 0x67);
@@ -641,22 +733,24 @@
 MAKE_BUDGET_INFO(ttbt,	"TT-Budget/WinTV-NOVA-T  PCI",	BUDGET_TT);
 MAKE_BUDGET_INFO(satel,	"SATELCO Multimedia PCI",	BUDGET_TT_HW_DISEQC);
 MAKE_BUDGET_INFO(ttbs1401, "TT-Budget-S-1401 PCI", BUDGET_TT);
+MAKE_BUDGET_INFO(tt1600, "TT-Budget S2-1600 PCI", BUDGET_TT);
 MAKE_BUDGET_INFO(fsacs0, "Fujitsu Siemens Activy Budget-S PCI (rev GR/grundig frontend)", BUDGET_FS_ACTIVY);
 MAKE_BUDGET_INFO(fsacs1, "Fujitsu Siemens Activy Budget-S PCI (rev AL/alps frontend)", BUDGET_FS_ACTIVY);
 MAKE_BUDGET_INFO(fsact,	 "Fujitsu Siemens Activy Budget-T PCI (rev GR/Grundig frontend)", BUDGET_FS_ACTIVY);
 MAKE_BUDGET_INFO(fsact1, "Fujitsu Siemens Activy Budget-T PCI (rev AL/ALPS TDHD1-204A)", BUDGET_FS_ACTIVY);
 
 static struct pci_device_id pci_tbl[] = {
-	MAKE_EXTENSION_PCI(ttbs,  0x13c2, 0x1003),
-	MAKE_EXTENSION_PCI(ttbc,  0x13c2, 0x1004),
-	MAKE_EXTENSION_PCI(ttbt,  0x13c2, 0x1005),
-	MAKE_EXTENSION_PCI(satel, 0x13c2, 0x1013),
-	MAKE_EXTENSION_PCI(ttbs,  0x13c2, 0x1016),
-	MAKE_EXTENSION_PCI(ttbs1401, 0x13c2, 0x1018),
-	MAKE_EXTENSION_PCI(fsacs1,0x1131, 0x4f60),
-	MAKE_EXTENSION_PCI(fsacs0,0x1131, 0x4f61),
-	MAKE_EXTENSION_PCI(fsact1, 0x1131, 0x5f60),
-	MAKE_EXTENSION_PCI(fsact, 0x1131, 0x5f61),
+	MAKE_EXTENSION_PCI(ttbs,    0x13c2, 0x1003),
+	MAKE_EXTENSION_PCI(ttbc,    0x13c2, 0x1004),
+	MAKE_EXTENSION_PCI(ttbt,    0x13c2, 0x1005),
+	MAKE_EXTENSION_PCI(satel,   0x13c2, 0x1013),
+	MAKE_EXTENSION_PCI(ttbs,    0x13c2, 0x1016),
+ 	MAKE_EXTENSION_PCI(tt1600,  0x13c2, 0x101c),
+	MAKE_EXTENSION_PCI(ttbs1401,0x13c2, 0x1018),
+	MAKE_EXTENSION_PCI(fsacs1,  0x1131, 0x4f60),
+	MAKE_EXTENSION_PCI(fsacs0,  0x1131, 0x4f61),
+	MAKE_EXTENSION_PCI(fsact1,  0x1131, 0x5f60),
+	MAKE_EXTENSION_PCI(fsact,   0x1131, 0x5f61),
 	{
 		.vendor    = 0,
 	}