summaryrefslogtreecommitdiffstats
path: root/drivers/video/i810/i810.h
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2005-11-07 01:00:50 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-07 07:53:52 -0800
commit5fab851ea15206cc375582ad0db79f7827325098 (patch)
treebc7e3dd1e15d147c1aa482df69f433ff37246641 /drivers/video/i810/i810.h
parent8a0934f2969df4cdea81cf48fde4c8626b32325d (diff)
downloadop-kernel-dev-5fab851ea15206cc375582ad0db79f7827325098.zip
op-kernel-dev-5fab851ea15206cc375582ad0db79f7827325098.tar.gz
[PATCH] i810fb: Cleanup I2C code
- The functions for reading the 1st and 2nd bus are essentially the same, except for the register. Consolidate them all. - According to Nicolas Boichat, there is an undocumented 3rd i2c bus for attaching daughter cards. Add support for this. Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/video/i810/i810.h')
-rw-r--r--drivers/video/i810/i810.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/i810/i810.h b/drivers/video/i810/i810.h
index d48949c..6c187d5 100644
--- a/drivers/video/i810/i810.h
+++ b/drivers/video/i810/i810.h
@@ -249,6 +249,7 @@ struct i810fb_i2c_chan {
struct i810fb_par *par;
struct i2c_adapter adapter;
struct i2c_algo_bit_data algo;
+ unsigned long ddc_base;
};
struct i810fb_par {
@@ -262,7 +263,7 @@ struct i810fb_par {
struct heap_data iring;
struct heap_data cursor_heap;
struct vgastate state;
- struct i810fb_i2c_chan chan[2];
+ struct i810fb_i2c_chan chan[3];
atomic_t use_count;
u32 pseudo_palette[17];
unsigned long mmio_start_phys;
OpenPOWER on IntegriCloud