Skip to content

L
linux
Commit 2a4e095a authored by Michael Hunold's avatar Michael Hunold Committed by Linus Torvalds
Browse files
Options

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

 - [V4L] follow changes in saa7146 driver: mxb, dpc7146, hexium_orion,
   hexium_gemini
parent b8bd49a4
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 30 deletions
drivers/media/video/dpc7146.c
View file @ 2a4e095a
...@@ -106,7 +106,7 @@ static int dpc_probe(struct saa7146_dev* dev) ...@@ -106,7 +106,7 @@ static int dpc_probe(struct saa7146_dev* dev)
video port pins should be enabled here ?! */ video port pins should be enabled here ?! */
saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26)); 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) { if(i2c_add_adapter(&dpc->i2c_adapter) < 0) {
DEB_S(("cannot register i2c-device. skipping.\n")); DEB_S(("cannot register i2c-device. skipping.\n"));
kfree(dpc); kfree(dpc);
...@@ -312,18 +312,18 @@ static int std_callback(struct saa7146_dev* dev, struct saa7146_standard *std) ...@@ -312,18 +312,18 @@ static int std_callback(struct saa7146_dev* dev, struct saa7146_standard *std)
static struct saa7146_standard standard[] = { static struct saa7146_standard standard[] = {
{ {
.name = "PAL", .id = V4L2_STD_PAL, .name = "PAL", .id = V4L2_STD_PAL,
.v_offset = 0x17, .v_field = 288, .v_calc = 576, .v_offset = 0x17, .v_field = 288,
.h_offset = 0x14, .h_pixels = 680, .h_calc = 680+1, .h_offset = 0x14, .h_pixels = 680,
.v_max_out = 576, .h_max_out = 768, .v_max_out = 576, .h_max_out = 768,
}, { }, {
.name = "NTSC", .id = V4L2_STD_NTSC, .name = "NTSC", .id = V4L2_STD_NTSC,
.v_offset = 0x16, .v_field = 240, .v_calc = 480, .v_offset = 0x16, .v_field = 240,
.h_offset = 0x06, .h_pixels = 708, .h_calc = 708+1, .h_offset = 0x06, .h_pixels = 708,
.v_max_out = 480, .h_max_out = 640, .v_max_out = 480, .h_max_out = 640,
}, { }, {
.name = "SECAM", .id = V4L2_STD_SECAM, .name = "SECAM", .id = V4L2_STD_SECAM,
.v_offset = 0x14, .v_field = 288, .v_calc = 576, .v_offset = 0x14, .v_field = 288,
.h_offset = 0x14, .h_pixels = 720, .h_calc = 720+1, .h_offset = 0x14, .h_pixels = 720,
.v_max_out = 576, .h_max_out = 768, .v_max_out = 576, .h_max_out = 768,
} }
}; };
......
drivers/media/video/hexium_gemini.c
View file @ 2a4e095a
...@@ -159,18 +159,18 @@ static struct hexium_data hexium_input_select[] = { ...@@ -159,18 +159,18 @@ static struct hexium_data hexium_input_select[] = {
static struct saa7146_standard hexium_standards[] = { static struct saa7146_standard hexium_standards[] = {
{ {
.name = "PAL", .id = V4L2_STD_PAL, .name = "PAL", .id = V4L2_STD_PAL,
.v_offset = 28, .v_field = 288, .v_calc = 576, .v_offset = 28, .v_field = 288,
.h_offset = 1, .h_pixels = 680, .h_calc = 680+1, .h_offset = 1, .h_pixels = 680,
.v_max_out = 576, .h_max_out = 768, .v_max_out = 576, .h_max_out = 768,
}, { }, {
.name = "NTSC", .id = V4L2_STD_NTSC, .name = "NTSC", .id = V4L2_STD_NTSC,
.v_offset = 28, .v_field = 240, .v_calc = 480, .v_offset = 28, .v_field = 240,
.h_offset = 1, .h_pixels = 640, .h_calc = 641+1, .h_offset = 1, .h_pixels = 640,
.v_max_out = 480, .h_max_out = 640, .v_max_out = 480, .h_max_out = 640,
}, { }, {
.name = "SECAM", .id = V4L2_STD_SECAM, .name = "SECAM", .id = V4L2_STD_SECAM,
.v_offset = 28, .v_field = 288, .v_calc = 576, .v_offset = 28, .v_field = 288,
.h_offset = 1, .h_pixels = 720, .h_calc = 720+1, .h_offset = 1, .h_pixels = 720,
.v_max_out = 576, .h_max_out = 768, .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 ...@@ -250,7 +250,7 @@ static int hexium_attach(struct saa7146_dev *dev, struct saa7146_pci_extension_d
/* enable i2c-port pins */ /* enable i2c-port pins */
saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26)); 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) { if (i2c_add_adapter(&hexium->i2c_adapter) < 0) {
DEB_S(("cannot register i2c-device. skipping.\n")); DEB_S(("cannot register i2c-device. skipping.\n"));
kfree(hexium); kfree(hexium);
......
drivers/media/video/hexium_orion.c
View file @ 2a4e095a
...@@ -192,18 +192,18 @@ static struct { ...@@ -192,18 +192,18 @@ static struct {
static struct saa7146_standard hexium_standards[] = { static struct saa7146_standard hexium_standards[] = {
{ {
.name = "PAL", .id = V4L2_STD_PAL, .name = "PAL", .id = V4L2_STD_PAL,
.v_offset = 16, .v_field = 288, .v_calc = 576, .v_offset = 16, .v_field = 288,
.h_offset = 1, .h_pixels = 680, .h_calc = 680+1, .h_offset = 1, .h_pixels = 680,
.v_max_out = 576, .h_max_out = 768, .v_max_out = 576, .h_max_out = 768,
}, { }, {
.name = "NTSC", .id = V4L2_STD_NTSC, .name = "NTSC", .id = V4L2_STD_NTSC,
.v_offset = 16, .v_field = 240, .v_calc = 480, .v_offset = 16, .v_field = 240,
.h_offset = 1, .h_pixels = 640, .h_calc = 641+1, .h_offset = 1, .h_pixels = 640,
.v_max_out = 480, .h_max_out = 640, .v_max_out = 480, .h_max_out = 640,
}, { }, {
.name = "SECAM", .id = V4L2_STD_SECAM, .name = "SECAM", .id = V4L2_STD_SECAM,
.v_offset = 16, .v_field = 288, .v_calc = 576, .v_offset = 16, .v_field = 288,
.h_offset = 1, .h_pixels = 720, .h_calc = 720+1, .h_offset = 1, .h_pixels = 720,
.v_max_out = 576, .h_max_out = 768, .v_max_out = 576, .h_max_out = 768,
} }
}; };
...@@ -237,7 +237,7 @@ static int hexium_probe(struct saa7146_dev *dev) ...@@ -237,7 +237,7 @@ static int hexium_probe(struct saa7146_dev *dev)
saa7146_write(dev, DD1_STREAM_B, 0x00000000); saa7146_write(dev, DD1_STREAM_B, 0x00000000);
saa7146_write(dev, MC2, (MASK_09 | MASK_25 | MASK_10 | MASK_26)); 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) { if (i2c_add_adapter(&hexium->i2c_adapter) < 0) {
DEB_S(("cannot register i2c-device. skipping.\n")); DEB_S(("cannot register i2c-device. skipping.\n"));
kfree(hexium); kfree(hexium);
......
drivers/media/video/mxb.c
View file @ 2a4e095a
...@@ -223,7 +223,7 @@ static int mxb_probe(struct saa7146_dev* dev) ...@@ -223,7 +223,7 @@ static int mxb_probe(struct saa7146_dev* dev)
video port pins should be enabled here ?! */ video port pins should be enabled here ?! */
saa7146_write(dev, MC1, (MASK_08 | MASK_24 | MASK_10 | MASK_26)); 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) { if(i2c_add_adapter(&mxb->i2c_adapter) < 0) {
DEB_S(("cannot register i2c-device. skipping.\n")); DEB_S(("cannot register i2c-device. skipping.\n"));
kfree(mxb); kfree(mxb);
...@@ -1007,23 +1007,23 @@ static int std_callback(struct saa7146_dev* dev, struct saa7146_standard *std) ...@@ -1007,23 +1007,23 @@ static int std_callback(struct saa7146_dev* dev, struct saa7146_standard *std)
static struct saa7146_standard standard[] = { static struct saa7146_standard standard[] = {
{ {
.name = "PAL-BG", .id = V4L2_STD_PAL_BG, .name = "PAL-BG", .id = V4L2_STD_PAL_BG,
.v_offset = 0x17, .v_field = 288, .v_calc = 576, .v_offset = 0x17, .v_field = 288,
.h_offset = 0x14, .h_pixels = 680, .h_calc = 680+1, .h_offset = 0x14, .h_pixels = 680,
.v_max_out = 576, .h_max_out = 768, .v_max_out = 576, .h_max_out = 768,
}, { }, {
.name = "PAL-I", .id = V4L2_STD_PAL_I, .name = "PAL-I", .id = V4L2_STD_PAL_I,
.v_offset = 0x17, .v_field = 288, .v_calc = 576, .v_offset = 0x17, .v_field = 288,
.h_offset = 0x14, .h_pixels = 680, .h_calc = 680+1, .h_offset = 0x14, .h_pixels = 680,
.v_max_out = 576, .h_max_out = 768, .v_max_out = 576, .h_max_out = 768,
}, { }, {
.name = "NTSC", .id = V4L2_STD_NTSC, .name = "NTSC", .id = V4L2_STD_NTSC,
.v_offset = 0x16, .v_field = 240, .v_calc = 480, .v_offset = 0x16, .v_field = 240,
.h_offset = 0x06, .h_pixels = 708, .h_calc = 708+1, .h_offset = 0x06, .h_pixels = 708,
.v_max_out = 480, .h_max_out = 640, .v_max_out = 480, .h_max_out = 640,
}, { }, {
.name = "SECAM", .id = V4L2_STD_SECAM, .name = "SECAM", .id = V4L2_STD_SECAM,
.v_offset = 0x14, .v_field = 288, .v_calc = 576, .v_offset = 0x14, .v_field = 288,
.h_offset = 0x14, .h_pixels = 720, .h_calc = 720+1, .h_offset = 0x14, .h_pixels = 720,
.v_max_out = 576, .h_max_out = 768, .v_max_out = 576, .h_max_out = 768,
} }
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7