Mirrors_Framework/nuttx
1
0
Fork 0
mirror of https://github.com/apache/nuttx.git synced 2026-06-06 08:36:24 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

SAMV71-XULT: Some improved naming

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