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

Pull ARM SoC multiplatform conversion patches from Olof Johansson:
 "Here are more patches in the progression towards multiplatform, sparse
  irq conversions in particular.

  Tegra has a handful of cleanups and general groundwork, but is not
  quite there yet on full enablement.

  Platforms that are enabled through this branch are VT8500 and Zynq.
  Note that i.MX was converted in one of the earlier cleanup branches as
  well (before we started a separate topic for multiplatform).  And both
  new platforms for this merge window, sunxi and bcm, were merged with
  multiplatform support enabled."

Fix up conflicts mostly as per Olof.

* tag 'multiplatform' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (29 commits)
  ARM: zynq: Remove all unused mach headers
  ARM: zynq: add support for ARCH_MULTIPLATFORM
  ARM: zynq: make use of debug_ll_io_init()
  ARM: zynq: remove TTC early mapping
  ARM: tegra: move debug-macro.S to include/debug
  ARM: tegra: don't include iomap.h from debug-macro.S
  ARM: tegra: decouple uncompress.h and debug-macro.S
  ARM: tegra: simplify DEBUG_LL UART selection options
  ARM: tegra: select SPARSE_IRQ
  ARM: tegra: enhance timer.c to get IO address from device tree
  ARM: tegra: enhance timer.c to get IRQ info from device tree
  ARM: timer: fix checkpatch warnings
  ARM: tegra: add TWD to device tree
  ARM: tegra: define DT bindings for and instantiate RTC
  ARM: tegra: define DT bindings for and instantiate timer
  clocksource/mtu-nomadik: use apb_pclk
  clk: ux500: Register mtu apb_pclocks
  ARM: plat-nomadik: convert platforms to SPARSE_IRQ
  mfd/db8500-prcmu: use the irq_domain_add_simple()
  mfd/ab8500-core: use irq_domain_add_simple()
  ...

10 files changed, 66 insertions, 446 deletions

diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index 9ff6f6ea3617..e426d1b7747e 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -57,57 +57,6 @@ config TEGRA_AHB
           which controls AHB bus master arbitration and some
           perfomance parameters(priority, prefech size).
 
-choice
-        prompt "Default low-level debug console UART"
-        default TEGRA_DEBUG_UART_NONE
-
-config TEGRA_DEBUG_UART_NONE
-        bool "None"
-
-config TEGRA_DEBUG_UARTA
-        bool "UART-A"
-
-config TEGRA_DEBUG_UARTB
-        bool "UART-B"
-
-config TEGRA_DEBUG_UARTC
-        bool "UART-C"
-
-config TEGRA_DEBUG_UARTD
-        bool "UART-D"
-
-config TEGRA_DEBUG_UARTE
-        bool "UART-E"
-
-endchoice
-
-choice
-        prompt "Automatic low-level debug console UART"
-        default TEGRA_DEBUG_UART_AUTO_NONE
-
-config TEGRA_DEBUG_UART_AUTO_NONE
-        bool "None"
-
-config TEGRA_DEBUG_UART_AUTO_ODMDATA
-        bool "Via ODMDATA"
-        help
-          Automatically determines which UART to use for low-level debug based
-          on the ODMDATA value. This value is part of the BCT, and is written
-          to the boot memory device using nvflash, or other flashing tool.
-          When bits 19:18 are 3, then bits 17:15 indicate which UART to use;
-          0/1/2/3/4 are UART A/B/C/D/E.
-
-config TEGRA_DEBUG_UART_AUTO_SCRATCH
-        bool "Via UART scratch register"
-        help
-          Automatically determines which UART to use for low-level debug based
-          on the UART scratch register value. Some bootloaders put ASCII 'D'
-          in this register when they initialize their own console UART output.
-          Using this option allows the kernel to automatically pick the same
-          UART.
-
-endchoice
-
 config TEGRA_EMC_SCALING_ENABLE
         bool "Enable scaling the memory frequency"
 
diff --git a/arch/arm/mach-tegra/common.c b/arch/arm/mach-tegra/common.c
index 11a74db51e5d..0816562725f6 100644
--- 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
diff --git a/arch/arm/mach-tegra/include/mach/debug-macro.S b/arch/arm/mach-tegra/include/mach/debug-macro.S
deleted file mode 100644
index 44ca7b1d8b8a..000000000000
--- a/arch/arm/mach-tegra/include/mach/debug-macro.S
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * arch/arm/mach-tegra/include/mach/debug-macro.S
- *
- * Copyright (C) 2010,2011 Google, Inc.
- * Copyright (C) 2011-2012 NVIDIA CORPORATION. All Rights Reserved.
- *
- * Author:
- *      Colin Cross <ccross@google.com>
- *      Erik Gilling <konkers@google.com>
- *      Doug Anderson <dianders@chromium.org>
- *      Stephen Warren <swarren@nvidia.com>
- *
- * Portions based on mach-omap2's debug-macro.S
- * Copyright (C) 1994-1999 Russell King
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#include <linux/serial_reg.h>
-
-#include "../../iomap.h"
-#include "../../irammap.h"
-
-                .macro  addruart, rp, rv, tmp
-                adr     \rp, 99f                @ actual addr of 99f
-                ldr     \rv, [\rp]              @ linked addr is stored there
-                sub     \rv, \rv, \rp           @ offset between the two
-                ldr     \rp, [\rp, #4]          @ linked tegra_uart_config
-                sub     \tmp, \rp, \rv          @ actual tegra_uart_config
-                ldr     \rp, [\tmp]             @ Load tegra_uart_config
-                cmp     \rp, #1                 @ needs intitialization?
-                bne     100f                    @ no; go load the addresses
-                mov     \rv, #0                 @ yes; record init is done
-                str     \rv, [\tmp]
-                mov     \rp, #TEGRA_IRAM_BASE   @ See if cookie is in IRAM
-                ldr     \rv, [\rp, #TEGRA_IRAM_DEBUG_UART_OFFSET]
-                movw    \rp, #TEGRA_IRAM_DEBUG_UART_COOKIE & 0xffff
-                movt    \rp, #TEGRA_IRAM_DEBUG_UART_COOKIE >> 16
-                cmp     \rv, \rp                @ Cookie present?
-                bne     100f                    @ No, use default UART
-                mov     \rp, #TEGRA_IRAM_BASE   @ Load UART address from IRAM
-                ldr     \rv, [\rp, #TEGRA_IRAM_DEBUG_UART_OFFSET + 4]
-                str     \rv, [\tmp, #4]         @ Store in tegra_uart_phys
-                sub     \rv, \rv, #IO_APB_PHYS  @ Calculate virt address
-                add     \rv, \rv, #IO_APB_VIRT
-                str     \rv, [\tmp, #8]         @ Store in tegra_uart_virt
-                b       100f
-
-                .align
-99:             .word   .
-                .word   tegra_uart_config
-                .ltorg
-
-100:            ldr     \rp, [\tmp, #4]         @ Load tegra_uart_phys
-                ldr     \rv, [\tmp, #8]         @ Load tegra_uart_virt
-                .endm
-
-#define UART_SHIFT 2
-
-/*
- * Code below is swiped from <asm/hardware/debug-8250.S>, but add an extra
- * check to make sure that we aren't in the CONFIG_TEGRA_DEBUG_UART_NONE case.
- * We use the fact that all 5 valid UART addresses all have something in the
- * 2nd-to-lowest byte.
- */
-
-                .macro  senduart, rd, rx
-                tst     \rx, #0x0000ff00
-                strneb  \rd, [\rx, #UART_TX << UART_SHIFT]
-1001:
-                .endm
-
-                .macro  busyuart, rd, rx
-                tst     \rx, #0x0000ff00
-                beq     1002f
-1001:           ldrb    \rd, [\rx, #UART_LSR << UART_SHIFT]
-                and     \rd, \rd, #UART_LSR_TEMT | UART_LSR_THRE
-                teq     \rd, #UART_LSR_TEMT | UART_LSR_THRE
-                bne     1001b
-1002:
-                .endm
-
-                .macro  waituart, rd, rx
-#ifdef FLOW_CONTROL
-                tst     \rx, #0x0000ff00
-                beq     1002f
-1001:           ldrb    \rd, [\rx, #UART_MSR << UART_SHIFT]
-                tst     \rd, #UART_MSR_CTS
-                beq     1001b
-1002:
-#endif
-                .endm
diff --git a/arch/arm/mach-tegra/include/mach/irqs.h b/arch/arm/mach-tegra/include/mach/irqs.h
deleted file mode 100644
index aad1a2c1d714..000000000000
--- a/arch/arm/mach-tegra/include/mach/irqs.h
+++ /dev/null
@@ -1,182 +0,0 @@
-/*
- * arch/arm/mach-tegra/include/mach/irqs.h
- *
- * Copyright (C) 2010 Google, Inc.
- *
- * Author:
- *      Colin Cross <ccross@google.com>
- *      Erik Gilling <konkers@google.com>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- */
-
-#ifndef __MACH_TEGRA_IRQS_H
-#define __MACH_TEGRA_IRQS_H
-
-#define INT_GIC_BASE                    0
-
-#define IRQ_LOCALTIMER                  29
-
-/* Primary Interrupt Controller */
-#define INT_PRI_BASE                    (INT_GIC_BASE + 32)
-#define INT_TMR1                        (INT_PRI_BASE + 0)
-#define INT_TMR2                        (INT_PRI_BASE + 1)
-#define INT_RTC                         (INT_PRI_BASE + 2)
-#define INT_I2S2                        (INT_PRI_BASE + 3)
-#define INT_SHR_SEM_INBOX_IBF           (INT_PRI_BASE + 4)
-#define INT_SHR_SEM_INBOX_IBE           (INT_PRI_BASE + 5)
-#define INT_SHR_SEM_OUTBOX_IBF          (INT_PRI_BASE + 6)
-#define INT_SHR_SEM_OUTBOX_IBE          (INT_PRI_BASE + 7)
-#define INT_VDE_UCQ_ERROR               (INT_PRI_BASE + 8)
-#define INT_VDE_SYNC_TOKEN              (INT_PRI_BASE + 9)
-#define INT_VDE_BSE_V                   (INT_PRI_BASE + 10)
-#define INT_VDE_BSE_A                   (INT_PRI_BASE + 11)
-#define INT_VDE_SXE                     (INT_PRI_BASE + 12)
-#define INT_I2S1                        (INT_PRI_BASE + 13)
-#define INT_SDMMC1                      (INT_PRI_BASE + 14)
-#define INT_SDMMC2                      (INT_PRI_BASE + 15)
-#define INT_XIO                         (INT_PRI_BASE + 16)
-#define INT_VDE                         (INT_PRI_BASE + 17)
-#define INT_AVP_UCQ                     (INT_PRI_BASE + 18)
-#define INT_SDMMC3                      (INT_PRI_BASE + 19)
-#define INT_USB                         (INT_PRI_BASE + 20)
-#define INT_USB2                        (INT_PRI_BASE + 21)
-#define INT_PRI_RES_22                  (INT_PRI_BASE + 22)
-#define INT_EIDE                        (INT_PRI_BASE + 23)
-#define INT_NANDFLASH                   (INT_PRI_BASE + 24)
-#define INT_VCP                         (INT_PRI_BASE + 25)
-#define INT_APB_DMA                     (INT_PRI_BASE + 26)
-#define INT_AHB_DMA                     (INT_PRI_BASE + 27)
-#define INT_GNT_0                       (INT_PRI_BASE + 28)
-#define INT_GNT_1                       (INT_PRI_BASE + 29)
-#define INT_OWR                         (INT_PRI_BASE + 30)
-#define INT_SDMMC4                      (INT_PRI_BASE + 31)
-
-/* Secondary Interrupt Controller */
-#define INT_SEC_BASE                    (INT_PRI_BASE + 32)
-#define INT_GPIO1                       (INT_SEC_BASE + 0)
-#define INT_GPIO2                       (INT_SEC_BASE + 1)
-#define INT_GPIO3                       (INT_SEC_BASE + 2)
-#define INT_GPIO4                       (INT_SEC_BASE + 3)
-#define INT_UARTA                       (INT_SEC_BASE + 4)
-#define INT_UARTB                       (INT_SEC_BASE + 5)
-#define INT_I2C                         (INT_SEC_BASE + 6)
-#define INT_SPI                         (INT_SEC_BASE + 7)
-#define INT_TWC                         (INT_SEC_BASE + 8)
-#define INT_TMR3                        (INT_SEC_BASE + 9)
-#define INT_TMR4                        (INT_SEC_BASE + 10)
-#define INT_FLOW_RSM0                   (INT_SEC_BASE + 11)
-#define INT_FLOW_RSM1                   (INT_SEC_BASE + 12)
-#define INT_SPDIF                       (INT_SEC_BASE + 13)
-#define INT_UARTC                       (INT_SEC_BASE + 14)
-#define INT_MIPI                        (INT_SEC_BASE + 15)
-#define INT_EVENTA                      (INT_SEC_BASE + 16)
-#define INT_EVENTB                      (INT_SEC_BASE + 17)
-#define INT_EVENTC                      (INT_SEC_BASE + 18)
-#define INT_EVENTD                      (INT_SEC_BASE + 19)
-#define INT_VFIR                        (INT_SEC_BASE + 20)
-#define INT_DVC                         (INT_SEC_BASE + 21)
-#define INT_SYS_STATS_MON               (INT_SEC_BASE + 22)
-#define INT_GPIO5                       (INT_SEC_BASE + 23)
-#define INT_CPU0_PMU_INTR               (INT_SEC_BASE + 24)
-#define INT_CPU1_PMU_INTR               (INT_SEC_BASE + 25)
-#define INT_SEC_RES_26                  (INT_SEC_BASE + 26)
-#define INT_S_LINK1                     (INT_SEC_BASE + 27)
-#define INT_APB_DMA_COP                 (INT_SEC_BASE + 28)
-#define INT_AHB_DMA_COP                 (INT_SEC_BASE + 29)
-#define INT_DMA_TX                      (INT_SEC_BASE + 30)
-#define INT_DMA_RX                      (INT_SEC_BASE + 31)
-
-/* Tertiary Interrupt Controller */
-#define INT_TRI_BASE                    (INT_SEC_BASE + 32)
-#define INT_HOST1X_COP_SYNCPT           (INT_TRI_BASE + 0)
-#define INT_HOST1X_MPCORE_SYNCPT        (INT_TRI_BASE + 1)
-#define INT_HOST1X_COP_GENERAL          (INT_TRI_BASE + 2)
-#define INT_HOST1X_MPCORE_GENERAL       (INT_TRI_BASE + 3)
-#define INT_MPE_GENERAL                 (INT_TRI_BASE + 4)
-#define INT_VI_GENERAL                  (INT_TRI_BASE + 5)
-#define INT_EPP_GENERAL                 (INT_TRI_BASE + 6)
-#define INT_ISP_GENERAL                 (INT_TRI_BASE + 7)
-#define INT_2D_GENERAL                  (INT_TRI_BASE + 8)
-#define INT_DISPLAY_GENERAL             (INT_TRI_BASE + 9)
-#define INT_DISPLAY_B_GENERAL           (INT_TRI_BASE + 10)
-#define INT_HDMI                        (INT_TRI_BASE + 11)
-#define INT_TVO_GENERAL                 (INT_TRI_BASE + 12)
-#define INT_MC_GENERAL                  (INT_TRI_BASE + 13)
-#define INT_EMC_GENERAL                 (INT_TRI_BASE + 14)
-#define INT_TRI_RES_15                  (INT_TRI_BASE + 15)
-#define INT_TRI_RES_16                  (INT_TRI_BASE + 16)
-#define INT_AC97                        (INT_TRI_BASE + 17)
-#define INT_SPI_2                       (INT_TRI_BASE + 18)
-#define INT_SPI_3                       (INT_TRI_BASE + 19)
-#define INT_I2C2                        (INT_TRI_BASE + 20)
-#define INT_KBC                         (INT_TRI_BASE + 21)
-#define INT_EXTERNAL_PMU                (INT_TRI_BASE + 22)
-#define INT_GPIO6                       (INT_TRI_BASE + 23)
-#define INT_TVDAC                       (INT_TRI_BASE + 24)
-#define INT_GPIO7                       (INT_TRI_BASE + 25)
-#define INT_UARTD                       (INT_TRI_BASE + 26)
-#define INT_UARTE                       (INT_TRI_BASE + 27)
-#define INT_I2C3                        (INT_TRI_BASE + 28)
-#define INT_SPI_4                       (INT_TRI_BASE + 29)
-#define INT_TRI_RES_30                  (INT_TRI_BASE + 30)
-#define INT_SW_RESERVED                 (INT_TRI_BASE + 31)
-
-/* Quaternary Interrupt Controller */
-#define INT_QUAD_BASE                   (INT_TRI_BASE + 32)
-#define INT_SNOR                        (INT_QUAD_BASE + 0)
-#define INT_USB3                        (INT_QUAD_BASE + 1)
-#define INT_PCIE_INTR                   (INT_QUAD_BASE + 2)
-#define INT_PCIE_MSI                    (INT_QUAD_BASE + 3)
-#define INT_QUAD_RES_4                  (INT_QUAD_BASE + 4)
-#define INT_QUAD_RES_5                  (INT_QUAD_BASE + 5)
-#define INT_QUAD_RES_6                  (INT_QUAD_BASE + 6)
-#define INT_QUAD_RES_7                  (INT_QUAD_BASE + 7)
-#define INT_APB_DMA_CH0                 (INT_QUAD_BASE + 8)
-#define INT_APB_DMA_CH1                 (INT_QUAD_BASE + 9)
-#define INT_APB_DMA_CH2                 (INT_QUAD_BASE + 10)
-#define INT_APB_DMA_CH3                 (INT_QUAD_BASE + 11)
-#define INT_APB_DMA_CH4                 (INT_QUAD_BASE + 12)
-#define INT_APB_DMA_CH5                 (INT_QUAD_BASE + 13)
-#define INT_APB_DMA_CH6                 (INT_QUAD_BASE + 14)
-#define INT_APB_DMA_CH7                 (INT_QUAD_BASE + 15)
-#define INT_APB_DMA_CH8                 (INT_QUAD_BASE + 16)
-#define INT_APB_DMA_CH9                 (INT_QUAD_BASE + 17)
-#define INT_APB_DMA_CH10                (INT_QUAD_BASE + 18)
-#define INT_APB_DMA_CH11                (INT_QUAD_BASE + 19)
-#define INT_APB_DMA_CH12                (INT_QUAD_BASE + 20)
-#define INT_APB_DMA_CH13                (INT_QUAD_BASE + 21)
-#define INT_APB_DMA_CH14                (INT_QUAD_BASE + 22)
-#define INT_APB_DMA_CH15                (INT_QUAD_BASE + 23)
-#define INT_QUAD_RES_24                 (INT_QUAD_BASE + 24)
-#define INT_QUAD_RES_25                 (INT_QUAD_BASE + 25)
-#define INT_QUAD_RES_26                 (INT_QUAD_BASE + 26)
-#define INT_QUAD_RES_27                 (INT_QUAD_BASE + 27)
-#define INT_QUAD_RES_28                 (INT_QUAD_BASE + 28)
-#define INT_QUAD_RES_29                 (INT_QUAD_BASE + 29)
-#define INT_QUAD_RES_30                 (INT_QUAD_BASE + 30)
-#define INT_QUAD_RES_31                 (INT_QUAD_BASE + 31)
-
-/* Tegra30 has 5 banks of 32 IRQs */
-#define INT_MAIN_NR                     (32 * 5)
-#define INT_GPIO_BASE                   (INT_PRI_BASE + INT_MAIN_NR)
-
-/* Tegra30 has 8 banks of 32 GPIOs */
-#define INT_GPIO_NR                     (32 * 8)
-
-#define TEGRA_NR_IRQS                   (INT_GPIO_BASE + INT_GPIO_NR)
-
-#define INT_BOARD_BASE                  TEGRA_NR_IRQS
-#define NR_BOARD_IRQS                   32
-
-#define NR_IRQS                         (INT_BOARD_BASE + NR_BOARD_IRQS)
-
-#endif
diff --git a/arch/arm/mach-tegra/include/mach/uncompress.h b/arch/arm/mach-tegra/include/mach/uncompress.h
index 27725750ca3e..485003f9b636 100644
--- a/arch/arm/mach-tegra/include/mach/uncompress.h
+++ b/arch/arm/mach-tegra/include/mach/uncompress.h
@@ -29,7 +29,6 @@
 #include <linux/serial_reg.h>
 
 #include "../../iomap.h"
-#include "../../irammap.h"
 
 #define BIT(x) (1 << (x))
 #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]))
@@ -52,17 +51,6 @@ static inline void flush(void)
 {
 }
 
-static inline void save_uart_address(void)
-{
-        u32 *buf = (u32 *)(TEGRA_IRAM_BASE + TEGRA_IRAM_DEBUG_UART_OFFSET);
-
-        if (uart) {
-                buf[0] = TEGRA_IRAM_DEBUG_UART_COOKIE;
-                buf[1] = (u32)uart;
-        } else
-                buf[0] = 0;
-}
-
 static const struct {
         u32 base;
         u32 reset_reg;
@@ -139,51 +127,19 @@ int auto_odmdata(void)
 }
 #endif
 
-#ifdef CONFIG_TEGRA_DEBUG_UART_AUTO_SCRATCH
-int auto_scratch(void)
-{
-        int i;
-
-        /*
-         * Look for the first UART that:
-         * a) Is not in reset.
-         * b) Is clocked.
-         * c) Has a 'D' in the scratchpad register.
-         *
-         * Note that on Tegra30, the first two conditions are required, since
-         * if not true, accesses to the UART scratch register will hang.
-         * Tegra20 doesn't have this issue.
-         *
-         * The intent is that the bootloader will tell the kernel which UART
-         * to use by setting up those conditions. If nothing found, we'll fall
-         * back to what's specified in TEGRA_DEBUG_UART_BASE.
-         */
-        for (i = 0; i < ARRAY_SIZE(uarts); i++) {
-                if (!uart_clocked(i))
-                        continue;
-
-                uart = (volatile u8 *)uarts[i].base;
-                if (uart[UART_SCR << DEBUG_UART_SHIFT] != 'D')
-                        continue;
-
-                return i;
-        }
-
-        return -1;
-}
-#endif
-
 /*
  * Setup before decompression.  This is where we do UART selection for
  * earlyprintk and init the uart_base register.
  */
 static inline void arch_decomp_setup(void)
 {
-        int uart_id, auto_uart_id;
+        int uart_id;
         volatile u32 *apb_misc = (volatile u32 *)TEGRA_APB_MISC_BASE;
         u32 chip, div;
 
-#if defined(CONFIG_TEGRA_DEBUG_UARTA)
+#if defined(CONFIG_TEGRA_DEBUG_UART_AUTO_ODMDATA)
+        uart_id = auto_odmdata();
+#elif defined(CONFIG_TEGRA_DEBUG_UARTA)
         uart_id = 0;
 #elif defined(CONFIG_TEGRA_DEBUG_UARTB)
         uart_id = 1;
@@ -193,19 +149,7 @@ static inline void arch_decomp_setup(void)
         uart_id = 3;
 #elif defined(CONFIG_TEGRA_DEBUG_UARTE)
         uart_id = 4;
-#else
-        uart_id = -1;
-#endif
-
-#if defined(CONFIG_TEGRA_DEBUG_UART_AUTO_ODMDATA)
-        auto_uart_id = auto_odmdata();
-#elif defined(CONFIG_TEGRA_DEBUG_UART_AUTO_SCRATCH)
-        auto_uart_id = auto_scratch();
-#else
-        auto_uart_id = -1;
 #endif
-        if (auto_uart_id != -1)
-                uart_id = auto_uart_id;
 
         if (uart_id < 0 || uart_id >= ARRAY_SIZE(uarts) ||
             !uart_clocked(uart_id))
@@ -213,7 +157,6 @@ static inline void arch_decomp_setup(void)
         else
                 uart = (volatile u8 *)uarts[uart_id].base;
 
-        save_uart_address();
         if (uart == NULL)
                 return;
 
diff --git a/arch/arm/mach-tegra/io.c b/arch/arm/mach-tegra/io.c
index 7d09f301b3a1..bb9c9c29d181 100644
--- a/arch/arm/mach-tegra/io.c
+++ b/arch/arm/mach-tegra/io.c
@@ -59,5 +59,6 @@ static struct map_desc tegra_io_desc[] __initdata = {
 
 void __init tegra_map_common_io(void)
 {
+        debug_ll_io_init();
         iotable_init(tegra_io_desc, ARRAY_SIZE(tegra_io_desc));
 }
diff --git a/arch/arm/mach-tegra/iomap.h b/arch/arm/mach-tegra/iomap.h
index 53151030a07d..db8be51cad80 100644
--- a/arch/arm/mach-tegra/iomap.h
+++ b/arch/arm/mach-tegra/iomap.h
@@ -261,20 +261,6 @@
 #define TEGRA_SDMMC4_BASE               0xC8000600
 #define TEGRA_SDMMC4_SIZE               SZ_512
 
-#if defined(CONFIG_TEGRA_DEBUG_UART_NONE)
-# define TEGRA_DEBUG_UART_BASE 0
-#elif defined(CONFIG_TEGRA_DEBUG_UARTA)
-# define TEGRA_DEBUG_UART_BASE TEGRA_UARTA_BASE
-#elif defined(CONFIG_TEGRA_DEBUG_UARTB)
-# define TEGRA_DEBUG_UART_BASE TEGRA_UARTB_BASE
-#elif defined(CONFIG_TEGRA_DEBUG_UARTC)
-# define TEGRA_DEBUG_UART_BASE TEGRA_UARTC_BASE
-#elif defined(CONFIG_TEGRA_DEBUG_UARTD)
-# define TEGRA_DEBUG_UART_BASE TEGRA_UARTD_BASE
-#elif defined(CONFIG_TEGRA_DEBUG_UARTE)
-# define TEGRA_DEBUG_UART_BASE TEGRA_UARTE_BASE
-#endif
-
 /* On TEGRA, many peripherals are very closely packed in
  * two 256MB io windows (that actually only use about 64KB
  * at the start of each).
diff --git a/arch/arm/mach-tegra/irammap.h b/arch/arm/mach-tegra/irammap.h
index 0cbe63261854..501952a84344 100644
--- a/arch/arm/mach-tegra/irammap.h
+++ b/arch/arm/mach-tegra/irammap.h
@@ -23,13 +23,4 @@
 #define TEGRA_IRAM_RESET_HANDLER_OFFSET 0
 #define TEGRA_IRAM_RESET_HANDLER_SIZE   SZ_1K
 
-/*
- * These locations are written to by uncompress.h, and read by debug-macro.S.
- * The first word holds the cookie value if the data is valid. The second
- * word holds the UART physical address.
- */
-#define TEGRA_IRAM_DEBUG_UART_OFFSET    SZ_1K
-#define TEGRA_IRAM_DEBUG_UART_SIZE      8
-#define TEGRA_IRAM_DEBUG_UART_COOKIE    0x55415254
-
 #endif
diff --git a/arch/arm/mach-tegra/pcie.c b/arch/arm/mach-tegra/pcie.c
index f18fc3ab4e58..53d085871798 100644
--- a/arch/arm/mach-tegra/pcie.c
+++ b/arch/arm/mach-tegra/pcie.c
@@ -43,6 +43,9 @@
 #include "board.h"
 #include "iomap.h"
 
+/* Hack - need to parse this from DT */
+#define INT_PCIE_INTR 130
+
 /* register definitions */
 #define AFI_OFFSET      0x3800
 #define PADS_OFFSET     0x3000
diff --git a/arch/arm/mach-tegra/timer.c b/arch/arm/mach-tegra/timer.c
index 6ff503536512..e4863f3e9ee7 100644
--- a/arch/arm/mach-tegra/timer.c
+++ b/arch/arm/mach-tegra/timer.c
@@ -26,16 +26,14 @@
 #include <linux/clocksource.h>
 #include <linux/clk.h>
 #include <linux/io.h>
+#include <linux/of_address.h>
+#include <linux/of_irq.h>
 
 #include <asm/mach/time.h>
 #include <asm/smp_twd.h>
 #include <asm/sched_clock.h>
 
-#include <mach/irqs.h>
-
 #include "board.h"
-#include "clock.h"
-#include "iomap.h"
 
 #define RTC_SECONDS            0x08
 #define RTC_SHADOW_SECONDS     0x0c
@@ -53,8 +51,8 @@
 #define TIMER_PTV 0x0
 #define TIMER_PCR 0x4
 
-static void __iomem *timer_reg_base = IO_ADDRESS(TEGRA_TMR1_BASE);
-static void __iomem *rtc_base = IO_ADDRESS(TEGRA_RTC_BASE);
+static void __iomem *timer_reg_base;
+static void __iomem *rtc_base;
 
 static struct timespec persistent_ts;
 static u64 persistent_ms, last_persistent_ms;
@@ -158,40 +156,66 @@ static struct irqaction tegra_timer_irq = {
         .flags          = IRQF_DISABLED | IRQF_TIMER | IRQF_TRIGGER_HIGH,
         .handler        = tegra_timer_interrupt,
         .dev_id         = &tegra_clockevent,
-        .irq            = INT_TMR3,
 };
 
-#ifdef CONFIG_HAVE_ARM_TWD
-static DEFINE_TWD_LOCAL_TIMER(twd_local_timer,
-                              TEGRA_ARM_PERIF_BASE + 0x600,
-                              IRQ_LOCALTIMER);
+static const struct of_device_id timer_match[] __initconst = {
+        { .compatible = "nvidia,tegra20-timer" },
+        {}
+};
 
-static void __init tegra_twd_init(void)
-{
-        int err = twd_local_timer_register(&twd_local_timer);
-        if (err)
-                pr_err("twd_local_timer_register failed %d\n", err);
-}
-#else
-#define tegra_twd_init()        do {} while(0)
-#endif
+static const struct of_device_id rtc_match[] __initconst = {
+        { .compatible = "nvidia,tegra20-rtc" },
+        {}
+};
 
 static void __init tegra_init_timer(void)
 {
+        struct device_node *np;
         struct clk *clk;
         unsigned long rate;
         int ret;
 
+        np = of_find_matching_node(NULL, timer_match);
+        if (!np) {
+                pr_err("Failed to find timer DT node\n");
+                BUG();
+        }
+
+        timer_reg_base = of_iomap(np, 0);
+        if (!timer_reg_base) {
+                pr_err("Can't map timer registers");
+                BUG();
+        }
+
+        tegra_timer_irq.irq = irq_of_parse_and_map(np, 2);
+        if (tegra_timer_irq.irq <= 0) {
+                pr_err("Failed to map timer IRQ\n");
+                BUG();
+        }
+
         clk = clk_get_sys("timer", NULL);
         if (IS_ERR(clk)) {
-                pr_warn("Unable to get timer clock."
-                        " Assuming 12Mhz input clock.\n");
+                pr_warn("Unable to get timer clock. Assuming 12Mhz input clock.\n");
                 rate = 12000000;
         } else {
                 clk_prepare_enable(clk);
                 rate = clk_get_rate(clk);
         }
 
+        of_node_put(np);
+
+        np = of_find_matching_node(NULL, rtc_match);
+        if (!np) {
+                pr_err("Failed to find RTC DT node\n");
+                BUG();
+        }
+
+        rtc_base = of_iomap(np, 0);
+        if (!rtc_base) {
+                pr_err("Can't map RTC registers");
+                BUG();
+        }
+
         /*
          * rtc registers are used by read_persistent_clock, keep the rtc clock
          * enabled
@@ -202,6 +226,8 @@ static void __init tegra_init_timer(void)
         else
                 clk_prepare_enable(clk);
 
+        of_node_put(np);
+
         switch (rate) {
         case 12000000:
                 timer_writel(0x000b, TIMERUS_USEC_CFG);
@@ -223,13 +249,13 @@ static void __init tegra_init_timer(void)
 
         if (clocksource_mmio_init(timer_reg_base + TIMERUS_CNTR_1US,
                 "timer_us", 1000000, 300, 32, clocksource_mmio_readl_up)) {
-                printk(KERN_ERR "Failed to register clocksource\n");
+                pr_err("Failed to register clocksource\n");
                 BUG();
         }
 
         ret = setup_irq(tegra_timer_irq.irq, &tegra_timer_irq);
         if (ret) {
-                printk(KERN_ERR "Failed to register timer IRQ: %d\n", ret);
+                pr_err("Failed to register timer IRQ: %d\n", ret);
                 BUG();
         }
 
@@ -241,7 +267,9 @@ static void __init tegra_init_timer(void)
         tegra_clockevent.cpumask = cpu_all_mask;
         tegra_clockevent.irq = tegra_timer_irq.irq;
         clockevents_register_device(&tegra_clockevent);
-        tegra_twd_init();
+#ifdef CONFIG_HAVE_ARM_TWD
+        twd_local_timer_of_register();
+#endif
         register_persistent_clock(NULL, tegra_read_persistent_clock);
 }