intelfb: RESEND - add preliminary i2c support
PATCH 8/8 intelfb: RESEND - add preliminary i2c support
From: Dennis Munsie <[email protected]>
Adds code to unregister the I2C buses in the cleanup function.
Signed-off-by Dennis Munsie <[email protected]>
---
drivers/video/intelfb/intelfb.h | 1 + drivers/video/intelfb/intelfb_i2c.c | 16 ++++++++++++++++ drivers/video/intelfb/intelfbdrv.c | 5 +++++ 3 files changed, 22 insertions(+)
drivers/video/intelfb/intelfb.h +1 -0
@@ -367,6 +367,7 @@ extern int intelfb_var_to_depth(const st#ifdef CONFIG_FB_INTEL_I2C extern void intelfb_create_i2c_busses (struct intelfb_info *dinfo); +extern void intelfb_delete_i2c_busses (struct intelfb_info *dinfo);#endif #endif /* _INTELFB_H */
drivers/video/intelfb/intelfb_i2c.c +16 -0
@@ -182,3 +182,19 @@ void intelfb_create_i2c_busses(struct in } dinfo->num_outputs = i; } + +void intelfb_delete_i2c_busses (struct intelfb_info *dinfo) +{ +int i; + +for (i =0 ; i <MAX_OUTPUTS ; i++) { +if (dinfo->output[i].i2c_bus.dinfo) { +i2c_bit_del_bus (&dinfo->output[i].i2c_bus.adapter); + dinfo->output[i].i2c_bus.dinfo =NULL ; + } +if (dinfo->output[i].ddc_bus.dinfo) { +i2c_bit_del_bus (&dinfo->output[i].ddc_bus.adapter); + dinfo->output[i].ddc_bus.dinfo =NULL ; + } + } +}
drivers/video/intelfb/intelfbdrv.c +5 -0
@@ -474,6 +474,11 @@ cleanup(struct intelfb_info *dinfo)agp_free_memory (dinfo->gtt_ring_mem); } +#ifdef CONFIG_FB_INTEL_I2C +/* un-register I2C bus */ +intelfb_delete_i2c_busses (dinfo); +#endif +if (dinfo->mmio_base)iounmap ((void __iomem *)dinfo->mmio_base);if (dinfo->aperture.virtual)