diff --git a/arch/mips/src/pic32mx/pic32mx-head.S b/arch/mips/src/pic32mx/pic32mx-head.S index ec7b8a991d1cfd9a6bfac40fe6d7e0cc2baa6565..dedc84558b8b9250bab450aa0d05962c5e27eecf 100644 --- a/arch/mips/src/pic32mx/pic32mx-head.S +++ b/arch/mips/src/pic32mx/pic32mx-head.S @@ -538,7 +538,7 @@ devconfig3: devconfig2: .long CONFIG_PIC32MX_PLLIDIV | CONFIG_PIC32MX_PLLMULT | \ - CONFIG_PIC32MX_UPLLIDIV | DEVCFG2_FPLLODIV_DIV1 | \ + CONFIG_PIC32MX_UPLLIDIV | CONFIG_PIC32MX_PLLODIV | \ DEVCFG2_UNUSED devconfig1: diff --git a/configs/sam3u-ek/src/up_spi.c b/configs/sam3u-ek/src/up_spi.c index 8fed3c48f8731cd72b7c6ae634dc04367a19c4d6..8dafc293e6682eeeec41fc5c061ac9b311326d89 100644 --- a/configs/sam3u-ek/src/up_spi.c +++ b/configs/sam3u-ek/src/up_spi.c @@ -161,7 +161,6 @@ void weak_function sam3u_spiinitialize(void) * ****************************************************************************/ -#ifdef CONFIG_SAM3U_SPI int sam3u_spicsnumber(enum spi_dev_e devid) { int cs = -EINVAL; @@ -240,6 +239,5 @@ uint8_t sam3u_spistatus(FAR struct spi_dev_s *dev, enum spi_dev_e devid) { return 0; } -#endif #endif /* CONFIG_SAM3U_SPI */ diff --git a/configs/sam3u-ek/src/up_touchscreen.c b/configs/sam3u-ek/src/up_touchscreen.c index 9b58f151c49a931b2ecdbbce5a90a6069e33ad61..0de367ec945fcf7582a2fa9bb4bb5d3b3b844637 100755 --- a/configs/sam3u-ek/src/up_touchscreen.c +++ b/configs/sam3u-ek/src/up_touchscreen.c @@ -179,10 +179,20 @@ static void tsc_clear(FAR struct ads7843e_config_s *state) static bool tsc_busy(FAR struct ads7843e_config_s *state) { +#if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_VERBOSE) + static bool last = (bool)-1; +#endif + /* REVISIT: This might need to be inverted */ bool busy = sam3u_gpioread(GPIO_TCS_BUSY); - ivdbg("busy:%d\n", busy); +#if defined(CONFIG_DEBUG_INPUT) && defined(CONFIG_DEBUG_VERBOSE) + if (busy != last) + { + ivdbg("busy:%d\n", busy); + last = busy; + } +#endif return busy; } diff --git a/drivers/input/ads7843e.h b/drivers/input/ads7843e.h index edf205c61e55367fb17b6b5a0ecd83dfdd0de83f..7a534099e1b95176fc41f5738a277294b413d1a8 100644 --- a/drivers/input/ads7843e.h +++ b/drivers/input/ads7843e.h @@ -72,11 +72,11 @@ #define ADS7843E_CMD_DFR (1 << 2) /* SER/DFR */ #define ADS7843E_CMD_EIGHT_BITS_MOD (1 << 3) /* Mode */ #define ADS7843E_CMD_START (1 << 7) /* Start Bit */ -#define ADS7843E_CMD_SWITCH_SHIFT 4 /* Address setting */ +#define ADS7843E_CMD_SWITCH_SHIFT 4 /* Address setting */ /* ADS7843E Commands */ -#define ADS7843_CMD_YPOSITION \ +#define ADS7843_CMD_YPOSITION \ ((1 << ADS7843E_CMD_SWITCH_SHIFT)|ADS7843E_CMD_START|ADS7843E_CMD_PD0|ADS7843E_CMD_PD1) #define ADS7843_CMD_XPOSITION \ ((5 << ADS7843E_CMD_SWITCH_SHIFT)|ADS7843E_CMD_START|ADS7843E_CMD_PD0|ADS7843E_CMD_PD1)