From: Ralf Ramsauer <[email protected]> This patch removes the hard-coded 0x300 offset from the uart tegra driver since such offset depends on the specific board.
Signed-off-by: Ralf Ramsauer <[email protected]> Signed-off-by: Claudio Scordino <[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 37fc46e..df6c3b5 100644 --- a/configs/jetson-tk1.c +++ b/configs/jetson-tk1.c @@ -33,8 +33,8 @@ struct { .size = 0x4000000 - 0x100000, /* -1MB (PSCI) */ }, .debug_console = { - .phys_start = 0x70006000, - .size = 0x1000, + .phys_start = 0x70006300, + .size = 0x40, .flags = JAILHOUSE_MEM_IO, }, .platform_info.arm = { diff --git a/hypervisor/arch/arm/include/asm/uart-tegra.h b/hypervisor/arch/arm/include/asm/uart-tegra.h index d40274e..bedface 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 7b97dc7..ce23468 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.7.4 -- 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.
