[PATCH] DVB: Follow saa7146 changes in affected V4L drivers

 - [V4L] follow changes in saa7146 driver: mxb, dpc7146, hexium_orion,
   hexium_gemini

diff --git a/drivers/media/video/dpc7146.c b/drivers/media/video/dpc7146.c
index 74572ab02234b16dbad5ec5ef149c8926f941ab2..86ca8a4385b7612f39b9c0ee1c9187c61cbd1312 100644 (file)
--- a/drivers/media/video/dpc7146.c
+++ b/drivers/media/video/dpc7146.c
@@ -106,7 +106,7 @@ static int dpc_probe(struct saa7146_dev* dev)
           video port pins should be enabled here ?! */
        saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26));
 
-       saa7146_i2c_adapter_prepare(dev, &dpc->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
+       saa7146_i2c_adapter_prepare(dev, &dpc->i2c_adapter, I2C_ADAP_CLASS_TV_ANALOG, SAA7146_I2C_BUS_BIT_RATE_480);
        if(i2c_add_adapter(&dpc->i2c_adapter) < 0) {
                DEB_S(("cannot register i2c-device. skipping.\n"));
                kfree(dpc);
@@ -312,18 +312,18 @@ static int std_callback(struct saa7146_dev* dev, struct saa7146_standard *std)
 static struct saa7146_standard standard[] = {
        {
                .name   = "PAL",        .id     = V4L2_STD_PAL,
-               .v_offset       = 0x17, .v_field        = 288,  .v_calc         = 576,
-               .h_offset       = 0x14, .h_pixels       = 680,  .h_calc         = 680+1,
+               .v_offset       = 0x17, .v_field        = 288,
+               .h_offset       = 0x14, .h_pixels       = 680,
                .v_max_out      = 576,  .h_max_out      = 768,
        }, {
                .name   = "NTSC",       .id     = V4L2_STD_NTSC,
-               .v_offset       = 0x16, .v_field        = 240,  .v_calc         = 480,
-               .h_offset       = 0x06, .h_pixels       = 708,  .h_calc         = 708+1,
+               .v_offset       = 0x16, .v_field        = 240,
+               .h_offset       = 0x06, .h_pixels       = 708,
                .v_max_out      = 480,  .h_max_out      = 640,
        }, {
                .name   = "SECAM",      .id     = V4L2_STD_SECAM,
-               .v_offset       = 0x14, .v_field        = 288,  .v_calc         = 576,
-               .h_offset       = 0x14, .h_pixels       = 720,  .h_calc         = 720+1,
+               .v_offset       = 0x14, .v_field        = 288,
+               .h_offset       = 0x14, .h_pixels       = 720,
                .v_max_out      = 576,  .h_max_out      = 768,
        }
 };

diff --git a/drivers/media/video/hexium_gemini.c b/drivers/media/video/hexium_gemini.c
index 8dd647a90f2e066a835aad879d85ea8644d1b70c..748ba676c43133bb8c8022856ea09b18ce2c2f59 100644 (file)
--- a/drivers/media/video/hexium_gemini.c
+++ b/drivers/media/video/hexium_gemini.c
@@ -159,18 +159,18 @@ static struct hexium_data hexium_input_select[] = {
 static struct saa7146_standard hexium_standards[] = {
        {
                .name   = "PAL",        .id     = V4L2_STD_PAL,
-               .v_offset       = 28,   .v_field        = 288,  .v_calc         = 576,
-               .h_offset       = 1,    .h_pixels       = 680,  .h_calc         = 680+1,
+               .v_offset       = 28,   .v_field        = 288,
+               .h_offset       = 1,    .h_pixels       = 680,
                .v_max_out      = 576,  .h_max_out      = 768,
        }, {
                .name   = "NTSC",       .id     = V4L2_STD_NTSC,
-               .v_offset       = 28,   .v_field        = 240,  .v_calc         = 480,
-               .h_offset       = 1,    .h_pixels       = 640,  .h_calc         = 641+1,
+               .v_offset       = 28,   .v_field        = 240,
+               .h_offset       = 1,    .h_pixels       = 640,
                .v_max_out      = 480,  .h_max_out      = 640,
        }, {
                .name   = "SECAM",      .id     = V4L2_STD_SECAM,
-               .v_offset       = 28,   .v_field        = 288,  .v_calc         = 576,
-               .h_offset       = 1,    .h_pixels       = 720,  .h_calc         = 720+1,
+               .v_offset       = 28,   .v_field        = 288,
+               .h_offset       = 1,    .h_pixels       = 720,
                .v_max_out      = 576,  .h_max_out      = 768,
        }
 };             
@@ -250,7 +250,7 @@ static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_d
        /* enable i2c-port pins */
        saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26));
 
-       saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
+       saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, I2C_ADAP_CLASS_TV_ANALOG, SAA7146_I2C_BUS_BIT_RATE_480);
        if (i2c_add_adapter(&hexium->i2c_adapter) < 0) {
                DEB_S(("cannot register i2c-device. skipping.\n"));
                kfree(hexium);

diff --git a/drivers/media/video/hexium_orion.c b/drivers/media/video/hexium_orion.c
index 91c8c82da9a59e381967e699511fc682c54b5959..cdb82726c42080239da8c391f256c988bd9bd8a1 100644 (file)
--- a/drivers/media/video/hexium_orion.c
+++ b/drivers/media/video/hexium_orion.c
@@ -192,18 +192,18 @@ static struct {
 static struct saa7146_standard hexium_standards[] = {
        {
                .name   = "PAL",        .id     = V4L2_STD_PAL,
-               .v_offset       = 16,   .v_field        = 288,  .v_calc         = 576,
-               .h_offset       = 1,    .h_pixels       = 680,  .h_calc         = 680+1,
+               .v_offset       = 16,   .v_field        = 288,
+               .h_offset       = 1,    .h_pixels       = 680,
                .v_max_out      = 576,  .h_max_out      = 768,
        }, {
                .name   = "NTSC",       .id     = V4L2_STD_NTSC,
-               .v_offset       = 16,   .v_field        = 240,  .v_calc         = 480,
-               .h_offset       = 1,    .h_pixels       = 640,  .h_calc         = 641+1,
+               .v_offset       = 16,   .v_field        = 240,
+               .h_offset       = 1,    .h_pixels       = 640,
                .v_max_out      = 480,  .h_max_out      = 640,
        }, {
                .name   = "SECAM",      .id     = V4L2_STD_SECAM,
-               .v_offset       = 16,   .v_field        = 288,  .v_calc         = 576,
-               .h_offset       = 1,    .h_pixels       = 720,  .h_calc         = 720+1,
+               .v_offset       = 16,   .v_field        = 288,
+               .h_offset       = 1,    .h_pixels       = 720,
                .v_max_out      = 576,  .h_max_out      = 768,
        }
 };             
@@ -237,7 +237,7 @@ static int hexium_probe(struct saa7146_dev *dev)
        saa7146_write(dev, DD1_STREAM_B, 0x00000000);
        saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26));
 
-       saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
+       saa7146_i2c_adapter_prepare(dev, &hexium->i2c_adapter, I2C_ADAP_CLASS_TV_ANALOG, SAA7146_I2C_BUS_BIT_RATE_480);
        if (i2c_add_adapter(&hexium->i2c_adapter) < 0) {
                DEB_S(("cannot register i2c-device. skipping.\n"));
                kfree(hexium);

diff --git a/drivers/media/video/mxb.c b/drivers/media/video/mxb.c
index f808a1f6b28ba97a889921e8bf4af274418ed07e..cad4049a35e656d5a7647a07a934649e9af3ac23 100644 (file)
--- a/drivers/media/video/mxb.c
+++ b/drivers/media/video/mxb.c
@@ -223,7 +223,7 @@ static int mxb_probe(struct saa7146_dev* dev)
           video port pins should be enabled here ?! */
        saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26));
 
-       saa7146_i2c_adapter_prepare(dev, &mxb->i2c_adapter, SAA7146_I2C_BUS_BIT_RATE_480);
+       saa7146_i2c_adapter_prepare(dev, &mxb->i2c_adapter, I2C_ADAP_CLASS_TV_ANALOG, SAA7146_I2C_BUS_BIT_RATE_480);
        if(i2c_add_adapter(&mxb->i2c_adapter) < 0) {
                DEB_S(("cannot register i2c-device. skipping.\n"));
                kfree(mxb);
@@ -1007,23 +1007,23 @@ static int std_callback(struct saa7146_dev* dev, struct saa7146_standard *std)
 static struct saa7146_standard standard[] = {
        {
                .name   = "PAL-BG",     .id     = V4L2_STD_PAL_BG,
-               .v_offset       = 0x17, .v_field        = 288,  .v_calc         = 576,
-               .h_offset       = 0x14, .h_pixels       = 680,  .h_calc         = 680+1,
+               .v_offset       = 0x17, .v_field        = 288,
+               .h_offset       = 0x14, .h_pixels       = 680,
                .v_max_out      = 576,  .h_max_out      = 768,
        }, {
                .name   = "PAL-I",      .id     = V4L2_STD_PAL_I,
-               .v_offset       = 0x17, .v_field        = 288,  .v_calc         = 576,
-               .h_offset       = 0x14, .h_pixels       = 680,  .h_calc         = 680+1,
+               .v_offset       = 0x17, .v_field        = 288,
+               .h_offset       = 0x14, .h_pixels       = 680,
                .v_max_out      = 576,  .h_max_out      = 768,
        }, {
                .name   = "NTSC",       .id     = V4L2_STD_NTSC,
-               .v_offset       = 0x16, .v_field        = 240,  .v_calc         = 480,
-               .h_offset       = 0x06, .h_pixels       = 708,  .h_calc         = 708+1,
+               .v_offset       = 0x16, .v_field        = 240,
+               .h_offset       = 0x06, .h_pixels       = 708,
                .v_max_out      = 480,  .h_max_out      = 640,
        }, {
                .name   = "SECAM",      .id     = V4L2_STD_SECAM,
-               .v_offset       = 0x14, .v_field        = 288,  .v_calc         = 576,
-               .h_offset       = 0x14, .h_pixels       = 720,  .h_calc         = 720+1,
+               .v_offset       = 0x14, .v_field        = 288,
+               .h_offset       = 0x14, .h_pixels       = 720,
                .v_max_out      = 576,  .h_max_out      = 768,
        }
 };