sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/arm/src/imxrt: Various fixes from attempt at initial bringup.

Browse Source
This commit is contained in:
Gregory Nutt 2018-05-14 16:07:34 -06:00
parent 3a34b29f76
commit 2fa738e08c
7 changed files with 907 additions and 895 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1711
arch/arm/src/imxrt/chip/imxrt105x_pinmux.h
View File

File diff suppressed because it is too large Load Diff

6
arch/arm/src/imxrt/imxrt_clockconfig.h
View File

@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __ARCH_ARM_SRC_IMRT_IMX_CLOCKCONFIG_H
#define __ARCH_ARM_SRC_IMRT_IMX_CLOCKCONFIG_H
#ifndef __ARCH_ARM_SRC_IMXRT_IMX_CLOCKCONFIG_H
#define __ARCH_ARM_SRC_IMXRT_IMX_CLOCKCONFIG_H
/****************************************************************************
* Included Files
@ -58,4 +58,4 @@
void imxrt_clockconfig(void);
#endif /* __ARCH_ARM_SRC_IMRT_IMX_CLOCKCONFIG_H */
#endif /* __ARCH_ARM_SRC_IMXRT_IMX_CLOCKCONFIG_H */

2
arch/arm/src/imxrt/imxrt_iomuxc.c
View File

@ -213,7 +213,7 @@ static const uint8_t g_mux2ctl_map[IMXRT_PADMUX_NREGISTERS] =
unsigned int imxrt_padmux_map(unsigned int padmux)
{
DEBUGASSERT(padmux < IMX_PADMUX_NREGISTERS);
DEBUGASSERT(padmux < IMXRT_PADMUX_NREGISTERS);
return (unsigned int)g_mux2ctl_map[padmux];
}

33
arch/arm/src/imxrt/imxrt_lowputc.c
View File

@ -46,6 +46,7 @@
#include "up_arch.h"
#include "chip/imxrt_iomuxc.h"
#include "chip/imxrt_pinmux.h"
#include "chip/imxrt_ccm.h"
#include "chip/imxrt_lpuart.h"
#include "imxrt_config.h"
@ -254,8 +255,8 @@ void imxrt_lowsetup(void)
* control is enabled.
*/
(void)imxrt_config_gpio(GPIO_LPUART1_RX_DATA);
(void)imxrt_config_gpio(GPIO_LPUART1_TX_DATA);
(void)imxrt_config_gpio(GPIO_LPUART1_RX);
(void)imxrt_config_gpio(GPIO_LPUART1_TX);
#ifdef CONFIG_LPUART1_OFLOWCONTROL
(void)imxrt_config_gpio(GPIO_LPUART1_CTS);
#endif
@ -270,8 +271,8 @@ void imxrt_lowsetup(void)
* control is enabled.
*/
(void)imxrt_config_gpio(GPIO_LPUART2_RX_DATA);
(void)imxrt_config_gpio(GPIO_LPUART2_TX_DATA);
(void)imxrt_config_gpio(GPIO_LPUART2_RX);
(void)imxrt_config_gpio(GPIO_LPUART2_TX);
#ifdef CONFIG_LPUART2_OFLOWCONTROL
(void)imxrt_config_gpio(GPIO_LPUART2_CTS);
#endif
@ -286,8 +287,8 @@ void imxrt_lowsetup(void)
* control is enabled.
*/
(void)imxrt_config_gpio(GPIO_LPUART3_RX_DATA);
(void)imxrt_config_gpio(GPIO_LPUART3_TX_DATA);
(void)imxrt_config_gpio(GPIO_LPUART3_RX);
(void)imxrt_config_gpio(GPIO_LPUART3_TX);
#ifdef CONFIG_LPUART3_OFLOWCONTROL
(void)imxrt_config_gpio(GPIO_LPUART3_CTS);
#endif
@ -302,8 +303,8 @@ void imxrt_lowsetup(void)
* control is enabled.
*/
(void)imxrt_config_gpio(GPIO_LPUART4_RX_DATA);
(void)imxrt_config_gpio(GPIO_LPUART4_TX_DATA);
(void)imxrt_config_gpio(GPIO_LPUART4_RX);
(void)imxrt_config_gpio(GPIO_LPUART4_TX);
#ifdef CONFIG_LPUART4_OFLOWCONTROL
(void)imxrt_config_gpio(GPIO_LPUART4_CTS);
#endif
@ -318,8 +319,8 @@ void imxrt_lowsetup(void)
* control is enabled.
*/
(void)imxrt_config_gpio(GPIO_LPUART5_RX_DATA);
(void)imxrt_config_gpio(GPIO_LPUART5_TX_DATA);
(void)imxrt_config_gpio(GPIO_LPUART5_RX);
(void)imxrt_config_gpio(GPIO_LPUART5_TX);
#ifdef CONFIG_LPUART5_OFLOWCONTROL
(void)imxrt_config_gpio(GPIO_LPUART5_CTS);
#endif
@ -334,8 +335,8 @@ void imxrt_lowsetup(void)
* control is enabled.
*/
(void)imxrt_config_gpio(GPIO_LPUART6_RX_DATA);
(void)imxrt_config_gpio(GPIO_LPUART6_TX_DATA);
(void)imxrt_config_gpio(GPIO_LPUART6_RX);
(void)imxrt_config_gpio(GPIO_LPUART6_TX);
#ifdef CONFIG_LPUART6_OFLOWCONTROL
(void)imxrt_config_gpio(GPIO_LPUART6_CTS);
#endif
@ -350,8 +351,8 @@ void imxrt_lowsetup(void)
* control is enabled.
*/
(void)imxrt_config_gpio(GPIO_LPUART7_RX_DATA);
(void)imxrt_config_gpio(GPIO_LPUART7_TX_DATA);
(void)imxrt_config_gpio(GPIO_LPUART7_RX);
(void)imxrt_config_gpio(GPIO_LPUART7_TX);
#ifdef CONFIG_LPUART7_OFLOWCONTROL
(void)imxrt_config_gpio(GPIO_LPUART7_CTS);
#endif
@ -366,8 +367,8 @@ void imxrt_lowsetup(void)
* control is enabled.
*/
(void)imxrt_config_gpio(GPIO_LPUART8_RX_DATA);
(void)imxrt_config_gpio(GPIO_LPUART8_TX_DATA);
(void)imxrt_config_gpio(GPIO_LPUART8_RX);
(void)imxrt_config_gpio(GPIO_LPUART8_TX);
#ifdef CONFIG_LPUART8_OFLOWCONTROL
(void)imxrt_config_gpio(GPIO_LPUART8_CTS);
#endif

6
arch/arm/src/imxrt/imxrt_wdog.h
View File

@ -33,8 +33,8 @@
*
****************************************************************************/
#ifndef __ARCH_ARM_SRC_IMRT_IMXRT_WDOG_H
#define __ARCH_ARM_SRC_IMRT_IMXRT_WDOG_H
#ifndef __ARCH_ARM_SRC_IMXRT_IMXRT_WDOG_H
#define __ARCH_ARM_SRC_IMXRT_IMXRT_WDOG_H
/****************************************************************************
* Included Files
@ -69,4 +69,4 @@
void imxrt_wdog_disable_all(void);
#endif /* __ARCH_ARM_SRC_IMRT_IMXRT_WDOG_H */
#endif /* __ARCH_ARM_SRC_IMXRT_IMXRT_WDOG_H */

11
configs/imxrt1050-evk/README.txt
View File

@ -44,10 +44,15 @@ Contents
Serial Console
==============
To be provided.
Virtual console port provided by OpenSDA:
GPIO_AD_B0_12 LPUART1_TX UART Console
GPIO_AD_B0_13 LPUART1_RX UART Console
UART1_TXD GPIO_AD_B0_12 LPUART1_TX
UART1_RXD GPIO_AD_B0_13 LPUART1_RX
Arduino RS-232 Shield:
J22 D0 UART_RX/D0 GPIO_AD_B1_07 LPUART3_RX
J22 D1 UART_TX/D1 GPIO_AD_B1_06 LPUART3_TX
LEDs and buttons
================

33
configs/imxrt1050-evk/include/board.h
View File

@ -74,21 +74,6 @@
#define BOARD_CPU_FREQUENCY \
(BOARD_XTAL_FREQUENCY * IMXRT_ARM_PLL_SELECT) / (IMXRT_ARM_CLOCK_DIVIDER + 1)
/* Define lpuart RF and TX pins
*
* WARNING: imxrt_pinmux.h should be added and used later.
*/
#define IOMUX_UART (IOMUX_PULL_UP_100K | IOMUX_CMOS_OUTPUT | \
IOMUX_DRIVE_40OHM | IOMUX_SLEW_FAST | \
IOMUX_SPEED_MEDIUM | IOMUX_SCHMITT_TRIGGER)
#define GPIO_LPUART1_RX_DATA (GPIO_PERIPH | GPIO_ALT2 | \
GPIO_PADMUX(IMXRT_PADMUX_GPIO_AD_B0_13_INDEX) | \
IOMUX_UART)
#define GPIO_LPUART1_TX_DATA (GPIO_PERIPH | GPIO_ALT2 | \
GPIO_PADMUX(IMXRT_PADMUX_GPIO_AD_B0_12_INDEX) | \
IOMUX_UART)
/* LED definitions ******************************************************************/
/* There are four LED status indicators located on the EVK Board. The functions of
* these LEDs include:
@ -148,6 +133,24 @@
#define BUTTON_SW8_BIT (1 << BUTTON_SW8)
/* PIO Disambiguation ***************************************************************/
/* LPUARTs
*
* Virtual console port provided by OpenSDA:
*
* UART1_TXD GPIO_AD_B0_12 LPUART1_TX
* UART1_RXD GPIO_AD_B0_13 LPUART1_RX
*
* NOTE: There are no alternative pin configurations for LPUART1.
*
* Arduino RS-232 Shield:
*
* J22 D0 UART_RX/D0 GPIO_AD_B1_07 LPUART3_RX
* J22 D1 UART_TX/D1 GPIO_AD_B1_06 LPUART3_TX
*/
#define GPIO_LPUART3_RX GPIO_LPUART3_RX_1 /* GPIO_AD_B1_07 */
#define GPIO_LPUART3_TX GPIO_LPUART3_TX_1 /* GPIO_AD_B1_06 */
/************************************************************************************
* Public Types