rockchip: rk3399: spl: Make baudrate and UART configurable

The RK3399-Q7 ("Puma") SoM exposes UART0 as the Qseven UART (i.e. the serial line available via standardised pins on the edge connector and available on a RS232 connector).

To support boards (such as the RK3399-Q7) that require UART0 as a debug console, we match CONFIG_DEBUG_UART_BASE and add the appropriate iomux setup to the rk3399 SPL code.

As we are already touching this code, we also move the board-specific UART setup (i.e. iomux setup) into board_debug_uart_init(). This will be called from the debug UART init when CONFIG_DEBUG_UART_BOARD_INIT is set.

Signed-off-by Philipp Tomsich <[email protected]>

---

Changes in v2:
- Changed hex constant to lowercase

  arch/arm/include/asm/arch-rockchip/grf_rk3399.h |  8 +++++++
  arch/arm/mach-rockchip/rk3399-board-spl.c       | 29 ++++++++++++++++++-------
  2 files changed, 29 insertions(+), 8 deletions(-)

arch/arm/include/asm/arch-rockchip/grf_rk3399.h +8 -0

index 62d8496..4701cfb 100644
@@ -333,6 +333,14 @@ enum {
  	GRF_GPIO2B4_SEL_MASK	= 3 << GRF_GPIO2B4_SEL_SHIFT,
  	GRF_SPI2TPM_CSN0	= 1,
 
+	/* GRF_GPIO2C_IOMUX */
+	GRF_GPIO2C0_SEL_SHIFT   = 0,
+	GRF_GPIO2C0_SEL_MASK    = 3 << GRF_GPIO2C0_SEL_SHIFT,
+	GRF_UART0BT_SIN         = 1,
+	GRF_GPIO2C1_SEL_SHIFT   = 2,
+	GRF_GPIO2C1_SEL_MASK    = 3 << GRF_GPIO2C1_SEL_SHIFT,
+	GRF_UART0BT_SOUT        = 1,
+
  	/* GRF_GPIO3A_IOMUX */
  	GRF_GPIO3A4_SEL_SHIFT	= 8,
  	GRF_GPIO3A4_SEL_MASK	= 3 << GRF_GPIO3A4_SEL_SHIFT,

arch/arm/mach-rockchip/rk3399-board-spl.c +14 -8

index 7b4e0a1..c212143 100644
@@ -57,19 +57,22 @@ void secure_timer_init(void)
  	writel(TIMER_EN | TIMER_FMODE, TIMER_CHN10_BASE + TIMER_CONTROL_REG);
  }
 
-#define GRF_EMMCCORE_CON11 0xff77f02c
-void board_init_f(ulong dummy)
+void board_debug_uart_init(void)
  {
-	struct udevice *pinctrl;
-	struct udevice *dev;
-	int ret;
-
-	/* Example code showing how to enable the debug UART on RK3288 */
  #include <asm/arch/grf_rk3399.h>
-	/* Enable early UART2 channel C on the RK3399 */
  #define GRF_BASE	0xff770000
  	struct rk3399_grf_regs * const grf = (void *)GRF_BASE;
 
+#if defined(CONFIG_DEBUG_UART_BASE) && (CONFIG_DEBUG_UART_BASE == 0xff180000)
+	/* Enable early UART0 on the RK3399 */
+	rk_clrsetreg(&grf->gpio2c_iomux,
+		     GRF_GPIO2C0_SEL_MASK,
+		     GRF_UART0BT_SIN << GRF_GPIO2C0_SEL_SHIFT);
+	rk_clrsetreg(&grf->gpio2c_iomux,
+		     GRF_GPIO2C1_SEL_MASK,
+		     GRF_UART0BT_SOUT << GRF_GPIO2C1_SEL_SHIFT);
+#else
+	/* Enable early UART2 channel C on the RK3399 */
  	rk_clrsetreg(&grf->gpio4c_iomux,
  		     GRF_GPIO4C3_SEL_MASK,
  		     GRF_UART2DGBC_SIN << GRF_GPIO4C3_SEL_SHIFT);

@@ -80,6 +83,16 @@ void board_init_f(ulong dummy)
  	rk_clrsetreg(&grf->soc_con7,
  		     GRF_UART_DBG_SEL_MASK,
  		     GRF_UART_DBG_SEL_C << GRF_UART_DBG_SEL_SHIFT);
+#endif
+}
+

Hi Philipp,

Quoted 23 lines · Philipp Tomsich

The RK3399-Q7 ("Puma") SoM exposes UART0 as the Qseven UART (i.e. the serial line available via standardised pins on the edge connector and available on a RS232 connector).

To support boards (such as the RK3399-Q7) that require UART0 as a debug console, we match CONFIG_DEBUG_UART_BASE and add the appropriate iomux setup to the rk3399 SPL code.

As we are already touching this code, we also move the board-specific UART setup (i.e. iomux setup) into board_debug_uart_init(). This will be called from the debug UART init when CONFIG_DEBUG_UART_BOARD_INIT is set.

Signed-off-by Philipp Tomsich <[email protected]>

---

Changes in v2:
- Changed hex constant to lowercase

  arch/arm/include/asm/arch-rockchip/grf_rk3399.h |  8 +++++++
  arch/arm/mach-rockchip/rk3399-board-spl.c       | 29 ++++++++++++++++++-------
  2 files changed, 29 insertions(+), 8 deletions(-)

Hi,

Quoted 28 lines · On 23 March 2017 at 20:12, Kever Yang <kever.yang at rock-chips.com…

Hi Philipp,

Quoted 23 lines · Philipp Tomsich

The RK3399-Q7 ("Puma") SoM exposes UART0 as the Qseven UART (i.e. the serial line available via standardised pins on the edge connector and available on a RS232 connector).

To support boards (such as the RK3399-Q7) that require UART0 as a debug console, we match CONFIG_DEBUG_UART_BASE and add the appropriate iomux setup to the rk3399 SPL code.

As we are already touching this code, we also move the board-specific UART setup (i.e. iomux setup) into board_debug_uart_init(). This will be called from the debug UART init when CONFIG_DEBUG_UART_BOARD_INIT is set.

Signed-off-by Philipp Tomsich <[email protected]>

---

Changes in v2:
- Changed hex constant to lowercase

 arch/arm/include/asm/arch-rockchip/grf_rk3399.h |  8 +++++++
 arch/arm/mach-rockchip/rk3399-board-spl.c       | 29 ++++++++++++++++++-------
 2 files changed, 29 insertions(+), 8 deletions(-)

This patch causes a build error for me:

aarch64: + evb-rk3399
+arch/arm/mach-rockchip/rk3399-board-spl.c:60:6: error: redefinition of 'board_debug_uart_init'
+ void board_debug_uart_init(void)

(quoted diff) +3 -0

+      ^
+In file included from arch/arm/mach-rockchip/rk3399-board-spl.c:8:0:
+include/debug_uart.h:68:20: note: previous definition of

'board_debug_uart_init' was here
+ static inline void board_debug_uart_init(void)

(quoted diff) +5 -0

+                    ^
+make[3]: *** [spl/arch/arm/mach-rockchip/rk3399-board-spl.o] Error 1
+make[2]: *** [spl/arch/arm/mach-rockchip] Error 2
+make[1]: *** [spl/u-boot-spl] Error 2
+make: *** [sub-make] Error 2

Regards,
Simon

Simon,

you’ll need
CONFIG_DEBUG_UART_BOARD_INIT=y
as include/debug_uart.h checks this macro and either defines this function inline (with
an empty body) or allows the function definition.

Seems like everyone just adds this to their defconfig (as did we), but I am open towards
an automatic selection of this for ROCKCHIP_RK3399 via Kconfig.

Regards,
Philipp.

On 26 Mar 2017, at 04:38, Simon Glass <[email protected]> wrote:

Hi,

On 23 March 2017 at 20:12, Kever Yang <[email protected]> wrote:

Hi Philipp,

On 03/24/2017 06:24 AM, Philipp Tomsich wrote:

The RK3399-Q7 ("Puma") SoM exposes UART0 as the Qseven UART (i.e. the serial line available via standardised pins on the edge connector and available on a RS232 connector).

To support boards (such as the RK3399-Q7) that require UART0 as a debug console, we match CONFIG_DEBUG_UART_BASE and add the appropriate iomux setup to the rk3399 SPL code.

As we are already touching this code, we also move the board-specific UART setup (i.e. iomux setup) into board_debug_uart_init(). This will be called from the debug UART init when CONFIG_DEBUG_UART_BOARD_INIT is set.

Signed-off-by Philipp Tomsich <[email protected]>

---

Changes in v2:
- Changed hex constant to lowercase

 arch/arm/include/asm/arch-rockchip/grf_rk3399.h |  8 +++++++
 arch/arm/mach-rockchip/rk3399-board-spl.c       | 29
++++++++++++++++++-------
 2 files changed, 29 insertions(+), 8 deletions(-)

This patch causes a build error for me:

aarch64: + evb-rk3399
+arch/arm/mach-rockchip/rk3399-board-spl.c:60:6: error: redefinition of 'board_debug_uart_init'
+ void board_debug_uart_init(void)

(quoted diff) +3 -0

+      ^
+In file included from arch/arm/mach-rockchip/rk3399-board-spl.c:8:0:
+include/debug_uart.h:68:20: note: previous definition of

'board_debug_uart_init' was here
+ static inline void board_debug_uart_init(void)

With everything set up to define CONFIG_BAUDRATE via defconfig and with to have the SPL debug UART either on UART0 or UART2, the configs for the RK3399 EVB and for the RK3399-Q7 can be updated.

Signed-off-by Philipp Tomsich <[email protected]>

---

Changes in v2: None

  configs/evb-rk3399_defconfig    | 2 ++
  configs/puma_defconfig          | 4 +++-
  include/configs/rk3399_common.h | 1 -
  3 files changed, 5 insertions(+), 2 deletions(-)

configs/evb-rk3399_defconfig +2 -0

index 22405ce..7a82869 100644
@@ -43,7 +43,9 @@ CONFIG_DM_REGULATOR_FIXED=y
  CONFIG_PWM_ROCKCHIP=y
  CONFIG_RAM=y
  CONFIG_SPL_RAM=y
+CONFIG_BAUDRATE=1500000
  CONFIG_DEBUG_UART=y
+CONFIG_DEBUG_UART_BOARD_INIT=y
  CONFIG_DEBUG_UART_BASE=0xFF1A0000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_DEBUG_UART_SHIFT=2

configs/puma_defconfig +3 -1

index 515185e..8e29d96 100644
@@ -43,8 +43,10 @@ CONFIG_DM_REGULATOR_FIXED=y
  CONFIG_PWM_ROCKCHIP=y
  CONFIG_RAM=y
  CONFIG_SPL_RAM=y
+CONFIG_BAUDRATE=115200
  CONFIG_DEBUG_UART=y
-CONFIG_DEBUG_UART_BASE=0xFF1A0000
+CONFIG_DEBUG_UART_BOARD_INIT=y
+CONFIG_DEBUG_UART_BASE=0xFF180000
  CONFIG_DEBUG_UART_CLOCK=24000000
  CONFIG_DEBUG_UART_SHIFT=2
  CONFIG_SYS_NS16550=y

include/configs/rk3399_common.h +0 -0

index bc91eb6..c1ea616 100644