From 9e7e98671d66a6048bbdcfaa1e8a68f4a2f97224 Mon Sep 17 00:00:00 2001 From: Varun Wadekar Date: Wed, 4 Mar 2020 13:47:13 -0800 Subject: [PATCH] Tegra: spe: use CONSOLE_T_BASE to save MMIO base address Commit ac71344e9eca1f7d1e0ce4a67aca776470639b1c moved the base address for the MMIO aperture of the console inside the console_t struct. As a result, the driver should now save the MMIO base address to console_t at offset marked by the CONSOLE_T_BASE macro. This patch updates the SPE console driver to use the CONSOLE_T_BASE macro to save/access the MMIO base address. Signed-off-by: Varun Wadekar Change-Id: I42afc2608372687832932269108ed642f218fd40 --- plat/nvidia/tegra/common/drivers/spe/shared_console.S | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plat/nvidia/tegra/common/drivers/spe/shared_console.S b/plat/nvidia/tegra/common/drivers/spe/shared_console.S index c783373dd..6df73ec24 100644 --- a/plat/nvidia/tegra/common/drivers/spe/shared_console.S +++ b/plat/nvidia/tegra/common/drivers/spe/shared_console.S @@ -69,7 +69,7 @@ func console_spe_register check_if_console_is_ready x0, x1, x2, register_fail cbz x3, register_fail - str x0, [x3, #CONSOLE_T_DRVDATA] + str x0, [x3, #CONSOLE_T_BASE] mov x0, x3 finish_console_register spe putc=1, getc=1, flush=1 @@ -132,7 +132,7 @@ endfunc console_spe_core_putc * -------------------------------------------------------- */ func console_spe_putc - ldr x1, [x1, #CONSOLE_T_DRVDATA] + ldr x1, [x1, #CONSOLE_T_BASE] b console_spe_core_putc endfunc console_spe_putc @@ -183,6 +183,6 @@ endfunc console_spe_core_flush * --------------------------------------------- */ func console_spe_flush - ldr x0, [x0, #CONSOLE_T_DRVDATA] + ldr x0, [x0, #CONSOLE_T_BASE] b console_spe_core_flush endfunc console_spe_flush