diff --git a/boards/arm/imxrt/imxrt1060-evk/src/imxrt1060-evk.h b/boards/arm/imxrt/imxrt1060-evk/src/imxrt1060-evk.h index 81e2cb3a9f..dcdd8fb5fe 100644 --- a/boards/arm/imxrt/imxrt1060-evk/src/imxrt1060-evk.h +++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt1060-evk.h @@ -162,7 +162,7 @@ #define IOMUX_FT5X06_RST (IOMUX_PULL_NONE | IOMUX_CMOS_OUTPUT | \ IOMUX_DRIVE_40OHM | IOMUX_SPEED_MEDIUM | \ IOMUX_SLEW_SLOW) /* AD_B0_11 */ -#define GPIO_FT5X06_CTRSTn (GPIO_OUTPUT | GPIO_OUTPUT_ZERO | \ +#define GPIO_FT5X06_CTRSTN (GPIO_OUTPUT | GPIO_OUTPUT_ZERO | \ GPIO_PORT1 | GPIO_PIN2 | IOMUX_FT5X06_RST) /* AD_B0_02 */ /* Test Pins ****************************************************************/ diff --git a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_ft5x06.c b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_ft5x06.c index 619d645448..85f337e83e 100644 --- a/boards/arm/imxrt/imxrt1060-evk/src/imxrt_ft5x06.c +++ b/boards/arm/imxrt/imxrt1060-evk/src/imxrt_ft5x06.c @@ -186,7 +186,7 @@ static void imxrt_ft5x06_wakeup(FAR const struct ft5x06_config_s *config) static void imxrt_ft5x06_nreset(FAR const struct ft5x06_config_s *config, bool nstate) { - imxrt_gpio_write(GPIO_FT5X06_CTRSTn, nstate); + imxrt_gpio_write(GPIO_FT5X06_CTRSTN, nstate); } /**************************************************************************** @@ -206,9 +206,9 @@ int imxrt_ft5x06_register(void) FAR struct i2c_master_s *i2c; int ret; - /* Initialize CTRSTn pin */ + /* Initialize CTRSTN pin */ - imxrt_config_gpio(GPIO_FT5X06_CTRSTn); + imxrt_config_gpio(GPIO_FT5X06_CTRSTN); #ifndef CONFIG_FT5X06_POLLMODE int irq; @@ -228,7 +228,7 @@ int imxrt_ft5x06_register(void) /* Take the FT5X06 out of reset */ - imxrt_gpio_write(GPIO_FT5X06_CTRSTn, true); + imxrt_gpio_write(GPIO_FT5X06_CTRSTN, true); /* The FT5X06 is on LPI2C1. Get the handle and register the F5x06 device */ @@ -246,7 +246,7 @@ int imxrt_ft5x06_register(void) syslog(LOG_ERR, "ERROR: Failed to register FT5X06 driver: %d\n", ret); - imxrt_gpio_write(GPIO_FT5X06_CTRSTn, false); + imxrt_gpio_write(GPIO_FT5X06_CTRSTN, false); imxrt_i2cbus_uninitialize(i2c); return ret; } diff --git a/boards/arm/stm32/mikroe-stm32f4/src/stm32_vs1053.c b/boards/arm/stm32/mikroe-stm32f4/src/stm32_vs1053.c index 3e3746e841..4ad3e8ab7b 100644 --- a/boards/arm/stm32/mikroe-stm32f4/src/stm32_vs1053.c +++ b/boards/arm/stm32/mikroe-stm32f4/src/stm32_vs1053.c @@ -170,7 +170,7 @@ void up_vs1053initialize(FAR struct spi_dev_s * spi) { int ret; char name[8]; - FAR struct audio_lowerhalf_s *pVs1053; + FAR struct audio_lowerhalf_s *PVS1053; /* Assumptions: * 1) SPI pins were configured in up_spi.c early in the boot-up phase. @@ -192,8 +192,8 @@ void up_vs1053initialize(FAR struct spi_dev_s * spi) /* Bind the SPI port to the VS1053 driver */ - pVs1053 = vs1053_initialize(spi, &g_vs1053lower.lower, VS1053_DEVNO); - if (pVs1053 == NULL) + PVS1053 = vs1053_initialize(spi, &g_vs1053lower.lower, VS1053_DEVNO); + if (PVS1053 == NULL) { auderr("ERROR: Failed to bind SPI port %d VS1053 device\n", VS1053_DEVNO); @@ -203,7 +203,7 @@ void up_vs1053initialize(FAR struct spi_dev_s * spi) /* Now register the audio device */ sprintf(name, "vs1053d%d", VS1053_DEVNO); - ret = audio_register(name, pVs1053); + ret = audio_register(name, PVS1053); if (ret < 0) { auderr("ERROR: Failed to register VS1053 Audio device\n");