rockchip: rk3188: fix early uart setup

Commit 7a6d7d3e12 ("rockchip: pinctrl: rk3188: Move the iomux definitions
into pinctrl-driver") moved the iomux settings out of the grf header
to prevent conflicts with the iomux definitions of other rockchip socs.

This also breaks the early uart setup, as the iomux for uart2 are needed.
To fix that just put the tiny amount of needed iomux definitions next to
the early uart code.

Fixes: 7a6d7d3e12 ("rockchip: pinctrl: rk3188: Move the iomux definitions into pinctrl-driver")
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
This commit is contained in:
Heiko Stuebner 2018-10-08 13:01:57 +02:00 committed by Philipp Tomsich
parent 5b5ca4c0d4
commit 6c69ed19f9

View file

@ -103,6 +103,16 @@ void board_init_f(ulong dummy)
/* Example code showing how to enable the debug UART on RK3188 */
#ifdef EARLY_UART
enum {
GPIO1B1_SHIFT = 2,
GPIO1B1_MASK = 3,
GPIO1B1_UART2_SOUT = 1,
GPIO1B0_SHIFT = 0,
GPIO1B0_MASK = 3,
GPIO1B0_UART2_SIN = 1,
};
/* Enable early UART on the RK3188 */
rk_clrsetreg(&grf->gpio1b_iomux,
GPIO1B1_MASK << GPIO1B1_SHIFT |