From 53ef64aae6bc05050a1c082eede5fff3df74bf75 Mon Sep 17 00:00:00 2001
From: Gregory Nutt <gnutt@nuttx.org>
Date: Thu, 24 Aug 2017 11:11:06 -0600
Subject: [PATCH] drivers/audio:  Fix naming of configurations to be compliant
 for vs1053 audio driver.

---
 configs/mikroe-stm32f4/fulldemo/defconfig   | 2 +-
 configs/mikroe-stm32f4/src/Makefile         | 2 +-
 configs/mikroe-stm32f4/src/mikroe-stm32f4.h | 2 +-
 configs/mikroe-stm32f4/src/stm32_boot.c     | 2 +-
 configs/mikroe-stm32f4/src/stm32_spi.c      | 4 ++--
 configs/mikroe-stm32f4/src/stm32_vs1053.c   | 4 ++--
 drivers/audio/Make.defs                     | 2 +-
 include/nuttx/audio/vs1053.h                | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configs/mikroe-stm32f4/fulldemo/defconfig b/configs/mikroe-stm32f4/fulldemo/defconfig
index cd623903c7..f5bb94340b 100644
--- a/configs/mikroe-stm32f4/fulldemo/defconfig
+++ b/configs/mikroe-stm32f4/fulldemo/defconfig
@@ -142,5 +142,5 @@ CONFIG_SYSTEM_NXPLAYER=y
 CONFIG_TASK_NAME_SIZE=11
 CONFIG_USBDEV=y
 CONFIG_USER_ENTRYPOINT="nxwm_main"
-CONFIG_VS1053=y
+CONFIG_AUDIO_VS1053=y
 CONFIG_WDOG_INTRESERVE=1
diff --git a/configs/mikroe-stm32f4/src/Makefile b/configs/mikroe-stm32f4/src/Makefile
index aa62ed68c5..0796e3d0f9 100644
--- a/configs/mikroe-stm32f4/src/Makefile
+++ b/configs/mikroe-stm32f4/src/Makefile
@@ -86,7 +86,7 @@ ifeq ($(CONFIG_LCD_MIO283QT9A),y)
 CSRCS += stm32_mio283qt9a.c
 endif
 
-ifeq ($(CONFIG_VS1053),y)
+ifeq ($(CONFIG_AUDIO_VS1053),y)
 CSRCS += stm32_vs1053.c
 endif
 
diff --git a/configs/mikroe-stm32f4/src/mikroe-stm32f4.h b/configs/mikroe-stm32f4/src/mikroe-stm32f4.h
index 18e98d1ff6..4b8bcc3daf 100644
--- a/configs/mikroe-stm32f4/src/mikroe-stm32f4.h
+++ b/configs/mikroe-stm32f4/src/mikroe-stm32f4.h
@@ -285,7 +285,7 @@ void stm32_lcdinitialize(void);
  *
  ****************************************************************************************************/
 
-#ifdef CONFIG_VS1053
+#ifdef CONFIG_AUDIO_VS1053
 void up_vs1053initialize(FAR struct spi_dev_s *spi);
 #endif
 
diff --git a/configs/mikroe-stm32f4/src/stm32_boot.c b/configs/mikroe-stm32f4/src/stm32_boot.c
index 5bd7b9798e..4d571e075c 100644
--- a/configs/mikroe-stm32f4/src/stm32_boot.c
+++ b/configs/mikroe-stm32f4/src/stm32_boot.c
@@ -72,7 +72,7 @@ void stm32_boardinitialize(void)
 {
   /* First reset the VS1053 since it tends to produce noise out of power on reset */
 
-#ifdef CONFIG_VS1053
+#ifdef CONFIG_AUDIO_VS1053
   (void)stm32_configgpio(GPIO_VS1053_RST);
 #endif
 
diff --git a/configs/mikroe-stm32f4/src/stm32_spi.c b/configs/mikroe-stm32f4/src/stm32_spi.c
index 05bb88a21a..ae790826a5 100644
--- a/configs/mikroe-stm32f4/src/stm32_spi.c
+++ b/configs/mikroe-stm32f4/src/stm32_spi.c
@@ -84,7 +84,7 @@ void weak_function stm32_spidev_initialize(void)
   (void)stm32_configgpio(GPIO_SD_CD);       /* MMC/SD card detect */
 #endif
 
-#ifdef CONFIG_VS1053
+#ifdef CONFIG_AUDIO_VS1053
   (void)stm32_configgpio(GPIO_CS_MP3_DATA); /* MP3 codec chip select for DATA */
   (void)stm32_configgpio(GPIO_CS_MP3_CMD);  /* MP3 codec chip select for CMD */
 #endif
@@ -126,7 +126,7 @@ void stm32_spi3select(FAR struct spi_dev_s *dev, uint32_t devid, bool selected)
 
   spiinfo("devid: %d CS: %s\n", (int)devid, selected ? "assert" : "de-assert");
 
-#if defined(CONFIG_VS1053)
+#if defined(CONFIG_AUDIO_VS1053)
   if (devid == SPIDEV_AUDIO_DATA(0))
     {
       stm32_gpiowrite(GPIO_CS_MP3_DATA, !selected);
diff --git a/configs/mikroe-stm32f4/src/stm32_vs1053.c b/configs/mikroe-stm32f4/src/stm32_vs1053.c
index 182c559fa6..341e5508cf 100644
--- a/configs/mikroe-stm32f4/src/stm32_vs1053.c
+++ b/configs/mikroe-stm32f4/src/stm32_vs1053.c
@@ -53,7 +53,7 @@
 #include "up_arch.h"
 #include "mikroe-stm32f4.h"
 
-#ifdef CONFIG_VS1053
+#ifdef CONFIG_AUDIO_VS1053
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -209,4 +209,4 @@ void up_vs1053initialize(FAR struct spi_dev_s* spi)
   audinfo("Bound SPI port to VS1053 device %s\n", name);
 }
 
-#endif /* CONFIG_VS1053 */
+#endif /* CONFIG_AUDIO_VS1053 */
diff --git a/drivers/audio/Make.defs b/drivers/audio/Make.defs
index 96db396860..210d92c124 100644
--- a/drivers/audio/Make.defs
+++ b/drivers/audio/Make.defs
@@ -39,7 +39,7 @@
 
 ifeq ($(CONFIG_AUDIO_DEVICES),y)
 
-ifeq ($(CONFIG_VS1053),y)
+ifeq ($(CONFIG_AUDIO_VS1053),y)
 CSRCS += vs1053.c
 endif
 
diff --git a/include/nuttx/audio/vs1053.h b/include/nuttx/audio/vs1053.h
index 896bb37e0b..0e8a3fc8d9 100644
--- a/include/nuttx/audio/vs1053.h
+++ b/include/nuttx/audio/vs1053.h
@@ -51,7 +51,7 @@
 
 /* VS1053 Configuration Settings:
  *
- * CONFIG_VS1053 - Enabled VS1053 support
+ * CONFIG_AUDIO_VS1053 - Enabled VS1053 support
  * CONFIG_VS1053_SPIMODE - Controls the SPI mode
  */