arm: jetson tk1: use 7006300 as default debug console

The page of the Jetson TK1 UARTs is 0x70006000, the DB9 debug uart is 0x300 inside that page. Moving this offset to the configuration allows us to consolidate uart-tegra and uart-8250-dw. Signed-off-by: Ralf Ramsauer <ralf.ramsauer@oth-regensburg.de> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
siemens · Nov 29, 2016 · 21b36c4 · 21b36c4
1 parent 2a7c873
commit 21b36c4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/configs/jetson-tk1.c b/configs/jetson-tk1.c
@@ -35,8 +35,8 @@ struct {
 			.size = 0x4000000 - 0x100000, /* -1MB (PSCI) */
 		},
 		.debug_console = {
-			.address = 0x70006000,
-			.size = 0x1000,
+			.address = 0x70006300,
+			.size = 0x40,
 			/* .divider = 0xdd, */
 			.flags = JAILHOUSE_CON_TYPE_UART_ARM |
 				 JAILHOUSE_CON_FLAG_MMIO,

diff --git a/hypervisor/arch/arm/include/asm/uart-tegra.h b/hypervisor/arch/arm/include/asm/uart-tegra.h
@@ -25,7 +25,6 @@
 
 static void uart_init(struct uart_chip *chip)
 {
-	chip->virt_base += 0x300;
 }
 
 static void uart_wait(struct uart_chip *chip)

diff --git a/inmates/lib/arm/include/mach-tegra124/mach/uart.h b/inmates/lib/arm/include/mach-tegra124/mach/uart.h
@@ -10,4 +10,4 @@
  * the COPYING file in the top-level directory.
  */
 
-#define UART_BASE	((void *)0x70006000)
+#define UART_BASE	((void *)0x70006300)