ARM: zynq: Move early printk virtual address to vmalloc area
authorMichal Simek <michal.simek@xilinx.com>
Mon, 15 Feb 2016 09:17:47 +0000 (10:17 +0100)
committerMichal Simek <michal.simek@xilinx.com>
Thu, 25 Feb 2016 13:06:03 +0000 (14:06 +0100)
The patch
"ARM: 8432/1: move VMALLOC_END from 0xff000000 to 0xff800000"
(sha1: 6ff0966052c46efb53980b8a1add2e7b49c9f560)
has moved also start of VMALLOC area because size didn't change.
That's why origin location of vmalloc was
   vmalloc : 0xf0000000 - 0xff000000   ( 240 MB)
and now is
   vmalloc : 0xf0800000 - 0xff800000   ( 240 MB)

That's why uart virtual addresses need to be changed to reflect this new
memory setup. Starting address should be vmalloc start address.

Signed-off-by: Michal Simek <michal.simek@xilinx.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/include/debug/zynq.S

index de86b924756401da3189c625ef5bde99d57b1782..060cb5b49bfd84e5ccf3888d7cef0e9f5e683e87 100644 (file)
@@ -20,9 +20,9 @@
 #define UART_SR_TXEMPTY                0x00000008      /* TX FIFO empty */
 
 #define UART0_PHYS             0xE0000000
-#define UART0_VIRT             0xF0000000
+#define UART0_VIRT             0xF0800000
 #define UART1_PHYS             0xE0001000
-#define UART1_VIRT             0xF0001000
+#define UART1_VIRT             0xF0801000
 
 #if IS_ENABLED(CONFIG_DEBUG_ZYNQ_UART1)
 # define LL_UART_PADDR         UART1_PHYS