Core driver for WM97xx touchscreens
Subsystems (3)
PATCH 2/6 Add chip driver for WM9705 touchscreen
In reply to Mark Brown--- drivers/input/touchscreen/wm9705.c | 352 ++++++++++++++++++++++++++++++++++++ 1 files changed, 352 insertions(+), 0 deletions(-) create mode 100644 drivers/input/touchscreen/wm9705.c
drivers/input/touchscreen/wm9705.c new file +352 -0
@@ -0,0 +1,352 @@ +/* +* wm9705.c -- Codec driver for Wolfson WM9705 AC97 Codec. +* +* Copyright 2003, 2004, 2005, 2006, 2007 Wolfson Microelectronics PLC. +* Author: Liam Girdwood +* [email protected] or [email protected] +* Parts Copyright : Ian Molton <[email protected]> +* Andrew Zabolotny <[email protected]> +* Russell King <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +* +*/ + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/version.h> +#include <linux/kernel.h> +#include <linux/input.h> +#include <linux/delay.h> +#include <linux/bitops.h> +#include <linux/wm97xx.h> + +#define TS_NAME "wm97xx" +#define WM9705_VERSION "0.62" +#define DEFAULT_PRESSURE 0xb0c0 + +/* +* Module parameters +*/ + +/* +* Set current used for pressure measurement. +* +* Set pil = 2 to use 400uA +* pil = 1 to use 200uA and +* pil = 0 to disable pressure measurement. +* +* This is used to increase the range of values returned by the adc +* when measureing touchpanel pressure. +*/ +static int pil; +module_param (pil, int,0 ); +MODULE_PARM_DESC (pil,"Set current used for pressure measurement." ); + +/* +* Set threshold for pressure measurement. +* +* Pen down pressure below threshold is ignored. +*/ +static int pressure =DEFAULT_PRESSURE &0xfff ; +module_param (pressure, int,0 ); +MODULE_PARM_DESC (pressure,"Set threshold for pressure measurement." ); + +/* +* Set adc sample delay. +* +* For accurate touchpanel measurements, some settling time may be +* required between the switch matrix applying a voltage across the +* touchpanel plate and the ADC sampling the signal. +* +* This delay can be set by setting delay = n, where n is the array +* position of the delay in the array delay_table below. +* Long delays > 1ms are supported for completeness, but are not +* recommended. +*/ +static int delay =4 ; +module_param (delay, int,0 ); +MODULE_PARM_DESC (delay,"Set adc sample delay." ); + +/* +* Pen detect comparator threshold. +* +* 0 to Vmid in 15 steps, 0 = use zero power comparator with Vmid threshold +* i.e. 1 = Vmid/15 threshold +* 15 = Vmid/1 threshold +* +* Adjust this value if you are having problems with pen detect not +* detecting any down events. +*/ +static int pdd =8 ; +module_param (pdd, int,0 ); +MODULE_PARM_DESC (pdd,"Set pen detect comparator threshold" ); + +/* +* Set adc mask function. +* +* Sources of glitch noise, such as signals driving an LCD display, may feed +* through to the touch screen plates and affect measurement accuracy. In +* order to minimise this, a signal may be applied to the MASK pin to delay or +* synchronise the sampling. +* +* 0 = No delay or sync +* 1 = High on pin stops conversions +* 2 = Edge triggered, edge on pin delays conversion by delay param (above) +* 3 = Edge triggered, edge on pin starts conversion after delay param +*/ +static int mask; +module_param (mask, int,0 ); +MODULE_PARM_DESC (mask,"Set adc mask function." ); + +/* +* ADC sample delay times in uS +*/ +static const int delay_table[] = { +21 ,/* 1 AC97 Link frames */ +42 ,/* 2 */ +84 ,/* 4 */ +167 ,/* 8 */ +333 ,/* 16 */ +667 ,/* 32 */ +1000 ,/* 48 */ +1333 ,/* 64 */ +2000 ,/* 96 */ +2667 ,/* 128 */ +3333 ,/* 160 */ +4000 ,/* 192 */ +4667 ,/* 224 */ +5333 ,/* 256 */ +6000 ,/* 288 */ +0 /* No delay, switch matrix always on */ +}; + +/* +* Delay after issuing a POLL command. +* +* The delay is 3 AC97 link frames + the touchpanel settling delay +*/ +static inline void poll_delay (int d) +{ +udelay (3 *AC97_LINK_FRAME + delay_table[d]); +} + +/* +* set up the physical settings of the WM9705 +*/ +static void wm9705_phy_init (struct wm97xx *wm) +{ +u16 dig1 =0 , dig2 =WM97XX_RPR ; + +/* +* mute VIDEO and AUX as they share X and Y touchscreen +* inputs on the WM9705 +*/ +wm97xx_reg_write (wm,AC97_AUX ,0x8000 ); +wm97xx_reg_write (wm,AC97_VIDEO ,0x8000 ); + +/* touchpanel pressure current*/ +if (pil ==2 ) { + dig2 |=WM9705_PIL ; +dev_dbg (wm->dev, +"setting pressure measurement current to 400uA." ); + }else if (pil) +dev_dbg (wm->dev, +"setting pressure measurement current to 200uA." ); +if (!pil) + pressure =0 ; + +/* polling mode sample settling delay */ +if (delay !=4 ) { +if (delay <0 || delay >15 ) { +dev_dbg (wm->dev,"supplied delay out of range." ); + delay =4 ; + } + } + dig1 &=0xff0f ; + dig1 |=WM97XX_DELAY (delay); +dev_dbg (wm->dev,"setting adc sample delay to %d u Secs." , + delay_table[delay]); + +/* WM9705 pdd */ + dig2 |= (pdd &0x000f ); +dev_dbg (wm->dev,"setting pdd to Vmid/%d" ,1 - (pdd &0x000f )); + +/* mask */ + dig2 |= ((mask &0x3 ) <<4 ); + +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 , dig1); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 , dig2); +} + +static void wm9705_dig_enable (struct wm97xx *wm,int enable) +{ +if (enable) { +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 , + wm->dig[2 ] |WM97XX_PRP_DET_DIG ); +wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD );/* dummy read */ + }else +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 , + wm->dig[2 ] & ~WM97XX_PRP_DET_DIG ); +} + +static void wm9705_aux_prepare (struct wm97xx *wm) +{ +memcpy (wm->dig_save, wm->dig,sizeof (wm->dig)); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 ,0 ); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 ,WM97XX_PRP_DET_DIG ); +} + +static void wm9705_dig_restore (struct wm97xx *wm) +{ +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 , wm->dig_save[1 ]); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 , wm->dig_save[2 ]); +} + +static inline int is_pden (struct wm97xx *wm) +{ +return wm->dig[2 ] &WM9705_PDEN ; +} + +/* +* Read a sample from the WM9705 adc in polling mode. +*/ +static int wm9705_poll_sample (struct wm97xx *wm,int adcsel,int *sample) +{ +int timeout =5 * delay; + +if (!wm->pen_probably_down) { +u16 data =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +if (!(data &WM97XX_PEN_DOWN )) +return RC_PENUP ; + wm->pen_probably_down =1 ; + } + +/* set up digitiser */ +if (adcsel &0x8000 ) + adcsel = ((adcsel &0x7fff ) +3 ) <<12 ; + +if (wm->mach_ops && wm->mach_ops->pre_sample) + wm->mach_ops->pre_sample (adcsel); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 , + adcsel |WM97XX_POLL |WM97XX_DELAY (delay)); + +/* wait 3 AC97 time slots + delay for conversion */ +poll_delay (delay); + +/* wait for POLL to go low */ +while ((wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER1 ) &WM97XX_POLL ) + && timeout) { +udelay (AC97_LINK_FRAME ); + timeout--; + } + +if (timeout <=0 ) { +/* If PDEN is set, we can get a timeout when pen goes up */ +if (is_pden (wm)) + wm->pen_probably_down =0 ; +else +dev_dbg (wm->dev,"adc sample timeout" ); +return RC_PENUP ; + } + + *sample =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +if (wm->mach_ops && wm->mach_ops->post_sample) + wm->mach_ops->post_sample (adcsel); + +/* check we have correct sample */ +if ((*sample &WM97XX_ADCSEL_MASK ) != adcsel) { +dev_dbg (wm->dev,"adc wrong sample, read %x got %x" , adcsel, + *sample &WM97XX_ADCSEL_MASK ); +return RC_PENUP ; + } + +if (!(*sample &WM97XX_PEN_DOWN )) { + wm->pen_probably_down =0 ; +return RC_PENUP ; + } + +return RC_VALID ; +} + +/* +* Sample the WM9705 touchscreen in polling mode +*/ +static int wm9705_poll_touch (struct wm97xx *wm,struct wm97xx_data *data) +{ +int rc; + + rc =wm9705_poll_sample (wm,WM97XX_ADCSEL_X , &data->x); +if (rc !=RC_VALID ) +return rc; + rc =wm9705_poll_sample (wm,WM97XX_ADCSEL_Y , &data->y); +if (rc !=RC_VALID ) +return rc; +if (pil) { + rc =wm9705_poll_sample (wm,WM97XX_ADCSEL_PRES , &data->p); +if (rc !=RC_VALID ) +return rc; + }else + data->p =DEFAULT_PRESSURE ; + +return RC_VALID ; +} + +/* +* Enable WM9705 continuous mode, i.e. touch data is streamed across +* an AC97 slot +*/ +static int wm9705_acc_enable (struct wm97xx *wm,int enable) +{ +u16 dig1, dig2; +int ret =0 ; + + dig1 = wm->dig[1 ]; + dig2 = wm->dig[2 ]; + +if (enable) { +/* continous mode */ +if (wm->mach_ops->acc_startup && + (ret = wm->mach_ops->acc_startup (wm)) <0 ) +return ret; + dig1 &= ~(WM97XX_CM_RATE_MASK |WM97XX_ADCSEL_MASK | +WM97XX_DELAY_MASK |WM97XX_SLT_MASK ); + dig1 |=WM97XX_CTC |WM97XX_COO |WM97XX_SLEN | +WM97XX_DELAY (delay) | +WM97XX_SLT (wm->acc_slot) | +WM97XX_RATE (wm->acc_rate); +if (pil) + dig1 |=WM97XX_ADCSEL_PRES ; + dig2 |=WM9705_PDEN ; + }else { + dig1 &= ~(WM97XX_CTC |WM97XX_COO |WM97XX_SLEN ); + dig2 &= ~WM9705_PDEN ; +if (wm->mach_ops->acc_shutdown) + wm->mach_ops->acc_shutdown (wm); + } + +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 , dig1); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 , dig2); +return ret; +} + +struct wm97xx_codec_drv wm9705_codec = { + .id =WM9705_ID2 , + .name ="wm9705" , + .poll_sample = wm9705_poll_sample, + .poll_touch = wm9705_poll_touch, + .acc_enable = wm9705_acc_enable, + .phy_init = wm9705_phy_init, + .dig_enable = wm9705_dig_enable, + .dig_restore = wm9705_dig_restore, + .aux_prepare = wm9705_aux_prepare, +}; +EXPORT_SYMBOL_GPL (wm9705_codec); + +/* Module information */ +MODULE_AUTHOR ("Liam Girdwood <[email protected]>" ); +MODULE_DESCRIPTION ("WM9705 Touch Screen Driver" ); +MODULE_LICENSE ("GPL" );
Signature · 1 line
1.5.2.5
PATCH 3/6 Add chip driver for WM9712 touchscreen
In reply to Mark Brown--- drivers/input/touchscreen/wm9712.c | 461 ++++++++++++++++++++++++++++++++++++ 1 files changed, 461 insertions(+), 0 deletions(-) create mode 100644 drivers/input/touchscreen/wm9712.c
drivers/input/touchscreen/wm9712.c new file +461 -0
@@ -0,0 +1,461 @@ +/* +* wm9712.c -- Codec driver for Wolfson WM9712 AC97 Codecs. +* +* Copyright 2003, 2004, 2005, 2006, 2007 Wolfson Microelectronics PLC. +* Author: Liam Girdwood +* [email protected] or [email protected] +* Parts Copyright : Ian Molton <[email protected]> +* Andrew Zabolotny <[email protected]> +* Russell King <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +* +*/ + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/version.h> +#include <linux/kernel.h> +#include <linux/input.h> +#include <linux/delay.h> +#include <linux/bitops.h> +#include <linux/wm97xx.h> + +#define TS_NAME "wm97xx" +#define WM9712_VERSION "0.61" +#define DEFAULT_PRESSURE 0xb0c0 + +/* +* Module parameters +*/ + +/* +* Set internal pull up for pen detect. +* +* Pull up is in the range 1.02k (least sensitive) to 64k (most sensitive) +* i.e. pull up resistance = 64k Ohms / rpu. +* +* Adjust this value if you are having problems with pen detect not +* detecting any down event. +*/ +static int rpu =8 ; +module_param (rpu, int,0 ); +MODULE_PARM_DESC (rpu,"Set internal pull up resitor for pen detect." ); + +/* +* Set current used for pressure measurement. +* +* Set pil = 2 to use 400uA +* pil = 1 to use 200uA and +* pil = 0 to disable pressure measurement. +* +* This is used to increase the range of values returned by the adc +* when measureing touchpanel pressure. +*/ +static int pil; +module_param (pil, int,0 ); +MODULE_PARM_DESC (pil,"Set current used for pressure measurement." ); + +/* +* Set threshold for pressure measurement. +* +* Pen down pressure below threshold is ignored. +*/ +static int pressure =DEFAULT_PRESSURE &0xfff ; +module_param (pressure, int,0 ); +MODULE_PARM_DESC (pressure,"Set threshold for pressure measurement." ); + +/* +* Set adc sample delay. +* +* For accurate touchpanel measurements, some settling time may be +* required between the switch matrix applying a voltage across the +* touchpanel plate and the ADC sampling the signal. +* +* This delay can be set by setting delay = n, where n is the array +* position of the delay in the array delay_table below. +* Long delays > 1ms are supported for completeness, but are not +* recommended. +*/ +static int delay =3 ; +module_param (delay, int,0 ); +MODULE_PARM_DESC (delay,"Set adc sample delay." ); + +/* +* Set five_wire = 1 to use a 5 wire touchscreen. +* +* NOTE: Five wire mode does not allow for readback of pressure. +*/ +static int five_wire; +module_param (five_wire, int,0 ); +MODULE_PARM_DESC (five_wire,"Set to '1' to use 5-wire touchscreen." ); + +/* +* Set adc mask function. +* +* Sources of glitch noise, such as signals driving an LCD display, may feed +* through to the touch screen plates and affect measurement accuracy. In +* order to minimise this, a signal may be applied to the MASK pin to delay or +* synchronise the sampling. +* +* 0 = No delay or sync +* 1 = High on pin stops conversions +* 2 = Edge triggered, edge on pin delays conversion by delay param (above) +* 3 = Edge triggered, edge on pin starts conversion after delay param +*/ +static int mask; +module_param (mask, int,0 ); +MODULE_PARM_DESC (mask,"Set adc mask function." ); + +/* +* Coordinate Polling Enable. +* +* Set to 1 to enable coordinate polling. e.g. x,y[,p] is sampled together +* for every poll. +*/ +static int coord; +module_param (coord, int,0 ); +MODULE_PARM_DESC (coord,"Polling coordinate mode" ); + +/* +* ADC sample delay times in uS +*/ +static const int delay_table[] = { +21 ,/* 1 AC97 Link frames */ +42 ,/* 2 */ +84 ,/* 4 */ +167 ,/* 8 */ +333 ,/* 16 */ +667 ,/* 32 */ +1000 ,/* 48 */ +1333 ,/* 64 */ +2000 ,/* 96 */ +2667 ,/* 128 */ +3333 ,/* 160 */ +4000 ,/* 192 */ +4667 ,/* 224 */ +5333 ,/* 256 */ +6000 ,/* 288 */ +0 /* No delay, switch matrix always on */ +}; + +/* +* Delay after issuing a POLL command. +* +* The delay is 3 AC97 link frames + the touchpanel settling delay +*/ +static inline void poll_delay (int d) +{ +udelay (3 *AC97_LINK_FRAME + delay_table[d]); +} + +/* +* set up the physical settings of the WM9712 +*/ +static void wm9712_phy_init (struct wm97xx *wm) +{ +u16 dig1 =0 ; +u16 dig2 =WM97XX_RPR |WM9712_RPU (1 ); + +/* WM9712 rpu */ +if (rpu) { + dig2 &=0xffc0 ; + dig2 |=WM9712_RPU (rpu); +dev_dbg (wm->dev,"setting pen detect pull-up to %d Ohms" , +64000 / rpu); + } + +/* touchpanel pressure current*/ +if (pil ==2 ) { + dig2 |=WM9712_PIL ; +dev_dbg (wm->dev, +"setting pressure measurement current to 400uA." ); + }else if (pil) +dev_dbg (wm->dev, +"setting pressure measurement current to 200uA." ); +if (!pil) + pressure =0 ; + +/* WM9712 five wire */ +if (five_wire) { + dig2 |=WM9712_45W ; +dev_dbg (wm->dev,"setting 5-wire touchscreen mode." ); + } + +/* polling mode sample settling delay */ +if (delay <0 || delay >15 ) { +dev_dbg (wm->dev,"supplied delay out of range." ); + delay =4 ; + } + dig1 &=0xff0f ; + dig1 |=WM97XX_DELAY (delay); +dev_dbg (wm->dev,"setting adc sample delay to %d u Secs." , + delay_table[delay]); + +/* mask */ + dig2 |= ((mask &0x3 ) <<6 ); +if (mask) { +u16 reg; +/* Set GPIO4 as Mask Pin*/ + reg =wm97xx_reg_read (wm,AC97_MISC_AFE ); +wm97xx_reg_write (wm,AC97_MISC_AFE , reg |WM97XX_GPIO_4 ); + reg =wm97xx_reg_read (wm,AC97_GPIO_CFG ); +wm97xx_reg_write (wm,AC97_GPIO_CFG , reg |WM97XX_GPIO_4 ); + } + +/* wait - coord mode */ +if (coord) + dig2 |=WM9712_WAIT ; + +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 , dig1); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 , dig2); +} + +static void wm9712_dig_enable (struct wm97xx *wm,int enable) +{ +u16 dig2 = wm->dig[2 ]; + +if (enable) { +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 , + dig2 |WM97XX_PRP_DET_DIG ); +wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD );/* dummy read */ + }else +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 , + dig2 & ~WM97XX_PRP_DET_DIG ); +} + +static void wm9712_aux_prepare (struct wm97xx *wm) +{ +memcpy (wm->dig_save, wm->dig,sizeof (wm->dig)); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 ,0 ); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 ,WM97XX_PRP_DET_DIG ); +} + +static void wm9712_dig_restore (struct wm97xx *wm) +{ +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 , wm->dig_save[1 ]); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 , wm->dig_save[2 ]); +} + +static inline int is_pden (struct wm97xx *wm) +{ +return wm->dig[2 ] &WM9712_PDEN ; +} + +/* +* Read a sample from the WM9712 adc in polling mode. +*/ +static int wm9712_poll_sample (struct wm97xx *wm,int adcsel,int *sample) +{ +int timeout =5 * delay; + +if (!wm->pen_probably_down) { +u16 data =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +if (!(data &WM97XX_PEN_DOWN )) +return RC_PENUP ; + wm->pen_probably_down =1 ; + } + +/* set up digitiser */ +if (adcsel &0x8000 ) + adcsel = ((adcsel &0x7fff ) +3 ) <<12 ; + +if (wm->mach_ops && wm->mach_ops->pre_sample) + wm->mach_ops->pre_sample (adcsel); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 , + adcsel |WM97XX_POLL |WM97XX_DELAY (delay)); + +/* wait 3 AC97 time slots + delay for conversion */ +poll_delay (delay); + +/* wait for POLL to go low */ +while ((wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER1 ) &WM97XX_POLL ) + && timeout) { +udelay (AC97_LINK_FRAME ); + timeout--; + } + +if (timeout <=0 ) { +/* If PDEN is set, we can get a timeout when pen goes up */ +if (is_pden (wm)) + wm->pen_probably_down =0 ; +else +dev_dbg (wm->dev,"adc sample timeout" ); +return RC_PENUP ; + } + + *sample =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +if (wm->mach_ops && wm->mach_ops->post_sample) + wm->mach_ops->post_sample (adcsel); + +/* check we have correct sample */ +if ((*sample &WM97XX_ADCSEL_MASK ) != adcsel) { +dev_dbg (wm->dev,"adc wrong sample, read %x got %x" , adcsel, + *sample &WM97XX_ADCSEL_MASK ); +return RC_PENUP ; + } + +if (!(*sample &WM97XX_PEN_DOWN )) { + wm->pen_probably_down =0 ; +return RC_PENUP ; + } + +return RC_VALID ; +} + +/* +* Read a coord from the WM9712 adc in polling mode. +*/ +static int wm9712_poll_coord (struct wm97xx *wm,struct wm97xx_data *data) +{ +int timeout =5 * delay; + +if (!wm->pen_probably_down) { +u16 data_rd =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +if (!(data_rd &WM97XX_PEN_DOWN )) +return RC_PENUP ; + wm->pen_probably_down =1 ; + } + +/* set up digitiser */ +if (wm->mach_ops && wm->mach_ops->pre_sample) + wm->mach_ops->pre_sample (WM97XX_ADCSEL_X |WM97XX_ADCSEL_Y ); + +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 , +WM97XX_COO |WM97XX_POLL |WM97XX_DELAY (delay)); + +/* wait 3 AC97 time slots + delay for conversion and read x */ +poll_delay (delay); + data->x =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +/* wait for POLL to go low */ +while ((wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER1 ) &WM97XX_POLL ) + && timeout) { +udelay (AC97_LINK_FRAME ); + timeout--; + } + +if (timeout <=0 ) { +/* If PDEN is set, we can get a timeout when pen goes up */ +if (is_pden (wm)) + wm->pen_probably_down =0 ; +else +dev_dbg (wm->dev,"adc sample timeout" ); +return RC_PENUP ; + } + +/* read back y data */ + data->y =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +if (pil) + data->p =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +else + data->p =DEFAULT_PRESSURE ; + +if (wm->mach_ops && wm->mach_ops->post_sample) + wm->mach_ops->post_sample (WM97XX_ADCSEL_X |WM97XX_ADCSEL_Y ); + +/* check we have correct sample */ +if (!(data->x &WM97XX_ADCSEL_X ) || !(data->y &WM97XX_ADCSEL_Y )) + goto err; +if (pil && !(data->p &WM97XX_ADCSEL_PRES )) + goto err; + +if (!(data->x &WM97XX_PEN_DOWN )) { + wm->pen_probably_down =0 ; +return RC_PENUP ; + } +return RC_VALID ; +err: +return RC_PENUP ; +} + +/* +* Sample the WM9712 touchscreen in polling mode +*/ +static int wm9712_poll_touch (struct wm97xx *wm,struct wm97xx_data *data) +{ +int rc; + +if (coord) { + rc =wm9712_poll_coord (wm, data); +if (rc !=RC_VALID ) +return rc; + }else { + rc =wm9712_poll_sample (wm,WM97XX_ADCSEL_X , &data->x); +if (rc !=RC_VALID ) +return rc; + + rc =wm9712_poll_sample (wm,WM97XX_ADCSEL_Y , &data->y); +if (rc !=RC_VALID ) +return rc; + +if (pil && !five_wire) { + rc =wm9712_poll_sample (wm,WM97XX_ADCSEL_PRES , + &data->p); +if (rc !=RC_VALID ) +return rc; + }else + data->p =DEFAULT_PRESSURE ; + } +return RC_VALID ; +} + +/* +* Enable WM9712 continuous mode, i.e. touch data is streamed across +* an AC97 slot +*/ +static int wm9712_acc_enable (struct wm97xx *wm,int enable) +{ +u16 dig1, dig2; +int ret =0 ; + + dig1 = wm->dig[1 ]; + dig2 = wm->dig[2 ]; + +if (enable) { +/* continous mode */ +if (wm->mach_ops->acc_startup) { + ret = wm->mach_ops->acc_startup (wm); +if (ret <0 ) +return ret; + } + dig1 &= ~(WM97XX_CM_RATE_MASK |WM97XX_ADCSEL_MASK | +WM97XX_DELAY_MASK |WM97XX_SLT_MASK ); + dig1 |=WM97XX_CTC |WM97XX_COO |WM97XX_SLEN | +WM97XX_DELAY (delay) | +WM97XX_SLT (wm->acc_slot) | +WM97XX_RATE (wm->acc_rate); +if (pil) + dig1 |=WM97XX_ADCSEL_PRES ; + dig2 |=WM9712_PDEN ; + }else { + dig1 &= ~(WM97XX_CTC |WM97XX_COO |WM97XX_SLEN ); + dig2 &= ~WM9712_PDEN ; +if (wm->mach_ops->acc_shutdown) + wm->mach_ops->acc_shutdown (wm); + } + +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 , dig1); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 , dig2); +return 0 ; +} + +struct wm97xx_codec_drv wm9712_codec = { + .id =WM9712_ID2 , + .name ="wm9712" , + .poll_sample = wm9712_poll_sample, + .poll_touch = wm9712_poll_touch, + .acc_enable = wm9712_acc_enable, + .phy_init = wm9712_phy_init, + .dig_enable = wm9712_dig_enable, + .dig_restore = wm9712_dig_restore, + .aux_prepare = wm9712_aux_prepare, +}; +EXPORT_SYMBOL_GPL (wm9712_codec); + +/* Module information */ +MODULE_AUTHOR ("Liam Girdwood <[email protected]>" ); +MODULE_DESCRIPTION ("WM9712 Touch Screen Driver" ); +MODULE_LICENSE ("GPL" );
Signature · 1 line
1.5.2.5
PATCH 4/6 Add chip driver for WM9713 touchscreen
In reply to Mark Brown--- drivers/input/touchscreen/wm9713.c | 459 ++++++++++++++++++++++++++++++++++++ 1 files changed, 459 insertions(+), 0 deletions(-) create mode 100644 drivers/input/touchscreen/wm9713.c
drivers/input/touchscreen/wm9713.c new file +459 -0
@@ -0,0 +1,459 @@ +/* +* wm9713.c -- Codec touch driver for Wolfson WM9713 AC97 Codec. +* +* Copyright 2003, 2004, 2005, 2006, 2007, 2008 Wolfson Microelectronics PLC. +* Author: Liam Girdwood +* [email protected] or [email protected] +* Parts Copyright : Ian Molton <[email protected]> +* Andrew Zabolotny <[email protected]> +* Russell King <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +* +*/ + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/version.h> +#include <linux/kernel.h> +#include <linux/input.h> +#include <linux/delay.h> +#include <linux/bitops.h> +#include <linux/wm97xx.h> + +#define TS_NAME "wm97xx" +#define WM9713_VERSION "0.53" +#define DEFAULT_PRESSURE 0xb0c0 + +/* +* Module parameters +*/ + +/* +* Set internal pull up for pen detect. +* +* Pull up is in the range 1.02k (least sensitive) to 64k (most sensitive) +* i.e. pull up resistance = 64k Ohms / rpu. +* +* Adjust this value if you are having problems with pen detect not +* detecting any down event. +*/ +static int rpu =8 ; +module_param (rpu, int,0 ); +MODULE_PARM_DESC (rpu,"Set internal pull up resitor for pen detect." ); + +/* +* Set current used for pressure measurement. +* +* Set pil = 2 to use 400uA +* pil = 1 to use 200uA and +* pil = 0 to disable pressure measurement. +* +* This is used to increase the range of values returned by the adc +* when measureing touchpanel pressure. +*/ +static int pil; +module_param (pil, int,0 ); +MODULE_PARM_DESC (pil,"Set current used for pressure measurement." ); + +/* +* Set threshold for pressure measurement. +* +* Pen down pressure below threshold is ignored. +*/ +static int pressure =DEFAULT_PRESSURE &0xfff ; +module_param (pressure, int,0 ); +MODULE_PARM_DESC (pressure,"Set threshold for pressure measurement." ); + +/* +* Set adc sample delay. +* +* For accurate touchpanel measurements, some settling time may be +* required between the switch matrix applying a voltage across the +* touchpanel plate and the ADC sampling the signal. +* +* This delay can be set by setting delay = n, where n is the array +* position of the delay in the array delay_table below. +* Long delays > 1ms are supported for completeness, but are not +* recommended. +*/ +static int delay =4 ; +module_param (delay, int,0 ); +MODULE_PARM_DESC (delay,"Set adc sample delay." ); + +/* +* Set adc mask function. +* +* Sources of glitch noise, such as signals driving an LCD display, may feed +* through to the touch screen plates and affect measurement accuracy. In +* order to minimise this, a signal may be applied to the MASK pin to delay or +* synchronise the sampling. +* +* 0 = No delay or sync +* 1 = High on pin stops conversions +* 2 = Edge triggered, edge on pin delays conversion by delay param (above) +* 3 = Edge triggered, edge on pin starts conversion after delay param +*/ +static int mask; +module_param (mask, int,0 ); +MODULE_PARM_DESC (mask,"Set adc mask function." ); + +/* +* Coordinate Polling Enable. +* +* Set to 1 to enable coordinate polling. e.g. x,y[,p] is sampled together +* for every poll. +*/ +static int coord; +module_param (coord, int,0 ); +MODULE_PARM_DESC (coord,"Polling coordinate mode" ); + +/* +* ADC sample delay times in uS +*/ +static const int delay_table[] = { +21 ,/* 1 AC97 Link frames */ +42 ,/* 2 */ +84 ,/* 4 */ +167 ,/* 8 */ +333 ,/* 16 */ +667 ,/* 32 */ +1000 ,/* 48 */ +1333 ,/* 64 */ +2000 ,/* 96 */ +2667 ,/* 128 */ +3333 ,/* 160 */ +4000 ,/* 192 */ +4667 ,/* 224 */ +5333 ,/* 256 */ +6000 ,/* 288 */ +0 /* No delay, switch matrix always on */ +}; + +/* +* Delay after issuing a POLL command. +* +* The delay is 3 AC97 link frames + the touchpanel settling delay +*/ +static inline void poll_delay (int d) +{ +udelay (3 *AC97_LINK_FRAME + delay_table[d]); +} + +/* +* set up the physical settings of the WM9713 +*/ +static void wm9713_phy_init (struct wm97xx *wm) +{ +u16 dig1 =0 , dig2, dig3; + +/* default values */ + dig2 =WM97XX_DELAY (4 ) |WM97XX_SLT (5 ); + dig3 =WM9712_RPU (1 ); + +/* rpu */ +if (rpu) { + dig3 &=0xffc0 ; + dig3 |=WM9712_RPU (rpu); +dev_info (wm->dev,"setting pen detect pull-up to %d Ohms\n" , +64000 / rpu); + } + +/* touchpanel pressure */ +if (pil ==2 ) { + dig3 |=WM9712_PIL ; +dev_info (wm->dev, +"setting pressure measurement current to 400uA." ); + }else if (pil) +dev_info (wm->dev, +"setting pressure measurement current to 200uA." ); +if (!pil) + pressure =0 ; + +/* sample settling delay */ +if (delay <0 || delay >15 ) { +dev_info (wm->dev,"supplied delay out of range." ); + delay =4 ; +dev_info (wm->dev,"setting adc sample delay to %d u Secs." , + delay_table[delay]); + } + dig2 &=0xff0f ; + dig2 |=WM97XX_DELAY (delay); + +/* mask */ + dig3 |= ((mask &0x3 ) <<4 ); +if (coord) + dig3 |=WM9713_WAIT ; + + wm->misc =wm97xx_reg_read (wm,0x5a ); + +wm97xx_reg_write (wm,AC97_WM9713_DIG1 , dig1); +wm97xx_reg_write (wm,AC97_WM9713_DIG2 , dig2); +wm97xx_reg_write (wm,AC97_WM9713_DIG3 , dig3); +wm97xx_reg_write (wm,AC97_GPIO_STICKY ,0x0 ); +} + +static void wm9713_dig_enable (struct wm97xx *wm,int enable) +{ +u16 val; + +if (enable) { + val =wm97xx_reg_read (wm,AC97_EXTENDED_MID ); +wm97xx_reg_write (wm,AC97_EXTENDED_MID , val &0x7fff ); +wm97xx_reg_write (wm,AC97_WM9713_DIG3 , wm->dig[2 ] | +WM97XX_PRP_DET_DIG ); +wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD );/* dummy read */ + }else { +wm97xx_reg_write (wm,AC97_WM9713_DIG3 , wm->dig[2 ] & + ~WM97XX_PRP_DET_DIG ); + val =wm97xx_reg_read (wm,AC97_EXTENDED_MID ); +wm97xx_reg_write (wm,AC97_EXTENDED_MID , val |0x8000 ); + } +} + +static void wm9713_dig_restore (struct wm97xx *wm) +{ +wm97xx_reg_write (wm,AC97_WM9713_DIG1 , wm->dig_save[0 ]); +wm97xx_reg_write (wm,AC97_WM9713_DIG2 , wm->dig_save[1 ]); +wm97xx_reg_write (wm,AC97_WM9713_DIG3 , wm->dig_save[2 ]); +} + +static void wm9713_aux_prepare (struct wm97xx *wm) +{ +memcpy (wm->dig_save, wm->dig,sizeof (wm->dig)); +wm97xx_reg_write (wm,AC97_WM9713_DIG1 ,0 ); +wm97xx_reg_write (wm,AC97_WM9713_DIG2 ,0 ); +wm97xx_reg_write (wm,AC97_WM9713_DIG3 ,WM97XX_PRP_DET_DIG ); +} + +static inline int is_pden (struct wm97xx *wm) +{ +return wm->dig[2 ] &WM9713_PDEN ; +} + +/* +* Read a sample from the WM9713 adc in polling mode. +*/ +static int wm9713_poll_sample (struct wm97xx *wm,int adcsel,int *sample) +{ +u16 dig1; +int timeout =5 * delay; + +if (!wm->pen_probably_down) { +u16 data =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +if (!(data &WM97XX_PEN_DOWN )) +return RC_PENUP ; + wm->pen_probably_down =1 ; + } + +/* set up digitiser */ +if (adcsel &0x8000 ) + adcsel =1 << ((adcsel &0x7fff ) +3 ); + + dig1 =wm97xx_reg_read (wm,AC97_WM9713_DIG1 ); + dig1 &= ~WM9713_ADCSEL_MASK ; + +if (wm->mach_ops && wm->mach_ops->pre_sample) + wm->mach_ops->pre_sample (adcsel); +wm97xx_reg_write (wm,AC97_WM9713_DIG1 , dig1 | adcsel |WM9713_POLL ); + +/* wait 3 AC97 time slots + delay for conversion */ +poll_delay (delay); + +/* wait for POLL to go low */ +while ((wm97xx_reg_read (wm,AC97_WM9713_DIG1 ) &WM9713_POLL ) && + timeout) { +udelay (AC97_LINK_FRAME ); + timeout--; + } + +if (timeout <=0 ) { +/* If PDEN is set, we can get a timeout when pen goes up */ +if (is_pden (wm)) + wm->pen_probably_down =0 ; +else +dev_dbg (wm->dev,"adc sample timeout" ); +return RC_PENUP ; + } + + *sample =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +if (wm->mach_ops && wm->mach_ops->post_sample) + wm->mach_ops->post_sample (adcsel); + +/* check we have correct sample */ +if ((*sample &WM97XX_ADCSRC_MASK ) !=ffs (adcsel >>1 ) <<12 ) { +dev_dbg (wm->dev,"adc wrong sample, read %x got %x" , adcsel, + *sample &WM97XX_ADCSRC_MASK ); +return RC_PENUP ; + } + +if (!(*sample &WM97XX_PEN_DOWN )) { + wm->pen_probably_down =0 ; +return RC_PENUP ; + } + +return RC_VALID ; +} + +/* +* Read a coordinate from the WM9713 adc in polling mode. +*/ +static int wm9713_poll_coord (struct wm97xx *wm,struct wm97xx_data *data) +{ +u16 dig1; +int timeout =5 * delay; + +if (!wm->pen_probably_down) { +u16 data =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +if (!(data &WM97XX_PEN_DOWN )) +return RC_PENUP ; + wm->pen_probably_down =1 ; + } + +/* set up digitiser */ + dig1 =wm97xx_reg_read (wm,AC97_WM9713_DIG1 ); + dig1 &= ~WM9713_ADCSEL_MASK ; +if (pil) + dig1 |=WM9713_ADCSEL_PRES ; + +if (wm->mach_ops && wm->mach_ops->pre_sample) + wm->mach_ops->pre_sample (WM97XX_ADCSEL_X |WM97XX_ADCSEL_Y ); +wm97xx_reg_write (wm,AC97_WM9713_DIG1 , + dig1 |WM9713_POLL |WM9713_COO ); + +/* wait 3 AC97 time slots + delay for conversion */ +poll_delay (delay); + data->x =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +/* wait for POLL to go low */ +while ((wm97xx_reg_read (wm,AC97_WM9713_DIG1 ) &WM9713_POLL ) + && timeout) { +udelay (AC97_LINK_FRAME ); + timeout--; + } + +if (timeout <=0 ) { +/* If PDEN is set, we can get a timeout when pen goes up */ +if (is_pden (wm)) + wm->pen_probably_down =0 ; +else +dev_dbg (wm->dev,"adc sample timeout" ); +return RC_PENUP ; + } + +/* read back data */ + data->y =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +if (pil) + data->p =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +else + data->p =DEFAULT_PRESSURE ; + +if (wm->mach_ops && wm->mach_ops->post_sample) + wm->mach_ops->post_sample (WM97XX_ADCSEL_X |WM97XX_ADCSEL_Y ); + +/* check we have correct sample */ +if (!(data->x &WM97XX_ADCSEL_X ) || !(data->y &WM97XX_ADCSEL_Y )) + goto err; +if (pil && !(data->p &WM97XX_ADCSEL_PRES )) + goto err; + +if (!(data->x &WM97XX_PEN_DOWN )) { + wm->pen_probably_down =0 ; +return RC_PENUP ; + } +return RC_VALID ; +err: +return RC_PENUP ; +} + +/* +* Sample the WM9713 touchscreen in polling mode +*/ +static int wm9713_poll_touch (struct wm97xx *wm,struct wm97xx_data *data) +{ +int rc; + +if (coord) { + rc =wm9713_poll_coord (wm, data); +if (rc !=RC_VALID ) +return rc; + }else { + rc =wm9713_poll_sample (wm,WM9713_ADCSEL_X , &data->x); +if (rc !=RC_VALID ) +return rc; + rc =wm9713_poll_sample (wm,WM9713_ADCSEL_Y , &data->y); +if (rc !=RC_VALID ) +return rc; +if (pil) { + rc =wm9713_poll_sample (wm,WM9713_ADCSEL_PRES , + &data->p); +if (rc !=RC_VALID ) +return rc; + }else + data->p =DEFAULT_PRESSURE ; + } +return RC_VALID ; +} + +/* +* Enable WM9713 continuous mode, i.e. touch data is streamed across +* an AC97 slot +*/ +static int wm9713_acc_enable (struct wm97xx *wm,int enable) +{ +u16 dig1, dig2, dig3; +int ret =0 ; + + dig1 = wm->dig[0 ]; + dig2 = wm->dig[1 ]; + dig3 = wm->dig[2 ]; + +if (enable) { +/* continous mode */ +if (wm->mach_ops->acc_startup && + (ret = wm->mach_ops->acc_startup (wm)) <0 ) +return ret; + + dig1 &= ~WM9713_ADCSEL_MASK ; + dig1 |=WM9713_CTC |WM9713_COO |WM9713_ADCSEL_X | +WM9713_ADCSEL_Y ; +if (pil) + dig1 |=WM9713_ADCSEL_PRES ; + dig2 &= ~(WM97XX_DELAY_MASK |WM97XX_SLT_MASK | +WM97XX_CM_RATE_MASK ); + dig2 |=WM97XX_SLEN |WM97XX_DELAY (delay) | +WM97XX_SLT (wm->acc_slot) |WM97XX_RATE (wm->acc_rate); + dig3 |=WM9713_PDEN ; + }else { + dig1 &= ~(WM9713_CTC |WM9713_COO ); + dig2 &= ~WM97XX_SLEN ; + dig3 &= ~WM9713_PDEN ; +if (wm->mach_ops->acc_shutdown) + wm->mach_ops->acc_shutdown (wm); + } + +wm97xx_reg_write (wm,AC97_WM9713_DIG1 , dig1); +wm97xx_reg_write (wm,AC97_WM9713_DIG2 , dig2); +wm97xx_reg_write (wm,AC97_WM9713_DIG3 , dig3); +return ret; +} + +struct wm97xx_codec_drv wm9713_codec = { + .id =WM9713_ID2 , + .name ="wm9713" , + .poll_sample = wm9713_poll_sample, + .poll_touch = wm9713_poll_touch, + .acc_enable = wm9713_acc_enable, + .phy_init = wm9713_phy_init, + .dig_enable = wm9713_dig_enable, + .dig_restore = wm9713_dig_restore, + .aux_prepare = wm9713_aux_prepare, +}; +EXPORT_SYMBOL_GPL (wm9713_codec); + +/* Module information */ +MODULE_AUTHOR ("Liam Girdwood <[email protected]>" ); +MODULE_DESCRIPTION ("WM9713 Touch Screen Driver" ); +MODULE_LICENSE ("GPL" );
Signature · 1 line
1.5.2.5
PATCH 5/6 Driver for WM97xx touchscreens in streaming mode on Mainstone
In reply to Mark Brown--- drivers/input/touchscreen/mainstone-wm97xx.c | 298 ++++++++++++++++++++++++++ 1 files changed, 298 insertions(+), 0 deletions(-) create mode 100644 drivers/input/touchscreen/mainstone-wm97xx.c
drivers/input/touchscreen/mainstone-wm97xx.c new file +298 -0
@@ -0,0 +1,298 @@ +/* +* mainstone-wm97xx.c -- Mainstone Continuous Touch screen driver for +* Wolfson WM97xx AC97 Codecs. +* +* Copyright 2004, 2007 Wolfson Microelectronics PLC. +* Author: Liam Girdwood +* [email protected] or [email protected] +* Parts Copyright : Ian Molton <[email protected]> +* Andrew Zabolotny <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +* +* Notes: +* This is a wm97xx extended touch driver to capture touch +* data in a continuous manner on the Intel XScale archictecture +* +* Features: +* - codecs supported:- WM9705, WM9712, WM9713 +* - processors supported:- Intel XScale PXA25x, PXA26x, PXA27x +* +*/ + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/version.h> +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/delay.h> +#include <linux/irq.h> +#include <linux/interrupt.h> +#include <linux/wm97xx.h> +#include <linux/io.h> +#include <asm/arch/pxa-regs.h> + +#define VERSION "0.13" + +struct continuous { +u16 id;/* codec id */ +u8 code;/* continuous code */ +u8 reads;/* number of coord reads per read cycle */ +u32 speed;/* number of coords per second */ +}; + +#define WM_READS (sp) ((sp / HZ) + 1) + +static const struct continuous cinfo[] = { + {WM9705_ID2 ,0 ,WM_READS (94 ),94 }, + {WM9705_ID2 ,1 ,WM_READS (188 ),188 }, + {WM9705_ID2 ,2 ,WM_READS (375 ),375 }, + {WM9705_ID2 ,3 ,WM_READS (750 ),750 }, + {WM9712_ID2 ,0 ,WM_READS (94 ),94 }, + {WM9712_ID2 ,1 ,WM_READS (188 ),188 }, + {WM9712_ID2 ,2 ,WM_READS (375 ),375 }, + {WM9712_ID2 ,3 ,WM_READS (750 ),750 }, + {WM9713_ID2 ,0 ,WM_READS (94 ),94 }, + {WM9713_ID2 ,1 ,WM_READS (120 ),120 }, + {WM9713_ID2 ,2 ,WM_READS (154 ),154 }, + {WM9713_ID2 ,3 ,WM_READS (188 ),188 }, +}; + +/* continuous speed index */ +static int sp_idx; +static u16 last, tries; + +/* +* Pen sampling frequency (Hz) in continuous mode. +*/ +static int cont_rate =200 ; +module_param (cont_rate, int,0 ); +MODULE_PARM_DESC (cont_rate,"Sampling rate in continuous mode (Hz)" ); + +/* +* Pen down detection. +* +* This driver can either poll or use an interrupt to indicate a pen down +* event. If the irq request fails then it will fall back to polling mode. +*/ +static int pen_int; +module_param (pen_int, int,0 ); +MODULE_PARM_DESC (pen_int,"Pen down detection (1 = interrupt, 0 = polling)" ); + +/* +* Pressure readback. +* +* Set to 1 to read back pen down pressure +*/ +static int pressure; +module_param (pressure, int,0 ); +MODULE_PARM_DESC (pressure,"Pressure readback (1 = pressure, 0 = no pressure)" ); + +/* +* AC97 touch data slot. +* +* Touch screen readback data ac97 slot +*/ +static int ac97_touch_slot =5 ; +module_param (ac97_touch_slot, int,0 ); +MODULE_PARM_DESC (ac97_touch_slot,"Touch screen data slot AC97 number" ); + + +/* flush AC97 slot 5 FIFO on pxa machines */ +#ifdef CONFIG_PXA27x +static void wm97xx_acc_pen_up (struct wm97xx *wm) +{ +set_current_state (TASK_INTERRUPTIBLE ); +schedule_timeout (1 ); + +while (MISR & (1 <<2 )) +MODR ; +} +#else +static void wm97xx_acc_pen_up (struct wm97xx *wm) +{ +int count =16 ; +set_current_state (TASK_INTERRUPTIBLE ); +schedule_timeout (1 ); + +while (count <16 ) { +MODR ; + count--; + } +} +#endif + +static int wm97xx_acc_pen_down (struct wm97xx *wm) +{ +u16 x, y, p =0x100 |WM97XX_ADCSEL_PRES ; +int reads =0 ; + +/* data is never immediately available after pen down irq */ +set_current_state (TASK_INTERRUPTIBLE ); +schedule_timeout (1 ); + +if (tries >5 ) { + tries =0 ; +return RC_PENUP ; + } + + x =MODR ; +if (x == last) { + tries++; +return RC_AGAIN ; + } + last = x; +do { +if (reads) + x =MODR ; + y =MODR ; +if (pressure) + p =MODR ; + +/* are samples valid */ +if ((x &0x7000 ) !=WM97XX_ADCSEL_X || + (y &0x7000 ) !=WM97XX_ADCSEL_Y || + (p &0x7000 ) !=WM97XX_ADCSEL_PRES ) + goto up; + +/* coordinate is good */ + tries =0 ; +input_report_abs (wm->input_dev,ABS_X , x &0xfff ); +input_report_abs (wm->input_dev,ABS_Y , y &0xfff ); +input_report_abs (wm->input_dev,ABS_PRESSURE , p &0xfff ); +input_sync (wm->input_dev); + reads++; + }while (reads < cinfo[sp_idx].reads); +up: +return RC_PENDOWN |RC_AGAIN ; +} + +static int wm97xx_acc_startup (struct wm97xx *wm) +{ +int idx =0 ; + +/* check we have a codec */ +if (wm->ac97 ==NULL ) +return -ENODEV ; + +/* Go you big red fire engine */ +for (idx =0 ; idx <ARRAY_SIZE (cinfo); idx++) { +if (wm->id != cinfo[idx].id) +continue ; + sp_idx = idx; +if (cont_rate <= cinfo[idx].speed) +break ; + } + wm->acc_rate = cinfo[sp_idx].code; + wm->acc_slot = ac97_touch_slot; +dev_info (wm->dev, +"mainstone accelerated touchscreen driver, %d samples/sec\n" , + cinfo[sp_idx].speed); + +/* codec specific irq config */ +if (pen_int) { +switch (wm->id) { +case WM9705_ID2 : + wm->pen_irq =IRQ_GPIO (4 ); +set_irq_type (IRQ_GPIO (4 ),IRQT_BOTHEDGE ); +break ; +case WM9712_ID2 : +case WM9713_ID2 : +/* enable pen down interrupt */ +/* use PEN_DOWN GPIO 13 to assert IRQ on GPIO line 2 */ + wm->pen_irq =MAINSTONE_AC97_IRQ ; +wm97xx_config_gpio (wm,WM97XX_GPIO_13 ,WM97XX_GPIO_IN , +WM97XX_GPIO_POL_HIGH , +WM97XX_GPIO_STICKY , +WM97XX_GPIO_WAKE ); +wm97xx_config_gpio (wm,WM97XX_GPIO_2 ,WM97XX_GPIO_OUT , +WM97XX_GPIO_POL_HIGH , +WM97XX_GPIO_NOTSTICKY , +WM97XX_GPIO_NOWAKE ); +break ; +default : +dev_err (wm->dev, +"pen down irq not supported on this device\n" ); + pen_int =0 ; +break ; + } + } + +return 0 ; +} + +static void wm97xx_acc_shutdown (struct wm97xx *wm) +{ +/* codec specific deconfig */ +if (pen_int) { +switch (wm->id &0xffff ) { +case WM9705_ID2 : + wm->pen_irq =0 ; +break ; +case WM9712_ID2 : +case WM9713_ID2 : +/* disable interrupt */ + wm->pen_irq =0 ; +break ; + } + } +} + +static void wm97xx_irq_enable (struct wm97xx *wm,int enable) +{ +if (enable) +enable_irq (wm->pen_irq); +else +disable_irq (wm->pen_irq); +} + +static struct wm97xx_mach_ops mainstone_mach_ops = { + .acc_enabled =1 , + .acc_pen_up = wm97xx_acc_pen_up, + .acc_pen_down = wm97xx_acc_pen_down, + .acc_startup = wm97xx_acc_startup, + .acc_shutdown = wm97xx_acc_shutdown, + .irq_enable = wm97xx_irq_enable, +}; + +static int mainstone_wm97xx_probe (struct platform_device *pdev) +{ +struct wm97xx *wm =platform_get_drvdata (pdev); +return wm97xx_register_mach_ops (wm, &mainstone_mach_ops); +} + +static int mainstone_wm97xx_remove (struct platform_device *pdev) +{ +struct wm97xx *wm =platform_get_drvdata (pdev); +wm97xx_unregister_mach_ops (wm); +return 0 ; +} + +static struct platform_driver mainstone_wm97xx_driver = { + .probe = mainstone_wm97xx_probe, + .remove = mainstone_wm97xx_remove, + .driver = { + .name ="wm97xx-touch" , + }, +}; + +static int __init mainstone_wm97xx_init (void ) +{ +return platform_driver_register (&mainstone_wm97xx_driver); +} + +static void __exit mainstone_wm97xx_exit(void) +{ +platform_driver_unregister (&mainstone_wm97xx_driver); +} + +module_init (mainstone_wm97xx_init); +module_exit (mainstone_wm97xx_exit); + +/* Module information */ +MODULE_AUTHOR ("Liam Girdwood <[email protected]>" ); +MODULE_DESCRIPTION ("wm97xx continuous touch driver for mainstone" ); +MODULE_LICENSE ("GPL" );
Signature · 1 line
1.5.2.5
PATCH 6/6 Build system and MAINTAINERS entry for WM97xx touchscreen drivers
In reply to Mark Brown--- MAINTAINERS | 10 +++++++ drivers/input/touchscreen/Kconfig | 52 ++++++++++++++++++++++++++++++++++++ drivers/input/touchscreen/Makefile | 7 +++++ 3 files changed, 69 insertions(+), 0 deletions(-)
MAINTAINERS +10 -0
@@ -4317,6 +4317,16 @@ L: [email protected] W: http://oops.ghostprotocols.net:81/blog S: Maintained +WM97XX TOUCHSCREEN DRIVERS +P: Mark Brown +M: [email protected] +P: Liam Girdwood +M: [email protected] +L: [email protected] +T: git git://opensource.wolfsonmicro.com/linux-2.6-touch +W: http://opensource.wolfsonmicro.com/node/7 +S: Supported + X.25 NETWORK LAYER P: Henner Eisen M: [email protected]
drivers/input/touchscreen/Kconfig +52 -0
58 lines not on this page · raw message
drivers/input/touchscreen/Makefile +7 -0
@@ -4,6 +4,8 @@ # Each configuration option enables a list of files. +wm97xx-ts-y := wm97xx-core.o + obj-$(CONFIG_TOUCHSCREEN_ADS7846) += ads7846.o obj-$(CONFIG_TOUCHSCREEN_BITSY) += h3600_ts_input.o obj-$(CONFIG_TOUCHSCREEN_CORGI) += corgi_ts.o
@@ -19,3 +21,8 @@ obj-$(CONFIG_TOUCHSCREEN_PENMOUNT) += penmount.o obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o +obj-$(CONFIG_TOUCHSCREEN_WM97XX) += wm97xx-ts.o +obj-$(CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE) += mainstone-wm97xx.o +wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9705) += wm9705.o +wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9712) += wm9712.o +wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9713) += wm9713.o
Signature · 1 line
1.5.2.5
PATCH 1/6 Core driver for WM97xx touchscreens
This patch series adds support for the touchscreen controllers provided by Wolfson Microelectronics WM97xx series chips in both polled and streaming modes.
These drivers have been maintained out of tree since 2003. During that time the driver the primary maintainer was Liam Girdwood and a number of people have made contributions including Dmitry Baryshkov, Stanley Cai, Rodolfo Giometti, Russell King, Marc Kleine-Budde, Ian Molton, Vincent Sanders, Andrew Zabolotny, Graeme Gregory, Mike Arthur and myself. Apologies to anyone I have omitted.
--- drivers/input/touchscreen/wm97xx-core.c | 731 +++++++++++++++++++++++++++++++ include/linux/wm97xx.h | 308 +++++++++++++ 2 files changed, 1039 insertions(+), 0 deletions(-) create mode 100644 drivers/input/touchscreen/wm97xx-core.c create mode 100644 include/linux/wm97xx.h
drivers/input/touchscreen/wm97xx-core.c new file +731 -0
@@ -0,0 +1,731 @@ +/* +* wm97xx-core.c -- Touch screen driver core for Wolfson WM9705, WM9712 +* and WM9713 AC97 Codecs. +* +* Copyright 2003, 2004, 2005, 2006, 2007, 2008 Wolfson Microelectronics PLC. +* Author: Liam Girdwood +* [email protected] or [email protected] +* Parts Copyright : Ian Molton <[email protected]> +* Andrew Zabolotny <[email protected]> +* Russell King <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +* +* Notes: +* +* Features: +* - supports WM9705, WM9712, WM9713 +* - polling mode +* - continuous mode (arch-dependent) +* - adjustable rpu/dpp settings +* - adjustable pressure current +* - adjustable sample settle delay +* - 4 and 5 wire touchscreens (5 wire is WM9712 only) +* - pen down detection +* - battery monitor +* - sample AUX adcs +* - power management +* - codec GPIO +* - codec event notification +* Todo +* - Support for async sampling control for noisy LCDs. +* +*/ + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/version.h> +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/delay.h> +#include <linux/string.h> +#include <linux/proc_fs.h> +#include <linux/pm.h> +#include <linux/interrupt.h> +#include <linux/bitops.h> +#include <linux/workqueue.h> +#include <linux/wm97xx.h> +#include <linux/uaccess.h> +#include <linux/io.h> + +#define TS_NAME "wm97xx" +#define WM_CORE_VERSION "1.00" +#define DEFAULT_PRESSURE 0xb0c0 + + +/* +* Touchscreen absolute values +* +* These parameters are used to help the input layer discard out of +* range readings and reduce jitter etc. +* +* o min, max:- indicate the min and max values your touch screen returns +* o fuzz:- use a higher number to reduce jitter +* +* The default values correspond to Mainstone II in QVGA mode +* +* Please read +* Documentation/input/input-programming.txt for more details. +*/ + +static int abs_x[3 ] = {350 ,3900 ,5 }; +module_param_array (abs_x, int,NULL ,0 ); +MODULE_PARM_DESC (abs_x,"Touchscreen absolute X min, max, fuzz" ); + +static int abs_y[3 ] = {320 ,3750 ,40 }; +module_param_array (abs_y, int,NULL ,0 ); +MODULE_PARM_DESC (abs_y,"Touchscreen absolute Y min, max, fuzz" ); + +static int abs_p[3 ] = {0 ,150 ,4 }; +module_param_array (abs_p, int,NULL ,0 ); +MODULE_PARM_DESC (abs_p,"Touchscreen absolute Pressure min, max, fuzz" ); + +/* +* wm97xx IO access, all IO locking done by AC97 layer +*/ +int wm97xx_reg_read (struct wm97xx *wm,u16 reg) +{ +if (wm->ac97) +return wm->ac97->bus->ops->read (wm->ac97, reg); +else +return -1 ; +} +EXPORT_SYMBOL_GPL (wm97xx_reg_read); + +void wm97xx_reg_write (struct wm97xx *wm,u16 reg,u16 val) +{ +/* cache digitiser registers */ +if (reg >=AC97_WM9713_DIG1 && reg <=AC97_WM9713_DIG3 ) + wm->dig[(reg -AC97_WM9713_DIG1 ) >>1 ] = val; + +/* cache gpio regs */ +if (reg >=AC97_GPIO_CFG && reg <=AC97_MISC_AFE ) + wm->gpio[(reg -AC97_GPIO_CFG ) >>1 ] = val; + +/* wm9713 irq reg */ +if (reg ==0x5a ) + wm->misc = val; + +if (wm->ac97) + wm->ac97->bus->ops->write (wm->ac97, reg, val); +} +EXPORT_SYMBOL_GPL (wm97xx_reg_write); + +/** +* wm97xx_read_aux_adc - Read the aux adc. +* @wm: wm97xx device. +* @adcsel: codec ADC to be read +* +* Reads the selected AUX ADC. +*/ + +int wm97xx_read_aux_adc (struct wm97xx *wm,u16 adcsel) +{ +int power_adc =0 , auxval; +u16 power =0 ; + +/* get codec */ +mutex_lock (&wm->codec_mutex); + +/* When the touchscreen is not in use, we may have to power up +* the AUX ADC before we can use sample the AUX inputs-> +*/ +if (wm->id ==WM9713_ID2 && + (power =wm97xx_reg_read (wm,AC97_EXTENDED_MID )) &0x8000 ) { + power_adc =1 ; +wm97xx_reg_write (wm,AC97_EXTENDED_MID , power &0x7fff ); + } + +/* Prepare the codec for AUX reading */ + wm->codec->aux_prepare (wm); + +/* Turn polling mode on to read AUX ADC */ + wm->pen_probably_down =1 ; + wm->codec->poll_sample (wm, adcsel, &auxval); + +if (power_adc) +wm97xx_reg_write (wm,AC97_EXTENDED_MID , power |0x8000 ); + + wm->codec->dig_restore (wm); + + wm->pen_probably_down =0 ; + +mutex_unlock (&wm->codec_mutex); +return auxval &0xfff ; +} +EXPORT_SYMBOL_GPL (wm97xx_read_aux_adc); + +/** +* wm97xx_get_gpio - Get the status of a codec GPIO. +* @wm: wm97xx device. +* @gpio: gpio +* +* Get the status of a codec GPIO pin +*/ + +enum wm97xx_gpio_status wm97xx_get_gpio (struct wm97xx *wm,u32 gpio) +{ +u16 status; +enum wm97xx_gpio_status ret; + +mutex_lock (&wm->codec_mutex); + status =wm97xx_reg_read (wm,AC97_GPIO_STATUS ); + +if (status & gpio) + ret =WM97XX_GPIO_HIGH ; +else + ret =WM97XX_GPIO_LOW ; + +mutex_unlock (&wm->codec_mutex); +return ret; +} +EXPORT_SYMBOL_GPL (wm97xx_get_gpio); + +/** +* wm97xx_set_gpio - Set the status of a codec GPIO. +* @wm: wm97xx device. +* @gpio: gpio +* +* +* Set the status of a codec GPIO pin +*/ + +void wm97xx_set_gpio (struct wm97xx *wm,u32 gpio, +enum wm97xx_gpio_status status) +{ +u16 reg; + +mutex_lock (&wm->codec_mutex); + reg =wm97xx_reg_read (wm,AC97_GPIO_STATUS ); + +if (status &WM97XX_GPIO_HIGH ) + reg |= gpio; +else + reg &= ~gpio; + +if (wm->id ==WM9712_ID2 ) +wm97xx_reg_write (wm,AC97_GPIO_STATUS , reg <<1 ); +else +wm97xx_reg_write (wm,AC97_GPIO_STATUS , reg); +mutex_unlock (&wm->codec_mutex); +} +EXPORT_SYMBOL_GPL (wm97xx_set_gpio); + +/* +* Codec GPIO pin configuration, this sets pin direction, polarity, +* stickyness and wake up. +*/ +void wm97xx_config_gpio (struct wm97xx *wm,u32 gpio,enum wm97xx_gpio_dir dir, +enum wm97xx_gpio_pol pol,enum wm97xx_gpio_sticky sticky, +enum wm97xx_gpio_wake wake) +{ +u16 reg; + +mutex_lock (&wm->codec_mutex); + reg =wm97xx_reg_read (wm,AC97_GPIO_POLARITY ); + +if (pol ==WM97XX_GPIO_POL_HIGH ) + reg |= gpio; +else + reg &= ~gpio; + +wm97xx_reg_write (wm,AC97_GPIO_POLARITY , reg); + reg =wm97xx_reg_read (wm,AC97_GPIO_STICKY ); + +if (sticky ==WM97XX_GPIO_STICKY ) + reg |= gpio; +else + reg &= ~gpio; + +wm97xx_reg_write (wm,AC97_GPIO_STICKY , reg); + reg =wm97xx_reg_read (wm,AC97_GPIO_WAKEUP ); + +if (wake ==WM97XX_GPIO_WAKE ) + reg |= gpio; +else + reg &= ~gpio; + +wm97xx_reg_write (wm,AC97_GPIO_WAKEUP , reg); + reg =wm97xx_reg_read (wm,AC97_GPIO_CFG ); + +if (dir ==WM97XX_GPIO_IN ) + reg |= gpio; +else + reg &= ~gpio; + +wm97xx_reg_write (wm,AC97_GPIO_CFG , reg); +mutex_unlock (&wm->codec_mutex); +} +EXPORT_SYMBOL_GPL (wm97xx_config_gpio); + +/* +* Handle a pen down interrupt. +*/ +static void wm97xx_pen_irq_worker (struct work_struct *work) +{ + struct wm97xx *wm = container_of(work, struct wm97xx, pen_event_work); + +/* do we need to enable the touch panel reader */ +if (wm->id ==WM9705_ID2 ) { +if (wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ) & +WM97XX_PEN_DOWN ) + wm->pen_is_down =1 ; +else + wm->pen_is_down =0 ; + }else { +u16 status, pol; +mutex_lock (&wm->codec_mutex); + status =wm97xx_reg_read (wm,AC97_GPIO_STATUS ); + pol =wm97xx_reg_read (wm,AC97_GPIO_POLARITY ); + +if (WM97XX_GPIO_13 & pol & status) { + wm->pen_is_down =1 ; +wm97xx_reg_write (wm,AC97_GPIO_POLARITY , pol & + ~WM97XX_GPIO_13 ); + }else { + wm->pen_is_down =0 ; +wm97xx_reg_write (wm,AC97_GPIO_POLARITY , pol | +WM97XX_GPIO_13 ); + } + +if (wm->id ==WM9712_ID2 ) +wm97xx_reg_write (wm,AC97_GPIO_STATUS , (status & + ~WM97XX_GPIO_13 ) <<1 ); +else +wm97xx_reg_write (wm,AC97_GPIO_STATUS , status & + ~WM97XX_GPIO_13 ); +mutex_unlock (&wm->codec_mutex); + } + +queue_delayed_work (wm->ts_workq, &wm->ts_reader,0 ); + +if (!wm->pen_is_down && wm->mach_ops && wm->mach_ops->acc_enabled) + wm->mach_ops->acc_pen_up (wm); + wm->mach_ops->irq_enable (wm,1 ); +} + +/* +* Codec PENDOWN irq handler +* +* We have to disable the codec interrupt in the handler because it can +* take upto 1ms to clear the interrupt source. The interrupt is then enabled +* again in the slow handler when the source has been cleared. +*/ +static irqreturn_t wm97xx_pen_interrupt (int irq,void *dev_id) +{ +struct wm97xx *wm = dev_id; + wm->mach_ops->irq_enable (wm,0 ); +queue_work (wm->ts_workq, &wm->pen_event_work); +return IRQ_HANDLED ; +} + +/* +* initialise pen IRQ handler and workqueue +*/ +static int wm97xx_init_pen_irq (struct wm97xx *wm) +{ +u16 reg; + +/* If an interrupt is supplied an IRQ enable operation must also be +* provided. */ +BUG_ON (!wm->mach_ops->irq_enable); + +INIT_WORK (&wm->pen_event_work, wm97xx_pen_irq_worker); + +if (request_irq (wm->pen_irq, wm97xx_pen_interrupt,IRQF_SHARED , +"wm97xx-pen" , wm)) { +dev_err (wm->dev, +"Failed to register pen down interrupt, polling" ); + wm->pen_irq =0 ; +return -EINVAL ; + } + +/* enable PEN down on wm9712/13 */ +if (wm->id !=WM9705_ID2 ) { + reg =wm97xx_reg_read (wm,AC97_MISC_AFE ); +wm97xx_reg_write (wm,AC97_MISC_AFE , reg &0xfffb ); + reg =wm97xx_reg_read (wm,0x5a ); +wm97xx_reg_write (wm,0x5a , reg & ~0x0001 ); + } + +return 0 ; +} + +static int wm97xx_read_samples (struct wm97xx *wm) +{ +struct wm97xx_data data; +int rc; + +mutex_lock (&wm->codec_mutex); + +if (wm->mach_ops && wm->mach_ops->acc_enabled) + rc = wm->mach_ops->acc_pen_down (wm); +else + rc = wm->codec->poll_touch (wm, &data); + +if (rc &RC_PENUP ) { +if (wm->pen_is_down) { + wm->pen_is_down =0 ; +dev_dbg (wm->dev,"pen up\n" ); +input_report_abs (wm->input_dev,ABS_PRESSURE ,0 ); +input_sync (wm->input_dev); + }else if (!(rc &RC_AGAIN )) { +/* We need high frequency updates only while +* pen is down, the user never will be able to +* touch screen faster than a few times per +* second... On the other hand, when the user +* is actively working with the touchscreen we +* don't want to lose the quick response. So we +* will slowly increase sleep time after the +* pen is up and quicky restore it to ~one task +* switch when pen is down again. +*/ +if (wm->ts_reader_interval <HZ /10 ) + wm->ts_reader_interval++; + } + + }else if (rc &RC_VALID ) { +dev_dbg (wm->dev, +"pen down: x=%x:%d, y=%x:%d, pressure=%x:%d\n" , + data.x >>12 , data.x &0xfff , data.y >>12 , + data.y &0xfff , data.p >>12 , data.p &0xfff ); +input_report_abs (wm->input_dev,ABS_X , data.x &0xfff ); +input_report_abs (wm->input_dev,ABS_Y , data.y &0xfff ); +input_report_abs (wm->input_dev,ABS_PRESSURE , data.p &0xfff ); +input_sync (wm->input_dev); + wm->pen_is_down =1 ; + wm->ts_reader_interval = wm->ts_reader_min_interval; + }else if (rc &RC_PENDOWN ) { +dev_dbg (wm->dev,"pen down\n" ); + wm->pen_is_down =1 ; + wm->ts_reader_interval = wm->ts_reader_min_interval; + } + +mutex_unlock (&wm->codec_mutex); +return rc; +} + +/* +* The touchscreen sample reader. +*/ +static void wm97xx_ts_reader (struct work_struct *work) +{ +int rc; + struct wm97xx *wm = container_of(work, struct wm97xx, ts_reader.work); + +BUG_ON (!wm->codec); + +do { + rc =wm97xx_read_samples (wm); + }while (rc &RC_AGAIN ); + +if (wm->pen_is_down || !wm->pen_irq) +queue_delayed_work (wm->ts_workq, &wm->ts_reader, + wm->ts_reader_interval); +} + +/** +* wm97xx_ts_input_open - Open the touch screen input device. +* @idev: Input device to be opened. +* +* Called by the input sub system to open a wm97xx touchscreen device. +* Starts the touchscreen thread and touch digitiser. +*/ +static int wm97xx_ts_input_open (struct input_dev *idev) +{ +struct wm97xx *wm =input_get_drvdata (idev); + + wm->ts_workq =create_singlethread_workqueue ("kwm97xx" ); +if (wm->ts_workq ==NULL ) { +dev_err (wm->dev, +"Failed to create workqueue\n" ); +return -EINVAL ; + } + +/* start digitiser */ +if (wm->mach_ops && wm->mach_ops->acc_enabled) + wm->codec->acc_enable (wm,1 ); + wm->codec->dig_enable (wm,1 ); + +INIT_DELAYED_WORK (&wm->ts_reader, wm97xx_ts_reader); + + wm->ts_reader_min_interval =HZ >=100 ?HZ /100 :1 ; +if (wm->ts_reader_min_interval <1 ) + wm->ts_reader_min_interval =1 ; + wm->ts_reader_interval = wm->ts_reader_min_interval; + + wm->pen_is_down =0 ; +if (wm->pen_irq) +wm97xx_init_pen_irq (wm); +else +dev_err (wm->dev,"No IRQ specified\n" ); + +/* If we either don't have an interrupt for pen down events or +* failed to acquire it then we need to poll. +*/ +if (wm->pen_irq ==0 ) +queue_delayed_work (wm->ts_workq, &wm->ts_reader, + wm->ts_reader_interval); + +return 0 ; +} + +/** +* wm97xx_ts_input_close - Close the touch screen input device. +* @idev: Input device to be closed. +* +* Called by the input sub system to close a wm97xx touchscreen device. +* Kills the touchscreen thread and stops the touch digitiser. +*/ + +static void wm97xx_ts_input_close (struct input_dev *idev) +{ +struct wm97xx *wm =input_get_drvdata (idev); + +if (wm->pen_irq) +free_irq (wm->pen_irq, wm); + + wm->pen_is_down =0 ; + +/* ts_reader rearms itself so we need to explicitly stop it +* before we destroy the workqueue. +*/ +cancel_delayed_work_sync (&wm->ts_reader); +destroy_workqueue (wm->ts_workq); + +/* stop digitiser */ + wm->codec->dig_enable (wm,0 ); +if (wm->mach_ops && wm->mach_ops->acc_enabled) + wm->codec->acc_enable (wm,0 ); +} + +static int wm97xx_probe (struct device *dev) +{ +struct wm97xx *wm; +int ret =0 , id =0 ; + + wm =kzalloc (sizeof (struct wm97xx ),GFP_KERNEL ); +if (!wm) +return -ENOMEM ; +mutex_init (&wm->codec_mutex); + + wm->dev = dev; + dev->driver_data = wm; + wm->ac97 =to_ac97_t (dev); + +/* check that we have a supported codec */ + id =wm97xx_reg_read (wm,AC97_VENDOR_ID1 ); +if (id !=WM97XX_ID1 ) { +dev_err (dev,"Device with vendor %04x is not a wm97xx\n" , id); + ret = -ENODEV ; + goto alloc_err; + } + + wm->id =wm97xx_reg_read (wm,AC97_VENDOR_ID2 ); + +dev_info (wm->dev,"detected a wm97%02x codec\n" , wm->id &0xff ); + +switch (wm->id &0xff ) { +#ifdef CONFIG_TOUCHSCREEN_WM9705 +case 0x05 : + wm->codec = &wm9705_codec; +break ; +#endif +#ifdef CONFIG_TOUCHSCREEN_WM9712 +case 0x12 : + wm->codec = &wm9712_codec; +break ; +#endif +#ifdef CONFIG_TOUCHSCREEN_WM9713 +case 0x13 : + wm->codec = &wm9713_codec; +break ; +#endif +default : +dev_err (wm->dev,"Support for wm97%02x not compiled in.\n" , + wm->id &0xff ); + ret = -ENODEV ; + goto alloc_err; + } + + wm->input_dev =input_allocate_device (); +if (wm->input_dev ==NULL ) { + ret = -ENOMEM ; + goto alloc_err; + } + +/* set up touch configuration */ + wm->input_dev->name ="wm97xx touchscreen" ; + wm->input_dev->open = wm97xx_ts_input_open; + wm->input_dev->close = wm97xx_ts_input_close; +set_bit (EV_ABS , wm->input_dev->evbit); +set_bit (ABS_X , wm->input_dev->absbit); +set_bit (ABS_Y , wm->input_dev->absbit); +set_bit (ABS_PRESSURE , wm->input_dev->absbit); +input_set_abs_params (wm->input_dev,ABS_X , abs_x[0 ], abs_x[1 ], + abs_x[2 ],0 ); +input_set_abs_params (wm->input_dev,ABS_Y , abs_y[0 ], abs_y[1 ], + abs_y[2 ],0 ); +input_set_abs_params (wm->input_dev,ABS_PRESSURE , abs_p[0 ], abs_p[1 ], + abs_p[2 ],0 ); +input_set_drvdata (wm->input_dev, wm); + wm->input_dev->dev.parent = dev; + ret =input_register_device (wm->input_dev); +if (ret <0 ) + goto dev_alloc_err; + +/* set up physical characteristics */ + wm->codec->phy_init (wm); + +/* load gpio cache */ + wm->gpio[0 ] =wm97xx_reg_read (wm,AC97_GPIO_CFG ); + wm->gpio[1 ] =wm97xx_reg_read (wm,AC97_GPIO_POLARITY ); + wm->gpio[2 ] =wm97xx_reg_read (wm,AC97_GPIO_STICKY ); + wm->gpio[3 ] =wm97xx_reg_read (wm,AC97_GPIO_WAKEUP ); + wm->gpio[4 ] =wm97xx_reg_read (wm,AC97_GPIO_STATUS ); + wm->gpio[5 ] =wm97xx_reg_read (wm,AC97_MISC_AFE ); + +/* register our battery device */ + wm->battery_dev =platform_device_alloc ("wm97xx-battery" ,-1 ); +if (!wm->battery_dev) { + ret = -ENOMEM ; + goto batt_err; + } +platform_set_drvdata (wm->battery_dev, wm); + wm->battery_dev->dev.parent = dev; + ret =platform_device_add (wm->battery_dev); +if (ret <0 ) + goto batt_reg_err; + +/* register our extended touch device (for machine specific +* extensions) */ + wm->touch_dev =platform_device_alloc ("wm97xx-touch" ,-1 ); +if (!wm->touch_dev) { + ret = -ENOMEM ; + goto touch_err; + } +platform_set_drvdata (wm->touch_dev, wm); + wm->touch_dev->dev.parent = dev; + ret =platform_device_add (wm->touch_dev); +if (ret <0 ) + goto touch_reg_err; + +return ret; + + touch_reg_err: +platform_device_put (wm->touch_dev); + touch_err: +platform_device_unregister (wm->battery_dev); + wm->battery_dev =NULL ; + batt_reg_err: +platform_device_put (wm->battery_dev); + batt_err: +input_unregister_device (wm->input_dev); + wm->input_dev =NULL ; + dev_alloc_err: +input_free_device (wm->input_dev); + alloc_err: +kfree (wm); + +return ret; +} + +static int wm97xx_remove (struct device *dev) +{ +struct wm97xx *wm =dev_get_drvdata (dev); + +platform_device_unregister (wm->battery_dev); +platform_device_unregister (wm->touch_dev); +input_unregister_device (wm->input_dev); + +kfree (wm); +return 0 ; +} + +#ifdef CONFIG_PM +static int wm97xx_resume (struct device *dev) +{ +struct wm97xx *wm =dev_get_drvdata (dev); + +/* restore digitiser and gpios */ +if (wm->id ==WM9713_ID2 ) { +wm97xx_reg_write (wm,AC97_WM9713_DIG1 , wm->dig[0 ]); +wm97xx_reg_write (wm,0x5a , wm->misc); +if (wm->input_dev->users) { +u16 reg; + reg =wm97xx_reg_read (wm,AC97_EXTENDED_MID ) &0x7fff ; +wm97xx_reg_write (wm,AC97_EXTENDED_MID , reg); + } + } + +wm97xx_reg_write (wm,AC97_WM9713_DIG2 , wm->dig[1 ]); +wm97xx_reg_write (wm,AC97_WM9713_DIG3 , wm->dig[2 ]); + +wm97xx_reg_write (wm,AC97_GPIO_CFG , wm->gpio[0 ]); +wm97xx_reg_write (wm,AC97_GPIO_POLARITY , wm->gpio[1 ]); +wm97xx_reg_write (wm,AC97_GPIO_STICKY , wm->gpio[2 ]); +wm97xx_reg_write (wm,AC97_GPIO_WAKEUP , wm->gpio[3 ]); +wm97xx_reg_write (wm,AC97_GPIO_STATUS , wm->gpio[4 ]); +wm97xx_reg_write (wm,AC97_MISC_AFE , wm->gpio[5 ]); + +return 0 ; +} + +#else +#define wm97xx_resume NULL +#endif + +/* +* Machine specific operations +*/ +int wm97xx_register_mach_ops (struct wm97xx *wm, +struct wm97xx_mach_ops *mach_ops) +{ +mutex_lock (&wm->codec_mutex); +if (wm->mach_ops) { +mutex_unlock (&wm->codec_mutex); +return -EINVAL ; + } + wm->mach_ops = mach_ops; +mutex_unlock (&wm->codec_mutex); +return 0 ; +} +EXPORT_SYMBOL_GPL (wm97xx_register_mach_ops); + +void wm97xx_unregister_mach_ops (struct wm97xx *wm) +{ +mutex_lock (&wm->codec_mutex); + wm->mach_ops =NULL ; +mutex_unlock (&wm->codec_mutex); +} +EXPORT_SYMBOL_GPL (wm97xx_unregister_mach_ops); + +static struct device_driver wm97xx_driver = { + .name ="ac97" , + .bus = &ac97_bus_type, + .owner =THIS_MODULE , + .probe = wm97xx_probe, + .remove = wm97xx_remove, + .resume = wm97xx_resume, +}; + +static int __init wm97xx_init (void ) +{ +return driver_register (&wm97xx_driver); +} + +static void __exit wm97xx_exit(void) +{ +driver_unregister (&wm97xx_driver); +} + +module_init (wm97xx_init); +module_exit (wm97xx_exit); + +/* Module information */ +MODULE_AUTHOR ("Liam Girdwood <[email protected]>" ); +MODULE_DESCRIPTION ("WM97xx Core - Touch Screen / AUX ADC / GPIO Driver" ); +MODULE_LICENSE ("GPL" );
include/linux/wm97xx.h new file +308 -0
308 lines not on this page · raw message
Signature · 1 line
1.5.2.5
PATCH 2/6 Add chip driver for WM9705 touchscreen
--- drivers/input/touchscreen/wm9705.c | 352 ++++++++++++++++++++++++++++++++++++ 1 files changed, 352 insertions(+), 0 deletions(-) create mode 100644 drivers/input/touchscreen/wm9705.c
drivers/input/touchscreen/wm9705.c new file +352 -0
@@ -0,0 +1,352 @@ +/* +* wm9705.c -- Codec driver for Wolfson WM9705 AC97 Codec. +* +* Copyright 2003, 2004, 2005, 2006, 2007 Wolfson Microelectronics PLC. +* Author: Liam Girdwood +* [email protected] or [email protected] +* Parts Copyright : Ian Molton <[email protected]> +* Andrew Zabolotny <[email protected]> +* Russell King <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +* +*/ + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/version.h> +#include <linux/kernel.h> +#include <linux/input.h> +#include <linux/delay.h> +#include <linux/bitops.h> +#include <linux/wm97xx.h> + +#define TS_NAME "wm97xx" +#define WM9705_VERSION "0.62" +#define DEFAULT_PRESSURE 0xb0c0 + +/* +* Module parameters +*/ + +/* +* Set current used for pressure measurement. +* +* Set pil = 2 to use 400uA +* pil = 1 to use 200uA and +* pil = 0 to disable pressure measurement. +* +* This is used to increase the range of values returned by the adc +* when measureing touchpanel pressure. +*/ +static int pil; +module_param (pil, int,0 ); +MODULE_PARM_DESC (pil,"Set current used for pressure measurement." ); + +/* +* Set threshold for pressure measurement. +* +* Pen down pressure below threshold is ignored. +*/ +static int pressure =DEFAULT_PRESSURE &0xfff ; +module_param (pressure, int,0 ); +MODULE_PARM_DESC (pressure,"Set threshold for pressure measurement." ); + +/* +* Set adc sample delay. +* +* For accurate touchpanel measurements, some settling time may be +* required between the switch matrix applying a voltage across the +* touchpanel plate and the ADC sampling the signal. +* +* This delay can be set by setting delay = n, where n is the array +* position of the delay in the array delay_table below. +* Long delays > 1ms are supported for completeness, but are not +* recommended. +*/ +static int delay =4 ; +module_param (delay, int,0 ); +MODULE_PARM_DESC (delay,"Set adc sample delay." ); + +/* +* Pen detect comparator threshold. +* +* 0 to Vmid in 15 steps, 0 = use zero power comparator with Vmid threshold +* i.e. 1 = Vmid/15 threshold +* 15 = Vmid/1 threshold +* +* Adjust this value if you are having problems with pen detect not +* detecting any down events. +*/ +static int pdd =8 ; +module_param (pdd, int,0 ); +MODULE_PARM_DESC (pdd,"Set pen detect comparator threshold" ); + +/* +* Set adc mask function. +* +* Sources of glitch noise, such as signals driving an LCD display, may feed +* through to the touch screen plates and affect measurement accuracy. In +* order to minimise this, a signal may be applied to the MASK pin to delay or +* synchronise the sampling. +* +* 0 = No delay or sync +* 1 = High on pin stops conversions +* 2 = Edge triggered, edge on pin delays conversion by delay param (above) +* 3 = Edge triggered, edge on pin starts conversion after delay param +*/ +static int mask; +module_param (mask, int,0 ); +MODULE_PARM_DESC (mask,"Set adc mask function." ); + +/* +* ADC sample delay times in uS +*/ +static const int delay_table[] = { +21 ,/* 1 AC97 Link frames */ +42 ,/* 2 */ +84 ,/* 4 */ +167 ,/* 8 */ +333 ,/* 16 */ +667 ,/* 32 */ +1000 ,/* 48 */ +1333 ,/* 64 */ +2000 ,/* 96 */ +2667 ,/* 128 */ +3333 ,/* 160 */ +4000 ,/* 192 */ +4667 ,/* 224 */ +5333 ,/* 256 */ +6000 ,/* 288 */ +0 /* No delay, switch matrix always on */ +}; + +/* +* Delay after issuing a POLL command. +* +* The delay is 3 AC97 link frames + the touchpanel settling delay +*/ +static inline void poll_delay (int d) +{ +udelay (3 *AC97_LINK_FRAME + delay_table[d]); +} + +/* +* set up the physical settings of the WM9705 +*/ +static void wm9705_phy_init (struct wm97xx *wm) +{ +u16 dig1 =0 , dig2 =WM97XX_RPR ; + +/* +* mute VIDEO and AUX as they share X and Y touchscreen +* inputs on the WM9705 +*/ +wm97xx_reg_write (wm,AC97_AUX ,0x8000 ); +wm97xx_reg_write (wm,AC97_VIDEO ,0x8000 ); + +/* touchpanel pressure current*/ +if (pil ==2 ) { + dig2 |=WM9705_PIL ; +dev_dbg (wm->dev, +"setting pressure measurement current to 400uA." ); + }else if (pil) +dev_dbg (wm->dev, +"setting pressure measurement current to 200uA." ); +if (!pil) + pressure =0 ; + +/* polling mode sample settling delay */ +if (delay !=4 ) { +if (delay <0 || delay >15 ) { +dev_dbg (wm->dev,"supplied delay out of range." ); + delay =4 ; + } + } + dig1 &=0xff0f ; + dig1 |=WM97XX_DELAY (delay); +dev_dbg (wm->dev,"setting adc sample delay to %d u Secs." , + delay_table[delay]); + +/* WM9705 pdd */ + dig2 |= (pdd &0x000f ); +dev_dbg (wm->dev,"setting pdd to Vmid/%d" ,1 - (pdd &0x000f )); + +/* mask */ + dig2 |= ((mask &0x3 ) <<4 ); + +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 , dig1); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 , dig2); +} + +static void wm9705_dig_enable (struct wm97xx *wm,int enable) +{ +if (enable) { +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 , + wm->dig[2 ] |WM97XX_PRP_DET_DIG ); +wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD );/* dummy read */ + }else +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 , + wm->dig[2 ] & ~WM97XX_PRP_DET_DIG ); +} + +static void wm9705_aux_prepare (struct wm97xx *wm) +{ +memcpy (wm->dig_save, wm->dig,sizeof (wm->dig)); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 ,0 ); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 ,WM97XX_PRP_DET_DIG ); +} + +static void wm9705_dig_restore (struct wm97xx *wm) +{ +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 , wm->dig_save[1 ]); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 , wm->dig_save[2 ]); +} + +static inline int is_pden (struct wm97xx *wm) +{ +return wm->dig[2 ] &WM9705_PDEN ; +} + +/* +* Read a sample from the WM9705 adc in polling mode. +*/ +static int wm9705_poll_sample (struct wm97xx *wm,int adcsel,int *sample) +{ +int timeout =5 * delay; + +if (!wm->pen_probably_down) { +u16 data =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +if (!(data &WM97XX_PEN_DOWN )) +return RC_PENUP ; + wm->pen_probably_down =1 ; + } + +/* set up digitiser */ +if (adcsel &0x8000 ) + adcsel = ((adcsel &0x7fff ) +3 ) <<12 ; + +if (wm->mach_ops && wm->mach_ops->pre_sample) + wm->mach_ops->pre_sample (adcsel); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 , + adcsel |WM97XX_POLL |WM97XX_DELAY (delay)); + +/* wait 3 AC97 time slots + delay for conversion */ +poll_delay (delay); + +/* wait for POLL to go low */ +while ((wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER1 ) &WM97XX_POLL ) + && timeout) { +udelay (AC97_LINK_FRAME ); + timeout--; + } + +if (timeout <=0 ) { +/* If PDEN is set, we can get a timeout when pen goes up */ +if (is_pden (wm)) + wm->pen_probably_down =0 ; +else +dev_dbg (wm->dev,"adc sample timeout" ); +return RC_PENUP ; + } + + *sample =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +if (wm->mach_ops && wm->mach_ops->post_sample) + wm->mach_ops->post_sample (adcsel); + +/* check we have correct sample */ +if ((*sample &WM97XX_ADCSEL_MASK ) != adcsel) { +dev_dbg (wm->dev,"adc wrong sample, read %x got %x" , adcsel, + *sample &WM97XX_ADCSEL_MASK ); +return RC_PENUP ; + } + +if (!(*sample &WM97XX_PEN_DOWN )) { + wm->pen_probably_down =0 ; +return RC_PENUP ; + } + +return RC_VALID ; +} + +/* +* Sample the WM9705 touchscreen in polling mode +*/ +static int wm9705_poll_touch (struct wm97xx *wm,struct wm97xx_data *data) +{ +int rc; + + rc =wm9705_poll_sample (wm,WM97XX_ADCSEL_X , &data->x); +if (rc !=RC_VALID ) +return rc; + rc =wm9705_poll_sample (wm,WM97XX_ADCSEL_Y , &data->y); +if (rc !=RC_VALID ) +return rc; +if (pil) { + rc =wm9705_poll_sample (wm,WM97XX_ADCSEL_PRES , &data->p); +if (rc !=RC_VALID ) +return rc; + }else + data->p =DEFAULT_PRESSURE ; + +return RC_VALID ; +} + +/* +* Enable WM9705 continuous mode, i.e. touch data is streamed across +* an AC97 slot +*/ +static int wm9705_acc_enable (struct wm97xx *wm,int enable) +{ +u16 dig1, dig2; +int ret =0 ; + + dig1 = wm->dig[1 ]; + dig2 = wm->dig[2 ]; + +if (enable) { +/* continous mode */ +if (wm->mach_ops->acc_startup && + (ret = wm->mach_ops->acc_startup (wm)) <0 ) +return ret; + dig1 &= ~(WM97XX_CM_RATE_MASK |WM97XX_ADCSEL_MASK | +WM97XX_DELAY_MASK |WM97XX_SLT_MASK ); + dig1 |=WM97XX_CTC |WM97XX_COO |WM97XX_SLEN | +WM97XX_DELAY (delay) | +WM97XX_SLT (wm->acc_slot) | +WM97XX_RATE (wm->acc_rate); +if (pil) + dig1 |=WM97XX_ADCSEL_PRES ; + dig2 |=WM9705_PDEN ; + }else { + dig1 &= ~(WM97XX_CTC |WM97XX_COO |WM97XX_SLEN ); + dig2 &= ~WM9705_PDEN ; +if (wm->mach_ops->acc_shutdown) + wm->mach_ops->acc_shutdown (wm); + } + +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 , dig1); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 , dig2); +return ret; +} + +struct wm97xx_codec_drv wm9705_codec = { + .id =WM9705_ID2 , + .name ="wm9705" , + .poll_sample = wm9705_poll_sample, + .poll_touch = wm9705_poll_touch, + .acc_enable = wm9705_acc_enable, + .phy_init = wm9705_phy_init, + .dig_enable = wm9705_dig_enable, + .dig_restore = wm9705_dig_restore, + .aux_prepare = wm9705_aux_prepare, +}; +EXPORT_SYMBOL_GPL (wm9705_codec); + +/* Module information */ +MODULE_AUTHOR ("Liam Girdwood <[email protected]>" ); +MODULE_DESCRIPTION ("WM9705 Touch Screen Driver" ); +MODULE_LICENSE ("GPL" );
Signature · 1 line
1.5.2.5
PATCH 4/6 Add chip driver for WM9713 touchscreen
In reply to Mark Brown--- drivers/input/touchscreen/wm9713.c | 459 ++++++++++++++++++++++++++++++++++++ 1 files changed, 459 insertions(+), 0 deletions(-) create mode 100644 drivers/input/touchscreen/wm9713.c
drivers/input/touchscreen/wm9713.c new file +459 -0
@@ -0,0 +1,459 @@ +/* +* wm9713.c -- Codec touch driver for Wolfson WM9713 AC97 Codec. +* +* Copyright 2003, 2004, 2005, 2006, 2007, 2008 Wolfson Microelectronics PLC. +* Author: Liam Girdwood +* [email protected] or [email protected] +* Parts Copyright : Ian Molton <[email protected]> +* Andrew Zabolotny <[email protected]> +* Russell King <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +* +*/ + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/version.h> +#include <linux/kernel.h> +#include <linux/input.h> +#include <linux/delay.h> +#include <linux/bitops.h> +#include <linux/wm97xx.h> + +#define TS_NAME "wm97xx" +#define WM9713_VERSION "0.53" +#define DEFAULT_PRESSURE 0xb0c0 + +/* +* Module parameters +*/ + +/* +* Set internal pull up for pen detect. +* +* Pull up is in the range 1.02k (least sensitive) to 64k (most sensitive) +* i.e. pull up resistance = 64k Ohms / rpu. +* +* Adjust this value if you are having problems with pen detect not +* detecting any down event. +*/ +static int rpu =8 ; +module_param (rpu, int,0 ); +MODULE_PARM_DESC (rpu,"Set internal pull up resitor for pen detect." ); + +/* +* Set current used for pressure measurement. +* +* Set pil = 2 to use 400uA +* pil = 1 to use 200uA and +* pil = 0 to disable pressure measurement. +* +* This is used to increase the range of values returned by the adc +* when measureing touchpanel pressure. +*/ +static int pil; +module_param (pil, int,0 ); +MODULE_PARM_DESC (pil,"Set current used for pressure measurement." ); + +/* +* Set threshold for pressure measurement. +* +* Pen down pressure below threshold is ignored. +*/ +static int pressure =DEFAULT_PRESSURE &0xfff ; +module_param (pressure, int,0 ); +MODULE_PARM_DESC (pressure,"Set threshold for pressure measurement." ); + +/* +* Set adc sample delay. +* +* For accurate touchpanel measurements, some settling time may be +* required between the switch matrix applying a voltage across the +* touchpanel plate and the ADC sampling the signal. +* +* This delay can be set by setting delay = n, where n is the array +* position of the delay in the array delay_table below. +* Long delays > 1ms are supported for completeness, but are not +* recommended. +*/ +static int delay =4 ; +module_param (delay, int,0 ); +MODULE_PARM_DESC (delay,"Set adc sample delay." ); + +/* +* Set adc mask function. +* +* Sources of glitch noise, such as signals driving an LCD display, may feed +* through to the touch screen plates and affect measurement accuracy. In +* order to minimise this, a signal may be applied to the MASK pin to delay or +* synchronise the sampling. +* +* 0 = No delay or sync +* 1 = High on pin stops conversions +* 2 = Edge triggered, edge on pin delays conversion by delay param (above) +* 3 = Edge triggered, edge on pin starts conversion after delay param +*/ +static int mask; +module_param (mask, int,0 ); +MODULE_PARM_DESC (mask,"Set adc mask function." ); + +/* +* Coordinate Polling Enable. +* +* Set to 1 to enable coordinate polling. e.g. x,y[,p] is sampled together +* for every poll. +*/ +static int coord; +module_param (coord, int,0 ); +MODULE_PARM_DESC (coord,"Polling coordinate mode" ); + +/* +* ADC sample delay times in uS +*/ +static const int delay_table[] = { +21 ,/* 1 AC97 Link frames */ +42 ,/* 2 */ +84 ,/* 4 */ +167 ,/* 8 */ +333 ,/* 16 */ +667 ,/* 32 */ +1000 ,/* 48 */ +1333 ,/* 64 */ +2000 ,/* 96 */ +2667 ,/* 128 */ +3333 ,/* 160 */ +4000 ,/* 192 */ +4667 ,/* 224 */ +5333 ,/* 256 */ +6000 ,/* 288 */ +0 /* No delay, switch matrix always on */ +}; + +/* +* Delay after issuing a POLL command. +* +* The delay is 3 AC97 link frames + the touchpanel settling delay +*/ +static inline void poll_delay (int d) +{ +udelay (3 *AC97_LINK_FRAME + delay_table[d]); +} + +/* +* set up the physical settings of the WM9713 +*/ +static void wm9713_phy_init (struct wm97xx *wm) +{ +u16 dig1 =0 , dig2, dig3; + +/* default values */ + dig2 =WM97XX_DELAY (4 ) |WM97XX_SLT (5 ); + dig3 =WM9712_RPU (1 ); + +/* rpu */ +if (rpu) { + dig3 &=0xffc0 ; + dig3 |=WM9712_RPU (rpu); +dev_info (wm->dev,"setting pen detect pull-up to %d Ohms\n" , +64000 / rpu); + } + +/* touchpanel pressure */ +if (pil ==2 ) { + dig3 |=WM9712_PIL ; +dev_info (wm->dev, +"setting pressure measurement current to 400uA." ); + }else if (pil) +dev_info (wm->dev, +"setting pressure measurement current to 200uA." ); +if (!pil) + pressure =0 ; + +/* sample settling delay */ +if (delay <0 || delay >15 ) { +dev_info (wm->dev,"supplied delay out of range." ); + delay =4 ; +dev_info (wm->dev,"setting adc sample delay to %d u Secs." , + delay_table[delay]); + } + dig2 &=0xff0f ; + dig2 |=WM97XX_DELAY (delay); + +/* mask */ + dig3 |= ((mask &0x3 ) <<4 ); +if (coord) + dig3 |=WM9713_WAIT ; + + wm->misc =wm97xx_reg_read (wm,0x5a ); + +wm97xx_reg_write (wm,AC97_WM9713_DIG1 , dig1); +wm97xx_reg_write (wm,AC97_WM9713_DIG2 , dig2); +wm97xx_reg_write (wm,AC97_WM9713_DIG3 , dig3); +wm97xx_reg_write (wm,AC97_GPIO_STICKY ,0x0 ); +} + +static void wm9713_dig_enable (struct wm97xx *wm,int enable) +{ +u16 val; + +if (enable) { + val =wm97xx_reg_read (wm,AC97_EXTENDED_MID ); +wm97xx_reg_write (wm,AC97_EXTENDED_MID , val &0x7fff ); +wm97xx_reg_write (wm,AC97_WM9713_DIG3 , wm->dig[2 ] | +WM97XX_PRP_DET_DIG ); +wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD );/* dummy read */ + }else { +wm97xx_reg_write (wm,AC97_WM9713_DIG3 , wm->dig[2 ] & + ~WM97XX_PRP_DET_DIG ); + val =wm97xx_reg_read (wm,AC97_EXTENDED_MID ); +wm97xx_reg_write (wm,AC97_EXTENDED_MID , val |0x8000 ); + } +} + +static void wm9713_dig_restore (struct wm97xx *wm) +{ +wm97xx_reg_write (wm,AC97_WM9713_DIG1 , wm->dig_save[0 ]); +wm97xx_reg_write (wm,AC97_WM9713_DIG2 , wm->dig_save[1 ]); +wm97xx_reg_write (wm,AC97_WM9713_DIG3 , wm->dig_save[2 ]); +} + +static void wm9713_aux_prepare (struct wm97xx *wm) +{ +memcpy (wm->dig_save, wm->dig,sizeof (wm->dig)); +wm97xx_reg_write (wm,AC97_WM9713_DIG1 ,0 ); +wm97xx_reg_write (wm,AC97_WM9713_DIG2 ,0 ); +wm97xx_reg_write (wm,AC97_WM9713_DIG3 ,WM97XX_PRP_DET_DIG ); +} + +static inline int is_pden (struct wm97xx *wm) +{ +return wm->dig[2 ] &WM9713_PDEN ; +} + +/* +* Read a sample from the WM9713 adc in polling mode. +*/ +static int wm9713_poll_sample (struct wm97xx *wm,int adcsel,int *sample) +{ +u16 dig1; +int timeout =5 * delay; + +if (!wm->pen_probably_down) { +u16 data =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +if (!(data &WM97XX_PEN_DOWN )) +return RC_PENUP ; + wm->pen_probably_down =1 ; + } + +/* set up digitiser */ +if (adcsel &0x8000 ) + adcsel =1 << ((adcsel &0x7fff ) +3 ); + + dig1 =wm97xx_reg_read (wm,AC97_WM9713_DIG1 ); + dig1 &= ~WM9713_ADCSEL_MASK ; + +if (wm->mach_ops && wm->mach_ops->pre_sample) + wm->mach_ops->pre_sample (adcsel); +wm97xx_reg_write (wm,AC97_WM9713_DIG1 , dig1 | adcsel |WM9713_POLL ); + +/* wait 3 AC97 time slots + delay for conversion */ +poll_delay (delay); + +/* wait for POLL to go low */ +while ((wm97xx_reg_read (wm,AC97_WM9713_DIG1 ) &WM9713_POLL ) && + timeout) { +udelay (AC97_LINK_FRAME ); + timeout--; + } + +if (timeout <=0 ) { +/* If PDEN is set, we can get a timeout when pen goes up */ +if (is_pden (wm)) + wm->pen_probably_down =0 ; +else +dev_dbg (wm->dev,"adc sample timeout" ); +return RC_PENUP ; + } + + *sample =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +if (wm->mach_ops && wm->mach_ops->post_sample) + wm->mach_ops->post_sample (adcsel); + +/* check we have correct sample */ +if ((*sample &WM97XX_ADCSRC_MASK ) !=ffs (adcsel >>1 ) <<12 ) { +dev_dbg (wm->dev,"adc wrong sample, read %x got %x" , adcsel, + *sample &WM97XX_ADCSRC_MASK ); +return RC_PENUP ; + } + +if (!(*sample &WM97XX_PEN_DOWN )) { + wm->pen_probably_down =0 ; +return RC_PENUP ; + } + +return RC_VALID ; +} + +/* +* Read a coordinate from the WM9713 adc in polling mode. +*/ +static int wm9713_poll_coord (struct wm97xx *wm,struct wm97xx_data *data) +{ +u16 dig1; +int timeout =5 * delay; + +if (!wm->pen_probably_down) { +u16 data =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +if (!(data &WM97XX_PEN_DOWN )) +return RC_PENUP ; + wm->pen_probably_down =1 ; + } + +/* set up digitiser */ + dig1 =wm97xx_reg_read (wm,AC97_WM9713_DIG1 ); + dig1 &= ~WM9713_ADCSEL_MASK ; +if (pil) + dig1 |=WM9713_ADCSEL_PRES ; + +if (wm->mach_ops && wm->mach_ops->pre_sample) + wm->mach_ops->pre_sample (WM97XX_ADCSEL_X |WM97XX_ADCSEL_Y ); +wm97xx_reg_write (wm,AC97_WM9713_DIG1 , + dig1 |WM9713_POLL |WM9713_COO ); + +/* wait 3 AC97 time slots + delay for conversion */ +poll_delay (delay); + data->x =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +/* wait for POLL to go low */ +while ((wm97xx_reg_read (wm,AC97_WM9713_DIG1 ) &WM9713_POLL ) + && timeout) { +udelay (AC97_LINK_FRAME ); + timeout--; + } + +if (timeout <=0 ) { +/* If PDEN is set, we can get a timeout when pen goes up */ +if (is_pden (wm)) + wm->pen_probably_down =0 ; +else +dev_dbg (wm->dev,"adc sample timeout" ); +return RC_PENUP ; + } + +/* read back data */ + data->y =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +if (pil) + data->p =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +else + data->p =DEFAULT_PRESSURE ; + +if (wm->mach_ops && wm->mach_ops->post_sample) + wm->mach_ops->post_sample (WM97XX_ADCSEL_X |WM97XX_ADCSEL_Y ); + +/* check we have correct sample */ +if (!(data->x &WM97XX_ADCSEL_X ) || !(data->y &WM97XX_ADCSEL_Y )) + goto err; +if (pil && !(data->p &WM97XX_ADCSEL_PRES )) + goto err; + +if (!(data->x &WM97XX_PEN_DOWN )) { + wm->pen_probably_down =0 ; +return RC_PENUP ; + } +return RC_VALID ; +err: +return RC_PENUP ; +} + +/* +* Sample the WM9713 touchscreen in polling mode +*/ +static int wm9713_poll_touch (struct wm97xx *wm,struct wm97xx_data *data) +{ +int rc; + +if (coord) { + rc =wm9713_poll_coord (wm, data); +if (rc !=RC_VALID ) +return rc; + }else { + rc =wm9713_poll_sample (wm,WM9713_ADCSEL_X , &data->x); +if (rc !=RC_VALID ) +return rc; + rc =wm9713_poll_sample (wm,WM9713_ADCSEL_Y , &data->y); +if (rc !=RC_VALID ) +return rc; +if (pil) { + rc =wm9713_poll_sample (wm,WM9713_ADCSEL_PRES , + &data->p); +if (rc !=RC_VALID ) +return rc; + }else + data->p =DEFAULT_PRESSURE ; + } +return RC_VALID ; +} + +/* +* Enable WM9713 continuous mode, i.e. touch data is streamed across +* an AC97 slot +*/ +static int wm9713_acc_enable (struct wm97xx *wm,int enable) +{ +u16 dig1, dig2, dig3; +int ret =0 ; + + dig1 = wm->dig[0 ]; + dig2 = wm->dig[1 ]; + dig3 = wm->dig[2 ]; + +if (enable) { +/* continous mode */ +if (wm->mach_ops->acc_startup && + (ret = wm->mach_ops->acc_startup (wm)) <0 ) +return ret; + + dig1 &= ~WM9713_ADCSEL_MASK ; + dig1 |=WM9713_CTC |WM9713_COO |WM9713_ADCSEL_X | +WM9713_ADCSEL_Y ; +if (pil) + dig1 |=WM9713_ADCSEL_PRES ; + dig2 &= ~(WM97XX_DELAY_MASK |WM97XX_SLT_MASK | +WM97XX_CM_RATE_MASK ); + dig2 |=WM97XX_SLEN |WM97XX_DELAY (delay) | +WM97XX_SLT (wm->acc_slot) |WM97XX_RATE (wm->acc_rate); + dig3 |=WM9713_PDEN ; + }else { + dig1 &= ~(WM9713_CTC |WM9713_COO ); + dig2 &= ~WM97XX_SLEN ; + dig3 &= ~WM9713_PDEN ; +if (wm->mach_ops->acc_shutdown) + wm->mach_ops->acc_shutdown (wm); + } + +wm97xx_reg_write (wm,AC97_WM9713_DIG1 , dig1); +wm97xx_reg_write (wm,AC97_WM9713_DIG2 , dig2); +wm97xx_reg_write (wm,AC97_WM9713_DIG3 , dig3); +return ret; +} + +struct wm97xx_codec_drv wm9713_codec = { + .id =WM9713_ID2 , + .name ="wm9713" , + .poll_sample = wm9713_poll_sample, + .poll_touch = wm9713_poll_touch, + .acc_enable = wm9713_acc_enable, + .phy_init = wm9713_phy_init, + .dig_enable = wm9713_dig_enable, + .dig_restore = wm9713_dig_restore, + .aux_prepare = wm9713_aux_prepare, +}; +EXPORT_SYMBOL_GPL (wm9713_codec); + +/* Module information */ +MODULE_AUTHOR ("Liam Girdwood <[email protected]>" ); +MODULE_DESCRIPTION ("WM9713 Touch Screen Driver" ); +MODULE_LICENSE ("GPL" );
Signature · 1 line
1.5.2.5
PATCH 5/6 Driver for WM97xx touchscreens in streaming mode on Mainstone
--- drivers/input/touchscreen/mainstone-wm97xx.c | 298 ++++++++++++++++++++++++++ 1 files changed, 298 insertions(+), 0 deletions(-) create mode 100644 drivers/input/touchscreen/mainstone-wm97xx.c
drivers/input/touchscreen/mainstone-wm97xx.c new file +298 -0
@@ -0,0 +1,298 @@ +/* +* mainstone-wm97xx.c -- Mainstone Continuous Touch screen driver for +* Wolfson WM97xx AC97 Codecs. +* +* Copyright 2004, 2007 Wolfson Microelectronics PLC. +* Author: Liam Girdwood +* [email protected] or [email protected] +* Parts Copyright : Ian Molton <[email protected]> +* Andrew Zabolotny <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +* +* Notes: +* This is a wm97xx extended touch driver to capture touch +* data in a continuous manner on the Intel XScale archictecture +* +* Features: +* - codecs supported:- WM9705, WM9712, WM9713 +* - processors supported:- Intel XScale PXA25x, PXA26x, PXA27x +* +*/ + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/version.h> +#include <linux/kernel.h> +#include <linux/init.h> +#include <linux/delay.h> +#include <linux/irq.h> +#include <linux/interrupt.h> +#include <linux/wm97xx.h> +#include <linux/io.h> +#include <asm/arch/pxa-regs.h> + +#define VERSION "0.13" + +struct continuous { +u16 id;/* codec id */ +u8 code;/* continuous code */ +u8 reads;/* number of coord reads per read cycle */ +u32 speed;/* number of coords per second */ +}; + +#define WM_READS (sp) ((sp / HZ) + 1) + +static const struct continuous cinfo[] = { + {WM9705_ID2 ,0 ,WM_READS (94 ),94 }, + {WM9705_ID2 ,1 ,WM_READS (188 ),188 }, + {WM9705_ID2 ,2 ,WM_READS (375 ),375 }, + {WM9705_ID2 ,3 ,WM_READS (750 ),750 }, + {WM9712_ID2 ,0 ,WM_READS (94 ),94 }, + {WM9712_ID2 ,1 ,WM_READS (188 ),188 }, + {WM9712_ID2 ,2 ,WM_READS (375 ),375 }, + {WM9712_ID2 ,3 ,WM_READS (750 ),750 }, + {WM9713_ID2 ,0 ,WM_READS (94 ),94 }, + {WM9713_ID2 ,1 ,WM_READS (120 ),120 }, + {WM9713_ID2 ,2 ,WM_READS (154 ),154 }, + {WM9713_ID2 ,3 ,WM_READS (188 ),188 }, +}; + +/* continuous speed index */ +static int sp_idx; +static u16 last, tries; + +/* +* Pen sampling frequency (Hz) in continuous mode. +*/ +static int cont_rate =200 ; +module_param (cont_rate, int,0 ); +MODULE_PARM_DESC (cont_rate,"Sampling rate in continuous mode (Hz)" ); + +/* +* Pen down detection. +* +* This driver can either poll or use an interrupt to indicate a pen down +* event. If the irq request fails then it will fall back to polling mode. +*/ +static int pen_int; +module_param (pen_int, int,0 ); +MODULE_PARM_DESC (pen_int,"Pen down detection (1 = interrupt, 0 = polling)" ); + +/* +* Pressure readback. +* +* Set to 1 to read back pen down pressure +*/ +static int pressure; +module_param (pressure, int,0 ); +MODULE_PARM_DESC (pressure,"Pressure readback (1 = pressure, 0 = no pressure)" ); + +/* +* AC97 touch data slot. +* +* Touch screen readback data ac97 slot +*/ +static int ac97_touch_slot =5 ; +module_param (ac97_touch_slot, int,0 ); +MODULE_PARM_DESC (ac97_touch_slot,"Touch screen data slot AC97 number" ); + + +/* flush AC97 slot 5 FIFO on pxa machines */ +#ifdef CONFIG_PXA27x +static void wm97xx_acc_pen_up (struct wm97xx *wm) +{ +set_current_state (TASK_INTERRUPTIBLE ); +schedule_timeout (1 ); + +while (MISR & (1 <<2 )) +MODR ; +} +#else +static void wm97xx_acc_pen_up (struct wm97xx *wm) +{ +int count =16 ; +set_current_state (TASK_INTERRUPTIBLE ); +schedule_timeout (1 ); + +while (count <16 ) { +MODR ; + count--; + } +} +#endif + +static int wm97xx_acc_pen_down (struct wm97xx *wm) +{ +u16 x, y, p =0x100 |WM97XX_ADCSEL_PRES ; +int reads =0 ; + +/* data is never immediately available after pen down irq */ +set_current_state (TASK_INTERRUPTIBLE ); +schedule_timeout (1 ); + +if (tries >5 ) { + tries =0 ; +return RC_PENUP ; + } + + x =MODR ; +if (x == last) { + tries++; +return RC_AGAIN ; + } + last = x; +do { +if (reads) + x =MODR ; + y =MODR ; +if (pressure) + p =MODR ; + +/* are samples valid */ +if ((x &0x7000 ) !=WM97XX_ADCSEL_X || + (y &0x7000 ) !=WM97XX_ADCSEL_Y || + (p &0x7000 ) !=WM97XX_ADCSEL_PRES ) + goto up; + +/* coordinate is good */ + tries =0 ; +input_report_abs (wm->input_dev,ABS_X , x &0xfff ); +input_report_abs (wm->input_dev,ABS_Y , y &0xfff ); +input_report_abs (wm->input_dev,ABS_PRESSURE , p &0xfff ); +input_sync (wm->input_dev); + reads++; + }while (reads < cinfo[sp_idx].reads); +up: +return RC_PENDOWN |RC_AGAIN ; +} + +static int wm97xx_acc_startup (struct wm97xx *wm) +{ +int idx =0 ; + +/* check we have a codec */ +if (wm->ac97 ==NULL ) +return -ENODEV ; + +/* Go you big red fire engine */ +for (idx =0 ; idx <ARRAY_SIZE (cinfo); idx++) { +if (wm->id != cinfo[idx].id) +continue ; + sp_idx = idx; +if (cont_rate <= cinfo[idx].speed) +break ; + } + wm->acc_rate = cinfo[sp_idx].code; + wm->acc_slot = ac97_touch_slot; +dev_info (wm->dev, +"mainstone accelerated touchscreen driver, %d samples/sec\n" , + cinfo[sp_idx].speed); + +/* codec specific irq config */ +if (pen_int) { +switch (wm->id) { +case WM9705_ID2 : + wm->pen_irq =IRQ_GPIO (4 ); +set_irq_type (IRQ_GPIO (4 ),IRQT_BOTHEDGE ); +break ; +case WM9712_ID2 : +case WM9713_ID2 : +/* enable pen down interrupt */ +/* use PEN_DOWN GPIO 13 to assert IRQ on GPIO line 2 */ + wm->pen_irq =MAINSTONE_AC97_IRQ ; +wm97xx_config_gpio (wm,WM97XX_GPIO_13 ,WM97XX_GPIO_IN , +WM97XX_GPIO_POL_HIGH , +WM97XX_GPIO_STICKY , +WM97XX_GPIO_WAKE ); +wm97xx_config_gpio (wm,WM97XX_GPIO_2 ,WM97XX_GPIO_OUT , +WM97XX_GPIO_POL_HIGH , +WM97XX_GPIO_NOTSTICKY , +WM97XX_GPIO_NOWAKE ); +break ; +default : +dev_err (wm->dev, +"pen down irq not supported on this device\n" ); + pen_int =0 ; +break ; + } + } + +return 0 ; +} + +static void wm97xx_acc_shutdown (struct wm97xx *wm) +{ +/* codec specific deconfig */ +if (pen_int) { +switch (wm->id &0xffff ) { +case WM9705_ID2 : + wm->pen_irq =0 ; +break ; +case WM9712_ID2 : +case WM9713_ID2 : +/* disable interrupt */ + wm->pen_irq =0 ; +break ; + } + } +} + +static void wm97xx_irq_enable (struct wm97xx *wm,int enable) +{ +if (enable) +enable_irq (wm->pen_irq); +else +disable_irq (wm->pen_irq); +} + +static struct wm97xx_mach_ops mainstone_mach_ops = { + .acc_enabled =1 , + .acc_pen_up = wm97xx_acc_pen_up, + .acc_pen_down = wm97xx_acc_pen_down, + .acc_startup = wm97xx_acc_startup, + .acc_shutdown = wm97xx_acc_shutdown, + .irq_enable = wm97xx_irq_enable, +}; + +static int mainstone_wm97xx_probe (struct platform_device *pdev) +{ +struct wm97xx *wm =platform_get_drvdata (pdev); +return wm97xx_register_mach_ops (wm, &mainstone_mach_ops); +} + +static int mainstone_wm97xx_remove (struct platform_device *pdev) +{ +struct wm97xx *wm =platform_get_drvdata (pdev); +wm97xx_unregister_mach_ops (wm); +return 0 ; +} + +static struct platform_driver mainstone_wm97xx_driver = { + .probe = mainstone_wm97xx_probe, + .remove = mainstone_wm97xx_remove, + .driver = { + .name ="wm97xx-touch" , + }, +}; + +static int __init mainstone_wm97xx_init (void ) +{ +return platform_driver_register (&mainstone_wm97xx_driver); +} + +static void __exit mainstone_wm97xx_exit(void) +{ +platform_driver_unregister (&mainstone_wm97xx_driver); +} + +module_init (mainstone_wm97xx_init); +module_exit (mainstone_wm97xx_exit); + +/* Module information */ +MODULE_AUTHOR ("Liam Girdwood <[email protected]>" ); +MODULE_DESCRIPTION ("wm97xx continuous touch driver for mainstone" ); +MODULE_LICENSE ("GPL" );
Signature · 1 line
1.5.2.5
PATCH 6/6 Build system and MAINTAINERS entry for WM97xx touchscreen drivers
--- MAINTAINERS | 10 +++++++ drivers/input/touchscreen/Kconfig | 52 ++++++++++++++++++++++++++++++++++++ drivers/input/touchscreen/Makefile | 7 +++++ 3 files changed, 69 insertions(+), 0 deletions(-)
MAINTAINERS +10 -0
@@ -4317,6 +4317,16 @@ L: [email protected] W: http://oops.ghostprotocols.net:81/blog S: Maintained +WM97XX TOUCHSCREEN DRIVERS +P: Mark Brown +M: [email protected] +P: Liam Girdwood +M: [email protected] +L: [email protected] +T: git git://opensource.wolfsonmicro.com/linux-2.6-touch +W: http://opensource.wolfsonmicro.com/node/7 +S: Supported + X.25 NETWORK LAYER P: Henner Eisen M: [email protected]
drivers/input/touchscreen/Kconfig +52 -0
58 lines not on this page · raw message
drivers/input/touchscreen/Makefile +7 -0
@@ -4,6 +4,8 @@ # Each configuration option enables a list of files. +wm97xx-ts-y := wm97xx-core.o + obj-$(CONFIG_TOUCHSCREEN_ADS7846) += ads7846.o obj-$(CONFIG_TOUCHSCREEN_BITSY) += h3600_ts_input.o obj-$(CONFIG_TOUCHSCREEN_CORGI) += corgi_ts.o
@@ -19,3 +21,8 @@ obj-$(CONFIG_TOUCHSCREEN_PENMOUNT) += penmount.o obj-$(CONFIG_TOUCHSCREEN_TOUCHRIGHT) += touchright.o obj-$(CONFIG_TOUCHSCREEN_TOUCHWIN) += touchwin.o obj-$(CONFIG_TOUCHSCREEN_UCB1400) += ucb1400_ts.o +obj-$(CONFIG_TOUCHSCREEN_WM97XX) += wm97xx-ts.o +obj-$(CONFIG_TOUCHSCREEN_WM97XX_MAINSTONE) += mainstone-wm97xx.o +wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9705) += wm9705.o +wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9712) += wm9712.o +wm97xx-ts-$(CONFIG_TOUCHSCREEN_WM9713) += wm9713.o
Signature · 1 line
1.5.2.5
PATCH 3/6 Add chip driver for WM9712 touchscreen
In reply to Mark Brown--- drivers/input/touchscreen/wm9712.c | 461 ++++++++++++++++++++++++++++++++++++ 1 files changed, 461 insertions(+), 0 deletions(-) create mode 100644 drivers/input/touchscreen/wm9712.c
drivers/input/touchscreen/wm9712.c new file +461 -0
@@ -0,0 +1,461 @@ +/* +* wm9712.c -- Codec driver for Wolfson WM9712 AC97 Codecs. +* +* Copyright 2003, 2004, 2005, 2006, 2007 Wolfson Microelectronics PLC. +* Author: Liam Girdwood +* [email protected] or [email protected] +* Parts Copyright : Ian Molton <[email protected]> +* Andrew Zabolotny <[email protected]> +* Russell King <[email protected]> +* +* This program is free software; you can redistribute it and/or modify it +* under the terms of the GNU General Public License as published by the +* Free Software Foundation; either version 2 of the License, or (at your +* option) any later version. +* +*/ + +#include <linux/module.h> +#include <linux/moduleparam.h> +#include <linux/version.h> +#include <linux/kernel.h> +#include <linux/input.h> +#include <linux/delay.h> +#include <linux/bitops.h> +#include <linux/wm97xx.h> + +#define TS_NAME "wm97xx" +#define WM9712_VERSION "0.61" +#define DEFAULT_PRESSURE 0xb0c0 + +/* +* Module parameters +*/ + +/* +* Set internal pull up for pen detect. +* +* Pull up is in the range 1.02k (least sensitive) to 64k (most sensitive) +* i.e. pull up resistance = 64k Ohms / rpu. +* +* Adjust this value if you are having problems with pen detect not +* detecting any down event. +*/ +static int rpu =8 ; +module_param (rpu, int,0 ); +MODULE_PARM_DESC (rpu,"Set internal pull up resitor for pen detect." ); + +/* +* Set current used for pressure measurement. +* +* Set pil = 2 to use 400uA +* pil = 1 to use 200uA and +* pil = 0 to disable pressure measurement. +* +* This is used to increase the range of values returned by the adc +* when measureing touchpanel pressure. +*/ +static int pil; +module_param (pil, int,0 ); +MODULE_PARM_DESC (pil,"Set current used for pressure measurement." ); + +/* +* Set threshold for pressure measurement. +* +* Pen down pressure below threshold is ignored. +*/ +static int pressure =DEFAULT_PRESSURE &0xfff ; +module_param (pressure, int,0 ); +MODULE_PARM_DESC (pressure,"Set threshold for pressure measurement." ); + +/* +* Set adc sample delay. +* +* For accurate touchpanel measurements, some settling time may be +* required between the switch matrix applying a voltage across the +* touchpanel plate and the ADC sampling the signal. +* +* This delay can be set by setting delay = n, where n is the array +* position of the delay in the array delay_table below. +* Long delays > 1ms are supported for completeness, but are not +* recommended. +*/ +static int delay =3 ; +module_param (delay, int,0 ); +MODULE_PARM_DESC (delay,"Set adc sample delay." ); + +/* +* Set five_wire = 1 to use a 5 wire touchscreen. +* +* NOTE: Five wire mode does not allow for readback of pressure. +*/ +static int five_wire; +module_param (five_wire, int,0 ); +MODULE_PARM_DESC (five_wire,"Set to '1' to use 5-wire touchscreen." ); + +/* +* Set adc mask function. +* +* Sources of glitch noise, such as signals driving an LCD display, may feed +* through to the touch screen plates and affect measurement accuracy. In +* order to minimise this, a signal may be applied to the MASK pin to delay or +* synchronise the sampling. +* +* 0 = No delay or sync +* 1 = High on pin stops conversions +* 2 = Edge triggered, edge on pin delays conversion by delay param (above) +* 3 = Edge triggered, edge on pin starts conversion after delay param +*/ +static int mask; +module_param (mask, int,0 ); +MODULE_PARM_DESC (mask,"Set adc mask function." ); + +/* +* Coordinate Polling Enable. +* +* Set to 1 to enable coordinate polling. e.g. x,y[,p] is sampled together +* for every poll. +*/ +static int coord; +module_param (coord, int,0 ); +MODULE_PARM_DESC (coord,"Polling coordinate mode" ); + +/* +* ADC sample delay times in uS +*/ +static const int delay_table[] = { +21 ,/* 1 AC97 Link frames */ +42 ,/* 2 */ +84 ,/* 4 */ +167 ,/* 8 */ +333 ,/* 16 */ +667 ,/* 32 */ +1000 ,/* 48 */ +1333 ,/* 64 */ +2000 ,/* 96 */ +2667 ,/* 128 */ +3333 ,/* 160 */ +4000 ,/* 192 */ +4667 ,/* 224 */ +5333 ,/* 256 */ +6000 ,/* 288 */ +0 /* No delay, switch matrix always on */ +}; + +/* +* Delay after issuing a POLL command. +* +* The delay is 3 AC97 link frames + the touchpanel settling delay +*/ +static inline void poll_delay (int d) +{ +udelay (3 *AC97_LINK_FRAME + delay_table[d]); +} + +/* +* set up the physical settings of the WM9712 +*/ +static void wm9712_phy_init (struct wm97xx *wm) +{ +u16 dig1 =0 ; +u16 dig2 =WM97XX_RPR |WM9712_RPU (1 ); + +/* WM9712 rpu */ +if (rpu) { + dig2 &=0xffc0 ; + dig2 |=WM9712_RPU (rpu); +dev_dbg (wm->dev,"setting pen detect pull-up to %d Ohms" , +64000 / rpu); + } + +/* touchpanel pressure current*/ +if (pil ==2 ) { + dig2 |=WM9712_PIL ; +dev_dbg (wm->dev, +"setting pressure measurement current to 400uA." ); + }else if (pil) +dev_dbg (wm->dev, +"setting pressure measurement current to 200uA." ); +if (!pil) + pressure =0 ; + +/* WM9712 five wire */ +if (five_wire) { + dig2 |=WM9712_45W ; +dev_dbg (wm->dev,"setting 5-wire touchscreen mode." ); + } + +/* polling mode sample settling delay */ +if (delay <0 || delay >15 ) { +dev_dbg (wm->dev,"supplied delay out of range." ); + delay =4 ; + } + dig1 &=0xff0f ; + dig1 |=WM97XX_DELAY (delay); +dev_dbg (wm->dev,"setting adc sample delay to %d u Secs." , + delay_table[delay]); + +/* mask */ + dig2 |= ((mask &0x3 ) <<6 ); +if (mask) { +u16 reg; +/* Set GPIO4 as Mask Pin*/ + reg =wm97xx_reg_read (wm,AC97_MISC_AFE ); +wm97xx_reg_write (wm,AC97_MISC_AFE , reg |WM97XX_GPIO_4 ); + reg =wm97xx_reg_read (wm,AC97_GPIO_CFG ); +wm97xx_reg_write (wm,AC97_GPIO_CFG , reg |WM97XX_GPIO_4 ); + } + +/* wait - coord mode */ +if (coord) + dig2 |=WM9712_WAIT ; + +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 , dig1); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 , dig2); +} + +static void wm9712_dig_enable (struct wm97xx *wm,int enable) +{ +u16 dig2 = wm->dig[2 ]; + +if (enable) { +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 , + dig2 |WM97XX_PRP_DET_DIG ); +wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD );/* dummy read */ + }else +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 , + dig2 & ~WM97XX_PRP_DET_DIG ); +} + +static void wm9712_aux_prepare (struct wm97xx *wm) +{ +memcpy (wm->dig_save, wm->dig,sizeof (wm->dig)); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 ,0 ); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 ,WM97XX_PRP_DET_DIG ); +} + +static void wm9712_dig_restore (struct wm97xx *wm) +{ +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 , wm->dig_save[1 ]); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 , wm->dig_save[2 ]); +} + +static inline int is_pden (struct wm97xx *wm) +{ +return wm->dig[2 ] &WM9712_PDEN ; +} + +/* +* Read a sample from the WM9712 adc in polling mode. +*/ +static int wm9712_poll_sample (struct wm97xx *wm,int adcsel,int *sample) +{ +int timeout =5 * delay; + +if (!wm->pen_probably_down) { +u16 data =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +if (!(data &WM97XX_PEN_DOWN )) +return RC_PENUP ; + wm->pen_probably_down =1 ; + } + +/* set up digitiser */ +if (adcsel &0x8000 ) + adcsel = ((adcsel &0x7fff ) +3 ) <<12 ; + +if (wm->mach_ops && wm->mach_ops->pre_sample) + wm->mach_ops->pre_sample (adcsel); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 , + adcsel |WM97XX_POLL |WM97XX_DELAY (delay)); + +/* wait 3 AC97 time slots + delay for conversion */ +poll_delay (delay); + +/* wait for POLL to go low */ +while ((wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER1 ) &WM97XX_POLL ) + && timeout) { +udelay (AC97_LINK_FRAME ); + timeout--; + } + +if (timeout <=0 ) { +/* If PDEN is set, we can get a timeout when pen goes up */ +if (is_pden (wm)) + wm->pen_probably_down =0 ; +else +dev_dbg (wm->dev,"adc sample timeout" ); +return RC_PENUP ; + } + + *sample =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +if (wm->mach_ops && wm->mach_ops->post_sample) + wm->mach_ops->post_sample (adcsel); + +/* check we have correct sample */ +if ((*sample &WM97XX_ADCSEL_MASK ) != adcsel) { +dev_dbg (wm->dev,"adc wrong sample, read %x got %x" , adcsel, + *sample &WM97XX_ADCSEL_MASK ); +return RC_PENUP ; + } + +if (!(*sample &WM97XX_PEN_DOWN )) { + wm->pen_probably_down =0 ; +return RC_PENUP ; + } + +return RC_VALID ; +} + +/* +* Read a coord from the WM9712 adc in polling mode. +*/ +static int wm9712_poll_coord (struct wm97xx *wm,struct wm97xx_data *data) +{ +int timeout =5 * delay; + +if (!wm->pen_probably_down) { +u16 data_rd =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +if (!(data_rd &WM97XX_PEN_DOWN )) +return RC_PENUP ; + wm->pen_probably_down =1 ; + } + +/* set up digitiser */ +if (wm->mach_ops && wm->mach_ops->pre_sample) + wm->mach_ops->pre_sample (WM97XX_ADCSEL_X |WM97XX_ADCSEL_Y ); + +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 , +WM97XX_COO |WM97XX_POLL |WM97XX_DELAY (delay)); + +/* wait 3 AC97 time slots + delay for conversion and read x */ +poll_delay (delay); + data->x =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +/* wait for POLL to go low */ +while ((wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER1 ) &WM97XX_POLL ) + && timeout) { +udelay (AC97_LINK_FRAME ); + timeout--; + } + +if (timeout <=0 ) { +/* If PDEN is set, we can get a timeout when pen goes up */ +if (is_pden (wm)) + wm->pen_probably_down =0 ; +else +dev_dbg (wm->dev,"adc sample timeout" ); +return RC_PENUP ; + } + +/* read back y data */ + data->y =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +if (pil) + data->p =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +else + data->p =DEFAULT_PRESSURE ; + +if (wm->mach_ops && wm->mach_ops->post_sample) + wm->mach_ops->post_sample (WM97XX_ADCSEL_X |WM97XX_ADCSEL_Y ); + +/* check we have correct sample */ +if (!(data->x &WM97XX_ADCSEL_X ) || !(data->y &WM97XX_ADCSEL_Y )) + goto err; +if (pil && !(data->p &WM97XX_ADCSEL_PRES )) + goto err; + +if (!(data->x &WM97XX_PEN_DOWN )) { + wm->pen_probably_down =0 ; +return RC_PENUP ; + } +return RC_VALID ; +err: +return RC_PENUP ; +} + +/* +* Sample the WM9712 touchscreen in polling mode +*/ +static int wm9712_poll_touch (struct wm97xx *wm,struct wm97xx_data *data) +{ +int rc; + +if (coord) { + rc =wm9712_poll_coord (wm, data); +if (rc !=RC_VALID ) +return rc; + }else { + rc =wm9712_poll_sample (wm,WM97XX_ADCSEL_X , &data->x); +if (rc !=RC_VALID ) +return rc; + + rc =wm9712_poll_sample (wm,WM97XX_ADCSEL_Y , &data->y); +if (rc !=RC_VALID ) +return rc; + +if (pil && !five_wire) { + rc =wm9712_poll_sample (wm,WM97XX_ADCSEL_PRES , + &data->p); +if (rc !=RC_VALID ) +return rc; + }else + data->p =DEFAULT_PRESSURE ; + } +return RC_VALID ; +} + +/* +* Enable WM9712 continuous mode, i.e. touch data is streamed across +* an AC97 slot +*/ +static int wm9712_acc_enable (struct wm97xx *wm,int enable) +{ +u16 dig1, dig2; +int ret =0 ; + + dig1 = wm->dig[1 ]; + dig2 = wm->dig[2 ]; + +if (enable) { +/* continous mode */ +if (wm->mach_ops->acc_startup) { + ret = wm->mach_ops->acc_startup (wm); +if (ret <0 ) +return ret; + } + dig1 &= ~(WM97XX_CM_RATE_MASK |WM97XX_ADCSEL_MASK | +WM97XX_DELAY_MASK |WM97XX_SLT_MASK ); + dig1 |=WM97XX_CTC |WM97XX_COO |WM97XX_SLEN | +WM97XX_DELAY (delay) | +WM97XX_SLT (wm->acc_slot) | +WM97XX_RATE (wm->acc_rate); +if (pil) + dig1 |=WM97XX_ADCSEL_PRES ; + dig2 |=WM9712_PDEN ; + }else { + dig1 &= ~(WM97XX_CTC |WM97XX_COO |WM97XX_SLEN ); + dig2 &= ~WM9712_PDEN ; +if (wm->mach_ops->acc_shutdown) + wm->mach_ops->acc_shutdown (wm); + } + +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 , dig1); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER2 , dig2); +return 0 ; +} + +struct wm97xx_codec_drv wm9712_codec = { + .id =WM9712_ID2 , + .name ="wm9712" , + .poll_sample = wm9712_poll_sample, + .poll_touch = wm9712_poll_touch, + .acc_enable = wm9712_acc_enable, + .phy_init = wm9712_phy_init, + .dig_enable = wm9712_dig_enable, + .dig_restore = wm9712_dig_restore, + .aux_prepare = wm9712_aux_prepare, +}; +EXPORT_SYMBOL_GPL (wm9712_codec); + +/* Module information */ +MODULE_AUTHOR ("Liam Girdwood <[email protected]>" ); +MODULE_DESCRIPTION ("WM9712 Touch Screen Driver" ); +MODULE_LICENSE ("GPL" );
Signature · 1 line
1.5.2.5
Re: [PATCH 2/6] Add chip driver for WM9705 touchscreen
In reply to Mark BrownQuoted 42 lines · On Tue, 26 Feb 2008 13:40:14 +0000 Mark Brown…
drivers/input/touchscreen/wm9705.c new file +42
-0+/* +* Set current used for pressure measurement. +* +* Set pil = 2 to use 400uA +* pil = 1 to use 200uA and +* pil = 0 to disable pressure measurement. +* +* This is used to increase the range of values returned by the adc +* when measureing touchpanel pressure. +*/ +static int pil; +module_param (pil, int,0 ); +MODULE_PARM_DESC (pil,"Set current used for pressure measurement." ); + +/* +* Set threshold for pressure measurement. +* +* Pen down pressure below threshold is ignored. +*/ +static int pressure =DEFAULT_PRESSURE &0xfff ; +module_param (pressure, int,0 ); +MODULE_PARM_DESC (pressure,"Set threshold for pressure measurement." ); + +/* +* Set adc sample delay. +* +* For accurate touchpanel measurements, some settling time may be +* required between the switch matrix applying a voltage across the +* touchpanel plate and the ADC sampling the signal. +* +* This delay can be set by setting delay = n, where n is the array +* position of the delay in the array delay_table below. +* Long delays > 1ms are supported for completeness, but are not +* recommended. +*/ +static int delay =4 ; +module_param (delay, int,0 ); +MODULE_PARM_DESC (delay,"Set adc sample delay." ); + +/* +* Pen detect comparator threshold. +*
drivers/input/touchscreen/wm9705.c line 86
Quoted 10 lines
drivers/input/touchscreen/wm9705.c new file +10
-0+* 0 to Vmid in 15 steps, 0 = use zero power comparator with Vmid threshold +* i.e. 1 = Vmid/15 threshold +* 15 = Vmid/1 threshold +* +* Adjust this value if you are having problems with pen detect not +* detecting any down events. +*/ +static int pdd =8 ; +module_param (pdd, int,0 ); +MODULE_PARM_DESC (pdd,"Set pen detect comparator threshold" );
I guess that's all the documentation we get ;) It won't kill us - we've done worse..
It would be rather nice if the kerneldoc system could extract the above comments and put them in a module-parameters-documentation section, but I don't think it can do that.
Quoted 26 lines
...
drivers/input/touchscreen/wm9705.c new file +24
-0+/* +* Read a sample from the WM9705 adc in polling mode. +*/ +static int wm9705_poll_sample (struct wm97xx *wm,int adcsel,int *sample) +{ +int timeout =5 * delay; + +if (!wm->pen_probably_down) { +u16 data =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +if (!(data &WM97XX_PEN_DOWN )) +return RC_PENUP ; + wm->pen_probably_down =1 ; + } + +/* set up digitiser */ +if (adcsel &0x8000 ) + adcsel = ((adcsel &0x7fff ) +3 ) <<12 ; + +if (wm->mach_ops && wm->mach_ops->pre_sample) + wm->mach_ops->pre_sample (adcsel); +wm97xx_reg_write (wm,AC97_WM97XX_DIGITISER1 , + adcsel |WM97XX_POLL |WM97XX_DELAY (delay)); + +/* wait 3 AC97 time slots + delay for conversion */
drivers/input/touchscreen/wm9705.c line 247
Quoted 10 lines
drivers/input/touchscreen/wm9705.c new file +10
-0+poll_delay (delay); + +/* wait for POLL to go low */ +while ((wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER1 ) &WM97XX_POLL ) + && timeout) { +udelay (AC97_LINK_FRAME ); + timeout--; + } + +if (timeout <=0 ) {
timeout cannot be negative here.
Quoted 27 lines
drivers/input/touchscreen/wm9705.c new file +27
-0+/* If PDEN is set, we can get a timeout when pen goes up */ +if (is_pden (wm)) + wm->pen_probably_down =0 ; +else +dev_dbg (wm->dev,"adc sample timeout" ); +return RC_PENUP ; + } + + *sample =wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ); +if (wm->mach_ops && wm->mach_ops->post_sample) + wm->mach_ops->post_sample (adcsel); + +/* check we have correct sample */ +if ((*sample &WM97XX_ADCSEL_MASK ) != adcsel) { +dev_dbg (wm->dev,"adc wrong sample, read %x got %x" , adcsel, + *sample &WM97XX_ADCSEL_MASK ); +return RC_PENUP ; + } + +if (!(*sample &WM97XX_PEN_DOWN )) { + wm->pen_probably_down =0 ; +return RC_PENUP ; + } + +return RC_VALID ; +} +
Re: [PATCH 5/6] Driver for WM97xx touchscreens in streaming mode on Mainstone
In reply to Mark BrownQuoted 12 lines · On Tue, 26 Feb 2008 13:40:17 +0000 Mark Brown…
drivers/input/touchscreen/mainstone-wm97xx.c new file +12
-0+#ifdef CONFIG_PXA27x +static void wm97xx_acc_pen_up (struct wm97xx *wm) +{ +set_current_state (TASK_INTERRUPTIBLE ); +schedule_timeout (1 ); + +while (MISR & (1 <<2 )) +MODR ; +} +#else +static void wm97xx_acc_pen_up (struct wm97xx *wm) +{
drivers/input/touchscreen/mainstone-wm97xx.c line 126
Quoted 10 lines
drivers/input/touchscreen/mainstone-wm97xx.c new file +10
-0+int count =16 ; +set_current_state (TASK_INTERRUPTIBLE ); +schedule_timeout (1 ); + +while (count <16 ) { +MODR ; + count--; + } +} +#endif
Can use schedule_timeout_interruptible() here.
If the calling process happens to have a signal pending then the schedule_timeout() becomes a no-op. Will the driver still function correctly?
drivers/input/touchscreen/mainstone-wm97xx.c line 135
Quoted 8 lines
drivers/input/touchscreen/mainstone-wm97xx.c new file +8
-0+static int wm97xx_acc_pen_down (struct wm97xx *wm) +{ +u16 x, y, p =0x100 |WM97XX_ADCSEL_PRES ; +int reads =0 ; + +/* data is never immediately available after pen down irq */ +set_current_state (TASK_INTERRUPTIBLE ); +schedule_timeout (1 );
dittoes.
Quoted 36 lines
drivers/input/touchscreen/mainstone-wm97xx.c new file +36
-0+if (tries >5 ) { + tries =0 ; +return RC_PENUP ; + } + + x =MODR ; +if (x == last) { + tries++; +return RC_AGAIN ; + } + last = x; +do { +if (reads) + x =MODR ; + y =MODR ; +if (pressure) + p =MODR ; + +/* are samples valid */ +if ((x &0x7000 ) !=WM97XX_ADCSEL_X || + (y &0x7000 ) !=WM97XX_ADCSEL_Y || + (p &0x7000 ) !=WM97XX_ADCSEL_PRES ) + goto up; + +/* coordinate is good */ + tries =0 ; +input_report_abs (wm->input_dev,ABS_X , x &0xfff ); +input_report_abs (wm->input_dev,ABS_Y , y &0xfff ); +input_report_abs (wm->input_dev,ABS_PRESSURE , p &0xfff ); +input_sync (wm->input_dev); + reads++; + }while (reads < cinfo[sp_idx].reads); +up: +return RC_PENDOWN |RC_AGAIN ; +} +
Quoted 11 lines · On Tue, 26 Feb 2008 13:40:13 +0000 Mark Brown…
This patch series adds support for the touchscreen controllers provided by Wolfson Microelectronics WM97xx series chips in both polled and streaming modes.
These drivers have been maintained out of tree since 2003. During that time the driver the primary maintainer was Liam Girdwood and a number of people have made contributions including Dmitry Baryshkov, Stanley Cai, Rodolfo Giometti, Russell King, Marc Kleine-Budde, Ian Molton, Vincent Sanders, Andrew Zabolotny, Graeme Gregory, Mike Arthur and myself. Apologies to anyone I have omitted.
Nice looking drivers.
Quoted 32 lines
...
drivers/input/touchscreen/wm97xx-core.c new file +30
-0+/* +* Handle a pen down interrupt. +*/ +static void wm97xx_pen_irq_worker (struct work_struct *work) +{ + struct wm97xx *wm = container_of(work, struct wm97xx, pen_event_work); + +/* do we need to enable the touch panel reader */ +if (wm->id ==WM9705_ID2 ) { +if (wm97xx_reg_read (wm,AC97_WM97XX_DIGITISER_RD ) & +WM97XX_PEN_DOWN ) + wm->pen_is_down =1 ; +else + wm->pen_is_down =0 ; + }else { +u16 status, pol; +mutex_lock (&wm->codec_mutex); + status =wm97xx_reg_read (wm,AC97_GPIO_STATUS ); + pol =wm97xx_reg_read (wm,AC97_GPIO_POLARITY ); + +if (WM97XX_GPIO_13 & pol & status) { + wm->pen_is_down =1 ; +wm97xx_reg_write (wm,AC97_GPIO_POLARITY , pol & + ~WM97XX_GPIO_13 ); + }else { + wm->pen_is_down =0 ; +wm97xx_reg_write (wm,AC97_GPIO_POLARITY , pol | +WM97XX_GPIO_13 ); + } +
drivers/input/touchscreen/wm97xx-core.c line 303
Quoted 10 lines
drivers/input/touchscreen/wm97xx-core.c new file +10
-0+if (wm->id ==WM9712_ID2 ) +wm97xx_reg_write (wm,AC97_GPIO_STATUS , (status & + ~WM97XX_GPIO_13 ) <<1 ); +else +wm97xx_reg_write (wm,AC97_GPIO_STATUS , status & + ~WM97XX_GPIO_13 ); +mutex_unlock (&wm->codec_mutex); + } + +queue_delayed_work (wm->ts_workq, &wm->ts_reader,0 );
This is equvaltnet to queue_work().
Why queue the work instead of just callng it synchronously right here?
Quoted 9 lines
drivers/input/touchscreen/wm97xx-core.c new file +9
-0+if (!wm->pen_is_down && wm->mach_ops && wm->mach_ops->acc_enabled) + wm->mach_ops->acc_pen_up (wm); + wm->mach_ops->irq_enable (wm,1 ); +} + +/* +* Codec PENDOWN irq handler +* +* We have to disable the codec interrupt in the handler because it can
drivers/input/touchscreen/wm97xx-core.c line 323
Quoted 10 lines
drivers/input/touchscreen/wm97xx-core.c new file +10
-0+* take upto 1ms to clear the interrupt source. The interrupt is then enabled +* again in the slow handler when the source has been cleared. +*/ +static irqreturn_t wm97xx_pen_interrupt (int irq,void *dev_id) +{ +struct wm97xx *wm = dev_id; + wm->mach_ops->irq_enable (wm,0 ); +queue_work (wm->ts_workq, &wm->pen_event_work); +return IRQ_HANDLED ; +}
We can lose events, can't we? We only have one work to queue, and if it is already queued, the queue_work() here is a no-op.
otoh there's no payload so there's actually no data to lose.
Still, this stands out a bit and perhaps a comment which describes the overall interrupt handling design would help here.
Quoted 94 lines
drivers/input/touchscreen/wm97xx-core.c new file +94
-0+/* +* initialise pen IRQ handler and workqueue +*/ +static int wm97xx_init_pen_irq (struct wm97xx *wm) +{ +u16 reg; + +/* If an interrupt is supplied an IRQ enable operation must also be +* provided. */ +BUG_ON (!wm->mach_ops->irq_enable); + +INIT_WORK (&wm->pen_event_work, wm97xx_pen_irq_worker); + +if (request_irq (wm->pen_irq, wm97xx_pen_interrupt,IRQF_SHARED , +"wm97xx-pen" , wm)) { +dev_err (wm->dev, +"Failed to register pen down interrupt, polling" ); + wm->pen_irq =0 ; +return -EINVAL ; + } + +/* enable PEN down on wm9712/13 */ +if (wm->id !=WM9705_ID2 ) { + reg =wm97xx_reg_read (wm,AC97_MISC_AFE ); +wm97xx_reg_write (wm,AC97_MISC_AFE , reg &0xfffb ); + reg =wm97xx_reg_read (wm,0x5a ); +wm97xx_reg_write (wm,0x5a , reg & ~0x0001 ); + } + +return 0 ; +} + +static int wm97xx_read_samples (struct wm97xx *wm) +{ +struct wm97xx_data data; +int rc; + +mutex_lock (&wm->codec_mutex); + +if (wm->mach_ops && wm->mach_ops->acc_enabled) + rc = wm->mach_ops->acc_pen_down (wm); +else + rc = wm->codec->poll_touch (wm, &data); + +if (rc &RC_PENUP ) { +if (wm->pen_is_down) { + wm->pen_is_down =0 ; +dev_dbg (wm->dev,"pen up\n" ); +input_report_abs (wm->input_dev,ABS_PRESSURE ,0 ); +input_sync (wm->input_dev); + }else if (!(rc &RC_AGAIN )) { +/* We need high frequency updates only while +* pen is down, the user never will be able to +* touch screen faster than a few times per +* second... On the other hand, when the user +* is actively working with the touchscreen we +* don't want to lose the quick response. So we +* will slowly increase sleep time after the +* pen is up and quicky restore it to ~one task +* switch when pen is down again. +*/ +if (wm->ts_reader_interval <HZ /10 ) + wm->ts_reader_interval++; + } + + }else if (rc &RC_VALID ) { +dev_dbg (wm->dev, +"pen down: x=%x:%d, y=%x:%d, pressure=%x:%d\n" , + data.x >>12 , data.x &0xfff , data.y >>12 , + data.y &0xfff , data.p >>12 , data.p &0xfff ); +input_report_abs (wm->input_dev,ABS_X , data.x &0xfff ); +input_report_abs (wm->input_dev,ABS_Y , data.y &0xfff ); +input_report_abs (wm->input_dev,ABS_PRESSURE , data.p &0xfff ); +input_sync (wm->input_dev); + wm->pen_is_down =1 ; + wm->ts_reader_interval = wm->ts_reader_min_interval; + }else if (rc &RC_PENDOWN ) { +dev_dbg (wm->dev,"pen down\n" ); + wm->pen_is_down =1 ; + wm->ts_reader_interval = wm->ts_reader_min_interval; + } + +mutex_unlock (&wm->codec_mutex); +return rc; +} + +/* +* The touchscreen sample reader. +*/ +static void wm97xx_ts_reader (struct work_struct *work) +{ +int rc; + struct wm97xx *wm = container_of(work, struct wm97xx, ts_reader.work); +
drivers/input/touchscreen/wm97xx-core.c line 428
Quoted 10 lines
drivers/input/touchscreen/wm97xx-core.c new file +10
-0+BUG_ON (!wm->codec); + +do { + rc =wm97xx_read_samples (wm); + }while (rc &RC_AGAIN ); + +if (wm->pen_is_down || !wm->pen_irq) +queue_delayed_work (wm->ts_workq, &wm->ts_reader, + wm->ts_reader_interval); +}
again, if this work is already scheduled, your queue_delayed_work() here is a no-op. Will things all work correctly?
Quoted 6 lines
+/**
+ *wm97xx_ts_input_open- Open the touch screen input device.
+ * @idev: Input device to be opened.
+ *
+ * Called by the input sub system to open a wm97xx touchscreen device.
+ * Starts the touchscreen thread and touch digitiser.
A bit of whitecpace inconsistency there.
I don't understand why people use tabs to indent kerneldoc - all it does is waste the space where you want to put text. Shrug.
Quoted 29 lines
+ */
drivers/input/touchscreen/wm97xx-core.c new file +28
-0+static int wm97xx_ts_input_open (struct input_dev *idev) +{ +struct wm97xx *wm =input_get_drvdata (idev); + + wm->ts_workq =create_singlethread_workqueue ("kwm97xx" ); +if (wm->ts_workq ==NULL ) { +dev_err (wm->dev, +"Failed to create workqueue\n" ); +return -EINVAL ; + } + +/* start digitiser */ +if (wm->mach_ops && wm->mach_ops->acc_enabled) + wm->codec->acc_enable (wm,1 ); + wm->codec->dig_enable (wm,1 ); + +INIT_DELAYED_WORK (&wm->ts_reader, wm97xx_ts_reader); + + wm->ts_reader_min_interval =HZ >=100 ?HZ /100 :1 ; +if (wm->ts_reader_min_interval <1 ) + wm->ts_reader_min_interval =1 ; + wm->ts_reader_interval = wm->ts_reader_min_interval; + + wm->pen_is_down =0 ; +if (wm->pen_irq) +wm97xx_init_pen_irq (wm); +else +dev_err (wm->dev,"No IRQ specified\n" );
drivers/input/touchscreen/wm97xx-core.c line 474
Quoted 10 lines
drivers/input/touchscreen/wm97xx-core.c new file +10
-0+ +/* If we either don't have an interrupt for pen down events or +* failed to acquire it then we need to poll. +*/ +if (wm->pen_irq ==0 ) +queue_delayed_work (wm->ts_workq, &wm->ts_reader, + wm->ts_reader_interval); + +return 0 ; +}
So... this driver continuously polls the hardware at 100HZ? If so, powertop users will come after you with pitchforks.
Quoted 61 lines
drivers/input/touchscreen/wm97xx-core.c new file +61
-0+/** +* wm97xx_ts_input_close - Close the touch screen input device. +* @idev: Input device to be closed. +* +* Called by the input sub system to close a wm97xx touchscreen device. +* Kills the touchscreen thread and stops the touch digitiser. +*/ + +static void wm97xx_ts_input_close (struct input_dev *idev) +{ +struct wm97xx *wm =input_get_drvdata (idev); + +if (wm->pen_irq) +free_irq (wm->pen_irq, wm); + + wm->pen_is_down =0 ; + +/* ts_reader rearms itself so we need to explicitly stop it +* before we destroy the workqueue. +*/ +cancel_delayed_work_sync (&wm->ts_reader); +destroy_workqueue (wm->ts_workq); + +/* stop digitiser */ + wm->codec->dig_enable (wm,0 ); +if (wm->mach_ops && wm->mach_ops->acc_enabled) + wm->codec->acc_enable (wm,0 ); +} + +static int wm97xx_probe (struct device *dev) +{ +struct wm97xx *wm; +int ret =0 , id =0 ; + + wm =kzalloc (sizeof (struct wm97xx ),GFP_KERNEL ); +if (!wm) +return -ENOMEM ; +mutex_init (&wm->codec_mutex); + + wm->dev = dev; + dev->driver_data = wm; + wm->ac97 =to_ac97_t (dev); + +/* check that we have a supported codec */ + id =wm97xx_reg_read (wm,AC97_VENDOR_ID1 ); +if (id !=WM97XX_ID1 ) { +dev_err (dev,"Device with vendor %04x is not a wm97xx\n" , id); + ret = -ENODEV ; + goto alloc_err; + } + + wm->id =wm97xx_reg_read (wm,AC97_VENDOR_ID2 ); + +dev_info (wm->dev,"detected a wm97%02x codec\n" , wm->id &0xff ); + +switch (wm->id &0xff ) { +#ifdef CONFIG_TOUCHSCREEN_WM9705 +case 0x05 : + wm->codec = &wm9705_codec; +break ; +#endif
drivers/input/touchscreen/wm97xx-core.c line 546
Quoted 10 lines
drivers/input/touchscreen/wm97xx-core.c new file +10
-0+#ifdef CONFIG_TOUCHSCREEN_WM9712 +case 0x12 : + wm->codec = &wm9712_codec; +break ; +#endif +#ifdef CONFIG_TOUCHSCREEN_WM9713 +case 0x13 : + wm->codec = &wm9713_codec; +break ; +#endif
That's a wee bit combersome. Really a "core" should not know about its specific clients. A better and more typical design would have the clients registering themselves with the core via some registration interface.
Quoted 5 lines
drivers/input/touchscreen/wm97xx-core.c new file +5
-0+default : +dev_err (wm->dev,"Support for wm97%02x not compiled in.\n" , + wm->id &0xff ); + ret = -ENODEV ; + goto alloc_err;
drivers/input/touchscreen/wm97xx-core.c line 561
Quoted 10 lines
drivers/input/touchscreen/wm97xx-core.c new file +10
-0+ } + + wm->input_dev =input_allocate_device (); +if (wm->input_dev ==NULL ) { + ret = -ENOMEM ; + goto alloc_err; + } + +/* set up touch configuration */ + wm->input_dev->name ="wm97xx touchscreen" ;
spaces in names are OK here? They can make proc files basically unparseable.
Quoted 63 lines
drivers/input/touchscreen/wm97xx-core.c new file +63
-0+ wm->input_dev->open = wm97xx_ts_input_open; + wm->input_dev->close = wm97xx_ts_input_close; +set_bit (EV_ABS , wm->input_dev->evbit); +set_bit (ABS_X , wm->input_dev->absbit); +set_bit (ABS_Y , wm->input_dev->absbit); +set_bit (ABS_PRESSURE , wm->input_dev->absbit); +input_set_abs_params (wm->input_dev,ABS_X , abs_x[0 ], abs_x[1 ], + abs_x[2 ],0 ); +input_set_abs_params (wm->input_dev,ABS_Y , abs_y[0 ], abs_y[1 ], + abs_y[2 ],0 ); +input_set_abs_params (wm->input_dev,ABS_PRESSURE , abs_p[0 ], abs_p[1 ], + abs_p[2 ],0 ); +input_set_drvdata (wm->input_dev, wm); + wm->input_dev->dev.parent = dev; + ret =input_register_device (wm->input_dev); +if (ret <0 ) + goto dev_alloc_err; + +/* set up physical characteristics */ + wm->codec->phy_init (wm); + +/* load gpio cache */ + wm->gpio[0 ] =wm97xx_reg_read (wm,AC97_GPIO_CFG ); + wm->gpio[1 ] =wm97xx_reg_read (wm,AC97_GPIO_POLARITY ); + wm->gpio[2 ] =wm97xx_reg_read (wm,AC97_GPIO_STICKY ); + wm->gpio[3 ] =wm97xx_reg_read (wm,AC97_GPIO_WAKEUP ); + wm->gpio[4 ] =wm97xx_reg_read (wm,AC97_GPIO_STATUS ); + wm->gpio[5 ] =wm97xx_reg_read (wm,AC97_MISC_AFE ); + +/* register our battery device */ + wm->battery_dev =platform_device_alloc ("wm97xx-battery" ,-1 ); +if (!wm->battery_dev) { + ret = -ENOMEM ; + goto batt_err; + } +platform_set_drvdata (wm->battery_dev, wm); + wm->battery_dev->dev.parent = dev; + ret =platform_device_add (wm->battery_dev); +if (ret <0 ) + goto batt_reg_err; + +/* register our extended touch device (for machine specific +* extensions) */ + wm->touch_dev =platform_device_alloc ("wm97xx-touch" ,-1 ); +if (!wm->touch_dev) { + ret = -ENOMEM ; + goto touch_err; + } +platform_set_drvdata (wm->touch_dev, wm); + wm->touch_dev->dev.parent = dev; + ret =platform_device_add (wm->touch_dev); +if (ret <0 ) + goto touch_reg_err; + +return ret; + + touch_reg_err: +platform_device_put (wm->touch_dev); + touch_err: +platform_device_unregister (wm->battery_dev); + wm->battery_dev =NULL ; + batt_reg_err: +platform_device_put (wm->battery_dev);
drivers/input/touchscreen/wm97xx-core.c line 634
Quoted 10 lines
drivers/input/touchscreen/wm97xx-core.c new file +10
-0+ batt_err: +input_unregister_device (wm->input_dev); + wm->input_dev =NULL ; + dev_alloc_err: +input_free_device (wm->input_dev); + alloc_err: +kfree (wm); + +return ret; +}
The kernel->userspace interface looks fairly complex. Is it documented anywhere?
Quoted 34 lines
drivers/input/touchscreen/wm97xx-core.c new file +34
-0+static int wm97xx_remove (struct device *dev) +{ +struct wm97xx *wm =dev_get_drvdata (dev); + +platform_device_unregister (wm->battery_dev); +platform_device_unregister (wm->touch_dev); +input_unregister_device (wm->input_dev); + +kfree (wm); +return 0 ; +} + +#ifdef CONFIG_PM +static int wm97xx_resume (struct device *dev) +{ +struct wm97xx *wm =dev_get_drvdata (dev); + +/* restore digitiser and gpios */ +if (wm->id ==WM9713_ID2 ) { +wm97xx_reg_write (wm,AC97_WM9713_DIG1 , wm->dig[0 ]); +wm97xx_reg_write (wm,0x5a , wm->misc); +if (wm->input_dev->users) { +u16 reg; + reg =wm97xx_reg_read (wm,AC97_EXTENDED_MID ) &0x7fff ; +wm97xx_reg_write (wm,AC97_EXTENDED_MID , reg); + } + } + +wm97xx_reg_write (wm,AC97_WM9713_DIG2 , wm->dig[1 ]); +wm97xx_reg_write (wm,AC97_WM9713_DIG3 , wm->dig[2 ]); + +wm97xx_reg_write (wm,AC97_GPIO_CFG , wm->gpio[0 ]); +wm97xx_reg_write (wm,AC97_GPIO_POLARITY , wm->gpio[1 ]); +wm97xx_reg_write (wm,AC97_GPIO_STICKY , wm->gpio[2 ]);
drivers/input/touchscreen/wm97xx-core.c line 679
Quoted 10 lines
drivers/input/touchscreen/wm97xx-core.c new file +10
-0+wm97xx_reg_write (wm,AC97_GPIO_WAKEUP , wm->gpio[3 ]); +wm97xx_reg_write (wm,AC97_GPIO_STATUS , wm->gpio[4 ]); +wm97xx_reg_write (wm,AC97_MISC_AFE , wm->gpio[5 ]); + + return 0; +} + +#else +#define wm97xx_resume NULL +#endif
It's strange to see a .resume but no .suspend.
Quoted 67 lines
drivers/input/touchscreen/wm97xx-core.c new file +51
-0+/* +* Machine specific operations +*/ +int wm97xx_register_mach_ops (struct wm97xx *wm, +struct wm97xx_mach_ops *mach_ops) +{ +mutex_lock (&wm->codec_mutex); +if (wm->mach_ops) { +mutex_unlock (&wm->codec_mutex); +return -EINVAL ; + } + wm->mach_ops = mach_ops; +mutex_unlock (&wm->codec_mutex); +return 0 ; +} +EXPORT_SYMBOL_GPL (wm97xx_register_mach_ops); + +void wm97xx_unregister_mach_ops (struct wm97xx *wm) +{ +mutex_lock (&wm->codec_mutex); + wm->mach_ops =NULL ; +mutex_unlock (&wm->codec_mutex); +} +EXPORT_SYMBOL_GPL (wm97xx_unregister_mach_ops); + +static struct device_driver wm97xx_driver = { + .name ="ac97" , + .bus = &ac97_bus_type, + .owner =THIS_MODULE , + .probe = wm97xx_probe, + .remove = wm97xx_remove, + .resume = wm97xx_resume, +}; + +static int __init wm97xx_init (void ) +{ +return driver_register (&wm97xx_driver); +} + +static void __exit wm97xx_exit(void) +{ +driver_unregister (&wm97xx_driver); +} + +module_init (wm97xx_init); +module_exit (wm97xx_exit); + +/* Module information */ +MODULE_AUTHOR ("Liam Girdwood <[email protected]>" ); +MODULE_DESCRIPTION ("WM97xx Core - Touch Screen / AUX ADC / GPIO Driver" ); +MODULE_LICENSE ("GPL" );include/linux/wm97xx.h new file +10
-0@@ -0,0 +1,308 @@ + +/* +* Register bits and API for Wolfson WM97xx series of codecs +*/ + +#ifndef _LINUX_WM97XX_H +#define _LINUX_WM97XX_H + +#include <sound/core.h> +#include <sound/pcm.h>
include/linux/wm97xx.h line 20
Quoted 10 lines
include/linux/wm97xx.h new file +10
-0+#include <sound/ac97_codec.h> +#include <sound/initval.h> +#include <linux/types.h> +#include <linux/list.h> +#include <linux/input.h> /* Input device layer */ +#include <linux/platform_device.h> + +/* +* WM97xx AC97 Touchscreen registers +*/
ac97 stuff? But I saw no appropriate dependencies for this in the Kconfig patch?
Quoted 29 lines
include/linux/wm97xx.h new file +29
-0+/* +* Codec GPIO status +*/ +enum wm97xx_gpio_status { +WM97XX_GPIO_HIGH , +WM97XX_GPIO_LOW +}; + +/* +* Codec GPIO direction +*/ +enum wm97xx_gpio_dir { +WM97XX_GPIO_IN , +WM97XX_GPIO_OUT +}; + +/* +* Codec GPIO polarity +*/ +enum wm97xx_gpio_pol { +WM97XX_GPIO_POL_HIGH , +WM97XX_GPIO_POL_LOW +}; + +/* +* Codec GPIO sticky +*/ +enum wm97xx_gpio_sticky { +WM97XX_GPIO_STICKY ,
include/linux/wm97xx.h line 204
Quoted 10 lines
include/linux/wm97xx.h new file +10
-0+ WM97XX_GPIO_NOTSTICKY +}; + +/* +* Codec GPIO wake +*/ +enum wm97xx_gpio_wake { +WM97XX_GPIO_WAKE , +WM97XX_GPIO_NOWAKE +};
Are these gpio's really gp? If so, should this driver be using the drivers/gpio/ infrastructure?
Re: [PATCH 3/6] Add chip driver for WM9712 touchscreen
In reply to Mark BrownQuoted 5 lines · On Tue, 26 Feb 2008 13:40:15 +0000 Mark Brown…
drivers/input/touchscreen/wm9712.c new file +5
-0+/* +* Set adc sample delay. +* +* For accurate touchpanel measurements, some settling time may be +* required between the switch matrix applying a voltage across the
drivers/input/touchscreen/wm9712.c line 85
Quoted 10 lines
drivers/input/touchscreen/wm9712.c new file +10
-0+* touchpanel plate and the ADC sampling the signal. +* +* This delay can be set by setting delay = n, where n is the array +* position of the delay in the array delay_table below. +* Long delays > 1ms are supported for completeness, but are not +* recommended. +*/ +static int delay =3 ; +module_param (delay, int,0 ); +MODULE_PARM_DESC (delay,"Set adc sample delay." );
I assume we don't support more than one attached device per host?
If so, is that a problem? One could envisage an application with lots of screens attached to one Linux box.
Re: [PATCH 2/6] Add chip driver for WM9705 touchscreen
In reply to Andrew MortonQuoted 13 lines · Andrew Morton
drivers/input/touchscreen/wm9705.c line 86
Quoted 7 lines · On Tue, 26 Feb 2008 13:40:14 +0000 Mark Brown…
+ *
+ * Adjust this value if you are having problems with pen detect not
+ * detecting any down events.
+ */drivers/input/touchscreen/wm9705.c new file +3
-0+static int pdd =8 ; +module_param (pdd, int,0 ); +MODULE_PARM_DESC (pdd,"Set pen detect comparator threshold" );I guess that's all the documentation we get ;) It won't kill us - we've done worse..
Quoted 3 lines
It would be rather nice if the kerneldoc system could extract the above comments and put them in a module-parameters-documentation section, but I don't think it can do that.
What would be really nice for this application would be a way to pass platform data to devices enumerated by non-platform buses - most of the time these parameters are determined by the board the system is on. In that case we'd be able to provide kerneldoc for the struct used to pass in platform data.
Quoted 3 lines
drivers/input/touchscreen/wm9705.c line 247
Quoted 1 line
drivers/input/touchscreen/wm9705.c new file +1
-0+if (timeout <=0 ) {timeout cannot be negative here.
Fixed, thanks.
Re: [PATCH 3/6] Add chip driver for WM9712 touchscreen
In reply to Andrew MortonQuoted 1 line · Andrew Morton
I assume we don't support more than one attached device per host?
Yes.
Quoted 2 lines
If so, is that a problem? One could envisage an application with lots of screens attached to one Linux box.
Indeed, but it's fairly unlikely that such an application would do so using multiple instances of these particular controllers. They are all primary-only devices so having more than one of them in the system requires multiple AC97 controllers which is pretty unusual. They're also multi function devices with audio CODECs as well - people would be relatively unlikely to use them for the touchscreen functionality alone.
If someone does come up with an application which needs more than one of these we can deal with it then but it's not an issue for most applications.
Quoted 1 line · Andrew Morton
Nice looking drivers.
Thanks.
Quoted 7 lines · On Tue, 26 Feb 2008 13:40:13 +0000 Mark Brown…
drivers/input/touchscreen/wm97xx-core.c line 303
Quoted 2 lines
drivers/input/touchscreen/wm97xx-core.c new file +1
-0+queue_delayed_work (wm->ts_workq, &wm->ts_reader,0 );This is equvaltnet to
queue_work().Why queue the work instead of just callng it synchronously right here?
No good reason any more, I think. I'll take a closer look and either change it to an immediate call or document what's going on.
Quoted 11 lines
drivers/input/touchscreen/wm97xx-core.c line 323
Quoted 7 lines
drivers/input/touchscreen/wm97xx-core.c new file +7
-0+static irqreturn_t wm97xx_pen_interrupt (int irq,void *dev_id) +{ +struct wm97xx *wm = dev_id; + wm->mach_ops->irq_enable (wm,0 ); +queue_work (wm->ts_workq, &wm->pen_event_work); +return IRQ_HANDLED ; +}We can lose events, can't we? We only have one work to queue, and if it is already queued, the
queue_work()here is a no-op.
Quoted 1 line
otoh there's no payload so there's actually no data to lose.
Indeed - only scheduling the work a single time is exactly the behaviour that's desired here.
Quoted 2 lines
Still, this stands out a bit and perhaps a comment which describes the overall interrupt handling design would help here.
I agree, I'll add something.
Quoted 7 lines
drivers/input/touchscreen/wm97xx-core.c line 428
Quoted 4 lines
drivers/input/touchscreen/wm97xx-core.c new file +4
-0+if (wm->pen_is_down || !wm->pen_irq) +queue_delayed_work (wm->ts_workq, &wm->ts_reader, + wm->ts_reader_interval); +}again, if this work is already scheduled, your
queue_delayed_work()here is a no-op. Will things all work correctly?
Yes, the worst that would happen would be that we'd read one less sample which might cause a glitch in input but we're reading sufficiently often to make that not an issue.
Quoted 1 line
A bit of whitecpace inconsistency there.
Fixed, thanks.
Quoted 11 lines
drivers/input/touchscreen/wm97xx-core.c line 474
Quoted 8 lines
drivers/input/touchscreen/wm97xx-core.c new file +8
-0+* failed to acquire it then we need to poll. +*/ +if (wm->pen_irq ==0 ) +queue_delayed_work (wm->ts_workq, &wm->ts_reader, + wm->ts_reader_interval); + +return 0 ; +}So... this driver continuously polls the hardware at 100HZ? If so, powertop users will come after you with pitchforks.
It'll only do that while the pen is down. It'd be possible to turn that down but that needs to be traded off against responsiveness.
If the user has provided an accelerated touch driver then while the pen is up we won't poll the device at all, relying on an interrupt to wake the driver up when the pen goes down. We strongly recommend doing this for power sensitive applications but it requires board-specific code.
If no acclerated touch driver is provided then we don't have much option other than polling but the driver will gradually back off to 10Hz. This is still far from ideal but not quite so bad. Reducing it any more than that would make the pen down event unresponsive.
Quoted 9 lines
drivers/input/touchscreen/wm97xx-core.c line 546
Quoted 5 lines
drivers/input/touchscreen/wm97xx-core.c new file +5
-0+#ifdef CONFIG_TOUCHSCREEN_WM9713 +case 0x13 : + wm->codec = &wm9713_codec; +break ; +#endif That's a wee bit combersome. Really a "core" should not know about its specific clients. A better and more typical design would have the clients registering themselves with the core via some registration interface.
Yes, that would be nicer. Unfortunately the driver isn't actually fully factored out like that yet - there are still a couple of places in the core code with device-specific checks. We could improve it further but it's probably more trouble than it's worth until more substantial work such as adding new chips is required.
Quoted 5 lines
drivers/input/touchscreen/wm97xx-core.c line 561
Quoted 2 lines
drivers/input/touchscreen/wm97xx-core.c new file +2
-0+/* set up touch configuration */ + wm->input_dev->name ="wm97xx touchscreen" ;spaces in names are OK here? They can make proc files basically unparseable.
Yes, it's fine. This ends up in /proc/bus/input/devices as:
N: Name="wm97xx touchscreen"
which is parsable and a quick survey of drivers/input/touchscreen suggests that spaces are even the common case for touchscreen drivers.
Quoted 2 lines
The
kernel->userspaceinterface looks fairly complex. Is it documented anywhere?
I'm not aware of anything specific to touchscreens beyond the source to existing applications and drivers but IME it's fairly straightforward within the input framework.
Quoted 5 lines
drivers/input/touchscreen/wm97xx-core.c line 679
Quoted 3 lines
drivers/input/touchscreen/wm97xx-core.c new file +3
-0+#else +#define wm97xx_resume NULL +#endif It's strange to see a .resume but no .suspend.
Yes. The actual chip shutdown is handled by AC97 though we really should quiesce the poll if it is running when we suspend - I'll add something for that.
Quoted 6 lines
Quoted 3 lines
+/*
+ * WM97xx AC97 Touchscreen registers
+ */ac97 stuff? But I saw no appropriate dependencies for this in the
Kconfigpatch?
Yes, they're AC97 parts. There's this in Kconfig ATM:
+config TOUCHSCREEN_WM97XX
+ tristate "Support for WM97xx AC97 touchscreen controllers"
+ depends on AC97_BUS
I'm not sure what else would be useful?
Quoted 10 lines
include/linux/wm97xx.h line 204
Quoted 7 lines
include/linux/wm97xx.h new file +7
-0+/* +* Codec GPIO wake +*/ +enum wm97xx_gpio_wake { +WM97XX_GPIO_WAKE , +WM97XX_GPIO_NOWAKE +};Are these gpio's really gp? If so, should this driver be using the
drivers/gpio/infrastructure?
Well, they're multi-function pins so they can do GPIO plus specific functionality for the device but yes they could do that. They are rarely used as fully GP pins since the SoC based systems where these codecs are most frequently deployed usually have an abundance of GPIO pins on the SoC itself which don't require going over the AC97 bus to manipulate.
Aside from the disruption to existing users the main problem with doing that is that it would require that platform data be passed into the driver to specify the base for the GPIOs (this would be useful for all the other configuration too). I can't see a suitably nice way to do that at the minute, unfortunately. Without such a method I'd really rather avoid using gpiolib since it doesn't feel like a sufficient win.
Thanks for the review.
Re: [PATCH 5/6] Driver for WM97xx touchscreens in streaming mode on Mainstone
In reply to Andrew MortonQuoted 3 lines · Andrew Morton
If the calling process happens to have a signal pending then the
schedule_timeout()becomes a no-op. Will the driver still function correctly?
No, it doesn't. Changed to be non-interruptible - thanks!