sysmo-bts
/
u-boot
9
0
Fork 0
Code Pull Requests Releases Activity

Blackfin: serial: clean up muxing a bit 

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Mike Frysinger 2010-12-17 16:23:59 -05:00
parent dbb6d366e3
commit baaa4f9ce2
1 changed files with 20 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
arch/blackfin/cpu/serial.h
View File

@ -74,23 +74,19 @@ struct bfin_mmr_serial {
};
#undef __BFP
#ifndef UART_LSR
# if (CONFIG_UART_CONSOLE == 3)
# define UART_BASE UART3_DLL
# elif (CONFIG_UART_CONSOLE == 2)
# define UART_BASE UART2_DLL
# elif (CONFIG_UART_CONSOLE == 1)
# define UART_BASE UART1_DLL
# elif (CONFIG_UART_CONSOLE == 0)
# define UART_BASE UART0_DLL
# endif
#define __PASTE_UART(num, pfx, sfx) pfx##num##_##sfx
#define _PASTE_UART(num, pfx, sfx) __PASTE_UART(num, pfx, sfx)
#define MMR_UART(mmr) _PASTE_UART(CONFIG_UART_CONSOLE, UART, DLL)
#define P_UART(pin) _PASTE_UART(CONFIG_UART_CONSOLE, P_UART, pin)
#ifndef UART_DLL
# define UART_DLL MMR_UART(DLL)
#else
# if CONFIG_UART_CONSOLE != 0
# error CONFIG_UART_CONSOLE must be 0 on parts with only one UART
# endif
# define UART_BASE UART_DLL
#endif
#define pUART ((volatile struct bfin_mmr_serial *)UART_BASE)
#define pUART ((volatile struct bfin_mmr_serial *)UART_DLL)
#ifdef __ADSPBF54x__
# define ACCESS_LATCH()
@ -106,18 +102,7 @@ __attribute__((always_inline))
static inline void serial_do_portmux(void)
{
if (!BFIN_DEBUG_EARLY_SERIAL) {
const unsigned short pins[] = {
#if CONFIG_UART_CONSOLE == 0
P_UART0_TX, P_UART0_RX,
#elif CONFIG_UART_CONSOLE == 1
P_UART1_TX, P_UART1_RX,
#elif CONFIG_UART_CONSOLE == 2
P_UART2_TX, P_UART2_RX,
#elif CONFIG_UART_CONSOLE == 3
P_UART3_TX, P_UART3_RX,
#endif
0,
};
const unsigned short pins[] = { P_UART(RX), P_UART(TX), 0, };
peripheral_request_list(pins, "bfin-uart");
return;
}
@ -141,13 +126,11 @@ static inline void serial_do_portmux(void)
}
SSYNC();
#elif defined(__ADSPBF537__) || defined(__ADSPBF536__) || defined(__ADSPBF534__)
# define DO_MUX(func, tx, rx) \
bfin_write_PORT_MUX(bfin_read_PORT_MUX() & ~(func)); \
bfin_write_PORTF_FER(bfin_read_PORTF_FER() | PF##tx | PF##rx);
switch (CONFIG_UART_CONSOLE) {
case 0: DO_MUX(PFDE, 0, 1); break;
case 1: DO_MUX(PFTE, 2, 3); break;
}
const uint16_t func[] = { PFDE, PFTE, };
bfin_write_PORT_MUX(bfin_read_PORT_MUX() & ~func[CONFIG_UART_CONSOLE]);
bfin_write_PORTF_FER(bfin_read_PORTF_FER() |
(1 << P_IDENT(P_UART(RX))) |
(1 << P_IDENT(P_UART(TX))));
SSYNC();
#elif defined(__ADSPBF54x__)
# define DO_MUX(port, tx, rx) \
@ -160,6 +143,12 @@ static inline void serial_do_portmux(void)
case 3: DO_MUX(B, 6, 7); break; /* Port B; PB6 and PB7 */
}
SSYNC();
#elif defined(__ADSPBF561__)
/* UART pins could be GPIO, but they aren't pin muxed. */
#else
# if (P_UART(RX) & P_DEFINED) || (P_UART(TX) & P_DEFINED)
# error "missing portmux logic for UART"
# endif
#endif
}