devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

imx233: fix touchscreen driver

Browse source 
One cannot call lradc_acquire in IRQ context. The solution is to reserve the
channel once at init. There is an additional complication on STMP3600 where
channel mapping is fixed.

Change-Id: Idccbac634a4d9002703e2b1d57748beb9b245cbb
This commit is contained in:
Amaury Pouly 2017-05-16 12:14:43 +10:00
parent 5dd443c033
commit 3210457764
2 changed files with 31 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
firmware/target/arm/imx233/kernel-imx233.h
View file

@ -43,4 +43,4 @@ int arbiter_acquire(struct channel_arbiter_t *a, int timeout);
void arbiter_release(struct channel_arbiter_t *a, int channel); void arbiter_release(struct channel_arbiter_t *a, int channel);
bool arbiter_acquired(struct channel_arbiter_t *a, int channel); bool arbiter_acquired(struct channel_arbiter_t *a, int channel);
#endif /* __KERNEL_IMX233__ */ #endif /* __KERNEL_IMX233__ */

36
firmware/target/arm/imx233/touchscreen-imx233.c
View file

@ -57,6 +57,10 @@ enum touch_state_t
static enum touch_state_t touch_state; static enum touch_state_t touch_state;
static int touch_chan = -1; static int touch_chan = -1;
#if IMX233_SUBTARGET < 3700
/* See imx233_touchscreen_init() */
static int touch_chan_xp = -1, touch_chan_yp = -1;
#endif
static int touch_delay = -1; static int touch_delay = -1;
static int touch_x, touch_y; static int touch_x, touch_y;
/* once a touch is confirmed, the parameters are copied to these value for /* once a touch is confirmed, the parameters are copied to these value for
@ -98,11 +102,15 @@ static void pulldown_setup(bool xminus_enable, bool yminus_enable,
static void kick_measure(bool pull_x, bool pull_y, bool detect, int src) static void kick_measure(bool pull_x, bool pull_y, bool detect, int src)
{ {
if(touch_chan >= 0) #if IMX233_SUBTARGET < 3700
imx233_lradc_release_channel(touch_chan); /* Select proper channel on STMP3600 */
touch_chan = imx233_lradc_acquire_channel(src, TIMEOUT_NOBLOCK); if(src == LRADC_SRC_XPLUS)
if(touch_chan < 0) touch_chan = touch_chan_xp;
panicf("touchscreen: cannot get adc channel"); else if(src == LRADC_SRC_XPLUS)
touch_chan = touch_chan_xp;
else
panicf("Unknown channel source %d in touchscreen", src);
#endif
/* enable interrupt */ /* enable interrupt */
imx233_lradc_set_channel_irq_callback(touch_chan, &touch_channel_irq); imx233_lradc_set_channel_irq_callback(touch_chan, &touch_channel_irq);
imx233_icoll_enable_interrupt(INT_SRC_LRADC_CHx(touch_chan), true); imx233_icoll_enable_interrupt(INT_SRC_LRADC_CHx(touch_chan), true);
@ -192,7 +200,23 @@ void imx233_touchscreen_init(void)
{ {
touch_delay = imx233_lradc_acquire_delay(TIMEOUT_NOBLOCK); touch_delay = imx233_lradc_acquire_delay(TIMEOUT_NOBLOCK);
if(touch_delay < 0) if(touch_delay < 0)
panicf("Cannot acquire channel and delays for touchscreen measurement"); panicf("Cannot acquire delay for touchscreen measurement");
#if IMX233_SUBTARGET >= 3700
/* On STMP3700+, any channel can measure any source so one channel is enough
* for all operations */
touch_chan = imx233_lradc_acquire_channel(LRADC_SRC_XPLUS, TIMEOUT_NOBLOCK);
if(touch_chan < 0)
panicf("touchscreen: cannot get adc channel");
#else
/* On STMP3600, channel mapping is fixed for touch screen so we need to reserve
* two channels */
touch_chan_xp = imx233_lradc_acquire_channel(LRADC_SRC_XPLUS, TIMEOUT_NOBLOCK);
if(touch_chan_xp < 0)
panicf("touchscreen: cannot get adc X+ channel");
touch_chan_yp = imx233_lradc_acquire_channel(LRADC_SRC_YPLUS, TIMEOUT_NOBLOCK);
if(touch_chan_yp < 0)
panicf("touchscreen: cannot get adc Y+ channel");
#endif
imx233_touchscreen_enable(false); imx233_touchscreen_enable(false);
} }