diff options
author | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-04-29 22:38:01 -0400 |
commit | 49e1900d4cc2e7bcecb681fe60f0990bec2dcce8 (patch) | |
tree | 253801ebf57e0a23856a2c7be129c2c178f62fdf /drivers/media/video/sn9c102/sn9c102_tas5130d1b.c | |
parent | 34f6d749c0a328817d5e36274e53121c1db734dc (diff) | |
parent | b9099ff63c75216d6ca10bce5a1abcd9293c27e6 (diff) |
Merge branch 'linux-2.6' into for-2.6.22
Diffstat (limited to 'drivers/media/video/sn9c102/sn9c102_tas5130d1b.c')
-rw-r--r-- | drivers/media/video/sn9c102/sn9c102_tas5130d1b.c | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c b/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c index cb1b318bc1ff..50406503fc40 100644 --- a/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c +++ b/drivers/media/video/sn9c102/sn9c102_tas5130d1b.c | |||
@@ -22,21 +22,14 @@ | |||
22 | #include "sn9c102_sensor.h" | 22 | #include "sn9c102_sensor.h" |
23 | 23 | ||
24 | 24 | ||
25 | static struct sn9c102_sensor tas5130d1b; | ||
26 | |||
27 | |||
28 | static int tas5130d1b_init(struct sn9c102_device* cam) | 25 | static int tas5130d1b_init(struct sn9c102_device* cam) |
29 | { | 26 | { |
30 | int err = 0; | 27 | int err; |
31 | 28 | ||
32 | err += sn9c102_write_reg(cam, 0x01, 0x01); | 29 | err = sn9c102_write_const_regs(cam, {0x01, 0x01}, {0x20, 0x17}, |
33 | err += sn9c102_write_reg(cam, 0x20, 0x17); | 30 | {0x04, 0x01}, {0x01, 0x10}, |
34 | err += sn9c102_write_reg(cam, 0x04, 0x01); | 31 | {0x00, 0x11}, {0x00, 0x14}, |
35 | err += sn9c102_write_reg(cam, 0x01, 0x10); | 32 | {0x60, 0x17}, {0x07, 0x18}); |
36 | err += sn9c102_write_reg(cam, 0x00, 0x11); | ||
37 | err += sn9c102_write_reg(cam, 0x00, 0x14); | ||
38 | err += sn9c102_write_reg(cam, 0x60, 0x17); | ||
39 | err += sn9c102_write_reg(cam, 0x07, 0x18); | ||
40 | 33 | ||
41 | return err; | 34 | return err; |
42 | } | 35 | } |
@@ -99,7 +92,7 @@ static int tas5130d1b_set_pix_format(struct sn9c102_device* cam, | |||
99 | static struct sn9c102_sensor tas5130d1b = { | 92 | static struct sn9c102_sensor tas5130d1b = { |
100 | .name = "TAS5130D1B", | 93 | .name = "TAS5130D1B", |
101 | .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>", | 94 | .maintainer = "Luca Risolia <luca.risolia@studio.unibo.it>", |
102 | .supported_bridge = BRIDGE_SN9C101 | BRIDGE_SN9C102 | BRIDGE_SN9C103, | 95 | .supported_bridge = BRIDGE_SN9C101 | BRIDGE_SN9C102, |
103 | .sysfs_ops = SN9C102_I2C_WRITE, | 96 | .sysfs_ops = SN9C102_I2C_WRITE, |
104 | .frequency = SN9C102_I2C_100KHZ, | 97 | .frequency = SN9C102_I2C_100KHZ, |
105 | .interface = SN9C102_I2C_3WIRES, | 98 | .interface = SN9C102_I2C_3WIRES, |