Finishes LPC43xx uart bard configuration; LPC43 is ready to begin testing
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4918 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
patacongo
parent
531316bcea
commit
4a0b61ab76
@ -2964,5 +2964,7 @@
|
||||
* lib/net/lib_inetntoa.c: Fix typographical error that cause compilation
|
||||
failure on platforms that do not support passing of structures as
|
||||
parameters.
|
||||
|
||||
* arch/arm/*/lpc43xx and configs/lpc4330-xplorer and code complete and
|
||||
ready for testing. Hopefully, verified LPC43xx support will appear
|
||||
in NuttX-6.20.
|
||||
|
||||
|
||||
@ -319,7 +319,7 @@
|
||||
|
||||
#define UART_FDR_DIVADDVAL_SHIFT (0) /* Bits 0-3: Baud-rate generation pre-scaler divisor value */
|
||||
#define UART_FDR_DIVADDVAL_MASK (15 << UART_FDR_DIVADDVAL_SHIFT)
|
||||
#define UART_FDR_MULVAL_SHIFT (3) /* Bits 4-7 Baud-rate pre-scaler multiplier value */
|
||||
#define UART_FDR_MULVAL_SHIFT (4) /* Bits 4-7 Baud-rate pre-scaler multiplier value */
|
||||
#define UART_FDR_MULVAL_MASK (15 << UART_FDR_MULVAL_SHIFT)
|
||||
/* Bits 8-31: Reserved */
|
||||
/* Oversampling Register (USART only) */
|
||||
|
||||
@ -73,21 +73,14 @@
|
||||
|
||||
#if defined(USE_SERIALDRIVER) && defined(HAVE_UART)
|
||||
|
||||
/* We cannot allow the DLM/DLL divisor to become to small or will will lose too
|
||||
* much accuracy. This following is a "fudge factor" that represents the minimum
|
||||
* value of the divisor that we will permit.
|
||||
*/
|
||||
|
||||
#define UART_MINDL 32
|
||||
|
||||
/****************************************************************************
|
||||
* Private Types
|
||||
****************************************************************************/
|
||||
|
||||
struct up_dev_s
|
||||
{
|
||||
uint32_t uartbase; /* Base address of UART registers */
|
||||
uint8_t basefreq; /* Base frequency of input clock */
|
||||
uintptr_t uartbase; /* Base address of UART registers */
|
||||
uint32_t basefreq; /* Base frequency of input clock */
|
||||
uint32_t baud; /* Configured baud */
|
||||
uint32_t ier; /* Saved IER value */
|
||||
uint8_t id; /* ID=0,1,2,3 */
|
||||
@ -483,9 +476,9 @@ static uart_dev_t g_uart3port =
|
||||
# endif
|
||||
#endif /*HAVE_CONSOLE*/
|
||||
|
||||
/************************************************************************************
|
||||
/****************************************************************************
|
||||
* Inline Functions
|
||||
************************************************************************************/
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_serialin
|
||||
@ -548,29 +541,135 @@ static inline void up_enablebreaks(struct up_dev_s *priv, bool enable)
|
||||
up_serialout(priv, LPC43_UART_LCR_OFFSET, lcr);
|
||||
}
|
||||
|
||||
/************************************************************************************
|
||||
* Name: lpc43_uartdl
|
||||
*
|
||||
* Descrption:
|
||||
* Select a divider to produce the BAUD from the UART BASEFREQ.
|
||||
*
|
||||
* BAUD = BASEFREQ / (16 * DL), or
|
||||
* DL = BASEFREQ / BAUD / 16
|
||||
*
|
||||
* Ignoring the fractional divider for now.
|
||||
*
|
||||
************************************************************************************/
|
||||
|
||||
static inline uint32_t lpc43_uartdl(uint32_t baud)
|
||||
{
|
||||
#warning "Missing logic"
|
||||
return 0;
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
* Private Functions
|
||||
****************************************************************************/
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_setbaud
|
||||
*
|
||||
* Description:
|
||||
* Configure the U[S]ART divisors to accomplish the desired BAUD given the
|
||||
* U[S]ART base frequency.
|
||||
*
|
||||
****************************************************************************/
|
||||
|
||||
void up_setbaud(struct up_dev_s *priv)
|
||||
{
|
||||
uint32_t lcr; /* Line control register value */
|
||||
uint32_t dl; /* Best DLM/DLL full value */
|
||||
uint32_t mul; /* Best FDR MULVALL value */
|
||||
uint32_t divadd; /* Best FDR DIVADDVAL value */
|
||||
uint32_t best; /* Error value associated with best {dl, mul, divadd} */
|
||||
uint32_t cdl; /* Candidate DLM/DLL full value */
|
||||
uint32_t cmul; /* Candidate FDR MULVALL value */
|
||||
uint32_t cdivadd; /* Candidate FDR DIVADDVAL value */
|
||||
uint32_t errval; /* Error value associated with the candidate */
|
||||
|
||||
/* The U[S]ART buad is given by:
|
||||
*
|
||||
* Fbaud = Fbase * mul / (mul + divadd) / (16 * dl)
|
||||
* dl = Fbase * mul / (mul + divadd) / Fbaud / 16
|
||||
* = Fbase * mul / ((mul + divadd) * Fbaud * 16)
|
||||
* = ((Fbase * mul) >> 4) / ((mul + divadd) * Fbaud)
|
||||
*
|
||||
* Where the value of MULVAL and DIVADDVAL comply with:
|
||||
*
|
||||
* 0 < mul < 16
|
||||
* 0 <= divadd < mul
|
||||
*/
|
||||
|
||||
best = UINT32_MAX;
|
||||
divadd = 0;
|
||||
mul = 0;
|
||||
dl = 0;
|
||||
|
||||
/* Try each mulitplier value in the valid range */
|
||||
|
||||
for (cmul = 1 ; cmul < 16; cmul++)
|
||||
{
|
||||
/* Try each divider value in the valid range */
|
||||
|
||||
for (cdivadd = 0 ; cdivadd < cmul ; cdivadd++)
|
||||
{
|
||||
/* Candidate:
|
||||
* dl = ((Fbase * mul) >> 4) / ((mul + cdivadd) * Fbaud)
|
||||
* (dl << 32) = (Fbase << 28) * cmul / ((mul + cdivadd) * Fbaud)
|
||||
*/
|
||||
|
||||
uint64_t dl64 = ((uint64_t)priv->basefreq << 28) * cmul /
|
||||
((cmul + cdivadd) * priv->baud);
|
||||
|
||||
/* The lower 32-bits of this value is the error */
|
||||
|
||||
errval = (uint32_t)(dl64 & 0x00000000ffffffffull);
|
||||
|
||||
/* The upper 32-bits is the candidate DL value */
|
||||
|
||||
cdl = (uint32_t)(dl64 >> 32);
|
||||
|
||||
/* Round up */
|
||||
|
||||
if (errval > (1 << 31))
|
||||
{
|
||||
errval = -errval;
|
||||
cdl++;
|
||||
}
|
||||
|
||||
/* Check if the resulting candidate DL value is within range */
|
||||
|
||||
if (cdl < 1 || cdl > 65536)
|
||||
{
|
||||
/* No... try a different divadd value */
|
||||
|
||||
continue;
|
||||
}
|
||||
|
||||
/* Is this the best combination that we have seen so far? */
|
||||
|
||||
if (errval < best)
|
||||
{
|
||||
/* Yes.. then the candidate is out best guess so far */
|
||||
|
||||
best = errval;
|
||||
dl = cdl;
|
||||
divadd = cdivadd;
|
||||
mul = cmul;
|
||||
|
||||
/* If the new best guess is exact (within our precision), then
|
||||
* we are finished.
|
||||
*/
|
||||
|
||||
if (best == 0)
|
||||
{
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
DEBUGASSERT(dl > 0);
|
||||
|
||||
/* Enter DLAB=1 */
|
||||
|
||||
lcr = up_serialin(priv, LPC43_UART_LCR_OFFSET);
|
||||
up_serialout(priv, LPC43_UART_LCR_OFFSET, lcr | UART_LCR_DLAB);
|
||||
|
||||
/* Save then divider values */
|
||||
|
||||
up_serialout(priv, LPC43_UART_DLM_OFFSET, dl >> 8);
|
||||
up_serialout(priv, LPC43_UART_DLL_OFFSET, dl & 0xff);
|
||||
|
||||
/* Clear DLAB */
|
||||
|
||||
up_serialout(priv, LPC43_UART_LCR_OFFSET, lcr & ~UART_LCR_DLAB);
|
||||
|
||||
/* Then save the fractional divider values */
|
||||
|
||||
up_serialout(priv, LPC43_UART_FDR_OFFSET,
|
||||
(mul << UART_FDR_MULVAL_SHIFT) | (divadd << UART_FDR_DIVADDVAL_SHIFT));
|
||||
}
|
||||
|
||||
/****************************************************************************
|
||||
* Name: up_setup
|
||||
*
|
||||
@ -584,7 +683,6 @@ static int up_setup(struct uart_dev_s *dev)
|
||||
{
|
||||
#ifndef CONFIG_SUPPRESS_LPC43_UART_CONFIG
|
||||
struct up_dev_s *priv = (struct up_dev_s*)dev->priv;
|
||||
uint16_t dl;
|
||||
uint32_t lcr;
|
||||
|
||||
/* Clear fifos */
|
||||
@ -626,19 +724,13 @@ static int up_setup(struct uart_dev_s *dev)
|
||||
lcr |= (UART_LCR_PE|UART_LCR_PS_EVEN);
|
||||
}
|
||||
|
||||
/* Enter DLAB=1 */
|
||||
/* Save the LCR */
|
||||
|
||||
up_serialout(priv, LPC43_UART_LCR_OFFSET, (lcr | UART_LCR_DLAB));
|
||||
up_serialout(priv, LPC43_UART_LCR_OFFSET, lcr);
|
||||
|
||||
/* Set the BAUD divisor */
|
||||
|
||||
dl = lpc43_uartdl(priv->baud);
|
||||
up_serialout(priv, LPC43_UART_DLM_OFFSET, dl >> 8);
|
||||
up_serialout(priv, LPC43_UART_DLL_OFFSET, dl & 0xff);
|
||||
|
||||
/* Clear DLAB */
|
||||
|
||||
up_serialout(priv, LPC43_UART_LCR_OFFSET, lcr);
|
||||
up_setbaud(priv);
|
||||
|
||||
/* Configure the FIFOs */
|
||||
|
||||
@ -648,7 +740,7 @@ static int up_setup(struct uart_dev_s *dev)
|
||||
/* Enable Auto-RTS and Auto-CS Flow Control in the Modem Control Register */
|
||||
|
||||
#ifdef CONFIG_UART1_FLOWCONTROL
|
||||
if (priv->uartbase == LPC43_UART1_BASE)
|
||||
if (priv->id == 1)
|
||||
{
|
||||
up_serialout(priv, LPC43_UART_MCR_OFFSET, (UART_MCR_RTSEN|UART_MCR_CTSEN));
|
||||
}
|
||||
|
||||
@ -155,7 +155,8 @@
|
||||
*
|
||||
* BASEFREQ = CCLK / divisor
|
||||
*
|
||||
* Ignoring the fractional divider for now.
|
||||
* Ignoring the fractional divider for now (the console UART will be reconfigured
|
||||
* later in the boot sequencye, then the fractional dividers will be set properly).
|
||||
*
|
||||
* Check divisor == 1. This works if the upper limit is met
|
||||
*
|
||||
@ -527,5 +528,3 @@ void lpc43_usart3_setup(void)
|
||||
irqrestore(flags);
|
||||
};
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
@ -8,6 +8,7 @@ Contents
|
||||
========
|
||||
|
||||
- LPC4330-Xplorer development board
|
||||
- Status
|
||||
- Development Environment
|
||||
- GNU Toolchain Options
|
||||
- IDEs
|
||||
@ -48,6 +49,72 @@ LPC4330-Xplorer board
|
||||
|
||||
The LPC4330-Xplorer default console is the USB1 virtual COM port (VCOM).
|
||||
|
||||
Status
|
||||
======
|
||||
|
||||
Where is the current status of the LPC43xx port:
|
||||
|
||||
- The basic OS test configuration is fully coded a ready for test.
|
||||
This includes: SYSTICK system time, pin and GPIO configuration,
|
||||
basic UART support.
|
||||
|
||||
- The following drivers have been copied from the LPC17xx port, but
|
||||
require integration into the LPC43xx. This integration should
|
||||
consist of:
|
||||
|
||||
- Remove LPC17xx power, clocking, and pin configuration logic.
|
||||
- Adding of clock source and frequency to the board.h file.
|
||||
- Adding of LPC43 clock connection and pin configuration logic.
|
||||
|
||||
Within any luck, these drivers should come up very quickly:
|
||||
|
||||
- lpc43_adc.c,
|
||||
- lpc43_dac.c,
|
||||
- lpc43_gpdma.c,
|
||||
- lpc43_i2c.c,
|
||||
- lpc43_spi.c, and
|
||||
- lpc43_ssp.c
|
||||
|
||||
These LPC17xx drivers were not brought into the LPC43xx port because
|
||||
it appears the the peripherals have been completely redesigned:
|
||||
|
||||
- CAN,
|
||||
- Ethernet,
|
||||
- USB device, and
|
||||
- USB host.
|
||||
|
||||
The following LPC43xx peripherals are unsupported. Some may be
|
||||
compatible with the LPC17xx, but there is no LPC17xx driver to be
|
||||
ported:
|
||||
|
||||
- SD/MMC,
|
||||
- EMC,
|
||||
- SPIFI,
|
||||
- USB0,
|
||||
- USB1,
|
||||
- Ethernet,
|
||||
- LCD,
|
||||
- SCT,
|
||||
- Timers 0-3
|
||||
- MCPWM,
|
||||
- QEI,
|
||||
- Alarm timer,
|
||||
- WWDT,
|
||||
- RTC,
|
||||
- Event monitor, and
|
||||
- CAN,
|
||||
|
||||
For the missing drivers some of these can be leveraged from other
|
||||
MCUs that appear to support the same peripheral IP.
|
||||
|
||||
- USB0 appears to be the same as the USB OTG peripheral for the
|
||||
LPC31xx. It should be possible to drop in the LPC31xx driver
|
||||
with a small porting effort.
|
||||
|
||||
- The Ethernet block looks to be based on the same IP as the
|
||||
STM32 Ethernet and, as a result, it should be possible to leverage
|
||||
the STM32 Ethernet driver with a little more effort.
|
||||
|
||||
Development Environment
|
||||
=======================
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user