OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix STM32 SPI3 remap logic 

git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5200 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo 2012-09-27 20:15:24 +00:00
parent 8a0899a695
commit 09e07d6550
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -3435,3 +3435,6 @@
DM9161 PHY. If the DM9161 failed to initialize, then use the DM9161 PHY. If the DM9161 failed to initialize, then use the
up_sysemreset() logic to reset the MCU. Contributed by Darcy up_sysemreset() logic to reset the MCU. Contributed by Darcy
Gong. Gong.
* arch/arm/src/stm32/stm32_gpio.c: Add missing logic to set bit
for SPI3 remap. This fixes the XPT2046 touchscreen driver using
drivers/input/ads7843.c

1
arch/arm/src/stm32/stm32_gpio.c
View File

@ -128,6 +128,7 @@ static inline void stm32_gpioremap(void)
val |= AFIO_MAPR_SPI1_REMAP; val |= AFIO_MAPR_SPI1_REMAP;
#endif #endif
#ifdef CONFIG_STM32_SPI3_REMAP #ifdef CONFIG_STM32_SPI3_REMAP
val |= AFIO_MAPR_SPI3_REMAP;
#endif #endif
#ifdef CONFIG_STM32_I2C1_REMAP #ifdef CONFIG_STM32_I2C1_REMAP

6
configs/shenzhou/nxwm/defconfig
View File

@ -362,9 +362,9 @@ CONFIG_INPUT_ADS7843E=y
# CONFIG_ADS7843E_MULTIPLE is not set # CONFIG_ADS7843E_MULTIPLE is not set
CONFIG_ADS7843E_SPIMODE=0 CONFIG_ADS7843E_SPIMODE=0
CONFIG_ADS7843E_FREQUENCY=100000 CONFIG_ADS7843E_FREQUENCY=100000
# CONFIG_ADS7843E_SWAPXY is not set CONFIG_ADS7843E_SWAPXY=y
CONFIG_ADS7843E_THRESHX=12 CONFIG_ADS7843E_THRESHX=39
CONFIG_ADS7843E_THRESHY=12 CONFIG_ADS7843E_THRESHY=51
# CONFIG_INPUT_STMPE811 is not set # CONFIG_INPUT_STMPE811 is not set
CONFIG_LCD=y CONFIG_LCD=y
# CONFIG_LCD_NOGETRUN is not set # CONFIG_LCD_NOGETRUN is not set

3
configs/shenzhou/src/up_touchscreen.c
View File

@ -209,9 +209,6 @@ static bool tsc_busy(FAR struct ads7843e_config_s *state)
* between sending the command, then reading the returned data. * between sending the command, then reading the returned data.
*/ */
#if 0
up_udelay(1600); /* 1.6MS */
#endif
return false; return false;
} }

3
drivers/input/ads7843e.c
View File

@ -951,8 +951,7 @@ static ssize_t ads7843e_read(FAR struct file *filep, FAR char *buffer, size_t le
if (sample.valid) if (sample.valid)
{ {
report->point[0].flags = TOUCH_UP | TOUCH_ID_VALID | report->point[0].flags = TOUCH_UP | TOUCH_ID_VALID | TOUCH_POS_VALID;
TOUCH_POS_VALID | TOUCH_PRESSURE_VALID;
} }
else else
{ {