Merge tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[can-eth-gw-linux.git] / arch / arm / mach-tegra / common.c

diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
index 11a74db51e5d4f0972e9b8ad093da3fb5844aa70..0816562725f64c61b72744ecd1b88af350828d01 100644 (file)
--- a/arch/arm/mach-tegra/common.c
+++ b/arch/arm/mach-tegra/common.c
@@ -45,14 +45,15 @@
  * kernel is loaded. The data is declared here rather than debug-macro.S so
  * that multiple inclusions of debug-macro.S point at the same data.
  */
-#define TEGRA_DEBUG_UART_OFFSET (TEGRA_DEBUG_UART_BASE & 0xFFFF)
-u32 tegra_uart_config[3] = {
+u32 tegra_uart_config[4] = {
        /* Debug UART initialization required */
        1,
        /* Debug UART physical address */
-       (u32)(IO_APB_PHYS + TEGRA_DEBUG_UART_OFFSET),
+       0,
        /* Debug UART virtual address */
-       (u32)(IO_APB_VIRT + TEGRA_DEBUG_UART_OFFSET),
+       0,
+       /* Scratch space for debug macro */
+       0,
 };
 
 #ifdef CONFIG_OF