summaryrefslogtreecommitdiff
path: root/drivers/video/i810/i810.h
diff options
context:
space:
mode:
authorAntonino A. Daplas <adaplas@gmail.com>2005-09-10 00:10:04 +0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-10 01:03:41 +0400
commit74f6ae84b2315c2fa8a4110b09a1c0f3dca92674 (patch)
tree47b3bae44b4c57a699d2c130510ff0fbe110fa97 /drivers/video/i810/i810.h
parent829e79b680210c4f4de435af6e1f90451922fc7d (diff)
downloadlinux-74f6ae84b2315c2fa8a4110b09a1c0f3dca92674.tar.xz
[PATCH] i810fb: Add i2c/DDC support
Add ddc/i2c support for i810fb. This will allow the driver to get display information, especially for monitors with fickle timings. The i2c support depends on CONFIG_FB_I810_GTF. Changed __init* to __devinit* Signed-off-by: Antonino Daplas <adaplas@pol.net> Signed-off-by: Alexander Nyberg <alexn@telia.com> 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.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/video/i810/i810.h b/drivers/video/i810/i810.h
index f59af3335ccf..d48949ceaacc 100644
--- a/drivers/video/i810/i810.h
+++ b/drivers/video/i810/i810.h
@@ -16,6 +16,9 @@
#include <linux/list.h>
#include <linux/agp_backend.h>
#include <linux/fb.h>
+#include <linux/i2c.h>
+#include <linux/i2c-id.h>
+#include <linux/i2c-algo-bit.h>
#include <video/vga.h>
/* Fence */
@@ -240,6 +243,14 @@ struct state_registers {
u8 cr39, cr41, cr70, sr01, msr;
};
+struct i810fb_par;
+
+struct i810fb_i2c_chan {
+ struct i810fb_par *par;
+ struct i2c_adapter adapter;
+ struct i2c_algo_bit_data algo;
+};
+
struct i810fb_par {
struct mode_registers regs;
struct state_registers hw_state;
@@ -251,10 +262,12 @@ struct i810fb_par {
struct heap_data iring;
struct heap_data cursor_heap;
struct vgastate state;
+ struct i810fb_i2c_chan chan[2];
atomic_t use_count;
u32 pseudo_palette[17];
unsigned long mmio_start_phys;
u8 __iomem *mmio_start_virtual;
+ u8 *edid;
u32 pitch;
u32 pixconf;
u32 watermark;