SAMV71-XULT: Some improved naming

5 files changed, 76 insertions, 76 deletions

diff --git a/nuttx/configs/samv71-xult/README.txt b/nuttx/configs/samv71-xult/README.txt
index 231eb8e4b..ef6edbbb3 100644
--- a/nuttx/configs/samv71-xult/README.txt
+++ b/nuttx/configs/samv71-xult/README.txt
@@ -800,9 +800,9 @@ It is also possible to connect the LCD via the flat cable to the EXT4 LCD
 connector.  In this case, you would use the SMC/EBI to communicate with the
 LCD.
 
-NOTE: (1) Only the RGB interface is supported by the SAMV71-XULT and (2) the
-3 switch mode selector on the back of the maXtouch.  These switches should be
-in the OFF-ON-OFF positions to select 16-bit color mode.
+NOTE: (1) Only the parallel interface is supported by the SAMV71-XULT and (2)
+the 3 switch mode selector on the back of the maXtouch.  These switches should
+be in the OFF-ON-OFF positions to select 16-bit color mode.
 
   ----------------- ------------- -----------------------------------------------------------
          LCD            SAMV71    Description
@@ -840,20 +840,20 @@ in the OFF-ON-OFF positions to select 16-bit color mode.
   30   N/C           -    -
   31   N/C           -    -
   32   GND           -   GND      Ground
-  33   PCLK/        PC30 GPIO     RGB: Pixel clock Display RAM select.
-       CMD_DATA_SEL               MCU: One address line of the MCU for displays where it
+  33   PCLK/        PC30 GPIO     SMC: Pixel clock Display RAM select.
+       CMD_DATA_SEL               SPI: One address line of the MCU for displays where it
                                        is possible to select either the register or the
                                        data interface
-  34   VSYNC/CS     PD19 NCS3     RGB: Vertical synchronization.
-                                  MCU: Chip select
-  35   HSYNC/WE     PC8  NWE      RGB: Horizontal synchronization
-                                  MCU: Write enable signal
-  36   DATA ENABLE/ PC11 NRD      RGB: Data enable signal
-       RE                         MCU: Read enable signal
-  37   SPI SCK       -    -       MCU: Clock for SPI
-  38   SPI MOSI      -    -       MCU: Master out slave in line of SPI
-  39   SPI MISO      -    -       MCU: Master in slave out line of SPI
-  40   SPI SS        -    -       MCU: Slave select for SPI
+  34   VSYNC/CS     PD19 NCS3     SMC: Vertical synchronization.
+                                  SPI: Chip select
+  35   HSYNC/WE     PC8  NWE      SMC: Horizontal synchronization
+                                  SPI: Write enable signal
+  36   DATA ENABLE/ PC11 NRD      SMC: Data enable signal
+       RE                         SPI: Read enable signal
+  37   SPI SCK       -    -       SPI: Clock for SPI
+  38   SPI MOSI      -    -       SPI: Master out slave in line of SPI
+  39   SPI MISO      -    -       SPI: Master in slave out line of SPI
+  40   SPI SS        -    -       SPI: Slave select for SPI
   41   N/C           -    -
   42   TWI SDA      PA3  TWD0     I2C data line (maXTouch®)
   43   TWI SCL      PA4  TWCK0    I2C clock line (maXTouch)
@@ -920,8 +920,8 @@ MXT Configuration Options
 ILI9488 Configuration Options
 -----------------------------
 
-Currently only the RGB mode is supported.  This means that the LCD can only
-be used in connected in the LCD (EXT4) connection.
+Currently only the parallel mode is supported.  This means that the LCD can
+only be used in connected in the LCD (EXT4) connection.
 
   System Type -> SAMV7 Peripheral Support
     CONFIG_SAMV7_SMC=y                    : Needed by the ILI9466 driver controller
@@ -1097,7 +1097,7 @@ Configuration sub-directories
        in EXT1 or LCD/EXT4 and also use the Arduino RXD/TXD pins as your
        serial console.
 
-       The LCD (EXT4) is configured by default because only the RGB LCD
+       The LCD (EXT4) is configured by default because only the parallel LCD
        interface is currently supported and that is only available on that
        connector.
 
@@ -1110,9 +1110,9 @@ Configuration sub-directories
        different U[S]ART option is selected, Audio cannot be used with
        this configuration.
 
-    4. Support for the ILI8488 LCD is enabled.  Only the RGB mode is support
-       at present.  As a consequence, the maXTouch Xplained Pro must be
-       connected at the LCD (EXT4) connector.  This mode requires:
+    4. Support for the ILI8488 LCD is enabled.  Only the parallel mode is
+       supported at present.  As a consequence, the maXTouch Xplained Pro
+       must be connected at the LCD (EXT4) connector.  This mode requires:
 
          CONFIG_SAMV71XULT_MXTXPLND_LCD=y : Must be connect in LCD (EXT4)
          CONFIG_SAMV7_SMC=y               : SMC/EBI support
diff --git a/nuttx/configs/samv71-xult/include/board.h b/nuttx/configs/samv71-xult/include/board.h
index 2a9b6b281..2f07bdbec 100644
--- a/nuttx/configs/samv71-xult/include/board.h
+++ b/nuttx/configs/samv71-xult/include/board.h
@@ -425,7 +425,7 @@
 
 /* maXTouch Xplained Pro Xplained Pro LCD Connector *********************************
  *
- * Only the RGB is supported by this BSP (via SMC/EBI).  The switch mode
+ * Only the parallel is supported by this BSP (via SMC/EBI).  The switch mode
  * selector on the back of the maXtouch should be set in the OFF-ON-OFF
  * positions to select 16-bit color mode.
  *
@@ -465,20 +465,20 @@
  * 30   N/C           -    -
  * 31   N/C           -    -
  * 32   GND           -   GND      Ground
- * 33   PCLK/        PC30 GPIO     RGB: Pixel clock Display RAM select.
- *      CMD_DATA_SEL               MCU: One address line of the MCU for displays where
+ * 33   PCLK/        PC30 GPIO     SMC: Pixel clock Display RAM select.
+ *      CMD_DATA_SEL               SPI: One address line of the MCU for displays where
  *                                      it is possible to select either the register
  *                                      or the data interface
- * 34   VSYNC/CS     PD19 NCS3     RGB: Vertical synchronization.
- *                                 MCU: Chip select
- * 35   HSYNC/WE     PC8  NWE      RGB: Horizontal synchronization
- *                                 MCU: Write enable signal
- * 36   DATA ENABLE/ PC11 NRD      RGB: Data enable signal
- *      RE                         MCU: Read enable signal
- * 37   SPI SCK       -    -       MCU: Clock for SPI
- * 38   SPI MOSI      -    -       MCU: Master out slave in line of SPI
- * 39   SPI MISO      -    -       MCU: Master in slave out line of SPI
- * 40   SPI SS        -    -       MCU: Slave select for SPI
+ * 34   VSYNC/CS     PD19 NCS3     SMC: Vertical synchronization.
+ *                                 SPI: Chip select
+ * 35   HSYNC/WE     PC8  NWE      SMC: Horizontal synchronization
+ *                                 SPI: Write enable signal
+ * 36   DATA ENABLE/ PC11 NRD      SMC: Data enable signal
+ *      RE                         SPI: Read enable signal
+ * 37   SPI SCK       -    -       SPI: Clock for SPI
+ * 38   SPI MOSI      -    -       SPI: Master out slave in line of SPI
+ * 39   SPI MISO      -    -       SPI: Master in slave out line of SPI
+ * 40   SPI SS        -    -       SPI: Slave select for SPI
  * 41   N/C           -    -
  * 42   TWI SDA      PA3  TWD0     I2C data line (maXTouch®)
  * 43   TWI SCL      PA4  TWCK0    I2C clock line (maXTouch)
diff --git a/nuttx/configs/samv71-xult/src/atmxt-xpro.h b/nuttx/configs/samv71-xult/src/atmxt-xpro.h
index 29dcaa4b6..aa9cc9272 100644
--- a/nuttx/configs/samv71-xult/src/atmxt-xpro.h
+++ b/nuttx/configs/samv71-xult/src/atmxt-xpro.h
@@ -48,15 +48,15 @@
 /* Configuration ********************************************************************/
 
 #define HAVE_MAXTOUCH    1
-#define HAVE_ILI9488_RGB 1
-#undef HAVE_ILI9488_MCU    /* Not yet suppported */
+#define HAVE_ILI9488_SMC 1
+#undef HAVE_ILI9488_SPI    /* Not yet suppported */
 
 /* maXTouch and LCD only available if the maXTouch Xplained Pro is connected */
 
 #ifndef CONFIG_SAMV71XULT_MXTXPLND
 #  undef HAVE_MAXTOUCH
-#  undef HAVE_ILI9488_RGB
-#  undef HAVE_ILI9488_MCU
+#  undef HAVE_ILI9488_SMC
+#  undef HAVE_ILI9488_SPI
 #endif
 
 /* maXTouch is only available if the maXTouch driver is enabled */
@@ -108,40 +108,40 @@
 
 /* ILI9488 LCD */
 
-#ifdef HAVE_ILI9488_RGB
-/* ILI9488 RGB requires use of LCD connector and SMC and DMA support */
+#ifdef HAVE_ILI9488_SMC
+/* ILI9488 parallel mode requires use of LCD connector and SMC and DMA support */
 
 #  ifndef CONFIG_SAMV71XULT_MXTXPLND_LCD
 #    warning The ILI8488 LCD must be connected on LCD EXT4 (CONFIG_SAMV71XULT_MXTXPLND_LCD)
-#    undef HAVE_ILI9488_RGB
+#    undef HAVE_ILI9488_SMC
 #  endif
 
-/* ILI9488 RGB requires SMC/EBI and XDMAC support */
+/* ILI9488 parallel mode requires SMC/EBI and XDMAC support */
 
 #  ifndef CONFIG_SAMV7_SMC
 #    warning The ILI8488 LCD requires SMC support (CONFIG_SAMV7_SMC)
-#    undef HAVE_ILI9488_RGB
+#    undef HAVE_ILI9488_SMC
 #  endif
 
 #  ifndef CONFIG_SAMV7_XDMAC
 #    warning The ILI8488 LCD requires DMA support (CONFIG_SAMV7_XDMAC)
-#    undef HAVE_ILI9488_RGB
+#    undef HAVE_ILI9488_SMC
 #  endif
 #endif
 
-#ifdef HAVE_ILI9488_MCU
-/* ILI9488 MCU requires use of EXT1 or EXT2 connector */
+#ifdef HAVE_ILI9488_SPI
+/* ILI9488 serial mode requires use of EXT1 or EXT2 connector */
 
 #  if !defined(CONFIG_SAMV71XULT_MXTXPLND_EXT1) && !defined(CONFIG_SAMV71XULT_MXTXPLND_EXT2)
-#    warning ILI9488 MCU must be connected or EXT1 or EXT2 (CONFIG_SAMV71XULT_MXTXPLND_EXT1/2)
-#    undef HAVE_ILI9488_MCU
+#    warning serial ILI9488 must be connected or EXT1 or EXT2 (CONFIG_SAMV71XULT_MXTXPLND_EXT1/2)
+#    undef HAVE_ILI9488_SPI
 #  endif
 
-/* ILI9488 MCU requires SPI0 */
+/* ILI9488 serial mode requires SPI0 */
 
 #  ifndef CONFIG_SAMV7_SPI0
-#    warning ILI9488 MCU support requires SPI0
-#    undef HAVE_ILI9488_MCU
+#    warning Serial ILI9488 requires SPI0 support
+#    undef HAVE_ILI9488_SPI
 #  endif
 #endif
 
@@ -197,15 +197,15 @@
 #      define IRQ_MXT_CHG       SAM_IRQ_PD28
 #    endif /* HAVE_MAXTOUCH */
 
-/* ILI9488 MCU mode definitions when connected via EXT1 */
+/* ILI9488 serial mode definitions when connected via EXT1 */
 
-#    ifdef HAVE_ILI9488_MCU
+#    ifdef HAVE_ILI9488_SPI
 #      define GPIO_ILI9488_CDS  (GPIO_OUTPUT | GPIO_CFG_DEFAULT | GPIO_OUTPUT_CLEAR | \
                                  GPIO_PORT_PIOB | GPIO_PIN3)
 #      define GPIO_ILI9488_CS   (PIO_OUTPUT | GPIO_CFG_PULLUP | GPIO_OUTPUT_SET | \
                                  GPIO_PORT_PIOD | GPIO_PIN25)
 #      define ILI9488_PORT      SPI0_CS1
-#    endif /* HAVE_ILI9488_MCU */
+#    endif /* HAVE_ILI9488_SPI */
 
 #  elif defined(CONFIG_SAMV71XULT_MXTXPLND_EXT2)
 /* General definitions when connected via EXT2 */
@@ -223,21 +223,21 @@
 #      define IRQ_MXT_CHG       SAM_IRQ_PA2
 #    endif /* HAVE_MAXTOUCH */
 
-/* ILI9488 MCU mode definitions when connected via EXT2 */
+/* ILI9488 serial mode definitions when connected via EXT2 */
 
-#    ifdef HAVE_ILI9488_MCU
+#    ifdef HAVE_ILI9488_SPI
 #      define GPIO_ILI9488_CDS  (GPIO_OUTPUT | GPIO_CFG_DEFAULT | GPIO_OUTPUT_CLEAR | \
                                  GPIO_PORT_PIOA | GPIO_PIN6)
 #      define GPIO_ILI9488_CS   (PIO_OUTPUT | GPIO_CFG_PULLUP | GPIO_OUTPUT_SET | \
                                  GPIO_PORT_PIOD | GPIO_PIN27)
 #      define MXTXLPND_PORT     SPI0_CS3
-#    endif /* HAVE_ILI9488_MCU */
+#    endif /* HAVE_ILI9488_SPI */
 
 /* maXTouch Xplained Pro Xplained Pro LCD Connector *********************************/
 /*
- * Only the RGB is supported by this BSP (via SMC/EBI).  The switch mode
- * selector on the back of the maXtouch should be set in the OFF-ON-OFF
- * positions to select 16-bit color mode.
+ * Only the parallel mode is supported by this BSP (via SMC/EBI).  The switch mode
+ * selector on the back of the maXtouch should be set in the OFF-ON-OFF positions
+ * to select 16-bit color mode.
  *
  * ----------------- ------------- --------------------------------------------------
  *        LCD            SAMV71    Description
@@ -275,20 +275,20 @@
  * 30   N/C           -    -
  * 31   N/C           -    -
  * 32   GND           -   GND      Ground
- * 33   PCLK/        PC30 GPIO     RGB: Pixel clock Display RAM select.
- *      CMD_DATA_SEL               MCU: One address line of the MCU for displays where it
+ * 33   PCLK/        PC30 GPIO     SMC: Pixel clock Display RAM select.
+ *      CMD_DATA_SEL               SPI: One address line of the MCU for displays where it
  *                                      is possible to select either the register or the
  *                                      data interface
- * 34   VSYNC/CS     PD19 NCS3     RGB: Vertical synchronization.
- *                                 MCU: Chip select
- * 35   HSYNC/WE     PC8  NWE      RGB: Horizontal synchronization
- *                                 MCU: Write enable signal
- * 36   DATA ENABLE/ PC11 NRD      RGB: Data enable signal
- *      RE                         MCU: Read enable signal
- * 37   SPI SCK       -    -       MCU: Clock for SPI
- * 38   SPI MOSI      -    -       MCU: Master out slave in line of SPI
- * 39   SPI MISO      -    -       MCU: Master in slave out line of SPI
- * 40   SPI SS        -    -       MCU: Slave select for SPI
+ * 34   VSYNC/CS     PD19 NCS3     SMC: Vertical synchronization.
+ *                                 SPI: Chip select
+ * 35   HSYNC/WE     PC8  NWE      SMC: Horizontal synchronization
+ *                                 SPI: Write enable signal
+ * 36   DATA ENABLE/ PC11 NRD      SMC: Data enable signal
+ *      RE                         SPI: Read enable signal
+ * 37   SPI SCK       -    -       SPI: Clock for SPI
+ * 38   SPI MOSI      -    -       SPI: Master out slave in line of SPI
+ * 39   SPI MISO      -    -       SPI: Master in slave out line of SPI
+ * 40   SPI SS        -    -       SPI: Slave select for SPI
  * 41   N/C           -    -
  * 42   TWI SDA      PA3  TWD0     I2C data line (maXTouch®)
  * 43   TWI SCL      PA4  TWCK0    I2C clock line (maXTouch)
@@ -318,7 +318,7 @@
 #      define IRQ_MXT_CHG        SAM_IRQ_PD28
 #    endif /* HAVE_MAXTOUCH */
 
-/* ILI9488 RGB mode definitions when connected via LCD (EXT4) */
+/* ILI9488 parallel mode definitions when connected via LCD (EXT4) */
 
 #    define GPIO_ILI9488_CDS    (GPIO_OUTPUT | GPIO_CFG_DEFAULT | GPIO_OUTPUT_SET | \
                                  GPIO_PORT_PIOC | GPIO_PIN30)
diff --git a/nuttx/configs/samv71-xult/src/sam_ili9488.c b/nuttx/configs/samv71-xult/src/sam_ili9488.c
index 8cfe62101..3d77516cd 100644
--- a/nuttx/configs/samv71-xult/src/sam_ili9488.c
+++ b/nuttx/configs/samv71-xult/src/sam_ili9488.c
@@ -151,7 +151,7 @@
 #include "samv71-xult.h"
 #include "atmxt-xpro.h"
 
-#ifdef HAVE_ILI9488_RGB
+#ifdef HAVE_ILI9488_SMC
 
 /****************************************************************************
  * Pre-processor Definitions
@@ -1720,4 +1720,4 @@ void sam_lcdclear(uint16_t color)
     }
 }
 
-#endif /* HAVE_ILI9488_RGB */
+#endif /* HAVE_ILI9488_SMC */
diff --git a/nuttx/configs/samv71-xult/src/sam_maxtouch.c b/nuttx/configs/samv71-xult/src/sam_maxtouch.c
index 14615cc22..2a9bd970b 100644
--- a/nuttx/configs/samv71-xult/src/sam_maxtouch.c
+++ b/nuttx/configs/samv71-xult/src/sam_maxtouch.c
@@ -262,7 +262,7 @@ int board_tsc_setup(int minor)
           return -ENODEV;
         }
 
-       /* Configure maXTouch CHG interrupts */
+      /* Configure maXTouch CHG interrupts */
 
       sam_gpioirq(GPIO_MXT_CHG);
       (void)irq_attach(IRQ_MXT_CHG, mxt_interrupt);