summaryrefslogtreecommitdiffstats
path: root/drivers/video/matrox/i2c-matroxfb.c
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2008-08-12 15:08:55 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-08-12 16:07:29 -0700
commit10546355323e4826d13e62f85ac6198385a817a9 (patch)
tree7e51dcb04003d253cee8718a01f5c36f88d19351 /drivers/video/matrox/i2c-matroxfb.c
parent73b7d92f6106e2f55206b8672e5ccf6206689899 (diff)
downloadop-kernel-dev-10546355323e4826d13e62f85ac6198385a817a9.zip
op-kernel-dev-10546355323e4826d13e62f85ac6198385a817a9.tar.gz
matrox maven: convert to a new-style i2c driver
The legacy i2c model is going away soon, so switch to the new model. Signed-off-by: Jean Delvare <khali@linux-fr.org> Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl> Cc: Petr Vandrovec <VANDROVE@vc.cvut.cz> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/video/matrox/i2c-matroxfb.c')
-rw-r--r--drivers/video/matrox/i2c-matroxfb.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/drivers/video/matrox/i2c-matroxfb.c b/drivers/video/matrox/i2c-matroxfb.c
index 9478439..c14e3e2 100644
--- a/drivers/video/matrox/i2c-matroxfb.c
+++ b/drivers/video/matrox/i2c-matroxfb.c
@@ -107,7 +107,6 @@ static int i2c_bus_reg(struct i2c_bit_adapter* b, struct matrox_fb_info* minfo,
b->mask.data = data;
b->mask.clock = clock;
b->adapter.owner = THIS_MODULE;
- b->adapter.id = I2C_HW_B_G400;
snprintf(b->adapter.name, sizeof(b->adapter.name), name,
minfo->fbcon.node);
i2c_set_adapdata(&b->adapter, b);
@@ -182,6 +181,17 @@ static void* i2c_matroxfb_probe(struct matrox_fb_info* minfo) {
MAT_DATA, MAT_CLK, "MAVEN:fb%u", 0);
if (err)
printk(KERN_INFO "i2c-matroxfb: Could not register Maven i2c bus. Continuing anyway.\n");
+ else {
+ struct i2c_board_info maven_info = {
+ I2C_BOARD_INFO("maven", 0x1b),
+ };
+ unsigned short const addr_list[2] = {
+ 0x1b, I2C_CLIENT_END
+ };
+
+ i2c_new_probed_device(&m2info->maven.adapter,
+ &maven_info, addr_list);
+ }
}
return m2info;
fail_ddc1:;
OpenPOWER on IntegriCloud