Commit c40a763b authored by Jean-Christophe PLAGNIOL-VILLARD's avatar Jean-Christophe PLAGNIOL-VILLARD Committed by Nicolas Ferre

ARM: at91: uncompress Store UART address in a variable

This will allow a future change to auto-detect which UART to use.
Signed-off-by: default avatarJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: default avatarNicolas Ferre <nicolas.ferre@atmel.com>
parent 1234f4ba
...@@ -43,6 +43,14 @@ ...@@ -43,6 +43,14 @@
#define UART_OFFSET AT91_USART5 #define UART_OFFSET AT91_USART5
#endif #endif
void __iomem *at91_uart;
static inline void arch_decomp_setup(void)
{
#ifdef UART_OFFSET
at91_uart = (void __iomem *) UART_OFFSET; /* physical address */
#endif
}
/* /*
* The following code assumes the serial port has already been * The following code assumes the serial port has already been
* initialized by the bootloader. If you didn't setup a port in * initialized by the bootloader. If you didn't setup a port in
...@@ -53,27 +61,21 @@ ...@@ -53,27 +61,21 @@
static void putc(int c) static void putc(int c)
{ {
#ifdef UART_OFFSET #ifdef UART_OFFSET
void __iomem *sys = (void __iomem *) UART_OFFSET; /* physical address */ while (!(__raw_readl(at91_uart + ATMEL_US_CSR) & ATMEL_US_TXRDY))
while (!(__raw_readl(sys + ATMEL_US_CSR) & ATMEL_US_TXRDY))
barrier(); barrier();
__raw_writel(c, sys + ATMEL_US_THR); __raw_writel(c, at91_uart + ATMEL_US_THR);
#endif #endif
} }
static inline void flush(void) static inline void flush(void)
{ {
#ifdef UART_OFFSET #ifdef UART_OFFSET
void __iomem *sys = (void __iomem *) UART_OFFSET; /* physical address */
/* wait for transmission to complete */ /* wait for transmission to complete */
while (!(__raw_readl(sys + ATMEL_US_CSR) & ATMEL_US_TXEMPTY)) while (!(__raw_readl(at91_uart + ATMEL_US_CSR) & ATMEL_US_TXEMPTY))
barrier(); barrier();
#endif #endif
} }
#define arch_decomp_setup()
#define arch_decomp_wdog() #define arch_decomp_wdog()
#endif #endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment