From: Paul Beesley <paul.beesley@arm.com>
Date: Thu, 15 Aug 2019 15:30:13 +0000 (+0000)
Subject: Merge changes from topic "rockchip-uart-fixes" into integration
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=99becbe3dff999c4a54bf641b5afe846d3ac20a8;p=project%2Fbcm63xx%2Fatf.git

Merge changes from topic "rockchip-uart-fixes" into integration

* changes:
  rockchip: rk3399: store actual debug uart information on suspend
  rockchip: move dt-coreboot uart distinction into param handling code
  rockchip: make uart baudrate configurable
  rockchip: px30: add uart5 as option for serial output
---

99becbe3dff999c4a54bf641b5afe846d3ac20a8
diff --cc plat/rockchip/common/include/plat_private.h
index 714a8bf9,98143b7f..990d1065
--- a/plat/rockchip/common/include/plat_private.h
+++ b/plat/rockchip/common/include/plat_private.h
@@@ -139,8 -139,10 +139,10 @@@ extern uint32_t cpuson_flags[PLATFORM_C
  extern const mmap_region_t plat_rk_mmap[];
  
  uint32_t rockchip_get_uart_base(void);
+ uint32_t rockchip_get_uart_baudrate(void);
+ uint32_t rockchip_get_uart_clock(void);
  
 -#endif /* __ASSEMBLY__ */
 +#endif /* __ASSEMBLER__ */
  
  /******************************************************************************
   * cpu up status