MIPS: tl-wdr4300: remove debug_uart_init call
In order to add a generic MIPS debug_uart_init call right before the call to board_early_init_f, we need to remove all calls to debug_uart_init from every MIPS boards. WDR4300 doesn't provide a board_debug_uart_init and configures pinmux in board_early_init_f instead. Since I have no idead of what's the needed uart pinmux config, I copied the whole pinmux config to a new function that is called from board_early_init_f if CONFIG_DEBUG_UART_BOARD_INIT is not enabled. Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
This commit is contained in:
parent
79f90ab1d2
commit
fa9aee3aa3
1 changed files with 14 additions and 4 deletions
|
@ -34,8 +34,7 @@ static void wdr4300_usb_start(void)
|
||||||
static inline void wdr4300_usb_start(void) {}
|
static inline void wdr4300_usb_start(void) {}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CONFIG_BOARD_EARLY_INIT_F
|
void wdr4300_pinmux_config(void)
|
||||||
int board_early_init_f(void)
|
|
||||||
{
|
{
|
||||||
void __iomem *regs;
|
void __iomem *regs;
|
||||||
|
|
||||||
|
@ -56,9 +55,20 @@ int board_early_init_f(void)
|
||||||
writel(0x00000000, regs + AR934X_GPIO_REG_OUT_FUNC3);
|
writel(0x00000000, regs + AR934X_GPIO_REG_OUT_FUNC3);
|
||||||
writel(0x0000004d, regs + AR934X_GPIO_REG_OUT_FUNC4);
|
writel(0x0000004d, regs + AR934X_GPIO_REG_OUT_FUNC4);
|
||||||
writel(0x00000000, regs + AR934X_GPIO_REG_OUT_FUNC5);
|
writel(0x00000000, regs + AR934X_GPIO_REG_OUT_FUNC5);
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_DEBUG_UART
|
#ifdef CONFIG_DEBUG_UART_BOARD_INIT
|
||||||
debug_uart_init();
|
void board_debug_uart_init(void)
|
||||||
|
{
|
||||||
|
wdr4300_pinmux_config();
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef CONFIG_BOARD_EARLY_INIT_F
|
||||||
|
int board_early_init_f(void)
|
||||||
|
{
|
||||||
|
#ifndef CONFIG_DEBUG_UART_BOARD_INIT
|
||||||
|
wdr4300_pinmux_config();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
|
#ifndef CONFIG_SKIP_LOWLEVEL_INIT
|
||||||
|
|
Loading…
Reference in a new issue