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 <[email protected]> --- configs/jetson-tk1.c | 4 ++-- hypervisor/arch/arm/include/asm/uart-tegra.h | 1 - inmates/lib/arm/include/mach-tegra124/mach/uart.h | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/configs/jetson-tk1.c b/configs/jetson-tk1.c index 1ee780bd7b..d5d7c5dfdb 100644 --- a/configs/jetson-tk1.c +++ b/configs/jetson-tk1.c @@ -34,8 +34,8 @@ struct { .size = 0x4000000 - 0x100000, /* -1MB (PSCI) */ }, .debug_console = { - .address = 0x70006000, - .size = 0x1000, + .address = 0x70006300, + .size = 0x40, /* .divider = 0xdd, */ .flags = JAILHOUSE_DBG_TYPE_UART_ARM | JAILHOUSE_DBG_FLAG_MMIO, diff --git a/hypervisor/arch/arm/include/asm/uart-tegra.h b/hypervisor/arch/arm/include/asm/uart-tegra.h index d40274eefd..bedface517 100644 --- 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 index 7b97dc7b13..ce23468046 100644 --- 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) -- 2.11.0.rc2 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
