4 files changed, 24 insertions, 3 deletions

diff --git a/drivers/media/video/cx88/cx88-blackbird.c b/drivers/media/video/cx88/cx88-blackbird.c
index 74e57a53116f..99bfa3238294 100644
--- a/drivers/media/video/cx88/cx88-blackbird.c
+++ b/drivers/media/video/cx88/cx88-blackbird.c
@@ -1689,6 +1689,18 @@ static int __devinit blackbird_probe(struct pci_dev *pci_dev,
         memcpy(&dev->params,&default_mpeg_params,sizeof(default_mpeg_params));
         memcpy(&dev->dnr_params,&default_dnr_params,sizeof(default_dnr_params));
 
+        if (core->board == CX88_BOARD_HAUPPAUGE_ROSLYN) {
+
+                if (core->tuner_formats & V4L2_STD_525_60) {
+                        dev->height = 480;
+                        dev->params.vi_frame_rate = 30;
+                } else {
+                        dev->height = 576;
+                        dev->params.vi_frame_rate = 25;
+                }
+
+        }
+
         err = cx8802_init_common(dev);
         if (0 != err)
                 goto fail_free;
diff --git a/drivers/media/video/cx88/cx88-cards.c b/drivers/media/video/cx88/cx88-cards.c
index c95438abcd7b..c20c07117537 100644
--- a/drivers/media/video/cx88/cx88-cards.c
+++ b/drivers/media/video/cx88/cx88-cards.c
@@ -611,12 +611,12 @@ struct cx88_board cx88_boards[] = {
                 .input          = {{
                         .type   = CX88_VMUX_TELEVISION,
                         .vmux   = 0,
-                        .gpio0  = 0xed12,  /* internal decoder */
+                        .gpio0  = 0xed1a,
                         .gpio2  = 0x00ff,
                 },{
                         .type   = CX88_VMUX_DEBUG,
                         .vmux   = 0,
-                        .gpio0  = 0xff01,  /* mono from tuner chip */
+                        .gpio0  = 0xff01,
                 },{
                         .type   = CX88_VMUX_COMPOSITE1,
                         .vmux   = 1,
@@ -1202,11 +1202,13 @@ static void hauppauge_eeprom(struct cx88_core *core, u8 *eeprom_data)
 
         tveeprom_hauppauge_analog(&core->i2c_client, &tv, eeprom_data);
         core->tuner_type = tv.tuner_type;
+        core->tuner_formats = tv.tuner_formats;
         core->has_radio  = tv.has_radio;
 
         /* Make sure we support the board model */
         switch (tv.model)
         {
+        case 28552: /* WinTV-PVR 'Roslyn' (No IR) */
         case 90002: /* Nova-T-PCI (9002) */
         case 92001: /* Nova-S-Plus (Video and IR) */
         case 92002: /* Nova-S-Plus (Video and IR) */
diff --git a/drivers/media/video/cx88/cx88-tvaudio.c b/drivers/media/video/cx88/cx88-tvaudio.c
index a1b120c8a9b5..00051a4c1dc2 100644
--- a/drivers/media/video/cx88/cx88-tvaudio.c
+++ b/drivers/media/video/cx88/cx88-tvaudio.c
@@ -139,7 +139,11 @@ static void set_audio_finish(struct cx88_core *core, u32 ctl)
 
         if (cx88_boards[core->board].blackbird) {
                 /* sets sound input from external adc */
-                cx_set(AUD_CTL, EN_I2SIN_ENABLE);
+                if (core->board == CX88_BOARD_HAUPPAUGE_ROSLYN)
+                        cx_clear(AUD_CTL, EN_I2SIN_ENABLE);
+                else
+                        cx_set(AUD_CTL, EN_I2SIN_ENABLE);
+
                 cx_write(AUD_I2SINPUTCNTL, 4);
                 cx_write(AUD_BAUDRATE, 1);
                 /* 'pass-thru mode': this enables the i2s output to the mpeg encoder */
diff --git a/drivers/media/video/cx88/cx88.h b/drivers/media/video/cx88/cx88.h
index 3e2bcd241a27..0bbf68b325c4 100644
--- a/drivers/media/video/cx88/cx88.h
+++ b/drivers/media/video/cx88/cx88.h
@@ -285,6 +285,9 @@ struct cx88_core {
         unsigned int               tda9887_conf;
         unsigned int               has_radio;
 
+        /* Supported V4L _STD_ tuner formats */
+        unsigned int               tuner_formats;
+
         /* config info -- dvb */
         struct dvb_pll_desc        *pll_desc;
         unsigned int               pll_addr;