diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2005-09-09 13:10:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 14:03:40 -0700 |
| commit | ba44cd2d8abc3271a608b42cdbf55e1e575e2ba5 (patch) | |
| tree | 7416f8acd8a76e5b7beddda61d03cd2a16b5bd03 | |
| parent | 61ab7903b8cd772d3bfb28bc26d02c599cfb0e5b (diff) | |
| download | kernel-crypto-ba44cd2d8abc3271a608b42cdbf55e1e575e2ba5.tar.gz kernel-crypto-ba44cd2d8abc3271a608b42cdbf55e1e575e2ba5.tar.xz kernel-crypto-ba44cd2d8abc3271a608b42cdbf55e1e575e2ba5.zip | |
[PATCH] pxafb: Add hsync time reporting hook
To solve touchscreen interference problems devices like the Sharp Zaurus
SL-C3000 need to know the length of the horitzontal sync pulses. This patch
adds a hook to pxafb so the touchscreen driver can function correctly.
Signed-Off-By: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| -rw-r--r-- | drivers/video/pxafb.c | 32 | ||||
| -rw-r--r-- | drivers/video/pxafb.h | 2 | ||||
| -rw-r--r-- | include/asm-arm/arch-pxa/pxafb.h | 1 |
3 files changed, 35 insertions, 0 deletions
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 30112816420..34d4dcc0320 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c @@ -468,6 +468,36 @@ static inline unsigned int get_pcd(unsigned int pixclock) } /* + * Some touchscreens need hsync information from the video driver to + * function correctly. We export it here. + */ +static inline void set_hsync_time(struct pxafb_info *fbi, unsigned int pcd) +{ + unsigned long long htime; + + if ((pcd == 0) || (fbi->fb.var.hsync_len == 0)) { + fbi->hsync_time=0; + return; + } + + htime = (unsigned long long)get_lcdclk_frequency_10khz() * 10000; + do_div(htime, pcd * fbi->fb.var.hsync_len); + fbi->hsync_time = htime; +} + +unsigned long pxafb_get_hsync_time(struct device *dev) +{ + struct pxafb_info *fbi = dev_get_drvdata(dev); + + /* If display is blanked/suspended, hsync isn't active */ + if (!fbi || (fbi->state != C_ENABLE)) + return 0; + + return fbi->hsync_time; +} +EXPORT_SYMBOL(pxafb_get_hsync_time); + +/* * pxafb_activate_var(): * Configures LCD Controller based on entries in var parameter. Settings are * only written to the controller if changes were made. @@ -631,6 +661,7 @@ static int pxafb_activate_var(struct fb_var_screeninfo *var, struct pxafb_info * fbi->reg_lccr1 = new_regs.lccr1; fbi->reg_lccr2 = new_regs.lccr2; fbi->reg_lccr3 = new_regs.lccr3; + set_hsync_time(fbi, pcd); local_irq_restore(flags); /* @@ -907,6 +938,7 @@ pxafb_freq_transition(struct notifier_block *nb, unsigned long val, void *data) case CPUFREQ_POSTCHANGE: pcd = get_pcd(fbi->fb.var.pixclock); + set_hsync_time(fbi, pcd); fbi->reg_lccr3 = (fbi->reg_lccr3 & ~0xff) | LCCR3_PixClkDiv(pcd); set_ctrlr_state(fbi, C_ENABLE_CLKCHANGE); break; diff --git a/drivers/video/pxafb.h b/drivers/video/pxafb.h index de15fec5f82..22c00be786a 100644 --- a/drivers/video/pxafb.h +++ b/drivers/video/pxafb.h @@ -83,6 +83,8 @@ struct pxafb_info { u_int reg_lccr2; u_int reg_lccr3; + unsigned long hsync_time; + volatile u_char state; volatile u_char task_state; struct semaphore ctrlr_sem; diff --git a/include/asm-arm/arch-pxa/pxafb.h b/include/asm-arm/arch-pxa/pxafb.h index 27d71e9d413..21c0e16dce5 100644 --- a/include/asm-arm/arch-pxa/pxafb.h +++ b/include/asm-arm/arch-pxa/pxafb.h @@ -66,3 +66,4 @@ struct pxafb_mach_info { }; void set_pxa_fb_info(struct pxafb_mach_info *hard_pxa_fb_info); +unsigned long pxafb_get_hsync_time(struct device *dev); |