1762 files changed, 53979 insertions, 43524 deletions

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 082d9b4b5472..35a300d4a9fb 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -7,7 +7,6 @@ config ALPHA
         select HAVE_PCSPKR_PLATFORM
         select HAVE_PERF_EVENTS
         select HAVE_DMA_ATTRS
-        select HAVE_GENERIC_HARDIRQS
         select VIRT_TO_BUS
         select GENERIC_IRQ_PROBE
         select AUTO_IRQ_AFFINITY if SMP
diff --git a/arch/alpha/lib/csum_partial_copy.c b/arch/alpha/lib/csum_partial_copy.c
index 40736da9bea8..ffb19b7da999 100644
--- a/arch/alpha/lib/csum_partial_copy.c
+++ b/arch/alpha/lib/csum_partial_copy.c
@@ -338,6 +338,11 @@ csum_partial_copy_from_user(const void __user *src, void *dst, int len,
         unsigned long doff = 7 & (unsigned long) dst;
 
         if (len) {
+                if (!access_ok(VERIFY_READ, src, len)) {
+                        *errp = -EFAULT;
+                        memset(dst, 0, len);
+                        return sum;
+                }
                 if (!doff) {
                         if (!soff)
                                 checksum = csum_partial_cfu_aligned(
diff --git a/arch/alpha/mm/fault.c b/arch/alpha/mm/fault.c
index 0c4132dd3507..98838a05ba6d 100644
--- a/arch/alpha/mm/fault.c
+++ b/arch/alpha/mm/fault.c
@@ -89,8 +89,7 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
         const struct exception_table_entry *fixup;
         int fault, si_code = SEGV_MAPERR;
         siginfo_t info;
-        unsigned int flags = (FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
-                              (cause > 0 ? FAULT_FLAG_WRITE : 0));
+        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
 
         /* As of EV6, a load into $31/$f31 is a prefetch, and never faults
            (or is suppressed by the PALcode).  Support that for older CPUs
@@ -115,7 +114,8 @@ do_page_fault(unsigned long address, unsigned long mmcsr,
         if (address >= TASK_SIZE)
                 goto vmalloc_fault;
 #endif
-
+        if (user_mode(regs))
+                flags |= FAULT_FLAG_USER;
 retry:
         down_read(&mm->mmap_sem);
         vma = find_vma(mm, address);
@@ -142,6 +142,7 @@ retry:
         } else {
                 if (!(vma->vm_flags & VM_WRITE))
                         goto bad_area;
+                flags |= FAULT_FLAG_WRITE;
         }
 
         /* If for any reason at all we couldn't handle the fault,
diff --git a/arch/alpha/oprofile/common.c b/arch/alpha/oprofile/common.c
index b8ce18f485d3..310a4ce1dccc 100644
--- a/arch/alpha/oprofile/common.c
+++ b/arch/alpha/oprofile/common.c
@@ -106,7 +106,7 @@ op_axp_stop(void)
 }
 
 static int
-op_axp_create_files(struct super_block *sb, struct dentry *root)
+op_axp_create_files(struct dentry *root)
 {
         int i;
 
@@ -115,23 +115,23 @@ op_axp_create_files(struct super_block *sb, struct dentry *root)
                 char buf[4];
 
                 snprintf(buf, sizeof buf, "%d", i);
-                dir = oprofilefs_mkdir(sb, root, buf);
+                dir = oprofilefs_mkdir(root, buf);
 
-                oprofilefs_create_ulong(sb, dir, "enabled", &ctr[i].enabled);
-                oprofilefs_create_ulong(sb, dir, "event", &ctr[i].event);
-                oprofilefs_create_ulong(sb, dir, "count", &ctr[i].count);
+                oprofilefs_create_ulong(dir, "enabled", &ctr[i].enabled);
+                oprofilefs_create_ulong(dir, "event", &ctr[i].event);
+                oprofilefs_create_ulong(dir, "count", &ctr[i].count);
                 /* Dummies.  */
-                oprofilefs_create_ulong(sb, dir, "kernel", &ctr[i].kernel);
-                oprofilefs_create_ulong(sb, dir, "user", &ctr[i].user);
-                oprofilefs_create_ulong(sb, dir, "unit_mask", &ctr[i].unit_mask);
+                oprofilefs_create_ulong(dir, "kernel", &ctr[i].kernel);
+                oprofilefs_create_ulong(dir, "user", &ctr[i].user);
+                oprofilefs_create_ulong(dir, "unit_mask", &ctr[i].unit_mask);
         }
 
         if (model->can_set_proc_mode) {
-                oprofilefs_create_ulong(sb, root, "enable_pal",
+                oprofilefs_create_ulong(root, "enable_pal",
                                         &sys.enable_pal);
-                oprofilefs_create_ulong(sb, root, "enable_kernel",
+                oprofilefs_create_ulong(root, "enable_kernel",
                                         &sys.enable_kernel);
-                oprofilefs_create_ulong(sb, root, "enable_user",
+                oprofilefs_create_ulong(root, "enable_user",
                                         &sys.enable_user);
         }
 
diff --git a/arch/arc/Kconfig b/arch/arc/Kconfig
index 68fcbb2d59e2..91dbb2757afd 100644
--- a/arch/arc/Kconfig
+++ b/arch/arc/Kconfig
@@ -20,7 +20,6 @@ config ARC
         select GENERIC_SMP_IDLE_THREAD
         select HAVE_ARCH_KGDB
         select HAVE_ARCH_TRACEHOOK
-        select HAVE_GENERIC_HARDIRQS
         select HAVE_IOREMAP_PROT
         select HAVE_KPROBES
         select HAVE_KRETPROBES
diff --git a/arch/arc/boot/.gitignore b/arch/arc/boot/.gitignore
new file mode 100644
index 000000000000..5d65b54bf17a
--- /dev/null
+++ b/arch/arc/boot/.gitignore
@@ -0,0 +1 @@
+*.dtb*
diff --git a/arch/arc/include/asm/cache.h b/arch/arc/include/asm/cache.h
index 5802849a6cae..e4abdaac6f9f 100644
--- a/arch/arc/include/asm/cache.h
+++ b/arch/arc/include/asm/cache.h
@@ -57,7 +57,7 @@
 
 extern void arc_cache_init(void);
 extern char *arc_cache_mumbojumbo(int cpu_id, char *buf, int len);
-extern void __init read_decode_cache_bcr(void);
+extern void read_decode_cache_bcr(void);
 
 #endif  /* !__ASSEMBLY__ */
 
diff --git a/arch/arc/include/asm/delay.h b/arch/arc/include/asm/delay.h
index 442ce5d0f709..43de30256981 100644
--- a/arch/arc/include/asm/delay.h
+++ b/arch/arc/include/asm/delay.h
@@ -53,11 +53,10 @@ static inline void __udelay(unsigned long usecs)
 {
         unsigned long loops;
 
-        /* (long long) cast ensures 64 bit MPY - real or emulated
+        /* (u64) cast ensures 64 bit MPY - real or emulated
          * HZ * 4295 is pre-evaluated by gcc - hence only 2 mpy ops
          */
-        loops = ((long long)(usecs * 4295 * HZ) *
-                 (long long)(loops_per_jiffy)) >> 32;
+        loops = ((u64) usecs * 4295 * HZ * loops_per_jiffy) >> 32;
 
         __delay(loops);
 }
diff --git a/arch/arc/include/asm/entry.h b/arch/arc/include/asm/entry.h
index df57611652e5..884081099f80 100644
--- a/arch/arc/include/asm/entry.h
+++ b/arch/arc/include/asm/entry.h
@@ -365,7 +365,7 @@
  * it to memory (non-SMP case) or SCRATCH0 Aux Reg (SMP).
  *
  * Before saving the full regfile - this reg is restored back, only
- * to be saved again on kernel mode stack, as part of ptregs.
+ * to be saved again on kernel mode stack, as part of pt_regs.
  *-------------------------------------------------------------*/
 .macro EXCPN_PROLOG_FREEUP_REG  reg
 #ifdef CONFIG_SMP
@@ -384,6 +384,28 @@
 .endm
 
 /*--------------------------------------------------------------
+ * Exception Entry prologue
+ * -Switches stack to K mode (if not already)
+ * -Saves the register file
+ *
+ * After this it is safe to call the "C" handlers
+ *-------------------------------------------------------------*/
+.macro EXCEPTION_PROLOGUE
+
+        /* Need at least 1 reg to code the early exception prologue */
+        EXCPN_PROLOG_FREEUP_REG r9
+
+        /* U/K mode at time of exception (stack not switched if already K) */
+        lr  r9, [erstatus]
+
+        /* ARC700 doesn't provide auto-stack switching */
+        SWITCH_TO_KERNEL_STK
+
+        /* save the regfile */
+        SAVE_ALL_SYS
+.endm
+
+/*--------------------------------------------------------------
  * Save all registers used by Exceptions (TLB Miss, Prot-V, Mem err etc)
  * Requires SP to be already switched to kernel mode Stack
  * sp points to the next free element on the stack at exit of this macro.
diff --git a/arch/arc/include/asm/io.h b/arch/arc/include/asm/io.h
index 473424d7528b..334ce7017a18 100644
--- a/arch/arc/include/asm/io.h
+++ b/arch/arc/include/asm/io.h
@@ -100,6 +100,10 @@ static inline void __raw_writel(u32 w, volatile void __iomem *addr)
 
 }
 
+#define readb_relaxed readb
+#define readw_relaxed readw
+#define readl_relaxed readl
+
 #include <asm-generic/io.h>
 
 #endif /* _ASM_ARC_IO_H */
diff --git a/arch/arc/include/asm/irqflags.h b/arch/arc/include/asm/irqflags.h
index d99f79bcf865..b68b53f458d1 100644
--- a/arch/arc/include/asm/irqflags.h
+++ b/arch/arc/include/asm/irqflags.h
@@ -157,13 +157,6 @@ static inline void arch_unmask_irq(unsigned int irq)
         flag    \scratch
 .endm
 
-.macro IRQ_DISABLE_SAVE  scratch, save
-        lr      \scratch, [status32]
-        mov     \save, \scratch         /* Make a copy */
-        bic     \scratch, \scratch, (STATUS_E1_MASK | STATUS_E2_MASK)
-        flag    \scratch
-.endm
-
 .macro IRQ_ENABLE  scratch
         lr      \scratch, [status32]
         or      \scratch, \scratch, (STATUS_E1_MASK | STATUS_E2_MASK)
diff --git a/arch/arc/include/asm/mmu.h b/arch/arc/include/asm/mmu.h
index 7c03fe61759c..c2663b32866b 100644
--- a/arch/arc/include/asm/mmu.h
+++ b/arch/arc/include/asm/mmu.h
@@ -32,6 +32,8 @@
 /* Error code if probe fails */
 #define TLB_LKUP_ERR            0x80000000
 
+#define TLB_DUP_ERR     (TLB_LKUP_ERR | 0x00000001)
+
 /* TLB Commands */
 #define TLBWrite    0x1
 #define TLBRead     0x2
@@ -46,21 +48,18 @@
 #ifndef __ASSEMBLY__
 
 typedef struct {
-        unsigned long asid;     /* Pvt Addr-Space ID for mm */
-#ifdef CONFIG_ARC_TLB_DBG
-        struct task_struct *tsk;
-#endif
+        unsigned long asid;     /* 8 bit MMU PID + Generation cycle */
 } mm_context_t;
 
 #ifdef CONFIG_ARC_DBG_TLB_PARANOIA
-void tlb_paranoid_check(unsigned int pid_sw, unsigned long address);
+void tlb_paranoid_check(unsigned int mm_asid, unsigned long address);
 #else
 #define tlb_paranoid_check(a, b)
 #endif
 
 void arc_mmu_init(void);
 extern char *arc_mmu_mumbojumbo(int cpu_id, char *buf, int len);
-void __init read_decode_mmu_bcr(void);
+void read_decode_mmu_bcr(void);
 
 #endif  /* !__ASSEMBLY__ */
 
diff --git a/arch/arc/include/asm/mmu_context.h b/arch/arc/include/asm/mmu_context.h
index 0d71fb11b57c..43a1b51bb8cc 100644
--- a/arch/arc/include/asm/mmu_context.h
+++ b/arch/arc/include/asm/mmu_context.h
@@ -34,95 +34,65 @@
  * When it reaches max 255, the allocation cycle starts afresh by flushing
  * the entire TLB and wrapping ASID back to zero.
  *
- * For book-keeping, Linux uses a couple of data-structures:
- *  -mm_struct has an @asid field to keep a note of task's ASID (needed at the
- *   time of say switch_mm( )
- *  -An array of mm structs @asid_mm_map[] for asid->mm the reverse mapping,
- *  given an ASID, finding the mm struct associated.
- *
- * The round-robin allocation algorithm allows for ASID stealing.
- * If asid tracker is at "x-1", a new req will allocate "x", even if "x" was
- * already assigned to another (switched-out) task. Obviously the prev owner
- * is marked with an invalid ASID to make it request for a new ASID when it
- * gets scheduled next time. However its TLB entries (with ASID "x") could
- * exist, which must be cleared before the same ASID is used by the new owner.
- * Flushing them would be plausible but costly solution. Instead we force a
- * allocation policy quirk, which ensures that a stolen ASID won't have any
- * TLB entries associates, alleviating the need to flush.
- * The quirk essentially is not allowing ASID allocated in prev cycle
- * to be used past a roll-over in the next cycle.
- * When this happens (i.e. task ASID > asid tracker), task needs to refresh
- * its ASID, aligning it to current value of tracker. If the task doesn't get
- * scheduled past a roll-over, hence its ASID is not yet realigned with
- * tracker, such ASID is anyways safely reusable because it is
- * gauranteed that TLB entries with that ASID wont exist.
+ * A new allocation cycle, post rollover, could potentially reassign an ASID
+ * to a different task. Thus the rule is to refresh the ASID in a new cycle.
+ * The 32 bit @asid_cache (and mm->asid) have 8 bits MMU PID and rest 24 bits
+ * serve as cycle/generation indicator and natural 32 bit unsigned math
+ * automagically increments the generation when lower 8 bits rollover.
  */
 
-#define FIRST_ASID  0
-#define MAX_ASID    255                 /* 8 bit PID field in PID Aux reg */
-#define NO_ASID     (MAX_ASID + 1)      /* ASID Not alloc to mmu ctxt */
-#define NUM_ASID    ((MAX_ASID - FIRST_ASID) + 1)
+#define MM_CTXT_ASID_MASK       0x000000ff /* MMU PID reg :8 bit PID */
+#define MM_CTXT_CYCLE_MASK      (~MM_CTXT_ASID_MASK)
+
+#define MM_CTXT_FIRST_CYCLE     (MM_CTXT_ASID_MASK + 1)
+#define MM_CTXT_NO_ASID         0UL
 
-/* ASID to mm struct mapping */
-extern struct mm_struct *asid_mm_map[NUM_ASID + 1];
+#define hw_pid(mm)              (mm->context.asid & MM_CTXT_ASID_MASK)
 
-extern int asid_cache;
+extern unsigned int asid_cache;
 
 /*
- * Assign a new ASID to task. If the task already has an ASID, it is
- * relinquished.
+ * Get a new ASID if task doesn't have a valid one (unalloc or from prev cycle)
+ * Also set the MMU PID register to existing/updated ASID
  */
 static inline void get_new_mmu_context(struct mm_struct *mm)
 {
-        struct mm_struct *prev_owner;
         unsigned long flags;
 
         local_irq_save(flags);
 
         /*
-         * Relinquish the currently owned ASID (if any).
-         * Doing unconditionally saves a cmp-n-branch; for already unused
-         * ASID slot, the value was/remains NULL
+         * Move to new ASID if it was not from current alloc-cycle/generation.
+         * This is done by ensuring that the generation bits in both mm->ASID
+         * and cpu's ASID counter are exactly same.
+         *
+         * Note: Callers needing new ASID unconditionally, independent of
+         *       generation, e.g. local_flush_tlb_mm() for forking  parent,
+         *       first need to destroy the context, setting it to invalid
+         *       value.
          */
-        asid_mm_map[mm->context.asid] = (struct mm_struct *)NULL;
+        if (!((mm->context.asid ^ asid_cache) & MM_CTXT_CYCLE_MASK))
+                goto set_hw;
+
+        /* move to new ASID and handle rollover */
+        if (unlikely(!(++asid_cache & MM_CTXT_ASID_MASK))) {
 
-        /* move to new ASID */
-        if (++asid_cache > MAX_ASID) {  /* ASID roll-over */
-                asid_cache = FIRST_ASID;
                 flush_tlb_all();
-        }
 
-        /*
-         * Is next ASID already owned by some-one else (we are stealing it).
-         * If so, let the orig owner be aware of this, so when it runs, it
-         * asks for a brand new ASID. This would only happen for a long-lived
-         * task with ASID from prev allocation cycle (before ASID roll-over).
-         *
-         * This might look wrong - if we are re-using some other task's ASID,
-         * won't we use it's stale TLB entries too. Actually switch_mm( ) takes
-         * care of such a case: it ensures that task with ASID from prev alloc
-         * cycle, when scheduled will refresh it's ASID: see switch_mm( ) below
-         * The stealing scenario described here will only happen if that task
-         * didn't get a chance to refresh it's ASID - implying stale entries
-         * won't exist.
-         */
-        prev_owner = asid_mm_map[asid_cache];
-        if (prev_owner)
-                prev_owner->context.asid = NO_ASID;
+                /*
+                 * Above checke for rollover of 8 bit ASID in 32 bit container.
+                 * If the container itself wrapped around, set it to a non zero
+                 * "generation" to distinguish from no context
+                 */
+                if (!asid_cache)
+                        asid_cache = MM_CTXT_FIRST_CYCLE;
+        }
 
         /* Assign new ASID to tsk */
-        asid_mm_map[asid_cache] = mm;
         mm->context.asid = asid_cache;
 
-#ifdef CONFIG_ARC_TLB_DBG
-        pr_info("ARC_TLB_DBG: NewMM=0x%x OldMM=0x%x task_struct=0x%x Task: %s,"
-               " pid:%u, assigned asid:%lu\n",
-               (unsigned int)mm, (unsigned int)prev_owner,
-               (unsigned int)(mm->context.tsk), (mm->context.tsk)->comm,
-               (mm->context.tsk)->pid, mm->context.asid);
-#endif
-
-        write_aux_reg(ARC_REG_PID, asid_cache | MMU_ENABLE);
+set_hw:
+        write_aux_reg(ARC_REG_PID, hw_pid(mm) | MMU_ENABLE);
 
         local_irq_restore(flags);
 }
@@ -134,10 +104,7 @@ static inline void get_new_mmu_context(struct mm_struct *mm)
 static inline int
 init_new_context(struct task_struct *tsk, struct mm_struct *mm)
 {
-        mm->context.asid = NO_ASID;
-#ifdef CONFIG_ARC_TLB_DBG
-        mm->context.tsk = tsk;
-#endif
+        mm->context.asid = MM_CTXT_NO_ASID;
         return 0;
 }
 
@@ -152,40 +119,21 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
         write_aux_reg(ARC_REG_SCRATCH_DATA0, next->pgd);
 #endif
 
-        /*
-         * Get a new ASID if task doesn't have a valid one. Possible when
-         *  -task never had an ASID (fresh after fork)
-         *  -it's ASID was stolen - past an ASID roll-over.
-         *  -There's a third obscure scenario (if this task is running for the
-         *   first time afer an ASID rollover), where despite having a valid
-         *   ASID, we force a get for new ASID - see comments at top.
-         *
-         * Both the non-alloc scenario and first-use-after-rollover can be
-         * detected using the single condition below:  NO_ASID = 256
-         * while asid_cache is always a valid ASID value (0-255).
-         */
-        if (next->context.asid > asid_cache) {
-                get_new_mmu_context(next);
-        } else {
-                /*
-                 * XXX: This will never happen given the chks above
-                 * BUG_ON(next->context.asid > MAX_ASID);
-                 */
-                write_aux_reg(ARC_REG_PID, next->context.asid | MMU_ENABLE);
-        }
-
+        get_new_mmu_context(next);
 }
 
+/*
+ * Called at the time of execve() to get a new ASID
+ * Note the subtlety here: get_new_mmu_context() behaves differently here
+ * vs. in switch_mm(). Here it always returns a new ASID, because mm has
+ * an unallocated "initial" value, while in latter, it moves to a new ASID,
+ * only if it was unallocated
+ */
+#define activate_mm(prev, next)         switch_mm(prev, next, NULL)
+
 static inline void destroy_context(struct mm_struct *mm)
 {
-        unsigned long flags;
-
-        local_irq_save(flags);
-
-        asid_mm_map[mm->context.asid] = NULL;
-        mm->context.asid = NO_ASID;
-
-        local_irq_restore(flags);
+        mm->context.asid = MM_CTXT_NO_ASID;
 }
 
 /* it seemed that deactivate_mm( ) is a reasonable place to do book-keeping
@@ -197,17 +145,6 @@ static inline void destroy_context(struct mm_struct *mm)
  */
 #define deactivate_mm(tsk, mm)   do { } while (0)
 
-static inline void activate_mm(struct mm_struct *prev, struct mm_struct *next)
-{
-#ifndef CONFIG_SMP
-        write_aux_reg(ARC_REG_SCRATCH_DATA0, next->pgd);
-#endif
-
-        /* Unconditionally get a new ASID */
-        get_new_mmu_context(next);
-
-}
-
 #define enter_lazy_tlb(mm, tsk)
 
 #endif /* __ASM_ARC_MMU_CONTEXT_H */
diff --git a/arch/arc/include/asm/pgtable.h b/arch/arc/include/asm/pgtable.h
index 4749a0eee1cf..6b0b7f7ef783 100644
--- a/arch/arc/include/asm/pgtable.h
+++ b/arch/arc/include/asm/pgtable.h
@@ -57,43 +57,31 @@
 
 #define _PAGE_ACCESSED      (1<<1)      /* Page is accessed (S) */
 #define _PAGE_CACHEABLE     (1<<2)      /* Page is cached (H) */
-#define _PAGE_U_EXECUTE     (1<<3)      /* Page has user execute perm (H) */
-#define _PAGE_U_WRITE       (1<<4)      /* Page has user write perm (H) */
-#define _PAGE_U_READ        (1<<5)      /* Page has user read perm (H) */
-#define _PAGE_K_EXECUTE     (1<<6)      /* Page has kernel execute perm (H) */
-#define _PAGE_K_WRITE       (1<<7)      /* Page has kernel write perm (H) */
-#define _PAGE_K_READ        (1<<8)      /* Page has kernel perm (H) */
-#define _PAGE_GLOBAL        (1<<9)      /* Page is global (H) */
-#define _PAGE_MODIFIED      (1<<10)     /* Page modified (dirty) (S) */
-#define _PAGE_FILE          (1<<10)     /* page cache/ swap (S) */
-#define _PAGE_PRESENT       (1<<11)     /* TLB entry is valid (H) */
+#define _PAGE_EXECUTE       (1<<3)      /* Page has user execute perm (H) */
+#define _PAGE_WRITE         (1<<4)      /* Page has user write perm (H) */
+#define _PAGE_READ          (1<<5)      /* Page has user read perm (H) */
+#define _PAGE_MODIFIED      (1<<6)      /* Page modified (dirty) (S) */
+#define _PAGE_FILE          (1<<7)      /* page cache/ swap (S) */
+#define _PAGE_GLOBAL        (1<<8)      /* Page is global (H) */
+#define _PAGE_PRESENT       (1<<10)     /* TLB entry is valid (H) */
 
-#else
+#else   /* MMU v3 onwards */
 
-/* PD1 */
 #define _PAGE_CACHEABLE     (1<<0)      /* Page is cached (H) */
-#define _PAGE_U_EXECUTE     (1<<1)      /* Page has user execute perm (H) */
-#define _PAGE_U_WRITE       (1<<2)      /* Page has user write perm (H) */
-#define _PAGE_U_READ        (1<<3)      /* Page has user read perm (H) */
-#define _PAGE_K_EXECUTE     (1<<4)      /* Page has kernel execute perm (H) */
-#define _PAGE_K_WRITE       (1<<5)      /* Page has kernel write perm (H) */
-#define _PAGE_K_READ        (1<<6)      /* Page has kernel perm (H) */
-#define _PAGE_ACCESSED      (1<<7)      /* Page is accessed (S) */
-
-/* PD0 */
+#define _PAGE_EXECUTE       (1<<1)      /* Page has user execute perm (H) */
+#define _PAGE_WRITE         (1<<2)      /* Page has user write perm (H) */
+#define _PAGE_READ          (1<<3)      /* Page has user read perm (H) */
+#define _PAGE_ACCESSED      (1<<4)      /* Page is accessed (S) */
+#define _PAGE_MODIFIED      (1<<5)      /* Page modified (dirty) (S) */
+#define _PAGE_FILE          (1<<6)      /* page cache/ swap (S) */
 #define _PAGE_GLOBAL        (1<<8)      /* Page is global (H) */
 #define _PAGE_PRESENT       (1<<9)      /* TLB entry is valid (H) */
-#define _PAGE_SHARED_CODE   (1<<10)     /* Shared Code page with cmn vaddr
+#define _PAGE_SHARED_CODE   (1<<11)     /* Shared Code page with cmn vaddr
                                            usable for shared TLB entries (H) */
-
-#define _PAGE_MODIFIED      (1<<11)     /* Page modified (dirty) (S) */
-#define _PAGE_FILE          (1<<12)     /* page cache/ swap (S) */
-
-#define _PAGE_SHARED_CODE_H (1<<31)     /* Hardware counterpart of above */
 #endif
 
-/* Kernel allowed all permissions for all pages */
-#define _K_PAGE_PERMS  (_PAGE_K_EXECUTE | _PAGE_K_WRITE | _PAGE_K_READ | \
+/* vmalloc permissions */
+#define _K_PAGE_PERMS  (_PAGE_EXECUTE | _PAGE_WRITE | _PAGE_READ | \
                         _PAGE_GLOBAL | _PAGE_PRESENT)
 
 #ifdef CONFIG_ARC_CACHE_PAGES
@@ -109,10 +97,6 @@
  */
 #define ___DEF (_PAGE_PRESENT | _PAGE_DEF_CACHEABLE)
 
-#define _PAGE_READ      (_PAGE_U_READ    | _PAGE_K_READ)
-#define _PAGE_WRITE     (_PAGE_U_WRITE   | _PAGE_K_WRITE)
-#define _PAGE_EXECUTE   (_PAGE_U_EXECUTE | _PAGE_K_EXECUTE)
-
 /* Set of bits not changed in pte_modify */
 #define _PAGE_CHG_MASK  (PAGE_MASK | _PAGE_ACCESSED | _PAGE_MODIFIED)
 
@@ -126,8 +110,8 @@
 
 #define PAGE_SHARED     PAGE_U_W_R
 
-/* While kernel runs out of unstrslated space, vmalloc/modules use a chunk of
- * kernel vaddr space - visible in all addr spaces, but kernel mode only
+/* While kernel runs out of unstranslated space, vmalloc/modules use a chunk of
+ * user vaddr space - visible in all addr spaces, but kernel mode only
  * Thus Global, all-kernel-access, no-user-access, cached
  */
 #define PAGE_KERNEL          __pgprot(_K_PAGE_PERMS | _PAGE_DEF_CACHEABLE)
@@ -136,10 +120,9 @@
 #define PAGE_KERNEL_NO_CACHE __pgprot(_K_PAGE_PERMS)
 
 /* Masks for actual TLB "PD"s */
-#define PTE_BITS_IN_PD0 (_PAGE_GLOBAL | _PAGE_PRESENT)
-#define PTE_BITS_IN_PD1 (PAGE_MASK | _PAGE_CACHEABLE | \
-                         _PAGE_U_EXECUTE | _PAGE_U_WRITE | _PAGE_U_READ | \
-                         _PAGE_K_EXECUTE | _PAGE_K_WRITE | _PAGE_K_READ)
+#define PTE_BITS_IN_PD0         (_PAGE_GLOBAL | _PAGE_PRESENT)
+#define PTE_BITS_RWX            (_PAGE_EXECUTE | _PAGE_WRITE | _PAGE_READ)
+#define PTE_BITS_NON_RWX_IN_PD1 (PAGE_MASK | _PAGE_CACHEABLE)
 
 /**************************************************************************
  * Mapping of vm_flags (Generic VM) to PTE flags (arch specific)
diff --git a/arch/arc/include/asm/ptrace.h b/arch/arc/include/asm/ptrace.h
index c9938e7a7dbd..1bfeec2c0558 100644
--- a/arch/arc/include/asm/ptrace.h
+++ b/arch/arc/include/asm/ptrace.h
@@ -20,27 +20,17 @@ struct pt_regs {
 
         /* Real registers */
         long bta;       /* bta_l1, bta_l2, erbta */
-        long lp_start;
-        long lp_end;
-        long lp_count;
+
+        long lp_start, lp_end, lp_count;
+
         long status32;  /* status32_l1, status32_l2, erstatus */
         long ret;       /* ilink1, ilink2 or eret */
         long blink;
         long fp;
         long r26;       /* gp */
-        long r12;
-        long r11;
-        long r10;
-        long r9;
-        long r8;
-        long r7;
-        long r6;
-        long r5;
-        long r4;
-        long r3;
-        long r2;
-        long r1;
-        long r0;
+
+        long r12, r11, r10, r9, r8, r7, r6, r5, r4, r3, r2, r1, r0;
+
         long sp;        /* user/kernel sp depending on where we came from  */
         long orig_r0;
 
@@ -70,19 +60,7 @@ struct pt_regs {
 /* Callee saved registers - need to be saved only when you are scheduled out */
 
 struct callee_regs {
-        long r25;
-        long r24;
-        long r23;
-        long r22;
-        long r21;
-        long r20;
-        long r19;
-        long r18;
-        long r17;
-        long r16;
-        long r15;
-        long r14;
-        long r13;
+        long r25, r24, r23, r22, r21, r20, r19, r18, r17, r16, r15, r14, r13;
 };
 
 #define instruction_pointer(regs)       ((regs)->ret)
diff --git a/arch/arc/include/asm/sections.h b/arch/arc/include/asm/sections.h
index 6fc1159dfefe..764f1e3ba752 100644
--- a/arch/arc/include/asm/sections.h
+++ b/arch/arc/include/asm/sections.h
@@ -11,7 +11,6 @@
 
 #include <asm-generic/sections.h>
 
-extern char _int_vec_base_lds[];
 extern char __arc_dccm_base[];
 extern char __dtb_start[];
 
diff --git a/arch/arc/include/asm/spinlock_types.h b/arch/arc/include/asm/spinlock_types.h
index 8276bfd61704..662627ced4f2 100644
--- a/arch/arc/include/asm/spinlock_types.h
+++ b/arch/arc/include/asm/spinlock_types.h
@@ -20,9 +20,9 @@ typedef struct {
 #define __ARCH_SPIN_LOCK_LOCKED         { __ARCH_SPIN_LOCK_LOCKED__ }
 
 /*
- * Unlocked:     0x01_00_00_00
- * Read lock(s): 0x00_FF_00_00 to say 0x01
- * Write lock:   0x0, but only possible if prior value "unlocked" 0x0100_0000
+ * Unlocked     : 0x0100_0000
+ * Read lock(s) : 0x00FF_FFFF to 0x01  (Multiple Readers decrement it)
+ * Write lock   : 0x0, but only if prior value is "unlocked" 0x0100_0000
  */
 typedef struct {
         volatile unsigned int   counter;
diff --git a/arch/arc/kernel/.gitignore b/arch/arc/kernel/.gitignore
new file mode 100644
index 000000000000..c5f676c3c224
--- /dev/null
+++ b/arch/arc/kernel/.gitignore
@@ -0,0 +1 @@
+vmlinux.lds
diff --git a/arch/arc/kernel/devtree.c b/arch/arc/kernel/devtree.c
index bdee3a812052..2340af0e1d6f 100644
--- a/arch/arc/kernel/devtree.c
+++ b/arch/arc/kernel/devtree.c
@@ -18,12 +18,6 @@
 #include <asm/clk.h>
 #include <asm/mach_desc.h>
 
-/* called from unflatten_device_tree() to bootstrap devicetree itself */
-void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
-{
-        return __va(memblock_alloc(size, align));
-}
-
 /**
  * setup_machine_fdt - Machine setup when an dtb was passed to the kernel
  * @dt:         virtual address pointer to dt blob
diff --git a/arch/arc/kernel/entry.S b/arch/arc/kernel/entry.S
index 1d7165156e17..b908dde8a331 100644
--- a/arch/arc/kernel/entry.S
+++ b/arch/arc/kernel/entry.S
@@ -267,12 +267,7 @@ ARC_EXIT handle_interrupt_level1
 
 ARC_ENTRY instr_service
 
-        EXCPN_PROLOG_FREEUP_REG r9
-
-        lr  r9, [erstatus]
-
-        SWITCH_TO_KERNEL_STK
-        SAVE_ALL_SYS
+        EXCEPTION_PROLOGUE
 
         lr  r0, [efa]
         mov r1, sp
@@ -289,15 +284,13 @@ ARC_EXIT instr_service
 
 ARC_ENTRY mem_service
 
-        EXCPN_PROLOG_FREEUP_REG r9
-
-        lr  r9, [erstatus]
-
-        SWITCH_TO_KERNEL_STK
-        SAVE_ALL_SYS
+        EXCEPTION_PROLOGUE
 
         lr  r0, [efa]
         mov r1, sp
+
+        FAKE_RET_FROM_EXCPN r9
+
         bl  do_memory_error
         b   ret_from_exception
 ARC_EXIT mem_service
@@ -308,11 +301,7 @@ ARC_EXIT mem_service
 
 ARC_ENTRY EV_MachineCheck
 
-        EXCPN_PROLOG_FREEUP_REG r9
-        lr  r9, [erstatus]
-
-        SWITCH_TO_KERNEL_STK
-        SAVE_ALL_SYS
+        EXCEPTION_PROLOGUE
 
         lr  r2, [ecr]
         lr  r0, [efa]
@@ -342,13 +331,7 @@ ARC_EXIT EV_MachineCheck
 
 ARC_ENTRY EV_TLBProtV
 
-        EXCPN_PROLOG_FREEUP_REG r9
-
-        ;Which mode (user/kernel) was the system in when Exception occured
-        lr  r9, [erstatus]
-
-        SWITCH_TO_KERNEL_STK
-        SAVE_ALL_SYS
+        EXCEPTION_PROLOGUE
 
         ;---------(3) Save some more regs-----------------
         ;  vineetg: Mar 6th: Random Seg Fault issue #1
@@ -406,12 +389,7 @@ ARC_EXIT EV_TLBProtV
 ; ---------------------------------------------
 ARC_ENTRY EV_PrivilegeV
 
-        EXCPN_PROLOG_FREEUP_REG r9
-
-        lr  r9, [erstatus]
-
-        SWITCH_TO_KERNEL_STK
-        SAVE_ALL_SYS
+        EXCEPTION_PROLOGUE
 
         lr  r0, [efa]
         mov r1, sp
@@ -427,14 +405,13 @@ ARC_EXIT EV_PrivilegeV
 ; ---------------------------------------------
 ARC_ENTRY EV_Extension
 
-        EXCPN_PROLOG_FREEUP_REG r9
-        lr  r9, [erstatus]
-
-        SWITCH_TO_KERNEL_STK
-        SAVE_ALL_SYS
+        EXCEPTION_PROLOGUE
 
         lr  r0, [efa]
         mov r1, sp
+
+        FAKE_RET_FROM_EXCPN r9
+
         bl  do_extension_fault
         b   ret_from_exception
 ARC_EXIT EV_Extension
@@ -526,14 +503,7 @@ trap_with_param:
 
 ARC_ENTRY EV_Trap
 
-        ; Need at least 1 reg to code the early exception prolog
-        EXCPN_PROLOG_FREEUP_REG r9
-
-        ;Which mode (user/kernel) was the system in when intr occured
-        lr  r9, [erstatus]
-
-        SWITCH_TO_KERNEL_STK
-        SAVE_ALL_SYS
+        EXCEPTION_PROLOGUE
 
         ;------- (4) What caused the Trap --------------
         lr     r12, [ecr]
@@ -642,6 +612,9 @@ resume_kernel_mode:
 
 #ifdef CONFIG_PREEMPT
 
+        ; This is a must for preempt_schedule_irq()
+        IRQ_DISABLE     r9
+
         ; Can't preempt if preemption disabled
         GET_CURR_THR_INFO_FROM_SP   r10
         ld  r8, [r10, THREAD_INFO_PREEMPT_COUNT]
@@ -651,8 +624,6 @@ resume_kernel_mode:
         ld  r9, [r10, THREAD_INFO_FLAGS]
         bbit0  r9, TIF_NEED_RESCHED, restore_regs
 
-        IRQ_DISABLE     r9
-
         ; Invoke PREEMPTION
         bl      preempt_schedule_irq
 
@@ -665,12 +636,11 @@ resume_kernel_mode:
 ;
 ; Restore the saved sys context (common exit-path for EXCPN/IRQ/Trap)
 ; IRQ shd definitely not happen between now and rtie
+; All 2 entry points to here already disable interrupts
 
 restore_regs :
 
-        ; Disable Interrupts while restoring reg-file back
-        ; XXX can this be optimised out
-        IRQ_DISABLE_SAVE    r9, r10     ;@r10 has prisitine (pre-disable) copy
+        lr      r10, [status32]
 
         ; Restore REG File. In case multiple Events outstanding,
         ; use the same priorty as rtie: EXCPN, L2 IRQ, L1 IRQ, None
diff --git a/arch/arc/kernel/head.S b/arch/arc/kernel/head.S
index 2a913f85a747..0f944f024513 100644
--- a/arch/arc/kernel/head.S
+++ b/arch/arc/kernel/head.S
@@ -34,6 +34,9 @@ stext:
         ;       IDENTITY Reg [ 3  2  1  0 ]
         ;       (cpu-id)             ^^^        => Zero for UP ARC700
         ;                                       => #Core-ID if SMP (Master 0)
+        ; Note that non-boot CPUs might not land here if halt-on-reset and
+        ; instead breath life from @first_lines_of_secondary, but we still
+        ; need to make sure only boot cpu takes this path.
         GET_CPU_ID  r5
         cmp     r5, 0
         jnz     arc_platform_smp_wait_to_boot
@@ -98,6 +101,8 @@ stext:
 
 first_lines_of_secondary:
 
+        sr      @_int_vec_base_lds, [AUX_INTR_VEC_BASE]
+
         ; setup per-cpu idle task as "current" on this CPU
         ld      r0, [@secondary_idle_tsk]
         SET_CURR_TASK_ON_CPU  r0, r1
diff --git a/arch/arc/kernel/irq.c b/arch/arc/kernel/irq.c
index 305b3f866aa7..5fc92455da36 100644
--- a/arch/arc/kernel/irq.c
+++ b/arch/arc/kernel/irq.c
@@ -24,7 +24,6 @@
  * -Needed for each CPU (hence not foldable into init_IRQ)
  *
  * what it does ?
- * -setup Vector Table Base Reg - in case Linux not linked at 0x8000_0000
  * -Disable all IRQs (on CPU side)
  * -Optionally, setup the High priority Interrupts as Level 2 IRQs
  */
diff --git a/arch/arc/kernel/setup.c b/arch/arc/kernel/setup.c
index 6b083454d039..2c68bc7e6a78 100644
--- a/arch/arc/kernel/setup.c
+++ b/arch/arc/kernel/setup.c
@@ -47,10 +47,7 @@ void read_arc_build_cfg_regs(void)
         READ_BCR(AUX_IDENTITY, cpu->core);
 
         cpu->timers = read_aux_reg(ARC_REG_TIMERS_BCR);
-
         cpu->vec_base = read_aux_reg(AUX_INTR_VEC_BASE);
-        if (cpu->vec_base == 0)
-                cpu->vec_base = (unsigned int)_int_vec_base_lds;
 
         READ_BCR(ARC_REG_D_UNCACH_BCR, uncached_space);
         cpu->uncached_base = uncached_space.start << 24;
@@ -357,8 +354,6 @@ void __init setup_arch(char **cmdline_p)
          */
         root_mountflags &= ~MS_RDONLY;
 
-        console_verbose();
-
 #if defined(CONFIG_VT) && defined(CONFIG_DUMMY_CONSOLE)
         conswitchp = &dummy_con;
 #endif
diff --git a/arch/arc/kernel/unaligned.c b/arch/arc/kernel/unaligned.c
index c0f832f595d3..28d170060747 100644
--- a/arch/arc/kernel/unaligned.c
+++ b/arch/arc/kernel/unaligned.c
@@ -16,6 +16,16 @@
 #include <linux/uaccess.h>
 #include <asm/disasm.h>
 
+#ifdef CONFIG_CPU_BIG_ENDIAN
+#define BE              1
+#define FIRST_BYTE_16   "swap %1, %1\n swape %1, %1\n"
+#define FIRST_BYTE_32   "swape %1, %1\n"
+#else
+#define BE              0
+#define FIRST_BYTE_16
+#define FIRST_BYTE_32
+#endif
+
 #define __get8_unaligned_check(val, addr, err)          \
         __asm__(                                        \
         "1:     ldb.ab  %1, [%2, 1]\n"                  \
@@ -36,9 +46,9 @@
         do {                                            \
                 unsigned int err = 0, v, a = addr;      \
                 __get8_unaligned_check(v, a, err);      \
-                val =  v ;                              \
+                val =  v << ((BE) ? 8 : 0);             \
                 __get8_unaligned_check(v, a, err);      \
-                val |= v << 8;                          \
+                val |= v << ((BE) ? 0 : 8);             \
                 if (err)                                \
                         goto fault;                     \
         } while (0)
@@ -47,13 +57,13 @@
         do {                                            \
                 unsigned int err = 0, v, a = addr;      \
                 __get8_unaligned_check(v, a, err);      \
-                val =  v << 0;                          \
+                val =  v << ((BE) ? 24 : 0);            \
                 __get8_unaligned_check(v, a, err);      \
-                val |= v << 8;                          \
+                val |= v << ((BE) ? 16 : 8);            \
                 __get8_unaligned_check(v, a, err);      \
-                val |= v << 16;                         \
+                val |= v << ((BE) ? 8 : 16);            \
                 __get8_unaligned_check(v, a, err);      \
-                val |= v << 24;                         \
+                val |= v << ((BE) ? 0 : 24);            \
                 if (err)                                \
                         goto fault;                     \
         } while (0)
@@ -63,6 +73,7 @@
                 unsigned int err = 0, v = val, a = addr;\
                                                         \
                 __asm__(                                \
+                FIRST_BYTE_16                           \
                 "1:     stb.ab  %1, [%2, 1]\n"          \
                 "       lsr %1, %1, 8\n"                \
                 "2:     stb     %1, [%2]\n"             \
@@ -87,8 +98,9 @@
 #define put32_unaligned_check(val, addr)                \
         do {                                            \
                 unsigned int err = 0, v = val, a = addr;\
-                __asm__(                                \
                                                         \
+                __asm__(                                \
+                FIRST_BYTE_32                           \
                 "1:     stb.ab  %1, [%2, 1]\n"          \
                 "       lsr %1, %1, 8\n"                \
                 "2:     stb.ab  %1, [%2, 1]\n"          \
diff --git a/arch/arc/mm/cache_arc700.c b/arch/arc/mm/cache_arc700.c
index f415d851b765..5a1259cd948c 100644
--- a/arch/arc/mm/cache_arc700.c
+++ b/arch/arc/mm/cache_arc700.c
@@ -622,12 +622,12 @@ void flush_icache_range(unsigned long kstart, unsigned long kend)
 /*
  * General purpose helper to make I and D cache lines consistent.
  * @paddr is phy addr of region
- * @vaddr is typically user or kernel vaddr (vmalloc)
- *    Howver in one instance, flush_icache_range() by kprobe (for a breakpt in
+ * @vaddr is typically user vaddr (breakpoint) or kernel vaddr (vmalloc)
+ *    However in one instance, when called by kprobe (for a breakpt in
  *    builtin kernel code) @vaddr will be paddr only, meaning CDU operation will
  *    use a paddr to index the cache (despite VIPT). This is fine since since a
- *    built-in kernel page will not have any virtual mappings (not even kernel)
- *    kprobe on loadable module is different as it will have kvaddr.
+ *    builtin kernel page will not have any virtual mappings.
+ *    kprobe on loadable module will be kernel vaddr.
  */
 void __sync_icache_dcache(unsigned long paddr, unsigned long vaddr, int len)
 {
diff --git a/arch/arc/mm/fault.c b/arch/arc/mm/fault.c
index 0fd1f0d515ff..d63f3de0cd5b 100644
--- a/arch/arc/mm/fault.c
+++ b/arch/arc/mm/fault.c
@@ -60,8 +60,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long address)
         siginfo_t info;
         int fault, ret;
         int write = regs->ecr_cause & ECR_C_PROTV_STORE;  /* ST/EX */
-        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
-                                (write ? FAULT_FLAG_WRITE : 0);
+        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
 
         /*
          * We fault-in kernel-space virtual memory on-demand. The
@@ -89,6 +88,8 @@ void do_page_fault(struct pt_regs *regs, unsigned long address)
         if (in_atomic() || !mm)
                 goto no_context;
 
+        if (user_mode(regs))
+                flags |= FAULT_FLAG_USER;
 retry:
         down_read(&mm->mmap_sem);
         vma = find_vma(mm, address);
@@ -117,12 +118,12 @@ good_area:
         if (write) {
                 if (!(vma->vm_flags & VM_WRITE))
                         goto bad_area;
+                flags |= FAULT_FLAG_WRITE;
         } else {
                 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
                         goto bad_area;
         }
 
-survive:
         /*
          * If for any reason at all we couldn't handle the fault,
          * make sure we exit gracefully rather than endlessly redo
@@ -201,10 +202,6 @@ no_context:
         die("Oops", regs, address);
 
 out_of_memory:
-        if (is_global_init(tsk)) {
-                yield();
-                goto survive;
-        }
         up_read(&mm->mmap_sem);
 
         if (user_mode(regs)) {
diff --git a/arch/arc/mm/init.c b/arch/arc/mm/init.c
index a08ce7185423..81279ec73a6a 100644
--- a/arch/arc/mm/init.c
+++ b/arch/arc/mm/init.c
@@ -127,9 +127,8 @@ void __init free_initrd_mem(unsigned long start, unsigned long end)
 #endif
 
 #ifdef CONFIG_OF_FLATTREE
-void __init early_init_dt_setup_initrd_arch(unsigned long start,
-                                            unsigned long end)
+void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
 {
-        pr_err("%s(%lx, %lx)\n", __func__, start, end);
+        pr_err("%s(%llx, %llx)\n", __func__, start, end);
 }
 #endif /* CONFIG_OF_FLATTREE */
diff --git a/arch/arc/mm/tlb.c b/arch/arc/mm/tlb.c
index 7957dc4e4d4a..71cb26df4255 100644
--- a/arch/arc/mm/tlb.c
+++ b/arch/arc/mm/tlb.c
@@ -52,6 +52,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/bug.h>
 #include <asm/arcregs.h>
 #include <asm/setup.h>
 #include <asm/mmu_context.h>
@@ -99,48 +100,45 @@
 
 
 /* A copy of the ASID from the PID reg is kept in asid_cache */
-int asid_cache = FIRST_ASID;
-
-/* ASID to mm struct mapping. We have one extra entry corresponding to
- * NO_ASID to save us a compare when clearing the mm entry for old asid
- * see get_new_mmu_context (asm-arc/mmu_context.h)
- */
-struct mm_struct *asid_mm_map[NUM_ASID + 1];
+unsigned int asid_cache = MM_CTXT_FIRST_CYCLE;
 
 /*
  * Utility Routine to erase a J-TLB entry
- * The procedure is to look it up in the MMU. If found, ERASE it by
- *  issuing a TlbWrite CMD with PD0 = PD1 = 0
+ * Caller needs to setup Index Reg (manually or via getIndex)
  */
-
-static void __tlb_entry_erase(void)
+static inline void __tlb_entry_erase(void)
 {
         write_aux_reg(ARC_REG_TLBPD1, 0);
         write_aux_reg(ARC_REG_TLBPD0, 0);
         write_aux_reg(ARC_REG_TLBCOMMAND, TLBWrite);
 }
 
-static void tlb_entry_erase(unsigned int vaddr_n_asid)
+static inline unsigned int tlb_entry_lkup(unsigned long vaddr_n_asid)
 {
         unsigned int idx;
 
-        /* Locate the TLB entry for this vaddr + ASID */
         write_aux_reg(ARC_REG_TLBPD0, vaddr_n_asid);
+
         write_aux_reg(ARC_REG_TLBCOMMAND, TLBProbe);
         idx = read_aux_reg(ARC_REG_TLBINDEX);
 
+        return idx;
+}
+
+static void tlb_entry_erase(unsigned int vaddr_n_asid)
+{
+        unsigned int idx;
+
+        /* Locate the TLB entry for this vaddr + ASID */
+        idx = tlb_entry_lkup(vaddr_n_asid);
+
         /* No error means entry found, zero it out */
         if (likely(!(idx & TLB_LKUP_ERR))) {
                 __tlb_entry_erase();
-        } else {                /* Some sort of Error */
-
+        } else {
                 /* Duplicate entry error */
-                if (idx & 0x1) {
-                        /* TODO we need to handle this case too */
-                        pr_emerg("unhandled Duplicate flush for %x\n",
-                               vaddr_n_asid);
-                }
-                /* else entry not found so nothing to do */
+                WARN(idx == TLB_DUP_ERR, "Probe returned Dup PD for %x\n",
+                                           vaddr_n_asid);
         }
 }
 
@@ -159,7 +157,7 @@ static void utlb_invalidate(void)
 {
 #if (CONFIG_ARC_MMU_VER >= 2)
 
-#if (CONFIG_ARC_MMU_VER < 3)
+#if (CONFIG_ARC_MMU_VER == 2)
         /* MMU v2 introduced the uTLB Flush command.
          * There was however an obscure hardware bug, where uTLB flush would
          * fail when a prior probe for J-TLB (both totally unrelated) would
@@ -182,6 +180,36 @@ static void utlb_invalidate(void)
 
 }
 
+static void tlb_entry_insert(unsigned int pd0, unsigned int pd1)
+{
+        unsigned int idx;
+
+        /*
+         * First verify if entry for this vaddr+ASID already exists
+         * This also sets up PD0 (vaddr, ASID..) for final commit
+         */
+        idx = tlb_entry_lkup(pd0);
+
+        /*
+         * If Not already present get a free slot from MMU.
+         * Otherwise, Probe would have located the entry and set INDEX Reg
+         * with existing location. This will cause Write CMD to over-write
+         * existing entry with new PD0 and PD1
+         */
+        if (likely(idx & TLB_LKUP_ERR))
+                write_aux_reg(ARC_REG_TLBCOMMAND, TLBGetIndex);
+
+        /* setup the other half of TLB entry (pfn, rwx..) */
+        write_aux_reg(ARC_REG_TLBPD1, pd1);
+
+        /*
+         * Commit the Entry to MMU
+         * It doesnt sound safe to use the TLBWriteNI cmd here
+         * which doesn't flush uTLBs. I'd rather be safe than sorry.
+         */
+        write_aux_reg(ARC_REG_TLBCOMMAND, TLBWrite);
+}
+
 /*
  * Un-conditionally (without lookup) erase the entire MMU contents
  */
@@ -224,13 +252,14 @@ noinline void local_flush_tlb_mm(struct mm_struct *mm)
                 return;
 
         /*
-         * Workaround for Android weirdism:
-         * A binder VMA could end up in a task such that vma->mm != tsk->mm
-         * old code would cause h/w - s/w ASID to get out of sync
+         * - Move to a new ASID, but only if the mm is still wired in
+         *   (Android Binder ended up calling this for vma->mm != tsk->mm,
+         *    causing h/w - s/w ASID to get out of sync)
+         * - Also get_new_mmu_context() new implementation allocates a new
+         *   ASID only if it is not allocated already - so unallocate first
          */
-        if (current->mm != mm)
-                destroy_context(mm);
-        else
+        destroy_context(mm);
+        if (current->mm == mm)
                 get_new_mmu_context(mm);
 }
 
@@ -246,7 +275,6 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
                            unsigned long end)
 {
         unsigned long flags;
-        unsigned int asid;
 
         /* If range @start to @end is more than 32 TLB entries deep,
          * its better to move to a new ASID rather than searching for
@@ -268,11 +296,10 @@ void local_flush_tlb_range(struct vm_area_struct *vma, unsigned long start,
         start &= PAGE_MASK;
 
         local_irq_save(flags);
-        asid = vma->vm_mm->context.asid;
 
-        if (asid != NO_ASID) {
+        if (vma->vm_mm->context.asid != MM_CTXT_NO_ASID) {
                 while (start < end) {
-                        tlb_entry_erase(start | (asid & 0xff));
+                        tlb_entry_erase(start | hw_pid(vma->vm_mm));
                         start += PAGE_SIZE;
                 }
         }
@@ -326,9 +353,8 @@ void local_flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
          */
         local_irq_save(flags);
 
-        if (vma->vm_mm->context.asid != NO_ASID) {
-                tlb_entry_erase((page & PAGE_MASK) |
-                                (vma->vm_mm->context.asid & 0xff));
+        if (vma->vm_mm->context.asid != MM_CTXT_NO_ASID) {
+                tlb_entry_erase((page & PAGE_MASK) | hw_pid(vma->vm_mm));
                 utlb_invalidate();
         }
 
@@ -341,8 +367,8 @@ void local_flush_tlb_page(struct vm_area_struct *vma, unsigned long page)
 void create_tlb(struct vm_area_struct *vma, unsigned long address, pte_t *ptep)
 {
         unsigned long flags;
-        unsigned int idx, asid_or_sasid;
-        unsigned long pd0_flags;
+        unsigned int asid_or_sasid, rwx;
+        unsigned long pd0, pd1;
 
         /*
          * create_tlb() assumes that current->mm == vma->mm, since
@@ -381,40 +407,30 @@ void create_tlb(struct vm_area_struct *vma, unsigned long address, pte_t *ptep)
         /* update this PTE credentials */
         pte_val(*ptep) |= (_PAGE_PRESENT | _PAGE_ACCESSED);
 
-        /* Create HW TLB entry Flags (in PD0) from PTE Flags */
-#if (CONFIG_ARC_MMU_VER <= 2)
-        pd0_flags = ((pte_val(*ptep) & PTE_BITS_IN_PD0) >> 1);
-#else
-        pd0_flags = ((pte_val(*ptep) & PTE_BITS_IN_PD0));
-#endif
+        /* Create HW TLB(PD0,PD1) from PTE  */
 
         /* ASID for this task */
         asid_or_sasid = read_aux_reg(ARC_REG_PID) & 0xff;
 
-        write_aux_reg(ARC_REG_TLBPD0, address | pd0_flags | asid_or_sasid);
-
-        /* Load remaining info in PD1 (Page Frame Addr and Kx/Kw/Kr Flags) */
-        write_aux_reg(ARC_REG_TLBPD1, (pte_val(*ptep) & PTE_BITS_IN_PD1));
-
-        /* First verify if entry for this vaddr+ASID already exists */
-        write_aux_reg(ARC_REG_TLBCOMMAND, TLBProbe);
-        idx = read_aux_reg(ARC_REG_TLBINDEX);
+        pd0 = address | asid_or_sasid | (pte_val(*ptep) & PTE_BITS_IN_PD0);
 
         /*
-         * If Not already present get a free slot from MMU.
-         * Otherwise, Probe would have located the entry and set INDEX Reg
-         * with existing location. This will cause Write CMD to over-write
-         * existing entry with new PD0 and PD1
+         * ARC MMU provides fully orthogonal access bits for K/U mode,
+         * however Linux only saves 1 set to save PTE real-estate
+         * Here we convert 3 PTE bits into 6 MMU bits:
+         * -Kernel only entries have Kr Kw Kx 0 0 0
+         * -User entries have mirrored K and U bits
          */
-        if (likely(idx & TLB_LKUP_ERR))
-                write_aux_reg(ARC_REG_TLBCOMMAND, TLBGetIndex);
+        rwx = pte_val(*ptep) & PTE_BITS_RWX;
 
-        /*
-         * Commit the Entry to MMU
-         * It doesnt sound safe to use the TLBWriteNI cmd here
-         * which doesn't flush uTLBs. I'd rather be safe than sorry.
-         */
-        write_aux_reg(ARC_REG_TLBCOMMAND, TLBWrite);
+        if (pte_val(*ptep) & _PAGE_GLOBAL)
+                rwx <<= 3;              /* r w x => Kr Kw Kx 0 0 0 */
+        else
+                rwx |= (rwx << 3);      /* r w x => Kr Kw Kx Ur Uw Ux */
+
+        pd1 = rwx | (pte_val(*ptep) & PTE_BITS_NON_RWX_IN_PD1);
+
+        tlb_entry_insert(pd0, pd1);
 
         local_irq_restore(flags);
 }
@@ -553,13 +569,6 @@ void arc_mmu_init(void)
         if (mmu->pg_sz != PAGE_SIZE)
                 panic("MMU pg size != PAGE_SIZE (%luk)\n", TO_KB(PAGE_SIZE));
 
-        /*
-         * ASID mgmt data structures are compile time init
-         *  asid_cache = FIRST_ASID and asid_mm_map[] all zeroes
-         */
-
-        local_flush_tlb_all();
-
         /* Enable the MMU */
         write_aux_reg(ARC_REG_PID, MMU_ENABLE);
 
@@ -671,25 +680,28 @@ void do_tlb_overlap_fault(unsigned long cause, unsigned long address,
  * Low Level ASM TLB handler calls this if it finds that HW and SW ASIDS
  * don't match
  */
-void print_asid_mismatch(int is_fast_path)
+void print_asid_mismatch(int mm_asid, int mmu_asid, int is_fast_path)
 {
-        int pid_sw, pid_hw;
-        pid_sw = current->active_mm->context.asid;
-        pid_hw = read_aux_reg(ARC_REG_PID) & 0xff;
-
         pr_emerg("ASID Mismatch in %s Path Handler: sw-pid=0x%x hw-pid=0x%x\n",
-               is_fast_path ? "Fast" : "Slow", pid_sw, pid_hw);
+               is_fast_path ? "Fast" : "Slow", mm_asid, mmu_asid);
 
         __asm__ __volatile__("flag 1");
 }
 
-void tlb_paranoid_check(unsigned int pid_sw, unsigned long addr)
+void tlb_paranoid_check(unsigned int mm_asid, unsigned long addr)
 {
-        unsigned int pid_hw;
+        unsigned int mmu_asid;
 
-        pid_hw = read_aux_reg(ARC_REG_PID) & 0xff;
+        mmu_asid = read_aux_reg(ARC_REG_PID) & 0xff;
 
-        if (addr < 0x70000000 && ((pid_hw != pid_sw) || (pid_sw == NO_ASID)))
-                print_asid_mismatch(0);
+        /*
+         * At the time of a TLB miss/installation
+         *   - HW version needs to match SW version
+         *   - SW needs to have a valid ASID
+         */
+        if (addr < 0x70000000 &&
+            ((mm_asid == MM_CTXT_NO_ASID) ||
+              (mmu_asid != (mm_asid & MM_CTXT_ASID_MASK))))
+                print_asid_mismatch(mm_asid, mmu_asid, 0);
 }
 #endif
diff --git a/arch/arc/mm/tlbex.S b/arch/arc/mm/tlbex.S
index 5c5bb23001b0..cf7d7d9ad695 100644
--- a/arch/arc/mm/tlbex.S
+++ b/arch/arc/mm/tlbex.S
@@ -44,17 +44,36 @@
 #include <asm/arcregs.h>
 #include <asm/cache.h>
 #include <asm/processor.h>
-#if (CONFIG_ARC_MMU_VER == 1)
 #include <asm/tlb-mmu1.h>
-#endif
 
-;--------------------------------------------------------------------------
-; scratch memory to save the registers (r0-r3) used to code TLB refill Handler
-; For details refer to comments before TLBMISS_FREEUP_REGS below
+;-----------------------------------------------------------------
+; ARC700 Exception Handling doesn't auto-switch stack and it only provides
+; ONE scratch AUX reg "ARC_REG_SCRATCH_DATA0"
+;
+; For Non-SMP, the scratch AUX reg is repurposed to cache task PGD, so a
+; "global" is used to free-up FIRST core reg to be able to code the rest of
+; exception prologue (IRQ auto-disabled on Exceptions, so it's IRQ-safe).
+; Since the Fast Path TLB Miss handler is coded with 4 regs, the remaining 3
+; need to be saved as well by extending the "global" to be 4 words. Hence
+;       ".size   ex_saved_reg1, 16"
+; [All of this dance is to avoid stack switching for each TLB Miss, since we
+; only need to save only a handful of regs, as opposed to complete reg file]
+;
+; For ARC700 SMP, the "global" obviously can't be used for free up the FIRST
+; core reg as it will not be SMP safe.
+; Thus scratch AUX reg is used (and no longer used to cache task PGD).
+; To save the rest of 3 regs - per cpu, the global is made "per-cpu".
+; Epilogue thus has to locate the "per-cpu" storage for regs.
+; To avoid cache line bouncing the per-cpu global is aligned/sized per
+; L1_CACHE_SHIFT, despite fundamentally needing to be 12 bytes only. Hence
+;       ".size   ex_saved_reg1, (CONFIG_NR_CPUS << L1_CACHE_SHIFT)"
+
+; As simple as that....
 ;--------------------------------------------------------------------------
 
+; scratch memory to save [r0-r3] used to code TLB refill Handler
 ARCFP_DATA ex_saved_reg1
-        .align 1 << L1_CACHE_SHIFT      ; IMP: Must be Cache Line aligned
+        .align 1 << L1_CACHE_SHIFT
         .type   ex_saved_reg1, @object
 #ifdef CONFIG_SMP
         .size   ex_saved_reg1, (CONFIG_NR_CPUS << L1_CACHE_SHIFT)
@@ -66,6 +85,44 @@ ex_saved_reg1:
         .zero 16
 #endif
 
+.macro TLBMISS_FREEUP_REGS
+#ifdef CONFIG_SMP
+        sr  r0, [ARC_REG_SCRATCH_DATA0] ; freeup r0 to code with
+        GET_CPU_ID  r0                  ; get to per cpu scratch mem,
+        lsl r0, r0, L1_CACHE_SHIFT      ; cache line wide per cpu
+        add r0, @ex_saved_reg1, r0
+#else
+        st    r0, [@ex_saved_reg1]
+        mov_s r0, @ex_saved_reg1
+#endif
+        st_s  r1, [r0, 4]
+        st_s  r2, [r0, 8]
+        st_s  r3, [r0, 12]
+
+        ; VERIFY if the ASID in MMU-PID Reg is same as
+        ; one in Linux data structures
+
+        tlb_paranoid_check_asm
+.endm
+
+.macro TLBMISS_RESTORE_REGS
+#ifdef CONFIG_SMP
+        GET_CPU_ID  r0                  ; get to per cpu scratch mem
+        lsl r0, r0, L1_CACHE_SHIFT      ; each is cache line wide
+        add r0, @ex_saved_reg1, r0
+        ld_s  r3, [r0,12]
+        ld_s  r2, [r0, 8]
+        ld_s  r1, [r0, 4]
+        lr    r0, [ARC_REG_SCRATCH_DATA0]
+#else
+        mov_s r0, @ex_saved_reg1
+        ld_s  r3, [r0,12]
+        ld_s  r2, [r0, 8]
+        ld_s  r1, [r0, 4]
+        ld_s  r0, [r0]
+#endif
+.endm
+
 ;============================================================================
 ;  Troubleshooting Stuff
 ;============================================================================
@@ -76,34 +133,35 @@ ex_saved_reg1:
 ; In bizzare scenrios SW and HW ASID can get out-of-sync which is trouble.
 ; So we try to detect this in TLB Mis shandler
 
-
-.macro DBG_ASID_MISMATCH
+.macro tlb_paranoid_check_asm
 
 #ifdef CONFIG_ARC_DBG_TLB_PARANOIA
 
-        ; make sure h/w ASID is same as s/w ASID
-
         GET_CURR_TASK_ON_CPU  r3
         ld r0, [r3, TASK_ACT_MM]
         ld r0, [r0, MM_CTXT+MM_CTXT_ASID]
+        breq r0, 0, 55f ; Error if no ASID allocated
 
         lr r1, [ARC_REG_PID]
         and r1, r1, 0xFF
-        breq r1, r0, 5f
 
+        and r2, r0, 0xFF        ; MMU PID bits only for comparison
+        breq r1, r2, 5f
+
+55:
         ; Error if H/w and S/w ASID don't match, but NOT if in kernel mode
-        lr  r0, [erstatus]
-        bbit0 r0, STATUS_U_BIT, 5f
+        lr  r2, [erstatus]
+        bbit0 r2, STATUS_U_BIT, 5f
 
         ; We sure are in troubled waters, Flag the error, but to do so
         ; need to switch to kernel mode stack to call error routine
         GET_TSK_STACK_BASE   r3, sp
 
         ; Call printk to shoutout aloud
-        mov r0, 1
+        mov r2, 1
         j print_asid_mismatch
 
-5:   ; ASIDs match so proceed normally
+5:      ; ASIDs match so proceed normally
         nop
 
 #endif
@@ -161,13 +219,17 @@ ex_saved_reg1:
 ; IN: r0 = PTE, r1 = ptr to PTE
 
 .macro CONV_PTE_TO_TLB
-        and r3, r0, PTE_BITS_IN_PD1 ; Extract permission flags+PFN from PTE
-        sr  r3, [ARC_REG_TLBPD1]    ; these go in PD1
+        and    r3, r0, PTE_BITS_RWX     ;       r w x
+        lsl    r2, r3, 3                ; r w x 0 0 0
+        and.f  0,  r0, _PAGE_GLOBAL
+        or.z   r2, r2, r3               ; r w x r w x
+
+        and r3, r0, PTE_BITS_NON_RWX_IN_PD1 ; Extract PFN+cache bits from PTE
+        or  r3, r3, r2
+
+        sr  r3, [ARC_REG_TLBPD1]        ; these go in PD1
 
         and r2, r0, PTE_BITS_IN_PD0 ; Extract other PTE flags: (V)alid, (G)lb
-#if (CONFIG_ARC_MMU_VER <= 2)   /* Neednot be done with v3 onwards */
-        lsr r2, r2                  ; shift PTE flags to match layout in PD0
-#endif
 
         lr  r3,[ARC_REG_TLBPD0]     ; MMU prepares PD0 with vaddr and asid
 
@@ -191,68 +253,6 @@ ex_saved_reg1:
 #endif
 .endm
 
-;-----------------------------------------------------------------
-; ARC700 Exception Handling doesn't auto-switch stack and it only provides
-; ONE scratch AUX reg "ARC_REG_SCRATCH_DATA0"
-;
-; For Non-SMP, the scratch AUX reg is repurposed to cache task PGD, so a
-; "global" is used to free-up FIRST core reg to be able to code the rest of
-; exception prologue (IRQ auto-disabled on Exceptions, so it's IRQ-safe).
-; Since the Fast Path TLB Miss handler is coded with 4 regs, the remaining 3
-; need to be saved as well by extending the "global" to be 4 words. Hence
-;       ".size   ex_saved_reg1, 16"
-; [All of this dance is to avoid stack switching for each TLB Miss, since we
-; only need to save only a handful of regs, as opposed to complete reg file]
-;
-; For ARC700 SMP, the "global" obviously can't be used for free up the FIRST
-; core reg as it will not be SMP safe.
-; Thus scratch AUX reg is used (and no longer used to cache task PGD).
-; To save the rest of 3 regs - per cpu, the global is made "per-cpu".
-; Epilogue thus has to locate the "per-cpu" storage for regs.
-; To avoid cache line bouncing the per-cpu global is aligned/sized per
-; L1_CACHE_SHIFT, despite fundamentally needing to be 12 bytes only. Hence
-;       ".size   ex_saved_reg1, (CONFIG_NR_CPUS << L1_CACHE_SHIFT)"
-
-; As simple as that....
-
-.macro TLBMISS_FREEUP_REGS
-#ifdef CONFIG_SMP
-        sr  r0, [ARC_REG_SCRATCH_DATA0] ; freeup r0 to code with
-        GET_CPU_ID  r0                  ; get to per cpu scratch mem,
-        lsl r0, r0, L1_CACHE_SHIFT      ; cache line wide per cpu
-        add r0, @ex_saved_reg1, r0
-#else
-        st    r0, [@ex_saved_reg1]
-        mov_s r0, @ex_saved_reg1
-#endif
-        st_s  r1, [r0, 4]
-        st_s  r2, [r0, 8]
-        st_s  r3, [r0, 12]
-
-        ; VERIFY if the ASID in MMU-PID Reg is same as
-        ; one in Linux data structures
-
-        DBG_ASID_MISMATCH
-.endm
-
-;-----------------------------------------------------------------
-.macro TLBMISS_RESTORE_REGS
-#ifdef CONFIG_SMP
-        GET_CPU_ID  r0                  ; get to per cpu scratch mem
-        lsl r0, r0, L1_CACHE_SHIFT      ; each is cache line wide
-        add r0, @ex_saved_reg1, r0
-        ld_s  r3, [r0,12]
-        ld_s  r2, [r0, 8]
-        ld_s  r1, [r0, 4]
-        lr    r0, [ARC_REG_SCRATCH_DATA0]
-#else
-        mov_s r0, @ex_saved_reg1
-        ld_s  r3, [r0,12]
-        ld_s  r2, [r0, 8]
-        ld_s  r1, [r0, 4]
-        ld_s  r0, [r0]
-#endif
-.endm
 
 ARCFP_CODE      ;Fast Path Code, candidate for ICCM
 
@@ -277,8 +277,8 @@ ARC_ENTRY EV_TLBMissI
         ;----------------------------------------------------------------
         ; VERIFY_PTE: Check if PTE permissions approp for executing code
         cmp_s   r2, VMALLOC_START
-        mov.lo  r2, (_PAGE_PRESENT | _PAGE_U_EXECUTE)
-        mov.hs  r2, (_PAGE_PRESENT | _PAGE_K_EXECUTE)
+        mov_s   r2, (_PAGE_PRESENT | _PAGE_EXECUTE)
+        or.hs   r2, r2, _PAGE_GLOBAL
 
         and     r3, r0, r2  ; Mask out NON Flag bits from PTE
         xor.f   r3, r3, r2  ; check ( ( pte & flags_test ) == flags_test )
@@ -317,26 +317,21 @@ ARC_ENTRY EV_TLBMissD
         ;----------------------------------------------------------------
         ; VERIFY_PTE: Chk if PTE permissions approp for data access (R/W/R+W)
 
-        mov_s   r2, 0
+        cmp_s   r2, VMALLOC_START
+        mov_s   r2, _PAGE_PRESENT       ; common bit for K/U PTE
+        or.hs   r2, r2, _PAGE_GLOBAL    ; kernel PTE only
+
+        ; Linux PTE [RWX] bits are semantically overloaded:
+        ; -If PAGE_GLOBAL set, they refer to kernel-only flags (vmalloc)
+        ; -Otherwise they are user-mode permissions, and those are exactly
+        ;  same for kernel mode as well (e.g. copy_(to|from)_user)
+
         lr      r3, [ecr]
         btst_s  r3, ECR_C_BIT_DTLB_LD_MISS      ; Read Access
-        or.nz   r2, r2, _PAGE_U_READ            ; chk for Read flag in PTE
+        or.nz   r2, r2, _PAGE_READ              ; chk for Read flag in PTE
         btst_s  r3, ECR_C_BIT_DTLB_ST_MISS      ; Write Access
-        or.nz   r2, r2, _PAGE_U_WRITE           ; chk for Write flag in PTE
-        ; Above laddering takes care of XCHG access
-        ;   which is both Read and Write
-
-        ; If kernel mode access, ; make _PAGE_xx flags as _PAGE_K_xx
-        ; For copy_(to|from)_user, despite exception taken in kernel mode,
-        ; this code is not hit, because EFA would still be the user mode
-        ; address (EFA < 0x6000_0000).
-        ; This code is for legit kernel mode faults, vmalloc specifically
-        ; (EFA: 0x7000_0000 to 0x7FFF_FFFF)
-
-        lr      r3, [efa]
-        cmp     r3, VMALLOC_START - 1   ; If kernel mode access
-        asl.hi  r2, r2, 3               ; make _PAGE_xx flags as _PAGE_K_xx
-        or      r2, r2, _PAGE_PRESENT   ; Common flag for K/U mode
+        or.nz   r2, r2, _PAGE_WRITE             ; chk for Write flag in PTE
+        ; Above laddering takes care of XCHG access (both R and W)
 
         ; By now, r2 setup with all the Flags we need to check in PTE
         and     r3, r0, r2              ; Mask out NON Flag bits from PTE
@@ -371,13 +366,7 @@ do_slow_path_pf:
 
         ; Slow path TLB Miss handled as a regular ARC Exception
         ; (stack switching / save the complete reg-file).
-        ; That requires freeing up r9
-        EXCPN_PROLOG_FREEUP_REG r9
-
-        lr  r9, [erstatus]
-
-        SWITCH_TO_KERNEL_STK
-        SAVE_ALL_SYS
+        EXCEPTION_PROLOGUE
 
         ; ------- setup args for Linux Page fault Hanlder ---------
         mov_s r0, sp
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 43594d5116ef..3f7714d8d2d2 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -3,20 +3,21 @@ config ARM
         default y
         select ARCH_BINFMT_ELF_RANDOMIZE_PIE
         select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
-        select ARCH_HAVE_CUSTOM_GPIO_H
         select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
+        select ARCH_HAVE_CUSTOM_GPIO_H
         select ARCH_WANT_IPC_PARSE_VERSION
         select BUILDTIME_EXTABLE_SORT if MMU
+        select CLONE_BACKWARDS
         select CPU_PM if (SUSPEND || CPU_IDLE)
         select DCACHE_WORD_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && !CPU_BIG_ENDIAN && MMU
         select GENERIC_ATOMIC64 if (CPU_V7M || CPU_V6 || !CPU_32v6K || !AEABI)
         select GENERIC_CLOCKEVENTS_BROADCAST if SMP
+        select GENERIC_IDLE_POLL_SETUP
         select GENERIC_IRQ_PROBE
         select GENERIC_IRQ_SHOW
         select GENERIC_PCI_IOMAP
         select GENERIC_SCHED_CLOCK
         select GENERIC_SMP_IDLE_THREAD
-        select GENERIC_IDLE_POLL_SETUP
         select GENERIC_STRNCPY_FROM_USER
         select GENERIC_STRNLEN_USER
         select HARDIRQS_SW_RESEND
@@ -25,6 +26,7 @@ config ARM
         select HAVE_ARCH_SECCOMP_FILTER
         select HAVE_ARCH_TRACEHOOK
         select HAVE_BPF_JIT
+        select HAVE_CONTEXT_TRACKING
         select HAVE_C_RECORDMCOUNT
         select HAVE_DEBUG_KMEMLEAK
         select HAVE_DMA_API_DEBUG
@@ -35,7 +37,6 @@ config ARM
         select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL)
         select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
         select HAVE_GENERIC_DMA_COHERENT
-        select HAVE_GENERIC_HARDIRQS
         select HAVE_HW_BREAKPOINT if (PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7))
         select HAVE_IDE if PCI || ISA || PCMCIA
         select HAVE_IRQ_TIME_ACCOUNTING
@@ -47,21 +48,22 @@ config ARM
         select HAVE_KPROBES if !XIP_KERNEL
         select HAVE_KRETPROBES if (HAVE_KPROBES)
         select HAVE_MEMBLOCK
+        select HAVE_MOD_ARCH_SPECIFIC if ARM_UNWIND
         select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
         select HAVE_PERF_EVENTS
         select HAVE_REGS_AND_STACK_ACCESS_API
         select HAVE_SYSCALL_TRACEPOINTS
         select HAVE_UID16
+        select IRQ_FORCED_THREADING
         select KTIME_SCALAR
+        select MODULES_USE_ELF_REL
+        select OLD_SIGACTION
+        select OLD_SIGSUSPEND3
         select PERF_USE_VMALLOC
         select RTC_LIB
         select SYS_SUPPORTS_APM_EMULATION
-        select HAVE_MOD_ARCH_SPECIFIC if ARM_UNWIND
-        select MODULES_USE_ELF_REL
-        select CLONE_BACKWARDS
-        select OLD_SIGSUSPEND3
-        select OLD_SIGACTION
-        select HAVE_CONTEXT_TRACKING
+        # Above selects are sorted alphabetically; please add new ones
+        # according to that.  Thanks.
         help
           The ARM series is a line of low-power-consumption RISC chip designs
           licensed by ARM Ltd and targeted at embedded applications and
@@ -385,8 +387,8 @@ config ARCH_GEMINI
         bool "Cortina Systems Gemini"
         select ARCH_REQUIRE_GPIOLIB
         select ARCH_USES_GETTIMEOFFSET
-        select NEED_MACH_GPIO_H
         select CPU_FA526
+        select NEED_MACH_GPIO_H
         help
           Support for the Cortina Systems Gemini family SoCs
 
@@ -441,7 +443,6 @@ config ARCH_NETX
 config ARCH_IOP13XX
         bool "IOP13xx-based"
         depends on MMU
-        select ARCH_SUPPORTS_MSI
         select CPU_XSC3
         select NEED_MACH_MEMORY_H
         select NEED_RET_TO_USER
@@ -487,8 +488,8 @@ config ARCH_IXP4XX
         select GENERIC_CLOCKEVENTS
         select MIGHT_HAVE_PCI
         select NEED_MACH_IO_H
-        select USB_EHCI_BIG_ENDIAN_MMIO
         select USB_EHCI_BIG_ENDIAN_DESC
+        select USB_EHCI_BIG_ENDIAN_MMIO
         help
           Support for Intel's IXP4XX (XScale) family of processors.
 
@@ -498,11 +499,11 @@ config ARCH_DOVE
         select CPU_PJ4
         select GENERIC_CLOCKEVENTS
         select MIGHT_HAVE_PCI
+        select MVEBU_MBUS
         select PINCTRL
         select PINCTRL_DOVE
         select PLAT_ORION_LEGACY
         select USB_ARCH_HAS_EHCI
-        select MVEBU_MBUS
         help
           Support for the Marvell Dove SoC 88AP510
 
@@ -512,12 +513,12 @@ config ARCH_KIRKWOOD
         select ARCH_REQUIRE_GPIOLIB
         select CPU_FEROCEON
         select GENERIC_CLOCKEVENTS
+        select MVEBU_MBUS
         select PCI
         select PCI_QUIRKS
         select PINCTRL
         select PINCTRL_KIRKWOOD
         select PLAT_ORION_LEGACY
-        select MVEBU_MBUS
         help
           Support for the following Marvell Kirkwood series SoCs:
           88F6180, 88F6192 and 88F6281.
@@ -527,9 +528,9 @@ config ARCH_MV78XX0
         select ARCH_REQUIRE_GPIOLIB
         select CPU_FEROCEON
         select GENERIC_CLOCKEVENTS
+        select MVEBU_MBUS
         select PCI
         select PLAT_ORION_LEGACY
-        select MVEBU_MBUS
         help
           Support for the following Marvell MV78xx0 series SoCs:
           MV781x0, MV782x0.
@@ -540,9 +541,9 @@ config ARCH_ORION5X
         select ARCH_REQUIRE_GPIOLIB
         select CPU_FEROCEON
         select GENERIC_CLOCKEVENTS
+        select MVEBU_MBUS
         select PCI
         select PLAT_ORION_LEGACY
-        select MVEBU_MBUS
         help
           Support for the following Marvell Orion 5x series SoCs:
           Orion-1 (5181), Orion-VoIP (5181L), Orion-NAS (5182),
@@ -557,6 +558,7 @@ config ARCH_MMP
         select GENERIC_CLOCKEVENTS
         select GPIO_PXA
         select IRQ_DOMAIN
+        select MULTI_IRQ_HANDLER
         select NEED_MACH_GPIO_H
         select PINCTRL
         select PLAT_PXA
@@ -630,6 +632,7 @@ config ARCH_MSM
         bool "Qualcomm MSM"
         select ARCH_REQUIRE_GPIOLIB
         select CLKDEV_LOOKUP
+        select CLKSRC_OF if OF
         select COMMON_CLK
         select GENERIC_CLOCKEVENTS
         help
@@ -645,7 +648,7 @@ config ARCH_SHMOBILE
         select CLKDEV_LOOKUP
         select GENERIC_CLOCKEVENTS
         select HAVE_ARM_SCU if SMP
-        select HAVE_ARM_TWD if LOCAL_TIMERS
+        select HAVE_ARM_TWD if SMP
         select HAVE_CLK
         select HAVE_MACH_CLKDEV
         select HAVE_SMP
@@ -700,7 +703,7 @@ config ARCH_S3C24XX
         select ARCH_HAS_CPUFREQ
         select ARCH_REQUIRE_GPIOLIB
         select CLKDEV_LOOKUP
-        select CLKSRC_MMIO
+        select CLKSRC_SAMSUNG_PWM
         select GENERIC_CLOCKEVENTS
         select GPIO_SAMSUNG
         select HAVE_CLK
@@ -723,7 +726,7 @@ config ARCH_S3C64XX
         select ARCH_REQUIRE_GPIOLIB
         select ARM_VIC
         select CLKDEV_LOOKUP
-        select CLKSRC_MMIO
+        select CLKSRC_SAMSUNG_PWM
         select CPU_V6
         select GENERIC_CLOCKEVENTS
         select GPIO_SAMSUNG
@@ -739,7 +742,6 @@ config ARCH_S3C64XX
         select SAMSUNG_ATAGS
         select SAMSUNG_CLKSRC
         select SAMSUNG_GPIOLIB_4BIT
-        select SAMSUNG_IRQ_VIC_TIMER
         select SAMSUNG_WDT_RESET
         select USB_ARCH_HAS_OHCI
         help
@@ -748,7 +750,7 @@ config ARCH_S3C64XX
 config ARCH_S5P64X0
         bool "Samsung S5P6440 S5P6450"
         select CLKDEV_LOOKUP
-        select CLKSRC_MMIO
+        select CLKSRC_SAMSUNG_PWM
         select CPU_V6
         select GENERIC_CLOCKEVENTS
         select GPIO_SAMSUNG
@@ -757,8 +759,8 @@ config ARCH_S5P64X0
         select HAVE_S3C2410_WATCHDOG if WATCHDOG
         select HAVE_S3C_RTC if RTC_CLASS
         select NEED_MACH_GPIO_H
-        select SAMSUNG_WDT_RESET
         select SAMSUNG_ATAGS
+        select SAMSUNG_WDT_RESET
         help
           Samsung S5P64X0 CPU based systems, such as the Samsung SMDK6440,
           SMDK6450.
@@ -767,7 +769,7 @@ config ARCH_S5PC100
         bool "Samsung S5PC100"
         select ARCH_REQUIRE_GPIOLIB
         select CLKDEV_LOOKUP
-        select CLKSRC_MMIO
+        select CLKSRC_SAMSUNG_PWM
         select CPU_V7
         select GENERIC_CLOCKEVENTS
         select GPIO_SAMSUNG
@@ -776,8 +778,8 @@ config ARCH_S5PC100
         select HAVE_S3C2410_WATCHDOG if WATCHDOG
         select HAVE_S3C_RTC if RTC_CLASS
         select NEED_MACH_GPIO_H
-        select SAMSUNG_WDT_RESET
         select SAMSUNG_ATAGS
+        select SAMSUNG_WDT_RESET
         help
           Samsung S5PC100 series based systems
 
@@ -787,7 +789,7 @@ config ARCH_S5PV210
         select ARCH_HAS_HOLES_MEMORYMODEL
         select ARCH_SPARSEMEM_ENABLE
         select CLKDEV_LOOKUP
-        select CLKSRC_MMIO
+        select CLKSRC_SAMSUNG_PWM
         select CPU_V7
         select GENERIC_CLOCKEVENTS
         select GPIO_SAMSUNG
@@ -1372,6 +1374,15 @@ config ARM_ERRATA_798181
           which sends an IPI to the CPUs that are running the same ASID
           as the one being invalidated.
 
+config ARM_ERRATA_773022
+        bool "ARM errata: incorrect instructions may be executed from loop buffer"
+        depends on CPU_V7
+        help
+          This option enables the workaround for the 773022 Cortex-A15
+          (up to r0p4) erratum. In certain rare sequences of code, the
+          loop buffer may deliver incorrect instructions. This
+          workaround disables the loop buffer to avoid the erratum.
+
 endmenu
 
 source "arch/arm/common/Kconfig"
@@ -1584,23 +1595,13 @@ config ARM_PSCI
           0022A ("Power State Coordination Interface System Software on
           ARM processors").
 
-config LOCAL_TIMERS
-        bool "Use local timer interrupts"
-        depends on SMP
-        default y
-        help
-          Enable support for local timers on SMP platforms, rather then the
-          legacy IPI broadcast method.  Local timers allows the system
-          accounting to be spread across the timer interval, preventing a
-          "thundering herd" at every timer tick.
-
 # The GPIO number here must be sorted by descending number. In case of
 # a multiplatform kernel, we just want the highest value required by the
 # selected platforms.
 config ARCH_NR_GPIO
         int
         default 1024 if ARCH_SHMOBILE || ARCH_TEGRA
-        default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5
+        default 512 if ARCH_EXYNOS || ARCH_KEYSTONE || SOC_OMAP5 || SOC_DRA7XX
         default 392 if ARCH_U8500
         default 352 if ARCH_VT8500
         default 288 if ARCH_SUNXI
@@ -1613,13 +1614,50 @@ config ARCH_NR_GPIO
 
 source kernel/Kconfig.preempt
 
-config HZ
+config HZ_FIXED
         int
         default 200 if ARCH_EBSA110 || ARCH_S3C24XX || ARCH_S5P64X0 || \
                 ARCH_S5PV210 || ARCH_EXYNOS4
         default AT91_TIMER_HZ if ARCH_AT91
         default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE
-        default 100
+        default 0
+
+choice
+        depends on HZ_FIXED = 0
+        prompt "Timer frequency"
+
+config HZ_100
+        bool "100 Hz"
+
+config HZ_200
+        bool "200 Hz"
+
+config HZ_250
+        bool "250 Hz"
+
+config HZ_300
+        bool "300 Hz"
+
+config HZ_500
+        bool "500 Hz"
+
+config HZ_1000
+        bool "1000 Hz"
+
+endchoice
+
+config HZ
+        int
+        default HZ_FIXED if HZ_FIXED != 0
+        default 100 if HZ_100
+        default 200 if HZ_200
+        default 250 if HZ_250
+        default 300 if HZ_300
+        default 500 if HZ_500
+        default 1000
+
+config SCHED_HRTICK
+        def_bool HIGH_RES_TIMERS
 
 config SCHED_HRTICK
         def_bool HIGH_RES_TIMERS
@@ -1756,6 +1794,9 @@ config HAVE_ARCH_TRANSPARENT_HUGEPAGE
        def_bool y
        depends on ARM_LPAE
 
+config ARCH_WANT_GENERAL_HUGETLB
+        def_bool y
+
 source "mm/Kconfig"
 
 config FORCE_MAX_ZONEORDER
@@ -2064,8 +2105,7 @@ config KEXEC
 
           It is an ongoing process to be certain the hardware in a machine
           is properly shutdown, so do not be surprised if this code does not
-          initially work for you.  It may help to enable device hotplugging
-          support.
+          initially work for you.
 
 config ATAGS_PROC
         bool "Export atags in procfs"
@@ -2175,6 +2215,13 @@ config NEON
           Say Y to include support code for NEON, the ARMv7 Advanced SIMD
           Extension.
 
+config KERNEL_MODE_NEON
+        bool "Support for NEON in kernel mode"
+        default n
+        depends on NEON
+        help
+          Say Y to include support for NEON in kernel mode.
+
 endmenu
 
 menu "Userspace binary formats"
@@ -2199,7 +2246,7 @@ source "kernel/power/Kconfig"
 
 config ARCH_SUSPEND_POSSIBLE
         depends on !ARCH_S5PC100
-        depends on CPU_ARM920T || CPU_ARM926T || CPU_SA1100 || \
+        depends on CPU_ARM920T || CPU_ARM926T || CPU_FEROCEON || CPU_SA1100 || \
                 CPU_V6 || CPU_V6K || CPU_V7 || CPU_XSC3 || CPU_XSCALE || CPU_MOHAWK
         def_bool y
 
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 583f4a00ec32..9762c84b4198 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -92,6 +92,7 @@ choice
         config DEBUG_BCM2835
                 bool "Kernel low-level debugging on BCM2835 PL011 UART"
                 depends on ARCH_BCM2835
+                select DEBUG_UART_PL01X
 
         config DEBUG_CLPS711X_UART1
                 bool "Kernel low-level debugging messages via UART1"
@@ -110,6 +111,7 @@ choice
         config DEBUG_CNS3XXX
                 bool "Kernel Kernel low-level debugging on Cavium Networks CNS3xxx"
                 depends on ARCH_CNS3XXX
+                select DEBUG_UART_PL01X
                 help
                   Say Y here if you want the debug print routines to direct
                   their output to the CNS3xxx UART0.
@@ -117,6 +119,7 @@ choice
         config DEBUG_DAVINCI_DA8XX_UART1
                 bool "Kernel low-level debugging on DaVinci DA8XX using UART1"
                 depends on ARCH_DAVINCI_DA8XX
+                select DEBUG_UART_8250
                 help
                   Say Y here if you want the debug print routines to direct
                   their output to UART1 serial port on DaVinci DA8XX devices.
@@ -124,6 +127,7 @@ choice
         config DEBUG_DAVINCI_DA8XX_UART2
                 bool "Kernel low-level debugging on DaVinci DA8XX using UART2"
                 depends on ARCH_DAVINCI_DA8XX
+                select DEBUG_UART_8250
                 help
                   Say Y here if you want the debug print routines to direct
                   their output to UART2 serial port on DaVinci DA8XX devices.
@@ -131,6 +135,7 @@ choice
         config DEBUG_DAVINCI_DMx_UART0
                 bool "Kernel low-level debugging on DaVinci DMx using UART0"
                 depends on ARCH_DAVINCI_DMx
+                select DEBUG_UART_8250
                 help
                   Say Y here if you want the debug print routines to direct
                   their output to UART0 serial port on DaVinci DMx devices.
@@ -138,6 +143,7 @@ choice
         config DEBUG_DAVINCI_TNETV107X_UART1
                 bool "Kernel low-level debugging on DaVinci TNETV107x using UART1"
                 depends on ARCH_DAVINCI_TNETV107X
+                select DEBUG_UART_8250
                 help
                   Say Y here if you want the debug print routines to direct
                   their output to UART1 serial port on DaVinci TNETV107X
@@ -174,9 +180,26 @@ choice
                   Say Y here if you want the debug print routines to direct
                   their output to the 8250 at PCI COM1.
 
+        config DEBUG_HI3620_UART
+                bool "Hisilicon HI3620 Debug UART"
+                depends on ARCH_HI3xxx
+                select DEBUG_UART_PL01X
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on HI3620 UART.
+
+        config DEBUG_HI3716_UART
+                bool "Hisilicon Hi3716 Debug UART"
+                depends on ARCH_HI3xxx
+                select DEBUG_UART_PL01X
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on HI3716 UART.
+
         config DEBUG_HIGHBANK_UART
                 bool "Kernel low-level debugging messages via Highbank UART"
                 depends on ARCH_HIGHBANK
+                select DEBUG_UART_PL01X
                 help
                   Say Y here if you want the debug print routines to direct
                   their output to the UART on Highbank based devices.
@@ -191,6 +214,7 @@ choice
         config DEBUG_IMX23_UART
                 bool "i.MX23 Debug UART"
                 depends on SOC_IMX23
+                select DEBUG_UART_PL01X
                 help
                   Say Y here if you want kernel low-level debugging support
                   on i.MX23.
@@ -212,6 +236,7 @@ choice
         config DEBUG_IMX28_UART
                 bool "i.MX28 Debug UART"
                 depends on SOC_IMX28
+                select DEBUG_UART_PL01X
                 help
                   Say Y here if you want kernel low-level debugging support
                   on i.MX28.
@@ -261,6 +286,7 @@ choice
         config DEBUG_KEYSTONE_UART0
                 bool "Kernel low-level debugging on KEYSTONE2 using UART0"
                 depends on ARCH_KEYSTONE
+                select DEBUG_UART_8250
                 help
                   Say Y here if you want the debug print routines to direct
                   their output to UART0 serial port on KEYSTONE2 devices.
@@ -268,6 +294,7 @@ choice
         config DEBUG_KEYSTONE_UART1
                 bool "Kernel low-level debugging on KEYSTONE2 using UART1"
                 depends on ARCH_KEYSTONE
+                select DEBUG_UART_8250
                 help
                   Say Y here if you want the debug print routines to direct
                   their output to UART1 serial port on KEYSTONE2 devices.
@@ -275,6 +302,7 @@ choice
         config DEBUG_MMP_UART2
                 bool "Kernel low-level debugging message via MMP UART2"
                 depends on ARCH_MMP
+                select DEBUG_UART_8250
                 help
                   Say Y here if you want kernel low-level debugging support
                   on MMP UART2.
@@ -282,6 +310,7 @@ choice
         config DEBUG_MMP_UART3
                 bool "Kernel low-level debugging message via MMP UART3"
                 depends on ARCH_MMP
+                select DEBUG_UART_8250
                 help
                   Say Y here if you want kernel low-level debugging support
                   on MMP UART3.
@@ -326,6 +355,7 @@ choice
         config DEBUG_MVEBU_UART
                 bool "Kernel low-level debugging messages via MVEBU UART (old bootloaders)"
                 depends on ARCH_MVEBU
+                select DEBUG_UART_8250
                 help
                   Say Y here if you want kernel low-level debugging support
                   on MVEBU based platforms.
@@ -344,6 +374,7 @@ choice
         config DEBUG_MVEBU_UART_ALTERNATE
                 bool "Kernel low-level debugging messages via MVEBU UART (new bootloaders)"
                 depends on ARCH_MVEBU
+                select DEBUG_UART_8250
                 help
                   Say Y here if you want kernel low-level debugging support
                   on MVEBU based platforms.
@@ -358,6 +389,7 @@ choice
         config DEBUG_NOMADIK_UART
                 bool "Kernel low-level debugging messages via NOMADIK UART"
                 depends on ARCH_NOMADIK
+                select DEBUG_UART_PL01X
                 help
                   Say Y here if you want kernel low-level debugging support
                   on NOMADIK based platforms.
@@ -365,6 +397,7 @@ choice
         config DEBUG_NSPIRE_CLASSIC_UART
                 bool "Kernel low-level debugging via TI-NSPIRE 8250 UART"
                 depends on ARCH_NSPIRE
+                select DEBUG_UART_8250
                 help
                   Say Y here if you want kernel low-level debugging support
                   on TI-NSPIRE classic models.
@@ -372,20 +405,82 @@ choice
         config DEBUG_NSPIRE_CX_UART
                 bool "Kernel low-level debugging via TI-NSPIRE PL011 UART"
                 depends on ARCH_NSPIRE
+                select DEBUG_UART_PL01X
                 help
                   Say Y here if you want kernel low-level debugging support
                   on TI-NSPIRE CX models.
 
-        config DEBUG_OMAP2PLUS_UART
-                bool "Kernel low-level debugging messages via OMAP2PLUS UART"
+        config DEBUG_OMAP2UART1
+                bool "OMAP2/3/4 UART1 (omap2/3 sdp boards and some omap3 boards)"
                 depends on ARCH_OMAP2PLUS
+                select DEBUG_OMAP2PLUS_UART
                 help
-                  Say Y here if you want kernel low-level debugging support
-                  on OMAP2PLUS based platforms.
+                  This covers at least h4, 2430sdp, 3430sdp, 3630sdp,
+                  omap3 torpedo and 3530 lv som.
+
+        config DEBUG_OMAP2UART2
+                bool "Kernel low-level debugging messages via OMAP2/3/4 UART2"
+                depends on ARCH_OMAP2PLUS
+                select DEBUG_OMAP2PLUS_UART
+
+        config DEBUG_OMAP2UART3
+                bool "Kernel low-level debugging messages via OMAP2 UART3 (n8x0)"
+                depends on ARCH_OMAP2PLUS
+                select DEBUG_OMAP2PLUS_UART
+
+        config DEBUG_OMAP3UART3
+                bool "Kernel low-level debugging messages via OMAP3 UART3 (most omap3 boards)"
+                depends on ARCH_OMAP2PLUS
+                select DEBUG_OMAP2PLUS_UART
+                help
+                  This covers at least cm_t3x, beagle, crane, devkit8000,
+                  igep00x0, ldp, n900, n9(50), pandora, overo, touchbook,
+                  and 3517evm.
+
+        config DEBUG_OMAP4UART3
+                bool "Kernel low-level debugging messages via OMAP4/5 UART3 (omap4 blaze, panda, omap5 sevm)"
+                depends on ARCH_OMAP2PLUS
+                select DEBUG_OMAP2PLUS_UART
+
+        config DEBUG_OMAP3UART4
+                bool "Kernel low-level debugging messages via OMAP36XX UART4"
+                depends on ARCH_OMAP2PLUS
+                select DEBUG_OMAP2PLUS_UART
+
+        config DEBUG_OMAP4UART4
+                bool "Kernel low-level debugging messages via OMAP4/5 UART4"
+                depends on ARCH_OMAP2PLUS
+                select DEBUG_OMAP2PLUS_UART
+
+        config DEBUG_TI81XXUART1
+                bool "Kernel low-level debugging messages via TI81XX UART1 (ti8148evm)"
+                depends on ARCH_OMAP2PLUS
+                select DEBUG_OMAP2PLUS_UART
+
+        config DEBUG_TI81XXUART2
+                bool "Kernel low-level debugging messages via TI81XX UART2"
+                depends on ARCH_OMAP2PLUS
+                select DEBUG_OMAP2PLUS_UART
+
+        config DEBUG_TI81XXUART3
+                bool "Kernel low-level debugging messages via TI81XX UART3 (ti8168evm)"
+                depends on ARCH_OMAP2PLUS
+                select DEBUG_OMAP2PLUS_UART
+
+        config DEBUG_AM33XXUART1
+                bool "Kernel low-level debugging messages via AM33XX UART1"
+                depends on ARCH_OMAP2PLUS
+                select DEBUG_OMAP2PLUS_UART
+
+        config DEBUG_ZOOM_UART
+                bool "Kernel low-level debugging messages via Zoom2/3 UART"
+                depends on ARCH_OMAP2PLUS
+                select DEBUG_OMAP2PLUS_UART
 
         config DEBUG_PICOXCELL_UART
                 depends on ARCH_PICOXCELL
                 bool "Use PicoXcell UART for low-level debug"
+                select DEBUG_UART_8250
                 help
                   Say Y here if you want kernel low-level debugging support
                   on PicoXcell based platforms.
@@ -393,6 +488,7 @@ choice
         config DEBUG_PXA_UART1
                 depends on ARCH_PXA
                 bool "Use PXA UART1 for low-level debug"
+                select DEBUG_UART_8250
                 help
                   Say Y here if you want kernel low-level debugging support
                   on PXA UART1.
@@ -400,6 +496,7 @@ choice
         config DEBUG_REALVIEW_STD_PORT
                 bool "RealView Default UART"
                 depends on ARCH_REALVIEW
+                select DEBUG_UART_PL01X
                 help
                   Say Y here if you want the debug print routines to direct
                   their output to the serial port on RealView EB, PB11MP, PBA8
@@ -408,14 +505,64 @@ choice
         config DEBUG_REALVIEW_PB1176_PORT
                 bool "RealView PB1176 UART"
                 depends on MACH_REALVIEW_PB1176
+                select DEBUG_UART_PL01X
                 help
                   Say Y here if you want the debug print routines to direct
                   their output to the standard serial port on the RealView
                   PB1176 platform.
 
-        config DEBUG_ROCKCHIP_UART
-                bool "Kernel low-level debugging messages via Rockchip UART"
+        config DEBUG_RK29_UART0
+                bool "Kernel low-level debugging messages via Rockchip RK29 UART0"
+                depends on ARCH_ROCKCHIP
+                select DEBUG_UART_8250
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on Rockchip based platforms.
+
+        config DEBUG_RK29_UART1
+                bool "Kernel low-level debugging messages via Rockchip RK29 UART1"
+                depends on ARCH_ROCKCHIP
+                select DEBUG_UART_8250
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on Rockchip based platforms.
+
+        config DEBUG_RK29_UART2
+                bool "Kernel low-level debugging messages via Rockchip RK29 UART2"
+                depends on ARCH_ROCKCHIP
+                select DEBUG_UART_8250
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on Rockchip based platforms.
+
+        config DEBUG_RK3X_UART0
+                bool "Kernel low-level debugging messages via Rockchip RK3X UART0"
+                depends on ARCH_ROCKCHIP
+                select DEBUG_UART_8250
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on Rockchip based platforms.
+
+        config DEBUG_RK3X_UART1
+                bool "Kernel low-level debugging messages via Rockchip RK3X UART1"
+                depends on ARCH_ROCKCHIP
+                select DEBUG_UART_8250
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on Rockchip based platforms.
+
+        config DEBUG_RK3X_UART2
+                bool "Kernel low-level debugging messages via Rockchip RK3X UART2"
+                depends on ARCH_ROCKCHIP
+                select DEBUG_UART_8250
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on Rockchip based platforms.
+
+        config DEBUG_RK3X_UART3
+                bool "Kernel low-level debugging messages via Rockchip RK3X UART3"
                 depends on ARCH_ROCKCHIP
+                select DEBUG_UART_8250
                 help
                   Say Y here if you want kernel low-level debugging support
                   on Rockchip based platforms.
@@ -471,6 +618,7 @@ choice
         config DEBUG_SOCFPGA_UART
                 depends on ARCH_SOCFPGA
                 bool "Use SOCFPGA UART for low-level debug"
+                select DEBUG_UART_8250
                 help
                   Say Y here if you want kernel low-level debugging support
                   on SOCFPGA based platforms.
@@ -478,6 +626,7 @@ choice
         config DEBUG_SUNXI_UART0
                 bool "Kernel low-level debugging messages via sunXi UART0"
                 depends on ARCH_SUNXI
+                select DEBUG_UART_8250
                 help
                   Say Y here if you want kernel low-level debugging support
                   on Allwinner A1X based platforms on the UART0.
@@ -485,13 +634,59 @@ choice
         config DEBUG_SUNXI_UART1
                 bool "Kernel low-level debugging messages via sunXi UART1"
                 depends on ARCH_SUNXI
+                select DEBUG_UART_8250
                 help
                   Say Y here if you want kernel low-level debugging support
                   on Allwinner A1X based platforms on the UART1.
 
-        config DEBUG_TEGRA_UART
+        config TEGRA_DEBUG_UART_AUTO_ODMDATA
+                bool "Kernel low-level debugging messages via Tegra UART via ODMDATA"
+                depends on ARCH_TEGRA
+                select DEBUG_TEGRA_UART
+                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_UARTA
+                bool "Kernel low-level debugging messages via Tegra UART A"
+                depends on ARCH_TEGRA
+                select DEBUG_TEGRA_UART
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on Tegra based platforms.
+
+        config TEGRA_DEBUG_UARTB
+                bool "Kernel low-level debugging messages via Tegra UART B"
+                depends on ARCH_TEGRA
+                select DEBUG_TEGRA_UART
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on Tegra based platforms.
+
+        config TEGRA_DEBUG_UARTC
+                bool "Kernel low-level debugging messages via Tegra UART C"
+                depends on ARCH_TEGRA
+                select DEBUG_TEGRA_UART
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on Tegra based platforms.
+
+        config TEGRA_DEBUG_UARTD
+                bool "Kernel low-level debugging messages via Tegra UART D"
+                depends on ARCH_TEGRA
+                select DEBUG_TEGRA_UART
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on Tegra based platforms.
+
+        config TEGRA_DEBUG_UARTE
+                bool "Kernel low-level debugging messages via Tegra UART E"
                 depends on ARCH_TEGRA
-                bool "Use Tegra UART for low-level debug"
+                select DEBUG_TEGRA_UART
                 help
                   Say Y here if you want kernel low-level debugging support
                   on Tegra based platforms.
@@ -510,19 +705,32 @@ choice
                   Say Y here if you want the debug print routines to direct
                   their output to the uart1 port on SiRFmarco devices.
 
-        config DEBUG_STI_UART
+        config STIH41X_DEBUG_ASC2
+                bool "Use StiH415/416 ASC2 UART for low-level debug"
+                depends on ARCH_STI
+                select DEBUG_STI_UART
+                help
+                  Say Y here if you want kernel low-level debugging support
+                  on STiH415/416 based platforms like b2000, which has
+                  default UART wired up to ASC2.
+
+                  If unsure, say N.
+
+        config STIH41X_DEBUG_SBC_ASC1
+                bool "Use StiH415/416 SBC ASC1 UART for low-level debug"
                 depends on ARCH_STI
-                bool "Use StiH415/416 ASC for low-level debug"
+                select DEBUG_STI_UART
                 help
                   Say Y here if you want kernel low-level debugging support
-                  on StiH415/416 based platforms like B2000, B2020.
-                  It support UART2 and SBC_UART1.
+                  on STiH415/416 based platforms like b2020. which has
+                  default UART wired up to SBC ASC1.
 
                   If unsure, say N.
 
         config DEBUG_U300_UART
                 bool "Kernel low-level debugging messages via U300 UART0"
                 depends on ARCH_U300
+                select DEBUG_UART_PL01X
                 help
                   Say Y here if you want the debug print routines to direct
                   their output to the uart port on U300 devices.
@@ -548,6 +756,7 @@ choice
         config DEBUG_VEXPRESS_UART0_CA9
                 bool "Use PL011 UART0 at 0x10009000 (V2P-CA9 core tile)"
                 depends on ARCH_VEXPRESS
+                select DEBUG_UART_PL01X
                 help
                   This option selects UART0 at 0x10009000. Except for custom models,
                   this applies only to the V2P-CA9 tile.
@@ -555,6 +764,7 @@ choice
         config DEBUG_VEXPRESS_UART0_RS1
                 bool "Use PL011 UART0 at 0x1c090000 (RS1 complaint tiles)"
                 depends on ARCH_VEXPRESS
+                select DEBUG_UART_PL01X
                 help
                   This option selects UART0 at 0x1c090000. This applies to most
                   of the tiles using the RS1 memory map, including all new A-class
@@ -563,6 +773,7 @@ choice
         config DEBUG_VEXPRESS_UART0_CRX
                 bool "Use PL011 UART0 at 0xb0090000 (Cortex-R compliant tiles)"
                 depends on ARCH_VEXPRESS && !MMU
+                select DEBUG_UART_PL01X
                 help
                   This option selects UART0 at 0xb0090000. This is appropriate for
                   Cortex-R series tiles and SMMs, such as Cortex-R5 and Cortex-R7
@@ -579,7 +790,7 @@ choice
                 depends on !ARCH_MULTIPLATFORM
                 help
                   Say Y here if your platform doesn't provide a UART option
-                  below. This relies on your platform choosing the right UART
+                  above. This relies on your platform choosing the right UART
                   definition internally in order for low-level debugging to
                   work.
 
@@ -610,11 +821,41 @@ choice
                   For more details about semihosting, please see
                   chapter 8 of DUI0203I_rvct_developer_guide.pdf from ARM Ltd.
 
+        config DEBUG_LL_UART_8250
+                bool "Kernel low-level debugging via 8250 UART"
+                help
+                  Say Y here if you wish the debug print routes to direct
+                  their output to an 8250 UART.  You can use this option
+                  to provide the parameters for the 8250 UART rather than
+                  selecting one of the platform specific options above if
+                  you know the parameters for the port.
+
+                  This option is preferred over the platform specific
+                  options; the platform specific options are deprecated
+                  and will be soon removed.
+
+        config DEBUG_LL_UART_PL01X
+                bool "Kernel low-level debugging via ARM Ltd PL01x Primecell UART"
+                help
+                  Say Y here if you wish the debug print routes to direct
+                  their output to a PL01x Primecell UART.  You can use
+                  this option to provide the parameters for the UART
+                  rather than selecting one of the platform specific
+                  options above if you know the parameters for the port.
+
+                  This option is preferred over the platform specific
+                  options; the platform specific options are deprecated
+                  and will be soon removed.
+
 endchoice
 
 config DEBUG_EXYNOS_UART
         bool
 
+config DEBUG_OMAP2PLUS_UART
+        bool
+        depends on ARCH_OMAP2PLUS
+
 config DEBUG_IMX_UART_PORT
         int "i.MX Debug UART Port Selection" if DEBUG_IMX1_UART || \
                                                 DEBUG_IMX25_UART || \
@@ -631,140 +872,19 @@ config DEBUG_IMX_UART_PORT
           Choose UART port on which kernel low-level debug messages
           should be output.
 
-choice
-        prompt "Low-level debug console UART"
-        depends on DEBUG_OMAP2PLUS_UART
-
-        config DEBUG_OMAP2UART1
-                bool "OMAP2/3/4 UART1 (omap2/3 sdp boards and some omap3 boards)"
-                help
-                  This covers at least h4, 2430sdp, 3430sdp, 3630sdp,
-                  omap3 torpedo and 3530 lv som.
-
-        config DEBUG_OMAP2UART2
-                bool "OMAP2/3/4 UART2"
-
-        config DEBUG_OMAP2UART3
-                bool "OMAP2 UART3 (n8x0)"
-
-        config DEBUG_OMAP3UART3
-                bool "OMAP3 UART3 (most omap3 boards)"
-                help
-                  This covers at least cm_t3x, beagle, crane, devkit8000,
-                  igep00x0, ldp, n900, n9(50), pandora, overo, touchbook,
-                  and 3517evm.
-
-        config DEBUG_OMAP4UART3
-                bool "OMAP4/5 UART3 (omap4 blaze, panda, omap5 sevm)"
-
-        config DEBUG_OMAP3UART4
-                bool "OMAP36XX UART4"
-
-        config DEBUG_OMAP4UART4
-                bool "OMAP4/5 UART4"
-
-        config DEBUG_TI81XXUART1
-                bool "TI81XX UART1 (ti8148evm)"
-
-        config DEBUG_TI81XXUART2
-                bool "TI81XX UART2"
-
-        config DEBUG_TI81XXUART3
-                bool "TI81XX UART3 (ti8168evm)"
-
-        config DEBUG_AM33XXUART1
-                bool "AM33XX UART1"
-
-        config DEBUG_ZOOM_UART
-                bool "Zoom2/3 UART"
-endchoice
-
-choice
-        prompt "Low-level debug console UART"
-        depends on DEBUG_ROCKCHIP_UART
-
-        config DEBUG_RK29_UART0
-                bool "RK29 UART0"
-
-        config DEBUG_RK29_UART1
-                bool "RK29 UART1"
-
-        config DEBUG_RK29_UART2
-                bool "RK29 UART2"
-
-        config DEBUG_RK3X_UART0
-                bool "RK3X UART0"
-
-        config DEBUG_RK3X_UART1
-                bool "RK3X UART1"
-
-        config DEBUG_RK3X_UART2
-                bool "RK3X UART2"
-
-        config DEBUG_RK3X_UART3
-                bool "RK3X UART3"
-endchoice
-
-choice
-        prompt "Low-level debug console UART"
-        depends on DEBUG_LL && DEBUG_TEGRA_UART
-
-        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_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 "Low-level debug console UART"
-        depends on DEBUG_LL && DEBUG_STI_UART
-
-        config STIH41X_DEBUG_ASC2
-                bool "ASC2 UART"
-                help
-                  Say Y here if you want kernel low-level debugging support
-                  on STiH415/416 based platforms like b2000, which has
-                  default UART wired up to ASC2.
-
-                  If unsure, say N.
-
-        config STIH41X_DEBUG_SBC_ASC1
-                bool "SBC ASC1 UART"
-                help
-                  Say Y here if you want kernel low-level debugging support
-                  on STiH415/416 based platforms like b2020. which has
-                  default UART wired up to SBC ASC1.
-
-                  If unsure, say N.
+config DEBUG_TEGRA_UART
+        bool
+        depends on ARCH_TEGRA
 
-endchoice
+config DEBUG_STI_UART
+        bool
+        depends on ARCH_STI
 
 config DEBUG_LL_INCLUDE
         string
-        default "debug/bcm2835.S" if DEBUG_BCM2835
-        default "debug/cns3xxx.S" if DEBUG_CNS3XXX
+        default "debug/8250.S" if DEBUG_LL_UART_8250 || DEBUG_UART_8250
+        default "debug/pl01x.S" if DEBUG_LL_UART_PL01X || DEBUG_UART_PL01X
         default "debug/exynos.S" if DEBUG_EXYNOS_UART
-        default "debug/highbank.S" if DEBUG_HIGHBANK_UART
         default "debug/icedcc.S" if DEBUG_ICEDCC
         default "debug/imx.S" if DEBUG_IMX1_UART || \
                                  DEBUG_IMX25_UART || \
@@ -775,38 +895,175 @@ config DEBUG_LL_INCLUDE
                                  DEBUG_IMX53_UART ||\
                                  DEBUG_IMX6Q_UART || \
                                  DEBUG_IMX6SL_UART
-        default "debug/keystone.S" if DEBUG_KEYSTONE_UART0 || \
-                                      DEBUG_KEYSTONE_UART1
-        default "debug/mvebu.S" if DEBUG_MVEBU_UART || \
-                                   DEBUG_MVEBU_UART_ALTERNATE
-        default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART
-        default "debug/nomadik.S" if DEBUG_NOMADIK_UART
-        default "debug/nspire.S" if     DEBUG_NSPIRE_CX_UART || \
-                                        DEBUG_NSPIRE_CLASSIC_UART
+        default "debug/msm.S" if DEBUG_MSM_UART1 || \
+                                 DEBUG_MSM_UART2 || \
+                                 DEBUG_MSM_UART3 || \
+                                 DEBUG_MSM8660_UART || \
+                                 DEBUG_MSM8960_UART
         default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
-        default "debug/picoxcell.S" if DEBUG_PICOXCELL_UART
-        default "debug/pxa.S" if DEBUG_PXA_UART1 || DEBUG_MMP_UART2 || \
-                                 DEBUG_MMP_UART3
-        default "debug/rockchip.S" if DEBUG_ROCKCHIP_UART
         default "debug/sirf.S" if DEBUG_SIRFPRIMA2_UART1 || DEBUG_SIRFMARCO_UART1
-        default "debug/socfpga.S" if DEBUG_SOCFPGA_UART
         default "debug/sti.S" if DEBUG_STI_UART
-        default "debug/sunxi.S" if DEBUG_SUNXI_UART0 || DEBUG_SUNXI_UART1
         default "debug/tegra.S" if DEBUG_TEGRA_UART
-        default "debug/u300.S" if DEBUG_U300_UART
         default "debug/ux500.S" if DEBUG_UX500_UART
-        default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT || \
-                DEBUG_VEXPRESS_UART0_CA9 || DEBUG_VEXPRESS_UART0_RS1 || \
-                DEBUG_VEXPRESS_UART0_CRX
+        default "debug/vexpress.S" if DEBUG_VEXPRESS_UART0_DETECT
         default "debug/vt8500.S" if DEBUG_VT8500_UART0
         default "debug/zynq.S" if DEBUG_ZYNQ_UART0 || DEBUG_ZYNQ_UART1
         default "mach/debug-macro.S"
 
+# Compatibility options for PL01x
+config DEBUG_UART_PL01X
+        def_bool ARCH_EP93XX || \
+                ARCH_INTEGRATOR || \
+                ARCH_SPEAR3XX || \
+                ARCH_SPEAR6XX || \
+                ARCH_SPEAR13XX || \
+                ARCH_VERSATILE
+
+# Compatibility options for 8250
+config DEBUG_UART_8250
+        def_bool ARCH_DOVE || ARCH_EBSA110 || \
+                (FOOTBRIDGE && !DEBUG_DC21285_PORT) || \
+                ARCH_GEMINI || ARCH_IOP13XX || ARCH_IOP32X || \
+                ARCH_IOP33X || ARCH_IXP4XX || ARCH_KIRKWOOD || \
+                ARCH_LPC32XX || ARCH_MV78XX0 || ARCH_ORION5X || ARCH_RPC
+
+config DEBUG_UART_PHYS
+        hex "Physical base address of debug UART"
+        default 0x01c20000 if DEBUG_DAVINCI_DMx_UART0
+        default 0x01c28000 if DEBUG_SUNXI_UART0
+        default 0x01c28400 if DEBUG_SUNXI_UART1
+        default 0x01d0c000 if DEBUG_DAVINCI_DA8XX_UART1
+        default 0x01d0d000 if DEBUG_DAVINCI_DA8XX_UART2
+        default 0x02530c00 if DEBUG_KEYSTONE_UART0
+        default 0x02531000 if DEBUG_KEYSTONE_UART1
+        default 0x03010fe0 if ARCH_RPC
+        default 0x08108300 if DEBUG_DAVINCI_TNETV107X_UART1
+        default 0x10009000 if DEBUG_REALVIEW_STD_PORT || DEBUG_CNS3XXX || \
+                                DEBUG_VEXPRESS_UART0_CA9
+        default 0x1010c000 if DEBUG_REALVIEW_PB1176_PORT
+        default 0x10124000 if DEBUG_RK3X_UART0
+        default 0x10126000 if DEBUG_RK3X_UART1
+        default 0x101f1000 if ARCH_VERSATILE
+        default 0x101fb000 if DEBUG_NOMADIK_UART
+        default 0x16000000 if ARCH_INTEGRATOR
+        default 0x1c090000 if DEBUG_VEXPRESS_UART0_RS1
+        default 0x20060000 if DEBUG_RK29_UART0
+        default 0x20064000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
+        default 0x20068000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3
+        default 0x20201000 if DEBUG_BCM2835
+        default 0x40090000 if ARCH_LPC32XX
+        default 0x40100000 if DEBUG_PXA_UART1
+        default 0x42000000 if ARCH_GEMINI
+        default 0x7c0003f8 if FOOTBRIDGE
+        default 0x80230000 if DEBUG_PICOXCELL_UART
+        default 0x80070000 if DEBUG_IMX23_UART
+        default 0x80074000 if DEBUG_IMX28_UART
+        default 0x808c0000 if ARCH_EP93XX
+        default 0x90020000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART
+        default 0xb0090000 if DEBUG_VEXPRESS_UART0_CRX
+        default 0xc0013000 if DEBUG_U300_UART
+        default 0xc8000000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN
+        default 0xc8000003 if ARCH_IXP4XX && CPU_BIG_ENDIAN
+        default 0xd0000000 if ARCH_SPEAR3XX || ARCH_SPEAR6XX
+        default 0xd0012000 if DEBUG_MVEBU_UART
+        default 0xd4017000 if DEBUG_MMP_UART2
+        default 0xd4018000 if DEBUG_MMP_UART3
+        default 0xe0000000 if ARCH_SPEAR13XX
+        default 0xf0000be0 if ARCH_EBSA110
+        default 0xf1012000 if DEBUG_MVEBU_UART_ALTERNATE
+        default 0xf1012000 if ARCH_DOVE || ARCH_KIRKWOOD || ARCH_MV78XX0 || \
+                                ARCH_ORION5X
+        default 0xf8b00000 if DEBUG_HI3716_UART
+        default 0xfcb00000 if DEBUG_HI3620_UART
+        default 0xfe800000 if ARCH_IOP32X
+        default 0xffc02000 if DEBUG_SOCFPGA_UART
+        default 0xffd82340 if ARCH_IOP13XX
+        default 0xfff36000 if DEBUG_HIGHBANK_UART
+        default 0xfffff700 if ARCH_IOP33X
+        depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
+                DEBUG_UART_8250 || DEBUG_UART_PL01X
+
+config DEBUG_UART_VIRT
+        hex "Virtual base address of debug UART"
+        default 0xe0010fe0 if ARCH_RPC
+        default 0xf0000be0 if ARCH_EBSA110
+        default 0xf0009000 if DEBUG_CNS3XXX
+        default 0xf01fb000 if DEBUG_NOMADIK_UART
+        default 0xf0201000 if DEBUG_BCM2835
+        default 0xf11f1000 if ARCH_VERSATILE
+        default 0xf1600000 if ARCH_INTEGRATOR
+        default 0xf1c28000 if DEBUG_SUNXI_UART0
+        default 0xf1c28400 if DEBUG_SUNXI_UART1
+        default 0xf2100000 if DEBUG_PXA_UART1
+        default 0xf4090000 if ARCH_LPC32XX
+        default 0xf4200000 if ARCH_GEMINI
+        default 0xf8009000 if DEBUG_VEXPRESS_UART0_CA9
+        default 0xf8090000 if DEBUG_VEXPRESS_UART0_RS1
+        default 0xfb009000 if DEBUG_REALVIEW_STD_PORT
+        default 0xfb10c000 if DEBUG_REALVIEW_PB1176_PORT
+        default 0xfd000000 if ARCH_SPEAR3XX || ARCH_SPEAR6XX
+        default 0xfd000000 if ARCH_SPEAR13XX
+        default 0xfd012000 if ARCH_MV78XX0
+        default 0xfde12000 if ARCH_DOVE
+        default 0xfe012000 if ARCH_ORION5X
+        default 0xfe017000 if DEBUG_MMP_UART2
+        default 0xfe018000 if DEBUG_MMP_UART3
+        default 0xfe100000 if DEBUG_IMX23_UART || DEBUG_IMX28_UART
+        default 0xfe230000 if DEBUG_PICOXCELL_UART
+        default 0xfe800000 if ARCH_IOP32X
+        default 0xfeb00000 if DEBUG_HI3620_UART || DEBUG_HI3716_UART
+        default 0xfeb24000 if DEBUG_RK3X_UART0
+        default 0xfeb26000 if DEBUG_RK3X_UART1
+        default 0xfeb30c00 if DEBUG_KEYSTONE_UART0
+        default 0xfeb31000 if DEBUG_KEYSTONE_UART1
+        default 0xfec12000 if DEBUG_MVEBU_UART || DEBUG_MVEBU_UART_ALTERNATE
+        default 0xfed60000 if DEBUG_RK29_UART0
+        default 0xfed64000 if DEBUG_RK29_UART1 || DEBUG_RK3X_UART2
+        default 0xfed68000 if DEBUG_RK29_UART2 || DEBUG_RK3X_UART3
+        default 0xfec02000 if DEBUG_SOCFPGA_UART
+        default 0xfec20000 if DEBUG_DAVINCI_DMx_UART0
+        default 0xfed0c000 if DEBUG_DAVINCI_DA8XX_UART1
+        default 0xfed0d000 if DEBUG_DAVINCI_DA8XX_UART2
+        default 0xfed12000 if ARCH_KIRKWOOD
+        default 0xfedc0000 if ARCH_EP93XX
+        default 0xfee003f8 if FOOTBRIDGE
+        default 0xfee08300 if DEBUG_DAVINCI_TNETV107X_UART1
+        default 0xfee20000 if DEBUG_NSPIRE_CLASSIC_UART || DEBUG_NSPIRE_CX_UART
+        default 0xfef36000 if DEBUG_HIGHBANK_UART
+        default 0xfee82340 if ARCH_IOP13XX
+        default 0xfef00000 if ARCH_IXP4XX && !CPU_BIG_ENDIAN
+        default 0xfef00003 if ARCH_IXP4XX && CPU_BIG_ENDIAN
+        default 0xfefff700 if ARCH_IOP33X
+        default 0xff003000 if DEBUG_U300_UART
+        default DEBUG_UART_PHYS if !MMU
+        depends on DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
+                DEBUG_UART_8250 || DEBUG_UART_PL01X
+
+config DEBUG_UART_8250_SHIFT
+        int "Register offset shift for the 8250 debug UART"
+        depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250
+        default 0 if FOOTBRIDGE || ARCH_IOP32X
+        default 2
+
+config DEBUG_UART_8250_WORD
+        bool "Use 32-bit accesses for 8250 UART"
+        depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250
+        depends on DEBUG_UART_8250_SHIFT >= 2
+        default y if DEBUG_PICOXCELL_UART || DEBUG_SOCFPGA_UART || \
+                ARCH_KEYSTONE || \
+                DEBUG_DAVINCI_DMx_UART0 || DEBUG_DAVINCI_DA8XX_UART1 || \
+                DEBUG_DAVINCI_DA8XX_UART2 || DEBUG_DAVINCI_TNETV107X_UART1
+
+config DEBUG_UART_8250_FLOW_CONTROL
+        bool "Enable flow control for 8250 UART"
+        depends on DEBUG_LL_UART_8250 || DEBUG_UART_8250
+        default y if ARCH_EBSA110 || FOOTBRIDGE || ARCH_GEMINI || ARCH_RPC
+
 config DEBUG_UNCOMPRESS
         bool
-        depends on ARCH_MULTIPLATFORM
+        depends on ARCH_MULTIPLATFORM || ARCH_MSM
         default y if DEBUG_LL && !DEBUG_OMAP2PLUS_UART && \
-                     !DEBUG_TEGRA_UART
+                     (!DEBUG_TEGRA_UART || !ZBOOT_ROM)
         help
           This option influences the normal decompressor output for
           multiplatform kernels.  Normally, multiplatform kernels disable
@@ -820,7 +1077,7 @@ config DEBUG_UNCOMPRESS
 
 config UNCOMPRESS_INCLUDE
         string
-        default "debug/uncompress.h" if ARCH_MULTIPLATFORM
+        default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM
         default "mach/uncompress.h"
 
 config EARLY_PRINTK
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 6fd2ceae305a..a37a50f575a2 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -190,6 +190,7 @@ machine-$(CONFIG_ARCH_S5PV210)		+= s5pv210
 machine-$(CONFIG_ARCH_SA1100)           += sa1100
 machine-$(CONFIG_ARCH_SHARK)            += shark
 machine-$(CONFIG_ARCH_SHMOBILE)         += shmobile
+machine-$(CONFIG_ARCH_SHMOBILE_MULTI)   += shmobile
 machine-$(CONFIG_ARCH_SIRF)             += prima2
 machine-$(CONFIG_ARCH_SOCFPGA)          += socfpga
 machine-$(CONFIG_ARCH_STI)              += sti
diff --git a/arch/arm/boot/compressed/head-shmobile.S b/arch/arm/boot/compressed/head-shmobile.S
index e2d636336b7c..e7f80928949c 100644
--- a/arch/arm/boot/compressed/head-shmobile.S
+++ b/arch/arm/boot/compressed/head-shmobile.S
@@ -55,12 +55,47 @@ __tmp_stack:
 __continue:
 #endif /* CONFIG_ZBOOT_ROM_MMC || CONFIG_ZBOOT_ROM_SH_MOBILE_SDHI */
 
-        /* Set board ID necessary for boot */
-        ldr     r7, 1f                          @ Set machine type register
-        mov     r8, #0                          @ pass null pointer as atag
+        adr     r0, dtb_info
+        ldmia   r0, {r1, r3, r4, r5, r7}
+
+        sub     r0, r0, r1              @ calculate the delta offset
+        add     r5, r5, r0              @ _edata
+
+        ldr     lr, [r5, #0]            @ check if valid DTB is present
+        cmp     lr, r3
+        bne     0f
+
+        add     r9, r7, #31             @ rounded up to a multiple
+        bic     r9, r9, #31             @ ... of 32 bytes
+
+        add     r6, r9, r5              @ copy from _edata
+        add     r9, r9, r4              @ to MEMORY_START
+
+1:      ldmdb   r6!, {r0 - r3, r10 - r12, lr}
+        cmp     r6, r5
+        stmdb   r9!, {r0 - r3, r10 - r12, lr}
+        bhi     1b
+
+        /* Success: Zero board ID, pointer to start of memory for atag/dtb */
+        mov     r7, #0
+        mov     r8, r4
         b       2f
 
-1 :     .long MACH_TYPE
+        .align  2
+dtb_info:
+        .word   dtb_info
+#ifndef __ARMEB__
+        .word   0xedfe0dd0              @ sig is 0xd00dfeed big endian
+#else
+        .word   0xd00dfeed
+#endif
+        .word   MEMORY_START
+        .word   _edata
+        .word   0x4000                  @ maximum DTB size
+0:
+        /* Failure: Zero board ID, NULL atag/dtb */
+        mov     r7, #0
+        mov     r8, #0                  @ pass null pointer as atag
 2 :
 
 #endif /* CONFIG_ZBOOT_ROM */
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
index 641b3c9a7028..e95af3f5433b 100644
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
@@ -42,24 +42,27 @@ dtb-$(CONFIG_ARCH_AT91)	+= sama5d34ek.dtb
 dtb-$(CONFIG_ARCH_AT91) += sama5d35ek.dtb
 
 dtb-$(CONFIG_ARCH_BCM2835) += bcm2835-rpi-b.dtb
-dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb
+dtb-$(CONFIG_ARCH_BCM) += bcm11351-brt.dtb \
+        bcm28155-ap.dtb
 dtb-$(CONFIG_ARCH_DAVINCI) += da850-enbw-cmc.dtb \
         da850-evm.dtb
 dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \
         dove-cubox.dtb \
+        dove-d2plug.dtb \
         dove-dove-db.dtb
 dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \
         exynos4210-smdkv310.dtb \
         exynos4210-trats.dtb \
         exynos4210-universal_c210.dtb \
         exynos4412-odroidx.dtb \
-        exynos4412-smdk4412.dtb \
         exynos4412-origen.dtb \
+        exynos4412-smdk4412.dtb \
+        exynos4412-trats2.dtb \
         exynos5250-arndale.dtb \
-        exynos5440-sd5v1.dtb \
         exynos5250-smdk5250.dtb \
         exynos5250-snow.dtb \
         exynos5420-smdk5420.dtb \
+        exynos5440-sd5v1.dtb \
         exynos5440-ssdk5440.dtb
 dtb-$(CONFIG_ARCH_HIGHBANK) += highbank.dtb \
         ecx-2000.dtb
@@ -83,12 +86,14 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \
         kirkwood-lschlv2.dtb \
         kirkwood-lsxhl.dtb \
         kirkwood-mplcec4.dtb \
+        kirkwood-mv88f6281gtw-ge.dtb \
         kirkwood-netgear_readynas_duo_v2.dtb \
         kirkwood-ns2.dtb \
         kirkwood-ns2lite.dtb \
         kirkwood-ns2max.dtb \
         kirkwood-ns2mini.dtb \
         kirkwood-nsa310.dtb \
+        kirkwood-nsa310a.dtb \
         kirkwood-sheevaplug.dtb \
         kirkwood-sheevaplug-esata.dtb \
         kirkwood-topkick.dtb \
@@ -100,7 +105,9 @@ dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \
         msm8960-cdp.dtb
 dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
         armada-370-mirabox.dtb \
+        armada-370-netgear-rn102.dtb \
         armada-370-rd.dtb \
+        armada-xp-axpwifiap.dtb \
         armada-xp-db.dtb \
         armada-xp-gp.dtb \
         armada-xp-openblocks-ax3-4.dtb
@@ -112,6 +119,8 @@ dtb-$(CONFIG_ARCH_MXC) += \
         imx27-pdk.dtb \
         imx27-phytec-phycore-som.dtb \
         imx27-phytec-phycore-rdk.dtb \
+        imx27-phytec-phycard-s-som.dtb \
+        imx27-phytec-phycard-s-rdk.dtb \
         imx31-bug.dtb \
         imx51-apf51.dtb \
         imx51-apf51dev.dtb \
@@ -131,6 +140,7 @@ dtb-$(CONFIG_ARCH_MXC) += \
         imx6q-sabrelite.dtb \
         imx6q-sabresd.dtb \
         imx6q-sbc6x.dtb \
+        imx6q-wandboard.dtb \
         imx6sl-evk.dtb \
         vf610-twr.dtb
 dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
@@ -143,7 +153,9 @@ dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
         imx28-cfa10037.dtb \
         imx28-cfa10049.dtb \
         imx28-cfa10055.dtb \
+        imx28-cfa10056.dtb \
         imx28-cfa10057.dtb \
+        imx28-cfa10058.dtb \
         imx28-evk.dtb \
         imx28-m28evk.dtb \
         imx28-sps1.dtb \
@@ -171,27 +183,34 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \
         am335x-evm.dtb \
         am335x-evmsk.dtb \
         am335x-bone.dtb \
+        am335x-boneblack.dtb \
         am3517-evm.dtb \
         am3517_mt_ventoux.dtb \
         am43x-epos-evm.dtb
 dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb
 dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb
-dtb-$(CONFIG_ARCH_U8500) += snowball.dtb \
-        hrefprev60.dtb \
-        hrefv60plus.dtb \
-        ccu8540.dtb \
-        ccu9540.dtb
+dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \
+        ste-hrefprev60.dtb \
+        ste-hrefv60plus.dtb \
+        ste-ccu8540.dtb \
+        ste-ccu9540.dtb
 dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
 dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
+        emev2-kzm9d-reference.dtb \
         r8a7740-armadillo800eva.dtb \
         r8a7778-bockw.dtb \
+        r8a7778-bockw-reference.dtb \
         r8a7740-armadillo800eva-reference.dtb \
+        r8a7779-marzen.dtb \
         r8a7779-marzen-reference.dtb \
         r8a7790-lager.dtb \
+        r8a7790-lager-reference.dtb \
         sh73a0-kzm9g.dtb \
         sh73a0-kzm9g-reference.dtb \
         r8a73a4-ape6evm.dtb \
+        r8a73a4-ape6evm-reference.dtb \
         sh7372-mackerel.dtb
+dtb-$(CONFIG_ARCH_SHMOBILE_MULTI) += emev2-kzm9d-reference.dtb
 dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5.dtb \
         socfpga_vt.dtb
 dtb-$(CONFIG_ARCH_SPEAR13XX) += spear1310-evb.dtb \
@@ -206,11 +225,15 @@ dtb-$(CONFIG_ARCH_STI)+= stih415-b2000.dtb \
         stih415-b2020.dtb \
         stih416-b2020.dtb
 dtb-$(CONFIG_ARCH_SUNXI) += \
+        sun4i-a10-a1000.dtb \
         sun4i-a10-cubieboard.dtb \
         sun4i-a10-mini-xplus.dtb \
         sun4i-a10-hackberry.dtb \
         sun5i-a10s-olinuxino-micro.dtb \
-        sun5i-a13-olinuxino.dtb
+        sun5i-a13-olinuxino.dtb \
+        sun6i-a31-colombus.dtb \
+        sun7i-a20-cubieboard2.dtb \
+        sun7i-a20-olinuxino-micro.dtb
 dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
         tegra20-iris-512.dtb \
         tegra20-medcom-wide.dtb \
@@ -224,8 +247,7 @@ dtb-$(CONFIG_ARCH_TEGRA) += tegra20-harmony.dtb \
         tegra30-beaver.dtb \
         tegra30-cardhu-a02.dtb \
         tegra30-cardhu-a04.dtb \
-        tegra114-dalmore.dtb \
-        tegra114-pluto.dtb
+        tegra114-dalmore.dtb
 dtb-$(CONFIG_ARCH_VERSATILE) += versatile-ab.dtb \
         versatile-pb.dtb
 dtb-$(CONFIG_ARCH_U300) += ste-u300.dtb
diff --git a/arch/arm/boot/dts/am335x-bone-common.dtsi b/arch/arm/boot/dts/am335x-bone-common.dtsi
new file mode 100644
index 000000000000..2f66deda9f5c
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-bone-common.dtsi
@@ -0,0 +1,262 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+/ {
+        model = "TI AM335x BeagleBone";
+        compatible = "ti,am335x-bone", "ti,am33xx";
+
+        cpus {
+                cpu@0 {
+                        cpu0-supply = <&dcdc2_reg>;
+                };
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x80000000 0x10000000>; /* 256 MB */
+        };
+
+        am33xx_pinmux: pinmux@44e10800 {
+                pinctrl-names = "default";
+                pinctrl-0 = <&clkout2_pin>;
+
+                user_leds_s0: user_leds_s0 {
+                        pinctrl-single,pins = <
+                                0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)  /* gpmc_a5.gpio1_21 */
+                                0x58 (PIN_OUTPUT_PULLUP | MUX_MODE7)    /* gpmc_a6.gpio1_22 */
+                                0x5c (PIN_OUTPUT_PULLDOWN | MUX_MODE7)  /* gpmc_a7.gpio1_23 */
+                                0x60 (PIN_OUTPUT_PULLUP | MUX_MODE7)    /* gpmc_a8.gpio1_24 */
+                        >;
+                };
+
+                i2c0_pins: pinmux_i2c0_pins {
+                        pinctrl-single,pins = <
+                                0x188 (PIN_INPUT_PULLUP | MUX_MODE0)    /* i2c0_sda.i2c0_sda */
+                                0x18c (PIN_INPUT_PULLUP | MUX_MODE0)    /* i2c0_scl.i2c0_scl */
+                        >;
+                };
+
+                uart0_pins: pinmux_uart0_pins {
+                        pinctrl-single,pins = <
+                                0x170 (PIN_INPUT_PULLUP | MUX_MODE0)    /* uart0_rxd.uart0_rxd */
+                                0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */
+                        >;
+                };
+
+                clkout2_pin: pinmux_clkout2_pin {
+                        pinctrl-single,pins = <
+                                0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
+                        >;
+                };
+
+                cpsw_default: cpsw_default {
+                        pinctrl-single,pins = <
+                                /* Slave 1 */
+                                0x110 (PIN_INPUT_PULLUP | MUX_MODE0)    /* mii1_rxerr.mii1_rxerr */
+                                0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txen.mii1_txen */
+                                0x118 (PIN_INPUT_PULLUP | MUX_MODE0)    /* mii1_rxdv.mii1_rxdv */
+                                0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd3.mii1_txd3 */
+                                0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd2.mii1_txd2 */
+                                0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd1.mii1_txd1 */
+                                0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd0.mii1_txd0 */
+                                0x12c (PIN_INPUT_PULLUP | MUX_MODE0)    /* mii1_txclk.mii1_txclk */
+                                0x130 (PIN_INPUT_PULLUP | MUX_MODE0)    /* mii1_rxclk.mii1_rxclk */
+                                0x134 (PIN_INPUT_PULLUP | MUX_MODE0)    /* mii1_rxd3.mii1_rxd3 */
+                                0x138 (PIN_INPUT_PULLUP | MUX_MODE0)    /* mii1_rxd2.mii1_rxd2 */
+                                0x13c (PIN_INPUT_PULLUP | MUX_MODE0)    /* mii1_rxd1.mii1_rxd1 */
+                                0x140 (PIN_INPUT_PULLUP | MUX_MODE0)    /* mii1_rxd0.mii1_rxd0 */
+                        >;
+                };
+
+                cpsw_sleep: cpsw_sleep {
+                        pinctrl-single,pins = <
+                                /* Slave 1 reset value */
+                                0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                                0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                                0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                                0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                                0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                                0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                                0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                                0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                                0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                                0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                                0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                                0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                                0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        >;
+                };
+
+                davinci_mdio_default: davinci_mdio_default {
+                        pinctrl-single,pins = <
+                                /* MDIO */
+                                0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)    /* mdio_data.mdio_data */
+                                0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0)                   /* mdio_clk.mdio_clk */
+                        >;
+                };
+
+                davinci_mdio_sleep: davinci_mdio_sleep {
+                        pinctrl-single,pins = <
+                                /* MDIO reset value */
+                                0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                                0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
+                        >;
+                };
+        };
+
+        ocp {
+                uart0: serial@44e09000 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&uart0_pins>;
+
+                        status = "okay";
+                };
+
+                musb: usb@47400000 {
+                        status = "okay";
+
+                        control@44e10000 {
+                                status = "okay";
+                        };
+
+                        usb-phy@47401300 {
+                                status = "okay";
+                        };
+
+                        usb-phy@47401b00 {
+                                status = "okay";
+                        };
+
+                        usb@47401000 {
+                                status = "okay";
+                        };
+
+                        usb@47401800 {
+                                status = "okay";
+                                dr_mode = "host";
+                        };
+
+                        dma-controller@07402000  {
+                                status = "okay";
+                        };
+                };
+
+                i2c0: i2c@44e0b000 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2c0_pins>;
+
+                        status = "okay";
+                        clock-frequency = <400000>;
+
+                        tps: tps@24 {
+                                reg = <0x24>;
+                        };
+
+                };
+        };
+
+        leds {
+                pinctrl-names = "default";
+                pinctrl-0 = <&user_leds_s0>;
+
+                compatible = "gpio-leds";
+
+                led@2 {
+                        label = "beaglebone:green:heartbeat";
+                        gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "heartbeat";
+                        default-state = "off";
+                };
+
+                led@3 {
+                        label = "beaglebone:green:mmc0";
+                        gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
+                        linux,default-trigger = "mmc0";
+                        default-state = "off";
+                };
+
+                led@4 {
+                        label = "beaglebone:green:usr2";
+                        gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
+                        default-state = "off";
+                };
+
+                led@5 {
+                        label = "beaglebone:green:usr3";
+                        gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
+                        default-state = "off";
+                };
+        };
+};
+
+/include/ "tps65217.dtsi"
+
+&tps {
+        regulators {
+                dcdc1_reg: regulator@0 {
+                        regulator-always-on;
+                };
+
+                dcdc2_reg: regulator@1 {
+                        /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
+                        regulator-name = "vdd_mpu";
+                        regulator-min-microvolt = <925000>;
+                        regulator-max-microvolt = <1325000>;
+                        regulator-boot-on;
+                        regulator-always-on;
+                };
+
+                dcdc3_reg: regulator@2 {
+                        /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
+                        regulator-name = "vdd_core";
+                        regulator-min-microvolt = <925000>;
+                        regulator-max-microvolt = <1150000>;
+                        regulator-boot-on;
+                        regulator-always-on;
+                };
+
+                ldo1_reg: regulator@3 {
+                        regulator-always-on;
+                };
+
+                ldo2_reg: regulator@4 {
+                        regulator-always-on;
+                };
+
+                ldo3_reg: regulator@5 {
+                        regulator-always-on;
+                };
+
+                ldo4_reg: regulator@6 {
+                        regulator-always-on;
+                };
+        };
+};
+
+&cpsw_emac0 {
+        phy_id = <&davinci_mdio>, <0>;
+        phy-mode = "mii";
+};
+
+&cpsw_emac1 {
+        phy_id = <&davinci_mdio>, <1>;
+        phy-mode = "mii";
+};
+
+&mac {
+        pinctrl-names = "default", "sleep";
+        pinctrl-0 = <&cpsw_default>;
+        pinctrl-1 = <&cpsw_sleep>;
+
+};
+
+&davinci_mdio {
+        pinctrl-names = "default", "sleep";
+        pinctrl-0 = <&davinci_mdio_default>;
+        pinctrl-1 = <&davinci_mdio_sleep>;
+};
diff --git a/arch/arm/boot/dts/am335x-bone.dts b/arch/arm/boot/dts/am335x-bone.dts
index 444b4ede0d60..7993c489982c 100644
--- a/arch/arm/boot/dts/am335x-bone.dts
+++ b/arch/arm/boot/dts/am335x-bone.dts
@@ -8,229 +8,4 @@
 /dts-v1/;
 
 #include "am33xx.dtsi"
-
-/ {
-        model = "TI AM335x BeagleBone";
-        compatible = "ti,am335x-bone", "ti,am33xx";
-
-        cpus {
-                cpu@0 {
-                        cpu0-supply = <&dcdc2_reg>;
-                };
-        };
-
-        memory {
-                device_type = "memory";
-                reg = <0x80000000 0x10000000>; /* 256 MB */
-        };
-
-        am33xx_pinmux: pinmux@44e10800 {
-                pinctrl-names = "default";
-                pinctrl-0 = <&clkout2_pin>;
-
-                user_leds_s0: user_leds_s0 {
-                        pinctrl-single,pins = <
-                                0x54 (PIN_OUTPUT_PULLDOWN | MUX_MODE7)  /* gpmc_a5.gpio1_21 */
-                                0x58 (PIN_OUTPUT_PULLUP | MUX_MODE7)    /* gpmc_a6.gpio1_22 */
-                                0x5c (PIN_OUTPUT_PULLDOWN | MUX_MODE7)  /* gpmc_a7.gpio1_23 */
-                                0x60 (PIN_OUTPUT_PULLUP | MUX_MODE7)    /* gpmc_a8.gpio1_24 */
-                        >;
-                };
-
-                i2c0_pins: pinmux_i2c0_pins {
-                        pinctrl-single,pins = <
-                                0x188 (PIN_INPUT_PULLUP | MUX_MODE0)    /* i2c0_sda.i2c0_sda */
-                                0x18c (PIN_INPUT_PULLUP | MUX_MODE0)    /* i2c0_scl.i2c0_scl */
-                        >;
-                };
-
-                uart0_pins: pinmux_uart0_pins {
-                        pinctrl-single,pins = <
-                                0x170 (PIN_INPUT_PULLUP | MUX_MODE0)    /* uart0_rxd.uart0_rxd */
-                                0x174 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* uart0_txd.uart0_txd */
-                        >;
-                };
-
-                clkout2_pin: pinmux_clkout2_pin {
-                        pinctrl-single,pins = <
-                                0x1b4 (PIN_OUTPUT_PULLDOWN | MUX_MODE3) /* xdma_event_intr1.clkout2 */
-                        >;
-                };
-
-                cpsw_default: cpsw_default {
-                        pinctrl-single,pins = <
-                                /* Slave 1 */
-                                0x110 (PIN_INPUT_PULLUP | MUX_MODE0)    /* mii1_rxerr.mii1_rxerr */
-                                0x114 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txen.mii1_txen */
-                                0x118 (PIN_INPUT_PULLUP | MUX_MODE0)    /* mii1_rxdv.mii1_rxdv */
-                                0x11c (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd3.mii1_txd3 */
-                                0x120 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd2.mii1_txd2 */
-                                0x124 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd1.mii1_txd1 */
-                                0x128 (PIN_OUTPUT_PULLDOWN | MUX_MODE0) /* mii1_txd0.mii1_txd0 */
-                                0x12c (PIN_INPUT_PULLUP | MUX_MODE0)    /* mii1_txclk.mii1_txclk */
-                                0x130 (PIN_INPUT_PULLUP | MUX_MODE0)    /* mii1_rxclk.mii1_rxclk */
-                                0x134 (PIN_INPUT_PULLUP | MUX_MODE0)    /* mii1_rxd3.mii1_rxd3 */
-                                0x138 (PIN_INPUT_PULLUP | MUX_MODE0)    /* mii1_rxd2.mii1_rxd2 */
-                                0x13c (PIN_INPUT_PULLUP | MUX_MODE0)    /* mii1_rxd1.mii1_rxd1 */
-                                0x140 (PIN_INPUT_PULLUP | MUX_MODE0)    /* mii1_rxd0.mii1_rxd0 */
-                        >;
-                };
-
-                cpsw_sleep: cpsw_sleep {
-                        pinctrl-single,pins = <
-                                /* Slave 1 reset value */
-                                0x110 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-                                0x114 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-                                0x118 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-                                0x11c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-                                0x120 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-                                0x124 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-                                0x128 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-                                0x12c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-                                0x130 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-                                0x134 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-                                0x138 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-                                0x13c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-                                0x140 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-                        >;
-                };
-
-                davinci_mdio_default: davinci_mdio_default {
-                        pinctrl-single,pins = <
-                                /* MDIO */
-                                0x148 (PIN_INPUT_PULLUP | SLEWCTRL_FAST | MUX_MODE0)    /* mdio_data.mdio_data */
-                                0x14c (PIN_OUTPUT_PULLUP | MUX_MODE0)                   /* mdio_clk.mdio_clk */
-                        >;
-                };
-
-                davinci_mdio_sleep: davinci_mdio_sleep {
-                        pinctrl-single,pins = <
-                                /* MDIO reset value */
-                                0x148 (PIN_INPUT_PULLDOWN | MUX_MODE7)
-                                0x14c (PIN_INPUT_PULLDOWN | MUX_MODE7)
-                        >;
-                };
-        };
-
-        ocp {
-                uart0: serial@44e09000 {
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&uart0_pins>;
-
-                        status = "okay";
-                };
-
-                i2c0: i2c@44e0b000 {
-                        pinctrl-names = "default";
-                        pinctrl-0 = <&i2c0_pins>;
-
-                        status = "okay";
-                        clock-frequency = <400000>;
-
-                        tps: tps@24 {
-                                reg = <0x24>;
-                        };
-
-                };
-        };
-
-        leds {
-                pinctrl-names = "default";
-                pinctrl-0 = <&user_leds_s0>;
-
-                compatible = "gpio-leds";
-
-                led@2 {
-                        label = "beaglebone:green:heartbeat";
-                        gpios = <&gpio1 21 GPIO_ACTIVE_HIGH>;
-                        linux,default-trigger = "heartbeat";
-                        default-state = "off";
-                };
-
-                led@3 {
-                        label = "beaglebone:green:mmc0";
-                        gpios = <&gpio1 22 GPIO_ACTIVE_HIGH>;
-                        linux,default-trigger = "mmc0";
-                        default-state = "off";
-                };
-
-                led@4 {
-                        label = "beaglebone:green:usr2";
-                        gpios = <&gpio1 23 GPIO_ACTIVE_HIGH>;
-                        default-state = "off";
-                };
-
-                led@5 {
-                        label = "beaglebone:green:usr3";
-                        gpios = <&gpio1 24 GPIO_ACTIVE_HIGH>;
-                        default-state = "off";
-                };
-        };
-};
-
-/include/ "tps65217.dtsi"
-
-&tps {
-        regulators {
-                dcdc1_reg: regulator@0 {
-                        regulator-always-on;
-                };
-
-                dcdc2_reg: regulator@1 {
-                        /* VDD_MPU voltage limits 0.95V - 1.26V with +/-4% tolerance */
-                        regulator-name = "vdd_mpu";
-                        regulator-min-microvolt = <925000>;
-                        regulator-max-microvolt = <1325000>;
-                        regulator-boot-on;
-                        regulator-always-on;
-                };
-
-                dcdc3_reg: regulator@2 {
-                        /* VDD_CORE voltage limits 0.95V - 1.1V with +/-4% tolerance */
-                        regulator-name = "vdd_core";
-                        regulator-min-microvolt = <925000>;
-                        regulator-max-microvolt = <1150000>;
-                        regulator-boot-on;
-                        regulator-always-on;
-                };
-
-                ldo1_reg: regulator@3 {
-                        regulator-always-on;
-                };
-
-                ldo2_reg: regulator@4 {
-                        regulator-always-on;
-                };
-
-                ldo3_reg: regulator@5 {
-                        regulator-always-on;
-                };
-
-                ldo4_reg: regulator@6 {
-                        regulator-always-on;
-                };
-        };
-};
-
-&cpsw_emac0 {
-        phy_id = <&davinci_mdio>, <0>;
-        phy-mode = "mii";
-};
-
-&cpsw_emac1 {
-        phy_id = <&davinci_mdio>, <1>;
-        phy-mode = "mii";
-};
-
-&mac {
-        pinctrl-names = "default", "sleep";
-        pinctrl-0 = <&cpsw_default>;
-        pinctrl-1 = <&cpsw_sleep>;
-
-};
-
-&davinci_mdio {
-        pinctrl-names = "default", "sleep";
-        pinctrl-0 = <&davinci_mdio_default>;
-        pinctrl-1 = <&davinci_mdio_sleep>;
-};
+#include "am335x-bone-common.dtsi"
diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
new file mode 100644
index 000000000000..197cadf72d2c
--- /dev/null
+++ b/arch/arm/boot/dts/am335x-boneblack.dts
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/dts-v1/;
+
+#include "am33xx.dtsi"
+#include "am335x-bone-common.dtsi"
+
+&ldo3_reg {
+        regulator-min-microvolt = <1800000>;
+        regulator-max-microvolt = <1800000>;
+        regulator-always-on;
+};
diff --git a/arch/arm/boot/dts/am335x-evm.dts b/arch/arm/boot/dts/am335x-evm.dts
index 3aee1a43782d..e8ec8756e498 100644
--- a/arch/arm/boot/dts/am335x-evm.dts
+++ b/arch/arm/boot/dts/am335x-evm.dts
@@ -171,6 +171,35 @@
                         };
                 };
 
+                musb: usb@47400000 {
+                        status = "okay";
+
+                        control@44e10000 {
+                                status = "okay";
+                        };
+
+                        usb-phy@47401300 {
+                                status = "okay";
+                        };
+
+                        usb-phy@47401b00 {
+                                status = "okay";
+                        };
+
+                        usb@47401000 {
+                                status = "okay";
+                        };
+
+                        usb@47401800 {
+                                status = "okay";
+                                dr_mode = "host";
+                        };
+
+                        dma-controller@07402000  {
+                                status = "okay";
+                        };
+                };
+
                 i2c1: i2c@4802a000 {
                         pinctrl-names = "default";
                         pinctrl-0 = <&i2c1_pins>;
diff --git a/arch/arm/boot/dts/am335x-evmsk.dts b/arch/arm/boot/dts/am335x-evmsk.dts
index 0c8ad173d2b0..4f339fa91c57 100644
--- a/arch/arm/boot/dts/am335x-evmsk.dts
+++ b/arch/arm/boot/dts/am335x-evmsk.dts
@@ -14,6 +14,7 @@
 /dts-v1/;
 
 #include "am33xx.dtsi"
+#include <dt-bindings/pwm/pwm.h>
 
 / {
         model = "TI AM335x EVM-SK";
@@ -207,6 +208,22 @@
                         };
                 };
 
+                musb: usb@47400000 {
+                        status = "okay";
+
+                        control@44e10000 {
+                                status = "okay";
+                        };
+
+                        usb-phy@47401300 {
+                                status = "okay";
+                        };
+
+                        usb@47401000 {
+                                status = "okay";
+                        };
+                };
+
                 epwmss2: epwmss@48304000 {
                         status = "okay";
 
@@ -298,7 +315,7 @@
 
         backlight {
                 compatible = "pwm-backlight";
-                pwms = <&ecap2 0 50000 1>;
+                pwms = <&ecap2 0 50000 PWM_POLARITY_INVERTED>;
                 brightness-levels = <0 58 61 66 75 90 125 170 255>;
                 default-brightness-level = <8>;
         };
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi
index 38b446ba1ce1..f9c5da9c7fe1 100644
--- a/arch/arm/boot/dts/am33xx.dtsi
+++ b/arch/arm/boot/dts/am33xx.dtsi
@@ -26,6 +26,10 @@
                 serial5 = &uart5;
                 d_can0 = &dcan0;
                 d_can1 = &dcan1;
+                usb0 = &usb0;
+                usb1 = &usb1;
+                phy0 = &usb0_phy;
+                phy1 = &usb1_phy;
         };
 
         cpus {
@@ -333,21 +337,132 @@
                         status = "disabled";
                 };
 
-                usb@47400000 {
-                        compatible = "ti,musb-am33xx";
-                        reg = <0x47400000 0x1000        /* usbss */
-                               0x47401000 0x800         /* musb instance 0 */
-                               0x47401800 0x800>;       /* musb instance 1 */
-                        interrupts = <17                /* usbss */
-                                      18                /* musb instance 0 */
-                                      19>;              /* musb instance 1 */
-                        multipoint = <1>;
-                        num-eps = <16>;
-                        ram-bits = <12>;
-                        port0-mode = <3>;
-                        port1-mode = <3>;
-                        power = <250>;
+                usb: usb@47400000 {
+                        compatible = "ti,am33xx-usb";
+                        reg = <0x47400000 0x1000>;
+                        ranges;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
                         ti,hwmods = "usb_otg_hs";
+                        status = "disabled";
+
+                        ctrl_mod: control@44e10000 {
+                                compatible = "ti,am335x-usb-ctrl-module";
+                                reg = <0x44e10620 0x10
+                                        0x44e10648 0x4>;
+                                reg-names = "phy_ctrl", "wakeup";
+                                status = "disabled";
+                        };
+
+                        usb0_phy: usb-phy@47401300 {
+                                compatible = "ti,am335x-usb-phy";
+                                reg = <0x47401300 0x100>;
+                                reg-names = "phy";
+                                status = "disabled";
+                                ti,ctrl_mod = <&ctrl_mod>;
+                        };
+
+                        usb0: usb@47401000 {
+                                compatible = "ti,musb-am33xx";
+                                status = "disabled";
+                                reg = <0x47401400 0x400
+                                        0x47401000 0x200>;
+                                reg-names = "mc", "control";
+
+                                interrupts = <18>;
+                                interrupt-names = "mc";
+                                dr_mode = "otg";
+                                mentor,multipoint = <1>;
+                                mentor,num-eps = <16>;
+                                mentor,ram-bits = <12>;
+                                mentor,power = <500>;
+                                phys = <&usb0_phy>;
+
+                                dmas = <&cppi41dma  0 0 &cppi41dma  1 0
+                                        &cppi41dma  2 0 &cppi41dma  3 0
+                                        &cppi41dma  4 0 &cppi41dma  5 0
+                                        &cppi41dma  6 0 &cppi41dma  7 0
+                                        &cppi41dma  8 0 &cppi41dma  9 0
+                                        &cppi41dma 10 0 &cppi41dma 11 0
+                                        &cppi41dma 12 0 &cppi41dma 13 0
+                                        &cppi41dma 14 0 &cppi41dma  0 1
+                                        &cppi41dma  1 1 &cppi41dma  2 1
+                                        &cppi41dma  3 1 &cppi41dma  4 1
+                                        &cppi41dma  5 1 &cppi41dma  6 1
+                                        &cppi41dma  7 1 &cppi41dma  8 1
+                                        &cppi41dma  9 1 &cppi41dma 10 1
+                                        &cppi41dma 11 1 &cppi41dma 12 1
+                                        &cppi41dma 13 1 &cppi41dma 14 1>;
+                                dma-names =
+                                        "rx1", "rx2", "rx3", "rx4", "rx5", "rx6", "rx7",
+                                        "rx8", "rx9", "rx10", "rx11", "rx12", "rx13",
+                                        "rx14", "rx15",
+                                        "tx1", "tx2", "tx3", "tx4", "tx5", "tx6", "tx7",
+                                        "tx8", "tx9", "tx10", "tx11", "tx12", "tx13",
+                                        "tx14", "tx15";
+                        };
+
+                        usb1_phy: usb-phy@47401b00 {
+                                compatible = "ti,am335x-usb-phy";
+                                reg = <0x47401b00 0x100>;
+                                reg-names = "phy";
+                                status = "disabled";
+                                ti,ctrl_mod = <&ctrl_mod>;
+                        };
+
+                        usb1: usb@47401800 {
+                                compatible = "ti,musb-am33xx";
+                                status = "disabled";
+                                reg = <0x47401c00 0x400
+                                        0x47401800 0x200>;
+                                reg-names = "mc", "control";
+                                interrupts = <19>;
+                                interrupt-names = "mc";
+                                dr_mode = "otg";
+                                mentor,multipoint = <1>;
+                                mentor,num-eps = <16>;
+                                mentor,ram-bits = <12>;
+                                mentor,power = <500>;
+                                phys = <&usb1_phy>;
+
+                                dmas = <&cppi41dma 15 0 &cppi41dma 16 0
+                                        &cppi41dma 17 0 &cppi41dma 18 0
+                                        &cppi41dma 19 0 &cppi41dma 20 0
+                                        &cppi41dma 21 0 &cppi41dma 22 0
+                                        &cppi41dma 23 0 &cppi41dma 24 0
+                                        &cppi41dma 25 0 &cppi41dma 26 0
+                                        &cppi41dma 27 0 &cppi41dma 28 0
+                                        &cppi41dma 29 0 &cppi41dma 15 1
+                                        &cppi41dma 16 1 &cppi41dma 17 1
+                                        &cppi41dma 18 1 &cppi41dma 19 1
+                                        &cppi41dma 20 1 &cppi41dma 21 1
+                                        &cppi41dma 22 1 &cppi41dma 23 1
+                                        &cppi41dma 24 1 &cppi41dma 25 1
+                                        &cppi41dma 26 1 &cppi41dma 27 1
+                                        &cppi41dma 28 1 &cppi41dma 29 1>;
+                                dma-names =
+                                        "rx1", "rx2", "rx3", "rx4", "rx5", "rx6", "rx7",
+                                        "rx8", "rx9", "rx10", "rx11", "rx12", "rx13",
+                                        "rx14", "rx15",
+                                        "tx1", "tx2", "tx3", "tx4", "tx5", "tx6", "tx7",
+                                        "tx8", "tx9", "tx10", "tx11", "tx12", "tx13",
+                                        "tx14", "tx15";
+                        };
+
+                        cppi41dma: dma-controller@07402000 {
+                                compatible = "ti,am3359-cppi41";
+                                reg =  <0x47400000 0x1000
+                                        0x47402000 0x1000
+                                        0x47403000 0x1000
+                                        0x47404000 0x4000>;
+                                reg-names = "glue", "controller", "scheduler", "queuemgr";
+                                interrupts = <17>;
+                                interrupt-names = "glue";
+                                #dma-cells = <2>;
+                                #dma-channels = <30>;
+                                #dma-requests = <256>;
+                                status = "disabled";
+                        };
                 };
 
                 epwmss0: epwmss@48300000 {
diff --git a/arch/arm/boot/dts/armada-370-db.dts b/arch/arm/boot/dts/armada-370-db.dts
index beee1699d49e..90ce29dbe119 100644
--- a/arch/arm/boot/dts/armada-370-db.dts
+++ b/arch/arm/boot/dts/armada-370-db.dts
@@ -14,7 +14,7 @@
  */
 
 /dts-v1/;
-/include/ "armada-370.dtsi"
+#include "armada-370.dtsi"
 
 / {
         model = "Marvell Armada 370 Evaluation Board";
@@ -30,6 +30,9 @@
         };
 
         soc {
+                ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000
+                          MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;
+
                 internal-regs {
                         serial@12000 {
                                 clock-frequency = <200000000>;
diff --git a/arch/arm/boot/dts/armada-370-mirabox.dts b/arch/arm/boot/dts/armada-370-mirabox.dts
index 45b107763e3b..2471d9da767b 100644
--- a/arch/arm/boot/dts/armada-370-mirabox.dts
+++ b/arch/arm/boot/dts/armada-370-mirabox.dts
@@ -9,7 +9,7 @@
  */
 
 /dts-v1/;
-/include/ "armada-370.dtsi"
+#include "armada-370.dtsi"
 
 / {
         model = "Globalscale Mirabox";
@@ -25,6 +25,25 @@
         };
 
         soc {
+                ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000
+                          MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;
+
+                pcie-controller {
+                        status = "okay";
+
+                        /* Internal mini-PCIe connector */
+                        pcie@1,0 {
+                                /* Port 0, Lane 0 */
+                                status = "okay";
+                        };
+
+                        /* Connected on the PCB to a USB 3.0 XHCI controller */
+                        pcie@2,0 {
+                                /* Port 1, Lane 0 */
+                                status = "okay";
+                        };
+                };
+
                 internal-regs {
                         serial@12000 {
                                 clock-frequency = <200000000>;
@@ -120,22 +139,6 @@
                                         reg = <0x25>;
                                 };
                         };
-
-                        pcie-controller {
-                                status = "okay";
-
-                                /* Internal mini-PCIe connector */
-                                pcie@1,0 {
-                                        /* Port 0, Lane 0 */
-                                        status = "okay";
-                                };
-
-                                /* Connected on the PCB to a USB 3.0 XHCI controller */
-                                pcie@2,0 {
-                                        /* Port 1, Lane 0 */
-                                        status = "okay";
-                                };
-                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/armada-370-netgear-rn102.dts b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
new file mode 100644
index 000000000000..05e4485a8225
--- /dev/null
+++ b/arch/arm/boot/dts/armada-370-netgear-rn102.dts
@@ -0,0 +1,179 @@
+/*
+ * Device Tree file for NETGEAR ReadyNAS 102
+ *
+ * Copyright (C) 2013, Arnaud EBALARD <arno@natisbad.org>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+/dts-v1/;
+
+#include "armada-370.dtsi"
+
+/ {
+        model = "NETGEAR ReadyNAS 102";
+        compatible = "netgear,readynas-102", "marvell,armada370", "marvell,armada-370-xp";
+
+        chosen {
+                bootargs = "console=ttyS0,115200 earlyprintk";
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x20000000>; /* 512 MB */
+        };
+
+        soc {
+                internal-regs {
+                        serial@12000 {
+                                clock-frequency = <200000000>;
+                                status = "okay";
+                        };
+
+                        sata@a0000 {
+                                nr-ports = <2>;
+                                status = "okay";
+                        };
+
+                        pinctrl {
+                                power_led_pin: power-led-pin {
+                                        marvell,pins = "mpp57";
+                                        marvell,function = "gpio";
+                                };
+                                sata1_led_pin: sata1-led-pin {
+                                        marvell,pins = "mpp15";
+                                        marvell,function = "gpio";
+                                };
+
+                                sata2_led_pin: sata2-led-pin {
+                                        marvell,pins = "mpp14";
+                                        marvell,function = "gpio";
+                                };
+
+                                backup_led_pin: backup-led-pin {
+                                        marvell,pins = "mpp56";
+                                        marvell,function = "gpio";
+                                };
+                        };
+
+                        mdio {
+                                phy0: ethernet-phy@0 {
+                                        reg = <0>;
+                                };
+                        };
+
+                        ethernet@74000 {
+                                status = "okay";
+                                phy = <&phy0>;
+                                phy-mode = "rgmii-id";
+                        };
+
+                        usb@50000 {
+                                status = "okay";
+                        };
+
+                        i2c@11000 {
+                                compatible = "marvell,mv64xxx-i2c";
+                                clock-frequency = <100000>;
+                                status = "okay";
+
+                                g762: g762@3e {
+                                        compatible = "gmt,g762";
+                                        reg = <0x3e>;
+                                        clocks = <&g762_clk>; /* input clock */
+                                        fan_gear_mode = <0>;
+                                        fan_startv = <1>;
+                                        pwm_polarity = <0>;
+                                };
+                        };
+
+                        pcie-controller {
+                                status = "okay";
+
+                                /* Connected to Marvell SATA controller */
+                                pcie@1,0 {
+                                        /* Port 0, Lane 0 */
+                                        status = "okay";
+                                };
+
+                                /* Connected to FL1009 USB 3.0 controller */
+                                pcie@2,0 {
+                                        /* Port 1, Lane 0 */
+                                        status = "okay";
+                                };
+                        };
+                };
+        };
+
+        clocks {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               g762_clk: fixedclk {
+                         compatible = "fixed-clock";
+                         #clock-cells = <0>;
+                         clock-frequency = <8192>;
+               };
+        };
+
+        gpio_leds {
+                compatible = "gpio-leds";
+                pinctrl-0 = < &power_led_pin
+                              &sata1_led_pin
+                              &sata2_led_pin
+                              &backup_led_pin >;
+                pinctrl-names = "default";
+
+                blue_power_led {
+                        label = "rn102:blue:pwr";
+                        gpios = <&gpio1 25 1>;  /* GPIO 57 Active Low */
+                        linux,default-trigger = "heartbeat";
+                };
+
+                green_sata1_led {
+                        label = "rn102:green:sata1";
+                        gpios = <&gpio0 15 1>;  /* GPIO 15 Active Low */
+                        default-state = "on";
+                };
+
+                green_sata2_led {
+                        label = "rn102:green:sata2";
+                        gpios = <&gpio0 14 1>;   /* GPIO 14 Active Low */
+                        default-state = "on";
+                };
+
+                green_backup_led {
+                        label = "rn102:green:backup";
+                        gpios = <&gpio1 24 1>;   /* GPIO 56 Active Low */
+                        default-state = "on";
+                };
+        };
+
+        gpio_keys {
+                compatible = "gpio-keys";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                button@1 {
+                        label = "Power Button";
+                        linux,code = <116>;     /* KEY_POWER */
+                        gpios = <&gpio1 30 1>;
+                };
+
+                button@2 {
+                        label = "Reset Button";
+                        linux,code = <0x198>;   /* KEY_RESTART */
+                        gpios = <&gpio0 6 1>;
+                };
+
+                button@3 {
+                        label = "Backup Button";
+                        linux,code = <133>;     /* KEY_COPY */
+                        gpios = <&gpio1 26 1>;
+                };
+        };
+
+};
diff --git a/arch/arm/boot/dts/armada-370-rd.dts b/arch/arm/boot/dts/armada-370-rd.dts
index a3a2fedb8726..f81810a59629 100644
--- a/arch/arm/boot/dts/armada-370-rd.dts
+++ b/arch/arm/boot/dts/armada-370-rd.dts
@@ -12,7 +12,7 @@
  */
 
 /dts-v1/;
-/include/ "armada-370.dtsi"
+#include "armada-370.dtsi"
 
 / {
         model = "Marvell Armada 370 Reference Design";
@@ -28,6 +28,25 @@
         };
 
         soc {
+                ranges = <MBUS_ID(0xf0, 0x01) 0 0xd0000000 0x100000
+                          MBUS_ID(0x01, 0xe0) 0 0xfff00000 0x100000>;
+
+                pcie-controller {
+                        status = "okay";
+
+                        /* Internal mini-PCIe connector */
+                        pcie@1,0 {
+                                /* Port 0, Lane 0 */
+                                status = "okay";
+                        };
+
+                        /* Internal mini-PCIe connector */
+                        pcie@2,0 {
+                                /* Port 1, Lane 0 */
+                                status = "okay";
+                        };
+                };
+
                 internal-regs {
                         serial@12000 {
                                 clock-frequency = <200000000>;
@@ -85,22 +104,6 @@
                                         gpios = <&gpio0 6 1>;
                                 };
                         };
-
-                        pcie-controller {
-                                status = "okay";
-
-                                /* Internal mini-PCIe connector */
-                                pcie@1,0 {
-                                        /* Port 0, Lane 0 */
-                                        status = "okay";
-                                };
-
-                                /* Internal mini-PCIe connector */
-                                pcie@2,0 {
-                                        /* Port 1, Lane 0 */
-                                        status = "okay";
-                                };
-                        };
                 };
         };
  };
diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 90b117624abb..1de2dae0fdae 100644
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -18,6 +18,8 @@
 
 /include/ "skeleton64.dtsi"
 
+#define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))
+
 / {
         model = "Marvell Armada 370 and XP SoC";
         compatible = "marvell,armada-370-xp";
@@ -38,18 +40,73 @@
         };
 
         soc {
-                #address-cells = <1>;
+                #address-cells = <2>;
                 #size-cells = <1>;
-                compatible = "simple-bus";
+                controller = <&mbusc>;
                 interrupt-parent = <&mpic>;
-                ranges = <0          0 0xd0000000 0x0100000 /* internal registers */
-                          0xe0000000 0 0xe0000000 0x8100000 /* PCIe */>;
+                pcie-mem-aperture = <0xe0000000 0x8000000>;
+                pcie-io-aperture  = <0xe8000000 0x100000>;
+
+                devbus-bootcs {
+                        compatible = "marvell,mvebu-devbus";
+                        reg = <MBUS_ID(0xf0, 0x01) 0x10400 0x8>;
+                        ranges = <0 MBUS_ID(0x01, 0x2f) 0 0xffffffff>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        clocks = <&coreclk 0>;
+                        status = "disabled";
+                };
+
+                devbus-cs0 {
+                        compatible = "marvell,mvebu-devbus";
+                        reg = <MBUS_ID(0xf0, 0x01) 0x10408 0x8>;
+                        ranges = <0 MBUS_ID(0x01, 0x3e) 0 0xffffffff>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        clocks = <&coreclk 0>;
+                        status = "disabled";
+                };
+
+                devbus-cs1 {
+                        compatible = "marvell,mvebu-devbus";
+                        reg = <MBUS_ID(0xf0, 0x01) 0x10410 0x8>;
+                        ranges = <0 MBUS_ID(0x01, 0x3d) 0 0xffffffff>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        clocks = <&coreclk 0>;
+                        status = "disabled";
+                };
+
+                devbus-cs2 {
+                        compatible = "marvell,mvebu-devbus";
+                        reg = <MBUS_ID(0xf0, 0x01) 0x10418 0x8>;
+                        ranges = <0 MBUS_ID(0x01, 0x3b) 0 0xffffffff>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        clocks = <&coreclk 0>;
+                        status = "disabled";
+                };
+
+                devbus-cs3 {
+                        compatible = "marvell,mvebu-devbus";
+                        reg = <MBUS_ID(0xf0, 0x01) 0x10420 0x8>;
+                        ranges = <0 MBUS_ID(0x01, 0x37) 0 0xffffffff>;
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        clocks = <&coreclk 0>;
+                        status = "disabled";
+                };
 
                 internal-regs {
                         compatible = "simple-bus";
                         #address-cells = <1>;
                         #size-cells = <1>;
-                        ranges;
+                        ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>;
+
+                        mbusc: mbus-controller@20000 {
+                                compatible = "marvell,mbus-controller";
+                                reg = <0x20000 0x100>, <0x20180 0x20>;
+                        };
 
                         mpic: interrupt-controller@20000 {
                                 compatible = "marvell,mpic";
@@ -81,10 +138,8 @@
                         };
 
                         timer@20300 {
-                                compatible = "marvell,armada-370-xp-timer";
                                 reg = <0x20300 0x30>, <0x21040 0x30>;
                                 interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
-                                clocks = <&coreclk 2>;
                         };
 
                         sata@a0000 {
@@ -195,50 +250,6 @@
                                 status = "disabled";
                         };
 
-                        devbus-bootcs@10400 {
-                                compatible = "marvell,mvebu-devbus";
-                                reg = <0x10400 0x8>;
-                                #address-cells = <1>;
-                                #size-cells = <1>;
-                                clocks = <&coreclk 0>;
-                                status = "disabled";
-                        };
-
-                        devbus-cs0@10408 {
-                                compatible = "marvell,mvebu-devbus";
-                                reg = <0x10408 0x8>;
-                                #address-cells = <1>;
-                                #size-cells = <1>;
-                                clocks = <&coreclk 0>;
-                                status = "disabled";
-                        };
-
-                        devbus-cs1@10410 {
-                                compatible = "marvell,mvebu-devbus";
-                                reg = <0x10410 0x8>;
-                                #address-cells = <1>;
-                                #size-cells = <1>;
-                                clocks = <&coreclk 0>;
-                                status = "disabled";
-                        };
-
-                        devbus-cs2@10418 {
-                                compatible = "marvell,mvebu-devbus";
-                                reg = <0x10418 0x8>;
-                                #address-cells = <1>;
-                                #size-cells = <1>;
-                                clocks = <&coreclk 0>;
-                                status = "disabled";
-                        };
-
-                        devbus-cs3@10420 {
-                                compatible = "marvell,mvebu-devbus";
-                                reg = <0x10420 0x8>;
-                                #address-cells = <1>;
-                                #size-cells = <1>;
-                                clocks = <&coreclk 0>;
-                                status = "disabled";
-                        };
                 };
         };
  };
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi
index fa3dfc6b4c6a..e134d7a90c9a 100644
--- a/arch/arm/boot/dts/armada-370.dtsi
+++ b/arch/arm/boot/dts/armada-370.dtsi
@@ -15,7 +15,7 @@
  * common to all Armada SoCs.
  */
 
-/include/ "armada-370-xp.dtsi"
+#include "armada-370-xp.dtsi"
 /include/ "skeleton.dtsi"
 
 / {
@@ -29,8 +29,66 @@
         };
 
         soc {
-                ranges = <0          0xd0000000 0x0100000 /* internal registers */
-                          0xe0000000 0xe0000000 0x8100000 /* PCIe */>;
+                compatible = "marvell,armada370-mbus", "simple-bus";
+
+                bootrom {
+                        compatible = "marvell,bootrom";
+                        reg = <MBUS_ID(0x01, 0xe0) 0 0x100000>;
+                };
+
+                pcie-controller {
+                        compatible = "marvell,armada-370-pcie";
+                        status = "disabled";
+                        device_type = "pci";
+
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+
+                        bus-range = <0x00 0xff>;
+
+                        ranges =
+                               <0x82000000 0 0x40000 MBUS_ID(0xf0, 0x01) 0x40000 0 0x00002000
+                                0x82000000 0 0x80000 MBUS_ID(0xf0, 0x01) 0x80000 0 0x00002000
+                                0x82000000 0x1 0     MBUS_ID(0x04, 0xe8) 0       1 0 /* Port 0.0 MEM */
+                                0x81000000 0x1 0     MBUS_ID(0x04, 0xe0) 0       1 0 /* Port 0.0 IO  */
+                                0x82000000 0x2 0     MBUS_ID(0x08, 0xe8) 0       1 0 /* Port 1.0 MEM */
+                                0x81000000 0x2 0     MBUS_ID(0x08, 0xe0) 0       1 0 /* Port 1.0 IO  */>;
+
+                        pcie@1,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
+                                reg = <0x0800 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0
+                                          0x81000000 0 0 0x81000000 0x1 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 58>;
+                                marvell,pcie-port = <0>;
+                                marvell,pcie-lane = <0>;
+                                clocks = <&gateclk 5>;
+                                status = "disabled";
+                        };
+
+                        pcie@2,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
+                                reg = <0x1000 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x2 0 1 0
+                                          0x81000000 0 0 0x81000000 0x2 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 62>;
+                                marvell,pcie-port = <1>;
+                                marvell,pcie-lane = <0>;
+                                clocks = <&gateclk 9>;
+                                status = "disabled";
+                        };
+                };
+
                 internal-regs {
                         system-controller@18200 {
                                 compatible = "marvell,armada-370-xp-system-controller";
@@ -78,7 +136,7 @@
                                 gpio-controller;
                                 #gpio-cells = <2>;
                                 interrupt-controller;
-                                #interrupts-cells = <2>;
+                                #interrupt-cells = <2>;
                                 interrupts = <82>, <83>, <84>, <85>;
                         };
 
@@ -89,7 +147,7 @@
                                 gpio-controller;
                                 #gpio-cells = <2>;
                                 interrupt-controller;
-                                #interrupts-cells = <2>;
+                                #interrupt-cells = <2>;
                                 interrupts = <87>, <88>, <89>, <90>;
                         };
 
@@ -100,10 +158,15 @@
                                 gpio-controller;
                                 #gpio-cells = <2>;
                                 interrupt-controller;
-                                #interrupts-cells = <2>;
+                                #interrupt-cells = <2>;
                                 interrupts = <91>;
                         };
 
+                        timer@20300 {
+                                compatible = "marvell,armada-370-timer";
+                                clocks = <&coreclk 2>;
+                        };
+
                         coreclk: mvebu-sar@18230 {
                                 compatible = "marvell,armada-370-core-clock";
                                 reg = <0x18230 0x08>;
@@ -169,54 +232,6 @@
                                         0x18304 0x4>;
                                 status = "okay";
                         };
-
-                        pcie-controller {
-                                compatible = "marvell,armada-370-pcie";
-                                status = "disabled";
-                                device_type = "pci";
-
-                                #address-cells = <3>;
-                                #size-cells = <2>;
-
-                                bus-range = <0x00 0xff>;
-
-                                ranges = <0x82000000 0 0x40000 0x40000 0 0x00002000   /* Port 0.0 registers */
-                                        0x82000000 0 0x80000 0x80000 0 0x00002000   /* Port 1.0 registers */
-                                        0x82000000 0 0xe0000000 0xe0000000 0 0x08000000   /* non-prefetchable memory */
-                                        0x81000000 0 0          0xe8000000 0 0x00100000>; /* downstream I/O */
-
-                                pcie@1,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
-                                        reg = <0x0800 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 58>;
-                                        marvell,pcie-port = <0>;
-                                        marvell,pcie-lane = <0>;
-                                        clocks = <&gateclk 5>;
-                                        status = "disabled";
-                                };
-
-                                pcie@2,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
-                                        reg = <0x1000 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 62>;
-                                        marvell,pcie-port = <1>;
-                                        marvell,pcie-lane = <0>;
-                                        clocks = <&gateclk 9>;
-                                        status = "disabled";
-                                };
-                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/armada-xp-axpwifiap.dts b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
new file mode 100644
index 000000000000..c5fe57269f5a
--- /dev/null
+++ b/arch/arm/boot/dts/armada-xp-axpwifiap.dts
@@ -0,0 +1,164 @@
+/*
+ * Device Tree file for Marvell RD-AXPWiFiAP.
+ *
+ * Note: this board is shipped with a new generation boot loader that
+ * remaps internal registers at 0xf1000000. Therefore, if earlyprintk
+ * is used, the CONFIG_DEBUG_MVEBU_UART_ALTERNATE option should be
+ * used.
+ *
+ * Copyright (C) 2013 Marvell
+ *
+ * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+/dts-v1/;
+#include "armada-xp-mv78230.dtsi"
+
+/ {
+        model = "Marvell RD-AXPWiFiAP";
+        compatible = "marvell,rd-axpwifiap", "marvell,armadaxp-mv78230", "marvell,armadaxp", "marvell,armada-370-xp";
+
+        chosen {
+                bootargs = "console=ttyS0,115200 earlyprintk";
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x00000000 0x00000000 0x40000000>; /* 1GB */
+        };
+
+        soc {
+                ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xf1000000 0x100000
+                          MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000>;
+
+                pcie-controller {
+                        status = "okay";
+
+                        /* First mini-PCIe port */
+                        pcie@1,0 {
+                                /* Port 0, Lane 0 */
+                                status = "okay";
+                        };
+
+                        /* Second mini-PCIe port */
+                        pcie@2,0 {
+                                /* Port 0, Lane 1 */
+                                status = "okay";
+                        };
+
+                        /* Renesas uPD720202 USB 3.0 controller */
+                        pcie@3,0 {
+                                /* Port 0, Lane 3 */
+                                status = "okay";
+                        };
+                };
+
+                internal-regs {
+                        pinctrl {
+                                pinctrl-0 = <&pmx_phy_int>;
+                                pinctrl-names = "default";
+
+                                pmx_ge0: pmx-ge0 {
+                                        marvell,pins = "mpp0", "mpp1", "mpp2", "mpp3",
+                                                       "mpp4", "mpp5", "mpp6", "mpp7",
+                                                       "mpp8", "mpp9", "mpp10", "mpp11";
+                                        marvell,function = "ge0";
+                                };
+
+                                pmx_ge1: pmx-ge1 {
+                                        marvell,pins = "mpp12", "mpp13", "mpp14", "mpp15",
+                                                       "mpp16", "mpp17", "mpp18", "mpp19",
+                                                       "mpp20", "mpp21", "mpp22", "mpp23";
+                                        marvell,function = "ge1";
+                                };
+
+                                pmx_keys: pmx-keys {
+                                        marvell,pins = "mpp33";
+                                        marvell,function = "gpio";
+                                };
+
+                                pmx_spi: pmx-spi {
+                                        marvell,pins = "mpp36", "mpp37", "mpp38", "mpp39";
+                                        marvell,function = "spi";
+                                };
+
+                                pmx_phy_int: pmx-phy-int {
+                                        marvell,pins = "mpp32";
+                                        marvell,function = "gpio";
+                                };
+                        };
+
+                        serial@12000 {
+                                clock-frequency = <250000000>;
+                                status = "okay";
+                        };
+
+                        serial@12100 {
+                                clock-frequency = <250000000>;
+                                status = "okay";
+                        };
+
+                        sata@a0000 {
+                                nr-ports = <1>;
+                                status = "okay";
+                        };
+
+                        mdio {
+                                phy0: ethernet-phy@0 {
+                                        reg = <0>;
+                                };
+
+                                phy1: ethernet-phy@1 {
+                                        reg = <1>;
+                                };
+                        };
+
+                        ethernet@70000 {
+                                pinctrl-0 = <&pmx_ge0>;
+                                pinctrl-names = "default";
+                                status = "okay";
+                                phy = <&phy0>;
+                                phy-mode = "rgmii-id";
+                        };
+                        ethernet@74000 {
+                                pinctrl-0 = <&pmx_ge1>;
+                                pinctrl-names = "default";
+                                status = "okay";
+                                phy = <&phy1>;
+                                phy-mode = "rgmii-id";
+                        };
+
+                        spi0: spi@10600 {
+                                status = "okay";
+                                pinctrl-0 = <&pmx_spi>;
+                                pinctrl-names = "default";
+
+                                spi-flash@0 {
+                                        #address-cells = <1>;
+                                        #size-cells = <1>;
+                                        compatible = "n25q128a13";
+                                        reg = <0>; /* Chip select 0 */
+                                        spi-max-frequency = <108000000>;
+                                };
+                        };
+                };
+        };
+
+        gpio_keys {
+                compatible = "gpio-keys";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                pinctrl-0 = <&pmx_keys>;
+                pinctrl-names = "default";
+
+                button@1 {
+                        label = "Factory Reset Button";
+                        linux,code = <141>; /* KEY_SETUP */
+                        gpios = <&gpio1 1 1>;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/armada-xp-db.dts b/arch/arm/boot/dts/armada-xp-db.dts
index e28e68ff864d..bcf6d79a57ec 100644
--- a/arch/arm/boot/dts/armada-xp-db.dts
+++ b/arch/arm/boot/dts/armada-xp-db.dts
@@ -14,7 +14,7 @@
  */
 
 /dts-v1/;
-/include/ "armada-xp-mv78460.dtsi"
+#include "armada-xp-mv78460.dtsi"
 
 / {
         model = "Marvell Armada XP Evaluation Board";
@@ -30,9 +30,70 @@
         };
 
         soc {
-                ranges = <0          0 0xd0000000 0x100000      /* Internal registers 1MiB */
-                          0xe0000000 0 0xe0000000 0x8100000     /* PCIe */
-                          0xf0000000 0 0xf0000000 0x1000000>;   /* Device Bus, NOR 16MiB   */
+                ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
+                          MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
+                          MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000>;
+
+                devbus-bootcs {
+                        status = "okay";
+
+                        /* Device Bus parameters are required */
+
+                        /* Read parameters */
+                        devbus,bus-width    = <8>;
+                        devbus,turn-off-ps  = <60000>;
+                        devbus,badr-skew-ps = <0>;
+                        devbus,acc-first-ps = <124000>;
+                        devbus,acc-next-ps  = <248000>;
+                        devbus,rd-setup-ps  = <0>;
+                        devbus,rd-hold-ps   = <0>;
+
+                        /* Write parameters */
+                        devbus,sync-enable = <0>;
+                        devbus,wr-high-ps  = <60000>;
+                        devbus,wr-low-ps   = <60000>;
+                        devbus,ale-wr-ps   = <60000>;
+
+                        /* NOR 16 MiB */
+                        nor@0 {
+                                compatible = "cfi-flash";
+                                reg = <0 0x1000000>;
+                                bank-width = <2>;
+                        };
+                };
+
+                pcie-controller {
+                        status = "okay";
+
+                        /*
+                         * All 6 slots are physically present as
+                         * standard PCIe slots on the board.
+                         */
+                        pcie@1,0 {
+                                /* Port 0, Lane 0 */
+                                status = "okay";
+                        };
+                        pcie@2,0 {
+                                /* Port 0, Lane 1 */
+                                status = "okay";
+                        };
+                        pcie@3,0 {
+                                /* Port 0, Lane 2 */
+                                status = "okay";
+                        };
+                        pcie@4,0 {
+                                /* Port 0, Lane 3 */
+                                status = "okay";
+                        };
+                        pcie@9,0 {
+                                /* Port 2, Lane 0 */
+                                status = "okay";
+                        };
+                        pcie@10,0 {
+                                /* Port 3, Lane 0 */
+                                status = "okay";
+                        };
+                };
 
                 internal-regs {
                         serial@12000 {
@@ -127,68 +188,6 @@
                                         spi-max-frequency = <20000000>;
                                 };
                         };
-
-                        pcie-controller {
-                                status = "okay";
-
-                                /*
-                                 * All 6 slots are physically present as
-                                 * standard PCIe slots on the board.
-                                 */
-                                pcie@1,0 {
-                                        /* Port 0, Lane 0 */
-                                        status = "okay";
-                                };
-                                pcie@2,0 {
-                                        /* Port 0, Lane 1 */
-                                        status = "okay";
-                                };
-                                pcie@3,0 {
-                                        /* Port 0, Lane 2 */
-                                        status = "okay";
-                                };
-                                pcie@4,0 {
-                                        /* Port 0, Lane 3 */
-                                        status = "okay";
-                                };
-                                pcie@9,0 {
-                                        /* Port 2, Lane 0 */
-                                        status = "okay";
-                                };
-                                pcie@10,0 {
-                                        /* Port 3, Lane 0 */
-                                        status = "okay";
-                                };
-                        };
-
-                        devbus-bootcs@10400 {
-                                status = "okay";
-                                ranges = <0 0xf0000000 0x1000000>;
-
-                                /* Device Bus parameters are required */
-
-                                /* Read parameters */
-                                devbus,bus-width    = <8>;
-                                devbus,turn-off-ps  = <60000>;
-                                devbus,badr-skew-ps = <0>;
-                                devbus,acc-first-ps = <124000>;
-                                devbus,acc-next-ps  = <248000>;
-                                devbus,rd-setup-ps  = <0>;
-                                devbus,rd-hold-ps   = <0>;
-
-                                /* Write parameters */
-                                devbus,sync-enable = <0>;
-                                devbus,wr-high-ps  = <60000>;
-                                devbus,wr-low-ps   = <60000>;
-                                devbus,ale-wr-ps   = <60000>;
-
-                                /* NOR 16 MiB */
-                                nor@0 {
-                                        compatible = "cfi-flash";
-                                        reg = <0 0x1000000>;
-                                        bank-width = <2>;
-                                };
-                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/armada-xp-gp.dts b/arch/arm/boot/dts/armada-xp-gp.dts
index c87b2de29c30..2298e4a910e2 100644
--- a/arch/arm/boot/dts/armada-xp-gp.dts
+++ b/arch/arm/boot/dts/armada-xp-gp.dts
@@ -14,7 +14,7 @@
  */
 
 /dts-v1/;
-/include/ "armada-xp-mv78460.dtsi"
+#include "armada-xp-mv78460.dtsi"
 
 / {
         model = "Marvell Armada XP Development Board DB-MV784MP-GP";
@@ -39,9 +39,58 @@
         };
 
         soc {
-                ranges = <0          0 0xd0000000 0x100000  /* Internal registers 1MiB */
-                          0xe0000000 0 0xe0000000 0x8100000 /* PCIe */
-                          0xf0000000 0 0xf0000000 0x1000000 /* Device Bus, NOR 16MiB  */>;
+                ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
+                          MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
+                          MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x1000000>;
+
+                devbus-bootcs {
+                        status = "okay";
+
+                        /* Device Bus parameters are required */
+
+                        /* Read parameters */
+                        devbus,bus-width    = <8>;
+                        devbus,turn-off-ps  = <60000>;
+                        devbus,badr-skew-ps = <0>;
+                        devbus,acc-first-ps = <124000>;
+                        devbus,acc-next-ps  = <248000>;
+                        devbus,rd-setup-ps  = <0>;
+                        devbus,rd-hold-ps   = <0>;
+
+                        /* Write parameters */
+                        devbus,sync-enable = <0>;
+                        devbus,wr-high-ps  = <60000>;
+                        devbus,wr-low-ps   = <60000>;
+                        devbus,ale-wr-ps   = <60000>;
+
+                        /* NOR 16 MiB */
+                        nor@0 {
+                                compatible = "cfi-flash";
+                                reg = <0 0x1000000>;
+                                bank-width = <2>;
+                        };
+                };
+
+                pcie-controller {
+                        status = "okay";
+
+                        /*
+                         * The 3 slots are physically present as
+                         * standard PCIe slots on the board.
+                         */
+                        pcie@1,0 {
+                                /* Port 0, Lane 0 */
+                                status = "okay";
+                        };
+                        pcie@9,0 {
+                                /* Port 2, Lane 0 */
+                                status = "okay";
+                        };
+                        pcie@10,0 {
+                                /* Port 3, Lane 0 */
+                                status = "okay";
+                        };
+                };
 
                 internal-regs {
                         serial@12000 {
@@ -126,56 +175,6 @@
                                         spi-max-frequency = <108000000>;
                                 };
                         };
-
-                        devbus-bootcs@10400 {
-                                status = "okay";
-                                ranges = <0 0xf0000000 0x1000000>; /* @addr 0xf000000, size 0x1000000 */
-
-                                /* Device Bus parameters are required */
-
-                                /* Read parameters */
-                                devbus,bus-width    = <8>;
-                                devbus,turn-off-ps  = <60000>;
-                                devbus,badr-skew-ps = <0>;
-                                devbus,acc-first-ps = <124000>;
-                                devbus,acc-next-ps  = <248000>;
-                                devbus,rd-setup-ps  = <0>;
-                                devbus,rd-hold-ps   = <0>;
-
-                                /* Write parameters */
-                                devbus,sync-enable = <0>;
-                                devbus,wr-high-ps  = <60000>;
-                                devbus,wr-low-ps   = <60000>;
-                                devbus,ale-wr-ps   = <60000>;
-
-                                /* NOR 16 MiB */
-                                nor@0 {
-                                        compatible = "cfi-flash";
-                                        reg = <0 0x1000000>;
-                                        bank-width = <2>;
-                                };
-                        };
-
-                        pcie-controller {
-                                status = "okay";
-
-                                /*
-                                 * The 3 slots are physically present as
-                                 * standard PCIe slots on the board.
-                                 */
-                                pcie@1,0 {
-                                        /* Port 0, Lane 0 */
-                                        status = "okay";
-                                };
-                                pcie@9,0 {
-                                        /* Port 2, Lane 0 */
-                                        status = "okay";
-                                };
-                                pcie@10,0 {
-                                        /* Port 3, Lane 0 */
-                                        status = "okay";
-                                };
-                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/armada-xp-mv78230.dtsi b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
index f8eaa383e07f..0358a33cba48 100644
--- a/arch/arm/boot/dts/armada-xp-mv78230.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78230.dtsi
@@ -13,7 +13,7 @@
  * common to all Armada XP SoCs.
  */
 
-/include/ "armada-xp.dtsi"
+#include "armada-xp.dtsi"
 
 / {
         model = "Marvell Armada XP MV78230 SoC";
@@ -44,6 +44,124 @@
         };
 
         soc {
+                /*
+                 * MV78230 has 2 PCIe units Gen2.0: One unit can be
+                 * configured as x4 or quad x1 lanes. One unit is
+                 * x4/x1.
+                 */
+                pcie-controller {
+                        compatible = "marvell,armada-xp-pcie";
+                        status = "disabled";
+                        device_type = "pci";
+
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+
+                        bus-range = <0x00 0xff>;
+
+                        ranges =
+                               <0x82000000 0 0x40000 MBUS_ID(0xf0, 0x01) 0x40000 0 0x00002000   /* Port 0.0 registers */
+                                0x82000000 0 0x42000 MBUS_ID(0xf0, 0x01) 0x42000 0 0x00002000   /* Port 2.0 registers */
+                                0x82000000 0 0x44000 MBUS_ID(0xf0, 0x01) 0x44000 0 0x00002000   /* Port 0.1 registers */
+                                0x82000000 0 0x48000 MBUS_ID(0xf0, 0x01) 0x48000 0 0x00002000   /* Port 0.2 registers */
+                                0x82000000 0 0x4c000 MBUS_ID(0xf0, 0x01) 0x4c000 0 0x00002000   /* Port 0.3 registers */
+                                0x82000000 0x1 0       MBUS_ID(0x04, 0xe8) 0 1 0 /* Port 0.0 MEM */
+                                0x81000000 0x1 0       MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0.0 IO  */
+                                0x82000000 0x2 0       MBUS_ID(0x04, 0xd8) 0 1 0 /* Port 0.1 MEM */
+                                0x81000000 0x2 0       MBUS_ID(0x04, 0xd0) 0 1 0 /* Port 0.1 IO  */
+                                0x82000000 0x3 0       MBUS_ID(0x04, 0xb8) 0 1 0 /* Port 0.2 MEM */
+                                0x81000000 0x3 0       MBUS_ID(0x04, 0xb0) 0 1 0 /* Port 0.2 IO  */
+                                0x82000000 0x4 0       MBUS_ID(0x04, 0x78) 0 1 0 /* Port 0.3 MEM */
+                                0x81000000 0x4 0       MBUS_ID(0x04, 0x70) 0 1 0 /* Port 0.3 IO  */
+                                0x82000000 0x9 0       MBUS_ID(0x04, 0xf8) 0 1 0 /* Port 2.0 MEM */
+                                0x81000000 0x9 0       MBUS_ID(0x04, 0xf0) 0 1 0 /* Port 2.0 IO  */>;
+
+                        pcie@1,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
+                                reg = <0x0800 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0
+                                          0x81000000 0 0 0x81000000 0x1 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 58>;
+                                marvell,pcie-port = <0>;
+                                marvell,pcie-lane = <0>;
+                                clocks = <&gateclk 5>;
+                                status = "disabled";
+                        };
+
+                        pcie@2,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
+                                reg = <0x1000 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x2 0 1 0
+                                          0x81000000 0 0 0x81000000 0x2 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 59>;
+                                marvell,pcie-port = <0>;
+                                marvell,pcie-lane = <1>;
+                                clocks = <&gateclk 6>;
+                                status = "disabled";
+                        };
+
+                        pcie@3,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
+                                reg = <0x1800 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x3 0 1 0
+                                          0x81000000 0 0 0x81000000 0x3 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 60>;
+                                marvell,pcie-port = <0>;
+                                marvell,pcie-lane = <2>;
+                                clocks = <&gateclk 7>;
+                                status = "disabled";
+                        };
+
+                        pcie@4,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>;
+                                reg = <0x2000 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x4 0 1 0
+                                          0x81000000 0 0 0x81000000 0x4 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 61>;
+                                marvell,pcie-port = <0>;
+                                marvell,pcie-lane = <3>;
+                                clocks = <&gateclk 8>;
+                                status = "disabled";
+                        };
+
+                        pcie@9,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82000800 0 0x42000 0 0x2000>;
+                                reg = <0x4800 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x9 0 1 0
+                                          0x81000000 0 0 0x81000000 0x9 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 99>;
+                                marvell,pcie-port = <2>;
+                                marvell,pcie-lane = <0>;
+                                clocks = <&gateclk 26>;
+                                status = "disabled";
+                        };
+                };
+
                 internal-regs {
                         pinctrl {
                                 compatible = "marvell,mv78230-pinctrl";
@@ -63,7 +181,7 @@
                                 gpio-controller;
                                 #gpio-cells = <2>;
                                 interrupt-controller;
-                                #interrupts-cells = <2>;
+                                #interrupt-cells = <2>;
                                 interrupts = <82>, <83>, <84>, <85>;
                         };
 
@@ -74,113 +192,9 @@
                                 gpio-controller;
                                 #gpio-cells = <2>;
                                 interrupt-controller;
-                                #interrupts-cells = <2>;
+                                #interrupt-cells = <2>;
                                 interrupts = <87>, <88>, <89>;
                         };
-
-                        /*
-                         * MV78230 has 2 PCIe units Gen2.0: One unit can be
-                         * configured as x4 or quad x1 lanes. One unit is
-                         * x4/x1.
-                         */
-                        pcie-controller {
-                                compatible = "marvell,armada-xp-pcie";
-                                status = "disabled";
-                                device_type = "pci";
-
-#address-cells = <3>;
-#size-cells = <2>;
-
-                                bus-range = <0x00 0xff>;
-
-                                ranges = <0x82000000 0 0x40000 0x40000 0 0x00002000   /* Port 0.0 registers */
-                                        0x82000000 0 0x42000 0x42000 0 0x00002000   /* Port 2.0 registers */
-                                        0x82000000 0 0x44000 0x44000 0 0x00002000   /* Port 0.1 registers */
-                                        0x82000000 0 0x48000 0x48000 0 0x00002000   /* Port 0.2 registers */
-                                        0x82000000 0 0x4c000 0x4c000 0 0x00002000   /* Port 0.3 registers */
-                                        0x82000000 0 0xe0000000 0xe0000000 0 0x08000000   /* non-prefetchable memory */
-                                        0x81000000 0 0    0xe8000000 0 0x00100000>; /* downstream I/O */
-
-                                pcie@1,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
-                                        reg = <0x0800 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 58>;
-                                        marvell,pcie-port = <0>;
-                                        marvell,pcie-lane = <0>;
-                                        clocks = <&gateclk 5>;
-                                        status = "disabled";
-                                };
-
-                                pcie@2,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
-                                        reg = <0x1000 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 59>;
-                                        marvell,pcie-port = <0>;
-                                        marvell,pcie-lane = <1>;
-                                        clocks = <&gateclk 6>;
-                                        status = "disabled";
-                                };
-
-                                pcie@3,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
-                                        reg = <0x1800 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 60>;
-                                        marvell,pcie-port = <0>;
-                                        marvell,pcie-lane = <2>;
-                                        clocks = <&gateclk 7>;
-                                        status = "disabled";
-                                };
-
-                                pcie@4,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>;
-                                        reg = <0x2000 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 61>;
-                                        marvell,pcie-port = <0>;
-                                        marvell,pcie-lane = <3>;
-                                        clocks = <&gateclk 8>;
-                                        status = "disabled";
-                                };
-
-                                pcie@9,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82000800 0 0x42000 0 0x2000>;
-                                        reg = <0x4800 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 99>;
-                                        marvell,pcie-port = <2>;
-                                        marvell,pcie-lane = <0>;
-                                        clocks = <&gateclk 26>;
-                                        status = "disabled";
-                                };
-                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/armada-xp-mv78260.dtsi b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
index 2d9335da210c..0e82c5062243 100644
--- a/arch/arm/boot/dts/armada-xp-mv78260.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78260.dtsi
@@ -13,7 +13,7 @@
  * common to all Armada XP SoCs.
  */
 
-/include/ "armada-xp.dtsi"
+#include "armada-xp.dtsi"
 
 / {
         model = "Marvell Armada XP MV78260 SoC";
@@ -45,6 +45,145 @@
         };
 
         soc {
+                /*
+                 * MV78260 has 3 PCIe units Gen2.0: Two units can be
+                 * configured as x4 or quad x1 lanes. One unit is
+                 * x4/x1.
+                 */
+                pcie-controller {
+                        compatible = "marvell,armada-xp-pcie";
+                        status = "disabled";
+                        device_type = "pci";
+
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+
+                        bus-range = <0x00 0xff>;
+
+                        ranges =
+                               <0x82000000 0 0x40000 MBUS_ID(0xf0, 0x01) 0x40000 0 0x00002000   /* Port 0.0 registers */
+                                0x82000000 0 0x42000 MBUS_ID(0xf0, 0x01) 0x42000 0 0x00002000   /* Port 2.0 registers */
+                                0x82000000 0 0x44000 MBUS_ID(0xf0, 0x01) 0x44000 0 0x00002000   /* Port 0.1 registers */
+                                0x82000000 0 0x48000 MBUS_ID(0xf0, 0x01) 0x48000 0 0x00002000   /* Port 0.2 registers */
+                                0x82000000 0 0x4c000 MBUS_ID(0xf0, 0x01) 0x4c000 0 0x00002000   /* Port 0.3 registers */
+                                0x82000000 0 0x80000 MBUS_ID(0xf0, 0x01) 0x80000 0 0x00002000   /* Port 1.0 registers */
+                                0x82000000 0 0x82000 MBUS_ID(0xf0, 0x01) 0x82000 0 0x00002000   /* Port 3.0 registers */
+                                0x82000000 0x1 0     MBUS_ID(0x04, 0xe8) 0 1 0 /* Port 0.0 MEM */
+                                0x81000000 0x1 0     MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0.0 IO  */
+                                0x82000000 0x2 0     MBUS_ID(0x04, 0xd8) 0 1 0 /* Port 0.1 MEM */
+                                0x81000000 0x2 0     MBUS_ID(0x04, 0xd0) 0 1 0 /* Port 0.1 IO  */
+                                0x82000000 0x3 0     MBUS_ID(0x04, 0xb8) 0 1 0 /* Port 0.2 MEM */
+                                0x81000000 0x3 0     MBUS_ID(0x04, 0xb0) 0 1 0 /* Port 0.2 IO  */
+                                0x82000000 0x4 0     MBUS_ID(0x04, 0x78) 0 1 0 /* Port 0.3 MEM */
+                                0x81000000 0x4 0     MBUS_ID(0x04, 0x70) 0 1 0 /* Port 0.3 IO  */
+                                0x82000000 0x9 0     MBUS_ID(0x08, 0xe8) 0 1 0 /* Port 1.0 MEM */
+                                0x81000000 0x9 0     MBUS_ID(0x08, 0xe0) 0 1 0 /* Port 1.0 IO  */
+                                0x82000000 0xa 0     MBUS_ID(0x08, 0xf8) 0 1 0 /* Port 3.0 MEM */
+                                0x81000000 0xa 0     MBUS_ID(0x08, 0xf0) 0 1 0 /* Port 3.0 IO  */>;
+
+                        pcie@1,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
+                                reg = <0x0800 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0
+                                          0x81000000 0 0 0x81000000 0x1 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 58>;
+                                marvell,pcie-port = <0>;
+                                marvell,pcie-lane = <0>;
+                                clocks = <&gateclk 5>;
+                                status = "disabled";
+                        };
+
+                        pcie@2,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
+                                reg = <0x1000 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x2 0 1 0
+                                          0x81000000 0 0 0x81000000 0x2 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 59>;
+                                marvell,pcie-port = <0>;
+                                marvell,pcie-lane = <1>;
+                                clocks = <&gateclk 6>;
+                                status = "disabled";
+                        };
+
+                        pcie@3,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
+                                reg = <0x1800 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x3 0 1 0
+                                          0x81000000 0 0 0x81000000 0x3 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 60>;
+                                marvell,pcie-port = <0>;
+                                marvell,pcie-lane = <2>;
+                                clocks = <&gateclk 7>;
+                                status = "disabled";
+                        };
+
+                        pcie@4,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>;
+                                reg = <0x2000 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x4 0 1 0
+                                          0x81000000 0 0 0x81000000 0x4 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 61>;
+                                marvell,pcie-port = <0>;
+                                marvell,pcie-lane = <3>;
+                                clocks = <&gateclk 8>;
+                                status = "disabled";
+                        };
+
+                        pcie@9,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82000800 0 0x42000 0 0x2000>;
+                                reg = <0x4800 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x9 0 1 0
+                                          0x81000000 0 0 0x81000000 0x9 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 99>;
+                                marvell,pcie-port = <2>;
+                                marvell,pcie-lane = <0>;
+                                clocks = <&gateclk 26>;
+                                status = "disabled";
+                        };
+
+                        pcie@10,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82000800 0 0x82000 0 0x2000>;
+                                reg = <0x5000 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0xa 0 1 0
+                                          0x81000000 0 0 0x81000000 0xa 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 103>;
+                                marvell,pcie-port = <3>;
+                                marvell,pcie-lane = <0>;
+                                clocks = <&gateclk 27>;
+                                status = "disabled";
+                        };
+                };
+
                 internal-regs {
                         pinctrl {
                                 compatible = "marvell,mv78260-pinctrl";
@@ -64,7 +203,7 @@
                                 gpio-controller;
                                 #gpio-cells = <2>;
                                 interrupt-controller;
-                                #interrupts-cells = <2>;
+                                #interrupt-cells = <2>;
                                 interrupts = <82>, <83>, <84>, <85>;
                         };
 
@@ -75,7 +214,7 @@
                                 gpio-controller;
                                 #gpio-cells = <2>;
                                 interrupt-controller;
-                                #interrupts-cells = <2>;
+                                #interrupt-cells = <2>;
                                 interrupts = <87>, <88>, <89>, <90>;
                         };
 
@@ -86,7 +225,7 @@
                                 gpio-controller;
                                 #gpio-cells = <2>;
                                 interrupt-controller;
-                                #interrupts-cells = <2>;
+                                #interrupt-cells = <2>;
                                 interrupts = <91>;
                         };
 
@@ -97,128 +236,6 @@
                                 clocks = <&gateclk 1>;
                                 status = "disabled";
                         };
-
-                        /*
-                         * MV78260 has 3 PCIe units Gen2.0: Two units can be
-                         * configured as x4 or quad x1 lanes. One unit is
-                         * x4/x1.
-                         */
-                        pcie-controller {
-                                compatible = "marvell,armada-xp-pcie";
-                                status = "disabled";
-                                device_type = "pci";
-
-                                #address-cells = <3>;
-                                #size-cells = <2>;
-
-                                bus-range = <0x00 0xff>;
-
-                                ranges = <0x82000000 0 0x40000 0x40000 0 0x00002000   /* Port 0.0 registers */
-                                        0x82000000 0 0x42000 0x42000 0 0x00002000   /* Port 2.0 registers */
-                                        0x82000000 0 0x44000 0x44000 0 0x00002000   /* Port 0.1 registers */
-                                        0x82000000 0 0x48000 0x48000 0 0x00002000   /* Port 0.2 registers */
-                                        0x82000000 0 0x4c000 0x4c000 0 0x00002000   /* Port 0.3 registers */
-                                        0x82000000 0 0x80000 0x80000 0 0x00002000   /* Port 1.0 registers */
-                                        0x82000000 0 0x82000 0x82000 0 0x00002000   /* Port 3.0 registers */
-                                        0x82000000 0 0xe0000000 0xe0000000 0 0x08000000   /* non-prefetchable memory */
-                                        0x81000000 0 0    0xe8000000 0 0x00100000>; /* downstream I/O */
-
-                                pcie@1,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
-                                        reg = <0x0800 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 58>;
-                                        marvell,pcie-port = <0>;
-                                        marvell,pcie-lane = <0>;
-                                        clocks = <&gateclk 5>;
-                                        status = "disabled";
-                                };
-
-                                pcie@2,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
-                                        reg = <0x1000 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 59>;
-                                        marvell,pcie-port = <0>;
-                                        marvell,pcie-lane = <1>;
-                                        clocks = <&gateclk 6>;
-                                        status = "disabled";
-                                };
-
-                                pcie@3,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
-                                        reg = <0x1800 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 60>;
-                                        marvell,pcie-port = <0>;
-                                        marvell,pcie-lane = <2>;
-                                        clocks = <&gateclk 7>;
-                                        status = "disabled";
-                                };
-
-                                pcie@4,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>;
-                                        reg = <0x2000 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 61>;
-                                        marvell,pcie-port = <0>;
-                                        marvell,pcie-lane = <3>;
-                                        clocks = <&gateclk 8>;
-                                        status = "disabled";
-                                };
-
-                                pcie@9,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82000800 0 0x42000 0 0x2000>;
-                                        reg = <0x4800 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 99>;
-                                        marvell,pcie-port = <2>;
-                                        marvell,pcie-lane = <0>;
-                                        clocks = <&gateclk 26>;
-                                        status = "disabled";
-                                };
-
-                                pcie@10,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82000800 0 0x82000 0 0x2000>;
-                                        reg = <0x5000 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 103>;
-                                        marvell,pcie-port = <3>;
-                                        marvell,pcie-lane = <0>;
-                                        clocks = <&gateclk 27>;
-                                        status = "disabled";
-                                };
-                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/armada-xp-mv78460.dtsi b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
index c7b1f4d5c1c7..e82c1b80af17 100644
--- a/arch/arm/boot/dts/armada-xp-mv78460.dtsi
+++ b/arch/arm/boot/dts/armada-xp-mv78460.dtsi
@@ -13,7 +13,7 @@
  * common to all Armada XP SoCs.
  */
 
-/include/ "armada-xp.dtsi"
+#include "armada-xp.dtsi"
 
 / {
         model = "Marvell Armada XP MV78460 SoC";
@@ -61,6 +61,227 @@
         };
 
         soc {
+                /*
+                 * MV78460 has 4 PCIe units Gen2.0: Two units can be
+                 * configured as x4 or quad x1 lanes. Two units are
+                 * x4/x1.
+                 */
+                pcie-controller {
+                        compatible = "marvell,armada-xp-pcie";
+                        status = "disabled";
+                        device_type = "pci";
+
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+
+                        bus-range = <0x00 0xff>;
+
+                        ranges =
+                               <0x82000000 0 0x40000 MBUS_ID(0xf0, 0x01) 0x40000 0 0x00002000   /* Port 0.0 registers */
+                                0x82000000 0 0x42000 MBUS_ID(0xf0, 0x01) 0x42000 0 0x00002000   /* Port 2.0 registers */
+                                0x82000000 0 0x44000 MBUS_ID(0xf0, 0x01) 0x44000 0 0x00002000   /* Port 0.1 registers */
+                                0x82000000 0 0x48000 MBUS_ID(0xf0, 0x01) 0x48000 0 0x00002000   /* Port 0.2 registers */
+                                0x82000000 0 0x4c000 MBUS_ID(0xf0, 0x01) 0x4c000 0 0x00002000   /* Port 0.3 registers */
+                                0x82000000 0 0x80000 MBUS_ID(0xf0, 0x01) 0x80000 0 0x00002000   /* Port 1.0 registers */
+                                0x82000000 0 0x82000 MBUS_ID(0xf0, 0x01) 0x82000 0 0x00002000   /* Port 3.0 registers */
+                                0x82000000 0 0x84000 MBUS_ID(0xf0, 0x01) 0x84000 0 0x00002000   /* Port 1.1 registers */
+                                0x82000000 0 0x88000 MBUS_ID(0xf0, 0x01) 0x88000 0 0x00002000   /* Port 1.2 registers */
+                                0x82000000 0 0x8c000 MBUS_ID(0xf0, 0x01) 0x8c000 0 0x00002000   /* Port 1.3 registers */
+                                0x82000000 0x1 0     MBUS_ID(0x04, 0xe8) 0 1 0 /* Port 0.0 MEM */
+                                0x81000000 0x1 0     MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0.0 IO  */
+                                0x82000000 0x2 0     MBUS_ID(0x04, 0xd8) 0 1 0 /* Port 0.1 MEM */
+                                0x81000000 0x2 0     MBUS_ID(0x04, 0xd0) 0 1 0 /* Port 0.1 IO  */
+                                0x82000000 0x3 0     MBUS_ID(0x04, 0xb8) 0 1 0 /* Port 0.2 MEM */
+                                0x81000000 0x3 0     MBUS_ID(0x04, 0xb0) 0 1 0 /* Port 0.2 IO  */
+                                0x82000000 0x4 0     MBUS_ID(0x04, 0x78) 0 1 0 /* Port 0.3 MEM */
+                                0x81000000 0x4 0     MBUS_ID(0x04, 0x70) 0 1 0 /* Port 0.3 IO  */
+
+                                0x82000000 0x5 0     MBUS_ID(0x08, 0xe8) 0 1 0 /* Port 1.0 MEM */
+                                0x81000000 0x5 0     MBUS_ID(0x08, 0xe0) 0 1 0 /* Port 1.0 IO  */
+                                0x82000000 0x6 0     MBUS_ID(0x08, 0xd8) 0 1 0 /* Port 1.1 MEM */
+                                0x81000000 0x6 0     MBUS_ID(0x08, 0xd0) 0 1 0 /* Port 1.1 IO  */
+                                0x82000000 0x7 0     MBUS_ID(0x08, 0xb8) 0 1 0 /* Port 1.2 MEM */
+                                0x81000000 0x7 0     MBUS_ID(0x08, 0xb0) 0 1 0 /* Port 1.2 IO  */
+                                0x82000000 0x8 0     MBUS_ID(0x08, 0x78) 0 1 0 /* Port 1.3 MEM */
+                                0x81000000 0x8 0     MBUS_ID(0x08, 0x70) 0 1 0 /* Port 1.3 IO  */
+
+                                0x82000000 0x9 0     MBUS_ID(0x04, 0xf8) 0 1 0 /* Port 2.0 MEM */
+                                0x81000000 0x9 0     MBUS_ID(0x04, 0xf0) 0 1 0 /* Port 2.0 IO  */
+
+                                0x82000000 0xa 0     MBUS_ID(0x08, 0xf8) 0 1 0 /* Port 3.0 MEM */
+                                0x81000000 0xa 0     MBUS_ID(0x08, 0xf0) 0 1 0 /* Port 3.0 IO  */>;
+
+                        pcie@1,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
+                                reg = <0x0800 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0
+                                          0x81000000 0 0 0x81000000 0x1 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 58>;
+                                marvell,pcie-port = <0>;
+                                marvell,pcie-lane = <0>;
+                                clocks = <&gateclk 5>;
+                                status = "disabled";
+                        };
+
+                        pcie@2,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82001000 0 0x44000 0 0x2000>;
+                                reg = <0x1000 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x2 0 1 0
+                                          0x81000000 0 0 0x81000000 0x2 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 59>;
+                                marvell,pcie-port = <0>;
+                                marvell,pcie-lane = <1>;
+                                clocks = <&gateclk 6>;
+                                status = "disabled";
+                        };
+
+                        pcie@3,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82001800 0 0x48000 0 0x2000>;
+                                reg = <0x1800 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x3 0 1 0
+                                          0x81000000 0 0 0x81000000 0x3 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 60>;
+                                marvell,pcie-port = <0>;
+                                marvell,pcie-lane = <2>;
+                                clocks = <&gateclk 7>;
+                                status = "disabled";
+                        };
+
+                        pcie@4,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82002000 0 0x4c000 0 0x2000>;
+                                reg = <0x2000 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x4 0 1 0
+                                          0x81000000 0 0 0x81000000 0x4 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 61>;
+                                marvell,pcie-port = <0>;
+                                marvell,pcie-lane = <3>;
+                                clocks = <&gateclk 8>;
+                                status = "disabled";
+                        };
+
+                        pcie@5,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
+                                reg = <0x2800 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x5 0 1 0
+                                          0x81000000 0 0 0x81000000 0x5 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 62>;
+                                marvell,pcie-port = <1>;
+                                marvell,pcie-lane = <0>;
+                                clocks = <&gateclk 9>;
+                                status = "disabled";
+                        };
+
+                        pcie@6,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82003000 0 0x84000 0 0x2000>;
+                                reg = <0x3000 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x6 0 1 0
+                                          0x81000000 0 0 0x81000000 0x6 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 63>;
+                                marvell,pcie-port = <1>;
+                                marvell,pcie-lane = <1>;
+                                clocks = <&gateclk 10>;
+                                status = "disabled";
+                        };
+
+                        pcie@7,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82003800 0 0x88000 0 0x2000>;
+                                reg = <0x3800 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x7 0 1 0
+                                          0x81000000 0 0 0x81000000 0x7 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 64>;
+                                marvell,pcie-port = <1>;
+                                marvell,pcie-lane = <2>;
+                                clocks = <&gateclk 11>;
+                                status = "disabled";
+                        };
+
+                        pcie@8,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82004000 0 0x8c000 0 0x2000>;
+                                reg = <0x4000 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x8 0 1 0
+                                          0x81000000 0 0 0x81000000 0x8 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 65>;
+                                marvell,pcie-port = <1>;
+                                marvell,pcie-lane = <3>;
+                                clocks = <&gateclk 12>;
+                                status = "disabled";
+                        };
+
+                        pcie@9,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82004800 0 0x42000 0 0x2000>;
+                                reg = <0x4800 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x9 0 1 0
+                                          0x81000000 0 0 0x81000000 0x9 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 99>;
+                                marvell,pcie-port = <2>;
+                                marvell,pcie-lane = <0>;
+                                clocks = <&gateclk 26>;
+                                status = "disabled";
+                        };
+
+                        pcie@10,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82005000 0 0x82000 0 0x2000>;
+                                reg = <0x5000 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0xa 0 1 0
+                                          0x81000000 0 0 0x81000000 0xa 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &mpic 103>;
+                                marvell,pcie-port = <3>;
+                                marvell,pcie-lane = <0>;
+                                clocks = <&gateclk 27>;
+                                status = "disabled";
+                        };
+                };
+
                 internal-regs {
                         pinctrl {
                                 compatible = "marvell,mv78460-pinctrl";
@@ -80,7 +301,7 @@
                                 gpio-controller;
                                 #gpio-cells = <2>;
                                 interrupt-controller;
-                                #interrupts-cells = <2>;
+                                #interrupt-cells = <2>;
                                 interrupts = <82>, <83>, <84>, <85>;
                         };
 
@@ -91,7 +312,7 @@
                                 gpio-controller;
                                 #gpio-cells = <2>;
                                 interrupt-controller;
-                                #interrupts-cells = <2>;
+                                #interrupt-cells = <2>;
                                 interrupts = <87>, <88>, <89>, <90>;
                         };
 
@@ -102,7 +323,7 @@
                                 gpio-controller;
                                 #gpio-cells = <2>;
                                 interrupt-controller;
-                                #interrupts-cells = <2>;
+                                #interrupt-cells = <2>;
                                 interrupts = <91>;
                         };
 
@@ -113,194 +334,6 @@
                                 clocks = <&gateclk 1>;
                                 status = "disabled";
                         };
-
-                        /*
-                         * MV78460 has 4 PCIe units Gen2.0: Two units can be
-                         * configured as x4 or quad x1 lanes. Two units are
-                         * x4/x1.
-                         */
-                        pcie-controller {
-                                compatible = "marvell,armada-xp-pcie";
-                                status = "disabled";
-                                device_type = "pci";
-
-                                #address-cells = <3>;
-                                #size-cells = <2>;
-
-                                bus-range = <0x00 0xff>;
-
-                                ranges = <0x82000000 0 0x40000 0x40000 0 0x00002000   /* Port 0.0 registers */
-                                        0x82000000 0 0x42000 0x42000 0 0x00002000   /* Port 2.0 registers */
-                                        0x82000000 0 0x44000 0x44000 0 0x00002000   /* Port 0.1 registers */
-                                        0x82000000 0 0x48000 0x48000 0 0x00002000   /* Port 0.2 registers */
-                                        0x82000000 0 0x4c000 0x4c000 0 0x00002000   /* Port 0.3 registers */
-                                        0x82000000 0 0x80000 0x80000 0 0x00002000   /* Port 1.0 registers */
-                                        0x82000000 0 0x82000 0x82000 0 0x00002000   /* Port 3.0 registers */
-                                        0x82000000 0 0x84000 0x84000 0 0x00002000   /* Port 1.1 registers */
-                                        0x82000000 0 0x88000 0x88000 0 0x00002000   /* Port 1.2 registers */
-                                        0x82000000 0 0x8c000 0x8c000 0 0x00002000   /* Port 1.3 registers */
-                                        0x82000000 0 0xe0000000 0xe0000000 0 0x08000000   /* non-prefetchable memory */
-                                        0x81000000 0 0    0xe8000000 0 0x00100000>; /* downstream I/O */
-
-                                pcie@1,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
-                                        reg = <0x0800 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 58>;
-                                        marvell,pcie-port = <0>;
-                                        marvell,pcie-lane = <0>;
-                                        clocks = <&gateclk 5>;
-                                        status = "disabled";
-                                };
-
-                                pcie@2,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82001000 0 0x44000 0 0x2000>;
-                                        reg = <0x1000 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 59>;
-                                        marvell,pcie-port = <0>;
-                                        marvell,pcie-lane = <1>;
-                                        clocks = <&gateclk 6>;
-                                        status = "disabled";
-                                };
-
-                                pcie@3,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82001800 0 0x48000 0 0x2000>;
-                                        reg = <0x1800 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 60>;
-                                        marvell,pcie-port = <0>;
-                                        marvell,pcie-lane = <2>;
-                                        clocks = <&gateclk 7>;
-                                        status = "disabled";
-                                };
-
-                                pcie@4,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82002000 0 0x4c000 0 0x2000>;
-                                        reg = <0x2000 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 61>;
-                                        marvell,pcie-port = <0>;
-                                        marvell,pcie-lane = <3>;
-                                        clocks = <&gateclk 8>;
-                                        status = "disabled";
-                                };
-
-                                pcie@5,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
-                                        reg = <0x2800 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 62>;
-                                        marvell,pcie-port = <1>;
-                                        marvell,pcie-lane = <0>;
-                                        clocks = <&gateclk 9>;
-                                        status = "disabled";
-                                };
-
-                                pcie@6,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82003000 0 0x84000 0 0x2000>;
-                                        reg = <0x3000 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 63>;
-                                        marvell,pcie-port = <1>;
-                                        marvell,pcie-lane = <1>;
-                                        clocks = <&gateclk 10>;
-                                        status = "disabled";
-                                };
-
-                                pcie@7,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82003800 0 0x88000 0 0x2000>;
-                                        reg = <0x3800 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 64>;
-                                        marvell,pcie-port = <1>;
-                                        marvell,pcie-lane = <2>;
-                                        clocks = <&gateclk 11>;
-                                        status = "disabled";
-                                };
-
-                                pcie@8,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82004000 0 0x8c000 0 0x2000>;
-                                        reg = <0x4000 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 65>;
-                                        marvell,pcie-port = <1>;
-                                        marvell,pcie-lane = <3>;
-                                        clocks = <&gateclk 12>;
-                                        status = "disabled";
-                                };
-                                pcie@9,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82004800 0 0x42000 0 0x2000>;
-                                        reg = <0x4800 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 99>;
-                                        marvell,pcie-port = <2>;
-                                        marvell,pcie-lane = <0>;
-                                        clocks = <&gateclk 26>;
-                                        status = "disabled";
-                                };
-
-                                pcie@10,0 {
-                                        device_type = "pci";
-                                        assigned-addresses = <0x82005000 0 0x82000 0 0x2000>;
-                                        reg = <0x5000 0 0 0 0>;
-                                        #address-cells = <3>;
-                                        #size-cells = <2>;
-                                        #interrupt-cells = <1>;
-                                        ranges;
-                                        interrupt-map-mask = <0 0 0 0>;
-                                        interrupt-map = <0 0 0 0 &mpic 103>;
-                                        marvell,pcie-port = <3>;
-                                        marvell,pcie-lane = <0>;
-                                        clocks = <&gateclk 27>;
-                                        status = "disabled";
-                                };
-                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
index 8f510458ea86..5695afcc04bf 100644
--- a/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
+++ b/arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts
@@ -11,7 +11,7 @@
  */
 
 /dts-v1/;
-/include/ "armada-xp-mv78260.dtsi"
+#include "armada-xp-mv78260.dtsi"
 
 / {
         model = "PlatHome OpenBlocks AX3-4 board";
@@ -27,9 +27,46 @@
         };
 
         soc {
-                ranges = <0          0 0xd0000000 0x100000      /* Internal registers 1MiB */
-                          0xe0000000 0 0xe0000000 0x8100000     /* PCIe */
-                          0xf0000000 0 0xf0000000 0x8000000     /* Device Bus, NOR 128MiB   */>;
+                ranges = <MBUS_ID(0xf0, 0x01) 0 0 0xd0000000 0x100000
+                          MBUS_ID(0x01, 0x1d) 0 0 0xfff00000 0x100000
+                          MBUS_ID(0x01, 0x2f) 0 0 0xf0000000 0x8000000>;
+
+                devbus-bootcs {
+                        status = "okay";
+
+                        /* Device Bus parameters are required */
+
+                        /* Read parameters */
+                        devbus,bus-width    = <8>;
+                        devbus,turn-off-ps  = <60000>;
+                        devbus,badr-skew-ps = <0>;
+                        devbus,acc-first-ps = <124000>;
+                        devbus,acc-next-ps  = <248000>;
+                        devbus,rd-setup-ps  = <0>;
+                        devbus,rd-hold-ps   = <0>;
+
+                        /* Write parameters */
+                        devbus,sync-enable = <0>;
+                        devbus,wr-high-ps  = <60000>;
+                        devbus,wr-low-ps   = <60000>;
+                        devbus,ale-wr-ps   = <60000>;
+
+                        /* NOR 128 MiB */
+                        nor@0 {
+                                compatible = "cfi-flash";
+                                reg = <0 0x8000000>;
+                                bank-width = <2>;
+                        };
+                };
+
+                pcie-controller {
+                        status = "okay";
+                        /* Internal mini-PCIe connector */
+                        pcie@1,0 {
+                                /* Port 0, Lane 0 */
+                                status = "okay";
+                        };
+                };
 
                 internal-regs {
                         serial@12000 {
@@ -148,49 +185,6 @@
                         usb@51000 {
                                 status = "okay";
                         };
-
-                        /* USB interface in the mini-PCIe connector */
-                        usb@52000 {
-                                status = "okay";
-                        };
-
-                        devbus-bootcs@10400 {
-                                status = "okay";
-                                ranges = <0 0xf0000000 0x8000000>; /* @addr 0xf000000, size 0x8000000 */
-
-                                /* Device Bus parameters are required */
-
-                                /* Read parameters */
-                                devbus,bus-width    = <8>;
-                                devbus,turn-off-ps  = <60000>;
-                                devbus,badr-skew-ps = <0>;
-                                devbus,acc-first-ps = <124000>;
-                                devbus,acc-next-ps  = <248000>;
-                                devbus,rd-setup-ps  = <0>;
-                                devbus,rd-hold-ps   = <0>;
-
-                                /* Write parameters */
-                                devbus,sync-enable = <0>;
-                                devbus,wr-high-ps  = <60000>;
-                                devbus,wr-low-ps   = <60000>;
-                                devbus,ale-wr-ps   = <60000>;
-
-                                /* NOR 128 MiB */
-                                nor@0 {
-                                        compatible = "cfi-flash";
-                                        reg = <0 0x8000000>;
-                                        bank-width = <2>;
-                                };
-                        };
-
-                        pcie-controller {
-                                status = "okay";
-                                /* Internal mini-PCIe connector */
-                                pcie@1,0 {
-                                        /* Port 0, Lane 0 */
-                                        status = "okay";
-                                };
-                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/armada-xp.dtsi b/arch/arm/boot/dts/armada-xp.dtsi
index 416eb9481844..def125c0eeaa 100644
--- a/arch/arm/boot/dts/armada-xp.dtsi
+++ b/arch/arm/boot/dts/armada-xp.dtsi
@@ -16,7 +16,7 @@
  * common to all Armada SoCs.
  */
 
-/include/ "armada-370-xp.dtsi"
+#include "armada-370-xp.dtsi"
 
 / {
         model = "Marvell Armada XP family SoC";
@@ -27,6 +27,13 @@
         };
 
         soc {
+                compatible = "marvell,armadaxp-mbus", "simple-bus";
+
+                bootrom {
+                        compatible = "marvell,bootrom";
+                        reg = <MBUS_ID(0x01, 0x1d) 0 0x100000>;
+                };
+
                 internal-regs {
                         L2: l2-cache {
                                 compatible = "marvell,aurora-system-cache";
@@ -62,7 +69,7 @@
                         };
 
                         timer@20300 {
-                                marvell,timer-25Mhz;
+                                compatible = "marvell,armada-xp-timer";
                         };
 
                         coreclk: mvebu-sar@18230 {
diff --git a/arch/arm/boot/dts/at91rm9200.dtsi b/arch/arm/boot/dts/at91rm9200.dtsi
index 92b9e21389db..f77065506f1e 100644
--- a/arch/arm/boot/dts/at91rm9200.dtsi
+++ b/arch/arm/boot/dts/at91rm9200.dtsi
@@ -120,6 +120,7 @@
                                 interrupts = <10 IRQ_TYPE_LEVEL_HIGH 0>;
                                 #address-cells = <1>;
                                 #size-cells = <0>;
+                                pinctrl-names = "default";
                                 status = "disabled";
                         };
 
diff --git a/arch/arm/boot/dts/at91rm9200_pqfp.dtsi b/arch/arm/boot/dts/at91rm9200_pqfp.dtsi
new file mode 100644
index 000000000000..93ca66f80360
--- /dev/null
+++ b/arch/arm/boot/dts/at91rm9200_pqfp.dtsi
@@ -0,0 +1,17 @@
+/*
+ * at91rm9200_pqfp.dtsi - Device Tree Include file for AT91RM9200 PQFP family SoC
+ *
+ * Copyright (C) 2013 Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
+ *
+ * Licensed under GPLv2 or later.
+ */
+
+#include "at91rm9200.dtsi"
+
+/ {
+        compatible = "atmel,at91rm9200-pqfp", "atmel,at91rm9200";
+};
+
+&pioD {
+        status = "disabled";
+};
diff --git a/arch/arm/boot/dts/at91sam9260.dtsi b/arch/arm/boot/dts/at91sam9260.dtsi
index c7ccbcbffb3e..56ee8282a7a8 100644
--- a/arch/arm/boot/dts/at91sam9260.dtsi
+++ b/arch/arm/boot/dts/at91sam9260.dtsi
@@ -572,6 +572,7 @@
                                 interrupts = <9 IRQ_TYPE_LEVEL_HIGH 0>;
                                 #address-cells = <1>;
                                 #size-cells = <0>;
+                                pinctrl-names = "default";
                                 status = "disabled";
                         };
 
diff --git a/arch/arm/boot/dts/at91sam9n12.dtsi b/arch/arm/boot/dts/at91sam9n12.dtsi
index bb7f564b3a55..9fb7ffd32af2 100644
--- a/arch/arm/boot/dts/at91sam9n12.dtsi
+++ b/arch/arm/boot/dts/at91sam9n12.dtsi
@@ -291,6 +291,22 @@
                                         };
                                 };
 
+                                i2c0 {
+                                        pinctrl_i2c0: i2c0-0 {
+                                                atmel,pins =
+                                                        <AT91_PIOA 30 AT91_PERIPH_A AT91_PINCTRL_NONE
+                                                         AT91_PIOA 31 AT91_PERIPH_A AT91_PINCTRL_NONE>;
+                                        };
+                                };
+
+                                i2c1 {
+                                        pinctrl_i2c1: i2c1-0 {
+                                                atmel,pins =
+                                                        <AT91_PIOC 0 AT91_PERIPH_C AT91_PINCTRL_NONE
+                                                         AT91_PIOC 1 AT91_PERIPH_C AT91_PINCTRL_NONE>;
+                                        };
+                                };
+
                                 tcb0 {
                                         pinctrl_tcb0_tclk0: tcb0_tclk0-0 {
                                                 atmel,pins = <AT91_PIOA 24 AT91_PERIPH_A AT91_PINCTRL_NONE>;
@@ -471,6 +487,8 @@
                                 dma-names = "tx", "rx";
                                 #address-cells = <1>;
                                 #size-cells = <0>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pinctrl_i2c0>;
                                 status = "disabled";
                         };
 
@@ -483,6 +501,8 @@
                                 dma-names = "tx", "rx";
                                 #address-cells = <1>;
                                 #size-cells = <0>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pinctrl_i2c1>;
                                 status = "disabled";
                         };
 
diff --git a/arch/arm/boot/dts/at91sam9n12ek.dts b/arch/arm/boot/dts/at91sam9n12ek.dts
index 3d77dbe406f4..27a9352b9d7a 100644
--- a/arch/arm/boot/dts/at91sam9n12ek.dts
+++ b/arch/arm/boot/dts/at91sam9n12ek.dts
@@ -40,6 +40,15 @@
 
                         i2c0: i2c@f8010000 {
                                 status = "okay";
+
+                                qt1070: keyboard@1b {
+                                        compatible = "qt1070";
+                                        reg = <0x1b>;
+                                        interrupt-parent = <&pioA>;
+                                        interrupts = <2 IRQ_TYPE_EDGE_FALLING>;
+                                        pinctrl-names = "default";
+                                        pinctrl-0 = <&pinctrl_qt1070_irq>;
+                                };
                         };
 
                         i2c1: i2c@f8014000 {
@@ -66,6 +75,13 @@
                                                         <AT91_PIOA 7 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;   /* PA7 gpio CD pin pull up and deglitch */
                                         };
                                 };
+
+                                qt1070 {
+                                        pinctrl_qt1070_irq: qt1070_irq {
+                                                atmel,pins =
+                                                        <AT91_PIOA 2 AT91_PERIPH_GPIO AT91_PINCTRL_PULL_UP_DEGLITCH>;
+                                        };
+                                };
                         };
 
                         spi0: spi@f0000000 {
@@ -121,7 +137,7 @@
 
                 enter {
                         label = "Enter";
-                        gpios = <&pioB 4 GPIO_ACTIVE_LOW>;
+                        gpios = <&pioB 3 GPIO_ACTIVE_LOW>;
                         linux,code = <28>;
                         gpio-key,wakeup;
                 };
diff --git a/arch/arm/boot/dts/at91sam9x5.dtsi b/arch/arm/boot/dts/at91sam9x5.dtsi
index 57d45f5bea09..cf78ac0b04b1 100644
--- a/arch/arm/boot/dts/at91sam9x5.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5.dtsi
@@ -542,6 +542,9 @@
                                 compatible = "atmel,at91sam9g45-ssc";
                                 reg = <0xf0010000 0x4000>;
                                 interrupts = <28 IRQ_TYPE_LEVEL_HIGH 5>;
+                                dmas = <&dma0 1 AT91_DMA_CFG_PER_ID(13)>,
+                                       <&dma0 1 AT91_DMA_CFG_PER_ID(14)>;
+                                dma-names = "tx", "rx";
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pinctrl_ssc0_tx &pinctrl_ssc0_rx>;
                                 status = "disabled";
diff --git a/arch/arm/boot/dts/at91sam9x5ek.dtsi b/arch/arm/boot/dts/at91sam9x5ek.dtsi
index 49e3c45818c2..3a9f6fa4a36a 100644
--- a/arch/arm/boot/dts/at91sam9x5ek.dtsi
+++ b/arch/arm/boot/dts/at91sam9x5ek.dtsi
@@ -59,6 +59,11 @@
 
                         i2c0: i2c@f8010000 {
                                 status = "okay";
+
+                                wm8731: wm8731@1a {
+                                        compatible = "wm8731";
+                                        reg = <0x1a>;
+                                };
                         };
 
                         pinctrl@fffff400 {
@@ -90,6 +95,10 @@
                         watchdog@fffffe40 {
                                 status = "okay";
                         };
+
+                        ssc0: ssc@f0010000 {
+                                status = "okay";
+                        };
                 };
 
                 usb0: ohci@00600000 {
@@ -105,4 +114,19 @@
                         status = "okay";
                 };
         };
+
+        sound {
+                compatible = "atmel,sam9x5-wm8731-audio";
+
+                atmel,model = "wm8731 @ AT91SAM9X5EK";
+
+                atmel,audio-routing =
+                        "Headphone Jack", "RHPOUT",
+                        "Headphone Jack", "LHPOUT",
+                        "LLINEIN", "Line In Jack",
+                        "RLINEIN", "Line In Jack";
+
+                atmel,ssc-controller = <&ssc0>;
+                atmel,audio-codec = <&wm8731>;
+        };
 };
diff --git a/arch/arm/boot/dts/atlas6.dtsi b/arch/arm/boot/dts/atlas6.dtsi
index a0f2721ea583..8678e0c11119 100644
--- a/arch/arm/boot/dts/atlas6.dtsi
+++ b/arch/arm/boot/dts/atlas6.dtsi
@@ -329,6 +329,12 @@
                                                 sirf,function = "uart0";
                                         };
                                 };
+                                uart0_noflow_pins_a: uart0@1 {
+                                        uart {
+                                                sirf,pins = "uart0_nostreamctrlgrp";
+                                                sirf,function = "uart0_nostreamctrl";
+                                        };
+                                };
                                 uart1_pins_a: uart1@0 {
                                         uart {
                                                 sirf,pins = "uart1grp";
diff --git a/arch/arm/boot/dts/bcm11351-brt.dts b/arch/arm/boot/dts/bcm11351-brt.dts
index 67ec524098b5..9d36eb4e3c41 100644
--- a/arch/arm/boot/dts/bcm11351-brt.dts
+++ b/arch/arm/boot/dts/bcm11351-brt.dts
@@ -17,7 +17,7 @@
 
 / {
         model = "BCM11351 BRT board";
-        compatible = "bcm,bcm11351-brt", "bcm,bcm11351";
+        compatible = "brcm,bcm11351-brt", "brcm,bcm11351";
 
         memory {
                 reg = <0x80000000 0x40000000>; /* 1 GB */
@@ -27,18 +27,18 @@
                 status = "okay";
         };
 
-        sdio0: sdio@0x3f180000 {
+        sdio1: sdio@3f180000 {
                 max-frequency = <48000000>;
                 status = "okay";
         };
 
-        sdio1: sdio@0x3f190000 {
+        sdio2: sdio@3f190000 {
                 non-removable;
                 max-frequency = <48000000>;
                 status = "okay";
         };
 
-        sdio3: sdio@0x3f1b0000 {
+        sdio4: sdio@3f1b0000 {
                 max-frequency = <48000000>;
                 status = "okay";
         };
diff --git a/arch/arm/boot/dts/bcm11351.dtsi b/arch/arm/boot/dts/bcm11351.dtsi
index c0cdf66f8964..05a5aabe3b2c 100644
--- a/arch/arm/boot/dts/bcm11351.dtsi
+++ b/arch/arm/boot/dts/bcm11351.dtsi
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Broadcom Corporation
+ * Copyright (C) 2012-2013 Broadcom Corporation
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -18,7 +18,7 @@
 
 / {
         model = "BCM11351 SoC";
-        compatible = "bcm,bcm11351";
+        compatible = "brcm,bcm11351";
         interrupt-parent = <&gic>;
 
         chosen {
@@ -35,12 +35,12 @@
         };
 
         smc@0x3404c000 {
-                compatible = "bcm,bcm11351-smc", "bcm,kona-smc";
+                compatible = "brcm,bcm11351-smc", "brcm,kona-smc";
                 reg = <0x3404c000 0x400>; /* 1 KiB in SRAM */
         };
 
         uart@3e000000 {
-                compatible = "bcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart";
+                compatible = "brcm,bcm11351-dw-apb-uart", "snps,dw-apb-uart";
                 status = "disabled";
                 reg = <0x3e000000 0x1000>;
                 clock-frequency = <13000000>;
@@ -50,42 +50,47 @@
         };
 
         L2: l2-cache {
-                compatible = "bcm,bcm11351-a2-pl310-cache";
+                compatible = "brcm,bcm11351-a2-pl310-cache";
                 reg = <0x3ff20000 0x1000>;
                 cache-unified;
                 cache-level = <2>;
         };
 
+        watchdog@35002f40 {
+                compatible = "brcm,bcm11351-wdt", "brcm,kona-wdt";
+                reg = <0x35002f40 0x6c>;
+        };
+
         timer@35006000 {
-                compatible = "bcm,kona-timer";
+                compatible = "brcm,kona-timer";
                 reg = <0x35006000 0x1000>;
                 interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>;
                 clock-frequency = <32768>;
         };
 
-        sdio0: sdio@0x3f180000 {
-                compatible = "bcm,kona-sdhci";
+        sdio1: sdio@3f180000 {
+                compatible = "brcm,kona-sdhci";
                 reg = <0x3f180000 0x10000>;
                 interrupts = <0x0 77 0x4>;
                 status = "disabled";
         };
 
-        sdio1: sdio@0x3f190000 {
-                compatible = "bcm,kona-sdhci";
+        sdio2: sdio@3f190000 {
+                compatible = "brcm,kona-sdhci";
                 reg = <0x3f190000 0x10000>;
                 interrupts = <0x0 76 0x4>;
                 status = "disabled";
         };
 
-        sdio2: sdio@0x3f1a0000 {
-                compatible = "bcm,kona-sdhci";
+        sdio3: sdio@3f1a0000 {
+                compatible = "brcm,kona-sdhci";
                 reg = <0x3f1a0000 0x10000>;
                 interrupts = <0x0 74 0x4>;
                 status = "disabled";
         };
 
-        sdio3: sdio@0x3f1b0000 {
-                compatible = "bcm,kona-sdhci";
+        sdio4: sdio@3f1b0000 {
+                compatible = "brcm,kona-sdhci";
                 reg = <0x3f1b0000 0x10000>;
                 interrupts = <0x0 73 0x4>;
                 status = "disabled";
diff --git a/arch/arm/boot/dts/bcm28155-ap.dts b/arch/arm/boot/dts/bcm28155-ap.dts
new file mode 100644
index 000000000000..96ae67a2f0d3
--- /dev/null
+++ b/arch/arm/boot/dts/bcm28155-ap.dts
@@ -0,0 +1,45 @@
+/*
+ * Copyright (C) 2013 Broadcom Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+/dts-v1/;
+
+#include "bcm11351.dtsi"
+
+/ {
+        model = "BCM28155 AP board";
+        compatible = "brcm,bcm28155-ap", "brcm,bcm11351";
+
+        memory {
+                reg = <0x80000000 0x40000000>; /* 1 GB */
+        };
+
+        uart@3e000000 {
+                status = "okay";
+        };
+
+        sdio1: sdio@3f180000 {
+                max-frequency = <48000000>;
+                status = "okay";
+        };
+
+        sdio2: sdio@3f190000 {
+                non-removable;
+                max-frequency = <48000000>;
+                status = "okay";
+        };
+
+        sdio4: sdio@3f1b0000 {
+                max-frequency = <48000000>;
+                status = "okay";
+        };
+};
diff --git a/arch/arm/boot/dts/ccu8540.dts b/arch/arm/boot/dts/ccu8540.dts
deleted file mode 100644
index 48ff03441f5a..000000000000
--- a/arch/arm/boot/dts/ccu8540.dts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2013 ST-Ericsson AB
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-/dts-v1/;
-#include "dbx5x0.dtsi"
-
-/ {
-        model = "ST-Ericsson U8540 platform with Device Tree";
-        compatible = "st-ericsson,ccu8540", "st-ericsson,u8540";
-
-        memory@0 {
-                reg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>;
-        };
-
-        soc {
-                prcmu@80157000 {
-                        reg = <0x80157000 0x2000>, <0x801b0000 0x8000>, <0x801b8000 0x3000>;
-                        reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm";
-                };
-
-                uart@80120000 {
-                        status = "okay";
-                };
-
-                uart@80121000 {
-                        status = "okay";
-                };
-
-                uart@80007000 {
-                        status = "okay";
-                };
-        };
-};
diff --git a/arch/arm/boot/dts/da850-evm.dts b/arch/arm/boot/dts/da850-evm.dts
index 5bce7cc55cf3..588ce58a2959 100644
--- a/arch/arm/boot/dts/da850-evm.dts
+++ b/arch/arm/boot/dts/da850-evm.dts
@@ -90,6 +90,17 @@
                                 };
                         };
                 };
+                mdio: mdio@1e24000 {
+                        status = "okay";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&mdio_pins>;
+                        bus_freq = <2200000>;
+                };
+                eth0: ethernet@1e20000 {
+                        status = "okay";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&mii_pins>;
+                };
         };
         nand_cs3@62000000 {
                 status = "okay";
diff --git a/arch/arm/boot/dts/da850.dtsi b/arch/arm/boot/dts/da850.dtsi
index d70ba5504481..8d17346f9702 100644
--- a/arch/arm/boot/dts/da850.dtsi
+++ b/arch/arm/boot/dts/da850.dtsi
@@ -125,11 +125,33 @@
                                         0x14 0x00000010 0x000000f0
                                 >;
                         };
+                        mdio_pins: pinmux_mdio_pins {
+                                pinctrl-single,bits = <
+                                        /* MDIO_CLK, MDIO_D */
+                                        0x10 0x00000088 0x000000ff
+                                >;
+                        };
+                        mii_pins: pinmux_mii_pins {
+                                pinctrl-single,bits = <
+                                        /*
+                                         * MII_TXEN, MII_TXCLK, MII_COL
+                                         * MII_TXD_3, MII_TXD_2, MII_TXD_1
+                                         * MII_TXD_0
+                                         */
+                                        0x8 0x88888880 0xfffffff0
+                                        /*
+                                         * MII_RXER, MII_CRS, MII_RXCLK
+                                         * MII_RXDV, MII_RXD_3, MII_RXD_2
+                                         * MII_RXD_1, MII_RXD_0
+                                         */
+                                        0xc 0x88888888 0xffffffff
+                                >;
+                        };
+
                 };
                 serial0: serial@1c42000 {
                         compatible = "ns16550a";
                         reg = <0x42000 0x100>;
-                        clock-frequency = <150000000>;
                         reg-shift = <2>;
                         interrupts = <25>;
                         status = "disabled";
@@ -137,7 +159,6 @@
                 serial1: serial@1d0c000 {
                         compatible = "ns16550a";
                         reg = <0x10c000 0x100>;
-                        clock-frequency = <150000000>;
                         reg-shift = <2>;
                         interrupts = <53>;
                         status = "disabled";
@@ -145,7 +166,6 @@
                 serial2: serial@1d0d000 {
                         compatible = "ns16550a";
                         reg = <0x10d000 0x100>;
-                        clock-frequency = <150000000>;
                         reg-shift = <2>;
                         interrupts = <61>;
                         status = "disabled";
@@ -216,6 +236,26 @@
                         interrupts = <56>;
                         status = "disabled";
                 };
+                mdio: mdio@1e24000 {
+                        compatible = "ti,davinci_mdio";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0x224000 0x1000>;
+                };
+                eth0: ethernet@1e20000 {
+                        compatible = "ti,davinci-dm6467-emac";
+                        reg = <0x220000 0x4000>;
+                        ti,davinci-ctrl-reg-offset = <0x3000>;
+                        ti,davinci-ctrl-mod-reg-offset = <0x2000>;
+                        ti,davinci-ctrl-ram-offset = <0>;
+                        ti,davinci-ctrl-ram-size = <0x2000>;
+                        local-mac-address = [ 00 00 00 00 00 00 ];
+                        interrupts = <33
+                                        34
+                                        35
+                                        36
+                                        >;
+                };
         };
         nand_cs3@62000000 {
                 compatible = "ti,davinci-nand";
diff --git a/arch/arm/boot/dts/dove-cubox.dts b/arch/arm/boot/dts/dove-cubox.dts
index 5cae2ab69762..022646ef4b38 100644
--- a/arch/arm/boot/dts/dove-cubox.dts
+++ b/arch/arm/boot/dts/dove-cubox.dts
@@ -42,6 +42,8 @@
                         regulator-always-on;
                         regulator-boot-on;
                         gpio = <&gpio0 1 0>;
+                        pinctrl-0 = <&pmx_gpio_1>;
+                        pinctrl-names = "default";
                 };
         };
 
@@ -53,10 +55,24 @@
                         clock-frequency = <25000000>;
                 };
         };
+
+        ir_recv: ir-receiver {
+                compatible = "gpio-ir-receiver";
+                gpios = <&gpio0 19 1>;
+                pinctrl-0 = <&pmx_gpio_19>;
+                pinctrl-names = "default";
+        };
 };
 
 &uart0 { status = "okay"; };
 &sata0 { status = "okay"; };
+&mdio { status = "okay"; };
+&eth { status = "okay"; };
+
+&ethphy {
+        compatible = "marvell,88e1310";
+        reg = <1>;
+};
 
 &i2c0 {
         status = "okay";
@@ -103,6 +119,7 @@
         status = "okay";
         /* sdio0 card detect is connected to wrong pin on CuBox */
         cd-gpios = <&gpio0 12 1>;
+        pinctrl-0 = <&pmx_sdio0 &pmx_gpio_12>;
 };
 
 &spi0 {
@@ -115,23 +132,3 @@
                 reg = <0>;
         };
 };
-
-&pinctrl {
-        pinctrl-0 = <&pmx_gpio_1 &pmx_gpio_12>;
-        pinctrl-names = "default";
-
-        pmx_gpio_1: pmx-gpio-1 {
-                marvell,pins = "mpp1";
-                marvell,function = "gpio";
-        };
-
-        pmx_gpio_12: pmx-gpio-12 {
-                marvell,pins = "mpp12";
-                marvell,function = "gpio";
-        };
-
-        pmx_gpio_18: pmx-gpio-18 {
-                marvell,pins = "mpp18";
-                marvell,function = "gpio";
-        };
-};
diff --git a/arch/arm/boot/dts/dove-d2plug.dts b/arch/arm/boot/dts/dove-d2plug.dts
new file mode 100644
index 000000000000..e2222ce94f2f
--- /dev/null
+++ b/arch/arm/boot/dts/dove-d2plug.dts
@@ -0,0 +1,69 @@
+/dts-v1/;
+
+/include/ "dove.dtsi"
+
+/ {
+        model = "Globalscale D2Plug";
+        compatible = "globalscale,d2plug", "marvell,dove";
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x40000000>;
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,115200n8 earlyprintk";
+        };
+
+        leds {
+                compatible = "gpio-leds";
+                pinctrl-0 = <&pmx_gpio_0 &pmx_gpio_1 &pmx_gpio_2>;
+                pinctrl-names = "default";
+
+                wlan-ap {
+                        label = "wlan-ap";
+                        gpios = <&gpio0 0 1>;
+                };
+
+                wlan-act {
+                        label = "wlan-act";
+                        gpios = <&gpio0 1 1>;
+                };
+
+                bluetooth-act {
+                        label = "bt-act";
+                        gpios = <&gpio0 2 1>;
+                };
+        };
+};
+
+&uart0 { status = "okay"; };
+&sata0 { status = "okay"; };
+&i2c0 { status = "okay"; };
+&mdio { status = "okay"; };
+&eth { status = "okay"; };
+
+/* Samsung M8G2F eMMC */
+&sdio0 {
+        status = "okay";
+        non-removable;
+        bus-width = <4>;
+};
+
+/* Marvell SD8787 WLAN/BT */
+&sdio1 {
+        status = "okay";
+        non-removable;
+        bus-width = <4>;
+};
+
+&spi0 {
+        status = "okay";
+
+        /* spi0.0: 4M Flash Macronix MX25L3205D */
+        spi-flash@0 {
+                compatible = "st,m25l3205d";
+                spi-max-frequency = <20000000>;
+                reg = <0>;
+        };
+};
diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
index 6cab46849cdb..cc279166646f 100644
--- a/arch/arm/boot/dts/dove.dtsi
+++ b/arch/arm/boot/dts/dove.dtsi
@@ -10,6 +10,23 @@
                 gpio2 = &gpio2;
         };
 
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu0: cpu@0 {
+                        compatible = "marvell,pj4a", "marvell,sheeva-v7";
+                        device_type = "cpu";
+                        next-level-cache = <&l2>;
+                        reg = <0>;
+                };
+        };
+
+        l2: l2-cache {
+                compatible = "marvell,tauros2-cache";
+                marvell,tauros2-cache-features = <0>;
+        };
+
         soc@f1000000 {
                 compatible = "simple-bus";
                 #address-cells = <1>;
@@ -25,16 +42,28 @@
                           0xf2100000 0xf2100000 0x0100000   /* PCIe0 I/O   1M */
                           0xf8000000 0xf8000000 0x8000000>; /* BootROM   128M */
 
-                l2: l2-cache {
-                        compatible = "marvell,tauros2-cache";
-                        marvell,tauros2-cache-features = <0>;
+                timer: timer@20300 {
+                        compatible = "marvell,orion-timer";
+                        reg = <0x20300 0x20>;
+                        interrupt-parent = <&bridge_intc>;
+                        interrupts = <1>, <2>;
+                        clocks = <&core_clk 0>;
                 };
 
-                intc: interrupt-controller {
+                intc: main-interrupt-ctrl@20200 {
                         compatible = "marvell,orion-intc";
                         interrupt-controller;
                         #interrupt-cells = <1>;
-                        reg = <0x20204 0x04>, <0x20214 0x04>;
+                        reg = <0x20200 0x10>, <0x20210 0x10>;
+                };
+
+                bridge_intc: bridge-interrupt-ctrl@20110 {
+                        compatible = "marvell,orion-bridge-intc";
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+                        reg = <0x20110 0x8>;
+                        interrupts = <0>;
+                        marvell,#interrupts = <5>;
                 };
 
                 core_clk: core-clocks@d0214 {
@@ -43,14 +72,14 @@
                         #clock-cells = <1>;
                 };
 
-                gate_clk: clock-gating-control@d0038 {
+                gate_clk: clock-gating-ctrl@d0038 {
                         compatible = "marvell,dove-gating-clock";
                         reg = <0xd0038 0x4>;
                         clocks = <&core_clk 0>;
                         #clock-cells = <1>;
                 };
 
-                thermal: thermal@d001c {
+                thermal: thermal-diode@d001c {
                         compatible = "marvell,dove-thermal";
                         reg = <0xd001c 0x0c>, <0xd005c 0x08>;
                 };
@@ -70,6 +99,8 @@
                         reg-shift = <2>;
                         interrupts = <8>;
                         clocks = <&core_clk 0>;
+                        pinctrl-0 = <&pmx_uart1>;
+                        pinctrl-names = "default";
                         status = "disabled";
                 };
 
@@ -91,7 +122,7 @@
                         status = "disabled";
                 };
 
-                gpio0: gpio@d0400 {
+                gpio0: gpio-ctrl@d0400 {
                         compatible = "marvell,orion-gpio";
                         #gpio-cells = <2>;
                         gpio-controller;
@@ -102,7 +133,7 @@
                         interrupts = <12>, <13>, <14>, <60>;
                 };
 
-                gpio1: gpio@d0420 {
+                gpio1: gpio-ctrl@d0420 {
                         compatible = "marvell,orion-gpio";
                         #gpio-cells = <2>;
                         gpio-controller;
@@ -113,7 +144,7 @@
                         interrupts = <61>;
                 };
 
-                gpio2: gpio@e8400 {
+                gpio2: gpio-ctrl@e8400 {
                         compatible = "marvell,orion-gpio";
                         #gpio-cells = <2>;
                         gpio-controller;
@@ -121,13 +152,188 @@
                         ngpios = <8>;
                 };
 
-                pinctrl: pinctrl@d0200 {
+                pinctrl: pin-ctrl@d0200 {
                         compatible = "marvell,dove-pinctrl";
                         reg = <0xd0200 0x10>;
                         clocks = <&gate_clk 22>;
+
+                        pmx_gpio_0: pmx-gpio-0 {
+                                marvell,pins = "mpp0";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_gpio_1: pmx-gpio-1 {
+                                marvell,pins = "mpp1";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_gpio_2: pmx-gpio-2 {
+                                marvell,pins = "mpp2";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_gpio_3: pmx-gpio-3 {
+                                marvell,pins = "mpp3";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_gpio_4: pmx-gpio-4 {
+                                marvell,pins = "mpp4";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_gpio_5: pmx-gpio-5 {
+                                marvell,pins = "mpp5";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_gpio_6: pmx-gpio-6 {
+                                marvell,pins = "mpp6";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_gpio_7: pmx-gpio-7 {
+                                marvell,pins = "mpp7";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_gpio_8: pmx-gpio-8 {
+                                marvell,pins = "mpp8";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_gpio_9: pmx-gpio-9 {
+                                marvell,pins = "mpp9";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_gpio_10: pmx-gpio-10 {
+                                marvell,pins = "mpp10";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_gpio_11: pmx-gpio-11 {
+                                marvell,pins = "mpp11";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_gpio_12: pmx-gpio-12 {
+                                marvell,pins = "mpp12";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_gpio_13: pmx-gpio-13 {
+                                marvell,pins = "mpp13";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_gpio_14: pmx-gpio-14 {
+                                marvell,pins = "mpp14";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_gpio_15: pmx-gpio-15 {
+                                marvell,pins = "mpp15";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_gpio_16: pmx-gpio-16 {
+                                marvell,pins = "mpp16";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_gpio_17: pmx-gpio-17 {
+                                marvell,pins = "mpp17";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_gpio_18: pmx-gpio-18 {
+                                marvell,pins = "mpp18";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_gpio_19: pmx-gpio-19 {
+                                marvell,pins = "mpp19";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_gpio_20: pmx-gpio-20 {
+                                marvell,pins = "mpp20";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_gpio_21: pmx-gpio-21 {
+                                marvell,pins = "mpp21";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_camera: pmx-camera {
+                                marvell,pins = "mpp_camera";
+                                marvell,function = "camera";
+                        };
+
+                        pmx_camera_gpio: pmx-camera-gpio {
+                                marvell,pins = "mpp_camera";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_sdio0: pmx-sdio0 {
+                                marvell,pins = "mpp_sdio0";
+                                marvell,function = "sdio0";
+                        };
+
+                        pmx_sdio0_gpio: pmx-sdio0-gpio {
+                                marvell,pins = "mpp_sdio0";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_sdio1: pmx-sdio1 {
+                                marvell,pins = "mpp_sdio1";
+                                marvell,function = "sdio1";
+                        };
+
+                        pmx_sdio1_gpio: pmx-sdio1-gpio {
+                                marvell,pins = "mpp_sdio1";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_audio1_gpio: pmx-audio1-gpio {
+                                marvell,pins = "mpp_audio1";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_spi0: pmx-spi0 {
+                                marvell,pins = "mpp_spi0";
+                                marvell,function = "spi0";
+                        };
+
+                        pmx_spi0_gpio: pmx-spi0-gpio {
+                                marvell,pins = "mpp_spi0";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_uart1: pmx-uart1 {
+                                marvell,pins = "mpp_uart1";
+                                marvell,function = "uart1";
+                        };
+
+                        pmx_uart1_gpio: pmx-uart1-gpio {
+                                marvell,pins = "mpp_uart1";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_nand: pmx-nand {
+                                marvell,pins = "mpp_nand";
+                                marvell,function = "nand";
+                        };
+
+                        pmx_nand_gpo: pmx-nand-gpo {
+                                marvell,pins = "mpp_nand";
+                                marvell,function = "gpo";
+                        };
                 };
 
-                spi0: spi@10600 {
+                spi0: spi-ctrl@10600 {
                         compatible = "marvell,orion-spi";
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -135,10 +341,12 @@
                         interrupts = <6>;
                         reg = <0x10600 0x28>;
                         clocks = <&core_clk 0>;
+                        pinctrl-0 = <&pmx_spi0>;
+                        pinctrl-names = "default";
                         status = "disabled";
                 };
 
-                spi1: spi@14600 {
+                spi1: spi-ctrl@14600 {
                         compatible = "marvell,orion-spi";
                         #address-cells = <1>;
                         #size-cells = <0>;
@@ -149,7 +357,7 @@
                         status = "disabled";
                 };
 
-                i2c0: i2c@11000 {
+                i2c0: i2c-ctrl@11000 {
                         compatible = "marvell,mv64xxx-i2c";
                         reg = <0x11000 0x20>;
                         #address-cells = <1>;
@@ -177,23 +385,27 @@
                         status = "okay";
                 };
 
-                sdio0: sdio@92000 {
+                sdio0: sdio-host@92000 {
                         compatible = "marvell,dove-sdhci";
                         reg = <0x92000 0x100>;
                         interrupts = <35>, <37>;
                         clocks = <&gate_clk 8>;
+                        pinctrl-0 = <&pmx_sdio0>;
+                        pinctrl-names = "default";
                         status = "disabled";
                 };
 
-                sdio1: sdio@90000 {
+                sdio1: sdio-host@90000 {
                         compatible = "marvell,dove-sdhci";
                         reg = <0x90000 0x100>;
                         interrupts = <36>, <38>;
                         clocks = <&gate_clk 9>;
+                        pinctrl-0 = <&pmx_sdio1>;
+                        pinctrl-names = "default";
                         status = "disabled";
                 };
 
-                sata0: sata@a0000 {
+                sata0: sata-host@a0000 {
                         compatible = "marvell,orion-sata";
                         reg = <0xa0000 0x2400>;
                         interrupts = <62>;
@@ -202,12 +414,12 @@
                         status = "disabled";
                 };
 
-                rtc@d8500 {
+                rtc: real-time-clock@d8500 {
                         compatible = "marvell,orion-rtc";
                         reg = <0xd8500 0x20>;
                 };
 
-                crypto: crypto@30000 {
+                crypto: crypto-engine@30000 {
                         compatible = "marvell,orion-crypto";
                         reg = <0x30000 0x10000>,
                               <0xc8000000 0x800>;
@@ -258,5 +470,40 @@
                                 dmacap,xor;
                         };
                 };
+
+                mdio: mdio-bus@72004 {
+                        compatible = "marvell,orion-mdio";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0x72004 0x84>;
+                        interrupts = <30>;
+                        clocks = <&gate_clk 2>;
+                        status = "disabled";
+
+                        ethphy: ethernet-phy {
+                                device-type = "ethernet-phy";
+                                /* set phy address in board file */
+                        };
+                };
+
+                eth: ethernet-controller@72000 {
+                        compatible = "marvell,orion-eth";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0x72000 0x4000>;
+                        clocks = <&gate_clk 2>;
+                        marvell,tx-checksum-limit = <1600>;
+                        status = "disabled";
+
+                        ethernet-port@0 {
+                                device_type = "network";
+                                compatible = "marvell,orion-eth-port";
+                                reg = <0>;
+                                interrupts = <29>;
+                                /* overwrite MAC address in bootloader */
+                                local-mac-address = [00 00 00 00 00 00];
+                                phy-handle = <&ethphy>;
+                        };
+                };
         };
 };
diff --git a/arch/arm/boot/dts/emev2-kzm9d-reference.dts b/arch/arm/boot/dts/emev2-kzm9d-reference.dts
new file mode 100644
index 000000000000..cceefda268b6
--- /dev/null
+++ b/arch/arm/boot/dts/emev2-kzm9d-reference.dts
@@ -0,0 +1,57 @@
+/*
+ * Device Tree Source for the KZM9D board
+ *
+ * Copyright (C) 2013 Renesas Solutions Corp.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+/dts-v1/;
+
+/include/ "emev2.dtsi"
+
+/ {
+        model = "EMEV2 KZM9D Board";
+        compatible = "renesas,kzm9d-reference", "renesas,emev2";
+
+        memory {
+                device_type = "memory";
+                reg = <0x40000000 0x8000000>;
+        };
+
+        chosen {
+                bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp";
+        };
+
+        reg_1p8v: regulator@0 {
+                compatible = "regulator-fixed";
+                regulator-name = "fixed-1.8V";
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <1800000>;
+                regulator-always-on;
+                regulator-boot-on;
+        };
+
+        reg_3p3v: regulator@1 {
+                compatible = "regulator-fixed";
+                regulator-name = "fixed-3.3V";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                regulator-always-on;
+                regulator-boot-on;
+        };
+
+        lan9220@20000000 {
+                compatible = "smsc,lan9220", "smsc,lan9115";
+                reg = <0x20000000 0x10000>;
+                phy-mode = "mii";
+                interrupt-parent = <&gpio0>;
+                interrupts = <1 1>;     /* active high */
+                reg-io-width = <4>;
+                smsc,irq-active-high;
+                smsc,irq-push-pull;
+                vddvario-supply = <&reg_1p8v>;
+                vdd33a-supply = <&reg_3p3v>;
+        };
+};
diff --git a/arch/arm/boot/dts/emev2-kzm9d.dts b/arch/arm/boot/dts/emev2-kzm9d.dts
index b9b3241f173b..f92e812fdd9f 100644
--- a/arch/arm/boot/dts/emev2-kzm9d.dts
+++ b/arch/arm/boot/dts/emev2-kzm9d.dts
@@ -21,6 +21,6 @@
         };
 
         chosen {
-                bootargs = "console=tty0 console=ttyS1,115200n81 earlyprintk=serial8250-em.1,115200n81 mem=128M@0x40000000 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096";
+                bootargs = "console=ttyS1,115200n81 ignore_loglevel root=/dev/nfs ip=dhcp";
         };
 };
diff --git a/arch/arm/boot/dts/emev2.dtsi b/arch/arm/boot/dts/emev2.dtsi
index c8a8c08b48dd..9063a4434d6a 100644
--- a/arch/arm/boot/dts/emev2.dtsi
+++ b/arch/arm/boot/dts/emev2.dtsi
@@ -14,6 +14,14 @@
         compatible = "renesas,emev2";
         interrupt-parent = <&gic>;
 
+        aliases {
+                gpio0 = &gpio0;
+                gpio1 = &gpio1;
+                gpio2 = &gpio2;
+                gpio3 = &gpio3;
+                gpio4 = &gpio4;
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
@@ -38,6 +46,12 @@
                       <0xe0020000 0x0100>;
         };
 
+        pmu {
+                compatible = "arm,cortex-a9-pmu";
+                interrupts = <0 120 4>,
+                             <0 121 4>;
+        };
+
         sti@e0180000 {
                 compatible = "renesas,em-sti";
                 reg = <0xe0180000 0x54>;
@@ -67,4 +81,55 @@
                 reg = <0xe1050000 0x38>;
                 interrupts = <0 11 0>;
         };
+
+        gpio0: gpio@e0050000 {
+                compatible = "renesas,em-gio";
+                reg = <0xe0050000 0x2c>, <0xe0050040 0x20>;
+                interrupts = <0 67 0>, <0 68 0>;
+                gpio-controller;
+                #gpio-cells = <2>;
+                ngpios = <32>;
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+        gpio1: gpio@e0050080 {
+                compatible = "renesas,em-gio";
+                reg = <0xe0050080 0x2c>, <0xe00500c0 0x20>;
+                interrupts = <0 69 0>, <0 70 0>;
+                gpio-controller;
+                #gpio-cells = <2>;
+                ngpios = <32>;
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+        gpio2: gpio@e0050100 {
+                compatible = "renesas,em-gio";
+                reg = <0xe0050100 0x2c>, <0xe0050140 0x20>;
+                interrupts = <0 71 0>, <0 72 0>;
+                gpio-controller;
+                #gpio-cells = <2>;
+                ngpios = <32>;
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+        gpio3: gpio@e0050180 {
+                compatible = "renesas,em-gio";
+                reg = <0xe0050180 0x2c>, <0xe00501c0 0x20>;
+                interrupts = <0 73 0>, <0 74 0>;
+                gpio-controller;
+                #gpio-cells = <2>;
+                ngpios = <32>;
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
+        gpio4: gpio@e0050200 {
+                compatible = "renesas,em-gio";
+                reg = <0xe0050200 0x2c>, <0xe0050240 0x20>;
+                interrupts = <0 75 0>, <0 76 0>;
+                gpio-controller;
+                #gpio-cells = <2>;
+                ngpios = <31>;
+                interrupt-controller;
+                #interrupt-cells = <2>;
+        };
 };
diff --git a/arch/arm/boot/dts/exynos4.dtsi b/arch/arm/boot/dts/exynos4.dtsi
index 3f94fe8e3706..caadc0257342 100644
--- a/arch/arm/boot/dts/exynos4.dtsi
+++ b/arch/arm/boot/dts/exynos4.dtsi
@@ -36,6 +36,12 @@
                 i2c5 = &i2c_5;
                 i2c6 = &i2c_6;
                 i2c7 = &i2c_7;
+                csis0 = &csis_0;
+                csis1 = &csis_1;
+                fimc0 = &fimc_0;
+                fimc1 = &fimc_1;
+                fimc2 = &fimc_2;
+                fimc3 = &fimc_3;
         };
 
         chipid@10000000 {
@@ -92,6 +98,88 @@
                 reg = <0x10010000 0x400>;
         };
 
+        camera {
+                compatible = "samsung,fimc", "simple-bus";
+                status = "disabled";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+
+                clock_cam: clock-controller {
+                         #clock-cells = <1>;
+                };
+
+                fimc_0: fimc@11800000 {
+                        compatible = "samsung,exynos4210-fimc";
+                        reg = <0x11800000 0x1000>;
+                        interrupts = <0 84 0>;
+                        clocks = <&clock 256>, <&clock 128>;
+                        clock-names = "fimc", "sclk_fimc";
+                        samsung,power-domain = <&pd_cam>;
+                        samsung,sysreg = <&sys_reg>;
+                        status = "disabled";
+                };
+
+                fimc_1: fimc@11810000 {
+                        compatible = "samsung,exynos4210-fimc";
+                        reg = <0x11810000 0x1000>;
+                        interrupts = <0 85 0>;
+                        clocks = <&clock 257>, <&clock 129>;
+                        clock-names = "fimc", "sclk_fimc";
+                        samsung,power-domain = <&pd_cam>;
+                        samsung,sysreg = <&sys_reg>;
+                        status = "disabled";
+                };
+
+                fimc_2: fimc@11820000 {
+                        compatible = "samsung,exynos4210-fimc";
+                        reg = <0x11820000 0x1000>;
+                        interrupts = <0 86 0>;
+                        clocks = <&clock 258>, <&clock 130>;
+                        clock-names = "fimc", "sclk_fimc";
+                        samsung,power-domain = <&pd_cam>;
+                        samsung,sysreg = <&sys_reg>;
+                        status = "disabled";
+                };
+
+                fimc_3: fimc@11830000 {
+                        compatible = "samsung,exynos4210-fimc";
+                        reg = <0x11830000 0x1000>;
+                        interrupts = <0 87 0>;
+                        clocks = <&clock 259>, <&clock 131>;
+                        clock-names = "fimc", "sclk_fimc";
+                        samsung,power-domain = <&pd_cam>;
+                        samsung,sysreg = <&sys_reg>;
+                        status = "disabled";
+                };
+
+                csis_0: csis@11880000 {
+                        compatible = "samsung,exynos4210-csis";
+                        reg = <0x11880000 0x4000>;
+                        interrupts = <0 78 0>;
+                        clocks = <&clock 260>, <&clock 134>;
+                        clock-names = "csis", "sclk_csis";
+                        bus-width = <4>;
+                        samsung,power-domain = <&pd_cam>;
+                        status = "disabled";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                };
+
+                csis_1: csis@11890000 {
+                        compatible = "samsung,exynos4210-csis";
+                        reg = <0x11890000 0x4000>;
+                        interrupts = <0 80 0>;
+                        clocks = <&clock 261>, <&clock 135>;
+                        clock-names = "csis", "sclk_csis";
+                        bus-width = <2>;
+                        samsung,power-domain = <&pd_cam>;
+                        status = "disabled";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                };
+        };
+
         watchdog@10060000 {
                 compatible = "samsung,s3c2410-wdt";
                 reg = <0x10060000 0x100>;
@@ -155,13 +243,31 @@
                 status = "disabled";
         };
 
+        ehci@12580000 {
+                compatible = "samsung,exynos4210-ehci";
+                reg = <0x12580000 0x100>;
+                interrupts = <0 70 0>;
+                clocks = <&clock 304>;
+                clock-names = "usbhost";
+                status = "disabled";
+        };
+
+        ohci@12590000 {
+                compatible = "samsung,exynos4210-ohci";
+                reg = <0x12590000 0x100>;
+                interrupts = <0 70 0>;
+                clocks = <&clock 304>;
+                clock-names = "usbhost";
+                status = "disabled";
+        };
+
         mfc: codec@13400000 {
                 compatible = "samsung,mfc-v5";
                 reg = <0x13400000 0x10000>;
                 interrupts = <0 94 0>;
                 samsung,power-domain = <&pd_mfc>;
-                clocks = <&clock 170>, <&clock 273>;
-                clock-names = "sclk_mfc", "mfc";
+                clocks = <&clock 273>;
+                clock-names = "mfc";
                 status = "disabled";
         };
 
@@ -297,8 +403,8 @@
                 compatible = "samsung,exynos4210-spi";
                 reg = <0x13920000 0x100>;
                 interrupts = <0 66 0>;
-                tx-dma-channel = <&pdma0 7>; /* preliminary */
-                rx-dma-channel = <&pdma0 6>; /* preliminary */
+                dmas = <&pdma0 7>, <&pdma0 6>;
+                dma-names = "tx", "rx";
                 #address-cells = <1>;
                 #size-cells = <0>;
                 clocks = <&clock 327>, <&clock 159>;
@@ -312,8 +418,8 @@
                 compatible = "samsung,exynos4210-spi";
                 reg = <0x13930000 0x100>;
                 interrupts = <0 67 0>;
-                tx-dma-channel = <&pdma1 7>; /* preliminary */
-                rx-dma-channel = <&pdma1 6>; /* preliminary */
+                dmas = <&pdma1 7>, <&pdma1 6>;
+                dma-names = "tx", "rx";
                 #address-cells = <1>;
                 #size-cells = <0>;
                 clocks = <&clock 328>, <&clock 160>;
@@ -327,8 +433,8 @@
                 compatible = "samsung,exynos4210-spi";
                 reg = <0x13940000 0x100>;
                 interrupts = <0 68 0>;
-                tx-dma-channel = <&pdma0 9>; /* preliminary */
-                rx-dma-channel = <&pdma0 8>; /* preliminary */
+                dmas = <&pdma0 9>, <&pdma0 8>;
+                dma-names = "tx", "rx";
                 #address-cells = <1>;
                 #size-cells = <0>;
                 clocks = <&clock 329>, <&clock 161>;
@@ -342,6 +448,8 @@
                 compatible = "samsung,exynos4210-pwm";
                 reg = <0x139D0000 0x1000>;
                 interrupts = <0 37 0>, <0 38 0>, <0 39 0>, <0 40 0>, <0 41 0>;
+                clocks = <&clock 336>;
+                clock-names = "timers";
                 #pwm-cells = <2>;
                 status = "disabled";
         };
diff --git a/arch/arm/boot/dts/exynos4210-pinctrl.dtsi b/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
index 553bceae8967..a7c212891674 100644
--- a/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4210-pinctrl.dtsi
@@ -797,6 +797,29 @@
                         samsung,pin-pud = <0>;
                         samsung,pin-drv = <0>;
                 };
+
+                cam_port_a_io: cam-port-a-io {
+                        samsung,pins = "gpj0-0", "gpj0-1", "gpj0-2", "gpj0-3",
+                                        "gpj0-4", "gpj0-5", "gpj0-6", "gpj0-7",
+                                        "gpj1-0", "gpj1-1", "gpj1-2", "gpj1-4";
+                        samsung,pin-function = <2>;
+                        samsung,pin-pud = <0>;
+                        samsung,pin-drv = <0>;
+                };
+
+                cam_port_a_clk_active: cam-port-a-clk-active {
+                        samsung,pins = "gpj1-3";
+                        samsung,pin-function = <2>;
+                        samsung,pin-pud = <0>;
+                        samsung,pin-drv = <3>;
+                };
+
+                cam_port_a_clk_idle: cam-port-a-clk-idle {
+                        samsung,pins = "gpj1-3";
+                        samsung,pin-function = <0>;
+                        samsung,pin-pud = <1>;
+                        samsung,pin-drv = <0>;
+                };
         };
 
         pinctrl@03860000 {
diff --git a/arch/arm/boot/dts/exynos4210-trats.dts b/arch/arm/boot/dts/exynos4210-trats.dts
index 94eebffe3044..1c164f234bcc 100644
--- a/arch/arm/boot/dts/exynos4210-trats.dts
+++ b/arch/arm/boot/dts/exynos4210-trats.dts
@@ -30,13 +30,62 @@
                 bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rootwait earlyprintk panic=5";
         };
 
-        vemmc_reg: voltage-regulator@0 {
-                compatible = "regulator-fixed";
-                regulator-name = "VMEM_VDD_2.8V";
-                regulator-min-microvolt = <2800000>;
-                regulator-max-microvolt = <2800000>;
-                gpio = <&gpk0 2 0>;
-                enable-active-high;
+        regulators {
+                compatible = "simple-bus";
+
+                vemmc_reg: regulator-0 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "VMEM_VDD_2.8V";
+                        regulator-min-microvolt = <2800000>;
+                        regulator-max-microvolt = <2800000>;
+                        gpio = <&gpk0 2 0>;
+                        enable-active-high;
+                };
+
+                tsp_reg: regulator-1 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "TSP_FIXED_VOLTAGES";
+                        regulator-min-microvolt = <2800000>;
+                        regulator-max-microvolt = <2800000>;
+                        gpio = <&gpl0 3 0>;
+                        enable-active-high;
+                };
+
+                cam_af_28v_reg: regulator-2 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "8M_AF_2.8V_EN";
+                        regulator-min-microvolt = <2800000>;
+                        regulator-max-microvolt = <2800000>;
+                        gpio = <&gpk1 1 0>;
+                        enable-active-high;
+                };
+
+                cam_io_en_reg: regulator-3 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "CAM_IO_EN";
+                        regulator-min-microvolt = <2800000>;
+                        regulator-max-microvolt = <2800000>;
+                        gpio = <&gpe2 1 0>;
+                        enable-active-high;
+                };
+
+                cam_io_12v_reg: regulator-4 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "8M_1.2V_EN";
+                        regulator-min-microvolt = <1200000>;
+                        regulator-max-microvolt = <1200000>;
+                        gpio = <&gpe2 5 0>;
+                        enable-active-high;
+                };
+
+                vt_core_15v_reg: regulator-5 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "VT_CORE_1.5V";
+                        regulator-min-microvolt = <1500000>;
+                        regulator-max-microvolt = <1500000>;
+                        gpio = <&gpe2 2 0>;
+                        enable-active-high;
+                };
         };
 
         sdhci_emmc: sdhci@12510000 {
@@ -97,15 +146,6 @@
                 };
         };
 
-        tsp_reg: voltage-regulator {
-                compatible = "regulator-fixed";
-                regulator-name = "TSP_FIXED_VOLTAGES";
-                regulator-min-microvolt = <2800000>;
-                regulator-max-microvolt = <2800000>;
-                gpio = <&gpl0 3 0>;
-                enable-active-high;
-        };
-
         i2c@13890000 {
                 samsung,i2c-sda-delay = <100>;
                 samsung,i2c-slave-addr = <0x10>;
@@ -218,6 +258,12 @@
                                      regulator-always-on;
                                 };
 
+                                vtcam_reg: LDO12 {
+                                     regulator-name = "VT_CAM_1.8V";
+                                     regulator-min-microvolt = <1800000>;
+                                     regulator-max-microvolt = <1800000>;
+                                };
+
                                 vcclcd_reg: LDO13 {
                                      regulator-name = "VCC_3.3V_LCD";
                                      regulator-min-microvolt = <3300000>;
@@ -301,4 +347,26 @@
                         clock-frequency = <24000000>;
                 };
         };
+
+        camera {
+                pinctrl-names = "default";
+                pinctrl-0 = <>;
+                status = "okay";
+
+                fimc_0: fimc@11800000 {
+                        status = "okay";
+                };
+
+                fimc_1: fimc@11810000 {
+                        status = "okay";
+                };
+
+                fimc_2: fimc@11820000 {
+                        status = "okay";
+                };
+
+                fimc_3: fimc@11830000 {
+                        status = "okay";
+                };
+        };
 };
diff --git a/arch/arm/boot/dts/exynos4210.dtsi b/arch/arm/boot/dts/exynos4210.dtsi
index b7f358a93bcb..057d6829d319 100644
--- a/arch/arm/boot/dts/exynos4210.dtsi
+++ b/arch/arm/boot/dts/exynos4210.dtsi
@@ -72,7 +72,7 @@
                 };
         };
 
-        clock: clock-controller@0x10030000 {
+        clock: clock-controller@10030000 {
                 compatible = "samsung,exynos4210-clock";
                 reg = <0x10030000 0x20000>;
                 #clock-cells = <1>;
@@ -125,4 +125,34 @@
                 clock-names = "sclk_fimg2d", "fimg2d";
                 status = "disabled";
         };
+
+        camera {
+                clocks = <&clock 132>, <&clock 133>, <&clock 351>, <&clock 352>;
+                clock-names = "sclk_cam0", "sclk_cam1", "pxl_async0", "pxl_async1";
+
+                fimc_0: fimc@11800000 {
+                        samsung,pix-limits = <4224 8192 1920 4224>;
+                        samsung,mainscaler-ext;
+                        samsung,cam-if;
+                };
+
+                fimc_1: fimc@11810000 {
+                        samsung,pix-limits = <4224 8192 1920 4224>;
+                        samsung,mainscaler-ext;
+                        samsung,cam-if;
+                };
+
+                fimc_2: fimc@11820000 {
+                        samsung,pix-limits = <4224 8192 1920 4224>;
+                        samsung,mainscaler-ext;
+                        samsung,lcd-wb;
+                };
+
+                fimc_3: fimc@11830000 {
+                        samsung,pix-limits = <1920 8192 1366 1920>;
+                        samsung,rotators = <0>;
+                        samsung,mainscaler-ext;
+                        samsung,lcd-wb;
+                };
+        };
 };
diff --git a/arch/arm/boot/dts/exynos4412-origen.dts b/arch/arm/boot/dts/exynos4412-origen.dts
index 7993641cb32a..8768b03702e5 100644
--- a/arch/arm/boot/dts/exynos4412-origen.dts
+++ b/arch/arm/boot/dts/exynos4412-origen.dts
@@ -27,6 +27,11 @@
                 bootargs ="console=ttySAC2,115200";
         };
 
+        firmware@0203F000 {
+                compatible = "samsung,secure-firmware";
+                reg = <0x0203F000 0x1000>;
+        };
+
         mmc_reg: voltage-regulator {
                 compatible = "regulator-fixed";
                 regulator-name = "VMEM_VDD_2.8V";
diff --git a/arch/arm/boot/dts/exynos4412-trats2.dts b/arch/arm/boot/dts/exynos4412-trats2.dts
new file mode 100644
index 000000000000..fb7b9ae5f399
--- /dev/null
+++ b/arch/arm/boot/dts/exynos4412-trats2.dts
@@ -0,0 +1,579 @@
+/*
+ * Samsung's Exynos4412 based Trats 2 board device tree source
+ *
+ * Copyright (c) 2013 Samsung Electronics Co., Ltd.
+ *              http://www.samsung.com
+ *
+ * Device tree source file for Samsung's Trats 2 board which is based on
+ * Samsung's Exynos4412 SoC.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+*/
+
+/dts-v1/;
+#include "exynos4412.dtsi"
+
+/ {
+        model = "Samsung Trats 2 based on Exynos4412";
+        compatible = "samsung,trats2", "samsung,exynos4412";
+
+        aliases {
+                i2c8 = &i2c_ak8975;
+        };
+
+        memory {
+                reg =  <0x40000000 0x40000000>;
+        };
+
+        chosen {
+                bootargs = "console=ttySAC2,115200N8 root=/dev/mmcblk0p5 rootwait earlyprintk panic=5";
+        };
+
+        firmware@0204F000 {
+                compatible = "samsung,secure-firmware";
+                reg = <0x0204F000 0x1000>;
+        };
+
+        fixed-rate-clocks {
+                xxti {
+                        compatible = "samsung,clock-xxti", "fixed-clock";
+                        clock-frequency = <0>;
+                };
+
+                xusbxti {
+                        compatible = "samsung,clock-xusbxti", "fixed-clock";
+                        clock-frequency = <24000000>;
+                };
+        };
+
+        regulators {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                vemmc_reg: regulator-0 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "VMEM_VDD_2.8V";
+                        regulator-min-microvolt = <2800000>;
+                        regulator-max-microvolt = <2800000>;
+                        gpio = <&gpk0 2 0>;
+                        enable-active-high;
+                };
+
+                cam_io_reg: voltage-regulator-1 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "CAM_SENSOR_A";
+                        regulator-min-microvolt = <2800000>;
+                        regulator-max-microvolt = <2800000>;
+                        gpio = <&gpm0 2 0>;
+                        enable-active-high;
+                };
+
+                /* More to come */
+        };
+
+        gpio-keys {
+                compatible = "gpio-keys";
+
+                key-down {
+                        interrupt-parent = <&gpj1>;
+                        interrupts = <2 0>;
+                        gpios = <&gpj1 2 1>;
+                        linux,code = <114>;
+                        label = "volume down";
+                        debounce-interval = <10>;
+                };
+
+                key-up {
+                        interrupt-parent = <&gpj1>;
+                        interrupts = <1 0>;
+                        gpios = <&gpj1 1 1>;
+                        linux,code = <115>;
+                        label = "volume up";
+                        debounce-interval = <10>;
+                };
+
+                key-power {
+                        interrupt-parent = <&gpx2>;
+                        interrupts = <7 0>;
+                        gpios = <&gpx2 7 1>;
+                        linux,code = <116>;
+                        label = "power";
+                        debounce-interval = <10>;
+                        gpio-key,wakeup;
+                };
+        };
+
+        i2c@13890000 {
+                samsung,i2c-sda-delay = <100>;
+                samsung,i2c-slave-addr = <0x10>;
+                samsung,i2c-max-bus-freq = <400000>;
+                pinctrl-0 = <&i2c3_bus>;
+                pinctrl-names = "default";
+                status = "okay";
+
+                mms114-touchscreen@48 {
+                        compatible = "melfas,mms114";
+                        reg = <0x48>;
+                        interrupt-parent = <&gpm2>;
+                        interrupts = <3 2>;
+                        x-size = <720>;
+                        y-size = <1280>;
+                        avdd-supply = <&ldo23_reg>;
+                        vdd-supply = <&ldo24_reg>;
+                };
+        };
+
+        i2c@138D0000 {
+                samsung,i2c-sda-delay = <100>;
+                samsung,i2c-slave-addr = <0x10>;
+                samsung,i2c-max-bus-freq = <100000>;
+                pinctrl-0 = <&i2c7_bus>;
+                pinctrl-names = "default";
+                status = "okay";
+
+                max77686_pmic@09 {
+                        compatible = "maxim,max77686";
+                        interrupt-parent = <&gpx0>;
+                        interrupts = <7 0>;
+                        reg = <0x09>;
+
+                        voltage-regulators {
+                                ldo1_reg: ldo1 {
+                                        regulator-compatible = "LDO1";
+                                        regulator-name = "VALIVE_1.0V_AP";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1000000>;
+                                        regulator-always-on;
+                                        regulator-mem-on;
+                                };
+
+                                ldo2_reg: ldo2 {
+                                        regulator-compatible = "LDO2";
+                                        regulator-name = "VM1M2_1.2V_AP";
+                                        regulator-min-microvolt = <1200000>;
+                                        regulator-max-microvolt = <1200000>;
+                                        regulator-always-on;
+                                        regulator-mem-on;
+                                };
+
+                                ldo3_reg: ldo3 {
+                                        regulator-compatible = "LDO3";
+                                        regulator-name = "VCC_1.8V_AP";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                        regulator-mem-on;
+                                };
+
+                                ldo4_reg: ldo4 {
+                                        regulator-compatible = "LDO4";
+                                        regulator-name = "VCC_2.8V_AP";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                        regulator-always-on;
+                                        regulator-mem-on;
+                                };
+
+                                ldo5_reg: ldo5 {
+                                        regulator-compatible = "LDO5";
+                                        regulator-name = "VCC_1.8V_IO";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-always-on;
+                                        regulator-mem-on;
+                                };
+
+                                ldo6_reg: ldo6 {
+                                        regulator-compatible = "LDO6";
+                                        regulator-name = "VMPLL_1.0V_AP";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1000000>;
+                                        regulator-always-on;
+                                        regulator-mem-on;
+                                };
+
+                                ldo7_reg: ldo7 {
+                                        regulator-compatible = "LDO7";
+                                        regulator-name = "VPLL_1.0V_AP";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1000000>;
+                                        regulator-always-on;
+                                        regulator-mem-on;
+                                };
+
+                                ldo8_reg: ldo8 {
+                                        regulator-compatible = "LDO8";
+                                        regulator-name = "VMIPI_1.0V";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1000000>;
+                                        regulator-mem-off;
+                                };
+
+                                ldo9_reg: ldo9 {
+                                        regulator-compatible = "LDO9";
+                                        regulator-name = "CAM_ISP_MIPI_1.2V";
+                                        regulator-min-microvolt = <1200000>;
+                                        regulator-max-microvolt = <1200000>;
+                                        regulator-mem-idle;
+                                };
+
+                                ldo10_reg: ldo10 {
+                                        regulator-compatible = "LDO10";
+                                        regulator-name = "VMIPI_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-mem-off;
+                                };
+
+                                ldo11_reg: ldo11 {
+                                        regulator-compatible = "LDO11";
+                                        regulator-name = "VABB1_1.95V";
+                                        regulator-min-microvolt = <1950000>;
+                                        regulator-max-microvolt = <1950000>;
+                                        regulator-always-on;
+                                        regulator-mem-off;
+                                };
+
+                                ldo12_reg: ldo12 {
+                                        regulator-compatible = "LDO12";
+                                        regulator-name = "VUOTG_3.0V";
+                                        regulator-min-microvolt = <3000000>;
+                                        regulator-max-microvolt = <3000000>;
+                                        regulator-mem-off;
+                                };
+
+                                ldo13_reg: ldo13 {
+                                        regulator-compatible = "LDO13";
+                                        regulator-name = "NFC_AVDD_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-mem-idle;
+                                };
+
+                                ldo14_reg: ldo14 {
+                                        regulator-compatible = "LDO14";
+                                        regulator-name = "VABB2_1.95V";
+                                        regulator-min-microvolt = <1950000>;
+                                        regulator-max-microvolt = <1950000>;
+                                        regulator-always-on;
+                                        regulator-mem-off;
+                                };
+
+                                ldo15_reg: ldo15 {
+                                        regulator-compatible = "LDO15";
+                                        regulator-name = "VHSIC_1.0V";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1000000>;
+                                        regulator-mem-off;
+                                };
+
+                                ldo16_reg: ldo16 {
+                                        regulator-compatible = "LDO16";
+                                        regulator-name = "VHSIC_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-mem-off;
+                                };
+
+                                ldo17_reg: ldo17 {
+                                        regulator-compatible = "LDO17";
+                                        regulator-name = "CAM_SENSOR_CORE_1.2V";
+                                        regulator-min-microvolt = <1200000>;
+                                        regulator-max-microvolt = <1200000>;
+                                        regulator-mem-idle;
+                                };
+
+                                ldo18_reg: ldo18 {
+                                        regulator-compatible = "LDO18";
+                                        regulator-name = "CAM_ISP_SEN_IO_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-mem-idle;
+                                };
+
+                                ldo19_reg: ldo19 {
+                                        regulator-compatible = "LDO19";
+                                        regulator-name = "VT_CAM_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-mem-idle;
+                                };
+
+                                ldo20_reg: ldo20 {
+                                        regulator-compatible = "LDO20";
+                                        regulator-name = "VDDQ_PRE_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-mem-idle;
+                                };
+
+                                ldo21_reg: ldo21 {
+                                        regulator-compatible = "LDO21";
+                                        regulator-name = "VTF_2.8V";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                        regulator-mem-idle;
+                                };
+
+                                ldo22_reg: ldo22 {
+                                        regulator-compatible = "LDO22";
+                                        regulator-name = "VMEM_VDD_2.8V";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                        regulator-always-on;
+                                        regulator-mem-off;
+                                };
+
+                                ldo23_reg: ldo23 {
+                                        regulator-compatible = "LDO23";
+                                        regulator-name = "TSP_AVDD_3.3V";
+                                        regulator-min-microvolt = <3300000>;
+                                        regulator-max-microvolt = <3300000>;
+                                        regulator-mem-idle;
+                                };
+
+                                ldo24_reg: ldo24 {
+                                        regulator-compatible = "LDO24";
+                                        regulator-name = "TSP_VDD_1.8V";
+                                        regulator-min-microvolt = <1800000>;
+                                        regulator-max-microvolt = <1800000>;
+                                        regulator-mem-idle;
+                                };
+
+                                ldo25_reg: ldo25 {
+                                        regulator-compatible = "LDO25";
+                                        regulator-name = "LCD_VCC_3.3V";
+                                        regulator-min-microvolt = <2800000>;
+                                        regulator-max-microvolt = <2800000>;
+                                        regulator-mem-idle;
+                                };
+
+                                ldo26_reg: ldo26 {
+                                        regulator-compatible = "LDO26";
+                                        regulator-name = "MOTOR_VCC_3.0V";
+                                        regulator-min-microvolt = <3000000>;
+                                        regulator-max-microvolt = <3000000>;
+                                        regulator-mem-idle;
+                                };
+
+                                buck1_reg: buck1 {
+                                        regulator-compatible = "BUCK1";
+                                        regulator-name = "vdd_mif";
+                                        regulator-min-microvolt = <850000>;
+                                        regulator-max-microvolt = <1100000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                        regulator-mem-off;
+                                };
+
+                                buck2_reg: buck2 {
+                                        regulator-compatible = "BUCK2";
+                                        regulator-name = "vdd_arm";
+                                        regulator-min-microvolt = <850000>;
+                                        regulator-max-microvolt = <1500000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                        regulator-mem-off;
+                                };
+
+                                buck3_reg: buck3 {
+                                        regulator-compatible = "BUCK3";
+                                        regulator-name = "vdd_int";
+                                        regulator-min-microvolt = <850000>;
+                                        regulator-max-microvolt = <1150000>;
+                                        regulator-always-on;
+                                        regulator-boot-on;
+                                        regulator-mem-off;
+                                };
+
+                                buck4_reg: buck4 {
+                                        regulator-compatible = "BUCK4";
+                                        regulator-name = "vdd_g3d";
+                                        regulator-min-microvolt = <850000>;
+                                        regulator-max-microvolt = <1150000>;
+                                        regulator-boot-on;
+                                        regulator-mem-off;
+                                };
+
+                                buck5_reg: buck5 {
+                                        regulator-compatible = "BUCK5";
+                                        regulator-name = "VMEM_1.2V_AP";
+                                        regulator-min-microvolt = <1200000>;
+                                        regulator-max-microvolt = <1200000>;
+                                        regulator-always-on;
+                                };
+
+                                buck6_reg: buck6 {
+                                        regulator-compatible = "BUCK6";
+                                        regulator-name = "VCC_SUB_1.35V";
+                                        regulator-min-microvolt = <1350000>;
+                                        regulator-max-microvolt = <1350000>;
+                                        regulator-always-on;
+                                };
+
+                                buck7_reg: buck7 {
+                                        regulator-compatible = "BUCK7";
+                                        regulator-name = "VCC_SUB_2.0V";
+                                        regulator-min-microvolt = <2000000>;
+                                        regulator-max-microvolt = <2000000>;
+                                        regulator-always-on;
+                                };
+
+                                buck8_reg: buck8 {
+                                        regulator-compatible = "BUCK8";
+                                        regulator-name = "VMEM_VDDF_3.0V";
+                                        regulator-min-microvolt = <2850000>;
+                                        regulator-max-microvolt = <2850000>;
+                                        regulator-always-on;
+                                        regulator-mem-off;
+                                };
+
+                                buck9_reg: buck9 {
+                                        regulator-compatible = "BUCK9";
+                                        regulator-name = "CAM_ISP_CORE_1.2V";
+                                        regulator-min-microvolt = <1000000>;
+                                        regulator-max-microvolt = <1200000>;
+                                        regulator-mem-off;
+                                };
+                        };
+                };
+        };
+
+        sdhci@12510000 {
+                bus-width = <8>;
+                non-removable;
+                pinctrl-0 = <&sd0_clk &sd0_cmd &sd0_bus8>;
+                pinctrl-names = "default";
+                vmmc-supply = <&vemmc_reg>;
+                status = "okay";
+        };
+
+        serial@13800000 {
+                status = "okay";
+        };
+
+        serial@13810000 {
+                status = "okay";
+        };
+
+        serial@13820000 {
+                status = "okay";
+        };
+
+        serial@13830000 {
+                status = "okay";
+        };
+
+        i2c_ak8975: i2c-gpio-0 {
+                compatible = "i2c-gpio";
+                gpios = <&gpy2 4 0>, <&gpy2 5 0>;
+                i2c-gpio,delay-us = <2>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "okay";
+
+                ak8975@0c {
+                        compatible = "ak,ak8975";
+                        reg = <0x0c>;
+                        gpios = <&gpj0 7 0>;
+                };
+        };
+
+        spi_1: spi@13930000 {
+                pinctrl-names = "default";
+                pinctrl-0 = <&spi1_bus>;
+                status = "okay";
+
+                s5c73m3_spi: s5c73m3 {
+                        compatible = "samsung,s5c73m3";
+                        spi-max-frequency = <50000000>;
+                        reg = <0>;
+                        controller-data {
+                                cs-gpio = <&gpb 5 0>;
+                                samsung,spi-feedback-delay = <2>;
+                        };
+                };
+        };
+
+        camera {
+                pinctrl-0 = <&cam_port_b_clk_active>;
+                pinctrl-names = "default";
+                status = "okay";
+
+                fimc_0: fimc@11800000 {
+                        status = "okay";
+                };
+
+                fimc_1: fimc@11810000 {
+                        status = "okay";
+                };
+
+                fimc_2: fimc@11820000 {
+                        status = "okay";
+                };
+
+                fimc_3: fimc@11830000 {
+                        status = "okay";
+                };
+
+                csis_1: csis@11890000 {
+                        vddcore-supply = <&ldo8_reg>;
+                        vddio-supply = <&ldo10_reg>;
+                        clock-frequency = <160000000>;
+                        status = "okay";
+
+                        /* Camera D (4) MIPI CSI-2 (CSIS1) */
+                        port@4 {
+                                reg = <4>;
+                                csis1_ep: endpoint {
+                                        remote-endpoint = <&is_s5k6a3_ep>;
+                                        data-lanes = <1>;
+                                        samsung,csis-hs-settle = <18>;
+                                        samsung,csis-wclk;
+                                };
+                        };
+                };
+
+                fimc_lite_0: fimc-lite@12390000 {
+                        status = "okay";
+                };
+
+                fimc_lite_1: fimc-lite@123A0000 {
+                        status = "okay";
+                };
+
+                fimc-is@12000000 {
+                        pinctrl-0 = <&fimc_is_uart>;
+                        pinctrl-names = "default";
+                        status = "okay";
+
+                        i2c1_isp: i2c-isp@12140000 {
+                                pinctrl-0 = <&fimc_is_i2c1>;
+                                pinctrl-names = "default";
+
+                                s5k6a3@10 {
+                                        compatible = "samsung,s5k6a3";
+                                        reg = <0x10>;
+                                        svdda-supply = <&cam_io_reg>;
+                                        svddio-supply = <&ldo19_reg>;
+                                        clock-frequency = <24000000>;
+                                        /* CAM_B_CLKOUT */
+                                        clocks = <&clock_cam 1>;
+                                        clock-names = "mclk";
+                                        samsung,camclk-out = <1>;
+                                        gpios = <&gpm1 6 0>;
+
+                                        port {
+                                                is_s5k6a3_ep: endpoint {
+                                                        remote-endpoint = <&csis1_ep>;
+                                                        data-lanes = <1>;
+                                                };
+                                        };
+                                };
+                        };
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
index 704290f7c5c0..99b26df8dbc7 100644
--- a/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos4x12-pinctrl.dtsi
@@ -401,13 +401,26 @@
                         samsung,pin-drv = <0>;
                 };
 
-                cam_port_a: cam-port-a {
+                cam_port_a_io: cam-port-a-io {
                         samsung,pins = "gpj0-0", "gpj0-1", "gpj0-2", "gpj0-3",
                                         "gpj0-4", "gpj0-5", "gpj0-6", "gpj0-7",
-                                        "gpj1-0", "gpj1-1", "gpj1-2", "gpj1-3",
-                                        "gpj1-4";
+                                        "gpj1-0", "gpj1-1", "gpj1-2", "gpj1-4";
                         samsung,pin-function = <2>;
-                        samsung,pin-pud = <3>;
+                        samsung,pin-pud = <0>;
+                        samsung,pin-drv = <0>;
+                };
+
+                cam_port_a_clk_active: cam-port-a-clk-active {
+                        samsung,pins = "gpj1-3";
+                        samsung,pin-function = <2>;
+                        samsung,pin-pud = <0>;
+                        samsung,pin-drv = <3>;
+                };
+
+                cam_port_a_clk_idle: cam-port-a-clk-idle {
+                        samsung,pins = "gpj1-3";
+                        samsung,pin-function = <0>;
+                        samsung,pin-pud = <1>;
                         samsung,pin-drv = <0>;
                 };
         };
@@ -778,16 +791,29 @@
                         samsung,pin-drv = <3>;
                 };
 
-                cam_port_b: cam-port-b {
+                cam_port_b_io: cam-port-b-io {
                         samsung,pins = "gpm0-0", "gpm0-1", "gpm0-2", "gpm0-3",
                                         "gpm0-4", "gpm0-5", "gpm0-6", "gpm0-7",
-                                        "gpm1-0", "gpm1-1", "gpm2-0", "gpm2-1",
-                                        "gpm2-2";
+                                        "gpm1-0", "gpm1-1", "gpm2-0", "gpm2-1";
                         samsung,pin-function = <3>;
                         samsung,pin-pud = <3>;
                         samsung,pin-drv = <0>;
                 };
 
+                cam_port_b_clk_active: cam-port-b-clk-active {
+                        samsung,pins = "gpm2-2";
+                        samsung,pin-function = <3>;
+                        samsung,pin-pud = <0>;
+                        samsung,pin-drv = <3>;
+                };
+
+                cam_port_b_clk_idle: cam-port-b-clk-idle {
+                        samsung,pins = "gpm2-2";
+                        samsung,pin-function = <0>;
+                        samsung,pin-pud = <1>;
+                        samsung,pin-drv = <0>;
+                };
+
                 eint0: ext-int0 {
                         samsung,pins = "gpx0-0";
                         samsung,pin-function = <0xf>;
@@ -822,6 +848,27 @@
                         samsung,pin-pud = <0>;
                         samsung,pin-drv = <0>;
                 };
+
+                fimc_is_i2c0: fimc-is-i2c0 {
+                        samsung,pins = "gpm4-0", "gpm4-1";
+                        samsung,pin-function = <2>;
+                        samsung,pin-pud = <0>;
+                        samsung,pin-drv = <0>;
+                };
+
+                fimc_is_i2c1: fimc-is-i2c1 {
+                        samsung,pins = "gpm4-2", "gpm4-3";
+                        samsung,pin-function = <2>;
+                        samsung,pin-pud = <0>;
+                        samsung,pin-drv = <0>;
+                };
+
+                fimc_is_uart: fimc-is-uart {
+                        samsung,pins = "gpm3-5", "gpm3-7";
+                        samsung,pin-function = <3>;
+                        samsung,pin-pud = <0>;
+                        samsung,pin-drv = <0>;
+                };
         };
 
         pinctrl@03860000 {
diff --git a/arch/arm/boot/dts/exynos4x12.dtsi b/arch/arm/boot/dts/exynos4x12.dtsi
index 01da194ba329..ad531fe6ab95 100644
--- a/arch/arm/boot/dts/exynos4x12.dtsi
+++ b/arch/arm/boot/dts/exynos4x12.dtsi
@@ -26,9 +26,16 @@
                 pinctrl1 = &pinctrl_1;
                 pinctrl2 = &pinctrl_2;
                 pinctrl3 = &pinctrl_3;
+                fimc-lite0 = &fimc_lite_0;
+                fimc-lite1 = &fimc_lite_1;
         };
 
-        clock: clock-controller@0x10030000 {
+        pd_isp: isp-power-domain@10023CA0 {
+                compatible = "samsung,exynos4210-pd";
+                reg = <0x10023CA0 0x20>;
+        };
+
+        clock: clock-controller@10030000 {
                 compatible = "samsung,exynos4412-clock";
                 reg = <0x10030000 0x20000>;
                 #clock-cells = <1>;
@@ -73,4 +80,100 @@
                 clock-names = "sclk_fimg2d", "fimg2d";
                 status = "disabled";
         };
+
+        camera {
+                clocks = <&clock 132>, <&clock 133>, <&clock 351>, <&clock 352>;
+                clock-names = "sclk_cam0", "sclk_cam1", "pxl_async0", "pxl_async1";
+
+                fimc_0: fimc@11800000 {
+                        compatible = "samsung,exynos4212-fimc";
+                        samsung,pix-limits = <4224 8192 1920 4224>;
+                        samsung,mainscaler-ext;
+                        samsung,isp-wb;
+                        samsung,cam-if;
+                };
+
+                fimc_1: fimc@11810000 {
+                        compatible = "samsung,exynos4212-fimc";
+                        samsung,pix-limits = <4224 8192 1920 4224>;
+                        samsung,mainscaler-ext;
+                        samsung,isp-wb;
+                        samsung,cam-if;
+                };
+
+                fimc_2: fimc@11820000 {
+                        compatible = "samsung,exynos4212-fimc";
+                        samsung,pix-limits = <4224 8192 1920 4224>;
+                        samsung,mainscaler-ext;
+                        samsung,isp-wb;
+                        samsung,lcd-wb;
+                        samsung,cam-if;
+                };
+
+                fimc_3: fimc@11830000 {
+                        compatible = "samsung,exynos4212-fimc";
+                        samsung,pix-limits = <1920 8192 1366 1920>;
+                        samsung,rotators = <0>;
+                        samsung,mainscaler-ext;
+                        samsung,isp-wb;
+                        samsung,lcd-wb;
+                };
+
+                fimc_lite_0: fimc-lite@12390000 {
+                        compatible = "samsung,exynos4212-fimc-lite";
+                        reg = <0x12390000 0x1000>;
+                        interrupts = <0 105 0>;
+                        samsung,power-domain = <&pd_isp>;
+                        clocks = <&clock 353>;
+                        clock-names = "flite";
+                        status = "disabled";
+                };
+
+                fimc_lite_1: fimc-lite@123A0000 {
+                        compatible = "samsung,exynos4212-fimc-lite";
+                        reg = <0x123A0000 0x1000>;
+                        interrupts = <0 106 0>;
+                        samsung,power-domain = <&pd_isp>;
+                        clocks = <&clock 354>;
+                        clock-names = "flite";
+                        status = "disabled";
+                };
+
+                fimc_is: fimc-is@12000000 {
+                        compatible = "samsung,exynos4212-fimc-is", "simple-bus";
+                        reg = <0x12000000 0x260000>;
+                        interrupts = <0 90 0>, <0 95 0>;
+                        samsung,power-domain = <&pd_isp>;
+                        clocks = <&clock 353>, <&clock 354>, <&clock 355>,
+                                <&clock 356>, <&clock 17>, <&clock 357>,
+                                <&clock 358>, <&clock 359>, <&clock 360>,
+                                <&clock 450>,<&clock 451>, <&clock 452>,
+                                <&clock 453>, <&clock 176>, <&clock 13>,
+                                <&clock 454>, <&clock 395>, <&clock 455>;
+                        clock-names = "lite0", "lite1", "ppmuispx",
+                                      "ppmuispmx", "mpll", "isp",
+                                      "drc", "fd", "mcuisp",
+                                      "ispdiv0", "ispdiv1", "mcuispdiv0",
+                                      "mcuispdiv1", "uart", "aclk200",
+                                      "div_aclk200", "aclk400mcuisp",
+                                      "div_aclk400mcuisp";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        ranges;
+                        status = "disabled";
+
+                        pmu {
+                                reg = <0x10020000 0x3000>;
+                        };
+
+                        i2c1_isp: i2c-isp@12140000 {
+                                compatible = "samsung,exynos4212-i2c-isp";
+                                reg = <0x12140000 0x100>;
+                                clocks = <&clock 370>;
+                                clock-names = "i2c_isp";
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                        };
+                };
+        };
 };
diff --git a/arch/arm/boot/dts/exynos5.dtsi b/arch/arm/boot/dts/exynos5.dtsi
index f65e124c04a6..074739d39e2d 100644
--- a/arch/arm/boot/dts/exynos5.dtsi
+++ b/arch/arm/boot/dts/exynos5.dtsi
@@ -95,7 +95,7 @@
                 interrupts = <0 54 0>;
         };
 
-        rtc {
+        rtc@101E0000 {
                 compatible = "samsung,s3c6410-rtc";
                 reg = <0x101E0000 0x100>;
                 interrupts = <0 43 0>, <0 44 0>;
@@ -108,4 +108,23 @@
                 interrupts = <0 42 0>;
                 status = "disabled";
         };
+
+        fimd@14400000 {
+                compatible = "samsung,exynos5250-fimd";
+                interrupt-parent = <&combiner>;
+                reg = <0x14400000 0x40000>;
+                interrupt-names = "fifo", "vsync", "lcd_sys";
+                interrupts = <18 4>, <18 5>, <18 6>;
+                status = "disabled";
+        };
+
+        dp-controller@145B0000 {
+                compatible = "samsung,exynos5-dp";
+                reg = <0x145B0000 0x1000>;
+                interrupts = <10 3>;
+                interrupt-parent = <&combiner>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+                status = "disabled";
+        };
 };
diff --git a/arch/arm/boot/dts/exynos5250-arndale.dts b/arch/arm/boot/dts/exynos5250-arndale.dts
index abc7272c7afd..cee55fa33731 100644
--- a/arch/arm/boot/dts/exynos5250-arndale.dts
+++ b/arch/arm/boot/dts/exynos5250-arndale.dts
@@ -11,6 +11,7 @@
 
 /dts-v1/;
 #include "exynos5250.dtsi"
+#include <dt-bindings/interrupt-controller/irq.h>
 
 / {
         model = "Insignal Arndale evaluation board based on EXYNOS5250";
@@ -37,6 +38,28 @@
                 s5m8767_pmic@66 {
                         compatible = "samsung,s5m8767-pmic";
                         reg = <0x66>;
+                        interrupt-parent = <&gpx3>;
+                        interrupts = <2 IRQ_TYPE_LEVEL_LOW>;
+
+                        vinb1-supply = <&main_dc_reg>;
+                        vinb2-supply = <&main_dc_reg>;
+                        vinb3-supply = <&main_dc_reg>;
+                        vinb4-supply = <&main_dc_reg>;
+                        vinb5-supply = <&main_dc_reg>;
+                        vinb6-supply = <&main_dc_reg>;
+                        vinb7-supply = <&main_dc_reg>;
+                        vinb8-supply = <&main_dc_reg>;
+                        vinb9-supply = <&main_dc_reg>;
+
+                        vinl1-supply = <&buck7_reg>;
+                        vinl2-supply = <&buck7_reg>;
+                        vinl3-supply = <&buck7_reg>;
+                        vinl4-supply = <&main_dc_reg>;
+                        vinl5-supply = <&main_dc_reg>;
+                        vinl6-supply = <&main_dc_reg>;
+                        vinl7-supply = <&main_dc_reg>;
+                        vinl8-supply = <&buck8_reg>;
+                        vinl9-supply = <&buck8_reg>;
 
                         s5m8767,pmic-buck2-dvs-voltage = <1300000>;
                         s5m8767,pmic-buck3-dvs-voltage = <1100000>;
@@ -276,6 +299,16 @@
                                         op_mode = <1>;
                                 };
 
+                                buck7_reg: BUCK7 {
+                                        regulator-name = "PVDD_BUCK7";
+                                        regulator-always-on;
+                                };
+
+                                buck8_reg: BUCK8 {
+                                        regulator-name = "PVDD_BUCK8";
+                                        regulator-always-on;
+                                };
+
                                 buck9_reg: BUCK9 {
                                         regulator-name = "VDD_33_OFF_EXT1";
                                         regulator-min-microvolt = <750000>;
@@ -295,7 +328,22 @@
         };
 
         i2c@12C90000 {
-                status = "disabled";
+                wm1811a@1a {
+                        compatible = "wlf,wm1811";
+                        reg = <0x1a>;
+
+                        AVDD2-supply = <&main_dc_reg>;
+                        CPVDD-supply = <&main_dc_reg>;
+                        DBVDD1-supply = <&main_dc_reg>;
+                        DBVDD2-supply = <&main_dc_reg>;
+                        DBVDD3-supply = <&main_dc_reg>;
+                        LDO1VDD-supply = <&main_dc_reg>;
+                        SPKVDD1-supply = <&main_dc_reg>;
+                        SPKVDD2-supply = <&main_dc_reg>;
+
+                        wlf,ldo1ena = <&gpb0 0 0>;
+                        wlf,ldo2ena = <&gpb0 1 0>;
+                };
         };
 
         i2c@12CA0000 {
@@ -429,18 +477,29 @@
                 vdd-supply = <&ldo8_reg>;
         };
 
-        mmc_reg: voltage-regulator {
-                compatible = "regulator-fixed";
-                regulator-name = "VDD_33ON_2.8V";
-                regulator-min-microvolt = <2800000>;
-                regulator-max-microvolt = <2800000>;
-                gpio = <&gpx1 1 1>;
-                enable-active-high;
-        };
+        regulators {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                main_dc_reg: fixedregulator@1 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "MAIN_DC";
+                };
 
-        reg_hdmi_en: fixedregulator@0 {
-                compatible = "regulator-fixed";
-                regulator-name = "hdmi-en";
+                mmc_reg: voltage-regulator {
+                        compatible = "regulator-fixed";
+                        regulator-name = "VDD_33ON_2.8V";
+                        regulator-min-microvolt = <2800000>;
+                        regulator-max-microvolt = <2800000>;
+                        gpio = <&gpx1 1 1>;
+                        enable-active-high;
+                };
+
+                reg_hdmi_en: fixedregulator@0 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "hdmi-en";
+                };
         };
 
         fixed-rate-clocks {
@@ -450,16 +509,18 @@
                 };
         };
 
-        dp-controller {
+        dp-controller@145B0000 {
                 samsung,color-space = <0>;
                 samsung,dynamic-range = <0>;
                 samsung,ycbcr-coeff = <0>;
                 samsung,color-depth = <1>;
                 samsung,link-rate = <0x0a>;
                 samsung,lane-count = <4>;
+                status = "okay";
         };
 
         fimd: fimd@14400000 {
+                status = "okay";
                 display-timings {
                         native-mode = <&timing0>;
                         timing0: timing@0 {
@@ -477,7 +538,21 @@
                 };
         };
 
-        rtc {
-                status = "okay";
+        usb_hub_bus {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                // SMSC USB3503 connected in hardware only mode as a PHY
+                usb_hub: usb_hub {
+                        compatible = "smsc,usb3503a";
+
+                        reset-gpios = <&gpx3 5 1>;
+                        connect-gpios = <&gpd1 7 1>;
+                };
+        };
+
+        usb@12110000 {
+                usb-phy = <&usb2_phy>;
         };
 };
diff --git a/arch/arm/boot/dts/exynos5250-smdk5250.dts b/arch/arm/boot/dts/exynos5250-smdk5250.dts
index 49f18c24a576..2538b329f2ce 100644
--- a/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@ -250,7 +250,7 @@
                 samsung,vbus-gpio = <&gpx2 6 0>;
         };
 
-        dp-controller {
+        dp-controller@145B0000 {
                 samsung,color-space = <0>;
                 samsung,dynamic-range = <0>;
                 samsung,ycbcr-coeff = <0>;
@@ -260,21 +260,25 @@
 
                 pinctrl-names = "default";
                 pinctrl-0 = <&dp_hpd>;
+                status = "okay";
         };
 
-        display-timings {
-                native-mode = <&timing0>;
-                timing0: timing@0 {
-                        /* 1280x800 */
-                        clock-frequency = <50000>;
-                        hactive = <1280>;
-                        vactive = <800>;
-                        hfront-porch = <4>;
-                        hback-porch = <4>;
-                        hsync-len = <4>;
-                        vback-porch = <4>;
-                        vfront-porch = <4>;
-                        vsync-len = <4>;
+        fimd@14400000 {
+                status = "okay";
+                display-timings {
+                        native-mode = <&timing0>;
+                        timing0: timing@0 {
+                                /* 1280x800 */
+                                clock-frequency = <50000>;
+                                hactive = <1280>;
+                                vactive = <800>;
+                                hfront-porch = <4>;
+                                hback-porch = <4>;
+                                hsync-len = <4>;
+                                vback-porch = <4>;
+                                vfront-porch = <4>;
+                                vsync-len = <4>;
+                        };
                 };
         };
 
diff --git a/arch/arm/boot/dts/exynos5250-snow.dts b/arch/arm/boot/dts/exynos5250-snow.dts
index e79331dba12d..fd711e245e8d 100644
--- a/arch/arm/boot/dts/exynos5250-snow.dts
+++ b/arch/arm/boot/dts/exynos5250-snow.dts
@@ -171,10 +171,6 @@
                 };
         };
 
-        rtc {
-                status = "okay";
-        };
-
         /*
          * On Snow we've got SIP WiFi and so can keep drive strengths low to
          * reduce EMI.
diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi
index ef57277fc38f..7d7cc777ff7b 100644
--- a/arch/arm/boot/dts/exynos5250.dtsi
+++ b/arch/arm/boot/dts/exynos5250.dtsi
@@ -68,17 +68,17 @@
                 };
         };
 
-        pd_gsc: gsc-power-domain@0x10044000 {
+        pd_gsc: gsc-power-domain@10044000 {
                 compatible = "samsung,exynos4210-pd";
                 reg = <0x10044000 0x20>;
         };
 
-        pd_mfc: mfc-power-domain@0x10044040 {
+        pd_mfc: mfc-power-domain@10044040 {
                 compatible = "samsung,exynos4210-pd";
                 reg = <0x10044040 0x20>;
         };
 
-        clock: clock-controller@0x10010000 {
+        clock: clock-controller@10010000 {
                 compatible = "samsung,exynos5250-clock";
                 reg = <0x10010000 0x30000>;
                 #clock-cells = <1>;
@@ -163,16 +163,27 @@
                 clock-names = "watchdog";
         };
 
+        g2d@10850000 {
+                compatible = "samsung,exynos5250-g2d";
+                reg = <0x10850000 0x1000>;
+                interrupts = <0 91 0>;
+                clocks = <&clock 345>;
+                clock-names = "fimg2d";
+        };
+
         codec@11000000 {
                 compatible = "samsung,mfc-v6";
                 reg = <0x11000000 0x10000>;
                 interrupts = <0 96 0>;
                 samsung,power-domain = <&pd_mfc>;
+                clocks = <&clock 266>;
+                clock-names = "mfc";
         };
 
-        rtc {
+        rtc@101E0000 {
                 clocks = <&clock 337>;
                 clock-names = "rtc";
+                status = "okay";
         };
 
         tmu@10060000 {
@@ -405,7 +416,7 @@
         };
 
         i2s0: i2s@03830000 {
-                compatible = "samsung,i2s-v5";
+                compatible = "samsung,s5pv210-i2s";
                 reg = <0x03830000 0x100>;
                 dmas = <&pdma0 10
                         &pdma0 9
@@ -415,16 +426,13 @@
                         <&clock_audss EXYNOS_I2S_BUS>,
                         <&clock_audss EXYNOS_SCLK_I2S>;
                 clock-names = "iis", "i2s_opclk0", "i2s_opclk1";
-                samsung,supports-6ch;
-                samsung,supports-rstclr;
-                samsung,supports-secdai;
                 samsung,idma-addr = <0x03000000>;
                 pinctrl-names = "default";
                 pinctrl-0 = <&i2s0_bus>;
         };
 
         i2s1: i2s@12D60000 {
-                compatible = "samsung,i2s-v5";
+                compatible = "samsung,s3c6410-i2s";
                 reg = <0x12D60000 0x100>;
                 dmas = <&pdma1 12
                         &pdma1 11>;
@@ -436,7 +444,7 @@
         };
 
         i2s2: i2s@12D70000 {
-                compatible = "samsung,i2s-v5";
+                compatible = "samsung,s3c6410-i2s";
                 reg = <0x12D70000 0x100>;
                 dmas = <&pdma0 12
                         &pdma0 11>;
@@ -562,7 +570,7 @@
                 };
         };
 
-        gsc_0:  gsc@0x13e00000 {
+        gsc_0:  gsc@13e00000 {
                 compatible = "samsung,exynos5-gsc";
                 reg = <0x13e00000 0x1000>;
                 interrupts = <0 85 0>;
@@ -571,7 +579,7 @@
                 clock-names = "gscl";
         };
 
-        gsc_1:  gsc@0x13e10000 {
+        gsc_1:  gsc@13e10000 {
                 compatible = "samsung,exynos5-gsc";
                 reg = <0x13e10000 0x1000>;
                 interrupts = <0 86 0>;
@@ -580,7 +588,7 @@
                 clock-names = "gscl";
         };
 
-        gsc_2:  gsc@0x13e20000 {
+        gsc_2:  gsc@13e20000 {
                 compatible = "samsung,exynos5-gsc";
                 reg = <0x13e20000 0x1000>;
                 interrupts = <0 87 0>;
@@ -589,7 +597,7 @@
                 clock-names = "gscl";
         };
 
-        gsc_3:  gsc@0x13e30000 {
+        gsc_3:  gsc@13e30000 {
                 compatible = "samsung,exynos5-gsc";
                 reg = <0x13e30000 0x1000>;
                 interrupts = <0 88 0>;
@@ -614,29 +622,32 @@
                 interrupts = <0 94 0>;
         };
 
-        dp-controller {
-                compatible = "samsung,exynos5-dp";
-                reg = <0x145b0000 0x1000>;
-                interrupts = <10 3>;
-                interrupt-parent = <&combiner>;
+        dp_phy: video-phy@10040720 {
+                compatible = "samsung,exynos5250-dp-video-phy";
+                reg = <0x10040720 4>;
+                #phy-cells = <0>;
+        };
+
+        dp-controller@145B0000 {
                 clocks = <&clock 342>;
                 clock-names = "dp";
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                dptx-phy {
-                        reg = <0x10040720>;
-                        samsung,enable-mask = <1>;
-                };
+                phys = <&dp_phy>;
+                phy-names = "dp";
         };
 
-        fimd {
-                compatible = "samsung,exynos5250-fimd";
-                interrupt-parent = <&combiner>;
-                reg = <0x14400000 0x40000>;
-                interrupt-names = "fifo", "vsync", "lcd_sys";
-                interrupts = <18 4>, <18 5>, <18 6>;
+        fimd@14400000 {
                 clocks = <&clock 133>, <&clock 339>;
                 clock-names = "sclk_fimd", "fimd";
         };
+
+        adc: adc@12D10000 {
+                compatible = "samsung,exynos-adc-v1";
+                reg = <0x12D10000 0x100>, <0x10040718 0x4>;
+                interrupts = <0 106 0>;
+                clocks = <&clock 303>;
+                clock-names = "adc";
+                #io-channel-cells = <1>;
+                io-channel-ranges;
+                status = "disabled";
+        };
 };
diff --git a/arch/arm/boot/dts/exynos5420-pinctrl.dtsi b/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
index 5848c425ae4d..e695aba5f73c 100644
--- a/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
+++ b/arch/arm/boot/dts/exynos5420-pinctrl.dtsi
@@ -59,6 +59,13 @@
                         interrupt-controller;
                         #interrupt-cells = <2>;
                 };
+
+                dp_hpd: dp_hpd {
+                        samsung,pins = "gpx0-7";
+                        samsung,pin-function = <3>;
+                        samsung,pin-pud = <0>;
+                        samaung,pin-drv = <0>;
+                };
         };
 
         pinctrl@13410000 {
diff --git a/arch/arm/boot/dts/exynos5420-smdk5420.dts b/arch/arm/boot/dts/exynos5420-smdk5420.dts
index 08607df6a180..bafba25ba7c2 100644
--- a/arch/arm/boot/dts/exynos5420-smdk5420.dts
+++ b/arch/arm/boot/dts/exynos5420-smdk5420.dts
@@ -30,4 +30,35 @@
                         clock-frequency = <24000000>;
                 };
         };
+
+        dp-controller@145B0000 {
+                pinctrl-names = "default";
+                pinctrl-0 = <&dp_hpd>;
+                samsung,color-space = <0>;
+                samsung,dynamic-range = <0>;
+                samsung,ycbcr-coeff = <0>;
+                samsung,color-depth = <1>;
+                samsung,link-rate = <0x0a>;
+                samsung,lane-count = <4>;
+                status = "okay";
+        };
+
+        fimd@14400000 {
+                status = "okay";
+                display-timings {
+                        native-mode = <&timing0>;
+                        timing0: timing@0 {
+                                clock-frequency = <50000>;
+                                hactive = <2560>;
+                                vactive = <1600>;
+                                hfront-porch = <48>;
+                                hback-porch = <80>;
+                                hsync-len = <32>;
+                                vback-porch = <16>;
+                                vfront-porch = <8>;
+                                vsync-len = <6>;
+                        };
+                };
+        };
+
 };
diff --git a/arch/arm/boot/dts/exynos5420.dtsi b/arch/arm/boot/dts/exynos5420.dtsi
index 8c54c4b74f0e..d537cd704e19 100644
--- a/arch/arm/boot/dts/exynos5420.dtsi
+++ b/arch/arm/boot/dts/exynos5420.dtsi
@@ -14,7 +14,10 @@
  */
 
 #include "exynos5.dtsi"
-/include/ "exynos5420-pinctrl.dtsi"
+#include "exynos5420-pinctrl.dtsi"
+
+#include <dt-bindings/clk/exynos-audss-clk.h>
+
 / {
         compatible = "samsung,exynos5420";
 
@@ -59,12 +62,28 @@
                 };
         };
 
-        clock: clock-controller@0x10010000 {
+        clock: clock-controller@10010000 {
                 compatible = "samsung,exynos5420-clock";
                 reg = <0x10010000 0x30000>;
                 #clock-cells = <1>;
         };
 
+        clock_audss: audss-clock-controller@3810000 {
+                compatible = "samsung,exynos5420-audss-clock";
+                reg = <0x03810000 0x0C>;
+                #clock-cells = <1>;
+                clocks = <&clock 148>;
+                clock-names = "sclk_audio";
+        };
+
+        codec@11000000 {
+                compatible = "samsung,mfc-v7";
+                reg = <0x11000000 0x10000>;
+                interrupts = <0 96 0>;
+                clocks = <&clock 401>;
+                clock-names = "mfc";
+        };
+
         mct@101C0000 {
                 compatible = "samsung,exynos4210-mct";
                 reg = <0x101C0000 0x800>;
@@ -90,6 +109,41 @@
                 };
         };
 
+        gsc_pd: power-domain@10044000 {
+                compatible = "samsung,exynos4210-pd";
+                reg = <0x10044000 0x20>;
+        };
+
+        isp_pd: power-domain@10044020 {
+                compatible = "samsung,exynos4210-pd";
+                reg = <0x10044020 0x20>;
+        };
+
+        mfc_pd: power-domain@10044060 {
+                compatible = "samsung,exynos4210-pd";
+                reg = <0x10044060 0x20>;
+        };
+
+        disp_pd: power-domain@100440C0 {
+                compatible = "samsung,exynos4210-pd";
+                reg = <0x100440C0 0x20>;
+        };
+
+        mau_pd: power-domain@100440E0 {
+                compatible = "samsung,exynos4210-pd";
+                reg = <0x100440E0 0x20>;
+        };
+
+        g2d_pd: power-domain@10044100 {
+                compatible = "samsung,exynos4210-pd";
+                reg = <0x10044100 0x20>;
+        };
+
+        msc_pd: power-domain@10044120 {
+                compatible = "samsung,exynos4210-pd";
+                reg = <0x10044120 0x20>;
+        };
+
         pinctrl_0: pinctrl@13400000 {
                 compatible = "samsung,exynos5420-pinctrl";
                 reg = <0x13400000 0x1000>;
@@ -126,6 +180,12 @@
                 interrupts = <0 47 0>;
         };
 
+        rtc@101E0000 {
+                clocks = <&clock 317>;
+                clock-names = "rtc";
+                status = "okay";
+        };
+
         serial@12C00000 {
                 clocks = <&clock 257>, <&clock 128>;
                 clock-names = "uart", "clk_uart_baud0";
@@ -145,4 +205,34 @@
                 clocks = <&clock 260>, <&clock 131>;
                 clock-names = "uart", "clk_uart_baud0";
         };
+
+        dp_phy: video-phy@10040728 {
+                compatible = "samsung,exynos5250-dp-video-phy";
+                reg = <0x10040728 4>;
+                #phy-cells = <0>;
+        };
+
+        dp-controller@145B0000 {
+                clocks = <&clock 412>;
+                clock-names = "dp";
+                phys = <&dp_phy>;
+                phy-names = "dp";
+        };
+
+        fimd@14400000 {
+                samsung,power-domain = <&disp_pd>;
+                clocks = <&clock 147>, <&clock 421>;
+                clock-names = "sclk_fimd", "fimd";
+        };
+
+        adc: adc@12D10000 {
+                compatible = "samsung,exynos-adc-v2";
+                reg = <0x12D10000 0x100>, <0x10040720 0x4>;
+                interrupts = <0 106 0>;
+                clocks = <&clock 270>;
+                clock-names = "adc";
+                #io-channel-cells = <1>;
+                io-channel-ranges;
+                status = "disabled";
+        };
 };
diff --git a/arch/arm/boot/dts/exynos5440.dtsi b/arch/arm/boot/dts/exynos5440.dtsi
index ff7f5d855845..5d6cf4965d6e 100644
--- a/arch/arm/boot/dts/exynos5440.dtsi
+++ b/arch/arm/boot/dts/exynos5440.dtsi
@@ -18,9 +18,12 @@
 
         aliases {
                 spi0 = &spi_0;
+                tmuctrl0 = &tmuctrl_0;
+                tmuctrl1 = &tmuctrl_1;
+                tmuctrl2 = &tmuctrl_2;
         };
 
-        clock: clock-controller@0x160000 {
+        clock: clock-controller@160000 {
                 compatible = "samsung,exynos5440-clock";
                 reg = <0x160000 0x1000>;
                 #clock-cells = <1>;
@@ -207,6 +210,30 @@
                 clock-names = "rtc";
         };
 
+        tmuctrl_0: tmuctrl@160118 {
+                compatible = "samsung,exynos5440-tmu";
+                reg = <0x160118 0x230>, <0x160368 0x10>;
+                interrupts = <0 58 0>;
+                clocks = <&clock 21>;
+                clock-names = "tmu_apbif";
+        };
+
+        tmuctrl_1: tmuctrl@16011C {
+                compatible = "samsung,exynos5440-tmu";
+                reg = <0x16011C 0x230>, <0x160368 0x10>;
+                interrupts = <0 58 0>;
+                clocks = <&clock 21>;
+                clock-names = "tmu_apbif";
+        };
+
+        tmuctrl_2: tmuctrl@160120 {
+                compatible = "samsung,exynos5440-tmu";
+                reg = <0x160120 0x230>, <0x160368 0x10>;
+                interrupts = <0 58 0>;
+                clocks = <&clock 21>;
+                clock-names = "tmu_apbif";
+        };
+
         sata@210000 {
                 compatible = "snps,exynos5440-ahci";
                 reg = <0x210000 0x10000>;
@@ -248,6 +275,7 @@
                 #interrupt-cells = <1>;
                 interrupt-map-mask = <0 0 0 0>;
                 interrupt-map = <0x0 0 &gic 53>;
+                num-lanes = <4>;
         };
 
         pcie@2a0000 {
@@ -267,5 +295,6 @@
                 #interrupt-cells = <1>;
                 interrupt-map-mask = <0 0 0 0>;
                 interrupt-map = <0x0 0 &gic 56>;
+                num-lanes = <4>;
         };
 };
diff --git a/arch/arm/boot/dts/imx23-evk.dts b/arch/arm/boot/dts/imx23-evk.dts
index da0588a04131..185c7c01102a 100644
--- a/arch/arm/boot/dts/imx23-evk.dts
+++ b/arch/arm/boot/dts/imx23-evk.dts
@@ -90,6 +90,11 @@
                 };
 
                 apbx@80040000 {
+                        lradc@80050000 {
+                                status = "okay";
+                                fsl,lradc-touchscreen-wires = <4>;
+                        };
+
                         pwm: pwm@80064000 {
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&pwm2_pins_a>;
@@ -107,6 +112,16 @@
                                 pinctrl-0 = <&duart_pins_a>;
                                 status = "okay";
                         };
+
+                        usbphy0: usbphy@8007c000 {
+                                status = "okay";
+                        };
+                };
+        };
+
+        ahb@80080000 {
+                usb0: usb@80080000 {
+                        status = "okay";
                 };
         };
 
diff --git a/arch/arm/boot/dts/imx23-olinuxino.dts b/arch/arm/boot/dts/imx23-olinuxino.dts
index d107c4af321f..fc766ae12e24 100644
--- a/arch/arm/boot/dts/imx23-olinuxino.dts
+++ b/arch/arm/boot/dts/imx23-olinuxino.dts
@@ -69,6 +69,10 @@
                 };
 
                 apbx@80040000 {
+                        lradc@80050000 {
+                                status = "okay";
+                        };
+
                         duart: serial@80070000 {
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&duart_pins_a>;
diff --git a/arch/arm/boot/dts/imx23.dtsi b/arch/arm/boot/dts/imx23.dtsi
index 587ceef81e45..28b5ce289662 100644
--- a/arch/arm/boot/dts/imx23.dtsi
+++ b/arch/arm/boot/dts/imx23.dtsi
@@ -20,6 +20,8 @@
                 gpio2 = &gpio2;
                 serial0 = &auart0;
                 serial1 = &auart1;
+                spi0 = &ssp0;
+                spi1 = &ssp1;
         };
 
         cpus {
@@ -76,23 +78,21 @@
                                 #size-cells = <1>;
                                 reg = <0x8000c000 0x2000>, <0x8000a000 0x2000>;
                                 reg-names = "gpmi-nand", "bch";
-                                interrupts = <13>, <56>;
-                                interrupt-names = "gpmi-dma", "bch";
+                                interrupts = <56>;
+                                interrupt-names = "bch";
                                 clocks = <&clks 34>;
                                 clock-names = "gpmi_io";
                                 dmas = <&dma_apbh 4>;
                                 dma-names = "rx-tx";
-                                fsl,gpmi-dma-channel = <4>;
                                 status = "disabled";
                         };
 
                         ssp0: ssp@80010000 {
                                 reg = <0x80010000 0x2000>;
-                                interrupts = <15 14>;
+                                interrupts = <15>;
                                 clocks = <&clks 33>;
                                 dmas = <&dma_apbh 1>;
                                 dma-names = "rx-tx";
-                                fsl,ssp-dma-channel = <1>;
                                 status = "disabled";
                         };
 
@@ -366,11 +366,10 @@
 
                         ssp1: ssp@80034000 {
                                 reg = <0x80034000 0x2000>;
-                                interrupts = <2 20>;
+                                interrupts = <2>;
                                 clocks = <&clks 33>;
                                 dmas = <&dma_apbh 2>;
                                 dma-names = "rx-tx";
-                                fsl,ssp-dma-channel = <2>;
                                 status = "disabled";
                         };
 
@@ -472,7 +471,7 @@
                         auart0: serial@8006c000 {
                                 compatible = "fsl,imx23-auart";
                                 reg = <0x8006c000 0x2000>;
-                                interrupts = <24 25 23>;
+                                interrupts = <24>;
                                 clocks = <&clks 32>;
                                 dmas = <&dma_apbx 6>, <&dma_apbx 7>;
                                 dma-names = "rx", "tx";
@@ -482,7 +481,7 @@
                         auart1: serial@8006e000 {
                                 compatible = "fsl,imx23-auart";
                                 reg = <0x8006e000 0x2000>;
-                                interrupts = <59 60 58>;
+                                interrupts = <59>;
                                 clocks = <&clks 32>;
                                 dmas = <&dma_apbx 8>, <&dma_apbx 9>;
                                 dma-names = "rx", "tx";
diff --git a/arch/arm/boot/dts/imx25.dtsi b/arch/arm/boot/dts/imx25.dtsi
index 701153992c69..737ed5da8f71 100644
--- a/arch/arm/boot/dts/imx25.dtsi
+++ b/arch/arm/boot/dts/imx25.dtsi
@@ -13,19 +13,35 @@
 
 / {
         aliases {
+                gpio0 = &gpio1;
+                gpio1 = &gpio2;
+                gpio2 = &gpio3;
+                gpio3 = &gpio4;
+                i2c0 = &i2c1;
+                i2c1 = &i2c2;
+                i2c2 = &i2c3;
                 serial0 = &uart1;
                 serial1 = &uart2;
                 serial2 = &uart3;
                 serial3 = &uart4;
                 serial4 = &uart5;
-                gpio0 = &gpio1;
-                gpio1 = &gpio2;
-                gpio2 = &gpio3;
-                gpio3 = &gpio4;
+                spi0 = &spi1;
+                spi1 = &spi2;
+                spi2 = &spi3;
                 usb0 = &usbotg;
                 usb1 = &usbhost1;
         };
 
+        cpus {
+                #address-cells = <0>;
+                #size-cells = <0>;
+
+                cpu {
+                        compatible = "arm,arm926ej-s";
+                        device_type = "cpu";
+                };
+        };
+
         asic: asic-interrupt-controller@68000000 {
                 compatible = "fsl,imx25-asic", "fsl,avic";
                 interrupt-controller;
@@ -377,7 +393,8 @@
                                 status = "disabled";
                         };
 
-                        lcdc@53fbc000 {
+                        lcdc: lcdc@53fbc000 {
+                                compatible = "fsl,imx25-fb", "fsl,imx21-fb";
                                 reg = <0x53fbc000 0x4000>;
                                 interrupts = <39>;
                                 clocks = <&clks 103>, <&clks 66>, <&clks 49>;
@@ -424,6 +441,7 @@
                                 reg = <0x53fd4000 0x4000>;
                                 clocks = <&clks 112>, <&clks 68>;
                                 clock-names = "ipg", "ahb";
+                                #dma-cells = <3>;
                                 interrupts = <34>;
                         };
 
@@ -444,6 +462,13 @@
                                 interrupts = <26>;
                         };
 
+                        iim: iim@53ff0000 {
+                                compatible = "fsl,imx25-iim", "fsl,imx27-iim";
+                                reg = <0x53ff0000 0x4000>;
+                                interrupts = <19>;
+                                clocks = <&clks 99>;
+                        };
+
                         usbphy1: usbphy@1 {
                                 compatible = "nop-usbphy";
                                 status = "disabled";
diff --git a/arch/arm/boot/dts/imx27-apf27dev.dts b/arch/arm/boot/dts/imx27-apf27dev.dts
index 66b8e1c1b0be..2a377ca1881a 100644
--- a/arch/arm/boot/dts/imx27-apf27dev.dts
+++ b/arch/arm/boot/dts/imx27-apf27dev.dts
@@ -53,6 +53,11 @@
 &i2c1 {
         clock-frequency = <400000>;
         status = "okay";
+
+        rtc@68 {
+                compatible = "dallas,ds1374";
+                reg = <0x68>;
+        };
 };
 
 &i2c2 {
diff --git a/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts b/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts
new file mode 100644
index 000000000000..5a31c776513f
--- /dev/null
+++ b/arch/arm/boot/dts/imx27-phytec-phycard-s-rdk.dts
@@ -0,0 +1,93 @@
+/*
+ * Copyright 2012 Markus Pargmann, Pengutronix
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include "imx27-phytec-phycard-s-som.dts"
+
+/ {
+        model = "Phytec pca100 rapid development kit";
+        compatible = "phytec,imx27-pca100-rdk", "phytec,imx27-pca100", "fsl,imx27";
+
+        display: display {
+                model = "Primeview-PD050VL1";
+                native-mode = <&timing0>;
+                bits-per-pixel = <16>;  /* non-standard but required */
+                fsl,pcr = <0xf0c88080>; /* non-standard but required */
+                display-timings {
+                        timing0: 640x480 {
+                                hactive = <640>;
+                                vactive = <480>;
+                                hback-porch = <112>;
+                                hfront-porch = <36>;
+                                hsync-len = <32>;
+                                vback-porch = <33>;
+                                vfront-porch = <33>;
+                                vsync-len = <2>;
+                                clock-frequency = <25000000>;
+                        };
+                };
+        };
+
+        regulators {
+                compatible = "simple-bus";
+
+                reg_3v3: 3v3 {
+                        compatible = "regulator-fixed";
+                        regulator-name = "3V3";
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                        regulator-always-on;
+                };
+        };
+};
+
+&fb {
+        display = <&display>;
+        status = "okay";
+};
+
+&i2c1 {
+        status = "okay";
+
+        rtc@51 {
+                compatible = "nxp,pcf8563";
+                reg = <0x51>;
+        };
+
+        adc@64 {
+                compatible = "maxim,max1037";
+                vcc-supply = <&reg_3v3>;
+                reg = <0x64>;
+        };
+};
+
+&owire {
+        status = "okay";
+};
+
+&sdhci2 {
+        cd-gpios = <&gpio3 29 0>;
+        status = "okay";
+};
+
+&uart1 {
+        fsl,uart-has-rtscts;
+        status = "okay";
+};
+
+&uart2 {
+        fsl,uart-has-rtscts;
+        status = "okay";
+};
+
+&uart3 {
+        fsl,uart-has-rtscts;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts b/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts
new file mode 100644
index 000000000000..c8d57d1d0743
--- /dev/null
+++ b/arch/arm/boot/dts/imx27-phytec-phycard-s-som.dts
@@ -0,0 +1,44 @@
+/*
+ * Copyright 2012 Sascha Hauer, Uwe Kleine-König, Steffen Trumtrar
+ * and Markus Pargmann, Pengutronix
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "imx27.dtsi"
+
+/ {
+        model = "Phytec pca100";
+        compatible = "phytec,imx27-pca100", "fsl,imx27";
+
+        memory {
+                reg = <0xa0000000 0x08000000>; /* 128MB */
+        };
+};
+
+&cspi1 {
+        fsl,spi-num-chipselects = <2>;
+        cs-gpios = <&gpio4 28 0>,
+                <&gpio4 27 0>;
+        status = "okay";
+};
+
+&fec {
+        status = "okay";
+};
+
+&i2c2 {
+        status = "okay";
+
+        at24@52 {
+                compatible = "at,24c32";
+                pagesize = <32>;
+                reg = <0x52>;
+        };
+};
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
index e7ed9786920a..0fc6551786c6 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-rdk.dts
@@ -35,3 +35,16 @@
         fsl,uart-has-rtscts;
         status = "okay";
 };
+
+&weim {
+        can@d4000000 {
+                compatible = "nxp,sja1000";
+                reg = <4 0x00000000 0x00000100>;
+                interrupt-parent = <&gpio5>;
+                interrupts = <19 0x2>;
+                nxp,external-clock-frequency = <16000000>;
+                nxp,tx-output-config = <0x16>;
+                nxp,no-comparator-bypass;
+                fsl,weim-cs-timing = <0x0000dcf6 0x444a0301 0x44443302>;
+        };
+};
diff --git a/arch/arm/boot/dts/imx27-phytec-phycore-som.dts b/arch/arm/boot/dts/imx27-phytec-phycore-som.dts
index f0105651869d..4ec402c38945 100644
--- a/arch/arm/boot/dts/imx27-phytec-phycore-som.dts
+++ b/arch/arm/boot/dts/imx27-phytec-phycore-som.dts
@@ -17,49 +17,22 @@
         compatible = "phytec,imx27-pcm038", "fsl,imx27";
 
         memory {
-                reg = <0x0 0x0>;
+                reg = <0xa0000000 0x08000000>;
         };
+};
 
-        soc {
-                aipi@10000000 { /* aipi1 */
-                        serial@1000a000 {
-                                status = "okay";
-                        };
-
-                        i2c@1001d000 {
-                                clock-frequency = <400000>;
-                                status = "okay";
-                                at24@52 {
-                                        compatible = "at,24c32";
-                                        pagesize = <32>;
-                                        reg = <0x52>;
-                                };
-                                pcf8563@51 {
-                                        compatible = "nxp,pcf8563";
-                                        reg = <0x51>;
-                                };
-                                lm75@4a {
-                                        compatible = "national,lm75";
-                                        reg = <0x4a>;
-                                };
-                        };
-                };
+&audmux {
+        status = "okay";
 
-                aipi@10020000 { /* aipi2 */
-                        ethernet@1002b000 {
-                                phy-reset-gpios = <&gpio3 30 0>;
-                                status = "okay";
-                        };
-                };
+        /* SSI0 <=> PINS_4 (MC13783 Audio) */
+        ssi0 {
+                fsl,audmux-port = <0>;
+                fsl,port-config = <0xcb205000>;
         };
 
-        nor_flash@c0000000 {
-                compatible = "cfi-flash";
-                bank-width = <2>;
-                reg = <0xc0000000 0x02000000>;
-                linux,mtd-name = "physmap-flash.0";
-                #address-cells = <1>;
-                #size-cells = <1>;
+        pins4 {
+                fsl,audmux-port = <2>;
+                fsl,port-config = <0x00001000>;
         };
 };
 
@@ -80,28 +53,16 @@
                 fsl,mc13xxx-uses-rtc;
 
                 regulators {
-                        sw1a_reg: sw1a {
+                        /* SW1A and SW1B joined operation */
+                        sw1_reg: sw1a {
                                 regulator-min-microvolt = <1200000>;
-                                regulator-max-microvolt = <1200000>;
+                                regulator-max-microvolt = <1520000>;
                                 regulator-always-on;
                                 regulator-boot-on;
                         };
 
-                        sw1b_reg: sw1b {
-                                regulator-min-microvolt = <1200000>;
-                                regulator-max-microvolt = <1200000>;
-                                regulator-always-on;
-                                regulator-boot-on;
-                        };
-
-                        sw2a_reg: sw2a {
-                                regulator-min-microvolt = <1800000>;
-                                regulator-max-microvolt = <1800000>;
-                                regulator-always-on;
-                                regulator-boot-on;
-                        };
-
-                        sw2b_reg: sw2b {
+                        /* SW2A and SW2B joined operation */
+                        sw2_reg: sw2a {
                                 regulator-min-microvolt = <1800000>;
                                 regulator-max-microvolt = <1800000>;
                                 regulator-always-on;
@@ -172,8 +133,62 @@
         };
 };
 
+&fec {
+        phy-reset-gpios = <&gpio3 30 0>;
+        status = "okay";
+};
+
+&i2c2 {
+        clock-frequency = <400000>;
+        status = "okay";
+
+        at24@52 {
+                compatible = "at,24c32";
+                pagesize = <32>;
+                reg = <0x52>;
+        };
+
+        pcf8563@51 {
+                compatible = "nxp,pcf8563";
+                reg = <0x51>;
+        };
+
+        lm75@4a {
+                compatible = "national,lm75";
+                reg = <0x4a>;
+        };
+};
+
 &nfc {
         nand-bus-width = <8>;
         nand-ecc-mode = "hw";
         status = "okay";
 };
+
+&uart1 {
+        status = "okay";
+};
+
+&weim {
+        status = "okay";
+
+        nor: nor@c0000000 {
+                compatible = "cfi-flash";
+                reg = <0 0x00000000 0x02000000>;
+                bank-width = <2>;
+                linux,mtd-name = "physmap-flash.0";
+                fsl,weim-cs-timing = <0x22c2cf00 0x75000d01 0x00000900>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+        };
+
+        sram: sram@c8000000 {
+                compatible = "mtd-ram";
+                reg = <1 0x00000000 0x00800000>;
+                bank-width = <2>;
+                linux,mtd-name = "mtd-ram.0";
+                fsl,weim-cs-timing = <0x0000d843 0x22252521 0x22220a00>;
+                #address-cells = <1>;
+                #size-cells = <1>;
+        };
+};
diff --git a/arch/arm/boot/dts/imx27.dtsi b/arch/arm/boot/dts/imx27.dtsi
index 0695264ddf1b..b7a1c6d950b9 100644
--- a/arch/arm/boot/dts/imx27.dtsi
+++ b/arch/arm/boot/dts/imx27.dtsi
@@ -13,25 +13,27 @@
 
 / {
         aliases {
-                serial0 = &uart1;
-                serial1 = &uart2;
-                serial2 = &uart3;
-                serial3 = &uart4;
-                serial4 = &uart5;
-                serial5 = &uart6;
                 gpio0 = &gpio1;
                 gpio1 = &gpio2;
                 gpio2 = &gpio3;
                 gpio3 = &gpio4;
                 gpio4 = &gpio5;
                 gpio5 = &gpio6;
+                i2c0 = &i2c1;
+                i2c1 = &i2c2;
+                serial0 = &uart1;
+                serial1 = &uart2;
+                serial2 = &uart3;
+                serial3 = &uart4;
+                serial4 = &uart5;
+                serial5 = &uart6;
                 spi0 = &cspi1;
                 spi1 = &cspi2;
                 spi2 = &cspi3;
         };
 
-        avic: avic-interrupt-controller@e0000000 {
-                compatible = "fsl,imx27-avic", "fsl,avic";
+        aitc: aitc-interrupt-controller@e0000000 {
+                compatible = "fsl,imx27-aitc", "fsl,avic";
                 interrupt-controller;
                 #interrupt-cells = <1>;
                 reg = <0x10040000 0x1000>;
@@ -47,11 +49,29 @@
                 };
         };
 
+        cpus {
+                #size-cells = <0>;
+                #address-cells = <1>;
+
+                cpu: cpu@0 {
+                        device_type = "cpu";
+                        compatible = "arm,arm926ej-s";
+                        operating-points = <
+                                /* kHz uV */
+                                266000 1300000
+                                399000 1450000
+                        >;
+                        clock-latency = <62500>;
+                        clocks = <&clks 18>;
+                        voltage-tolerance = <5>;
+                };
+        };
+
         soc {
                 #address-cells = <1>;
                 #size-cells = <1>;
                 compatible = "simple-bus";
-                interrupt-parent = <&avic>;
+                interrupt-parent = <&aitc>;
                 ranges;
 
                 aipi@10000000 { /* AIPI1 */
@@ -75,7 +95,7 @@
                                 compatible = "fsl,imx27-wdt", "fsl,imx21-wdt";
                                 reg = <0x10002000 0x1000>;
                                 interrupts = <27>;
-                                clocks = <&clks 0>;
+                                clocks = <&clks 74>;
                         };
 
                         gpt1: timer@10003000 {
@@ -102,7 +122,7 @@
                                 clock-names = "ipg", "per";
                         };
 
-                        pwm0: pwm@10006000 {
+                        pwm: pwm@10006000 {
                                 compatible = "fsl,imx27-pwm";
                                 reg = <0x10006000 0x1000>;
                                 interrupts = <23>;
@@ -110,6 +130,21 @@
                                 clock-names = "ipg", "per";
                         };
 
+                        kpp: kpp@10008000 {
+                                compatible = "fsl,imx27-kpp", "fsl,imx21-kpp";
+                                reg = <0x10008000 0x1000>;
+                                interrupts = <21>;
+                                clocks = <&clks 37>;
+                                status = "disabled";
+                        };
+
+                        owire: owire@10009000 {
+                                compatible = "fsl,imx27-owire", "fsl,imx21-owire";
+                                reg = <0x10009000 0x1000>;
+                                clocks = <&clks 35>;
+                                status = "disabled";
+                        };
+
                         uart1: serial@1000a000 {
                                 compatible = "fsl,imx27-uart", "fsl,imx21-uart";
                                 reg = <0x1000a000 0x1000>;
@@ -152,7 +187,7 @@
                                 compatible = "fsl,imx27-cspi";
                                 reg = <0x1000e000 0x1000>;
                                 interrupts = <16>;
-                                clocks = <&clks 53>, <&clks 53>;
+                                clocks = <&clks 53>, <&clks 60>;
                                 clock-names = "ipg", "per";
                                 status = "disabled";
                         };
@@ -163,7 +198,7 @@
                                 compatible = "fsl,imx27-cspi";
                                 reg = <0x1000f000 0x1000>;
                                 interrupts = <15>;
-                                clocks = <&clks 52>, <&clks 52>;
+                                clocks = <&clks 52>, <&clks 60>;
                                 clock-names = "ipg", "per";
                                 status = "disabled";
                         };
@@ -260,13 +295,21 @@
                                 #interrupt-cells = <2>;
                         };
 
+                        audmux: audmux@10016000 {
+                                compatible = "fsl,imx27-audmux", "fsl,imx21-audmux";
+                                reg = <0x10016000 0x1000>;
+                                clocks = <&clks 0>;
+                                clock-names = "audmux";
+                                status = "disabled";
+                        };
+
                         cspi3: cspi@10017000 {
                                 #address-cells = <1>;
                                 #size-cells = <0>;
                                 compatible = "fsl,imx27-cspi";
                                 reg = <0x10017000 0x1000>;
                                 interrupts = <6>;
-                                clocks = <&clks 51>, <&clks 51>;
+                                clocks = <&clks 51>, <&clks 60>;
                                 clock-names = "ipg", "per";
                                 status = "disabled";
                         };
@@ -342,6 +385,15 @@
                         reg = <0x10020000 0x20000>;
                         ranges;
 
+                        fb: fb@10021000 {
+                                compatible = "fsl,imx27-fb", "fsl,imx21-fb";
+                                interrupts = <61>;
+                                reg = <0x10021000 0x1000>;
+                                clocks = <&clks 36>, <&clks 65>, <&clks 59>;
+                                clock-names = "ipg", "ahb", "per";
+                                status = "disabled";
+                        };
+
                         coda: coda@10023000 {
                                 compatible = "fsl,imx27-vpu";
                                 reg = <0x10023000 0x0200>;
@@ -351,27 +403,37 @@
                                 iram = <&iram>;
                         };
 
+                        sahara2: sahara@10025000 {
+                                compatible = "fsl,imx27-sahara";
+                                reg = <0x10025000 0x1000>;
+                                interrupts = <59>;
+                                clocks = <&clks 32>, <&clks 64>;
+                                clock-names = "ipg", "ahb";
+                        };
+
                         clks: ccm@10027000{
                                 compatible = "fsl,imx27-ccm";
                                 reg = <0x10027000 0x1000>;
                                 #clock-cells = <1>;
                         };
 
+                        iim: iim@10028000 {
+                                compatible = "fsl,imx27-iim";
+                                reg = <0x10028000 0x1000>;
+                                interrupts = <62>;
+                                clocks = <&clks 38>;
+                        };
+
                         fec: ethernet@1002b000 {
                                 compatible = "fsl,imx27-fec";
                                 reg = <0x1002b000 0x4000>;
                                 interrupts = <50>;
-                                clocks = <&clks 48>, <&clks 67>, <&clks 0>;
-                                clock-names = "ipg", "ahb", "ptp";
+                                clocks = <&clks 48>, <&clks 67>;
+                                clock-names = "ipg", "ahb";
                                 status = "disabled";
                         };
                 };
 
-                iram: iram@ffff4c00 {
-                        compatible = "mmio-sram";
-                        reg = <0xffff4c00 0xb400>;
-                };
-
                 nfc: nand@d8000000 {
                         #address-cells = <1>;
                         #size-cells = <1>;
@@ -381,5 +443,27 @@
                         clocks = <&clks 54>;
                         status = "disabled";
                 };
+
+                weim: weim@d8002000 {
+                        #address-cells = <2>;
+                        #size-cells = <1>;
+                        compatible = "fsl,imx27-weim";
+                        reg = <0xd8002000 0x1000>;
+                        clocks = <&clks 0>;
+                        ranges = <
+                                0 0 0xc0000000 0x08000000
+                                1 0 0xc8000000 0x08000000
+                                2 0 0xd0000000 0x02000000
+                                3 0 0xd2000000 0x02000000
+                                4 0 0xd4000000 0x02000000
+                                5 0 0xd6000000 0x02000000
+                        >;
+                        status = "disabled";
+                };
+
+                iram: iram@ffff4c00 {
+                        compatible = "mmio-sram";
+                        reg = <0xffff4c00 0xb400>;
+                };
         };
 };
diff --git a/arch/arm/boot/dts/imx28-cfa10036.dts b/arch/arm/boot/dts/imx28-cfa10036.dts
index 94c4476972c3..1ec8c94bbac9 100644
--- a/arch/arm/boot/dts/imx28-cfa10036.dts
+++ b/arch/arm/boot/dts/imx28-cfa10036.dts
@@ -23,10 +23,7 @@
         apb@80000000 {
                 apbh@80000000 {
                         pinctrl@80018000 {
-                                pinctrl-names = "default";
-                                pinctrl-0 = <&hog_pins_cfa10036>;
-
-                                hog_pins_cfa10036: hog-10036@0 {
+                                ssd1306_cfa10036: ssd1306-10036@0 {
                                         reg = <0>;
                                         fsl,pinmux-ids = <
                                                 0x2073 /* MX28_PAD_SSP0_D7__GPIO_2_7 */
@@ -83,6 +80,8 @@
 
                                 ssd1306: oled@3c {
                                         compatible = "solomon,ssd1306fb-i2c";
+                                        pinctrl-names = "default";
+                                        pinctrl-0 = <&ssd1306_cfa10036>;
                                         reg = <0x3c>;
                                         reset-gpios = <&gpio2 7 0>;
                                         solomon,height = <32>;
diff --git a/arch/arm/boot/dts/imx28-cfa10037.dts b/arch/arm/boot/dts/imx28-cfa10037.dts
index c2ef3a3d655e..182b99fe35f3 100644
--- a/arch/arm/boot/dts/imx28-cfa10037.dts
+++ b/arch/arm/boot/dts/imx28-cfa10037.dts
@@ -22,13 +22,19 @@
         apb@80000000 {
                 apbh@80000000 {
                         pinctrl@80018000 {
-                                pinctrl-names = "default", "default";
-                                pinctrl-1 = <&hog_pins_cfa10037>;
-
-                                hog_pins_cfa10037: hog-10037@0 {
+                                usb_pins_cfa10037: usb-10037@0 {
                                         reg = <0>;
                                         fsl,pinmux-ids = <
                                                 0x0073 /* MX28_PAD_GPMI_D7__GPIO_0_7 */
+                                        >;
+                                        fsl,drive-strength = <0>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <0>;
+                                };
+
+                                mac0_pins_cfa10037: mac0-10037@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <
                                                 0x2153 /* MX28_PAD_SSP2_D5__GPIO_2_21 */
                                         >;
                                         fsl,drive-strength = <0>;
@@ -56,7 +62,8 @@
                 mac0: ethernet@800f0000 {
                         phy-mode = "rmii";
                         pinctrl-names = "default";
-                        pinctrl-0 = <&mac0_pins_a>;
+                        pinctrl-0 = <&mac0_pins_a
+                                &mac0_pins_cfa10037>;
                         phy-reset-gpios = <&gpio2 21 0>;
                         phy-reset-duration = <100>;
                         status = "okay";
@@ -68,6 +75,8 @@
 
                 reg_usb1_vbus: usb1_vbus {
                         compatible = "regulator-fixed";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&usb_pins_cfa10037>;
                         regulator-name = "usb1_vbus";
                         regulator-min-microvolt = <5000000>;
                         regulator-max-microvolt = <5000000>;
diff --git a/arch/arm/boot/dts/imx28-cfa10049.dts b/arch/arm/boot/dts/imx28-cfa10049.dts
index 04b2f769ffbd..06e4cfaf7dd2 100644
--- a/arch/arm/boot/dts/imx28-cfa10049.dts
+++ b/arch/arm/boot/dts/imx28-cfa10049.dts
@@ -22,32 +22,62 @@
         apb@80000000 {
                 apbh@80000000 {
                         pinctrl@80018000 {
-                                pinctrl-names = "default", "default";
-                                pinctrl-1 = <&hog_pins_cfa10049
-                                        &hog_pins_cfa10049_pullup>;
-
-                                hog_pins_cfa10049: hog-10049@0 {
+                                usb_pins_cfa10049: usb-10049@0 {
                                         reg = <0>;
                                         fsl,pinmux-ids = <
                                                 0x0073 /* MX28_PAD_GPMI_D7__GPIO_0_7 */
+                                        >;
+                                        fsl,drive-strength = <0>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <0>;
+                                };
+
+                                i2cmux_pins_cfa10049: i2cmux-10049@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <
                                                 0x1163 /* MX28_PAD_LCD_D22__GPIO_1_22 */
                                                 0x1173 /* MX28_PAD_LCD_D22__GPIO_1_23 */
+                                        >;
+                                        fsl,drive-strength = <0>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <0>;
+                                };
+
+                                mac0_pins_cfa10049: mac0-10049@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <
                                                 0x2153 /* MX28_PAD_SSP2_D5__GPIO_2_21 */
-                                                0x3053 /* MX28_PAD_AUART1_TX__GPIO_3_5 */
                                         >;
                                         fsl,drive-strength = <0>;
                                         fsl,voltage = <1>;
                                         fsl,pull-up = <0>;
                                 };
 
-                                hog_pins_cfa10049_pullup: hog-10049-pullup@0 {
+                                pca_pins_cfa10049: pca-10049@0 {
                                         reg = <0>;
                                         fsl,pinmux-ids = <
                                                 0x2133 /* MX28_PAD_SSP2_D3__GPIO_2_19 */
+                                        >;
+                                        fsl,drive-strength = <0>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <1>;
+                                };
+
+                                rotary_pins_cfa10049: rotary-10049@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <
                                                 0x3183 /* MX28_PAD_I2C0_SCL__GPIO_3_24 */
                                                 0x3193 /* MX28_PAD_I2C0_SDA__GPIO_3_25 */
+                                        >;
+                                        fsl,drive-strength = <0>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <1>;
+                                };
+
+                                rotary_btn_pins_cfa10049: rotary-btn-10049@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <
                                                 0x31a3 /* MX28_PAD_SAIF_SDATA0__GPIO_3_26 */
-                                                0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */
                                         >;
                                         fsl,drive-strength = <0>;
                                         fsl,voltage = <1>;
@@ -60,6 +90,7 @@
                                                 0x2103 /* MX28_PAD_SSP2_SCK__GPIO_2_16 */
                                                 0x2113 /* MX28_PAD_SSP2_CMD__GPIO_2_17 */
                                                 0x2123 /* MX28_PAD_SSP2_D0__GPIO_2_18 */
+                                                0x3053 /* MX28_PAD_AUART1_TX__GPIO_3_5 */
                                         >;
                                         fsl,drive-strength = <1>;
                                         fsl,voltage = <1>;
@@ -120,6 +151,16 @@
                                         fsl,pull-up = <0>;
                                 };
 
+                                lcdif_pins_cfa10049_pullup: lcdif-10049-pullup@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <
+                                                0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */
+                                        >;
+                                        fsl,drive-strength = <0>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <1>;
+                                };
+
                                 w1_gpio_pins: w1-gpio@0 {
                                         reg = <0>;
                                         fsl,pinmux-ids = <
@@ -134,7 +175,8 @@
                         lcdif@80030000 {
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&lcdif_18bit_pins_cfa10049
-                                             &lcdif_pins_cfa10049>;
+                                             &lcdif_pins_cfa10049
+                                             &lcdif_pins_cfa10049_pullup>;
                                 display = <&display>;
                                 status = "okay";
 
@@ -181,6 +223,8 @@
                                 compatible = "i2c-mux-gpio";
                                 #address-cells = <1>;
                                 #size-cells = <0>;
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&i2cmux_pins_cfa10049>;
                                 mux-gpios = <&gpio1 22 0 &gpio1 23 0>;
                                 i2c-parent = <&i2c1>;
 
@@ -203,6 +247,8 @@
 
                                         pca9555: pca9555@20 {
                                                 compatible = "nxp,pca9555";
+                                                pinctrl-names = "default";
+                                                pinctrl-0 = <&pca_pins_cfa10049>;
                                                 interrupt-parent = <&gpio2>;
                                                 interrupts = <19 0x2>;
                                                 gpio-controller;
@@ -239,6 +285,8 @@
 
                 reg_usb1_vbus: usb1_vbus {
                         compatible = "regulator-fixed";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&usb_pins_cfa10049>;
                         regulator-name = "usb1_vbus";
                         regulator-min-microvolt = <5000000>;
                         regulator-max-microvolt = <5000000>;
@@ -250,7 +298,8 @@
                 mac0: ethernet@800f0000 {
                         phy-mode = "rmii";
                         pinctrl-names = "default";
-                        pinctrl-0 = <&mac0_pins_a>;
+                        pinctrl-0 = <&mac0_pins_a
+                                &mac0_pins_cfa10049>;
                         phy-reset-gpios = <&gpio2 21 0>;
                         phy-reset-duration = <100>;
                         status = "okay";
@@ -320,6 +369,8 @@
 
         gpio_keys {
                 compatible = "gpio-keys";
+                pinctrl-names = "default";
+                pinctrl-0 = <&rotary_btn_pins_cfa10049>;
                 #address-cells = <1>;
                 #size-cells = <0>;
 
@@ -333,6 +384,8 @@
 
         rotary {
                 compatible = "rotary-encoder";
+                pinctrl-names = "default";
+                pinctrl-0 = <&rotary_pins_cfa10049>;
                 gpios = <&gpio3 24 1>, <&gpio3 25 1>;
                 linux,axis = <1>; /* REL_Y */
                 rotary-encoder,relative-axis;
diff --git a/arch/arm/boot/dts/imx28-cfa10055.dts b/arch/arm/boot/dts/imx28-cfa10055.dts
index 158111244122..171bcbe1ec4b 100644
--- a/arch/arm/boot/dts/imx28-cfa10055.dts
+++ b/arch/arm/boot/dts/imx28-cfa10055.dts
@@ -23,36 +23,13 @@
         apb@80000000 {
                 apbh@80000000 {
                         pinctrl@80018000 {
-                                pinctrl-names = "default", "default";
-                                pinctrl-1 = <&hog_pins_cfa10055
-                                        &hog_pins_cfa10055_pullup>;
-
-                                hog_pins_cfa10055: hog-10055@0 {
-                                        reg = <0>;
-                                        fsl,pinmux-ids = <
-                                                0x3053 /* MX28_PAD_AUART1_TX__GPIO_3_5 */
-                                        >;
-                                        fsl,drive-strength = <0>;
-                                        fsl,voltage = <1>;
-                                        fsl,pull-up = <0>;
-                                };
-
-                                hog_pins_cfa10055_pullup: hog-10055-pullup@0 {
-                                        reg = <0>;
-                                        fsl,pinmux-ids = <
-                                                0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */
-                                        >;
-                                        fsl,drive-strength = <0>;
-                                        fsl,voltage = <1>;
-                                        fsl,pull-up = <1>;
-                                };
-
                                 spi2_pins_cfa10055: spi2-cfa10055@0 {
                                         reg = <0>;
                                         fsl,pinmux-ids = <
                                                 0x2103 /* MX28_PAD_SSP2_SCK__GPIO_2_16 */
                                                 0x2113 /* MX28_PAD_SSP2_CMD__GPIO_2_17 */
                                                 0x2123 /* MX28_PAD_SSP2_D0__GPIO_2_18 */
+                                                0x3053 /* MX28_PAD_AUART1_TX__GPIO_3_5 */
                                         >;
                                         fsl,drive-strength = <1>;
                                         fsl,voltage = <1>;
@@ -98,12 +75,23 @@
                                         fsl,voltage = <1>;
                                         fsl,pull-up = <0>;
                                 };
+
+                                lcdif_pins_cfa10055_pullup: lcdif-10055-pullup@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <
+                                                0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */
+                                        >;
+                                        fsl,drive-strength = <0>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <1>;
+                                };
                         };
 
                         lcdif@80030000 {
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&lcdif_18bit_pins_cfa10055
-                                             &lcdif_pins_cfa10055>;
+                                             &lcdif_pins_cfa10055
+                                             &lcdif_pins_cfa10055_pullup>;
                                 display = <&display>;
                                 status = "okay";
 
diff --git a/arch/arm/boot/dts/imx28-cfa10056.dts b/arch/arm/boot/dts/imx28-cfa10056.dts
new file mode 100644
index 000000000000..b45dd0e4ee57
--- /dev/null
+++ b/arch/arm/boot/dts/imx28-cfa10056.dts
@@ -0,0 +1,119 @@
+/*
+ * Copyright 2013 Free Electrons
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/*
+ * The CFA-10055 is an expansion board for the CFA-10036 module and
+ * CFA-10037, thus we need to include the CFA-10037 DTS.
+ */
+/include/ "imx28-cfa10037.dts"
+
+/ {
+        model = "Crystalfontz CFA-10056 Board";
+        compatible = "crystalfontz,cfa10056", "crystalfontz,cfa10037", "crystalfontz,cfa10036", "fsl,imx28";
+
+        apb@80000000 {
+                apbh@80000000 {
+                        pinctrl@80018000 {
+                                spi2_pins_cfa10056: spi2-cfa10056@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <
+                                                0x2103 /* MX28_PAD_SSP2_SCK__GPIO_2_16 */
+                                                0x2113 /* MX28_PAD_SSP2_CMD__GPIO_2_17 */
+                                                0x2123 /* MX28_PAD_SSP2_D0__GPIO_2_18 */
+                                                0x3053 /* MX28_PAD_AUART1_TX__GPIO_3_5 */
+                                        >;
+                                        fsl,drive-strength = <1>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <1>;
+                                };
+
+                                lcdif_pins_cfa10056: lcdif-10056@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <
+                                                0x1181 /* MX28_PAD_LCD_RD_E__LCD_VSYNC */
+                                                0x1191 /* MX28_PAD_LCD_WR_RWN__LCD_HSYNC */
+                                                0x11a1 /* MX28_PAD_LCD_RS__LCD_DOTCLK */
+                                                0x11b1 /* MX28_PAD_LCD_CS__LCD_ENABLE */
+                                        >;
+                                        fsl,drive-strength = <0>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <0>;
+                                };
+
+                                lcdif_pins_cfa10056_pullup: lcdif-10056-pullup@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <
+                                                0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */
+                                        >;
+                                        fsl,drive-strength = <0>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <1>;
+                                };
+                        };
+
+                        lcdif@80030000 {
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&lcdif_24bit_pins_a
+                                                &lcdif_pins_cfa10056
+                                                &lcdif_pins_cfa10056_pullup >;
+                                display = <&display>;
+                                status = "okay";
+
+                                display: display {
+                                        bits-per-pixel = <32>;
+                                        bus-width = <24>;
+
+                                        display-timings {
+                                                native-mode = <&timing0>;
+                                                timing0: timing0 {
+                                                        clock-frequency = <32000000>;
+                                                        hactive = <480>;
+                                                        vactive = <800>;
+                                                        hback-porch = <2>;
+                                                        hfront-porch = <2>;
+                                                        vback-porch = <2>;
+                                                        vfront-porch = <2>;
+                                                        hsync-len = <5>;
+                                                        vsync-len = <5>;
+                                                        hsync-active = <0>;
+                                                        vsync-active = <0>;
+                                                        de-active = <1>;
+                                                        pixelclk-active = <1>;
+                                                };
+                                        };
+                                };
+                        };
+                };
+        };
+
+        spi2 {
+                compatible = "spi-gpio";
+                pinctrl-names = "default";
+                pinctrl-0 = <&spi2_pins_cfa10056>;
+                status = "okay";
+                gpio-sck = <&gpio2 16 0>;
+                gpio-mosi = <&gpio2 17 0>;
+                gpio-miso = <&gpio2 18 0>;
+                cs-gpios = <&gpio3 5 0>;
+                num-chipselects = <1>;
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                hx8369: hx8369@0 {
+                        compatible = "himax,hx8369a", "himax,hx8369";
+                        reg = <0>;
+                        spi-max-frequency = <100000>;
+                        spi-cpol;
+                        spi-cpha;
+                        gpios-reset = <&gpio3 30 0>;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/imx28-cfa10057.dts b/arch/arm/boot/dts/imx28-cfa10057.dts
index 2da713cdb42a..0333c0532f28 100644
--- a/arch/arm/boot/dts/imx28-cfa10057.dts
+++ b/arch/arm/boot/dts/imx28-cfa10057.dts
@@ -23,35 +23,16 @@
         apb@80000000 {
                 apbh@80000000 {
                         pinctrl@80018000 {
-                                pinctrl-names = "default", "default";
-                                pinctrl-1 = <&hog_pins_cfa10057
-                                        &hog_pins_cfa10057_pullup>;
-
-                                hog_pins_cfa10057: hog-10057@0 {
+                                usb_pins_cfa10057: usb-10057@0 {
                                         reg = <0>;
                                         fsl,pinmux-ids = <
                                                 0x0073 /* MX28_PAD_GPMI_D7__GPIO_0_7 */
-                                                0x3053 /* MX28_PAD_AUART1_TX__GPIO_3_5 */
                                         >;
                                         fsl,drive-strength = <0>;
                                         fsl,voltage = <1>;
                                         fsl,pull-up = <0>;
                                 };
 
-                                hog_pins_cfa10057_pullup: hog-10057-pullup@0 {
-                                        reg = <0>;
-                                        fsl,pinmux-ids = <
-                                                0x2133 /* MX28_PAD_SSP2_D3__GPIO_2_19 */
-                                                0x3183 /* MX28_PAD_I2C0_SCL__GPIO_3_24 */
-                                                0x3193 /* MX28_PAD_I2C0_SDA__GPIO_3_25 */
-                                                0x31a3 /* MX28_PAD_SAIF_SDATA0__GPIO_3_26 */
-                                                0x31e3 /* MX28_PAD_LCD_RESET__GPIO_3_30 */
-                                        >;
-                                        fsl,drive-strength = <0>;
-                                        fsl,voltage = <1>;
-                                        fsl,pull-up = <1>;
-                                };
-
                                 lcdif_18bit_pins_cfa10057: lcdif-18bit@0 {
                                         reg = <0>;
                                         fsl,pinmux-ids = <
@@ -164,6 +145,8 @@
 
                 reg_usb1_vbus: usb1_vbus {
                         compatible = "regulator-fixed";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&usb_pins_cfa10057>;
                         regulator-name = "usb1_vbus";
                         regulator-min-microvolt = <5000000>;
                         regulator-max-microvolt = <5000000>;
diff --git a/arch/arm/boot/dts/imx28-cfa10058.dts b/arch/arm/boot/dts/imx28-cfa10058.dts
new file mode 100644
index 000000000000..64c64c55a82a
--- /dev/null
+++ b/arch/arm/boot/dts/imx28-cfa10058.dts
@@ -0,0 +1,141 @@
+/*
+ * Copyright 2013 Crystalfontz America, Inc.
+ * Copyright 2013 Free Electrons
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/*
+ * The CFA-10058 is an expansion board for the CFA-10036 module, thus we
+ * need to include the CFA-10036 DTS.
+ */
+/include/ "imx28-cfa10036.dts"
+
+/ {
+        model = "Crystalfontz CFA-10058 Board";
+        compatible = "crystalfontz,cfa10058", "crystalfontz,cfa10036", "fsl,imx28";
+
+        apb@80000000 {
+                apbh@80000000 {
+                        pinctrl@80018000 {
+                                usb_pins_cfa10058: usb-10058@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <
+                                                0x0073 /* MX28_PAD_GPMI_D7__GPIO_0_7 */
+                                        >;
+                                        fsl,drive-strength = <0>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <0>;
+                                };
+
+                                lcdif_pins_cfa10058: lcdif-10058@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <
+                                                0x1181 /* MX28_PAD_LCD_RD_E__LCD_VSYNC */
+                                                0x1191 /* MX28_PAD_LCD_WR_RWN__LCD_HSYNC */
+                                                0x11a1 /* MX28_PAD_LCD_RS__LCD_DOTCLK */
+                                                0x11b1 /* MX28_PAD_LCD_CS__LCD_ENABLE */
+                                        >;
+                                        fsl,drive-strength = <0>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <0>;
+                                };
+                        };
+
+                        lcdif@80030000 {
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&lcdif_24bit_pins_a
+                                                 &lcdif_pins_cfa10058>;
+                                display = <&display>;
+                                status = "okay";
+
+                                display: display {
+                                        bits-per-pixel = <32>;
+                                        bus-width = <24>;
+
+                                        display-timings {
+                                                native-mode = <&timing0>;
+                                                timing0: timing0 {
+                                                        clock-frequency = <30000000>;
+                                                        hactive = <800>;
+                                                        vactive = <480>;
+                                                        hback-porch = <40>;
+                                                        hfront-porch = <40>;
+                                                        vback-porch = <13>;
+                                                        vfront-porch = <29>;
+                                                        hsync-len = <8>;
+                                                        vsync-len = <8>;
+                                                        hsync-active = <0>;
+                                                        vsync-active = <0>;
+                                                        de-active = <1>;
+                                                        pixelclk-active = <1>;
+                                                };
+                                        };
+                                };
+                        };
+                };
+
+                apbx@80040000 {
+                        lradc@80050000 {
+                                fsl,lradc-touchscreen-wires = <4>;
+                                status = "okay";
+                        };
+
+                        pwm: pwm@80064000 {
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pwm3_pins_b>;
+                                status = "okay";
+                        };
+
+                        usbphy1: usbphy@8007e000 {
+                                status = "okay";
+                        };
+                };
+        };
+
+        ahb@80080000 {
+                usb1: usb@80090000 {
+                        vbus-supply = <&reg_usb1_vbus>;
+                        pinctrl-0 = <&usbphy1_pins_a>;
+                        pinctrl-names = "default";
+                        status = "okay";
+                };
+        };
+
+        regulators {
+                compatible = "simple-bus";
+
+                reg_usb1_vbus: usb1_vbus {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&usb_pins_cfa10058>;
+                        compatible = "regulator-fixed";
+                        regulator-name = "usb1_vbus";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        gpio = <&gpio0 7 1>;
+                };
+        };
+
+        ahb@80080000 {
+                mac0: ethernet@800f0000 {
+                        phy-mode = "rmii";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&mac0_pins_a>;
+                        phy-reset-gpios = <&gpio2 21 0>;
+                        phy-reset-duration = <100>;
+                        status = "okay";
+                };
+        };
+
+        backlight {
+                compatible = "pwm-backlight";
+                pwms = <&pwm 3 5000000>;
+                brightness-levels = <0 4 8 16 32 64 128 255>;
+                default-brightness-level = <6>;
+        };
+};
diff --git a/arch/arm/boot/dts/imx28-evk.dts b/arch/arm/boot/dts/imx28-evk.dts
index e035f4664b97..15715d921d14 100644
--- a/arch/arm/boot/dts/imx28-evk.dts
+++ b/arch/arm/boot/dts/imx28-evk.dts
@@ -220,6 +220,7 @@
                         auart0: serial@8006a000 {
                                 pinctrl-names = "default";
                                 pinctrl-0 = <&auart0_pins_a>;
+                                fsl,uart-has-rtscts;
                                 status = "okay";
                         };
 
diff --git a/arch/arm/boot/dts/imx28-m28evk.dts b/arch/arm/boot/dts/imx28-m28evk.dts
index 44d9da57736e..0d322a2bebaf 100644
--- a/arch/arm/boot/dts/imx28-m28evk.dts
+++ b/arch/arm/boot/dts/imx28-m28evk.dts
@@ -235,6 +235,12 @@
                                 pinctrl-0 = <&auart2_2pins_b>;
                                 status = "okay";
                         };
+
+                        pwm: pwm@80064000 {
+                                pinctrl-names = "default";
+                                pinctrl-0 = <&pwm4_pins_a>;
+                                status = "okay";
+                        };
                 };
         };
 
@@ -270,6 +276,13 @@
                 };
         };
 
+        backlight {
+                compatible = "pwm-backlight";
+                pwms = <&pwm 4 5000000>;
+                brightness-levels = <0 4 8 16 32 64 128 255>;
+                default-brightness-level = <6>;
+        };
+
         regulators {
                 compatible = "simple-bus";
 
diff --git a/arch/arm/boot/dts/imx28.dtsi b/arch/arm/boot/dts/imx28.dtsi
index 9524a0571281..7363fded95ee 100644
--- a/arch/arm/boot/dts/imx28.dtsi
+++ b/arch/arm/boot/dts/imx28.dtsi
@@ -15,6 +15,8 @@
         interrupt-parent = <&icoll>;
 
         aliases {
+                ethernet0 = &mac0;
+                ethernet1 = &mac1;
                 gpio0 = &gpio0;
                 gpio1 = &gpio1;
                 gpio2 = &gpio2;
@@ -27,8 +29,8 @@
                 serial2 = &auart2;
                 serial3 = &auart3;
                 serial4 = &auart4;
-                ethernet0 = &mac0;
-                ethernet1 = &mac1;
+                spi0 = &ssp1;
+                spi1 = &ssp2;
         };
 
         cpus {
@@ -62,9 +64,9 @@
                                 reg = <0x80000000 0x2000>;
                         };
 
-                        hsadc@80002000 {
+                        hsadc: hsadc@80002000 {
                                 reg = <0x80002000 0x2000>;
-                                interrupts = <13 87>;
+                                interrupts = <13>;
                                 dmas = <&dma_apbh 12>;
                                 dma-names = "rx";
                                 status = "disabled";
@@ -86,25 +88,24 @@
                                 clocks = <&clks 25>;
                         };
 
-                        perfmon@80006000 {
+                        perfmon: perfmon@80006000 {
                                 reg = <0x80006000 0x800>;
                                 interrupts = <27>;
                                 status = "disabled";
                         };
 
-                        gpmi-nand@8000c000 {
+                        gpmi: gpmi-nand@8000c000 {
                                 compatible = "fsl,imx28-gpmi-nand";
                                 #address-cells = <1>;
                                 #size-cells = <1>;
                                 reg = <0x8000c000 0x2000>, <0x8000a000 0x2000>;
                                 reg-names = "gpmi-nand", "bch";
-                                interrupts = <88>, <41>;
-                                interrupt-names = "gpmi-dma", "bch";
+                                interrupts = <41>;
+                                interrupt-names = "bch";
                                 clocks = <&clks 50>;
                                 clock-names = "gpmi_io";
                                 dmas = <&dma_apbh 4>;
                                 dma-names = "rx-tx";
-                                fsl,gpmi-dma-channel = <4>;
                                 status = "disabled";
                         };
 
@@ -112,11 +113,10 @@
                                 #address-cells = <1>;
                                 #size-cells = <0>;
                                 reg = <0x80010000 0x2000>;
-                                interrupts = <96 82>;
+                                interrupts = <96>;
                                 clocks = <&clks 46>;
                                 dmas = <&dma_apbh 0>;
                                 dma-names = "rx-tx";
-                                fsl,ssp-dma-channel = <0>;
                                 status = "disabled";
                         };
 
@@ -124,11 +124,10 @@
                                 #address-cells = <1>;
                                 #size-cells = <0>;
                                 reg = <0x80012000 0x2000>;
-                                interrupts = <97 83>;
+                                interrupts = <97>;
                                 clocks = <&clks 47>;
                                 dmas = <&dma_apbh 1>;
                                 dma-names = "rx-tx";
-                                fsl,ssp-dma-channel = <1>;
                                 status = "disabled";
                         };
 
@@ -136,11 +135,10 @@
                                 #address-cells = <1>;
                                 #size-cells = <0>;
                                 reg = <0x80014000 0x2000>;
-                                interrupts = <98 84>;
+                                interrupts = <98>;
                                 clocks = <&clks 48>;
                                 dmas = <&dma_apbh 2>;
                                 dma-names = "rx-tx";
-                                fsl,ssp-dma-channel = <2>;
                                 status = "disabled";
                         };
 
@@ -148,15 +146,14 @@
                                 #address-cells = <1>;
                                 #size-cells = <0>;
                                 reg = <0x80016000 0x2000>;
-                                interrupts = <99 85>;
+                                interrupts = <99>;
                                 clocks = <&clks 49>;
                                 dmas = <&dma_apbh 3>;
                                 dma-names = "rx-tx";
-                                fsl,ssp-dma-channel = <3>;
                                 status = "disabled";
                         };
 
-                        pinctrl@80018000 {
+                        pinctrl: pinctrl@80018000 {
                                 #address-cells = <1>;
                                 #size-cells = <0>;
                                 compatible = "fsl,imx28-pinctrl", "simple-bus";
@@ -521,6 +518,18 @@
                                         fsl,pull-up = <1>;
                                 };
 
+                                saif0_pins_b: saif0@1 {
+                                        reg = <1>;
+                                        fsl,pinmux-ids = <
+                                                0x3150 /* MX28_PAD_SAIF0_LRCLK__SAIF0_LRCLK */
+                                                0x3160 /* MX28_PAD_SAIF0_BITCLK__SAIF0_BITCLK */
+                                                0x3170 /* MX28_PAD_SAIF0_SDATA0__SAIF0_SDATA0 */
+                                        >;
+                                        fsl,drive-strength = <2>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <1>;
+                                };
+
                                 saif1_pins_a: saif1@0 {
                                         reg = <0>;
                                         fsl,pinmux-ids = <
@@ -639,6 +648,19 @@
                                         fsl,pull-up = <0>;
                                 };
 
+                                lcdif_sync_pins_a: lcdif-sync@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <
+                                                0x11a1 /* MX28_PAD_LCD_RS__LCD_DOTCLK */
+                                                0x11b1 /* MX28_PAD_LCD_CS__LCD_ENABLE */
+                                                0x1181 /* MX28_PAD_LCD_RD_E__LCD_VSYNC */
+                                                0x1191 /* MX28_PAD_LCD_WR_RWN__LCD_HSYNC */
+                                        >;
+                                        fsl,drive-strength = <0>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <0>;
+                                };
+
                                 can0_pins_a: can0@0 {
                                         reg = <0>;
                                         fsl,pinmux-ids = <
@@ -674,6 +696,21 @@
                                         fsl,pull-up = <1>;
                                 };
 
+                                spi3_pins_a: spi3@0 {
+                                        reg = <0>;
+                                        fsl,pinmux-ids = <
+                                                0x3082 /* MX28_PAD_AUART2_RX__SSP3_D4 */
+                                                0x3092 /* MX28_PAD_AUART2_TX__SSP3_D5 */
+                                                0x2180 /* MX28_PAD_SSP3_SCK__SSP3_SCK */
+                                                0x2190 /* MX28_PAD_SSP3_MOSI__SSP3_CMD */
+                                                0x21A0 /* MX28_PAD_SSP3_MISO__SSP3_D0 */
+                                                0x21B0 /* MX28_PAD_SSP3_SS0__SSP3_D3 */
+                                        >;
+                                        fsl,drive-strength = <1>;
+                                        fsl,voltage = <1>;
+                                        fsl,pull-up = <0>;
+                                };
+
                                 usbphy0_pins_a: usbphy0@0 {
                                         reg = <0>;
                                         fsl,pinmux-ids = <
@@ -705,14 +742,14 @@
                                 };
                         };
 
-                        digctl@8001c000 {
+                        digctl: digctl@8001c000 {
                                 compatible = "fsl,imx28-digctl", "fsl,imx23-digctl";
                                 reg = <0x8001c000 0x2000>;
                                 interrupts = <89>;
                                 status = "disabled";
                         };
 
-                        etm@80022000 {
+                        etm: etm@80022000 {
                                 reg = <0x80022000 0x2000>;
                                 status = "disabled";
                         };
@@ -733,19 +770,19 @@
                                 clocks = <&clks 26>;
                         };
 
-                        dcp@80028000 {
+                        dcp: dcp@80028000 {
                                 reg = <0x80028000 0x2000>;
                                 interrupts = <52 53 54>;
                                 compatible = "fsl-dcp";
                         };
 
-                        pxp@8002a000 {
+                        pxp: pxp@8002a000 {
                                 reg = <0x8002a000 0x2000>;
                                 interrupts = <39>;
                                 status = "disabled";
                         };
 
-                        ocotp@8002c000 {
+                        ocotp: ocotp@8002c000 {
                                 compatible = "fsl,ocotp";
                                 reg = <0x8002c000 0x2000>;
                                 status = "disabled";
@@ -756,10 +793,10 @@
                                 status = "disabled";
                         };
 
-                        lcdif@80030000 {
+                        lcdif: lcdif@80030000 {
                                 compatible = "fsl,imx28-lcdif";
                                 reg = <0x80030000 0x2000>;
-                                interrupts = <38 86>;
+                                interrupts = <38>;
                                 clocks = <&clks 55>;
                                 dmas = <&dma_apbh 13>;
                                 dma-names = "rx";
@@ -784,41 +821,41 @@
                                 status = "disabled";
                         };
 
-                        simdbg@8003c000 {
+                        simdbg: simdbg@8003c000 {
                                 reg = <0x8003c000 0x200>;
                                 status = "disabled";
                         };
 
-                        simgpmisel@8003c200 {
+                        simgpmisel: simgpmisel@8003c200 {
                                 reg = <0x8003c200 0x100>;
                                 status = "disabled";
                         };
 
-                        simsspsel@8003c300 {
+                        simsspsel: simsspsel@8003c300 {
                                 reg = <0x8003c300 0x100>;
                                 status = "disabled";
                         };
 
-                        simmemsel@8003c400 {
+                        simmemsel: simmemsel@8003c400 {
                                 reg = <0x8003c400 0x100>;
                                 status = "disabled";
                         };
 
-                        gpiomon@8003c500 {
+                        gpiomon: gpiomon@8003c500 {
                                 reg = <0x8003c500 0x100>;
                                 status = "disabled";
                         };
 
-                        simenet@8003c700 {
+                        simenet: simenet@8003c700 {
                                 reg = <0x8003c700 0x100>;
                                 status = "disabled";
                         };
 
-                        armjtag@8003c800 {
+                        armjtag: armjtag@8003c800 {
                                 reg = <0x8003c800 0x100>;
                                 status = "disabled";
                         };
-                };
+                };
 
                 apbx@80040000 {
                         compatible = "simple-bus";
@@ -836,16 +873,15 @@
                         saif0: saif@80042000 {
                                 compatible = "fsl,imx28-saif";
                                 reg = <0x80042000 0x2000>;
-                                interrupts = <59 80>;
+                                interrupts = <59>;
                                 #clock-cells = <0>;
                                 clocks = <&clks 53>;
                                 dmas = <&dma_apbx 4>;
                                 dma-names = "rx-tx";
-                                fsl,saif-dma-channel = <4>;
                                 status = "disabled";
                         };
 
-                        power@80044000 {
+                        power: power@80044000 {
                                 reg = <0x80044000 0x2000>;
                                 status = "disabled";
                         };
@@ -853,15 +889,14 @@
                         saif1: saif@80046000 {
                                 compatible = "fsl,imx28-saif";
                                 reg = <0x80046000 0x2000>;
-                                interrupts = <58 81>;
+                                interrupts = <58>;
                                 clocks = <&clks 54>;
                                 dmas = <&dma_apbx 5>;
                                 dma-names = "rx-tx";
-                                fsl,saif-dma-channel = <5>;
                                 status = "disabled";
                         };
 
-                        lradc@80050000 {
+                        lradc: lradc@80050000 {
                                 compatible = "fsl,imx28-lradc";
                                 reg = <0x80050000 0x2000>;
                                 interrupts = <10 14 15 16 17 18 19
@@ -869,15 +904,15 @@
                                 status = "disabled";
                         };
 
-                        spdif@80054000 {
+                        spdif: spdif@80054000 {
                                 reg = <0x80054000 0x2000>;
-                                interrupts = <45 66>;
+                                interrupts = <45>;
                                 dmas = <&dma_apbx 2>;
                                 dma-names = "tx";
                                 status = "disabled";
                         };
 
-                        rtc@80056000 {
+                        mxs_rtc: rtc@80056000 {
                                 compatible = "fsl,imx28-rtc", "fsl,stmp3xxx-rtc";
                                 reg = <0x80056000 0x2000>;
                                 interrupts = <29>;
@@ -888,11 +923,10 @@
                                 #size-cells = <0>;
                                 compatible = "fsl,imx28-i2c";
                                 reg = <0x80058000 0x2000>;
-                                interrupts = <111 68>;
+                                interrupts = <111>;
                                 clock-frequency = <100000>;
                                 dmas = <&dma_apbx 6>;
                                 dma-names = "rx-tx";
-                                fsl,i2c-dma-channel = <6>;
                                 status = "disabled";
                         };
 
@@ -901,11 +935,10 @@
                                 #size-cells = <0>;
                                 compatible = "fsl,imx28-i2c";
                                 reg = <0x8005a000 0x2000>;
-                                interrupts = <110 69>;
+                                interrupts = <110>;
                                 clock-frequency = <100000>;
                                 dmas = <&dma_apbx 7>;
                                 dma-names = "rx-tx";
-                                fsl,i2c-dma-channel = <7>;
                                 status = "disabled";
                         };
 
@@ -918,7 +951,7 @@
                                 status = "disabled";
                         };
 
-                        timrot@80068000 {
+                        timer: timrot@80068000 {
                                 compatible = "fsl,imx28-timrot", "fsl,timrot";
                                 reg = <0x80068000 0x2000>;
                                 interrupts = <48 49 50 51>;
@@ -928,10 +961,9 @@
                         auart0: serial@8006a000 {
                                 compatible = "fsl,imx28-auart", "fsl,imx23-auart";
                                 reg = <0x8006a000 0x2000>;
-                                interrupts = <112 70 71>;
+                                interrupts = <112>;
                                 dmas = <&dma_apbx 8>, <&dma_apbx 9>;
                                 dma-names = "rx", "tx";
-                                fsl,auart-dma-channel = <8 9>;
                                 clocks = <&clks 45>;
                                 status = "disabled";
                         };
@@ -939,7 +971,7 @@
                         auart1: serial@8006c000 {
                                 compatible = "fsl,imx28-auart", "fsl,imx23-auart";
                                 reg = <0x8006c000 0x2000>;
-                                interrupts = <113 72 73>;
+                                interrupts = <113>;
                                 dmas = <&dma_apbx 10>, <&dma_apbx 11>;
                                 dma-names = "rx", "tx";
                                 clocks = <&clks 45>;
@@ -949,7 +981,7 @@
                         auart2: serial@8006e000 {
                                 compatible = "fsl,imx28-auart", "fsl,imx23-auart";
                                 reg = <0x8006e000 0x2000>;
-                                interrupts = <114 74 75>;
+                                interrupts = <114>;
                                 dmas = <&dma_apbx 12>, <&dma_apbx 13>;
                                 dma-names = "rx", "tx";
                                 clocks = <&clks 45>;
@@ -959,7 +991,7 @@
                         auart3: serial@80070000 {
                                 compatible = "fsl,imx28-auart", "fsl,imx23-auart";
                                 reg = <0x80070000 0x2000>;
-                                interrupts = <115 76 77>;
+                                interrupts = <115>;
                                 dmas = <&dma_apbx 14>, <&dma_apbx 15>;
                                 dma-names = "rx", "tx";
                                 clocks = <&clks 45>;
@@ -969,7 +1001,7 @@
                         auart4: serial@80072000 {
                                 compatible = "fsl,imx28-auart", "fsl,imx23-auart";
                                 reg = <0x80072000 0x2000>;
-                                interrupts = <116 78 79>;
+                                interrupts = <116>;
                                 dmas = <&dma_apbx 0>, <&dma_apbx 1>;
                                 dma-names = "rx", "tx";
                                 clocks = <&clks 45>;
@@ -1026,7 +1058,7 @@
                         status = "disabled";
                 };
 
-                dflpt@800c0000 {
+                dflpt: dflpt@800c0000 {
                         reg = <0x800c0000 0x10000>;
                         status = "disabled";
                 };
@@ -1049,10 +1081,9 @@
                         status = "disabled";
                 };
 
-                switch@800f8000 {
+                etn_switch: switch@800f8000 {
                         reg = <0x800f8000 0x8000>;
                         status = "disabled";
                 };
-
         };
 };
diff --git a/arch/arm/boot/dts/imx31.dtsi b/arch/arm/boot/dts/imx31.dtsi
index c5449257ad9a..c34f82581248 100644
--- a/arch/arm/boot/dts/imx31.dtsi
+++ b/arch/arm/boot/dts/imx31.dtsi
@@ -20,6 +20,16 @@
                 serial4 = &uart5;
         };
 
+        cpus {
+                #address-cells = <0>;
+                #size-cells = <0>;
+
+                cpu {
+                        compatible = "arm,arm1136";
+                        device_type = "cpu";
+                };
+        };
+
         avic: avic-interrupt-controller@60000000 {
                 compatible = "fsl,imx31-avic", "fsl,avic";
                 interrupt-controller;
@@ -94,6 +104,13 @@
                                 status = "disabled";
                         };
 
+                        iim: iim@5001c000 {
+                                compatible = "fsl,imx31-iim", "fsl,imx27-iim";
+                                reg = <0x5001c000 0x1000>;
+                                interrupts = <19>;
+                                clocks = <&clks 25>;
+                        };
+
                         clks: ccm@53f80000{
                                 compatible = "fsl,imx31-ccm";
                                 reg = <0x53f80000 0x4000>;
diff --git a/arch/arm/boot/dts/imx51-apf51.dts b/arch/arm/boot/dts/imx51-apf51.dts
index 8f7f9ac0b989..b3606993f2e8 100644
--- a/arch/arm/boot/dts/imx51-apf51.dts
+++ b/arch/arm/boot/dts/imx51-apf51.dts
@@ -26,10 +26,6 @@
         };
 
         clocks {
-                ckih1 {
-                        clock-frequency = <0>;
-                };
-
                 osc {
                         clock-frequency = <33554432>;
                 };
diff --git a/arch/arm/boot/dts/imx51-babbage.dts b/arch/arm/boot/dts/imx51-babbage.dts
index ad3471ca17c7..1d337d99ecd5 100644
--- a/arch/arm/boot/dts/imx51-babbage.dts
+++ b/arch/arm/boot/dts/imx51-babbage.dts
@@ -63,6 +63,10 @@
         };
 
         clocks {
+                ckih1 {
+                        clock-frequency = <22579200>;
+                };
+
                 clk_26M: codec_clock {
                         compatible = "fixed-clock";
                         reg=<0>;
@@ -108,6 +112,7 @@
                 #size-cells = <0>;
                 compatible = "fsl,mc13892";
                 spi-max-frequency = <6000000>;
+                spi-cs-high;
                 reg = <0>;
                 interrupt-parent = <&gpio1>;
                 interrupts = <8 0x4>;
diff --git a/arch/arm/boot/dts/imx51.dtsi b/arch/arm/boot/dts/imx51.dtsi
index 25764b505a61..54cee6517902 100644
--- a/arch/arm/boot/dts/imx51.dtsi
+++ b/arch/arm/boot/dts/imx51.dtsi
@@ -15,13 +15,18 @@
 
 / {
         aliases {
-                serial0 = &uart1;
-                serial1 = &uart2;
-                serial2 = &uart3;
                 gpio0 = &gpio1;
                 gpio1 = &gpio2;
                 gpio2 = &gpio3;
                 gpio3 = &gpio4;
+                i2c0 = &i2c1;
+                i2c1 = &i2c2;
+                serial0 = &uart1;
+                serial1 = &uart2;
+                serial2 = &uart3;
+                spi0 = &ecspi1;
+                spi1 = &ecspi2;
+                spi2 = &cspi;
         };
 
         tzic: tz-interrupt-controller@e0000000 {
@@ -42,7 +47,7 @@
 
                 ckih1 {
                         compatible = "fsl,imx-ckih1", "fixed-clock";
-                        clock-frequency = <22579200>;
+                        clock-frequency = <0>;
                 };
 
                 ckih2 {
@@ -149,6 +154,9 @@
                                         reg = <0x70014000 0x4000>;
                                         interrupts = <30>;
                                         clocks = <&clks 49>;
+                                        dmas = <&sdma 24 1 0>,
+                                               <&sdma 25 1 0>;
+                                        dma-names = "rx", "tx";
                                         fsl,fifo-depth = <15>;
                                         fsl,ssi-dma-events = <25 24 23 22>; /* TX0 RX0 TX1 RX1 */
                                         status = "disabled";
@@ -300,275 +308,6 @@
                         iomuxc: iomuxc@73fa8000 {
                                 compatible = "fsl,imx51-iomuxc";
                                 reg = <0x73fa8000 0x4000>;
-
-                                audmux {
-                                        pinctrl_audmux_1: audmuxgrp-1 {
-                                                fsl,pins = <
-                                                        MX51_PAD_AUD3_BB_TXD__AUD3_TXD 0x80000000
-                                                        MX51_PAD_AUD3_BB_RXD__AUD3_RXD 0x80000000
-                                                        MX51_PAD_AUD3_BB_CK__AUD3_TXC  0x80000000
-                                                        MX51_PAD_AUD3_BB_FS__AUD3_TXFS 0x80000000
-                                                >;
-                                        };
-                                };
-
-                                fec {
-                                        pinctrl_fec_1: fecgrp-1 {
-                                                fsl,pins = <
-                                                        MX51_PAD_EIM_EB2__FEC_MDIO         0x80000000
-                                                        MX51_PAD_EIM_EB3__FEC_RDATA1       0x80000000
-                                                        MX51_PAD_EIM_CS2__FEC_RDATA2       0x80000000
-                                                        MX51_PAD_EIM_CS3__FEC_RDATA3       0x80000000
-                                                        MX51_PAD_EIM_CS4__FEC_RX_ER        0x80000000
-                                                        MX51_PAD_EIM_CS5__FEC_CRS          0x80000000
-                                                        MX51_PAD_NANDF_RB2__FEC_COL        0x80000000
-                                                        MX51_PAD_NANDF_RB3__FEC_RX_CLK     0x80000000
-                                                        MX51_PAD_NANDF_D9__FEC_RDATA0      0x80000000
-                                                        MX51_PAD_NANDF_D8__FEC_TDATA0      0x80000000
-                                                        MX51_PAD_NANDF_CS2__FEC_TX_ER      0x80000000
-                                                        MX51_PAD_NANDF_CS3__FEC_MDC        0x80000000
-                                                        MX51_PAD_NANDF_CS4__FEC_TDATA1     0x80000000
-                                                        MX51_PAD_NANDF_CS5__FEC_TDATA2     0x80000000
-                                                        MX51_PAD_NANDF_CS6__FEC_TDATA3     0x80000000
-                                                        MX51_PAD_NANDF_CS7__FEC_TX_EN      0x80000000
-                                                        MX51_PAD_NANDF_RDY_INT__FEC_TX_CLK 0x80000000
-                                                >;
-                                        };
-
-                                        pinctrl_fec_2: fecgrp-2 {
-                                                fsl,pins = <
-                                                        MX51_PAD_DI_GP3__FEC_TX_ER        0x80000000
-                                                        MX51_PAD_DI2_PIN4__FEC_CRS        0x80000000
-                                                        MX51_PAD_DI2_PIN2__FEC_MDC        0x80000000
-                                                        MX51_PAD_DI2_PIN3__FEC_MDIO       0x80000000
-                                                        MX51_PAD_DI2_DISP_CLK__FEC_RDATA1 0x80000000
-                                                        MX51_PAD_DI_GP4__FEC_RDATA2       0x80000000
-                                                        MX51_PAD_DISP2_DAT0__FEC_RDATA3   0x80000000
-                                                        MX51_PAD_DISP2_DAT1__FEC_RX_ER    0x80000000
-                                                        MX51_PAD_DISP2_DAT6__FEC_TDATA1   0x80000000
-                                                        MX51_PAD_DISP2_DAT7__FEC_TDATA2   0x80000000
-                                                        MX51_PAD_DISP2_DAT8__FEC_TDATA3   0x80000000
-                                                        MX51_PAD_DISP2_DAT9__FEC_TX_EN    0x80000000
-                                                        MX51_PAD_DISP2_DAT10__FEC_COL     0x80000000
-                                                        MX51_PAD_DISP2_DAT11__FEC_RX_CLK  0x80000000
-                                                        MX51_PAD_DISP2_DAT12__FEC_RX_DV   0x80000000
-                                                        MX51_PAD_DISP2_DAT13__FEC_TX_CLK  0x80000000
-                                                        MX51_PAD_DISP2_DAT14__FEC_RDATA0  0x80000000
-                                                        MX51_PAD_DISP2_DAT15__FEC_TDATA0  0x80000000
-                                                >;
-                                        };
-                                };
-
-                                ecspi1 {
-                                        pinctrl_ecspi1_1: ecspi1grp-1 {
-                                                fsl,pins = <
-                                                        MX51_PAD_CSPI1_MISO__ECSPI1_MISO 0x185
-                                                        MX51_PAD_CSPI1_MOSI__ECSPI1_MOSI 0x185
-                                                        MX51_PAD_CSPI1_SCLK__ECSPI1_SCLK 0x185
-                                                >;
-                                        };
-                                };
-
-                                ecspi2 {
-                                        pinctrl_ecspi2_1: ecspi2grp-1 {
-                                                fsl,pins = <
-                                                        MX51_PAD_NANDF_RB3__ECSPI2_MISO 0x185
-                                                        MX51_PAD_NANDF_D15__ECSPI2_MOSI 0x185
-                                                        MX51_PAD_NANDF_RB2__ECSPI2_SCLK 0x185
-                                                >;
-                                        };
-                                };
-
-                                esdhc1 {
-                                        pinctrl_esdhc1_1: esdhc1grp-1 {
-                                                fsl,pins = <
-                                                        MX51_PAD_SD1_CMD__SD1_CMD     0x400020d5
-                                                        MX51_PAD_SD1_CLK__SD1_CLK     0x20d5
-                                                        MX51_PAD_SD1_DATA0__SD1_DATA0 0x20d5
-                                                        MX51_PAD_SD1_DATA1__SD1_DATA1 0x20d5
-                                                        MX51_PAD_SD1_DATA2__SD1_DATA2 0x20d5
-                                                        MX51_PAD_SD1_DATA3__SD1_DATA3 0x20d5
-                                                >;
-                                        };
-                                };
-
-                                esdhc2 {
-                                        pinctrl_esdhc2_1: esdhc2grp-1 {
-                                                fsl,pins = <
-                                                        MX51_PAD_SD2_CMD__SD2_CMD     0x400020d5
-                                                        MX51_PAD_SD2_CLK__SD2_CLK     0x20d5
-                                                        MX51_PAD_SD2_DATA0__SD2_DATA0 0x20d5
-                                                        MX51_PAD_SD2_DATA1__SD2_DATA1 0x20d5
-                                                        MX51_PAD_SD2_DATA2__SD2_DATA2 0x20d5
-                                                        MX51_PAD_SD2_DATA3__SD2_DATA3 0x20d5
-                                                >;
-                                        };
-                                };
-
-                                i2c2 {
-                                        pinctrl_i2c2_1: i2c2grp-1 {
-                                                fsl,pins = <
-                                                        MX51_PAD_KEY_COL4__I2C2_SCL 0x400001ed
-                                                        MX51_PAD_KEY_COL5__I2C2_SDA 0x400001ed
-                                                >;
-                                        };
-
-                                        pinctrl_i2c2_2: i2c2grp-2 {
-                                                fsl,pins = <
-                                                        MX51_PAD_EIM_D27__I2C2_SCL 0x400001ed
-                                                        MX51_PAD_EIM_D24__I2C2_SDA 0x400001ed
-                                                >;
-                                        };
-                                };
-
-                                ipu_disp1 {
-                                        pinctrl_ipu_disp1_1: ipudisp1grp-1 {
-                                                fsl,pins = <
-                                                        MX51_PAD_DISP1_DAT0__DISP1_DAT0   0x5
-                                                        MX51_PAD_DISP1_DAT1__DISP1_DAT1   0x5
-                                                        MX51_PAD_DISP1_DAT2__DISP1_DAT2   0x5
-                                                        MX51_PAD_DISP1_DAT3__DISP1_DAT3   0x5
-                                                        MX51_PAD_DISP1_DAT4__DISP1_DAT4   0x5
-                                                        MX51_PAD_DISP1_DAT5__DISP1_DAT5   0x5
-                                                        MX51_PAD_DISP1_DAT6__DISP1_DAT6   0x5
-                                                        MX51_PAD_DISP1_DAT7__DISP1_DAT7   0x5
-                                                        MX51_PAD_DISP1_DAT8__DISP1_DAT8   0x5
-                                                        MX51_PAD_DISP1_DAT9__DISP1_DAT9   0x5
-                                                        MX51_PAD_DISP1_DAT10__DISP1_DAT10 0x5
-                                                        MX51_PAD_DISP1_DAT11__DISP1_DAT11 0x5
-                                                        MX51_PAD_DISP1_DAT12__DISP1_DAT12 0x5
-                                                        MX51_PAD_DISP1_DAT13__DISP1_DAT13 0x5
-                                                        MX51_PAD_DISP1_DAT14__DISP1_DAT14 0x5
-                                                        MX51_PAD_DISP1_DAT15__DISP1_DAT15 0x5
-                                                        MX51_PAD_DISP1_DAT16__DISP1_DAT16 0x5
-                                                        MX51_PAD_DISP1_DAT17__DISP1_DAT17 0x5
-                                                        MX51_PAD_DISP1_DAT18__DISP1_DAT18 0x5
-                                                        MX51_PAD_DISP1_DAT19__DISP1_DAT19 0x5
-                                                        MX51_PAD_DISP1_DAT20__DISP1_DAT20 0x5
-                                                        MX51_PAD_DISP1_DAT21__DISP1_DAT21 0x5
-                                                        MX51_PAD_DISP1_DAT22__DISP1_DAT22 0x5
-                                                        MX51_PAD_DISP1_DAT23__DISP1_DAT23 0x5
-                                                        MX51_PAD_DI1_PIN2__DI1_PIN2       0x5 /* hsync */
-                                                        MX51_PAD_DI1_PIN3__DI1_PIN3       0x5 /* vsync */
-                                                >;
-                                        };
-                                };
-
-                                ipu_disp2 {
-                                        pinctrl_ipu_disp2_1: ipudisp2grp-1 {
-                                                fsl,pins = <
-                                                        MX51_PAD_DISP2_DAT0__DISP2_DAT0     0x5
-                                                        MX51_PAD_DISP2_DAT1__DISP2_DAT1     0x5
-                                                        MX51_PAD_DISP2_DAT2__DISP2_DAT2     0x5
-                                                        MX51_PAD_DISP2_DAT3__DISP2_DAT3     0x5
-                                                        MX51_PAD_DISP2_DAT4__DISP2_DAT4     0x5
-                                                        MX51_PAD_DISP2_DAT5__DISP2_DAT5     0x5
-                                                        MX51_PAD_DISP2_DAT6__DISP2_DAT6     0x5
-                                                        MX51_PAD_DISP2_DAT7__DISP2_DAT7     0x5
-                                                        MX51_PAD_DISP2_DAT8__DISP2_DAT8     0x5
-                                                        MX51_PAD_DISP2_DAT9__DISP2_DAT9     0x5
-                                                        MX51_PAD_DISP2_DAT10__DISP2_DAT10   0x5
-                                                        MX51_PAD_DISP2_DAT11__DISP2_DAT11   0x5
-                                                        MX51_PAD_DISP2_DAT12__DISP2_DAT12   0x5
-                                                        MX51_PAD_DISP2_DAT13__DISP2_DAT13   0x5
-                                                        MX51_PAD_DISP2_DAT14__DISP2_DAT14   0x5
-                                                        MX51_PAD_DISP2_DAT15__DISP2_DAT15   0x5
-                                                        MX51_PAD_DI2_PIN2__DI2_PIN2         0x5 /* hsync */
-                                                        MX51_PAD_DI2_PIN3__DI2_PIN3         0x5 /* vsync */
-                                                        MX51_PAD_DI2_DISP_CLK__DI2_DISP_CLK 0x5
-                                                        MX51_PAD_DI_GP4__DI2_PIN15          0x5
-                                                >;
-                                        };
-                                };
-
-                                pata {
-                                        pinctrl_pata_1: patagrp-1 {
-                                                fsl,pins = <
-                                                        MX51_PAD_NANDF_WE_B__PATA_DIOW          0x2004
-                                                        MX51_PAD_NANDF_RE_B__PATA_DIOR          0x2004
-                                                        MX51_PAD_NANDF_ALE__PATA_BUFFER_EN      0x2004
-                                                        MX51_PAD_NANDF_CLE__PATA_RESET_B        0x2004
-                                                        MX51_PAD_NANDF_WP_B__PATA_DMACK         0x2004
-                                                        MX51_PAD_NANDF_RB0__PATA_DMARQ          0x2004
-                                                        MX51_PAD_NANDF_RB1__PATA_IORDY          0x2004
-                                                        MX51_PAD_GPIO_NAND__PATA_INTRQ          0x2004
-                                                        MX51_PAD_NANDF_CS2__PATA_CS_0           0x2004
-                                                        MX51_PAD_NANDF_CS3__PATA_CS_1           0x2004
-                                                        MX51_PAD_NANDF_CS4__PATA_DA_0           0x2004
-                                                        MX51_PAD_NANDF_CS5__PATA_DA_1           0x2004
-                                                        MX51_PAD_NANDF_CS6__PATA_DA_2           0x2004
-                                                        MX51_PAD_NANDF_D15__PATA_DATA15         0x2004
-                                                        MX51_PAD_NANDF_D14__PATA_DATA14         0x2004
-                                                        MX51_PAD_NANDF_D13__PATA_DATA13         0x2004
-                                                        MX51_PAD_NANDF_D12__PATA_DATA12         0x2004
-                                                        MX51_PAD_NANDF_D11__PATA_DATA11         0x2004
-                                                        MX51_PAD_NANDF_D10__PATA_DATA10         0x2004
-                                                        MX51_PAD_NANDF_D9__PATA_DATA9           0x2004
-                                                        MX51_PAD_NANDF_D8__PATA_DATA8           0x2004
-                                                        MX51_PAD_NANDF_D7__PATA_DATA7           0x2004
-                                                        MX51_PAD_NANDF_D6__PATA_DATA6           0x2004
-                                                        MX51_PAD_NANDF_D5__PATA_DATA5           0x2004
-                                                        MX51_PAD_NANDF_D4__PATA_DATA4           0x2004
-                                                        MX51_PAD_NANDF_D3__PATA_DATA3           0x2004
-                                                        MX51_PAD_NANDF_D2__PATA_DATA2           0x2004
-                                                        MX51_PAD_NANDF_D1__PATA_DATA1           0x2004
-                                                        MX51_PAD_NANDF_D0__PATA_DATA0           0x2004
-                                                >;
-                                        };
-                                };
-
-                                uart1 {
-                                        pinctrl_uart1_1: uart1grp-1 {
-                                                fsl,pins = <
-                                                        MX51_PAD_UART1_RXD__UART1_RXD 0x1c5
-                                                        MX51_PAD_UART1_TXD__UART1_TXD 0x1c5
-                                                        MX51_PAD_UART1_RTS__UART1_RTS 0x1c5
-                                                        MX51_PAD_UART1_CTS__UART1_CTS 0x1c5
-                                                >;
-                                        };
-                                };
-
-                                uart2 {
-                                        pinctrl_uart2_1: uart2grp-1 {
-                                                fsl,pins = <
-                                                        MX51_PAD_UART2_RXD__UART2_RXD 0x1c5
-                                                        MX51_PAD_UART2_TXD__UART2_TXD 0x1c5
-                                                >;
-                                        };
-                                };
-
-                                uart3 {
-                                        pinctrl_uart3_1: uart3grp-1 {
-                                                fsl,pins = <
-                                                        MX51_PAD_EIM_D25__UART3_RXD 0x1c5
-                                                        MX51_PAD_EIM_D26__UART3_TXD 0x1c5
-                                                        MX51_PAD_EIM_D27__UART3_RTS 0x1c5
-                                                        MX51_PAD_EIM_D24__UART3_CTS 0x1c5
-                                                >;
-                                        };
-
-                                        pinctrl_uart3_2: uart3grp-2 {
-                                                fsl,pins = <
-                                                        MX51_PAD_UART3_RXD__UART3_RXD 0x1c5
-                                                        MX51_PAD_UART3_TXD__UART3_TXD 0x1c5
-                                                >;
-                                        };
-                                };
-
-                                kpp {
-                                        pinctrl_kpp_1: kppgrp-1 {
-                                                fsl,pins = <
-                                                        MX51_PAD_KEY_ROW0__KEY_ROW0 0xe0
-                                                        MX51_PAD_KEY_ROW1__KEY_ROW1 0xe0
-                                                        MX51_PAD_KEY_ROW2__KEY_ROW2 0xe0
-                                                        MX51_PAD_KEY_ROW3__KEY_ROW3 0xe0
-                                                        MX51_PAD_KEY_COL0__KEY_COL0 0xe8
-                                                        MX51_PAD_KEY_COL1__KEY_COL1 0xe8
-                                                        MX51_PAD_KEY_COL2__KEY_COL2 0xe8
-                                                        MX51_PAD_KEY_COL3__KEY_COL3 0xe8
-                                                >;
-                                        };
-                                };
                         };
 
                         pwm1: pwm@73fb4000 {
@@ -628,6 +367,13 @@
                         reg = <0x80000000 0x10000000>;
                         ranges;
 
+                        iim: iim@83f98000 {
+                                compatible = "fsl,imx51-iim", "fsl,imx27-iim";
+                                reg = <0x83f98000 0x4000>;
+                                interrupts = <69>;
+                                clocks = <&clks 107>;
+                        };
+
                         ecspi2: ecspi@83fac000 {
                                 #address-cells = <1>;
                                 #size-cells = <0>;
@@ -645,6 +391,7 @@
                                 interrupts = <6>;
                                 clocks = <&clks 56>, <&clks 56>;
                                 clock-names = "ipg", "ahb";
+                                #dma-cells = <3>;
                                 fsl,sdma-ram-script-name = "imx/sdma/sdma-imx51.bin";
                         };
 
@@ -684,6 +431,9 @@
                                 reg = <0x83fcc000 0x4000>;
                                 interrupts = <29>;
                                 clocks = <&clks 48>;
+                                dmas = <&sdma 28 0 0>,
+                                       <&sdma 29 0 0>;
+                                dma-names = "rx", "tx";
                                 fsl,fifo-depth = <15>;
                                 fsl,ssi-dma-events = <29 28 27 26>; /* TX0 RX0 TX1 RX1 */
                                 status = "disabled";
@@ -695,6 +445,23 @@
                                 status = "disabled";
                         };
 
+                        weim: weim@83fda000 {
+                                #address-cells = <2>;
+                                #size-cells = <1>;
+                                compatible = "fsl,imx51-weim";
+                                reg = <0x83fda000 0x1000>;
+                                clocks = <&clks 57>;
+                                ranges = <
+                                        0 0 0xb0000000 0x08000000
+                                        1 0 0xb8000000 0x08000000
+                                        2 0 0xc0000000 0x08000000
+                                        3 0 0xc8000000 0x04000000
+                                        4 0 0xcc000000 0x02000000
+                                        5 0 0xce000000 0x02000000
+                                >;
+                                status = "disabled";
+                        };
+
                         nfc: nand@83fdb000 {
                                 compatible = "fsl,imx51-nand";
                                 reg = <0x83fdb000 0x1000 0xcfff0000 0x10000>;
@@ -707,7 +474,7 @@
                                 compatible = "fsl,imx51-pata", "fsl,imx27-pata";
                                 reg = <0x83fe0000 0x4000>;
                                 interrupts = <70>;
-                                clocks = <&clks 161>;
+                                clocks = <&clks 172>;
                                 status = "disabled";
                         };
 
@@ -716,6 +483,9 @@
                                 reg = <0x83fe8000 0x4000>;
                                 interrupts = <96>;
                                 clocks = <&clks 50>;
+                                dmas = <&sdma 46 0 0>,
+                                       <&sdma 47 0 0>;
+                                dma-names = "rx", "tx";
                                 fsl,fifo-depth = <15>;
                                 fsl,ssi-dma-events = <47 46 37 35>; /* TX0 RX0 TX1 RX1 */
                                 status = "disabled";
@@ -732,3 +502,319 @@
                 };
         };
 };
+
+&iomuxc {
+        audmux {
+                pinctrl_audmux_1: audmuxgrp-1 {
+                        fsl,pins = <
+                                MX51_PAD_AUD3_BB_TXD__AUD3_TXD 0x80000000
+                                MX51_PAD_AUD3_BB_RXD__AUD3_RXD 0x80000000
+                                MX51_PAD_AUD3_BB_CK__AUD3_TXC  0x80000000
+                                MX51_PAD_AUD3_BB_FS__AUD3_TXFS 0x80000000
+                        >;
+                };
+        };
+
+        fec {
+                pinctrl_fec_1: fecgrp-1 {
+                        fsl,pins = <
+                                MX51_PAD_EIM_EB2__FEC_MDIO         0x80000000
+                                MX51_PAD_EIM_EB3__FEC_RDATA1       0x80000000
+                                MX51_PAD_EIM_CS2__FEC_RDATA2       0x80000000
+                                MX51_PAD_EIM_CS3__FEC_RDATA3       0x80000000
+                                MX51_PAD_EIM_CS4__FEC_RX_ER        0x80000000
+                                MX51_PAD_EIM_CS5__FEC_CRS          0x80000000
+                                MX51_PAD_NANDF_RB2__FEC_COL        0x80000000
+                                MX51_PAD_NANDF_RB3__FEC_RX_CLK     0x80000000
+                                MX51_PAD_NANDF_D9__FEC_RDATA0      0x80000000
+                                MX51_PAD_NANDF_D8__FEC_TDATA0      0x80000000
+                                MX51_PAD_NANDF_CS2__FEC_TX_ER      0x80000000
+                                MX51_PAD_NANDF_CS3__FEC_MDC        0x80000000
+                                MX51_PAD_NANDF_CS4__FEC_TDATA1     0x80000000
+                                MX51_PAD_NANDF_CS5__FEC_TDATA2     0x80000000
+                                MX51_PAD_NANDF_CS6__FEC_TDATA3     0x80000000
+                                MX51_PAD_NANDF_CS7__FEC_TX_EN      0x80000000
+                                MX51_PAD_NANDF_RDY_INT__FEC_TX_CLK 0x80000000
+                        >;
+                };
+
+                pinctrl_fec_2: fecgrp-2 {
+                        fsl,pins = <
+                                MX51_PAD_DI_GP3__FEC_TX_ER        0x80000000
+                                MX51_PAD_DI2_PIN4__FEC_CRS        0x80000000
+                                MX51_PAD_DI2_PIN2__FEC_MDC        0x80000000
+                                MX51_PAD_DI2_PIN3__FEC_MDIO       0x80000000
+                                MX51_PAD_DI2_DISP_CLK__FEC_RDATA1 0x80000000
+                                MX51_PAD_DI_GP4__FEC_RDATA2       0x80000000
+                                MX51_PAD_DISP2_DAT0__FEC_RDATA3   0x80000000
+                                MX51_PAD_DISP2_DAT1__FEC_RX_ER    0x80000000
+                                MX51_PAD_DISP2_DAT6__FEC_TDATA1   0x80000000
+                                MX51_PAD_DISP2_DAT7__FEC_TDATA2   0x80000000
+                                MX51_PAD_DISP2_DAT8__FEC_TDATA3   0x80000000
+                                MX51_PAD_DISP2_DAT9__FEC_TX_EN    0x80000000
+                                MX51_PAD_DISP2_DAT10__FEC_COL     0x80000000
+                                MX51_PAD_DISP2_DAT11__FEC_RX_CLK  0x80000000
+                                MX51_PAD_DISP2_DAT12__FEC_RX_DV   0x80000000
+                                MX51_PAD_DISP2_DAT13__FEC_TX_CLK  0x80000000
+                                MX51_PAD_DISP2_DAT14__FEC_RDATA0  0x80000000
+                                MX51_PAD_DISP2_DAT15__FEC_TDATA0  0x80000000
+                        >;
+                };
+        };
+
+        ecspi1 {
+                pinctrl_ecspi1_1: ecspi1grp-1 {
+                        fsl,pins = <
+                                MX51_PAD_CSPI1_MISO__ECSPI1_MISO 0x185
+                                MX51_PAD_CSPI1_MOSI__ECSPI1_MOSI 0x185
+                                MX51_PAD_CSPI1_SCLK__ECSPI1_SCLK 0x185
+                        >;
+                };
+        };
+
+        ecspi2 {
+                pinctrl_ecspi2_1: ecspi2grp-1 {
+                        fsl,pins = <
+                                MX51_PAD_NANDF_RB3__ECSPI2_MISO 0x185
+                                MX51_PAD_NANDF_D15__ECSPI2_MOSI 0x185
+                                MX51_PAD_NANDF_RB2__ECSPI2_SCLK 0x185
+                        >;
+                };
+        };
+
+        esdhc1 {
+                pinctrl_esdhc1_1: esdhc1grp-1 {
+                        fsl,pins = <
+                                MX51_PAD_SD1_CMD__SD1_CMD     0x400020d5
+                                MX51_PAD_SD1_CLK__SD1_CLK     0x20d5
+                                MX51_PAD_SD1_DATA0__SD1_DATA0 0x20d5
+                                MX51_PAD_SD1_DATA1__SD1_DATA1 0x20d5
+                                MX51_PAD_SD1_DATA2__SD1_DATA2 0x20d5
+                                MX51_PAD_SD1_DATA3__SD1_DATA3 0x20d5
+                        >;
+                };
+        };
+
+        esdhc2 {
+                pinctrl_esdhc2_1: esdhc2grp-1 {
+                        fsl,pins = <
+                                MX51_PAD_SD2_CMD__SD2_CMD     0x400020d5
+                                MX51_PAD_SD2_CLK__SD2_CLK     0x20d5
+                                MX51_PAD_SD2_DATA0__SD2_DATA0 0x20d5
+                                MX51_PAD_SD2_DATA1__SD2_DATA1 0x20d5
+                                MX51_PAD_SD2_DATA2__SD2_DATA2 0x20d5
+                                MX51_PAD_SD2_DATA3__SD2_DATA3 0x20d5
+                        >;
+                };
+        };
+
+        i2c2 {
+                pinctrl_i2c2_1: i2c2grp-1 {
+                        fsl,pins = <
+                                MX51_PAD_KEY_COL4__I2C2_SCL 0x400001ed
+                                MX51_PAD_KEY_COL5__I2C2_SDA 0x400001ed
+                        >;
+                };
+
+                pinctrl_i2c2_2: i2c2grp-2 {
+                        fsl,pins = <
+                                MX51_PAD_EIM_D27__I2C2_SCL 0x400001ed
+                                MX51_PAD_EIM_D24__I2C2_SDA 0x400001ed
+                        >;
+                };
+
+                pinctrl_i2c2_3: i2c2grp-3 {
+                        fsl,pins = <
+                                MX51_PAD_GPIO1_2__I2C2_SCL 0x400001ed
+                                MX51_PAD_GPIO1_3__I2C2_SDA 0x400001ed
+                        >;
+                };
+        };
+
+        ipu_disp1 {
+                pinctrl_ipu_disp1_1: ipudisp1grp-1 {
+                        fsl,pins = <
+                                MX51_PAD_DISP1_DAT0__DISP1_DAT0   0x5
+                                MX51_PAD_DISP1_DAT1__DISP1_DAT1   0x5
+                                MX51_PAD_DISP1_DAT2__DISP1_DAT2   0x5
+                                MX51_PAD_DISP1_DAT3__DISP1_DAT3   0x5
+                                MX51_PAD_DISP1_DAT4__DISP1_DAT4   0x5
+                                MX51_PAD_DISP1_DAT5__DISP1_DAT5   0x5
+                                MX51_PAD_DISP1_DAT6__DISP1_DAT6   0x5
+                                MX51_PAD_DISP1_DAT7__DISP1_DAT7   0x5
+                                MX51_PAD_DISP1_DAT8__DISP1_DAT8   0x5
+                                MX51_PAD_DISP1_DAT9__DISP1_DAT9   0x5
+                                MX51_PAD_DISP1_DAT10__DISP1_DAT10 0x5
+                                MX51_PAD_DISP1_DAT11__DISP1_DAT11 0x5
+                                MX51_PAD_DISP1_DAT12__DISP1_DAT12 0x5
+                                MX51_PAD_DISP1_DAT13__DISP1_DAT13 0x5
+                                MX51_PAD_DISP1_DAT14__DISP1_DAT14 0x5
+                                MX51_PAD_DISP1_DAT15__DISP1_DAT15 0x5
+                                MX51_PAD_DISP1_DAT16__DISP1_DAT16 0x5
+                                MX51_PAD_DISP1_DAT17__DISP1_DAT17 0x5
+                                MX51_PAD_DISP1_DAT18__DISP1_DAT18 0x5
+                                MX51_PAD_DISP1_DAT19__DISP1_DAT19 0x5
+                                MX51_PAD_DISP1_DAT20__DISP1_DAT20 0x5
+                                MX51_PAD_DISP1_DAT21__DISP1_DAT21 0x5
+                                MX51_PAD_DISP1_DAT22__DISP1_DAT22 0x5
+                                MX51_PAD_DISP1_DAT23__DISP1_DAT23 0x5
+                                MX51_PAD_DI1_PIN2__DI1_PIN2       0x5 /* hsync */
+                                MX51_PAD_DI1_PIN3__DI1_PIN3       0x5 /* vsync */
+                        >;
+                };
+        };
+
+        ipu_disp2 {
+                pinctrl_ipu_disp2_1: ipudisp2grp-1 {
+                        fsl,pins = <
+                                MX51_PAD_DISP2_DAT0__DISP2_DAT0     0x5
+                                MX51_PAD_DISP2_DAT1__DISP2_DAT1     0x5
+                                MX51_PAD_DISP2_DAT2__DISP2_DAT2     0x5
+                                MX51_PAD_DISP2_DAT3__DISP2_DAT3     0x5
+                                MX51_PAD_DISP2_DAT4__DISP2_DAT4     0x5
+                                MX51_PAD_DISP2_DAT5__DISP2_DAT5     0x5
+                                MX51_PAD_DISP2_DAT6__DISP2_DAT6     0x5
+                                MX51_PAD_DISP2_DAT7__DISP2_DAT7     0x5
+                                MX51_PAD_DISP2_DAT8__DISP2_DAT8     0x5
+                                MX51_PAD_DISP2_DAT9__DISP2_DAT9     0x5
+                                MX51_PAD_DISP2_DAT10__DISP2_DAT10   0x5
+                                MX51_PAD_DISP2_DAT11__DISP2_DAT11   0x5
+                                MX51_PAD_DISP2_DAT12__DISP2_DAT12   0x5
+                                MX51_PAD_DISP2_DAT13__DISP2_DAT13   0x5
+                                MX51_PAD_DISP2_DAT14__DISP2_DAT14   0x5
+                                MX51_PAD_DISP2_DAT15__DISP2_DAT15   0x5
+                                MX51_PAD_DI2_PIN2__DI2_PIN2         0x5 /* hsync */
+                                MX51_PAD_DI2_PIN3__DI2_PIN3         0x5 /* vsync */
+                                MX51_PAD_DI2_DISP_CLK__DI2_DISP_CLK 0x5 /* CLK */
+                                MX51_PAD_DI_GP4__DI2_PIN15          0x5 /* DE */
+                        >;
+                };
+        };
+
+        kpp {
+                pinctrl_kpp_1: kppgrp-1 {
+                        fsl,pins = <
+                                MX51_PAD_KEY_ROW0__KEY_ROW0 0xe0
+                                MX51_PAD_KEY_ROW1__KEY_ROW1 0xe0
+                                MX51_PAD_KEY_ROW2__KEY_ROW2 0xe0
+                                MX51_PAD_KEY_ROW3__KEY_ROW3 0xe0
+                                MX51_PAD_KEY_COL0__KEY_COL0 0xe8
+                                MX51_PAD_KEY_COL1__KEY_COL1 0xe8
+                                MX51_PAD_KEY_COL2__KEY_COL2 0xe8
+                                MX51_PAD_KEY_COL3__KEY_COL3 0xe8
+                        >;
+                };
+        };
+
+        pata {
+                pinctrl_pata_1: patagrp-1 {
+                        fsl,pins = <
+                                MX51_PAD_NANDF_WE_B__PATA_DIOW     0x2004
+                                MX51_PAD_NANDF_RE_B__PATA_DIOR     0x2004
+                                MX51_PAD_NANDF_ALE__PATA_BUFFER_EN 0x2004
+                                MX51_PAD_NANDF_CLE__PATA_RESET_B   0x2004
+                                MX51_PAD_NANDF_WP_B__PATA_DMACK    0x2004
+                                MX51_PAD_NANDF_RB0__PATA_DMARQ     0x2004
+                                MX51_PAD_NANDF_RB1__PATA_IORDY     0x2004
+                                MX51_PAD_GPIO_NAND__PATA_INTRQ     0x2004
+                                MX51_PAD_NANDF_CS2__PATA_CS_0      0x2004
+                                MX51_PAD_NANDF_CS3__PATA_CS_1      0x2004
+                                MX51_PAD_NANDF_CS4__PATA_DA_0      0x2004
+                                MX51_PAD_NANDF_CS5__PATA_DA_1      0x2004
+                                MX51_PAD_NANDF_CS6__PATA_DA_2      0x2004
+                                MX51_PAD_NANDF_D15__PATA_DATA15    0x2004
+                                MX51_PAD_NANDF_D14__PATA_DATA14    0x2004
+                                MX51_PAD_NANDF_D13__PATA_DATA13    0x2004
+                                MX51_PAD_NANDF_D12__PATA_DATA12    0x2004
+                                MX51_PAD_NANDF_D11__PATA_DATA11    0x2004
+                                MX51_PAD_NANDF_D10__PATA_DATA10    0x2004
+                                MX51_PAD_NANDF_D9__PATA_DATA9      0x2004
+                                MX51_PAD_NANDF_D8__PATA_DATA8      0x2004
+                                MX51_PAD_NANDF_D7__PATA_DATA7      0x2004
+                                MX51_PAD_NANDF_D6__PATA_DATA6     0x2004
+                                MX51_PAD_NANDF_D5__PATA_DATA5     0x2004
+                                MX51_PAD_NANDF_D4__PATA_DATA4     0x2004
+                                MX51_PAD_NANDF_D3__PATA_DATA3     0x2004
+                                MX51_PAD_NANDF_D2__PATA_DATA2     0x2004
+                                MX51_PAD_NANDF_D1__PATA_DATA1     0x2004
+                                MX51_PAD_NANDF_D0__PATA_DATA0     0x2004
+                        >;
+                };
+        };
+
+        uart1 {
+                pinctrl_uart1_1: uart1grp-1 {
+                        fsl,pins = <
+                                MX51_PAD_UART1_RXD__UART1_RXD 0x1c5
+                                MX51_PAD_UART1_TXD__UART1_TXD 0x1c5
+                                MX51_PAD_UART1_RTS__UART1_RTS 0x1c5
+                                MX51_PAD_UART1_CTS__UART1_CTS 0x1c5
+                        >;
+                };
+        };
+
+        uart2 {
+                pinctrl_uart2_1: uart2grp-1 {
+                        fsl,pins = <
+                                MX51_PAD_UART2_RXD__UART2_RXD 0x1c5
+                                MX51_PAD_UART2_TXD__UART2_TXD 0x1c5
+                        >;
+                };
+        };
+
+        uart3 {
+                pinctrl_uart3_1: uart3grp-1 {
+                        fsl,pins = <
+                                MX51_PAD_EIM_D25__UART3_RXD 0x1c5
+                                MX51_PAD_EIM_D26__UART3_TXD 0x1c5
+                                MX51_PAD_EIM_D27__UART3_RTS 0x1c5
+                                MX51_PAD_EIM_D24__UART3_CTS 0x1c5
+                        >;
+                };
+
+                pinctrl_uart3_2: uart3grp-2 {
+                        fsl,pins = <
+                                MX51_PAD_UART3_RXD__UART3_RXD 0x1c5
+                                MX51_PAD_UART3_TXD__UART3_TXD 0x1c5
+                        >;
+                };
+        };
+
+        usbh1 {
+                pinctrl_usbh1_1: usbh1grp-1 {
+                        fsl,pins = <
+                                MX51_PAD_USBH1_DATA0__USBH1_DATA0 0x1e5
+                                MX51_PAD_USBH1_DATA1__USBH1_DATA1 0x1e5
+                                MX51_PAD_USBH1_DATA2__USBH1_DATA2 0x1e5
+                                MX51_PAD_USBH1_DATA3__USBH1_DATA3 0x1e5
+                                MX51_PAD_USBH1_DATA4__USBH1_DATA4 0x1e5
+                                MX51_PAD_USBH1_DATA5__USBH1_DATA5 0x1e5
+                                MX51_PAD_USBH1_DATA6__USBH1_DATA6 0x1e5
+                                MX51_PAD_USBH1_DATA7__USBH1_DATA7 0x1e5
+                                MX51_PAD_USBH1_CLK__USBH1_CLK     0x1e5
+                                MX51_PAD_USBH1_DIR__USBH1_DIR     0x1e5
+                                MX51_PAD_USBH1_NXT__USBH1_NXT     0x1e5
+                                MX51_PAD_USBH1_STP__USBH1_STP     0x1e5
+                        >;
+                };
+        };
+
+        usbh2 {
+                pinctrl_usbh2_1: usbh2grp-1 {
+                        fsl,pins = <
+                                MX51_PAD_EIM_D16__USBH2_DATA0 0x1e5
+                                MX51_PAD_EIM_D17__USBH2_DATA1 0x1e5
+                                MX51_PAD_EIM_D18__USBH2_DATA2 0x1e5
+                                MX51_PAD_EIM_D19__USBH2_DATA3 0x1e5
+                                MX51_PAD_EIM_D20__USBH2_DATA4 0x1e5
+                                MX51_PAD_EIM_D21__USBH2_DATA5 0x1e5
+                                MX51_PAD_EIM_D22__USBH2_DATA6 0x1e5
+                                MX51_PAD_EIM_D23__USBH2_DATA7 0x1e5
+                                MX51_PAD_EIM_A24__USBH2_CLK   0x1e5
+                                MX51_PAD_EIM_A25__USBH2_DIR   0x1e5
+                                MX51_PAD_EIM_A27__USBH2_NXT   0x1e5
+                                MX51_PAD_EIM_A26__USBH2_STP   0x1e5
+                        >;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/imx53-qsb.dts b/arch/arm/boot/dts/imx53-qsb.dts
index 512a1f608253..e97ddae09d74 100644
--- a/arch/arm/boot/dts/imx53-qsb.dts
+++ b/arch/arm/boot/dts/imx53-qsb.dts
@@ -93,6 +93,15 @@
                         regulator-max-microvolt = <3200000>;
                         regulator-always-on;
                 };
+
+                reg_usb_vbus: usb_vbus {
+                        compatible = "regulator-fixed";
+                        regulator-name = "usb_vbus";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        gpio = <&gpio7 8 0>;
+                        enable-active-high;
+                };
         };
 
         sound {
@@ -145,6 +154,7 @@
                                 MX53_PAD_EIM_DA12__GPIO3_12       0x80000000
                                 MX53_PAD_EIM_DA13__GPIO3_13       0x80000000
                                 MX53_PAD_PATA_DA_0__GPIO7_6       0x80000000
+                                MX53_PAD_PATA_DA_2__GPIO7_8       0x80000000
                                 MX53_PAD_GPIO_16__GPIO7_11        0x80000000
                         >;
                 };
@@ -297,8 +307,14 @@
         status = "okay";
 };
 
+&vpu {
+        status = "okay";
+};
+
 &usbh1 {
-       status = "okay";
+        vbus-supply = <&reg_usb_vbus>;
+        phy_type = "utmi";
+        status = "okay";
 };
 
 &usbotg {
diff --git a/arch/arm/boot/dts/imx53.dtsi b/arch/arm/boot/dts/imx53.dtsi
index 569aa9f2c4ed..4307e80b2d2e 100644
--- a/arch/arm/boot/dts/imx53.dtsi
+++ b/arch/arm/boot/dts/imx53.dtsi
@@ -15,11 +15,6 @@
 
 / {
         aliases {
-                serial0 = &uart1;
-                serial1 = &uart2;
-                serial2 = &uart3;
-                serial3 = &uart4;
-                serial4 = &uart5;
                 gpio0 = &gpio1;
                 gpio1 = &gpio2;
                 gpio2 = &gpio3;
@@ -30,6 +25,24 @@
                 i2c0 = &i2c1;
                 i2c1 = &i2c2;
                 i2c2 = &i2c3;
+                serial0 = &uart1;
+                serial1 = &uart2;
+                serial2 = &uart3;
+                serial3 = &uart4;
+                serial4 = &uart5;
+                spi0 = &ecspi1;
+                spi1 = &ecspi2;
+                spi2 = &cspi;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                cpu@0 {
+                        device_type = "cpu";
+                        compatible = "arm,cortex-a8";
+                        reg = <0x0>;
+                };
         };
 
         tzic: tz-interrupt-controller@0fffc000 {
@@ -140,6 +153,9 @@
                                         reg = <0x50014000 0x4000>;
                                         interrupts = <30>;
                                         clocks = <&clks 49>;
+                                        dmas = <&sdma 24 1 0>,
+                                               <&sdma 25 1 0>;
+                                        dma-names = "rx", "tx";
                                         fsl,fifo-depth = <15>;
                                         fsl,ssi-dma-events = <25 24 23 22>; /* TX0 RX0 TX1 RX1 */
                                         status = "disabled";
@@ -957,6 +973,13 @@
                         reg = <0x60000000 0x10000000>;
                         ranges;
 
+                        iim: iim@63f98000 {
+                                compatible = "fsl,imx53-iim", "fsl,imx27-iim";
+                                reg = <0x63f98000 0x4000>;
+                                interrupts = <69>;
+                                clocks = <&clks 107>;
+                        };
+
                         uart5: serial@63f90000 {
                                 compatible = "fsl,imx53-uart", "fsl,imx21-uart";
                                 reg = <0x63f90000 0x4000>;
@@ -990,6 +1013,7 @@
                                 interrupts = <6>;
                                 clocks = <&clks 56>, <&clks 56>;
                                 clock-names = "ipg", "ahb";
+                                #dma-cells = <3>;
                                 fsl,sdma-ram-script-name = "imx/sdma/sdma-imx53.bin";
                         };
 
@@ -1029,6 +1053,9 @@
                                 reg = <0x63fcc000 0x4000>;
                                 interrupts = <29>;
                                 clocks = <&clks 48>;
+                                dmas = <&sdma 28 0 0>,
+                                       <&sdma 29 0 0>;
+                                dma-names = "rx", "tx";
                                 fsl,fifo-depth = <15>;
                                 fsl,ssi-dma-events = <29 28 27 26>; /* TX0 RX0 TX1 RX1 */
                                 status = "disabled";
@@ -1053,6 +1080,9 @@
                                 reg = <0x63fe8000 0x4000>;
                                 interrupts = <96>;
                                 clocks = <&clks 50>;
+                                dmas = <&sdma 46 0 0>,
+                                       <&sdma 47 0 0>;
+                                dma-names = "rx", "tx";
                                 fsl,fifo-depth = <15>;
                                 fsl,ssi-dma-events = <47 46 45 44>; /* TX0 RX0 TX1 RX1 */
                                 status = "disabled";
@@ -1076,6 +1106,22 @@
                                 crtcs = <&ipu 1>;
                                 status = "disabled";
                         };
+
+                        vpu: vpu@63ff4000 {
+                                compatible = "fsl,imx53-vpu";
+                                reg = <0x63ff4000 0x1000>;
+                                interrupts = <9>;
+                                clocks = <&clks 63>, <&clks 63>;
+                                clock-names = "per", "ahb";
+                                iram = <&ocram>;
+                                status = "disabled";
+                        };
+                };
+
+                ocram: sram@f8000000 {
+                        compatible = "mmio-sram";
+                        reg = <0xf8000000 0x20000>;
+                        clocks = <&clks 186>;
                 };
         };
 };
diff --git a/arch/arm/boot/dts/imx6dl-pinfunc.h b/arch/arm/boot/dts/imx6dl-pinfunc.h
index 9aab950ec269..b81a7a4ebab6 100644
--- a/arch/arm/boot/dts/imx6dl-pinfunc.h
+++ b/arch/arm/boot/dts/imx6dl-pinfunc.h
@@ -14,1072 +14,1076 @@
  * The pin function ID is a tuple of
  * <mux_reg conf_reg input_reg mux_mode input_val>
  */
-#define MX6DL_PAD_CSI0_DAT10__IPU1_CSI0_DATA10     0x04c 0x360 0x000 0x0 0x0
-#define MX6DL_PAD_CSI0_DAT10__AUD3_RXC             0x04c 0x360 0x000 0x1 0x0
-#define MX6DL_PAD_CSI0_DAT10__ECSPI2_MISO          0x04c 0x360 0x7f8 0x2 0x0
-#define MX6DL_PAD_CSI0_DAT10__UART1_TX_DATA        0x04c 0x360 0x000 0x3 0x0
-#define MX6DL_PAD_CSI0_DAT10__UART1_RX_DATA        0x04c 0x360 0x8fc 0x3 0x0
-#define MX6DL_PAD_CSI0_DAT10__GPIO5_IO28           0x04c 0x360 0x000 0x5 0x0
-#define MX6DL_PAD_CSI0_DAT10__ARM_TRACE07          0x04c 0x360 0x000 0x7 0x0
-#define MX6DL_PAD_CSI0_DAT11__IPU1_CSI0_DATA11     0x050 0x364 0x000 0x0 0x0
-#define MX6DL_PAD_CSI0_DAT11__AUD3_RXFS            0x050 0x364 0x000 0x1 0x0
-#define MX6DL_PAD_CSI0_DAT11__ECSPI2_SS0           0x050 0x364 0x800 0x2 0x0
-#define MX6DL_PAD_CSI0_DAT11__UART1_RX_DATA        0x050 0x364 0x8fc 0x3 0x1
-#define MX6DL_PAD_CSI0_DAT11__UART1_TX_DATA        0x050 0x364 0x000 0x3 0x0
-#define MX6DL_PAD_CSI0_DAT11__GPIO5_IO29           0x050 0x364 0x000 0x5 0x0
-#define MX6DL_PAD_CSI0_DAT11__ARM_TRACE08          0x050 0x364 0x000 0x7 0x0
-#define MX6DL_PAD_CSI0_DAT12__IPU1_CSI0_DATA12     0x054 0x368 0x000 0x0 0x0
-#define MX6DL_PAD_CSI0_DAT12__EIM_DATA08           0x054 0x368 0x000 0x1 0x0
-#define MX6DL_PAD_CSI0_DAT12__UART4_TX_DATA        0x054 0x368 0x000 0x3 0x0
-#define MX6DL_PAD_CSI0_DAT12__UART4_RX_DATA        0x054 0x368 0x914 0x3 0x0
-#define MX6DL_PAD_CSI0_DAT12__GPIO5_IO30           0x054 0x368 0x000 0x5 0x0
-#define MX6DL_PAD_CSI0_DAT12__ARM_TRACE09          0x054 0x368 0x000 0x7 0x0
-#define MX6DL_PAD_CSI0_DAT13__IPU1_CSI0_DATA13     0x058 0x36c 0x000 0x0 0x0
-#define MX6DL_PAD_CSI0_DAT13__EIM_DATA09           0x058 0x36c 0x000 0x1 0x0
-#define MX6DL_PAD_CSI0_DAT13__UART4_RX_DATA        0x058 0x36c 0x914 0x3 0x1
-#define MX6DL_PAD_CSI0_DAT13__UART4_TX_DATA        0x058 0x36c 0x000 0x3 0x0
-#define MX6DL_PAD_CSI0_DAT13__GPIO5_IO31           0x058 0x36c 0x000 0x5 0x0
-#define MX6DL_PAD_CSI0_DAT13__ARM_TRACE10          0x058 0x36c 0x000 0x7 0x0
-#define MX6DL_PAD_CSI0_DAT14__IPU1_CSI0_DATA14     0x05c 0x370 0x000 0x0 0x0
-#define MX6DL_PAD_CSI0_DAT14__EIM_DATA10           0x05c 0x370 0x000 0x1 0x0
-#define MX6DL_PAD_CSI0_DAT14__UART5_TX_DATA        0x05c 0x370 0x000 0x3 0x0
-#define MX6DL_PAD_CSI0_DAT14__UART5_RX_DATA        0x05c 0x370 0x91c 0x3 0x0
-#define MX6DL_PAD_CSI0_DAT14__GPIO6_IO00           0x05c 0x370 0x000 0x5 0x0
-#define MX6DL_PAD_CSI0_DAT14__ARM_TRACE11          0x05c 0x370 0x000 0x7 0x0
-#define MX6DL_PAD_CSI0_DAT15__IPU1_CSI0_DATA15     0x060 0x374 0x000 0x0 0x0
-#define MX6DL_PAD_CSI0_DAT15__EIM_DATA11           0x060 0x374 0x000 0x1 0x0
-#define MX6DL_PAD_CSI0_DAT15__UART5_RX_DATA        0x060 0x374 0x91c 0x3 0x1
-#define MX6DL_PAD_CSI0_DAT15__UART5_TX_DATA        0x060 0x374 0x000 0x3 0x0
-#define MX6DL_PAD_CSI0_DAT15__GPIO6_IO01           0x060 0x374 0x000 0x5 0x0
-#define MX6DL_PAD_CSI0_DAT15__ARM_TRACE12          0x060 0x374 0x000 0x7 0x0
-#define MX6DL_PAD_CSI0_DAT16__IPU1_CSI0_DATA16     0x064 0x378 0x000 0x0 0x0
-#define MX6DL_PAD_CSI0_DAT16__EIM_DATA12           0x064 0x378 0x000 0x1 0x0
-#define MX6DL_PAD_CSI0_DAT16__UART4_RTS_B          0x064 0x378 0x910 0x3 0x0
-#define MX6DL_PAD_CSI0_DAT16__UART4_CTS_B          0x064 0x378 0x000 0x3 0x0
-#define MX6DL_PAD_CSI0_DAT16__GPIO6_IO02           0x064 0x378 0x000 0x5 0x0
-#define MX6DL_PAD_CSI0_DAT16__ARM_TRACE13          0x064 0x378 0x000 0x7 0x0
-#define MX6DL_PAD_CSI0_DAT17__IPU1_CSI0_DATA17     0x068 0x37c 0x000 0x0 0x0
-#define MX6DL_PAD_CSI0_DAT17__EIM_DATA13           0x068 0x37c 0x000 0x1 0x0
-#define MX6DL_PAD_CSI0_DAT17__UART4_CTS_B          0x068 0x37c 0x000 0x3 0x0
-#define MX6DL_PAD_CSI0_DAT17__UART4_RTS_B          0x068 0x37c 0x910 0x3 0x1
-#define MX6DL_PAD_CSI0_DAT17__GPIO6_IO03           0x068 0x37c 0x000 0x5 0x0
-#define MX6DL_PAD_CSI0_DAT17__ARM_TRACE14          0x068 0x37c 0x000 0x7 0x0
-#define MX6DL_PAD_CSI0_DAT18__IPU1_CSI0_DATA18     0x06c 0x380 0x000 0x0 0x0
-#define MX6DL_PAD_CSI0_DAT18__EIM_DATA14           0x06c 0x380 0x000 0x1 0x0
-#define MX6DL_PAD_CSI0_DAT18__UART5_RTS_B          0x06c 0x380 0x918 0x3 0x0
-#define MX6DL_PAD_CSI0_DAT18__UART5_CTS_B          0x06c 0x380 0x000 0x3 0x0
-#define MX6DL_PAD_CSI0_DAT18__GPIO6_IO04           0x06c 0x380 0x000 0x5 0x0
-#define MX6DL_PAD_CSI0_DAT18__ARM_TRACE15          0x06c 0x380 0x000 0x7 0x0
-#define MX6DL_PAD_CSI0_DAT19__IPU1_CSI0_DATA19     0x070 0x384 0x000 0x0 0x0
-#define MX6DL_PAD_CSI0_DAT19__EIM_DATA15           0x070 0x384 0x000 0x1 0x0
-#define MX6DL_PAD_CSI0_DAT19__UART5_CTS_B          0x070 0x384 0x000 0x3 0x0
-#define MX6DL_PAD_CSI0_DAT19__UART5_RTS_B          0x070 0x384 0x918 0x3 0x1
-#define MX6DL_PAD_CSI0_DAT19__GPIO6_IO05           0x070 0x384 0x000 0x5 0x0
-#define MX6DL_PAD_CSI0_DAT4__IPU1_CSI0_DATA04      0x074 0x388 0x000 0x0 0x0
-#define MX6DL_PAD_CSI0_DAT4__EIM_DATA02            0x074 0x388 0x000 0x1 0x0
-#define MX6DL_PAD_CSI0_DAT4__ECSPI1_SCLK           0x074 0x388 0x7d8 0x2 0x0
-#define MX6DL_PAD_CSI0_DAT4__KEY_COL5              0x074 0x388 0x8c0 0x3 0x0
-#define MX6DL_PAD_CSI0_DAT4__AUD3_TXC              0x074 0x388 0x000 0x4 0x0
-#define MX6DL_PAD_CSI0_DAT4__GPIO5_IO22            0x074 0x388 0x000 0x5 0x0
-#define MX6DL_PAD_CSI0_DAT4__ARM_TRACE01           0x074 0x388 0x000 0x7 0x0
-#define MX6DL_PAD_CSI0_DAT5__IPU1_CSI0_DATA05      0x078 0x38c 0x000 0x0 0x0
-#define MX6DL_PAD_CSI0_DAT5__EIM_DATA03            0x078 0x38c 0x000 0x1 0x0
-#define MX6DL_PAD_CSI0_DAT5__ECSPI1_MOSI           0x078 0x38c 0x7e0 0x2 0x0
-#define MX6DL_PAD_CSI0_DAT5__KEY_ROW5              0x078 0x38c 0x8cc 0x3 0x0
-#define MX6DL_PAD_CSI0_DAT5__AUD3_TXD              0x078 0x38c 0x000 0x4 0x0
-#define MX6DL_PAD_CSI0_DAT5__GPIO5_IO23            0x078 0x38c 0x000 0x5 0x0
-#define MX6DL_PAD_CSI0_DAT5__ARM_TRACE02           0x078 0x38c 0x000 0x7 0x0
-#define MX6DL_PAD_CSI0_DAT6__IPU1_CSI0_DATA06      0x07c 0x390 0x000 0x0 0x0
-#define MX6DL_PAD_CSI0_DAT6__EIM_DATA04            0x07c 0x390 0x000 0x1 0x0
-#define MX6DL_PAD_CSI0_DAT6__ECSPI1_MISO           0x07c 0x390 0x7dc 0x2 0x0
-#define MX6DL_PAD_CSI0_DAT6__KEY_COL6              0x07c 0x390 0x8c4 0x3 0x0
-#define MX6DL_PAD_CSI0_DAT6__AUD3_TXFS             0x07c 0x390 0x000 0x4 0x0
-#define MX6DL_PAD_CSI0_DAT6__GPIO5_IO24            0x07c 0x390 0x000 0x5 0x0
-#define MX6DL_PAD_CSI0_DAT6__ARM_TRACE03           0x07c 0x390 0x000 0x7 0x0
-#define MX6DL_PAD_CSI0_DAT7__IPU1_CSI0_DATA07      0x080 0x394 0x000 0x0 0x0
-#define MX6DL_PAD_CSI0_DAT7__EIM_DATA05            0x080 0x394 0x000 0x1 0x0
-#define MX6DL_PAD_CSI0_DAT7__ECSPI1_SS0            0x080 0x394 0x7e4 0x2 0x0
-#define MX6DL_PAD_CSI0_DAT7__KEY_ROW6              0x080 0x394 0x8d0 0x3 0x0
-#define MX6DL_PAD_CSI0_DAT7__AUD3_RXD              0x080 0x394 0x000 0x4 0x0
-#define MX6DL_PAD_CSI0_DAT7__GPIO5_IO25            0x080 0x394 0x000 0x5 0x0
-#define MX6DL_PAD_CSI0_DAT7__ARM_TRACE04           0x080 0x394 0x000 0x7 0x0
-#define MX6DL_PAD_CSI0_DAT8__IPU1_CSI0_DATA08      0x084 0x398 0x000 0x0 0x0
-#define MX6DL_PAD_CSI0_DAT8__EIM_DATA06            0x084 0x398 0x000 0x1 0x0
-#define MX6DL_PAD_CSI0_DAT8__ECSPI2_SCLK           0x084 0x398 0x7f4 0x2 0x0
-#define MX6DL_PAD_CSI0_DAT8__KEY_COL7              0x084 0x398 0x8c8 0x3 0x0
-#define MX6DL_PAD_CSI0_DAT8__I2C1_SDA              0x084 0x398 0x86c 0x4 0x0
-#define MX6DL_PAD_CSI0_DAT8__GPIO5_IO26            0x084 0x398 0x000 0x5 0x0
-#define MX6DL_PAD_CSI0_DAT8__ARM_TRACE05           0x084 0x398 0x000 0x7 0x0
-#define MX6DL_PAD_CSI0_DAT9__IPU1_CSI0_DATA09      0x088 0x39c 0x000 0x0 0x0
-#define MX6DL_PAD_CSI0_DAT9__EIM_DATA07            0x088 0x39c 0x000 0x1 0x0
-#define MX6DL_PAD_CSI0_DAT9__ECSPI2_MOSI           0x088 0x39c 0x7fc 0x2 0x0
-#define MX6DL_PAD_CSI0_DAT9__KEY_ROW7              0x088 0x39c 0x8d4 0x3 0x0
-#define MX6DL_PAD_CSI0_DAT9__I2C1_SCL              0x088 0x39c 0x868 0x4 0x0
-#define MX6DL_PAD_CSI0_DAT9__GPIO5_IO27            0x088 0x39c 0x000 0x5 0x0
-#define MX6DL_PAD_CSI0_DAT9__ARM_TRACE06           0x088 0x39c 0x000 0x7 0x0
-#define MX6DL_PAD_CSI0_DATA_EN__IPU1_CSI0_DATA_EN  0x08c 0x3a0 0x000 0x0 0x0
-#define MX6DL_PAD_CSI0_DATA_EN__EIM_DATA00         0x08c 0x3a0 0x000 0x1 0x0
-#define MX6DL_PAD_CSI0_DATA_EN__GPIO5_IO20         0x08c 0x3a0 0x000 0x5 0x0
-#define MX6DL_PAD_CSI0_DATA_EN__ARM_TRACE_CLK      0x08c 0x3a0 0x000 0x7 0x0
-#define MX6DL_PAD_CSI0_MCLK__IPU1_CSI0_HSYNC       0x090 0x3a4 0x000 0x0 0x0
-#define MX6DL_PAD_CSI0_MCLK__CCM_CLKO1             0x090 0x3a4 0x000 0x3 0x0
-#define MX6DL_PAD_CSI0_MCLK__GPIO5_IO19            0x090 0x3a4 0x000 0x5 0x0
-#define MX6DL_PAD_CSI0_MCLK__ARM_TRACE_CTL         0x090 0x3a4 0x000 0x7 0x0
-#define MX6DL_PAD_CSI0_PIXCLK__IPU1_CSI0_PIXCLK    0x094 0x3a8 0x000 0x0 0x0
-#define MX6DL_PAD_CSI0_PIXCLK__GPIO5_IO18          0x094 0x3a8 0x000 0x5 0x0
-#define MX6DL_PAD_CSI0_PIXCLK__ARM_EVENTO          0x094 0x3a8 0x000 0x7 0x0
-#define MX6DL_PAD_CSI0_VSYNC__IPU1_CSI0_VSYNC      0x098 0x3ac 0x000 0x0 0x0
-#define MX6DL_PAD_CSI0_VSYNC__EIM_DATA01           0x098 0x3ac 0x000 0x1 0x0
-#define MX6DL_PAD_CSI0_VSYNC__GPIO5_IO21           0x098 0x3ac 0x000 0x5 0x0
-#define MX6DL_PAD_CSI0_VSYNC__ARM_TRACE00          0x098 0x3ac 0x000 0x7 0x0
-#define MX6DL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK  0x09c 0x3b0 0x000 0x0 0x0
-#define MX6DL_PAD_DI0_DISP_CLK__LCD_CLK            0x09c 0x3b0 0x000 0x1 0x0
-#define MX6DL_PAD_DI0_DISP_CLK__GPIO4_IO16         0x09c 0x3b0 0x000 0x5 0x0
-#define MX6DL_PAD_DI0_DISP_CLK__LCD_WR_RWN         0x09c 0x3b0 0x000 0x8 0x0
-#define MX6DL_PAD_DI0_PIN15__IPU1_DI0_PIN15        0x0a0 0x3b4 0x000 0x0 0x0
-#define MX6DL_PAD_DI0_PIN15__LCD_ENABLE            0x0a0 0x3b4 0x000 0x1 0x0
-#define MX6DL_PAD_DI0_PIN15__AUD6_TXC              0x0a0 0x3b4 0x000 0x2 0x0
-#define MX6DL_PAD_DI0_PIN15__GPIO4_IO17            0x0a0 0x3b4 0x000 0x5 0x0
-#define MX6DL_PAD_DI0_PIN15__LCD_RD_E              0x0a0 0x3b4 0x000 0x8 0x0
-#define MX6DL_PAD_DI0_PIN2__IPU1_DI0_PIN02         0x0a4 0x3b8 0x000 0x0 0x0
-#define MX6DL_PAD_DI0_PIN2__LCD_HSYNC              0x0a4 0x3b8 0x8d8 0x1 0x0
-#define MX6DL_PAD_DI0_PIN2__AUD6_TXD               0x0a4 0x3b8 0x000 0x2 0x0
-#define MX6DL_PAD_DI0_PIN2__GPIO4_IO18             0x0a4 0x3b8 0x000 0x5 0x0
-#define MX6DL_PAD_DI0_PIN2__LCD_RS                 0x0a4 0x3b8 0x000 0x8 0x0
-#define MX6DL_PAD_DI0_PIN3__IPU1_DI0_PIN03         0x0a8 0x3bc 0x000 0x0 0x0
-#define MX6DL_PAD_DI0_PIN3__LCD_VSYNC              0x0a8 0x3bc 0x000 0x1 0x0
-#define MX6DL_PAD_DI0_PIN3__AUD6_TXFS              0x0a8 0x3bc 0x000 0x2 0x0
-#define MX6DL_PAD_DI0_PIN3__GPIO4_IO19             0x0a8 0x3bc 0x000 0x5 0x0
-#define MX6DL_PAD_DI0_PIN3__LCD_CS                 0x0a8 0x3bc 0x000 0x8 0x0
-#define MX6DL_PAD_DI0_PIN4__IPU1_DI0_PIN04         0x0ac 0x3c0 0x000 0x0 0x0
-#define MX6DL_PAD_DI0_PIN4__LCD_BUSY               0x0ac 0x3c0 0x8d8 0x1 0x1
-#define MX6DL_PAD_DI0_PIN4__AUD6_RXD               0x0ac 0x3c0 0x000 0x2 0x0
-#define MX6DL_PAD_DI0_PIN4__SD1_WP                 0x0ac 0x3c0 0x92c 0x3 0x0
-#define MX6DL_PAD_DI0_PIN4__GPIO4_IO20             0x0ac 0x3c0 0x000 0x5 0x0
-#define MX6DL_PAD_DI0_PIN4__LCD_RESET              0x0ac 0x3c0 0x000 0x8 0x0
-#define MX6DL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00    0x0b0 0x3c4 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT0__LCD_DATA00           0x0b0 0x3c4 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT0__ECSPI3_SCLK          0x0b0 0x3c4 0x000 0x2 0x0
-#define MX6DL_PAD_DISP0_DAT0__GPIO4_IO21           0x0b0 0x3c4 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01    0x0b4 0x3c8 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT1__LCD_DATA01           0x0b4 0x3c8 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT1__ECSPI3_MOSI          0x0b4 0x3c8 0x000 0x2 0x0
-#define MX6DL_PAD_DISP0_DAT1__GPIO4_IO22           0x0b4 0x3c8 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10   0x0b8 0x3cc 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT10__LCD_DATA10          0x0b8 0x3cc 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT10__GPIO4_IO31          0x0b8 0x3cc 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11   0x0bc 0x3d0 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT11__LCD_DATA11          0x0bc 0x3d0 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT11__GPIO5_IO05          0x0bc 0x3d0 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12   0x0c0 0x3d4 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT12__LCD_DATA12          0x0c0 0x3d4 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT12__GPIO5_IO06          0x0c0 0x3d4 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13   0x0c4 0x3d8 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT13__LCD_DATA13          0x0c4 0x3d8 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT13__AUD5_RXFS           0x0c4 0x3d8 0x7bc 0x3 0x0
-#define MX6DL_PAD_DISP0_DAT13__GPIO5_IO07          0x0c4 0x3d8 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14   0x0c8 0x3dc 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT14__LCD_DATA14          0x0c8 0x3dc 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT14__AUD5_RXC            0x0c8 0x3dc 0x7b8 0x3 0x0
-#define MX6DL_PAD_DISP0_DAT14__GPIO5_IO08          0x0c8 0x3dc 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15   0x0cc 0x3e0 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT15__LCD_DATA15          0x0cc 0x3e0 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT15__ECSPI1_SS1          0x0cc 0x3e0 0x7e8 0x2 0x0
-#define MX6DL_PAD_DISP0_DAT15__ECSPI2_SS1          0x0cc 0x3e0 0x804 0x3 0x0
-#define MX6DL_PAD_DISP0_DAT15__GPIO5_IO09          0x0cc 0x3e0 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16   0x0d0 0x3e4 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT16__LCD_DATA16          0x0d0 0x3e4 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT16__ECSPI2_MOSI         0x0d0 0x3e4 0x7fc 0x2 0x1
-#define MX6DL_PAD_DISP0_DAT16__AUD5_TXC            0x0d0 0x3e4 0x7c0 0x3 0x0
-#define MX6DL_PAD_DISP0_DAT16__SDMA_EXT_EVENT0     0x0d0 0x3e4 0x8e8 0x4 0x0
-#define MX6DL_PAD_DISP0_DAT16__GPIO5_IO10          0x0d0 0x3e4 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17   0x0d4 0x3e8 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT17__LCD_DATA17          0x0d4 0x3e8 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT17__ECSPI2_MISO         0x0d4 0x3e8 0x7f8 0x2 0x1
-#define MX6DL_PAD_DISP0_DAT17__AUD5_TXD            0x0d4 0x3e8 0x7b4 0x3 0x0
-#define MX6DL_PAD_DISP0_DAT17__SDMA_EXT_EVENT1     0x0d4 0x3e8 0x8ec 0x4 0x0
-#define MX6DL_PAD_DISP0_DAT17__GPIO5_IO11          0x0d4 0x3e8 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT18__IPU1_DISP0_DATA18   0x0d8 0x3ec 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT18__LCD_DATA18          0x0d8 0x3ec 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT18__ECSPI2_SS0          0x0d8 0x3ec 0x800 0x2 0x1
-#define MX6DL_PAD_DISP0_DAT18__AUD5_TXFS           0x0d8 0x3ec 0x7c4 0x3 0x0
-#define MX6DL_PAD_DISP0_DAT18__AUD4_RXFS           0x0d8 0x3ec 0x7a4 0x4 0x0
-#define MX6DL_PAD_DISP0_DAT18__GPIO5_IO12          0x0d8 0x3ec 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT18__EIM_CS2_B           0x0d8 0x3ec 0x000 0x7 0x0
-#define MX6DL_PAD_DISP0_DAT19__IPU1_DISP0_DATA19   0x0dc 0x3f0 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT19__LCD_DATA19          0x0dc 0x3f0 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT19__ECSPI2_SCLK         0x0dc 0x3f0 0x7f4 0x2 0x1
-#define MX6DL_PAD_DISP0_DAT19__AUD5_RXD            0x0dc 0x3f0 0x7b0 0x3 0x0
-#define MX6DL_PAD_DISP0_DAT19__AUD4_RXC            0x0dc 0x3f0 0x7a0 0x4 0x0
-#define MX6DL_PAD_DISP0_DAT19__GPIO5_IO13          0x0dc 0x3f0 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT19__EIM_CS3_B           0x0dc 0x3f0 0x000 0x7 0x0
-#define MX6DL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02    0x0e0 0x3f4 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT2__LCD_DATA02           0x0e0 0x3f4 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT2__ECSPI3_MISO          0x0e0 0x3f4 0x000 0x2 0x0
-#define MX6DL_PAD_DISP0_DAT2__GPIO4_IO23           0x0e0 0x3f4 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT20__IPU1_DISP0_DATA20   0x0e4 0x3f8 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT20__LCD_DATA20          0x0e4 0x3f8 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT20__ECSPI1_SCLK         0x0e4 0x3f8 0x7d8 0x2 0x1
-#define MX6DL_PAD_DISP0_DAT20__AUD4_TXC            0x0e4 0x3f8 0x7a8 0x3 0x0
-#define MX6DL_PAD_DISP0_DAT20__GPIO5_IO14          0x0e4 0x3f8 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT21__IPU1_DISP0_DATA21   0x0e8 0x3fc 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT21__LCD_DATA21          0x0e8 0x3fc 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT21__ECSPI1_MOSI         0x0e8 0x3fc 0x7e0 0x2 0x1
-#define MX6DL_PAD_DISP0_DAT21__AUD4_TXD            0x0e8 0x3fc 0x79c 0x3 0x0
-#define MX6DL_PAD_DISP0_DAT21__GPIO5_IO15          0x0e8 0x3fc 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT22__IPU1_DISP0_DATA22   0x0ec 0x400 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT22__LCD_DATA22          0x0ec 0x400 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT22__ECSPI1_MISO         0x0ec 0x400 0x7dc 0x2 0x1
-#define MX6DL_PAD_DISP0_DAT22__AUD4_TXFS           0x0ec 0x400 0x7ac 0x3 0x0
-#define MX6DL_PAD_DISP0_DAT22__GPIO5_IO16          0x0ec 0x400 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT23__IPU1_DISP0_DATA23   0x0f0 0x404 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT23__LCD_DATA23          0x0f0 0x404 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT23__ECSPI1_SS0          0x0f0 0x404 0x7e4 0x2 0x1
-#define MX6DL_PAD_DISP0_DAT23__AUD4_RXD            0x0f0 0x404 0x798 0x3 0x0
-#define MX6DL_PAD_DISP0_DAT23__GPIO5_IO17          0x0f0 0x404 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03    0x0f4 0x408 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT3__LCD_DATA03           0x0f4 0x408 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT3__ECSPI3_SS0           0x0f4 0x408 0x000 0x2 0x0
-#define MX6DL_PAD_DISP0_DAT3__GPIO4_IO24           0x0f4 0x408 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04    0x0f8 0x40c 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT4__LCD_DATA04           0x0f8 0x40c 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT4__ECSPI3_SS1           0x0f8 0x40c 0x000 0x2 0x0
-#define MX6DL_PAD_DISP0_DAT4__GPIO4_IO25           0x0f8 0x40c 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05    0x0fc 0x410 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT5__LCD_DATA05           0x0fc 0x410 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT5__ECSPI3_SS2           0x0fc 0x410 0x000 0x2 0x0
-#define MX6DL_PAD_DISP0_DAT5__AUD6_RXFS            0x0fc 0x410 0x000 0x3 0x0
-#define MX6DL_PAD_DISP0_DAT5__GPIO4_IO26           0x0fc 0x410 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06    0x100 0x414 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT6__LCD_DATA06           0x100 0x414 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT6__ECSPI3_SS3           0x100 0x414 0x000 0x2 0x0
-#define MX6DL_PAD_DISP0_DAT6__AUD6_RXC             0x100 0x414 0x000 0x3 0x0
-#define MX6DL_PAD_DISP0_DAT6__GPIO4_IO27           0x100 0x414 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07    0x104 0x418 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT7__LCD_DATA07           0x104 0x418 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT7__ECSPI3_RDY           0x104 0x418 0x000 0x2 0x0
-#define MX6DL_PAD_DISP0_DAT7__GPIO4_IO28           0x104 0x418 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08    0x108 0x41c 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT8__LCD_DATA08           0x108 0x41c 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT8__PWM1_OUT             0x108 0x41c 0x000 0x2 0x0
-#define MX6DL_PAD_DISP0_DAT8__WDOG1_B              0x108 0x41c 0x000 0x3 0x0
-#define MX6DL_PAD_DISP0_DAT8__GPIO4_IO29           0x108 0x41c 0x000 0x5 0x0
-#define MX6DL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09    0x10c 0x420 0x000 0x0 0x0
-#define MX6DL_PAD_DISP0_DAT9__LCD_DATA09           0x10c 0x420 0x000 0x1 0x0
-#define MX6DL_PAD_DISP0_DAT9__PWM2_OUT             0x10c 0x420 0x000 0x2 0x0
-#define MX6DL_PAD_DISP0_DAT9__WDOG2_B              0x10c 0x420 0x000 0x3 0x0
-#define MX6DL_PAD_DISP0_DAT9__GPIO4_IO30           0x10c 0x420 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_A16__EIM_ADDR16              0x110 0x4e0 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_A16__IPU1_DI1_DISP_CLK       0x110 0x4e0 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_A16__IPU1_CSI1_PIXCLK        0x110 0x4e0 0x8b8 0x2 0x0
-#define MX6DL_PAD_EIM_A16__GPIO2_IO22              0x110 0x4e0 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_A16__SRC_BOOT_CFG16          0x110 0x4e0 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_A16__EPDC_DATA00             0x110 0x4e0 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_A17__EIM_ADDR17              0x114 0x4e4 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_A17__IPU1_DISP1_DATA12       0x114 0x4e4 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_A17__IPU1_CSI1_DATA12        0x114 0x4e4 0x890 0x2 0x0
-#define MX6DL_PAD_EIM_A17__GPIO2_IO21              0x114 0x4e4 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_A17__SRC_BOOT_CFG17          0x114 0x4e4 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_A17__EPDC_PWR_STAT           0x114 0x4e4 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_A18__EIM_ADDR18              0x118 0x4e8 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_A18__IPU1_DISP1_DATA13       0x118 0x4e8 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_A18__IPU1_CSI1_DATA13        0x118 0x4e8 0x894 0x2 0x0
-#define MX6DL_PAD_EIM_A18__GPIO2_IO20              0x118 0x4e8 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_A18__SRC_BOOT_CFG18          0x118 0x4e8 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_A18__EPDC_PWR_CTRL0          0x118 0x4e8 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_A19__EIM_ADDR19              0x11c 0x4ec 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_A19__IPU1_DISP1_DATA14       0x11c 0x4ec 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_A19__IPU1_CSI1_DATA14        0x11c 0x4ec 0x898 0x2 0x0
-#define MX6DL_PAD_EIM_A19__GPIO2_IO19              0x11c 0x4ec 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_A19__SRC_BOOT_CFG19          0x11c 0x4ec 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_A19__EPDC_PWR_CTRL1          0x11c 0x4ec 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_A20__EIM_ADDR20              0x120 0x4f0 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_A20__IPU1_DISP1_DATA15       0x120 0x4f0 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_A20__IPU1_CSI1_DATA15        0x120 0x4f0 0x89c 0x2 0x0
-#define MX6DL_PAD_EIM_A20__GPIO2_IO18              0x120 0x4f0 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_A20__SRC_BOOT_CFG20          0x120 0x4f0 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_A20__EPDC_PWR_CTRL2          0x120 0x4f0 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_A21__EIM_ADDR21              0x124 0x4f4 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_A21__IPU1_DISP1_DATA16       0x124 0x4f4 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_A21__IPU1_CSI1_DATA16        0x124 0x4f4 0x8a0 0x2 0x0
-#define MX6DL_PAD_EIM_A21__GPIO2_IO17              0x124 0x4f4 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_A21__SRC_BOOT_CFG21          0x124 0x4f4 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_A21__EPDC_GDCLK              0x124 0x4f4 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_A22__EIM_ADDR22              0x128 0x4f8 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_A22__IPU1_DISP1_DATA17       0x128 0x4f8 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_A22__IPU1_CSI1_DATA17        0x128 0x4f8 0x8a4 0x2 0x0
-#define MX6DL_PAD_EIM_A22__GPIO2_IO16              0x128 0x4f8 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_A22__SRC_BOOT_CFG22          0x128 0x4f8 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_A22__EPDC_GDSP               0x128 0x4f8 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_A23__EIM_ADDR23              0x12c 0x4fc 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_A23__IPU1_DISP1_DATA18       0x12c 0x4fc 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_A23__IPU1_CSI1_DATA18        0x12c 0x4fc 0x8a8 0x2 0x0
-#define MX6DL_PAD_EIM_A23__IPU1_SISG3              0x12c 0x4fc 0x000 0x4 0x0
-#define MX6DL_PAD_EIM_A23__GPIO6_IO06              0x12c 0x4fc 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_A23__SRC_BOOT_CFG23          0x12c 0x4fc 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_A23__EPDC_GDOE               0x12c 0x4fc 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_A24__EIM_ADDR24              0x130 0x500 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_A24__IPU1_DISP1_DATA19       0x130 0x500 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_A24__IPU1_CSI1_DATA19        0x130 0x500 0x8ac 0x2 0x0
-#define MX6DL_PAD_EIM_A24__IPU1_SISG2              0x130 0x500 0x000 0x4 0x0
-#define MX6DL_PAD_EIM_A24__GPIO5_IO04              0x130 0x500 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_A24__SRC_BOOT_CFG24          0x130 0x500 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_A24__EPDC_GDRL               0x130 0x500 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_A25__EIM_ADDR25              0x134 0x504 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_A25__ECSPI4_SS1              0x134 0x504 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_A25__ECSPI2_RDY              0x134 0x504 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_A25__IPU1_DI1_PIN12          0x134 0x504 0x000 0x3 0x0
-#define MX6DL_PAD_EIM_A25__IPU1_DI0_D1_CS          0x134 0x504 0x000 0x4 0x0
-#define MX6DL_PAD_EIM_A25__GPIO5_IO02              0x134 0x504 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_A25__HDMI_TX_CEC_LINE        0x134 0x504 0x85c 0x6 0x0
-#define MX6DL_PAD_EIM_A25__EPDC_DATA15             0x134 0x504 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_A25__EIM_ACLK_FREERUN        0x134 0x504 0x000 0x9 0x0
-#define MX6DL_PAD_EIM_BCLK__EIM_BCLK               0x138 0x508 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_BCLK__IPU1_DI1_PIN16         0x138 0x508 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_BCLK__GPIO6_IO31             0x138 0x508 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_BCLK__EPDC_SDCE9             0x138 0x508 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_CS0__EIM_CS0_B               0x13c 0x50c 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_CS0__IPU1_DI1_PIN05          0x13c 0x50c 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_CS0__ECSPI2_SCLK             0x13c 0x50c 0x7f4 0x2 0x2
-#define MX6DL_PAD_EIM_CS0__GPIO2_IO23              0x13c 0x50c 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_CS0__EPDC_DATA06             0x13c 0x50c 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_CS1__EIM_CS1_B               0x140 0x510 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_CS1__IPU1_DI1_PIN06          0x140 0x510 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_CS1__ECSPI2_MOSI             0x140 0x510 0x7fc 0x2 0x2
-#define MX6DL_PAD_EIM_CS1__GPIO2_IO24              0x140 0x510 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_CS1__EPDC_DATA08             0x140 0x510 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_D16__EIM_DATA16              0x144 0x514 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_D16__ECSPI1_SCLK             0x144 0x514 0x7d8 0x1 0x2
-#define MX6DL_PAD_EIM_D16__IPU1_DI0_PIN05          0x144 0x514 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_D16__IPU1_CSI1_DATA18        0x144 0x514 0x8a8 0x3 0x1
-#define MX6DL_PAD_EIM_D16__HDMI_TX_DDC_SDA         0x144 0x514 0x864 0x4 0x0
-#define MX6DL_PAD_EIM_D16__GPIO3_IO16              0x144 0x514 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_D16__I2C2_SDA                0x144 0x514 0x874 0x6 0x0
-#define MX6DL_PAD_EIM_D16__EPDC_DATA10             0x144 0x514 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_D17__EIM_DATA17              0x148 0x518 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_D17__ECSPI1_MISO             0x148 0x518 0x7dc 0x1 0x2
-#define MX6DL_PAD_EIM_D17__IPU1_DI0_PIN06          0x148 0x518 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_D17__IPU1_CSI1_PIXCLK        0x148 0x518 0x8b8 0x3 0x1
-#define MX6DL_PAD_EIM_D17__DCIC1_OUT               0x148 0x518 0x000 0x4 0x0
-#define MX6DL_PAD_EIM_D17__GPIO3_IO17              0x148 0x518 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_D17__I2C3_SCL                0x148 0x518 0x878 0x6 0x0
-#define MX6DL_PAD_EIM_D17__EPDC_VCOM0              0x148 0x518 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_D18__EIM_DATA18              0x14c 0x51c 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_D18__ECSPI1_MOSI             0x14c 0x51c 0x7e0 0x1 0x2
-#define MX6DL_PAD_EIM_D18__IPU1_DI0_PIN07          0x14c 0x51c 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_D18__IPU1_CSI1_DATA17        0x14c 0x51c 0x8a4 0x3 0x1
-#define MX6DL_PAD_EIM_D18__IPU1_DI1_D0_CS          0x14c 0x51c 0x000 0x4 0x0
-#define MX6DL_PAD_EIM_D18__GPIO3_IO18              0x14c 0x51c 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_D18__I2C3_SDA                0x14c 0x51c 0x87c 0x6 0x0
-#define MX6DL_PAD_EIM_D18__EPDC_VCOM1              0x14c 0x51c 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_D19__EIM_DATA19              0x150 0x520 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_D19__ECSPI1_SS1              0x150 0x520 0x7e8 0x1 0x1
-#define MX6DL_PAD_EIM_D19__IPU1_DI0_PIN08          0x150 0x520 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_D19__IPU1_CSI1_DATA16        0x150 0x520 0x8a0 0x3 0x1
-#define MX6DL_PAD_EIM_D19__UART1_CTS_B             0x150 0x520 0x000 0x4 0x0
-#define MX6DL_PAD_EIM_D19__UART1_RTS_B             0x150 0x520 0x8f8 0x4 0x0
-#define MX6DL_PAD_EIM_D19__GPIO3_IO19              0x150 0x520 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_D19__EPIT1_OUT               0x150 0x520 0x000 0x6 0x0
-#define MX6DL_PAD_EIM_D19__EPDC_DATA12             0x150 0x520 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_D20__EIM_DATA20              0x154 0x524 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_D20__ECSPI4_SS0              0x154 0x524 0x808 0x1 0x0
-#define MX6DL_PAD_EIM_D20__IPU1_DI0_PIN16          0x154 0x524 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_D20__IPU1_CSI1_DATA15        0x154 0x524 0x89c 0x3 0x1
-#define MX6DL_PAD_EIM_D20__UART1_RTS_B             0x154 0x524 0x8f8 0x4 0x1
-#define MX6DL_PAD_EIM_D20__UART1_CTS_B             0x154 0x524 0x000 0x4 0x0
-#define MX6DL_PAD_EIM_D20__GPIO3_IO20              0x154 0x524 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_D20__EPIT2_OUT               0x154 0x524 0x000 0x6 0x0
-#define MX6DL_PAD_EIM_D21__EIM_DATA21              0x158 0x528 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_D21__ECSPI4_SCLK             0x158 0x528 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_D21__IPU1_DI0_PIN17          0x158 0x528 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_D21__IPU1_CSI1_DATA11        0x158 0x528 0x88c 0x3 0x0
-#define MX6DL_PAD_EIM_D21__USB_OTG_OC              0x158 0x528 0x920 0x4 0x0
-#define MX6DL_PAD_EIM_D21__GPIO3_IO21              0x158 0x528 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_D21__I2C1_SCL                0x158 0x528 0x868 0x6 0x1
-#define MX6DL_PAD_EIM_D21__SPDIF_IN                0x158 0x528 0x8f0 0x7 0x0
-#define MX6DL_PAD_EIM_D22__EIM_DATA22              0x15c 0x52c 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_D22__ECSPI4_MISO             0x15c 0x52c 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_D22__IPU1_DI0_PIN01          0x15c 0x52c 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_D22__IPU1_CSI1_DATA10        0x15c 0x52c 0x888 0x3 0x0
-#define MX6DL_PAD_EIM_D22__USB_OTG_PWR             0x15c 0x52c 0x000 0x4 0x0
-#define MX6DL_PAD_EIM_D22__GPIO3_IO22              0x15c 0x52c 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_D22__SPDIF_OUT               0x15c 0x52c 0x000 0x6 0x0
-#define MX6DL_PAD_EIM_D22__EPDC_SDCE6              0x15c 0x52c 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_D23__EIM_DATA23              0x160 0x530 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_D23__IPU1_DI0_D0_CS          0x160 0x530 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_D23__UART3_CTS_B             0x160 0x530 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_D23__UART3_RTS_B             0x160 0x530 0x908 0x2 0x0
-#define MX6DL_PAD_EIM_D23__UART1_DCD_B             0x160 0x530 0x000 0x3 0x0
-#define MX6DL_PAD_EIM_D23__IPU1_CSI1_DATA_EN       0x160 0x530 0x8b0 0x4 0x0
-#define MX6DL_PAD_EIM_D23__GPIO3_IO23              0x160 0x530 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_D23__IPU1_DI1_PIN02          0x160 0x530 0x000 0x6 0x0
-#define MX6DL_PAD_EIM_D23__IPU1_DI1_PIN14          0x160 0x530 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_D23__EPDC_DATA11             0x160 0x530 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_D24__EIM_DATA24              0x164 0x534 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_D24__ECSPI4_SS2              0x164 0x534 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_D24__UART3_TX_DATA           0x164 0x534 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_D24__UART3_RX_DATA           0x164 0x534 0x90c 0x2 0x0
-#define MX6DL_PAD_EIM_D24__ECSPI1_SS2              0x164 0x534 0x7ec 0x3 0x0
-#define MX6DL_PAD_EIM_D24__ECSPI2_SS2              0x164 0x534 0x000 0x4 0x0
-#define MX6DL_PAD_EIM_D24__GPIO3_IO24              0x164 0x534 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_D24__AUD5_RXFS               0x164 0x534 0x7bc 0x6 0x1
-#define MX6DL_PAD_EIM_D24__UART1_DTR_B             0x164 0x534 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_D24__EPDC_SDCE7              0x164 0x534 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_D25__EIM_DATA25              0x168 0x538 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_D25__ECSPI4_SS3              0x168 0x538 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_D25__UART3_RX_DATA           0x168 0x538 0x90c 0x2 0x1
-#define MX6DL_PAD_EIM_D25__UART3_TX_DATA           0x168 0x538 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_D25__ECSPI1_SS3              0x168 0x538 0x7f0 0x3 0x0
-#define MX6DL_PAD_EIM_D25__ECSPI2_SS3              0x168 0x538 0x000 0x4 0x0
-#define MX6DL_PAD_EIM_D25__GPIO3_IO25              0x168 0x538 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_D25__AUD5_RXC                0x168 0x538 0x7b8 0x6 0x1
-#define MX6DL_PAD_EIM_D25__UART1_DSR_B             0x168 0x538 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_D25__EPDC_SDCE8              0x168 0x538 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_D26__EIM_DATA26              0x16c 0x53c 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_D26__IPU1_DI1_PIN11          0x16c 0x53c 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_D26__IPU1_CSI0_DATA01        0x16c 0x53c 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_D26__IPU1_CSI1_DATA14        0x16c 0x53c 0x898 0x3 0x1
-#define MX6DL_PAD_EIM_D26__UART2_TX_DATA           0x16c 0x53c 0x000 0x4 0x0
-#define MX6DL_PAD_EIM_D26__UART2_RX_DATA           0x16c 0x53c 0x904 0x4 0x0
-#define MX6DL_PAD_EIM_D26__GPIO3_IO26              0x16c 0x53c 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_D26__IPU1_SISG2              0x16c 0x53c 0x000 0x6 0x0
-#define MX6DL_PAD_EIM_D26__IPU1_DISP1_DATA22       0x16c 0x53c 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_D26__EPDC_SDOED              0x16c 0x53c 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_D27__EIM_DATA27              0x170 0x540 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_D27__IPU1_DI1_PIN13          0x170 0x540 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_D27__IPU1_CSI0_DATA00        0x170 0x540 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_D27__IPU1_CSI1_DATA13        0x170 0x540 0x894 0x3 0x1
-#define MX6DL_PAD_EIM_D27__UART2_RX_DATA           0x170 0x540 0x904 0x4 0x1
-#define MX6DL_PAD_EIM_D27__UART2_TX_DATA           0x170 0x540 0x000 0x4 0x0
-#define MX6DL_PAD_EIM_D27__GPIO3_IO27              0x170 0x540 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_D27__IPU1_SISG3              0x170 0x540 0x000 0x6 0x0
-#define MX6DL_PAD_EIM_D27__IPU1_DISP1_DATA23       0x170 0x540 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_D27__EPDC_SDOE               0x170 0x540 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_D28__EIM_DATA28              0x174 0x544 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_D28__I2C1_SDA                0x174 0x544 0x86c 0x1 0x1
-#define MX6DL_PAD_EIM_D28__ECSPI4_MOSI             0x174 0x544 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_D28__IPU1_CSI1_DATA12        0x174 0x544 0x890 0x3 0x1
-#define MX6DL_PAD_EIM_D28__UART2_CTS_B             0x174 0x544 0x000 0x4 0x0
-#define MX6DL_PAD_EIM_D28__UART2_RTS_B             0x174 0x544 0x900 0x4 0x0
-#define MX6DL_PAD_EIM_D28__GPIO3_IO28              0x174 0x544 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_D28__IPU1_EXT_TRIG           0x174 0x544 0x000 0x6 0x0
-#define MX6DL_PAD_EIM_D28__IPU1_DI0_PIN13          0x174 0x544 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_D28__EPDC_PWR_CTRL3          0x174 0x544 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_D29__EIM_DATA29              0x178 0x548 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_D29__IPU1_DI1_PIN15          0x178 0x548 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_D29__ECSPI4_SS0              0x178 0x548 0x808 0x2 0x1
-#define MX6DL_PAD_EIM_D29__UART2_RTS_B             0x178 0x548 0x900 0x4 0x1
-#define MX6DL_PAD_EIM_D29__UART2_CTS_B             0x178 0x548 0x000 0x4 0x0
-#define MX6DL_PAD_EIM_D29__GPIO3_IO29              0x178 0x548 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_D29__IPU1_CSI1_VSYNC         0x178 0x548 0x8bc 0x6 0x0
-#define MX6DL_PAD_EIM_D29__IPU1_DI0_PIN14          0x178 0x548 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_D29__EPDC_PWR_WAKE           0x178 0x548 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_D30__EIM_DATA30              0x17c 0x54c 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_D30__IPU1_DISP1_DATA21       0x17c 0x54c 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_D30__IPU1_DI0_PIN11          0x17c 0x54c 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_D30__IPU1_CSI0_DATA03        0x17c 0x54c 0x000 0x3 0x0
-#define MX6DL_PAD_EIM_D30__UART3_CTS_B             0x17c 0x54c 0x000 0x4 0x0
-#define MX6DL_PAD_EIM_D30__UART3_RTS_B             0x17c 0x54c 0x908 0x4 0x1
-#define MX6DL_PAD_EIM_D30__GPIO3_IO30              0x17c 0x54c 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_D30__USB_H1_OC               0x17c 0x54c 0x924 0x6 0x0
-#define MX6DL_PAD_EIM_D30__EPDC_SDOEZ              0x17c 0x54c 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_D31__EIM_DATA31              0x180 0x550 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_D31__IPU1_DISP1_DATA20       0x180 0x550 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_D31__IPU1_DI0_PIN12          0x180 0x550 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_D31__IPU1_CSI0_DATA02        0x180 0x550 0x000 0x3 0x0
-#define MX6DL_PAD_EIM_D31__UART3_RTS_B             0x180 0x550 0x908 0x4 0x2
-#define MX6DL_PAD_EIM_D31__UART3_CTS_B             0x180 0x550 0x000 0x4 0x0
-#define MX6DL_PAD_EIM_D31__GPIO3_IO31              0x180 0x550 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_D31__USB_H1_PWR              0x180 0x550 0x000 0x6 0x0
-#define MX6DL_PAD_EIM_D31__EPDC_SDCLK_P            0x180 0x550 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_D31__EIM_ACLK_FREERUN        0x180 0x550 0x000 0x9 0x0
-#define MX6DL_PAD_EIM_DA0__EIM_AD00                0x184 0x554 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_DA0__IPU1_DISP1_DATA09       0x184 0x554 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_DA0__IPU1_CSI1_DATA09        0x184 0x554 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_DA0__GPIO3_IO00              0x184 0x554 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_DA0__SRC_BOOT_CFG00          0x184 0x554 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_DA0__EPDC_SDCLK_N            0x184 0x554 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_DA1__EIM_AD01                0x188 0x558 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_DA1__IPU1_DISP1_DATA08       0x188 0x558 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_DA1__IPU1_CSI1_DATA08        0x188 0x558 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_DA1__GPIO3_IO01              0x188 0x558 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_DA1__SRC_BOOT_CFG01          0x188 0x558 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_DA1__EPDC_SDLE               0x188 0x558 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_DA10__EIM_AD10               0x18c 0x55c 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_DA10__IPU1_DI1_PIN15         0x18c 0x55c 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_DA10__IPU1_CSI1_DATA_EN      0x18c 0x55c 0x8b0 0x2 0x1
-#define MX6DL_PAD_EIM_DA10__GPIO3_IO10             0x18c 0x55c 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_DA10__SRC_BOOT_CFG10         0x18c 0x55c 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_DA10__EPDC_DATA01            0x18c 0x55c 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_DA11__EIM_AD11               0x190 0x560 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_DA11__IPU1_DI1_PIN02         0x190 0x560 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_DA11__IPU1_CSI1_HSYNC        0x190 0x560 0x8b4 0x2 0x0
-#define MX6DL_PAD_EIM_DA11__GPIO3_IO11             0x190 0x560 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_DA11__SRC_BOOT_CFG11         0x190 0x560 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_DA11__EPDC_DATA03            0x190 0x560 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_DA12__EIM_AD12               0x194 0x564 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_DA12__IPU1_DI1_PIN03         0x194 0x564 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_DA12__IPU1_CSI1_VSYNC        0x194 0x564 0x8bc 0x2 0x1
-#define MX6DL_PAD_EIM_DA12__GPIO3_IO12             0x194 0x564 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_DA12__SRC_BOOT_CFG12         0x194 0x564 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_DA12__EPDC_DATA02            0x194 0x564 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_DA13__EIM_AD13               0x198 0x568 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_DA13__IPU1_DI1_D0_CS         0x198 0x568 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_DA13__GPIO3_IO13             0x198 0x568 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_DA13__SRC_BOOT_CFG13         0x198 0x568 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_DA13__EPDC_DATA13            0x198 0x568 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_DA14__EIM_AD14               0x19c 0x56c 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_DA14__IPU1_DI1_D1_CS         0x19c 0x56c 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_DA14__GPIO3_IO14             0x19c 0x56c 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_DA14__SRC_BOOT_CFG14         0x19c 0x56c 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_DA14__EPDC_DATA14            0x19c 0x56c 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_DA15__EIM_AD15               0x1a0 0x570 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_DA15__IPU1_DI1_PIN01         0x1a0 0x570 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_DA15__IPU1_DI1_PIN04         0x1a0 0x570 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_DA15__GPIO3_IO15             0x1a0 0x570 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_DA15__SRC_BOOT_CFG15         0x1a0 0x570 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_DA15__EPDC_DATA09            0x1a0 0x570 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_DA2__EIM_AD02                0x1a4 0x574 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_DA2__IPU1_DISP1_DATA07       0x1a4 0x574 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_DA2__IPU1_CSI1_DATA07        0x1a4 0x574 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_DA2__GPIO3_IO02              0x1a4 0x574 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_DA2__SRC_BOOT_CFG02          0x1a4 0x574 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_DA2__EPDC_BDR0               0x1a4 0x574 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_DA3__EIM_AD03                0x1a8 0x578 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_DA3__IPU1_DISP1_DATA06       0x1a8 0x578 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_DA3__IPU1_CSI1_DATA06        0x1a8 0x578 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_DA3__GPIO3_IO03              0x1a8 0x578 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_DA3__SRC_BOOT_CFG03          0x1a8 0x578 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_DA3__EPDC_BDR1               0x1a8 0x578 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_DA4__EIM_AD04                0x1ac 0x57c 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_DA4__IPU1_DISP1_DATA05       0x1ac 0x57c 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_DA4__IPU1_CSI1_DATA05        0x1ac 0x57c 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_DA4__GPIO3_IO04              0x1ac 0x57c 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_DA4__SRC_BOOT_CFG04          0x1ac 0x57c 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_DA4__EPDC_SDCE0              0x1ac 0x57c 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_DA5__EIM_AD05                0x1b0 0x580 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_DA5__IPU1_DISP1_DATA04       0x1b0 0x580 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_DA5__IPU1_CSI1_DATA04        0x1b0 0x580 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_DA5__GPIO3_IO05              0x1b0 0x580 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_DA5__SRC_BOOT_CFG05          0x1b0 0x580 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_DA5__EPDC_SDCE1              0x1b0 0x580 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_DA6__EIM_AD06                0x1b4 0x584 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_DA6__IPU1_DISP1_DATA03       0x1b4 0x584 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_DA6__IPU1_CSI1_DATA03        0x1b4 0x584 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_DA6__GPIO3_IO06              0x1b4 0x584 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_DA6__SRC_BOOT_CFG06          0x1b4 0x584 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_DA6__EPDC_SDCE2              0x1b4 0x584 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_DA7__EIM_AD07                0x1b8 0x588 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_DA7__IPU1_DISP1_DATA02       0x1b8 0x588 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_DA7__IPU1_CSI1_DATA02        0x1b8 0x588 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_DA7__GPIO3_IO07              0x1b8 0x588 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_DA7__SRC_BOOT_CFG07          0x1b8 0x588 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_DA7__EPDC_SDCE3              0x1b8 0x588 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_DA8__EIM_AD08                0x1bc 0x58c 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_DA8__IPU1_DISP1_DATA01       0x1bc 0x58c 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_DA8__IPU1_CSI1_DATA01        0x1bc 0x58c 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_DA8__GPIO3_IO08              0x1bc 0x58c 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_DA8__SRC_BOOT_CFG08          0x1bc 0x58c 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_DA8__EPDC_SDCE4              0x1bc 0x58c 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_DA9__EIM_AD09                0x1c0 0x590 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_DA9__IPU1_DISP1_DATA00       0x1c0 0x590 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_DA9__IPU1_CSI1_DATA00        0x1c0 0x590 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_DA9__GPIO3_IO09              0x1c0 0x590 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_DA9__SRC_BOOT_CFG09          0x1c0 0x590 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_DA9__EPDC_SDCE5              0x1c0 0x590 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_EB0__EIM_EB0_B               0x1c4 0x594 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_EB0__IPU1_DISP1_DATA11       0x1c4 0x594 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_EB0__IPU1_CSI1_DATA11        0x1c4 0x594 0x88c 0x2 0x1
-#define MX6DL_PAD_EIM_EB0__CCM_PMIC_READY          0x1c4 0x594 0x7d4 0x4 0x0
-#define MX6DL_PAD_EIM_EB0__GPIO2_IO28              0x1c4 0x594 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_EB0__SRC_BOOT_CFG27          0x1c4 0x594 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_EB0__EPDC_PWR_COM            0x1c4 0x594 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_EB1__EIM_EB1_B               0x1c8 0x598 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_EB1__IPU1_DISP1_DATA10       0x1c8 0x598 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_EB1__IPU1_CSI1_DATA10        0x1c8 0x598 0x888 0x2 0x1
-#define MX6DL_PAD_EIM_EB1__GPIO2_IO29              0x1c8 0x598 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_EB1__SRC_BOOT_CFG28          0x1c8 0x598 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_EB1__EPDC_SDSHR              0x1c8 0x598 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_EB2__EIM_EB2_B               0x1cc 0x59c 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_EB2__ECSPI1_SS0              0x1cc 0x59c 0x7e4 0x1 0x2
-#define MX6DL_PAD_EIM_EB2__IPU1_CSI1_DATA19        0x1cc 0x59c 0x8ac 0x3 0x1
-#define MX6DL_PAD_EIM_EB2__HDMI_TX_DDC_SCL         0x1cc 0x59c 0x860 0x4 0x0
-#define MX6DL_PAD_EIM_EB2__GPIO2_IO30              0x1cc 0x59c 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_EB2__I2C2_SCL                0x1cc 0x59c 0x870 0x6 0x0
-#define MX6DL_PAD_EIM_EB2__SRC_BOOT_CFG30          0x1cc 0x59c 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_EB2__EPDC_DATA05             0x1cc 0x59c 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_EB3__EIM_EB3_B               0x1d0 0x5a0 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_EB3__ECSPI4_RDY              0x1d0 0x5a0 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_EB3__UART3_RTS_B             0x1d0 0x5a0 0x908 0x2 0x3
-#define MX6DL_PAD_EIM_EB3__UART3_CTS_B             0x1d0 0x5a0 0x000 0x2 0x0
-#define MX6DL_PAD_EIM_EB3__UART1_RI_B              0x1d0 0x5a0 0x000 0x3 0x0
-#define MX6DL_PAD_EIM_EB3__IPU1_CSI1_HSYNC         0x1d0 0x5a0 0x8b4 0x4 0x1
-#define MX6DL_PAD_EIM_EB3__GPIO2_IO31              0x1d0 0x5a0 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_EB3__IPU1_DI1_PIN03          0x1d0 0x5a0 0x000 0x6 0x0
-#define MX6DL_PAD_EIM_EB3__SRC_BOOT_CFG31          0x1d0 0x5a0 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_EB3__EPDC_SDCE0              0x1d0 0x5a0 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_EB3__EIM_ACLK_FREERUN        0x1d0 0x5a0 0x000 0x9 0x0
-#define MX6DL_PAD_EIM_LBA__EIM_LBA_B               0x1d4 0x5a4 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_LBA__IPU1_DI1_PIN17          0x1d4 0x5a4 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_LBA__ECSPI2_SS1              0x1d4 0x5a4 0x804 0x2 0x1
-#define MX6DL_PAD_EIM_LBA__GPIO2_IO27              0x1d4 0x5a4 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_LBA__SRC_BOOT_CFG26          0x1d4 0x5a4 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_LBA__EPDC_DATA04             0x1d4 0x5a4 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_OE__EIM_OE_B                 0x1d8 0x5a8 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_OE__IPU1_DI1_PIN07           0x1d8 0x5a8 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_OE__ECSPI2_MISO              0x1d8 0x5a8 0x7f8 0x2 0x2
-#define MX6DL_PAD_EIM_OE__GPIO2_IO25               0x1d8 0x5a8 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_OE__EPDC_PWR_IRQ             0x1d8 0x5a8 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_RW__EIM_RW                   0x1dc 0x5ac 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_RW__IPU1_DI1_PIN08           0x1dc 0x5ac 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_RW__ECSPI2_SS0               0x1dc 0x5ac 0x800 0x2 0x2
-#define MX6DL_PAD_EIM_RW__GPIO2_IO26               0x1dc 0x5ac 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_RW__SRC_BOOT_CFG29           0x1dc 0x5ac 0x000 0x7 0x0
-#define MX6DL_PAD_EIM_RW__EPDC_DATA07              0x1dc 0x5ac 0x000 0x8 0x0
-#define MX6DL_PAD_EIM_WAIT__EIM_WAIT_B             0x1e0 0x5b0 0x000 0x0 0x0
-#define MX6DL_PAD_EIM_WAIT__EIM_DTACK_B            0x1e0 0x5b0 0x000 0x1 0x0
-#define MX6DL_PAD_EIM_WAIT__GPIO5_IO00             0x1e0 0x5b0 0x000 0x5 0x0
-#define MX6DL_PAD_EIM_WAIT__SRC_BOOT_CFG25         0x1e0 0x5b0 0x000 0x7 0x0
-#define MX6DL_PAD_ENET_CRS_DV__ENET_RX_EN          0x1e4 0x5b4 0x828 0x1 0x0
-#define MX6DL_PAD_ENET_CRS_DV__ESAI_TX_CLK         0x1e4 0x5b4 0x840 0x2 0x0
-#define MX6DL_PAD_ENET_CRS_DV__SPDIF_EXT_CLK       0x1e4 0x5b4 0x8f4 0x3 0x0
-#define MX6DL_PAD_ENET_CRS_DV__GPIO1_IO25          0x1e4 0x5b4 0x000 0x5 0x0
-#define MX6DL_PAD_ENET_MDC__MLB_DATA               0x1e8 0x5b8 0x8e0 0x0 0x0
-#define MX6DL_PAD_ENET_MDC__ENET_MDC               0x1e8 0x5b8 0x000 0x1 0x0
-#define MX6DL_PAD_ENET_MDC__ESAI_TX5_RX0           0x1e8 0x5b8 0x858 0x2 0x0
-#define MX6DL_PAD_ENET_MDC__ENET_1588_EVENT1_IN    0x1e8 0x5b8 0x000 0x4 0x0
-#define MX6DL_PAD_ENET_MDC__GPIO1_IO31             0x1e8 0x5b8 0x000 0x5 0x0
-#define MX6DL_PAD_ENET_MDIO__ENET_MDIO             0x1ec 0x5bc 0x810 0x1 0x0
-#define MX6DL_PAD_ENET_MDIO__ESAI_RX_CLK           0x1ec 0x5bc 0x83c 0x2 0x0
-#define MX6DL_PAD_ENET_MDIO__ENET_1588_EVENT1_OUT  0x1ec 0x5bc 0x000 0x4 0x0
-#define MX6DL_PAD_ENET_MDIO__GPIO1_IO22            0x1ec 0x5bc 0x000 0x5 0x0
-#define MX6DL_PAD_ENET_MDIO__SPDIF_LOCK            0x1ec 0x5bc 0x000 0x6 0x0
-#define MX6DL_PAD_ENET_REF_CLK__ENET_TX_CLK        0x1f0 0x5c0 0x000 0x1 0x0
-#define MX6DL_PAD_ENET_REF_CLK__ESAI_RX_FS         0x1f0 0x5c0 0x82c 0x2 0x0
-#define MX6DL_PAD_ENET_REF_CLK__GPIO1_IO23         0x1f0 0x5c0 0x000 0x5 0x0
-#define MX6DL_PAD_ENET_REF_CLK__SPDIF_SR_CLK       0x1f0 0x5c0 0x000 0x6 0x0
-#define MX6DL_PAD_ENET_RX_ER__USB_OTG_ID           0x1f4 0x5c4 0x790 0x0 0x0
-#define MX6DL_PAD_ENET_RX_ER__ENET_RX_ER           0x1f4 0x5c4 0x000 0x1 0x0
-#define MX6DL_PAD_ENET_RX_ER__ESAI_RX_HF_CLK       0x1f4 0x5c4 0x834 0x2 0x0
-#define MX6DL_PAD_ENET_RX_ER__SPDIF_IN             0x1f4 0x5c4 0x8f0 0x3 0x1
-#define MX6DL_PAD_ENET_RX_ER__ENET_1588_EVENT2_OUT 0x1f4 0x5c4 0x000 0x4 0x0
-#define MX6DL_PAD_ENET_RX_ER__GPIO1_IO24           0x1f4 0x5c4 0x000 0x5 0x0
-#define MX6DL_PAD_ENET_RXD0__ENET_RX_DATA0         0x1f8 0x5c8 0x818 0x1 0x0
-#define MX6DL_PAD_ENET_RXD0__ESAI_TX_HF_CLK        0x1f8 0x5c8 0x838 0x2 0x0
-#define MX6DL_PAD_ENET_RXD0__SPDIF_OUT             0x1f8 0x5c8 0x000 0x3 0x0
-#define MX6DL_PAD_ENET_RXD0__GPIO1_IO27            0x1f8 0x5c8 0x000 0x5 0x0
-#define MX6DL_PAD_ENET_RXD1__MLB_SIG               0x1fc 0x5cc 0x8e4 0x0 0x0
-#define MX6DL_PAD_ENET_RXD1__ENET_RX_DATA1         0x1fc 0x5cc 0x81c 0x1 0x0
-#define MX6DL_PAD_ENET_RXD1__ESAI_TX_FS            0x1fc 0x5cc 0x830 0x2 0x0
-#define MX6DL_PAD_ENET_RXD1__ENET_1588_EVENT3_OUT  0x1fc 0x5cc 0x000 0x4 0x0
-#define MX6DL_PAD_ENET_RXD1__GPIO1_IO26            0x1fc 0x5cc 0x000 0x5 0x0
-#define MX6DL_PAD_ENET_TX_EN__ENET_TX_EN           0x200 0x5d0 0x000 0x1 0x0
-#define MX6DL_PAD_ENET_TX_EN__ESAI_TX3_RX2         0x200 0x5d0 0x850 0x2 0x0
-#define MX6DL_PAD_ENET_TX_EN__GPIO1_IO28           0x200 0x5d0 0x000 0x5 0x0
-#define MX6DL_PAD_ENET_TX_EN__I2C4_SCL             0x200 0x5d0 0x880 0x9 0x0
-#define MX6DL_PAD_ENET_TXD0__ENET_TX_DATA0         0x204 0x5d4 0x000 0x1 0x0
-#define MX6DL_PAD_ENET_TXD0__ESAI_TX4_RX1          0x204 0x5d4 0x854 0x2 0x0
-#define MX6DL_PAD_ENET_TXD0__GPIO1_IO30            0x204 0x5d4 0x000 0x5 0x0
-#define MX6DL_PAD_ENET_TXD1__MLB_CLK               0x208 0x5d8 0x8dc 0x0 0x0
-#define MX6DL_PAD_ENET_TXD1__ENET_TX_DATA1         0x208 0x5d8 0x000 0x1 0x0
-#define MX6DL_PAD_ENET_TXD1__ESAI_TX2_RX3          0x208 0x5d8 0x84c 0x2 0x0
-#define MX6DL_PAD_ENET_TXD1__ENET_1588_EVENT0_IN   0x208 0x5d8 0x000 0x4 0x0
-#define MX6DL_PAD_ENET_TXD1__GPIO1_IO29            0x208 0x5d8 0x000 0x5 0x0
-#define MX6DL_PAD_ENET_TXD1__I2C4_SDA              0x208 0x5d8 0x884 0x9 0x0
-#define MX6DL_PAD_GPIO_0__CCM_CLKO1                0x20c 0x5dc 0x000 0x0 0x0
-#define MX6DL_PAD_GPIO_0__KEY_COL5                 0x20c 0x5dc 0x8c0 0x2 0x1
-#define MX6DL_PAD_GPIO_0__ASRC_EXT_CLK             0x20c 0x5dc 0x794 0x3 0x0
-#define MX6DL_PAD_GPIO_0__EPIT1_OUT                0x20c 0x5dc 0x000 0x4 0x0
-#define MX6DL_PAD_GPIO_0__GPIO1_IO00               0x20c 0x5dc 0x000 0x5 0x0
-#define MX6DL_PAD_GPIO_0__USB_H1_PWR               0x20c 0x5dc 0x000 0x6 0x0
-#define MX6DL_PAD_GPIO_0__SNVS_VIO_5               0x20c 0x5dc 0x000 0x7 0x0
-#define MX6DL_PAD_GPIO_1__ESAI_RX_CLK              0x210 0x5e0 0x83c 0x0 0x1
-#define MX6DL_PAD_GPIO_1__WDOG2_B                  0x210 0x5e0 0x000 0x1 0x0
-#define MX6DL_PAD_GPIO_1__KEY_ROW5                 0x210 0x5e0 0x8cc 0x2 0x1
-#define MX6DL_PAD_GPIO_1__USB_OTG_ID               0x210 0x5e0 0x790 0x3 0x1
-#define MX6DL_PAD_GPIO_1__PWM2_OUT                 0x210 0x5e0 0x000 0x4 0x0
-#define MX6DL_PAD_GPIO_1__GPIO1_IO01               0x210 0x5e0 0x000 0x5 0x0
-#define MX6DL_PAD_GPIO_1__SD1_CD_B                 0x210 0x5e0 0x000 0x6 0x0
-#define MX6DL_PAD_GPIO_16__ESAI_TX3_RX2            0x214 0x5e4 0x850 0x0 0x1
-#define MX6DL_PAD_GPIO_16__ENET_1588_EVENT2_IN     0x214 0x5e4 0x000 0x1 0x0
-#define MX6DL_PAD_GPIO_16__ENET_REF_CLK            0x214 0x5e4 0x80c 0x2 0x0
-#define MX6DL_PAD_GPIO_16__SD1_LCTL                0x214 0x5e4 0x000 0x3 0x0
-#define MX6DL_PAD_GPIO_16__SPDIF_IN                0x214 0x5e4 0x8f0 0x4 0x2
-#define MX6DL_PAD_GPIO_16__GPIO7_IO11              0x214 0x5e4 0x000 0x5 0x0
-#define MX6DL_PAD_GPIO_16__I2C3_SDA                0x214 0x5e4 0x87c 0x6 0x1
-#define MX6DL_PAD_GPIO_16__JTAG_DE_B               0x214 0x5e4 0x000 0x7 0x0
-#define MX6DL_PAD_GPIO_17__ESAI_TX0                0x218 0x5e8 0x844 0x0 0x0
-#define MX6DL_PAD_GPIO_17__ENET_1588_EVENT3_IN     0x218 0x5e8 0x000 0x1 0x0
-#define MX6DL_PAD_GPIO_17__CCM_PMIC_READY          0x218 0x5e8 0x7d4 0x2 0x1
-#define MX6DL_PAD_GPIO_17__SDMA_EXT_EVENT0         0x218 0x5e8 0x8e8 0x3 0x1
-#define MX6DL_PAD_GPIO_17__SPDIF_OUT               0x218 0x5e8 0x000 0x4 0x0
-#define MX6DL_PAD_GPIO_17__GPIO7_IO12              0x218 0x5e8 0x000 0x5 0x0
-#define MX6DL_PAD_GPIO_18__ESAI_TX1                0x21c 0x5ec 0x848 0x0 0x0
-#define MX6DL_PAD_GPIO_18__ENET_RX_CLK             0x21c 0x5ec 0x814 0x1 0x0
-#define MX6DL_PAD_GPIO_18__SD3_VSELECT             0x21c 0x5ec 0x000 0x2 0x0
-#define MX6DL_PAD_GPIO_18__SDMA_EXT_EVENT1         0x21c 0x5ec 0x8ec 0x3 0x1
-#define MX6DL_PAD_GPIO_18__ASRC_EXT_CLK            0x21c 0x5ec 0x794 0x4 0x1
-#define MX6DL_PAD_GPIO_18__GPIO7_IO13              0x21c 0x5ec 0x000 0x5 0x0
-#define MX6DL_PAD_GPIO_18__SNVS_VIO_5_CTL          0x21c 0x5ec 0x000 0x6 0x0
-#define MX6DL_PAD_GPIO_19__KEY_COL5                0x220 0x5f0 0x8c0 0x0 0x2
-#define MX6DL_PAD_GPIO_19__ENET_1588_EVENT0_OUT    0x220 0x5f0 0x000 0x1 0x0
-#define MX6DL_PAD_GPIO_19__SPDIF_OUT               0x220 0x5f0 0x000 0x2 0x0
-#define MX6DL_PAD_GPIO_19__CCM_CLKO1               0x220 0x5f0 0x000 0x3 0x0
-#define MX6DL_PAD_GPIO_19__ECSPI1_RDY              0x220 0x5f0 0x000 0x4 0x0
-#define MX6DL_PAD_GPIO_19__GPIO4_IO05              0x220 0x5f0 0x000 0x5 0x0
-#define MX6DL_PAD_GPIO_19__ENET_TX_ER              0x220 0x5f0 0x000 0x6 0x0
-#define MX6DL_PAD_GPIO_2__ESAI_TX_FS               0x224 0x5f4 0x830 0x0 0x1
-#define MX6DL_PAD_GPIO_2__KEY_ROW6                 0x224 0x5f4 0x8d0 0x2 0x1
-#define MX6DL_PAD_GPIO_2__GPIO1_IO02               0x224 0x5f4 0x000 0x5 0x0
-#define MX6DL_PAD_GPIO_2__SD2_WP                   0x224 0x5f4 0x000 0x6 0x0
-#define MX6DL_PAD_GPIO_2__MLB_DATA                 0x224 0x5f4 0x8e0 0x7 0x1
-#define MX6DL_PAD_GPIO_3__ESAI_RX_HF_CLK           0x228 0x5f8 0x834 0x0 0x1
-#define MX6DL_PAD_GPIO_3__I2C3_SCL                 0x228 0x5f8 0x878 0x2 0x1
-#define MX6DL_PAD_GPIO_3__XTALOSC_REF_CLK_24M      0x228 0x5f8 0x000 0x3 0x0
-#define MX6DL_PAD_GPIO_3__CCM_CLKO2                0x228 0x5f8 0x000 0x4 0x0
-#define MX6DL_PAD_GPIO_3__GPIO1_IO03               0x228 0x5f8 0x000 0x5 0x0
-#define MX6DL_PAD_GPIO_3__USB_H1_OC                0x228 0x5f8 0x924 0x6 0x1
-#define MX6DL_PAD_GPIO_3__MLB_CLK                  0x228 0x5f8 0x8dc 0x7 0x1
-#define MX6DL_PAD_GPIO_4__ESAI_TX_HF_CLK           0x22c 0x5fc 0x838 0x0 0x1
-#define MX6DL_PAD_GPIO_4__KEY_COL7                 0x22c 0x5fc 0x8c8 0x2 0x1
-#define MX6DL_PAD_GPIO_4__GPIO1_IO04               0x22c 0x5fc 0x000 0x5 0x0
-#define MX6DL_PAD_GPIO_4__SD2_CD_B                 0x22c 0x5fc 0x000 0x6 0x0
-#define MX6DL_PAD_GPIO_5__ESAI_TX2_RX3             0x230 0x600 0x84c 0x0 0x1
-#define MX6DL_PAD_GPIO_5__KEY_ROW7                 0x230 0x600 0x8d4 0x2 0x1
-#define MX6DL_PAD_GPIO_5__CCM_CLKO1                0x230 0x600 0x000 0x3 0x0
-#define MX6DL_PAD_GPIO_5__GPIO1_IO05               0x230 0x600 0x000 0x5 0x0
-#define MX6DL_PAD_GPIO_5__I2C3_SCL                 0x230 0x600 0x878 0x6 0x2
-#define MX6DL_PAD_GPIO_5__ARM_EVENTI               0x230 0x600 0x000 0x7 0x0
-#define MX6DL_PAD_GPIO_6__ESAI_TX_CLK              0x234 0x604 0x840 0x0 0x1
-#define MX6DL_PAD_GPIO_6__I2C3_SDA                 0x234 0x604 0x87c 0x2 0x2
-#define MX6DL_PAD_GPIO_6__GPIO1_IO06               0x234 0x604 0x000 0x5 0x0
-#define MX6DL_PAD_GPIO_6__SD2_LCTL                 0x234 0x604 0x000 0x6 0x0
-#define MX6DL_PAD_GPIO_6__MLB_SIG                  0x234 0x604 0x8e4 0x7 0x1
-#define MX6DL_PAD_GPIO_7__ESAI_TX4_RX1             0x238 0x608 0x854 0x0 0x1
-#define MX6DL_PAD_GPIO_7__EPIT1_OUT                0x238 0x608 0x000 0x2 0x0
-#define MX6DL_PAD_GPIO_7__FLEXCAN1_TX              0x238 0x608 0x000 0x3 0x0
-#define MX6DL_PAD_GPIO_7__UART2_TX_DATA            0x238 0x608 0x000 0x4 0x0
-#define MX6DL_PAD_GPIO_7__UART2_RX_DATA            0x238 0x608 0x904 0x4 0x2
-#define MX6DL_PAD_GPIO_7__GPIO1_IO07               0x238 0x608 0x000 0x5 0x0
-#define MX6DL_PAD_GPIO_7__SPDIF_LOCK               0x238 0x608 0x000 0x6 0x0
-#define MX6DL_PAD_GPIO_7__USB_OTG_HOST_MODE        0x238 0x608 0x000 0x7 0x0
-#define MX6DL_PAD_GPIO_7__I2C4_SCL                 0x238 0x608 0x880 0x8 0x1
-#define MX6DL_PAD_GPIO_8__ESAI_TX5_RX0             0x23c 0x60c 0x858 0x0 0x1
-#define MX6DL_PAD_GPIO_8__XTALOSC_REF_CLK_32K      0x23c 0x60c 0x000 0x1 0x0
-#define MX6DL_PAD_GPIO_8__EPIT2_OUT                0x23c 0x60c 0x000 0x2 0x0
-#define MX6DL_PAD_GPIO_8__FLEXCAN1_RX              0x23c 0x60c 0x7c8 0x3 0x0
-#define MX6DL_PAD_GPIO_8__UART2_RX_DATA            0x23c 0x60c 0x904 0x4 0x3
-#define MX6DL_PAD_GPIO_8__UART2_TX_DATA            0x23c 0x60c 0x000 0x4 0x0
-#define MX6DL_PAD_GPIO_8__GPIO1_IO08               0x23c 0x60c 0x000 0x5 0x0
-#define MX6DL_PAD_GPIO_8__SPDIF_SR_CLK             0x23c 0x60c 0x000 0x6 0x0
-#define MX6DL_PAD_GPIO_8__USB_OTG_PWR_CTL_WAKE     0x23c 0x60c 0x000 0x7 0x0
-#define MX6DL_PAD_GPIO_8__I2C4_SDA                 0x23c 0x60c 0x884 0x8 0x1
-#define MX6DL_PAD_GPIO_9__ESAI_RX_FS               0x240 0x610 0x82c 0x0 0x1
-#define MX6DL_PAD_GPIO_9__WDOG1_B                  0x240 0x610 0x000 0x1 0x0
-#define MX6DL_PAD_GPIO_9__KEY_COL6                 0x240 0x610 0x8c4 0x2 0x1
-#define MX6DL_PAD_GPIO_9__CCM_REF_EN_B             0x240 0x610 0x000 0x3 0x0
-#define MX6DL_PAD_GPIO_9__PWM1_OUT                 0x240 0x610 0x000 0x4 0x0
-#define MX6DL_PAD_GPIO_9__GPIO1_IO09               0x240 0x610 0x000 0x5 0x0
-#define MX6DL_PAD_GPIO_9__SD1_WP                   0x240 0x610 0x92c 0x6 0x1
-#define MX6DL_PAD_KEY_COL0__ECSPI1_SCLK            0x244 0x62c 0x7d8 0x0 0x3
-#define MX6DL_PAD_KEY_COL0__ENET_RX_DATA3          0x244 0x62c 0x824 0x1 0x0
-#define MX6DL_PAD_KEY_COL0__AUD5_TXC               0x244 0x62c 0x7c0 0x2 0x1
-#define MX6DL_PAD_KEY_COL0__KEY_COL0               0x244 0x62c 0x000 0x3 0x0
-#define MX6DL_PAD_KEY_COL0__UART4_TX_DATA          0x244 0x62c 0x000 0x4 0x0
-#define MX6DL_PAD_KEY_COL0__UART4_RX_DATA          0x244 0x62c 0x914 0x4 0x2
-#define MX6DL_PAD_KEY_COL0__GPIO4_IO06             0x244 0x62c 0x000 0x5 0x0
-#define MX6DL_PAD_KEY_COL0__DCIC1_OUT              0x244 0x62c 0x000 0x6 0x0
-#define MX6DL_PAD_KEY_COL1__ECSPI1_MISO            0x248 0x630 0x7dc 0x0 0x3
-#define MX6DL_PAD_KEY_COL1__ENET_MDIO              0x248 0x630 0x810 0x1 0x1
-#define MX6DL_PAD_KEY_COL1__AUD5_TXFS              0x248 0x630 0x7c4 0x2 0x1
-#define MX6DL_PAD_KEY_COL1__KEY_COL1               0x248 0x630 0x000 0x3 0x0
-#define MX6DL_PAD_KEY_COL1__UART5_TX_DATA          0x248 0x630 0x000 0x4 0x0
-#define MX6DL_PAD_KEY_COL1__UART5_RX_DATA          0x248 0x630 0x91c 0x4 0x2
-#define MX6DL_PAD_KEY_COL1__GPIO4_IO08             0x248 0x630 0x000 0x5 0x0
-#define MX6DL_PAD_KEY_COL1__SD1_VSELECT            0x248 0x630 0x000 0x6 0x0
-#define MX6DL_PAD_KEY_COL2__ECSPI1_SS1             0x24c 0x634 0x7e8 0x0 0x2
-#define MX6DL_PAD_KEY_COL2__ENET_RX_DATA2          0x24c 0x634 0x820 0x1 0x0
-#define MX6DL_PAD_KEY_COL2__FLEXCAN1_TX            0x24c 0x634 0x000 0x2 0x0
-#define MX6DL_PAD_KEY_COL2__KEY_COL2               0x24c 0x634 0x000 0x3 0x0
-#define MX6DL_PAD_KEY_COL2__ENET_MDC               0x24c 0x634 0x000 0x4 0x0
-#define MX6DL_PAD_KEY_COL2__GPIO4_IO10             0x24c 0x634 0x000 0x5 0x0
-#define MX6DL_PAD_KEY_COL2__USB_H1_PWR_CTL_WAKE    0x24c 0x634 0x000 0x6 0x0
-#define MX6DL_PAD_KEY_COL3__ECSPI1_SS3             0x250 0x638 0x7f0 0x0 0x1
-#define MX6DL_PAD_KEY_COL3__ENET_CRS               0x250 0x638 0x000 0x1 0x0
-#define MX6DL_PAD_KEY_COL3__HDMI_TX_DDC_SCL        0x250 0x638 0x860 0x2 0x1
-#define MX6DL_PAD_KEY_COL3__KEY_COL3               0x250 0x638 0x000 0x3 0x0
-#define MX6DL_PAD_KEY_COL3__I2C2_SCL               0x250 0x638 0x870 0x4 0x1
-#define MX6DL_PAD_KEY_COL3__GPIO4_IO12             0x250 0x638 0x000 0x5 0x0
-#define MX6DL_PAD_KEY_COL3__SPDIF_IN               0x250 0x638 0x8f0 0x6 0x3
-#define MX6DL_PAD_KEY_COL4__FLEXCAN2_TX            0x254 0x63c 0x000 0x0 0x0
-#define MX6DL_PAD_KEY_COL4__IPU1_SISG4             0x254 0x63c 0x000 0x1 0x0
-#define MX6DL_PAD_KEY_COL4__USB_OTG_OC             0x254 0x63c 0x920 0x2 0x1
-#define MX6DL_PAD_KEY_COL4__KEY_COL4               0x254 0x63c 0x000 0x3 0x0
-#define MX6DL_PAD_KEY_COL4__UART5_RTS_B            0x254 0x63c 0x918 0x4 0x2
-#define MX6DL_PAD_KEY_COL4__UART5_CTS_B            0x254 0x63c 0x000 0x4 0x0
-#define MX6DL_PAD_KEY_COL4__GPIO4_IO14             0x254 0x63c 0x000 0x5 0x0
-#define MX6DL_PAD_KEY_ROW0__ECSPI1_MOSI            0x258 0x640 0x7e0 0x0 0x3
-#define MX6DL_PAD_KEY_ROW0__ENET_TX_DATA3          0x258 0x640 0x000 0x1 0x0
-#define MX6DL_PAD_KEY_ROW0__AUD5_TXD               0x258 0x640 0x7b4 0x2 0x1
-#define MX6DL_PAD_KEY_ROW0__KEY_ROW0               0x258 0x640 0x000 0x3 0x0
-#define MX6DL_PAD_KEY_ROW0__UART4_RX_DATA          0x258 0x640 0x914 0x4 0x3
-#define MX6DL_PAD_KEY_ROW0__UART4_TX_DATA          0x258 0x640 0x000 0x4 0x0
-#define MX6DL_PAD_KEY_ROW0__GPIO4_IO07             0x258 0x640 0x000 0x5 0x0
-#define MX6DL_PAD_KEY_ROW0__DCIC2_OUT              0x258 0x640 0x000 0x6 0x0
-#define MX6DL_PAD_KEY_ROW1__ECSPI1_SS0             0x25c 0x644 0x7e4 0x0 0x3
-#define MX6DL_PAD_KEY_ROW1__ENET_COL               0x25c 0x644 0x000 0x1 0x0
-#define MX6DL_PAD_KEY_ROW1__AUD5_RXD               0x25c 0x644 0x7b0 0x2 0x1
-#define MX6DL_PAD_KEY_ROW1__KEY_ROW1               0x25c 0x644 0x000 0x3 0x0
-#define MX6DL_PAD_KEY_ROW1__UART5_RX_DATA          0x25c 0x644 0x91c 0x4 0x3
-#define MX6DL_PAD_KEY_ROW1__UART5_TX_DATA          0x25c 0x644 0x000 0x4 0x0
-#define MX6DL_PAD_KEY_ROW1__GPIO4_IO09             0x25c 0x644 0x000 0x5 0x0
-#define MX6DL_PAD_KEY_ROW1__SD2_VSELECT            0x25c 0x644 0x000 0x6 0x0
-#define MX6DL_PAD_KEY_ROW2__ECSPI1_SS2             0x260 0x648 0x7ec 0x0 0x1
-#define MX6DL_PAD_KEY_ROW2__ENET_TX_DATA2          0x260 0x648 0x000 0x1 0x0
-#define MX6DL_PAD_KEY_ROW2__FLEXCAN1_RX            0x260 0x648 0x7c8 0x2 0x1
-#define MX6DL_PAD_KEY_ROW2__KEY_ROW2               0x260 0x648 0x000 0x3 0x0
-#define MX6DL_PAD_KEY_ROW2__SD2_VSELECT            0x260 0x648 0x000 0x4 0x0
-#define MX6DL_PAD_KEY_ROW2__GPIO4_IO11             0x260 0x648 0x000 0x5 0x0
-#define MX6DL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE       0x260 0x648 0x85c 0x6 0x1
-#define MX6DL_PAD_KEY_ROW3__ASRC_EXT_CLK           0x264 0x64c 0x794 0x1 0x2
-#define MX6DL_PAD_KEY_ROW3__HDMI_TX_DDC_SDA        0x264 0x64c 0x864 0x2 0x1
-#define MX6DL_PAD_KEY_ROW3__KEY_ROW3               0x264 0x64c 0x000 0x3 0x0
-#define MX6DL_PAD_KEY_ROW3__I2C2_SDA               0x264 0x64c 0x874 0x4 0x1
-#define MX6DL_PAD_KEY_ROW3__GPIO4_IO13             0x264 0x64c 0x000 0x5 0x0
-#define MX6DL_PAD_KEY_ROW3__SD1_VSELECT            0x264 0x64c 0x000 0x6 0x0
-#define MX6DL_PAD_KEY_ROW4__FLEXCAN2_RX            0x268 0x650 0x7cc 0x0 0x0
-#define MX6DL_PAD_KEY_ROW4__IPU1_SISG5             0x268 0x650 0x000 0x1 0x0
-#define MX6DL_PAD_KEY_ROW4__USB_OTG_PWR            0x268 0x650 0x000 0x2 0x0
-#define MX6DL_PAD_KEY_ROW4__KEY_ROW4               0x268 0x650 0x000 0x3 0x0
-#define MX6DL_PAD_KEY_ROW4__UART5_CTS_B            0x268 0x650 0x000 0x4 0x0
-#define MX6DL_PAD_KEY_ROW4__UART5_RTS_B            0x268 0x650 0x918 0x4 0x3
-#define MX6DL_PAD_KEY_ROW4__GPIO4_IO15             0x268 0x650 0x000 0x5 0x0
-#define MX6DL_PAD_NANDF_ALE__NAND_ALE              0x26c 0x654 0x000 0x0 0x0
-#define MX6DL_PAD_NANDF_ALE__SD4_RESET             0x26c 0x654 0x000 0x1 0x0
-#define MX6DL_PAD_NANDF_ALE__GPIO6_IO08            0x26c 0x654 0x000 0x5 0x0
-#define MX6DL_PAD_NANDF_CLE__NAND_CLE              0x270 0x658 0x000 0x0 0x0
-#define MX6DL_PAD_NANDF_CLE__GPIO6_IO07            0x270 0x658 0x000 0x5 0x0
-#define MX6DL_PAD_NANDF_CS0__NAND_CE0_B            0x274 0x65c 0x000 0x0 0x0
-#define MX6DL_PAD_NANDF_CS0__GPIO6_IO11            0x274 0x65c 0x000 0x5 0x0
-#define MX6DL_PAD_NANDF_CS1__NAND_CE1_B            0x278 0x660 0x000 0x0 0x0
-#define MX6DL_PAD_NANDF_CS1__SD4_VSELECT           0x278 0x660 0x000 0x1 0x0
-#define MX6DL_PAD_NANDF_CS1__SD3_VSELECT           0x278 0x660 0x000 0x2 0x0
-#define MX6DL_PAD_NANDF_CS1__GPIO6_IO14            0x278 0x660 0x000 0x5 0x0
-#define MX6DL_PAD_NANDF_CS2__NAND_CE2_B            0x27c 0x664 0x000 0x0 0x0
-#define MX6DL_PAD_NANDF_CS2__IPU1_SISG0            0x27c 0x664 0x000 0x1 0x0
-#define MX6DL_PAD_NANDF_CS2__ESAI_TX0              0x27c 0x664 0x844 0x2 0x1
-#define MX6DL_PAD_NANDF_CS2__EIM_CRE               0x27c 0x664 0x000 0x3 0x0
-#define MX6DL_PAD_NANDF_CS2__CCM_CLKO2             0x27c 0x664 0x000 0x4 0x0
-#define MX6DL_PAD_NANDF_CS2__GPIO6_IO15            0x27c 0x664 0x000 0x5 0x0
-#define MX6DL_PAD_NANDF_CS3__NAND_CE3_B            0x280 0x668 0x000 0x0 0x0
-#define MX6DL_PAD_NANDF_CS3__IPU1_SISG1            0x280 0x668 0x000 0x1 0x0
-#define MX6DL_PAD_NANDF_CS3__ESAI_TX1              0x280 0x668 0x848 0x2 0x1
-#define MX6DL_PAD_NANDF_CS3__EIM_ADDR26            0x280 0x668 0x000 0x3 0x0
-#define MX6DL_PAD_NANDF_CS3__GPIO6_IO16            0x280 0x668 0x000 0x5 0x0
-#define MX6DL_PAD_NANDF_CS3__I2C4_SDA              0x280 0x668 0x884 0x9 0x2
-#define MX6DL_PAD_NANDF_D0__NAND_DATA00            0x284 0x66c 0x000 0x0 0x0
-#define MX6DL_PAD_NANDF_D0__SD1_DATA4              0x284 0x66c 0x000 0x1 0x0
-#define MX6DL_PAD_NANDF_D0__GPIO2_IO00             0x284 0x66c 0x000 0x5 0x0
-#define MX6DL_PAD_NANDF_D1__NAND_DATA01            0x288 0x670 0x000 0x0 0x0
-#define MX6DL_PAD_NANDF_D1__SD1_DATA5              0x288 0x670 0x000 0x1 0x0
-#define MX6DL_PAD_NANDF_D1__GPIO2_IO01             0x288 0x670 0x000 0x5 0x0
-#define MX6DL_PAD_NANDF_D2__NAND_DATA02            0x28c 0x674 0x000 0x0 0x0
-#define MX6DL_PAD_NANDF_D2__SD1_DATA6              0x28c 0x674 0x000 0x1 0x0
-#define MX6DL_PAD_NANDF_D2__GPIO2_IO02             0x28c 0x674 0x000 0x5 0x0
-#define MX6DL_PAD_NANDF_D3__NAND_DATA03            0x290 0x678 0x000 0x0 0x0
-#define MX6DL_PAD_NANDF_D3__SD1_DATA7              0x290 0x678 0x000 0x1 0x0
-#define MX6DL_PAD_NANDF_D3__GPIO2_IO03             0x290 0x678 0x000 0x5 0x0
-#define MX6DL_PAD_NANDF_D4__NAND_DATA04            0x294 0x67c 0x000 0x0 0x0
-#define MX6DL_PAD_NANDF_D4__SD2_DATA4              0x294 0x67c 0x000 0x1 0x0
-#define MX6DL_PAD_NANDF_D4__GPIO2_IO04             0x294 0x67c 0x000 0x5 0x0
-#define MX6DL_PAD_NANDF_D5__NAND_DATA05            0x298 0x680 0x000 0x0 0x0
-#define MX6DL_PAD_NANDF_D5__SD2_DATA5              0x298 0x680 0x000 0x1 0x0
-#define MX6DL_PAD_NANDF_D5__GPIO2_IO05             0x298 0x680 0x000 0x5 0x0
-#define MX6DL_PAD_NANDF_D6__NAND_DATA06            0x29c 0x684 0x000 0x0 0x0
-#define MX6DL_PAD_NANDF_D6__SD2_DATA6              0x29c 0x684 0x000 0x1 0x0
-#define MX6DL_PAD_NANDF_D6__GPIO2_IO06             0x29c 0x684 0x000 0x5 0x0
-#define MX6DL_PAD_NANDF_D7__NAND_DATA07            0x2a0 0x688 0x000 0x0 0x0
-#define MX6DL_PAD_NANDF_D7__SD2_DATA7              0x2a0 0x688 0x000 0x1 0x0
-#define MX6DL_PAD_NANDF_D7__GPIO2_IO07             0x2a0 0x688 0x000 0x5 0x0
-#define MX6DL_PAD_NANDF_RB0__NAND_READY_B          0x2a4 0x68c 0x000 0x0 0x0
-#define MX6DL_PAD_NANDF_RB0__GPIO6_IO10            0x2a4 0x68c 0x000 0x5 0x0
-#define MX6DL_PAD_NANDF_WP_B__NAND_WP_B            0x2a8 0x690 0x000 0x0 0x0
-#define MX6DL_PAD_NANDF_WP_B__GPIO6_IO09           0x2a8 0x690 0x000 0x5 0x0
-#define MX6DL_PAD_NANDF_WP_B__I2C4_SCL             0x2a8 0x690 0x880 0x9 0x2
-#define MX6DL_PAD_RGMII_RD0__HSI_RX_READY          0x2ac 0x694 0x000 0x0 0x0
-#define MX6DL_PAD_RGMII_RD0__RGMII_RD0             0x2ac 0x694 0x818 0x1 0x1
-#define MX6DL_PAD_RGMII_RD0__GPIO6_IO25            0x2ac 0x694 0x000 0x5 0x0
-#define MX6DL_PAD_RGMII_RD1__HSI_TX_FLAG           0x2b0 0x698 0x000 0x0 0x0
-#define MX6DL_PAD_RGMII_RD1__RGMII_RD1             0x2b0 0x698 0x81c 0x1 0x1
-#define MX6DL_PAD_RGMII_RD1__GPIO6_IO27            0x2b0 0x698 0x000 0x5 0x0
-#define MX6DL_PAD_RGMII_RD2__HSI_TX_DATA           0x2b4 0x69c 0x000 0x0 0x0
-#define MX6DL_PAD_RGMII_RD2__RGMII_RD2             0x2b4 0x69c 0x820 0x1 0x1
-#define MX6DL_PAD_RGMII_RD2__GPIO6_IO28            0x2b4 0x69c 0x000 0x5 0x0
-#define MX6DL_PAD_RGMII_RD3__HSI_TX_WAKE           0x2b8 0x6a0 0x000 0x0 0x0
-#define MX6DL_PAD_RGMII_RD3__RGMII_RD3             0x2b8 0x6a0 0x824 0x1 0x1
-#define MX6DL_PAD_RGMII_RD3__GPIO6_IO29            0x2b8 0x6a0 0x000 0x5 0x0
-#define MX6DL_PAD_RGMII_RX_CTL__USB_H3_DATA        0x2bc 0x6a4 0x000 0x0 0x0
-#define MX6DL_PAD_RGMII_RX_CTL__RGMII_RX_CTL       0x2bc 0x6a4 0x828 0x1 0x1
-#define MX6DL_PAD_RGMII_RX_CTL__GPIO6_IO24         0x2bc 0x6a4 0x000 0x5 0x0
-#define MX6DL_PAD_RGMII_RXC__USB_H3_STROBE         0x2c0 0x6a8 0x000 0x0 0x0
-#define MX6DL_PAD_RGMII_RXC__RGMII_RXC             0x2c0 0x6a8 0x814 0x1 0x1
-#define MX6DL_PAD_RGMII_RXC__GPIO6_IO30            0x2c0 0x6a8 0x000 0x5 0x0
-#define MX6DL_PAD_RGMII_TD0__HSI_TX_READY          0x2c4 0x6ac 0x000 0x0 0x0
-#define MX6DL_PAD_RGMII_TD0__RGMII_TD0             0x2c4 0x6ac 0x000 0x1 0x0
-#define MX6DL_PAD_RGMII_TD0__GPIO6_IO20            0x2c4 0x6ac 0x000 0x5 0x0
-#define MX6DL_PAD_RGMII_TD1__HSI_RX_FLAG           0x2c8 0x6b0 0x000 0x0 0x0
-#define MX6DL_PAD_RGMII_TD1__RGMII_TD1             0x2c8 0x6b0 0x000 0x1 0x0
-#define MX6DL_PAD_RGMII_TD1__GPIO6_IO21            0x2c8 0x6b0 0x000 0x5 0x0
-#define MX6DL_PAD_RGMII_TD2__HSI_RX_DATA           0x2cc 0x6b4 0x000 0x0 0x0
-#define MX6DL_PAD_RGMII_TD2__RGMII_TD2             0x2cc 0x6b4 0x000 0x1 0x0
-#define MX6DL_PAD_RGMII_TD2__GPIO6_IO22            0x2cc 0x6b4 0x000 0x5 0x0
-#define MX6DL_PAD_RGMII_TD3__HSI_RX_WAKE           0x2d0 0x6b8 0x000 0x0 0x0
-#define MX6DL_PAD_RGMII_TD3__RGMII_TD3             0x2d0 0x6b8 0x000 0x1 0x0
-#define MX6DL_PAD_RGMII_TD3__GPIO6_IO23            0x2d0 0x6b8 0x000 0x5 0x0
-#define MX6DL_PAD_RGMII_TX_CTL__USB_H2_STROBE      0x2d4 0x6bc 0x000 0x0 0x0
-#define MX6DL_PAD_RGMII_TX_CTL__RGMII_TX_CTL       0x2d4 0x6bc 0x000 0x1 0x0
-#define MX6DL_PAD_RGMII_TX_CTL__GPIO6_IO26         0x2d4 0x6bc 0x000 0x5 0x0
-#define MX6DL_PAD_RGMII_TX_CTL__ENET_REF_CLK       0x2d4 0x6bc 0x80c 0x7 0x1
-#define MX6DL_PAD_RGMII_TXC__USB_H2_DATA           0x2d8 0x6c0 0x000 0x0 0x0
-#define MX6DL_PAD_RGMII_TXC__RGMII_TXC             0x2d8 0x6c0 0x000 0x1 0x0
-#define MX6DL_PAD_RGMII_TXC__SPDIF_EXT_CLK         0x2d8 0x6c0 0x8f4 0x2 0x1
-#define MX6DL_PAD_RGMII_TXC__GPIO6_IO19            0x2d8 0x6c0 0x000 0x5 0x0
-#define MX6DL_PAD_RGMII_TXC__XTALOSC_REF_CLK_24M   0x2d8 0x6c0 0x000 0x7 0x0
-#define MX6DL_PAD_SD1_CLK__SD1_CLK                 0x2dc 0x6c4 0x928 0x0 0x1
-#define MX6DL_PAD_SD1_CLK__GPT_CLKIN               0x2dc 0x6c4 0x000 0x3 0x0
-#define MX6DL_PAD_SD1_CLK__GPIO1_IO20              0x2dc 0x6c4 0x000 0x5 0x0
-#define MX6DL_PAD_SD1_CMD__SD1_CMD                 0x2e0 0x6c8 0x000 0x0 0x0
-#define MX6DL_PAD_SD1_CMD__PWM4_OUT                0x2e0 0x6c8 0x000 0x2 0x0
-#define MX6DL_PAD_SD1_CMD__GPT_COMPARE1            0x2e0 0x6c8 0x000 0x3 0x0
-#define MX6DL_PAD_SD1_CMD__GPIO1_IO18              0x2e0 0x6c8 0x000 0x5 0x0
-#define MX6DL_PAD_SD1_DAT0__SD1_DATA0              0x2e4 0x6cc 0x000 0x0 0x0
-#define MX6DL_PAD_SD1_DAT0__GPT_CAPTURE1           0x2e4 0x6cc 0x000 0x3 0x0
-#define MX6DL_PAD_SD1_DAT0__GPIO1_IO16             0x2e4 0x6cc 0x000 0x5 0x0
-#define MX6DL_PAD_SD1_DAT1__SD1_DATA1              0x2e8 0x6d0 0x000 0x0 0x0
-#define MX6DL_PAD_SD1_DAT1__PWM3_OUT               0x2e8 0x6d0 0x000 0x2 0x0
-#define MX6DL_PAD_SD1_DAT1__GPT_CAPTURE2           0x2e8 0x6d0 0x000 0x3 0x0
-#define MX6DL_PAD_SD1_DAT1__GPIO1_IO17             0x2e8 0x6d0 0x000 0x5 0x0
-#define MX6DL_PAD_SD1_DAT2__SD1_DATA2              0x2ec 0x6d4 0x000 0x0 0x0
-#define MX6DL_PAD_SD1_DAT2__GPT_COMPARE2           0x2ec 0x6d4 0x000 0x2 0x0
-#define MX6DL_PAD_SD1_DAT2__PWM2_OUT               0x2ec 0x6d4 0x000 0x3 0x0
-#define MX6DL_PAD_SD1_DAT2__WDOG1_B                0x2ec 0x6d4 0x000 0x4 0x0
-#define MX6DL_PAD_SD1_DAT2__GPIO1_IO19             0x2ec 0x6d4 0x000 0x5 0x0
-#define MX6DL_PAD_SD1_DAT2__WDOG1_RESET_B_DEB      0x2ec 0x6d4 0x000 0x6 0x0
-#define MX6DL_PAD_SD1_DAT3__SD1_DATA3              0x2f0 0x6d8 0x000 0x0 0x0
-#define MX6DL_PAD_SD1_DAT3__GPT_COMPARE3           0x2f0 0x6d8 0x000 0x2 0x0
-#define MX6DL_PAD_SD1_DAT3__PWM1_OUT               0x2f0 0x6d8 0x000 0x3 0x0
-#define MX6DL_PAD_SD1_DAT3__WDOG2_B                0x2f0 0x6d8 0x000 0x4 0x0
-#define MX6DL_PAD_SD1_DAT3__GPIO1_IO21             0x2f0 0x6d8 0x000 0x5 0x0
-#define MX6DL_PAD_SD1_DAT3__WDOG2_RESET_B_DEB      0x2f0 0x6d8 0x000 0x6 0x0
-#define MX6DL_PAD_SD2_CLK__SD2_CLK                 0x2f4 0x6dc 0x930 0x0 0x1
-#define MX6DL_PAD_SD2_CLK__KEY_COL5                0x2f4 0x6dc 0x8c0 0x2 0x3
-#define MX6DL_PAD_SD2_CLK__AUD4_RXFS               0x2f4 0x6dc 0x7a4 0x3 0x1
-#define MX6DL_PAD_SD2_CLK__GPIO1_IO10              0x2f4 0x6dc 0x000 0x5 0x0
-#define MX6DL_PAD_SD2_CMD__SD2_CMD                 0x2f8 0x6e0 0x000 0x0 0x0
-#define MX6DL_PAD_SD2_CMD__KEY_ROW5                0x2f8 0x6e0 0x8cc 0x2 0x2
-#define MX6DL_PAD_SD2_CMD__AUD4_RXC                0x2f8 0x6e0 0x7a0 0x3 0x1
-#define MX6DL_PAD_SD2_CMD__GPIO1_IO11              0x2f8 0x6e0 0x000 0x5 0x0
-#define MX6DL_PAD_SD2_DAT0__SD2_DATA0              0x2fc 0x6e4 0x000 0x0 0x0
-#define MX6DL_PAD_SD2_DAT0__AUD4_RXD               0x2fc 0x6e4 0x798 0x3 0x1
-#define MX6DL_PAD_SD2_DAT0__KEY_ROW7               0x2fc 0x6e4 0x8d4 0x4 0x2
-#define MX6DL_PAD_SD2_DAT0__GPIO1_IO15             0x2fc 0x6e4 0x000 0x5 0x0
-#define MX6DL_PAD_SD2_DAT0__DCIC2_OUT              0x2fc 0x6e4 0x000 0x6 0x0
-#define MX6DL_PAD_SD2_DAT1__SD2_DATA1              0x300 0x6e8 0x000 0x0 0x0
-#define MX6DL_PAD_SD2_DAT1__EIM_CS2_B              0x300 0x6e8 0x000 0x2 0x0
-#define MX6DL_PAD_SD2_DAT1__AUD4_TXFS              0x300 0x6e8 0x7ac 0x3 0x1
-#define MX6DL_PAD_SD2_DAT1__KEY_COL7               0x300 0x6e8 0x8c8 0x4 0x2
-#define MX6DL_PAD_SD2_DAT1__GPIO1_IO14             0x300 0x6e8 0x000 0x5 0x0
-#define MX6DL_PAD_SD2_DAT2__SD2_DATA2              0x304 0x6ec 0x000 0x0 0x0
-#define MX6DL_PAD_SD2_DAT2__EIM_CS3_B              0x304 0x6ec 0x000 0x2 0x0
-#define MX6DL_PAD_SD2_DAT2__AUD4_TXD               0x304 0x6ec 0x79c 0x3 0x1
-#define MX6DL_PAD_SD2_DAT2__KEY_ROW6               0x304 0x6ec 0x8d0 0x4 0x2
-#define MX6DL_PAD_SD2_DAT2__GPIO1_IO13             0x304 0x6ec 0x000 0x5 0x0
-#define MX6DL_PAD_SD2_DAT3__SD2_DATA3              0x308 0x6f0 0x000 0x0 0x0
-#define MX6DL_PAD_SD2_DAT3__KEY_COL6               0x308 0x6f0 0x8c4 0x2 0x2
-#define MX6DL_PAD_SD2_DAT3__AUD4_TXC               0x308 0x6f0 0x7a8 0x3 0x1
-#define MX6DL_PAD_SD2_DAT3__GPIO1_IO12             0x308 0x6f0 0x000 0x5 0x0
-#define MX6DL_PAD_SD3_CLK__SD3_CLK                 0x30c 0x6f4 0x934 0x0 0x1
-#define MX6DL_PAD_SD3_CLK__UART2_RTS_B             0x30c 0x6f4 0x900 0x1 0x2
-#define MX6DL_PAD_SD3_CLK__UART2_CTS_B             0x30c 0x6f4 0x000 0x1 0x0
-#define MX6DL_PAD_SD3_CLK__FLEXCAN1_RX             0x30c 0x6f4 0x7c8 0x2 0x2
-#define MX6DL_PAD_SD3_CLK__GPIO7_IO03              0x30c 0x6f4 0x000 0x5 0x0
-#define MX6DL_PAD_SD3_CMD__SD3_CMD                 0x310 0x6f8 0x000 0x0 0x0
-#define MX6DL_PAD_SD3_CMD__UART2_CTS_B             0x310 0x6f8 0x000 0x1 0x0
-#define MX6DL_PAD_SD3_CMD__UART2_RTS_B             0x310 0x6f8 0x900 0x1 0x3
-#define MX6DL_PAD_SD3_CMD__FLEXCAN1_TX             0x310 0x6f8 0x000 0x2 0x0
-#define MX6DL_PAD_SD3_CMD__GPIO7_IO02              0x310 0x6f8 0x000 0x5 0x0
-#define MX6DL_PAD_SD3_DAT0__SD3_DATA0              0x314 0x6fc 0x000 0x0 0x0
-#define MX6DL_PAD_SD3_DAT0__UART1_CTS_B            0x314 0x6fc 0x000 0x1 0x0
-#define MX6DL_PAD_SD3_DAT0__UART1_RTS_B            0x314 0x6fc 0x8f8 0x1 0x2
-#define MX6DL_PAD_SD3_DAT0__FLEXCAN2_TX            0x314 0x6fc 0x000 0x2 0x0
-#define MX6DL_PAD_SD3_DAT0__GPIO7_IO04             0x314 0x6fc 0x000 0x5 0x0
-#define MX6DL_PAD_SD3_DAT1__SD3_DATA1              0x318 0x700 0x000 0x0 0x0
-#define MX6DL_PAD_SD3_DAT1__UART1_RTS_B            0x318 0x700 0x8f8 0x1 0x3
-#define MX6DL_PAD_SD3_DAT1__UART1_CTS_B            0x318 0x700 0x000 0x1 0x0
-#define MX6DL_PAD_SD3_DAT1__FLEXCAN2_RX            0x318 0x700 0x7cc 0x2 0x1
-#define MX6DL_PAD_SD3_DAT1__GPIO7_IO05             0x318 0x700 0x000 0x5 0x0
-#define MX6DL_PAD_SD3_DAT2__SD3_DATA2              0x31c 0x704 0x000 0x0 0x0
-#define MX6DL_PAD_SD3_DAT2__GPIO7_IO06             0x31c 0x704 0x000 0x5 0x0
-#define MX6DL_PAD_SD3_DAT3__SD3_DATA3              0x320 0x708 0x000 0x0 0x0
-#define MX6DL_PAD_SD3_DAT3__UART3_CTS_B            0x320 0x708 0x000 0x1 0x0
-#define MX6DL_PAD_SD3_DAT3__UART3_RTS_B            0x320 0x708 0x908 0x1 0x4
-#define MX6DL_PAD_SD3_DAT3__GPIO7_IO07             0x320 0x708 0x000 0x5 0x0
-#define MX6DL_PAD_SD3_DAT4__SD3_DATA4              0x324 0x70c 0x000 0x0 0x0
-#define MX6DL_PAD_SD3_DAT4__UART2_RX_DATA          0x324 0x70c 0x904 0x1 0x4
-#define MX6DL_PAD_SD3_DAT4__UART2_TX_DATA          0x324 0x70c 0x000 0x1 0x0
-#define MX6DL_PAD_SD3_DAT4__GPIO7_IO01             0x324 0x70c 0x000 0x5 0x0
-#define MX6DL_PAD_SD3_DAT5__SD3_DATA5              0x328 0x710 0x000 0x0 0x0
-#define MX6DL_PAD_SD3_DAT5__UART2_TX_DATA          0x328 0x710 0x000 0x1 0x0
-#define MX6DL_PAD_SD3_DAT5__UART2_RX_DATA          0x328 0x710 0x904 0x1 0x5
-#define MX6DL_PAD_SD3_DAT5__GPIO7_IO00             0x328 0x710 0x000 0x5 0x0
-#define MX6DL_PAD_SD3_DAT6__SD3_DATA6              0x32c 0x714 0x000 0x0 0x0
-#define MX6DL_PAD_SD3_DAT6__UART1_RX_DATA          0x32c 0x714 0x8fc 0x1 0x2
-#define MX6DL_PAD_SD3_DAT6__UART1_TX_DATA          0x32c 0x714 0x000 0x1 0x0
-#define MX6DL_PAD_SD3_DAT6__GPIO6_IO18             0x32c 0x714 0x000 0x5 0x0
-#define MX6DL_PAD_SD3_DAT7__SD3_DATA7              0x330 0x718 0x000 0x0 0x0
-#define MX6DL_PAD_SD3_DAT7__UART1_TX_DATA          0x330 0x718 0x000 0x1 0x0
-#define MX6DL_PAD_SD3_DAT7__UART1_RX_DATA          0x330 0x718 0x8fc 0x1 0x3
-#define MX6DL_PAD_SD3_DAT7__GPIO6_IO17             0x330 0x718 0x000 0x5 0x0
-#define MX6DL_PAD_SD3_RST__SD3_RESET               0x334 0x71c 0x000 0x0 0x0
-#define MX6DL_PAD_SD3_RST__UART3_RTS_B             0x334 0x71c 0x908 0x1 0x5
-#define MX6DL_PAD_SD3_RST__UART3_CTS_B             0x334 0x71c 0x000 0x1 0x0
-#define MX6DL_PAD_SD3_RST__GPIO7_IO08              0x334 0x71c 0x000 0x5 0x0
-#define MX6DL_PAD_SD4_CLK__SD4_CLK                 0x338 0x720 0x938 0x0 0x1
-#define MX6DL_PAD_SD4_CLK__NAND_WE_B               0x338 0x720 0x000 0x1 0x0
-#define MX6DL_PAD_SD4_CLK__UART3_RX_DATA           0x338 0x720 0x90c 0x2 0x2
-#define MX6DL_PAD_SD4_CLK__UART3_TX_DATA           0x338 0x720 0x000 0x2 0x0
-#define MX6DL_PAD_SD4_CLK__GPIO7_IO10              0x338 0x720 0x000 0x5 0x0
-#define MX6DL_PAD_SD4_CMD__SD4_CMD                 0x33c 0x724 0x000 0x0 0x0
-#define MX6DL_PAD_SD4_CMD__NAND_RE_B               0x33c 0x724 0x000 0x1 0x0
-#define MX6DL_PAD_SD4_CMD__UART3_TX_DATA           0x33c 0x724 0x000 0x2 0x0
-#define MX6DL_PAD_SD4_CMD__UART3_RX_DATA           0x33c 0x724 0x90c 0x2 0x3
-#define MX6DL_PAD_SD4_CMD__GPIO7_IO09              0x33c 0x724 0x000 0x5 0x0
-#define MX6DL_PAD_SD4_DAT0__SD4_DATA0              0x340 0x728 0x000 0x1 0x0
-#define MX6DL_PAD_SD4_DAT0__NAND_DQS               0x340 0x728 0x000 0x2 0x0
-#define MX6DL_PAD_SD4_DAT0__GPIO2_IO08             0x340 0x728 0x000 0x5 0x0
-#define MX6DL_PAD_SD4_DAT1__SD4_DATA1              0x344 0x72c 0x000 0x1 0x0
-#define MX6DL_PAD_SD4_DAT1__PWM3_OUT               0x344 0x72c 0x000 0x2 0x0
-#define MX6DL_PAD_SD4_DAT1__GPIO2_IO09             0x344 0x72c 0x000 0x5 0x0
-#define MX6DL_PAD_SD4_DAT2__SD4_DATA2              0x348 0x730 0x000 0x1 0x0
-#define MX6DL_PAD_SD4_DAT2__PWM4_OUT               0x348 0x730 0x000 0x2 0x0
-#define MX6DL_PAD_SD4_DAT2__GPIO2_IO10             0x348 0x730 0x000 0x5 0x0
-#define MX6DL_PAD_SD4_DAT3__SD4_DATA3              0x34c 0x734 0x000 0x1 0x0
-#define MX6DL_PAD_SD4_DAT3__GPIO2_IO11             0x34c 0x734 0x000 0x5 0x0
-#define MX6DL_PAD_SD4_DAT4__SD4_DATA4              0x350 0x738 0x000 0x1 0x0
-#define MX6DL_PAD_SD4_DAT4__UART2_RX_DATA          0x350 0x738 0x904 0x2 0x6
-#define MX6DL_PAD_SD4_DAT4__UART2_TX_DATA          0x350 0x738 0x000 0x2 0x0
-#define MX6DL_PAD_SD4_DAT4__GPIO2_IO12             0x350 0x738 0x000 0x5 0x0
-#define MX6DL_PAD_SD4_DAT5__SD4_DATA5              0x354 0x73c 0x000 0x1 0x0
-#define MX6DL_PAD_SD4_DAT5__UART2_RTS_B            0x354 0x73c 0x900 0x2 0x4
-#define MX6DL_PAD_SD4_DAT5__UART2_CTS_B            0x354 0x73c 0x000 0x2 0x0
-#define MX6DL_PAD_SD4_DAT5__GPIO2_IO13             0x354 0x73c 0x000 0x5 0x0
-#define MX6DL_PAD_SD4_DAT6__SD4_DATA6              0x358 0x740 0x000 0x1 0x0
-#define MX6DL_PAD_SD4_DAT6__UART2_CTS_B            0x358 0x740 0x000 0x2 0x0
-#define MX6DL_PAD_SD4_DAT6__UART2_RTS_B            0x358 0x740 0x900 0x2 0x5
-#define MX6DL_PAD_SD4_DAT6__GPIO2_IO14             0x358 0x740 0x000 0x5 0x0
-#define MX6DL_PAD_SD4_DAT7__SD4_DATA7              0x35c 0x744 0x000 0x1 0x0
-#define MX6DL_PAD_SD4_DAT7__UART2_TX_DATA          0x35c 0x744 0x000 0x2 0x0
-#define MX6DL_PAD_SD4_DAT7__UART2_RX_DATA          0x35c 0x744 0x904 0x2 0x7
-#define MX6DL_PAD_SD4_DAT7__GPIO2_IO15             0x35c 0x744 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT10__IPU1_CSI0_DATA10     0x04c 0x360 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT10__AUD3_RXC             0x04c 0x360 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT10__ECSPI2_MISO          0x04c 0x360 0x7f8 0x2 0x0
+#define MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA        0x04c 0x360 0x000 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT10__UART1_RX_DATA        0x04c 0x360 0x8fc 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT10__GPIO5_IO28           0x04c 0x360 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT10__ARM_TRACE07          0x04c 0x360 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT11__IPU1_CSI0_DATA11     0x050 0x364 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT11__AUD3_RXFS            0x050 0x364 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT11__ECSPI2_SS0           0x050 0x364 0x800 0x2 0x0
+#define MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA        0x050 0x364 0x8fc 0x3 0x1
+#define MX6QDL_PAD_CSI0_DAT11__UART1_TX_DATA        0x050 0x364 0x000 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT11__GPIO5_IO29           0x050 0x364 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT11__ARM_TRACE08          0x050 0x364 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT12__IPU1_CSI0_DATA12     0x054 0x368 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT12__EIM_DATA08           0x054 0x368 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA        0x054 0x368 0x000 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT12__UART4_RX_DATA        0x054 0x368 0x914 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT12__GPIO5_IO30           0x054 0x368 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT12__ARM_TRACE09          0x054 0x368 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT13__IPU1_CSI0_DATA13     0x058 0x36c 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT13__EIM_DATA09           0x058 0x36c 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA        0x058 0x36c 0x914 0x3 0x1
+#define MX6QDL_PAD_CSI0_DAT13__UART4_TX_DATA        0x058 0x36c 0x000 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT13__GPIO5_IO31           0x058 0x36c 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT13__ARM_TRACE10          0x058 0x36c 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT14__IPU1_CSI0_DATA14     0x05c 0x370 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT14__EIM_DATA10           0x05c 0x370 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT14__UART5_TX_DATA        0x05c 0x370 0x000 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT14__UART5_RX_DATA        0x05c 0x370 0x91c 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT14__GPIO6_IO00           0x05c 0x370 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT14__ARM_TRACE11          0x05c 0x370 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT15__IPU1_CSI0_DATA15     0x060 0x374 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT15__EIM_DATA11           0x060 0x374 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT15__UART5_RX_DATA        0x060 0x374 0x91c 0x3 0x1
+#define MX6QDL_PAD_CSI0_DAT15__UART5_TX_DATA        0x060 0x374 0x000 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT15__GPIO6_IO01           0x060 0x374 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT15__ARM_TRACE12          0x060 0x374 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT16__IPU1_CSI0_DATA16     0x064 0x378 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT16__EIM_DATA12           0x064 0x378 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT16__UART4_RTS_B          0x064 0x378 0x910 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT16__UART4_CTS_B          0x064 0x378 0x000 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT16__GPIO6_IO02           0x064 0x378 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT16__ARM_TRACE13          0x064 0x378 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT17__IPU1_CSI0_DATA17     0x068 0x37c 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT17__EIM_DATA13           0x068 0x37c 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT17__UART4_CTS_B          0x068 0x37c 0x000 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT17__UART4_RTS_B          0x068 0x37c 0x910 0x3 0x1
+#define MX6QDL_PAD_CSI0_DAT17__GPIO6_IO03           0x068 0x37c 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT17__ARM_TRACE14          0x068 0x37c 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT18__IPU1_CSI0_DATA18     0x06c 0x380 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT18__EIM_DATA14           0x06c 0x380 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT18__UART5_RTS_B          0x06c 0x380 0x918 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT18__UART5_CTS_B          0x06c 0x380 0x000 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT18__GPIO6_IO04           0x06c 0x380 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT18__ARM_TRACE15          0x06c 0x380 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT19__IPU1_CSI0_DATA19     0x070 0x384 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT19__EIM_DATA15           0x070 0x384 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT19__UART5_CTS_B          0x070 0x384 0x000 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT19__UART5_RTS_B          0x070 0x384 0x918 0x3 0x1
+#define MX6QDL_PAD_CSI0_DAT19__GPIO6_IO05           0x070 0x384 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT4__IPU1_CSI0_DATA04      0x074 0x388 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT4__EIM_DATA02            0x074 0x388 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT4__ECSPI1_SCLK           0x074 0x388 0x7d8 0x2 0x0
+#define MX6QDL_PAD_CSI0_DAT4__KEY_COL5              0x074 0x388 0x8c0 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT4__AUD3_TXC              0x074 0x388 0x000 0x4 0x0
+#define MX6QDL_PAD_CSI0_DAT4__GPIO5_IO22            0x074 0x388 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT4__ARM_TRACE01           0x074 0x388 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT5__IPU1_CSI0_DATA05      0x078 0x38c 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT5__EIM_DATA03            0x078 0x38c 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT5__ECSPI1_MOSI           0x078 0x38c 0x7e0 0x2 0x0
+#define MX6QDL_PAD_CSI0_DAT5__KEY_ROW5              0x078 0x38c 0x8cc 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT5__AUD3_TXD              0x078 0x38c 0x000 0x4 0x0
+#define MX6QDL_PAD_CSI0_DAT5__GPIO5_IO23            0x078 0x38c 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT5__ARM_TRACE02           0x078 0x38c 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT6__IPU1_CSI0_DATA06      0x07c 0x390 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT6__EIM_DATA04            0x07c 0x390 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT6__ECSPI1_MISO           0x07c 0x390 0x7dc 0x2 0x0
+#define MX6QDL_PAD_CSI0_DAT6__KEY_COL6              0x07c 0x390 0x8c4 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS             0x07c 0x390 0x000 0x4 0x0
+#define MX6QDL_PAD_CSI0_DAT6__GPIO5_IO24            0x07c 0x390 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT6__ARM_TRACE03           0x07c 0x390 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT7__IPU1_CSI0_DATA07      0x080 0x394 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT7__EIM_DATA05            0x080 0x394 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT7__ECSPI1_SS0            0x080 0x394 0x7e4 0x2 0x0
+#define MX6QDL_PAD_CSI0_DAT7__KEY_ROW6              0x080 0x394 0x8d0 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT7__AUD3_RXD              0x080 0x394 0x000 0x4 0x0
+#define MX6QDL_PAD_CSI0_DAT7__GPIO5_IO25            0x080 0x394 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT7__ARM_TRACE04           0x080 0x394 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT8__IPU1_CSI0_DATA08      0x084 0x398 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT8__EIM_DATA06            0x084 0x398 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT8__ECSPI2_SCLK           0x084 0x398 0x7f4 0x2 0x0
+#define MX6QDL_PAD_CSI0_DAT8__KEY_COL7              0x084 0x398 0x8c8 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT8__I2C1_SDA              0x084 0x398 0x86c 0x4 0x0
+#define MX6QDL_PAD_CSI0_DAT8__GPIO5_IO26            0x084 0x398 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT8__ARM_TRACE05           0x084 0x398 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT9__IPU1_CSI0_DATA09      0x088 0x39c 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT9__EIM_DATA07            0x088 0x39c 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT9__ECSPI2_MOSI           0x088 0x39c 0x7fc 0x2 0x0
+#define MX6QDL_PAD_CSI0_DAT9__KEY_ROW7              0x088 0x39c 0x8d4 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT9__I2C1_SCL              0x088 0x39c 0x868 0x4 0x0
+#define MX6QDL_PAD_CSI0_DAT9__GPIO5_IO27            0x088 0x39c 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT9__ARM_TRACE06           0x088 0x39c 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DATA_EN__IPU1_CSI0_DATA_EN  0x08c 0x3a0 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DATA_EN__EIM_DATA00         0x08c 0x3a0 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DATA_EN__GPIO5_IO20         0x08c 0x3a0 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DATA_EN__ARM_TRACE_CLK      0x08c 0x3a0 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_MCLK__IPU1_CSI0_HSYNC       0x090 0x3a4 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_MCLK__CCM_CLKO1             0x090 0x3a4 0x000 0x3 0x0
+#define MX6QDL_PAD_CSI0_MCLK__GPIO5_IO19            0x090 0x3a4 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_MCLK__ARM_TRACE_CTL         0x090 0x3a4 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_PIXCLK__IPU1_CSI0_PIXCLK    0x094 0x3a8 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_PIXCLK__GPIO5_IO18          0x094 0x3a8 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_PIXCLK__ARM_EVENTO          0x094 0x3a8 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_VSYNC__IPU1_CSI0_VSYNC      0x098 0x3ac 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_VSYNC__EIM_DATA01           0x098 0x3ac 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_VSYNC__GPIO5_IO21           0x098 0x3ac 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_VSYNC__ARM_TRACE00          0x098 0x3ac 0x000 0x7 0x0
+#define MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK  0x09c 0x3b0 0x000 0x0 0x0
+#define MX6QDL_PAD_DI0_DISP_CLK__LCD_CLK            0x09c 0x3b0 0x000 0x1 0x0
+#define MX6QDL_PAD_DI0_DISP_CLK__GPIO4_IO16         0x09c 0x3b0 0x000 0x5 0x0
+#define MX6QDL_PAD_DI0_DISP_CLK__LCD_WR_RWN         0x09c 0x3b0 0x000 0x8 0x0
+#define MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15        0x0a0 0x3b4 0x000 0x0 0x0
+#define MX6QDL_PAD_DI0_PIN15__LCD_ENABLE            0x0a0 0x3b4 0x000 0x1 0x0
+#define MX6QDL_PAD_DI0_PIN15__AUD6_TXC              0x0a0 0x3b4 0x000 0x2 0x0
+#define MX6QDL_PAD_DI0_PIN15__GPIO4_IO17            0x0a0 0x3b4 0x000 0x5 0x0
+#define MX6QDL_PAD_DI0_PIN15__LCD_RD_E              0x0a0 0x3b4 0x000 0x8 0x0
+#define MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02         0x0a4 0x3b8 0x000 0x0 0x0
+#define MX6QDL_PAD_DI0_PIN2__LCD_HSYNC              0x0a4 0x3b8 0x8d8 0x1 0x0
+#define MX6QDL_PAD_DI0_PIN2__AUD6_TXD               0x0a4 0x3b8 0x000 0x2 0x0
+#define MX6QDL_PAD_DI0_PIN2__GPIO4_IO18             0x0a4 0x3b8 0x000 0x5 0x0
+#define MX6QDL_PAD_DI0_PIN2__LCD_RS                 0x0a4 0x3b8 0x000 0x8 0x0
+#define MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03         0x0a8 0x3bc 0x000 0x0 0x0
+#define MX6QDL_PAD_DI0_PIN3__LCD_VSYNC              0x0a8 0x3bc 0x000 0x1 0x0
+#define MX6QDL_PAD_DI0_PIN3__AUD6_TXFS              0x0a8 0x3bc 0x000 0x2 0x0
+#define MX6QDL_PAD_DI0_PIN3__GPIO4_IO19             0x0a8 0x3bc 0x000 0x5 0x0
+#define MX6QDL_PAD_DI0_PIN3__LCD_CS                 0x0a8 0x3bc 0x000 0x8 0x0
+#define MX6QDL_PAD_DI0_PIN4__IPU1_DI0_PIN04         0x0ac 0x3c0 0x000 0x0 0x0
+#define MX6QDL_PAD_DI0_PIN4__LCD_BUSY               0x0ac 0x3c0 0x8d8 0x1 0x1
+#define MX6QDL_PAD_DI0_PIN4__AUD6_RXD               0x0ac 0x3c0 0x000 0x2 0x0
+#define MX6QDL_PAD_DI0_PIN4__SD1_WP                 0x0ac 0x3c0 0x92c 0x3 0x0
+#define MX6QDL_PAD_DI0_PIN4__GPIO4_IO20             0x0ac 0x3c0 0x000 0x5 0x0
+#define MX6QDL_PAD_DI0_PIN4__LCD_RESET              0x0ac 0x3c0 0x000 0x8 0x0
+#define MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00    0x0b0 0x3c4 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT0__LCD_DATA00           0x0b0 0x3c4 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT0__ECSPI3_SCLK          0x0b0 0x3c4 0x000 0x2 0x0
+#define MX6QDL_PAD_DISP0_DAT0__GPIO4_IO21           0x0b0 0x3c4 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01    0x0b4 0x3c8 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT1__LCD_DATA01           0x0b4 0x3c8 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT1__ECSPI3_MOSI          0x0b4 0x3c8 0x000 0x2 0x0
+#define MX6QDL_PAD_DISP0_DAT1__GPIO4_IO22           0x0b4 0x3c8 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10   0x0b8 0x3cc 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT10__LCD_DATA10          0x0b8 0x3cc 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT10__GPIO4_IO31          0x0b8 0x3cc 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11   0x0bc 0x3d0 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT11__LCD_DATA11          0x0bc 0x3d0 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT11__GPIO5_IO05          0x0bc 0x3d0 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12   0x0c0 0x3d4 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT12__LCD_DATA12          0x0c0 0x3d4 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT12__GPIO5_IO06          0x0c0 0x3d4 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13   0x0c4 0x3d8 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT13__LCD_DATA13          0x0c4 0x3d8 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT13__AUD5_RXFS           0x0c4 0x3d8 0x7bc 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT13__GPIO5_IO07          0x0c4 0x3d8 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14   0x0c8 0x3dc 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT14__LCD_DATA14          0x0c8 0x3dc 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT14__AUD5_RXC            0x0c8 0x3dc 0x7b8 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT14__GPIO5_IO08          0x0c8 0x3dc 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15   0x0cc 0x3e0 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT15__LCD_DATA15          0x0cc 0x3e0 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT15__ECSPI1_SS1          0x0cc 0x3e0 0x7e8 0x2 0x0
+#define MX6QDL_PAD_DISP0_DAT15__ECSPI2_SS1          0x0cc 0x3e0 0x804 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT15__GPIO5_IO09          0x0cc 0x3e0 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16   0x0d0 0x3e4 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT16__LCD_DATA16          0x0d0 0x3e4 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT16__ECSPI2_MOSI         0x0d0 0x3e4 0x7fc 0x2 0x1
+#define MX6QDL_PAD_DISP0_DAT16__AUD5_TXC            0x0d0 0x3e4 0x7c0 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT16__SDMA_EXT_EVENT0     0x0d0 0x3e4 0x8e8 0x4 0x0
+#define MX6QDL_PAD_DISP0_DAT16__GPIO5_IO10          0x0d0 0x3e4 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17   0x0d4 0x3e8 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT17__LCD_DATA17          0x0d4 0x3e8 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT17__ECSPI2_MISO         0x0d4 0x3e8 0x7f8 0x2 0x1
+#define MX6QDL_PAD_DISP0_DAT17__AUD5_TXD            0x0d4 0x3e8 0x7b4 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT17__SDMA_EXT_EVENT1     0x0d4 0x3e8 0x8ec 0x4 0x0
+#define MX6QDL_PAD_DISP0_DAT17__GPIO5_IO11          0x0d4 0x3e8 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT18__IPU1_DISP0_DATA18   0x0d8 0x3ec 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT18__LCD_DATA18          0x0d8 0x3ec 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT18__ECSPI2_SS0          0x0d8 0x3ec 0x800 0x2 0x1
+#define MX6QDL_PAD_DISP0_DAT18__AUD5_TXFS           0x0d8 0x3ec 0x7c4 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT18__AUD4_RXFS           0x0d8 0x3ec 0x7a4 0x4 0x0
+#define MX6QDL_PAD_DISP0_DAT18__GPIO5_IO12          0x0d8 0x3ec 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT18__EIM_CS2_B           0x0d8 0x3ec 0x000 0x7 0x0
+#define MX6QDL_PAD_DISP0_DAT19__IPU1_DISP0_DATA19   0x0dc 0x3f0 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT19__LCD_DATA19          0x0dc 0x3f0 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT19__ECSPI2_SCLK         0x0dc 0x3f0 0x7f4 0x2 0x1
+#define MX6QDL_PAD_DISP0_DAT19__AUD5_RXD            0x0dc 0x3f0 0x7b0 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT19__AUD4_RXC            0x0dc 0x3f0 0x7a0 0x4 0x0
+#define MX6QDL_PAD_DISP0_DAT19__GPIO5_IO13          0x0dc 0x3f0 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT19__EIM_CS3_B           0x0dc 0x3f0 0x000 0x7 0x0
+#define MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02    0x0e0 0x3f4 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT2__LCD_DATA02           0x0e0 0x3f4 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT2__ECSPI3_MISO          0x0e0 0x3f4 0x000 0x2 0x0
+#define MX6QDL_PAD_DISP0_DAT2__GPIO4_IO23           0x0e0 0x3f4 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT20__IPU1_DISP0_DATA20   0x0e4 0x3f8 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT20__LCD_DATA20          0x0e4 0x3f8 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT20__ECSPI1_SCLK         0x0e4 0x3f8 0x7d8 0x2 0x1
+#define MX6QDL_PAD_DISP0_DAT20__AUD4_TXC            0x0e4 0x3f8 0x7a8 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT20__GPIO5_IO14          0x0e4 0x3f8 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT21__IPU1_DISP0_DATA21   0x0e8 0x3fc 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT21__LCD_DATA21          0x0e8 0x3fc 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT21__ECSPI1_MOSI         0x0e8 0x3fc 0x7e0 0x2 0x1
+#define MX6QDL_PAD_DISP0_DAT21__AUD4_TXD            0x0e8 0x3fc 0x79c 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15          0x0e8 0x3fc 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT22__IPU1_DISP0_DATA22   0x0ec 0x400 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT22__LCD_DATA22          0x0ec 0x400 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT22__ECSPI1_MISO         0x0ec 0x400 0x7dc 0x2 0x1
+#define MX6QDL_PAD_DISP0_DAT22__AUD4_TXFS           0x0ec 0x400 0x7ac 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT22__GPIO5_IO16          0x0ec 0x400 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT23__IPU1_DISP0_DATA23   0x0f0 0x404 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT23__LCD_DATA23          0x0f0 0x404 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT23__ECSPI1_SS0          0x0f0 0x404 0x7e4 0x2 0x1
+#define MX6QDL_PAD_DISP0_DAT23__AUD4_RXD            0x0f0 0x404 0x798 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17          0x0f0 0x404 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03    0x0f4 0x408 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT3__LCD_DATA03           0x0f4 0x408 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT3__ECSPI3_SS0           0x0f4 0x408 0x000 0x2 0x0
+#define MX6QDL_PAD_DISP0_DAT3__GPIO4_IO24           0x0f4 0x408 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04    0x0f8 0x40c 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT4__LCD_DATA04           0x0f8 0x40c 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT4__ECSPI3_SS1           0x0f8 0x40c 0x000 0x2 0x0
+#define MX6QDL_PAD_DISP0_DAT4__GPIO4_IO25           0x0f8 0x40c 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05    0x0fc 0x410 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT5__LCD_DATA05           0x0fc 0x410 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT5__ECSPI3_SS2           0x0fc 0x410 0x000 0x2 0x0
+#define MX6QDL_PAD_DISP0_DAT5__AUD6_RXFS            0x0fc 0x410 0x000 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT5__GPIO4_IO26           0x0fc 0x410 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06    0x100 0x414 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT6__LCD_DATA06           0x100 0x414 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT6__ECSPI3_SS3           0x100 0x414 0x000 0x2 0x0
+#define MX6QDL_PAD_DISP0_DAT6__AUD6_RXC             0x100 0x414 0x000 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT6__GPIO4_IO27           0x100 0x414 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07    0x104 0x418 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT7__LCD_DATA07           0x104 0x418 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT7__ECSPI3_RDY           0x104 0x418 0x000 0x2 0x0
+#define MX6QDL_PAD_DISP0_DAT7__GPIO4_IO28           0x104 0x418 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08    0x108 0x41c 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT8__LCD_DATA08           0x108 0x41c 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT8__PWM1_OUT             0x108 0x41c 0x000 0x2 0x0
+#define MX6QDL_PAD_DISP0_DAT8__WDOG1_B              0x108 0x41c 0x000 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT8__GPIO4_IO29           0x108 0x41c 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09    0x10c 0x420 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT9__LCD_DATA09           0x10c 0x420 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT9__PWM2_OUT             0x10c 0x420 0x000 0x2 0x0
+#define MX6QDL_PAD_DISP0_DAT9__WDOG2_B              0x10c 0x420 0x000 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT9__GPIO4_IO30           0x10c 0x420 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_A16__EIM_ADDR16              0x110 0x4e0 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_A16__IPU1_DI1_DISP_CLK       0x110 0x4e0 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_A16__IPU1_CSI1_PIXCLK        0x110 0x4e0 0x8b8 0x2 0x0
+#define MX6QDL_PAD_EIM_A16__GPIO2_IO22              0x110 0x4e0 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_A16__SRC_BOOT_CFG16          0x110 0x4e0 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_A16__EPDC_DATA00             0x110 0x4e0 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_A17__EIM_ADDR17              0x114 0x4e4 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_A17__IPU1_DISP1_DATA12       0x114 0x4e4 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_A17__IPU1_CSI1_DATA12        0x114 0x4e4 0x890 0x2 0x0
+#define MX6QDL_PAD_EIM_A17__GPIO2_IO21              0x114 0x4e4 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_A17__SRC_BOOT_CFG17          0x114 0x4e4 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_A17__EPDC_PWR_STAT           0x114 0x4e4 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_A18__EIM_ADDR18              0x118 0x4e8 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_A18__IPU1_DISP1_DATA13       0x118 0x4e8 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_A18__IPU1_CSI1_DATA13        0x118 0x4e8 0x894 0x2 0x0
+#define MX6QDL_PAD_EIM_A18__GPIO2_IO20              0x118 0x4e8 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_A18__SRC_BOOT_CFG18          0x118 0x4e8 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_A18__EPDC_PWR_CTRL0          0x118 0x4e8 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_A19__EIM_ADDR19              0x11c 0x4ec 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_A19__IPU1_DISP1_DATA14       0x11c 0x4ec 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_A19__IPU1_CSI1_DATA14        0x11c 0x4ec 0x898 0x2 0x0
+#define MX6QDL_PAD_EIM_A19__GPIO2_IO19              0x11c 0x4ec 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_A19__SRC_BOOT_CFG19          0x11c 0x4ec 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_A19__EPDC_PWR_CTRL1          0x11c 0x4ec 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_A20__EIM_ADDR20              0x120 0x4f0 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_A20__IPU1_DISP1_DATA15       0x120 0x4f0 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_A20__IPU1_CSI1_DATA15        0x120 0x4f0 0x89c 0x2 0x0
+#define MX6QDL_PAD_EIM_A20__GPIO2_IO18              0x120 0x4f0 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_A20__SRC_BOOT_CFG20          0x120 0x4f0 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_A20__EPDC_PWR_CTRL2          0x120 0x4f0 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_A21__EIM_ADDR21              0x124 0x4f4 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_A21__IPU1_DISP1_DATA16       0x124 0x4f4 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_A21__IPU1_CSI1_DATA16        0x124 0x4f4 0x8a0 0x2 0x0
+#define MX6QDL_PAD_EIM_A21__GPIO2_IO17              0x124 0x4f4 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_A21__SRC_BOOT_CFG21          0x124 0x4f4 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_A21__EPDC_GDCLK              0x124 0x4f4 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_A22__EIM_ADDR22              0x128 0x4f8 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_A22__IPU1_DISP1_DATA17       0x128 0x4f8 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_A22__IPU1_CSI1_DATA17        0x128 0x4f8 0x8a4 0x2 0x0
+#define MX6QDL_PAD_EIM_A22__GPIO2_IO16              0x128 0x4f8 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_A22__SRC_BOOT_CFG22          0x128 0x4f8 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_A22__EPDC_GDSP               0x128 0x4f8 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_A23__EIM_ADDR23              0x12c 0x4fc 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_A23__IPU1_DISP1_DATA18       0x12c 0x4fc 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_A23__IPU1_CSI1_DATA18        0x12c 0x4fc 0x8a8 0x2 0x0
+#define MX6QDL_PAD_EIM_A23__IPU1_SISG3              0x12c 0x4fc 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_A23__GPIO6_IO06              0x12c 0x4fc 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_A23__SRC_BOOT_CFG23          0x12c 0x4fc 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_A23__EPDC_GDOE               0x12c 0x4fc 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_A24__EIM_ADDR24              0x130 0x500 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_A24__IPU1_DISP1_DATA19       0x130 0x500 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_A24__IPU1_CSI1_DATA19        0x130 0x500 0x8ac 0x2 0x0
+#define MX6QDL_PAD_EIM_A24__IPU1_SISG2              0x130 0x500 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_A24__GPIO5_IO04              0x130 0x500 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_A24__SRC_BOOT_CFG24          0x130 0x500 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_A24__EPDC_GDRL               0x130 0x500 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_A25__EIM_ADDR25              0x134 0x504 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_A25__ECSPI4_SS1              0x134 0x504 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_A25__ECSPI2_RDY              0x134 0x504 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_A25__IPU1_DI1_PIN12          0x134 0x504 0x000 0x3 0x0
+#define MX6QDL_PAD_EIM_A25__IPU1_DI0_D1_CS          0x134 0x504 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_A25__GPIO5_IO02              0x134 0x504 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_A25__HDMI_TX_CEC_LINE        0x134 0x504 0x85c 0x6 0x0
+#define MX6QDL_PAD_EIM_A25__EPDC_DATA15             0x134 0x504 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_A25__EIM_ACLK_FREERUN        0x134 0x504 0x000 0x9 0x0
+#define MX6QDL_PAD_EIM_BCLK__EIM_BCLK               0x138 0x508 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_BCLK__IPU1_DI1_PIN16         0x138 0x508 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_BCLK__GPIO6_IO31             0x138 0x508 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_BCLK__EPDC_SDCE9             0x138 0x508 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_CS0__EIM_CS0_B               0x13c 0x50c 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_CS0__IPU1_DI1_PIN05          0x13c 0x50c 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_CS0__ECSPI2_SCLK             0x13c 0x50c 0x7f4 0x2 0x2
+#define MX6QDL_PAD_EIM_CS0__GPIO2_IO23              0x13c 0x50c 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_CS0__EPDC_DATA06             0x13c 0x50c 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_CS1__EIM_CS1_B               0x140 0x510 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_CS1__IPU1_DI1_PIN06          0x140 0x510 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_CS1__ECSPI2_MOSI             0x140 0x510 0x7fc 0x2 0x2
+#define MX6QDL_PAD_EIM_CS1__GPIO2_IO24              0x140 0x510 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_CS1__EPDC_DATA08             0x140 0x510 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_D16__EIM_DATA16              0x144 0x514 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D16__ECSPI1_SCLK             0x144 0x514 0x7d8 0x1 0x2
+#define MX6QDL_PAD_EIM_D16__IPU1_DI0_PIN05          0x144 0x514 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D16__IPU1_CSI1_DATA18        0x144 0x514 0x8a8 0x3 0x1
+#define MX6QDL_PAD_EIM_D16__HDMI_TX_DDC_SDA         0x144 0x514 0x864 0x4 0x0
+#define MX6QDL_PAD_EIM_D16__GPIO3_IO16              0x144 0x514 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D16__I2C2_SDA                0x144 0x514 0x874 0x6 0x0
+#define MX6QDL_PAD_EIM_D16__EPDC_DATA10             0x144 0x514 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_D17__EIM_DATA17              0x148 0x518 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D17__ECSPI1_MISO             0x148 0x518 0x7dc 0x1 0x2
+#define MX6QDL_PAD_EIM_D17__IPU1_DI0_PIN06          0x148 0x518 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D17__IPU1_CSI1_PIXCLK        0x148 0x518 0x8b8 0x3 0x1
+#define MX6QDL_PAD_EIM_D17__DCIC1_OUT               0x148 0x518 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D17__GPIO3_IO17              0x148 0x518 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D17__I2C3_SCL                0x148 0x518 0x878 0x6 0x0
+#define MX6QDL_PAD_EIM_D17__EPDC_VCOM0              0x148 0x518 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_D18__EIM_DATA18              0x14c 0x51c 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D18__ECSPI1_MOSI             0x14c 0x51c 0x7e0 0x1 0x2
+#define MX6QDL_PAD_EIM_D18__IPU1_DI0_PIN07          0x14c 0x51c 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D18__IPU1_CSI1_DATA17        0x14c 0x51c 0x8a4 0x3 0x1
+#define MX6QDL_PAD_EIM_D18__IPU1_DI1_D0_CS          0x14c 0x51c 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D18__GPIO3_IO18              0x14c 0x51c 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D18__I2C3_SDA                0x14c 0x51c 0x87c 0x6 0x0
+#define MX6QDL_PAD_EIM_D18__EPDC_VCOM1              0x14c 0x51c 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_D19__EIM_DATA19              0x150 0x520 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D19__ECSPI1_SS1              0x150 0x520 0x7e8 0x1 0x1
+#define MX6QDL_PAD_EIM_D19__IPU1_DI0_PIN08          0x150 0x520 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D19__IPU1_CSI1_DATA16        0x150 0x520 0x8a0 0x3 0x1
+#define MX6QDL_PAD_EIM_D19__UART1_CTS_B             0x150 0x520 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D19__UART1_RTS_B             0x150 0x520 0x8f8 0x4 0x0
+#define MX6QDL_PAD_EIM_D19__GPIO3_IO19              0x150 0x520 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D19__EPIT1_OUT               0x150 0x520 0x000 0x6 0x0
+#define MX6QDL_PAD_EIM_D19__EPDC_DATA12             0x150 0x520 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_D20__EIM_DATA20              0x154 0x524 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D20__ECSPI4_SS0              0x154 0x524 0x808 0x1 0x0
+#define MX6QDL_PAD_EIM_D20__IPU1_DI0_PIN16          0x154 0x524 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D20__IPU1_CSI1_DATA15        0x154 0x524 0x89c 0x3 0x1
+#define MX6QDL_PAD_EIM_D20__UART1_RTS_B             0x154 0x524 0x8f8 0x4 0x1
+#define MX6QDL_PAD_EIM_D20__UART1_CTS_B             0x154 0x524 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D20__GPIO3_IO20              0x154 0x524 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D20__EPIT2_OUT               0x154 0x524 0x000 0x6 0x0
+#define MX6QDL_PAD_EIM_D21__EIM_DATA21              0x158 0x528 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D21__ECSPI4_SCLK             0x158 0x528 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_D21__IPU1_DI0_PIN17          0x158 0x528 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D21__IPU1_CSI1_DATA11        0x158 0x528 0x88c 0x3 0x0
+#define MX6QDL_PAD_EIM_D21__USB_OTG_OC              0x158 0x528 0x920 0x4 0x0
+#define MX6QDL_PAD_EIM_D21__GPIO3_IO21              0x158 0x528 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D21__I2C1_SCL                0x158 0x528 0x868 0x6 0x1
+#define MX6QDL_PAD_EIM_D21__SPDIF_IN                0x158 0x528 0x8f0 0x7 0x0
+#define MX6QDL_PAD_EIM_D22__EIM_DATA22              0x15c 0x52c 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D22__ECSPI4_MISO             0x15c 0x52c 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_D22__IPU1_DI0_PIN01          0x15c 0x52c 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D22__IPU1_CSI1_DATA10        0x15c 0x52c 0x888 0x3 0x0
+#define MX6QDL_PAD_EIM_D22__USB_OTG_PWR             0x15c 0x52c 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D22__GPIO3_IO22              0x15c 0x52c 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D22__SPDIF_OUT               0x15c 0x52c 0x000 0x6 0x0
+#define MX6QDL_PAD_EIM_D22__EPDC_SDCE6              0x15c 0x52c 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_D23__EIM_DATA23              0x160 0x530 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D23__IPU1_DI0_D0_CS          0x160 0x530 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_D23__UART3_CTS_B             0x160 0x530 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D23__UART3_RTS_B             0x160 0x530 0x908 0x2 0x0
+#define MX6QDL_PAD_EIM_D23__UART1_DCD_B             0x160 0x530 0x000 0x3 0x0
+#define MX6QDL_PAD_EIM_D23__IPU1_CSI1_DATA_EN       0x160 0x530 0x8b0 0x4 0x0
+#define MX6QDL_PAD_EIM_D23__GPIO3_IO23              0x160 0x530 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D23__IPU1_DI1_PIN02          0x160 0x530 0x000 0x6 0x0
+#define MX6QDL_PAD_EIM_D23__IPU1_DI1_PIN14          0x160 0x530 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_D23__EPDC_DATA11             0x160 0x530 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_D24__EIM_DATA24              0x164 0x534 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D24__ECSPI4_SS2              0x164 0x534 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_D24__UART3_TX_DATA           0x164 0x534 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D24__UART3_RX_DATA           0x164 0x534 0x90c 0x2 0x0
+#define MX6QDL_PAD_EIM_D24__ECSPI1_SS2              0x164 0x534 0x7ec 0x3 0x0
+#define MX6QDL_PAD_EIM_D24__ECSPI2_SS2              0x164 0x534 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D24__GPIO3_IO24              0x164 0x534 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D24__AUD5_RXFS               0x164 0x534 0x7bc 0x6 0x1
+#define MX6QDL_PAD_EIM_D24__UART1_DTR_B             0x164 0x534 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_D24__EPDC_SDCE7              0x164 0x534 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_D25__EIM_DATA25              0x168 0x538 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D25__ECSPI4_SS3              0x168 0x538 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_D25__UART3_RX_DATA           0x168 0x538 0x90c 0x2 0x1
+#define MX6QDL_PAD_EIM_D25__UART3_TX_DATA           0x168 0x538 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D25__ECSPI1_SS3              0x168 0x538 0x7f0 0x3 0x0
+#define MX6QDL_PAD_EIM_D25__ECSPI2_SS3              0x168 0x538 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D25__GPIO3_IO25              0x168 0x538 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D25__AUD5_RXC                0x168 0x538 0x7b8 0x6 0x1
+#define MX6QDL_PAD_EIM_D25__UART1_DSR_B             0x168 0x538 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_D25__EPDC_SDCE8              0x168 0x538 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_D26__EIM_DATA26              0x16c 0x53c 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D26__IPU1_DI1_PIN11          0x16c 0x53c 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_D26__IPU1_CSI0_DATA01        0x16c 0x53c 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D26__IPU1_CSI1_DATA14        0x16c 0x53c 0x898 0x3 0x1
+#define MX6QDL_PAD_EIM_D26__UART2_TX_DATA           0x16c 0x53c 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D26__UART2_RX_DATA           0x16c 0x53c 0x904 0x4 0x0
+#define MX6QDL_PAD_EIM_D26__GPIO3_IO26              0x16c 0x53c 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D26__IPU1_SISG2              0x16c 0x53c 0x000 0x6 0x0
+#define MX6QDL_PAD_EIM_D26__IPU1_DISP1_DATA22       0x16c 0x53c 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_D26__EPDC_SDOED              0x16c 0x53c 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_D27__EIM_DATA27              0x170 0x540 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D27__IPU1_DI1_PIN13          0x170 0x540 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_D27__IPU1_CSI0_DATA00        0x170 0x540 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D27__IPU1_CSI1_DATA13        0x170 0x540 0x894 0x3 0x1
+#define MX6QDL_PAD_EIM_D27__UART2_RX_DATA           0x170 0x540 0x904 0x4 0x1
+#define MX6QDL_PAD_EIM_D27__UART2_TX_DATA           0x170 0x540 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D27__GPIO3_IO27              0x170 0x540 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D27__IPU1_SISG3              0x170 0x540 0x000 0x6 0x0
+#define MX6QDL_PAD_EIM_D27__IPU1_DISP1_DATA23       0x170 0x540 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_D27__EPDC_SDOE               0x170 0x540 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_D28__EIM_DATA28              0x174 0x544 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D28__I2C1_SDA                0x174 0x544 0x86c 0x1 0x1
+#define MX6QDL_PAD_EIM_D28__ECSPI4_MOSI             0x174 0x544 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D28__IPU1_CSI1_DATA12        0x174 0x544 0x890 0x3 0x1
+#define MX6QDL_PAD_EIM_D28__UART2_CTS_B             0x174 0x544 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D28__UART2_RTS_B             0x174 0x544 0x900 0x4 0x0
+#define MX6QDL_PAD_EIM_D28__UART2_DTE_CTS_B         0x174 0x544 0x900 0x4 0x0
+#define MX6QDL_PAD_EIM_D28__UART2_DTE_RTS_B         0x174 0x544 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D28__GPIO3_IO28              0x174 0x544 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D28__IPU1_EXT_TRIG           0x174 0x544 0x000 0x6 0x0
+#define MX6QDL_PAD_EIM_D28__IPU1_DI0_PIN13          0x174 0x544 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_D28__EPDC_PWR_CTRL3          0x174 0x544 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_D29__EIM_DATA29              0x178 0x548 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D29__IPU1_DI1_PIN15          0x178 0x548 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_D29__ECSPI4_SS0              0x178 0x548 0x808 0x2 0x1
+#define MX6QDL_PAD_EIM_D29__UART2_RTS_B             0x178 0x548 0x900 0x4 0x1
+#define MX6QDL_PAD_EIM_D29__UART2_CTS_B             0x178 0x548 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D29__UART2_DTE_RTS_B         0x178 0x548 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D29__UART2_DTE_CTS_B         0x178 0x548 0x900 0x4 0x1
+#define MX6QDL_PAD_EIM_D29__GPIO3_IO29              0x178 0x548 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D29__IPU1_CSI1_VSYNC         0x178 0x548 0x8bc 0x6 0x0
+#define MX6QDL_PAD_EIM_D29__IPU1_DI0_PIN14          0x178 0x548 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_D29__EPDC_PWR_WAKE           0x178 0x548 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_D30__EIM_DATA30              0x17c 0x54c 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D30__IPU1_DISP1_DATA21       0x17c 0x54c 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_D30__IPU1_DI0_PIN11          0x17c 0x54c 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D30__IPU1_CSI0_DATA03        0x17c 0x54c 0x000 0x3 0x0
+#define MX6QDL_PAD_EIM_D30__UART3_CTS_B             0x17c 0x54c 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D30__UART3_RTS_B             0x17c 0x54c 0x908 0x4 0x1
+#define MX6QDL_PAD_EIM_D30__GPIO3_IO30              0x17c 0x54c 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D30__USB_H1_OC               0x17c 0x54c 0x924 0x6 0x0
+#define MX6QDL_PAD_EIM_D30__EPDC_SDOEZ              0x17c 0x54c 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_D31__EIM_DATA31              0x180 0x550 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D31__IPU1_DISP1_DATA20       0x180 0x550 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_D31__IPU1_DI0_PIN12          0x180 0x550 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D31__IPU1_CSI0_DATA02        0x180 0x550 0x000 0x3 0x0
+#define MX6QDL_PAD_EIM_D31__UART3_RTS_B             0x180 0x550 0x908 0x4 0x2
+#define MX6QDL_PAD_EIM_D31__UART3_CTS_B             0x180 0x550 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D31__GPIO3_IO31              0x180 0x550 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D31__USB_H1_PWR              0x180 0x550 0x000 0x6 0x0
+#define MX6QDL_PAD_EIM_D31__EPDC_SDCLK_P            0x180 0x550 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_D31__EIM_ACLK_FREERUN        0x180 0x550 0x000 0x9 0x0
+#define MX6QDL_PAD_EIM_DA0__EIM_AD00                0x184 0x554 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA0__IPU1_DISP1_DATA09       0x184 0x554 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA0__IPU1_CSI1_DATA09        0x184 0x554 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_DA0__GPIO3_IO00              0x184 0x554 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA0__SRC_BOOT_CFG00          0x184 0x554 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA0__EPDC_SDCLK_N            0x184 0x554 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_DA1__EIM_AD01                0x188 0x558 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA1__IPU1_DISP1_DATA08       0x188 0x558 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA1__IPU1_CSI1_DATA08        0x188 0x558 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_DA1__GPIO3_IO01              0x188 0x558 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA1__SRC_BOOT_CFG01          0x188 0x558 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA1__EPDC_SDLE               0x188 0x558 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_DA10__EIM_AD10               0x18c 0x55c 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA10__IPU1_DI1_PIN15         0x18c 0x55c 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA10__IPU1_CSI1_DATA_EN      0x18c 0x55c 0x8b0 0x2 0x1
+#define MX6QDL_PAD_EIM_DA10__GPIO3_IO10             0x18c 0x55c 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA10__SRC_BOOT_CFG10         0x18c 0x55c 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA10__EPDC_DATA01            0x18c 0x55c 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_DA11__EIM_AD11               0x190 0x560 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA11__IPU1_DI1_PIN02         0x190 0x560 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA11__IPU1_CSI1_HSYNC        0x190 0x560 0x8b4 0x2 0x0
+#define MX6QDL_PAD_EIM_DA11__GPIO3_IO11             0x190 0x560 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA11__SRC_BOOT_CFG11         0x190 0x560 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA11__EPDC_DATA03            0x190 0x560 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_DA12__EIM_AD12               0x194 0x564 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA12__IPU1_DI1_PIN03         0x194 0x564 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA12__IPU1_CSI1_VSYNC        0x194 0x564 0x8bc 0x2 0x1
+#define MX6QDL_PAD_EIM_DA12__GPIO3_IO12             0x194 0x564 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA12__SRC_BOOT_CFG12         0x194 0x564 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA12__EPDC_DATA02            0x194 0x564 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_DA13__EIM_AD13               0x198 0x568 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA13__IPU1_DI1_D0_CS         0x198 0x568 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA13__GPIO3_IO13             0x198 0x568 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA13__SRC_BOOT_CFG13         0x198 0x568 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA13__EPDC_DATA13            0x198 0x568 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_DA14__EIM_AD14               0x19c 0x56c 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA14__IPU1_DI1_D1_CS         0x19c 0x56c 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA14__GPIO3_IO14             0x19c 0x56c 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA14__SRC_BOOT_CFG14         0x19c 0x56c 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA14__EPDC_DATA14            0x19c 0x56c 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_DA15__EIM_AD15               0x1a0 0x570 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA15__IPU1_DI1_PIN01         0x1a0 0x570 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA15__IPU1_DI1_PIN04         0x1a0 0x570 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_DA15__GPIO3_IO15             0x1a0 0x570 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA15__SRC_BOOT_CFG15         0x1a0 0x570 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA15__EPDC_DATA09            0x1a0 0x570 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_DA2__EIM_AD02                0x1a4 0x574 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA2__IPU1_DISP1_DATA07       0x1a4 0x574 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA2__IPU1_CSI1_DATA07        0x1a4 0x574 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_DA2__GPIO3_IO02              0x1a4 0x574 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA2__SRC_BOOT_CFG02          0x1a4 0x574 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA2__EPDC_BDR0               0x1a4 0x574 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_DA3__EIM_AD03                0x1a8 0x578 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA3__IPU1_DISP1_DATA06       0x1a8 0x578 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA3__IPU1_CSI1_DATA06        0x1a8 0x578 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_DA3__GPIO3_IO03              0x1a8 0x578 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA3__SRC_BOOT_CFG03          0x1a8 0x578 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA3__EPDC_BDR1               0x1a8 0x578 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_DA4__EIM_AD04                0x1ac 0x57c 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA4__IPU1_DISP1_DATA05       0x1ac 0x57c 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA4__IPU1_CSI1_DATA05        0x1ac 0x57c 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_DA4__GPIO3_IO04              0x1ac 0x57c 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA4__SRC_BOOT_CFG04          0x1ac 0x57c 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA4__EPDC_SDCE0              0x1ac 0x57c 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_DA5__EIM_AD05                0x1b0 0x580 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA5__IPU1_DISP1_DATA04       0x1b0 0x580 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA5__IPU1_CSI1_DATA04        0x1b0 0x580 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_DA5__GPIO3_IO05              0x1b0 0x580 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA5__SRC_BOOT_CFG05          0x1b0 0x580 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA5__EPDC_SDCE1              0x1b0 0x580 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_DA6__EIM_AD06                0x1b4 0x584 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA6__IPU1_DISP1_DATA03       0x1b4 0x584 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA6__IPU1_CSI1_DATA03        0x1b4 0x584 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_DA6__GPIO3_IO06              0x1b4 0x584 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA6__SRC_BOOT_CFG06          0x1b4 0x584 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA6__EPDC_SDCE2              0x1b4 0x584 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_DA7__EIM_AD07                0x1b8 0x588 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA7__IPU1_DISP1_DATA02       0x1b8 0x588 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA7__IPU1_CSI1_DATA02        0x1b8 0x588 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_DA7__GPIO3_IO07              0x1b8 0x588 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA7__SRC_BOOT_CFG07          0x1b8 0x588 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA7__EPDC_SDCE3              0x1b8 0x588 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_DA8__EIM_AD08                0x1bc 0x58c 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA8__IPU1_DISP1_DATA01       0x1bc 0x58c 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA8__IPU1_CSI1_DATA01        0x1bc 0x58c 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_DA8__GPIO3_IO08              0x1bc 0x58c 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA8__SRC_BOOT_CFG08          0x1bc 0x58c 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA8__EPDC_SDCE4              0x1bc 0x58c 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_DA9__EIM_AD09                0x1c0 0x590 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA9__IPU1_DISP1_DATA00       0x1c0 0x590 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA9__IPU1_CSI1_DATA00        0x1c0 0x590 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_DA9__GPIO3_IO09              0x1c0 0x590 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA9__SRC_BOOT_CFG09          0x1c0 0x590 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA9__EPDC_SDCE5              0x1c0 0x590 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_EB0__EIM_EB0_B               0x1c4 0x594 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_EB0__IPU1_DISP1_DATA11       0x1c4 0x594 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_EB0__IPU1_CSI1_DATA11        0x1c4 0x594 0x88c 0x2 0x1
+#define MX6QDL_PAD_EIM_EB0__CCM_PMIC_READY          0x1c4 0x594 0x7d4 0x4 0x0
+#define MX6QDL_PAD_EIM_EB0__GPIO2_IO28              0x1c4 0x594 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_EB0__SRC_BOOT_CFG27          0x1c4 0x594 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_EB0__EPDC_PWR_COM            0x1c4 0x594 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_EB1__EIM_EB1_B               0x1c8 0x598 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_EB1__IPU1_DISP1_DATA10       0x1c8 0x598 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_EB1__IPU1_CSI1_DATA10        0x1c8 0x598 0x888 0x2 0x1
+#define MX6QDL_PAD_EIM_EB1__GPIO2_IO29              0x1c8 0x598 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_EB1__SRC_BOOT_CFG28          0x1c8 0x598 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_EB1__EPDC_SDSHR              0x1c8 0x598 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_EB2__EIM_EB2_B               0x1cc 0x59c 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_EB2__ECSPI1_SS0              0x1cc 0x59c 0x7e4 0x1 0x2
+#define MX6QDL_PAD_EIM_EB2__IPU1_CSI1_DATA19        0x1cc 0x59c 0x8ac 0x3 0x1
+#define MX6QDL_PAD_EIM_EB2__HDMI_TX_DDC_SCL         0x1cc 0x59c 0x860 0x4 0x0
+#define MX6QDL_PAD_EIM_EB2__GPIO2_IO30              0x1cc 0x59c 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_EB2__I2C2_SCL                0x1cc 0x59c 0x870 0x6 0x0
+#define MX6QDL_PAD_EIM_EB2__SRC_BOOT_CFG30          0x1cc 0x59c 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_EB2__EPDC_DATA05             0x1cc 0x59c 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_EB3__EIM_EB3_B               0x1d0 0x5a0 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_EB3__ECSPI4_RDY              0x1d0 0x5a0 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_EB3__UART3_RTS_B             0x1d0 0x5a0 0x908 0x2 0x3
+#define MX6QDL_PAD_EIM_EB3__UART3_CTS_B             0x1d0 0x5a0 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_EB3__UART1_RI_B              0x1d0 0x5a0 0x000 0x3 0x0
+#define MX6QDL_PAD_EIM_EB3__IPU1_CSI1_HSYNC         0x1d0 0x5a0 0x8b4 0x4 0x1
+#define MX6QDL_PAD_EIM_EB3__GPIO2_IO31              0x1d0 0x5a0 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_EB3__IPU1_DI1_PIN03          0x1d0 0x5a0 0x000 0x6 0x0
+#define MX6QDL_PAD_EIM_EB3__SRC_BOOT_CFG31          0x1d0 0x5a0 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_EB3__EPDC_SDCE0              0x1d0 0x5a0 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_EB3__EIM_ACLK_FREERUN        0x1d0 0x5a0 0x000 0x9 0x0
+#define MX6QDL_PAD_EIM_LBA__EIM_LBA_B               0x1d4 0x5a4 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_LBA__IPU1_DI1_PIN17          0x1d4 0x5a4 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_LBA__ECSPI2_SS1              0x1d4 0x5a4 0x804 0x2 0x1
+#define MX6QDL_PAD_EIM_LBA__GPIO2_IO27              0x1d4 0x5a4 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_LBA__SRC_BOOT_CFG26          0x1d4 0x5a4 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_LBA__EPDC_DATA04             0x1d4 0x5a4 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_OE__EIM_OE_B                 0x1d8 0x5a8 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_OE__IPU1_DI1_PIN07           0x1d8 0x5a8 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_OE__ECSPI2_MISO              0x1d8 0x5a8 0x7f8 0x2 0x2
+#define MX6QDL_PAD_EIM_OE__GPIO2_IO25               0x1d8 0x5a8 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_OE__EPDC_PWR_IRQ             0x1d8 0x5a8 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_RW__EIM_RW                   0x1dc 0x5ac 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_RW__IPU1_DI1_PIN08           0x1dc 0x5ac 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_RW__ECSPI2_SS0               0x1dc 0x5ac 0x800 0x2 0x2
+#define MX6QDL_PAD_EIM_RW__GPIO2_IO26               0x1dc 0x5ac 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_RW__SRC_BOOT_CFG29           0x1dc 0x5ac 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_RW__EPDC_DATA07              0x1dc 0x5ac 0x000 0x8 0x0
+#define MX6QDL_PAD_EIM_WAIT__EIM_WAIT_B             0x1e0 0x5b0 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_WAIT__EIM_DTACK_B            0x1e0 0x5b0 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_WAIT__GPIO5_IO00             0x1e0 0x5b0 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_WAIT__SRC_BOOT_CFG25         0x1e0 0x5b0 0x000 0x7 0x0
+#define MX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN          0x1e4 0x5b4 0x828 0x1 0x0
+#define MX6QDL_PAD_ENET_CRS_DV__ESAI_TX_CLK         0x1e4 0x5b4 0x840 0x2 0x0
+#define MX6QDL_PAD_ENET_CRS_DV__SPDIF_EXT_CLK       0x1e4 0x5b4 0x8f4 0x3 0x0
+#define MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25          0x1e4 0x5b4 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_MDC__MLB_DATA               0x1e8 0x5b8 0x8e0 0x0 0x0
+#define MX6QDL_PAD_ENET_MDC__ENET_MDC               0x1e8 0x5b8 0x000 0x1 0x0
+#define MX6QDL_PAD_ENET_MDC__ESAI_TX5_RX0           0x1e8 0x5b8 0x858 0x2 0x0
+#define MX6QDL_PAD_ENET_MDC__ENET_1588_EVENT1_IN    0x1e8 0x5b8 0x000 0x4 0x0
+#define MX6QDL_PAD_ENET_MDC__GPIO1_IO31             0x1e8 0x5b8 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_MDIO__ENET_MDIO             0x1ec 0x5bc 0x810 0x1 0x0
+#define MX6QDL_PAD_ENET_MDIO__ESAI_RX_CLK           0x1ec 0x5bc 0x83c 0x2 0x0
+#define MX6QDL_PAD_ENET_MDIO__ENET_1588_EVENT1_OUT  0x1ec 0x5bc 0x000 0x4 0x0
+#define MX6QDL_PAD_ENET_MDIO__GPIO1_IO22            0x1ec 0x5bc 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_MDIO__SPDIF_LOCK            0x1ec 0x5bc 0x000 0x6 0x0
+#define MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK        0x1f0 0x5c0 0x000 0x1 0x0
+#define MX6QDL_PAD_ENET_REF_CLK__ESAI_RX_FS         0x1f0 0x5c0 0x82c 0x2 0x0
+#define MX6QDL_PAD_ENET_REF_CLK__GPIO1_IO23         0x1f0 0x5c0 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_REF_CLK__SPDIF_SR_CLK       0x1f0 0x5c0 0x000 0x6 0x0
+#define MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID           0x1f4 0x5c4 0x790 0x0 0x0
+#define MX6QDL_PAD_ENET_RX_ER__ENET_RX_ER           0x1f4 0x5c4 0x000 0x1 0x0
+#define MX6QDL_PAD_ENET_RX_ER__ESAI_RX_HF_CLK       0x1f4 0x5c4 0x834 0x2 0x0
+#define MX6QDL_PAD_ENET_RX_ER__SPDIF_IN             0x1f4 0x5c4 0x8f0 0x3 0x1
+#define MX6QDL_PAD_ENET_RX_ER__ENET_1588_EVENT2_OUT 0x1f4 0x5c4 0x000 0x4 0x0
+#define MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24           0x1f4 0x5c4 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_RXD0__ENET_RX_DATA0         0x1f8 0x5c8 0x818 0x1 0x0
+#define MX6QDL_PAD_ENET_RXD0__ESAI_TX_HF_CLK        0x1f8 0x5c8 0x838 0x2 0x0
+#define MX6QDL_PAD_ENET_RXD0__SPDIF_OUT             0x1f8 0x5c8 0x000 0x3 0x0
+#define MX6QDL_PAD_ENET_RXD0__GPIO1_IO27            0x1f8 0x5c8 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_RXD1__MLB_SIG               0x1fc 0x5cc 0x8e4 0x0 0x0
+#define MX6QDL_PAD_ENET_RXD1__ENET_RX_DATA1         0x1fc 0x5cc 0x81c 0x1 0x0
+#define MX6QDL_PAD_ENET_RXD1__ESAI_TX_FS            0x1fc 0x5cc 0x830 0x2 0x0
+#define MX6QDL_PAD_ENET_RXD1__ENET_1588_EVENT3_OUT  0x1fc 0x5cc 0x000 0x4 0x0
+#define MX6QDL_PAD_ENET_RXD1__GPIO1_IO26            0x1fc 0x5cc 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN           0x200 0x5d0 0x000 0x1 0x0
+#define MX6QDL_PAD_ENET_TX_EN__ESAI_TX3_RX2         0x200 0x5d0 0x850 0x2 0x0
+#define MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28           0x200 0x5d0 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_TX_EN__I2C4_SCL             0x200 0x5d0 0x880 0x9 0x0
+#define MX6QDL_PAD_ENET_TXD0__ENET_TX_DATA0         0x204 0x5d4 0x000 0x1 0x0
+#define MX6QDL_PAD_ENET_TXD0__ESAI_TX4_RX1          0x204 0x5d4 0x854 0x2 0x0
+#define MX6QDL_PAD_ENET_TXD0__GPIO1_IO30            0x204 0x5d4 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_TXD1__MLB_CLK               0x208 0x5d8 0x8dc 0x0 0x0
+#define MX6QDL_PAD_ENET_TXD1__ENET_TX_DATA1         0x208 0x5d8 0x000 0x1 0x0
+#define MX6QDL_PAD_ENET_TXD1__ESAI_TX2_RX3          0x208 0x5d8 0x84c 0x2 0x0
+#define MX6QDL_PAD_ENET_TXD1__ENET_1588_EVENT0_IN   0x208 0x5d8 0x000 0x4 0x0
+#define MX6QDL_PAD_ENET_TXD1__GPIO1_IO29            0x208 0x5d8 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_TXD1__I2C4_SDA              0x208 0x5d8 0x884 0x9 0x0
+#define MX6QDL_PAD_GPIO_0__CCM_CLKO1                0x20c 0x5dc 0x000 0x0 0x0
+#define MX6QDL_PAD_GPIO_0__KEY_COL5                 0x20c 0x5dc 0x8c0 0x2 0x1
+#define MX6QDL_PAD_GPIO_0__ASRC_EXT_CLK             0x20c 0x5dc 0x794 0x3 0x0
+#define MX6QDL_PAD_GPIO_0__EPIT1_OUT                0x20c 0x5dc 0x000 0x4 0x0
+#define MX6QDL_PAD_GPIO_0__GPIO1_IO00               0x20c 0x5dc 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_0__USB_H1_PWR               0x20c 0x5dc 0x000 0x6 0x0
+#define MX6QDL_PAD_GPIO_0__SNVS_VIO_5               0x20c 0x5dc 0x000 0x7 0x0
+#define MX6QDL_PAD_GPIO_1__ESAI_RX_CLK              0x210 0x5e0 0x83c 0x0 0x1
+#define MX6QDL_PAD_GPIO_1__WDOG2_B                  0x210 0x5e0 0x000 0x1 0x0
+#define MX6QDL_PAD_GPIO_1__KEY_ROW5                 0x210 0x5e0 0x8cc 0x2 0x1
+#define MX6QDL_PAD_GPIO_1__USB_OTG_ID               0x210 0x5e0 0x790 0x3 0x1
+#define MX6QDL_PAD_GPIO_1__PWM2_OUT                 0x210 0x5e0 0x000 0x4 0x0
+#define MX6QDL_PAD_GPIO_1__GPIO1_IO01               0x210 0x5e0 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_1__SD1_CD_B                 0x210 0x5e0 0x000 0x6 0x0
+#define MX6QDL_PAD_GPIO_16__ESAI_TX3_RX2            0x214 0x5e4 0x850 0x0 0x1
+#define MX6QDL_PAD_GPIO_16__ENET_1588_EVENT2_IN     0x214 0x5e4 0x000 0x1 0x0
+#define MX6QDL_PAD_GPIO_16__ENET_REF_CLK            0x214 0x5e4 0x80c 0x2 0x0
+#define MX6QDL_PAD_GPIO_16__SD1_LCTL                0x214 0x5e4 0x000 0x3 0x0
+#define MX6QDL_PAD_GPIO_16__SPDIF_IN                0x214 0x5e4 0x8f0 0x4 0x2
+#define MX6QDL_PAD_GPIO_16__GPIO7_IO11              0x214 0x5e4 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_16__I2C3_SDA                0x214 0x5e4 0x87c 0x6 0x1
+#define MX6QDL_PAD_GPIO_16__JTAG_DE_B               0x214 0x5e4 0x000 0x7 0x0
+#define MX6QDL_PAD_GPIO_17__ESAI_TX0                0x218 0x5e8 0x844 0x0 0x0
+#define MX6QDL_PAD_GPIO_17__ENET_1588_EVENT3_IN     0x218 0x5e8 0x000 0x1 0x0
+#define MX6QDL_PAD_GPIO_17__CCM_PMIC_READY          0x218 0x5e8 0x7d4 0x2 0x1
+#define MX6QDL_PAD_GPIO_17__SDMA_EXT_EVENT0         0x218 0x5e8 0x8e8 0x3 0x1
+#define MX6QDL_PAD_GPIO_17__SPDIF_OUT               0x218 0x5e8 0x000 0x4 0x0
+#define MX6QDL_PAD_GPIO_17__GPIO7_IO12              0x218 0x5e8 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_18__ESAI_TX1                0x21c 0x5ec 0x848 0x0 0x0
+#define MX6QDL_PAD_GPIO_18__ENET_RX_CLK             0x21c 0x5ec 0x814 0x1 0x0
+#define MX6QDL_PAD_GPIO_18__SD3_VSELECT             0x21c 0x5ec 0x000 0x2 0x0
+#define MX6QDL_PAD_GPIO_18__SDMA_EXT_EVENT1         0x21c 0x5ec 0x8ec 0x3 0x1
+#define MX6QDL_PAD_GPIO_18__ASRC_EXT_CLK            0x21c 0x5ec 0x794 0x4 0x1
+#define MX6QDL_PAD_GPIO_18__GPIO7_IO13              0x21c 0x5ec 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_18__SNVS_VIO_5_CTL          0x21c 0x5ec 0x000 0x6 0x0
+#define MX6QDL_PAD_GPIO_19__KEY_COL5                0x220 0x5f0 0x8c0 0x0 0x2
+#define MX6QDL_PAD_GPIO_19__ENET_1588_EVENT0_OUT    0x220 0x5f0 0x000 0x1 0x0
+#define MX6QDL_PAD_GPIO_19__SPDIF_OUT               0x220 0x5f0 0x000 0x2 0x0
+#define MX6QDL_PAD_GPIO_19__CCM_CLKO1               0x220 0x5f0 0x000 0x3 0x0
+#define MX6QDL_PAD_GPIO_19__ECSPI1_RDY              0x220 0x5f0 0x000 0x4 0x0
+#define MX6QDL_PAD_GPIO_19__GPIO4_IO05              0x220 0x5f0 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_19__ENET_TX_ER              0x220 0x5f0 0x000 0x6 0x0
+#define MX6QDL_PAD_GPIO_2__ESAI_TX_FS               0x224 0x5f4 0x830 0x0 0x1
+#define MX6QDL_PAD_GPIO_2__KEY_ROW6                 0x224 0x5f4 0x8d0 0x2 0x1
+#define MX6QDL_PAD_GPIO_2__GPIO1_IO02               0x224 0x5f4 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_2__SD2_WP                   0x224 0x5f4 0x000 0x6 0x0
+#define MX6QDL_PAD_GPIO_2__MLB_DATA                 0x224 0x5f4 0x8e0 0x7 0x1
+#define MX6QDL_PAD_GPIO_3__ESAI_RX_HF_CLK           0x228 0x5f8 0x834 0x0 0x1
+#define MX6QDL_PAD_GPIO_3__I2C3_SCL                 0x228 0x5f8 0x878 0x2 0x1
+#define MX6QDL_PAD_GPIO_3__XTALOSC_REF_CLK_24M      0x228 0x5f8 0x000 0x3 0x0
+#define MX6QDL_PAD_GPIO_3__CCM_CLKO2                0x228 0x5f8 0x000 0x4 0x0
+#define MX6QDL_PAD_GPIO_3__GPIO1_IO03               0x228 0x5f8 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_3__USB_H1_OC                0x228 0x5f8 0x924 0x6 0x1
+#define MX6QDL_PAD_GPIO_3__MLB_CLK                  0x228 0x5f8 0x8dc 0x7 0x1
+#define MX6QDL_PAD_GPIO_4__ESAI_TX_HF_CLK           0x22c 0x5fc 0x838 0x0 0x1
+#define MX6QDL_PAD_GPIO_4__KEY_COL7                 0x22c 0x5fc 0x8c8 0x2 0x1
+#define MX6QDL_PAD_GPIO_4__GPIO1_IO04               0x22c 0x5fc 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_4__SD2_CD_B                 0x22c 0x5fc 0x000 0x6 0x0
+#define MX6QDL_PAD_GPIO_5__ESAI_TX2_RX3             0x230 0x600 0x84c 0x0 0x1
+#define MX6QDL_PAD_GPIO_5__KEY_ROW7                 0x230 0x600 0x8d4 0x2 0x1
+#define MX6QDL_PAD_GPIO_5__CCM_CLKO1                0x230 0x600 0x000 0x3 0x0
+#define MX6QDL_PAD_GPIO_5__GPIO1_IO05               0x230 0x600 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_5__I2C3_SCL                 0x230 0x600 0x878 0x6 0x2
+#define MX6QDL_PAD_GPIO_5__ARM_EVENTI               0x230 0x600 0x000 0x7 0x0
+#define MX6QDL_PAD_GPIO_6__ESAI_TX_CLK              0x234 0x604 0x840 0x0 0x1
+#define MX6QDL_PAD_GPIO_6__I2C3_SDA                 0x234 0x604 0x87c 0x2 0x2
+#define MX6QDL_PAD_GPIO_6__GPIO1_IO06               0x234 0x604 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_6__SD2_LCTL                 0x234 0x604 0x000 0x6 0x0
+#define MX6QDL_PAD_GPIO_6__MLB_SIG                  0x234 0x604 0x8e4 0x7 0x1
+#define MX6QDL_PAD_GPIO_7__ESAI_TX4_RX1             0x238 0x608 0x854 0x0 0x1
+#define MX6QDL_PAD_GPIO_7__EPIT1_OUT                0x238 0x608 0x000 0x2 0x0
+#define MX6QDL_PAD_GPIO_7__FLEXCAN1_TX              0x238 0x608 0x000 0x3 0x0
+#define MX6QDL_PAD_GPIO_7__UART2_TX_DATA            0x238 0x608 0x000 0x4 0x0
+#define MX6QDL_PAD_GPIO_7__UART2_RX_DATA            0x238 0x608 0x904 0x4 0x2
+#define MX6QDL_PAD_GPIO_7__GPIO1_IO07               0x238 0x608 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_7__SPDIF_LOCK               0x238 0x608 0x000 0x6 0x0
+#define MX6QDL_PAD_GPIO_7__USB_OTG_HOST_MODE        0x238 0x608 0x000 0x7 0x0
+#define MX6QDL_PAD_GPIO_7__I2C4_SCL                 0x238 0x608 0x880 0x8 0x1
+#define MX6QDL_PAD_GPIO_8__ESAI_TX5_RX0             0x23c 0x60c 0x858 0x0 0x1
+#define MX6QDL_PAD_GPIO_8__XTALOSC_REF_CLK_32K      0x23c 0x60c 0x000 0x1 0x0
+#define MX6QDL_PAD_GPIO_8__EPIT2_OUT                0x23c 0x60c 0x000 0x2 0x0
+#define MX6QDL_PAD_GPIO_8__FLEXCAN1_RX              0x23c 0x60c 0x7c8 0x3 0x0
+#define MX6QDL_PAD_GPIO_8__UART2_RX_DATA            0x23c 0x60c 0x904 0x4 0x3
+#define MX6QDL_PAD_GPIO_8__UART2_TX_DATA            0x23c 0x60c 0x000 0x4 0x0
+#define MX6QDL_PAD_GPIO_8__GPIO1_IO08               0x23c 0x60c 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_8__SPDIF_SR_CLK             0x23c 0x60c 0x000 0x6 0x0
+#define MX6QDL_PAD_GPIO_8__USB_OTG_PWR_CTL_WAKE     0x23c 0x60c 0x000 0x7 0x0
+#define MX6QDL_PAD_GPIO_8__I2C4_SDA                 0x23c 0x60c 0x884 0x8 0x1
+#define MX6QDL_PAD_GPIO_9__ESAI_RX_FS               0x240 0x610 0x82c 0x0 0x1
+#define MX6QDL_PAD_GPIO_9__WDOG1_B                  0x240 0x610 0x000 0x1 0x0
+#define MX6QDL_PAD_GPIO_9__KEY_COL6                 0x240 0x610 0x8c4 0x2 0x1
+#define MX6QDL_PAD_GPIO_9__CCM_REF_EN_B             0x240 0x610 0x000 0x3 0x0
+#define MX6QDL_PAD_GPIO_9__PWM1_OUT                 0x240 0x610 0x000 0x4 0x0
+#define MX6QDL_PAD_GPIO_9__GPIO1_IO09               0x240 0x610 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_9__SD1_WP                   0x240 0x610 0x92c 0x6 0x1
+#define MX6QDL_PAD_KEY_COL0__ECSPI1_SCLK            0x244 0x62c 0x7d8 0x0 0x3
+#define MX6QDL_PAD_KEY_COL0__ENET_RX_DATA3          0x244 0x62c 0x824 0x1 0x0
+#define MX6QDL_PAD_KEY_COL0__AUD5_TXC               0x244 0x62c 0x7c0 0x2 0x1
+#define MX6QDL_PAD_KEY_COL0__KEY_COL0               0x244 0x62c 0x000 0x3 0x0
+#define MX6QDL_PAD_KEY_COL0__UART4_TX_DATA          0x244 0x62c 0x000 0x4 0x0
+#define MX6QDL_PAD_KEY_COL0__UART4_RX_DATA          0x244 0x62c 0x914 0x4 0x2
+#define MX6QDL_PAD_KEY_COL0__GPIO4_IO06             0x244 0x62c 0x000 0x5 0x0
+#define MX6QDL_PAD_KEY_COL0__DCIC1_OUT              0x244 0x62c 0x000 0x6 0x0
+#define MX6QDL_PAD_KEY_COL1__ECSPI1_MISO            0x248 0x630 0x7dc 0x0 0x3
+#define MX6QDL_PAD_KEY_COL1__ENET_MDIO              0x248 0x630 0x810 0x1 0x1
+#define MX6QDL_PAD_KEY_COL1__AUD5_TXFS              0x248 0x630 0x7c4 0x2 0x1
+#define MX6QDL_PAD_KEY_COL1__KEY_COL1               0x248 0x630 0x000 0x3 0x0
+#define MX6QDL_PAD_KEY_COL1__UART5_TX_DATA          0x248 0x630 0x000 0x4 0x0
+#define MX6QDL_PAD_KEY_COL1__UART5_RX_DATA          0x248 0x630 0x91c 0x4 0x2
+#define MX6QDL_PAD_KEY_COL1__GPIO4_IO08             0x248 0x630 0x000 0x5 0x0
+#define MX6QDL_PAD_KEY_COL1__SD1_VSELECT            0x248 0x630 0x000 0x6 0x0
+#define MX6QDL_PAD_KEY_COL2__ECSPI1_SS1             0x24c 0x634 0x7e8 0x0 0x2
+#define MX6QDL_PAD_KEY_COL2__ENET_RX_DATA2          0x24c 0x634 0x820 0x1 0x0
+#define MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX            0x24c 0x634 0x000 0x2 0x0
+#define MX6QDL_PAD_KEY_COL2__KEY_COL2               0x24c 0x634 0x000 0x3 0x0
+#define MX6QDL_PAD_KEY_COL2__ENET_MDC               0x24c 0x634 0x000 0x4 0x0
+#define MX6QDL_PAD_KEY_COL2__GPIO4_IO10             0x24c 0x634 0x000 0x5 0x0
+#define MX6QDL_PAD_KEY_COL2__USB_H1_PWR_CTL_WAKE    0x24c 0x634 0x000 0x6 0x0
+#define MX6QDL_PAD_KEY_COL3__ECSPI1_SS3             0x250 0x638 0x7f0 0x0 0x1
+#define MX6QDL_PAD_KEY_COL3__ENET_CRS               0x250 0x638 0x000 0x1 0x0
+#define MX6QDL_PAD_KEY_COL3__HDMI_TX_DDC_SCL        0x250 0x638 0x860 0x2 0x1
+#define MX6QDL_PAD_KEY_COL3__KEY_COL3               0x250 0x638 0x000 0x3 0x0
+#define MX6QDL_PAD_KEY_COL3__I2C2_SCL               0x250 0x638 0x870 0x4 0x1
+#define MX6QDL_PAD_KEY_COL3__GPIO4_IO12             0x250 0x638 0x000 0x5 0x0
+#define MX6QDL_PAD_KEY_COL3__SPDIF_IN               0x250 0x638 0x8f0 0x6 0x3
+#define MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX            0x254 0x63c 0x000 0x0 0x0
+#define MX6QDL_PAD_KEY_COL4__IPU1_SISG4             0x254 0x63c 0x000 0x1 0x0
+#define MX6QDL_PAD_KEY_COL4__USB_OTG_OC             0x254 0x63c 0x920 0x2 0x1
+#define MX6QDL_PAD_KEY_COL4__KEY_COL4               0x254 0x63c 0x000 0x3 0x0
+#define MX6QDL_PAD_KEY_COL4__UART5_RTS_B            0x254 0x63c 0x918 0x4 0x2
+#define MX6QDL_PAD_KEY_COL4__UART5_CTS_B            0x254 0x63c 0x000 0x4 0x0
+#define MX6QDL_PAD_KEY_COL4__GPIO4_IO14             0x254 0x63c 0x000 0x5 0x0
+#define MX6QDL_PAD_KEY_ROW0__ECSPI1_MOSI            0x258 0x640 0x7e0 0x0 0x3
+#define MX6QDL_PAD_KEY_ROW0__ENET_TX_DATA3          0x258 0x640 0x000 0x1 0x0
+#define MX6QDL_PAD_KEY_ROW0__AUD5_TXD               0x258 0x640 0x7b4 0x2 0x1
+#define MX6QDL_PAD_KEY_ROW0__KEY_ROW0               0x258 0x640 0x000 0x3 0x0
+#define MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA          0x258 0x640 0x914 0x4 0x3
+#define MX6QDL_PAD_KEY_ROW0__UART4_TX_DATA          0x258 0x640 0x000 0x4 0x0
+#define MX6QDL_PAD_KEY_ROW0__GPIO4_IO07             0x258 0x640 0x000 0x5 0x0
+#define MX6QDL_PAD_KEY_ROW0__DCIC2_OUT              0x258 0x640 0x000 0x6 0x0
+#define MX6QDL_PAD_KEY_ROW1__ECSPI1_SS0             0x25c 0x644 0x7e4 0x0 0x3
+#define MX6QDL_PAD_KEY_ROW1__ENET_COL               0x25c 0x644 0x000 0x1 0x0
+#define MX6QDL_PAD_KEY_ROW1__AUD5_RXD               0x25c 0x644 0x7b0 0x2 0x1
+#define MX6QDL_PAD_KEY_ROW1__KEY_ROW1               0x25c 0x644 0x000 0x3 0x0
+#define MX6QDL_PAD_KEY_ROW1__UART5_RX_DATA          0x25c 0x644 0x91c 0x4 0x3
+#define MX6QDL_PAD_KEY_ROW1__UART5_TX_DATA          0x25c 0x644 0x000 0x4 0x0
+#define MX6QDL_PAD_KEY_ROW1__GPIO4_IO09             0x25c 0x644 0x000 0x5 0x0
+#define MX6QDL_PAD_KEY_ROW1__SD2_VSELECT            0x25c 0x644 0x000 0x6 0x0
+#define MX6QDL_PAD_KEY_ROW2__ECSPI1_SS2             0x260 0x648 0x7ec 0x0 0x1
+#define MX6QDL_PAD_KEY_ROW2__ENET_TX_DATA2          0x260 0x648 0x000 0x1 0x0
+#define MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX            0x260 0x648 0x7c8 0x2 0x1
+#define MX6QDL_PAD_KEY_ROW2__KEY_ROW2               0x260 0x648 0x000 0x3 0x0
+#define MX6QDL_PAD_KEY_ROW2__SD2_VSELECT            0x260 0x648 0x000 0x4 0x0
+#define MX6QDL_PAD_KEY_ROW2__GPIO4_IO11             0x260 0x648 0x000 0x5 0x0
+#define MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE       0x260 0x648 0x85c 0x6 0x1
+#define MX6QDL_PAD_KEY_ROW3__ASRC_EXT_CLK           0x264 0x64c 0x794 0x1 0x2
+#define MX6QDL_PAD_KEY_ROW3__HDMI_TX_DDC_SDA        0x264 0x64c 0x864 0x2 0x1
+#define MX6QDL_PAD_KEY_ROW3__KEY_ROW3               0x264 0x64c 0x000 0x3 0x0
+#define MX6QDL_PAD_KEY_ROW3__I2C2_SDA               0x264 0x64c 0x874 0x4 0x1
+#define MX6QDL_PAD_KEY_ROW3__GPIO4_IO13             0x264 0x64c 0x000 0x5 0x0
+#define MX6QDL_PAD_KEY_ROW3__SD1_VSELECT            0x264 0x64c 0x000 0x6 0x0
+#define MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX            0x268 0x650 0x7cc 0x0 0x0
+#define MX6QDL_PAD_KEY_ROW4__IPU1_SISG5             0x268 0x650 0x000 0x1 0x0
+#define MX6QDL_PAD_KEY_ROW4__USB_OTG_PWR            0x268 0x650 0x000 0x2 0x0
+#define MX6QDL_PAD_KEY_ROW4__KEY_ROW4               0x268 0x650 0x000 0x3 0x0
+#define MX6QDL_PAD_KEY_ROW4__UART5_CTS_B            0x268 0x650 0x000 0x4 0x0
+#define MX6QDL_PAD_KEY_ROW4__UART5_RTS_B            0x268 0x650 0x918 0x4 0x3
+#define MX6QDL_PAD_KEY_ROW4__GPIO4_IO15             0x268 0x650 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_ALE__NAND_ALE              0x26c 0x654 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_ALE__SD4_RESET             0x26c 0x654 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_ALE__GPIO6_IO08            0x26c 0x654 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_CLE__NAND_CLE              0x270 0x658 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_CLE__GPIO6_IO07            0x270 0x658 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_CS0__NAND_CE0_B            0x274 0x65c 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_CS0__GPIO6_IO11            0x274 0x65c 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_CS1__NAND_CE1_B            0x278 0x660 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_CS1__SD4_VSELECT           0x278 0x660 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_CS1__SD3_VSELECT           0x278 0x660 0x000 0x2 0x0
+#define MX6QDL_PAD_NANDF_CS1__GPIO6_IO14            0x278 0x660 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_CS2__NAND_CE2_B            0x27c 0x664 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_CS2__IPU1_SISG0            0x27c 0x664 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_CS2__ESAI_TX0              0x27c 0x664 0x844 0x2 0x1
+#define MX6QDL_PAD_NANDF_CS2__EIM_CRE               0x27c 0x664 0x000 0x3 0x0
+#define MX6QDL_PAD_NANDF_CS2__CCM_CLKO2             0x27c 0x664 0x000 0x4 0x0
+#define MX6QDL_PAD_NANDF_CS2__GPIO6_IO15            0x27c 0x664 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_CS3__NAND_CE3_B            0x280 0x668 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_CS3__IPU1_SISG1            0x280 0x668 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_CS3__ESAI_TX1              0x280 0x668 0x848 0x2 0x1
+#define MX6QDL_PAD_NANDF_CS3__EIM_ADDR26            0x280 0x668 0x000 0x3 0x0
+#define MX6QDL_PAD_NANDF_CS3__GPIO6_IO16            0x280 0x668 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_CS3__I2C4_SDA              0x280 0x668 0x884 0x9 0x2
+#define MX6QDL_PAD_NANDF_D0__NAND_DATA00            0x284 0x66c 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_D0__SD1_DATA4              0x284 0x66c 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_D0__GPIO2_IO00             0x284 0x66c 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_D1__NAND_DATA01            0x288 0x670 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_D1__SD1_DATA5              0x288 0x670 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_D1__GPIO2_IO01             0x288 0x670 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_D2__NAND_DATA02            0x28c 0x674 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_D2__SD1_DATA6              0x28c 0x674 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_D2__GPIO2_IO02             0x28c 0x674 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_D3__NAND_DATA03            0x290 0x678 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_D3__SD1_DATA7              0x290 0x678 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_D3__GPIO2_IO03             0x290 0x678 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_D4__NAND_DATA04            0x294 0x67c 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_D4__SD2_DATA4              0x294 0x67c 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_D4__GPIO2_IO04             0x294 0x67c 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_D5__NAND_DATA05            0x298 0x680 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_D5__SD2_DATA5              0x298 0x680 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_D5__GPIO2_IO05             0x298 0x680 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_D6__NAND_DATA06            0x29c 0x684 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_D6__SD2_DATA6              0x29c 0x684 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_D6__GPIO2_IO06             0x29c 0x684 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_D7__NAND_DATA07            0x2a0 0x688 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_D7__SD2_DATA7              0x2a0 0x688 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_D7__GPIO2_IO07             0x2a0 0x688 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_RB0__NAND_READY_B          0x2a4 0x68c 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_RB0__GPIO6_IO10            0x2a4 0x68c 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_WP_B__NAND_WP_B            0x2a8 0x690 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_WP_B__GPIO6_IO09           0x2a8 0x690 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_WP_B__I2C4_SCL             0x2a8 0x690 0x880 0x9 0x2
+#define MX6QDL_PAD_RGMII_RD0__HSI_RX_READY          0x2ac 0x694 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_RD0__RGMII_RD0             0x2ac 0x694 0x818 0x1 0x1
+#define MX6QDL_PAD_RGMII_RD0__GPIO6_IO25            0x2ac 0x694 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_RD1__HSI_TX_FLAG           0x2b0 0x698 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_RD1__RGMII_RD1             0x2b0 0x698 0x81c 0x1 0x1
+#define MX6QDL_PAD_RGMII_RD1__GPIO6_IO27            0x2b0 0x698 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_RD2__HSI_TX_DATA           0x2b4 0x69c 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_RD2__RGMII_RD2             0x2b4 0x69c 0x820 0x1 0x1
+#define MX6QDL_PAD_RGMII_RD2__GPIO6_IO28            0x2b4 0x69c 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_RD3__HSI_TX_WAKE           0x2b8 0x6a0 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_RD3__RGMII_RD3             0x2b8 0x6a0 0x824 0x1 0x1
+#define MX6QDL_PAD_RGMII_RD3__GPIO6_IO29            0x2b8 0x6a0 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_RX_CTL__USB_H3_DATA        0x2bc 0x6a4 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL       0x2bc 0x6a4 0x828 0x1 0x1
+#define MX6QDL_PAD_RGMII_RX_CTL__GPIO6_IO24         0x2bc 0x6a4 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_RXC__USB_H3_STROBE         0x2c0 0x6a8 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_RXC__RGMII_RXC             0x2c0 0x6a8 0x814 0x1 0x1
+#define MX6QDL_PAD_RGMII_RXC__GPIO6_IO30            0x2c0 0x6a8 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_TD0__HSI_TX_READY          0x2c4 0x6ac 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_TD0__RGMII_TD0             0x2c4 0x6ac 0x000 0x1 0x0
+#define MX6QDL_PAD_RGMII_TD0__GPIO6_IO20            0x2c4 0x6ac 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_TD1__HSI_RX_FLAG           0x2c8 0x6b0 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_TD1__RGMII_TD1             0x2c8 0x6b0 0x000 0x1 0x0
+#define MX6QDL_PAD_RGMII_TD1__GPIO6_IO21            0x2c8 0x6b0 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_TD2__HSI_RX_DATA           0x2cc 0x6b4 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_TD2__RGMII_TD2             0x2cc 0x6b4 0x000 0x1 0x0
+#define MX6QDL_PAD_RGMII_TD2__GPIO6_IO22            0x2cc 0x6b4 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_TD3__HSI_RX_WAKE           0x2d0 0x6b8 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_TD3__RGMII_TD3             0x2d0 0x6b8 0x000 0x1 0x0
+#define MX6QDL_PAD_RGMII_TD3__GPIO6_IO23            0x2d0 0x6b8 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_TX_CTL__USB_H2_STROBE      0x2d4 0x6bc 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL       0x2d4 0x6bc 0x000 0x1 0x0
+#define MX6QDL_PAD_RGMII_TX_CTL__GPIO6_IO26         0x2d4 0x6bc 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_TX_CTL__ENET_REF_CLK       0x2d4 0x6bc 0x80c 0x7 0x1
+#define MX6QDL_PAD_RGMII_TXC__USB_H2_DATA           0x2d8 0x6c0 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_TXC__RGMII_TXC             0x2d8 0x6c0 0x000 0x1 0x0
+#define MX6QDL_PAD_RGMII_TXC__SPDIF_EXT_CLK         0x2d8 0x6c0 0x8f4 0x2 0x1
+#define MX6QDL_PAD_RGMII_TXC__GPIO6_IO19            0x2d8 0x6c0 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_TXC__XTALOSC_REF_CLK_24M   0x2d8 0x6c0 0x000 0x7 0x0
+#define MX6QDL_PAD_SD1_CLK__SD1_CLK                 0x2dc 0x6c4 0x928 0x0 0x1
+#define MX6QDL_PAD_SD1_CLK__GPT_CLKIN               0x2dc 0x6c4 0x000 0x3 0x0
+#define MX6QDL_PAD_SD1_CLK__GPIO1_IO20              0x2dc 0x6c4 0x000 0x5 0x0
+#define MX6QDL_PAD_SD1_CMD__SD1_CMD                 0x2e0 0x6c8 0x000 0x0 0x0
+#define MX6QDL_PAD_SD1_CMD__PWM4_OUT                0x2e0 0x6c8 0x000 0x2 0x0
+#define MX6QDL_PAD_SD1_CMD__GPT_COMPARE1            0x2e0 0x6c8 0x000 0x3 0x0
+#define MX6QDL_PAD_SD1_CMD__GPIO1_IO18              0x2e0 0x6c8 0x000 0x5 0x0
+#define MX6QDL_PAD_SD1_DAT0__SD1_DATA0              0x2e4 0x6cc 0x000 0x0 0x0
+#define MX6QDL_PAD_SD1_DAT0__GPT_CAPTURE1           0x2e4 0x6cc 0x000 0x3 0x0
+#define MX6QDL_PAD_SD1_DAT0__GPIO1_IO16             0x2e4 0x6cc 0x000 0x5 0x0
+#define MX6QDL_PAD_SD1_DAT1__SD1_DATA1              0x2e8 0x6d0 0x000 0x0 0x0
+#define MX6QDL_PAD_SD1_DAT1__PWM3_OUT               0x2e8 0x6d0 0x000 0x2 0x0
+#define MX6QDL_PAD_SD1_DAT1__GPT_CAPTURE2           0x2e8 0x6d0 0x000 0x3 0x0
+#define MX6QDL_PAD_SD1_DAT1__GPIO1_IO17             0x2e8 0x6d0 0x000 0x5 0x0
+#define MX6QDL_PAD_SD1_DAT2__SD1_DATA2              0x2ec 0x6d4 0x000 0x0 0x0
+#define MX6QDL_PAD_SD1_DAT2__GPT_COMPARE2           0x2ec 0x6d4 0x000 0x2 0x0
+#define MX6QDL_PAD_SD1_DAT2__PWM2_OUT               0x2ec 0x6d4 0x000 0x3 0x0
+#define MX6QDL_PAD_SD1_DAT2__WDOG1_B                0x2ec 0x6d4 0x000 0x4 0x0
+#define MX6QDL_PAD_SD1_DAT2__GPIO1_IO19             0x2ec 0x6d4 0x000 0x5 0x0
+#define MX6QDL_PAD_SD1_DAT2__WDOG1_RESET_B_DEB      0x2ec 0x6d4 0x000 0x6 0x0
+#define MX6QDL_PAD_SD1_DAT3__SD1_DATA3              0x2f0 0x6d8 0x000 0x0 0x0
+#define MX6QDL_PAD_SD1_DAT3__GPT_COMPARE3           0x2f0 0x6d8 0x000 0x2 0x0
+#define MX6QDL_PAD_SD1_DAT3__PWM1_OUT               0x2f0 0x6d8 0x000 0x3 0x0
+#define MX6QDL_PAD_SD1_DAT3__WDOG2_B                0x2f0 0x6d8 0x000 0x4 0x0
+#define MX6QDL_PAD_SD1_DAT3__GPIO1_IO21             0x2f0 0x6d8 0x000 0x5 0x0
+#define MX6QDL_PAD_SD1_DAT3__WDOG2_RESET_B_DEB      0x2f0 0x6d8 0x000 0x6 0x0
+#define MX6QDL_PAD_SD2_CLK__SD2_CLK                 0x2f4 0x6dc 0x930 0x0 0x1
+#define MX6QDL_PAD_SD2_CLK__KEY_COL5                0x2f4 0x6dc 0x8c0 0x2 0x3
+#define MX6QDL_PAD_SD2_CLK__AUD4_RXFS               0x2f4 0x6dc 0x7a4 0x3 0x1
+#define MX6QDL_PAD_SD2_CLK__GPIO1_IO10              0x2f4 0x6dc 0x000 0x5 0x0
+#define MX6QDL_PAD_SD2_CMD__SD2_CMD                 0x2f8 0x6e0 0x000 0x0 0x0
+#define MX6QDL_PAD_SD2_CMD__KEY_ROW5                0x2f8 0x6e0 0x8cc 0x2 0x2
+#define MX6QDL_PAD_SD2_CMD__AUD4_RXC                0x2f8 0x6e0 0x7a0 0x3 0x1
+#define MX6QDL_PAD_SD2_CMD__GPIO1_IO11              0x2f8 0x6e0 0x000 0x5 0x0
+#define MX6QDL_PAD_SD2_DAT0__SD2_DATA0              0x2fc 0x6e4 0x000 0x0 0x0
+#define MX6QDL_PAD_SD2_DAT0__AUD4_RXD               0x2fc 0x6e4 0x798 0x3 0x1
+#define MX6QDL_PAD_SD2_DAT0__KEY_ROW7               0x2fc 0x6e4 0x8d4 0x4 0x2
+#define MX6QDL_PAD_SD2_DAT0__GPIO1_IO15             0x2fc 0x6e4 0x000 0x5 0x0
+#define MX6QDL_PAD_SD2_DAT0__DCIC2_OUT              0x2fc 0x6e4 0x000 0x6 0x0
+#define MX6QDL_PAD_SD2_DAT1__SD2_DATA1              0x300 0x6e8 0x000 0x0 0x0
+#define MX6QDL_PAD_SD2_DAT1__EIM_CS2_B              0x300 0x6e8 0x000 0x2 0x0
+#define MX6QDL_PAD_SD2_DAT1__AUD4_TXFS              0x300 0x6e8 0x7ac 0x3 0x1
+#define MX6QDL_PAD_SD2_DAT1__KEY_COL7               0x300 0x6e8 0x8c8 0x4 0x2
+#define MX6QDL_PAD_SD2_DAT1__GPIO1_IO14             0x300 0x6e8 0x000 0x5 0x0
+#define MX6QDL_PAD_SD2_DAT2__SD2_DATA2              0x304 0x6ec 0x000 0x0 0x0
+#define MX6QDL_PAD_SD2_DAT2__EIM_CS3_B              0x304 0x6ec 0x000 0x2 0x0
+#define MX6QDL_PAD_SD2_DAT2__AUD4_TXD               0x304 0x6ec 0x79c 0x3 0x1
+#define MX6QDL_PAD_SD2_DAT2__KEY_ROW6               0x304 0x6ec 0x8d0 0x4 0x2
+#define MX6QDL_PAD_SD2_DAT2__GPIO1_IO13             0x304 0x6ec 0x000 0x5 0x0
+#define MX6QDL_PAD_SD2_DAT3__SD2_DATA3              0x308 0x6f0 0x000 0x0 0x0
+#define MX6QDL_PAD_SD2_DAT3__KEY_COL6               0x308 0x6f0 0x8c4 0x2 0x2
+#define MX6QDL_PAD_SD2_DAT3__AUD4_TXC               0x308 0x6f0 0x7a8 0x3 0x1
+#define MX6QDL_PAD_SD2_DAT3__GPIO1_IO12             0x308 0x6f0 0x000 0x5 0x0
+#define MX6QDL_PAD_SD3_CLK__SD3_CLK                 0x30c 0x6f4 0x934 0x0 0x1
+#define MX6QDL_PAD_SD3_CLK__UART2_RTS_B             0x30c 0x6f4 0x900 0x1 0x2
+#define MX6QDL_PAD_SD3_CLK__UART2_CTS_B             0x30c 0x6f4 0x000 0x1 0x0
+#define MX6QDL_PAD_SD3_CLK__FLEXCAN1_RX             0x30c 0x6f4 0x7c8 0x2 0x2
+#define MX6QDL_PAD_SD3_CLK__GPIO7_IO03              0x30c 0x6f4 0x000 0x5 0x0
+#define MX6QDL_PAD_SD3_CMD__SD3_CMD                 0x310 0x6f8 0x000 0x0 0x0
+#define MX6QDL_PAD_SD3_CMD__UART2_CTS_B             0x310 0x6f8 0x000 0x1 0x0
+#define MX6QDL_PAD_SD3_CMD__UART2_RTS_B             0x310 0x6f8 0x900 0x1 0x3
+#define MX6QDL_PAD_SD3_CMD__FLEXCAN1_TX             0x310 0x6f8 0x000 0x2 0x0
+#define MX6QDL_PAD_SD3_CMD__GPIO7_IO02              0x310 0x6f8 0x000 0x5 0x0
+#define MX6QDL_PAD_SD3_DAT0__SD3_DATA0              0x314 0x6fc 0x000 0x0 0x0
+#define MX6QDL_PAD_SD3_DAT0__UART1_CTS_B            0x314 0x6fc 0x000 0x1 0x0
+#define MX6QDL_PAD_SD3_DAT0__UART1_RTS_B            0x314 0x6fc 0x8f8 0x1 0x2
+#define MX6QDL_PAD_SD3_DAT0__FLEXCAN2_TX            0x314 0x6fc 0x000 0x2 0x0
+#define MX6QDL_PAD_SD3_DAT0__GPIO7_IO04             0x314 0x6fc 0x000 0x5 0x0
+#define MX6QDL_PAD_SD3_DAT1__SD3_DATA1              0x318 0x700 0x000 0x0 0x0
+#define MX6QDL_PAD_SD3_DAT1__UART1_RTS_B            0x318 0x700 0x8f8 0x1 0x3
+#define MX6QDL_PAD_SD3_DAT1__UART1_CTS_B            0x318 0x700 0x000 0x1 0x0
+#define MX6QDL_PAD_SD3_DAT1__FLEXCAN2_RX            0x318 0x700 0x7cc 0x2 0x1
+#define MX6QDL_PAD_SD3_DAT1__GPIO7_IO05             0x318 0x700 0x000 0x5 0x0
+#define MX6QDL_PAD_SD3_DAT2__SD3_DATA2              0x31c 0x704 0x000 0x0 0x0
+#define MX6QDL_PAD_SD3_DAT2__GPIO7_IO06             0x31c 0x704 0x000 0x5 0x0
+#define MX6QDL_PAD_SD3_DAT3__SD3_DATA3              0x320 0x708 0x000 0x0 0x0
+#define MX6QDL_PAD_SD3_DAT3__UART3_CTS_B            0x320 0x708 0x000 0x1 0x0
+#define MX6QDL_PAD_SD3_DAT3__UART3_RTS_B            0x320 0x708 0x908 0x1 0x4
+#define MX6QDL_PAD_SD3_DAT3__GPIO7_IO07             0x320 0x708 0x000 0x5 0x0
+#define MX6QDL_PAD_SD3_DAT4__SD3_DATA4              0x324 0x70c 0x000 0x0 0x0
+#define MX6QDL_PAD_SD3_DAT4__UART2_RX_DATA          0x324 0x70c 0x904 0x1 0x4
+#define MX6QDL_PAD_SD3_DAT4__UART2_TX_DATA          0x324 0x70c 0x000 0x1 0x0
+#define MX6QDL_PAD_SD3_DAT4__GPIO7_IO01             0x324 0x70c 0x000 0x5 0x0
+#define MX6QDL_PAD_SD3_DAT5__SD3_DATA5              0x328 0x710 0x000 0x0 0x0
+#define MX6QDL_PAD_SD3_DAT5__UART2_TX_DATA          0x328 0x710 0x000 0x1 0x0
+#define MX6QDL_PAD_SD3_DAT5__UART2_RX_DATA          0x328 0x710 0x904 0x1 0x5
+#define MX6QDL_PAD_SD3_DAT5__GPIO7_IO00             0x328 0x710 0x000 0x5 0x0
+#define MX6QDL_PAD_SD3_DAT6__SD3_DATA6              0x32c 0x714 0x000 0x0 0x0
+#define MX6QDL_PAD_SD3_DAT6__UART1_RX_DATA          0x32c 0x714 0x8fc 0x1 0x2
+#define MX6QDL_PAD_SD3_DAT6__UART1_TX_DATA          0x32c 0x714 0x000 0x1 0x0
+#define MX6QDL_PAD_SD3_DAT6__GPIO6_IO18             0x32c 0x714 0x000 0x5 0x0
+#define MX6QDL_PAD_SD3_DAT7__SD3_DATA7              0x330 0x718 0x000 0x0 0x0
+#define MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA          0x330 0x718 0x000 0x1 0x0
+#define MX6QDL_PAD_SD3_DAT7__UART1_RX_DATA          0x330 0x718 0x8fc 0x1 0x3
+#define MX6QDL_PAD_SD3_DAT7__GPIO6_IO17             0x330 0x718 0x000 0x5 0x0
+#define MX6QDL_PAD_SD3_RST__SD3_RESET               0x334 0x71c 0x000 0x0 0x0
+#define MX6QDL_PAD_SD3_RST__UART3_RTS_B             0x334 0x71c 0x908 0x1 0x5
+#define MX6QDL_PAD_SD3_RST__UART3_CTS_B             0x334 0x71c 0x000 0x1 0x0
+#define MX6QDL_PAD_SD3_RST__GPIO7_IO08              0x334 0x71c 0x000 0x5 0x0
+#define MX6QDL_PAD_SD4_CLK__SD4_CLK                 0x338 0x720 0x938 0x0 0x1
+#define MX6QDL_PAD_SD4_CLK__NAND_WE_B               0x338 0x720 0x000 0x1 0x0
+#define MX6QDL_PAD_SD4_CLK__UART3_RX_DATA           0x338 0x720 0x90c 0x2 0x2
+#define MX6QDL_PAD_SD4_CLK__UART3_TX_DATA           0x338 0x720 0x000 0x2 0x0
+#define MX6QDL_PAD_SD4_CLK__GPIO7_IO10              0x338 0x720 0x000 0x5 0x0
+#define MX6QDL_PAD_SD4_CMD__SD4_CMD                 0x33c 0x724 0x000 0x0 0x0
+#define MX6QDL_PAD_SD4_CMD__NAND_RE_B               0x33c 0x724 0x000 0x1 0x0
+#define MX6QDL_PAD_SD4_CMD__UART3_TX_DATA           0x33c 0x724 0x000 0x2 0x0
+#define MX6QDL_PAD_SD4_CMD__UART3_RX_DATA           0x33c 0x724 0x90c 0x2 0x3
+#define MX6QDL_PAD_SD4_CMD__GPIO7_IO09              0x33c 0x724 0x000 0x5 0x0
+#define MX6QDL_PAD_SD4_DAT0__SD4_DATA0              0x340 0x728 0x000 0x1 0x0
+#define MX6QDL_PAD_SD4_DAT0__NAND_DQS               0x340 0x728 0x000 0x2 0x0
+#define MX6QDL_PAD_SD4_DAT0__GPIO2_IO08             0x340 0x728 0x000 0x5 0x0
+#define MX6QDL_PAD_SD4_DAT1__SD4_DATA1              0x344 0x72c 0x000 0x1 0x0
+#define MX6QDL_PAD_SD4_DAT1__PWM3_OUT               0x344 0x72c 0x000 0x2 0x0
+#define MX6QDL_PAD_SD4_DAT1__GPIO2_IO09             0x344 0x72c 0x000 0x5 0x0
+#define MX6QDL_PAD_SD4_DAT2__SD4_DATA2              0x348 0x730 0x000 0x1 0x0
+#define MX6QDL_PAD_SD4_DAT2__PWM4_OUT               0x348 0x730 0x000 0x2 0x0
+#define MX6QDL_PAD_SD4_DAT2__GPIO2_IO10             0x348 0x730 0x000 0x5 0x0
+#define MX6QDL_PAD_SD4_DAT3__SD4_DATA3              0x34c 0x734 0x000 0x1 0x0
+#define MX6QDL_PAD_SD4_DAT3__GPIO2_IO11             0x34c 0x734 0x000 0x5 0x0
+#define MX6QDL_PAD_SD4_DAT4__SD4_DATA4              0x350 0x738 0x000 0x1 0x0
+#define MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA          0x350 0x738 0x904 0x2 0x6
+#define MX6QDL_PAD_SD4_DAT4__UART2_TX_DATA          0x350 0x738 0x000 0x2 0x0
+#define MX6QDL_PAD_SD4_DAT4__GPIO2_IO12             0x350 0x738 0x000 0x5 0x0
+#define MX6QDL_PAD_SD4_DAT5__SD4_DATA5              0x354 0x73c 0x000 0x1 0x0
+#define MX6QDL_PAD_SD4_DAT5__UART2_RTS_B            0x354 0x73c 0x900 0x2 0x4
+#define MX6QDL_PAD_SD4_DAT5__UART2_CTS_B            0x354 0x73c 0x000 0x2 0x0
+#define MX6QDL_PAD_SD4_DAT5__GPIO2_IO13             0x354 0x73c 0x000 0x5 0x0
+#define MX6QDL_PAD_SD4_DAT6__SD4_DATA6              0x358 0x740 0x000 0x1 0x0
+#define MX6QDL_PAD_SD4_DAT6__UART2_CTS_B            0x358 0x740 0x000 0x2 0x0
+#define MX6QDL_PAD_SD4_DAT6__UART2_RTS_B            0x358 0x740 0x900 0x2 0x5
+#define MX6QDL_PAD_SD4_DAT6__GPIO2_IO14             0x358 0x740 0x000 0x5 0x0
+#define MX6QDL_PAD_SD4_DAT7__SD4_DATA7              0x35c 0x744 0x000 0x1 0x0
+#define MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA          0x35c 0x744 0x000 0x2 0x0
+#define MX6QDL_PAD_SD4_DAT7__UART2_RX_DATA          0x35c 0x744 0x904 0x2 0x7
+#define MX6QDL_PAD_SD4_DAT7__GPIO2_IO15             0x35c 0x744 0x000 0x5 0x0
 
 #endif /* __DTS_IMX6DL_PINFUNC_H */
diff --git a/arch/arm/boot/dts/imx6dl-sabreauto.dts b/arch/arm/boot/dts/imx6dl-sabreauto.dts
index 95da71185a4a..a6ce7b487ad7 100644
--- a/arch/arm/boot/dts/imx6dl-sabreauto.dts
+++ b/arch/arm/boot/dts/imx6dl-sabreauto.dts
@@ -15,25 +15,3 @@
         model = "Freescale i.MX6 DualLite/Solo SABRE Automotive Board";
         compatible = "fsl,imx6dl-sabreauto", "fsl,imx6dl";
 };
-
-&iomuxc {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_hog>;
-
-        hog {
-                pinctrl_hog: hoggrp {
-                        fsl,pins = <
-                                MX6DL_PAD_NANDF_CS2__GPIO6_IO15 0x80000000
-                                MX6DL_PAD_SD2_DAT2__GPIO1_IO13  0x80000000
-                        >;
-                };
-        };
-
-        ecspi1 {
-                pinctrl_ecspi1_sabreauto: ecspi1-sabreauto {
-                        fsl,pins = <
-                                MX6DL_PAD_EIM_D19__GPIO3_IO19  0x80000000
-                        >;
-                };
-        };
-};
diff --git a/arch/arm/boot/dts/imx6dl-sabresd.dts b/arch/arm/boot/dts/imx6dl-sabresd.dts
index 8989df2b89e5..1e45f2f9d0b6 100644
--- a/arch/arm/boot/dts/imx6dl-sabresd.dts
+++ b/arch/arm/boot/dts/imx6dl-sabresd.dts
@@ -15,22 +15,3 @@
         model = "Freescale i.MX6 DualLite SABRE Smart Device Board";
         compatible = "fsl,imx6dl-sabresd", "fsl,imx6dl";
 };
-
-&iomuxc {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_hog>;
-
-        hog {
-                pinctrl_hog: hoggrp {
-                        fsl,pins = <
-                                MX6DL_PAD_GPIO_4__GPIO1_IO04   0x80000000
-                                MX6DL_PAD_GPIO_5__GPIO1_IO05   0x80000000
-                                MX6DL_PAD_NANDF_D0__GPIO2_IO00 0x80000000
-                                MX6DL_PAD_NANDF_D1__GPIO2_IO01 0x80000000
-                                MX6DL_PAD_NANDF_D2__GPIO2_IO02 0x80000000
-                                MX6DL_PAD_NANDF_D3__GPIO2_IO03 0x80000000
-                                MX6DL_PAD_GPIO_0__CCM_CLKO1    0x130b0
-                        >;
-                };
-        };
-};
diff --git a/arch/arm/boot/dts/imx6dl-wandboard.dts b/arch/arm/boot/dts/imx6dl-wandboard.dts
index bfc59c3566a4..e672891c1626 100644
--- a/arch/arm/boot/dts/imx6dl-wandboard.dts
+++ b/arch/arm/boot/dts/imx6dl-wandboard.dts
@@ -10,6 +10,7 @@
  */
 /dts-v1/;
 #include "imx6dl.dtsi"
+#include "imx6qdl-wandboard.dtsi"
 
 / {
         model = "Wandboard i.MX6 Dual Lite Board";
@@ -19,26 +20,3 @@
                 reg = <0x10000000 0x40000000>;
         };
 };
-
-&fec {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_enet_1>;
-        phy-mode = "rgmii";
-        status = "okay";
-};
-
-&uart1 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_uart1_1>;
-        status = "okay";
-};
-
-&usbh1 {
-        status = "okay";
-};
-
-&usdhc3 {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_usdhc3_2>;
-        status = "okay";
-};
diff --git a/arch/arm/boot/dts/imx6dl.dtsi b/arch/arm/boot/dts/imx6dl.dtsi
index 2b3ecd679350..9e8ae118fdd4 100644
--- a/arch/arm/boot/dts/imx6dl.dtsi
+++ b/arch/arm/boot/dts/imx6dl.dtsi
@@ -8,8 +8,8 @@
  *
  */
 
-#include "imx6qdl.dtsi"
 #include "imx6dl-pinfunc.h"
+#include "imx6qdl.dtsi"
 
 / {
         cpus {
@@ -32,238 +32,15 @@
         };
 
         soc {
+                ocram: sram@00900000 {
+                        compatible = "mmio-sram";
+                        reg = <0x00900000 0x20000>;
+                        clocks = <&clks 142>;
+                };
+
                 aips1: aips-bus@02000000 {
                         iomuxc: iomuxc@020e0000 {
                                 compatible = "fsl,imx6dl-iomuxc";
-                                reg = <0x020e0000 0x4000>;
-
-                                audmux {
-                                        pinctrl_audmux_2: audmux-2 {
-                                                fsl,pins = <
-                                                        MX6DL_PAD_CSI0_DAT7__AUD3_RXD  0x80000000
-                                                        MX6DL_PAD_CSI0_DAT4__AUD3_TXC  0x80000000
-                                                        MX6DL_PAD_CSI0_DAT5__AUD3_TXD  0x80000000
-                                                        MX6DL_PAD_CSI0_DAT6__AUD3_TXFS 0x80000000
-                                                >;
-                                        };
-                                };
-
-                                ecspi1 {
-                                        pinctrl_ecspi1_1: ecspi1grp-1 {
-                                                fsl,pins = <
-                                                        MX6DL_PAD_EIM_D17__ECSPI1_MISO 0x100b1
-                                                        MX6DL_PAD_EIM_D18__ECSPI1_MOSI 0x100b1
-                                                        MX6DL_PAD_EIM_D16__ECSPI1_SCLK 0x100b1
-                                                >;
-                                        };
-                                };
-
-                                enet {
-                                        pinctrl_enet_1: enetgrp-1 {
-                                                fsl,pins = <
-                                                        MX6DL_PAD_ENET_MDIO__ENET_MDIO       0x1b0b0
-                                                        MX6DL_PAD_ENET_MDC__ENET_MDC         0x1b0b0
-                                                        MX6DL_PAD_RGMII_TXC__RGMII_TXC       0x1b0b0
-                                                        MX6DL_PAD_RGMII_TD0__RGMII_TD0       0x1b0b0
-                                                        MX6DL_PAD_RGMII_TD1__RGMII_TD1       0x1b0b0
-                                                        MX6DL_PAD_RGMII_TD2__RGMII_TD2       0x1b0b0
-                                                        MX6DL_PAD_RGMII_TD3__RGMII_TD3       0x1b0b0
-                                                        MX6DL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
-                                                        MX6DL_PAD_ENET_REF_CLK__ENET_TX_CLK  0x1b0b0
-                                                        MX6DL_PAD_RGMII_RXC__RGMII_RXC       0x1b0b0
-                                                        MX6DL_PAD_RGMII_RD0__RGMII_RD0       0x1b0b0
-                                                        MX6DL_PAD_RGMII_RD1__RGMII_RD1       0x1b0b0
-                                                        MX6DL_PAD_RGMII_RD2__RGMII_RD2       0x1b0b0
-                                                        MX6DL_PAD_RGMII_RD3__RGMII_RD3       0x1b0b0
-                                                        MX6DL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-                                                        MX6DL_PAD_GPIO_16__ENET_REF_CLK      0x4001b0a8
-                                                >;
-                                        };
-
-                                        pinctrl_enet_2: enetgrp-2 {
-                                                fsl,pins = <
-                                                        MX6DL_PAD_KEY_COL1__ENET_MDIO        0x1b0b0
-                                                        MX6DL_PAD_KEY_COL2__ENET_MDC         0x1b0b0
-                                                        MX6DL_PAD_RGMII_TXC__RGMII_TXC       0x1b0b0
-                                                        MX6DL_PAD_RGMII_TD0__RGMII_TD0       0x1b0b0
-                                                        MX6DL_PAD_RGMII_TD1__RGMII_TD1       0x1b0b0
-                                                        MX6DL_PAD_RGMII_TD2__RGMII_TD2       0x1b0b0
-                                                        MX6DL_PAD_RGMII_TD3__RGMII_TD3       0x1b0b0
-                                                        MX6DL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
-                                                        MX6DL_PAD_ENET_REF_CLK__ENET_TX_CLK  0x1b0b0
-                                                        MX6DL_PAD_RGMII_RXC__RGMII_RXC       0x1b0b0
-                                                        MX6DL_PAD_RGMII_RD0__RGMII_RD0       0x1b0b0
-                                                        MX6DL_PAD_RGMII_RD1__RGMII_RD1       0x1b0b0
-                                                        MX6DL_PAD_RGMII_RD2__RGMII_RD2       0x1b0b0
-                                                        MX6DL_PAD_RGMII_RD3__RGMII_RD3       0x1b0b0
-                                                        MX6DL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-                                                >;
-                                        };
-                                };
-
-                                gpmi-nand {
-                                        pinctrl_gpmi_nand_1: gpmi-nand-1 {
-                                                fsl,pins = <
-                                                        MX6DL_PAD_NANDF_CLE__NAND_CLE     0xb0b1
-                                                        MX6DL_PAD_NANDF_ALE__NAND_ALE     0xb0b1
-                                                        MX6DL_PAD_NANDF_WP_B__NAND_WP_B   0xb0b1
-                                                        MX6DL_PAD_NANDF_RB0__NAND_READY_B 0xb000
-                                                        MX6DL_PAD_NANDF_CS0__NAND_CE0_B   0xb0b1
-                                                        MX6DL_PAD_NANDF_CS1__NAND_CE1_B   0xb0b1
-                                                        MX6DL_PAD_SD4_CMD__NAND_RE_B      0xb0b1
-                                                        MX6DL_PAD_SD4_CLK__NAND_WE_B      0xb0b1
-                                                        MX6DL_PAD_NANDF_D0__NAND_DATA00   0xb0b1
-                                                        MX6DL_PAD_NANDF_D1__NAND_DATA01   0xb0b1
-                                                        MX6DL_PAD_NANDF_D2__NAND_DATA02   0xb0b1
-                                                        MX6DL_PAD_NANDF_D3__NAND_DATA03   0xb0b1
-                                                        MX6DL_PAD_NANDF_D4__NAND_DATA04   0xb0b1
-                                                        MX6DL_PAD_NANDF_D5__NAND_DATA05   0xb0b1
-                                                        MX6DL_PAD_NANDF_D6__NAND_DATA06   0xb0b1
-                                                        MX6DL_PAD_NANDF_D7__NAND_DATA07   0xb0b1
-                                                        MX6DL_PAD_SD4_DAT0__NAND_DQS      0x00b1
-                                                >;
-                                        };
-                                };
-
-                                i2c1 {
-                                        pinctrl_i2c1_2: i2c1grp-2 {
-                                                fsl,pins = <
-                                                        MX6DL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1
-                                                        MX6DL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1
-                                                >;
-                                        };
-                                };
-
-                                uart1 {
-                                        pinctrl_uart1_1: uart1grp-1 {
-                                                fsl,pins = <
-                                                        MX6DL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
-                                                        MX6DL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
-                                                >;
-                                        };
-                                };
-
-                                uart4 {
-                                        pinctrl_uart4_1: uart4grp-1 {
-                                                fsl,pins = <
-                                                        MX6DL_PAD_KEY_COL0__UART4_TX_DATA 0x1b0b1
-                                                        MX6DL_PAD_KEY_ROW0__UART4_RX_DATA 0x1b0b1
-                                                >;
-                                        };
-                                };
-
-                                usbotg {
-                                        pinctrl_usbotg_2: usbotggrp-2 {
-                                                fsl,pins = <
-                                                        MX6DL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
-                                                >;
-                                        };
-                                };
-
-                                usdhc2 {
-                                        pinctrl_usdhc2_1: usdhc2grp-1 {
-                                                fsl,pins = <
-                                                        MX6DL_PAD_SD2_CMD__SD2_CMD    0x17059
-                                                        MX6DL_PAD_SD2_CLK__SD2_CLK    0x10059
-                                                        MX6DL_PAD_SD2_DAT0__SD2_DATA0 0x17059
-                                                        MX6DL_PAD_SD2_DAT1__SD2_DATA1 0x17059
-                                                        MX6DL_PAD_SD2_DAT2__SD2_DATA2 0x17059
-                                                        MX6DL_PAD_SD2_DAT3__SD2_DATA3 0x17059
-                                                        MX6DL_PAD_NANDF_D4__SD2_DATA4 0x17059
-                                                        MX6DL_PAD_NANDF_D5__SD2_DATA5 0x17059
-                                                        MX6DL_PAD_NANDF_D6__SD2_DATA6 0x17059
-                                                        MX6DL_PAD_NANDF_D7__SD2_DATA7 0x17059
-                                                >;
-                                        };
-                                };
-
-                                usdhc3 {
-                                        pinctrl_usdhc3_1: usdhc3grp-1 {
-                                                fsl,pins = <
-                                                        MX6DL_PAD_SD3_CMD__SD3_CMD    0x17059
-                                                        MX6DL_PAD_SD3_CLK__SD3_CLK    0x10059
-                                                        MX6DL_PAD_SD3_DAT0__SD3_DATA0 0x17059
-                                                        MX6DL_PAD_SD3_DAT1__SD3_DATA1 0x17059
-                                                        MX6DL_PAD_SD3_DAT2__SD3_DATA2 0x17059
-                                                        MX6DL_PAD_SD3_DAT3__SD3_DATA3 0x17059
-                                                        MX6DL_PAD_SD3_DAT4__SD3_DATA4 0x17059
-                                                        MX6DL_PAD_SD3_DAT5__SD3_DATA5 0x17059
-                                                        MX6DL_PAD_SD3_DAT6__SD3_DATA6 0x17059
-                                                        MX6DL_PAD_SD3_DAT7__SD3_DATA7 0x17059
-                                                >;
-                                        };
-
-                                        pinctrl_usdhc3_2: usdhc3grp_2 {
-                                                fsl,pins = <
-                                                        MX6DL_PAD_SD3_CMD__SD3_CMD    0x17059
-                                                        MX6DL_PAD_SD3_CLK__SD3_CLK    0x10059
-                                                        MX6DL_PAD_SD3_DAT0__SD3_DATA0 0x17059
-                                                        MX6DL_PAD_SD3_DAT1__SD3_DATA1 0x17059
-                                                        MX6DL_PAD_SD3_DAT2__SD3_DATA2 0x17059
-                                                        MX6DL_PAD_SD3_DAT3__SD3_DATA3 0x17059
-                                                >;
-                                        };
-                                };
-
-                                weim {
-                                        pinctrl_weim_cs0_1: weim_cs0grp-1 {
-                                                fsl,pins = <
-                                                        MX6DL_PAD_EIM_CS0__EIM_CS0_B   0xb0b1
-                                                >;
-                                        };
-
-                                        pinctrl_weim_nor_1: weim_norgrp-1 {
-                                                fsl,pins = <
-                                                        MX6DL_PAD_EIM_OE__EIM_OE_B     0xb0b1
-                                                        MX6DL_PAD_EIM_RW__EIM_RW       0xb0b1
-                                                        MX6DL_PAD_EIM_WAIT__EIM_WAIT_B 0xb060
-                                                        /* data */
-                                                        MX6DL_PAD_EIM_D16__EIM_DATA16 0x1b0b0
-                                                        MX6DL_PAD_EIM_D17__EIM_DATA17 0x1b0b0
-                                                        MX6DL_PAD_EIM_D18__EIM_DATA18 0x1b0b0
-                                                        MX6DL_PAD_EIM_D19__EIM_DATA19 0x1b0b0
-                                                        MX6DL_PAD_EIM_D20__EIM_DATA20 0x1b0b0
-                                                        MX6DL_PAD_EIM_D21__EIM_DATA21 0x1b0b0
-                                                        MX6DL_PAD_EIM_D22__EIM_DATA22 0x1b0b0
-                                                        MX6DL_PAD_EIM_D23__EIM_DATA23 0x1b0b0
-                                                        MX6DL_PAD_EIM_D24__EIM_DATA24 0x1b0b0
-                                                        MX6DL_PAD_EIM_D25__EIM_DATA25 0x1b0b0
-                                                        MX6DL_PAD_EIM_D26__EIM_DATA26 0x1b0b0
-                                                        MX6DL_PAD_EIM_D27__EIM_DATA27 0x1b0b0
-                                                        MX6DL_PAD_EIM_D28__EIM_DATA28 0x1b0b0
-                                                        MX6DL_PAD_EIM_D29__EIM_DATA29 0x1b0b0
-                                                        MX6DL_PAD_EIM_D30__EIM_DATA30 0x1b0b0
-                                                        MX6DL_PAD_EIM_D31__EIM_DATA31 0x1b0b0
-                                                        /* address */
-                                                        MX6DL_PAD_EIM_A23__EIM_ADDR23 0xb0b1
-                                                        MX6DL_PAD_EIM_A22__EIM_ADDR22 0xb0b1
-                                                        MX6DL_PAD_EIM_A21__EIM_ADDR21 0xb0b1
-                                                        MX6DL_PAD_EIM_A20__EIM_ADDR20 0xb0b1
-                                                        MX6DL_PAD_EIM_A19__EIM_ADDR19 0xb0b1
-                                                        MX6DL_PAD_EIM_A18__EIM_ADDR18 0xb0b1
-                                                        MX6DL_PAD_EIM_A17__EIM_ADDR17 0xb0b1
-                                                        MX6DL_PAD_EIM_A16__EIM_ADDR16 0xb0b1
-                                                        MX6DL_PAD_EIM_DA15__EIM_AD15  0xb0b1
-                                                        MX6DL_PAD_EIM_DA14__EIM_AD14  0xb0b1
-                                                        MX6DL_PAD_EIM_DA13__EIM_AD13  0xb0b1
-                                                        MX6DL_PAD_EIM_DA12__EIM_AD12  0xb0b1
-                                                        MX6DL_PAD_EIM_DA11__EIM_AD11  0xb0b1
-                                                        MX6DL_PAD_EIM_DA10__EIM_AD10  0xb0b1
-                                                        MX6DL_PAD_EIM_DA9__EIM_AD09   0xb0b1
-                                                        MX6DL_PAD_EIM_DA8__EIM_AD08   0xb0b1
-                                                        MX6DL_PAD_EIM_DA7__EIM_AD07   0xb0b1
-                                                        MX6DL_PAD_EIM_DA6__EIM_AD06   0xb0b1
-                                                        MX6DL_PAD_EIM_DA5__EIM_AD05   0xb0b1
-                                                        MX6DL_PAD_EIM_DA4__EIM_AD04   0xb0b1
-                                                        MX6DL_PAD_EIM_DA3__EIM_AD03   0xb0b1
-                                                        MX6DL_PAD_EIM_DA2__EIM_AD02   0xb0b1
-                                                        MX6DL_PAD_EIM_DA1__EIM_AD01   0xb0b1
-                                                        MX6DL_PAD_EIM_DA0__EIM_AD00   0xb0b1
-                                                >;
-                                        };
-
-                                };
-
                         };
 
                         pxp: pxp@020f0000 {
@@ -294,3 +71,20 @@
                 };
         };
 };
+
+&ldb {
+        clocks = <&clks 33>, <&clks 34>,
+                 <&clks 39>, <&clks 40>,
+                 <&clks 135>, <&clks 136>;
+        clock-names = "di0_pll", "di1_pll",
+                      "di0_sel", "di1_sel",
+                      "di0", "di1";
+
+        lvds-channel@0 {
+                crtcs = <&ipu1 0>, <&ipu1 1>;
+        };
+
+        lvds-channel@1 {
+                crtcs = <&ipu1 0>, <&ipu1 1>;
+        };
+};
diff --git a/arch/arm/boot/dts/imx6q-arm2.dts b/arch/arm/boot/dts/imx6q-arm2.dts
index 4e54fde591bd..edf1bd967164 100644
--- a/arch/arm/boot/dts/imx6q-arm2.dts
+++ b/arch/arm/boot/dts/imx6q-arm2.dts
@@ -57,7 +57,7 @@
         hog {
                 pinctrl_hog: hoggrp {
                         fsl,pins = <
-                                MX6Q_PAD_EIM_D25__GPIO3_IO25 0x80000000
+                                MX6QDL_PAD_EIM_D25__GPIO3_IO25 0x80000000
                         >;
                 };
         };
@@ -65,8 +65,8 @@
         arm2 {
                 pinctrl_usdhc3_arm2: usdhc3grp-arm2 {
                         fsl,pins = <
-                                MX6Q_PAD_NANDF_CS0__GPIO6_IO11 0x80000000
-                                MX6Q_PAD_NANDF_CS1__GPIO6_IO14 0x80000000
+                                MX6QDL_PAD_NANDF_CS0__GPIO6_IO11 0x80000000
+                                MX6QDL_PAD_NANDF_CS1__GPIO6_IO14 0x80000000
                         >;
                 };
         };
@@ -97,6 +97,14 @@
         status = "okay";
 };
 
+&uart2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart2_2>;
+        fsl,dte-mode;
+        fsl,uart-has-rtscts;
+        status = "okay";
+};
+
 &uart4 {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_uart4_1>;
diff --git a/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi b/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi
index f5e1981025ed..1a3b50d4d8fa 100644
--- a/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi
+++ b/arch/arm/boot/dts/imx6q-phytec-pfla02.dtsi
@@ -20,6 +20,110 @@
         };
 };
 
+&ecspi3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_ecspi3_1>;
+        status = "okay";
+        fsl,spi-num-chipselects = <1>;
+        cs-gpios = <&gpio4 24 0>;
+
+        flash@0 {
+                compatible = "m25p80";
+                spi-max-frequency = <20000000>;
+                reg = <0>;
+        };
+};
+
+&i2c1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c1_1>;
+        status = "okay";
+
+        eeprom@50 {
+                compatible = "atmel,24c32";
+                reg = <0x50>;
+        };
+
+        pmic@58 {
+                compatible = "dialog,da9063";
+                reg = <0x58>;
+                interrupt-parent = <&gpio4>;
+                interrupts = <17 0x8>; /* active-low GPIO4_17 */
+
+                regulators {
+                        vddcore_reg: bcore1 {
+                                regulator-min-microvolt = <730000>;
+                                regulator-max-microvolt = <1380000>;
+                                regulator-always-on;
+                        };
+
+                        vddsoc_reg: bcore2 {
+                                regulator-min-microvolt = <730000>;
+                                regulator-max-microvolt = <1380000>;
+                                regulator-always-on;
+                        };
+
+                        vdd_ddr3_reg: bpro {
+                                regulator-min-microvolt = <1500000>;
+                                regulator-max-microvolt = <1500000>;
+                                regulator-always-on;
+                        };
+
+                        vdd_3v3_reg: bperi {
+                                regulator-min-microvolt = <3300000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
+
+                        vdd_buckmem_reg: bmem {
+                                regulator-min-microvolt = <3300000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
+
+                        vdd_eth_reg: bio {
+                                regulator-min-microvolt = <1200000>;
+                                regulator-max-microvolt = <1200000>;
+                                regulator-always-on;
+                        };
+
+                        vdd_eth_io_reg: ldo4 {
+                                regulator-min-microvolt = <2500000>;
+                                regulator-max-microvolt = <2500000>;
+                                regulator-always-on;
+                        };
+
+                        vdd_mx6_snvs_reg: ldo5 {
+                                regulator-min-microvolt = <3000000>;
+                                regulator-max-microvolt = <3000000>;
+                                regulator-always-on;
+                        };
+
+                        vdd_3v3_pmic_io_reg: ldo6 {
+                                regulator-min-microvolt = <3300000>;
+                                regulator-max-microvolt = <3300000>;
+                                regulator-always-on;
+                        };
+
+                        vdd_sd0_reg: ldo9 {
+                                regulator-min-microvolt = <3300000>;
+                                regulator-max-microvolt = <3300000>;
+                        };
+
+                        vdd_sd1_reg: ldo10 {
+                                regulator-min-microvolt = <3300000>;
+                                regulator-max-microvolt = <3300000>;
+                        };
+
+                        vdd_mx6_high_reg: ldo11 {
+                                regulator-min-microvolt = <3000000>;
+                                regulator-max-microvolt = <3000000>;
+                                regulator-always-on;
+                        };
+                };
+        };
+};
+
 &iomuxc {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_hog>;
@@ -27,7 +131,9 @@
         hog {
                 pinctrl_hog: hoggrp {
                         fsl,pins = <
-                                MX6Q_PAD_EIM_D23__GPIO3_IO23    0x80000000
+                                MX6QDL_PAD_EIM_D23__GPIO3_IO23 0x80000000
+                                MX6QDL_PAD_DISP0_DAT3__GPIO4_IO24 0x80000000 /* SPI NOR chipselect */
+                                MX6QDL_PAD_DI0_PIN15__GPIO4_IO17  0x80000000 /* PMIC interrupt */
                         >;
                 };
         };
@@ -35,8 +141,8 @@
         pfla02 {
                 pinctrl_usdhc3_pfla02: usdhc3grp-pfla02 {
                         fsl,pins = <
-                                MX6Q_PAD_ENET_RXD0__GPIO1_IO27  0x80000000
-                                MX6Q_PAD_ENET_TXD1__GPIO1_IO29  0x80000000
+                                MX6QDL_PAD_ENET_RXD0__GPIO1_IO27 0x80000000
+                                MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x80000000
                         >;
                 };
         };
diff --git a/arch/arm/boot/dts/imx6q-pinfunc.h b/arch/arm/boot/dts/imx6q-pinfunc.h
index faea6e1ada00..9bbe82bdee41 100644
--- a/arch/arm/boot/dts/imx6q-pinfunc.h
+++ b/arch/arm/boot/dts/imx6q-pinfunc.h
@@ -14,1028 +14,1032 @@
  * The pin function ID is a tuple of
  * <mux_reg conf_reg input_reg mux_mode input_val>
  */
-#define MX6Q_PAD_SD2_DAT1__SD2_DATA1              0x04c 0x360 0x000 0x0 0x0
-#define MX6Q_PAD_SD2_DAT1__ECSPI5_SS0             0x04c 0x360 0x834 0x1 0x0
-#define MX6Q_PAD_SD2_DAT1__EIM_CS2_B              0x04c 0x360 0x000 0x2 0x0
-#define MX6Q_PAD_SD2_DAT1__AUD4_TXFS              0x04c 0x360 0x7c8 0x3 0x0
-#define MX6Q_PAD_SD2_DAT1__KEY_COL7               0x04c 0x360 0x8f0 0x4 0x0
-#define MX6Q_PAD_SD2_DAT1__GPIO1_IO14             0x04c 0x360 0x000 0x5 0x0
-#define MX6Q_PAD_SD2_DAT2__SD2_DATA2              0x050 0x364 0x000 0x0 0x0
-#define MX6Q_PAD_SD2_DAT2__ECSPI5_SS1             0x050 0x364 0x838 0x1 0x0
-#define MX6Q_PAD_SD2_DAT2__EIM_CS3_B              0x050 0x364 0x000 0x2 0x0
-#define MX6Q_PAD_SD2_DAT2__AUD4_TXD               0x050 0x364 0x7b8 0x3 0x0
-#define MX6Q_PAD_SD2_DAT2__KEY_ROW6               0x050 0x364 0x8f8 0x4 0x0
-#define MX6Q_PAD_SD2_DAT2__GPIO1_IO13             0x050 0x364 0x000 0x5 0x0
-#define MX6Q_PAD_SD2_DAT0__SD2_DATA0              0x054 0x368 0x000 0x0 0x0
-#define MX6Q_PAD_SD2_DAT0__ECSPI5_MISO            0x054 0x368 0x82c 0x1 0x0
-#define MX6Q_PAD_SD2_DAT0__AUD4_RXD               0x054 0x368 0x7b4 0x3 0x0
-#define MX6Q_PAD_SD2_DAT0__KEY_ROW7               0x054 0x368 0x8fc 0x4 0x0
-#define MX6Q_PAD_SD2_DAT0__GPIO1_IO15             0x054 0x368 0x000 0x5 0x0
-#define MX6Q_PAD_SD2_DAT0__DCIC2_OUT              0x054 0x368 0x000 0x6 0x0
-#define MX6Q_PAD_RGMII_TXC__USB_H2_DATA           0x058 0x36c 0x000 0x0 0x0
-#define MX6Q_PAD_RGMII_TXC__RGMII_TXC             0x058 0x36c 0x000 0x1 0x0
-#define MX6Q_PAD_RGMII_TXC__SPDIF_EXT_CLK         0x058 0x36c 0x918 0x2 0x0
-#define MX6Q_PAD_RGMII_TXC__GPIO6_IO19            0x058 0x36c 0x000 0x5 0x0
-#define MX6Q_PAD_RGMII_TXC__XTALOSC_REF_CLK_24M   0x058 0x36c 0x000 0x7 0x0
-#define MX6Q_PAD_RGMII_TD0__HSI_TX_READY          0x05c 0x370 0x000 0x0 0x0
-#define MX6Q_PAD_RGMII_TD0__RGMII_TD0             0x05c 0x370 0x000 0x1 0x0
-#define MX6Q_PAD_RGMII_TD0__GPIO6_IO20            0x05c 0x370 0x000 0x5 0x0
-#define MX6Q_PAD_RGMII_TD1__HSI_RX_FLAG           0x060 0x374 0x000 0x0 0x0
-#define MX6Q_PAD_RGMII_TD1__RGMII_TD1             0x060 0x374 0x000 0x1 0x0
-#define MX6Q_PAD_RGMII_TD1__GPIO6_IO21            0x060 0x374 0x000 0x5 0x0
-#define MX6Q_PAD_RGMII_TD2__HSI_RX_DATA           0x064 0x378 0x000 0x0 0x0
-#define MX6Q_PAD_RGMII_TD2__RGMII_TD2             0x064 0x378 0x000 0x1 0x0
-#define MX6Q_PAD_RGMII_TD2__GPIO6_IO22            0x064 0x378 0x000 0x5 0x0
-#define MX6Q_PAD_RGMII_TD3__HSI_RX_WAKE           0x068 0x37c 0x000 0x0 0x0
-#define MX6Q_PAD_RGMII_TD3__RGMII_TD3             0x068 0x37c 0x000 0x1 0x0
-#define MX6Q_PAD_RGMII_TD3__GPIO6_IO23            0x068 0x37c 0x000 0x5 0x0
-#define MX6Q_PAD_RGMII_RX_CTL__USB_H3_DATA        0x06c 0x380 0x000 0x0 0x0
-#define MX6Q_PAD_RGMII_RX_CTL__RGMII_RX_CTL       0x06c 0x380 0x858 0x1 0x0
-#define MX6Q_PAD_RGMII_RX_CTL__GPIO6_IO24         0x06c 0x380 0x000 0x5 0x0
-#define MX6Q_PAD_RGMII_RD0__HSI_RX_READY          0x070 0x384 0x000 0x0 0x0
-#define MX6Q_PAD_RGMII_RD0__RGMII_RD0             0x070 0x384 0x848 0x1 0x0
-#define MX6Q_PAD_RGMII_RD0__GPIO6_IO25            0x070 0x384 0x000 0x5 0x0
-#define MX6Q_PAD_RGMII_TX_CTL__USB_H2_STROBE      0x074 0x388 0x000 0x0 0x0
-#define MX6Q_PAD_RGMII_TX_CTL__RGMII_TX_CTL       0x074 0x388 0x000 0x1 0x0
-#define MX6Q_PAD_RGMII_TX_CTL__GPIO6_IO26         0x074 0x388 0x000 0x5 0x0
-#define MX6Q_PAD_RGMII_TX_CTL__ENET_REF_CLK       0x074 0x388 0x83c 0x7 0x0
-#define MX6Q_PAD_RGMII_RD1__HSI_TX_FLAG           0x078 0x38c 0x000 0x0 0x0
-#define MX6Q_PAD_RGMII_RD1__RGMII_RD1             0x078 0x38c 0x84c 0x1 0x0
-#define MX6Q_PAD_RGMII_RD1__GPIO6_IO27            0x078 0x38c 0x000 0x5 0x0
-#define MX6Q_PAD_RGMII_RD2__HSI_TX_DATA           0x07c 0x390 0x000 0x0 0x0
-#define MX6Q_PAD_RGMII_RD2__RGMII_RD2             0x07c 0x390 0x850 0x1 0x0
-#define MX6Q_PAD_RGMII_RD2__GPIO6_IO28            0x07c 0x390 0x000 0x5 0x0
-#define MX6Q_PAD_RGMII_RD3__HSI_TX_WAKE           0x080 0x394 0x000 0x0 0x0
-#define MX6Q_PAD_RGMII_RD3__RGMII_RD3             0x080 0x394 0x854 0x1 0x0
-#define MX6Q_PAD_RGMII_RD3__GPIO6_IO29            0x080 0x394 0x000 0x5 0x0
-#define MX6Q_PAD_RGMII_RXC__USB_H3_STROBE         0x084 0x398 0x000 0x0 0x0
-#define MX6Q_PAD_RGMII_RXC__RGMII_RXC             0x084 0x398 0x844 0x1 0x0
-#define MX6Q_PAD_RGMII_RXC__GPIO6_IO30            0x084 0x398 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_A25__EIM_ADDR25              0x088 0x39c 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_A25__ECSPI4_SS1              0x088 0x39c 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_A25__ECSPI2_RDY              0x088 0x39c 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_A25__IPU1_DI1_PIN12          0x088 0x39c 0x000 0x3 0x0
-#define MX6Q_PAD_EIM_A25__IPU1_DI0_D1_CS          0x088 0x39c 0x000 0x4 0x0
-#define MX6Q_PAD_EIM_A25__GPIO5_IO02              0x088 0x39c 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_A25__HDMI_TX_CEC_LINE        0x088 0x39c 0x88c 0x6 0x0
-#define MX6Q_PAD_EIM_EB2__EIM_EB2_B               0x08c 0x3a0 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_EB2__ECSPI1_SS0              0x08c 0x3a0 0x800 0x1 0x0
-#define MX6Q_PAD_EIM_EB2__IPU2_CSI1_DATA19        0x08c 0x3a0 0x8d4 0x3 0x0
-#define MX6Q_PAD_EIM_EB2__HDMI_TX_DDC_SCL         0x08c 0x3a0 0x890 0x4 0x0
-#define MX6Q_PAD_EIM_EB2__GPIO2_IO30              0x08c 0x3a0 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_EB2__I2C2_SCL                0x08c 0x3a0 0x8a0 0x6 0x0
-#define MX6Q_PAD_EIM_EB2__SRC_BOOT_CFG30          0x08c 0x3a0 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_D16__EIM_DATA16              0x090 0x3a4 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_D16__ECSPI1_SCLK             0x090 0x3a4 0x7f4 0x1 0x0
-#define MX6Q_PAD_EIM_D16__IPU1_DI0_PIN05          0x090 0x3a4 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_D16__IPU2_CSI1_DATA18        0x090 0x3a4 0x8d0 0x3 0x0
-#define MX6Q_PAD_EIM_D16__HDMI_TX_DDC_SDA         0x090 0x3a4 0x894 0x4 0x0
-#define MX6Q_PAD_EIM_D16__GPIO3_IO16              0x090 0x3a4 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_D16__I2C2_SDA                0x090 0x3a4 0x8a4 0x6 0x0
-#define MX6Q_PAD_EIM_D17__EIM_DATA17              0x094 0x3a8 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_D17__ECSPI1_MISO             0x094 0x3a8 0x7f8 0x1 0x0
-#define MX6Q_PAD_EIM_D17__IPU1_DI0_PIN06          0x094 0x3a8 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_D17__IPU2_CSI1_PIXCLK        0x094 0x3a8 0x8e0 0x3 0x0
-#define MX6Q_PAD_EIM_D17__DCIC1_OUT               0x094 0x3a8 0x000 0x4 0x0
-#define MX6Q_PAD_EIM_D17__GPIO3_IO17              0x094 0x3a8 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_D17__I2C3_SCL                0x094 0x3a8 0x8a8 0x6 0x0
-#define MX6Q_PAD_EIM_D18__EIM_DATA18              0x098 0x3ac 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_D18__ECSPI1_MOSI             0x098 0x3ac 0x7fc 0x1 0x0
-#define MX6Q_PAD_EIM_D18__IPU1_DI0_PIN07          0x098 0x3ac 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_D18__IPU2_CSI1_DATA17        0x098 0x3ac 0x8cc 0x3 0x0
-#define MX6Q_PAD_EIM_D18__IPU1_DI1_D0_CS          0x098 0x3ac 0x000 0x4 0x0
-#define MX6Q_PAD_EIM_D18__GPIO3_IO18              0x098 0x3ac 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_D18__I2C3_SDA                0x098 0x3ac 0x8ac 0x6 0x0
-#define MX6Q_PAD_EIM_D19__EIM_DATA19              0x09c 0x3b0 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_D19__ECSPI1_SS1              0x09c 0x3b0 0x804 0x1 0x0
-#define MX6Q_PAD_EIM_D19__IPU1_DI0_PIN08          0x09c 0x3b0 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_D19__IPU2_CSI1_DATA16        0x09c 0x3b0 0x8c8 0x3 0x0
-#define MX6Q_PAD_EIM_D19__UART1_CTS_B             0x09c 0x3b0 0x000 0x4 0x0
-#define MX6Q_PAD_EIM_D19__UART1_RTS_B             0x09c 0x3b0 0x91c 0x4 0x0
-#define MX6Q_PAD_EIM_D19__GPIO3_IO19              0x09c 0x3b0 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_D19__EPIT1_OUT               0x09c 0x3b0 0x000 0x6 0x0
-#define MX6Q_PAD_EIM_D20__EIM_DATA20              0x0a0 0x3b4 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_D20__ECSPI4_SS0              0x0a0 0x3b4 0x824 0x1 0x0
-#define MX6Q_PAD_EIM_D20__IPU1_DI0_PIN16          0x0a0 0x3b4 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_D20__IPU2_CSI1_DATA15        0x0a0 0x3b4 0x8c4 0x3 0x0
-#define MX6Q_PAD_EIM_D20__UART1_RTS_B             0x0a0 0x3b4 0x91c 0x4 0x1
-#define MX6Q_PAD_EIM_D20__UART1_CTS_B             0x0a0 0x3b4 0x000 0x4 0x0
-#define MX6Q_PAD_EIM_D20__GPIO3_IO20              0x0a0 0x3b4 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_D20__EPIT2_OUT               0x0a0 0x3b4 0x000 0x6 0x0
-#define MX6Q_PAD_EIM_D21__EIM_DATA21              0x0a4 0x3b8 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_D21__ECSPI4_SCLK             0x0a4 0x3b8 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_D21__IPU1_DI0_PIN17          0x0a4 0x3b8 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_D21__IPU2_CSI1_DATA11        0x0a4 0x3b8 0x8b4 0x3 0x0
-#define MX6Q_PAD_EIM_D21__USB_OTG_OC              0x0a4 0x3b8 0x944 0x4 0x0
-#define MX6Q_PAD_EIM_D21__GPIO3_IO21              0x0a4 0x3b8 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_D21__I2C1_SCL                0x0a4 0x3b8 0x898 0x6 0x0
-#define MX6Q_PAD_EIM_D21__SPDIF_IN                0x0a4 0x3b8 0x914 0x7 0x0
-#define MX6Q_PAD_EIM_D22__EIM_DATA22              0x0a8 0x3bc 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_D22__ECSPI4_MISO             0x0a8 0x3bc 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_D22__IPU1_DI0_PIN01          0x0a8 0x3bc 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_D22__IPU2_CSI1_DATA10        0x0a8 0x3bc 0x8b0 0x3 0x0
-#define MX6Q_PAD_EIM_D22__USB_OTG_PWR             0x0a8 0x3bc 0x000 0x4 0x0
-#define MX6Q_PAD_EIM_D22__GPIO3_IO22              0x0a8 0x3bc 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_D22__SPDIF_OUT               0x0a8 0x3bc 0x000 0x6 0x0
-#define MX6Q_PAD_EIM_D23__EIM_DATA23              0x0ac 0x3c0 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_D23__IPU1_DI0_D0_CS          0x0ac 0x3c0 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_D23__UART3_CTS_B             0x0ac 0x3c0 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_D23__UART3_RTS_B             0x0ac 0x3c0 0x92c 0x2 0x0
-#define MX6Q_PAD_EIM_D23__UART1_DCD_B             0x0ac 0x3c0 0x000 0x3 0x0
-#define MX6Q_PAD_EIM_D23__IPU2_CSI1_DATA_EN       0x0ac 0x3c0 0x8d8 0x4 0x0
-#define MX6Q_PAD_EIM_D23__GPIO3_IO23              0x0ac 0x3c0 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_D23__IPU1_DI1_PIN02          0x0ac 0x3c0 0x000 0x6 0x0
-#define MX6Q_PAD_EIM_D23__IPU1_DI1_PIN14          0x0ac 0x3c0 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_EB3__EIM_EB3_B               0x0b0 0x3c4 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_EB3__ECSPI4_RDY              0x0b0 0x3c4 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_EB3__UART3_RTS_B             0x0b0 0x3c4 0x92c 0x2 0x1
-#define MX6Q_PAD_EIM_EB3__UART3_CTS_B             0x0b0 0x3c4 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_EB3__UART1_RI_B              0x0b0 0x3c4 0x000 0x3 0x0
-#define MX6Q_PAD_EIM_EB3__IPU2_CSI1_HSYNC         0x0b0 0x3c4 0x8dc 0x4 0x0
-#define MX6Q_PAD_EIM_EB3__GPIO2_IO31              0x0b0 0x3c4 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_EB3__IPU1_DI1_PIN03          0x0b0 0x3c4 0x000 0x6 0x0
-#define MX6Q_PAD_EIM_EB3__SRC_BOOT_CFG31          0x0b0 0x3c4 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_D24__EIM_DATA24              0x0b4 0x3c8 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_D24__ECSPI4_SS2              0x0b4 0x3c8 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_D24__UART3_TX_DATA           0x0b4 0x3c8 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_D24__UART3_RX_DATA           0x0b4 0x3c8 0x930 0x2 0x0
-#define MX6Q_PAD_EIM_D24__ECSPI1_SS2              0x0b4 0x3c8 0x808 0x3 0x0
-#define MX6Q_PAD_EIM_D24__ECSPI2_SS2              0x0b4 0x3c8 0x000 0x4 0x0
-#define MX6Q_PAD_EIM_D24__GPIO3_IO24              0x0b4 0x3c8 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_D24__AUD5_RXFS               0x0b4 0x3c8 0x7d8 0x6 0x0
-#define MX6Q_PAD_EIM_D24__UART1_DTR_B             0x0b4 0x3c8 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_D25__EIM_DATA25              0x0b8 0x3cc 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_D25__ECSPI4_SS3              0x0b8 0x3cc 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_D25__UART3_RX_DATA           0x0b8 0x3cc 0x930 0x2 0x1
-#define MX6Q_PAD_EIM_D25__UART3_TX_DATA           0x0b8 0x3cc 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_D25__ECSPI1_SS3              0x0b8 0x3cc 0x80c 0x3 0x0
-#define MX6Q_PAD_EIM_D25__ECSPI2_SS3              0x0b8 0x3cc 0x000 0x4 0x0
-#define MX6Q_PAD_EIM_D25__GPIO3_IO25              0x0b8 0x3cc 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_D25__AUD5_RXC                0x0b8 0x3cc 0x7d4 0x6 0x0
-#define MX6Q_PAD_EIM_D25__UART1_DSR_B             0x0b8 0x3cc 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_D26__EIM_DATA26              0x0bc 0x3d0 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_D26__IPU1_DI1_PIN11          0x0bc 0x3d0 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_D26__IPU1_CSI0_DATA01        0x0bc 0x3d0 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_D26__IPU2_CSI1_DATA14        0x0bc 0x3d0 0x8c0 0x3 0x0
-#define MX6Q_PAD_EIM_D26__UART2_TX_DATA           0x0bc 0x3d0 0x000 0x4 0x0
-#define MX6Q_PAD_EIM_D26__UART2_RX_DATA           0x0bc 0x3d0 0x928 0x4 0x0
-#define MX6Q_PAD_EIM_D26__GPIO3_IO26              0x0bc 0x3d0 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_D26__IPU1_SISG2              0x0bc 0x3d0 0x000 0x6 0x0
-#define MX6Q_PAD_EIM_D26__IPU1_DISP1_DATA22       0x0bc 0x3d0 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_D27__EIM_DATA27              0x0c0 0x3d4 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_D27__IPU1_DI1_PIN13          0x0c0 0x3d4 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_D27__IPU1_CSI0_DATA00        0x0c0 0x3d4 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_D27__IPU2_CSI1_DATA13        0x0c0 0x3d4 0x8bc 0x3 0x0
-#define MX6Q_PAD_EIM_D27__UART2_RX_DATA           0x0c0 0x3d4 0x928 0x4 0x1
-#define MX6Q_PAD_EIM_D27__UART2_TX_DATA           0x0c0 0x3d4 0x000 0x4 0x0
-#define MX6Q_PAD_EIM_D27__GPIO3_IO27              0x0c0 0x3d4 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_D27__IPU1_SISG3              0x0c0 0x3d4 0x000 0x6 0x0
-#define MX6Q_PAD_EIM_D27__IPU1_DISP1_DATA23       0x0c0 0x3d4 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_D28__EIM_DATA28              0x0c4 0x3d8 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_D28__I2C1_SDA                0x0c4 0x3d8 0x89c 0x1 0x0
-#define MX6Q_PAD_EIM_D28__ECSPI4_MOSI             0x0c4 0x3d8 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_D28__IPU2_CSI1_DATA12        0x0c4 0x3d8 0x8b8 0x3 0x0
-#define MX6Q_PAD_EIM_D28__UART2_CTS_B             0x0c4 0x3d8 0x000 0x4 0x0
-#define MX6Q_PAD_EIM_D28__UART2_RTS_B             0x0c4 0x3d8 0x924 0x4 0x0
-#define MX6Q_PAD_EIM_D28__GPIO3_IO28              0x0c4 0x3d8 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_D28__IPU1_EXT_TRIG           0x0c4 0x3d8 0x000 0x6 0x0
-#define MX6Q_PAD_EIM_D28__IPU1_DI0_PIN13          0x0c4 0x3d8 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_D29__EIM_DATA29              0x0c8 0x3dc 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_D29__IPU1_DI1_PIN15          0x0c8 0x3dc 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_D29__ECSPI4_SS0              0x0c8 0x3dc 0x824 0x2 0x1
-#define MX6Q_PAD_EIM_D29__UART2_RTS_B             0x0c8 0x3dc 0x924 0x4 0x1
-#define MX6Q_PAD_EIM_D29__UART2_CTS_B             0x0c8 0x3dc 0x000 0x4 0x0
-#define MX6Q_PAD_EIM_D29__GPIO3_IO29              0x0c8 0x3dc 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_D29__IPU2_CSI1_VSYNC         0x0c8 0x3dc 0x8e4 0x6 0x0
-#define MX6Q_PAD_EIM_D29__IPU1_DI0_PIN14          0x0c8 0x3dc 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_D30__EIM_DATA30              0x0cc 0x3e0 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_D30__IPU1_DISP1_DATA21       0x0cc 0x3e0 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_D30__IPU1_DI0_PIN11          0x0cc 0x3e0 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_D30__IPU1_CSI0_DATA03        0x0cc 0x3e0 0x000 0x3 0x0
-#define MX6Q_PAD_EIM_D30__UART3_CTS_B             0x0cc 0x3e0 0x000 0x4 0x0
-#define MX6Q_PAD_EIM_D30__UART3_RTS_B             0x0cc 0x3e0 0x92c 0x4 0x2
-#define MX6Q_PAD_EIM_D30__GPIO3_IO30              0x0cc 0x3e0 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_D30__USB_H1_OC               0x0cc 0x3e0 0x948 0x6 0x0
-#define MX6Q_PAD_EIM_D31__EIM_DATA31              0x0d0 0x3e4 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_D31__IPU1_DISP1_DATA20       0x0d0 0x3e4 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_D31__IPU1_DI0_PIN12          0x0d0 0x3e4 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_D31__IPU1_CSI0_DATA02        0x0d0 0x3e4 0x000 0x3 0x0
-#define MX6Q_PAD_EIM_D31__UART3_RTS_B             0x0d0 0x3e4 0x92c 0x4 0x3
-#define MX6Q_PAD_EIM_D31__UART3_CTS_B             0x0d0 0x3e4 0x000 0x4 0x0
-#define MX6Q_PAD_EIM_D31__GPIO3_IO31              0x0d0 0x3e4 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_D31__USB_H1_PWR              0x0d0 0x3e4 0x000 0x6 0x0
-#define MX6Q_PAD_EIM_A24__EIM_ADDR24              0x0d4 0x3e8 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_A24__IPU1_DISP1_DATA19       0x0d4 0x3e8 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_A24__IPU2_CSI1_DATA19        0x0d4 0x3e8 0x8d4 0x2 0x1
-#define MX6Q_PAD_EIM_A24__IPU2_SISG2              0x0d4 0x3e8 0x000 0x3 0x0
-#define MX6Q_PAD_EIM_A24__IPU1_SISG2              0x0d4 0x3e8 0x000 0x4 0x0
-#define MX6Q_PAD_EIM_A24__GPIO5_IO04              0x0d4 0x3e8 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_A24__SRC_BOOT_CFG24          0x0d4 0x3e8 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_A23__EIM_ADDR23              0x0d8 0x3ec 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_A23__IPU1_DISP1_DATA18       0x0d8 0x3ec 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_A23__IPU2_CSI1_DATA18        0x0d8 0x3ec 0x8d0 0x2 0x1
-#define MX6Q_PAD_EIM_A23__IPU2_SISG3              0x0d8 0x3ec 0x000 0x3 0x0
-#define MX6Q_PAD_EIM_A23__IPU1_SISG3              0x0d8 0x3ec 0x000 0x4 0x0
-#define MX6Q_PAD_EIM_A23__GPIO6_IO06              0x0d8 0x3ec 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_A23__SRC_BOOT_CFG23          0x0d8 0x3ec 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_A22__EIM_ADDR22              0x0dc 0x3f0 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_A22__IPU1_DISP1_DATA17       0x0dc 0x3f0 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_A22__IPU2_CSI1_DATA17        0x0dc 0x3f0 0x8cc 0x2 0x1
-#define MX6Q_PAD_EIM_A22__GPIO2_IO16              0x0dc 0x3f0 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_A22__SRC_BOOT_CFG22          0x0dc 0x3f0 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_A21__EIM_ADDR21              0x0e0 0x3f4 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_A21__IPU1_DISP1_DATA16       0x0e0 0x3f4 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_A21__IPU2_CSI1_DATA16        0x0e0 0x3f4 0x8c8 0x2 0x1
-#define MX6Q_PAD_EIM_A21__GPIO2_IO17              0x0e0 0x3f4 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_A21__SRC_BOOT_CFG21          0x0e0 0x3f4 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_A20__EIM_ADDR20              0x0e4 0x3f8 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_A20__IPU1_DISP1_DATA15       0x0e4 0x3f8 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_A20__IPU2_CSI1_DATA15        0x0e4 0x3f8 0x8c4 0x2 0x1
-#define MX6Q_PAD_EIM_A20__GPIO2_IO18              0x0e4 0x3f8 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_A20__SRC_BOOT_CFG20          0x0e4 0x3f8 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_A19__EIM_ADDR19              0x0e8 0x3fc 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_A19__IPU1_DISP1_DATA14       0x0e8 0x3fc 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_A19__IPU2_CSI1_DATA14        0x0e8 0x3fc 0x8c0 0x2 0x1
-#define MX6Q_PAD_EIM_A19__GPIO2_IO19              0x0e8 0x3fc 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_A19__SRC_BOOT_CFG19          0x0e8 0x3fc 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_A18__EIM_ADDR18              0x0ec 0x400 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_A18__IPU1_DISP1_DATA13       0x0ec 0x400 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_A18__IPU2_CSI1_DATA13        0x0ec 0x400 0x8bc 0x2 0x1
-#define MX6Q_PAD_EIM_A18__GPIO2_IO20              0x0ec 0x400 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_A18__SRC_BOOT_CFG18          0x0ec 0x400 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_A17__EIM_ADDR17              0x0f0 0x404 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_A17__IPU1_DISP1_DATA12       0x0f0 0x404 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_A17__IPU2_CSI1_DATA12        0x0f0 0x404 0x8b8 0x2 0x1
-#define MX6Q_PAD_EIM_A17__GPIO2_IO21              0x0f0 0x404 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_A17__SRC_BOOT_CFG17          0x0f0 0x404 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_A16__EIM_ADDR16              0x0f4 0x408 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_A16__IPU1_DI1_DISP_CLK       0x0f4 0x408 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_A16__IPU2_CSI1_PIXCLK        0x0f4 0x408 0x8e0 0x2 0x1
-#define MX6Q_PAD_EIM_A16__GPIO2_IO22              0x0f4 0x408 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_A16__SRC_BOOT_CFG16          0x0f4 0x408 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_CS0__EIM_CS0_B               0x0f8 0x40c 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_CS0__IPU1_DI1_PIN05          0x0f8 0x40c 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_CS0__ECSPI2_SCLK             0x0f8 0x40c 0x810 0x2 0x0
-#define MX6Q_PAD_EIM_CS0__GPIO2_IO23              0x0f8 0x40c 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_CS1__EIM_CS1_B               0x0fc 0x410 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_CS1__IPU1_DI1_PIN06          0x0fc 0x410 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_CS1__ECSPI2_MOSI             0x0fc 0x410 0x818 0x2 0x0
-#define MX6Q_PAD_EIM_CS1__GPIO2_IO24              0x0fc 0x410 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_OE__EIM_OE_B                 0x100 0x414 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_OE__IPU1_DI1_PIN07           0x100 0x414 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_OE__ECSPI2_MISO              0x100 0x414 0x814 0x2 0x0
-#define MX6Q_PAD_EIM_OE__GPIO2_IO25               0x100 0x414 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_RW__EIM_RW                   0x104 0x418 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_RW__IPU1_DI1_PIN08           0x104 0x418 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_RW__ECSPI2_SS0               0x104 0x418 0x81c 0x2 0x0
-#define MX6Q_PAD_EIM_RW__GPIO2_IO26               0x104 0x418 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_RW__SRC_BOOT_CFG29           0x104 0x418 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_LBA__EIM_LBA_B               0x108 0x41c 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_LBA__IPU1_DI1_PIN17          0x108 0x41c 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_LBA__ECSPI2_SS1              0x108 0x41c 0x820 0x2 0x0
-#define MX6Q_PAD_EIM_LBA__GPIO2_IO27              0x108 0x41c 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_LBA__SRC_BOOT_CFG26          0x108 0x41c 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_EB0__EIM_EB0_B               0x10c 0x420 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_EB0__IPU1_DISP1_DATA11       0x10c 0x420 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_EB0__IPU2_CSI1_DATA11        0x10c 0x420 0x8b4 0x2 0x1
-#define MX6Q_PAD_EIM_EB0__CCM_PMIC_READY          0x10c 0x420 0x7f0 0x4 0x0
-#define MX6Q_PAD_EIM_EB0__GPIO2_IO28              0x10c 0x420 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_EB0__SRC_BOOT_CFG27          0x10c 0x420 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_EB1__EIM_EB1_B               0x110 0x424 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_EB1__IPU1_DISP1_DATA10       0x110 0x424 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_EB1__IPU2_CSI1_DATA10        0x110 0x424 0x8b0 0x2 0x1
-#define MX6Q_PAD_EIM_EB1__GPIO2_IO29              0x110 0x424 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_EB1__SRC_BOOT_CFG28          0x110 0x424 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_DA0__EIM_AD00                0x114 0x428 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_DA0__IPU1_DISP1_DATA09       0x114 0x428 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_DA0__IPU2_CSI1_DATA09        0x114 0x428 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_DA0__GPIO3_IO00              0x114 0x428 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_DA0__SRC_BOOT_CFG00          0x114 0x428 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_DA1__EIM_AD01                0x118 0x42c 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_DA1__IPU1_DISP1_DATA08       0x118 0x42c 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_DA1__IPU2_CSI1_DATA08        0x118 0x42c 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_DA1__GPIO3_IO01              0x118 0x42c 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_DA1__SRC_BOOT_CFG01          0x118 0x42c 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_DA2__EIM_AD02                0x11c 0x430 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_DA2__IPU1_DISP1_DATA07       0x11c 0x430 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_DA2__IPU2_CSI1_DATA07        0x11c 0x430 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_DA2__GPIO3_IO02              0x11c 0x430 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_DA2__SRC_BOOT_CFG02          0x11c 0x430 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_DA3__EIM_AD03                0x120 0x434 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_DA3__IPU1_DISP1_DATA06       0x120 0x434 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_DA3__IPU2_CSI1_DATA06        0x120 0x434 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_DA3__GPIO3_IO03              0x120 0x434 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_DA3__SRC_BOOT_CFG03          0x120 0x434 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_DA4__EIM_AD04                0x124 0x438 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_DA4__IPU1_DISP1_DATA05       0x124 0x438 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_DA4__IPU2_CSI1_DATA05        0x124 0x438 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_DA4__GPIO3_IO04              0x124 0x438 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_DA4__SRC_BOOT_CFG04          0x124 0x438 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_DA5__EIM_AD05                0x128 0x43c 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_DA5__IPU1_DISP1_DATA04       0x128 0x43c 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_DA5__IPU2_CSI1_DATA04        0x128 0x43c 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_DA5__GPIO3_IO05              0x128 0x43c 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_DA5__SRC_BOOT_CFG05          0x128 0x43c 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_DA6__EIM_AD06                0x12c 0x440 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_DA6__IPU1_DISP1_DATA03       0x12c 0x440 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_DA6__IPU2_CSI1_DATA03        0x12c 0x440 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_DA6__GPIO3_IO06              0x12c 0x440 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_DA6__SRC_BOOT_CFG06          0x12c 0x440 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_DA7__EIM_AD07                0x130 0x444 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_DA7__IPU1_DISP1_DATA02       0x130 0x444 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_DA7__IPU2_CSI1_DATA02        0x130 0x444 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_DA7__GPIO3_IO07              0x130 0x444 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_DA7__SRC_BOOT_CFG07          0x130 0x444 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_DA8__EIM_AD08                0x134 0x448 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_DA8__IPU1_DISP1_DATA01       0x134 0x448 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_DA8__IPU2_CSI1_DATA01        0x134 0x448 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_DA8__GPIO3_IO08              0x134 0x448 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_DA8__SRC_BOOT_CFG08          0x134 0x448 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_DA9__EIM_AD09                0x138 0x44c 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_DA9__IPU1_DISP1_DATA00       0x138 0x44c 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_DA9__IPU2_CSI1_DATA00        0x138 0x44c 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_DA9__GPIO3_IO09              0x138 0x44c 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_DA9__SRC_BOOT_CFG09          0x138 0x44c 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_DA10__EIM_AD10               0x13c 0x450 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_DA10__IPU1_DI1_PIN15         0x13c 0x450 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_DA10__IPU2_CSI1_DATA_EN      0x13c 0x450 0x8d8 0x2 0x1
-#define MX6Q_PAD_EIM_DA10__GPIO3_IO10             0x13c 0x450 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_DA10__SRC_BOOT_CFG10         0x13c 0x450 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_DA11__EIM_AD11               0x140 0x454 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_DA11__IPU1_DI1_PIN02         0x140 0x454 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_DA11__IPU2_CSI1_HSYNC        0x140 0x454 0x8dc 0x2 0x1
-#define MX6Q_PAD_EIM_DA11__GPIO3_IO11             0x140 0x454 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_DA11__SRC_BOOT_CFG11         0x140 0x454 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_DA12__EIM_AD12               0x144 0x458 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_DA12__IPU1_DI1_PIN03         0x144 0x458 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_DA12__IPU2_CSI1_VSYNC        0x144 0x458 0x8e4 0x2 0x1
-#define MX6Q_PAD_EIM_DA12__GPIO3_IO12             0x144 0x458 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_DA12__SRC_BOOT_CFG12         0x144 0x458 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_DA13__EIM_AD13               0x148 0x45c 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_DA13__IPU1_DI1_D0_CS         0x148 0x45c 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_DA13__GPIO3_IO13             0x148 0x45c 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_DA13__SRC_BOOT_CFG13         0x148 0x45c 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_DA14__EIM_AD14               0x14c 0x460 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_DA14__IPU1_DI1_D1_CS         0x14c 0x460 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_DA14__GPIO3_IO14             0x14c 0x460 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_DA14__SRC_BOOT_CFG14         0x14c 0x460 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_DA15__EIM_AD15               0x150 0x464 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_DA15__IPU1_DI1_PIN01         0x150 0x464 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_DA15__IPU1_DI1_PIN04         0x150 0x464 0x000 0x2 0x0
-#define MX6Q_PAD_EIM_DA15__GPIO3_IO15             0x150 0x464 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_DA15__SRC_BOOT_CFG15         0x150 0x464 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_WAIT__EIM_WAIT_B             0x154 0x468 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_WAIT__EIM_DTACK_B            0x154 0x468 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_WAIT__GPIO5_IO00             0x154 0x468 0x000 0x5 0x0
-#define MX6Q_PAD_EIM_WAIT__SRC_BOOT_CFG25         0x154 0x468 0x000 0x7 0x0
-#define MX6Q_PAD_EIM_BCLK__EIM_BCLK               0x158 0x46c 0x000 0x0 0x0
-#define MX6Q_PAD_EIM_BCLK__IPU1_DI1_PIN16         0x158 0x46c 0x000 0x1 0x0
-#define MX6Q_PAD_EIM_BCLK__GPIO6_IO31             0x158 0x46c 0x000 0x5 0x0
-#define MX6Q_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK  0x15c 0x470 0x000 0x0 0x0
-#define MX6Q_PAD_DI0_DISP_CLK__IPU2_DI0_DISP_CLK  0x15c 0x470 0x000 0x1 0x0
-#define MX6Q_PAD_DI0_DISP_CLK__GPIO4_IO16         0x15c 0x470 0x000 0x5 0x0
-#define MX6Q_PAD_DI0_PIN15__IPU1_DI0_PIN15        0x160 0x474 0x000 0x0 0x0
-#define MX6Q_PAD_DI0_PIN15__IPU2_DI0_PIN15        0x160 0x474 0x000 0x1 0x0
-#define MX6Q_PAD_DI0_PIN15__AUD6_TXC              0x160 0x474 0x000 0x2 0x0
-#define MX6Q_PAD_DI0_PIN15__GPIO4_IO17            0x160 0x474 0x000 0x5 0x0
-#define MX6Q_PAD_DI0_PIN2__IPU1_DI0_PIN02         0x164 0x478 0x000 0x0 0x0
-#define MX6Q_PAD_DI0_PIN2__IPU2_DI0_PIN02         0x164 0x478 0x000 0x1 0x0
-#define MX6Q_PAD_DI0_PIN2__AUD6_TXD               0x164 0x478 0x000 0x2 0x0
-#define MX6Q_PAD_DI0_PIN2__GPIO4_IO18             0x164 0x478 0x000 0x5 0x0
-#define MX6Q_PAD_DI0_PIN3__IPU1_DI0_PIN03         0x168 0x47c 0x000 0x0 0x0
-#define MX6Q_PAD_DI0_PIN3__IPU2_DI0_PIN03         0x168 0x47c 0x000 0x1 0x0
-#define MX6Q_PAD_DI0_PIN3__AUD6_TXFS              0x168 0x47c 0x000 0x2 0x0
-#define MX6Q_PAD_DI0_PIN3__GPIO4_IO19             0x168 0x47c 0x000 0x5 0x0
-#define MX6Q_PAD_DI0_PIN4__IPU1_DI0_PIN04         0x16c 0x480 0x000 0x0 0x0
-#define MX6Q_PAD_DI0_PIN4__IPU2_DI0_PIN04         0x16c 0x480 0x000 0x1 0x0
-#define MX6Q_PAD_DI0_PIN4__AUD6_RXD               0x16c 0x480 0x000 0x2 0x0
-#define MX6Q_PAD_DI0_PIN4__SD1_WP                 0x16c 0x480 0x94c 0x3 0x0
-#define MX6Q_PAD_DI0_PIN4__GPIO4_IO20             0x16c 0x480 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT0__IPU1_DISP0_DATA00    0x170 0x484 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT0__IPU2_DISP0_DATA00    0x170 0x484 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT0__ECSPI3_SCLK          0x170 0x484 0x000 0x2 0x0
-#define MX6Q_PAD_DISP0_DAT0__GPIO4_IO21           0x170 0x484 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT1__IPU1_DISP0_DATA01    0x174 0x488 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT1__IPU2_DISP0_DATA01    0x174 0x488 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT1__ECSPI3_MOSI          0x174 0x488 0x000 0x2 0x0
-#define MX6Q_PAD_DISP0_DAT1__GPIO4_IO22           0x174 0x488 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT2__IPU1_DISP0_DATA02    0x178 0x48c 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT2__IPU2_DISP0_DATA02    0x178 0x48c 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT2__ECSPI3_MISO          0x178 0x48c 0x000 0x2 0x0
-#define MX6Q_PAD_DISP0_DAT2__GPIO4_IO23           0x178 0x48c 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT3__IPU1_DISP0_DATA03    0x17c 0x490 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT3__IPU2_DISP0_DATA03    0x17c 0x490 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT3__ECSPI3_SS0           0x17c 0x490 0x000 0x2 0x0
-#define MX6Q_PAD_DISP0_DAT3__GPIO4_IO24           0x17c 0x490 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT4__IPU1_DISP0_DATA04    0x180 0x494 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT4__IPU2_DISP0_DATA04    0x180 0x494 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT4__ECSPI3_SS1           0x180 0x494 0x000 0x2 0x0
-#define MX6Q_PAD_DISP0_DAT4__GPIO4_IO25           0x180 0x494 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT5__IPU1_DISP0_DATA05    0x184 0x498 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT5__IPU2_DISP0_DATA05    0x184 0x498 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT5__ECSPI3_SS2           0x184 0x498 0x000 0x2 0x0
-#define MX6Q_PAD_DISP0_DAT5__AUD6_RXFS            0x184 0x498 0x000 0x3 0x0
-#define MX6Q_PAD_DISP0_DAT5__GPIO4_IO26           0x184 0x498 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT6__IPU1_DISP0_DATA06    0x188 0x49c 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT6__IPU2_DISP0_DATA06    0x188 0x49c 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT6__ECSPI3_SS3           0x188 0x49c 0x000 0x2 0x0
-#define MX6Q_PAD_DISP0_DAT6__AUD6_RXC             0x188 0x49c 0x000 0x3 0x0
-#define MX6Q_PAD_DISP0_DAT6__GPIO4_IO27           0x188 0x49c 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT7__IPU1_DISP0_DATA07    0x18c 0x4a0 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT7__IPU2_DISP0_DATA07    0x18c 0x4a0 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT7__ECSPI3_RDY           0x18c 0x4a0 0x000 0x2 0x0
-#define MX6Q_PAD_DISP0_DAT7__GPIO4_IO28           0x18c 0x4a0 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT8__IPU1_DISP0_DATA08    0x190 0x4a4 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT8__IPU2_DISP0_DATA08    0x190 0x4a4 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT8__PWM1_OUT             0x190 0x4a4 0x000 0x2 0x0
-#define MX6Q_PAD_DISP0_DAT8__WDOG1_B              0x190 0x4a4 0x000 0x3 0x0
-#define MX6Q_PAD_DISP0_DAT8__GPIO4_IO29           0x190 0x4a4 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT9__IPU1_DISP0_DATA09    0x194 0x4a8 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT9__IPU2_DISP0_DATA09    0x194 0x4a8 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT9__PWM2_OUT             0x194 0x4a8 0x000 0x2 0x0
-#define MX6Q_PAD_DISP0_DAT9__WDOG2_B              0x194 0x4a8 0x000 0x3 0x0
-#define MX6Q_PAD_DISP0_DAT9__GPIO4_IO30           0x194 0x4a8 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT10__IPU1_DISP0_DATA10   0x198 0x4ac 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT10__IPU2_DISP0_DATA10   0x198 0x4ac 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT10__GPIO4_IO31          0x198 0x4ac 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT11__IPU1_DISP0_DATA11   0x19c 0x4b0 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT11__IPU2_DISP0_DATA11   0x19c 0x4b0 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT11__GPIO5_IO05          0x19c 0x4b0 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT12__IPU1_DISP0_DATA12   0x1a0 0x4b4 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT12__IPU2_DISP0_DATA12   0x1a0 0x4b4 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT12__GPIO5_IO06          0x1a0 0x4b4 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT13__IPU1_DISP0_DATA13   0x1a4 0x4b8 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT13__IPU2_DISP0_DATA13   0x1a4 0x4b8 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT13__AUD5_RXFS           0x1a4 0x4b8 0x7d8 0x3 0x1
-#define MX6Q_PAD_DISP0_DAT13__GPIO5_IO07          0x1a4 0x4b8 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT14__IPU1_DISP0_DATA14   0x1a8 0x4bc 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT14__IPU2_DISP0_DATA14   0x1a8 0x4bc 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT14__AUD5_RXC            0x1a8 0x4bc 0x7d4 0x3 0x1
-#define MX6Q_PAD_DISP0_DAT14__GPIO5_IO08          0x1a8 0x4bc 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT15__IPU1_DISP0_DATA15   0x1ac 0x4c0 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT15__IPU2_DISP0_DATA15   0x1ac 0x4c0 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT15__ECSPI1_SS1          0x1ac 0x4c0 0x804 0x2 0x1
-#define MX6Q_PAD_DISP0_DAT15__ECSPI2_SS1          0x1ac 0x4c0 0x820 0x3 0x1
-#define MX6Q_PAD_DISP0_DAT15__GPIO5_IO09          0x1ac 0x4c0 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT16__IPU1_DISP0_DATA16   0x1b0 0x4c4 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT16__IPU2_DISP0_DATA16   0x1b0 0x4c4 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT16__ECSPI2_MOSI         0x1b0 0x4c4 0x818 0x2 0x1
-#define MX6Q_PAD_DISP0_DAT16__AUD5_TXC            0x1b0 0x4c4 0x7dc 0x3 0x0
-#define MX6Q_PAD_DISP0_DAT16__SDMA_EXT_EVENT0     0x1b0 0x4c4 0x90c 0x4 0x0
-#define MX6Q_PAD_DISP0_DAT16__GPIO5_IO10          0x1b0 0x4c4 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT17__IPU1_DISP0_DATA17   0x1b4 0x4c8 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT17__IPU2_DISP0_DATA17   0x1b4 0x4c8 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT17__ECSPI2_MISO         0x1b4 0x4c8 0x814 0x2 0x1
-#define MX6Q_PAD_DISP0_DAT17__AUD5_TXD            0x1b4 0x4c8 0x7d0 0x3 0x0
-#define MX6Q_PAD_DISP0_DAT17__SDMA_EXT_EVENT1     0x1b4 0x4c8 0x910 0x4 0x0
-#define MX6Q_PAD_DISP0_DAT17__GPIO5_IO11          0x1b4 0x4c8 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT18__IPU1_DISP0_DATA18   0x1b8 0x4cc 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT18__IPU2_DISP0_DATA18   0x1b8 0x4cc 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT18__ECSPI2_SS0          0x1b8 0x4cc 0x81c 0x2 0x1
-#define MX6Q_PAD_DISP0_DAT18__AUD5_TXFS           0x1b8 0x4cc 0x7e0 0x3 0x0
-#define MX6Q_PAD_DISP0_DAT18__AUD4_RXFS           0x1b8 0x4cc 0x7c0 0x4 0x0
-#define MX6Q_PAD_DISP0_DAT18__GPIO5_IO12          0x1b8 0x4cc 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT18__EIM_CS2_B           0x1b8 0x4cc 0x000 0x7 0x0
-#define MX6Q_PAD_DISP0_DAT19__IPU1_DISP0_DATA19   0x1bc 0x4d0 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT19__IPU2_DISP0_DATA19   0x1bc 0x4d0 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT19__ECSPI2_SCLK         0x1bc 0x4d0 0x810 0x2 0x1
-#define MX6Q_PAD_DISP0_DAT19__AUD5_RXD            0x1bc 0x4d0 0x7cc 0x3 0x0
-#define MX6Q_PAD_DISP0_DAT19__AUD4_RXC            0x1bc 0x4d0 0x7bc 0x4 0x0
-#define MX6Q_PAD_DISP0_DAT19__GPIO5_IO13          0x1bc 0x4d0 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT19__EIM_CS3_B           0x1bc 0x4d0 0x000 0x7 0x0
-#define MX6Q_PAD_DISP0_DAT20__IPU1_DISP0_DATA20   0x1c0 0x4d4 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT20__IPU2_DISP0_DATA20   0x1c0 0x4d4 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT20__ECSPI1_SCLK         0x1c0 0x4d4 0x7f4 0x2 0x1
-#define MX6Q_PAD_DISP0_DAT20__AUD4_TXC            0x1c0 0x4d4 0x7c4 0x3 0x0
-#define MX6Q_PAD_DISP0_DAT20__GPIO5_IO14          0x1c0 0x4d4 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT21__IPU1_DISP0_DATA21   0x1c4 0x4d8 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT21__IPU2_DISP0_DATA21   0x1c4 0x4d8 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT21__ECSPI1_MOSI         0x1c4 0x4d8 0x7fc 0x2 0x1
-#define MX6Q_PAD_DISP0_DAT21__AUD4_TXD            0x1c4 0x4d8 0x7b8 0x3 0x1
-#define MX6Q_PAD_DISP0_DAT21__GPIO5_IO15          0x1c4 0x4d8 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT22__IPU1_DISP0_DATA22   0x1c8 0x4dc 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT22__IPU2_DISP0_DATA22   0x1c8 0x4dc 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT22__ECSPI1_MISO         0x1c8 0x4dc 0x7f8 0x2 0x1
-#define MX6Q_PAD_DISP0_DAT22__AUD4_TXFS           0x1c8 0x4dc 0x7c8 0x3 0x1
-#define MX6Q_PAD_DISP0_DAT22__GPIO5_IO16          0x1c8 0x4dc 0x000 0x5 0x0
-#define MX6Q_PAD_DISP0_DAT23__IPU1_DISP0_DATA23   0x1cc 0x4e0 0x000 0x0 0x0
-#define MX6Q_PAD_DISP0_DAT23__IPU2_DISP0_DATA23   0x1cc 0x4e0 0x000 0x1 0x0
-#define MX6Q_PAD_DISP0_DAT23__ECSPI1_SS0          0x1cc 0x4e0 0x800 0x2 0x1
-#define MX6Q_PAD_DISP0_DAT23__AUD4_RXD            0x1cc 0x4e0 0x7b4 0x3 0x1
-#define MX6Q_PAD_DISP0_DAT23__GPIO5_IO17          0x1cc 0x4e0 0x000 0x5 0x0
-#define MX6Q_PAD_ENET_MDIO__ENET_MDIO             0x1d0 0x4e4 0x840 0x1 0x0
-#define MX6Q_PAD_ENET_MDIO__ESAI_RX_CLK           0x1d0 0x4e4 0x86c 0x2 0x0
-#define MX6Q_PAD_ENET_MDIO__ENET_1588_EVENT1_OUT  0x1d0 0x4e4 0x000 0x4 0x0
-#define MX6Q_PAD_ENET_MDIO__GPIO1_IO22            0x1d0 0x4e4 0x000 0x5 0x0
-#define MX6Q_PAD_ENET_MDIO__SPDIF_LOCK            0x1d0 0x4e4 0x000 0x6 0x0
-#define MX6Q_PAD_ENET_REF_CLK__ENET_TX_CLK        0x1d4 0x4e8 0x000 0x1 0x0
-#define MX6Q_PAD_ENET_REF_CLK__ESAI_RX_FS         0x1d4 0x4e8 0x85c 0x2 0x0
-#define MX6Q_PAD_ENET_REF_CLK__GPIO1_IO23         0x1d4 0x4e8 0x000 0x5 0x0
-#define MX6Q_PAD_ENET_REF_CLK__SPDIF_SR_CLK       0x1d4 0x4e8 0x000 0x6 0x0
-#define MX6Q_PAD_ENET_RX_ER__USB_OTG_ID           0x1d8 0x4ec 0x000 0x0 0x0
-#define MX6Q_PAD_ENET_RX_ER__ENET_RX_ER           0x1d8 0x4ec 0x000 0x1 0x0
-#define MX6Q_PAD_ENET_RX_ER__ESAI_RX_HF_CLK       0x1d8 0x4ec 0x864 0x2 0x0
-#define MX6Q_PAD_ENET_RX_ER__SPDIF_IN             0x1d8 0x4ec 0x914 0x3 0x1
-#define MX6Q_PAD_ENET_RX_ER__ENET_1588_EVENT2_OUT 0x1d8 0x4ec 0x000 0x4 0x0
-#define MX6Q_PAD_ENET_RX_ER__GPIO1_IO24           0x1d8 0x4ec 0x000 0x5 0x0
-#define MX6Q_PAD_ENET_CRS_DV__ENET_RX_EN          0x1dc 0x4f0 0x858 0x1 0x1
-#define MX6Q_PAD_ENET_CRS_DV__ESAI_TX_CLK         0x1dc 0x4f0 0x870 0x2 0x0
-#define MX6Q_PAD_ENET_CRS_DV__SPDIF_EXT_CLK       0x1dc 0x4f0 0x918 0x3 0x1
-#define MX6Q_PAD_ENET_CRS_DV__GPIO1_IO25          0x1dc 0x4f0 0x000 0x5 0x0
-#define MX6Q_PAD_ENET_RXD1__MLB_SIG               0x1e0 0x4f4 0x908 0x0 0x0
-#define MX6Q_PAD_ENET_RXD1__ENET_RX_DATA1         0x1e0 0x4f4 0x84c 0x1 0x1
-#define MX6Q_PAD_ENET_RXD1__ESAI_TX_FS            0x1e0 0x4f4 0x860 0x2 0x0
-#define MX6Q_PAD_ENET_RXD1__ENET_1588_EVENT3_OUT  0x1e0 0x4f4 0x000 0x4 0x0
-#define MX6Q_PAD_ENET_RXD1__GPIO1_IO26            0x1e0 0x4f4 0x000 0x5 0x0
-#define MX6Q_PAD_ENET_RXD0__ENET_RX_DATA0         0x1e4 0x4f8 0x848 0x1 0x1
-#define MX6Q_PAD_ENET_RXD0__ESAI_TX_HF_CLK        0x1e4 0x4f8 0x868 0x2 0x0
-#define MX6Q_PAD_ENET_RXD0__SPDIF_OUT             0x1e4 0x4f8 0x000 0x3 0x0
-#define MX6Q_PAD_ENET_RXD0__GPIO1_IO27            0x1e4 0x4f8 0x000 0x5 0x0
-#define MX6Q_PAD_ENET_TX_EN__ENET_TX_EN           0x1e8 0x4fc 0x000 0x1 0x0
-#define MX6Q_PAD_ENET_TX_EN__ESAI_TX3_RX2         0x1e8 0x4fc 0x880 0x2 0x0
-#define MX6Q_PAD_ENET_TX_EN__GPIO1_IO28           0x1e8 0x4fc 0x000 0x5 0x0
-#define MX6Q_PAD_ENET_TXD1__MLB_CLK               0x1ec 0x500 0x900 0x0 0x0
-#define MX6Q_PAD_ENET_TXD1__ENET_TX_DATA1         0x1ec 0x500 0x000 0x1 0x0
-#define MX6Q_PAD_ENET_TXD1__ESAI_TX2_RX3          0x1ec 0x500 0x87c 0x2 0x0
-#define MX6Q_PAD_ENET_TXD1__ENET_1588_EVENT0_IN   0x1ec 0x500 0x000 0x4 0x0
-#define MX6Q_PAD_ENET_TXD1__GPIO1_IO29            0x1ec 0x500 0x000 0x5 0x0
-#define MX6Q_PAD_ENET_TXD0__ENET_TX_DATA0         0x1f0 0x504 0x000 0x1 0x0
-#define MX6Q_PAD_ENET_TXD0__ESAI_TX4_RX1          0x1f0 0x504 0x884 0x2 0x0
-#define MX6Q_PAD_ENET_TXD0__GPIO1_IO30            0x1f0 0x504 0x000 0x5 0x0
-#define MX6Q_PAD_ENET_MDC__MLB_DATA               0x1f4 0x508 0x904 0x0 0x0
-#define MX6Q_PAD_ENET_MDC__ENET_MDC               0x1f4 0x508 0x000 0x1 0x0
-#define MX6Q_PAD_ENET_MDC__ESAI_TX5_RX0           0x1f4 0x508 0x888 0x2 0x0
-#define MX6Q_PAD_ENET_MDC__ENET_1588_EVENT1_IN    0x1f4 0x508 0x000 0x4 0x0
-#define MX6Q_PAD_ENET_MDC__GPIO1_IO31             0x1f4 0x508 0x000 0x5 0x0
-#define MX6Q_PAD_KEY_COL0__ECSPI1_SCLK            0x1f8 0x5c8 0x7f4 0x0 0x2
-#define MX6Q_PAD_KEY_COL0__ENET_RX_DATA3          0x1f8 0x5c8 0x854 0x1 0x1
-#define MX6Q_PAD_KEY_COL0__AUD5_TXC               0x1f8 0x5c8 0x7dc 0x2 0x1
-#define MX6Q_PAD_KEY_COL0__KEY_COL0               0x1f8 0x5c8 0x000 0x3 0x0
-#define MX6Q_PAD_KEY_COL0__UART4_TX_DATA          0x1f8 0x5c8 0x000 0x4 0x0
-#define MX6Q_PAD_KEY_COL0__UART4_RX_DATA          0x1f8 0x5c8 0x938 0x4 0x0
-#define MX6Q_PAD_KEY_COL0__GPIO4_IO06             0x1f8 0x5c8 0x000 0x5 0x0
-#define MX6Q_PAD_KEY_COL0__DCIC1_OUT              0x1f8 0x5c8 0x000 0x6 0x0
-#define MX6Q_PAD_KEY_ROW0__ECSPI1_MOSI            0x1fc 0x5cc 0x7fc 0x0 0x2
-#define MX6Q_PAD_KEY_ROW0__ENET_TX_DATA3          0x1fc 0x5cc 0x000 0x1 0x0
-#define MX6Q_PAD_KEY_ROW0__AUD5_TXD               0x1fc 0x5cc 0x7d0 0x2 0x1
-#define MX6Q_PAD_KEY_ROW0__KEY_ROW0               0x1fc 0x5cc 0x000 0x3 0x0
-#define MX6Q_PAD_KEY_ROW0__UART4_RX_DATA          0x1fc 0x5cc 0x938 0x4 0x1
-#define MX6Q_PAD_KEY_ROW0__UART4_TX_DATA          0x1fc 0x5cc 0x000 0x4 0x0
-#define MX6Q_PAD_KEY_ROW0__GPIO4_IO07             0x1fc 0x5cc 0x000 0x5 0x0
-#define MX6Q_PAD_KEY_ROW0__DCIC2_OUT              0x1fc 0x5cc 0x000 0x6 0x0
-#define MX6Q_PAD_KEY_COL1__ECSPI1_MISO            0x200 0x5d0 0x7f8 0x0 0x2
-#define MX6Q_PAD_KEY_COL1__ENET_MDIO              0x200 0x5d0 0x840 0x1 0x1
-#define MX6Q_PAD_KEY_COL1__AUD5_TXFS              0x200 0x5d0 0x7e0 0x2 0x1
-#define MX6Q_PAD_KEY_COL1__KEY_COL1               0x200 0x5d0 0x000 0x3 0x0
-#define MX6Q_PAD_KEY_COL1__UART5_TX_DATA          0x200 0x5d0 0x000 0x4 0x0
-#define MX6Q_PAD_KEY_COL1__UART5_RX_DATA          0x200 0x5d0 0x940 0x4 0x0
-#define MX6Q_PAD_KEY_COL1__GPIO4_IO08             0x200 0x5d0 0x000 0x5 0x0
-#define MX6Q_PAD_KEY_COL1__SD1_VSELECT            0x200 0x5d0 0x000 0x6 0x0
-#define MX6Q_PAD_KEY_ROW1__ECSPI1_SS0             0x204 0x5d4 0x800 0x0 0x2
-#define MX6Q_PAD_KEY_ROW1__ENET_COL               0x204 0x5d4 0x000 0x1 0x0
-#define MX6Q_PAD_KEY_ROW1__AUD5_RXD               0x204 0x5d4 0x7cc 0x2 0x1
-#define MX6Q_PAD_KEY_ROW1__KEY_ROW1               0x204 0x5d4 0x000 0x3 0x0
-#define MX6Q_PAD_KEY_ROW1__UART5_RX_DATA          0x204 0x5d4 0x940 0x4 0x1
-#define MX6Q_PAD_KEY_ROW1__UART5_TX_DATA          0x204 0x5d4 0x000 0x4 0x0
-#define MX6Q_PAD_KEY_ROW1__GPIO4_IO09             0x204 0x5d4 0x000 0x5 0x0
-#define MX6Q_PAD_KEY_ROW1__SD2_VSELECT            0x204 0x5d4 0x000 0x6 0x0
-#define MX6Q_PAD_KEY_COL2__ECSPI1_SS1             0x208 0x5d8 0x804 0x0 0x2
-#define MX6Q_PAD_KEY_COL2__ENET_RX_DATA2          0x208 0x5d8 0x850 0x1 0x1
-#define MX6Q_PAD_KEY_COL2__FLEXCAN1_TX            0x208 0x5d8 0x000 0x2 0x0
-#define MX6Q_PAD_KEY_COL2__KEY_COL2               0x208 0x5d8 0x000 0x3 0x0
-#define MX6Q_PAD_KEY_COL2__ENET_MDC               0x208 0x5d8 0x000 0x4 0x0
-#define MX6Q_PAD_KEY_COL2__GPIO4_IO10             0x208 0x5d8 0x000 0x5 0x0
-#define MX6Q_PAD_KEY_COL2__USB_H1_PWR_CTL_WAKE    0x208 0x5d8 0x000 0x6 0x0
-#define MX6Q_PAD_KEY_ROW2__ECSPI1_SS2             0x20c 0x5dc 0x808 0x0 0x1
-#define MX6Q_PAD_KEY_ROW2__ENET_TX_DATA2          0x20c 0x5dc 0x000 0x1 0x0
-#define MX6Q_PAD_KEY_ROW2__FLEXCAN1_RX            0x20c 0x5dc 0x7e4 0x2 0x0
-#define MX6Q_PAD_KEY_ROW2__KEY_ROW2               0x20c 0x5dc 0x000 0x3 0x0
-#define MX6Q_PAD_KEY_ROW2__SD2_VSELECT            0x20c 0x5dc 0x000 0x4 0x0
-#define MX6Q_PAD_KEY_ROW2__GPIO4_IO11             0x20c 0x5dc 0x000 0x5 0x0
-#define MX6Q_PAD_KEY_ROW2__HDMI_TX_CEC_LINE       0x20c 0x5dc 0x88c 0x6 0x1
-#define MX6Q_PAD_KEY_COL3__ECSPI1_SS3             0x210 0x5e0 0x80c 0x0 0x1
-#define MX6Q_PAD_KEY_COL3__ENET_CRS               0x210 0x5e0 0x000 0x1 0x0
-#define MX6Q_PAD_KEY_COL3__HDMI_TX_DDC_SCL        0x210 0x5e0 0x890 0x2 0x1
-#define MX6Q_PAD_KEY_COL3__KEY_COL3               0x210 0x5e0 0x000 0x3 0x0
-#define MX6Q_PAD_KEY_COL3__I2C2_SCL               0x210 0x5e0 0x8a0 0x4 0x1
-#define MX6Q_PAD_KEY_COL3__GPIO4_IO12             0x210 0x5e0 0x000 0x5 0x0
-#define MX6Q_PAD_KEY_COL3__SPDIF_IN               0x210 0x5e0 0x914 0x6 0x2
-#define MX6Q_PAD_KEY_ROW3__ASRC_EXT_CLK           0x214 0x5e4 0x7b0 0x1 0x0
-#define MX6Q_PAD_KEY_ROW3__HDMI_TX_DDC_SDA        0x214 0x5e4 0x894 0x2 0x1
-#define MX6Q_PAD_KEY_ROW3__KEY_ROW3               0x214 0x5e4 0x000 0x3 0x0
-#define MX6Q_PAD_KEY_ROW3__I2C2_SDA               0x214 0x5e4 0x8a4 0x4 0x1
-#define MX6Q_PAD_KEY_ROW3__GPIO4_IO13             0x214 0x5e4 0x000 0x5 0x0
-#define MX6Q_PAD_KEY_ROW3__SD1_VSELECT            0x214 0x5e4 0x000 0x6 0x0
-#define MX6Q_PAD_KEY_COL4__FLEXCAN2_TX            0x218 0x5e8 0x000 0x0 0x0
-#define MX6Q_PAD_KEY_COL4__IPU1_SISG4             0x218 0x5e8 0x000 0x1 0x0
-#define MX6Q_PAD_KEY_COL4__USB_OTG_OC             0x218 0x5e8 0x944 0x2 0x1
-#define MX6Q_PAD_KEY_COL4__KEY_COL4               0x218 0x5e8 0x000 0x3 0x0
-#define MX6Q_PAD_KEY_COL4__UART5_RTS_B            0x218 0x5e8 0x93c 0x4 0x0
-#define MX6Q_PAD_KEY_COL4__UART5_CTS_B            0x218 0x5e8 0x000 0x4 0x0
-#define MX6Q_PAD_KEY_COL4__GPIO4_IO14             0x218 0x5e8 0x000 0x5 0x0
-#define MX6Q_PAD_KEY_ROW4__FLEXCAN2_RX            0x21c 0x5ec 0x7e8 0x0 0x0
-#define MX6Q_PAD_KEY_ROW4__IPU1_SISG5             0x21c 0x5ec 0x000 0x1 0x0
-#define MX6Q_PAD_KEY_ROW4__USB_OTG_PWR            0x21c 0x5ec 0x000 0x2 0x0
-#define MX6Q_PAD_KEY_ROW4__KEY_ROW4               0x21c 0x5ec 0x000 0x3 0x0
-#define MX6Q_PAD_KEY_ROW4__UART5_CTS_B            0x21c 0x5ec 0x000 0x4 0x0
-#define MX6Q_PAD_KEY_ROW4__UART5_RTS_B            0x21c 0x5ec 0x93c 0x4 0x1
-#define MX6Q_PAD_KEY_ROW4__GPIO4_IO15             0x21c 0x5ec 0x000 0x5 0x0
-#define MX6Q_PAD_GPIO_0__CCM_CLKO1                0x220 0x5f0 0x000 0x0 0x0
-#define MX6Q_PAD_GPIO_0__KEY_COL5                 0x220 0x5f0 0x8e8 0x2 0x0
-#define MX6Q_PAD_GPIO_0__ASRC_EXT_CLK             0x220 0x5f0 0x7b0 0x3 0x1
-#define MX6Q_PAD_GPIO_0__EPIT1_OUT                0x220 0x5f0 0x000 0x4 0x0
-#define MX6Q_PAD_GPIO_0__GPIO1_IO00               0x220 0x5f0 0x000 0x5 0x0
-#define MX6Q_PAD_GPIO_0__USB_H1_PWR               0x220 0x5f0 0x000 0x6 0x0
-#define MX6Q_PAD_GPIO_0__SNVS_VIO_5               0x220 0x5f0 0x000 0x7 0x0
-#define MX6Q_PAD_GPIO_1__ESAI_RX_CLK              0x224 0x5f4 0x86c 0x0 0x1
-#define MX6Q_PAD_GPIO_1__WDOG2_B                  0x224 0x5f4 0x000 0x1 0x0
-#define MX6Q_PAD_GPIO_1__KEY_ROW5                 0x224 0x5f4 0x8f4 0x2 0x0
-#define MX6Q_PAD_GPIO_1__USB_OTG_ID               0x224 0x5f4 0x000 0x3 0x0
-#define MX6Q_PAD_GPIO_1__PWM2_OUT                 0x224 0x5f4 0x000 0x4 0x0
-#define MX6Q_PAD_GPIO_1__GPIO1_IO01               0x224 0x5f4 0x000 0x5 0x0
-#define MX6Q_PAD_GPIO_1__SD1_CD_B                 0x224 0x5f4 0x000 0x6 0x0
-#define MX6Q_PAD_GPIO_9__ESAI_RX_FS               0x228 0x5f8 0x85c 0x0 0x1
-#define MX6Q_PAD_GPIO_9__WDOG1_B                  0x228 0x5f8 0x000 0x1 0x0
-#define MX6Q_PAD_GPIO_9__KEY_COL6                 0x228 0x5f8 0x8ec 0x2 0x0
-#define MX6Q_PAD_GPIO_9__CCM_REF_EN_B             0x228 0x5f8 0x000 0x3 0x0
-#define MX6Q_PAD_GPIO_9__PWM1_OUT                 0x228 0x5f8 0x000 0x4 0x0
-#define MX6Q_PAD_GPIO_9__GPIO1_IO09               0x228 0x5f8 0x000 0x5 0x0
-#define MX6Q_PAD_GPIO_9__SD1_WP                   0x228 0x5f8 0x94c 0x6 0x1
-#define MX6Q_PAD_GPIO_3__ESAI_RX_HF_CLK           0x22c 0x5fc 0x864 0x0 0x1
-#define MX6Q_PAD_GPIO_3__I2C3_SCL                 0x22c 0x5fc 0x8a8 0x2 0x1
-#define MX6Q_PAD_GPIO_3__XTALOSC_REF_CLK_24M      0x22c 0x5fc 0x000 0x3 0x0
-#define MX6Q_PAD_GPIO_3__CCM_CLKO2                0x22c 0x5fc 0x000 0x4 0x0
-#define MX6Q_PAD_GPIO_3__GPIO1_IO03               0x22c 0x5fc 0x000 0x5 0x0
-#define MX6Q_PAD_GPIO_3__USB_H1_OC                0x22c 0x5fc 0x948 0x6 0x1
-#define MX6Q_PAD_GPIO_3__MLB_CLK                  0x22c 0x5fc 0x900 0x7 0x1
-#define MX6Q_PAD_GPIO_6__ESAI_TX_CLK              0x230 0x600 0x870 0x0 0x1
-#define MX6Q_PAD_GPIO_6__I2C3_SDA                 0x230 0x600 0x8ac 0x2 0x1
-#define MX6Q_PAD_GPIO_6__GPIO1_IO06               0x230 0x600 0x000 0x5 0x0
-#define MX6Q_PAD_GPIO_6__SD2_LCTL                 0x230 0x600 0x000 0x6 0x0
-#define MX6Q_PAD_GPIO_6__MLB_SIG                  0x230 0x600 0x908 0x7 0x1
-#define MX6Q_PAD_GPIO_2__ESAI_TX_FS               0x234 0x604 0x860 0x0 0x1
-#define MX6Q_PAD_GPIO_2__KEY_ROW6                 0x234 0x604 0x8f8 0x2 0x1
-#define MX6Q_PAD_GPIO_2__GPIO1_IO02               0x234 0x604 0x000 0x5 0x0
-#define MX6Q_PAD_GPIO_2__SD2_WP                   0x234 0x604 0x000 0x6 0x0
-#define MX6Q_PAD_GPIO_2__MLB_DATA                 0x234 0x604 0x904 0x7 0x1
-#define MX6Q_PAD_GPIO_4__ESAI_TX_HF_CLK           0x238 0x608 0x868 0x0 0x1
-#define MX6Q_PAD_GPIO_4__KEY_COL7                 0x238 0x608 0x8f0 0x2 0x1
-#define MX6Q_PAD_GPIO_4__GPIO1_IO04               0x238 0x608 0x000 0x5 0x0
-#define MX6Q_PAD_GPIO_4__SD2_CD_B                 0x238 0x608 0x000 0x6 0x0
-#define MX6Q_PAD_GPIO_5__ESAI_TX2_RX3             0x23c 0x60c 0x87c 0x0 0x1
-#define MX6Q_PAD_GPIO_5__KEY_ROW7                 0x23c 0x60c 0x8fc 0x2 0x1
-#define MX6Q_PAD_GPIO_5__CCM_CLKO1                0x23c 0x60c 0x000 0x3 0x0
-#define MX6Q_PAD_GPIO_5__GPIO1_IO05               0x23c 0x60c 0x000 0x5 0x0
-#define MX6Q_PAD_GPIO_5__I2C3_SCL                 0x23c 0x60c 0x8a8 0x6 0x2
-#define MX6Q_PAD_GPIO_5__ARM_EVENTI               0x23c 0x60c 0x000 0x7 0x0
-#define MX6Q_PAD_GPIO_7__ESAI_TX4_RX1             0x240 0x610 0x884 0x0 0x1
-#define MX6Q_PAD_GPIO_7__ECSPI5_RDY               0x240 0x610 0x000 0x1 0x0
-#define MX6Q_PAD_GPIO_7__EPIT1_OUT                0x240 0x610 0x000 0x2 0x0
-#define MX6Q_PAD_GPIO_7__FLEXCAN1_TX              0x240 0x610 0x000 0x3 0x0
-#define MX6Q_PAD_GPIO_7__UART2_TX_DATA            0x240 0x610 0x000 0x4 0x0
-#define MX6Q_PAD_GPIO_7__UART2_RX_DATA            0x240 0x610 0x928 0x4 0x2
-#define MX6Q_PAD_GPIO_7__GPIO1_IO07               0x240 0x610 0x000 0x5 0x0
-#define MX6Q_PAD_GPIO_7__SPDIF_LOCK               0x240 0x610 0x000 0x6 0x0
-#define MX6Q_PAD_GPIO_7__USB_OTG_HOST_MODE        0x240 0x610 0x000 0x7 0x0
-#define MX6Q_PAD_GPIO_8__ESAI_TX5_RX0             0x244 0x614 0x888 0x0 0x1
-#define MX6Q_PAD_GPIO_8__XTALOSC_REF_CLK_32K      0x244 0x614 0x000 0x1 0x0
-#define MX6Q_PAD_GPIO_8__EPIT2_OUT                0x244 0x614 0x000 0x2 0x0
-#define MX6Q_PAD_GPIO_8__FLEXCAN1_RX              0x244 0x614 0x7e4 0x3 0x1
-#define MX6Q_PAD_GPIO_8__UART2_RX_DATA            0x244 0x614 0x928 0x4 0x3
-#define MX6Q_PAD_GPIO_8__UART2_TX_DATA            0x244 0x614 0x000 0x4 0x0
-#define MX6Q_PAD_GPIO_8__GPIO1_IO08               0x244 0x614 0x000 0x5 0x0
-#define MX6Q_PAD_GPIO_8__SPDIF_SR_CLK             0x244 0x614 0x000 0x6 0x0
-#define MX6Q_PAD_GPIO_8__USB_OTG_PWR_CTL_WAKE     0x244 0x614 0x000 0x7 0x0
-#define MX6Q_PAD_GPIO_16__ESAI_TX3_RX2            0x248 0x618 0x880 0x0 0x1
-#define MX6Q_PAD_GPIO_16__ENET_1588_EVENT2_IN     0x248 0x618 0x000 0x1 0x0
-#define MX6Q_PAD_GPIO_16__ENET_REF_CLK            0x248 0x618 0x83c 0x2 0x1
-#define MX6Q_PAD_GPIO_16__SD1_LCTL                0x248 0x618 0x000 0x3 0x0
-#define MX6Q_PAD_GPIO_16__SPDIF_IN                0x248 0x618 0x914 0x4 0x3
-#define MX6Q_PAD_GPIO_16__GPIO7_IO11              0x248 0x618 0x000 0x5 0x0
-#define MX6Q_PAD_GPIO_16__I2C3_SDA                0x248 0x618 0x8ac 0x6 0x2
-#define MX6Q_PAD_GPIO_16__JTAG_DE_B               0x248 0x618 0x000 0x7 0x0
-#define MX6Q_PAD_GPIO_17__ESAI_TX0                0x24c 0x61c 0x874 0x0 0x0
-#define MX6Q_PAD_GPIO_17__ENET_1588_EVENT3_IN     0x24c 0x61c 0x000 0x1 0x0
-#define MX6Q_PAD_GPIO_17__CCM_PMIC_READY          0x24c 0x61c 0x7f0 0x2 0x1
-#define MX6Q_PAD_GPIO_17__SDMA_EXT_EVENT0         0x24c 0x61c 0x90c 0x3 0x1
-#define MX6Q_PAD_GPIO_17__SPDIF_OUT               0x24c 0x61c 0x000 0x4 0x0
-#define MX6Q_PAD_GPIO_17__GPIO7_IO12              0x24c 0x61c 0x000 0x5 0x0
-#define MX6Q_PAD_GPIO_18__ESAI_TX1                0x250 0x620 0x878 0x0 0x0
-#define MX6Q_PAD_GPIO_18__ENET_RX_CLK             0x250 0x620 0x844 0x1 0x1
-#define MX6Q_PAD_GPIO_18__SD3_VSELECT             0x250 0x620 0x000 0x2 0x0
-#define MX6Q_PAD_GPIO_18__SDMA_EXT_EVENT1         0x250 0x620 0x910 0x3 0x1
-#define MX6Q_PAD_GPIO_18__ASRC_EXT_CLK            0x250 0x620 0x7b0 0x4 0x2
-#define MX6Q_PAD_GPIO_18__GPIO7_IO13              0x250 0x620 0x000 0x5 0x0
-#define MX6Q_PAD_GPIO_18__SNVS_VIO_5_CTL          0x250 0x620 0x000 0x6 0x0
-#define MX6Q_PAD_GPIO_19__KEY_COL5                0x254 0x624 0x8e8 0x0 0x1
-#define MX6Q_PAD_GPIO_19__ENET_1588_EVENT0_OUT    0x254 0x624 0x000 0x1 0x0
-#define MX6Q_PAD_GPIO_19__SPDIF_OUT               0x254 0x624 0x000 0x2 0x0
-#define MX6Q_PAD_GPIO_19__CCM_CLKO1               0x254 0x624 0x000 0x3 0x0
-#define MX6Q_PAD_GPIO_19__ECSPI1_RDY              0x254 0x624 0x000 0x4 0x0
-#define MX6Q_PAD_GPIO_19__GPIO4_IO05              0x254 0x624 0x000 0x5 0x0
-#define MX6Q_PAD_GPIO_19__ENET_TX_ER              0x254 0x624 0x000 0x6 0x0
-#define MX6Q_PAD_CSI0_PIXCLK__IPU1_CSI0_PIXCLK    0x258 0x628 0x000 0x0 0x0
-#define MX6Q_PAD_CSI0_PIXCLK__GPIO5_IO18          0x258 0x628 0x000 0x5 0x0
-#define MX6Q_PAD_CSI0_PIXCLK__ARM_EVENTO          0x258 0x628 0x000 0x7 0x0
-#define MX6Q_PAD_CSI0_MCLK__IPU1_CSI0_HSYNC       0x25c 0x62c 0x000 0x0 0x0
-#define MX6Q_PAD_CSI0_MCLK__CCM_CLKO1             0x25c 0x62c 0x000 0x3 0x0
-#define MX6Q_PAD_CSI0_MCLK__GPIO5_IO19            0x25c 0x62c 0x000 0x5 0x0
-#define MX6Q_PAD_CSI0_MCLK__ARM_TRACE_CTL         0x25c 0x62c 0x000 0x7 0x0
-#define MX6Q_PAD_CSI0_DATA_EN__IPU1_CSI0_DATA_EN  0x260 0x630 0x000 0x0 0x0
-#define MX6Q_PAD_CSI0_DATA_EN__EIM_DATA00         0x260 0x630 0x000 0x1 0x0
-#define MX6Q_PAD_CSI0_DATA_EN__GPIO5_IO20         0x260 0x630 0x000 0x5 0x0
-#define MX6Q_PAD_CSI0_DATA_EN__ARM_TRACE_CLK      0x260 0x630 0x000 0x7 0x0
-#define MX6Q_PAD_CSI0_VSYNC__IPU1_CSI0_VSYNC      0x264 0x634 0x000 0x0 0x0
-#define MX6Q_PAD_CSI0_VSYNC__EIM_DATA01           0x264 0x634 0x000 0x1 0x0
-#define MX6Q_PAD_CSI0_VSYNC__GPIO5_IO21           0x264 0x634 0x000 0x5 0x0
-#define MX6Q_PAD_CSI0_VSYNC__ARM_TRACE00          0x264 0x634 0x000 0x7 0x0
-#define MX6Q_PAD_CSI0_DAT4__IPU1_CSI0_DATA04      0x268 0x638 0x000 0x0 0x0
-#define MX6Q_PAD_CSI0_DAT4__EIM_DATA02            0x268 0x638 0x000 0x1 0x0
-#define MX6Q_PAD_CSI0_DAT4__ECSPI1_SCLK           0x268 0x638 0x7f4 0x2 0x3
-#define MX6Q_PAD_CSI0_DAT4__KEY_COL5              0x268 0x638 0x8e8 0x3 0x2
-#define MX6Q_PAD_CSI0_DAT4__AUD3_TXC              0x268 0x638 0x000 0x4 0x0
-#define MX6Q_PAD_CSI0_DAT4__GPIO5_IO22            0x268 0x638 0x000 0x5 0x0
-#define MX6Q_PAD_CSI0_DAT4__ARM_TRACE01           0x268 0x638 0x000 0x7 0x0
-#define MX6Q_PAD_CSI0_DAT5__IPU1_CSI0_DATA05      0x26c 0x63c 0x000 0x0 0x0
-#define MX6Q_PAD_CSI0_DAT5__EIM_DATA03            0x26c 0x63c 0x000 0x1 0x0
-#define MX6Q_PAD_CSI0_DAT5__ECSPI1_MOSI           0x26c 0x63c 0x7fc 0x2 0x3
-#define MX6Q_PAD_CSI0_DAT5__KEY_ROW5              0x26c 0x63c 0x8f4 0x3 0x1
-#define MX6Q_PAD_CSI0_DAT5__AUD3_TXD              0x26c 0x63c 0x000 0x4 0x0
-#define MX6Q_PAD_CSI0_DAT5__GPIO5_IO23            0x26c 0x63c 0x000 0x5 0x0
-#define MX6Q_PAD_CSI0_DAT5__ARM_TRACE02           0x26c 0x63c 0x000 0x7 0x0
-#define MX6Q_PAD_CSI0_DAT6__IPU1_CSI0_DATA06      0x270 0x640 0x000 0x0 0x0
-#define MX6Q_PAD_CSI0_DAT6__EIM_DATA04            0x270 0x640 0x000 0x1 0x0
-#define MX6Q_PAD_CSI0_DAT6__ECSPI1_MISO           0x270 0x640 0x7f8 0x2 0x3
-#define MX6Q_PAD_CSI0_DAT6__KEY_COL6              0x270 0x640 0x8ec 0x3 0x1
-#define MX6Q_PAD_CSI0_DAT6__AUD3_TXFS             0x270 0x640 0x000 0x4 0x0
-#define MX6Q_PAD_CSI0_DAT6__GPIO5_IO24            0x270 0x640 0x000 0x5 0x0
-#define MX6Q_PAD_CSI0_DAT6__ARM_TRACE03           0x270 0x640 0x000 0x7 0x0
-#define MX6Q_PAD_CSI0_DAT7__IPU1_CSI0_DATA07      0x274 0x644 0x000 0x0 0x0
-#define MX6Q_PAD_CSI0_DAT7__EIM_DATA05            0x274 0x644 0x000 0x1 0x0
-#define MX6Q_PAD_CSI0_DAT7__ECSPI1_SS0            0x274 0x644 0x800 0x2 0x3
-#define MX6Q_PAD_CSI0_DAT7__KEY_ROW6              0x274 0x644 0x8f8 0x3 0x2
-#define MX6Q_PAD_CSI0_DAT7__AUD3_RXD              0x274 0x644 0x000 0x4 0x0
-#define MX6Q_PAD_CSI0_DAT7__GPIO5_IO25            0x274 0x644 0x000 0x5 0x0
-#define MX6Q_PAD_CSI0_DAT7__ARM_TRACE04           0x274 0x644 0x000 0x7 0x0
-#define MX6Q_PAD_CSI0_DAT8__IPU1_CSI0_DATA08      0x278 0x648 0x000 0x0 0x0
-#define MX6Q_PAD_CSI0_DAT8__EIM_DATA06            0x278 0x648 0x000 0x1 0x0
-#define MX6Q_PAD_CSI0_DAT8__ECSPI2_SCLK           0x278 0x648 0x810 0x2 0x2
-#define MX6Q_PAD_CSI0_DAT8__KEY_COL7              0x278 0x648 0x8f0 0x3 0x2
-#define MX6Q_PAD_CSI0_DAT8__I2C1_SDA              0x278 0x648 0x89c 0x4 0x1
-#define MX6Q_PAD_CSI0_DAT8__GPIO5_IO26            0x278 0x648 0x000 0x5 0x0
-#define MX6Q_PAD_CSI0_DAT8__ARM_TRACE05           0x278 0x648 0x000 0x7 0x0
-#define MX6Q_PAD_CSI0_DAT9__IPU1_CSI0_DATA09      0x27c 0x64c 0x000 0x0 0x0
-#define MX6Q_PAD_CSI0_DAT9__EIM_DATA07            0x27c 0x64c 0x000 0x1 0x0
-#define MX6Q_PAD_CSI0_DAT9__ECSPI2_MOSI           0x27c 0x64c 0x818 0x2 0x2
-#define MX6Q_PAD_CSI0_DAT9__KEY_ROW7              0x27c 0x64c 0x8fc 0x3 0x2
-#define MX6Q_PAD_CSI0_DAT9__I2C1_SCL              0x27c 0x64c 0x898 0x4 0x1
-#define MX6Q_PAD_CSI0_DAT9__GPIO5_IO27            0x27c 0x64c 0x000 0x5 0x0
-#define MX6Q_PAD_CSI0_DAT9__ARM_TRACE06           0x27c 0x64c 0x000 0x7 0x0
-#define MX6Q_PAD_CSI0_DAT10__IPU1_CSI0_DATA10     0x280 0x650 0x000 0x0 0x0
-#define MX6Q_PAD_CSI0_DAT10__AUD3_RXC             0x280 0x650 0x000 0x1 0x0
-#define MX6Q_PAD_CSI0_DAT10__ECSPI2_MISO          0x280 0x650 0x814 0x2 0x2
-#define MX6Q_PAD_CSI0_DAT10__UART1_TX_DATA        0x280 0x650 0x000 0x3 0x0
-#define MX6Q_PAD_CSI0_DAT10__UART1_RX_DATA        0x280 0x650 0x920 0x3 0x0
-#define MX6Q_PAD_CSI0_DAT10__GPIO5_IO28           0x280 0x650 0x000 0x5 0x0
-#define MX6Q_PAD_CSI0_DAT10__ARM_TRACE07          0x280 0x650 0x000 0x7 0x0
-#define MX6Q_PAD_CSI0_DAT11__IPU1_CSI0_DATA11     0x284 0x654 0x000 0x0 0x0
-#define MX6Q_PAD_CSI0_DAT11__AUD3_RXFS            0x284 0x654 0x000 0x1 0x0
-#define MX6Q_PAD_CSI0_DAT11__ECSPI2_SS0           0x284 0x654 0x81c 0x2 0x2
-#define MX6Q_PAD_CSI0_DAT11__UART1_RX_DATA        0x284 0x654 0x920 0x3 0x1
-#define MX6Q_PAD_CSI0_DAT11__UART1_TX_DATA        0x284 0x654 0x000 0x3 0x0
-#define MX6Q_PAD_CSI0_DAT11__GPIO5_IO29           0x284 0x654 0x000 0x5 0x0
-#define MX6Q_PAD_CSI0_DAT11__ARM_TRACE08          0x284 0x654 0x000 0x7 0x0
-#define MX6Q_PAD_CSI0_DAT12__IPU1_CSI0_DATA12     0x288 0x658 0x000 0x0 0x0
-#define MX6Q_PAD_CSI0_DAT12__EIM_DATA08           0x288 0x658 0x000 0x1 0x0
-#define MX6Q_PAD_CSI0_DAT12__UART4_TX_DATA        0x288 0x658 0x000 0x3 0x0
-#define MX6Q_PAD_CSI0_DAT12__UART4_RX_DATA        0x288 0x658 0x938 0x3 0x2
-#define MX6Q_PAD_CSI0_DAT12__GPIO5_IO30           0x288 0x658 0x000 0x5 0x0
-#define MX6Q_PAD_CSI0_DAT12__ARM_TRACE09          0x288 0x658 0x000 0x7 0x0
-#define MX6Q_PAD_CSI0_DAT13__IPU1_CSI0_DATA13     0x28c 0x65c 0x000 0x0 0x0
-#define MX6Q_PAD_CSI0_DAT13__EIM_DATA09           0x28c 0x65c 0x000 0x1 0x0
-#define MX6Q_PAD_CSI0_DAT13__UART4_RX_DATA        0x28c 0x65c 0x938 0x3 0x3
-#define MX6Q_PAD_CSI0_DAT13__UART4_TX_DATA        0x28c 0x65c 0x000 0x3 0x0
-#define MX6Q_PAD_CSI0_DAT13__GPIO5_IO31           0x28c 0x65c 0x000 0x5 0x0
-#define MX6Q_PAD_CSI0_DAT13__ARM_TRACE10          0x28c 0x65c 0x000 0x7 0x0
-#define MX6Q_PAD_CSI0_DAT14__IPU1_CSI0_DATA14     0x290 0x660 0x000 0x0 0x0
-#define MX6Q_PAD_CSI0_DAT14__EIM_DATA10           0x290 0x660 0x000 0x1 0x0
-#define MX6Q_PAD_CSI0_DAT14__UART5_TX_DATA        0x290 0x660 0x000 0x3 0x0
-#define MX6Q_PAD_CSI0_DAT14__UART5_RX_DATA        0x290 0x660 0x940 0x3 0x2
-#define MX6Q_PAD_CSI0_DAT14__GPIO6_IO00           0x290 0x660 0x000 0x5 0x0
-#define MX6Q_PAD_CSI0_DAT14__ARM_TRACE11          0x290 0x660 0x000 0x7 0x0
-#define MX6Q_PAD_CSI0_DAT15__IPU1_CSI0_DATA15     0x294 0x664 0x000 0x0 0x0
-#define MX6Q_PAD_CSI0_DAT15__EIM_DATA11           0x294 0x664 0x000 0x1 0x0
-#define MX6Q_PAD_CSI0_DAT15__UART5_RX_DATA        0x294 0x664 0x940 0x3 0x3
-#define MX6Q_PAD_CSI0_DAT15__UART5_TX_DATA        0x294 0x664 0x000 0x3 0x0
-#define MX6Q_PAD_CSI0_DAT15__GPIO6_IO01           0x294 0x664 0x000 0x5 0x0
-#define MX6Q_PAD_CSI0_DAT15__ARM_TRACE12          0x294 0x664 0x000 0x7 0x0
-#define MX6Q_PAD_CSI0_DAT16__IPU1_CSI0_DATA16     0x298 0x668 0x000 0x0 0x0
-#define MX6Q_PAD_CSI0_DAT16__EIM_DATA12           0x298 0x668 0x000 0x1 0x0
-#define MX6Q_PAD_CSI0_DAT16__UART4_RTS_B          0x298 0x668 0x934 0x3 0x0
-#define MX6Q_PAD_CSI0_DAT16__UART4_CTS_B          0x298 0x668 0x000 0x3 0x0
-#define MX6Q_PAD_CSI0_DAT16__GPIO6_IO02           0x298 0x668 0x000 0x5 0x0
-#define MX6Q_PAD_CSI0_DAT16__ARM_TRACE13          0x298 0x668 0x000 0x7 0x0
-#define MX6Q_PAD_CSI0_DAT17__IPU1_CSI0_DATA17     0x29c 0x66c 0x000 0x0 0x0
-#define MX6Q_PAD_CSI0_DAT17__EIM_DATA13           0x29c 0x66c 0x000 0x1 0x0
-#define MX6Q_PAD_CSI0_DAT17__UART4_CTS_B          0x29c 0x66c 0x000 0x3 0x0
-#define MX6Q_PAD_CSI0_DAT17__UART4_RTS_B          0x29c 0x66c 0x934 0x3 0x1
-#define MX6Q_PAD_CSI0_DAT17__GPIO6_IO03           0x29c 0x66c 0x000 0x5 0x0
-#define MX6Q_PAD_CSI0_DAT17__ARM_TRACE14          0x29c 0x66c 0x000 0x7 0x0
-#define MX6Q_PAD_CSI0_DAT18__IPU1_CSI0_DATA18     0x2a0 0x670 0x000 0x0 0x0
-#define MX6Q_PAD_CSI0_DAT18__EIM_DATA14           0x2a0 0x670 0x000 0x1 0x0
-#define MX6Q_PAD_CSI0_DAT18__UART5_RTS_B          0x2a0 0x670 0x93c 0x3 0x2
-#define MX6Q_PAD_CSI0_DAT18__UART5_CTS_B          0x2a0 0x670 0x000 0x3 0x0
-#define MX6Q_PAD_CSI0_DAT18__GPIO6_IO04           0x2a0 0x670 0x000 0x5 0x0
-#define MX6Q_PAD_CSI0_DAT18__ARM_TRACE15          0x2a0 0x670 0x000 0x7 0x0
-#define MX6Q_PAD_CSI0_DAT19__IPU1_CSI0_DATA19     0x2a4 0x674 0x000 0x0 0x0
-#define MX6Q_PAD_CSI0_DAT19__EIM_DATA15           0x2a4 0x674 0x000 0x1 0x0
-#define MX6Q_PAD_CSI0_DAT19__UART5_CTS_B          0x2a4 0x674 0x000 0x3 0x0
-#define MX6Q_PAD_CSI0_DAT19__UART5_RTS_B          0x2a4 0x674 0x93c 0x3 0x3
-#define MX6Q_PAD_CSI0_DAT19__GPIO6_IO05           0x2a4 0x674 0x000 0x5 0x0
-#define MX6Q_PAD_SD3_DAT7__SD3_DATA7              0x2a8 0x690 0x000 0x0 0x0
-#define MX6Q_PAD_SD3_DAT7__UART1_TX_DATA          0x2a8 0x690 0x000 0x1 0x0
-#define MX6Q_PAD_SD3_DAT7__UART1_RX_DATA          0x2a8 0x690 0x920 0x1 0x2
-#define MX6Q_PAD_SD3_DAT7__GPIO6_IO17             0x2a8 0x690 0x000 0x5 0x0
-#define MX6Q_PAD_SD3_DAT6__SD3_DATA6              0x2ac 0x694 0x000 0x0 0x0
-#define MX6Q_PAD_SD3_DAT6__UART1_RX_DATA          0x2ac 0x694 0x920 0x1 0x3
-#define MX6Q_PAD_SD3_DAT6__UART1_TX_DATA          0x2ac 0x694 0x000 0x1 0x0
-#define MX6Q_PAD_SD3_DAT6__GPIO6_IO18             0x2ac 0x694 0x000 0x5 0x0
-#define MX6Q_PAD_SD3_DAT5__SD3_DATA5              0x2b0 0x698 0x000 0x0 0x0
-#define MX6Q_PAD_SD3_DAT5__UART2_TX_DATA          0x2b0 0x698 0x000 0x1 0x0
-#define MX6Q_PAD_SD3_DAT5__UART2_RX_DATA          0x2b0 0x698 0x928 0x1 0x4
-#define MX6Q_PAD_SD3_DAT5__GPIO7_IO00             0x2b0 0x698 0x000 0x5 0x0
-#define MX6Q_PAD_SD3_DAT4__SD3_DATA4              0x2b4 0x69c 0x000 0x0 0x0
-#define MX6Q_PAD_SD3_DAT4__UART2_RX_DATA          0x2b4 0x69c 0x928 0x1 0x5
-#define MX6Q_PAD_SD3_DAT4__UART2_TX_DATA          0x2b4 0x69c 0x000 0x1 0x0
-#define MX6Q_PAD_SD3_DAT4__GPIO7_IO01             0x2b4 0x69c 0x000 0x5 0x0
-#define MX6Q_PAD_SD3_CMD__SD3_CMD                 0x2b8 0x6a0 0x000 0x0 0x0
-#define MX6Q_PAD_SD3_CMD__UART2_CTS_B             0x2b8 0x6a0 0x000 0x1 0x0
-#define MX6Q_PAD_SD3_CMD__UART2_RTS_B             0x2b8 0x6a0 0x924 0x1 0x2
-#define MX6Q_PAD_SD3_CMD__FLEXCAN1_TX             0x2b8 0x6a0 0x000 0x2 0x0
-#define MX6Q_PAD_SD3_CMD__GPIO7_IO02              0x2b8 0x6a0 0x000 0x5 0x0
-#define MX6Q_PAD_SD3_CLK__SD3_CLK                 0x2bc 0x6a4 0x000 0x0 0x0
-#define MX6Q_PAD_SD3_CLK__UART2_RTS_B             0x2bc 0x6a4 0x924 0x1 0x3
-#define MX6Q_PAD_SD3_CLK__UART2_CTS_B             0x2bc 0x6a4 0x000 0x1 0x0
-#define MX6Q_PAD_SD3_CLK__FLEXCAN1_RX             0x2bc 0x6a4 0x7e4 0x2 0x2
-#define MX6Q_PAD_SD3_CLK__GPIO7_IO03              0x2bc 0x6a4 0x000 0x5 0x0
-#define MX6Q_PAD_SD3_DAT0__SD3_DATA0              0x2c0 0x6a8 0x000 0x0 0x0
-#define MX6Q_PAD_SD3_DAT0__UART1_CTS_B            0x2c0 0x6a8 0x000 0x1 0x0
-#define MX6Q_PAD_SD3_DAT0__UART1_RTS_B            0x2c0 0x6a8 0x91c 0x1 0x2
-#define MX6Q_PAD_SD3_DAT0__FLEXCAN2_TX            0x2c0 0x6a8 0x000 0x2 0x0
-#define MX6Q_PAD_SD3_DAT0__GPIO7_IO04             0x2c0 0x6a8 0x000 0x5 0x0
-#define MX6Q_PAD_SD3_DAT1__SD3_DATA1              0x2c4 0x6ac 0x000 0x0 0x0
-#define MX6Q_PAD_SD3_DAT1__UART1_RTS_B            0x2c4 0x6ac 0x91c 0x1 0x3
-#define MX6Q_PAD_SD3_DAT1__UART1_CTS_B            0x2c4 0x6ac 0x000 0x1 0x0
-#define MX6Q_PAD_SD3_DAT1__FLEXCAN2_RX            0x2c4 0x6ac 0x7e8 0x2 0x1
-#define MX6Q_PAD_SD3_DAT1__GPIO7_IO05             0x2c4 0x6ac 0x000 0x5 0x0
-#define MX6Q_PAD_SD3_DAT2__SD3_DATA2              0x2c8 0x6b0 0x000 0x0 0x0
-#define MX6Q_PAD_SD3_DAT2__GPIO7_IO06             0x2c8 0x6b0 0x000 0x5 0x0
-#define MX6Q_PAD_SD3_DAT3__SD3_DATA3              0x2cc 0x6b4 0x000 0x0 0x0
-#define MX6Q_PAD_SD3_DAT3__UART3_CTS_B            0x2cc 0x6b4 0x000 0x1 0x0
-#define MX6Q_PAD_SD3_DAT3__UART3_RTS_B            0x2cc 0x6b4 0x92c 0x1 0x4
-#define MX6Q_PAD_SD3_DAT3__GPIO7_IO07             0x2cc 0x6b4 0x000 0x5 0x0
-#define MX6Q_PAD_SD3_RST__SD3_RESET               0x2d0 0x6b8 0x000 0x0 0x0
-#define MX6Q_PAD_SD3_RST__UART3_RTS_B             0x2d0 0x6b8 0x92c 0x1 0x5
-#define MX6Q_PAD_SD3_RST__UART3_CTS_B             0x2d0 0x6b8 0x000 0x1 0x0
-#define MX6Q_PAD_SD3_RST__GPIO7_IO08              0x2d0 0x6b8 0x000 0x5 0x0
-#define MX6Q_PAD_NANDF_CLE__NAND_CLE              0x2d4 0x6bc 0x000 0x0 0x0
-#define MX6Q_PAD_NANDF_CLE__IPU2_SISG4            0x2d4 0x6bc 0x000 0x1 0x0
-#define MX6Q_PAD_NANDF_CLE__GPIO6_IO07            0x2d4 0x6bc 0x000 0x5 0x0
-#define MX6Q_PAD_NANDF_ALE__NAND_ALE              0x2d8 0x6c0 0x000 0x0 0x0
-#define MX6Q_PAD_NANDF_ALE__SD4_RESET             0x2d8 0x6c0 0x000 0x1 0x0
-#define MX6Q_PAD_NANDF_ALE__GPIO6_IO08            0x2d8 0x6c0 0x000 0x5 0x0
-#define MX6Q_PAD_NANDF_WP_B__NAND_WP_B            0x2dc 0x6c4 0x000 0x0 0x0
-#define MX6Q_PAD_NANDF_WP_B__IPU2_SISG5           0x2dc 0x6c4 0x000 0x1 0x0
-#define MX6Q_PAD_NANDF_WP_B__GPIO6_IO09           0x2dc 0x6c4 0x000 0x5 0x0
-#define MX6Q_PAD_NANDF_RB0__NAND_READY_B          0x2e0 0x6c8 0x000 0x0 0x0
-#define MX6Q_PAD_NANDF_RB0__IPU2_DI0_PIN01        0x2e0 0x6c8 0x000 0x1 0x0
-#define MX6Q_PAD_NANDF_RB0__GPIO6_IO10            0x2e0 0x6c8 0x000 0x5 0x0
-#define MX6Q_PAD_NANDF_CS0__NAND_CE0_B            0x2e4 0x6cc 0x000 0x0 0x0
-#define MX6Q_PAD_NANDF_CS0__GPIO6_IO11            0x2e4 0x6cc 0x000 0x5 0x0
-#define MX6Q_PAD_NANDF_CS1__NAND_CE1_B            0x2e8 0x6d0 0x000 0x0 0x0
-#define MX6Q_PAD_NANDF_CS1__SD4_VSELECT           0x2e8 0x6d0 0x000 0x1 0x0
-#define MX6Q_PAD_NANDF_CS1__SD3_VSELECT           0x2e8 0x6d0 0x000 0x2 0x0
-#define MX6Q_PAD_NANDF_CS1__GPIO6_IO14            0x2e8 0x6d0 0x000 0x5 0x0
-#define MX6Q_PAD_NANDF_CS2__NAND_CE2_B            0x2ec 0x6d4 0x000 0x0 0x0
-#define MX6Q_PAD_NANDF_CS2__IPU1_SISG0            0x2ec 0x6d4 0x000 0x1 0x0
-#define MX6Q_PAD_NANDF_CS2__ESAI_TX0              0x2ec 0x6d4 0x874 0x2 0x1
-#define MX6Q_PAD_NANDF_CS2__EIM_CRE               0x2ec 0x6d4 0x000 0x3 0x0
-#define MX6Q_PAD_NANDF_CS2__CCM_CLKO2             0x2ec 0x6d4 0x000 0x4 0x0
-#define MX6Q_PAD_NANDF_CS2__GPIO6_IO15            0x2ec 0x6d4 0x000 0x5 0x0
-#define MX6Q_PAD_NANDF_CS2__IPU2_SISG0            0x2ec 0x6d4 0x000 0x6 0x0
-#define MX6Q_PAD_NANDF_CS3__NAND_CE3_B            0x2f0 0x6d8 0x000 0x0 0x0
-#define MX6Q_PAD_NANDF_CS3__IPU1_SISG1            0x2f0 0x6d8 0x000 0x1 0x0
-#define MX6Q_PAD_NANDF_CS3__ESAI_TX1              0x2f0 0x6d8 0x878 0x2 0x1
-#define MX6Q_PAD_NANDF_CS3__EIM_ADDR26            0x2f0 0x6d8 0x000 0x3 0x0
-#define MX6Q_PAD_NANDF_CS3__GPIO6_IO16            0x2f0 0x6d8 0x000 0x5 0x0
-#define MX6Q_PAD_NANDF_CS3__IPU2_SISG1            0x2f0 0x6d8 0x000 0x6 0x0
-#define MX6Q_PAD_SD4_CMD__SD4_CMD                 0x2f4 0x6dc 0x000 0x0 0x0
-#define MX6Q_PAD_SD4_CMD__NAND_RE_B               0x2f4 0x6dc 0x000 0x1 0x0
-#define MX6Q_PAD_SD4_CMD__UART3_TX_DATA           0x2f4 0x6dc 0x000 0x2 0x0
-#define MX6Q_PAD_SD4_CMD__UART3_RX_DATA           0x2f4 0x6dc 0x930 0x2 0x2
-#define MX6Q_PAD_SD4_CMD__GPIO7_IO09              0x2f4 0x6dc 0x000 0x5 0x0
-#define MX6Q_PAD_SD4_CLK__SD4_CLK                 0x2f8 0x6e0 0x000 0x0 0x0
-#define MX6Q_PAD_SD4_CLK__NAND_WE_B               0x2f8 0x6e0 0x000 0x1 0x0
-#define MX6Q_PAD_SD4_CLK__UART3_RX_DATA           0x2f8 0x6e0 0x930 0x2 0x3
-#define MX6Q_PAD_SD4_CLK__UART3_TX_DATA           0x2f8 0x6e0 0x000 0x2 0x0
-#define MX6Q_PAD_SD4_CLK__GPIO7_IO10              0x2f8 0x6e0 0x000 0x5 0x0
-#define MX6Q_PAD_NANDF_D0__NAND_DATA00            0x2fc 0x6e4 0x000 0x0 0x0
-#define MX6Q_PAD_NANDF_D0__SD1_DATA4              0x2fc 0x6e4 0x000 0x1 0x0
-#define MX6Q_PAD_NANDF_D0__GPIO2_IO00             0x2fc 0x6e4 0x000 0x5 0x0
-#define MX6Q_PAD_NANDF_D1__NAND_DATA01            0x300 0x6e8 0x000 0x0 0x0
-#define MX6Q_PAD_NANDF_D1__SD1_DATA5              0x300 0x6e8 0x000 0x1 0x0
-#define MX6Q_PAD_NANDF_D1__GPIO2_IO01             0x300 0x6e8 0x000 0x5 0x0
-#define MX6Q_PAD_NANDF_D2__NAND_DATA02            0x304 0x6ec 0x000 0x0 0x0
-#define MX6Q_PAD_NANDF_D2__SD1_DATA6              0x304 0x6ec 0x000 0x1 0x0
-#define MX6Q_PAD_NANDF_D2__GPIO2_IO02             0x304 0x6ec 0x000 0x5 0x0
-#define MX6Q_PAD_NANDF_D3__NAND_DATA03            0x308 0x6f0 0x000 0x0 0x0
-#define MX6Q_PAD_NANDF_D3__SD1_DATA7              0x308 0x6f0 0x000 0x1 0x0
-#define MX6Q_PAD_NANDF_D3__GPIO2_IO03             0x308 0x6f0 0x000 0x5 0x0
-#define MX6Q_PAD_NANDF_D4__NAND_DATA04            0x30c 0x6f4 0x000 0x0 0x0
-#define MX6Q_PAD_NANDF_D4__SD2_DATA4              0x30c 0x6f4 0x000 0x1 0x0
-#define MX6Q_PAD_NANDF_D4__GPIO2_IO04             0x30c 0x6f4 0x000 0x5 0x0
-#define MX6Q_PAD_NANDF_D5__NAND_DATA05            0x310 0x6f8 0x000 0x0 0x0
-#define MX6Q_PAD_NANDF_D5__SD2_DATA5              0x310 0x6f8 0x000 0x1 0x0
-#define MX6Q_PAD_NANDF_D5__GPIO2_IO05             0x310 0x6f8 0x000 0x5 0x0
-#define MX6Q_PAD_NANDF_D6__NAND_DATA06            0x314 0x6fc 0x000 0x0 0x0
-#define MX6Q_PAD_NANDF_D6__SD2_DATA6              0x314 0x6fc 0x000 0x1 0x0
-#define MX6Q_PAD_NANDF_D6__GPIO2_IO06             0x314 0x6fc 0x000 0x5 0x0
-#define MX6Q_PAD_NANDF_D7__NAND_DATA07            0x318 0x700 0x000 0x0 0x0
-#define MX6Q_PAD_NANDF_D7__SD2_DATA7              0x318 0x700 0x000 0x1 0x0
-#define MX6Q_PAD_NANDF_D7__GPIO2_IO07             0x318 0x700 0x000 0x5 0x0
-#define MX6Q_PAD_SD4_DAT0__SD4_DATA0              0x31c 0x704 0x000 0x1 0x0
-#define MX6Q_PAD_SD4_DAT0__NAND_DQS               0x31c 0x704 0x000 0x2 0x0
-#define MX6Q_PAD_SD4_DAT0__GPIO2_IO08             0x31c 0x704 0x000 0x5 0x0
-#define MX6Q_PAD_SD4_DAT1__SD4_DATA1              0x320 0x708 0x000 0x1 0x0
-#define MX6Q_PAD_SD4_DAT1__PWM3_OUT               0x320 0x708 0x000 0x2 0x0
-#define MX6Q_PAD_SD4_DAT1__GPIO2_IO09             0x320 0x708 0x000 0x5 0x0
-#define MX6Q_PAD_SD4_DAT2__SD4_DATA2              0x324 0x70c 0x000 0x1 0x0
-#define MX6Q_PAD_SD4_DAT2__PWM4_OUT               0x324 0x70c 0x000 0x2 0x0
-#define MX6Q_PAD_SD4_DAT2__GPIO2_IO10             0x324 0x70c 0x000 0x5 0x0
-#define MX6Q_PAD_SD4_DAT3__SD4_DATA3              0x328 0x710 0x000 0x1 0x0
-#define MX6Q_PAD_SD4_DAT3__GPIO2_IO11             0x328 0x710 0x000 0x5 0x0
-#define MX6Q_PAD_SD4_DAT4__SD4_DATA4              0x32c 0x714 0x000 0x1 0x0
-#define MX6Q_PAD_SD4_DAT4__UART2_RX_DATA          0x32c 0x714 0x928 0x2 0x6
-#define MX6Q_PAD_SD4_DAT4__UART2_TX_DATA          0x32c 0x714 0x000 0x2 0x0
-#define MX6Q_PAD_SD4_DAT4__GPIO2_IO12             0x32c 0x714 0x000 0x5 0x0
-#define MX6Q_PAD_SD4_DAT5__SD4_DATA5              0x330 0x718 0x000 0x1 0x0
-#define MX6Q_PAD_SD4_DAT5__UART2_RTS_B            0x330 0x718 0x924 0x2 0x4
-#define MX6Q_PAD_SD4_DAT5__UART2_CTS_B            0x330 0x718 0x000 0x2 0x0
-#define MX6Q_PAD_SD4_DAT5__GPIO2_IO13             0x330 0x718 0x000 0x5 0x0
-#define MX6Q_PAD_SD4_DAT6__SD4_DATA6              0x334 0x71c 0x000 0x1 0x0
-#define MX6Q_PAD_SD4_DAT6__UART2_CTS_B            0x334 0x71c 0x000 0x2 0x0
-#define MX6Q_PAD_SD4_DAT6__UART2_RTS_B            0x334 0x71c 0x924 0x2 0x5
-#define MX6Q_PAD_SD4_DAT6__GPIO2_IO14             0x334 0x71c 0x000 0x5 0x0
-#define MX6Q_PAD_SD4_DAT7__SD4_DATA7              0x338 0x720 0x000 0x1 0x0
-#define MX6Q_PAD_SD4_DAT7__UART2_TX_DATA          0x338 0x720 0x000 0x2 0x0
-#define MX6Q_PAD_SD4_DAT7__UART2_RX_DATA          0x338 0x720 0x928 0x2 0x7
-#define MX6Q_PAD_SD4_DAT7__GPIO2_IO15             0x338 0x720 0x000 0x5 0x0
-#define MX6Q_PAD_SD1_DAT1__SD1_DATA1              0x33c 0x724 0x000 0x0 0x0
-#define MX6Q_PAD_SD1_DAT1__ECSPI5_SS0             0x33c 0x724 0x834 0x1 0x1
-#define MX6Q_PAD_SD1_DAT1__PWM3_OUT               0x33c 0x724 0x000 0x2 0x0
-#define MX6Q_PAD_SD1_DAT1__GPT_CAPTURE2           0x33c 0x724 0x000 0x3 0x0
-#define MX6Q_PAD_SD1_DAT1__GPIO1_IO17             0x33c 0x724 0x000 0x5 0x0
-#define MX6Q_PAD_SD1_DAT0__SD1_DATA0              0x340 0x728 0x000 0x0 0x0
-#define MX6Q_PAD_SD1_DAT0__ECSPI5_MISO            0x340 0x728 0x82c 0x1 0x1
-#define MX6Q_PAD_SD1_DAT0__GPT_CAPTURE1           0x340 0x728 0x000 0x3 0x0
-#define MX6Q_PAD_SD1_DAT0__GPIO1_IO16             0x340 0x728 0x000 0x5 0x0
-#define MX6Q_PAD_SD1_DAT3__SD1_DATA3              0x344 0x72c 0x000 0x0 0x0
-#define MX6Q_PAD_SD1_DAT3__ECSPI5_SS2             0x344 0x72c 0x000 0x1 0x0
-#define MX6Q_PAD_SD1_DAT3__GPT_COMPARE3           0x344 0x72c 0x000 0x2 0x0
-#define MX6Q_PAD_SD1_DAT3__PWM1_OUT               0x344 0x72c 0x000 0x3 0x0
-#define MX6Q_PAD_SD1_DAT3__WDOG2_B                0x344 0x72c 0x000 0x4 0x0
-#define MX6Q_PAD_SD1_DAT3__GPIO1_IO21             0x344 0x72c 0x000 0x5 0x0
-#define MX6Q_PAD_SD1_DAT3__WDOG2_RESET_B_DEB      0x344 0x72c 0x000 0x6 0x0
-#define MX6Q_PAD_SD1_CMD__SD1_CMD                 0x348 0x730 0x000 0x0 0x0
-#define MX6Q_PAD_SD1_CMD__ECSPI5_MOSI             0x348 0x730 0x830 0x1 0x0
-#define MX6Q_PAD_SD1_CMD__PWM4_OUT                0x348 0x730 0x000 0x2 0x0
-#define MX6Q_PAD_SD1_CMD__GPT_COMPARE1            0x348 0x730 0x000 0x3 0x0
-#define MX6Q_PAD_SD1_CMD__GPIO1_IO18              0x348 0x730 0x000 0x5 0x0
-#define MX6Q_PAD_SD1_DAT2__SD1_DATA2              0x34c 0x734 0x000 0x0 0x0
-#define MX6Q_PAD_SD1_DAT2__ECSPI5_SS1             0x34c 0x734 0x838 0x1 0x1
-#define MX6Q_PAD_SD1_DAT2__GPT_COMPARE2           0x34c 0x734 0x000 0x2 0x0
-#define MX6Q_PAD_SD1_DAT2__PWM2_OUT               0x34c 0x734 0x000 0x3 0x0
-#define MX6Q_PAD_SD1_DAT2__WDOG1_B                0x34c 0x734 0x000 0x4 0x0
-#define MX6Q_PAD_SD1_DAT2__GPIO1_IO19             0x34c 0x734 0x000 0x5 0x0
-#define MX6Q_PAD_SD1_DAT2__WDOG1_RESET_B_DEB      0x34c 0x734 0x000 0x6 0x0
-#define MX6Q_PAD_SD1_CLK__SD1_CLK                 0x350 0x738 0x000 0x0 0x0
-#define MX6Q_PAD_SD1_CLK__ECSPI5_SCLK             0x350 0x738 0x828 0x1 0x0
-#define MX6Q_PAD_SD1_CLK__GPT_CLKIN               0x350 0x738 0x000 0x3 0x0
-#define MX6Q_PAD_SD1_CLK__GPIO1_IO20              0x350 0x738 0x000 0x5 0x0
-#define MX6Q_PAD_SD2_CLK__SD2_CLK                 0x354 0x73c 0x000 0x0 0x0
-#define MX6Q_PAD_SD2_CLK__ECSPI5_SCLK             0x354 0x73c 0x828 0x1 0x1
-#define MX6Q_PAD_SD2_CLK__KEY_COL5                0x354 0x73c 0x8e8 0x2 0x3
-#define MX6Q_PAD_SD2_CLK__AUD4_RXFS               0x354 0x73c 0x7c0 0x3 0x1
-#define MX6Q_PAD_SD2_CLK__GPIO1_IO10              0x354 0x73c 0x000 0x5 0x0
-#define MX6Q_PAD_SD2_CMD__SD2_CMD                 0x358 0x740 0x000 0x0 0x0
-#define MX6Q_PAD_SD2_CMD__ECSPI5_MOSI             0x358 0x740 0x830 0x1 0x1
-#define MX6Q_PAD_SD2_CMD__KEY_ROW5                0x358 0x740 0x8f4 0x2 0x2
-#define MX6Q_PAD_SD2_CMD__AUD4_RXC                0x358 0x740 0x7bc 0x3 0x1
-#define MX6Q_PAD_SD2_CMD__GPIO1_IO11              0x358 0x740 0x000 0x5 0x0
-#define MX6Q_PAD_SD2_DAT3__SD2_DATA3              0x35c 0x744 0x000 0x0 0x0
-#define MX6Q_PAD_SD2_DAT3__ECSPI5_SS3             0x35c 0x744 0x000 0x1 0x0
-#define MX6Q_PAD_SD2_DAT3__KEY_COL6               0x35c 0x744 0x8ec 0x2 0x2
-#define MX6Q_PAD_SD2_DAT3__AUD4_TXC               0x35c 0x744 0x7c4 0x3 0x1
-#define MX6Q_PAD_SD2_DAT3__GPIO1_IO12             0x35c 0x744 0x000 0x5 0x0
+#define MX6QDL_PAD_SD2_DAT1__SD2_DATA1              0x04c 0x360 0x000 0x0 0x0
+#define MX6QDL_PAD_SD2_DAT1__ECSPI5_SS0             0x04c 0x360 0x834 0x1 0x0
+#define MX6QDL_PAD_SD2_DAT1__EIM_CS2_B              0x04c 0x360 0x000 0x2 0x0
+#define MX6QDL_PAD_SD2_DAT1__AUD4_TXFS              0x04c 0x360 0x7c8 0x3 0x0
+#define MX6QDL_PAD_SD2_DAT1__KEY_COL7               0x04c 0x360 0x8f0 0x4 0x0
+#define MX6QDL_PAD_SD2_DAT1__GPIO1_IO14             0x04c 0x360 0x000 0x5 0x0
+#define MX6QDL_PAD_SD2_DAT2__SD2_DATA2              0x050 0x364 0x000 0x0 0x0
+#define MX6QDL_PAD_SD2_DAT2__ECSPI5_SS1             0x050 0x364 0x838 0x1 0x0
+#define MX6QDL_PAD_SD2_DAT2__EIM_CS3_B              0x050 0x364 0x000 0x2 0x0
+#define MX6QDL_PAD_SD2_DAT2__AUD4_TXD               0x050 0x364 0x7b8 0x3 0x0
+#define MX6QDL_PAD_SD2_DAT2__KEY_ROW6               0x050 0x364 0x8f8 0x4 0x0
+#define MX6QDL_PAD_SD2_DAT2__GPIO1_IO13             0x050 0x364 0x000 0x5 0x0
+#define MX6QDL_PAD_SD2_DAT0__SD2_DATA0              0x054 0x368 0x000 0x0 0x0
+#define MX6QDL_PAD_SD2_DAT0__ECSPI5_MISO            0x054 0x368 0x82c 0x1 0x0
+#define MX6QDL_PAD_SD2_DAT0__AUD4_RXD               0x054 0x368 0x7b4 0x3 0x0
+#define MX6QDL_PAD_SD2_DAT0__KEY_ROW7               0x054 0x368 0x8fc 0x4 0x0
+#define MX6QDL_PAD_SD2_DAT0__GPIO1_IO15             0x054 0x368 0x000 0x5 0x0
+#define MX6QDL_PAD_SD2_DAT0__DCIC2_OUT              0x054 0x368 0x000 0x6 0x0
+#define MX6QDL_PAD_RGMII_TXC__USB_H2_DATA           0x058 0x36c 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_TXC__RGMII_TXC             0x058 0x36c 0x000 0x1 0x0
+#define MX6QDL_PAD_RGMII_TXC__SPDIF_EXT_CLK         0x058 0x36c 0x918 0x2 0x0
+#define MX6QDL_PAD_RGMII_TXC__GPIO6_IO19            0x058 0x36c 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_TXC__XTALOSC_REF_CLK_24M   0x058 0x36c 0x000 0x7 0x0
+#define MX6QDL_PAD_RGMII_TD0__HSI_TX_READY          0x05c 0x370 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_TD0__RGMII_TD0             0x05c 0x370 0x000 0x1 0x0
+#define MX6QDL_PAD_RGMII_TD0__GPIO6_IO20            0x05c 0x370 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_TD1__HSI_RX_FLAG           0x060 0x374 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_TD1__RGMII_TD1             0x060 0x374 0x000 0x1 0x0
+#define MX6QDL_PAD_RGMII_TD1__GPIO6_IO21            0x060 0x374 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_TD2__HSI_RX_DATA           0x064 0x378 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_TD2__RGMII_TD2             0x064 0x378 0x000 0x1 0x0
+#define MX6QDL_PAD_RGMII_TD2__GPIO6_IO22            0x064 0x378 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_TD3__HSI_RX_WAKE           0x068 0x37c 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_TD3__RGMII_TD3             0x068 0x37c 0x000 0x1 0x0
+#define MX6QDL_PAD_RGMII_TD3__GPIO6_IO23            0x068 0x37c 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_RX_CTL__USB_H3_DATA        0x06c 0x380 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL       0x06c 0x380 0x858 0x1 0x0
+#define MX6QDL_PAD_RGMII_RX_CTL__GPIO6_IO24         0x06c 0x380 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_RD0__HSI_RX_READY          0x070 0x384 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_RD0__RGMII_RD0             0x070 0x384 0x848 0x1 0x0
+#define MX6QDL_PAD_RGMII_RD0__GPIO6_IO25            0x070 0x384 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_TX_CTL__USB_H2_STROBE      0x074 0x388 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL       0x074 0x388 0x000 0x1 0x0
+#define MX6QDL_PAD_RGMII_TX_CTL__GPIO6_IO26         0x074 0x388 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_TX_CTL__ENET_REF_CLK       0x074 0x388 0x83c 0x7 0x0
+#define MX6QDL_PAD_RGMII_RD1__HSI_TX_FLAG           0x078 0x38c 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_RD1__RGMII_RD1             0x078 0x38c 0x84c 0x1 0x0
+#define MX6QDL_PAD_RGMII_RD1__GPIO6_IO27            0x078 0x38c 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_RD2__HSI_TX_DATA           0x07c 0x390 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_RD2__RGMII_RD2             0x07c 0x390 0x850 0x1 0x0
+#define MX6QDL_PAD_RGMII_RD2__GPIO6_IO28            0x07c 0x390 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_RD3__HSI_TX_WAKE           0x080 0x394 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_RD3__RGMII_RD3             0x080 0x394 0x854 0x1 0x0
+#define MX6QDL_PAD_RGMII_RD3__GPIO6_IO29            0x080 0x394 0x000 0x5 0x0
+#define MX6QDL_PAD_RGMII_RXC__USB_H3_STROBE         0x084 0x398 0x000 0x0 0x0
+#define MX6QDL_PAD_RGMII_RXC__RGMII_RXC             0x084 0x398 0x844 0x1 0x0
+#define MX6QDL_PAD_RGMII_RXC__GPIO6_IO30            0x084 0x398 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_A25__EIM_ADDR25              0x088 0x39c 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_A25__ECSPI4_SS1              0x088 0x39c 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_A25__ECSPI2_RDY              0x088 0x39c 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_A25__IPU1_DI1_PIN12          0x088 0x39c 0x000 0x3 0x0
+#define MX6QDL_PAD_EIM_A25__IPU1_DI0_D1_CS          0x088 0x39c 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_A25__GPIO5_IO02              0x088 0x39c 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_A25__HDMI_TX_CEC_LINE        0x088 0x39c 0x88c 0x6 0x0
+#define MX6QDL_PAD_EIM_EB2__EIM_EB2_B               0x08c 0x3a0 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_EB2__ECSPI1_SS0              0x08c 0x3a0 0x800 0x1 0x0
+#define MX6QDL_PAD_EIM_EB2__IPU2_CSI1_DATA19        0x08c 0x3a0 0x8d4 0x3 0x0
+#define MX6QDL_PAD_EIM_EB2__HDMI_TX_DDC_SCL         0x08c 0x3a0 0x890 0x4 0x0
+#define MX6QDL_PAD_EIM_EB2__GPIO2_IO30              0x08c 0x3a0 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_EB2__I2C2_SCL                0x08c 0x3a0 0x8a0 0x6 0x0
+#define MX6QDL_PAD_EIM_EB2__SRC_BOOT_CFG30          0x08c 0x3a0 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_D16__EIM_DATA16              0x090 0x3a4 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D16__ECSPI1_SCLK             0x090 0x3a4 0x7f4 0x1 0x0
+#define MX6QDL_PAD_EIM_D16__IPU1_DI0_PIN05          0x090 0x3a4 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D16__IPU2_CSI1_DATA18        0x090 0x3a4 0x8d0 0x3 0x0
+#define MX6QDL_PAD_EIM_D16__HDMI_TX_DDC_SDA         0x090 0x3a4 0x894 0x4 0x0
+#define MX6QDL_PAD_EIM_D16__GPIO3_IO16              0x090 0x3a4 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D16__I2C2_SDA                0x090 0x3a4 0x8a4 0x6 0x0
+#define MX6QDL_PAD_EIM_D17__EIM_DATA17              0x094 0x3a8 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D17__ECSPI1_MISO             0x094 0x3a8 0x7f8 0x1 0x0
+#define MX6QDL_PAD_EIM_D17__IPU1_DI0_PIN06          0x094 0x3a8 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D17__IPU2_CSI1_PIXCLK        0x094 0x3a8 0x8e0 0x3 0x0
+#define MX6QDL_PAD_EIM_D17__DCIC1_OUT               0x094 0x3a8 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D17__GPIO3_IO17              0x094 0x3a8 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D17__I2C3_SCL                0x094 0x3a8 0x8a8 0x6 0x0
+#define MX6QDL_PAD_EIM_D18__EIM_DATA18              0x098 0x3ac 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D18__ECSPI1_MOSI             0x098 0x3ac 0x7fc 0x1 0x0
+#define MX6QDL_PAD_EIM_D18__IPU1_DI0_PIN07          0x098 0x3ac 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D18__IPU2_CSI1_DATA17        0x098 0x3ac 0x8cc 0x3 0x0
+#define MX6QDL_PAD_EIM_D18__IPU1_DI1_D0_CS          0x098 0x3ac 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D18__GPIO3_IO18              0x098 0x3ac 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D18__I2C3_SDA                0x098 0x3ac 0x8ac 0x6 0x0
+#define MX6QDL_PAD_EIM_D19__EIM_DATA19              0x09c 0x3b0 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D19__ECSPI1_SS1              0x09c 0x3b0 0x804 0x1 0x0
+#define MX6QDL_PAD_EIM_D19__IPU1_DI0_PIN08          0x09c 0x3b0 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D19__IPU2_CSI1_DATA16        0x09c 0x3b0 0x8c8 0x3 0x0
+#define MX6QDL_PAD_EIM_D19__UART1_CTS_B             0x09c 0x3b0 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D19__UART1_RTS_B             0x09c 0x3b0 0x91c 0x4 0x0
+#define MX6QDL_PAD_EIM_D19__GPIO3_IO19              0x09c 0x3b0 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D19__EPIT1_OUT               0x09c 0x3b0 0x000 0x6 0x0
+#define MX6QDL_PAD_EIM_D20__EIM_DATA20              0x0a0 0x3b4 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D20__ECSPI4_SS0              0x0a0 0x3b4 0x824 0x1 0x0
+#define MX6QDL_PAD_EIM_D20__IPU1_DI0_PIN16          0x0a0 0x3b4 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D20__IPU2_CSI1_DATA15        0x0a0 0x3b4 0x8c4 0x3 0x0
+#define MX6QDL_PAD_EIM_D20__UART1_RTS_B             0x0a0 0x3b4 0x91c 0x4 0x1
+#define MX6QDL_PAD_EIM_D20__UART1_CTS_B             0x0a0 0x3b4 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D20__GPIO3_IO20              0x0a0 0x3b4 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D20__EPIT2_OUT               0x0a0 0x3b4 0x000 0x6 0x0
+#define MX6QDL_PAD_EIM_D21__EIM_DATA21              0x0a4 0x3b8 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D21__ECSPI4_SCLK             0x0a4 0x3b8 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_D21__IPU1_DI0_PIN17          0x0a4 0x3b8 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D21__IPU2_CSI1_DATA11        0x0a4 0x3b8 0x8b4 0x3 0x0
+#define MX6QDL_PAD_EIM_D21__USB_OTG_OC              0x0a4 0x3b8 0x944 0x4 0x0
+#define MX6QDL_PAD_EIM_D21__GPIO3_IO21              0x0a4 0x3b8 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D21__I2C1_SCL                0x0a4 0x3b8 0x898 0x6 0x0
+#define MX6QDL_PAD_EIM_D21__SPDIF_IN                0x0a4 0x3b8 0x914 0x7 0x0
+#define MX6QDL_PAD_EIM_D22__EIM_DATA22              0x0a8 0x3bc 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D22__ECSPI4_MISO             0x0a8 0x3bc 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_D22__IPU1_DI0_PIN01          0x0a8 0x3bc 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D22__IPU2_CSI1_DATA10        0x0a8 0x3bc 0x8b0 0x3 0x0
+#define MX6QDL_PAD_EIM_D22__USB_OTG_PWR             0x0a8 0x3bc 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D22__GPIO3_IO22              0x0a8 0x3bc 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D22__SPDIF_OUT               0x0a8 0x3bc 0x000 0x6 0x0
+#define MX6QDL_PAD_EIM_D23__EIM_DATA23              0x0ac 0x3c0 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D23__IPU1_DI0_D0_CS          0x0ac 0x3c0 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_D23__UART3_CTS_B             0x0ac 0x3c0 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D23__UART3_RTS_B             0x0ac 0x3c0 0x92c 0x2 0x0
+#define MX6QDL_PAD_EIM_D23__UART1_DCD_B             0x0ac 0x3c0 0x000 0x3 0x0
+#define MX6QDL_PAD_EIM_D23__IPU2_CSI1_DATA_EN       0x0ac 0x3c0 0x8d8 0x4 0x0
+#define MX6QDL_PAD_EIM_D23__GPIO3_IO23              0x0ac 0x3c0 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D23__IPU1_DI1_PIN02          0x0ac 0x3c0 0x000 0x6 0x0
+#define MX6QDL_PAD_EIM_D23__IPU1_DI1_PIN14          0x0ac 0x3c0 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_EB3__EIM_EB3_B               0x0b0 0x3c4 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_EB3__ECSPI4_RDY              0x0b0 0x3c4 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_EB3__UART3_RTS_B             0x0b0 0x3c4 0x92c 0x2 0x1
+#define MX6QDL_PAD_EIM_EB3__UART3_CTS_B             0x0b0 0x3c4 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_EB3__UART1_RI_B              0x0b0 0x3c4 0x000 0x3 0x0
+#define MX6QDL_PAD_EIM_EB3__IPU2_CSI1_HSYNC         0x0b0 0x3c4 0x8dc 0x4 0x0
+#define MX6QDL_PAD_EIM_EB3__GPIO2_IO31              0x0b0 0x3c4 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_EB3__IPU1_DI1_PIN03          0x0b0 0x3c4 0x000 0x6 0x0
+#define MX6QDL_PAD_EIM_EB3__SRC_BOOT_CFG31          0x0b0 0x3c4 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_D24__EIM_DATA24              0x0b4 0x3c8 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D24__ECSPI4_SS2              0x0b4 0x3c8 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_D24__UART3_TX_DATA           0x0b4 0x3c8 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D24__UART3_RX_DATA           0x0b4 0x3c8 0x930 0x2 0x0
+#define MX6QDL_PAD_EIM_D24__ECSPI1_SS2              0x0b4 0x3c8 0x808 0x3 0x0
+#define MX6QDL_PAD_EIM_D24__ECSPI2_SS2              0x0b4 0x3c8 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D24__GPIO3_IO24              0x0b4 0x3c8 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D24__AUD5_RXFS               0x0b4 0x3c8 0x7d8 0x6 0x0
+#define MX6QDL_PAD_EIM_D24__UART1_DTR_B             0x0b4 0x3c8 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_D25__EIM_DATA25              0x0b8 0x3cc 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D25__ECSPI4_SS3              0x0b8 0x3cc 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_D25__UART3_RX_DATA           0x0b8 0x3cc 0x930 0x2 0x1
+#define MX6QDL_PAD_EIM_D25__UART3_TX_DATA           0x0b8 0x3cc 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D25__ECSPI1_SS3              0x0b8 0x3cc 0x80c 0x3 0x0
+#define MX6QDL_PAD_EIM_D25__ECSPI2_SS3              0x0b8 0x3cc 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D25__GPIO3_IO25              0x0b8 0x3cc 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D25__AUD5_RXC                0x0b8 0x3cc 0x7d4 0x6 0x0
+#define MX6QDL_PAD_EIM_D25__UART1_DSR_B             0x0b8 0x3cc 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_D26__EIM_DATA26              0x0bc 0x3d0 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D26__IPU1_DI1_PIN11          0x0bc 0x3d0 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_D26__IPU1_CSI0_DATA01        0x0bc 0x3d0 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D26__IPU2_CSI1_DATA14        0x0bc 0x3d0 0x8c0 0x3 0x0
+#define MX6QDL_PAD_EIM_D26__UART2_TX_DATA           0x0bc 0x3d0 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D26__UART2_RX_DATA           0x0bc 0x3d0 0x928 0x4 0x0
+#define MX6QDL_PAD_EIM_D26__GPIO3_IO26              0x0bc 0x3d0 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D26__IPU1_SISG2              0x0bc 0x3d0 0x000 0x6 0x0
+#define MX6QDL_PAD_EIM_D26__IPU1_DISP1_DATA22       0x0bc 0x3d0 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_D27__EIM_DATA27              0x0c0 0x3d4 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D27__IPU1_DI1_PIN13          0x0c0 0x3d4 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_D27__IPU1_CSI0_DATA00        0x0c0 0x3d4 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D27__IPU2_CSI1_DATA13        0x0c0 0x3d4 0x8bc 0x3 0x0
+#define MX6QDL_PAD_EIM_D27__UART2_RX_DATA           0x0c0 0x3d4 0x928 0x4 0x1
+#define MX6QDL_PAD_EIM_D27__UART2_TX_DATA           0x0c0 0x3d4 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D27__GPIO3_IO27              0x0c0 0x3d4 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D27__IPU1_SISG3              0x0c0 0x3d4 0x000 0x6 0x0
+#define MX6QDL_PAD_EIM_D27__IPU1_DISP1_DATA23       0x0c0 0x3d4 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_D28__EIM_DATA28              0x0c4 0x3d8 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D28__I2C1_SDA                0x0c4 0x3d8 0x89c 0x1 0x0
+#define MX6QDL_PAD_EIM_D28__ECSPI4_MOSI             0x0c4 0x3d8 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D28__IPU2_CSI1_DATA12        0x0c4 0x3d8 0x8b8 0x3 0x0
+#define MX6QDL_PAD_EIM_D28__UART2_CTS_B             0x0c4 0x3d8 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D28__UART2_RTS_B             0x0c4 0x3d8 0x924 0x4 0x0
+#define MX6QDL_PAD_EIM_D28__UART2_DTE_CTS_B         0x0c4 0x3d8 0x924 0x4 0x0
+#define MX6QDL_PAD_EIM_D28__UART2_DTE_RTS_B         0x0c4 0x3d8 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D28__GPIO3_IO28              0x0c4 0x3d8 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D28__IPU1_EXT_TRIG           0x0c4 0x3d8 0x000 0x6 0x0
+#define MX6QDL_PAD_EIM_D28__IPU1_DI0_PIN13          0x0c4 0x3d8 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_D29__EIM_DATA29              0x0c8 0x3dc 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D29__IPU1_DI1_PIN15          0x0c8 0x3dc 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_D29__ECSPI4_SS0              0x0c8 0x3dc 0x824 0x2 0x1
+#define MX6QDL_PAD_EIM_D29__UART2_RTS_B             0x0c8 0x3dc 0x924 0x4 0x1
+#define MX6QDL_PAD_EIM_D29__UART2_CTS_B             0x0c8 0x3dc 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D29__UART2_DTE_RTS_B         0x0c8 0x3dc 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D29__UART2_DTE_CTS_B         0x0c8 0x3dc 0x924 0x4 0x1
+#define MX6QDL_PAD_EIM_D29__GPIO3_IO29              0x0c8 0x3dc 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D29__IPU2_CSI1_VSYNC         0x0c8 0x3dc 0x8e4 0x6 0x0
+#define MX6QDL_PAD_EIM_D29__IPU1_DI0_PIN14          0x0c8 0x3dc 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_D30__EIM_DATA30              0x0cc 0x3e0 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D30__IPU1_DISP1_DATA21       0x0cc 0x3e0 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_D30__IPU1_DI0_PIN11          0x0cc 0x3e0 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D30__IPU1_CSI0_DATA03        0x0cc 0x3e0 0x000 0x3 0x0
+#define MX6QDL_PAD_EIM_D30__UART3_CTS_B             0x0cc 0x3e0 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D30__UART3_RTS_B             0x0cc 0x3e0 0x92c 0x4 0x2
+#define MX6QDL_PAD_EIM_D30__GPIO3_IO30              0x0cc 0x3e0 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D30__USB_H1_OC               0x0cc 0x3e0 0x948 0x6 0x0
+#define MX6QDL_PAD_EIM_D31__EIM_DATA31              0x0d0 0x3e4 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_D31__IPU1_DISP1_DATA20       0x0d0 0x3e4 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_D31__IPU1_DI0_PIN12          0x0d0 0x3e4 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_D31__IPU1_CSI0_DATA02        0x0d0 0x3e4 0x000 0x3 0x0
+#define MX6QDL_PAD_EIM_D31__UART3_RTS_B             0x0d0 0x3e4 0x92c 0x4 0x3
+#define MX6QDL_PAD_EIM_D31__UART3_CTS_B             0x0d0 0x3e4 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_D31__GPIO3_IO31              0x0d0 0x3e4 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_D31__USB_H1_PWR              0x0d0 0x3e4 0x000 0x6 0x0
+#define MX6QDL_PAD_EIM_A24__EIM_ADDR24              0x0d4 0x3e8 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_A24__IPU1_DISP1_DATA19       0x0d4 0x3e8 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_A24__IPU2_CSI1_DATA19        0x0d4 0x3e8 0x8d4 0x2 0x1
+#define MX6QDL_PAD_EIM_A24__IPU2_SISG2              0x0d4 0x3e8 0x000 0x3 0x0
+#define MX6QDL_PAD_EIM_A24__IPU1_SISG2              0x0d4 0x3e8 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_A24__GPIO5_IO04              0x0d4 0x3e8 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_A24__SRC_BOOT_CFG24          0x0d4 0x3e8 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_A23__EIM_ADDR23              0x0d8 0x3ec 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_A23__IPU1_DISP1_DATA18       0x0d8 0x3ec 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_A23__IPU2_CSI1_DATA18        0x0d8 0x3ec 0x8d0 0x2 0x1
+#define MX6QDL_PAD_EIM_A23__IPU2_SISG3              0x0d8 0x3ec 0x000 0x3 0x0
+#define MX6QDL_PAD_EIM_A23__IPU1_SISG3              0x0d8 0x3ec 0x000 0x4 0x0
+#define MX6QDL_PAD_EIM_A23__GPIO6_IO06              0x0d8 0x3ec 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_A23__SRC_BOOT_CFG23          0x0d8 0x3ec 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_A22__EIM_ADDR22              0x0dc 0x3f0 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_A22__IPU1_DISP1_DATA17       0x0dc 0x3f0 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_A22__IPU2_CSI1_DATA17        0x0dc 0x3f0 0x8cc 0x2 0x1
+#define MX6QDL_PAD_EIM_A22__GPIO2_IO16              0x0dc 0x3f0 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_A22__SRC_BOOT_CFG22          0x0dc 0x3f0 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_A21__EIM_ADDR21              0x0e0 0x3f4 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_A21__IPU1_DISP1_DATA16       0x0e0 0x3f4 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_A21__IPU2_CSI1_DATA16        0x0e0 0x3f4 0x8c8 0x2 0x1
+#define MX6QDL_PAD_EIM_A21__GPIO2_IO17              0x0e0 0x3f4 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_A21__SRC_BOOT_CFG21          0x0e0 0x3f4 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_A20__EIM_ADDR20              0x0e4 0x3f8 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_A20__IPU1_DISP1_DATA15       0x0e4 0x3f8 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_A20__IPU2_CSI1_DATA15        0x0e4 0x3f8 0x8c4 0x2 0x1
+#define MX6QDL_PAD_EIM_A20__GPIO2_IO18              0x0e4 0x3f8 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_A20__SRC_BOOT_CFG20          0x0e4 0x3f8 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_A19__EIM_ADDR19              0x0e8 0x3fc 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_A19__IPU1_DISP1_DATA14       0x0e8 0x3fc 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_A19__IPU2_CSI1_DATA14        0x0e8 0x3fc 0x8c0 0x2 0x1
+#define MX6QDL_PAD_EIM_A19__GPIO2_IO19              0x0e8 0x3fc 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_A19__SRC_BOOT_CFG19          0x0e8 0x3fc 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_A18__EIM_ADDR18              0x0ec 0x400 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_A18__IPU1_DISP1_DATA13       0x0ec 0x400 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_A18__IPU2_CSI1_DATA13        0x0ec 0x400 0x8bc 0x2 0x1
+#define MX6QDL_PAD_EIM_A18__GPIO2_IO20              0x0ec 0x400 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_A18__SRC_BOOT_CFG18          0x0ec 0x400 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_A17__EIM_ADDR17              0x0f0 0x404 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_A17__IPU1_DISP1_DATA12       0x0f0 0x404 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_A17__IPU2_CSI1_DATA12        0x0f0 0x404 0x8b8 0x2 0x1
+#define MX6QDL_PAD_EIM_A17__GPIO2_IO21              0x0f0 0x404 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_A17__SRC_BOOT_CFG17          0x0f0 0x404 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_A16__EIM_ADDR16              0x0f4 0x408 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_A16__IPU1_DI1_DISP_CLK       0x0f4 0x408 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_A16__IPU2_CSI1_PIXCLK        0x0f4 0x408 0x8e0 0x2 0x1
+#define MX6QDL_PAD_EIM_A16__GPIO2_IO22              0x0f4 0x408 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_A16__SRC_BOOT_CFG16          0x0f4 0x408 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_CS0__EIM_CS0_B               0x0f8 0x40c 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_CS0__IPU1_DI1_PIN05          0x0f8 0x40c 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_CS0__ECSPI2_SCLK             0x0f8 0x40c 0x810 0x2 0x0
+#define MX6QDL_PAD_EIM_CS0__GPIO2_IO23              0x0f8 0x40c 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_CS1__EIM_CS1_B               0x0fc 0x410 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_CS1__IPU1_DI1_PIN06          0x0fc 0x410 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_CS1__ECSPI2_MOSI             0x0fc 0x410 0x818 0x2 0x0
+#define MX6QDL_PAD_EIM_CS1__GPIO2_IO24              0x0fc 0x410 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_OE__EIM_OE_B                 0x100 0x414 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_OE__IPU1_DI1_PIN07           0x100 0x414 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_OE__ECSPI2_MISO              0x100 0x414 0x814 0x2 0x0
+#define MX6QDL_PAD_EIM_OE__GPIO2_IO25               0x100 0x414 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_RW__EIM_RW                   0x104 0x418 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_RW__IPU1_DI1_PIN08           0x104 0x418 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_RW__ECSPI2_SS0               0x104 0x418 0x81c 0x2 0x0
+#define MX6QDL_PAD_EIM_RW__GPIO2_IO26               0x104 0x418 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_RW__SRC_BOOT_CFG29           0x104 0x418 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_LBA__EIM_LBA_B               0x108 0x41c 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_LBA__IPU1_DI1_PIN17          0x108 0x41c 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_LBA__ECSPI2_SS1              0x108 0x41c 0x820 0x2 0x0
+#define MX6QDL_PAD_EIM_LBA__GPIO2_IO27              0x108 0x41c 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_LBA__SRC_BOOT_CFG26          0x108 0x41c 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_EB0__EIM_EB0_B               0x10c 0x420 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_EB0__IPU1_DISP1_DATA11       0x10c 0x420 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_EB0__IPU2_CSI1_DATA11        0x10c 0x420 0x8b4 0x2 0x1
+#define MX6QDL_PAD_EIM_EB0__CCM_PMIC_READY          0x10c 0x420 0x7f0 0x4 0x0
+#define MX6QDL_PAD_EIM_EB0__GPIO2_IO28              0x10c 0x420 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_EB0__SRC_BOOT_CFG27          0x10c 0x420 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_EB1__EIM_EB1_B               0x110 0x424 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_EB1__IPU1_DISP1_DATA10       0x110 0x424 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_EB1__IPU2_CSI1_DATA10        0x110 0x424 0x8b0 0x2 0x1
+#define MX6QDL_PAD_EIM_EB1__GPIO2_IO29              0x110 0x424 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_EB1__SRC_BOOT_CFG28          0x110 0x424 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA0__EIM_AD00                0x114 0x428 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA0__IPU1_DISP1_DATA09       0x114 0x428 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA0__IPU2_CSI1_DATA09        0x114 0x428 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_DA0__GPIO3_IO00              0x114 0x428 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA0__SRC_BOOT_CFG00          0x114 0x428 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA1__EIM_AD01                0x118 0x42c 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA1__IPU1_DISP1_DATA08       0x118 0x42c 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA1__IPU2_CSI1_DATA08        0x118 0x42c 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_DA1__GPIO3_IO01              0x118 0x42c 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA1__SRC_BOOT_CFG01          0x118 0x42c 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA2__EIM_AD02                0x11c 0x430 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA2__IPU1_DISP1_DATA07       0x11c 0x430 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA2__IPU2_CSI1_DATA07        0x11c 0x430 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_DA2__GPIO3_IO02              0x11c 0x430 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA2__SRC_BOOT_CFG02          0x11c 0x430 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA3__EIM_AD03                0x120 0x434 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA3__IPU1_DISP1_DATA06       0x120 0x434 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA3__IPU2_CSI1_DATA06        0x120 0x434 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_DA3__GPIO3_IO03              0x120 0x434 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA3__SRC_BOOT_CFG03          0x120 0x434 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA4__EIM_AD04                0x124 0x438 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA4__IPU1_DISP1_DATA05       0x124 0x438 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA4__IPU2_CSI1_DATA05        0x124 0x438 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_DA4__GPIO3_IO04              0x124 0x438 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA4__SRC_BOOT_CFG04          0x124 0x438 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA5__EIM_AD05                0x128 0x43c 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA5__IPU1_DISP1_DATA04       0x128 0x43c 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA5__IPU2_CSI1_DATA04        0x128 0x43c 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_DA5__GPIO3_IO05              0x128 0x43c 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA5__SRC_BOOT_CFG05          0x128 0x43c 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA6__EIM_AD06                0x12c 0x440 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA6__IPU1_DISP1_DATA03       0x12c 0x440 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA6__IPU2_CSI1_DATA03        0x12c 0x440 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_DA6__GPIO3_IO06              0x12c 0x440 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA6__SRC_BOOT_CFG06          0x12c 0x440 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA7__EIM_AD07                0x130 0x444 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA7__IPU1_DISP1_DATA02       0x130 0x444 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA7__IPU2_CSI1_DATA02        0x130 0x444 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_DA7__GPIO3_IO07              0x130 0x444 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA7__SRC_BOOT_CFG07          0x130 0x444 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA8__EIM_AD08                0x134 0x448 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA8__IPU1_DISP1_DATA01       0x134 0x448 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA8__IPU2_CSI1_DATA01        0x134 0x448 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_DA8__GPIO3_IO08              0x134 0x448 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA8__SRC_BOOT_CFG08          0x134 0x448 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA9__EIM_AD09                0x138 0x44c 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA9__IPU1_DISP1_DATA00       0x138 0x44c 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA9__IPU2_CSI1_DATA00        0x138 0x44c 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_DA9__GPIO3_IO09              0x138 0x44c 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA9__SRC_BOOT_CFG09          0x138 0x44c 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA10__EIM_AD10               0x13c 0x450 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA10__IPU1_DI1_PIN15         0x13c 0x450 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA10__IPU2_CSI1_DATA_EN      0x13c 0x450 0x8d8 0x2 0x1
+#define MX6QDL_PAD_EIM_DA10__GPIO3_IO10             0x13c 0x450 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA10__SRC_BOOT_CFG10         0x13c 0x450 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA11__EIM_AD11               0x140 0x454 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA11__IPU1_DI1_PIN02         0x140 0x454 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA11__IPU2_CSI1_HSYNC        0x140 0x454 0x8dc 0x2 0x1
+#define MX6QDL_PAD_EIM_DA11__GPIO3_IO11             0x140 0x454 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA11__SRC_BOOT_CFG11         0x140 0x454 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA12__EIM_AD12               0x144 0x458 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA12__IPU1_DI1_PIN03         0x144 0x458 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA12__IPU2_CSI1_VSYNC        0x144 0x458 0x8e4 0x2 0x1
+#define MX6QDL_PAD_EIM_DA12__GPIO3_IO12             0x144 0x458 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA12__SRC_BOOT_CFG12         0x144 0x458 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA13__EIM_AD13               0x148 0x45c 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA13__IPU1_DI1_D0_CS         0x148 0x45c 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA13__GPIO3_IO13             0x148 0x45c 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA13__SRC_BOOT_CFG13         0x148 0x45c 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA14__EIM_AD14               0x14c 0x460 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA14__IPU1_DI1_D1_CS         0x14c 0x460 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA14__GPIO3_IO14             0x14c 0x460 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA14__SRC_BOOT_CFG14         0x14c 0x460 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_DA15__EIM_AD15               0x150 0x464 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_DA15__IPU1_DI1_PIN01         0x150 0x464 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_DA15__IPU1_DI1_PIN04         0x150 0x464 0x000 0x2 0x0
+#define MX6QDL_PAD_EIM_DA15__GPIO3_IO15             0x150 0x464 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_DA15__SRC_BOOT_CFG15         0x150 0x464 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_WAIT__EIM_WAIT_B             0x154 0x468 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_WAIT__EIM_DTACK_B            0x154 0x468 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_WAIT__GPIO5_IO00             0x154 0x468 0x000 0x5 0x0
+#define MX6QDL_PAD_EIM_WAIT__SRC_BOOT_CFG25         0x154 0x468 0x000 0x7 0x0
+#define MX6QDL_PAD_EIM_BCLK__EIM_BCLK               0x158 0x46c 0x000 0x0 0x0
+#define MX6QDL_PAD_EIM_BCLK__IPU1_DI1_PIN16         0x158 0x46c 0x000 0x1 0x0
+#define MX6QDL_PAD_EIM_BCLK__GPIO6_IO31             0x158 0x46c 0x000 0x5 0x0
+#define MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK  0x15c 0x470 0x000 0x0 0x0
+#define MX6QDL_PAD_DI0_DISP_CLK__IPU2_DI0_DISP_CLK  0x15c 0x470 0x000 0x1 0x0
+#define MX6QDL_PAD_DI0_DISP_CLK__GPIO4_IO16         0x15c 0x470 0x000 0x5 0x0
+#define MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15        0x160 0x474 0x000 0x0 0x0
+#define MX6QDL_PAD_DI0_PIN15__IPU2_DI0_PIN15        0x160 0x474 0x000 0x1 0x0
+#define MX6QDL_PAD_DI0_PIN15__AUD6_TXC              0x160 0x474 0x000 0x2 0x0
+#define MX6QDL_PAD_DI0_PIN15__GPIO4_IO17            0x160 0x474 0x000 0x5 0x0
+#define MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02         0x164 0x478 0x000 0x0 0x0
+#define MX6QDL_PAD_DI0_PIN2__IPU2_DI0_PIN02         0x164 0x478 0x000 0x1 0x0
+#define MX6QDL_PAD_DI0_PIN2__AUD6_TXD               0x164 0x478 0x000 0x2 0x0
+#define MX6QDL_PAD_DI0_PIN2__GPIO4_IO18             0x164 0x478 0x000 0x5 0x0
+#define MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03         0x168 0x47c 0x000 0x0 0x0
+#define MX6QDL_PAD_DI0_PIN3__IPU2_DI0_PIN03         0x168 0x47c 0x000 0x1 0x0
+#define MX6QDL_PAD_DI0_PIN3__AUD6_TXFS              0x168 0x47c 0x000 0x2 0x0
+#define MX6QDL_PAD_DI0_PIN3__GPIO4_IO19             0x168 0x47c 0x000 0x5 0x0
+#define MX6QDL_PAD_DI0_PIN4__IPU1_DI0_PIN04         0x16c 0x480 0x000 0x0 0x0
+#define MX6QDL_PAD_DI0_PIN4__IPU2_DI0_PIN04         0x16c 0x480 0x000 0x1 0x0
+#define MX6QDL_PAD_DI0_PIN4__AUD6_RXD               0x16c 0x480 0x000 0x2 0x0
+#define MX6QDL_PAD_DI0_PIN4__SD1_WP                 0x16c 0x480 0x94c 0x3 0x0
+#define MX6QDL_PAD_DI0_PIN4__GPIO4_IO20             0x16c 0x480 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00    0x170 0x484 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT0__IPU2_DISP0_DATA00    0x170 0x484 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT0__ECSPI3_SCLK          0x170 0x484 0x000 0x2 0x0
+#define MX6QDL_PAD_DISP0_DAT0__GPIO4_IO21           0x170 0x484 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01    0x174 0x488 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT1__IPU2_DISP0_DATA01    0x174 0x488 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT1__ECSPI3_MOSI          0x174 0x488 0x000 0x2 0x0
+#define MX6QDL_PAD_DISP0_DAT1__GPIO4_IO22           0x174 0x488 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02    0x178 0x48c 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT2__IPU2_DISP0_DATA02    0x178 0x48c 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT2__ECSPI3_MISO          0x178 0x48c 0x000 0x2 0x0
+#define MX6QDL_PAD_DISP0_DAT2__GPIO4_IO23           0x178 0x48c 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03    0x17c 0x490 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT3__IPU2_DISP0_DATA03    0x17c 0x490 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT3__ECSPI3_SS0           0x17c 0x490 0x000 0x2 0x0
+#define MX6QDL_PAD_DISP0_DAT3__GPIO4_IO24           0x17c 0x490 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04    0x180 0x494 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT4__IPU2_DISP0_DATA04    0x180 0x494 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT4__ECSPI3_SS1           0x180 0x494 0x000 0x2 0x0
+#define MX6QDL_PAD_DISP0_DAT4__GPIO4_IO25           0x180 0x494 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05    0x184 0x498 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT5__IPU2_DISP0_DATA05    0x184 0x498 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT5__ECSPI3_SS2           0x184 0x498 0x000 0x2 0x0
+#define MX6QDL_PAD_DISP0_DAT5__AUD6_RXFS            0x184 0x498 0x000 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT5__GPIO4_IO26           0x184 0x498 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06    0x188 0x49c 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT6__IPU2_DISP0_DATA06    0x188 0x49c 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT6__ECSPI3_SS3           0x188 0x49c 0x000 0x2 0x0
+#define MX6QDL_PAD_DISP0_DAT6__AUD6_RXC             0x188 0x49c 0x000 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT6__GPIO4_IO27           0x188 0x49c 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07    0x18c 0x4a0 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT7__IPU2_DISP0_DATA07    0x18c 0x4a0 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT7__ECSPI3_RDY           0x18c 0x4a0 0x000 0x2 0x0
+#define MX6QDL_PAD_DISP0_DAT7__GPIO4_IO28           0x18c 0x4a0 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08    0x190 0x4a4 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT8__IPU2_DISP0_DATA08    0x190 0x4a4 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT8__PWM1_OUT             0x190 0x4a4 0x000 0x2 0x0
+#define MX6QDL_PAD_DISP0_DAT8__WDOG1_B              0x190 0x4a4 0x000 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT8__GPIO4_IO29           0x190 0x4a4 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09    0x194 0x4a8 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT9__IPU2_DISP0_DATA09    0x194 0x4a8 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT9__PWM2_OUT             0x194 0x4a8 0x000 0x2 0x0
+#define MX6QDL_PAD_DISP0_DAT9__WDOG2_B              0x194 0x4a8 0x000 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT9__GPIO4_IO30           0x194 0x4a8 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10   0x198 0x4ac 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT10__IPU2_DISP0_DATA10   0x198 0x4ac 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT10__GPIO4_IO31          0x198 0x4ac 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11   0x19c 0x4b0 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT11__IPU2_DISP0_DATA11   0x19c 0x4b0 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT11__GPIO5_IO05          0x19c 0x4b0 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12   0x1a0 0x4b4 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT12__IPU2_DISP0_DATA12   0x1a0 0x4b4 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT12__GPIO5_IO06          0x1a0 0x4b4 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13   0x1a4 0x4b8 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT13__IPU2_DISP0_DATA13   0x1a4 0x4b8 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT13__AUD5_RXFS           0x1a4 0x4b8 0x7d8 0x3 0x1
+#define MX6QDL_PAD_DISP0_DAT13__GPIO5_IO07          0x1a4 0x4b8 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14   0x1a8 0x4bc 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT14__IPU2_DISP0_DATA14   0x1a8 0x4bc 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT14__AUD5_RXC            0x1a8 0x4bc 0x7d4 0x3 0x1
+#define MX6QDL_PAD_DISP0_DAT14__GPIO5_IO08          0x1a8 0x4bc 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15   0x1ac 0x4c0 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT15__IPU2_DISP0_DATA15   0x1ac 0x4c0 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT15__ECSPI1_SS1          0x1ac 0x4c0 0x804 0x2 0x1
+#define MX6QDL_PAD_DISP0_DAT15__ECSPI2_SS1          0x1ac 0x4c0 0x820 0x3 0x1
+#define MX6QDL_PAD_DISP0_DAT15__GPIO5_IO09          0x1ac 0x4c0 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16   0x1b0 0x4c4 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT16__IPU2_DISP0_DATA16   0x1b0 0x4c4 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT16__ECSPI2_MOSI         0x1b0 0x4c4 0x818 0x2 0x1
+#define MX6QDL_PAD_DISP0_DAT16__AUD5_TXC            0x1b0 0x4c4 0x7dc 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT16__SDMA_EXT_EVENT0     0x1b0 0x4c4 0x90c 0x4 0x0
+#define MX6QDL_PAD_DISP0_DAT16__GPIO5_IO10          0x1b0 0x4c4 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17   0x1b4 0x4c8 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT17__IPU2_DISP0_DATA17   0x1b4 0x4c8 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT17__ECSPI2_MISO         0x1b4 0x4c8 0x814 0x2 0x1
+#define MX6QDL_PAD_DISP0_DAT17__AUD5_TXD            0x1b4 0x4c8 0x7d0 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT17__SDMA_EXT_EVENT1     0x1b4 0x4c8 0x910 0x4 0x0
+#define MX6QDL_PAD_DISP0_DAT17__GPIO5_IO11          0x1b4 0x4c8 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT18__IPU1_DISP0_DATA18   0x1b8 0x4cc 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT18__IPU2_DISP0_DATA18   0x1b8 0x4cc 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT18__ECSPI2_SS0          0x1b8 0x4cc 0x81c 0x2 0x1
+#define MX6QDL_PAD_DISP0_DAT18__AUD5_TXFS           0x1b8 0x4cc 0x7e0 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT18__AUD4_RXFS           0x1b8 0x4cc 0x7c0 0x4 0x0
+#define MX6QDL_PAD_DISP0_DAT18__GPIO5_IO12          0x1b8 0x4cc 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT18__EIM_CS2_B           0x1b8 0x4cc 0x000 0x7 0x0
+#define MX6QDL_PAD_DISP0_DAT19__IPU1_DISP0_DATA19   0x1bc 0x4d0 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT19__IPU2_DISP0_DATA19   0x1bc 0x4d0 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT19__ECSPI2_SCLK         0x1bc 0x4d0 0x810 0x2 0x1
+#define MX6QDL_PAD_DISP0_DAT19__AUD5_RXD            0x1bc 0x4d0 0x7cc 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT19__AUD4_RXC            0x1bc 0x4d0 0x7bc 0x4 0x0
+#define MX6QDL_PAD_DISP0_DAT19__GPIO5_IO13          0x1bc 0x4d0 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT19__EIM_CS3_B           0x1bc 0x4d0 0x000 0x7 0x0
+#define MX6QDL_PAD_DISP0_DAT20__IPU1_DISP0_DATA20   0x1c0 0x4d4 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT20__IPU2_DISP0_DATA20   0x1c0 0x4d4 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT20__ECSPI1_SCLK         0x1c0 0x4d4 0x7f4 0x2 0x1
+#define MX6QDL_PAD_DISP0_DAT20__AUD4_TXC            0x1c0 0x4d4 0x7c4 0x3 0x0
+#define MX6QDL_PAD_DISP0_DAT20__GPIO5_IO14          0x1c0 0x4d4 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT21__IPU1_DISP0_DATA21   0x1c4 0x4d8 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT21__IPU2_DISP0_DATA21   0x1c4 0x4d8 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT21__ECSPI1_MOSI         0x1c4 0x4d8 0x7fc 0x2 0x1
+#define MX6QDL_PAD_DISP0_DAT21__AUD4_TXD            0x1c4 0x4d8 0x7b8 0x3 0x1
+#define MX6QDL_PAD_DISP0_DAT21__GPIO5_IO15          0x1c4 0x4d8 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT22__IPU1_DISP0_DATA22   0x1c8 0x4dc 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT22__IPU2_DISP0_DATA22   0x1c8 0x4dc 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT22__ECSPI1_MISO         0x1c8 0x4dc 0x7f8 0x2 0x1
+#define MX6QDL_PAD_DISP0_DAT22__AUD4_TXFS           0x1c8 0x4dc 0x7c8 0x3 0x1
+#define MX6QDL_PAD_DISP0_DAT22__GPIO5_IO16          0x1c8 0x4dc 0x000 0x5 0x0
+#define MX6QDL_PAD_DISP0_DAT23__IPU1_DISP0_DATA23   0x1cc 0x4e0 0x000 0x0 0x0
+#define MX6QDL_PAD_DISP0_DAT23__IPU2_DISP0_DATA23   0x1cc 0x4e0 0x000 0x1 0x0
+#define MX6QDL_PAD_DISP0_DAT23__ECSPI1_SS0          0x1cc 0x4e0 0x800 0x2 0x1
+#define MX6QDL_PAD_DISP0_DAT23__AUD4_RXD            0x1cc 0x4e0 0x7b4 0x3 0x1
+#define MX6QDL_PAD_DISP0_DAT23__GPIO5_IO17          0x1cc 0x4e0 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_MDIO__ENET_MDIO             0x1d0 0x4e4 0x840 0x1 0x0
+#define MX6QDL_PAD_ENET_MDIO__ESAI_RX_CLK           0x1d0 0x4e4 0x86c 0x2 0x0
+#define MX6QDL_PAD_ENET_MDIO__ENET_1588_EVENT1_OUT  0x1d0 0x4e4 0x000 0x4 0x0
+#define MX6QDL_PAD_ENET_MDIO__GPIO1_IO22            0x1d0 0x4e4 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_MDIO__SPDIF_LOCK            0x1d0 0x4e4 0x000 0x6 0x0
+#define MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK        0x1d4 0x4e8 0x000 0x1 0x0
+#define MX6QDL_PAD_ENET_REF_CLK__ESAI_RX_FS         0x1d4 0x4e8 0x85c 0x2 0x0
+#define MX6QDL_PAD_ENET_REF_CLK__GPIO1_IO23         0x1d4 0x4e8 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_REF_CLK__SPDIF_SR_CLK       0x1d4 0x4e8 0x000 0x6 0x0
+#define MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID           0x1d8 0x4ec 0x000 0x0 0x0
+#define MX6QDL_PAD_ENET_RX_ER__ENET_RX_ER           0x1d8 0x4ec 0x000 0x1 0x0
+#define MX6QDL_PAD_ENET_RX_ER__ESAI_RX_HF_CLK       0x1d8 0x4ec 0x864 0x2 0x0
+#define MX6QDL_PAD_ENET_RX_ER__SPDIF_IN             0x1d8 0x4ec 0x914 0x3 0x1
+#define MX6QDL_PAD_ENET_RX_ER__ENET_1588_EVENT2_OUT 0x1d8 0x4ec 0x000 0x4 0x0
+#define MX6QDL_PAD_ENET_RX_ER__GPIO1_IO24           0x1d8 0x4ec 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_CRS_DV__ENET_RX_EN          0x1dc 0x4f0 0x858 0x1 0x1
+#define MX6QDL_PAD_ENET_CRS_DV__ESAI_TX_CLK         0x1dc 0x4f0 0x870 0x2 0x0
+#define MX6QDL_PAD_ENET_CRS_DV__SPDIF_EXT_CLK       0x1dc 0x4f0 0x918 0x3 0x1
+#define MX6QDL_PAD_ENET_CRS_DV__GPIO1_IO25          0x1dc 0x4f0 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_RXD1__MLB_SIG               0x1e0 0x4f4 0x908 0x0 0x0
+#define MX6QDL_PAD_ENET_RXD1__ENET_RX_DATA1         0x1e0 0x4f4 0x84c 0x1 0x1
+#define MX6QDL_PAD_ENET_RXD1__ESAI_TX_FS            0x1e0 0x4f4 0x860 0x2 0x0
+#define MX6QDL_PAD_ENET_RXD1__ENET_1588_EVENT3_OUT  0x1e0 0x4f4 0x000 0x4 0x0
+#define MX6QDL_PAD_ENET_RXD1__GPIO1_IO26            0x1e0 0x4f4 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_RXD0__ENET_RX_DATA0         0x1e4 0x4f8 0x848 0x1 0x1
+#define MX6QDL_PAD_ENET_RXD0__ESAI_TX_HF_CLK        0x1e4 0x4f8 0x868 0x2 0x0
+#define MX6QDL_PAD_ENET_RXD0__SPDIF_OUT             0x1e4 0x4f8 0x000 0x3 0x0
+#define MX6QDL_PAD_ENET_RXD0__GPIO1_IO27            0x1e4 0x4f8 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN           0x1e8 0x4fc 0x000 0x1 0x0
+#define MX6QDL_PAD_ENET_TX_EN__ESAI_TX3_RX2         0x1e8 0x4fc 0x880 0x2 0x0
+#define MX6QDL_PAD_ENET_TX_EN__GPIO1_IO28           0x1e8 0x4fc 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_TXD1__MLB_CLK               0x1ec 0x500 0x900 0x0 0x0
+#define MX6QDL_PAD_ENET_TXD1__ENET_TX_DATA1         0x1ec 0x500 0x000 0x1 0x0
+#define MX6QDL_PAD_ENET_TXD1__ESAI_TX2_RX3          0x1ec 0x500 0x87c 0x2 0x0
+#define MX6QDL_PAD_ENET_TXD1__ENET_1588_EVENT0_IN   0x1ec 0x500 0x000 0x4 0x0
+#define MX6QDL_PAD_ENET_TXD1__GPIO1_IO29            0x1ec 0x500 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_TXD0__ENET_TX_DATA0         0x1f0 0x504 0x000 0x1 0x0
+#define MX6QDL_PAD_ENET_TXD0__ESAI_TX4_RX1          0x1f0 0x504 0x884 0x2 0x0
+#define MX6QDL_PAD_ENET_TXD0__GPIO1_IO30            0x1f0 0x504 0x000 0x5 0x0
+#define MX6QDL_PAD_ENET_MDC__MLB_DATA               0x1f4 0x508 0x904 0x0 0x0
+#define MX6QDL_PAD_ENET_MDC__ENET_MDC               0x1f4 0x508 0x000 0x1 0x0
+#define MX6QDL_PAD_ENET_MDC__ESAI_TX5_RX0           0x1f4 0x508 0x888 0x2 0x0
+#define MX6QDL_PAD_ENET_MDC__ENET_1588_EVENT1_IN    0x1f4 0x508 0x000 0x4 0x0
+#define MX6QDL_PAD_ENET_MDC__GPIO1_IO31             0x1f4 0x508 0x000 0x5 0x0
+#define MX6QDL_PAD_KEY_COL0__ECSPI1_SCLK            0x1f8 0x5c8 0x7f4 0x0 0x2
+#define MX6QDL_PAD_KEY_COL0__ENET_RX_DATA3          0x1f8 0x5c8 0x854 0x1 0x1
+#define MX6QDL_PAD_KEY_COL0__AUD5_TXC               0x1f8 0x5c8 0x7dc 0x2 0x1
+#define MX6QDL_PAD_KEY_COL0__KEY_COL0               0x1f8 0x5c8 0x000 0x3 0x0
+#define MX6QDL_PAD_KEY_COL0__UART4_TX_DATA          0x1f8 0x5c8 0x000 0x4 0x0
+#define MX6QDL_PAD_KEY_COL0__UART4_RX_DATA          0x1f8 0x5c8 0x938 0x4 0x0
+#define MX6QDL_PAD_KEY_COL0__GPIO4_IO06             0x1f8 0x5c8 0x000 0x5 0x0
+#define MX6QDL_PAD_KEY_COL0__DCIC1_OUT              0x1f8 0x5c8 0x000 0x6 0x0
+#define MX6QDL_PAD_KEY_ROW0__ECSPI1_MOSI            0x1fc 0x5cc 0x7fc 0x0 0x2
+#define MX6QDL_PAD_KEY_ROW0__ENET_TX_DATA3          0x1fc 0x5cc 0x000 0x1 0x0
+#define MX6QDL_PAD_KEY_ROW0__AUD5_TXD               0x1fc 0x5cc 0x7d0 0x2 0x1
+#define MX6QDL_PAD_KEY_ROW0__KEY_ROW0               0x1fc 0x5cc 0x000 0x3 0x0
+#define MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA          0x1fc 0x5cc 0x938 0x4 0x1
+#define MX6QDL_PAD_KEY_ROW0__UART4_TX_DATA          0x1fc 0x5cc 0x000 0x4 0x0
+#define MX6QDL_PAD_KEY_ROW0__GPIO4_IO07             0x1fc 0x5cc 0x000 0x5 0x0
+#define MX6QDL_PAD_KEY_ROW0__DCIC2_OUT              0x1fc 0x5cc 0x000 0x6 0x0
+#define MX6QDL_PAD_KEY_COL1__ECSPI1_MISO            0x200 0x5d0 0x7f8 0x0 0x2
+#define MX6QDL_PAD_KEY_COL1__ENET_MDIO              0x200 0x5d0 0x840 0x1 0x1
+#define MX6QDL_PAD_KEY_COL1__AUD5_TXFS              0x200 0x5d0 0x7e0 0x2 0x1
+#define MX6QDL_PAD_KEY_COL1__KEY_COL1               0x200 0x5d0 0x000 0x3 0x0
+#define MX6QDL_PAD_KEY_COL1__UART5_TX_DATA          0x200 0x5d0 0x000 0x4 0x0
+#define MX6QDL_PAD_KEY_COL1__UART5_RX_DATA          0x200 0x5d0 0x940 0x4 0x0
+#define MX6QDL_PAD_KEY_COL1__GPIO4_IO08             0x200 0x5d0 0x000 0x5 0x0
+#define MX6QDL_PAD_KEY_COL1__SD1_VSELECT            0x200 0x5d0 0x000 0x6 0x0
+#define MX6QDL_PAD_KEY_ROW1__ECSPI1_SS0             0x204 0x5d4 0x800 0x0 0x2
+#define MX6QDL_PAD_KEY_ROW1__ENET_COL               0x204 0x5d4 0x000 0x1 0x0
+#define MX6QDL_PAD_KEY_ROW1__AUD5_RXD               0x204 0x5d4 0x7cc 0x2 0x1
+#define MX6QDL_PAD_KEY_ROW1__KEY_ROW1               0x204 0x5d4 0x000 0x3 0x0
+#define MX6QDL_PAD_KEY_ROW1__UART5_RX_DATA          0x204 0x5d4 0x940 0x4 0x1
+#define MX6QDL_PAD_KEY_ROW1__UART5_TX_DATA          0x204 0x5d4 0x000 0x4 0x0
+#define MX6QDL_PAD_KEY_ROW1__GPIO4_IO09             0x204 0x5d4 0x000 0x5 0x0
+#define MX6QDL_PAD_KEY_ROW1__SD2_VSELECT            0x204 0x5d4 0x000 0x6 0x0
+#define MX6QDL_PAD_KEY_COL2__ECSPI1_SS1             0x208 0x5d8 0x804 0x0 0x2
+#define MX6QDL_PAD_KEY_COL2__ENET_RX_DATA2          0x208 0x5d8 0x850 0x1 0x1
+#define MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX            0x208 0x5d8 0x000 0x2 0x0
+#define MX6QDL_PAD_KEY_COL2__KEY_COL2               0x208 0x5d8 0x000 0x3 0x0
+#define MX6QDL_PAD_KEY_COL2__ENET_MDC               0x208 0x5d8 0x000 0x4 0x0
+#define MX6QDL_PAD_KEY_COL2__GPIO4_IO10             0x208 0x5d8 0x000 0x5 0x0
+#define MX6QDL_PAD_KEY_COL2__USB_H1_PWR_CTL_WAKE    0x208 0x5d8 0x000 0x6 0x0
+#define MX6QDL_PAD_KEY_ROW2__ECSPI1_SS2             0x20c 0x5dc 0x808 0x0 0x1
+#define MX6QDL_PAD_KEY_ROW2__ENET_TX_DATA2          0x20c 0x5dc 0x000 0x1 0x0
+#define MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX            0x20c 0x5dc 0x7e4 0x2 0x0
+#define MX6QDL_PAD_KEY_ROW2__KEY_ROW2               0x20c 0x5dc 0x000 0x3 0x0
+#define MX6QDL_PAD_KEY_ROW2__SD2_VSELECT            0x20c 0x5dc 0x000 0x4 0x0
+#define MX6QDL_PAD_KEY_ROW2__GPIO4_IO11             0x20c 0x5dc 0x000 0x5 0x0
+#define MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE       0x20c 0x5dc 0x88c 0x6 0x1
+#define MX6QDL_PAD_KEY_COL3__ECSPI1_SS3             0x210 0x5e0 0x80c 0x0 0x1
+#define MX6QDL_PAD_KEY_COL3__ENET_CRS               0x210 0x5e0 0x000 0x1 0x0
+#define MX6QDL_PAD_KEY_COL3__HDMI_TX_DDC_SCL        0x210 0x5e0 0x890 0x2 0x1
+#define MX6QDL_PAD_KEY_COL3__KEY_COL3               0x210 0x5e0 0x000 0x3 0x0
+#define MX6QDL_PAD_KEY_COL3__I2C2_SCL               0x210 0x5e0 0x8a0 0x4 0x1
+#define MX6QDL_PAD_KEY_COL3__GPIO4_IO12             0x210 0x5e0 0x000 0x5 0x0
+#define MX6QDL_PAD_KEY_COL3__SPDIF_IN               0x210 0x5e0 0x914 0x6 0x2
+#define MX6QDL_PAD_KEY_ROW3__ASRC_EXT_CLK           0x214 0x5e4 0x7b0 0x1 0x0
+#define MX6QDL_PAD_KEY_ROW3__HDMI_TX_DDC_SDA        0x214 0x5e4 0x894 0x2 0x1
+#define MX6QDL_PAD_KEY_ROW3__KEY_ROW3               0x214 0x5e4 0x000 0x3 0x0
+#define MX6QDL_PAD_KEY_ROW3__I2C2_SDA               0x214 0x5e4 0x8a4 0x4 0x1
+#define MX6QDL_PAD_KEY_ROW3__GPIO4_IO13             0x214 0x5e4 0x000 0x5 0x0
+#define MX6QDL_PAD_KEY_ROW3__SD1_VSELECT            0x214 0x5e4 0x000 0x6 0x0
+#define MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX            0x218 0x5e8 0x000 0x0 0x0
+#define MX6QDL_PAD_KEY_COL4__IPU1_SISG4             0x218 0x5e8 0x000 0x1 0x0
+#define MX6QDL_PAD_KEY_COL4__USB_OTG_OC             0x218 0x5e8 0x944 0x2 0x1
+#define MX6QDL_PAD_KEY_COL4__KEY_COL4               0x218 0x5e8 0x000 0x3 0x0
+#define MX6QDL_PAD_KEY_COL4__UART5_RTS_B            0x218 0x5e8 0x93c 0x4 0x0
+#define MX6QDL_PAD_KEY_COL4__UART5_CTS_B            0x218 0x5e8 0x000 0x4 0x0
+#define MX6QDL_PAD_KEY_COL4__GPIO4_IO14             0x218 0x5e8 0x000 0x5 0x0
+#define MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX            0x21c 0x5ec 0x7e8 0x0 0x0
+#define MX6QDL_PAD_KEY_ROW4__IPU1_SISG5             0x21c 0x5ec 0x000 0x1 0x0
+#define MX6QDL_PAD_KEY_ROW4__USB_OTG_PWR            0x21c 0x5ec 0x000 0x2 0x0
+#define MX6QDL_PAD_KEY_ROW4__KEY_ROW4               0x21c 0x5ec 0x000 0x3 0x0
+#define MX6QDL_PAD_KEY_ROW4__UART5_CTS_B            0x21c 0x5ec 0x000 0x4 0x0
+#define MX6QDL_PAD_KEY_ROW4__UART5_RTS_B            0x21c 0x5ec 0x93c 0x4 0x1
+#define MX6QDL_PAD_KEY_ROW4__GPIO4_IO15             0x21c 0x5ec 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_0__CCM_CLKO1                0x220 0x5f0 0x000 0x0 0x0
+#define MX6QDL_PAD_GPIO_0__KEY_COL5                 0x220 0x5f0 0x8e8 0x2 0x0
+#define MX6QDL_PAD_GPIO_0__ASRC_EXT_CLK             0x220 0x5f0 0x7b0 0x3 0x1
+#define MX6QDL_PAD_GPIO_0__EPIT1_OUT                0x220 0x5f0 0x000 0x4 0x0
+#define MX6QDL_PAD_GPIO_0__GPIO1_IO00               0x220 0x5f0 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_0__USB_H1_PWR               0x220 0x5f0 0x000 0x6 0x0
+#define MX6QDL_PAD_GPIO_0__SNVS_VIO_5               0x220 0x5f0 0x000 0x7 0x0
+#define MX6QDL_PAD_GPIO_1__ESAI_RX_CLK              0x224 0x5f4 0x86c 0x0 0x1
+#define MX6QDL_PAD_GPIO_1__WDOG2_B                  0x224 0x5f4 0x000 0x1 0x0
+#define MX6QDL_PAD_GPIO_1__KEY_ROW5                 0x224 0x5f4 0x8f4 0x2 0x0
+#define MX6QDL_PAD_GPIO_1__USB_OTG_ID               0x224 0x5f4 0x000 0x3 0x0
+#define MX6QDL_PAD_GPIO_1__PWM2_OUT                 0x224 0x5f4 0x000 0x4 0x0
+#define MX6QDL_PAD_GPIO_1__GPIO1_IO01               0x224 0x5f4 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_1__SD1_CD_B                 0x224 0x5f4 0x000 0x6 0x0
+#define MX6QDL_PAD_GPIO_9__ESAI_RX_FS               0x228 0x5f8 0x85c 0x0 0x1
+#define MX6QDL_PAD_GPIO_9__WDOG1_B                  0x228 0x5f8 0x000 0x1 0x0
+#define MX6QDL_PAD_GPIO_9__KEY_COL6                 0x228 0x5f8 0x8ec 0x2 0x0
+#define MX6QDL_PAD_GPIO_9__CCM_REF_EN_B             0x228 0x5f8 0x000 0x3 0x0
+#define MX6QDL_PAD_GPIO_9__PWM1_OUT                 0x228 0x5f8 0x000 0x4 0x0
+#define MX6QDL_PAD_GPIO_9__GPIO1_IO09               0x228 0x5f8 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_9__SD1_WP                   0x228 0x5f8 0x94c 0x6 0x1
+#define MX6QDL_PAD_GPIO_3__ESAI_RX_HF_CLK           0x22c 0x5fc 0x864 0x0 0x1
+#define MX6QDL_PAD_GPIO_3__I2C3_SCL                 0x22c 0x5fc 0x8a8 0x2 0x1
+#define MX6QDL_PAD_GPIO_3__XTALOSC_REF_CLK_24M      0x22c 0x5fc 0x000 0x3 0x0
+#define MX6QDL_PAD_GPIO_3__CCM_CLKO2                0x22c 0x5fc 0x000 0x4 0x0
+#define MX6QDL_PAD_GPIO_3__GPIO1_IO03               0x22c 0x5fc 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_3__USB_H1_OC                0x22c 0x5fc 0x948 0x6 0x1
+#define MX6QDL_PAD_GPIO_3__MLB_CLK                  0x22c 0x5fc 0x900 0x7 0x1
+#define MX6QDL_PAD_GPIO_6__ESAI_TX_CLK              0x230 0x600 0x870 0x0 0x1
+#define MX6QDL_PAD_GPIO_6__I2C3_SDA                 0x230 0x600 0x8ac 0x2 0x1
+#define MX6QDL_PAD_GPIO_6__GPIO1_IO06               0x230 0x600 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_6__SD2_LCTL                 0x230 0x600 0x000 0x6 0x0
+#define MX6QDL_PAD_GPIO_6__MLB_SIG                  0x230 0x600 0x908 0x7 0x1
+#define MX6QDL_PAD_GPIO_2__ESAI_TX_FS               0x234 0x604 0x860 0x0 0x1
+#define MX6QDL_PAD_GPIO_2__KEY_ROW6                 0x234 0x604 0x8f8 0x2 0x1
+#define MX6QDL_PAD_GPIO_2__GPIO1_IO02               0x234 0x604 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_2__SD2_WP                   0x234 0x604 0x000 0x6 0x0
+#define MX6QDL_PAD_GPIO_2__MLB_DATA                 0x234 0x604 0x904 0x7 0x1
+#define MX6QDL_PAD_GPIO_4__ESAI_TX_HF_CLK           0x238 0x608 0x868 0x0 0x1
+#define MX6QDL_PAD_GPIO_4__KEY_COL7                 0x238 0x608 0x8f0 0x2 0x1
+#define MX6QDL_PAD_GPIO_4__GPIO1_IO04               0x238 0x608 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_4__SD2_CD_B                 0x238 0x608 0x000 0x6 0x0
+#define MX6QDL_PAD_GPIO_5__ESAI_TX2_RX3             0x23c 0x60c 0x87c 0x0 0x1
+#define MX6QDL_PAD_GPIO_5__KEY_ROW7                 0x23c 0x60c 0x8fc 0x2 0x1
+#define MX6QDL_PAD_GPIO_5__CCM_CLKO1                0x23c 0x60c 0x000 0x3 0x0
+#define MX6QDL_PAD_GPIO_5__GPIO1_IO05               0x23c 0x60c 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_5__I2C3_SCL                 0x23c 0x60c 0x8a8 0x6 0x2
+#define MX6QDL_PAD_GPIO_5__ARM_EVENTI               0x23c 0x60c 0x000 0x7 0x0
+#define MX6QDL_PAD_GPIO_7__ESAI_TX4_RX1             0x240 0x610 0x884 0x0 0x1
+#define MX6QDL_PAD_GPIO_7__ECSPI5_RDY               0x240 0x610 0x000 0x1 0x0
+#define MX6QDL_PAD_GPIO_7__EPIT1_OUT                0x240 0x610 0x000 0x2 0x0
+#define MX6QDL_PAD_GPIO_7__FLEXCAN1_TX              0x240 0x610 0x000 0x3 0x0
+#define MX6QDL_PAD_GPIO_7__UART2_TX_DATA            0x240 0x610 0x000 0x4 0x0
+#define MX6QDL_PAD_GPIO_7__UART2_RX_DATA            0x240 0x610 0x928 0x4 0x2
+#define MX6QDL_PAD_GPIO_7__GPIO1_IO07               0x240 0x610 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_7__SPDIF_LOCK               0x240 0x610 0x000 0x6 0x0
+#define MX6QDL_PAD_GPIO_7__USB_OTG_HOST_MODE        0x240 0x610 0x000 0x7 0x0
+#define MX6QDL_PAD_GPIO_8__ESAI_TX5_RX0             0x244 0x614 0x888 0x0 0x1
+#define MX6QDL_PAD_GPIO_8__XTALOSC_REF_CLK_32K      0x244 0x614 0x000 0x1 0x0
+#define MX6QDL_PAD_GPIO_8__EPIT2_OUT                0x244 0x614 0x000 0x2 0x0
+#define MX6QDL_PAD_GPIO_8__FLEXCAN1_RX              0x244 0x614 0x7e4 0x3 0x1
+#define MX6QDL_PAD_GPIO_8__UART2_RX_DATA            0x244 0x614 0x928 0x4 0x3
+#define MX6QDL_PAD_GPIO_8__UART2_TX_DATA            0x244 0x614 0x000 0x4 0x0
+#define MX6QDL_PAD_GPIO_8__GPIO1_IO08               0x244 0x614 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_8__SPDIF_SR_CLK             0x244 0x614 0x000 0x6 0x0
+#define MX6QDL_PAD_GPIO_8__USB_OTG_PWR_CTL_WAKE     0x244 0x614 0x000 0x7 0x0
+#define MX6QDL_PAD_GPIO_16__ESAI_TX3_RX2            0x248 0x618 0x880 0x0 0x1
+#define MX6QDL_PAD_GPIO_16__ENET_1588_EVENT2_IN     0x248 0x618 0x000 0x1 0x0
+#define MX6QDL_PAD_GPIO_16__ENET_REF_CLK            0x248 0x618 0x83c 0x2 0x1
+#define MX6QDL_PAD_GPIO_16__SD1_LCTL                0x248 0x618 0x000 0x3 0x0
+#define MX6QDL_PAD_GPIO_16__SPDIF_IN                0x248 0x618 0x914 0x4 0x3
+#define MX6QDL_PAD_GPIO_16__GPIO7_IO11              0x248 0x618 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_16__I2C3_SDA                0x248 0x618 0x8ac 0x6 0x2
+#define MX6QDL_PAD_GPIO_16__JTAG_DE_B               0x248 0x618 0x000 0x7 0x0
+#define MX6QDL_PAD_GPIO_17__ESAI_TX0                0x24c 0x61c 0x874 0x0 0x0
+#define MX6QDL_PAD_GPIO_17__ENET_1588_EVENT3_IN     0x24c 0x61c 0x000 0x1 0x0
+#define MX6QDL_PAD_GPIO_17__CCM_PMIC_READY          0x24c 0x61c 0x7f0 0x2 0x1
+#define MX6QDL_PAD_GPIO_17__SDMA_EXT_EVENT0         0x24c 0x61c 0x90c 0x3 0x1
+#define MX6QDL_PAD_GPIO_17__SPDIF_OUT               0x24c 0x61c 0x000 0x4 0x0
+#define MX6QDL_PAD_GPIO_17__GPIO7_IO12              0x24c 0x61c 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_18__ESAI_TX1                0x250 0x620 0x878 0x0 0x0
+#define MX6QDL_PAD_GPIO_18__ENET_RX_CLK             0x250 0x620 0x844 0x1 0x1
+#define MX6QDL_PAD_GPIO_18__SD3_VSELECT             0x250 0x620 0x000 0x2 0x0
+#define MX6QDL_PAD_GPIO_18__SDMA_EXT_EVENT1         0x250 0x620 0x910 0x3 0x1
+#define MX6QDL_PAD_GPIO_18__ASRC_EXT_CLK            0x250 0x620 0x7b0 0x4 0x2
+#define MX6QDL_PAD_GPIO_18__GPIO7_IO13              0x250 0x620 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_18__SNVS_VIO_5_CTL          0x250 0x620 0x000 0x6 0x0
+#define MX6QDL_PAD_GPIO_19__KEY_COL5                0x254 0x624 0x8e8 0x0 0x1
+#define MX6QDL_PAD_GPIO_19__ENET_1588_EVENT0_OUT    0x254 0x624 0x000 0x1 0x0
+#define MX6QDL_PAD_GPIO_19__SPDIF_OUT               0x254 0x624 0x000 0x2 0x0
+#define MX6QDL_PAD_GPIO_19__CCM_CLKO1               0x254 0x624 0x000 0x3 0x0
+#define MX6QDL_PAD_GPIO_19__ECSPI1_RDY              0x254 0x624 0x000 0x4 0x0
+#define MX6QDL_PAD_GPIO_19__GPIO4_IO05              0x254 0x624 0x000 0x5 0x0
+#define MX6QDL_PAD_GPIO_19__ENET_TX_ER              0x254 0x624 0x000 0x6 0x0
+#define MX6QDL_PAD_CSI0_PIXCLK__IPU1_CSI0_PIXCLK    0x258 0x628 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_PIXCLK__GPIO5_IO18          0x258 0x628 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_PIXCLK__ARM_EVENTO          0x258 0x628 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_MCLK__IPU1_CSI0_HSYNC       0x25c 0x62c 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_MCLK__CCM_CLKO1             0x25c 0x62c 0x000 0x3 0x0
+#define MX6QDL_PAD_CSI0_MCLK__GPIO5_IO19            0x25c 0x62c 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_MCLK__ARM_TRACE_CTL         0x25c 0x62c 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DATA_EN__IPU1_CSI0_DATA_EN  0x260 0x630 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DATA_EN__EIM_DATA00         0x260 0x630 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DATA_EN__GPIO5_IO20         0x260 0x630 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DATA_EN__ARM_TRACE_CLK      0x260 0x630 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_VSYNC__IPU1_CSI0_VSYNC      0x264 0x634 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_VSYNC__EIM_DATA01           0x264 0x634 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_VSYNC__GPIO5_IO21           0x264 0x634 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_VSYNC__ARM_TRACE00          0x264 0x634 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT4__IPU1_CSI0_DATA04      0x268 0x638 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT4__EIM_DATA02            0x268 0x638 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT4__ECSPI1_SCLK           0x268 0x638 0x7f4 0x2 0x3
+#define MX6QDL_PAD_CSI0_DAT4__KEY_COL5              0x268 0x638 0x8e8 0x3 0x2
+#define MX6QDL_PAD_CSI0_DAT4__AUD3_TXC              0x268 0x638 0x000 0x4 0x0
+#define MX6QDL_PAD_CSI0_DAT4__GPIO5_IO22            0x268 0x638 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT4__ARM_TRACE01           0x268 0x638 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT5__IPU1_CSI0_DATA05      0x26c 0x63c 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT5__EIM_DATA03            0x26c 0x63c 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT5__ECSPI1_MOSI           0x26c 0x63c 0x7fc 0x2 0x3
+#define MX6QDL_PAD_CSI0_DAT5__KEY_ROW5              0x26c 0x63c 0x8f4 0x3 0x1
+#define MX6QDL_PAD_CSI0_DAT5__AUD3_TXD              0x26c 0x63c 0x000 0x4 0x0
+#define MX6QDL_PAD_CSI0_DAT5__GPIO5_IO23            0x26c 0x63c 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT5__ARM_TRACE02           0x26c 0x63c 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT6__IPU1_CSI0_DATA06      0x270 0x640 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT6__EIM_DATA04            0x270 0x640 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT6__ECSPI1_MISO           0x270 0x640 0x7f8 0x2 0x3
+#define MX6QDL_PAD_CSI0_DAT6__KEY_COL6              0x270 0x640 0x8ec 0x3 0x1
+#define MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS             0x270 0x640 0x000 0x4 0x0
+#define MX6QDL_PAD_CSI0_DAT6__GPIO5_IO24            0x270 0x640 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT6__ARM_TRACE03           0x270 0x640 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT7__IPU1_CSI0_DATA07      0x274 0x644 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT7__EIM_DATA05            0x274 0x644 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT7__ECSPI1_SS0            0x274 0x644 0x800 0x2 0x3
+#define MX6QDL_PAD_CSI0_DAT7__KEY_ROW6              0x274 0x644 0x8f8 0x3 0x2
+#define MX6QDL_PAD_CSI0_DAT7__AUD3_RXD              0x274 0x644 0x000 0x4 0x0
+#define MX6QDL_PAD_CSI0_DAT7__GPIO5_IO25            0x274 0x644 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT7__ARM_TRACE04           0x274 0x644 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT8__IPU1_CSI0_DATA08      0x278 0x648 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT8__EIM_DATA06            0x278 0x648 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT8__ECSPI2_SCLK           0x278 0x648 0x810 0x2 0x2
+#define MX6QDL_PAD_CSI0_DAT8__KEY_COL7              0x278 0x648 0x8f0 0x3 0x2
+#define MX6QDL_PAD_CSI0_DAT8__I2C1_SDA              0x278 0x648 0x89c 0x4 0x1
+#define MX6QDL_PAD_CSI0_DAT8__GPIO5_IO26            0x278 0x648 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT8__ARM_TRACE05           0x278 0x648 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT9__IPU1_CSI0_DATA09      0x27c 0x64c 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT9__EIM_DATA07            0x27c 0x64c 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT9__ECSPI2_MOSI           0x27c 0x64c 0x818 0x2 0x2
+#define MX6QDL_PAD_CSI0_DAT9__KEY_ROW7              0x27c 0x64c 0x8fc 0x3 0x2
+#define MX6QDL_PAD_CSI0_DAT9__I2C1_SCL              0x27c 0x64c 0x898 0x4 0x1
+#define MX6QDL_PAD_CSI0_DAT9__GPIO5_IO27            0x27c 0x64c 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT9__ARM_TRACE06           0x27c 0x64c 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT10__IPU1_CSI0_DATA10     0x280 0x650 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT10__AUD3_RXC             0x280 0x650 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT10__ECSPI2_MISO          0x280 0x650 0x814 0x2 0x2
+#define MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA        0x280 0x650 0x000 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT10__UART1_RX_DATA        0x280 0x650 0x920 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT10__GPIO5_IO28           0x280 0x650 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT10__ARM_TRACE07          0x280 0x650 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT11__IPU1_CSI0_DATA11     0x284 0x654 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT11__AUD3_RXFS            0x284 0x654 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT11__ECSPI2_SS0           0x284 0x654 0x81c 0x2 0x2
+#define MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA        0x284 0x654 0x920 0x3 0x1
+#define MX6QDL_PAD_CSI0_DAT11__UART1_TX_DATA        0x284 0x654 0x000 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT11__GPIO5_IO29           0x284 0x654 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT11__ARM_TRACE08          0x284 0x654 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT12__IPU1_CSI0_DATA12     0x288 0x658 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT12__EIM_DATA08           0x288 0x658 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT12__UART4_TX_DATA        0x288 0x658 0x000 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT12__UART4_RX_DATA        0x288 0x658 0x938 0x3 0x2
+#define MX6QDL_PAD_CSI0_DAT12__GPIO5_IO30           0x288 0x658 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT12__ARM_TRACE09          0x288 0x658 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT13__IPU1_CSI0_DATA13     0x28c 0x65c 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT13__EIM_DATA09           0x28c 0x65c 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT13__UART4_RX_DATA        0x28c 0x65c 0x938 0x3 0x3
+#define MX6QDL_PAD_CSI0_DAT13__UART4_TX_DATA        0x28c 0x65c 0x000 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT13__GPIO5_IO31           0x28c 0x65c 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT13__ARM_TRACE10          0x28c 0x65c 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT14__IPU1_CSI0_DATA14     0x290 0x660 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT14__EIM_DATA10           0x290 0x660 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT14__UART5_TX_DATA        0x290 0x660 0x000 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT14__UART5_RX_DATA        0x290 0x660 0x940 0x3 0x2
+#define MX6QDL_PAD_CSI0_DAT14__GPIO6_IO00           0x290 0x660 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT14__ARM_TRACE11          0x290 0x660 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT15__IPU1_CSI0_DATA15     0x294 0x664 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT15__EIM_DATA11           0x294 0x664 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT15__UART5_RX_DATA        0x294 0x664 0x940 0x3 0x3
+#define MX6QDL_PAD_CSI0_DAT15__UART5_TX_DATA        0x294 0x664 0x000 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT15__GPIO6_IO01           0x294 0x664 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT15__ARM_TRACE12          0x294 0x664 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT16__IPU1_CSI0_DATA16     0x298 0x668 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT16__EIM_DATA12           0x298 0x668 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT16__UART4_RTS_B          0x298 0x668 0x934 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT16__UART4_CTS_B          0x298 0x668 0x000 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT16__GPIO6_IO02           0x298 0x668 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT16__ARM_TRACE13          0x298 0x668 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT17__IPU1_CSI0_DATA17     0x29c 0x66c 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT17__EIM_DATA13           0x29c 0x66c 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT17__UART4_CTS_B          0x29c 0x66c 0x000 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT17__UART4_RTS_B          0x29c 0x66c 0x934 0x3 0x1
+#define MX6QDL_PAD_CSI0_DAT17__GPIO6_IO03           0x29c 0x66c 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT17__ARM_TRACE14          0x29c 0x66c 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT18__IPU1_CSI0_DATA18     0x2a0 0x670 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT18__EIM_DATA14           0x2a0 0x670 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT18__UART5_RTS_B          0x2a0 0x670 0x93c 0x3 0x2
+#define MX6QDL_PAD_CSI0_DAT18__UART5_CTS_B          0x2a0 0x670 0x000 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT18__GPIO6_IO04           0x2a0 0x670 0x000 0x5 0x0
+#define MX6QDL_PAD_CSI0_DAT18__ARM_TRACE15          0x2a0 0x670 0x000 0x7 0x0
+#define MX6QDL_PAD_CSI0_DAT19__IPU1_CSI0_DATA19     0x2a4 0x674 0x000 0x0 0x0
+#define MX6QDL_PAD_CSI0_DAT19__EIM_DATA15           0x2a4 0x674 0x000 0x1 0x0
+#define MX6QDL_PAD_CSI0_DAT19__UART5_CTS_B          0x2a4 0x674 0x000 0x3 0x0
+#define MX6QDL_PAD_CSI0_DAT19__UART5_RTS_B          0x2a4 0x674 0x93c 0x3 0x3
+#define MX6QDL_PAD_CSI0_DAT19__GPIO6_IO05           0x2a4 0x674 0x000 0x5 0x0
+#define MX6QDL_PAD_SD3_DAT7__SD3_DATA7              0x2a8 0x690 0x000 0x0 0x0
+#define MX6QDL_PAD_SD3_DAT7__UART1_TX_DATA          0x2a8 0x690 0x000 0x1 0x0
+#define MX6QDL_PAD_SD3_DAT7__UART1_RX_DATA          0x2a8 0x690 0x920 0x1 0x2
+#define MX6QDL_PAD_SD3_DAT7__GPIO6_IO17             0x2a8 0x690 0x000 0x5 0x0
+#define MX6QDL_PAD_SD3_DAT6__SD3_DATA6              0x2ac 0x694 0x000 0x0 0x0
+#define MX6QDL_PAD_SD3_DAT6__UART1_RX_DATA          0x2ac 0x694 0x920 0x1 0x3
+#define MX6QDL_PAD_SD3_DAT6__UART1_TX_DATA          0x2ac 0x694 0x000 0x1 0x0
+#define MX6QDL_PAD_SD3_DAT6__GPIO6_IO18             0x2ac 0x694 0x000 0x5 0x0
+#define MX6QDL_PAD_SD3_DAT5__SD3_DATA5              0x2b0 0x698 0x000 0x0 0x0
+#define MX6QDL_PAD_SD3_DAT5__UART2_TX_DATA          0x2b0 0x698 0x000 0x1 0x0
+#define MX6QDL_PAD_SD3_DAT5__UART2_RX_DATA          0x2b0 0x698 0x928 0x1 0x4
+#define MX6QDL_PAD_SD3_DAT5__GPIO7_IO00             0x2b0 0x698 0x000 0x5 0x0
+#define MX6QDL_PAD_SD3_DAT4__SD3_DATA4              0x2b4 0x69c 0x000 0x0 0x0
+#define MX6QDL_PAD_SD3_DAT4__UART2_RX_DATA          0x2b4 0x69c 0x928 0x1 0x5
+#define MX6QDL_PAD_SD3_DAT4__UART2_TX_DATA          0x2b4 0x69c 0x000 0x1 0x0
+#define MX6QDL_PAD_SD3_DAT4__GPIO7_IO01             0x2b4 0x69c 0x000 0x5 0x0
+#define MX6QDL_PAD_SD3_CMD__SD3_CMD                 0x2b8 0x6a0 0x000 0x0 0x0
+#define MX6QDL_PAD_SD3_CMD__UART2_CTS_B             0x2b8 0x6a0 0x000 0x1 0x0
+#define MX6QDL_PAD_SD3_CMD__UART2_RTS_B             0x2b8 0x6a0 0x924 0x1 0x2
+#define MX6QDL_PAD_SD3_CMD__FLEXCAN1_TX             0x2b8 0x6a0 0x000 0x2 0x0
+#define MX6QDL_PAD_SD3_CMD__GPIO7_IO02              0x2b8 0x6a0 0x000 0x5 0x0
+#define MX6QDL_PAD_SD3_CLK__SD3_CLK                 0x2bc 0x6a4 0x000 0x0 0x0
+#define MX6QDL_PAD_SD3_CLK__UART2_RTS_B             0x2bc 0x6a4 0x924 0x1 0x3
+#define MX6QDL_PAD_SD3_CLK__UART2_CTS_B             0x2bc 0x6a4 0x000 0x1 0x0
+#define MX6QDL_PAD_SD3_CLK__FLEXCAN1_RX             0x2bc 0x6a4 0x7e4 0x2 0x2
+#define MX6QDL_PAD_SD3_CLK__GPIO7_IO03              0x2bc 0x6a4 0x000 0x5 0x0
+#define MX6QDL_PAD_SD3_DAT0__SD3_DATA0              0x2c0 0x6a8 0x000 0x0 0x0
+#define MX6QDL_PAD_SD3_DAT0__UART1_CTS_B            0x2c0 0x6a8 0x000 0x1 0x0
+#define MX6QDL_PAD_SD3_DAT0__UART1_RTS_B            0x2c0 0x6a8 0x91c 0x1 0x2
+#define MX6QDL_PAD_SD3_DAT0__FLEXCAN2_TX            0x2c0 0x6a8 0x000 0x2 0x0
+#define MX6QDL_PAD_SD3_DAT0__GPIO7_IO04             0x2c0 0x6a8 0x000 0x5 0x0
+#define MX6QDL_PAD_SD3_DAT1__SD3_DATA1              0x2c4 0x6ac 0x000 0x0 0x0
+#define MX6QDL_PAD_SD3_DAT1__UART1_RTS_B            0x2c4 0x6ac 0x91c 0x1 0x3
+#define MX6QDL_PAD_SD3_DAT1__UART1_CTS_B            0x2c4 0x6ac 0x000 0x1 0x0
+#define MX6QDL_PAD_SD3_DAT1__FLEXCAN2_RX            0x2c4 0x6ac 0x7e8 0x2 0x1
+#define MX6QDL_PAD_SD3_DAT1__GPIO7_IO05             0x2c4 0x6ac 0x000 0x5 0x0
+#define MX6QDL_PAD_SD3_DAT2__SD3_DATA2              0x2c8 0x6b0 0x000 0x0 0x0
+#define MX6QDL_PAD_SD3_DAT2__GPIO7_IO06             0x2c8 0x6b0 0x000 0x5 0x0
+#define MX6QDL_PAD_SD3_DAT3__SD3_DATA3              0x2cc 0x6b4 0x000 0x0 0x0
+#define MX6QDL_PAD_SD3_DAT3__UART3_CTS_B            0x2cc 0x6b4 0x000 0x1 0x0
+#define MX6QDL_PAD_SD3_DAT3__UART3_RTS_B            0x2cc 0x6b4 0x92c 0x1 0x4
+#define MX6QDL_PAD_SD3_DAT3__GPIO7_IO07             0x2cc 0x6b4 0x000 0x5 0x0
+#define MX6QDL_PAD_SD3_RST__SD3_RESET               0x2d0 0x6b8 0x000 0x0 0x0
+#define MX6QDL_PAD_SD3_RST__UART3_RTS_B             0x2d0 0x6b8 0x92c 0x1 0x5
+#define MX6QDL_PAD_SD3_RST__UART3_CTS_B             0x2d0 0x6b8 0x000 0x1 0x0
+#define MX6QDL_PAD_SD3_RST__GPIO7_IO08              0x2d0 0x6b8 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_CLE__NAND_CLE              0x2d4 0x6bc 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_CLE__IPU2_SISG4            0x2d4 0x6bc 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_CLE__GPIO6_IO07            0x2d4 0x6bc 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_ALE__NAND_ALE              0x2d8 0x6c0 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_ALE__SD4_RESET             0x2d8 0x6c0 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_ALE__GPIO6_IO08            0x2d8 0x6c0 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_WP_B__NAND_WP_B            0x2dc 0x6c4 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_WP_B__IPU2_SISG5           0x2dc 0x6c4 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_WP_B__GPIO6_IO09           0x2dc 0x6c4 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_RB0__NAND_READY_B          0x2e0 0x6c8 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_RB0__IPU2_DI0_PIN01        0x2e0 0x6c8 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_RB0__GPIO6_IO10            0x2e0 0x6c8 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_CS0__NAND_CE0_B            0x2e4 0x6cc 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_CS0__GPIO6_IO11            0x2e4 0x6cc 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_CS1__NAND_CE1_B            0x2e8 0x6d0 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_CS1__SD4_VSELECT           0x2e8 0x6d0 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_CS1__SD3_VSELECT           0x2e8 0x6d0 0x000 0x2 0x0
+#define MX6QDL_PAD_NANDF_CS1__GPIO6_IO14            0x2e8 0x6d0 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_CS2__NAND_CE2_B            0x2ec 0x6d4 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_CS2__IPU1_SISG0            0x2ec 0x6d4 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_CS2__ESAI_TX0              0x2ec 0x6d4 0x874 0x2 0x1
+#define MX6QDL_PAD_NANDF_CS2__EIM_CRE               0x2ec 0x6d4 0x000 0x3 0x0
+#define MX6QDL_PAD_NANDF_CS2__CCM_CLKO2             0x2ec 0x6d4 0x000 0x4 0x0
+#define MX6QDL_PAD_NANDF_CS2__GPIO6_IO15            0x2ec 0x6d4 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_CS2__IPU2_SISG0            0x2ec 0x6d4 0x000 0x6 0x0
+#define MX6QDL_PAD_NANDF_CS3__NAND_CE3_B            0x2f0 0x6d8 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_CS3__IPU1_SISG1            0x2f0 0x6d8 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_CS3__ESAI_TX1              0x2f0 0x6d8 0x878 0x2 0x1
+#define MX6QDL_PAD_NANDF_CS3__EIM_ADDR26            0x2f0 0x6d8 0x000 0x3 0x0
+#define MX6QDL_PAD_NANDF_CS3__GPIO6_IO16            0x2f0 0x6d8 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_CS3__IPU2_SISG1            0x2f0 0x6d8 0x000 0x6 0x0
+#define MX6QDL_PAD_SD4_CMD__SD4_CMD                 0x2f4 0x6dc 0x000 0x0 0x0
+#define MX6QDL_PAD_SD4_CMD__NAND_RE_B               0x2f4 0x6dc 0x000 0x1 0x0
+#define MX6QDL_PAD_SD4_CMD__UART3_TX_DATA           0x2f4 0x6dc 0x000 0x2 0x0
+#define MX6QDL_PAD_SD4_CMD__UART3_RX_DATA           0x2f4 0x6dc 0x930 0x2 0x2
+#define MX6QDL_PAD_SD4_CMD__GPIO7_IO09              0x2f4 0x6dc 0x000 0x5 0x0
+#define MX6QDL_PAD_SD4_CLK__SD4_CLK                 0x2f8 0x6e0 0x000 0x0 0x0
+#define MX6QDL_PAD_SD4_CLK__NAND_WE_B               0x2f8 0x6e0 0x000 0x1 0x0
+#define MX6QDL_PAD_SD4_CLK__UART3_RX_DATA           0x2f8 0x6e0 0x930 0x2 0x3
+#define MX6QDL_PAD_SD4_CLK__UART3_TX_DATA           0x2f8 0x6e0 0x000 0x2 0x0
+#define MX6QDL_PAD_SD4_CLK__GPIO7_IO10              0x2f8 0x6e0 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_D0__NAND_DATA00            0x2fc 0x6e4 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_D0__SD1_DATA4              0x2fc 0x6e4 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_D0__GPIO2_IO00             0x2fc 0x6e4 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_D1__NAND_DATA01            0x300 0x6e8 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_D1__SD1_DATA5              0x300 0x6e8 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_D1__GPIO2_IO01             0x300 0x6e8 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_D2__NAND_DATA02            0x304 0x6ec 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_D2__SD1_DATA6              0x304 0x6ec 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_D2__GPIO2_IO02             0x304 0x6ec 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_D3__NAND_DATA03            0x308 0x6f0 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_D3__SD1_DATA7              0x308 0x6f0 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_D3__GPIO2_IO03             0x308 0x6f0 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_D4__NAND_DATA04            0x30c 0x6f4 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_D4__SD2_DATA4              0x30c 0x6f4 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_D4__GPIO2_IO04             0x30c 0x6f4 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_D5__NAND_DATA05            0x310 0x6f8 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_D5__SD2_DATA5              0x310 0x6f8 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_D5__GPIO2_IO05             0x310 0x6f8 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_D6__NAND_DATA06            0x314 0x6fc 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_D6__SD2_DATA6              0x314 0x6fc 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_D6__GPIO2_IO06             0x314 0x6fc 0x000 0x5 0x0
+#define MX6QDL_PAD_NANDF_D7__NAND_DATA07            0x318 0x700 0x000 0x0 0x0
+#define MX6QDL_PAD_NANDF_D7__SD2_DATA7              0x318 0x700 0x000 0x1 0x0
+#define MX6QDL_PAD_NANDF_D7__GPIO2_IO07             0x318 0x700 0x000 0x5 0x0
+#define MX6QDL_PAD_SD4_DAT0__SD4_DATA0              0x31c 0x704 0x000 0x1 0x0
+#define MX6QDL_PAD_SD4_DAT0__NAND_DQS               0x31c 0x704 0x000 0x2 0x0
+#define MX6QDL_PAD_SD4_DAT0__GPIO2_IO08             0x31c 0x704 0x000 0x5 0x0
+#define MX6QDL_PAD_SD4_DAT1__SD4_DATA1              0x320 0x708 0x000 0x1 0x0
+#define MX6QDL_PAD_SD4_DAT1__PWM3_OUT               0x320 0x708 0x000 0x2 0x0
+#define MX6QDL_PAD_SD4_DAT1__GPIO2_IO09             0x320 0x708 0x000 0x5 0x0
+#define MX6QDL_PAD_SD4_DAT2__SD4_DATA2              0x324 0x70c 0x000 0x1 0x0
+#define MX6QDL_PAD_SD4_DAT2__PWM4_OUT               0x324 0x70c 0x000 0x2 0x0
+#define MX6QDL_PAD_SD4_DAT2__GPIO2_IO10             0x324 0x70c 0x000 0x5 0x0
+#define MX6QDL_PAD_SD4_DAT3__SD4_DATA3              0x328 0x710 0x000 0x1 0x0
+#define MX6QDL_PAD_SD4_DAT3__GPIO2_IO11             0x328 0x710 0x000 0x5 0x0
+#define MX6QDL_PAD_SD4_DAT4__SD4_DATA4              0x32c 0x714 0x000 0x1 0x0
+#define MX6QDL_PAD_SD4_DAT4__UART2_RX_DATA          0x32c 0x714 0x928 0x2 0x6
+#define MX6QDL_PAD_SD4_DAT4__UART2_TX_DATA          0x32c 0x714 0x000 0x2 0x0
+#define MX6QDL_PAD_SD4_DAT4__GPIO2_IO12             0x32c 0x714 0x000 0x5 0x0
+#define MX6QDL_PAD_SD4_DAT5__SD4_DATA5              0x330 0x718 0x000 0x1 0x0
+#define MX6QDL_PAD_SD4_DAT5__UART2_RTS_B            0x330 0x718 0x924 0x2 0x4
+#define MX6QDL_PAD_SD4_DAT5__UART2_CTS_B            0x330 0x718 0x000 0x2 0x0
+#define MX6QDL_PAD_SD4_DAT5__GPIO2_IO13             0x330 0x718 0x000 0x5 0x0
+#define MX6QDL_PAD_SD4_DAT6__SD4_DATA6              0x334 0x71c 0x000 0x1 0x0
+#define MX6QDL_PAD_SD4_DAT6__UART2_CTS_B            0x334 0x71c 0x000 0x2 0x0
+#define MX6QDL_PAD_SD4_DAT6__UART2_RTS_B            0x334 0x71c 0x924 0x2 0x5
+#define MX6QDL_PAD_SD4_DAT6__GPIO2_IO14             0x334 0x71c 0x000 0x5 0x0
+#define MX6QDL_PAD_SD4_DAT7__SD4_DATA7              0x338 0x720 0x000 0x1 0x0
+#define MX6QDL_PAD_SD4_DAT7__UART2_TX_DATA          0x338 0x720 0x000 0x2 0x0
+#define MX6QDL_PAD_SD4_DAT7__UART2_RX_DATA          0x338 0x720 0x928 0x2 0x7
+#define MX6QDL_PAD_SD4_DAT7__GPIO2_IO15             0x338 0x720 0x000 0x5 0x0
+#define MX6QDL_PAD_SD1_DAT1__SD1_DATA1              0x33c 0x724 0x000 0x0 0x0
+#define MX6QDL_PAD_SD1_DAT1__ECSPI5_SS0             0x33c 0x724 0x834 0x1 0x1
+#define MX6QDL_PAD_SD1_DAT1__PWM3_OUT               0x33c 0x724 0x000 0x2 0x0
+#define MX6QDL_PAD_SD1_DAT1__GPT_CAPTURE2           0x33c 0x724 0x000 0x3 0x0
+#define MX6QDL_PAD_SD1_DAT1__GPIO1_IO17             0x33c 0x724 0x000 0x5 0x0
+#define MX6QDL_PAD_SD1_DAT0__SD1_DATA0              0x340 0x728 0x000 0x0 0x0
+#define MX6QDL_PAD_SD1_DAT0__ECSPI5_MISO            0x340 0x728 0x82c 0x1 0x1
+#define MX6QDL_PAD_SD1_DAT0__GPT_CAPTURE1           0x340 0x728 0x000 0x3 0x0
+#define MX6QDL_PAD_SD1_DAT0__GPIO1_IO16             0x340 0x728 0x000 0x5 0x0
+#define MX6QDL_PAD_SD1_DAT3__SD1_DATA3              0x344 0x72c 0x000 0x0 0x0
+#define MX6QDL_PAD_SD1_DAT3__ECSPI5_SS2             0x344 0x72c 0x000 0x1 0x0
+#define MX6QDL_PAD_SD1_DAT3__GPT_COMPARE3           0x344 0x72c 0x000 0x2 0x0
+#define MX6QDL_PAD_SD1_DAT3__PWM1_OUT               0x344 0x72c 0x000 0x3 0x0
+#define MX6QDL_PAD_SD1_DAT3__WDOG2_B                0x344 0x72c 0x000 0x4 0x0
+#define MX6QDL_PAD_SD1_DAT3__GPIO1_IO21             0x344 0x72c 0x000 0x5 0x0
+#define MX6QDL_PAD_SD1_DAT3__WDOG2_RESET_B_DEB      0x344 0x72c 0x000 0x6 0x0
+#define MX6QDL_PAD_SD1_CMD__SD1_CMD                 0x348 0x730 0x000 0x0 0x0
+#define MX6QDL_PAD_SD1_CMD__ECSPI5_MOSI             0x348 0x730 0x830 0x1 0x0
+#define MX6QDL_PAD_SD1_CMD__PWM4_OUT                0x348 0x730 0x000 0x2 0x0
+#define MX6QDL_PAD_SD1_CMD__GPT_COMPARE1            0x348 0x730 0x000 0x3 0x0
+#define MX6QDL_PAD_SD1_CMD__GPIO1_IO18              0x348 0x730 0x000 0x5 0x0
+#define MX6QDL_PAD_SD1_DAT2__SD1_DATA2              0x34c 0x734 0x000 0x0 0x0
+#define MX6QDL_PAD_SD1_DAT2__ECSPI5_SS1             0x34c 0x734 0x838 0x1 0x1
+#define MX6QDL_PAD_SD1_DAT2__GPT_COMPARE2           0x34c 0x734 0x000 0x2 0x0
+#define MX6QDL_PAD_SD1_DAT2__PWM2_OUT               0x34c 0x734 0x000 0x3 0x0
+#define MX6QDL_PAD_SD1_DAT2__WDOG1_B                0x34c 0x734 0x000 0x4 0x0
+#define MX6QDL_PAD_SD1_DAT2__GPIO1_IO19             0x34c 0x734 0x000 0x5 0x0
+#define MX6QDL_PAD_SD1_DAT2__WDOG1_RESET_B_DEB      0x34c 0x734 0x000 0x6 0x0
+#define MX6QDL_PAD_SD1_CLK__SD1_CLK                 0x350 0x738 0x000 0x0 0x0
+#define MX6QDL_PAD_SD1_CLK__ECSPI5_SCLK             0x350 0x738 0x828 0x1 0x0
+#define MX6QDL_PAD_SD1_CLK__GPT_CLKIN               0x350 0x738 0x000 0x3 0x0
+#define MX6QDL_PAD_SD1_CLK__GPIO1_IO20              0x350 0x738 0x000 0x5 0x0
+#define MX6QDL_PAD_SD2_CLK__SD2_CLK                 0x354 0x73c 0x000 0x0 0x0
+#define MX6QDL_PAD_SD2_CLK__ECSPI5_SCLK             0x354 0x73c 0x828 0x1 0x1
+#define MX6QDL_PAD_SD2_CLK__KEY_COL5                0x354 0x73c 0x8e8 0x2 0x3
+#define MX6QDL_PAD_SD2_CLK__AUD4_RXFS               0x354 0x73c 0x7c0 0x3 0x1
+#define MX6QDL_PAD_SD2_CLK__GPIO1_IO10              0x354 0x73c 0x000 0x5 0x0
+#define MX6QDL_PAD_SD2_CMD__SD2_CMD                 0x358 0x740 0x000 0x0 0x0
+#define MX6QDL_PAD_SD2_CMD__ECSPI5_MOSI             0x358 0x740 0x830 0x1 0x1
+#define MX6QDL_PAD_SD2_CMD__KEY_ROW5                0x358 0x740 0x8f4 0x2 0x2
+#define MX6QDL_PAD_SD2_CMD__AUD4_RXC                0x358 0x740 0x7bc 0x3 0x1
+#define MX6QDL_PAD_SD2_CMD__GPIO1_IO11              0x358 0x740 0x000 0x5 0x0
+#define MX6QDL_PAD_SD2_DAT3__SD2_DATA3              0x35c 0x744 0x000 0x0 0x0
+#define MX6QDL_PAD_SD2_DAT3__ECSPI5_SS3             0x35c 0x744 0x000 0x1 0x0
+#define MX6QDL_PAD_SD2_DAT3__KEY_COL6               0x35c 0x744 0x8ec 0x2 0x2
+#define MX6QDL_PAD_SD2_DAT3__AUD4_TXC               0x35c 0x744 0x7c4 0x3 0x1
+#define MX6QDL_PAD_SD2_DAT3__GPIO1_IO12             0x35c 0x744 0x000 0x5 0x0
 
 #endif /* __DTS_IMX6Q_PINFUNC_H */
diff --git a/arch/arm/boot/dts/imx6q-sabreauto.dts b/arch/arm/boot/dts/imx6q-sabreauto.dts
index 09a75807bc6d..334b9247e78c 100644
--- a/arch/arm/boot/dts/imx6q-sabreauto.dts
+++ b/arch/arm/boot/dts/imx6q-sabreauto.dts
@@ -20,24 +20,6 @@
         compatible = "fsl,imx6q-sabreauto", "fsl,imx6q";
 };
 
-&iomuxc {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_hog>;
-
-        hog {
-                pinctrl_hog: hoggrp {
-                        fsl,pins = <
-                                MX6Q_PAD_NANDF_CS2__GPIO6_IO15 0x80000000
-                                MX6Q_PAD_SD2_DAT2__GPIO1_IO13  0x80000000
-                        >;
-                };
-        };
-
-        ecspi1 {
-                pinctrl_ecspi1_sabreauto: ecspi1-sabreauto {
-                        fsl,pins = <
-                                MX6Q_PAD_EIM_D19__GPIO3_IO19  0x80000000
-                        >;
-                };
-        };
+&sata {
+        status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6q-sabrelite.dts b/arch/arm/boot/dts/imx6q-sabrelite.dts
index 6a000666c147..3530280f5150 100644
--- a/arch/arm/boot/dts/imx6q-sabrelite.dts
+++ b/arch/arm/boot/dts/imx6q-sabrelite.dts
@@ -65,6 +65,10 @@
         };
 };
 
+&sata {
+        status = "okay";
+};
+
 &ecspi1 {
         fsl,spi-num-chipselects = <1>;
         cs-gpios = <&gpio3 19 0>;
@@ -91,14 +95,14 @@
         hog {
                 pinctrl_hog: hoggrp {
                         fsl,pins = <
-                                MX6Q_PAD_NANDF_D6__GPIO2_IO06 0x80000000
-                                MX6Q_PAD_NANDF_D7__GPIO2_IO07 0x80000000
-                                MX6Q_PAD_EIM_D19__GPIO3_IO19  0x80000000
-                                MX6Q_PAD_EIM_D22__GPIO3_IO22  0x80000000
-                                MX6Q_PAD_EIM_D23__GPIO3_IO23  0x80000000
-                                MX6Q_PAD_SD3_DAT5__GPIO7_IO00 0x80000000
-                                MX6Q_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0
-                                MX6Q_PAD_GPIO_0__CCM_CLKO1    0x80000000
+                                MX6QDL_PAD_NANDF_D6__GPIO2_IO06 0x80000000
+                                MX6QDL_PAD_NANDF_D7__GPIO2_IO07 0x80000000
+                                MX6QDL_PAD_EIM_D19__GPIO3_IO19  0x80000000
+                                MX6QDL_PAD_EIM_D22__GPIO3_IO22  0x80000000
+                                MX6QDL_PAD_EIM_D23__GPIO3_IO23  0x80000000
+                                MX6QDL_PAD_SD3_DAT5__GPIO7_IO00 0x80000000
+                                MX6QDL_PAD_SD3_DAT4__GPIO7_IO01 0x1f0b0
+                                MX6QDL_PAD_GPIO_0__CCM_CLKO1    0x80000000
                         >;
                 };
         };
@@ -163,7 +167,7 @@
         codec: sgtl5000@0a {
                 compatible = "fsl,sgtl5000";
                 reg = <0x0a>;
-                clocks = <&clks 169>;
+                clocks = <&clks 201>;
                 VDDA-supply = <&reg_2p5v>;
                 VDDIO-supply = <&reg_3p3v>;
         };
diff --git a/arch/arm/boot/dts/imx6q-sabresd.dts b/arch/arm/boot/dts/imx6q-sabresd.dts
index 0038228c508c..9cbdfe7a0931 100644
--- a/arch/arm/boot/dts/imx6q-sabresd.dts
+++ b/arch/arm/boot/dts/imx6q-sabresd.dts
@@ -20,21 +20,6 @@
         compatible = "fsl,imx6q-sabresd", "fsl,imx6q";
 };
 
-&iomuxc {
-        pinctrl-names = "default";
-        pinctrl-0 = <&pinctrl_hog>;
-
-        hog {
-                pinctrl_hog: hoggrp {
-                        fsl,pins = <
-                                MX6Q_PAD_GPIO_4__GPIO1_IO04   0x80000000
-                                MX6Q_PAD_GPIO_5__GPIO1_IO05   0x80000000
-                                MX6Q_PAD_NANDF_D0__GPIO2_IO00 0x80000000
-                                MX6Q_PAD_NANDF_D1__GPIO2_IO01 0x80000000
-                                MX6Q_PAD_NANDF_D2__GPIO2_IO02 0x80000000
-                                MX6Q_PAD_NANDF_D3__GPIO2_IO03 0x80000000
-                                MX6Q_PAD_GPIO_0__CCM_CLKO1    0x130b0
-                        >;
-                };
-        };
+&sata {
+        status = "okay";
 };
diff --git a/arch/arm/boot/dts/imx6q-wandboard.dts b/arch/arm/boot/dts/imx6q-wandboard.dts
new file mode 100644
index 000000000000..36be17f207b1
--- /dev/null
+++ b/arch/arm/boot/dts/imx6q-wandboard.dts
@@ -0,0 +1,26 @@
+/*
+ * Copyright 2013 Freescale Semiconductor, Inc.
+ *
+ * Author: Fabio Estevam <fabio.estevam@freescale.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+/dts-v1/;
+#include "imx6q.dtsi"
+#include "imx6qdl-wandboard.dtsi"
+
+/ {
+        model = "Wandboard i.MX6 Quad Board";
+        compatible = "wand,imx6q-wandboard", "fsl,imx6q";
+
+        memory {
+                reg = <0x10000000 0x80000000>;
+        };
+};
+
+&sata {
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6q.dtsi b/arch/arm/boot/dts/imx6q.dtsi
index ba09dc32324e..f024ef28b34b 100644
--- a/arch/arm/boot/dts/imx6q.dtsi
+++ b/arch/arm/boot/dts/imx6q.dtsi
@@ -8,8 +8,8 @@
  *
  */
 
-#include "imx6qdl.dtsi"
 #include "imx6q-pinfunc.h"
+#include "imx6qdl.dtsi"
 
 / {
         cpus {
@@ -61,6 +61,12 @@
         };
 
         soc {
+                ocram: sram@00900000 {
+                        compatible = "mmio-sram";
+                        reg = <0x00900000 0x40000>;
+                        clocks = <&clks 142>;
+                };
+
                 aips-bus@02000000 { /* AIPS1 */
                         spba-bus@02000000 {
                                 ecspi5: ecspi@02018000 {
@@ -77,357 +83,54 @@
 
                         iomuxc: iomuxc@020e0000 {
                                 compatible = "fsl,imx6q-iomuxc";
-                                reg = <0x020e0000 0x4000>;
-
-                                /* shared pinctrl settings */
-                                audmux {
-                                        pinctrl_audmux_1: audmux-1 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_SD2_DAT0__AUD4_RXD  0x80000000
-                                                        MX6Q_PAD_SD2_DAT3__AUD4_TXC  0x80000000
-                                                        MX6Q_PAD_SD2_DAT2__AUD4_TXD  0x80000000
-                                                        MX6Q_PAD_SD2_DAT1__AUD4_TXFS 0x80000000
-                                                >;
-                                        };
-
-                                        pinctrl_audmux_2: audmux-2 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_CSI0_DAT7__AUD3_RXD  0x80000000
-                                                        MX6Q_PAD_CSI0_DAT4__AUD3_TXC  0x80000000
-                                                        MX6Q_PAD_CSI0_DAT5__AUD3_TXD  0x80000000
-                                                        MX6Q_PAD_CSI0_DAT6__AUD3_TXFS 0x80000000
-                                                >;
-                                        };
-                                };
-
-                                ecspi1 {
-                                        pinctrl_ecspi1_1: ecspi1grp-1 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_EIM_D17__ECSPI1_MISO 0x100b1
-                                                        MX6Q_PAD_EIM_D18__ECSPI1_MOSI 0x100b1
-                                                        MX6Q_PAD_EIM_D16__ECSPI1_SCLK 0x100b1
-                                                >;
-                                        };
-                                };
-
-                                ecspi3 {
-                                        pinctrl_ecspi3_1: ecspi3grp-1 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_DISP0_DAT2__ECSPI3_MISO 0x100b1
-                                                        MX6Q_PAD_DISP0_DAT1__ECSPI3_MOSI 0x100b1
-                                                        MX6Q_PAD_DISP0_DAT0__ECSPI3_SCLK 0x100b1
-                                                >;
-                                        };
-                                };
-
-                                enet {
-                                        pinctrl_enet_1: enetgrp-1 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_ENET_MDIO__ENET_MDIO       0x1b0b0
-                                                        MX6Q_PAD_ENET_MDC__ENET_MDC         0x1b0b0
-                                                        MX6Q_PAD_RGMII_TXC__RGMII_TXC       0x1b0b0
-                                                        MX6Q_PAD_RGMII_TD0__RGMII_TD0       0x1b0b0
-                                                        MX6Q_PAD_RGMII_TD1__RGMII_TD1       0x1b0b0
-                                                        MX6Q_PAD_RGMII_TD2__RGMII_TD2       0x1b0b0
-                                                        MX6Q_PAD_RGMII_TD3__RGMII_TD3       0x1b0b0
-                                                        MX6Q_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
-                                                        MX6Q_PAD_ENET_REF_CLK__ENET_TX_CLK  0x1b0b0
-                                                        MX6Q_PAD_RGMII_RXC__RGMII_RXC       0x1b0b0
-                                                        MX6Q_PAD_RGMII_RD0__RGMII_RD0       0x1b0b0
-                                                        MX6Q_PAD_RGMII_RD1__RGMII_RD1       0x1b0b0
-                                                        MX6Q_PAD_RGMII_RD2__RGMII_RD2       0x1b0b0
-                                                        MX6Q_PAD_RGMII_RD3__RGMII_RD3       0x1b0b0
-                                                        MX6Q_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-                                                        MX6Q_PAD_GPIO_16__ENET_REF_CLK      0x4001b0a8
-                                                >;
-                                        };
-
-                                        pinctrl_enet_2: enetgrp-2 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_KEY_COL1__ENET_MDIO        0x1b0b0
-                                                        MX6Q_PAD_KEY_COL2__ENET_MDC         0x1b0b0
-                                                        MX6Q_PAD_RGMII_TXC__RGMII_TXC       0x1b0b0
-                                                        MX6Q_PAD_RGMII_TD0__RGMII_TD0       0x1b0b0
-                                                        MX6Q_PAD_RGMII_TD1__RGMII_TD1       0x1b0b0
-                                                        MX6Q_PAD_RGMII_TD2__RGMII_TD2       0x1b0b0
-                                                        MX6Q_PAD_RGMII_TD3__RGMII_TD3       0x1b0b0
-                                                        MX6Q_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
-                                                        MX6Q_PAD_ENET_REF_CLK__ENET_TX_CLK  0x1b0b0
-                                                        MX6Q_PAD_RGMII_RXC__RGMII_RXC       0x1b0b0
-                                                        MX6Q_PAD_RGMII_RD0__RGMII_RD0       0x1b0b0
-                                                        MX6Q_PAD_RGMII_RD1__RGMII_RD1       0x1b0b0
-                                                        MX6Q_PAD_RGMII_RD2__RGMII_RD2       0x1b0b0
-                                                        MX6Q_PAD_RGMII_RD3__RGMII_RD3       0x1b0b0
-                                                        MX6Q_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-                                                >;
-                                        };
-
-                                        pinctrl_enet_3: enetgrp-3 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_ENET_MDIO__ENET_MDIO       0x1b0b0
-                                                        MX6Q_PAD_ENET_MDC__ENET_MDC         0x1b0b0
-                                                        MX6Q_PAD_RGMII_TXC__RGMII_TXC       0x1b0b0
-                                                        MX6Q_PAD_RGMII_TD0__RGMII_TD0       0x1b0b0
-                                                        MX6Q_PAD_RGMII_TD1__RGMII_TD1       0x1b0b0
-                                                        MX6Q_PAD_RGMII_TD2__RGMII_TD2       0x1b0b0
-                                                        MX6Q_PAD_RGMII_TD3__RGMII_TD3       0x1b0b0
-                                                        MX6Q_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
-                                                        MX6Q_PAD_ENET_REF_CLK__ENET_TX_CLK  0x1b0b0
-                                                        MX6Q_PAD_RGMII_RXC__RGMII_RXC       0x1b0b0
-                                                        MX6Q_PAD_RGMII_RD0__RGMII_RD0       0x1b0b0
-                                                        MX6Q_PAD_RGMII_RD1__RGMII_RD1       0x1b0b0
-                                                        MX6Q_PAD_RGMII_RD2__RGMII_RD2       0x1b0b0
-                                                        MX6Q_PAD_RGMII_RD3__RGMII_RD3       0x1b0b0
-                                                        MX6Q_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
-                                                        MX6Q_PAD_ENET_TX_EN__ENET_TX_EN     0x1b0b0
-                                                >;
-                                        };
-                                };
-
-                                gpmi-nand {
-                                        pinctrl_gpmi_nand_1: gpmi-nand-1 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_NANDF_CLE__NAND_CLE     0xb0b1
-                                                        MX6Q_PAD_NANDF_ALE__NAND_ALE     0xb0b1
-                                                        MX6Q_PAD_NANDF_WP_B__NAND_WP_B   0xb0b1
-                                                        MX6Q_PAD_NANDF_RB0__NAND_READY_B 0xb000
-                                                        MX6Q_PAD_NANDF_CS0__NAND_CE0_B   0xb0b1
-                                                        MX6Q_PAD_NANDF_CS1__NAND_CE1_B   0xb0b1
-                                                        MX6Q_PAD_SD4_CMD__NAND_RE_B      0xb0b1
-                                                        MX6Q_PAD_SD4_CLK__NAND_WE_B      0xb0b1
-                                                        MX6Q_PAD_NANDF_D0__NAND_DATA00   0xb0b1
-                                                        MX6Q_PAD_NANDF_D1__NAND_DATA01   0xb0b1
-                                                        MX6Q_PAD_NANDF_D2__NAND_DATA02   0xb0b1
-                                                        MX6Q_PAD_NANDF_D3__NAND_DATA03   0xb0b1
-                                                        MX6Q_PAD_NANDF_D4__NAND_DATA04   0xb0b1
-                                                        MX6Q_PAD_NANDF_D5__NAND_DATA05   0xb0b1
-                                                        MX6Q_PAD_NANDF_D6__NAND_DATA06   0xb0b1
-                                                        MX6Q_PAD_NANDF_D7__NAND_DATA07   0xb0b1
-                                                        MX6Q_PAD_SD4_DAT0__NAND_DQS      0x00b1
-                                                >;
-                                        };
-                                };
-
-                                i2c1 {
-                                        pinctrl_i2c1_1: i2c1grp-1 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_EIM_D21__I2C1_SCL 0x4001b8b1
-                                                        MX6Q_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
-                                                >;
-                                        };
 
-                                        pinctrl_i2c1_2: i2c1grp-2 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1
-                                                        MX6Q_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1
-                                                >;
-                                        };
-                                };
-
-                                i2c2 {
-                                        pinctrl_i2c2_1: i2c2grp-1 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_EIM_EB2__I2C2_SCL 0x4001b8b1
-                                                        MX6Q_PAD_EIM_D16__I2C2_SDA 0x4001b8b1
+                                ipu2 {
+                                        pinctrl_ipu2_1: ipu2grp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_DI0_DISP_CLK__IPU2_DI0_DISP_CLK 0x10
+                                                        MX6QDL_PAD_DI0_PIN15__IPU2_DI0_PIN15       0x10
+                                                        MX6QDL_PAD_DI0_PIN2__IPU2_DI0_PIN02        0x10
+                                                        MX6QDL_PAD_DI0_PIN3__IPU2_DI0_PIN03        0x10
+                                                        MX6QDL_PAD_DI0_PIN4__IPU2_DI0_PIN04        0x80000000
+                                                        MX6QDL_PAD_DISP0_DAT0__IPU2_DISP0_DATA00   0x10
+                                                        MX6QDL_PAD_DISP0_DAT1__IPU2_DISP0_DATA01   0x10
+                                                        MX6QDL_PAD_DISP0_DAT2__IPU2_DISP0_DATA02   0x10
+                                                        MX6QDL_PAD_DISP0_DAT3__IPU2_DISP0_DATA03   0x10
+                                                        MX6QDL_PAD_DISP0_DAT4__IPU2_DISP0_DATA04   0x10
+                                                        MX6QDL_PAD_DISP0_DAT5__IPU2_DISP0_DATA05   0x10
+                                                        MX6QDL_PAD_DISP0_DAT6__IPU2_DISP0_DATA06   0x10
+                                                        MX6QDL_PAD_DISP0_DAT7__IPU2_DISP0_DATA07   0x10
+                                                        MX6QDL_PAD_DISP0_DAT8__IPU2_DISP0_DATA08   0x10
+                                                        MX6QDL_PAD_DISP0_DAT9__IPU2_DISP0_DATA09   0x10
+                                                        MX6QDL_PAD_DISP0_DAT10__IPU2_DISP0_DATA10  0x10
+                                                        MX6QDL_PAD_DISP0_DAT11__IPU2_DISP0_DATA11  0x10
+                                                        MX6QDL_PAD_DISP0_DAT12__IPU2_DISP0_DATA12  0x10
+                                                        MX6QDL_PAD_DISP0_DAT13__IPU2_DISP0_DATA13  0x10
+                                                        MX6QDL_PAD_DISP0_DAT14__IPU2_DISP0_DATA14  0x10
+                                                        MX6QDL_PAD_DISP0_DAT15__IPU2_DISP0_DATA15  0x10
+                                                        MX6QDL_PAD_DISP0_DAT16__IPU2_DISP0_DATA16  0x10
+                                                        MX6QDL_PAD_DISP0_DAT17__IPU2_DISP0_DATA17  0x10
+                                                        MX6QDL_PAD_DISP0_DAT18__IPU2_DISP0_DATA18  0x10
+                                                        MX6QDL_PAD_DISP0_DAT19__IPU2_DISP0_DATA19  0x10
+                                                        MX6QDL_PAD_DISP0_DAT20__IPU2_DISP0_DATA20  0x10
+                                                        MX6QDL_PAD_DISP0_DAT21__IPU2_DISP0_DATA21  0x10
+                                                        MX6QDL_PAD_DISP0_DAT22__IPU2_DISP0_DATA22  0x10
+                                                        MX6QDL_PAD_DISP0_DAT23__IPU2_DISP0_DATA23  0x10
                                                 >;
                                         };
                                 };
-
-                                i2c3 {
-                                        pinctrl_i2c3_1: i2c3grp-1 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_EIM_D17__I2C3_SCL 0x4001b8b1
-                                                        MX6Q_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
-                                                >;
-                                        };
-                                };
-
-                                uart1 {
-                                        pinctrl_uart1_1: uart1grp-1 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
-                                                        MX6Q_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
-                                                >;
-                                        };
-                                };
-
-                                uart2 {
-                                        pinctrl_uart2_1: uart2grp-1 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_EIM_D26__UART2_TX_DATA 0x1b0b1
-                                                        MX6Q_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1
-                                                >;
-                                        };
-                                };
-
-                                uart4 {
-                                        pinctrl_uart4_1: uart4grp-1 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_KEY_COL0__UART4_TX_DATA 0x1b0b1
-                                                        MX6Q_PAD_KEY_ROW0__UART4_RX_DATA 0x1b0b1
-                                                >;
-                                        };
-                                };
-
-                                usbotg {
-                                        pinctrl_usbotg_1: usbotggrp-1 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_GPIO_1__USB_OTG_ID 0x17059
-                                                >;
-                                        };
-
-                                        pinctrl_usbotg_2: usbotggrp-2 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
-                                                >;
-                                        };
-                                };
-
-                                usdhc2 {
-                                        pinctrl_usdhc2_1: usdhc2grp-1 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_SD2_CMD__SD2_CMD    0x17059
-                                                        MX6Q_PAD_SD2_CLK__SD2_CLK    0x10059
-                                                        MX6Q_PAD_SD2_DAT0__SD2_DATA0 0x17059
-                                                        MX6Q_PAD_SD2_DAT1__SD2_DATA1 0x17059
-                                                        MX6Q_PAD_SD2_DAT2__SD2_DATA2 0x17059
-                                                        MX6Q_PAD_SD2_DAT3__SD2_DATA3 0x17059
-                                                        MX6Q_PAD_NANDF_D4__SD2_DATA4 0x17059
-                                                        MX6Q_PAD_NANDF_D5__SD2_DATA5 0x17059
-                                                        MX6Q_PAD_NANDF_D6__SD2_DATA6 0x17059
-                                                        MX6Q_PAD_NANDF_D7__SD2_DATA7 0x17059
-                                                >;
-                                        };
-
-                                        pinctrl_usdhc2_2: usdhc2grp-2 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_SD2_CMD__SD2_CMD    0x17059
-                                                        MX6Q_PAD_SD2_CLK__SD2_CLK    0x10059
-                                                        MX6Q_PAD_SD2_DAT0__SD2_DATA0 0x17059
-                                                        MX6Q_PAD_SD2_DAT1__SD2_DATA1 0x17059
-                                                        MX6Q_PAD_SD2_DAT2__SD2_DATA2 0x17059
-                                                        MX6Q_PAD_SD2_DAT3__SD2_DATA3 0x17059
-                                                >;
-                                        };
-                                };
-
-                                usdhc3 {
-                                        pinctrl_usdhc3_1: usdhc3grp-1 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_SD3_CMD__SD3_CMD    0x17059
-                                                        MX6Q_PAD_SD3_CLK__SD3_CLK    0x10059
-                                                        MX6Q_PAD_SD3_DAT0__SD3_DATA0 0x17059
-                                                        MX6Q_PAD_SD3_DAT1__SD3_DATA1 0x17059
-                                                        MX6Q_PAD_SD3_DAT2__SD3_DATA2 0x17059
-                                                        MX6Q_PAD_SD3_DAT3__SD3_DATA3 0x17059
-                                                        MX6Q_PAD_SD3_DAT4__SD3_DATA4 0x17059
-                                                        MX6Q_PAD_SD3_DAT5__SD3_DATA5 0x17059
-                                                        MX6Q_PAD_SD3_DAT6__SD3_DATA6 0x17059
-                                                        MX6Q_PAD_SD3_DAT7__SD3_DATA7 0x17059
-                                                >;
-                                        };
-
-                                        pinctrl_usdhc3_2: usdhc3grp-2 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_SD3_CMD__SD3_CMD    0x17059
-                                                        MX6Q_PAD_SD3_CLK__SD3_CLK    0x10059
-                                                        MX6Q_PAD_SD3_DAT0__SD3_DATA0 0x17059
-                                                        MX6Q_PAD_SD3_DAT1__SD3_DATA1 0x17059
-                                                        MX6Q_PAD_SD3_DAT2__SD3_DATA2 0x17059
-                                                        MX6Q_PAD_SD3_DAT3__SD3_DATA3 0x17059
-                                                >;
-                                        };
-                                };
-
-                                usdhc4 {
-                                        pinctrl_usdhc4_1: usdhc4grp-1 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_SD4_CMD__SD4_CMD    0x17059
-                                                        MX6Q_PAD_SD4_CLK__SD4_CLK    0x10059
-                                                        MX6Q_PAD_SD4_DAT0__SD4_DATA0 0x17059
-                                                        MX6Q_PAD_SD4_DAT1__SD4_DATA1 0x17059
-                                                        MX6Q_PAD_SD4_DAT2__SD4_DATA2 0x17059
-                                                        MX6Q_PAD_SD4_DAT3__SD4_DATA3 0x17059
-                                                        MX6Q_PAD_SD4_DAT4__SD4_DATA4 0x17059
-                                                        MX6Q_PAD_SD4_DAT5__SD4_DATA5 0x17059
-                                                        MX6Q_PAD_SD4_DAT6__SD4_DATA6 0x17059
-                                                        MX6Q_PAD_SD4_DAT7__SD4_DATA7 0x17059
-                                                >;
-                                        };
-
-                                        pinctrl_usdhc4_2: usdhc4grp-2 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_SD4_CMD__SD4_CMD    0x17059
-                                                        MX6Q_PAD_SD4_CLK__SD4_CLK    0x10059
-                                                        MX6Q_PAD_SD4_DAT0__SD4_DATA0 0x17059
-                                                        MX6Q_PAD_SD4_DAT1__SD4_DATA1 0x17059
-                                                        MX6Q_PAD_SD4_DAT2__SD4_DATA2 0x17059
-                                                        MX6Q_PAD_SD4_DAT3__SD4_DATA3 0x17059
-                                                >;
-                                        };
-                                };
-
-                                weim {
-                                        pinctrl_weim_cs0_1: weim_cs0grp-1 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_EIM_CS0__EIM_CS0_B   0xb0b1
-                                                >;
-                                        };
-
-                                        pinctrl_weim_nor_1: weimnorgrp-1 {
-                                                fsl,pins = <
-                                                        MX6Q_PAD_EIM_OE__EIM_OE_B     0xb0b1
-                                                        MX6Q_PAD_EIM_RW__EIM_RW       0xb0b1
-                                                        MX6Q_PAD_EIM_WAIT__EIM_WAIT_B 0xb060
-                                                        /* data */
-                                                        MX6Q_PAD_EIM_D16__EIM_DATA16 0x1b0b0
-                                                        MX6Q_PAD_EIM_D17__EIM_DATA17 0x1b0b0
-                                                        MX6Q_PAD_EIM_D18__EIM_DATA18 0x1b0b0
-                                                        MX6Q_PAD_EIM_D19__EIM_DATA19 0x1b0b0
-                                                        MX6Q_PAD_EIM_D20__EIM_DATA20 0x1b0b0
-                                                        MX6Q_PAD_EIM_D21__EIM_DATA21 0x1b0b0
-                                                        MX6Q_PAD_EIM_D22__EIM_DATA22 0x1b0b0
-                                                        MX6Q_PAD_EIM_D23__EIM_DATA23 0x1b0b0
-                                                        MX6Q_PAD_EIM_D24__EIM_DATA24 0x1b0b0
-                                                        MX6Q_PAD_EIM_D25__EIM_DATA25 0x1b0b0
-                                                        MX6Q_PAD_EIM_D26__EIM_DATA26 0x1b0b0
-                                                        MX6Q_PAD_EIM_D27__EIM_DATA27 0x1b0b0
-                                                        MX6Q_PAD_EIM_D28__EIM_DATA28 0x1b0b0
-                                                        MX6Q_PAD_EIM_D29__EIM_DATA29 0x1b0b0
-                                                        MX6Q_PAD_EIM_D30__EIM_DATA30 0x1b0b0
-                                                        MX6Q_PAD_EIM_D31__EIM_DATA31 0x1b0b0
-                                                        /* address */
-                                                        MX6Q_PAD_EIM_A23__EIM_ADDR23 0xb0b1
-                                                        MX6Q_PAD_EIM_A22__EIM_ADDR22 0xb0b1
-                                                        MX6Q_PAD_EIM_A21__EIM_ADDR21 0xb0b1
-                                                        MX6Q_PAD_EIM_A20__EIM_ADDR20 0xb0b1
-                                                        MX6Q_PAD_EIM_A19__EIM_ADDR19 0xb0b1
-                                                        MX6Q_PAD_EIM_A18__EIM_ADDR18 0xb0b1
-                                                        MX6Q_PAD_EIM_A17__EIM_ADDR17 0xb0b1
-                                                        MX6Q_PAD_EIM_A16__EIM_ADDR16 0xb0b1
-                                                        MX6Q_PAD_EIM_DA15__EIM_AD15  0xb0b1
-                                                        MX6Q_PAD_EIM_DA14__EIM_AD14  0xb0b1
-                                                        MX6Q_PAD_EIM_DA13__EIM_AD13  0xb0b1
-                                                        MX6Q_PAD_EIM_DA12__EIM_AD12  0xb0b1
-                                                        MX6Q_PAD_EIM_DA11__EIM_AD11  0xb0b1
-                                                        MX6Q_PAD_EIM_DA10__EIM_AD10  0xb0b1
-                                                        MX6Q_PAD_EIM_DA9__EIM_AD09   0xb0b1
-                                                        MX6Q_PAD_EIM_DA8__EIM_AD08   0xb0b1
-                                                        MX6Q_PAD_EIM_DA7__EIM_AD07   0xb0b1
-                                                        MX6Q_PAD_EIM_DA6__EIM_AD06   0xb0b1
-                                                        MX6Q_PAD_EIM_DA5__EIM_AD05   0xb0b1
-                                                        MX6Q_PAD_EIM_DA4__EIM_AD04   0xb0b1
-                                                        MX6Q_PAD_EIM_DA3__EIM_AD03   0xb0b1
-                                                        MX6Q_PAD_EIM_DA2__EIM_AD02   0xb0b1
-                                                        MX6Q_PAD_EIM_DA1__EIM_AD01   0xb0b1
-                                                        MX6Q_PAD_EIM_DA0__EIM_AD00   0xb0b1
-                                                >;
-                                        };
-
-                                };
                         };
                 };
 
+                sata: sata@02200000 {
+                        compatible = "fsl,imx6q-ahci";
+                        reg = <0x02200000 0x4000>;
+                        interrupts = <0 39 0x04>;
+                        clocks =  <&clks 154>, <&clks 187>, <&clks 105>;
+                        clock-names = "sata", "sata_ref", "ahb";
+                        status = "disabled";
+                };
+
                 ipu2: ipu@02800000 {
                         #crtc-cells = <1>;
                         compatible = "fsl,imx6q-ipu";
diff --git a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
index e994011220e7..1cbbc5160d27 100644
--- a/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabreauto.dtsi
@@ -45,6 +45,28 @@
         status = "okay";
 };
 
+&iomuxc {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hog>;
+
+        hog {
+                pinctrl_hog: hoggrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_NANDF_CS2__GPIO6_IO15 0x80000000
+                                MX6QDL_PAD_SD2_DAT2__GPIO1_IO13  0x80000000
+                        >;
+                };
+        };
+
+        ecspi1 {
+                pinctrl_ecspi1_sabreauto: ecspi1-sabreauto {
+                        fsl,pins = <
+                                MX6QDL_PAD_EIM_D19__GPIO3_IO19 0x80000000
+                        >;
+                };
+        };
+};
+
 &uart4 {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_uart4_1>;
diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
index 6e5dfdb32416..39eafc222a2e 100644
--- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi
@@ -27,6 +27,15 @@
                         enable-active-high;
                 };
 
+                reg_usb_h1_vbus: usb_h1_vbus {
+                        compatible = "regulator-fixed";
+                        regulator-name = "usb_h1_vbus";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        gpio = <&gpio1 29 0>;
+                        enable-active-high;
+                };
+
                 reg_audio: wm8962_supply {
                         compatible = "regulator-fixed";
                         regulator-name = "wm8962-supply";
@@ -41,12 +50,14 @@
                 volume-up {
                         label = "Volume Up";
                         gpios = <&gpio1 4 0>;
+                        gpio-key,wakeup;
                         linux,code = <115>; /* KEY_VOLUMEUP */
                 };
 
                 volume-down {
                         label = "Volume Down";
                         gpios = <&gpio1 5 0>;
+                        gpio-key,wakeup;
                         linux,code = <114>; /* KEY_VOLUMEDOWN */
                 };
         };
@@ -77,6 +88,22 @@
         status = "okay";
 };
 
+&ecspi1 {
+        fsl,spi-num-chipselects = <1>;
+        cs-gpios = <&gpio4 9 0>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_ecspi1_2>;
+        status = "okay";
+
+        flash: m25p80@0 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "st,m25p32";
+                spi-max-frequency = <20000000>;
+                reg = <0>;
+        };
+};
+
 &fec {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_enet_1>;
@@ -93,7 +120,7 @@
         codec: wm8962@1a {
                 compatible = "wlf,wm8962";
                 reg = <0x1a>;
-                clocks = <&clks 169>;
+                clocks = <&clks 201>;
                 DCVDD-supply = <&reg_audio>;
                 DBVDD-supply = <&reg_audio>;
                 AVDD-supply = <&reg_audio>;
@@ -113,6 +140,68 @@
        };
 };
 
+&i2c3 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c3_2>;
+        status = "okay";
+
+        egalax_ts@04 {
+                compatible = "eeti,egalax_ts";
+                reg = <0x04>;
+                interrupt-parent = <&gpio6>;
+                interrupts = <7 2>;
+                wakeup-gpios = <&gpio6 7 0>;
+        };
+};
+
+&iomuxc {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hog>;
+
+        hog {
+                pinctrl_hog: hoggrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_GPIO_4__GPIO1_IO04   0x80000000
+                                MX6QDL_PAD_GPIO_5__GPIO1_IO05   0x80000000
+                                MX6QDL_PAD_NANDF_D0__GPIO2_IO00 0x80000000
+                                MX6QDL_PAD_NANDF_D1__GPIO2_IO01 0x80000000
+                                MX6QDL_PAD_NANDF_D2__GPIO2_IO02 0x80000000
+                                MX6QDL_PAD_NANDF_D3__GPIO2_IO03 0x80000000
+                                MX6QDL_PAD_GPIO_0__CCM_CLKO1    0x130b0
+                                MX6QDL_PAD_NANDF_CLE__GPIO6_IO07 0x80000000
+                                MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x80000000
+                                MX6QDL_PAD_EIM_D22__GPIO3_IO22  0x80000000
+                        >;
+                };
+        };
+};
+
+&ldb {
+        status = "okay";
+
+        lvds-channel@1 {
+                fsl,data-mapping = "spwg";
+                fsl,data-width = <18>;
+                status = "okay";
+
+                display-timings {
+                        native-mode = <&timing0>;
+                        timing0: hsd100pxn1 {
+                                clock-frequency = <65000000>;
+                                hactive = <1024>;
+                                vactive = <768>;
+                                hback-porch = <220>;
+                                hfront-porch = <40>;
+                                vback-porch = <21>;
+                                vfront-porch = <7>;
+                                hsync-len = <60>;
+                                vsync-len = <10>;
+                        };
+                };
+        };
+};
+
 &ssi2 {
         fsl,mode = "i2s-slave";
         status = "okay";
@@ -125,6 +214,7 @@
 };
 
 &usbh1 {
+        vbus-supply = <&reg_usb_h1_vbus>;
         status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
new file mode 100644
index 000000000000..a55113e65bcb
--- /dev/null
+++ b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
@@ -0,0 +1,137 @@
+/*
+ * Copyright 2013 Freescale Semiconductor, Inc.
+ *
+ * Author: Fabio Estevam <fabio.estevam@freescale.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+/ {
+        regulators {
+                compatible = "simple-bus";
+
+                reg_2p5v: 2p5v {
+                        compatible = "regulator-fixed";
+                        regulator-name = "2P5V";
+                        regulator-min-microvolt = <2500000>;
+                        regulator-max-microvolt = <2500000>;
+                        regulator-always-on;
+                };
+
+                reg_3p3v: 3p3v {
+                        compatible = "regulator-fixed";
+                        regulator-name = "3P3V";
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                        regulator-always-on;
+                };
+        };
+
+        sound {
+                compatible = "fsl,imx6-wandboard-sgtl5000",
+                             "fsl,imx-audio-sgtl5000";
+                model = "imx6-wandboard-sgtl5000";
+                ssi-controller = <&ssi1>;
+                audio-codec = <&codec>;
+                audio-routing =
+                        "MIC_IN", "Mic Jack",
+                        "Mic Jack", "Mic Bias",
+                        "Headphone Jack", "HP_OUT";
+                mux-int-port = <1>;
+                mux-ext-port = <3>;
+        };
+};
+
+&audmux {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_audmux_2>;
+        status = "okay";
+};
+
+&i2c2 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c2_2>;
+        status = "okay";
+
+        codec: sgtl5000@0a {
+                compatible = "fsl,sgtl5000";
+                reg = <0x0a>;
+                clocks = <&clks 201>;
+                VDDA-supply = <&reg_2p5v>;
+                VDDIO-supply = <&reg_3p3v>;
+        };
+};
+
+&iomuxc {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_hog>;
+
+        hog {
+                pinctrl_hog: hoggrp {
+                        fsl,pins = <
+                                MX6QDL_PAD_GPIO_0__CCM_CLKO1     0x130b0
+                                MX6QDL_PAD_GPIO_2__GPIO1_IO02    0x80000000
+                                MX6QDL_PAD_EIM_DA9__GPIO3_IO09   0x80000000
+                                MX6QDL_PAD_EIM_EB1__GPIO2_IO29   0x80000000 /* WL_REF_ON */
+                                MX6QDL_PAD_EIM_A25__GPIO5_IO02   0x80000000 /* WL_RST_N */
+                                MX6QDL_PAD_ENET_RXD1__GPIO1_IO26 0x80000000 /* WL_REG_ON */
+                                MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x80000000 /* WL_HOST_WAKE */
+                                MX6QDL_PAD_ENET_TXD0__GPIO1_IO30 0x80000000 /* WL_WAKE */
+                        >;
+                };
+        };
+};
+
+&fec {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_enet_1>;
+        phy-mode = "rgmii";
+        status = "okay";
+};
+
+&ssi1 {
+        fsl,mode = "i2s-slave";
+        status = "okay";
+};
+
+&uart1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart1_1>;
+        status = "okay";
+};
+
+&uart3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_uart3_2>;
+        fsl,uart-has-rtscts;
+        status = "okay";
+};
+
+&usbh1 {
+        status = "okay";
+};
+
+&usdhc1 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc1_2>;
+        cd-gpios = <&gpio1 2 0>;
+        status = "okay";
+};
+
+&usdhc2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc2_2>;
+        non-removable;
+        status = "okay";
+};
+
+&usdhc3 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_usdhc3_2>;
+        cd-gpios = <&gpio3 9 0>;
+        status = "okay";
+};
diff --git a/arch/arm/boot/dts/imx6qdl.dtsi b/arch/arm/boot/dts/imx6qdl.dtsi
index f21d259080fd..ccd55c2fdb67 100644
--- a/arch/arm/boot/dts/imx6qdl.dtsi
+++ b/arch/arm/boot/dts/imx6qdl.dtsi
@@ -14,11 +14,6 @@
 
 / {
         aliases {
-                serial0 = &uart1;
-                serial1 = &uart2;
-                serial2 = &uart3;
-                serial3 = &uart4;
-                serial4 = &uart5;
                 gpio0 = &gpio1;
                 gpio1 = &gpio2;
                 gpio2 = &gpio3;
@@ -26,6 +21,18 @@
                 gpio4 = &gpio5;
                 gpio5 = &gpio6;
                 gpio6 = &gpio7;
+                i2c0 = &i2c1;
+                i2c1 = &i2c2;
+                i2c2 = &i2c3;
+                serial0 = &uart1;
+                serial1 = &uart2;
+                serial2 = &uart3;
+                serial3 = &uart4;
+                serial4 = &uart5;
+                spi0 = &ecspi1;
+                spi1 = &ecspi2;
+                spi2 = &ecspi3;
+                spi3 = &ecspi4;
         };
 
         intc: interrupt-controller@00a01000 {
@@ -81,15 +88,14 @@
                         #size-cells = <1>;
                         reg = <0x00112000 0x2000>, <0x00114000 0x2000>;
                         reg-names = "gpmi-nand", "bch";
-                        interrupts = <0 13 0x04>, <0 15 0x04>;
-                        interrupt-names = "gpmi-dma", "bch";
+                        interrupts = <0 15 0x04>;
+                        interrupt-names = "bch";
                         clocks = <&clks 152>, <&clks 153>, <&clks 151>,
                                  <&clks 150>, <&clks 149>;
                         clock-names = "gpmi_io", "gpmi_apb", "gpmi_bch",
                                       "gpmi_bch_apb", "per1_bch";
                         dmas = <&dma_apbh 0>;
                         dma-names = "rx-tx";
-                        fsl,gpmi-dma-channel = <0>;
                         status = "disabled";
                 };
 
@@ -184,6 +190,8 @@
                                         interrupts = <0 26 0x04>;
                                         clocks = <&clks 160>, <&clks 161>;
                                         clock-names = "ipg", "per";
+                                        dmas = <&sdma 25 4 0>, <&sdma 26 4 0>;
+                                        dma-names = "rx", "tx";
                                         status = "disabled";
                                 };
 
@@ -197,6 +205,9 @@
                                         reg = <0x02028000 0x4000>;
                                         interrupts = <0 46 0x04>;
                                         clocks = <&clks 178>;
+                                        dmas = <&sdma 37 1 0>,
+                                               <&sdma 38 1 0>;
+                                        dma-names = "rx", "tx";
                                         fsl,fifo-depth = <15>;
                                         fsl,ssi-dma-events = <38 37>;
                                         status = "disabled";
@@ -207,6 +218,9 @@
                                         reg = <0x0202c000 0x4000>;
                                         interrupts = <0 47 0x04>;
                                         clocks = <&clks 179>;
+                                        dmas = <&sdma 41 1 0>,
+                                               <&sdma 42 1 0>;
+                                        dma-names = "rx", "tx";
                                         fsl,fifo-depth = <15>;
                                         fsl,ssi-dma-events = <42 41>;
                                         status = "disabled";
@@ -217,6 +231,9 @@
                                         reg = <0x02030000 0x4000>;
                                         interrupts = <0 48 0x04>;
                                         clocks = <&clks 180>;
+                                        dmas = <&sdma 45 1 0>,
+                                               <&sdma 46 1 0>;
+                                        dma-names = "rx", "tx";
                                         fsl,fifo-depth = <15>;
                                         fsl,ssi-dma-events = <46 45>;
                                         status = "disabled";
@@ -278,17 +295,23 @@
                         };
 
                         can1: flexcan@02090000 {
+                                compatible = "fsl,imx6q-flexcan";
                                 reg = <0x02090000 0x4000>;
                                 interrupts = <0 110 0x04>;
+                                clocks = <&clks 108>, <&clks 109>;
+                                clock-names = "ipg", "per";
                         };
 
                         can2: flexcan@02094000 {
+                                compatible = "fsl,imx6q-flexcan";
                                 reg = <0x02094000 0x4000>;
                                 interrupts = <0 111 0x04>;
+                                clocks = <&clks 110>, <&clks 111>;
+                                clock-names = "ipg", "per";
                         };
 
                         gpt: gpt@02098000 {
-                                compatible = "fsl,imx6q-gpt";
+                                compatible = "fsl,imx6q-gpt", "fsl,imx31-gpt";
                                 reg = <0x02098000 0x4000>;
                                 interrupts = <0 55 0x04>;
                                 clocks = <&clks 119>, <&clks 120>;
@@ -491,6 +514,13 @@
                                 };
                         };
 
+                        tempmon: tempmon {
+                                compatible = "fsl,imx6q-tempmon";
+                                interrupts = <0 49 0x04>;
+                                fsl,tempmon = <&anatop>;
+                                fsl,tempmon-data = <&ocotp>;
+                        };
+
                         usbphy1: usbphy@020c9000 {
                                 compatible = "fsl,imx6q-usbphy", "fsl,imx23-usbphy";
                                 reg = <0x020c9000 0x1000>;
@@ -546,6 +576,713 @@
                                 reg = <0x020e0000 0x38>;
                         };
 
+                        iomuxc: iomuxc@020e0000 {
+                                compatible = "fsl,imx6dl-iomuxc", "fsl,imx6q-iomuxc";
+                                reg = <0x020e0000 0x4000>;
+
+                                audmux {
+                                        pinctrl_audmux_1: audmux-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_SD2_DAT0__AUD4_RXD  0x80000000
+                                                        MX6QDL_PAD_SD2_DAT3__AUD4_TXC  0x80000000
+                                                        MX6QDL_PAD_SD2_DAT2__AUD4_TXD  0x80000000
+                                                        MX6QDL_PAD_SD2_DAT1__AUD4_TXFS 0x80000000
+                                                >;
+                                        };
+
+                                        pinctrl_audmux_2: audmux-2 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_CSI0_DAT7__AUD3_RXD  0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT4__AUD3_TXC  0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT5__AUD3_TXD  0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT6__AUD3_TXFS 0x80000000
+                                                >;
+                                        };
+
+                                        pinctrl_audmux_3: audmux-3 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_DISP0_DAT16__AUD5_TXC  0x80000000
+                                                        MX6QDL_PAD_DISP0_DAT18__AUD5_TXFS 0x80000000
+                                                        MX6QDL_PAD_DISP0_DAT19__AUD5_RXD  0x80000000
+                                                >;
+                                        };
+                                };
+
+                                ecspi1 {
+                                        pinctrl_ecspi1_1: ecspi1grp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_EIM_D17__ECSPI1_MISO 0x100b1
+                                                        MX6QDL_PAD_EIM_D18__ECSPI1_MOSI 0x100b1
+                                                        MX6QDL_PAD_EIM_D16__ECSPI1_SCLK 0x100b1
+                                                >;
+                                        };
+
+                                        pinctrl_ecspi1_2: ecspi1grp-2 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_KEY_COL1__ECSPI1_MISO 0x100b1
+                                                        MX6QDL_PAD_KEY_ROW0__ECSPI1_MOSI 0x100b1
+                                                        MX6QDL_PAD_KEY_COL0__ECSPI1_SCLK 0x100b1
+                                                >;
+                                        };
+                                };
+
+                                ecspi3 {
+                                        pinctrl_ecspi3_1: ecspi3grp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_DISP0_DAT2__ECSPI3_MISO 0x100b1
+                                                        MX6QDL_PAD_DISP0_DAT1__ECSPI3_MOSI 0x100b1
+                                                        MX6QDL_PAD_DISP0_DAT0__ECSPI3_SCLK 0x100b1
+                                                >;
+                                        };
+                                };
+
+                                enet {
+                                        pinctrl_enet_1: enetgrp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_ENET_MDIO__ENET_MDIO       0x1b0b0
+                                                        MX6QDL_PAD_ENET_MDC__ENET_MDC         0x1b0b0
+                                                        MX6QDL_PAD_RGMII_TXC__RGMII_TXC       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_TD0__RGMII_TD0       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_TD1__RGMII_TD1       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_TD2__RGMII_TD2       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_TD3__RGMII_TD3       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
+                                                        MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK  0x1b0b0
+                                                        MX6QDL_PAD_RGMII_RXC__RGMII_RXC       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_RD0__RGMII_RD0       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_RD1__RGMII_RD1       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_RD2__RGMII_RD2       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_RD3__RGMII_RD3       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
+                                                        MX6QDL_PAD_GPIO_16__ENET_REF_CLK      0x4001b0a8
+                                                >;
+                                        };
+
+                                        pinctrl_enet_2: enetgrp-2 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_KEY_COL1__ENET_MDIO        0x1b0b0
+                                                        MX6QDL_PAD_KEY_COL2__ENET_MDC         0x1b0b0
+                                                        MX6QDL_PAD_RGMII_TXC__RGMII_TXC       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_TD0__RGMII_TD0       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_TD1__RGMII_TD1       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_TD2__RGMII_TD2       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_TD3__RGMII_TD3       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
+                                                        MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK  0x1b0b0
+                                                        MX6QDL_PAD_RGMII_RXC__RGMII_RXC       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_RD0__RGMII_RD0       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_RD1__RGMII_RD1       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_RD2__RGMII_RD2       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_RD3__RGMII_RD3       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
+                                                >;
+                                        };
+
+                                        pinctrl_enet_3: enetgrp-3 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_ENET_MDIO__ENET_MDIO       0x1b0b0
+                                                        MX6QDL_PAD_ENET_MDC__ENET_MDC         0x1b0b0
+                                                        MX6QDL_PAD_RGMII_TXC__RGMII_TXC       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_TD0__RGMII_TD0       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_TD1__RGMII_TD1       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_TD2__RGMII_TD2       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_TD3__RGMII_TD3       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_TX_CTL__RGMII_TX_CTL 0x1b0b0
+                                                        MX6QDL_PAD_ENET_REF_CLK__ENET_TX_CLK  0x1b0b0
+                                                        MX6QDL_PAD_RGMII_RXC__RGMII_RXC       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_RD0__RGMII_RD0       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_RD1__RGMII_RD1       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_RD2__RGMII_RD2       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_RD3__RGMII_RD3       0x1b0b0
+                                                        MX6QDL_PAD_RGMII_RX_CTL__RGMII_RX_CTL 0x1b0b0
+                                                        MX6QDL_PAD_ENET_TX_EN__ENET_TX_EN     0x1b0b0
+                                                >;
+                                        };
+                                };
+
+                                esai {
+                                        pinctrl_esai_1: esaigrp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_ENET_RXD0__ESAI_TX_HF_CLK 0x1b030
+                                                        MX6QDL_PAD_ENET_CRS_DV__ESAI_TX_CLK  0x1b030
+                                                        MX6QDL_PAD_ENET_RXD1__ESAI_TX_FS     0x1b030
+                                                        MX6QDL_PAD_ENET_TX_EN__ESAI_TX3_RX2  0x1b030
+                                                        MX6QDL_PAD_ENET_TXD1__ESAI_TX2_RX3   0x1b030
+                                                        MX6QDL_PAD_ENET_TXD0__ESAI_TX4_RX1   0x1b030
+                                                        MX6QDL_PAD_ENET_MDC__ESAI_TX5_RX0    0x1b030
+                                                        MX6QDL_PAD_NANDF_CS2__ESAI_TX0       0x1b030
+                                                        MX6QDL_PAD_NANDF_CS3__ESAI_TX1       0x1b030
+                                                >;
+                                        };
+
+                                        pinctrl_esai_2: esaigrp-2 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_ENET_CRS_DV__ESAI_TX_CLK 0x1b030
+                                                        MX6QDL_PAD_ENET_RXD1__ESAI_TX_FS    0x1b030
+                                                        MX6QDL_PAD_ENET_TX_EN__ESAI_TX3_RX2 0x1b030
+                                                        MX6QDL_PAD_GPIO_5__ESAI_TX2_RX3     0x1b030
+                                                        MX6QDL_PAD_ENET_TXD0__ESAI_TX4_RX1  0x1b030
+                                                        MX6QDL_PAD_ENET_MDC__ESAI_TX5_RX0   0x1b030
+                                                        MX6QDL_PAD_GPIO_17__ESAI_TX0        0x1b030
+                                                        MX6QDL_PAD_NANDF_CS3__ESAI_TX1      0x1b030
+                                                        MX6QDL_PAD_ENET_MDIO__ESAI_RX_CLK   0x1b030
+                                                        MX6QDL_PAD_GPIO_9__ESAI_RX_FS       0x1b030
+                                                >;
+                                        };
+                                };
+
+                                flexcan1 {
+                                        pinctrl_flexcan1_1: flexcan1grp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x80000000
+                                                        MX6QDL_PAD_KEY_COL2__FLEXCAN1_TX 0x80000000
+                                                >;
+                                        };
+
+                                        pinctrl_flexcan1_2: flexcan1grp-2 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_GPIO_7__FLEXCAN1_TX   0x80000000
+                                                        MX6QDL_PAD_KEY_ROW2__FLEXCAN1_RX 0x80000000
+                                                >;
+                                        };
+                                };
+
+                                flexcan2 {
+                                        pinctrl_flexcan2_1: flexcan2grp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_KEY_COL4__FLEXCAN2_TX 0x80000000
+                                                        MX6QDL_PAD_KEY_ROW4__FLEXCAN2_RX 0x80000000
+                                                >;
+                                        };
+                                };
+
+                                gpmi-nand {
+                                        pinctrl_gpmi_nand_1: gpmi-nand-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_NANDF_CLE__NAND_CLE     0xb0b1
+                                                        MX6QDL_PAD_NANDF_ALE__NAND_ALE     0xb0b1
+                                                        MX6QDL_PAD_NANDF_WP_B__NAND_WP_B   0xb0b1
+                                                        MX6QDL_PAD_NANDF_RB0__NAND_READY_B 0xb000
+                                                        MX6QDL_PAD_NANDF_CS0__NAND_CE0_B   0xb0b1
+                                                        MX6QDL_PAD_NANDF_CS1__NAND_CE1_B   0xb0b1
+                                                        MX6QDL_PAD_SD4_CMD__NAND_RE_B      0xb0b1
+                                                        MX6QDL_PAD_SD4_CLK__NAND_WE_B      0xb0b1
+                                                        MX6QDL_PAD_NANDF_D0__NAND_DATA00   0xb0b1
+                                                        MX6QDL_PAD_NANDF_D1__NAND_DATA01   0xb0b1
+                                                        MX6QDL_PAD_NANDF_D2__NAND_DATA02   0xb0b1
+                                                        MX6QDL_PAD_NANDF_D3__NAND_DATA03   0xb0b1
+                                                        MX6QDL_PAD_NANDF_D4__NAND_DATA04   0xb0b1
+                                                        MX6QDL_PAD_NANDF_D5__NAND_DATA05   0xb0b1
+                                                        MX6QDL_PAD_NANDF_D6__NAND_DATA06   0xb0b1
+                                                        MX6QDL_PAD_NANDF_D7__NAND_DATA07   0xb0b1
+                                                        MX6QDL_PAD_SD4_DAT0__NAND_DQS      0x00b1
+                                                >;
+                                        };
+                                };
+
+                                hdmi_hdcp {
+                                        pinctrl_hdmi_hdcp_1: hdmihdcpgrp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_KEY_COL3__HDMI_TX_DDC_SCL 0x4001b8b1
+                                                        MX6QDL_PAD_KEY_ROW3__HDMI_TX_DDC_SDA 0x4001b8b1
+                                                >;
+                                        };
+
+                                        pinctrl_hdmi_hdcp_2: hdmihdcpgrp-2 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_EIM_EB2__HDMI_TX_DDC_SCL 0x4001b8b1
+                                                        MX6QDL_PAD_EIM_D16__HDMI_TX_DDC_SDA 0x4001b8b1
+                                                >;
+                                        };
+
+                                        pinctrl_hdmi_hdcp_3: hdmihdcpgrp-3 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_EIM_EB2__HDMI_TX_DDC_SCL  0x4001b8b1
+                                                        MX6QDL_PAD_KEY_ROW3__HDMI_TX_DDC_SDA 0x4001b8b1
+                                                >;
+                                        };
+                                };
+
+                                hdmi_cec {
+                                        pinctrl_hdmi_cec_1: hdmicecgrp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_EIM_A25__HDMI_TX_CEC_LINE 0x1f8b0
+                                                >;
+                                        };
+
+                                        pinctrl_hdmi_cec_2: hdmicecgrp-2 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_KEY_ROW2__HDMI_TX_CEC_LINE 0x1f8b0
+                                                >;
+                                        };
+                                };
+
+                                i2c1 {
+                                        pinctrl_i2c1_1: i2c1grp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_EIM_D21__I2C1_SCL 0x4001b8b1
+                                                        MX6QDL_PAD_EIM_D28__I2C1_SDA 0x4001b8b1
+                                                >;
+                                        };
+
+                                        pinctrl_i2c1_2: i2c1grp-2 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_CSI0_DAT8__I2C1_SDA 0x4001b8b1
+                                                        MX6QDL_PAD_CSI0_DAT9__I2C1_SCL 0x4001b8b1
+                                                >;
+                                        };
+                                };
+
+                                i2c2 {
+                                        pinctrl_i2c2_1: i2c2grp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_EIM_EB2__I2C2_SCL 0x4001b8b1
+                                                        MX6QDL_PAD_EIM_D16__I2C2_SDA 0x4001b8b1
+                                                >;
+                                        };
+
+                                        pinctrl_i2c2_2: i2c2grp-2 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_KEY_COL3__I2C2_SCL 0x4001b8b1
+                                                        MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
+                                                >;
+                                        };
+
+                                        pinctrl_i2c2_3: i2c2grp-3 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_EIM_EB2__I2C2_SCL  0x4001b8b1
+                                                        MX6QDL_PAD_KEY_ROW3__I2C2_SDA 0x4001b8b1
+                                                >;
+                                        };
+                                };
+
+                                i2c3 {
+                                        pinctrl_i2c3_1: i2c3grp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_EIM_D17__I2C3_SCL 0x4001b8b1
+                                                        MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
+                                                >;
+                                        };
+
+                                        pinctrl_i2c3_2: i2c3grp-2 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_GPIO_3__I2C3_SCL 0x4001b8b1
+                                                        MX6QDL_PAD_GPIO_6__I2C3_SDA 0x4001b8b1
+                                                >;
+                                        };
+
+                                        pinctrl_i2c3_3: i2c3grp-3 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_GPIO_5__I2C3_SCL  0x4001b8b1
+                                                        MX6QDL_PAD_GPIO_16__I2C3_SDA 0x4001b8b1
+                                                >;
+                                        };
+
+                                        pinctrl_i2c3_4: i2c3grp-4 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_GPIO_3__I2C3_SCL  0x4001b8b1
+                                                        MX6QDL_PAD_EIM_D18__I2C3_SDA 0x4001b8b1
+                                                >;
+                                        };
+                                };
+
+                                ipu1 {
+                                        pinctrl_ipu1_1: ipu1grp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_DI0_DISP_CLK__IPU1_DI0_DISP_CLK 0x10
+                                                        MX6QDL_PAD_DI0_PIN15__IPU1_DI0_PIN15       0x10
+                                                        MX6QDL_PAD_DI0_PIN2__IPU1_DI0_PIN02        0x10
+                                                        MX6QDL_PAD_DI0_PIN3__IPU1_DI0_PIN03        0x10
+                                                        MX6QDL_PAD_DI0_PIN4__IPU1_DI0_PIN04        0x80000000
+                                                        MX6QDL_PAD_DISP0_DAT0__IPU1_DISP0_DATA00   0x10
+                                                        MX6QDL_PAD_DISP0_DAT1__IPU1_DISP0_DATA01   0x10
+                                                        MX6QDL_PAD_DISP0_DAT2__IPU1_DISP0_DATA02   0x10
+                                                        MX6QDL_PAD_DISP0_DAT3__IPU1_DISP0_DATA03   0x10
+                                                        MX6QDL_PAD_DISP0_DAT4__IPU1_DISP0_DATA04   0x10
+                                                        MX6QDL_PAD_DISP0_DAT5__IPU1_DISP0_DATA05   0x10
+                                                        MX6QDL_PAD_DISP0_DAT6__IPU1_DISP0_DATA06   0x10
+                                                        MX6QDL_PAD_DISP0_DAT7__IPU1_DISP0_DATA07   0x10
+                                                        MX6QDL_PAD_DISP0_DAT8__IPU1_DISP0_DATA08   0x10
+                                                        MX6QDL_PAD_DISP0_DAT9__IPU1_DISP0_DATA09   0x10
+                                                        MX6QDL_PAD_DISP0_DAT10__IPU1_DISP0_DATA10  0x10
+                                                        MX6QDL_PAD_DISP0_DAT11__IPU1_DISP0_DATA11  0x10
+                                                        MX6QDL_PAD_DISP0_DAT12__IPU1_DISP0_DATA12  0x10
+                                                        MX6QDL_PAD_DISP0_DAT13__IPU1_DISP0_DATA13  0x10
+                                                        MX6QDL_PAD_DISP0_DAT14__IPU1_DISP0_DATA14  0x10
+                                                        MX6QDL_PAD_DISP0_DAT15__IPU1_DISP0_DATA15  0x10
+                                                        MX6QDL_PAD_DISP0_DAT16__IPU1_DISP0_DATA16  0x10
+                                                        MX6QDL_PAD_DISP0_DAT17__IPU1_DISP0_DATA17  0x10
+                                                        MX6QDL_PAD_DISP0_DAT18__IPU1_DISP0_DATA18  0x10
+                                                        MX6QDL_PAD_DISP0_DAT19__IPU1_DISP0_DATA19  0x10
+                                                        MX6QDL_PAD_DISP0_DAT20__IPU1_DISP0_DATA20  0x10
+                                                        MX6QDL_PAD_DISP0_DAT21__IPU1_DISP0_DATA21  0x10
+                                                        MX6QDL_PAD_DISP0_DAT22__IPU1_DISP0_DATA22  0x10
+                                                        MX6QDL_PAD_DISP0_DAT23__IPU1_DISP0_DATA23  0x10
+                                                >;
+                                        };
+
+                                        pinctrl_ipu1_2: ipu1grp-2 { /* parallel camera */
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_CSI0_DAT12__IPU1_CSI0_DATA12    0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT13__IPU1_CSI0_DATA13    0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT14__IPU1_CSI0_DATA14    0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT15__IPU1_CSI0_DATA15    0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT16__IPU1_CSI0_DATA16    0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT17__IPU1_CSI0_DATA17    0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT18__IPU1_CSI0_DATA18    0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT19__IPU1_CSI0_DATA19    0x80000000
+                                                        MX6QDL_PAD_CSI0_DATA_EN__IPU1_CSI0_DATA_EN 0x80000000
+                                                        MX6QDL_PAD_CSI0_PIXCLK__IPU1_CSI0_PIXCLK   0x80000000
+                                                        MX6QDL_PAD_CSI0_MCLK__IPU1_CSI0_HSYNC      0x80000000
+                                                        MX6QDL_PAD_CSI0_VSYNC__IPU1_CSI0_VSYNC     0x80000000
+                                                >;
+                                        };
+
+                                        pinctrl_ipu1_3: ipu1grp-3 { /* parallel port 16-bit */
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_CSI0_DAT4__IPU1_CSI0_DATA04   0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT5__IPU1_CSI0_DATA05   0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT6__IPU1_CSI0_DATA06   0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT7__IPU1_CSI0_DATA07   0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT8__IPU1_CSI0_DATA08   0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT9__IPU1_CSI0_DATA09   0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT10__IPU1_CSI0_DATA10  0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT11__IPU1_CSI0_DATA11  0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT12__IPU1_CSI0_DATA12  0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT13__IPU1_CSI0_DATA13  0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT14__IPU1_CSI0_DATA14  0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT15__IPU1_CSI0_DATA15  0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT16__IPU1_CSI0_DATA16  0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT17__IPU1_CSI0_DATA17  0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT18__IPU1_CSI0_DATA18  0x80000000
+                                                        MX6QDL_PAD_CSI0_DAT19__IPU1_CSI0_DATA19  0x80000000
+                                                        MX6QDL_PAD_CSI0_PIXCLK__IPU1_CSI0_PIXCLK 0x80000000
+                                                        MX6QDL_PAD_CSI0_MCLK__IPU1_CSI0_HSYNC    0x80000000
+                                                        MX6QDL_PAD_CSI0_VSYNC__IPU1_CSI0_VSYNC   0x80000000
+                                                >;
+                                        };
+                                };
+
+                                mlb {
+                                        pinctrl_mlb_1: mlbgrp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_GPIO_3__MLB_CLK  0x71
+                                                        MX6QDL_PAD_GPIO_6__MLB_SIG  0x71
+                                                        MX6QDL_PAD_GPIO_2__MLB_DATA 0x71
+                                                >;
+                                        };
+
+                                        pinctrl_mlb_2: mlbgrp-2 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_ENET_TXD1__MLB_CLK 0x71
+                                                        MX6QDL_PAD_GPIO_6__MLB_SIG    0x71
+                                                        MX6QDL_PAD_GPIO_2__MLB_DATA   0x71
+                                                >;
+                                        };
+                                };
+
+                                pwm0 {
+                                        pinctrl_pwm0_1: pwm0grp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_SD1_DAT3__PWM1_OUT 0x1b0b1
+                                                >;
+                                        };
+                                };
+
+                                pwm3 {
+                                        pinctrl_pwm3_1: pwm3grp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_SD4_DAT1__PWM3_OUT 0x1b0b1
+                                                >;
+                                        };
+                                };
+
+                                spdif {
+                                        pinctrl_spdif_1: spdifgrp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_KEY_COL3__SPDIF_IN 0x1b0b0
+                                                >;
+                                        };
+
+                                        pinctrl_spdif_2: spdifgrp-2 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_GPIO_16__SPDIF_IN  0x1b0b0
+                                                        MX6QDL_PAD_GPIO_17__SPDIF_OUT 0x1b0b0
+                                                >;
+                                        };
+                                };
+
+                                uart1 {
+                                        pinctrl_uart1_1: uart1grp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_CSI0_DAT10__UART1_TX_DATA 0x1b0b1
+                                                        MX6QDL_PAD_CSI0_DAT11__UART1_RX_DATA 0x1b0b1
+                                                >;
+                                        };
+                                };
+
+                                uart2 {
+                                        pinctrl_uart2_1: uart2grp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_EIM_D26__UART2_TX_DATA 0x1b0b1
+                                                        MX6QDL_PAD_EIM_D27__UART2_RX_DATA 0x1b0b1
+                                                >;
+                                        };
+
+                                        pinctrl_uart2_2: uart2grp-2 { /* DTE mode */
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_EIM_D26__UART2_RX_DATA   0x1b0b1
+                                                        MX6QDL_PAD_EIM_D27__UART2_TX_DATA   0x1b0b1
+                                                        MX6QDL_PAD_EIM_D28__UART2_DTE_CTS_B 0x1b0b1
+                                                        MX6QDL_PAD_EIM_D29__UART2_DTE_RTS_B 0x1b0b1
+                                                >;
+                                        };
+                                };
+
+                                uart3 {
+                                        pinctrl_uart3_1: uart3grp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_SD4_CLK__UART3_RX_DATA 0x1b0b1
+                                                        MX6QDL_PAD_SD4_CMD__UART3_TX_DATA 0x1b0b1
+                                                        MX6QDL_PAD_EIM_D30__UART3_CTS_B   0x1b0b1
+                                                        MX6QDL_PAD_EIM_EB3__UART3_RTS_B   0x1b0b1
+                                                >;
+                                        };
+
+                                        pinctrl_uart3_2: uart3grp-2 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_EIM_D24__UART3_TX_DATA 0x1b0b1
+                                                        MX6QDL_PAD_EIM_D25__UART3_RX_DATA 0x1b0b1
+                                                        MX6QDL_PAD_EIM_D23__UART3_CTS_B   0x1b0b1
+                                                        MX6QDL_PAD_EIM_EB3__UART3_RTS_B   0x1b0b1
+                                                >;
+                                        };
+                                };
+
+                                uart4 {
+                                        pinctrl_uart4_1: uart4grp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_KEY_COL0__UART4_TX_DATA 0x1b0b1
+                                                        MX6QDL_PAD_KEY_ROW0__UART4_RX_DATA 0x1b0b1
+                                                >;
+                                        };
+                                };
+
+                                usbotg {
+                                        pinctrl_usbotg_1: usbotggrp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_GPIO_1__USB_OTG_ID 0x17059
+                                                >;
+                                        };
+
+                                        pinctrl_usbotg_2: usbotggrp-2 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_ENET_RX_ER__USB_OTG_ID 0x17059
+                                                >;
+                                        };
+                                };
+
+                                usbh2 {
+                                        pinctrl_usbh2_1: usbh2grp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_RGMII_TXC__USB_H2_DATA      0x40013030
+                                                        MX6QDL_PAD_RGMII_TX_CTL__USB_H2_STROBE 0x40013030
+                                                >;
+                                        };
+
+                                        pinctrl_usbh2_2: usbh2grp-2 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_RGMII_TX_CTL__USB_H2_STROBE 0x40017030
+                                                >;
+                                        };
+                                };
+
+                                usbh3 {
+                                        pinctrl_usbh3_1: usbh3grp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_RGMII_RX_CTL__USB_H3_DATA 0x40013030
+                                                        MX6QDL_PAD_RGMII_RXC__USB_H3_STROBE  0x40013030
+                                                >;
+                                        };
+
+                                        pinctrl_usbh3_2: usbh3grp-2 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_RGMII_RXC__USB_H3_STROBE 0x40017030
+                                                >;
+                                        };
+                                };
+
+                                usdhc1 {
+                                        pinctrl_usdhc1_1: usdhc1grp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_SD1_CMD__SD1_CMD    0x17059
+                                                        MX6QDL_PAD_SD1_CLK__SD1_CLK    0x10059
+                                                        MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x17059
+                                                        MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17059
+                                                        MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17059
+                                                        MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17059
+                                                        MX6QDL_PAD_NANDF_D0__SD1_DATA4 0x17059
+                                                        MX6QDL_PAD_NANDF_D1__SD1_DATA5 0x17059
+                                                        MX6QDL_PAD_NANDF_D2__SD1_DATA6 0x17059
+                                                        MX6QDL_PAD_NANDF_D3__SD1_DATA7 0x17059
+                                                >;
+                                        };
+
+                                        pinctrl_usdhc1_2: usdhc1grp-2 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_SD1_CMD__SD1_CMD    0x17059
+                                                        MX6QDL_PAD_SD1_CLK__SD1_CLK    0x10059
+                                                        MX6QDL_PAD_SD1_DAT0__SD1_DATA0 0x17059
+                                                        MX6QDL_PAD_SD1_DAT1__SD1_DATA1 0x17059
+                                                        MX6QDL_PAD_SD1_DAT2__SD1_DATA2 0x17059
+                                                        MX6QDL_PAD_SD1_DAT3__SD1_DATA3 0x17059
+                                                >;
+                                        };
+                                };
+
+                                usdhc2 {
+                                        pinctrl_usdhc2_1: usdhc2grp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_SD2_CMD__SD2_CMD    0x17059
+                                                        MX6QDL_PAD_SD2_CLK__SD2_CLK    0x10059
+                                                        MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059
+                                                        MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059
+                                                        MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059
+                                                        MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17059
+                                                        MX6QDL_PAD_NANDF_D4__SD2_DATA4 0x17059
+                                                        MX6QDL_PAD_NANDF_D5__SD2_DATA5 0x17059
+                                                        MX6QDL_PAD_NANDF_D6__SD2_DATA6 0x17059
+                                                        MX6QDL_PAD_NANDF_D7__SD2_DATA7 0x17059
+                                                >;
+                                        };
+
+                                        pinctrl_usdhc2_2: usdhc2grp-2 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_SD2_CMD__SD2_CMD    0x17059
+                                                        MX6QDL_PAD_SD2_CLK__SD2_CLK    0x10059
+                                                        MX6QDL_PAD_SD2_DAT0__SD2_DATA0 0x17059
+                                                        MX6QDL_PAD_SD2_DAT1__SD2_DATA1 0x17059
+                                                        MX6QDL_PAD_SD2_DAT2__SD2_DATA2 0x17059
+                                                        MX6QDL_PAD_SD2_DAT3__SD2_DATA3 0x17059
+                                                >;
+                                        };
+                                };
+
+                                usdhc3 {
+                                        pinctrl_usdhc3_1: usdhc3grp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_SD3_CMD__SD3_CMD    0x17059
+                                                        MX6QDL_PAD_SD3_CLK__SD3_CLK    0x10059
+                                                        MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
+                                                        MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
+                                                        MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
+                                                        MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
+                                                        MX6QDL_PAD_SD3_DAT4__SD3_DATA4 0x17059
+                                                        MX6QDL_PAD_SD3_DAT5__SD3_DATA5 0x17059
+                                                        MX6QDL_PAD_SD3_DAT6__SD3_DATA6 0x17059
+                                                        MX6QDL_PAD_SD3_DAT7__SD3_DATA7 0x17059
+                                                >;
+                                        };
+
+                                        pinctrl_usdhc3_2: usdhc3grp-2 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_SD3_CMD__SD3_CMD    0x17059
+                                                        MX6QDL_PAD_SD3_CLK__SD3_CLK    0x10059
+                                                        MX6QDL_PAD_SD3_DAT0__SD3_DATA0 0x17059
+                                                        MX6QDL_PAD_SD3_DAT1__SD3_DATA1 0x17059
+                                                        MX6QDL_PAD_SD3_DAT2__SD3_DATA2 0x17059
+                                                        MX6QDL_PAD_SD3_DAT3__SD3_DATA3 0x17059
+                                                >;
+                                        };
+                                };
+
+                                usdhc4 {
+                                        pinctrl_usdhc4_1: usdhc4grp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_SD4_CMD__SD4_CMD    0x17059
+                                                        MX6QDL_PAD_SD4_CLK__SD4_CLK    0x10059
+                                                        MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x17059
+                                                        MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x17059
+                                                        MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x17059
+                                                        MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x17059
+                                                        MX6QDL_PAD_SD4_DAT4__SD4_DATA4 0x17059
+                                                        MX6QDL_PAD_SD4_DAT5__SD4_DATA5 0x17059
+                                                        MX6QDL_PAD_SD4_DAT6__SD4_DATA6 0x17059
+                                                        MX6QDL_PAD_SD4_DAT7__SD4_DATA7 0x17059
+                                                >;
+                                        };
+
+                                        pinctrl_usdhc4_2: usdhc4grp-2 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_SD4_CMD__SD4_CMD    0x17059
+                                                        MX6QDL_PAD_SD4_CLK__SD4_CLK    0x10059
+                                                        MX6QDL_PAD_SD4_DAT0__SD4_DATA0 0x17059
+                                                        MX6QDL_PAD_SD4_DAT1__SD4_DATA1 0x17059
+                                                        MX6QDL_PAD_SD4_DAT2__SD4_DATA2 0x17059
+                                                        MX6QDL_PAD_SD4_DAT3__SD4_DATA3 0x17059
+                                                >;
+                                        };
+                                };
+
+                                weim {
+                                        pinctrl_weim_cs0_1: weim_cs0grp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_EIM_CS0__EIM_CS0_B   0xb0b1
+                                                >;
+                                        };
+
+                                        pinctrl_weim_nor_1: weim_norgrp-1 {
+                                                fsl,pins = <
+                                                        MX6QDL_PAD_EIM_OE__EIM_OE_B     0xb0b1
+                                                        MX6QDL_PAD_EIM_RW__EIM_RW       0xb0b1
+                                                        MX6QDL_PAD_EIM_WAIT__EIM_WAIT_B 0xb060
+                                                        /* data */
+                                                        MX6QDL_PAD_EIM_D16__EIM_DATA16 0x1b0b0
+                                                        MX6QDL_PAD_EIM_D17__EIM_DATA17 0x1b0b0
+                                                        MX6QDL_PAD_EIM_D18__EIM_DATA18 0x1b0b0
+                                                        MX6QDL_PAD_EIM_D19__EIM_DATA19 0x1b0b0
+                                                        MX6QDL_PAD_EIM_D20__EIM_DATA20 0x1b0b0
+                                                        MX6QDL_PAD_EIM_D21__EIM_DATA21 0x1b0b0
+                                                        MX6QDL_PAD_EIM_D22__EIM_DATA22 0x1b0b0
+                                                        MX6QDL_PAD_EIM_D23__EIM_DATA23 0x1b0b0
+                                                        MX6QDL_PAD_EIM_D24__EIM_DATA24 0x1b0b0
+                                                        MX6QDL_PAD_EIM_D25__EIM_DATA25 0x1b0b0
+                                                        MX6QDL_PAD_EIM_D26__EIM_DATA26 0x1b0b0
+                                                        MX6QDL_PAD_EIM_D27__EIM_DATA27 0x1b0b0
+                                                        MX6QDL_PAD_EIM_D28__EIM_DATA28 0x1b0b0
+                                                        MX6QDL_PAD_EIM_D29__EIM_DATA29 0x1b0b0
+                                                        MX6QDL_PAD_EIM_D30__EIM_DATA30 0x1b0b0
+                                                        MX6QDL_PAD_EIM_D31__EIM_DATA31 0x1b0b0
+                                                        /* address */
+                                                        MX6QDL_PAD_EIM_A23__EIM_ADDR23 0xb0b1
+                                                        MX6QDL_PAD_EIM_A22__EIM_ADDR22 0xb0b1
+                                                        MX6QDL_PAD_EIM_A21__EIM_ADDR21 0xb0b1
+                                                        MX6QDL_PAD_EIM_A20__EIM_ADDR20 0xb0b1
+                                                        MX6QDL_PAD_EIM_A19__EIM_ADDR19 0xb0b1
+                                                        MX6QDL_PAD_EIM_A18__EIM_ADDR18 0xb0b1
+                                                        MX6QDL_PAD_EIM_A17__EIM_ADDR17 0xb0b1
+                                                        MX6QDL_PAD_EIM_A16__EIM_ADDR16 0xb0b1
+                                                        MX6QDL_PAD_EIM_DA15__EIM_AD15  0xb0b1
+                                                        MX6QDL_PAD_EIM_DA14__EIM_AD14  0xb0b1
+                                                        MX6QDL_PAD_EIM_DA13__EIM_AD13  0xb0b1
+                                                        MX6QDL_PAD_EIM_DA12__EIM_AD12  0xb0b1
+                                                        MX6QDL_PAD_EIM_DA11__EIM_AD11  0xb0b1
+                                                        MX6QDL_PAD_EIM_DA10__EIM_AD10  0xb0b1
+                                                        MX6QDL_PAD_EIM_DA9__EIM_AD09   0xb0b1
+                                                        MX6QDL_PAD_EIM_DA8__EIM_AD08   0xb0b1
+                                                        MX6QDL_PAD_EIM_DA7__EIM_AD07   0xb0b1
+                                                        MX6QDL_PAD_EIM_DA6__EIM_AD06   0xb0b1
+                                                        MX6QDL_PAD_EIM_DA5__EIM_AD05   0xb0b1
+                                                        MX6QDL_PAD_EIM_DA4__EIM_AD04   0xb0b1
+                                                        MX6QDL_PAD_EIM_DA3__EIM_AD03   0xb0b1
+                                                        MX6QDL_PAD_EIM_DA2__EIM_AD02   0xb0b1
+                                                        MX6QDL_PAD_EIM_DA1__EIM_AD01   0xb0b1
+                                                        MX6QDL_PAD_EIM_DA0__EIM_AD00   0xb0b1
+                                                >;
+                                        };
+                                };
+                        };
+
                         ldb: ldb@020e0008 {
                                 #address-cells = <1>;
                                 #size-cells = <0>;
@@ -555,13 +1292,11 @@
 
                                 lvds-channel@0 {
                                         reg = <0>;
-                                        crtcs = <&ipu1 0>;
                                         status = "disabled";
                                 };
 
                                 lvds-channel@1 {
                                         reg = <1>;
-                                        crtcs = <&ipu1 1>;
                                         status = "disabled";
                                 };
                         };
@@ -582,6 +1317,7 @@
                                 interrupts = <0 2 0x04>;
                                 clocks = <&clks 155>, <&clks 155>;
                                 clock-names = "ipg", "ahb";
+                                #dma-cells = <3>;
                                 fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6q.bin";
                         };
                 };
@@ -751,8 +1487,8 @@
                                 clocks = <&clks 196>;
                         };
 
-                        ocotp@021bc000 {
-                                compatible = "fsl,imx6q-ocotp";
+                        ocotp: ocotp@021bc000 {
+                                compatible = "fsl,imx6q-ocotp", "syscon";
                                 reg = <0x021bc000 0x4000>;
                         };
 
@@ -791,6 +1527,8 @@
                                 interrupts = <0 27 0x04>;
                                 clocks = <&clks 160>, <&clks 161>;
                                 clock-names = "ipg", "per";
+                                dmas = <&sdma 27 4 0>, <&sdma 28 4 0>;
+                                dma-names = "rx", "tx";
                                 status = "disabled";
                         };
 
@@ -800,6 +1538,8 @@
                                 interrupts = <0 28 0x04>;
                                 clocks = <&clks 160>, <&clks 161>;
                                 clock-names = "ipg", "per";
+                                dmas = <&sdma 29 4 0>, <&sdma 30 4 0>;
+                                dma-names = "rx", "tx";
                                 status = "disabled";
                         };
 
@@ -809,6 +1549,8 @@
                                 interrupts = <0 29 0x04>;
                                 clocks = <&clks 160>, <&clks 161>;
                                 clock-names = "ipg", "per";
+                                dmas = <&sdma 31 4 0>, <&sdma 32 4 0>;
+                                dma-names = "rx", "tx";
                                 status = "disabled";
                         };
 
@@ -818,6 +1560,8 @@
                                 interrupts = <0 30 0x04>;
                                 clocks = <&clks 160>, <&clks 161>;
                                 clock-names = "ipg", "per";
+                                dmas = <&sdma 33 4 0>, <&sdma 34 4 0>;
+                                dma-names = "rx", "tx";
                                 status = "disabled";
                         };
                 };
diff --git a/arch/arm/boot/dts/imx6sl.dtsi b/arch/arm/boot/dts/imx6sl.dtsi
index c5e5da02d7e3..c46651e4d966 100644
--- a/arch/arm/boot/dts/imx6sl.dtsi
+++ b/arch/arm/boot/dts/imx6sl.dtsi
@@ -152,32 +152,41 @@
                                 };
 
                                 uart5: serial@02018000 {
-                                        compatible = "fsl,imx6sl-uart", "fsl,imx21-uart";
+                                        compatible = "fsl,imx6sl-uart",
+                                                   "fsl,imx6q-uart", "fsl,imx21-uart";
                                         reg = <0x02018000 0x4000>;
                                         interrupts = <0 30 0x04>;
                                         clocks = <&clks IMX6SL_CLK_UART>,
                                                  <&clks IMX6SL_CLK_UART_SERIAL>;
                                         clock-names = "ipg", "per";
+                                        dmas = <&sdma 33 4 0>, <&sdma 34 4 0>;
+                                        dma-names = "rx", "tx";
                                         status = "disabled";
                                 };
 
                                 uart1: serial@02020000 {
-                                        compatible = "fsl,imx6sl-uart", "fsl,imx21-uart";
+                                        compatible = "fsl,imx6sl-uart",
+                                                   "fsl,imx6q-uart", "fsl,imx21-uart";
                                         reg = <0x02020000 0x4000>;
                                         interrupts = <0 26 0x04>;
                                         clocks = <&clks IMX6SL_CLK_UART>,
                                                  <&clks IMX6SL_CLK_UART_SERIAL>;
                                         clock-names = "ipg", "per";
+                                        dmas = <&sdma 25 4 0>, <&sdma 26 4 0>;
+                                        dma-names = "rx", "tx";
                                         status = "disabled";
                                 };
 
                                 uart2: serial@02024000 {
-                                        compatible = "fsl,imx6sl-uart", "fsl,imx21-uart";
+                                        compatible = "fsl,imx6sl-uart",
+                                                   "fsl,imx6q-uart", "fsl,imx21-uart";
                                         reg = <0x02024000 0x4000>;
                                         interrupts = <0 27 0x04>;
                                         clocks = <&clks IMX6SL_CLK_UART>,
                                                  <&clks IMX6SL_CLK_UART_SERIAL>;
                                         clock-names = "ipg", "per";
+                                        dmas = <&sdma 27 4 0>, <&sdma 28 4 0>;
+                                        dma-names = "rx", "tx";
                                         status = "disabled";
                                 };
 
@@ -186,6 +195,9 @@
                                         reg = <0x02028000 0x4000>;
                                         interrupts = <0 46 0x04>;
                                         clocks = <&clks IMX6SL_CLK_SSI1>;
+                                        dmas = <&sdma 37 1 0>,
+                                               <&sdma 38 1 0>;
+                                        dma-names = "rx", "tx";
                                         fsl,fifo-depth = <15>;
                                         status = "disabled";
                                 };
@@ -195,6 +207,9 @@
                                         reg = <0x0202c000 0x4000>;
                                         interrupts = <0 47 0x04>;
                                         clocks = <&clks IMX6SL_CLK_SSI2>;
+                                        dmas = <&sdma 41 1 0>,
+                                               <&sdma 42 1 0>;
+                                        dma-names = "rx", "tx";
                                         fsl,fifo-depth = <15>;
                                         status = "disabled";
                                 };
@@ -204,27 +219,36 @@
                                         reg = <0x02030000 0x4000>;
                                         interrupts = <0 48 0x04>;
                                         clocks = <&clks IMX6SL_CLK_SSI3>;
+                                        dmas = <&sdma 45 1 0>,
+                                               <&sdma 46 1 0>;
+                                        dma-names = "rx", "tx";
                                         fsl,fifo-depth = <15>;
                                         status = "disabled";
                                 };
 
                                 uart3: serial@02034000 {
-                                        compatible = "fsl,imx6sl-uart", "fsl,imx21-uart";
+                                        compatible = "fsl,imx6sl-uart",
+                                                   "fsl,imx6q-uart", "fsl,imx21-uart";
                                         reg = <0x02034000 0x4000>;
                                         interrupts = <0 28 0x04>;
                                         clocks = <&clks IMX6SL_CLK_UART>,
                                                  <&clks IMX6SL_CLK_UART_SERIAL>;
                                         clock-names = "ipg", "per";
+                                        dmas = <&sdma 29 4 0>, <&sdma 30 4 0>;
+                                        dma-names = "rx", "tx";
                                         status = "disabled";
                                 };
 
                                 uart4: serial@02038000 {
-                                        compatible = "fsl,imx6sl-uart", "fsl,imx21-uart";
+                                        compatible = "fsl,imx6sl-uart",
+                                                   "fsl,imx6q-uart", "fsl,imx21-uart";
                                         reg = <0x02038000 0x4000>;
                                         interrupts = <0 29 0x04>;
                                         clocks = <&clks IMX6SL_CLK_UART>,
                                                  <&clks IMX6SL_CLK_UART_SERIAL>;
                                         clock-names = "ipg", "per";
+                                        dmas = <&sdma 31 4 0>, <&sdma 32 4 0>;
+                                        dma-names = "rx", "tx";
                                         status = "disabled";
                                 };
                         };
@@ -594,6 +618,7 @@
                                 clocks = <&clks IMX6SL_CLK_SDMA>,
                                          <&clks IMX6SL_CLK_SDMA>;
                                 clock-names = "ipg", "ahb";
+                                #dma-cells = <3>;
                                 fsl,sdma-ram-script-name = "imx/sdma/sdma-imx6sl.bin";
                         };
 
diff --git a/arch/arm/boot/dts/keystone.dts b/arch/arm/boot/dts/keystone.dts
index 1334b42c6b77..a68e34bbecb2 100644
--- a/arch/arm/boot/dts/keystone.dts
+++ b/arch/arm/boot/dts/keystone.dts
@@ -7,7 +7,9 @@
  */
 
 /dts-v1/;
-/include/ "skeleton.dtsi"
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+#include "skeleton.dtsi"
 
 / {
         model = "Texas Instruments Keystone 2 SoC";
@@ -67,18 +69,23 @@
 
         timer {
                 compatible = "arm,armv7-timer";
-                interrupts = <1 13 0xf08>,
-                             <1 14 0xf08>,
-                             <1 11 0xf08>,
-                             <1 10 0x308>;
+                interrupts =
+                        <GIC_PPI 13
+                                (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                        <GIC_PPI 14
+                                (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                        <GIC_PPI 11
+                                (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
+                        <GIC_PPI 10
+                                (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
         };
 
         pmu {
                 compatible = "arm,cortex-a15-pmu";
-                interrupts = <0 20 0xf01>,
-                             <0 21 0xf01>,
-                             <0 22 0xf01>,
-                             <0 23 0xf01>;
+                interrupts = <GIC_SPI 20 IRQ_TYPE_EDGE_RISING>,
+                             <GIC_SPI 21 IRQ_TYPE_EDGE_RISING>,
+                             <GIC_SPI 22 IRQ_TYPE_EDGE_RISING>,
+                             <GIC_SPI 23 IRQ_TYPE_EDGE_RISING>;
         };
 
         soc {
@@ -100,7 +107,7 @@
                         reg-io-width = <4>;
                         reg = <0x02530c00 0x100>;
                         clock-frequency = <133120000>;
-                        interrupts = <0 277 0xf01>;
+                        interrupts = <GIC_SPI 277 IRQ_TYPE_EDGE_RISING>;
                 };
 
                 uart1:  serial@02531000 {
@@ -110,7 +117,7 @@
                         reg-io-width = <4>;
                         reg = <0x02531000 0x100>;
                         clock-frequency = <133120000>;
-                        interrupts = <0 280 0xf01>;
+                        interrupts = <GIC_SPI 280 IRQ_TYPE_EDGE_RISING>;
                 };
 
         };
diff --git a/arch/arm/boot/dts/kirkwood-6281.dtsi b/arch/arm/boot/dts/kirkwood-6281.dtsi
index 1e5bef0bead7..650ef30e1856 100644
--- a/arch/arm/boot/dts/kirkwood-6281.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6281.dtsi
@@ -1,4 +1,39 @@
 / {
+        mbus {
+                pcie-controller {
+                        compatible = "marvell,kirkwood-pcie";
+                        status = "disabled";
+                        device_type = "pci";
+
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+
+                        bus-range = <0x00 0xff>;
+
+                        ranges =
+                               <0x82000000 0 0x40000 MBUS_ID(0xf0, 0x01) 0x40000 0 0x00002000
+                                0x82000000 0x1 0     MBUS_ID(0x04, 0xe8) 0       1 0 /* Port 0.0 MEM */
+                                0x81000000 0x1 0     MBUS_ID(0x04, 0xe0) 0       1 0 /* Port 0.0 IO  */>;
+
+                        pcie@1,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>;
+                                reg = <0x0800 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0
+                                          0x81000000 0 0 0x81000000 0x1 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &intc 9>;
+                                marvell,pcie-port = <0>;
+                                marvell,pcie-lane = <0>;
+                                clocks = <&gate_clk 2>;
+                                status = "disabled";
+                        };
+                };
+        };
+
         ocp@f1000000 {
                 pinctrl: pinctrl@10000 {
                         compatible = "marvell,88f6281-pinctrl";
@@ -41,37 +76,6 @@
                         };
                 };
 
-                pcie-controller {
-                        compatible = "marvell,kirkwood-pcie";
-                        status = "disabled";
-                        device_type = "pci";
-
-                        #address-cells = <3>;
-                        #size-cells = <2>;
-
-                        bus-range = <0x00 0xff>;
-
-                        ranges = <0x82000000 0 0x00040000 0x00040000 0 0x00002000   /* Port 0.0 registers */
-                                  0x82000000 0 0xe0000000 0xe0000000 0 0x08000000   /* non-prefetchable memory */
-                                  0x81000000 0 0          0xe8000000 0 0x00100000>; /* downstream I/O */
-
-                        pcie@1,0 {
-                                device_type = "pci";
-                                assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>;
-                                reg = <0x0800 0 0 0 0>;
-                                #address-cells = <3>;
-                                #size-cells = <2>;
-                                #interrupt-cells = <1>;
-                                ranges;
-                                interrupt-map-mask = <0 0 0 0>;
-                                interrupt-map = <0 0 0 0 &intc 9>;
-                                marvell,pcie-port = <0>;
-                                marvell,pcie-lane = <0>;
-                                clocks = <&gate_clk 2>;
-                                status = "disabled";
-                        };
-                };
-
                 rtc@10300 {
                         compatible = "marvell,kirkwood-rtc", "marvell,orion-rtc";
                         reg = <0x10300 0x20>;
diff --git a/arch/arm/boot/dts/kirkwood-6282.dtsi b/arch/arm/boot/dts/kirkwood-6282.dtsi
index a63a11137262..3933a331ddc2 100644
--- a/arch/arm/boot/dts/kirkwood-6282.dtsi
+++ b/arch/arm/boot/dts/kirkwood-6282.dtsi
@@ -1,4 +1,59 @@
 / {
+        mbus {
+                pcie-controller {
+                        compatible = "marvell,kirkwood-pcie";
+                        status = "disabled";
+                        device_type = "pci";
+
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+
+                        bus-range = <0x00 0xff>;
+
+                        ranges =
+                               <0x82000000 0 0x40000 MBUS_ID(0xf0, 0x01) 0x40000 0 0x00002000
+                                0x82000000 0 0x44000 MBUS_ID(0xf0, 0x01) 0x44000 0 0x00002000
+                                0x82000000 0 0x80000 MBUS_ID(0xf0, 0x01) 0x80000 0 0x00002000
+                                0x82000000 0x1 0     MBUS_ID(0x04, 0xe8) 0       1 0 /* Port 0.0 MEM */
+                                0x81000000 0x1 0     MBUS_ID(0x04, 0xe0) 0       1 0 /* Port 0.0 IO  */
+                                0x82000000 0x2 0     MBUS_ID(0x04, 0xd8) 0       1 0 /* Port 1.0 MEM */
+                                0x81000000 0x2 0     MBUS_ID(0x04, 0xd0) 0       1 0 /* Port 1.0 IO  */>;
+
+                        pcie@1,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>;
+                                reg = <0x0800 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0
+                                          0x81000000 0 0 0x81000000 0x1 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &intc 9>;
+                                marvell,pcie-port = <0>;
+                                marvell,pcie-lane = <0>;
+                                clocks = <&gate_clk 2>;
+                                status = "disabled";
+                        };
+
+                        pcie@2,0 {
+                                device_type = "pci";
+                                assigned-addresses = <0x82001000 0 0x00044000 0 0x2000>;
+                                reg = <0x1000 0 0 0 0>;
+                                #address-cells = <3>;
+                                #size-cells = <2>;
+                                #interrupt-cells = <1>;
+                                ranges = <0x82000000 0 0 0x82000000 0x2 0 1 0
+                                          0x81000000 0 0 0x81000000 0x2 0 1 0>;
+                                interrupt-map-mask = <0 0 0 0>;
+                                interrupt-map = <0 0 0 0 &intc 10>;
+                                marvell,pcie-port = <1>;
+                                marvell,pcie-lane = <0>;
+                                clocks = <&gate_clk 18>;
+                                status = "disabled";
+                        };
+                };
+        };
         ocp@f1000000 {
 
                 pinctrl: pinctrl@10000 {
@@ -94,52 +149,5 @@
                         status = "disabled";
                 };
 
-                pcie-controller {
-                        compatible = "marvell,kirkwood-pcie";
-                        status = "disabled";
-                        device_type = "pci";
-
-                        #address-cells = <3>;
-                        #size-cells = <2>;
-
-                        bus-range = <0x00 0xff>;
-
-                        ranges = <0x82000000 0 0x00040000 0x00040000 0 0x00002000   /* Port 0.0 registers */
-                                  0x82000000 0 0x00044000 0x00044000 0 0x00002000   /* Port 1.0 registers */
-                                  0x82000000 0 0xe0000000 0xe0000000 0 0x08000000   /* non-prefetchable memory */
-                                  0x81000000 0 0          0xe8000000 0 0x00100000>; /* downstream I/O */
-
-                        pcie@1,0 {
-                                device_type = "pci";
-                                assigned-addresses = <0x82000800 0 0x00040000 0 0x2000>;
-                                reg = <0x0800 0 0 0 0>;
-                                #address-cells = <3>;
-                                #size-cells = <2>;
-                                #interrupt-cells = <1>;
-                                ranges;
-                                interrupt-map-mask = <0 0 0 0>;
-                                interrupt-map = <0 0 0 0 &intc 9>;
-                                marvell,pcie-port = <0>;
-                                marvell,pcie-lane = <0>;
-                                clocks = <&gate_clk 2>;
-                                status = "disabled";
-                        };
-
-                        pcie@2,0 {
-                                device_type = "pci";
-                                assigned-addresses = <0x82001000 0 0x00044000 0 0x2000>;
-                                reg = <0x1000 0 0 0 0>;
-                                #address-cells = <3>;
-                                #size-cells = <2>;
-                                #interrupt-cells = <1>;
-                                ranges;
-                                interrupt-map-mask = <0 0 0 0>;
-                                interrupt-map = <0 0 0 0 &intc 10>;
-                                marvell,pcie-port = <1>;
-                                marvell,pcie-lane = <0>;
-                                clocks = <&gate_clk 18>;
-                                status = "disabled";
-                        };
-                };
         };
 };
diff --git a/arch/arm/boot/dts/kirkwood-cloudbox.dts b/arch/arm/boot/dts/kirkwood-cloudbox.dts
index 00c48d26de68..142b9cd3b454 100644
--- a/arch/arm/boot/dts/kirkwood-cloudbox.dts
+++ b/arch/arm/boot/dts/kirkwood-cloudbox.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
 
 / {
         model = "LaCie CloudBox";
@@ -89,3 +89,19 @@
                 gpios = <&gpio0 17 0>;
         };
 };
+
+&mdio {
+        status = "okay";
+
+        ethphy0: ethernet-phy@0 {
+                device_type = "ethernet-phy";
+                reg = <0>;
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-db-88f6281.dts b/arch/arm/boot/dts/kirkwood-db-88f6281.dts
index 9d777edd1f36..72c4b0a0366f 100644
--- a/arch/arm/boot/dts/kirkwood-db-88f6281.dts
+++ b/arch/arm/boot/dts/kirkwood-db-88f6281.dts
@@ -11,14 +11,15 @@
 
 /dts-v1/;
 
-/include/ "kirkwood-db.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood-db.dtsi"
+#include "kirkwood-6281.dtsi"
 
 / {
         model = "Marvell DB-88F6281-BP Development Board";
         compatible = "marvell,db-88f6281-bp", "marvell,kirkwood-88f6281", "marvell,kirkwood";
 
-        ocp@f1000000 {
+        mbus {
+                ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;
                 pcie-controller {
                         status = "okay";
 
diff --git a/arch/arm/boot/dts/kirkwood-db-88f6282.dts b/arch/arm/boot/dts/kirkwood-db-88f6282.dts
index f4c852886d23..36c411d34926 100644
--- a/arch/arm/boot/dts/kirkwood-db-88f6282.dts
+++ b/arch/arm/boot/dts/kirkwood-db-88f6282.dts
@@ -11,14 +11,15 @@
 
 /dts-v1/;
 
-/include/ "kirkwood-db.dtsi"
-/include/ "kirkwood-6282.dtsi"
+#include "kirkwood-db.dtsi"
+#include "kirkwood-6282.dtsi"
 
 / {
         model = "Marvell DB-88F6282-BP Development Board";
         compatible = "marvell,db-88f6282-bp", "marvell,kirkwood-88f6282", "marvell,kirkwood";
 
-        ocp@f1000000 {
+        mbus {
+                ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;
                 pcie-controller {
                         status = "okay";
 
diff --git a/arch/arm/boot/dts/kirkwood-db.dtsi b/arch/arm/boot/dts/kirkwood-db.dtsi
index c87cfb816120..c0e2a5879174 100644
--- a/arch/arm/boot/dts/kirkwood-db.dtsi
+++ b/arch/arm/boot/dts/kirkwood-db.dtsi
@@ -12,7 +12,7 @@
  * and 6282 variants of the Marvell Kirkwood Development Board.
  */
 
-/include/ "kirkwood.dtsi"
+#include "kirkwood.dtsi"
 
 / {
         memory {
@@ -77,13 +77,21 @@
                         cd-gpios = <&gpio1 6 0>;
                         status = "okay";
                 };
+        };
+};
 
-                pcie-controller {
-                        status = "okay";
+&mdio {
+        status = "okay";
 
-                        pcie@1,0 {
-                                status = "okay";
-                        };
-                };
+        ethphy0: ethernet-phy@8 {
+                device_type = "ethernet-phy";
+                reg = <8>;
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
         };
 };
diff --git a/arch/arm/boot/dts/kirkwood-dns320.dts b/arch/arm/boot/dts/kirkwood-dns320.dts
index 14d4ceea3057..e112ca62d978 100644
--- a/arch/arm/boot/dts/kirkwood-dns320.dts
+++ b/arch/arm/boot/dts/kirkwood-dns320.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "kirkwood-dnskw.dtsi"
+#include "kirkwood-dnskw.dtsi"
 
 / {
         model = "D-Link DNS-320 NAS (Rev A1)";
diff --git a/arch/arm/boot/dts/kirkwood-dns325.dts b/arch/arm/boot/dts/kirkwood-dns325.dts
index 63872570e6ce..5119fb8a8eb6 100644
--- a/arch/arm/boot/dts/kirkwood-dns325.dts
+++ b/arch/arm/boot/dts/kirkwood-dns325.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "kirkwood-dnskw.dtsi"
+#include "kirkwood-dnskw.dtsi"
 
 / {
         model = "D-Link DNS-325 NAS (Rev A1)";
diff --git a/arch/arm/boot/dts/kirkwood-dnskw.dtsi b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
index 0afe1d07c803..d544f77a4ca4 100644
--- a/arch/arm/boot/dts/kirkwood-dnskw.dtsi
+++ b/arch/arm/boot/dts/kirkwood-dnskw.dtsi
@@ -1,5 +1,5 @@
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
 
 / {
         model = "D-Link DNS NASes (kirkwood-based)";
@@ -219,3 +219,19 @@
                 };
         };
 };
+
+&mdio {
+        status = "okay";
+
+        ethphy0: ethernet-phy@8 {
+                device_type = "ethernet-phy";
+                reg = <8>;
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-dockstar.dts b/arch/arm/boot/dts/kirkwood-dockstar.dts
index 7714742bb8d8..59a2117c35a7 100644
--- a/arch/arm/boot/dts/kirkwood-dockstar.dts
+++ b/arch/arm/boot/dts/kirkwood-dockstar.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
 
 / {
         model = "Seagate FreeAgent Dockstar";
@@ -90,3 +90,20 @@
                 };
         };
 };
+
+&mdio {
+        status = "okay";
+
+        ethphy0: ethernet-phy@0 {
+                device_type = "ethernet-phy";
+                compatible = "marvell,88e1116";
+                reg = <0>;
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-dreamplug.dts b/arch/arm/boot/dts/kirkwood-dreamplug.dts
index 36c7ba38d500..6f62af99c9cb 100644
--- a/arch/arm/boot/dts/kirkwood-dreamplug.dts
+++ b/arch/arm/boot/dts/kirkwood-dreamplug.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
 
 / {
         model = "Globalscale Technologies Dreamplug";
@@ -99,3 +99,31 @@
                 };
         };
 };
+
+&mdio {
+        status = "okay";
+
+        ethphy0: ethernet-phy@0 {
+                device_type = "ethernet-phy";
+                reg = <0>;
+        };
+
+        ethphy1: ethernet-phy@1 {
+                device_type = "ethernet-phy";
+                reg = <1>;
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
+        };
+};
+
+&eth1 {
+        status = "okay";
+        ethernet1-port@0 {
+                phy-handle = <&ethphy1>;
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-goflexnet.dts b/arch/arm/boot/dts/kirkwood-goflexnet.dts
index 31caa6405065..6f7c7d7ecf2a 100644
--- a/arch/arm/boot/dts/kirkwood-goflexnet.dts
+++ b/arch/arm/boot/dts/kirkwood-goflexnet.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
 
 / {
         model = "Seagate GoFlex Net";
@@ -170,3 +170,19 @@
                 };
         };
 };
+
+&mdio {
+        status = "okay";
+
+        ethphy0: ethernet-phy@0 {
+                device_type = "ethernet-phy";
+                reg = <0>;
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
index 1e642f39b154..6548b9dc6855 100644
--- a/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
+++ b/arch/arm/boot/dts/kirkwood-guruplug-server-plus.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
 
 / {
         model = "Globalscale Technologies Guruplug Server Plus";
@@ -96,3 +96,33 @@
                 };
         };
 };
+
+&mdio {
+        status = "okay";
+
+        ethphy0: ethernet-phy@0 {
+                device_type = "ethernet-phy";
+                compatible = "marvell,88e1121";
+                reg = <0>;
+        };
+
+        ethphy1: ethernet-phy@1 {
+                device_type = "ethernet-phy";
+                compatible = "marvell,88e1121";
+                reg = <1>;
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
+        };
+};
+
+&eth1 {
+        status = "okay";
+        ethernet1-port@0 {
+                phy-handle = <&ethphy1>;
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-ib62x0.dts b/arch/arm/boot/dts/kirkwood-ib62x0.dts
index 20c4b081f420..cb711a3bd983 100644
--- a/arch/arm/boot/dts/kirkwood-ib62x0.dts
+++ b/arch/arm/boot/dts/kirkwood-ib62x0.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
 
 / {
         model = "RaidSonic ICY BOX IB-NAS62x0 (Rev B)";
@@ -122,3 +122,19 @@
 
 
 };
+
+&mdio {
+        status = "okay";
+
+        ethphy0: ethernet-phy@8 {
+                device_type = "ethernet-phy";
+                reg = <8>;
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-iconnect.dts b/arch/arm/boot/dts/kirkwood-iconnect.dts
index 441204e8abc6..0323f017eeed 100644
--- a/arch/arm/boot/dts/kirkwood-iconnect.dts
+++ b/arch/arm/boot/dts/kirkwood-iconnect.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
 
 / {
         model = "Iomega Iconnect";
@@ -18,6 +18,17 @@
                 linux,initrd-end   = <0x4800000>;
         };
 
+        mbus {
+                ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;
+                pcie-controller {
+                        status = "okay";
+
+                        pcie@1,0 {
+                                status = "okay";
+                        };
+                };
+        };
+
         ocp@f1000000 {
                 pinctrl: pinctrl@10000 {
                         pmx_button_reset: pmx-button-reset {
@@ -101,14 +112,6 @@
                                 reg = <0x980000 0x1f400000>;
                         };
                 };
-
-                pcie-controller {
-                        status = "okay";
-
-                        pcie@1,0 {
-                                status = "okay";
-                        };
-                };
         };
 
         gpio-leds {
@@ -176,3 +179,19 @@
                 };
         };
 };
+
+&mdio {
+        status = "okay";
+
+        ethphy0: ethernet-phy@11 {
+                device_type = "ethernet-phy";
+                reg = <11>;
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
index 00a7bfe5e83b..df8447442b37 100644
--- a/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
+++ b/arch/arm/boot/dts/kirkwood-iomega_ix2_200.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
 
 / {
         model = "Iomega StorCenter ix2-200";
@@ -194,3 +194,27 @@
                 };
         };
 };
+
+&mdio {
+        status = "okay";
+
+        ethphy1: ethernet-phy@11 {
+                device_type = "ethernet-phy";
+                reg = <11>;
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                speed = <1000>;
+                duplex = <1>;
+        };
+};
+
+&eth1 {
+        status = "okay";
+        ethernet1-port@0 {
+                phy-handle = <&ethphy1>;
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-is2.dts b/arch/arm/boot/dts/kirkwood-is2.dts
index c3f036b86cca..da674bbd49a8 100644
--- a/arch/arm/boot/dts/kirkwood-is2.dts
+++ b/arch/arm/boot/dts/kirkwood-is2.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "kirkwood-ns2-common.dtsi"
+#include "kirkwood-ns2-common.dtsi"
 
 / {
         model = "LaCie Internet Space v2";
@@ -30,3 +30,5 @@
                 };
         };
 };
+
+&ethphy0 { reg = <8>; };
diff --git a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
index 5d9f5ea78700..6899408482d2 100644
--- a/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
+++ b/arch/arm/boot/dts/kirkwood-km_kirkwood.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-98dx4122.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-98dx4122.dtsi"
 
 / {
         model = "Keymile Kirkwood Reference Design";
@@ -50,3 +50,19 @@
                 i2c-gpio,delay-us = <2>;        /* ~100 kHz */
         };
 };
+
+&mdio {
+        status = "okay";
+
+        ethphy0: ethernet-phy@0 {
+                device_type = "ethernet-phy";
+                reg = <0>;
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-lschlv2.dts b/arch/arm/boot/dts/kirkwood-lschlv2.dts
index 9f55d95f35f5..e2fa368aef25 100644
--- a/arch/arm/boot/dts/kirkwood-lschlv2.dts
+++ b/arch/arm/boot/dts/kirkwood-lschlv2.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "kirkwood-lsxl.dtsi"
+#include "kirkwood-lsxl.dtsi"
 
 / {
         model = "Buffalo Linkstation LS-CHLv2";
diff --git a/arch/arm/boot/dts/kirkwood-lsxhl.dts b/arch/arm/boot/dts/kirkwood-lsxhl.dts
index 5c84c118ed8d..8d89cdf8d6bf 100644
--- a/arch/arm/boot/dts/kirkwood-lsxhl.dts
+++ b/arch/arm/boot/dts/kirkwood-lsxhl.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "kirkwood-lsxl.dtsi"
+#include "kirkwood-lsxl.dtsi"
 
 / {
         model = "Buffalo Linkstation LS-XHL";
diff --git a/arch/arm/boot/dts/kirkwood-lsxl.dtsi b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
index 31b17f5b9d28..4e8f9e42c592 100644
--- a/arch/arm/boot/dts/kirkwood-lsxl.dtsi
+++ b/arch/arm/boot/dts/kirkwood-lsxl.dtsi
@@ -1,5 +1,5 @@
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
 
 / {
         chosen {
@@ -207,3 +207,31 @@
                 };
         };
 };
+
+&mdio {
+        status = "okay";
+
+        ethphy0: ethernet-phy@0 {
+                device_type = "ethernet-phy";
+                reg = <0>;
+        };
+
+        ethphy1: ethernet-phy@8 {
+                device_type = "ethernet-phy";
+                reg = <8>;
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
+        };
+};
+
+&eth1 {
+        status = "okay";
+        ethernet1-port@0 {
+                phy-handle = <&ethphy1>;
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-mplcec4.dts b/arch/arm/boot/dts/kirkwood-mplcec4.dts
index 6179333fd71f..ce2b94b513db 100644
--- a/arch/arm/boot/dts/kirkwood-mplcec4.dts
+++ b/arch/arm/boot/dts/kirkwood-mplcec4.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
 
 / {
         model = "MPL CEC4";
@@ -16,6 +16,17 @@
                 bootargs = "console=ttyS0,115200n8 earlyprintk";
         };
 
+        mbus {
+                ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;
+                pcie-controller {
+                        status = "okay";
+
+                        pcie@1,0 {
+                                status = "okay";
+                        };
+                };
+        };
+
         ocp@f1000000 {
                 pinctrl: pinctrl@10000 {
                         pmx_led_health: pmx-led-health {
@@ -134,14 +145,6 @@
                         cd-gpios = <&gpio1 15 1>;
                         /* No WP GPIO */
                 };
-
-                pcie-controller {
-                        status = "okay";
-
-                        pcie@1,0 {
-                                status = "okay";
-                        };
-                };
         };
 
         gpio-leds {
@@ -191,3 +194,30 @@
         };
 };
 
+&mdio {
+        status = "okay";
+
+        ethphy0: ethernet-phy@1 {
+                device_type = "ethernet-phy";
+                reg = <1>;
+        };
+
+        ethphy1: ethernet-phy@2 {
+                device_type = "ethernet-phy";
+                reg = <2>;
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
+        };
+};
+
+&eth1 {
+        status = "okay";
+        ethernet1-port@0 {
+                phy-handle = <&ethphy1>;
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
new file mode 100644
index 000000000000..6317e1d088b3
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-mv88f6281gtw-ge.dts
@@ -0,0 +1,125 @@
+/*
+ * Marvell 88F6281 GTW GE Board
+ *
+ * Lennert Buytenhek <buytenh@marvell.com>
+ * Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ *
+ * This file contains the definitions that are common between the 6281
+ * and 6282 variants of the Marvell Kirkwood Development Board.
+ */
+
+/dts-v1/;
+
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+        model = "Marvell 88F6281 GTW GE Board";
+        compatible = "marvell,mv88f6281gtw-ge", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x20000000>; /* 512 MB */
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,115200n8 earlyprintk";
+        };
+
+        ocp@f1000000 {
+                pinctrl@10000 {
+                        pmx_usb_led: pmx-usb-led {
+                                marvell,pins = "mpp12";
+                                marvell,function = "gpo";
+                        };
+
+                        pmx_leds: pmx-leds {
+                                marvell,pins = "mpp20", "mpp21";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_keys: pmx-keys {
+                                marvell,pins = "mpp46", "mpp47";
+                                marvell,function = "gpio";
+                        };
+                };
+
+                spi@10600 {
+                        pinctrl-0 = <&pmx_spi>;
+                        pinctrl-names = "default";
+                        status = "okay";
+
+                        flash@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                compatible = "mx25l12805d";
+                                reg = <0>;
+                                spi-max-frequency = <50000000>;
+                                mode = <0>;
+                        };
+                };
+
+                serial@12000 {
+                        pinctrl-0 = <&pmx_uart0>;
+                        pinctrl-names = "default";
+                        clock-frequency = <200000000>;
+                        status = "ok";
+                };
+
+                ehci@50000 {
+                        status = "okay";
+                };
+
+                pcie-controller {
+                        status = "okay";
+
+                        pcie@1,0 {
+                                status = "okay";
+                        };
+                };
+        };
+
+        gpio-leds {
+                compatible = "gpio-leds";
+                pinctrl-0 = <&pmx_leds &pmx_usb_led>;
+                pinctrl-names = "default";
+
+                green-status {
+                        label = "gtw:green:Status";
+                        gpios = <&gpio0 20 0>;
+                };
+
+                red-status {
+                        label = "gtw:red:Status";
+                        gpios = <&gpio0 21 0>;
+                };
+
+                green-usb {
+                        label = "gtw:green:USB";
+                        gpios = <&gpio0 12 0>;
+                };
+        };
+
+        gpio_keys {
+                compatible = "gpio-keys";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                pinctrl-0 = <&pmx_keys>;
+                pinctrl-names = "default";
+
+                button@1 {
+                        label = "SWR Button";
+                        linux,code = <0x198>; /* KEY_RESTART */
+                        gpios = <&gpio1 15 1>;
+                };
+                button@2 {
+                        label = "WPS Button";
+                        linux,code = <0x211>; /* KEY_WPS_BUTTON */
+                        gpios = <&gpio1 14 1>;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
index ad6ade7d9191..874857ea9cb8 100644
--- a/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
+++ b/arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6282.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6282.dtsi"
 
 / {
         model = "NETGEAR ReadyNAS Duo v2";
@@ -16,6 +16,17 @@
                 bootargs = "console=ttyS0,115200n8 earlyprintk";
         };
 
+        mbus {
+                ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;
+                pcie-controller {
+                        status = "okay";
+
+                        pcie@1,0 {
+                                status = "okay";
+                        };
+                };
+        };
+
         ocp@f1000000 {
                 pinctrl: pinctrl@10000 {
                         pmx_button_power: pmx-button-power {
@@ -52,6 +63,17 @@
                         };
                 };
 
+                clocks {
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+
+                       g762_clk: fixedclk {
+                                 compatible = "fixed-clock";
+                                 #clock-cells = <0>;
+                                 clock-frequency = <8192>;
+                       };
+                };
+
                 i2c@11000 {
                         status = "okay";
 
@@ -59,6 +81,15 @@
                                 compatible = "ricoh,rs5c372a";
                                 reg = <0x32>;
                         };
+
+                        g762: g762@3e {
+                                compatible = "gmt,g762";
+                                reg = <0x3e>;
+                                clocks = <&g762_clk>; /* input clock */
+                                fan_gear_mode = <0>;
+                                fan_startv = <1>;
+                                pwm_polarity = <0>;
+                        };
                 };
 
                 serial@12000 {
@@ -101,14 +132,6 @@
                         status = "okay";
                         nr-ports = <2>;
                 };
-
-                pcie-controller {
-                        status = "okay";
-
-                        pcie@1,0 {
-                                status = "okay";
-                        };
-                };
         };
 
         gpio-leds {
@@ -184,3 +207,19 @@
                 };
         };
 };
+
+&mdio {
+        status = "okay";
+
+        ethphy0: ethernet-phy@0 {
+                device_type = "ethernet-phy";
+                reg = <0>;
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
index 2afac0405816..2fcb82e20828 100644
--- a/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ns2-common.dtsi
@@ -1,5 +1,5 @@
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
 
 / {
         chosen {
@@ -84,3 +84,19 @@
         };
 
 };
+
+&mdio {
+        status = "okay";
+
+        ethphy0: ethernet-phy {
+                device_type = "ethernet-phy";
+                /* overwrite reg property in board file */
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-ns2.dts b/arch/arm/boot/dts/kirkwood-ns2.dts
index b50e93d7796c..53368d1022cc 100644
--- a/arch/arm/boot/dts/kirkwood-ns2.dts
+++ b/arch/arm/boot/dts/kirkwood-ns2.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "kirkwood-ns2-common.dtsi"
+#include "kirkwood-ns2-common.dtsi"
 
 / {
         model = "LaCie Network Space v2";
@@ -30,3 +30,5 @@
                 };
         };
 };
+
+&ethphy0 { reg = <8>; };
diff --git a/arch/arm/boot/dts/kirkwood-ns2lite.dts b/arch/arm/boot/dts/kirkwood-ns2lite.dts
index af8259fe8955..279607093cdb 100644
--- a/arch/arm/boot/dts/kirkwood-ns2lite.dts
+++ b/arch/arm/boot/dts/kirkwood-ns2lite.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "kirkwood-ns2-common.dtsi"
+#include "kirkwood-ns2-common.dtsi"
 
 / {
         model = "LaCie Network Space Lite v2";
@@ -30,3 +30,5 @@
                 };
         };
 };
+
+&ethphy0 { reg = <0>; };
diff --git a/arch/arm/boot/dts/kirkwood-ns2max.dts b/arch/arm/boot/dts/kirkwood-ns2max.dts
index 85f24d227e17..defdc77fb550 100644
--- a/arch/arm/boot/dts/kirkwood-ns2max.dts
+++ b/arch/arm/boot/dts/kirkwood-ns2max.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "kirkwood-ns2-common.dtsi"
+#include "kirkwood-ns2-common.dtsi"
 
 / {
         model = "LaCie Network Space Max v2";
@@ -49,3 +49,5 @@
                 };
         };
 };
+
+&ethphy0 { reg = <8>; };
diff --git a/arch/arm/boot/dts/kirkwood-ns2mini.dts b/arch/arm/boot/dts/kirkwood-ns2mini.dts
index 329e530bffe7..adbafdd90991 100644
--- a/arch/arm/boot/dts/kirkwood-ns2mini.dts
+++ b/arch/arm/boot/dts/kirkwood-ns2mini.dts
@@ -1,6 +1,6 @@
 /dts-v1/;
 
-/include/ "kirkwood-ns2-common.dtsi"
+#include "kirkwood-ns2-common.dtsi"
 
 / {
         /* This machine is embedded in the first LaCie CloudBox product. */
@@ -50,3 +50,5 @@
                 };
         };
 };
+
+&ethphy0 { reg = <0>; };
diff --git a/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi b/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi
new file mode 100644
index 000000000000..06267a91de38
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-nsa310-common.dtsi
@@ -0,0 +1,107 @@
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+
+/ {
+        model = "ZyXEL NSA310";
+
+        ocp@f1000000 {
+                pinctrl: pinctrl@10000 {
+
+                        pmx_usb_power_off: pmx-usb-power-off {
+                                marvell,pins = "mpp21";
+                                marvell,function = "gpio";
+                        };
+                        pmx_pwr_off: pmx-pwr-off {
+                                marvell,pins = "mpp48";
+                                marvell,function = "gpio";
+                        };
+
+                };
+
+                serial@12000 {
+                        status = "ok";
+                };
+
+                sata@80000 {
+                        status = "okay";
+                        nr-ports = <2>;
+                };
+
+                nand@3000000 {
+                        status = "okay";
+                        chip-delay = <35>;
+
+                        partition@0 {
+                                label = "uboot";
+                                reg = <0x0000000 0x0100000>;
+                                read-only;
+                        };
+                        partition@100000 {
+                                label = "uboot_env";
+                                reg = <0x0100000 0x0080000>;
+                        };
+                        partition@180000 {
+                                label = "key_store";
+                                reg = <0x0180000 0x0080000>;
+                        };
+                        partition@200000 {
+                                label = "info";
+                                reg = <0x0200000 0x0080000>;
+                        };
+                        partition@280000 {
+                                label = "etc";
+                                reg = <0x0280000 0x0a00000>;
+                        };
+                        partition@c80000 {
+                                label = "kernel_1";
+                                reg = <0x0c80000 0x0a00000>;
+                        };
+                        partition@1680000 {
+                                label = "rootfs1";
+                                reg = <0x1680000 0x2fc0000>;
+                        };
+                        partition@4640000 {
+                                label = "kernel_2";
+                                reg = <0x4640000 0x0a00000>;
+                        };
+                        partition@5040000 {
+                                label = "rootfs2";
+                                reg = <0x5040000 0x2fc0000>;
+                        };
+                };
+
+                pcie-controller {
+                        status = "okay";
+
+                        pcie@1,0 {
+                                status = "okay";
+                        };
+                };
+        };
+
+        gpio_poweroff {
+                compatible = "gpio-poweroff";
+                pinctrl-0 = <&pmx_pwr_off>;
+                pinctrl-names = "default";
+                gpios = <&gpio1 16 0>;
+        };
+
+        regulators {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <0>;
+                pinctrl-0 = <&pmx_usb_power_off>;
+                pinctrl-names = "default";
+
+                usb0_power_off: regulator@1 {
+                        compatible = "regulator-fixed";
+                        reg = <1>;
+                        regulator-name = "USB Power Off";
+                        regulator-min-microvolt = <5000000>;
+                        regulator-max-microvolt = <5000000>;
+                        regulator-always-on;
+                        regulator-boot-on;
+                        gpio = <&gpio0 21 0>;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-nsa310.dts b/arch/arm/boot/dts/kirkwood-nsa310.dts
index 69003598f5fa..7aeae0c2c1f4 100644
--- a/arch/arm/boot/dts/kirkwood-nsa310.dts
+++ b/arch/arm/boot/dts/kirkwood-nsa310.dts
@@ -1,10 +1,8 @@
 /dts-v1/;
 
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood-nsa310-common.dtsi"
 
 / {
-        model = "ZyXEL NSA310";
         compatible = "zyxel,nsa310", "marvell,kirkwood-88f6281", "marvell,kirkwood";
 
         memory {
@@ -16,6 +14,17 @@
                 bootargs = "console=ttyS0,115200";
         };
 
+        mbus {
+                ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;
+                pcie-controller {
+                        status = "okay";
+
+                        pcie@1,0 {
+                                status = "okay";
+                        };
+                };
+        };
+
         ocp@f1000000 {
                 pinctrl: pinctrl@10000 {
                         pinctrl-0 = <&pmx_unknown>;
@@ -41,11 +50,6 @@
                                 marvell,function = "gpio";
                         };
 
-                        pmx_usb_power_off: pmx-usb-power-off {
-                                marvell,pins = "mpp21";
-                                marvell,function = "gpio";
-                        };
-
                         pmx_led_sys_green: pmx-led-sys-green {
                                 marvell,pins = "mpp28";
                                 marvell,function = "gpio";
@@ -95,20 +99,6 @@
                                 marvell,pins = "mpp46";
                                 marvell,function = "gpio";
                         };
-
-                        pmx_pwr_off: pmx-pwr-off {
-                                marvell,pins = "mpp48";
-                                marvell,function = "gpio";
-                        };
-                };
-
-                serial@12000 {
-                        status = "ok";
-                };
-
-                sata@80000 {
-                        status = "okay";
-                        nr-ports = <2>;
                 };
 
                 i2c@11000 {
@@ -119,57 +109,6 @@
                                 reg = <0x2e>;
                         };
                 };
-
-                nand@3000000 {
-                        status = "okay";
-                        chip-delay = <35>;
-
-                        partition@0 {
-                                label = "uboot";
-                                reg = <0x0000000 0x0100000>;
-                                read-only;
-                        };
-                        partition@100000 {
-                                label = "uboot_env";
-                                reg = <0x0100000 0x0080000>;
-                        };
-                        partition@180000 {
-                                label = "key_store";
-                                reg = <0x0180000 0x0080000>;
-                        };
-                        partition@200000 {
-                                label = "info";
-                                reg = <0x0200000 0x0080000>;
-                        };
-                        partition@280000 {
-                                label = "etc";
-                                reg = <0x0280000 0x0a00000>;
-                        };
-                        partition@c80000 {
-                                label = "kernel_1";
-                                reg = <0x0c80000 0x0a00000>;
-                        };
-                        partition@1680000 {
-                                label = "rootfs1";
-                                reg = <0x1680000 0x2fc0000>;
-                        };
-                        partition@4640000 {
-                                label = "kernel_2";
-                                reg = <0x4640000 0x0a00000>;
-                        };
-                        partition@5040000 {
-                                label = "rootfs2";
-                                reg = <0x5040000 0x2fc0000>;
-                        };
-                };
-
-                pcie-controller {
-                        status = "okay";
-
-                        pcie@1,0 {
-                                status = "okay";
-                        };
-                };
         };
 
         gpio_keys {
@@ -246,30 +185,4 @@
                         gpios = <&gpio1 8 0>;
                 };
         };
-
-        gpio_poweroff {
-                compatible = "gpio-poweroff";
-                pinctrl-0 = <&pmx_pwr_off>;
-                pinctrl-names = "default";
-                gpios = <&gpio1 16 0>;
-        };
-
-        regulators {
-                compatible = "simple-bus";
-                #address-cells = <1>;
-                #size-cells = <0>;
-                pinctrl-0 = <&pmx_usb_power_off>;
-                pinctrl-names = "default";
-
-                usb0_power_off: regulator@1 {
-                        compatible = "regulator-fixed";
-                        reg = <1>;
-                        regulator-name = "USB Power Off";
-                        regulator-min-microvolt = <5000000>;
-                        regulator-max-microvolt = <5000000>;
-                        regulator-always-on;
-                        regulator-boot-on;
-                        gpio = <&gpio0 21 0>;
-                };
-        };
 };
diff --git a/arch/arm/boot/dts/kirkwood-nsa310a.dts b/arch/arm/boot/dts/kirkwood-nsa310a.dts
new file mode 100644
index 000000000000..ab0212b0e6f5
--- /dev/null
+++ b/arch/arm/boot/dts/kirkwood-nsa310a.dts
@@ -0,0 +1,165 @@
+/dts-v1/;
+
+#include "kirkwood-nsa310-common.dtsi"
+
+/*
+ * There are at least two different NSA310 designs. This variant does
+ * not have the red USB Led.
+ */
+
+/ {
+        compatible = "zyxel,nsa310a", "zyxel,nsa310", "marvell,kirkwood-88f6281", "marvell,kirkwood";
+
+        memory {
+                device_type = "memory";
+                reg = <0x00000000 0x10000000>;
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,115200";
+        };
+
+        ocp@f1000000 {
+                pinctrl: pinctrl@10000 {
+                        pinctrl-names = "default";
+
+                        pmx_led_esata_green: pmx-led-esata-green {
+                                marvell,pins = "mpp12";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_led_esata_red: pmx-led-esata-red {
+                                marvell,pins = "mpp13";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_led_usb_green: pmx-led-usb-green {
+                                marvell,pins = "mpp15";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_usb_power_off: pmx-usb-power-off {
+                                marvell,pins = "mpp21";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_led_sys_green: pmx-led-sys-green {
+                                marvell,pins = "mpp28";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_led_sys_red: pmx-led-sys-red {
+                                marvell,pins = "mpp29";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_btn_reset: pmx-btn-reset {
+                                marvell,pins = "mpp36";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_btn_copy: pmx-btn-copy {
+                                marvell,pins = "mpp37";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_led_copy_green: pmx-led-copy-green {
+                                marvell,pins = "mpp39";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_led_copy_red: pmx-led-copy-red {
+                                marvell,pins = "mpp40";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_led_hdd_green: pmx-led-hdd-green {
+                                marvell,pins = "mpp41";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_led_hdd_red: pmx-led-hdd-red {
+                                marvell,pins = "mpp42";
+                                marvell,function = "gpio";
+                        };
+
+                        pmx_btn_power: pmx-btn-power {
+                                marvell,pins = "mpp46";
+                                marvell,function = "gpio";
+                        };
+
+                };
+
+                i2c@11000 {
+                        status = "okay";
+
+                        lm85: lm85@2e {
+                                compatible = "lm85";
+                                reg = <0x2e>;
+                        };
+                };
+        };
+
+        gpio_keys {
+                compatible = "gpio-keys";
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                button@1 {
+                        label = "Power Button";
+                        linux,code = <116>;
+                        gpios = <&gpio1 14 0>;
+                };
+                button@2 {
+                        label = "Copy Button";
+                        linux,code = <133>;
+                        gpios = <&gpio1 5 1>;
+                };
+                button@3 {
+                        label = "Reset Button";
+                        linux,code = <0x198>;
+                        gpios = <&gpio1 4 1>;
+                };
+        };
+
+        gpio-leds {
+                compatible = "gpio-leds";
+
+                green-sys {
+                        label = "nsa310:green:sys";
+                        gpios = <&gpio0 28 0>;
+                };
+                red-sys {
+                        label = "nsa310:red:sys";
+                        gpios = <&gpio0 29 0>;
+                };
+                green-hdd {
+                        label = "nsa310:green:hdd";
+                        gpios = <&gpio1 9 0>;
+                };
+                red-hdd {
+                        label = "nsa310:red:hdd";
+                        gpios = <&gpio1 10 0>;
+                };
+                green-esata {
+                        label = "nsa310:green:esata";
+                        gpios = <&gpio0 12 0>;
+                };
+                red-esata {
+                        label = "nsa310:red:esata";
+                        gpios = <&gpio0 13 0>;
+                };
+                green-usb {
+                        label = "nsa310:green:usb";
+                        gpios = <&gpio0 15 0>;
+                };
+                green-copy {
+                        label = "nsa310:green:copy";
+                        gpios = <&gpio1 7 0>;
+                };
+                red-copy {
+                        label = "nsa310:red:copy";
+                        gpios = <&gpio1 8 0>;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
index 38dc8517d777..85ccf8d8abb1 100644
--- a/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
+++ b/arch/arm/boot/dts/kirkwood-openblocks_a6.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6282.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6282.dtsi"
 
 / {
         model = "Plat'Home OpenBlocksA6";
@@ -166,3 +166,19 @@
                 };
         };
 };
+
+&mdio {
+        status = "okay";
+
+        ethphy0: ethernet-phy@0 {
+                device_type = "ethernet-phy";
+                reg = <0>;
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
index f7143f128504..5696b630b70b 100644
--- a/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug-common.dtsi
@@ -6,8 +6,8 @@
  * Licensed under GPLv2
  */
 
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
 
 / {
         memory {
@@ -91,3 +91,19 @@
                 };
         };
 };
+
+&mdio {
+        status = "okay";
+
+        ethphy0: ethernet-phy@0 {
+                device_type = "ethernet-phy";
+                reg = <0>;
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts b/arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts
index f620ce48de97..eac6a21f3b1f 100644
--- a/arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug-esata.dts
@@ -8,7 +8,7 @@
 
 /dts-v1/;
 
-/include/ "kirkwood-sheevaplug-common.dtsi"
+#include "kirkwood-sheevaplug-common.dtsi"
 
 / {
         model = "Globalscale Technologies eSATA SheevaPlug";
diff --git a/arch/arm/boot/dts/kirkwood-sheevaplug.dts b/arch/arm/boot/dts/kirkwood-sheevaplug.dts
index bf1dff251432..bb61918313db 100644
--- a/arch/arm/boot/dts/kirkwood-sheevaplug.dts
+++ b/arch/arm/boot/dts/kirkwood-sheevaplug.dts
@@ -8,7 +8,7 @@
 
 /dts-v1/;
 
-/include/ "kirkwood-sheevaplug-common.dtsi"
+#include "kirkwood-sheevaplug-common.dtsi"
 
 / {
         model = "Globalscale Technologies SheevaPlug";
diff --git a/arch/arm/boot/dts/kirkwood-topkick.dts b/arch/arm/boot/dts/kirkwood-topkick.dts
index f2052d7bc10f..30842b4ff293 100644
--- a/arch/arm/boot/dts/kirkwood-topkick.dts
+++ b/arch/arm/boot/dts/kirkwood-topkick.dts
@@ -1,7 +1,7 @@
 /dts-v1/;
 
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6282.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6282.dtsi"
 
 / {
         model = "Univeral Scientific Industrial Co. Topkick-1281P2";
@@ -203,3 +203,19 @@
                 };
         };
 };
+
+&mdio {
+        status = "okay";
+
+        ethphy0: ethernet-phy@0 {
+                device_type = "ethernet-phy";
+                reg = <0>;
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
+        };
+};
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6281.dts b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
index 6dd1038e4de4..f755bc1dc604 100644
--- a/arch/arm/boot/dts/kirkwood-ts219-6281.dts
+++ b/arch/arm/boot/dts/kirkwood-ts219-6281.dts
@@ -1,8 +1,8 @@
 /dts-v1/;
 
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6281.dtsi"
-/include/ "kirkwood-ts219.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6281.dtsi"
+#include "kirkwood-ts219.dtsi"
 
 / {
         ocp@f1000000 {
@@ -50,4 +50,6 @@
                         gpios = <&gpio0 16 1>;
                 };
         };
-};
\ No newline at end of file
+};
+
+&ethphy0 { reg = <8>; };
diff --git a/arch/arm/boot/dts/kirkwood-ts219-6282.dts b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
index 6fdc5ffcaae5..9efcd2dc79d3 100644
--- a/arch/arm/boot/dts/kirkwood-ts219-6282.dts
+++ b/arch/arm/boot/dts/kirkwood-ts219-6282.dts
@@ -1,10 +1,21 @@
 /dts-v1/;
 
-/include/ "kirkwood.dtsi"
-/include/ "kirkwood-6282.dtsi"
-/include/ "kirkwood-ts219.dtsi"
+#include "kirkwood.dtsi"
+#include "kirkwood-6282.dtsi"
+#include "kirkwood-ts219.dtsi"
 
 / {
+        mbus {
+                ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;
+                pcie-controller {
+                        status = "okay";
+
+                        pcie@2,0 {
+                                status = "okay";
+                        };
+                };
+        };
+
         ocp@f1000000 {
                 pinctrl: pinctrl@10000 {
 
@@ -30,14 +41,6 @@
                                 marvell,function = "gpio";
                         };
                 };
-                pcie-controller {
-                        status = "okay";
-
-                        pcie@2,0 {
-                                status = "okay";
-                        };
-                };
-
         };
 
         gpio_keys {
@@ -58,4 +61,6 @@
                         gpios = <&gpio1 5 1>;
                 };
         };
-};
\ No newline at end of file
+};
+
+&ethphy0 { reg = <0>; };
diff --git a/arch/arm/boot/dts/kirkwood-ts219.dtsi b/arch/arm/boot/dts/kirkwood-ts219.dtsi
index 0c9a94cd666c..39158cf16258 100644
--- a/arch/arm/boot/dts/kirkwood-ts219.dtsi
+++ b/arch/arm/boot/dts/kirkwood-ts219.dtsi
@@ -11,6 +11,16 @@
                 bootargs = "console=ttyS0,115200n8";
         };
 
+        mbus {
+                pcie-controller {
+                        status = "okay";
+
+                        pcie@1,0 {
+                                status = "okay";
+                        };
+                };
+        };
+
         ocp@f1000000 {
                 i2c@11000 {
                         status = "okay";
@@ -87,12 +97,21 @@
                         status = "okay";
                         nr-ports = <2>;
                 };
-                pcie-controller {
-                        status = "okay";
+        };
+};
 
-                        pcie@1,0 {
-                                status = "okay";
-                        };
-                };
+&mdio {
+        status = "okay";
+
+        ethphy0: ethernet-phy {
+                device_type = "ethernet-phy";
+                /* overwrite reg property in board file */
+        };
+};
+
+&eth0 {
+        status = "okay";
+        ethernet0-port@0 {
+                phy-handle = <&ethphy0>;
         };
 };
diff --git a/arch/arm/boot/dts/kirkwood.dtsi b/arch/arm/boot/dts/kirkwood.dtsi
index 9809fc1f105c..cf7aeaf89e9c 100644
--- a/arch/arm/boot/dts/kirkwood.dtsi
+++ b/arch/arm/boot/dts/kirkwood.dtsi
@@ -1,5 +1,7 @@
 /include/ "skeleton.dtsi"
 
+#define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))
+
 / {
         compatible = "marvell,kirkwood";
         interrupt-parent = <&intc>;
@@ -20,23 +22,53 @@
                gpio0 = &gpio0;
                gpio1 = &gpio1;
         };
-        intc: interrupt-controller {
-                compatible = "marvell,orion-intc", "marvell,intc";
-                interrupt-controller;
-                #interrupt-cells = <1>;
-                reg = <0xf1020204 0x04>,
-                      <0xf1020214 0x04>;
+
+        mbus {
+                compatible = "marvell,kirkwood-mbus", "simple-bus";
+                #address-cells = <2>;
+                #size-cells = <1>;
+                controller = <&mbusc>;
+                pcie-mem-aperture = <0xe0000000 0x10000000>; /* 256 MiB memory space */
+                pcie-io-aperture  = <0xf2000000 0x100000>;   /*   1 MiB    I/O space */
         };
 
         ocp@f1000000 {
                 compatible = "simple-bus";
                 ranges = <0x00000000 0xf1000000 0x0100000
-                          0xe0000000 0xe0000000 0x8100000 /* PCIE */
                           0xf4000000 0xf4000000 0x0000400
                           0xf5000000 0xf5000000 0x0000400>;
                 #address-cells = <1>;
                 #size-cells = <1>;
 
+                mbusc: mbus-controller@20000 {
+                        compatible = "marvell,mbus-controller";
+                        reg = <0x20000 0x80>, <0x1500 0x20>;
+                };
+
+                timer: timer@20300 {
+                        compatible = "marvell,orion-timer";
+                        reg = <0x20300 0x20>;
+                        interrupt-parent = <&bridge_intc>;
+                        interrupts = <1>, <2>;
+                        clocks = <&core_clk 0>;
+                };
+
+                intc: main-interrupt-ctrl@20200 {
+                        compatible = "marvell,orion-intc";
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+                        reg = <0x20200 0x10>, <0x20210 0x10>;
+                };
+
+                bridge_intc: bridge-interrupt-ctrl@20110 {
+                        compatible = "marvell,orion-bridge-intc";
+                        interrupt-controller;
+                        #interrupt-cells = <1>;
+                        reg = <0x20110 0x8>;
+                        interrupts = <1>;
+                        marvell,#interrupts = <6>;
+                };
+
                 core_clk: core-clocks@10030 {
                         compatible = "marvell,kirkwood-core-clock";
                         reg = <0x10030 0x4>;
@@ -103,9 +135,11 @@
                         #clock-cells = <1>;
                 };
 
-                wdt@20300 {
+                wdt: watchdog-timer@20300 {
                         compatible = "marvell,orion-wdt";
                         reg = <0x20300 0x28>;
+                        interrupt-parent = <&bridge_intc>;
+                        interrupts = <3>;
                         clocks = <&gate_clk 7>;
                         status = "okay";
                 };
@@ -192,5 +226,57 @@
                         clocks = <&gate_clk 17>;
                         status = "okay";
                 };
+
+                mdio: mdio-bus@72004 {
+                        compatible = "marvell,orion-mdio";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0x72004 0x84>;
+                        interrupts = <46>;
+                        clocks = <&gate_clk 0>;
+                        status = "disabled";
+
+                        /* add phy nodes in board file */
+                };
+
+                eth0: ethernet-controller@72000 {
+                        compatible = "marvell,kirkwood-eth";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0x72000 0x4000>;
+                        clocks = <&gate_clk 0>;
+                        marvell,tx-checksum-limit = <1600>;
+                        status = "disabled";
+
+                        ethernet0-port@0 {
+                                device_type = "network";
+                                compatible = "marvell,kirkwood-eth-port";
+                                reg = <0>;
+                                interrupts = <11>;
+                                /* overwrite MAC address in bootloader */
+                                local-mac-address = [00 00 00 00 00 00];
+                                /* set phy-handle property in board file */
+                        };
+                };
+
+                eth1: ethernet-controller@76000 {
+                        compatible = "marvell,kirkwood-eth";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0x76000 0x4000>;
+                        clocks = <&gate_clk 19>;
+                        marvell,tx-checksum-limit = <1600>;
+                        status = "disabled";
+
+                        ethernet1-port@0 {
+                                device_type = "network";
+                                compatible = "marvell,kirkwood-eth-port";
+                                reg = <0>;
+                                interrupts = <15>;
+                                /* overwrite MAC address in bootloader */
+                                local-mac-address = [00 00 00 00 00 00];
+                                /* set phy-handle property in board file */
+                        };
+                };
         };
 };
diff --git a/arch/arm/boot/dts/msm8660-surf.dts b/arch/arm/boot/dts/msm8660-surf.dts
index cdc010e0f93e..386d42870215 100644
--- a/arch/arm/boot/dts/msm8660-surf.dts
+++ b/arch/arm/boot/dts/msm8660-surf.dts
@@ -38,7 +38,7 @@
         };
 
         serial@19c40000 {
-                compatible = "qcom,msm-hsuart", "qcom,msm-uart";
+                compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
                 reg = <0x19c40000 0x1000>,
                       <0x19c00000 0x1000>;
                 interrupts = <0 195 0x0>;
diff --git a/arch/arm/boot/dts/msm8960-cdp.dts b/arch/arm/boot/dts/msm8960-cdp.dts
index 9c1167b0459b..93e9f7e0b7ad 100644
--- a/arch/arm/boot/dts/msm8960-cdp.dts
+++ b/arch/arm/boot/dts/msm8960-cdp.dts
@@ -38,7 +38,7 @@
         };
 
         serial@16440000 {
-                compatible = "qcom,msm-hsuart", "qcom,msm-uart";
+                compatible = "qcom,msm-uartdm-v1.3", "qcom,msm-uartdm";
                 reg = <0x16440000 0x1000>,
                       <0x16400000 0x1000>;
                 interrupts = <0 154 0x0>;
diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts
index afdb16417d4e..0c514dc8460c 100644
--- a/arch/arm/boot/dts/omap3-beagle-xm.dts
+++ b/arch/arm/boot/dts/omap3-beagle-xm.dts
@@ -11,7 +11,7 @@
 
 / {
         model = "TI OMAP3 BeagleBoard xM";
-        compatible = "ti,omap3-beagle-xm, ti,omap3-beagle", "ti,omap3";
+        compatible = "ti,omap3-beagle-xm", "ti,omap3-beagle", "ti,omap3";
 
         cpus {
                 cpu@0 {
diff --git a/arch/arm/boot/dts/omap3-igep.dtsi b/arch/arm/boot/dts/omap3-igep.dtsi
index bc48b114eae6..2326d11462a5 100644
--- a/arch/arm/boot/dts/omap3-igep.dtsi
+++ b/arch/arm/boot/dts/omap3-igep.dtsi
@@ -48,6 +48,15 @@
                 >;
         };
 
+        mcbsp2_pins: pinmux_mcbsp2_pins {
+                pinctrl-single,pins = <
+                        0x10c (PIN_INPUT | MUX_MODE0)           /* mcbsp2_fsx.mcbsp2_fsx */
+                        0x10e (PIN_INPUT | MUX_MODE0)           /* mcbsp2_clkx.mcbsp2_clkx */
+                        0x110 (PIN_INPUT | MUX_MODE0)           /* mcbsp2_dr.mcbsp2.dr */
+                        0x112 (PIN_OUTPUT | MUX_MODE0)          /* mcbsp2_dx.mcbsp2_dx */
+                >;
+        };
+
         mmc1_pins: pinmux_mmc1_pins {
                 pinctrl-single,pins = <
                         0x114 (PIN_INPUT_PULLUP | MUX_MODE0)    /* sdmmc1_clk.sdmmc1_clk */
@@ -93,6 +102,11 @@
         clock-frequency = <400000>;
 };
 
+&mcbsp2 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&mcbsp2_pins>;
+};
+
 &mmc1 {
       pinctrl-names = "default";
       pinctrl-0 = <&mmc1_pins>;
diff --git a/arch/arm/boot/dts/omap4-panda-common.dtsi b/arch/arm/boot/dts/omap4-panda-common.dtsi
index faa95b5b242e..814ab67c8c29 100644
--- a/arch/arm/boot/dts/omap4-panda-common.dtsi
+++ b/arch/arm/boot/dts/omap4-panda-common.dtsi
@@ -107,6 +107,19 @@
          */
                 clock-frequency = <19200000>;
         };
+
+        /* regulator for wl12xx on sdio5 */
+        wl12xx_vmmc: wl12xx_vmmc {
+                pinctrl-names = "default";
+                pinctrl-0 = <&wl12xx_gpio>;
+                compatible = "regulator-fixed";
+                regulator-name = "vwl1271";
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <1800000>;
+                gpio = <&gpio2 11 0>;
+                startup-delay-us = <70000>;
+                enable-active-high;
+        };
 };
 
 &omap4_pmx_wkup {
@@ -235,6 +248,33 @@
                         0x1c (PIN_OUTPUT | MUX_MODE3)   /* gpio_wk8 */
                 >;
         };
+
+        /*
+         * wl12xx GPIO outputs for WLAN_EN, BT_EN, FM_EN, BT_WAKEUP
+         * REVISIT: Are the pull-ups needed for GPIO 48 and 49?
+         */
+        wl12xx_gpio: pinmux_wl12xx_gpio {
+                pinctrl-single,pins = <
+                        0x26 (PIN_OUTPUT | MUX_MODE3)           /* gpmc_a19.gpio_43 */
+                        0x2c (PIN_OUTPUT | MUX_MODE3)           /* gpmc_a22.gpio_46 */
+                        0x30 (PIN_OUTPUT_PULLUP | MUX_MODE3)    /* gpmc_a24.gpio_48 */
+                        0x32 (PIN_OUTPUT_PULLUP | MUX_MODE3)    /* gpmc_a25.gpio_49 */
+                >;
+        };
+
+        /* wl12xx GPIO inputs and SDIO pins */
+        wl12xx_pins: pinmux_wl12xx_pins {
+                pinctrl-single,pins = <
+                        0x38 (PIN_INPUT | MUX_MODE3)            /* gpmc_ncs2.gpio_52 */
+                        0x3a (PIN_INPUT | MUX_MODE3)            /* gpmc_ncs3.gpio_53 */
+                        0x108 (PIN_OUTPUT | MUX_MODE0)          /* sdmmc5_clk.sdmmc5_clk */
+                        0x10a (PIN_INPUT_PULLUP | MUX_MODE0)    /* sdmmc5_cmd.sdmmc5_cmd */
+                        0x10c (PIN_INPUT_PULLUP | MUX_MODE0)    /* sdmmc5_dat0.sdmmc5_dat0 */
+                        0x10e (PIN_INPUT_PULLUP | MUX_MODE0)    /* sdmmc5_dat1.sdmmc5_dat1 */
+                        0x110 (PIN_INPUT_PULLUP | MUX_MODE0)    /* sdmmc5_dat2.sdmmc5_dat2 */
+                        0x112 (PIN_INPUT_PULLUP | MUX_MODE0)    /* sdmmc5_dat3.sdmmc5_dat3 */
+                >;
+        };
 };
 
 &i2c1 {
@@ -314,8 +354,12 @@
 };
 
 &mmc5 {
-        ti,non-removable;
+        pinctrl-names = "default";
+        pinctrl-0 = <&wl12xx_pins>;
+        vmmc-supply = <&wl12xx_vmmc>;
+        non-removable;
         bus-width = <4>;
+        cap-power-off-card;
 };
 
 &emif1 {
diff --git a/arch/arm/boot/dts/omap4-sdp.dts b/arch/arm/boot/dts/omap4-sdp.dts
index 7951b4ea500a..4f78380ecdb8 100644
--- a/arch/arm/boot/dts/omap4-sdp.dts
+++ b/arch/arm/boot/dts/omap4-sdp.dts
@@ -140,6 +140,19 @@
                         "DMic", "Digital Mic",
                         "Digital Mic", "Digital Mic1 Bias";
         };
+
+        /* regulator for wl12xx on sdio5 */
+        wl12xx_vmmc: wl12xx_vmmc {
+                pinctrl-names = "default";
+                pinctrl-0 = <&wl12xx_gpio>;
+                compatible = "regulator-fixed";
+                regulator-name = "vwl1271";
+                regulator-min-microvolt = <1800000>;
+                regulator-max-microvolt = <1800000>;
+                gpio = <&gpio2 22 0>;
+                startup-delay-us = <70000>;
+                enable-active-high;
+        };
 };
 
 &omap4_pmx_wkup {
@@ -295,6 +308,26 @@
                         0xf0 (PIN_INPUT_PULLUP | MUX_MODE0)     /* i2c4_sda */
                 >;
         };
+
+        /* wl12xx GPIO output for WLAN_EN */
+        wl12xx_gpio: pinmux_wl12xx_gpio {
+                pinctrl-single,pins = <
+                        0x3c (PIN_OUTPUT | MUX_MODE3)           /* gpmc_nwp.gpio_54 */
+                >;
+        };
+
+        /* wl12xx GPIO inputs and SDIO pins */
+        wl12xx_pins: pinmux_wl12xx_pins {
+                pinctrl-single,pins = <
+                        0x3a (PIN_INPUT | MUX_MODE3)            /* gpmc_ncs3.gpio_53 */
+                        0x108 (PIN_OUTPUT | MUX_MODE3)          /* sdmmc5_clk.sdmmc5_clk */
+                        0x10a (PIN_INPUT_PULLUP | MUX_MODE3)    /* sdmmc5_cmd.sdmmc5_cmd */
+                        0x10c (PIN_INPUT_PULLUP | MUX_MODE3)    /* sdmmc5_dat0.sdmmc5_dat0 */
+                        0x10e (PIN_INPUT_PULLUP | MUX_MODE3)    /* sdmmc5_dat1.sdmmc5_dat1 */
+                        0x110 (PIN_INPUT_PULLUP | MUX_MODE3)    /* sdmmc5_dat2.sdmmc5_dat2 */
+                        0x112 (PIN_INPUT_PULLUP | MUX_MODE3)    /* sdmmc5_dat3.sdmmc5_dat3 */
+                >;
+        };
 };
 
 &i2c1 {
@@ -420,8 +453,12 @@
 };
 
 &mmc5 {
+        pinctrl-names = "default";
+        pinctrl-0 = <&wl12xx_pins>;
+        vmmc-supply = <&wl12xx_vmmc>;
+        non-removable;
         bus-width = <4>;
-        ti,non-removable;
+        cap-power-off-card;
 };
 
 &emif1 {
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index e643620417a9..7cdea1bfea09 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -637,25 +637,26 @@
                 omap_dwc3@4a020000 {
                         compatible = "ti,dwc3";
                         ti,hwmods = "usb_otg_ss";
-                        reg = <0x4a020000 0x1000>;
+                        reg = <0x4a020000 0x10000>;
                         interrupts = <GIC_SPI 93 IRQ_TYPE_LEVEL_HIGH>;
                         #address-cells = <1>;
                         #size-cells = <1>;
                         utmi-mode = <2>;
                         ranges;
                         dwc3@4a030000 {
-                                compatible = "synopsys,dwc3";
-                                reg = <0x4a030000 0x1000>;
+                                compatible = "snps,dwc3";
+                                reg = <0x4a030000 0x10000>;
                                 interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
                                 usb-phy = <&usb2_phy>, <&usb3_phy>;
                                 tx-fifo-resize;
                         };
                 };
 
-                ocp2scp {
+                ocp2scp@4a080000 {
                         compatible = "ti,omap-ocp2scp";
                         #address-cells = <1>;
                         #size-cells = <1>;
+                        reg = <0x4a080000 0x20>;
                         ranges;
                         ti,hwmods = "ocp2scp1";
                         usb2_phy: usb2phy@4a084000 {
diff --git a/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts b/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
index 0077fc8510b7..aed83deaa991 100644
--- a/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
+++ b/arch/arm/boot/dts/orion5x-lacie-ethernet-disk-mini-v2.dts
@@ -53,3 +53,20 @@
                 };
         };
 };
+
+&mdio {
+        status = "okay";
+
+        ethphy: ethernet-phy {
+                device-type = "ethernet-phy";
+                reg = <8>;
+        };
+};
+
+&eth {
+        status = "okay";
+
+        ethernet-port@0 {
+                phy-handle = <&ethphy>;
+        };
+};
diff --git a/arch/arm/boot/dts/orion5x.dtsi b/arch/arm/boot/dts/orion5x.dtsi
index 892c64e3f1e1..e06c37e91ac6 100644
--- a/arch/arm/boot/dts/orion5x.dtsi
+++ b/arch/arm/boot/dts/orion5x.dtsi
@@ -16,11 +16,12 @@
         aliases {
                 gpio0 = &gpio0;
         };
+
         intc: interrupt-controller {
-                compatible = "marvell,orion-intc", "marvell,intc";
+                compatible = "marvell,orion-intc";
                 interrupt-controller;
                 #interrupt-cells = <1>;
-                reg = <0xf1020204 0x04>;
+                reg = <0xf1020200 0x08>;
         };
 
         ocp@f1000000 {
@@ -132,5 +133,34 @@
                         interrupts = <28>;
                         status = "okay";
                 };
+
+                mdio: mdio-bus@72004 {
+                        compatible = "marvell,orion-mdio";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0x72004 0x84>;
+                        interrupts = <22>;
+                        status = "disabled";
+
+                        /* add phy nodes in board file */
+                };
+
+                eth: ethernet-controller@72000 {
+                        compatible = "marvell,orion-eth";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0x72000 0x4000>;
+                        marvell,tx-checksum-limit = <1600>;
+                        status = "disabled";
+
+                        ethernet-port@0 {
+                                device_type = "network";
+                                compatible = "marvell,orion-eth-port";
+                                reg = <0>;
+                                /* overwrite MAC address in bootloader */
+                                local-mac-address = [00 00 00 00 00 00];
+                                /* set phy-handle property in board file */
+                        };
+                };
         };
 };
diff --git a/arch/arm/boot/dts/pxa3xx.dtsi b/arch/arm/boot/dts/pxa3xx.dtsi
index f9d92da86783..83bb0eff697b 100644
--- a/arch/arm/boot/dts/pxa3xx.dtsi
+++ b/arch/arm/boot/dts/pxa3xx.dtsi
@@ -28,5 +28,16 @@
                         marvell,intc-priority;
                         marvell,intc-nr-irqs = <56>;
                 };
+
+                gpio: gpio@40e00000 {
+                        compatible = "intel,pxa3xx-gpio";
+                        reg = <0x40e00000 0x10000>;
+                        interrupt-names = "gpio0", "gpio1", "gpio_mux";
+                        interrupts = <8 9 10>;
+                        gpio-controller;
+                        #gpio-cells = <0x2>;
+                        interrupt-controller;
+                        #interrupt-cells = <0x2>;
+                };
         };
 };
diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
new file mode 100644
index 000000000000..f444624eb097
--- /dev/null
+++ b/arch/arm/boot/dts/r8a73a4-ape6evm-reference.dts
@@ -0,0 +1,65 @@
+/*
+ * Device Tree Source for the APE6EVM board
+ *
+ * Copyright (C) 2013 Renesas Solutions Corp.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/dts-v1/;
+/include/ "r8a73a4.dtsi"
+
+/ {
+        model = "APE6EVM";
+        compatible = "renesas,ape6evm-reference", "renesas,r8a73a4";
+
+        chosen {
+                bootargs = "console=ttySC0,115200 ignore_loglevel rw";
+        };
+
+        memory@40000000 {
+                device_type = "memory";
+                reg = <0 0x40000000 0 0x40000000>;
+        };
+
+        lbsc {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges = <0 0 0 0x80000000>;
+        };
+};
+
+&i2c5 {
+        vdd_dvfs: max8973@1b {
+                compatible = "maxim,max8973";
+                reg = <0x1b>;
+
+                regulator-min-microvolt = <935000>;
+                regulator-max-microvolt = <1200000>;
+                regulator-boot-on;
+                regulator-always-on;
+        };
+};
+
+&cpu0 {
+        cpu0-supply = <&vdd_dvfs>;
+        operating-points = <
+                /* kHz  uV */
+                1950000 1115000
+                1462500  995000
+        >;
+        voltage-tolerance = <1>; /* 1% */
+};
+
+&pfc {
+        pinctrl-0 = <&scifa0_pins>;
+        pinctrl-names = "default";
+
+        scifa0_pins: scifa0 {
+                renesas,groups = "scifa0_data";
+                renesas,function = "scifa0";
+        };
+};
diff --git a/arch/arm/boot/dts/r8a73a4-ape6evm.dts b/arch/arm/boot/dts/r8a73a4-ape6evm.dts
index f603c6946c29..72f867e65791 100644
--- a/arch/arm/boot/dts/r8a73a4-ape6evm.dts
+++ b/arch/arm/boot/dts/r8a73a4-ape6evm.dts
@@ -16,7 +16,7 @@
         compatible = "renesas,ape6evm", "renesas,r8a73a4";
 
         chosen {
-                bootargs = "console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp";
+                bootargs = "console=ttySC0,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
         };
 
         memory@40000000 {
@@ -50,3 +50,25 @@
                 };
         };
 };
+
+&i2c5 {
+        vdd_dvfs: max8973@1b {
+                compatible = "maxim,max8973";
+                reg = <0x1b>;
+
+                regulator-min-microvolt = <935000>;
+                regulator-max-microvolt = <1200000>;
+                regulator-boot-on;
+                regulator-always-on;
+        };
+};
+
+&cpu0 {
+        cpu0-supply = <&vdd_dvfs>;
+        operating-points = <
+                /* kHz  uV */
+                1950000 1115000
+                1462500  995000
+        >;
+        voltage-tolerance = <1>; /* 1% */
+};
diff --git a/arch/arm/boot/dts/r8a73a4.dtsi b/arch/arm/boot/dts/r8a73a4.dtsi
index 4ff2019c0e30..6c26caa880f2 100644
--- a/arch/arm/boot/dts/r8a73a4.dtsi
+++ b/arch/arm/boot/dts/r8a73a4.dtsi
@@ -85,4 +85,137 @@
                 interrupt-parent = <&gic>;
                 interrupts = <0 69 4>;
         };
+
+        i2c0: i2c@e6500000 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "renesas,rmobile-iic";
+                reg = <0 0xe6500000 0 0x428>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 174 0x4>;
+        };
+
+        i2c1: i2c@e6510000 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "renesas,rmobile-iic";
+                reg = <0 0xe6510000 0 0x428>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 175 0x4>;
+        };
+
+        i2c2: i2c@e6520000 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "renesas,rmobile-iic";
+                reg = <0 0xe6520000 0 0x428>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 176 0x4>;
+        };
+
+        i2c3: i2c@e6530000 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "renesas,rmobile-iic";
+                reg = <0 0xe6530000 0 0x428>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 177 0x4>;
+        };
+
+        i2c4: i2c@e6540000 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "renesas,rmobile-iic";
+                reg = <0 0xe6540000 0 0x428>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 178 0x4>;
+        };
+
+        i2c5: i2c@e60b0000 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "renesas,rmobile-iic";
+                reg = <0 0xe60b0000 0 0x428>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 179 0x4>;
+        };
+
+        i2c6: i2c@e6550000 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "renesas,rmobile-iic";
+                reg = <0 0xe6550000 0 0x428>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 184 0x4>;
+        };
+
+        i2c7: i2c@e6560000 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "renesas,rmobile-iic";
+                reg = <0 0xe6560000 0 0x428>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 185 0x4>;
+        };
+
+        i2c8: i2c@e6570000 {
+                #address-cells = <1>;
+                #size-cells = <0>;
+                compatible = "renesas,rmobile-iic";
+                reg = <0 0xe6570000 0 0x428>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 173 0x4>;
+        };
+
+        mmcif0: mmcif@ee200000 {
+                compatible = "renesas,sh-mmcif";
+                reg = <0 0xee200000 0 0x80>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 169 0x4>;
+                reg-io-width = <4>;
+                status = "disabled";
+        };
+
+        mmcif1: mmcif@ee220000 {
+                compatible = "renesas,sh-mmcif";
+                reg = <0 0xee220000 0 0x80>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 170 0x4>;
+                reg-io-width = <4>;
+                status = "disabled";
+        };
+
+        pfc: pfc@e6050000 {
+                compatible = "renesas,pfc-r8a73a4";
+                reg = <0 0xe6050000 0 0x9000>;
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        sdhi0: sdhi@ee100000 {
+                compatible = "renesas,r8a73a4-sdhi";
+                reg = <0 0xee100000 0 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 165 4>;
+                cap-sd-highspeed;
+                status = "disabled";
+        };
+
+        sdhi1: sdhi@ee120000 {
+                compatible = "renesas,r8a73a4-sdhi";
+                reg = <0 0xee120000 0 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 166 4>;
+                cap-sd-highspeed;
+                status = "disabled";
+        };
+
+        sdhi2: sdhi@ee140000 {
+                compatible = "renesas,r8a73a4-sdhi";
+                reg = <0 0xee140000 0 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 167 4>;
+                cap-sd-highspeed;
+                status = "disabled";
+        };
 };
diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
index 09ea22c26359..c638e4ab91b8 100644
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva-reference.dts
@@ -10,13 +10,14 @@
 
 /dts-v1/;
 /include/ "r8a7740.dtsi"
+#include <dt-bindings/gpio/gpio.h>
 
 / {
         model = "armadillo 800 eva reference";
         compatible = "renesas,armadillo800eva-reference", "renesas,r8a7740";
 
         chosen {
-                bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096 rw";
+                bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
         };
 
         memory {
@@ -33,6 +34,21 @@
                 regulator-boot-on;
         };
 
+        leds {
+                compatible = "gpio-leds";
+                led1 {
+                        gpios = <&pfc 102 GPIO_ACTIVE_HIGH>;
+                };
+                led2 {
+                        gpios = <&pfc 111 GPIO_ACTIVE_HIGH>;
+                };
+                led3 {
+                        gpios = <&pfc 110 GPIO_ACTIVE_HIGH>;
+                };
+                led4 {
+                        gpios = <&pfc 177 GPIO_ACTIVE_HIGH>;
+                };
+        };
 };
 
 &i2c0 {
@@ -41,5 +57,23 @@
                 reg = <0x55>;
                 interrupt-parent = <&irqpin1>;
                 interrupts = <2 0>; /* IRQ10: hwirq 2 on irqpin1 */
+                pinctrl-0 = <&st1232_pins>;
+                pinctrl-names = "default";
+                gpios = <&pfc 166 GPIO_ACTIVE_LOW>;
+        };
+};
+
+&pfc {
+        pinctrl-0 = <&scifa1_pins>;
+        pinctrl-names = "default";
+
+        scifa1_pins: scifa1 {
+                renesas,groups = "scifa1_data";
+                renesas,function = "scifa1";
+        };
+
+        st1232_pins: st1232 {
+                renesas,groups = "intc_irq10";
+                renesas,function = "intc";
         };
 };
diff --git a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
index 93da655b2598..426cd9c3e1c4 100644
--- a/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
+++ b/arch/arm/boot/dts/r8a7740-armadillo800eva.dts
@@ -16,7 +16,7 @@
         compatible = "renesas,armadillo800eva";
 
         chosen {
-                bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp nfsroot=,rsize=4096,wsize=4096 rw";
+                bootargs = "console=tty0 console=ttySC1,115200 earlyprintk=sh-sci.1,115200 ignore_loglevel root=/dev/nfs ip=dhcp rw";
         };
 
         memory {
diff --git a/arch/arm/boot/dts/r8a7740.dtsi b/arch/arm/boot/dts/r8a7740.dtsi
index 24e930643821..44d3d520e01f 100644
--- a/arch/arm/boot/dts/r8a7740.dtsi
+++ b/arch/arm/boot/dts/r8a7740.dtsi
@@ -32,6 +32,11 @@
                       <0xc2000000 0x1000>;
         };
 
+        pmu {
+                compatible = "arm,cortex-a9-pmu";
+                interrupts = <0 83 4>;
+        };
+
         /* irqpin0: IRQ0 - IRQ7 */
         irqpin0: irqpin@e6900000 {
                 compatible = "renesas,intc-irqpin";
@@ -139,4 +144,19 @@
                               0 72 0x4
                               0 73 0x4>;
         };
+
+        pfc: pfc@e6050000 {
+                compatible = "renesas,pfc-r8a7740";
+                reg = <0xe6050000 0x8000>,
+                      <0xe605800c 0x20>;
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
+
+        tpu: pwm@e6600000 {
+                compatible = "renesas,tpu-r8a7740", "renesas,tpu";
+                reg = <0xe6600000 0x100>;
+                status = "disabled";
+                #pwm-cells = <3>;
+        };
 };
diff --git a/arch/arm/boot/dts/r8a7778-bockw-reference.dts b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
new file mode 100644
index 000000000000..9bb903a3230d
--- /dev/null
+++ b/arch/arm/boot/dts/r8a7778-bockw-reference.dts
@@ -0,0 +1,32 @@
+/*
+ * Reference Device Tree Source for the Bock-W board
+ *
+ * Copyright (C) 2013  Renesas Solutions Corp.
+ * Copyright (C) 2013  Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+ *
+ * based on r8a7779
+ *
+ * Copyright (C) 2013 Renesas Solutions Corp.
+ * Copyright (C) 2013 Simon Horman
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/dts-v1/;
+/include/ "r8a7778.dtsi"
+
+/ {
+        model = "bockw";
+        compatible = "renesas,bockw-reference", "renesas,r8a7778";
+
+        chosen {
+                bootargs = "console=ttySC0,115200 ignore_loglevel rw";
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x60000000 0x10000000>;
+        };
+};
diff --git a/arch/arm/boot/dts/r8a7778-bockw.dts b/arch/arm/boot/dts/r8a7778-bockw.dts
index 0076b1e8a0fb..12bbebc9c955 100644
--- a/arch/arm/boot/dts/r8a7778-bockw.dts
+++ b/arch/arm/boot/dts/r8a7778-bockw.dts
@@ -22,7 +22,7 @@
         compatible = "renesas,bockw", "renesas,r8a7778";
 
         chosen {
-                bootargs = "console=ttySC0,115200 ignore_loglevel ip=dhcp root=/dev/nfs";
+                bootargs = "console=ttySC0,115200 ignore_loglevel ip=dhcp root=/dev/nfs rw";
         };
 
         memory {
diff --git a/arch/arm/boot/dts/r8a7778.dtsi b/arch/arm/boot/dts/r8a7778.dtsi
index 474373559bdc..45ac404ab6d8 100644
--- a/arch/arm/boot/dts/r8a7778.dtsi
+++ b/arch/arm/boot/dts/r8a7778.dtsi
@@ -32,4 +32,70 @@
                 reg = <0xfe438000 0x1000>,
                       <0xfe430000 0x100>;
         };
+
+        gpio0: gpio@ffc40000 {
+                compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar";
+                reg = <0xffc40000 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 103 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 0 32>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
+        gpio1: gpio@ffc41000 {
+                compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar";
+                reg = <0xffc41000 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 103 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 32 32>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
+        gpio2: gpio@ffc42000 {
+                compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar";
+                reg = <0xffc42000 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 103 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 64 32>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
+        gpio3: gpio@ffc43000 {
+                compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar";
+                reg = <0xffc43000 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 103 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 96 32>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
+        gpio4: gpio@ffc44000 {
+                compatible = "renesas,gpio-r8a7778", "renesas,gpio-rcar";
+                reg = <0xffc44000 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 103 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 128 27>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
+        pfc: pfc@fffc0000 {
+                compatible = "renesas,pfc-r8a7778";
+                reg = <0xfffc000 0x118>;
+                #gpio-range-cells = <3>;
+        };
 };
diff --git a/arch/arm/boot/dts/r8a7779-marzen-reference.dts b/arch/arm/boot/dts/r8a7779-marzen-reference.dts
index 72be4c87cfb5..6d5508392252 100644
--- a/arch/arm/boot/dts/r8a7779-marzen-reference.dts
+++ b/arch/arm/boot/dts/r8a7779-marzen-reference.dts
@@ -11,13 +11,14 @@
 
 /dts-v1/;
 /include/ "r8a7779.dtsi"
+#include <dt-bindings/gpio/gpio.h>
 
 / {
         model = "marzen";
         compatible = "renesas,marzen-reference", "renesas,r8a7779";
 
         chosen {
-                bootargs = "console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel root=/dev/nfs ip=on";
+                bootargs = "console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel root=/dev/nfs ip=on rw";
         };
 
         memory {
@@ -37,6 +38,9 @@
         lan0@18000000 {
                 compatible = "smsc,lan9220", "smsc,lan9115";
                 reg = <0x18000000 0x100>;
+                pinctrl-0 = <&lan0_pins>;
+                pinctrl-names = "default";
+
                 phy-mode = "mii";
                 interrupt-parent = <&gic>;
                 interrupts = <0 28 0x4>;
@@ -44,4 +48,49 @@
                 vddvario-supply = <&fixedregulator3v3>;
                 vdd33a-supply = <&fixedregulator3v3>;
         };
+
+        leds {
+                compatible = "gpio-leds";
+                led2 {
+                        gpios = <&gpio4 29 GPIO_ACTIVE_HIGH>;
+                };
+                led3 {
+                        gpios = <&gpio4 30 GPIO_ACTIVE_HIGH>;
+                };
+                led4 {
+                        gpios = <&gpio4 31 GPIO_ACTIVE_HIGH>;
+                };
+        };
+};
+
+&pfc {
+        pinctrl-0 = <&scif2_pins &scif4_pins &sdhi0_pins>;
+        pinctrl-names = "default";
+
+        lan0_pins: lan0 {
+                intc {
+                        renesas,groups = "intc_irq1_b";
+                        renesas,function = "intc";
+                };
+                lbsc {
+                        renesas,groups = "lbsc_ex_cs0";
+                        renesas,function = "lbsc";
+                };
+        };
+
+        scif2_pins: scif2 {
+                renesas,groups = "scif2_data_c";
+                renesas,function = "scif2";
+        };
+
+        scif4_pins: scif4 {
+                renesas,groups = "scif4_data";
+                renesas,function = "scif4";
+        };
+
+        sdhi0_pins: sdhi0 {
+                renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_cd",
+                                 "sdhi0_wp";
+                renesas,function = "sdhi0";
+        };
 };
diff --git a/arch/arm/boot/dts/r8a7779-marzen.dts b/arch/arm/boot/dts/r8a7779-marzen.dts
new file mode 100644
index 000000000000..f3f7f7999736
--- /dev/null
+++ b/arch/arm/boot/dts/r8a7779-marzen.dts
@@ -0,0 +1,27 @@
+/*
+ * Device Tree Source for the Marzen board
+ *
+ * Copyright (C) 2013 Renesas Solutions Corp.
+ * Copyright (C) 2013 Simon Horman
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/dts-v1/;
+/include/ "r8a7779.dtsi"
+
+/ {
+        model = "marzen";
+        compatible = "renesas,marzen", "renesas,r8a7779";
+
+        chosen {
+                bootargs = "console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel root=/dev/nfs ip=on";
+        };
+
+        memory {
+                device_type = "memory";
+                reg = <0x60000000 0x40000000>;
+        };
+};
diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index 7f146c6bf756..23a62447359c 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -48,6 +48,90 @@
                       <0xf0000100 0x100>;
         };
 
+        gpio0: gpio@ffc40000 {
+                compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar";
+                reg = <0xffc40000 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 141 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 0 32>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
+        gpio1: gpio@ffc41000 {
+                compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar";
+                reg = <0xffc41000 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 142 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 32 32>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
+        gpio2: gpio@ffc42000 {
+                compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar";
+                reg = <0xffc42000 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 143 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 64 32>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
+        gpio3: gpio@ffc43000 {
+                compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar";
+                reg = <0xffc43000 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 144 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 96 32>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
+        gpio4: gpio@ffc44000 {
+                compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar";
+                reg = <0xffc44000 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 145 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 128 32>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
+        gpio5: gpio@ffc45000 {
+                compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar";
+                reg = <0xffc45000 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 146 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 160 32>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
+        gpio6: gpio@ffc46000 {
+                compatible = "renesas,gpio-r8a7779", "renesas,gpio-rcar";
+                reg = <0xffc46000 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 147 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 192 9>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
         irqpin0: irqpin@fe780010 {
                 compatible = "renesas,intc-irqpin";
                 #interrupt-cells = <2>;
@@ -65,7 +149,7 @@
                 sense-bitfield-width = <2>;
         };
 
-        i2c0: i2c@0xffc70000 {
+        i2c0: i2c@ffc70000 {
                 #address-cells = <1>;
                 #size-cells = <0>;
                 compatible = "renesas,rmobile-iic";
@@ -74,7 +158,7 @@
                 interrupts = <0 79 0x4>;
         };
 
-        i2c1: i2c@0xffc71000 {
+        i2c1: i2c@ffc71000 {
                 #address-cells = <1>;
                 #size-cells = <0>;
                 compatible = "renesas,rmobile-iic";
@@ -83,7 +167,7 @@
                 interrupts = <0 82 0x4>;
         };
 
-        i2c2: i2c@0xffc72000 {
+        i2c2: i2c@ffc72000 {
                 #address-cells = <1>;
                 #size-cells = <0>;
                 compatible = "renesas,rmobile-iic";
@@ -92,7 +176,7 @@
                 interrupts = <0 80 0x4>;
         };
 
-        i2c3: i2c@0xffc73000 {
+        i2c3: i2c@ffc73000 {
                 #address-cells = <1>;
                 #size-cells = <0>;
                 compatible = "renesas,rmobile-iic";
@@ -101,6 +185,12 @@
                 interrupts = <0 81 0x4>;
         };
 
+        pfc: pfc@fffc0000 {
+                compatible = "renesas,pfc-r8a7779";
+                reg = <0xfffc0000 0x23c>;
+                #gpio-range-cells = <3>;
+        };
+
         thermal@ffc48000 {
                 compatible = "renesas,rcar-thermal";
                 reg = <0xffc48000 0x38>;
diff --git a/arch/arm/boot/dts/r8a7790-lager-reference.dts b/arch/arm/boot/dts/r8a7790-lager-reference.dts
new file mode 100644
index 000000000000..c462ef138922
--- /dev/null
+++ b/arch/arm/boot/dts/r8a7790-lager-reference.dts
@@ -0,0 +1,45 @@
+/*
+ * Device Tree Source for the Lager board
+ *
+ * Copyright (C) 2013 Renesas Solutions Corp.
+ *
+ * This file is licensed under the terms of the GNU General Public License
+ * version 2.  This program is licensed "as is" without any warranty of any
+ * kind, whether express or implied.
+ */
+
+/dts-v1/;
+/include/ "r8a7790.dtsi"
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+        model = "Lager";
+        compatible = "renesas,lager-reference", "renesas,r8a7790";
+
+        chosen {
+                bootargs = "console=ttySC6,115200 ignore_loglevel rw";
+        };
+
+        memory@40000000 {
+                device_type = "memory";
+                reg = <0 0x40000000 0 0x80000000>;
+        };
+
+        lbsc {
+                #address-cells = <1>;
+                #size-cells = <1>;
+        };
+
+        leds {
+                compatible = "gpio-leds";
+                led6 {
+                        gpios = <&gpio4 22 GPIO_ACTIVE_HIGH>;
+                };
+                led7 {
+                        gpios = <&gpio4 23 GPIO_ACTIVE_HIGH>;
+                };
+                led8 {
+                        gpios = <&gpio5 17 GPIO_ACTIVE_HIGH>;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/r8a7790-lager.dts b/arch/arm/boot/dts/r8a7790-lager.dts
index 09a84fce89d6..203bd089af29 100644
--- a/arch/arm/boot/dts/r8a7790-lager.dts
+++ b/arch/arm/boot/dts/r8a7790-lager.dts
@@ -16,7 +16,7 @@
         compatible = "renesas,lager", "renesas,r8a7790";
 
         chosen {
-                bootargs = "console=ttySC6,115200 ignore_loglevel";
+                bootargs = "console=ttySC6,115200 ignore_loglevel rw root=/dev/nfs ip=dhcp";
         };
 
         memory@40000000 {
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 339d9b11721c..3b879e7c697c 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -38,6 +38,78 @@
                 interrupts = <1 9 0xf04>;
         };
 
+        gpio0: gpio@ffc40000 {
+                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
+                reg = <0 0xffc40000 0 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 4 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 0 32>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
+        gpio1: gpio@ffc41000 {
+                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
+                reg = <0 0xffc41000 0 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 5 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 32 32>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
+        gpio2: gpio@ffc42000 {
+                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
+                reg = <0 0xffc42000 0 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 6 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 64 32>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
+        gpio3: gpio@ffc43000 {
+                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
+                reg = <0 0xffc43000 0 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 7 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 96 32>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
+        gpio4: gpio@ffc44000 {
+                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
+                reg = <0 0xffc44000 0 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 8 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 128 32>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
+        gpio5: gpio@ffc45000 {
+                compatible = "renesas,gpio-r8a7790", "renesas,gpio-rcar";
+                reg = <0 0xffc45000 0 0x2c>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 9 0x4>;
+                #gpio-cells = <2>;
+                gpio-controller;
+                gpio-ranges = <&pfc 0 160 32>;
+                #interrupt-cells = <2>;
+                interrupt-controller;
+        };
+
         timer {
                 compatible = "arm,armv7-timer";
                 interrupts = <1 13 0xf08>,
@@ -54,4 +126,64 @@
                 interrupt-parent = <&gic>;
                 interrupts = <0 0 4>, <0 1 4>, <0 2 4>, <0 3 4>;
         };
+
+        mmcif0: mmcif@ee200000 {
+                compatible = "renesas,sh-mmcif";
+                reg = <0 0xee200000 0 0x80>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 169 0x4>;
+                reg-io-width = <4>;
+                status = "disabled";
+        };
+
+        mmcif1: mmcif@ee220000 {
+                compatible = "renesas,sh-mmcif";
+                reg = <0 0xee220000 0 0x80>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 170 0x4>;
+                reg-io-width = <4>;
+                status = "disabled";
+        };
+
+        pfc: pfc@e6060000 {
+                compatible = "renesas,pfc-r8a7790";
+                reg = <0 0xe6060000 0 0x250>;
+                #gpio-range-cells = <3>;
+        };
+
+        sdhi0: sdhi@ee100000 {
+                compatible = "renesas,r8a7790-sdhi";
+                reg = <0 0xee100000 0 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 165 4>;
+                cap-sd-highspeed;
+                status = "disabled";
+        };
+
+        sdhi1: sdhi@ee120000 {
+                compatible = "renesas,r8a7790-sdhi";
+                reg = <0 0xee120000 0 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 166 4>;
+                cap-sd-highspeed;
+                status = "disabled";
+        };
+
+        sdhi2: sdhi@ee140000 {
+                compatible = "renesas,r8a7790-sdhi";
+                reg = <0 0xee140000 0 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 167 4>;
+                cap-sd-highspeed;
+                status = "disabled";
+        };
+
+        sdhi3: sdhi@ee160000 {
+                compatible = "renesas,r8a7790-sdhi";
+                reg = <0 0xee160000 0 0x100>;
+                interrupt-parent = <&gic>;
+                interrupts = <0 168 4>;
+                cap-sd-highspeed;
+                status = "disabled";
+        };
 };
diff --git a/arch/arm/boot/dts/sama5d3.dtsi b/arch/arm/boot/dts/sama5d3.dtsi
index a1d5e25a6698..b7f49615120d 100644
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
@@ -48,6 +48,11 @@
                 };
         };
 
+        pmu {
+                compatible = "arm,cortex-a5-pmu";
+                interrupts = <46 IRQ_TYPE_LEVEL_HIGH 0>;
+        };
+
         memory {
                 reg = <0x20000000 0x8000000>;
         };
@@ -1029,21 +1034,30 @@
                         compatible = "atmel,at91rm9200-nand";
                         #address-cells = <1>;
                         #size-cells = <1>;
+                        ranges;
                         reg = < 0x60000000 0x01000000   /* EBI CS3 */
                                 0xffffc070 0x00000490   /* SMC PMECC regs */
                                 0xffffc500 0x00000100   /* SMC PMECC Error Location regs */
-                                0x00100000 0x00100000   /* ROM code */
-                                0x70000000 0x10000000   /* NFC Command Registers */
-                                0xffffc000 0x00000070   /* NFC HSMC regs */
-                                0x00200000 0x00100000   /* NFC SRAM banks */
+                                0x00110000 0x00018000   /* ROM code */
                                 >;
                         interrupts = <5 IRQ_TYPE_LEVEL_HIGH 6>;
                         atmel,nand-addr-offset = <21>;
                         atmel,nand-cmd-offset = <22>;
                         pinctrl-names = "default";
                         pinctrl-0 = <&pinctrl_nand0_ale_cle>;
-                        atmel,pmecc-lookup-table-offset = <0x10000 0x18000>;
+                        atmel,pmecc-lookup-table-offset = <0x0 0x8000>;
                         status = "disabled";
+
+                        nfc@70000000 {
+                                compatible = "atmel,sama5d3-nfc";
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                reg = <
+                                        0x70000000 0x10000000   /* NFC Command Registers */
+                                        0xffffc000 0x00000070   /* NFC HSMC regs */
+                                        0x00200000 0x00100000   /* NFC SRAM banks */
+                                        >;
+                        };
                 };
         };
 };
diff --git a/arch/arm/boot/dts/sama5d3xcm.dtsi b/arch/arm/boot/dts/sama5d3xcm.dtsi
index 1f8050813a54..31ed9e3bb649 100644
--- a/arch/arm/boot/dts/sama5d3xcm.dtsi
+++ b/arch/arm/boot/dts/sama5d3xcm.dtsi
@@ -47,8 +47,6 @@
                         atmel,has-pmecc;
                         atmel,pmecc-cap = <4>;
                         atmel,pmecc-sector-size = <512>;
-                        atmel,has-nfc;
-                        atmel,use-nfc-sram;
                         nand-on-flash-bbt;
                         status = "okay";
 
diff --git a/arch/arm/boot/dts/sama5d3xmb.dtsi b/arch/arm/boot/dts/sama5d3xmb.dtsi
index 8a9e05d8a4b8..dba739b6ef36 100644
--- a/arch/arm/boot/dts/sama5d3xmb.dtsi
+++ b/arch/arm/boot/dts/sama5d3xmb.dtsi
@@ -81,6 +81,14 @@
 
                         macb1: ethernet@f802c000 {
                                 phy-mode = "rmii";
+
+                                #address-cells = <1>;
+                                #size-cells = <0>;
+                                phy0: ethernet-phy@1 {
+                                        interrupt-parent = <&pioE>;
+                                        interrupts = <30 IRQ_TYPE_EDGE_FALLING>;
+                                        reg = <1>;
+                                };
                         };
 
                         pinctrl@fffff200 {
diff --git a/arch/arm/boot/dts/sh7372.dtsi b/arch/arm/boot/dts/sh7372.dtsi
index 7bf020ecadf5..249f65be2a50 100644
--- a/arch/arm/boot/dts/sh7372.dtsi
+++ b/arch/arm/boot/dts/sh7372.dtsi
@@ -23,4 +23,12 @@
                         reg = <0x0>;
                 };
         };
+
+        pfc: pfc@e6050000 {
+                compatible = "renesas,pfc-sh7372";
+                reg = <0xe6050000 0x8000>,
+                      <0xe605801c 0x1c>;
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
 };
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
index b6f759e830ed..212230629f27 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
@@ -13,6 +13,7 @@
 
 /dts-v1/;
 /include/ "sh73a0.dtsi"
+#include <dt-bindings/gpio/gpio.h>
 
 / {
         model = "KZM-A9-GT";
@@ -32,7 +33,7 @@
         };
 
         chosen {
-                bootargs = "console=tty0 console=ttySC4,115200 root=/dev/nfs ip=dhcp ignore_loglevel earlyprintk=sh-sci.4,115200";
+                bootargs = "console=tty0 console=ttySC4,115200 root=/dev/nfs ip=dhcp ignore_loglevel earlyprintk=sh-sci.4,115200 rw";
         };
 
         memory {
@@ -58,6 +59,24 @@
                 regulator-boot-on;
         };
 
+        vmmc_sdhi0: regulator@2 {
+                compatible = "regulator-fixed";
+                regulator-name = "SDHI0 Vcc";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                gpio = <&pfc 15 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
+
+        vmmc_sdhi2: regulator@3 {
+                compatible = "regulator-fixed";
+                regulator-name = "SDHI2 Vcc";
+                regulator-min-microvolt = <3300000>;
+                regulator-max-microvolt = <3300000>;
+                gpio = <&pfc 14 GPIO_ACTIVE_HIGH>;
+                enable-active-high;
+        };
+
         lan9220@10000000 {
                 compatible = "smsc,lan9220", "smsc,lan9115";
                 reg = <0x10000000 0x100>;
@@ -70,6 +89,22 @@
                 vddvario-supply = <&reg_1p8v>;
                 vdd33a-supply = <&reg_3p3v>;
         };
+
+        leds {
+                compatible = "gpio-leds";
+                led1 {
+                        gpios = <&pfc 20 GPIO_ACTIVE_LOW>;
+                };
+                led2 {
+                        gpios = <&pfc 21 GPIO_ACTIVE_LOW>;
+                };
+                led3 {
+                        gpios = <&pfc 22 GPIO_ACTIVE_LOW>;
+                };
+                led4 {
+                        gpios = <&pfc 23 GPIO_ACTIVE_LOW>;
+                };
+        };
 };
 
 &i2c0 {
@@ -145,20 +180,71 @@
         };
 };
 
+&i2c3 {
+        pinctrl-0 = <&i2c3_pins>;
+        pinctrl-names = "default";
+};
+
 &mmcif {
+        pinctrl-0 = <&mmcif_pins>;
+        pinctrl-names = "default";
+
         bus-width = <8>;
         vmmc-supply = <&reg_1p8v>;
         status = "okay";
 };
 
+&pfc {
+        pinctrl-0 = <&scifa4_pins>;
+        pinctrl-names = "default";
+
+        i2c3_pins: i2c3 {
+                renesas,groups = "i2c3_1";
+                renesas,function = "i2c3";
+        };
+
+        mmcif_pins: mmcif {
+                mux {
+                        renesas,groups = "mmc0_data8_0", "mmc0_ctrl_0";
+                        renesas,function = "mmc0";
+                };
+                cfg {
+                        renesas,groups = "mmc0_data8_0";
+                        renesas,pins = "PORT279";
+                        bias-pull-up;
+                };
+        };
+
+        scifa4_pins: scifa4 {
+                renesas,groups = "scifa4_data", "scifa4_ctrl";
+                renesas,function = "scifa4";
+        };
+
+        sdhi0_pins: sdhi0 {
+                renesas,groups = "sdhi0_data4", "sdhi0_ctrl", "sdhi0_cd", "sdhi0_wp";
+                renesas,function = "sdhi0";
+        };
+
+        sdhi2_pins: sdhi2 {
+                renesas,groups = "sdhi2_data4", "sdhi2_ctrl";
+                renesas,function = "sdhi2";
+        };
+};
+
 &sdhi0 {
-        vmmc-supply = <&reg_3p3v>;
+        pinctrl-0 = <&sdhi0_pins>;
+        pinctrl-names = "default";
+
+        vmmc-supply = <&vmmc_sdhi0>;
         bus-width = <4>;
         status = "okay";
 };
 
 &sdhi2 {
-        vmmc-supply = <&reg_3p3v>;
+        pinctrl-0 = <&sdhi2_pins>;
+        pinctrl-names = "default";
+
+        vmmc-supply = <&vmmc_sdhi2>;
         bus-width = <4>;
         broken-cd;
         status = "okay";
diff --git a/arch/arm/boot/dts/sh73a0-kzm9g.dts b/arch/arm/boot/dts/sh73a0-kzm9g.dts
index 7c4071e7790c..0f1ca7792c46 100644
--- a/arch/arm/boot/dts/sh73a0-kzm9g.dts
+++ b/arch/arm/boot/dts/sh73a0-kzm9g.dts
@@ -16,7 +16,7 @@
         compatible = "renesas,kzm9g", "renesas,sh73a0";
 
         chosen {
-                bootargs = "console=tty0 console=ttySC4,115200 root=/dev/nfs ip=dhcp ignore_loglevel earlyprintk=sh-sci.4,115200";
+                bootargs = "console=tty0 console=ttySC4,115200 root=/dev/nfs ip=dhcp ignore_loglevel earlyprintk=sh-sci.4,115200 rw";
         };
 
         memory {
diff --git a/arch/arm/boot/dts/sh73a0.dtsi b/arch/arm/boot/dts/sh73a0.dtsi
index b97750256003..ba59a5875a10 100644
--- a/arch/arm/boot/dts/sh73a0.dtsi
+++ b/arch/arm/boot/dts/sh73a0.dtsi
@@ -38,6 +38,12 @@
                       <0xf0000100 0x100>;
         };
 
+        pmu {
+                compatible = "arm,cortex-a9-pmu";
+                interrupts = <0 55 4>,
+                             <0 56 4>;
+        };
+
         irqpin0: irqpin@e6900000 {
                 compatible = "renesas,intc-irqpin";
                 #interrupt-cells = <2>;
@@ -222,4 +228,12 @@
                 cap-sd-highspeed;
                 status = "disabled";
         };
+
+        pfc: pfc@e6050000 {
+                compatible = "renesas,pfc-sh73a0";
+                reg = <0xe6050000 0x8000>,
+                      <0xe605801c 0x1c>;
+                gpio-controller;
+                #gpio-cells = <2>;
+        };
 };
diff --git a/arch/arm/boot/dts/skeleton64.dtsi b/arch/arm/boot/dts/skeleton64.dtsi
index 15994158a998..b5d7f36f33de 100644
--- a/arch/arm/boot/dts/skeleton64.dtsi
+++ b/arch/arm/boot/dts/skeleton64.dtsi
@@ -9,5 +9,5 @@
         #size-cells = <2>;
         chosen { };
         aliases { };
-        memory { device_type = "memory"; reg = <0 0>; };
+        memory { device_type = "memory"; reg = <0 0 0 0>; };
 };
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
index bee62a2cf6d6..e273fa993b8c 100644
--- a/arch/arm/boot/dts/socfpga.dtsi
+++ b/arch/arm/boot/dts/socfpga.dtsi
@@ -476,25 +476,25 @@
                 };
 
                 timer0: timer0@ffc08000 {
-                        compatible = "snps,dw-apb-timer-sp";
+                        compatible = "snps,dw-apb-timer";
                         interrupts = <0 167 4>;
                         reg = <0xffc08000 0x1000>;
                 };
 
                 timer1: timer1@ffc09000 {
-                        compatible = "snps,dw-apb-timer-sp";
+                        compatible = "snps,dw-apb-timer";
                         interrupts = <0 168 4>;
                         reg = <0xffc09000 0x1000>;
                 };
 
                 timer2: timer2@ffd00000 {
-                        compatible = "snps,dw-apb-timer-osc";
+                        compatible = "snps,dw-apb-timer";
                         interrupts = <0 169 4>;
                         reg = <0xffd00000 0x1000>;
                 };
 
                 timer3: timer3@ffd01000 {
-                        compatible = "snps,dw-apb-timer-osc";
+                        compatible = "snps,dw-apb-timer";
                         interrupts = <0 170 4>;
                         reg = <0xffd01000 0x1000>;
                 };
diff --git a/arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi b/arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi
new file mode 100644
index 000000000000..e0799966bc25
--- /dev/null
+++ b/arch/arm/boot/dts/ste-ccu8540-pinctrl.dtsi
@@ -0,0 +1,196 @@
+/*
+ * Copyright 2012 ST-Ericsson
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+#include "ste-nomadik-pinctrl.dtsi"
+
+/ {
+        soc {
+                pinctrl {
+                        uart0 {
+                                uart0_default_mux: uart0_mux {
+                                        default_mux {
+                                                ste,function = "u0";
+                                                ste,pins = "u0_a_1";
+                                        };
+                                };
+
+                                uart0_default_mode: uart0_default {
+                                        default_cfg1 {
+                                                ste,pins = "GPIO0", "GPIO2";
+                                                ste,config = <&in_pu>;
+                                        };
+
+                                        default_cfg2 {
+                                                ste,pins = "GPIO1", "GPIO3";
+                                                ste,config = <&out_hi>;
+                                        };
+                                };
+
+                                uart0_sleep_mode: uart0_sleep {
+                                        sleep_cfg1 {
+                                                ste,pins = "GPIO0", "GPIO2";
+                                                ste,config = <&slpm_in_pu>;
+                                        };
+
+                                        sleep_cfg2 {
+                                                ste,pins = "GPIO1", "GPIO3";
+                                                ste,config = <&slpm_out_hi>;
+                                        };
+                                };
+                        };
+
+                        uart2 {
+                                uart2_default_mode: uart2_default {
+                                        default_mux {
+                                                ste,function = "u2";
+                                                ste,pins = "u2txrx_a_1";
+                                        };
+
+                                        default_cfg1 {
+                                                ste,pins = "GPIO120";
+                                                ste,config = <&in_pu>;
+                                        };
+
+                                        default_cfg2 {
+                                                ste,pins = "GPIO121";
+                                                ste,config = <&out_hi>;
+                                        };
+                                };
+
+                                uart2_sleep_mode: uart2_sleep {
+                                        sleep_cfg1 {
+                                                ste,pins = "GPIO120";
+                                                ste,config = <&slpm_in_pu>;
+                                        };
+
+                                        sleep_cfg2 {
+                                                ste,pins = "GPIO121";
+                                                ste,config = <&slpm_out_hi>;
+                                        };
+                                };
+                        };
+
+                        i2c0 {
+                                i2c0_default_mux: i2c_mux {
+                                        default_mux {
+                                                ste,function = "i2c0";
+                                                ste,pins = "i2c0_a_1";
+                                        };
+                                };
+
+                                i2c0_default_mode: i2c_default {
+                                        default_cfg1 {
+                                                ste,pins = "GPIO147", "GPIO148";
+                                                ste,config = <&in_pu>;
+                                        };
+                                };
+
+                                i2c0_sleep_mode: i2c_sleep {
+                                        sleep_cfg1 {
+                                                ste,pins = "GPIO147", "GPIO148";
+                                                ste,config = <&slpm_in_pu>;
+                                        };
+                                };
+                        };
+
+                        i2c1 {
+                                i2c1_default_mux: i2c_mux {
+                                        default_mux {
+                                                ste,function = "i2c1";
+                                                ste,pins = "i2c1_b_2";
+                                        };
+                                };
+
+                                i2c1_default_mode: i2c_default {
+                                        default_cfg1 {
+                                                ste,pins = "GPIO16", "GPIO17";
+                                                ste,config = <&in_pu>;
+                                        };
+                                };
+
+                                i2c1_sleep_mode: i2c_sleep {
+                                        sleep_cfg1 {
+                                                ste,pins = "GPIO16", "GPIO17";
+                                                ste,config = <&slpm_in_pu>;
+                                        };
+                                };
+                        };
+
+                        i2c2 {
+                                i2c2_default_mux: i2c_mux {
+                                        default_mux {
+                                                ste,function = "i2c2";
+                                                ste,pins = "i2c2_b_2";
+                                        };
+                                };
+
+                                i2c2_default_mode: i2c_default {
+                                        default_cfg1 {
+                                                ste,pins = "GPIO10", "GPIO11";
+                                                ste,config = <&in_pu>;
+                                        };
+                                };
+
+                                i2c2_sleep_mode: i2c_sleep {
+                                        sleep_cfg1 {
+                                                ste,pins = "GPIO11", "GPIO11";
+                                                ste,config = <&slpm_in_pu>;
+                                        };
+                                };
+                        };
+
+                        i2c4 {
+                                i2c4_default_mux: i2c_mux {
+                                        default_mux {
+                                                ste,function = "i2c4";
+                                                ste,pins = "i2c4_b_2";
+                                        };
+                                };
+
+                                i2c4_default_mode: i2c_default {
+                                        default_cfg1 {
+                                                ste,pins = "GPIO122", "GPIO123";
+                                                ste,config = <&in_pu>;
+                                        };
+                                };
+
+                                i2c4_sleep_mode: i2c_sleep {
+                                        sleep_cfg1 {
+                                                ste,pins = "GPIO122", "GPIO123";
+                                                ste,config = <&slpm_in_pu>;
+                                        };
+                                };
+                        };
+
+                        i2c5 {
+                                i2c5_default_mux: i2c_mux {
+                                        default_mux {
+                                                ste,function = "i2c5";
+                                                ste,pins = "i2c5_c_2";
+                                        };
+                                };
+
+                                i2c5_default_mode: i2c_default {
+                                        default_cfg1 {
+                                                ste,pins = "GPIO118", "GPIO119";
+                                                ste,config = <&in_pu>;
+                                        };
+                                };
+
+                                i2c5_sleep_mode: i2c_sleep {
+                                        sleep_cfg1 {
+                                                ste,pins = "GPIO118", "GPIO119";
+                                                ste,config = <&slpm_in_pu>;
+                                        };
+                                };
+                        };
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/ste-ccu8540.dts b/arch/arm/boot/dts/ste-ccu8540.dts
new file mode 100644
index 000000000000..7f3baf51a3a9
--- /dev/null
+++ b/arch/arm/boot/dts/ste-ccu8540.dts
@@ -0,0 +1,86 @@
+/*
+ * Copyright 2013 ST-Ericsson AB
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+#include "ste-dbx5x0.dtsi"
+#include "ste-ccu8540-pinctrl.dtsi"
+
+/ {
+        model = "ST-Ericsson U8540 platform with Device Tree";
+        compatible = "st-ericsson,ccu8540", "st-ericsson,u8540";
+
+        memory@0 {
+                reg = <0x20000000 0x1f000000>, <0xc0000000 0x3f000000>;
+        };
+
+        soc {
+                pinctrl {
+                        compatible = "stericsson,db8540-pinctrl";
+                };
+
+                prcmu@80157000 {
+                        reg = <0x80157000 0x2000>, <0x801b0000 0x8000>, <0x801b8000 0x3000>;
+                        reg-names = "prcmu", "prcmu-tcpm", "prcmu-tcdm";
+                };
+
+                uart@80120000 {
+                        pinctrl-names = "default", "sleep";
+                        pinctrl-0 = <&uart0_default_mux>, <&uart0_default_mode>;
+                        pinctrl-1 = <&uart0_sleep_mode>;
+                        status = "okay";
+                };
+
+                uart@80121000 {
+                        status = "okay";
+                };
+
+                uart@80007000 {
+                        pinctrl-names = "default", "sleep";
+                        pinctrl-0 = <&uart2_default_mode>;
+                        pinctrl-1 = <&uart2_sleep_mode>;
+                        status = "okay";
+                };
+
+                i2c0: i2c@80004000 {
+                        pinctrl-names = "default","sleep";
+                        pinctrl-0 = <&i2c0_default_mux>, <&i2c0_default_mode>;
+                        pinctrl-1 = <&i2c0_sleep_mode>;
+                };
+
+                i2c1: i2c@80122000 {
+                        pinctrl-names = "default","sleep";
+                        pinctrl-0 = <&i2c1_default_mux>, <&i2c1_default_mode>;
+                        pinctrl-1 = <&i2c1_sleep_mode>;
+                };
+
+                i2c2: i2c@80128000 {
+                        pinctrl-names = "default","sleep";
+                        pinctrl-0 = <&i2c2_default_mux>, <&i2c2_default_mode>;
+                        pinctrl-1 = <&i2c2_sleep_mode>;
+                };
+
+                i2c3: i2c@80110000 {
+                        status = "disabled";
+                };
+
+                i2c4: i2c@8012a000 {
+                        pinctrl-names = "default","sleep";
+                        pinctrl-0 = <&i2c4_default_mux>, <&i2c4_default_mode>;
+                        pinctrl-1 = <&i2c4_sleep_mode>;
+                };
+
+                i2c5: i2c@80001000 {
+                        pinctrl-names = "default","sleep";
+                        pinctrl-0 = <&i2c5_default_mux>, <&i2c5_default_mode>;
+                        pinctrl-1 = <&i2c5_sleep_mode>;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/ccu9540.dts b/arch/arm/boot/dts/ste-ccu9540.dts
index ed29ec7288e4..229508750890 100644
--- a/arch/arm/boot/dts/ccu9540.dts
+++ b/arch/arm/boot/dts/ste-ccu9540.dts
@@ -10,7 +10,7 @@
  */
 
 /dts-v1/;
-#include "dbx5x0.dtsi"
+#include "ste-dbx5x0.dtsi"
 
 / {
         model = "ST-Ericsson CCU9540 platform with Device Tree";
diff --git a/arch/arm/boot/dts/dbx5x0.dtsi b/arch/arm/boot/dts/ste-dbx5x0.dtsi
index a1529455f081..1c1091eedade 100644
--- a/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/arch/arm/boot/dts/ste-dbx5x0.dtsi
@@ -245,7 +245,7 @@
                                              <22 IRQ_TYPE_LEVEL_HIGH>;
                                 interrupt-names = "IRQ_HOTMON_LOW", "IRQ_HOTMON_HIGH";
                                 status = "disabled";
-                         };
+                        };
 
                         db8500-prcmu-regulators {
                                 compatible = "stericsson,db8500-prcmu-regulator";
@@ -457,8 +457,36 @@
                                         stericsson,earpeice-cmv = <950>; /* Units in mV. */
                                 };
 
+                                ext_regulators: ab8500-ext-regulators {
+                                        compatible = "stericsson,ab8500-ext-regulator";
+
+                                        ab8500_ext1_reg: ab8500_ext1 {
+                                                regulator-compatible = "ab8500_ext1";
+                                                regulator-min-microvolt = <1800000>;
+                                                regulator-max-microvolt = <1800000>;
+                                                regulator-boot-on;
+                                                regulator-always-on;
+                                        };
+
+                                        ab8500_ext2_reg: ab8500_ext2 {
+                                                regulator-compatible = "ab8500_ext2";
+                                                regulator-min-microvolt = <1360000>;
+                                                regulator-max-microvolt = <1360000>;
+                                                regulator-boot-on;
+                                                regulator-always-on;
+                                        };
+
+                                        ab8500_ext3_reg: ab8500_ext3 {
+                                                regulator-compatible = "ab8500_ext3";
+                                                regulator-min-microvolt = <3400000>;
+                                                regulator-max-microvolt = <3400000>;
+                                                regulator-boot-on;
+                                        };
+                                };
+
                                 ab8500-regulators {
                                         compatible = "stericsson,ab8500-regulator";
+                                        vin-supply = <&ab8500_ext3_reg>;
 
                                         // supplies to the display/camera
                                         ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
diff --git a/arch/arm/boot/dts/href.dtsi b/arch/arm/boot/dts/ste-href.dtsi
index 9db41b9d8358..370e03f5e7b2 100644
--- a/arch/arm/boot/dts/href.dtsi
+++ b/arch/arm/boot/dts/ste-href.dtsi
@@ -10,7 +10,7 @@
  */
 
 #include <dt-bindings/interrupt-controller/irq.h>
-#include "dbx5x0.dtsi"
+#include "ste-dbx5x0.dtsi"
 
 / {
         memory {
diff --git a/arch/arm/boot/dts/hrefprev60.dts b/arch/arm/boot/dts/ste-hrefprev60.dts
index c6bb07df2d1d..d8d3b99ab007 100644
--- a/arch/arm/boot/dts/hrefprev60.dts
+++ b/arch/arm/boot/dts/ste-hrefprev60.dts
@@ -10,9 +10,9 @@
  */
 
 /dts-v1/;
-#include "dbx5x0.dtsi"
-#include "href.dtsi"
-#include "stuib.dtsi"
+#include "ste-dbx5x0.dtsi"
+#include "ste-href.dtsi"
+#include "ste-stuib.dtsi"
 
 / {
         model = "ST-Ericsson HREF (pre-v60) platform with Device Tree";
diff --git a/arch/arm/boot/dts/hrefv60plus.dts b/arch/arm/boot/dts/ste-hrefv60plus.dts
index 3d580d6447f9..6e52ebbf113f 100644
--- a/arch/arm/boot/dts/hrefv60plus.dts
+++ b/arch/arm/boot/dts/ste-hrefv60plus.dts
@@ -10,9 +10,9 @@
  */
 
 /dts-v1/;
-#include "dbx5x0.dtsi"
-#include "href.dtsi"
-#include "stuib.dtsi"
+#include "ste-dbx5x0.dtsi"
+#include "ste-href.dtsi"
+#include "ste-stuib.dtsi"
 
 / {
         model = "ST-Ericsson HREF (v60+) platform with Device Tree";
diff --git a/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi b/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi
new file mode 100644
index 000000000000..efddee9403c4
--- /dev/null
+++ b/arch/arm/boot/dts/ste-nomadik-pinctrl.dtsi
@@ -0,0 +1,95 @@
+/*
+ * Copyright 2012 ST-Ericsson
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+#include <dt-bindings/pinctrl/nomadik.h>
+
+/ {
+        in_nopull: in_nopull {
+                ste,input = <INPUT_NOPULL>;
+        };
+
+        in_pu: input_pull_up {
+                ste,input = <INPUT_PULLUP>;
+        };
+
+        in_pd: input_pull_down {
+                ste,input = <INPUT_PULLDOWN>;
+        };
+
+        out_hi: output_high {
+                ste,output = <OUTPUT_HIGH>;
+        };
+
+        out_lo: output_low {
+                ste,output = <OUTPUT_LOW>;
+        };
+
+        gpio_out_lo: gpio_output_low {
+                ste,gpio = <GPIOMODE_ENABLED>;
+                ste,output = <OUTPUT_LOW>;
+        };
+
+        slpm_in_pu: slpm_in_pu {
+                ste,sleep = <SLPM_ENABLED>;
+                ste,sleep-input = <SLPM_INPUT_PULLUP>;
+                ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
+        };
+
+        slpm_in_wkup_pdis: slpm_in_wkup_pdis {
+                ste,sleep = <SLPM_ENABLED>;
+                ste,sleep-input = <SLPM_DIR_INPUT>;
+                ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
+                ste,sleep-pull-disable = <SLPM_PDIS_DISABLED>;
+        };
+
+        slpm_out_lo: slpm_out_lo {
+                ste,sleep = <SLPM_ENABLED>;
+                ste,sleep-output = <SLPM_OUTPUT_LOW>;
+                ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
+        };
+
+        slpm_out_hi: slpm_out_hi {
+                ste,sleep = <SLPM_ENABLED>;
+                ste,sleep-output = <SLPM_OUTPUT_HIGH>;
+                ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
+        };
+
+        slpm_out_hi_wkup_pdis: slpm_out_hi_wkup_pdis {
+                ste,sleep = <SLPM_ENABLED>;
+                ste,sleep-output = <SLPM_OUTPUT_HIGH>;
+                ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
+                ste,sleep-pull-disable = <SLPM_PDIS_DISABLED>;
+        };
+
+        slpm_out_wkup_pdis: slpm_out_wkup_pdis {
+                ste,sleep = <SLPM_ENABLED>;
+                ste,sleep-output = <SLPM_DIR_OUTPUT>;
+                ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
+                ste,sleep-pull-disable = <SLPM_PDIS_DISABLED>;
+        };
+
+        in_wkup_pdis: in_wkup_pdis {
+                ste,sleep-input = <SLPM_DIR_INPUT>;
+                ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
+                ste,sleep-pull-disable = <SLPM_PDIS_DISABLED>;
+        };
+
+        out_hi_wkup_pdis: out_hi_wkup_pdis {
+                ste,sleep-output = <SLPM_OUTPUT_HIGH>;
+                ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
+                ste,sleep-pull-disable = <SLPM_PDIS_DISABLED>;
+        };
+
+        out_wkup_pdis: out_wkup_pdis {
+                ste,sleep-output = <SLPM_DIR_OUTPUT>;
+                ste,sleep-wakeup = <SLPM_WAKEUP_ENABLE>;
+                ste,sleep-pull-disable = <SLPM_PDIS_DISABLED>;
+        };
+};
diff --git a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
index a3acfa7b3dc9..9169d3025f39 100644
--- a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
+++ b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
@@ -140,18 +140,30 @@
                         };
                 };
                 i2c0 {
+                        i2c0_default_mux: i2c0_mux {
+                                i2c0_default_mux {
+                                        ste,function = "i2c0";
+                                        ste,pins = "i2c0_a_1";
+                                };
+                        };
                         i2c0_default_mode: i2c0_default {
                                 i2c0_default_cfg {
                                         ste,pins = "GPIO62_D3", "GPIO63_D2";
-                                        ste,input = <1>;
+                                        ste,input = <0>;
                                 };
                         };
                 };
                 i2c1 {
+                        i2c1_default_mux: i2c1_mux {
+                                i2c1_default_mux {
+                                        ste,function = "i2c1";
+                                        ste,pins = "i2c1_a_1";
+                                };
+                        };
                         i2c1_default_mode: i2c1_default {
                                 i2c1_default_cfg {
                                         ste,pins = "GPIO53_L4", "GPIO54_L3";
-                                        ste,input = <1>;
+                                        ste,input = <0>;
                                 };
                         };
                 };
@@ -159,7 +171,7 @@
                         i2c2_default_mode: i2c2_default {
                                 i2c2_default_cfg {
                                         ste,pins = "GPIO73_C21", "GPIO74_C20";
-                                        ste,input = <1>;
+                                        ste,input = <0>;
                                 };
                         };
                 };
@@ -682,13 +694,17 @@
 
         /* I2C0 connected to the STw4811 power management chip */
         i2c0 {
-                compatible = "i2c-gpio";
-                gpios = <&gpio1 31 0>, /* sda */
-                        <&gpio1 30 0>; /* scl */
+                compatible = "st,nomadik-i2c", "arm,primecell";
+                reg = <0x101f8000 0x1000>;
+                interrupt-parent = <&vica>;
+                interrupts = <20>;
+                clock-frequency = <100000>;
                 #address-cells = <1>;
                 #size-cells = <0>;
+                clocks = <&i2c0clk>, <&pclki2c0>;
+                clock-names = "mclk", "apb_pclk";
                 pinctrl-names = "default";
-                pinctrl-0 = <&i2c0_default_mode>;
+                pinctrl-0 = <&i2c0_default_mux>, <&i2c0_default_mode>;
 
                 stw4811@2d {
                            compatible = "st,stw4811";
@@ -698,13 +714,17 @@
 
         /* I2C1 connected to various sensors */
         i2c1 {
-                compatible = "i2c-gpio";
-                gpios = <&gpio1 22 0>, /* sda */
-                        <&gpio1 21 0>; /* scl */
+                compatible = "st,nomadik-i2c", "arm,primecell";
+                reg = <0x101f7000 0x1000>;
+                interrupt-parent = <&vica>;
+                interrupts = <21>;
+                clock-frequency = <100000>;
                 #address-cells = <1>;
                 #size-cells = <0>;
+                clocks = <&i2c1clk>, <&pclki2c1>;
+                clock-names = "mclk", "apb_pclk";
                 pinctrl-names = "default";
-                pinctrl-0 = <&i2c1_default_mode>;
+                pinctrl-0 = <&i2c1_default_mux>, <&i2c1_default_mode>;
 
                 camera@2d {
                            compatible = "st,camera";
diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/ste-snowball.dts
index 49824be66845..f1fc128e249d 100644
--- a/arch/arm/boot/dts/snowball.dts
+++ b/arch/arm/boot/dts/ste-snowball.dts
@@ -10,7 +10,7 @@
  */
 
 /dts-v1/;
-#include "dbx5x0.dtsi"
+#include "ste-dbx5x0.dtsi"
 
 / {
         model = "Calao Systems Snowball platform with device tree";
@@ -165,34 +165,6 @@
                         status = "okay";
                 };
 
-                i2c@80004000 {
-                        tc3589x@42 {
-                                //compatible = "tc3589x";
-                                reg = <0x42>;
-                                gpios = <&gpio6 25 0x4>;
-                                interrupt-parent = <&gpio6>;
-                        };
-                        tps61052@33 {
-                                //compatible = "tps61052";
-                                reg = <0x33>;
-                        };
-                };
-
-                i2c@80128000 {
-                        lp5521@33 {
-                                // compatible = "lp5521";
-                                reg = <0x33>;
-                        };
-                        lp5521@34 {
-                                // compatible = "lp5521";
-                                reg = <0x34>;
-                        };
-                        bh1780@29 {
-                                // compatible = "rohm,bh1780gli";
-                                reg = <0x33>;
-                        };
-                };
-
                 cpufreq-cooling {
                         status = "okay";
                 };
@@ -310,6 +282,20 @@
                                         compatible = "stericsson,ab8500-gpio";
                                 };
 
+                                ext_regulators: ab8500-ext-regulators {
+                                        ab8500_ext1_reg: ab8500_ext1 {
+                                                regulator-name = "ab8500-ext-supply1";
+                                        };
+
+                                        ab8500_ext2_reg_reg: ab8500_ext2 {
+                                                regulator-name = "ab8500-ext-supply2";
+                                        };
+
+                                        ab8500_ext3_reg_reg: ab8500_ext3 {
+                                                regulator-name = "ab8500-ext-supply3";
+                                        };
+                                };
+
                                 ab8500-regulators {
                                         ab8500_ldo_aux1_reg: ab8500_ldo_aux1 {
                                                 regulator-name = "V-DISPLAY";
diff --git a/arch/arm/boot/dts/stuib.dtsi b/arch/arm/boot/dts/ste-stuib.dtsi
index 524e33240ad4..524e33240ad4 100644
--- a/arch/arm/boot/dts/stuib.dtsi
+++ b/arch/arm/boot/dts/ste-stuib.dtsi
diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts
new file mode 100644
index 000000000000..eb4d73b6a090
--- /dev/null
+++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts
@@ -0,0 +1,101 @@
+/*
+ * Copyright 2013 Emilio López
+ *
+ * Emilio López <emilio@elopez.com.ar>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+/include/ "sun4i-a10.dtsi"
+
+/ {
+        model = "Mele A1000";
+        compatible = "mele,a1000", "allwinner,sun4i-a10";
+
+        aliases {
+                serial0 = &uart0;
+        };
+
+        soc@01c00000 {
+                emac: ethernet@01c0b000 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&emac_pins_a>;
+                        phy = <&phy1>;
+                        status = "okay";
+                };
+
+                mdio@01c0b080 {
+                        phy-supply = <&reg_emac_3v3>;
+                        status = "okay";
+
+                        phy1: ethernet-phy@1 {
+                                reg = <1>;
+                        };
+                };
+
+                pinctrl@01c20800 {
+                        emac_power_pin_a1000: emac_power_pin@0 {
+                                allwinner,pins = "PH15";
+                                allwinner,function = "gpio_out";
+                                allwinner,drive = <0>;
+                                allwinner,pull = <0>;
+                        };
+
+                        led_pins_a1000: led_pins@0 {
+                                allwinner,pins = "PH10", "PH20";
+                                allwinner,function = "gpio_out";
+                                allwinner,drive = <0>;
+                                allwinner,pull = <0>;
+                        };
+                };
+
+                uart0: serial@01c28000 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&uart0_pins_a>;
+                        status = "okay";
+                };
+
+                i2c0: i2c@01c2ac00 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2c0_pins_a>;
+                        status = "okay";
+                };
+        };
+
+        leds {
+                compatible = "gpio-leds";
+                pinctrl-names = "default";
+                pinctrl-0 = <&led_pins_a1000>;
+
+                red {
+                        label = "a1000:red:usr";
+                        gpios = <&pio 7 10 0>;
+                };
+
+                blue {
+                        label = "a1000:blue:usr";
+                        gpios = <&pio 7 20 0>;
+                };
+        };
+
+        regulators {
+                compatible = "simple-bus";
+
+                reg_emac_3v3: emac-3v3 {
+                        compatible = "regulator-fixed";
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&emac_power_pin_a1000>;
+                        regulator-name = "emac-3v3";
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                        enable-active-high;
+                        gpio = <&pio 7 15 0>;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
index 757c4cd900ee..425a7db898c5 100644
--- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
+++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts
@@ -26,7 +26,7 @@
                 bootargs = "earlyprintk console=ttyS0,115200";
         };
 
-        soc@01c20000 {
+        soc@01c00000 {
                 emac: ethernet@01c0b000 {
                         pinctrl-names = "default";
                         pinctrl-0 = <&emac_pins_a>;
@@ -76,12 +76,12 @@
                 pinctrl-0 = <&led_pins_cubieboard>;
 
                 blue {
-                        label = "cubieboard::blue";
+                        label = "cubieboard:blue:usr";
                         gpios = <&pio 7 21 0>; /* LED1 */
                 };
 
                 green {
-                        label = "cubieboard::green";
+                        label = "cubieboard:green:usr";
                         gpios = <&pio 7 20 0>; /* LED2 */
                         linux,default-trigger = "heartbeat";
                 };
diff --git a/arch/arm/boot/dts/sun4i-a10-hackberry.dts b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
index 3514b37d66bc..b3ae51fa9372 100644
--- a/arch/arm/boot/dts/sun4i-a10-hackberry.dts
+++ b/arch/arm/boot/dts/sun4i-a10-hackberry.dts
@@ -22,7 +22,7 @@
                 bootargs = "earlyprintk console=ttyS0,115200";
         };
 
-        soc@01c20000 {
+        soc@01c00000 {
                 emac: ethernet@01c0b000 {
                         pinctrl-names = "default";
                         pinctrl-0 = <&emac_pins_a>;
diff --git a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
index 078ed7f618d7..0c1447c68059 100644
--- a/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
+++ b/arch/arm/boot/dts/sun4i-a10-mini-xplus.dts
@@ -22,7 +22,7 @@
                 bootargs = "earlyprintk console=ttyS0,115200";
         };
 
-        soc@01c20000 {
+        soc@01c00000 {
                 uart0: serial@01c28000 {
                         pinctrl-names = "default";
                         pinctrl-0 = <&uart0_pins_a>;
diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi
index b2bd6e124250..c32770a28acf 100644
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
@@ -160,11 +160,10 @@
                 };
         };
 
-        soc@01c20000 {
+        soc@01c00000 {
                 compatible = "simple-bus";
                 #address-cells = <1>;
                 #size-cells = <1>;
-                reg = <0x01c20000 0x300000>;
                 ranges;
 
                 emac: ethernet@01c0b000 {
diff --git a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
index 64dc0c42c43a..3c9f8b3cd3e3 100644
--- a/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun5i-a10s-olinuxino-micro.dts
@@ -18,7 +18,7 @@
         model = "Olimex A10s-Olinuxino Micro";
         compatible = "olimex,a10s-olinuxino-micro", "allwinner,sun5i-a10s";
 
-        soc@01c20000 {
+        soc@01c00000 {
                 emac: ethernet@01c0b000 {
                         pinctrl-names = "default";
                         pinctrl-0 = <&emac_pins_a>;
@@ -60,6 +60,31 @@
                         pinctrl-0 = <&uart3_pins_a>;
                         status = "okay";
                 };
+
+                i2c0: i2c@01c2ac00 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2c0_pins_a>;
+                        status = "okay";
+                };
+
+                i2c1: i2c@01c2b000 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2c1_pins_a>;
+                        status = "okay";
+
+                        at24@50 {
+                                compatible = "at,24c16";
+                                pagesize = <16>;
+                                reg = <0x50>;
+                                read-only;
+                        };
+                };
+
+                i2c2: i2c@01c2b400 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&i2c2_pins_a>;
+                        status = "okay";
+                };
         };
 
         leds {
diff --git a/arch/arm/boot/dts/sun5i-a10s.dtsi b/arch/arm/boot/dts/sun5i-a10s.dtsi
index 2307ce827ae0..3b4a0574f068 100644
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
@@ -95,20 +95,16 @@
 
                 ahb_gates: ahb_gates@01c20060 {
                         #clock-cells = <1>;
-                        compatible = "allwinner,sun4i-ahb-gates-clk";
+                        compatible = "allwinner,sun5i-a10s-ahb-gates-clk";
                         reg = <0x01c20060 0x8>;
                         clocks = <&ahb>;
-                        clock-output-names = "ahb_usb0", "ahb_ehci0",
-                                "ahb_ohci0", "ahb_ehci1", "ahb_ohci1", "ahb_ss",
-                                "ahb_dma", "ahb_bist", "ahb_mmc0", "ahb_mmc1",
-                                "ahb_mmc2", "ahb_mmc3", "ahb_ms", "ahb_nand",
-                                "ahb_sdram", "ahb_ace", "ahb_emac", "ahb_ts",
-                                "ahb_spi0", "ahb_spi1", "ahb_spi2", "ahb_spi3",
-                                "ahb_pata", "ahb_sata", "ahb_gps", "ahb_ve",
-                                "ahb_tvd", "ahb_tve0", "ahb_tve1", "ahb_lcd0",
-                                "ahb_lcd1", "ahb_csi0", "ahb_csi1", "ahb_hdmi",
-                                "ahb_de_be0", "ahb_de_be1", "ahb_de_fe0",
-                                "ahb_de_fe1", "ahb_mp", "ahb_mali400";
+                        clock-output-names = "ahb_usbotg", "ahb_ehci", "ahb_ohci",
+                                "ahb_ss", "ahb_dma", "ahb_bist", "ahb_mmc0",
+                                "ahb_mmc1", "ahb_mmc2", "ahb_nand", "ahb_sdram",
+                                "ahb_emac", "ahb_ts", "ahb_spi0", "ahb_spi1",
+                                "ahb_spi2", "ahb_gps", "ahb_stimer", "ahb_ve",
+                                "ahb_tve", "ahb_lcd", "ahb_csi", "ahb_hdmi",
+                                "ahb_de_be", "ahb_de_fe", "ahb_iep", "ahb_mali400";
                 };
 
                 apb0: apb0@01c20054 {
@@ -120,12 +116,11 @@
 
                 apb0_gates: apb0_gates@01c20068 {
                         #clock-cells = <1>;
-                        compatible = "allwinner,sun4i-apb0-gates-clk";
+                        compatible = "allwinner,sun5i-a10s-apb0-gates-clk";
                         reg = <0x01c20068 0x4>;
                         clocks = <&apb0>;
-                        clock-output-names = "apb0_codec", "apb0_spdif",
-                                "apb0_ac97", "apb0_iis", "apb0_pio", "apb0_ir0",
-                                "apb0_ir1", "apb0_keypad";
+                        clock-output-names = "apb0_codec", "apb0_iis", "apb0_pio",
+                                "apb0_ir", "apb0_keypad";
                 };
 
                 /* dummy is pll62 */
@@ -145,23 +140,19 @@
 
                 apb1_gates: apb1_gates@01c2006c {
                         #clock-cells = <1>;
-                        compatible = "allwinner,sun4i-apb1-gates-clk";
+                        compatible = "allwinner,sun5i-a10s-apb1-gates-clk";
                         reg = <0x01c2006c 0x4>;
                         clocks = <&apb1>;
                         clock-output-names = "apb1_i2c0", "apb1_i2c1",
-                                "apb1_i2c2", "apb1_can", "apb1_scr",
-                                "apb1_ps20", "apb1_ps21", "apb1_uart0",
-                                "apb1_uart1", "apb1_uart2", "apb1_uart3",
-                                "apb1_uart4", "apb1_uart5", "apb1_uart6",
-                                "apb1_uart7";
+                                "apb1_i2c2", "apb1_uart0", "apb1_uart1",
+                                "apb1_uart2", "apb1_uart3";
                 };
         };
 
-        soc@01c20000 {
+        soc@01c00000 {
                 compatible = "simple-bus";
                 #address-cells = <1>;
                 #size-cells = <1>;
-                reg = <0x01c20000 0x300000>;
                 ranges;
 
                 emac: ethernet@01c0b000 {
@@ -229,6 +220,27 @@
                                 allwinner,drive = <0>;
                                 allwinner,pull = <0>;
                         };
+
+                        i2c0_pins_a: i2c0@0 {
+                                allwinner,pins = "PB0", "PB1";
+                                allwinner,function = "i2c0";
+                                allwinner,drive = <0>;
+                                allwinner,pull = <0>;
+                        };
+
+                        i2c1_pins_a: i2c1@0 {
+                                allwinner,pins = "PB15", "PB16";
+                                allwinner,function = "i2c1";
+                                allwinner,drive = <0>;
+                                allwinner,pull = <0>;
+                        };
+
+                        i2c2_pins_a: i2c2@0 {
+                                allwinner,pins = "PB17", "PB18";
+                                allwinner,function = "i2c2";
+                                allwinner,drive = <0>;
+                                allwinner,pull = <0>;
+                        };
                 };
 
                 timer@01c20c00 {
@@ -282,5 +294,38 @@
                         clocks = <&apb1_gates 19>;
                         status = "disabled";
                 };
+
+                i2c0: i2c@01c2ac00 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "allwinner,sun4i-i2c";
+                        reg = <0x01c2ac00 0x400>;
+                        interrupts = <7>;
+                        clocks = <&apb1_gates 0>;
+                        clock-frequency = <100000>;
+                        status = "disabled";
+                };
+
+                i2c1: i2c@01c2b000 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "allwinner,sun4i-i2c";
+                        reg = <0x01c2b000 0x400>;
+                        interrupts = <8>;
+                        clocks = <&apb1_gates 1>;
+                        clock-frequency = <100000>;
+                        status = "disabled";
+                };
+
+                i2c2: i2c@01c2b400 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "allwinner,sun4i-i2c";
+                        reg = <0x01c2b400 0x400>;
+                        interrupts = <9>;
+                        clocks = <&apb1_gates 2>;
+                        clock-frequency = <100000>;
+                        status = "disabled";
+                };
         };
 };
diff --git a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
index 80497e376706..9e508dcc4245 100644
--- a/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
+++ b/arch/arm/boot/dts/sun5i-a13-olinuxino.dts
@@ -22,7 +22,7 @@
                 bootargs = "earlyprintk console=ttyS0,115200";
         };
 
-        soc@01c20000 {
+        soc@01c00000 {
                 pinctrl@01c20800 {
                         led_pins_olinuxino: led_pins@0 {
                                 allwinner,pins = "PG9";
diff --git a/arch/arm/boot/dts/sun5i-a13.dtsi b/arch/arm/boot/dts/sun5i-a13.dtsi
index 7363211daf84..f6091dc0936c 100644
--- a/arch/arm/boot/dts/sun5i-a13.dtsi
+++ b/arch/arm/boot/dts/sun5i-a13.dtsi
@@ -150,11 +150,10 @@
                 };
         };
 
-        soc@01c20000 {
+        soc@01c00000 {
                 compatible = "simple-bus";
                 #address-cells = <1>;
                 #size-cells = <1>;
-                reg = <0x01c20000 0x300000>;
                 ranges;
 
                 intc: interrupt-controller@01c20400 {
diff --git a/arch/arm/boot/dts/sun6i-a31-colombus.dts b/arch/arm/boot/dts/sun6i-a31-colombus.dts
new file mode 100644
index 000000000000..e5adae30899b
--- /dev/null
+++ b/arch/arm/boot/dts/sun6i-a31-colombus.dts
@@ -0,0 +1,32 @@
+/*
+ * Copyright 2013 Maxime Ripard
+ *
+ * Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+/include/ "sun6i-a31.dtsi"
+
+/ {
+        model = "WITS A31 Colombus Evaluation Board";
+        compatible = "wits,colombus", "allwinner,sun6i-a31";
+
+        chosen {
+                bootargs = "earlyprintk console=ttyS0,115200";
+        };
+
+        soc@01c00000 {
+                uart0: serial@01c28000 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&uart0_pins_a>;
+                        status = "okay";
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/sun6i-a31.dtsi b/arch/arm/boot/dts/sun6i-a31.dtsi
new file mode 100644
index 000000000000..f244f5f02365
--- /dev/null
+++ b/arch/arm/boot/dts/sun6i-a31.dtsi
@@ -0,0 +1,299 @@
+/*
+ * Copyright 2013 Maxime Ripard
+ *
+ * Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/include/ "skeleton.dtsi"
+
+/ {
+        interrupt-parent = <&gic>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu@0 {
+                        compatible = "arm,cortex-a7";
+                        device_type = "cpu";
+                        reg = <0>;
+                };
+
+                cpu@1 {
+                        compatible = "arm,cortex-a7";
+                        device_type = "cpu";
+                        reg = <1>;
+                };
+
+                cpu@2 {
+                        compatible = "arm,cortex-a7";
+                        device_type = "cpu";
+                        reg = <2>;
+                };
+
+                cpu@3 {
+                        compatible = "arm,cortex-a7";
+                        device_type = "cpu";
+                        reg = <3>;
+                };
+        };
+
+        memory {
+                reg = <0x40000000 0x80000000>;
+        };
+
+        clocks {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+
+                osc24M: osc24M {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <24000000>;
+                };
+
+                osc32k: osc32k {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <32768>;
+                };
+
+                pll1: pll1@01c20000 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun6i-a31-pll1-clk";
+                        reg = <0x01c20000 0x4>;
+                        clocks = <&osc24M>;
+                };
+
+                /*
+                 * This is a dummy clock, to be used as placeholder on
+                 * other mux clocks when a specific parent clock is not
+                 * yet implemented. It should be dropped when the driver
+                 * is complete.
+                 */
+                pll6: pll6 {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <0>;
+                };
+
+                cpu: cpu@01c20050 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun4i-cpu-clk";
+                        reg = <0x01c20050 0x4>;
+
+                        /*
+                         * PLL1 is listed twice here.
+                         * While it looks suspicious, it's actually documented
+                         * that way both in the datasheet and in the code from
+                         * Allwinner.
+                         */
+                        clocks = <&osc32k>, <&osc24M>, <&pll1>, <&pll1>;
+                };
+
+                axi: axi@01c20050 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun4i-axi-clk";
+                        reg = <0x01c20050 0x4>;
+                        clocks = <&cpu>;
+                };
+
+                ahb1_mux: ahb1_mux@01c20054 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun6i-a31-ahb1-mux-clk";
+                        reg = <0x01c20054 0x4>;
+                        clocks = <&osc32k>, <&osc24M>, <&axi>, <&pll6>;
+                };
+
+                ahb1: ahb1@01c20054 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun4i-ahb-clk";
+                        reg = <0x01c20054 0x4>;
+                        clocks = <&ahb1_mux>;
+                };
+
+                ahb1_gates: ahb1_gates@01c20060 {
+                        #clock-cells = <1>;
+                        compatible = "allwinner,sun6i-a31-ahb1-gates-clk";
+                        reg = <0x01c20060 0x8>;
+                        clocks = <&ahb1>;
+                        clock-output-names = "ahb1_mipidsi", "ahb1_ss",
+                                        "ahb1_dma", "ahb1_mmc0", "ahb1_mmc1",
+                                        "ahb1_mmc2", "ahb1_mmc3", "ahb1_nand1",
+                                        "ahb1_nand0", "ahb1_sdram",
+                                        "ahb1_gmac", "ahb1_ts", "ahb1_hstimer",
+                                        "ahb1_spi0", "ahb1_spi1", "ahb1_spi2",
+                                        "ahb1_spi3", "ahb1_otg", "ahb1_ehci0",
+                                        "ahb1_ehci1", "ahb1_ohci0",
+                                        "ahb1_ohci1", "ahb1_ohci2", "ahb1_ve",
+                                        "ahb1_lcd0", "ahb1_lcd1", "ahb1_csi",
+                                        "ahb1_hdmi", "ahb1_de0", "ahb1_de1",
+                                        "ahb1_fe0", "ahb1_fe1", "ahb1_mp",
+                                        "ahb1_gpu", "ahb1_deu0", "ahb1_deu1",
+                                        "ahb1_drc0", "ahb1_drc1";
+                };
+
+                apb1: apb1@01c20054 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun4i-apb0-clk";
+                        reg = <0x01c20054 0x4>;
+                        clocks = <&ahb1>;
+                };
+
+                apb1_gates: apb1_gates@01c20060 {
+                        #clock-cells = <1>;
+                        compatible = "allwinner,sun6i-a31-apb1-gates-clk";
+                        reg = <0x01c20068 0x4>;
+                        clocks = <&apb1>;
+                        clock-output-names = "apb1_codec", "apb1_digital_mic",
+                                        "apb1_pio", "apb1_daudio0",
+                                        "apb1_daudio1";
+                };
+
+                apb2_mux: apb2_mux@01c20058 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun4i-apb1-mux-clk";
+                        reg = <0x01c20058 0x4>;
+                        clocks = <&osc32k>, <&osc24M>, <&pll6>, <&pll6>;
+                };
+
+                apb2: apb2@01c20058 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun6i-a31-apb2-div-clk";
+                        reg = <0x01c20058 0x4>;
+                        clocks = <&apb2_mux>;
+                };
+
+                apb2_gates: apb2_gates@01c2006c {
+                        #clock-cells = <1>;
+                        compatible = "allwinner,sun6i-a31-apb2-gates-clk";
+                        reg = <0x01c2006c 0x8>;
+                        clocks = <&apb2>;
+                        clock-output-names = "apb2_i2c0", "apb2_i2c1",
+                                        "apb2_i2c2", "apb2_i2c3", "apb2_uart0",
+                                        "apb2_uart1", "apb2_uart2", "apb2_uart3",
+                                        "apb2_uart4", "apb2_uart5";
+                };
+        };
+
+        soc@01c00000 {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+
+                pio: pinctrl@01c20800 {
+                        compatible = "allwinner,sun6i-a31-pinctrl";
+                        reg = <0x01c20800 0x400>;
+                        interrupts = <0 11 1>, <0 15 1>, <0 16 1>, <0 17 1>;
+                        clocks = <&apb1_gates 5>;
+                        gpio-controller;
+                        interrupt-controller;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        #gpio-cells = <3>;
+
+                        uart0_pins_a: uart0@0 {
+                                allwinner,pins = "PH20", "PH21";
+                                allwinner,function = "uart0";
+                                allwinner,drive = <0>;
+                                allwinner,pull = <0>;
+                        };
+                };
+
+                timer@01c20c00 {
+                        compatible = "allwinner,sun4i-timer";
+                        reg = <0x01c20c00 0xa0>;
+                        interrupts = <0 18 1>,
+                                     <0 19 1>,
+                                     <0 20 1>,
+                                     <0 21 1>,
+                                     <0 22 1>;
+                        clocks = <&osc24M>;
+                };
+
+                wdt1: watchdog@01c20ca0 {
+                        compatible = "allwinner,sun6i-wdt";
+                        reg = <0x01c20ca0 0x20>;
+                };
+
+                uart0: serial@01c28000 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x01c28000 0x400>;
+                        interrupts = <0 0 1>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&apb2_gates 16>;
+                        status = "disabled";
+                };
+
+                uart1: serial@01c28400 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x01c28400 0x400>;
+                        interrupts = <0 1 1>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&apb2_gates 17>;
+                        status = "disabled";
+                };
+
+                uart2: serial@01c28800 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x01c28800 0x400>;
+                        interrupts = <0 2 1>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&apb2_gates 18>;
+                        status = "disabled";
+                };
+
+                uart3: serial@01c28c00 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x01c28c00 0x400>;
+                        interrupts = <0 3 1>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&apb2_gates 19>;
+                        status = "disabled";
+                };
+
+                uart4: serial@01c29000 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x01c29000 0x400>;
+                        interrupts = <0 4 1>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&apb2_gates 20>;
+                        status = "disabled";
+                };
+
+                uart5: serial@01c29400 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x01c29400 0x400>;
+                        interrupts = <0 5 1>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&apb2_gates 21>;
+                        status = "disabled";
+                };
+
+                gic: interrupt-controller@01c81000 {
+                        compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";
+                        reg = <0x01c81000 0x1000>,
+                              <0x01c82000 0x1000>,
+                              <0x01c84000 0x2000>,
+                              <0x01c86000 0x2000>;
+                        interrupt-controller;
+                        #interrupt-cells = <3>;
+                        interrupts = <1 9 0xf04>;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
new file mode 100644
index 000000000000..15e625eca312
--- /dev/null
+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2013 Maxime Ripard
+ *
+ * Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+/include/ "sun7i-a20.dtsi"
+
+/ {
+        model = "Cubietech Cubieboard2";
+        compatible = "cubietech,cubieboard2", "allwinner,sun7i-a20";
+
+        soc@01c00000 {
+                emac: ethernet@01c0b000 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&emac_pins_a>;
+                        phy = <&phy1>;
+                        status = "okay";
+                };
+
+                mdio@01c0b080 {
+                        status = "okay";
+
+                        phy1: ethernet-phy@1 {
+                                reg = <1>;
+                        };
+                };
+
+                pinctrl@01c20800 {
+                        led_pins_cubieboard2: led_pins@0 {
+                                allwinner,pins = "PH20", "PH21";
+                                allwinner,function = "gpio_out";
+                                allwinner,drive = <0>;
+                                allwinner,pull = <0>;
+                        };
+                };
+
+                uart0: serial@01c28000 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&uart0_pins_a>;
+                        status = "okay";
+                };
+        };
+
+        leds {
+                compatible = "gpio-leds";
+                pinctrl-names = "default";
+                pinctrl-0 = <&led_pins_cubieboard2>;
+
+                blue {
+                        label = "cubieboard2:blue:usr";
+                        gpios = <&pio 7 21 0>;
+                };
+
+                green {
+                        label = "cubieboard2:green:usr";
+                        gpios = <&pio 7 20 0>;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
new file mode 100644
index 000000000000..9e778557fadb
--- /dev/null
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
@@ -0,0 +1,76 @@
+/*
+ * Copyright 2013 Maxime Ripard
+ *
+ * Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/dts-v1/;
+/include/ "sun7i-a20.dtsi"
+
+/ {
+        model = "Olimex A20-Olinuxino Micro";
+        compatible = "olimex,a20-olinuxino-micro", "allwinner,sun7i-a20";
+
+        soc@01c00000 {
+                emac: ethernet@01c0b000 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&emac_pins_a>;
+                        phy = <&phy1>;
+                        status = "okay";
+                };
+
+                mdio@01c0b080 {
+                        status = "okay";
+
+                        phy1: ethernet-phy@1 {
+                                reg = <1>;
+                        };
+                };
+
+                pinctrl@01c20800 {
+                        led_pins_olinuxino: led_pins@0 {
+                                allwinner,pins = "PH2";
+                                allwinner,function = "gpio_out";
+                                allwinner,drive = <1>;
+                                allwinner,pull = <0>;
+                        };
+                };
+
+                uart0: serial@01c28000 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&uart0_pins_a>;
+                        status = "okay";
+                };
+
+                uart6: serial@01c29800 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&uart6_pins_a>;
+                        status = "okay";
+                };
+
+                uart7: serial@01c29c00 {
+                        pinctrl-names = "default";
+                        pinctrl-0 = <&uart7_pins_a>;
+                        status = "okay";
+                };
+        };
+
+        leds {
+                compatible = "gpio-leds";
+                pinctrl-names = "default";
+                pinctrl-0 = <&led_pins_olinuxino>;
+
+                green {
+                        label = "a20-olinuxino-micro:green:usr";
+                        gpios = <&pio 7 2 0>;
+                        default-state = "on";
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
new file mode 100644
index 000000000000..80559cbdbc87
--- /dev/null
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -0,0 +1,338 @@
+/*
+ * Copyright 2013 Maxime Ripard
+ *
+ * Maxime Ripard <maxime.ripard@free-electrons.com>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/include/ "skeleton.dtsi"
+
+/ {
+        interrupt-parent = <&gic>;
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                cpu@0 {
+                        compatible = "arm,cortex-a7";
+                        device_type = "cpu";
+                        reg = <0>;
+                };
+
+                cpu@1 {
+                        compatible = "arm,cortex-a7";
+                        device_type = "cpu";
+                        reg = <1>;
+                };
+        };
+
+        memory {
+                reg = <0x40000000 0x80000000>;
+        };
+
+        clocks {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+
+                osc24M: osc24M@01c20050 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun4i-osc-clk";
+                        reg = <0x01c20050 0x4>;
+                        clock-frequency = <24000000>;
+                };
+
+                osc32k: osc32k {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <32768>;
+                };
+
+                pll1: pll1@01c20000 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun4i-pll1-clk";
+                        reg = <0x01c20000 0x4>;
+                        clocks = <&osc24M>;
+                };
+
+                /*
+                 * This is a dummy clock, to be used as placeholder on
+                 * other mux clocks when a specific parent clock is not
+                 * yet implemented. It should be dropped when the driver
+                 * is complete.
+                 */
+                pll6: pll6 {
+                        #clock-cells = <0>;
+                        compatible = "fixed-clock";
+                        clock-frequency = <0>;
+                };
+
+                cpu: cpu@01c20054 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun4i-cpu-clk";
+                        reg = <0x01c20054 0x4>;
+                        clocks = <&osc32k>, <&osc24M>, <&pll1>, <&pll6>;
+                };
+
+                axi: axi@01c20054 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun4i-axi-clk";
+                        reg = <0x01c20054 0x4>;
+                        clocks = <&cpu>;
+                };
+
+                ahb: ahb@01c20054 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun4i-ahb-clk";
+                        reg = <0x01c20054 0x4>;
+                        clocks = <&axi>;
+                };
+
+                ahb_gates: ahb_gates@01c20060 {
+                        #clock-cells = <1>;
+                        compatible = "allwinner,sun7i-a20-ahb-gates-clk";
+                        reg = <0x01c20060 0x8>;
+                        clocks = <&ahb>;
+                        clock-output-names = "ahb_usb0", "ahb_ehci0",
+                                "ahb_ohci0", "ahb_ehci1", "ahb_ohci1",
+                                "ahb_ss", "ahb_dma", "ahb_bist", "ahb_mmc0",
+                                "ahb_mmc1", "ahb_mmc2", "ahb_mmc3", "ahb_ms",
+                                "ahb_nand", "ahb_sdram", "ahb_ace",
+                                "ahb_emac", "ahb_ts", "ahb_spi0", "ahb_spi1",
+                                "ahb_spi2", "ahb_spi3", "ahb_sata",
+                                "ahb_hstimer", "ahb_ve", "ahb_tvd", "ahb_tve0",
+                                "ahb_tve1", "ahb_lcd0", "ahb_lcd1", "ahb_csi0",
+                                "ahb_csi1", "ahb_hdmi1", "ahb_hdmi0",
+                                "ahb_de_be0", "ahb_de_be1", "ahb_de_fe0",
+                                "ahb_de_fe1", "ahb_gmac", "ahb_mp",
+                                "ahb_mali";
+                };
+
+                apb0: apb0@01c20054 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun4i-apb0-clk";
+                        reg = <0x01c20054 0x4>;
+                        clocks = <&ahb>;
+                };
+
+                apb0_gates: apb0_gates@01c20068 {
+                        #clock-cells = <1>;
+                        compatible = "allwinner,sun7i-a20-apb0-gates-clk";
+                        reg = <0x01c20068 0x4>;
+                        clocks = <&apb0>;
+                        clock-output-names = "apb0_codec", "apb0_spdif",
+                                "apb0_ac97", "apb0_iis0", "apb0_iis1",
+                                "apb0_pio", "apb0_ir0", "apb0_ir1",
+                                "apb0_iis2", "apb0_keypad";
+                };
+
+                apb1_mux: apb1_mux@01c20058 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun4i-apb1-mux-clk";
+                        reg = <0x01c20058 0x4>;
+                        clocks = <&osc24M>, <&pll6>, <&osc32k>;
+                };
+
+                apb1: apb1@01c20058 {
+                        #clock-cells = <0>;
+                        compatible = "allwinner,sun4i-apb1-clk";
+                        reg = <0x01c20058 0x4>;
+                        clocks = <&apb1_mux>;
+                };
+
+                apb1_gates: apb1_gates@01c2006c {
+                        #clock-cells = <1>;
+                        compatible = "allwinner,sun7i-a20-apb1-gates-clk";
+                        reg = <0x01c2006c 0x4>;
+                        clocks = <&apb1>;
+                        clock-output-names = "apb1_i2c0", "apb1_i2c1",
+                                "apb1_i2c2", "apb1_i2c3", "apb1_can",
+                                "apb1_scr", "apb1_ps20", "apb1_ps21",
+                                "apb1_i2c4", "apb1_uart0", "apb1_uart1",
+                                "apb1_uart2", "apb1_uart3", "apb1_uart4",
+                                "apb1_uart5", "apb1_uart6", "apb1_uart7";
+                };
+        };
+
+        soc@01c00000 {
+                compatible = "simple-bus";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                ranges;
+
+                emac: ethernet@01c0b000 {
+                        compatible = "allwinner,sun4i-emac";
+                        reg = <0x01c0b000 0x1000>;
+                        interrupts = <0 55 1>;
+                        clocks = <&ahb_gates 17>;
+                        status = "disabled";
+                };
+
+                mdio@01c0b080 {
+                        compatible = "allwinner,sun4i-mdio";
+                        reg = <0x01c0b080 0x14>;
+                        status = "disabled";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                };
+
+                pio: pinctrl@01c20800 {
+                        compatible = "allwinner,sun7i-a20-pinctrl";
+                        reg = <0x01c20800 0x400>;
+                        interrupts = <0 28 1>;
+                        clocks = <&apb0_gates 5>;
+                        gpio-controller;
+                        interrupt-controller;
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        #gpio-cells = <3>;
+
+                        uart0_pins_a: uart0@0 {
+                                allwinner,pins = "PB22", "PB23";
+                                allwinner,function = "uart0";
+                                allwinner,drive = <0>;
+                                allwinner,pull = <0>;
+                        };
+
+                        uart6_pins_a: uart6@0 {
+                                allwinner,pins = "PI12", "PI13";
+                                allwinner,function = "uart6";
+                                allwinner,drive = <0>;
+                                allwinner,pull = <0>;
+                        };
+
+                        uart7_pins_a: uart7@0 {
+                                allwinner,pins = "PI20", "PI21";
+                                allwinner,function = "uart7";
+                                allwinner,drive = <0>;
+                                allwinner,pull = <0>;
+                        };
+
+                        emac_pins_a: emac0@0 {
+                                allwinner,pins = "PA0", "PA1", "PA2",
+                                                "PA3", "PA4", "PA5", "PA6",
+                                                "PA7", "PA8", "PA9", "PA10",
+                                                "PA11", "PA12", "PA13", "PA14",
+                                                "PA15", "PA16";
+                                allwinner,function = "emac";
+                                allwinner,drive = <0>;
+                                allwinner,pull = <0>;
+                        };
+                };
+
+                timer@01c20c00 {
+                        compatible = "allwinner,sun4i-timer";
+                        reg = <0x01c20c00 0x90>;
+                        interrupts = <0 22 1>,
+                                     <0 23 1>,
+                                     <0 24 1>,
+                                     <0 25 1>,
+                                     <0 67 1>,
+                                     <0 68 1>;
+                        clocks = <&osc24M>;
+                };
+
+                wdt: watchdog@01c20c90 {
+                        compatible = "allwinner,sun4i-wdt";
+                        reg = <0x01c20c90 0x10>;
+                };
+
+                uart0: serial@01c28000 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x01c28000 0x400>;
+                        interrupts = <0 1 1>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&apb1_gates 16>;
+                        status = "disabled";
+                };
+
+                uart1: serial@01c28400 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x01c28400 0x400>;
+                        interrupts = <0 2 1>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&apb1_gates 17>;
+                        status = "disabled";
+                };
+
+                uart2: serial@01c28800 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x01c28800 0x400>;
+                        interrupts = <0 3 1>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&apb1_gates 18>;
+                        status = "disabled";
+                };
+
+                uart3: serial@01c28c00 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x01c28c00 0x400>;
+                        interrupts = <0 4 1>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&apb1_gates 19>;
+                        status = "disabled";
+                };
+
+                uart4: serial@01c29000 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x01c29000 0x400>;
+                        interrupts = <0 17 1>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&apb1_gates 20>;
+                        status = "disabled";
+                };
+
+                uart5: serial@01c29400 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x01c29400 0x400>;
+                        interrupts = <0 18 1>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&apb1_gates 21>;
+                        status = "disabled";
+                };
+
+                uart6: serial@01c29800 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x01c29800 0x400>;
+                        interrupts = <0 19 1>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&apb1_gates 22>;
+                        status = "disabled";
+                };
+
+                uart7: serial@01c29c00 {
+                        compatible = "snps,dw-apb-uart";
+                        reg = <0x01c29c00 0x400>;
+                        interrupts = <0 20 1>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clocks = <&apb1_gates 23>;
+                        status = "disabled";
+                };
+
+                gic: interrupt-controller@01c81000 {
+                        compatible = "arm,cortex-a7-gic", "arm,cortex-a15-gic";
+                        reg = <0x01c81000 0x1000>,
+                              <0x01c82000 0x1000>,
+                              <0x01c84000 0x2000>,
+                              <0x01c86000 0x2000>;
+                        interrupt-controller;
+                        #interrupt-cells = <3>;
+                        interrupts = <1 9 0xf04>;
+                };
+        };
+};
diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts
index cb640eb6c932..60230288884b 100644
--- a/arch/arm/boot/dts/tegra114-dalmore.dts
+++ b/arch/arm/boot/dts/tegra114-dalmore.dts
@@ -791,7 +791,7 @@
                                         regulator-boot-on;
                                 };
 
-                                dcdc3 {
+                                tps65090_dcdc3_reg: dcdc3 {
                                         regulator-name = "vdd-ao";
                                         regulator-always-on;
                                         regulator-boot-on;
@@ -836,6 +836,182 @@
                                 };
                         };
                 };
+
+                palmas: tps65913 {
+                        compatible = "ti,palmas";
+                        reg = <0x58>;
+                        interrupts = <0 86 IRQ_TYPE_LEVEL_LOW>;
+
+                        #interrupt-cells = <2>;
+                        interrupt-controller;
+
+                        ti,system-power-controller;
+
+                        palmas_gpio: gpio {
+                                compatible = "ti,palmas-gpio";
+                                gpio-controller;
+                                #gpio-cells = <2>;
+                        };
+
+                        pmic {
+                                compatible = "ti,tps65913-pmic", "ti,palmas-pmic";
+                                smps1-in-supply = <&tps65090_dcdc3_reg>;
+                                smps3-in-supply = <&tps65090_dcdc3_reg>;
+                                smps4-in-supply = <&tps65090_dcdc2_reg>;
+                                smps7-in-supply = <&tps65090_dcdc2_reg>;
+                                smps8-in-supply = <&tps65090_dcdc2_reg>;
+                                smps9-in-supply = <&tps65090_dcdc2_reg>;
+                                ldo1-in-supply = <&tps65090_dcdc2_reg>;
+                                ldo2-in-supply = <&tps65090_dcdc2_reg>;
+                                ldo3-in-supply = <&palmas_smps3_reg>;
+                                ldo4-in-supply = <&tps65090_dcdc2_reg>;
+                                ldo5-in-supply = <&vdd_ac_bat_reg>;
+                                ldo6-in-supply = <&tps65090_dcdc2_reg>;
+                                ldo7-in-supply = <&tps65090_dcdc2_reg>;
+                                ldo8-in-supply = <&tps65090_dcdc3_reg>;
+                                ldo9-in-supply = <&palmas_smps9_reg>;
+                                ldoln-in-supply = <&tps65090_dcdc1_reg>;
+                                ldousb-in-supply = <&tps65090_dcdc1_reg>;
+
+                                regulators {
+                                        smps12 {
+                                                regulator-name = "vddio-ddr";
+                                                regulator-min-microvolt = <1350000>;
+                                                regulator-max-microvolt = <1350000>;
+                                                regulator-always-on;
+                                                regulator-boot-on;
+                                        };
+
+                                        palmas_smps3_reg: smps3 {
+                                                regulator-name = "vddio-1v8";
+                                                regulator-min-microvolt = <1800000>;
+                                                regulator-max-microvolt = <1800000>;
+                                                regulator-always-on;
+                                                regulator-boot-on;
+                                        };
+
+                                        smps45 {
+                                                regulator-name = "vdd-core";
+                                                regulator-min-microvolt = <900000>;
+                                                regulator-max-microvolt = <1400000>;
+                                                regulator-always-on;
+                                                regulator-boot-on;
+                                        };
+
+                                        smps457 {
+                                                regulator-name = "vdd-core";
+                                                regulator-min-microvolt = <900000>;
+                                                regulator-max-microvolt = <1400000>;
+                                                regulator-always-on;
+                                                regulator-boot-on;
+                                        };
+
+                                        smps8 {
+                                                regulator-name = "avdd-pll";
+                                                regulator-min-microvolt = <1050000>;
+                                                regulator-max-microvolt = <1050000>;
+                                                regulator-always-on;
+                                                regulator-boot-on;
+                                        };
+
+                                        palmas_smps9_reg: smps9 {
+                                                regulator-name = "sdhci-vdd-sd-slot";
+                                                regulator-min-microvolt = <2800000>;
+                                                regulator-max-microvolt = <2800000>;
+                                                regulator-always-on;
+                                        };
+
+                                        ldo1 {
+                                                regulator-name = "avdd-cam1";
+                                                regulator-min-microvolt = <2800000>;
+                                                regulator-max-microvolt = <2800000>;
+                                        };
+
+                                        ldo2 {
+                                                regulator-name = "avdd-cam2";
+                                                regulator-min-microvolt = <2800000>;
+                                                regulator-max-microvolt = <2800000>;
+                                        };
+
+                                        ldo3 {
+                                                regulator-name = "avdd-dsi-csi";
+                                                regulator-min-microvolt = <1200000>;
+                                                regulator-max-microvolt = <1200000>;
+                                                regulator-always-on;
+                                                regulator-boot-on;
+                                        };
+
+                                        ldo4 {
+                                                regulator-name = "vpp-fuse";
+                                                regulator-min-microvolt = <1800000>;
+                                                regulator-max-microvolt = <1800000>;
+                                        };
+
+                                        ldo6 {
+                                                regulator-name = "vdd-sensor-2v85";
+                                                regulator-min-microvolt = <2850000>;
+                                                regulator-max-microvolt = <2850000>;
+                                        };
+
+                                        ldo7 {
+                                                regulator-name = "vdd-af-cam1";
+                                                regulator-min-microvolt = <2800000>;
+                                                regulator-max-microvolt = <2800000>;
+                                        };
+
+                                        ldo8 {
+                                                regulator-name = "vdd-rtc";
+                                                regulator-min-microvolt = <900000>;
+                                                regulator-max-microvolt = <900000>;
+                                                regulator-always-on;
+                                                regulator-boot-on;
+                                                ti,enable-ldo8-tracking;
+                                        };
+
+                                        ldo9 {
+                                                regulator-name = "vddio-sdmmc-2";
+                                                regulator-min-microvolt = <1800000>;
+                                                regulator-max-microvolt = <3300000>;
+                                                regulator-always-on;
+                                                regulator-boot-on;
+                                        };
+
+                                        ldoln {
+                                                regulator-name = "hvdd-usb";
+                                                regulator-min-microvolt = <3300000>;
+                                                regulator-max-microvolt = <3300000>;
+                                        };
+
+                                        ldousb {
+                                                regulator-name = "avdd-usb";
+                                                regulator-min-microvolt = <3300000>;
+                                                regulator-max-microvolt = <3300000>;
+                                                regulator-always-on;
+                                                regulator-boot-on;
+                                        };
+
+                                        regen1 {
+                                                regulator-name = "rail-3v3";
+                                                regulator-max-microvolt = <3300000>;
+                                                regulator-always-on;
+                                                regulator-boot-on;
+                                        };
+
+                                        regen2 {
+                                                regulator-name = "rail-5v0";
+                                                regulator-max-microvolt = <5000000>;
+                                                regulator-always-on;
+                                                regulator-boot-on;
+                                        };
+                                };
+                        };
+
+                        rtc {
+                                compatible = "ti,palmas-rtc";
+                                interrupt-parent = <&palmas>;
+                                interrupts = <8 0>;
+                        };
+                };
         };
 
         spi@7000da00 {
@@ -850,6 +1026,13 @@
 
         pmc {
                 nvidia,invert-interrupt;
+                nvidia,suspend-mode = <1>;
+                nvidia,cpu-pwr-good-time = <500>;
+                nvidia,cpu-pwr-off-time = <300>;
+                nvidia,core-pwr-good-time = <641 3845>;
+                nvidia,core-pwr-off-time = <61036>;
+                nvidia,core-power-req-active-high;
+                nvidia,sys-clock-req-active-high;
         };
 
         ahub {
@@ -870,6 +1053,15 @@
                 non-removable;
         };
 
+        usb@7d008000 {
+                status = "okay";
+        };
+
+        usb-phy@7d008000 {
+                status = "okay";
+                vbus-supply = <&usb3_vbus_reg>;
+        };
+
         clocks {
                 compatible = "simple-bus";
                 #address-cells = <1>;
@@ -883,6 +1075,35 @@
                 };
         };
 
+        gpio-keys {
+                compatible = "gpio-keys";
+
+                home {
+                        label = "Home";
+                        gpios = <&gpio TEGRA_GPIO(I, 5) GPIO_ACTIVE_LOW>;
+                        linux,code = <102>; /* KEY_HOME */
+                };
+
+                power {
+                        label = "Power";
+                        gpios = <&gpio TEGRA_GPIO(Q, 0) GPIO_ACTIVE_LOW>;
+                        linux,code = <116>; /* KEY_POWER */
+                        gpio-key,wakeup;
+                };
+
+                volume_down {
+                        label = "Volume Down";
+                        gpios = <&gpio TEGRA_GPIO(R, 1) GPIO_ACTIVE_LOW>;
+                        linux,code = <114>; /* KEY_VOLUMEDOWN */
+                };
+
+                volume_up {
+                        label = "Volume Up";
+                        gpios = <&gpio TEGRA_GPIO(R, 2) GPIO_ACTIVE_LOW>;
+                        linux,code = <115>; /* KEY_VOLUMEUP */
+                };
+        };
+
         regulators {
                 compatible = "simple-bus";
                 #address-cells = <1>;
@@ -951,6 +1172,16 @@
                         gpio = <&gpio TEGRA_GPIO(K, 1) GPIO_ACTIVE_HIGH>;
                         vin-supply = <&tps65090_dcdc1_reg>;
                 };
+
+                vdd_cam_1v8_reg: regulator@6 {
+                        compatible = "regulator-fixed";
+                        reg = <6>;
+                        regulator-name = "vdd_cam_1v8_reg";
+                        regulator-min-microvolt = <1800000>;
+                        regulator-max-microvolt = <1800000>;
+                        enable-active-high;
+                        gpio = <&palmas_gpio 6 0>;
+                };
         };
 
         sound {
@@ -964,7 +1195,9 @@
                         "Speakers", "SPORP",
                         "Speakers", "SPORN",
                         "Speakers", "SPOLP",
-                        "Speakers", "SPOLN";
+                        "Speakers", "SPOLN",
+                        "Mic Jack", "MICBIAS1",
+                        "IN2P", "Mic Jack";
 
                 nvidia,i2s-controller = <&tegra_i2s1>;
                 nvidia,audio-codec = <&rt5640>;
diff --git a/arch/arm/boot/dts/tegra114-pluto.dts b/arch/arm/boot/dts/tegra114-pluto.dts
deleted file mode 100644
index d5f8d3e0bde2..000000000000
--- a/arch/arm/boot/dts/tegra114-pluto.dts
+++ /dev/null
@@ -1,33 +0,0 @@
-/dts-v1/;
-
-#include "tegra114.dtsi"
-
-/ {
-        model = "NVIDIA Tegra114 Pluto evaluation board";
-        compatible = "nvidia,pluto", "nvidia,tegra114";
-
-        memory {
-                reg = <0x80000000 0x40000000>;
-        };
-
-        serial@70006300 {
-                status = "okay";
-        };
-
-        pmc {
-                nvidia,invert-interrupt;
-        };
-
-        clocks {
-                compatible = "simple-bus";
-                #address-cells = <1>;
-                #size-cells = <0>;
-
-                clk32k_in: clock {
-                        compatible = "fixed-clock";
-                        reg=<0>;
-                        #clock-cells = <0>;
-                        clock-frequency = <32768>;
-                };
-        };
-};
diff --git a/arch/arm/boot/dts/tegra114.dtsi b/arch/arm/boot/dts/tegra114.dtsi
index abf6c40d28c6..2905145d8e59 100644
--- a/arch/arm/boot/dts/tegra114.dtsi
+++ b/arch/arm/boot/dts/tegra114.dtsi
@@ -430,6 +430,68 @@
                 status = "disable";
         };
 
+        usb@7d000000 {
+                compatible = "nvidia,tegra30-ehci", "usb-ehci";
+                reg = <0x7d000000 0x4000>;
+                interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+                phy_type = "utmi";
+                clocks = <&tegra_car TEGRA114_CLK_USBD>;
+                nvidia,phy = <&phy1>;
+                status = "disabled";
+        };
+
+        phy1: usb-phy@7d000000 {
+                compatible = "nvidia,tegra30-usb-phy";
+                reg = <0x7d000000 0x4000 0x7d000000 0x4000>;
+                phy_type = "utmi";
+                clocks = <&tegra_car TEGRA114_CLK_USBD>,
+                         <&tegra_car TEGRA114_CLK_PLL_U>,
+                         <&tegra_car TEGRA114_CLK_USBD>;
+                clock-names = "reg", "pll_u", "utmi-pads";
+                nvidia,hssync-start-delay = <0>;
+                nvidia,idle-wait-delay = <17>;
+                nvidia,elastic-limit = <16>;
+                nvidia,term-range-adj = <6>;
+                nvidia,xcvr-setup = <9>;
+                nvidia,xcvr-lsfslew = <0>;
+                nvidia,xcvr-lsrslew = <3>;
+                nvidia,hssquelch-level = <2>;
+                nvidia,hsdiscon-level = <5>;
+                nvidia,xcvr-hsslew = <12>;
+                status = "disabled";
+        };
+
+        usb@7d008000 {
+                compatible = "nvidia,tegra30-ehci", "usb-ehci";
+                reg = <0x7d008000 0x4000>;
+                interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
+                phy_type = "utmi";
+                clocks = <&tegra_car TEGRA114_CLK_USB3>;
+                nvidia,phy = <&phy3>;
+                status = "disabled";
+        };
+
+        phy3: usb-phy@7d008000 {
+                compatible = "nvidia,tegra30-usb-phy";
+                reg = <0x7d008000 0x4000 0x7d000000 0x4000>;
+                phy_type = "utmi";
+                clocks = <&tegra_car TEGRA114_CLK_USB3>,
+                         <&tegra_car TEGRA114_CLK_PLL_U>,
+                         <&tegra_car TEGRA114_CLK_USBD>;
+                clock-names = "reg", "pll_u", "utmi-pads";
+                nvidia,hssync-start-delay = <0>;
+                nvidia,idle-wait-delay = <17>;
+                nvidia,elastic-limit = <16>;
+                nvidia,term-range-adj = <6>;
+                nvidia,xcvr-setup = <9>;
+                nvidia,xcvr-lsfslew = <0>;
+                nvidia,xcvr-lsrslew = <3>;
+                nvidia,hssquelch-level = <2>;
+                nvidia,hsdiscon-level = <5>;
+                nvidia,xcvr-hsslew = <12>;
+                status = "disabled";
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
diff --git a/arch/arm/boot/dts/tegra20-colibri-512.dtsi b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
index 5592be6f2f7a..d5c9bca01232 100644
--- a/arch/arm/boot/dts/tegra20-colibri-512.dtsi
+++ b/arch/arm/boot/dts/tegra20-colibri-512.dtsi
@@ -363,7 +363,7 @@
         };
 
         pmc {
-                nvidia,suspend-mode = <2>;
+                nvidia,suspend-mode = <1>;
                 nvidia,cpu-pwr-good-time = <5000>;
                 nvidia,cpu-pwr-off-time = <5000>;
                 nvidia,core-pwr-good-time = <3845 3845>;
diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
index d9f89cd879a7..e156ab30e763 100644
--- a/arch/arm/boot/dts/tegra20-harmony.dts
+++ b/arch/arm/boot/dts/tegra20-harmony.dts
@@ -335,7 +335,7 @@
                                         regulator-always-on;
                                 };
 
-                                ldo0 {
+                                pci_clk_reg: ldo0 {
                                         regulator-name = "vdd_ldo0,vddio_pex_clk";
                                         regulator-min-microvolt = <3300000>;
                                         regulator-max-microvolt = <3300000>;
@@ -417,7 +417,7 @@
 
         pmc {
                 nvidia,invert-interrupt;
-                nvidia,suspend-mode = <2>;
+                nvidia,suspend-mode = <1>;
                 nvidia,cpu-pwr-good-time = <5000>;
                 nvidia,cpu-pwr-off-time = <5000>;
                 nvidia,core-pwr-good-time = <3845 3845>;
@@ -425,6 +425,20 @@
                 nvidia,sys-clock-req-active-high;
         };
 
+        pcie-controller {
+                pex-clk-supply = <&pci_clk_reg>;
+                vdd-supply = <&pci_vdd_reg>;
+                status = "okay";
+
+                pci@1,0 {
+                        status = "okay";
+                };
+
+                pci@2,0 {
+                        status = "okay";
+                };
+        };
+
         usb@c5000000 {
                 status = "okay";
         };
@@ -643,7 +657,7 @@
                         enable-active-high;
                 };
 
-                regulator@3 {
+                pci_vdd_reg: regulator@3 {
                         compatible = "regulator-fixed";
                         reg = <3>;
                         regulator-name = "vdd_1v05";
@@ -651,8 +665,6 @@
                         regulator-max-microvolt = <1050000>;
                         gpio = <&pmic 2 GPIO_ACTIVE_HIGH>;
                         enable-active-high;
-                        /* Hack until board-harmony-pcie.c is removed */
-                        status = "disabled";
                 };
 
                 regulator@4 {
diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
index cfd12763b1b2..8d71fc9d8a2f 100644
--- a/arch/arm/boot/dts/tegra20-paz00.dts
+++ b/arch/arm/boot/dts/tegra20-paz00.dts
@@ -417,7 +417,7 @@
 
         pmc {
                 nvidia,invert-interrupt;
-                nvidia,suspend-mode = <2>;
+                nvidia,suspend-mode = <1>;
                 nvidia,cpu-pwr-good-time = <2000>;
                 nvidia,cpu-pwr-off-time = <0>;
                 nvidia,core-pwr-good-time = <3845 3845>;
diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
index 40e6fb280333..315aae26c3cd 100644
--- a/arch/arm/boot/dts/tegra20-seaboard.dts
+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
@@ -518,7 +518,7 @@
 
         pmc {
                 nvidia,invert-interrupt;
-                nvidia,suspend-mode = <2>;
+                nvidia,suspend-mode = <1>;
                 nvidia,cpu-pwr-good-time = <5000>;
                 nvidia,cpu-pwr-off-time = <5000>;
                 nvidia,core-pwr-good-time = <3845 3845>;
@@ -566,7 +566,6 @@
 
         usb@c5000000 {
                 status = "okay";
-                nvidia,vbus-gpio = <&gpio TEGRA_GPIO(D, 0) GPIO_ACTIVE_HIGH>;
                 dr_mode = "otg";
         };
 
@@ -829,7 +828,7 @@
                         regulator-min-microvolt = <5000000>;
                         regulator-max-microvolt = <5000000>;
                         enable-active-high;
-                        gpio = <&gpio 24 0>; /* PD0 */
+                        gpio = <&gpio TEGRA_GPIO(D, 0) 0>;
                         regulator-always-on;
                         regulator-boot-on;
                 };
diff --git a/arch/arm/boot/dts/tegra20-tamonten.dtsi b/arch/arm/boot/dts/tegra20-tamonten.dtsi
index c54faae7cfb3..7726dab3d08d 100644
--- a/arch/arm/boot/dts/tegra20-tamonten.dtsi
+++ b/arch/arm/boot/dts/tegra20-tamonten.dtsi
@@ -366,7 +366,7 @@
                                         regulator-always-on;
                                 };
 
-                                ldo0 {
+                                pci_clk_reg: ldo0 {
                                         regulator-name = "vdd_ldo0,vddio_pex_clk";
                                         regulator-min-microvolt = <3300000>;
                                         regulator-max-microvolt = <3300000>;
@@ -459,7 +459,7 @@
 
         pmc {
                 nvidia,invert-interrupt;
-                nvidia,suspend-mode = <2>;
+                nvidia,suspend-mode = <1>;
                 nvidia,cpu-pwr-good-time = <5000>;
                 nvidia,cpu-pwr-off-time = <5000>;
                 nvidia,core-pwr-good-time = <3845 3845>;
@@ -467,6 +467,11 @@
                 nvidia,sys-clock-req-active-high;
         };
 
+        pcie-controller {
+                pex-clk-supply = <&pci_clk_reg>;
+                vdd-supply = <&pci_vdd_reg>;
+        };
+
         usb@c5008000 {
                 status = "okay";
         };
@@ -509,5 +514,15 @@
                         regulator-max-microvolt = <5000000>;
                         regulator-always-on;
                 };
+
+                pci_vdd_reg: regulator@1 {
+                        compatible = "regulator-fixed";
+                        reg = <1>;
+                        regulator-name = "vdd_1v05";
+                        regulator-min-microvolt = <1050000>;
+                        regulator-max-microvolt = <1050000>;
+                        gpio = <&pmic 2 0>;
+                        enable-active-high;
+                };
         };
 };
diff --git a/arch/arm/boot/dts/tegra20-tec.dts b/arch/arm/boot/dts/tegra20-tec.dts
index c572c43751b1..3ada3cb67f07 100644
--- a/arch/arm/boot/dts/tegra20-tec.dts
+++ b/arch/arm/boot/dts/tegra20-tec.dts
@@ -32,6 +32,14 @@
                 };
         };
 
+        pcie-controller {
+                status = "okay";
+
+                pci@1,0 {
+                        status = "okay";
+                };
+        };
+
         sound {
                 compatible = "ad,tegra-audio-wm8903-tec",
                              "nvidia,tegra-audio-wm8903";
diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
index 37c93d3c4812..78deea5c0d21 100644
--- a/arch/arm/boot/dts/tegra20-trimslice.dts
+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
@@ -302,7 +302,7 @@
         };
 
         pmc {
-                nvidia,suspend-mode = <2>;
+                nvidia,suspend-mode = <1>;
                 nvidia,cpu-pwr-good-time = <5000>;
                 nvidia,cpu-pwr-off-time = <5000>;
                 nvidia,core-pwr-good-time = <3845 3845>;
@@ -310,9 +310,18 @@
                 nvidia,sys-clock-req-active-high;
         };
 
+        pcie-controller {
+                status = "okay";
+                pex-clk-supply = <&pci_clk_reg>;
+                vdd-supply = <&pci_vdd_reg>;
+
+                pci@1,0 {
+                        status = "okay";
+                };
+        };
+
         usb@c5000000 {
                 status = "okay";
-                nvidia,vbus-gpio = <&gpio TEGRA_GPIO(V, 2) GPIO_ACTIVE_HIGH>;
         };
 
         usb-phy@c5000000 {
@@ -411,10 +420,28 @@
                         regulator-min-microvolt = <5000000>;
                         regulator-max-microvolt = <5000000>;
                         enable-active-high;
-                        gpio = <&gpio 170 0>; /* PV2 */
+                        gpio = <&gpio TEGRA_GPIO(V, 2) 0>;
                         regulator-always-on;
                         regulator-boot-on;
                 };
+
+                pci_clk_reg: regulator@3 {
+                        compatible = "regulator-fixed";
+                        reg = <3>;
+                        regulator-name = "pci_clk";
+                        regulator-min-microvolt = <3300000>;
+                        regulator-max-microvolt = <3300000>;
+                        regulator-always-on;
+                };
+
+                pci_vdd_reg: regulator@4 {
+                        compatible = "regulator-fixed";
+                        reg = <4>;
+                        regulator-name = "pci_vdd";
+                        regulator-min-microvolt = <1050000>;
+                        regulator-max-microvolt = <1050000>;
+                        regulator-always-on;
+                };
         };
 
         sound {
diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts
index 7f8c28d1121f..aab872cd0530 100644
--- a/arch/arm/boot/dts/tegra20-ventana.dts
+++ b/arch/arm/boot/dts/tegra20-ventana.dts
@@ -494,7 +494,7 @@
 
         pmc {
                 nvidia,invert-interrupt;
-                nvidia,suspend-mode = <2>;
+                nvidia,suspend-mode = <1>;
                 nvidia,cpu-pwr-good-time = <2000>;
                 nvidia,cpu-pwr-off-time = <100>;
                 nvidia,core-pwr-good-time = <3845 3845>;
diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts
index a3d0ebad78a1..d33a73cf167c 100644
--- a/arch/arm/boot/dts/tegra20-whistler.dts
+++ b/arch/arm/boot/dts/tegra20-whistler.dts
@@ -497,7 +497,7 @@
 
         pmc {
                 nvidia,invert-interrupt;
-                nvidia,suspend-mode = <2>;
+                nvidia,suspend-mode = <1>;
                 nvidia,cpu-pwr-good-time = <2000>;
                 nvidia,cpu-pwr-off-time = <1000>;
                 nvidia,core-pwr-good-time = <0 3845>;
@@ -509,7 +509,6 @@
 
         usb@c5000000 {
                 status = "okay";
-                nvidia,vbus-gpio = <&tca6416 0 GPIO_ACTIVE_HIGH>;
         };
 
         usb-phy@c5000000 {
@@ -519,7 +518,6 @@
 
         usb@c5008000 {
                 status = "okay";
-                nvidia,vbus-gpio = <&tca6416 1 GPIO_ACTIVE_HIGH>;
         };
 
         usb-phy@c5008000 {
diff --git a/arch/arm/boot/dts/tegra20.dtsi b/arch/arm/boot/dts/tegra20.dtsi
index 9653fd8288d2..df40b54fd8bc 100644
--- a/arch/arm/boot/dts/tegra20.dtsi
+++ b/arch/arm/boot/dts/tegra20.dtsi
@@ -455,6 +455,61 @@
                 #size-cells = <0>;
         };
 
+        pcie-controller {
+                compatible = "nvidia,tegra20-pcie";
+                device_type = "pci";
+                reg = <0x80003000 0x00000800   /* PADS registers */
+                       0x80003800 0x00000200   /* AFI registers */
+                       0x90000000 0x10000000>; /* configuration space */
+                reg-names = "pads", "afi", "cs";
+                interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH   /* controller interrupt */
+                              GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; /* MSI interrupt */
+                interrupt-names = "intr", "msi";
+
+                bus-range = <0x00 0xff>;
+                #address-cells = <3>;
+                #size-cells = <2>;
+
+                ranges = <0x82000000 0 0x80000000 0x80000000 0 0x00001000   /* port 0 registers */
+                          0x82000000 0 0x80001000 0x80001000 0 0x00001000   /* port 1 registers */
+                          0x81000000 0 0          0x82000000 0 0x00010000   /* downstream I/O */
+                          0x82000000 0 0xa0000000 0xa0000000 0 0x08000000   /* non-prefetchable memory */
+                          0xc2000000 0 0xa8000000 0xa8000000 0 0x18000000>; /* prefetchable memory */
+
+                clocks = <&tegra_car TEGRA20_CLK_PEX>,
+                         <&tegra_car TEGRA20_CLK_AFI>,
+                         <&tegra_car TEGRA20_CLK_PCIE_XCLK>,
+                         <&tegra_car TEGRA20_CLK_PLL_E>;
+                clock-names = "pex", "afi", "pcie_xclk", "pll_e";
+                status = "disabled";
+
+                pci@1,0 {
+                        device_type = "pci";
+                        assigned-addresses = <0x82000800 0 0x80000000 0 0x1000>;
+                        reg = <0x000800 0 0 0 0>;
+                        status = "disabled";
+
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        ranges;
+
+                        nvidia,num-lanes = <2>;
+                };
+
+                pci@2,0 {
+                        device_type = "pci";
+                        assigned-addresses = <0x82001000 0 0x80001000 0 0x1000>;
+                        reg = <0x001000 0 0 0 0>;
+                        status = "disabled";
+
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        ranges;
+
+                        nvidia,num-lanes = <2>;
+                };
+        };
+
         usb@c5000000 {
                 compatible = "nvidia,tegra20-ehci", "usb-ehci";
                 reg = <0xc5000000 0x4000>;
@@ -477,13 +532,13 @@
                          <&tegra_car TEGRA20_CLK_USBD>;
                 clock-names = "reg", "pll_u", "timer", "utmi-pads";
                 nvidia,has-legacy-mode;
-                hssync_start_delay = <9>;
-                idle_wait_delay = <17>;
-                elastic_limit = <16>;
-                term_range_adj = <6>;
-                xcvr_setup = <9>;
-                xcvr_lsfslew = <1>;
-                xcvr_lsrslew = <1>;
+                nvidia,hssync-start-delay = <9>;
+                nvidia,idle-wait-delay = <17>;
+                nvidia,elastic-limit = <16>;
+                nvidia,term-range-adj = <6>;
+                nvidia,xcvr-setup = <9>;
+                nvidia,xcvr-lsfslew = <1>;
+                nvidia,xcvr-lsrslew = <1>;
                 status = "disabled";
         };
 
@@ -527,13 +582,13 @@
                          <&tegra_car TEGRA20_CLK_CLK_M>,
                          <&tegra_car TEGRA20_CLK_USBD>;
                 clock-names = "reg", "pll_u", "timer", "utmi-pads";
-                hssync_start_delay = <9>;
-                idle_wait_delay = <17>;
-                elastic_limit = <16>;
-                term_range_adj = <6>;
-                xcvr_setup = <9>;
-                xcvr_lsfslew = <2>;
-                xcvr_lsrslew = <2>;
+                nvidia,hssync-start-delay = <9>;
+                nvidia,idle-wait-delay = <17>;
+                nvidia,elastic-limit = <16>;
+                nvidia,term-range-adj = <6>;
+                nvidia,xcvr-setup = <9>;
+                nvidia,xcvr-lsfslew = <2>;
+                nvidia,xcvr-lsrslew = <2>;
                 status = "disabled";
         };
 
diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts
index 87c5f7b7c271..08cad696e89f 100644
--- a/arch/arm/boot/dts/tegra30-beaver.dts
+++ b/arch/arm/boot/dts/tegra30-beaver.dts
@@ -10,6 +10,40 @@
                 reg = <0x80000000 0x7ff00000>;
         };
 
+        pcie-controller {
+                status = "okay";
+                pex-clk-supply = <&sys_3v3_pexs_reg>;
+                vdd-supply = <&ldo1_reg>;
+                avdd-supply = <&ldo2_reg>;
+
+                pci@1,0 {
+                        status = "okay";
+                        nvidia,num-lanes = <2>;
+                };
+
+                pci@2,0 {
+                        nvidia,num-lanes = <2>;
+                };
+
+                pci@3,0 {
+                        status = "okay";
+                        nvidia,num-lanes = <2>;
+                };
+        };
+
+        host1x {
+                hdmi {
+                        status = "okay";
+
+                        vdd-supply = <&sys_3v3_reg>;
+                        pll-supply = <&vio_reg>;
+
+                        nvidia,hpd-gpio =
+                                <&gpio TEGRA_GPIO(N, 7) GPIO_ACTIVE_HIGH>;
+                        nvidia,ddc-i2c-bus = <&hdmiddc>;
+                };
+        };
+
         pinmux {
                 pinctrl-names = "default";
                 pinctrl-0 = <&state_default>;
@@ -76,6 +110,11 @@
                                 nvidia,pull = <0>;
                                 nvidia,tristate = <0>;
                         };
+                        pex_l1_prsnt_n_pdd4 {
+                                nvidia,pins =   "pex_l1_prsnt_n_pdd4",
+                                                "pex_l1_clkreq_n_pdd6";
+                                nvidia,pull = <2>;
+                        };
                         sdio3 {
                                 nvidia,pins = "drive_sdio3";
                                 nvidia,high-speed-mode = <0>;
@@ -85,6 +124,10 @@
                                 nvidia,slew-rate-rising = <1>;
                                 nvidia,slew-rate-falling = <1>;
                         };
+                        gpv {
+                                nvidia,pins = "drive_gpv";
+                                nvidia,pull-up-strength = <16>;
+                        };
                 };
         };
 
@@ -107,7 +150,7 @@
                 clock-frequency = <100000>;
         };
 
-        i2c@7000c700 {
+        hdmiddc: i2c@7000c700 {
                 status = "okay";
                 clock-frequency = <100000>;
         };
@@ -262,7 +305,7 @@
         pmc {
                 status = "okay";
                 nvidia,invert-interrupt;
-                nvidia,suspend-mode = <2>;
+                nvidia,suspend-mode = <1>;
                 nvidia,cpu-pwr-good-time = <2000>;
                 nvidia,cpu-pwr-off-time = <200>;
                 nvidia,core-pwr-good-time = <3845 3845>;
@@ -285,6 +328,15 @@
                 non-removable;
         };
 
+        usb@7d008000 {
+                status = "okay";
+        };
+
+        usb-phy@7d008000 {
+                vbus-supply = <&usb3_vbus_reg>;
+                status = "okay";
+        };
+
         clocks {
                 compatible = "simple-bus";
                 #address-cells = <1>;
@@ -357,7 +409,7 @@
                         regulator-min-microvolt = <5000000>;
                         regulator-max-microvolt = <5000000>;
                         enable-active-high;
-                        gpio = <&gpio TEGRA_GPIO(I, 4) GPIO_ACTIVE_HIGH>;
+                        gpio = <&gpio TEGRA_GPIO(DD, 6) GPIO_ACTIVE_HIGH>;
                         gpio-open-drain;
                         vin-supply = <&vdd_5v_in_reg>;
                 };
@@ -369,7 +421,7 @@
                         regulator-min-microvolt = <5000000>;
                         regulator-max-microvolt = <5000000>;
                         enable-active-high;
-                        gpio = <&gpio TEGRA_GPIO(H, 7) GPIO_ACTIVE_HIGH>;
+                        gpio = <&gpio TEGRA_GPIO(DD, 4) GPIO_ACTIVE_HIGH>;
                         gpio-open-drain;
                         vin-supply = <&vdd_5v_in_reg>;
                 };
@@ -421,7 +473,9 @@
 
                 nvidia,audio-routing =
                         "Headphones", "HPOR",
-                        "Headphones", "HPOL";
+                        "Headphones", "HPOL",
+                        "Mic Jack", "MICBIAS1",
+                        "IN2P", "Mic Jack";
 
                 nvidia,i2s-controller = <&tegra_i2s1>;
                 nvidia,audio-codec = <&rt5640>;
diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
index f65b53d32416..e19dbf238e5c 100644
--- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
@@ -31,6 +31,26 @@
                 reg = <0x80000000 0x40000000>;
         };
 
+        pcie-controller {
+                status = "okay";
+                pex-clk-supply = <&pex_hvdd_3v3_reg>;
+                vdd-supply = <&ldo1_reg>;
+                avdd-supply = <&ldo2_reg>;
+
+                pci@1,0 {
+                        nvidia,num-lanes = <4>;
+                };
+
+                pci@2,0 {
+                        nvidia,num-lanes = <1>;
+                };
+
+                pci@3,0 {
+                        status = "okay";
+                        nvidia,num-lanes = <1>;
+                };
+        };
+
         pinmux {
                 pinctrl-names = "default";
                 pinctrl-0 = <&state_default>;
@@ -173,19 +193,6 @@
                         gpio-cfg = <0xffffffff 0xffffffff 0 0xffffffff 0xffffffff>;
                 };
 
-                tps62361 {
-                        compatible = "ti,tps62361";
-                        reg = <0x60>;
-
-                        regulator-name = "tps62361-vout";
-                        regulator-min-microvolt = <500000>;
-                        regulator-max-microvolt = <1500000>;
-                        regulator-boot-on;
-                        regulator-always-on;
-                        ti,vsel0-state-high;
-                        ti,vsel1-state-high;
-                };
-
                 pmic: tps65911@2d {
                         compatible = "ti,tps65911";
                         reg = <0x2d>;
@@ -286,6 +293,26 @@
                                 };
                         };
                 };
+
+                nct1008 {
+                        compatible = "onnn,nct1008";
+                        reg = <0x4c>;
+                        interrupt-parent = <&gpio>;
+                        interrupts = <TEGRA_GPIO(CC, 2) IRQ_TYPE_LEVEL_LOW>;
+                };
+
+                tps62361 {
+                        compatible = "ti,tps62361";
+                        reg = <0x60>;
+
+                        regulator-name = "tps62361-vout";
+                        regulator-min-microvolt = <500000>;
+                        regulator-max-microvolt = <1500000>;
+                        regulator-boot-on;
+                        regulator-always-on;
+                        ti,vsel0-state-high;
+                        ti,vsel1-state-high;
+                };
         };
 
         spi@7000da00 {
@@ -307,7 +334,7 @@
         pmc {
                 status = "okay";
                 nvidia,invert-interrupt;
-                nvidia,suspend-mode = <2>;
+                nvidia,suspend-mode = <1>;
                 nvidia,cpu-pwr-good-time = <2000>;
                 nvidia,cpu-pwr-off-time = <200>;
                 nvidia,core-pwr-good-time = <3845 3845>;
@@ -330,6 +357,15 @@
                 non-removable;
         };
 
+        usb@7d008000 {
+                status = "okay";
+        };
+
+        usb-phy@7d008000 {
+                vbus-supply = <&usb3_vbus_reg>;
+                status = "okay";
+        };
+
         clocks {
                 compatible = "simple-bus";
                 #address-cells = <1>;
diff --git a/arch/arm/boot/dts/tegra30.dtsi b/arch/arm/boot/dts/tegra30.dtsi
index d8783f0fae63..0022c127e1d9 100644
--- a/arch/arm/boot/dts/tegra30.dtsi
+++ b/arch/arm/boot/dts/tegra30.dtsi
@@ -16,6 +16,76 @@
                 serial4 = &uarte;
         };
 
+        pcie-controller {
+                compatible = "nvidia,tegra30-pcie";
+                device_type = "pci";
+                reg = <0x00003000 0x00000800   /* PADS registers */
+                       0x00003800 0x00000200   /* AFI registers */
+                       0x10000000 0x10000000>; /* configuration space */
+                reg-names = "pads", "afi", "cs";
+                interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH   /* controller interrupt */
+                              GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>; /* MSI interrupt */
+                interrupt-names = "intr", "msi";
+
+                bus-range = <0x00 0xff>;
+                #address-cells = <3>;
+                #size-cells = <2>;
+
+                ranges = <0x82000000 0 0x00000000 0x00000000 0 0x00001000   /* port 0 configuration space */
+                          0x82000000 0 0x00001000 0x00001000 0 0x00001000   /* port 1 configuration space */
+                          0x82000000 0 0x00004000 0x00004000 0 0x00001000   /* port 2 configuration space */
+                          0x81000000 0 0          0x02000000 0 0x00010000   /* downstream I/O */
+                          0x82000000 0 0x20000000 0x20000000 0 0x08000000   /* non-prefetchable memory */
+                          0xc2000000 0 0x28000000 0x28000000 0 0x18000000>; /* prefetchable memory */
+
+                clocks = <&tegra_car TEGRA30_CLK_PCIE>,
+                         <&tegra_car TEGRA30_CLK_AFI>,
+                         <&tegra_car TEGRA30_CLK_PCIEX>,
+                         <&tegra_car TEGRA30_CLK_PLL_E>,
+                         <&tegra_car TEGRA30_CLK_CML0>;
+                clock-names = "pex", "afi", "pcie_xclk", "pll_e", "cml";
+                status = "disabled";
+
+                pci@1,0 {
+                        device_type = "pci";
+                        assigned-addresses = <0x82000800 0 0x00000000 0 0x1000>;
+                        reg = <0x000800 0 0 0 0>;
+                        status = "disabled";
+
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        ranges;
+
+                        nvidia,num-lanes = <2>;
+                };
+
+                pci@2,0 {
+                        device_type = "pci";
+                        assigned-addresses = <0x82001000 0 0x00001000 0 0x1000>;
+                        reg = <0x001000 0 0 0 0>;
+                        status = "disabled";
+
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        ranges;
+
+                        nvidia,num-lanes = <2>;
+                };
+
+                pci@3,0 {
+                        device_type = "pci";
+                        assigned-addresses = <0x82001800 0 0x00004000 0 0x1000>;
+                        reg = <0x001800 0 0 0 0>;
+                        status = "disabled";
+
+                        #address-cells = <3>;
+                        #size-cells = <2>;
+                        ranges;
+
+                        nvidia,num-lanes = <2>;
+                };
+        };
+
         host1x {
                 compatible = "nvidia,tegra30-host1x", "simple-bus";
                 reg = <0x50000000 0x00024000>;
@@ -561,6 +631,92 @@
                 status = "disabled";
         };
 
+        usb@7d000000 {
+                compatible = "nvidia,tegra30-ehci", "usb-ehci";
+                reg = <0x7d000000 0x4000>;
+                interrupts = <GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>;
+                phy_type = "utmi";
+                clocks = <&tegra_car TEGRA30_CLK_USBD>;
+                nvidia,needs-double-reset;
+                nvidia,phy = <&phy1>;
+                status = "disabled";
+        };
+
+        phy1: usb-phy@7d000000 {
+                compatible = "nvidia,tegra30-usb-phy";
+                reg = <0x7d000000 0x4000 0x7d000000 0x4000>;
+                phy_type = "utmi";
+                clocks = <&tegra_car TEGRA30_CLK_USBD>,
+                         <&tegra_car TEGRA30_CLK_PLL_U>,
+                         <&tegra_car TEGRA30_CLK_USBD>;
+                clock-names = "reg", "pll_u", "utmi-pads";
+                nvidia,hssync-start-delay = <9>;
+                nvidia,idle-wait-delay = <17>;
+                nvidia,elastic-limit = <16>;
+                nvidia,term-range-adj = <6>;
+                nvidia,xcvr-setup = <51>;
+                nvidia.xcvr-setup-use-fuses;
+                nvidia,xcvr-lsfslew = <1>;
+                nvidia,xcvr-lsrslew = <1>;
+                nvidia,xcvr-hsslew = <32>;
+                nvidia,hssquelch-level = <2>;
+                nvidia,hsdiscon-level = <5>;
+                status = "disabled";
+        };
+
+        usb@7d004000 {
+                compatible = "nvidia,tegra30-ehci", "usb-ehci";
+                reg = <0x7d004000 0x4000>;
+                interrupts = <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
+                phy_type = "ulpi";
+                clocks = <&tegra_car TEGRA30_CLK_USB2>;
+                nvidia,phy = <&phy2>;
+                status = "disabled";
+        };
+
+        phy2: usb-phy@7d004000 {
+                compatible = "nvidia,tegra30-usb-phy";
+                reg = <0x7d004000 0x4000>;
+                phy_type = "ulpi";
+                clocks = <&tegra_car TEGRA30_CLK_USB2>,
+                         <&tegra_car TEGRA30_CLK_PLL_U>,
+                         <&tegra_car TEGRA30_CLK_CDEV2>;
+                clock-names = "reg", "pll_u", "ulpi-link";
+                status = "disabled";
+        };
+
+        usb@7d008000 {
+                compatible = "nvidia,tegra30-ehci", "usb-ehci";
+                reg = <0x7d008000 0x4000>;
+                interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
+                phy_type = "utmi";
+                clocks = <&tegra_car TEGRA30_CLK_USB3>;
+                nvidia,phy = <&phy3>;
+                status = "disabled";
+        };
+
+        phy3: usb-phy@7d008000 {
+                compatible = "nvidia,tegra30-usb-phy";
+                reg = <0x7d008000 0x4000 0x7d000000 0x4000>;
+                phy_type = "utmi";
+                clocks = <&tegra_car TEGRA30_CLK_USB3>,
+                         <&tegra_car TEGRA30_CLK_PLL_U>,
+                         <&tegra_car TEGRA30_CLK_USBD>;
+                clock-names = "reg", "pll_u", "utmi-pads";
+                nvidia,hssync-start-delay = <0>;
+                nvidia,idle-wait-delay = <17>;
+                nvidia,elastic-limit = <16>;
+                nvidia,term-range-adj = <6>;
+                nvidia,xcvr-setup = <51>;
+                nvidia.xcvr-setup-use-fuses;
+                nvidia,xcvr-lsfslew = <2>;
+                nvidia,xcvr-lsrslew = <2>;
+                nvidia,xcvr-hsslew = <32>;
+                nvidia,hssquelch-level = <2>;
+                nvidia,hsdiscon-level = <5>;
+                status = "disabled";
+        };
+
         cpus {
                 #address-cells = <1>;
                 #size-cells = <0>;
diff --git a/arch/arm/boot/dts/u9540.dts b/arch/arm/boot/dts/u9540.dts
deleted file mode 100644
index 95892ec6c342..000000000000
--- a/arch/arm/boot/dts/u9540.dts
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright 2012 ST-Ericsson AB
- *
- * The code contained herein is licensed under the GNU General Public
- * License. You may obtain a copy of the GNU General Public License
- * Version 2 or later at the following locations:
- *
- * http://www.opensource.org/licenses/gpl-license.html
- * http://www.gnu.org/copyleft/gpl.html
- */
-
-/dts-v1/;
-/include/ "dbx5x0.dtsi"
-
-/ {
-        model = "ST-Ericsson U9540 platform with Device Tree";
-        compatible = "st-ericsson,u9540";
-
-        memory {
-                reg = <0x00000000 0x20000000>;
-        };
-
-        soc-u9500 {
-                uart@80120000 {
-                        status = "okay";
-                };
-
-                uart@80121000 {
-                        status = "okay";
-                };
-
-                uart@80007000 {
-                        status = "okay";
-                };
-
-                // External Micro SD slot
-                sdi0_per1@80126000 {
-                        arm,primecell-periphid = <0x10480180>;
-                        max-frequency = <100000000>;
-                        bus-width = <4>;
-                        mmc-cap-sd-highspeed;
-                        mmc-cap-mmc-highspeed;
-                        vmmc-supply = <&ab8500_ldo_aux3_reg>;
-
-                        cd-gpios  = <&gpio7 6 0x4>; // 230
-                        cd-inverted;
-
-                        status = "okay";
-                };
-
-
-                // WLAN SDIO channel
-                sdi1_per2@80118000 {
-                        arm,primecell-periphid = <0x10480180>;
-                        max-frequency = <50000000>;
-                        bus-width = <4>;
-
-                        status = "okay";
-                };
-
-                // On-board eMMC
-                sdi4_per2@80114000 {
-                        arm,primecell-periphid = <0x10480180>;
-                        max-frequency = <100000000>;
-                        bus-width = <8>;
-                        mmc-cap-mmc-highspeed;
-                        vmmc-supply = <&ab8500_ldo_aux2_reg>;
-
-                        status = "okay";
-                };
-        };
-};
diff --git a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
index d2803be4e1a8..15f98cbcb75a 100644
--- a/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
+++ b/arch/arm/boot/dts/vexpress-v2p-ca15_a7.dts
@@ -37,30 +37,35 @@
                         device_type = "cpu";
                         compatible = "arm,cortex-a15";
                         reg = <0>;
+                        cci-control-port = <&cci_control1>;
                 };
 
                 cpu1: cpu@1 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a15";
                         reg = <1>;
+                        cci-control-port = <&cci_control1>;
                 };
 
                 cpu2: cpu@2 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a7";
                         reg = <0x100>;
+                        cci-control-port = <&cci_control2>;
                 };
 
                 cpu3: cpu@3 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a7";
                         reg = <0x101>;
+                        cci-control-port = <&cci_control2>;
                 };
 
                 cpu4: cpu@4 {
                         device_type = "cpu";
                         compatible = "arm,cortex-a7";
                         reg = <0x102>;
+                        cci-control-port = <&cci_control2>;
                 };
         };
 
@@ -104,6 +109,26 @@
                 interrupts = <1 9 0xf04>;
         };
 
+        cci@2c090000 {
+                compatible = "arm,cci-400";
+                #address-cells = <1>;
+                #size-cells = <1>;
+                reg = <0 0x2c090000 0 0x1000>;
+                ranges = <0x0 0x0 0x2c090000 0x10000>;
+
+                cci_control1: slave-if@4000 {
+                        compatible = "arm,cci-400-ctrl-if";
+                        interface-type = "ace";
+                        reg = <0x4000 0x1000>;
+                };
+
+                cci_control2: slave-if@5000 {
+                        compatible = "arm,cci-400-ctrl-if";
+                        interface-type = "ace";
+                        reg = <0x5000 0x1000>;
+                };
+        };
+
         memory-controller@7ffd0000 {
                 compatible = "arm,pl354", "arm,primecell";
                 reg = <0 0x7ffd0000 0 0x1000>;
@@ -125,6 +150,12 @@
                 clock-names = "apb_pclk";
         };
 
+        scc@7fff0000 {
+                compatible = "arm,vexpress-scc,v2p-ca15_a7", "arm,vexpress-scc";
+                reg = <0 0x7fff0000 0 0x1000>;
+                interrupts = <0 95 4>;
+        };
+
         timer {
                 compatible = "arm,armv7-timer";
                 interrupts = <1 13 0xf08>,
diff --git a/arch/arm/boot/dts/vf610-twr.dts b/arch/arm/boot/dts/vf610-twr.dts
index b3905f5bcaf9..1a58678b93fa 100644
--- a/arch/arm/boot/dts/vf610-twr.dts
+++ b/arch/arm/boot/dts/vf610-twr.dts
@@ -50,6 +50,13 @@
         status = "okay";
 };
 
+&i2c0 {
+        clock-frequency = <100000>;
+        pinctrl-names = "default";
+        pinctrl-0 = <&pinctrl_i2c0_1>;
+        status = "okay";
+};
+
 &uart1 {
         pinctrl-names = "default";
         pinctrl-0 = <&pinctrl_uart1_1>;
diff --git a/arch/arm/boot/dts/wm8850-w70v2.dts b/arch/arm/boot/dts/wm8850-w70v2.dts
index 90e913fb64be..7a563d2523b0 100644
--- a/arch/arm/boot/dts/wm8850-w70v2.dts
+++ b/arch/arm/boot/dts/wm8850-w70v2.dts
@@ -11,13 +11,14 @@
 
 /dts-v1/;
 /include/ "wm8850.dtsi"
+#include <dt-bindings/pwm/pwm.h>
 
 / {
         model = "Wondermedia WM8850-W70v2 Tablet";
 
         backlight {
                 compatible = "pwm-backlight";
-                pwms = <&pwm 0 50000 1>;        /* duty inverted */
+                pwms = <&pwm 0 50000 PWM_POLARITY_INVERTED>;
 
                 brightness-levels = <0 40 60 80 100 130 190 255>;
                 default-brightness-level = <5>;
diff --git a/arch/arm/boot/dts/zynq-7000.dtsi b/arch/arm/boot/dts/zynq-7000.dtsi
index 6f54a64850eb..e32b92b949d2 100644
--- a/arch/arm/boot/dts/zynq-7000.dtsi
+++ b/arch/arm/boot/dts/zynq-7000.dtsi
@@ -41,8 +41,8 @@
                 L2: cache-controller {
                         compatible = "arm,pl310-cache";
                         reg = <0xF8F02000 0x1000>;
-                        arm,data-latency = <2 3 2>;
-                        arm,tag-latency = <2 3 2>;
+                        arm,data-latency = <3 2 2>;
+                        arm,tag-latency = <2 2 2>;
                         cache-unified;
                         cache-level = <2>;
                 };
diff --git a/arch/arm/common/edma.c b/arch/arm/common/edma.c
index 39ad030ac0c7..117f955a2a06 100644
--- a/arch/arm/common/edma.c
+++ b/arch/arm/common/edma.c
@@ -1235,6 +1235,23 @@ void edma_resume(unsigned channel)
 }
 EXPORT_SYMBOL(edma_resume);
 
+int edma_trigger_channel(unsigned channel)
+{
+        unsigned ctlr;
+        unsigned int mask;
+
+        ctlr = EDMA_CTLR(channel);
+        channel = EDMA_CHAN_SLOT(channel);
+        mask = BIT(channel & 0x1f);
+
+        edma_shadow0_write_array(ctlr, SH_ESR, (channel >> 5), mask);
+
+        pr_debug("EDMA: ESR%d %08x\n", (channel >> 5),
+                 edma_shadow0_read_array(ctlr, SH_ESR, (channel >> 5)));
+        return 0;
+}
+EXPORT_SYMBOL(edma_trigger_channel);
+
 /**
  * edma_start - start dma on a channel
  * @channel: channel being activated
diff --git a/arch/arm/common/mcpm_head.S b/arch/arm/common/mcpm_head.S
index 80f033614a1f..39c96df3477a 100644
--- a/arch/arm/common/mcpm_head.S
+++ b/arch/arm/common/mcpm_head.S
@@ -151,7 +151,7 @@ mcpm_setup_leave:
 
         mov     r0, #INBOUND_NOT_COMING_UP
         strb    r0, [r8, #MCPM_SYNC_CLUSTER_INBOUND]
-        dsb
+        dsb     st
         sev
 
         mov     r0, r11
diff --git a/arch/arm/common/timer-sp.c b/arch/arm/common/timer-sp.c
index 023ee63827a2..e901d0f3e0bb 100644
--- a/arch/arm/common/timer-sp.c
+++ b/arch/arm/common/timer-sp.c
@@ -166,7 +166,8 @@ static int sp804_set_next_event(unsigned long next,
 }
 
 static struct clock_event_device sp804_clockevent = {
-        .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
+        .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT |
+                CLOCK_EVT_FEAT_DYNIRQ,
         .set_mode       = sp804_set_mode,
         .set_next_event = sp804_set_next_event,
         .rating         = 300,
diff --git a/arch/arm/common/vlock.S b/arch/arm/common/vlock.S
index ff198583f683..8b7df283fedf 100644
--- a/arch/arm/common/vlock.S
+++ b/arch/arm/common/vlock.S
@@ -42,7 +42,7 @@
         dmb
         mov     \rscratch, #0
         strb    \rscratch, [\rbase, \rcpu]
-        dsb
+        dsb     st
         sev
 .endm
 
@@ -102,7 +102,7 @@ ENTRY(vlock_unlock)
         dmb
         mov     r1, #VLOCK_OWNER_NONE
         strb    r1, [r0, #VLOCK_OWNER_OFFSET]
-        dsb
+        dsb     st
         sev
         bx      lr
 ENDPROC(vlock_unlock)
diff --git a/arch/arm/configs/ag5evm_defconfig b/arch/arm/configs/ag5evm_defconfig
deleted file mode 100644
index 212ead354a6b..000000000000
--- a/arch/arm/configs/ag5evm_defconfig
+++ /dev/null
@@ -1,83 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_SYSVIPC=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
-CONFIG_LOG_BUF_SHIFT=16
-CONFIG_NAMESPACES=y
-# CONFIG_UTS_NS is not set
-# CONFIG_IPC_NS is not set
-# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_EXPERT=y
-CONFIG_SLAB=y
-# CONFIG_BLK_DEV_BSG is not set
-# CONFIG_IOSCHED_DEADLINE is not set
-# CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_SHMOBILE=y
-CONFIG_ARCH_SH73A0=y
-CONFIG_MACH_AG5EVM=y
-CONFIG_MEMORY_SIZE=0x10000000
-CONFIG_CPU_BPREDICT_DISABLE=y
-CONFIG_ARM_ERRATA_430973=y
-CONFIG_ARM_ERRATA_458693=y
-CONFIG_NO_HZ=y
-CONFIG_AEABI=y
-# CONFIG_OABI_COMPAT is not set
-CONFIG_HIGHMEM=y
-CONFIG_ZBOOT_ROM_TEXT=0x0
-CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=tty0 console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel"
-CONFIG_CMDLINE_FORCE=y
-CONFIG_KEXEC=y
-# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
-CONFIG_PM=y
-# CONFIG_SUSPEND is not set
-CONFIG_PM_RUNTIME=y
-CONFIG_NET=y
-CONFIG_PACKET=y
-CONFIG_UNIX=y
-CONFIG_INET=y
-# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
-# CONFIG_INET_XFRM_MODE_TUNNEL is not set
-# CONFIG_INET_XFRM_MODE_BEET is not set
-# CONFIG_INET_LRO is not set
-# CONFIG_INET_DIAG is not set
-# CONFIG_IPV6 is not set
-# CONFIG_WIRELESS is not set
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_BLK_DEV is not set
-CONFIG_NETDEVICES=y
-CONFIG_NET_ETHERNET=y
-CONFIG_SMSC911X=y
-# CONFIG_NETDEV_1000 is not set
-# CONFIG_NETDEV_10000 is not set
-# CONFIG_WLAN is not set
-CONFIG_INPUT_SPARSEKMAP=y
-# CONFIG_INPUT_MOUSEDEV_PSAUX is not set
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=9
-CONFIG_SERIAL_SH_SCI_CONSOLE=y
-# CONFIG_LEGACY_PTYS is not set
-# CONFIG_HW_RANDOM is not set
-CONFIG_I2C=y
-CONFIG_I2C_SH_MOBILE=y
-# CONFIG_HWMON is not set
-# CONFIG_MFD_SUPPORT is not set
-CONFIG_FB=y
-CONFIG_FB_SH_MOBILE_LCDC=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_USB_SUPPORT is not set
-# CONFIG_DNOTIFY is not set
-# CONFIG_INOTIFY_USER is not set
-CONFIG_TMPFS=y
-# CONFIG_MISC_FILESYSTEMS is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
-# CONFIG_FTRACE is not set
diff --git a/arch/arm/configs/ape6evm_defconfig b/arch/arm/configs/ape6evm_defconfig
index dab5a7dfadc6..1ce39940795d 100644
--- a/arch/arm/configs/ape6evm_defconfig
+++ b/arch/arm/configs/ape6evm_defconfig
@@ -54,7 +54,8 @@ CONFIG_NETDEVICES=y
 CONFIG_SMC91X=y
 CONFIG_SMSC911X=y
 # CONFIG_INPUT_MOUSEDEV is not set
-# CONFIG_INPUT_KEYBOARD is not set
+CONFIG_INPUT_EVDEV=y
+CONFIG_KEYBOARD_GPIO=y
 # CONFIG_INPUT_MOUSE is not set
 # CONFIG_SERIO is not set
 CONFIG_SERIAL_NONSTANDARD=y
@@ -71,6 +72,9 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_GPIO=y
 # CONFIG_HID is not set
 # CONFIG_USB_SUPPORT is not set
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_GPIO=y
 # CONFIG_IOMMU_SUPPORT is not set
 # CONFIG_DNOTIFY is not set
 CONFIG_TMPFS=y
diff --git a/arch/arm/configs/at91_dt_defconfig b/arch/arm/configs/at91_dt_defconfig
index 75fd842d4071..690e89273230 100644
--- a/arch/arm/configs/at91_dt_defconfig
+++ b/arch/arm/configs/at91_dt_defconfig
@@ -14,11 +14,13 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_AT91=y
+CONFIG_SOC_AT91RM9200=y
 CONFIG_SOC_AT91SAM9260=y
 CONFIG_SOC_AT91SAM9263=y
 CONFIG_SOC_AT91SAM9G45=y
 CONFIG_SOC_AT91SAM9X5=y
 CONFIG_SOC_AT91SAM9N12=y
+CONFIG_MACH_AT91RM9200_DT=y
 CONFIG_MACH_AT91SAM9_DT=y
 CONFIG_AT91_PROGRAMMABLE_CLOCKS=y
 CONFIG_AT91_TIMER_HZ=128
@@ -62,6 +64,7 @@ CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
+CONFIG_MTD_DATAFLASH=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_ATMEL=y
 CONFIG_MTD_UBI=y
@@ -78,7 +81,6 @@ CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_LOWLEVEL is not set
 CONFIG_NETDEVICES=y
-CONFIG_MII=y
 CONFIG_MACB=y
 # CONFIG_NET_VENDOR_BROADCOM is not set
 # CONFIG_NET_VENDOR_FARADAY is not set
diff --git a/arch/arm/configs/bcm_defconfig b/arch/arm/configs/bcm_defconfig
index 65edf6d47215..6e4931097dd4 100644
--- a/arch/arm/configs/bcm_defconfig
+++ b/arch/arm/configs/bcm_defconfig
@@ -42,6 +42,18 @@ CONFIG_VFP=y
 CONFIG_NEON=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_PM_RUNTIME=y
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_PACKET_DIAG=y
+CONFIG_UNIX=y
+CONFIG_UNIX_DIAG=y
+CONFIG_NET_KEY=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_ARPD=y
+CONFIG_SYN_COOKIES=y
+CONFIG_TCP_MD5SIG=y
+CONFIG_IPV6=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_PROC_DEVICETREE=y
@@ -112,7 +124,6 @@ CONFIG_DEFAULT_HUNG_TASK_TIMEOUT=110
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC=y
 CONFIG_DEBUG_INFO=y
 # CONFIG_FTRACE is not set
-CONFIG_DEBUG_LL=y
 CONFIG_CRC_CCITT=y
 CONFIG_CRC_T10DIF=y
 CONFIG_CRC_ITU_T=y
diff --git a/arch/arm/configs/bockw_defconfig b/arch/arm/configs/bockw_defconfig
index 845f5cdf62b5..e7e94948d194 100644
--- a/arch/arm/configs/bockw_defconfig
+++ b/arch/arm/configs/bockw_defconfig
@@ -82,6 +82,13 @@ CONFIG_SERIAL_SH_SCI_CONSOLE=y
 # CONFIG_HWMON is not set
 CONFIG_I2C=y
 CONFIG_I2C_RCAR=y
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_SOC_CAMERA=y
+CONFIG_VIDEO_RCAR_VIN=y
+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
+CONFIG_VIDEO_ML86V7667=y
 CONFIG_SPI=y
 CONFIG_SPI_SH_HSPI=y
 CONFIG_USB=y
diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig
index 4364eff5b01e..110105476848 100644
--- a/arch/arm/configs/dove_defconfig
+++ b/arch/arm/configs/dove_defconfig
@@ -13,6 +13,9 @@ CONFIG_ARCH_DOVE=y
 CONFIG_MACH_DOVE_DB=y
 CONFIG_MACH_CM_A510=y
 CONFIG_MACH_DOVE_DT=y
+CONFIG_PCI=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_MVEBU=y
 CONFIG_AEABI=y
 CONFIG_HIGHMEM=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
@@ -78,6 +81,7 @@ CONFIG_SPI_ORION=y
 CONFIG_THERMAL=y
 CONFIG_DOVE_THERMAL=y
 CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_STORAGE=y
diff --git a/arch/arm/configs/exynos4_defconfig b/arch/arm/configs/exynos4_defconfig
deleted file mode 100644
index bffe68e190a3..000000000000
--- a/arch/arm/configs/exynos4_defconfig
+++ /dev/null
@@ -1,68 +0,0 @@
-CONFIG_EXPERIMENTAL=y
-CONFIG_BLK_DEV_INITRD=y
-CONFIG_KALLSYMS_ALL=y
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-# CONFIG_BLK_DEV_BSG is not set
-CONFIG_ARCH_EXYNOS=y
-CONFIG_S3C_LOWLEVEL_UART_PORT=1
-CONFIG_MACH_SMDKC210=y
-CONFIG_MACH_ARMLEX4210=y
-CONFIG_MACH_UNIVERSAL_C210=y
-CONFIG_MACH_NURI=y
-CONFIG_MACH_ORIGEN=y
-CONFIG_MACH_SMDK4412=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
-CONFIG_SMP=y
-CONFIG_NR_CPUS=2
-CONFIG_PREEMPT=y
-CONFIG_AEABI=y
-CONFIG_CMDLINE="root=/dev/ram0 rw ramdisk=8192 initrd=0x41000000,8M console=ttySAC1,115200 init=/linuxrc mem=256M"
-CONFIG_VFP=y
-CONFIG_NEON=y
-CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-CONFIG_BLK_DEV_LOOP=y
-CONFIG_BLK_DEV_RAM=y
-CONFIG_BLK_DEV_RAM_SIZE=8192
-CONFIG_SCSI=y
-CONFIG_BLK_DEV_SD=y
-CONFIG_CHR_DEV_SG=y
-CONFIG_INPUT_EVDEV=y
-# CONFIG_INPUT_KEYBOARD is not set
-# CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_TOUCHSCREEN=y
-CONFIG_SERIAL_8250=y
-CONFIG_SERIAL_SAMSUNG=y
-CONFIG_SERIAL_SAMSUNG_CONSOLE=y
-CONFIG_HW_RANDOM=y
-CONFIG_I2C=y
-# CONFIG_HWMON is not set
-# CONFIG_MFD_SUPPORT is not set
-# CONFIG_HID_SUPPORT is not set
-# CONFIG_USB_SUPPORT is not set
-CONFIG_EXT2_FS=y
-CONFIG_MSDOS_FS=y
-CONFIG_VFAT_FS=y
-CONFIG_TMPFS=y
-CONFIG_TMPFS_POSIX_ACL=y
-CONFIG_CRAMFS=y
-CONFIG_ROMFS_FS=y
-CONFIG_PARTITION_ADVANCED=y
-CONFIG_BSD_DISKLABEL=y
-CONFIG_SOLARIS_X86_PARTITION=y
-CONFIG_NLS_CODEPAGE_437=y
-CONFIG_NLS_ASCII=y
-CONFIG_NLS_ISO8859_1=y
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_KERNEL=y
-CONFIG_DETECT_HUNG_TASK=y
-CONFIG_DEBUG_RT_MUTEXES=y
-CONFIG_DEBUG_SPINLOCK=y
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_DEBUG_INFO=y
-CONFIG_SYSCTL_SYSCALL_CHECK=y
-CONFIG_DEBUG_USER=y
-CONFIG_DEBUG_LL=y
-CONFIG_EARLY_PRINTK=y
-CONFIG_CRC_CCITT=y
diff --git a/arch/arm/configs/imx_v4_v5_defconfig b/arch/arm/configs/imx_v4_v5_defconfig
index f07a847b00c9..e958ebe79779 100644
--- a/arch/arm/configs/imx_v4_v5_defconfig
+++ b/arch/arm/configs/imx_v4_v5_defconfig
@@ -1,4 +1,3 @@
-CONFIG_EXPERIMENTAL=y
 # CONFIG_SWAP is not set
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
@@ -17,16 +16,18 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
-CONFIG_ARCH_MXC=y
 CONFIG_ARCH_MULTI_V4T=y
 CONFIG_ARCH_MULTI_V5=y
 # CONFIG_ARCH_MULTI_V7 is not set
+CONFIG_ARCH_MXC=y
+CONFIG_MXC_IRQ_PRIOR=y
 CONFIG_ARCH_MX1ADS=y
 CONFIG_MACH_SCB9328=y
 CONFIG_MACH_APF9328=y
 CONFIG_MACH_MX21ADS=y
 CONFIG_MACH_MX25_3DS=y
 CONFIG_MACH_EUKREA_CPUIMX25SD=y
+CONFIG_MACH_IMX25_DT=y
 CONFIG_MACH_MX27ADS=y
 CONFIG_MACH_PCM038=y
 CONFIG_MACH_CPUIMX27=y
@@ -39,8 +40,6 @@ CONFIG_MACH_PCA100=y
 CONFIG_MACH_MXT_TD60=y
 CONFIG_MACH_IMX27IPCAM=y
 CONFIG_MACH_IMX27_DT=y
-CONFIG_MXC_IRQ_PRIOR=y
-CONFIG_MXC_PWM=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
@@ -67,7 +66,6 @@ CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
 CONFIG_MTD_CFI_ADV_OPTIONS=y
@@ -123,24 +121,20 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_MC13783=y
 CONFIG_REGULATOR_MC13892=y
 CONFIG_MEDIA_SUPPORT=y
-CONFIG_VIDEO_DEV=y
-CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_SOC_CAMERA=y
-CONFIG_SOC_CAMERA_OV2640=y
 CONFIG_VIDEO_MX2=y
 CONFIG_V4L_MEM2MEM_DRIVERS=y
 CONFIG_VIDEO_CODA=y
+CONFIG_SOC_CAMERA_OV2640=y
 CONFIG_FB=y
 CONFIG_FB_IMX=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_LCD_L4F00242T03=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
-CONFIG_BACKLIGHT_PWM=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
 CONFIG_LOGO=y
 CONFIG_SOUND=y
 CONFIG_SND=y
@@ -157,7 +151,6 @@ CONFIG_USB_HID=m
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_MXC=y
-CONFIG_USB_ULPI=y
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
@@ -198,3 +191,5 @@ CONFIG_NLS_CODEPAGE_850=m
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_ISO8859_15=m
 # CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
diff --git a/arch/arm/configs/imx_v6_v7_defconfig b/arch/arm/configs/imx_v6_v7_defconfig
index 06686e7303a9..5d488c24b132 100644
--- a/arch/arm/configs/imx_v6_v7_defconfig
+++ b/arch/arm/configs/imx_v6_v7_defconfig
@@ -1,4 +1,3 @@
-CONFIG_EXPERIMENTAL=y
 # CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_KERNEL_LZO=y
 CONFIG_SYSVIPC=y
@@ -17,10 +16,8 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_MODULE_SRCVERSION_ALL=y
 # CONFIG_BLK_DEV_BSG is not set
-CONFIG_ARCH_MXC=y
 CONFIG_ARCH_MULTI_V6=y
-CONFIG_ARCH_MULTI_V7=y
-CONFIG_MACH_IMX31_DT=y
+CONFIG_ARCH_MXC=y
 CONFIG_MACH_MX31LILLY=y
 CONFIG_MACH_MX31LITE=y
 CONFIG_MACH_PCM037=y
@@ -30,6 +27,7 @@ CONFIG_MACH_MX31MOBOARD=y
 CONFIG_MACH_QONG=y
 CONFIG_MACH_ARMADILLO5X0=y
 CONFIG_MACH_KZM_ARM11_01=y
+CONFIG_MACH_IMX31_DT=y
 CONFIG_MACH_PCM043=y
 CONFIG_MACH_MX35_3DS=y
 CONFIG_MACH_VPR200=y
@@ -39,7 +37,6 @@ CONFIG_SOC_IMX53=y
 CONFIG_SOC_IMX6Q=y
 CONFIG_SOC_IMX6SL=y
 CONFIG_SOC_VF610=y
-CONFIG_MXC_PWM=y
 CONFIG_SMP=y
 CONFIG_VMSPLIT_2G=y
 CONFIG_PREEMPT_VOLUNTARY=y
@@ -64,20 +61,24 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_LRO is not set
 CONFIG_IPV6=y
 CONFIG_NETFILTER=y
-# CONFIG_WIRELESS is not set
+CONFIG_CFG80211=y
+CONFIG_MAC80211=y
+CONFIG_RFKILL=y
+CONFIG_RFKILL_INPUT=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_STANDALONE is not set
+CONFIG_IMX_WEIM=y
 CONFIG_CONNECTOR=y
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_CFI=y
 CONFIG_MTD_JEDECPROBE=y
 CONFIG_MTD_CFI_INTELEXT=y
 CONFIG_MTD_CFI_AMDSTD=y
 CONFIG_MTD_CFI_STAA=y
+CONFIG_MTD_PHYSMAP_OF=y
 CONFIG_MTD_DATAFLASH=y
 CONFIG_MTD_M25P80=y
 CONFIG_MTD_SST25L=y
@@ -88,6 +89,7 @@ CONFIG_MTD_UBI=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=65536
+CONFIG_SRAM=y
 CONFIG_EEPROM_AT24=y
 CONFIG_EEPROM_AT25=y
 # CONFIG_SCSI_PROC_FS is not set
@@ -98,10 +100,11 @@ CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_SCAN_ASYNC=y
 # CONFIG_SCSI_LOWLEVEL is not set
 CONFIG_ATA=y
+CONFIG_SATA_AHCI_PLATFORM=y
+CONFIG_AHCI_IMX=y
 CONFIG_PATA_IMX=y
 CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
 CONFIG_CS89x0=y
 CONFIG_CS89x0_PLATFORM=y
 # CONFIG_NET_VENDOR_FARADAY is not set
@@ -115,7 +118,7 @@ CONFIG_SMC91X=y
 CONFIG_SMC911X=y
 CONFIG_SMSC911X=y
 # CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_WLAN is not set
+CONFIG_BRCMFMAC=m
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_EVBUG=m
@@ -124,6 +127,7 @@ CONFIG_KEYBOARD_IMX=y
 CONFIG_MOUSE_PS2=m
 CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_INPUT_TOUCHSCREEN=y
+CONFIG_TOUCHSCREEN_EGALAX=y
 CONFIG_TOUCHSCREEN_MC13783=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_MMA8450=y
@@ -133,13 +137,13 @@ CONFIG_VT_HW_CONSOLE_BINDING=y
 # CONFIG_DEVKMEM is not set
 CONFIG_SERIAL_IMX=y
 CONFIG_SERIAL_IMX_CONSOLE=y
+CONFIG_SERIAL_FSL_LPUART=y
+CONFIG_SERIAL_FSL_LPUART_CONSOLE=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_MXC_RNGA=y
-CONFIG_I2C=y
 # CONFIG_I2C_COMPAT is not set
 CONFIG_I2C_CHARDEV=y
 # CONFIG_I2C_HELPER_AUTO is not set
-CONFIG_I2C_ALGOBIT=m
 CONFIG_I2C_ALGOPCF=m
 CONFIG_I2C_ALGOPCA=m
 CONFIG_I2C_IMX=y
@@ -155,30 +159,26 @@ CONFIG_MFD_MC13XXX_SPI=y
 CONFIG_MFD_MC13XXX_I2C=y
 CONFIG_REGULATOR=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
-CONFIG_REGULATOR_DA9052=y
 CONFIG_REGULATOR_ANATOP=y
+CONFIG_REGULATOR_DA9052=y
 CONFIG_REGULATOR_MC13783=y
 CONFIG_REGULATOR_MC13892=y
 CONFIG_MEDIA_SUPPORT=y
-CONFIG_VIDEO_DEV=y
-CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_V4L_PLATFORM_DRIVERS=y
 CONFIG_SOC_CAMERA=y
+CONFIG_VIDEO_MX3=y
+CONFIG_V4L_MEM2MEM_DRIVERS=y
+CONFIG_VIDEO_CODA=y
 CONFIG_SOC_CAMERA_OV2640=y
 CONFIG_DRM=y
-CONFIG_VIDEO_MX3=y
-CONFIG_FB=y
-CONFIG_LCD_PLATFORM=y
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_LCD_L4F00242T03=y
+CONFIG_LCD_PLATFORM=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_PWM=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-CONFIG_FONTS=y
-CONFIG_FONT_8x8=y
-CONFIG_FONT_8x16=y
 CONFIG_LOGO=y
 CONFIG_SOUND=y
 CONFIG_SND=y
@@ -192,11 +192,12 @@ CONFIG_SND_SOC_IMX_MC13783=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_MXC=y
+CONFIG_USB_STORAGE=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_HOST=y
 CONFIG_USB_PHY=y
+CONFIG_NOP_USB_XCEIV=y
 CONFIG_USB_MXS_PHY=y
-CONFIG_USB_STORAGE=y
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
 CONFIG_MMC_SDHCI_PLTFM=y
@@ -213,9 +214,10 @@ CONFIG_IMX_SDMA=y
 CONFIG_MXS_DMA=y
 CONFIG_STAGING=y
 CONFIG_DRM_IMX=y
-CONFIG_DRM_IMX_TVE=y
 CONFIG_DRM_IMX_FB_HELPER=y
 CONFIG_DRM_IMX_PARALLEL_DISPLAY=y
+CONFIG_DRM_IMX_TVE=y
+CONFIG_DRM_IMX_LDB=y
 CONFIG_DRM_IMX_IPUV3_CORE=y
 CONFIG_DRM_IMX_IPUV3=y
 CONFIG_COMMON_CLK_DEBUG=y
@@ -269,3 +271,6 @@ CONFIG_CRC_CCITT=m
 CONFIG_CRC_T10DIF=y
 CONFIG_CRC7=m
 CONFIG_LIBCRC32C=m
+CONFIG_FONTS=y
+CONFIG_FONT_8x8=y
+CONFIG_FONT_8x16=y
diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig
index 62e968cac9dc..1f36b823905f 100644
--- a/arch/arm/configs/keystone_defconfig
+++ b/arch/arm/configs/keystone_defconfig
@@ -104,6 +104,7 @@ CONFIG_IP_SCTP=y
 CONFIG_VLAN_8021Q=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CMA=y
+CONFIG_DMA_CMA=y
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_BLOCK=y
diff --git a/arch/arm/configs/kirkwood_defconfig b/arch/arm/configs/kirkwood_defconfig
index 0f2aa61911a3..0ae0eaebf6b2 100644
--- a/arch/arm/configs/kirkwood_defconfig
+++ b/arch/arm/configs/kirkwood_defconfig
@@ -10,49 +10,18 @@ CONFIG_MODULE_UNLOAD=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_ARCH_KIRKWOOD=y
 CONFIG_MACH_D2NET_V2=y
-CONFIG_MACH_DB88F6281_BP=y
-CONFIG_MACH_DOCKSTAR=y
-CONFIG_MACH_ESATA_SHEEVAPLUG=y
-CONFIG_MACH_GURUPLUG=y
-CONFIG_MACH_INETSPACE_V2=y
-CONFIG_MACH_MV88F6281GTW_GE=y
 CONFIG_MACH_NET2BIG_V2=y
 CONFIG_MACH_NET5BIG_V2=y
-CONFIG_MACH_NETSPACE_MAX_V2=y
-CONFIG_MACH_NETSPACE_V2=y
 CONFIG_MACH_OPENRD_BASE=y
 CONFIG_MACH_OPENRD_CLIENT=y
 CONFIG_MACH_OPENRD_ULTIMATE=y
 CONFIG_MACH_RD88F6192_NAS=y
 CONFIG_MACH_RD88F6281=y
-CONFIG_MACH_SHEEVAPLUG=y
 CONFIG_MACH_T5325=y
 CONFIG_MACH_TS219=y
 CONFIG_MACH_TS41X=y
-CONFIG_MACH_CLOUDBOX_DT=y
-CONFIG_MACH_DB88F628X_BP_DT=y
-CONFIG_MACH_DLINK_KIRKWOOD_DT=y
-CONFIG_MACH_DOCKSTAR_DT=y
-CONFIG_MACH_DREAMPLUG_DT=y
-CONFIG_MACH_GOFLEXNET_DT=y
-CONFIG_MACH_GURUPLUG_DT=y
-CONFIG_MACH_IB62X0_DT=y
-CONFIG_MACH_ICONNECT_DT=y
-CONFIG_MACH_INETSPACE_V2_DT=y
-CONFIG_MACH_IOMEGA_IX2_200_DT=y
-CONFIG_MACH_KM_KIRKWOOD_DT=y
-CONFIG_MACH_LSXL_DT=y
-CONFIG_MACH_MPLCEC4_DT=y
-CONFIG_MACH_NETSPACE_LITE_V2_DT=y
-CONFIG_MACH_NETSPACE_MAX_V2_DT=y
-CONFIG_MACH_NETSPACE_MINI_V2_DT=y
-CONFIG_MACH_NETSPACE_V2_DT=y
-CONFIG_MACH_NSA310_DT=y
-CONFIG_MACH_OPENBLOCKS_A6_DT=y
-CONFIG_MACH_READYNAS_DT=y
-CONFIG_MACH_SHEEVAPLUG_DT=y
-CONFIG_MACH_TOPKICK_DT=y
-CONFIG_MACH_TS219_DT=y
+CONFIG_ARCH_KIRKWOOD_DT=y
+CONFIG_MACH_MV88F6281GTW_GE_DT=y
 # CONFIG_CPU_FEROCEON_OLD_ID is not set
 CONFIG_PCI_MVEBU=y
 CONFIG_PREEMPT=y
@@ -92,6 +61,7 @@ CONFIG_MTD_M25P80=y
 CONFIG_MTD_NAND=y
 CONFIG_MTD_NAND_ORION=y
 CONFIG_BLK_DEV_LOOP=y
+CONFIG_EEPROM_AT24=y
 # CONFIG_SCSI_PROC_FS is not set
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=m
@@ -100,9 +70,9 @@ CONFIG_ATA=y
 CONFIG_SATA_AHCI=y
 CONFIG_SATA_MV=y
 CONFIG_NETDEVICES=y
-CONFIG_MII=y
 CONFIG_NET_DSA_MV88E6123_61_65=y
 CONFIG_MV643XX_ETH=y
+CONFIG_R8169=y
 CONFIG_MARVELL_PHY=y
 CONFIG_LIBERTAS=y
 CONFIG_LIBERTAS_SDIO=y
@@ -123,9 +93,11 @@ CONFIG_I2C_MV64XXX=y
 CONFIG_SPI=y
 CONFIG_SPI_ORION=y
 CONFIG_GPIO_SYSFS=y
-# CONFIG_HWMON is not set
+CONFIG_SENSORS_ADT7475=y
+CONFIG_SENSORS_LM63=y
+CONFIG_SENSORS_LM75=y
+CONFIG_SENSORS_LM85=y
 CONFIG_THERMAL=y
-CONFIG_KIRKWOOD_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_ORION_WATCHDOG=y
 CONFIG_HID_DRAGONRISE=y
@@ -164,6 +136,8 @@ CONFIG_LEDS_TRIGGER_TIMER=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_RS5C372=y
+CONFIG_RTC_DRV_PCF8563=y
 CONFIG_RTC_DRV_S35390A=y
 CONFIG_RTC_DRV_MV=y
 CONFIG_DMADEVICES=y
@@ -171,6 +145,7 @@ CONFIG_MV_XOR=y
 CONFIG_EXT2_FS=y
 CONFIG_EXT3_FS=y
 # CONFIG_EXT3_FS_XATTR is not set
+CONFIG_EXT4_FS=y
 CONFIG_ISO9660_FS=m
 CONFIG_JOLIET=y
 CONFIG_UDF_FS=m
@@ -186,12 +161,12 @@ CONFIG_NLS_CODEPAGE_850=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_ISO8859_2=y
 CONFIG_NLS_UTF8=y
-CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_INFO=y
 CONFIG_DEBUG_FS=y
+CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_SCHED_DEBUG is not set
 # CONFIG_DEBUG_PREEMPT is not set
-CONFIG_DEBUG_INFO=y
 # CONFIG_FTRACE is not set
 CONFIG_DEBUG_USER=y
 CONFIG_DEBUG_LL=y
diff --git a/arch/arm/configs/kota2_defconfig b/arch/arm/configs/lager_defconfig
index 57ad3d47de70..e777ef22b801 100644
--- a/arch/arm/configs/kota2_defconfig
+++ b/arch/arm/configs/lager_defconfig
@@ -1,52 +1,38 @@
-# CONFIG_ARM_PATCH_PHYS_VIRT is not set
-CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
+CONFIG_NO_HZ=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=16
-CONFIG_CGROUPS=y
-CONFIG_CPUSETS=y
-CONFIG_NAMESPACES=y
-# CONFIG_UTS_NS is not set
-# CONFIG_IPC_NS is not set
-# CONFIG_USER_NS is not set
-# CONFIG_PID_NS is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_EMBEDDED=y
+CONFIG_PERF_EVENTS=y
 CONFIG_SLAB=y
+# CONFIG_LBDAF is not set
 # CONFIG_BLK_DEV_BSG is not set
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_SHMOBILE=y
-CONFIG_KEYBOARD_GPIO_POLLED=y
-CONFIG_ARCH_SH73A0=y
-CONFIG_MACH_KOTA2=y
-CONFIG_MEMORY_SIZE=0x1e000000
+CONFIG_ARCH_R8A7790=y
+CONFIG_MACH_LAGER=y
 # CONFIG_SH_TIMER_TMU is not set
-# CONFIG_SWP_EMULATE is not set
-CONFIG_CPU_BPREDICT_DISABLE=y
+# CONFIG_EM_TIMER_STI is not set
+CONFIG_ARM_ERRATA_430973=y
+CONFIG_ARM_ERRATA_458693=y
 CONFIG_ARM_ERRATA_460075=y
-CONFIG_ARM_ERRATA_742230=y
-CONFIG_ARM_ERRATA_742231=y
-CONFIG_PL310_ERRATA_588369=y
-CONFIG_ARM_ERRATA_720789=y
-CONFIG_PL310_ERRATA_727915=y
 CONFIG_ARM_ERRATA_743622=y
-CONFIG_ARM_ERRATA_751472=y
-CONFIG_PL310_ERRATA_753970=y
 CONFIG_ARM_ERRATA_754322=y
-CONFIG_PL310_ERRATA_769419=y
-CONFIG_NO_HZ=y
-CONFIG_SMP=y
+CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_AEABI=y
 # CONFIG_OABI_COMPAT is not set
-CONFIG_HIGHMEM=y
+CONFIG_FORCE_MAX_ZONEORDER=13
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
-CONFIG_CMDLINE="console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel"
-CONFIG_CMDLINE_FORCE=y
+CONFIG_ARM_APPENDED_DTB=y
 CONFIG_KEXEC=y
-CONFIG_CPU_IDLE=y
+CONFIG_AUTO_ZRELADDR=y
+CONFIG_VFP=y
+CONFIG_NEON=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_PM_RUNTIME=y
 CONFIG_NET=y
@@ -61,47 +47,48 @@ CONFIG_IP_PNP_DHCP=y
 # CONFIG_INET_LRO is not set
 # CONFIG_INET_DIAG is not set
 # CONFIG_IPV6 is not set
-CONFIG_CFG80211=y
-CONFIG_WIRELESS_EXT_SYSFS=y
-CONFIG_MAC80211=y
+# CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
-# CONFIG_BLK_DEV is not set
 CONFIG_NETDEVICES=y
+# CONFIG_NET_CORE is not set
+# CONFIG_NET_VENDOR_ARC is not set
+# CONFIG_NET_CADENCE is not set
 # CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
+# CONFIG_NET_VENDOR_CIRRUS is not set
 # CONFIG_NET_VENDOR_FARADAY is not set
 # CONFIG_NET_VENDOR_INTEL is not set
 # CONFIG_NET_VENDOR_MARVELL is not set
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_NATSEMI is not set
+CONFIG_SH_ETH=y
 # CONFIG_NET_VENDOR_SEEQ is not set
-CONFIG_SMSC911X=y
+# CONFIG_NET_VENDOR_SMSC is not set
 # CONFIG_NET_VENDOR_STMICRO is not set
-CONFIG_B43=y
-CONFIG_B43_PHY_N=y
-CONFIG_B43_DEBUG=y
-CONFIG_INPUT_SPARSEKMAP=y
+# CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_NET_VENDOR_WIZNET is not set
+# CONFIG_WLAN is not set
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_EVDEV=y
 # CONFIG_KEYBOARD_ATKBD is not set
 CONFIG_KEYBOARD_GPIO=y
-CONFIG_KEYBOARD_SH_KEYSC=y
 # CONFIG_INPUT_MOUSE is not set
+# CONFIG_SERIO is not set
 # CONFIG_LEGACY_PTYS is not set
 CONFIG_SERIAL_SH_SCI=y
-CONFIG_SERIAL_SH_SCI_NR_UARTS=9
+CONFIG_SERIAL_SH_SCI_NR_UARTS=10
 CONFIG_SERIAL_SH_SCI_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
+CONFIG_I2C=y
+CONFIG_I2C_GPIO=y
 CONFIG_I2C_SH_MOBILE=y
+CONFIG_GPIO_SH_PFC=y
+CONFIG_GPIOLIB=y
+CONFIG_GPIO_RCAR=y
 # CONFIG_HWMON is not set
-CONFIG_BCMA=y
-CONFIG_BCMA_DEBUG=y
-CONFIG_FB=y
-CONFIG_FB_SH_MOBILE_LCDC=y
-CONFIG_LCD_PLATFORM=y
-CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y
-# CONFIG_HID_SUPPORT is not set
+CONFIG_THERMAL=y
+CONFIG_RCAR_THERMAL=y
+CONFIG_REGULATOR=y
+CONFIG_REGULATOR_FIXED_VOLTAGE=y
 # CONFIG_USB_SUPPORT is not set
 CONFIG_MMC=y
 CONFIG_MMC_SDHI=y
@@ -109,13 +96,25 @@ CONFIG_MMC_SH_MMCIF=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
-CONFIG_LEDS_RENESAS_TPU=y
-CONFIG_LEDS_TRIGGERS=y
+CONFIG_RTC_CLASS=y
+CONFIG_DMADEVICES=y
+CONFIG_SH_DMAE=y
+# CONFIG_IOMMU_SUPPORT is not set
 # CONFIG_DNOTIFY is not set
+CONFIG_MSDOS_FS=y
+CONFIG_VFAT_FS=y
 CONFIG_TMPFS=y
+CONFIG_CONFIGFS_FS=y
 # CONFIG_MISC_FILESYSTEMS is not set
-CONFIG_MAGIC_SYSRQ=y
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_INFO_REDUCED=y
-# CONFIG_FTRACE is not set
-CONFIG_DEBUG_USER=y
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3_ACL=y
+CONFIG_NFS_V4=y
+CONFIG_NFS_V4_1=y
+CONFIG_ROOT_NFS=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ISO8859_1=y
+# CONFIG_ENABLE_WARN_DEPRECATED is not set
+# CONFIG_ENABLE_MUST_CHECK is not set
+# CONFIG_ARM_UNWIND is not set
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+# CONFIG_CRYPTO_HW is not set
diff --git a/arch/arm/configs/marzen_defconfig b/arch/arm/configs/marzen_defconfig
index 494e70aeb9e1..000e9205b2b9 100644
--- a/arch/arm/configs/marzen_defconfig
+++ b/arch/arm/configs/marzen_defconfig
@@ -29,6 +29,7 @@ CONFIG_AEABI=y
 CONFIG_HIGHMEM=y
 CONFIG_ZBOOT_ROM_TEXT=0x0
 CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ARM_APPENDED_DTB=y
 CONFIG_CMDLINE="console=ttySC2,115200 earlyprintk=sh-sci.2,115200 ignore_loglevel root=/dev/nfs ip=on"
 CONFIG_CMDLINE_FORCE=y
 CONFIG_KEXEC=y
@@ -84,6 +85,13 @@ CONFIG_GPIO_RCAR=y
 CONFIG_THERMAL=y
 CONFIG_RCAR_THERMAL=y
 CONFIG_SSB=y
+CONFIG_MEDIA_SUPPORT=y
+CONFIG_MEDIA_CAMERA_SUPPORT=y
+CONFIG_V4L_PLATFORM_DRIVERS=y
+CONFIG_SOC_CAMERA=y
+CONFIG_VIDEO_RCAR_VIN=y
+# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set
+CONFIG_VIDEO_ADV7180=y
 CONFIG_USB=y
 CONFIG_USB_RCAR_PHY=y
 CONFIG_MMC=y
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 6e572c64cf5a..f3935b46df29 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -36,6 +36,7 @@ CONFIG_ARCH_TEGRA_114_SOC=y
 CONFIG_TEGRA_PCI=y
 CONFIG_TEGRA_EMC_SCALING_ENABLE=y
 CONFIG_ARCH_U8500=y
+CONFIG_MACH_HREFV60=y
 CONFIG_MACH_SNOWBALL=y
 CONFIG_MACH_UX500_DT=y
 CONFIG_ARCH_VEXPRESS=y
@@ -46,6 +47,7 @@ CONFIG_ARCH_ZYNQ=y
 CONFIG_SMP=y
 CONFIG_HIGHPTE=y
 CONFIG_ARM_APPENDED_DTB=y
+CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_NET=y
 CONFIG_UNIX=y
 CONFIG_INET=y
diff --git a/arch/arm/configs/mvebu_defconfig b/arch/arm/configs/mvebu_defconfig
index 731814e2c189..594d706b641f 100644
--- a/arch/arm/configs/mvebu_defconfig
+++ b/arch/arm/configs/mvebu_defconfig
@@ -39,6 +39,8 @@ CONFIG_MVNETA=y
 CONFIG_MARVELL_PHY=y
 CONFIG_MWIFIEX=y
 CONFIG_MWIFIEX_SDIO=y
+CONFIG_INPUT_EVDEV=y
+CONFIG_KEYBOARD_GPIO=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_I2C=y
diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig
index 1d6d8fb7f4a1..4555c025629a 100644
--- a/arch/arm/configs/mxs_defconfig
+++ b/arch/arm/configs/mxs_defconfig
@@ -1,4 +1,3 @@
-CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
@@ -27,7 +26,6 @@ CONFIG_ARCH_MXS=y
 # CONFIG_ARM_THUMB is not set
 CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_AEABI=y
-CONFIG_AUTO_ZRELADDR=y
 CONFIG_FPE_NWFPE=y
 CONFIG_NET=y
 CONFIG_PACKET=y
@@ -43,8 +41,6 @@ CONFIG_SYN_COOKIES=y
 # CONFIG_INET_DIAG is not set
 # CONFIG_IPV6 is not set
 CONFIG_CAN=m
-CONFIG_CAN_RAW=m
-CONFIG_CAN_BCM=m
 CONFIG_CAN_FLEXCAN=m
 # CONFIG_WIRELESS is not set
 CONFIG_DEVTMPFS=y
@@ -52,7 +48,6 @@ CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
-CONFIG_MTD_CHAR=y
 CONFIG_MTD_BLOCK=y
 CONFIG_MTD_DATAFLASH=y
 CONFIG_MTD_M25P80=y
@@ -67,12 +62,12 @@ CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_NETDEVICES=y
 CONFIG_ENC28J60=y
-CONFIG_USB_USBNET=y
-CONFIG_USB_NET_SMSC95XX=y
 CONFIG_SMSC_PHY=y
 CONFIG_ICPLUS_PHY=y
 CONFIG_REALTEK_PHY=y
 CONFIG_MICREL_PHY=y
+CONFIG_USB_USBNET=y
+CONFIG_USB_NET_SMSC95XX=y
 # CONFIG_WLAN is not set
 # CONFIG_INPUT_MOUSEDEV_PSAUX is not set
 CONFIG_INPUT_EVDEV=y
@@ -110,7 +105,6 @@ CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_BACKLIGHT_PWM=y
 CONFIG_FRAMEBUFFER_CONSOLE=y
-CONFIG_FONTS=y
 CONFIG_LOGO=y
 CONFIG_SOUND=y
 CONFIG_SND=y
@@ -119,9 +113,9 @@ CONFIG_SND_MXS_SOC=y
 CONFIG_SND_SOC_MXS_SGTL5000=y
 CONFIG_USB=y
 CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_STORAGE=y
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_HOST=y
-CONFIG_USB_STORAGE=y
 CONFIG_USB_PHY=y
 CONFIG_USB_MXS_PHY=y
 CONFIG_MMC=y
@@ -143,9 +137,9 @@ CONFIG_DMADEVICES=y
 CONFIG_MXS_DMA=y
 CONFIG_STAGING=y
 CONFIG_MXS_LRADC=y
-CONFIG_IIO_SYSFS_TRIGGER=y
 CONFIG_COMMON_CLK_DEBUG=y
 CONFIG_IIO=y
+CONFIG_IIO_SYSFS_TRIGGER=y
 CONFIG_PWM=y
 CONFIG_PWM_MXS=y
 CONFIG_EXT2_FS=y
@@ -173,14 +167,14 @@ CONFIG_NLS_CODEPAGE_850=y
 CONFIG_NLS_ISO8859_1=y
 CONFIG_NLS_ISO8859_15=y
 CONFIG_PRINTK_TIME=y
+CONFIG_DEBUG_INFO=y
 CONFIG_FRAME_WARN=2048
-CONFIG_MAGIC_SYSRQ=y
 CONFIG_UNUSED_SYMBOLS=y
+CONFIG_MAGIC_SYSRQ=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_TIMER_STATS=y
 CONFIG_PROVE_LOCKING=y
-CONFIG_DEBUG_INFO=y
 CONFIG_BLK_DEV_IO_TRACE=y
 CONFIG_STRICT_DEVMEM=y
 CONFIG_DEBUG_USER=y
@@ -188,3 +182,4 @@ CONFIG_DEBUG_USER=y
 # CONFIG_CRYPTO_HW is not set
 CONFIG_CRC_ITU_T=m
 CONFIG_CRC7=m
+CONFIG_FONTS=y
diff --git a/arch/arm/configs/omap2plus_defconfig b/arch/arm/configs/omap2plus_defconfig
index 5339e6a4d639..254cf0539439 100644
--- a/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@ -78,6 +78,7 @@ CONFIG_MAC80211_RC_PID=y
 CONFIG_MAC80211_RC_DEFAULT_PID=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_CMA=y
+CONFIG_DMA_CMA=y
 CONFIG_CONNECTOR=y
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
@@ -185,13 +186,11 @@ CONFIG_OMAP2_DSS_RFBI=y
 CONFIG_OMAP2_DSS_SDI=y
 CONFIG_OMAP2_DSS_DSI=y
 CONFIG_FB_OMAP2=m
-CONFIG_PANEL_GENERIC_DPI=m
-CONFIG_PANEL_TFP410=m
-CONFIG_PANEL_SHARP_LS037V7DW01=m
-CONFIG_PANEL_NEC_NL8048HL11_01B=m
-CONFIG_PANEL_TAAL=m
-CONFIG_PANEL_TPO_TD043MTEA1=m
-CONFIG_PANEL_ACX565AKM=m
+CONFIG_DISPLAY_ENCODER_TFP410=m
+CONFIG_DISPLAY_ENCODER_TPD12S015=m
+CONFIG_DISPLAY_CONNECTOR_DVI=m
+CONFIG_DISPLAY_CONNECTOR_HDMI=m
+CONFIG_DISPLAY_PANEL_DPI=m
 CONFIG_BACKLIGHT_LCD_SUPPORT=y
 CONFIG_LCD_CLASS_DEVICE=y
 CONFIG_LCD_PLATFORM=y
@@ -306,3 +305,4 @@ CONFIG_TI_DAVINCI_MDIO=y
 CONFIG_TI_DAVINCI_CPDMA=y
 CONFIG_TI_CPSW=y
 CONFIG_AT803X_PHY=y
+CONFIG_SOC_DRA7XX=y
diff --git a/arch/arm/configs/tegra_defconfig b/arch/arm/configs/tegra_defconfig
index 1effb43dab80..ea042e80e54d 100644
--- a/arch/arm/configs/tegra_defconfig
+++ b/arch/arm/configs/tegra_defconfig
@@ -1,3 +1,4 @@
+CONFIG_SYSVIPC=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
 CONFIG_IKCONFIG=y
@@ -26,8 +27,11 @@ CONFIG_ARCH_TEGRA=y
 CONFIG_ARCH_TEGRA_2x_SOC=y
 CONFIG_ARCH_TEGRA_3x_SOC=y
 CONFIG_ARCH_TEGRA_114_SOC=y
-CONFIG_TEGRA_PCI=y
 CONFIG_TEGRA_EMC_SCALING_ENABLE=y
+CONFIG_PCI=y
+CONFIG_PCI_MSI=y
+CONFIG_PCI_TEGRA=y
+CONFIG_PCIEPORTBUS=y
 CONFIG_SMP=y
 CONFIG_PREEMPT=y
 CONFIG_AEABI=y
@@ -79,6 +83,7 @@ CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 CONFIG_CMA=y
+CONFIG_DMA_CMA=y
 CONFIG_MTD=y
 CONFIG_MTD_M25P80=y
 CONFIG_PROC_DEVICETREE=y
@@ -91,6 +96,7 @@ CONFIG_ISL29003=y
 CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
+CONFIG_SCSI_MULTI_LUN=y
 # CONFIG_SCSI_LOWLEVEL is not set
 CONFIG_NETDEVICES=y
 CONFIG_DUMMY=y
@@ -105,6 +111,7 @@ CONFIG_RT2800USB=m
 CONFIG_INPUT_EVDEV=y
 CONFIG_KEYBOARD_GPIO=y
 CONFIG_KEYBOARD_TEGRA=y
+CONFIG_MOUSE_PS2_ELANTECH=y
 CONFIG_INPUT_MISC=y
 CONFIG_INPUT_MPU3050=y
 # CONFIG_LEGACY_PTYS is not set
@@ -177,6 +184,7 @@ CONFIG_SND_SOC_TEGRA_WM8903=y
 CONFIG_SND_SOC_TEGRA_TRIMSLICE=y
 CONFIG_SND_SOC_TEGRA_ALC5632=y
 CONFIG_USB=y
+CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_EHCI_TEGRA=y
 CONFIG_USB_ACM=y
diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h
index e406d575c94f..5665134bfa3e 100644
--- a/arch/arm/include/asm/arch_timer.h
+++ b/arch/arm/include/asm/arch_timer.h
@@ -17,7 +17,8 @@ int arch_timer_arch_init(void);
  * nicely work out which register we want, and chuck away the rest of
  * the code. At least it does so with a recent GCC (4.6.3).
  */
-static inline void arch_timer_reg_write(const int access, const int reg, u32 val)
+static __always_inline
+void arch_timer_reg_write_cp15(int access, enum arch_timer_reg reg, u32 val)
 {
         if (access == ARCH_TIMER_PHYS_ACCESS) {
                 switch (reg) {
@@ -28,9 +29,7 @@ static inline void arch_timer_reg_write(const int access, const int reg, u32 val
                         asm volatile("mcr p15, 0, %0, c14, c2, 0" : : "r" (val));
                         break;
                 }
-        }
-
-        if (access == ARCH_TIMER_VIRT_ACCESS) {
+        } else if (access == ARCH_TIMER_VIRT_ACCESS) {
                 switch (reg) {
                 case ARCH_TIMER_REG_CTRL:
                         asm volatile("mcr p15, 0, %0, c14, c3, 1" : : "r" (val));
@@ -44,7 +43,8 @@ static inline void arch_timer_reg_write(const int access, const int reg, u32 val
         isb();
 }
 
-static inline u32 arch_timer_reg_read(const int access, const int reg)
+static __always_inline
+u32 arch_timer_reg_read_cp15(int access, enum arch_timer_reg reg)
 {
         u32 val = 0;
 
@@ -57,9 +57,7 @@ static inline u32 arch_timer_reg_read(const int access, const int reg)
                         asm volatile("mrc p15, 0, %0, c14, c2, 0" : "=r" (val));
                         break;
                 }
-        }
-
-        if (access == ARCH_TIMER_VIRT_ACCESS) {
+        } else if (access == ARCH_TIMER_VIRT_ACCESS) {
                 switch (reg) {
                 case ARCH_TIMER_REG_CTRL:
                         asm volatile("mrc p15, 0, %0, c14, c3, 1" : "=r" (val));
diff --git a/arch/arm/include/asm/assembler.h b/arch/arm/include/asm/assembler.h
index a5fef710af32..fcc1b5bf6979 100644
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
@@ -220,9 +220,9 @@
 #ifdef CONFIG_SMP
 #if __LINUX_ARM_ARCH__ >= 7
         .ifeqs "\mode","arm"
-        ALT_SMP(dmb)
+        ALT_SMP(dmb     ish)
         .else
-        ALT_SMP(W(dmb))
+        ALT_SMP(W(dmb)  ish)
         .endif
 #elif __LINUX_ARM_ARCH__ == 6
         ALT_SMP(mcr     p15, 0, r0, c7, c10, 5) @ dmb
diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h
index 8dcd9c702d90..60f15e274e6d 100644
--- a/arch/arm/include/asm/barrier.h
+++ b/arch/arm/include/asm/barrier.h
@@ -14,27 +14,27 @@
 #endif
 
 #if __LINUX_ARM_ARCH__ >= 7
-#define isb() __asm__ __volatile__ ("isb" : : : "memory")
-#define dsb() __asm__ __volatile__ ("dsb" : : : "memory")
-#define dmb() __asm__ __volatile__ ("dmb" : : : "memory")
+#define isb(option) __asm__ __volatile__ ("isb " #option : : : "memory")
+#define dsb(option) __asm__ __volatile__ ("dsb " #option : : : "memory")
+#define dmb(option) __asm__ __volatile__ ("dmb " #option : : : "memory")
 #elif defined(CONFIG_CPU_XSC3) || __LINUX_ARM_ARCH__ == 6
-#define isb() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c5, 4" \
+#define isb(x) __asm__ __volatile__ ("mcr p15, 0, %0, c7, c5, 4" \
                                     : : "r" (0) : "memory")
-#define dsb() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 4" \
+#define dsb(x) __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 4" \
                                     : : "r" (0) : "memory")
-#define dmb() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" \
+#define dmb(x) __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 5" \
                                     : : "r" (0) : "memory")
 #elif defined(CONFIG_CPU_FA526)
-#define isb() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c5, 4" \
+#define isb(x) __asm__ __volatile__ ("mcr p15, 0, %0, c7, c5, 4" \
                                     : : "r" (0) : "memory")
-#define dsb() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 4" \
+#define dsb(x) __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 4" \
                                     : : "r" (0) : "memory")
-#define dmb() __asm__ __volatile__ ("" : : : "memory")
+#define dmb(x) __asm__ __volatile__ ("" : : : "memory")
 #else
-#define isb() __asm__ __volatile__ ("" : : : "memory")
-#define dsb() __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 4" \
+#define isb(x) __asm__ __volatile__ ("" : : : "memory")
+#define dsb(x) __asm__ __volatile__ ("mcr p15, 0, %0, c7, c10, 4" \
                                     : : "r" (0) : "memory")
-#define dmb() __asm__ __volatile__ ("" : : : "memory")
+#define dmb(x) __asm__ __volatile__ ("" : : : "memory")
 #endif
 
 #ifdef CONFIG_ARCH_HAS_BARRIERS
@@ -42,7 +42,7 @@
 #elif defined(CONFIG_ARM_DMA_MEM_BUFFERABLE) || defined(CONFIG_SMP)
 #define mb()            do { dsb(); outer_sync(); } while (0)
 #define rmb()           dsb()
-#define wmb()           mb()
+#define wmb()           do { dsb(st); outer_sync(); } while (0)
 #else
 #define mb()            barrier()
 #define rmb()           barrier()
@@ -54,9 +54,9 @@
 #define smp_rmb()       barrier()
 #define smp_wmb()       barrier()
 #else
-#define smp_mb()        dmb()
-#define smp_rmb()       dmb()
-#define smp_wmb()       dmb()
+#define smp_mb()        dmb(ish)
+#define smp_rmb()       smp_mb()
+#define smp_wmb()       dmb(ishst)
 #endif
 
 #define read_barrier_depends()          do { } while(0)
diff --git a/arch/arm/include/asm/cacheflush.h b/arch/arm/include/asm/cacheflush.h
index 17d0ae8672fa..15f2d5bf8875 100644
--- a/arch/arm/include/asm/cacheflush.h
+++ b/arch/arm/include/asm/cacheflush.h
@@ -268,8 +268,7 @@ extern void flush_cache_page(struct vm_area_struct *vma, unsigned long user_addr
  * Harvard caches are synchronised for the user space address range.
  * This is used for the ARM private sys_cacheflush system call.
  */
-#define flush_cache_user_range(start,end) \
-        __cpuc_coherent_user_range((start) & PAGE_MASK, PAGE_ALIGN(end))
+#define flush_cache_user_range(s,e)     __cpuc_coherent_user_range(s,e)
 
 /*
  * Perform necessary cache operations to ensure that data previously
@@ -352,7 +351,7 @@ static inline void flush_cache_vmap(unsigned long start, unsigned long end)
                  * set_pte_at() called from vmap_pte_range() does not
                  * have a DSB after cleaning the cache line.
                  */
-                dsb();
+                dsb(ishst);
 }
 
 static inline void flush_cache_vunmap(unsigned long start, unsigned long end)
diff --git a/arch/arm/include/asm/dma-contiguous.h b/arch/arm/include/asm/dma-contiguous.h
index 3ed37b4d93da..4f8e9e5514b1 100644
--- a/arch/arm/include/asm/dma-contiguous.h
+++ b/arch/arm/include/asm/dma-contiguous.h
@@ -2,10 +2,9 @@
 #define ASMARM_DMA_CONTIGUOUS_H
 
 #ifdef __KERNEL__
-#ifdef CONFIG_CMA
+#ifdef CONFIG_DMA_CMA
 
 #include <linux/types.h>
-#include <asm-generic/dma-contiguous.h>
 
 void dma_contiguous_early_fixup(phys_addr_t base, unsigned long size);
 
diff --git a/arch/arm/include/asm/elf.h b/arch/arm/include/asm/elf.h
index 56211f2084ef..f4b46d39b9cf 100644
--- a/arch/arm/include/asm/elf.h
+++ b/arch/arm/include/asm/elf.h
@@ -19,8 +19,6 @@ typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 
 typedef struct user_fp elf_fpregset_t;
 
-#define EM_ARM  40
-
 #define EF_ARM_EABI_MASK        0xff000000
 #define EF_ARM_EABI_UNKNOWN     0x00000000
 #define EF_ARM_EABI_VER1        0x01000000
diff --git a/arch/arm/include/asm/hardware/debug-8250.S b/arch/arm/include/asm/hardware/debug-8250.S
deleted file mode 100644
index 22c689255e6e..000000000000
--- a/arch/arm/include/asm/hardware/debug-8250.S
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * arch/arm/include/asm/hardware/debug-8250.S
- *
- *  Copyright (C) 1994-1999 Russell King
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <linux/serial_reg.h>
-
-                .macro  senduart,rd,rx
-                strb    \rd, [\rx, #UART_TX << UART_SHIFT]
-                .endm
-
-                .macro  busyuart,rd,rx
-1002:           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     1002b
-                .endm
-
-                .macro  waituart,rd,rx
-#ifdef FLOW_CONTROL
-1001:           ldrb    \rd, [\rx, #UART_MSR << UART_SHIFT]
-                tst     \rd, #UART_MSR_CTS
-                beq     1001b
-#endif
-                .endm
diff --git a/arch/arm/include/asm/kvm_mmu.h b/arch/arm/include/asm/kvm_mmu.h
index 472ac7091003..9b28c41f4ba9 100644
--- a/arch/arm/include/asm/kvm_mmu.h
+++ b/arch/arm/include/asm/kvm_mmu.h
@@ -64,7 +64,7 @@ void kvm_clear_hyp_idmap(void);
 
 static inline void kvm_set_pte(pte_t *pte, pte_t new_pte)
 {
-        pte_val(*pte) = new_pte;
+        *pte = new_pte;
         /*
          * flush_pmd_entry just takes a void pointer and cleans the necessary
          * cache entries, so we can reuse the function for ptes.
diff --git a/arch/arm/include/asm/localtimer.h b/arch/arm/include/asm/localtimer.h
deleted file mode 100644
index f77ffc1eb0c2..000000000000
--- a/arch/arm/include/asm/localtimer.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- *  arch/arm/include/asm/localtimer.h
- *
- *  Copyright (C) 2004-2005 ARM Ltd.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ASM_ARM_LOCALTIMER_H
-#define __ASM_ARM_LOCALTIMER_H
-
-#include <linux/errno.h>
-
-struct clock_event_device;
-
-struct local_timer_ops {
-        int  (*setup)(struct clock_event_device *);
-        void (*stop)(struct clock_event_device *);
-};
-
-#ifdef CONFIG_LOCAL_TIMERS
-/*
- * Register a local timer driver
- */
-int local_timer_register(struct local_timer_ops *);
-#else
-static inline int local_timer_register(struct local_timer_ops *ops)
-{
-        return -ENXIO;
-}
-#endif
-
-#endif
diff --git a/arch/arm/include/asm/mach/arch.h b/arch/arm/include/asm/mach/arch.h
index 441efc491b50..402a2bc6aa68 100644
--- a/arch/arm/include/asm/mach/arch.h
+++ b/arch/arm/include/asm/mach/arch.h
@@ -35,7 +35,7 @@ struct machine_desc {
         unsigned int            nr_irqs;        /* number of IRQs */
 
 #ifdef CONFIG_ZONE_DMA
-        unsigned long           dma_zone_size;  /* size of DMA-able area */
+        phys_addr_t             dma_zone_size;  /* size of DMA-able area */
 #endif
 
         unsigned int            video_start;    /* start of video RAM   */
@@ -65,12 +65,12 @@ struct machine_desc {
 /*
  * Current machine - only accessible during boot.
  */
-extern struct machine_desc *machine_desc;
+extern const struct machine_desc *machine_desc;
 
 /*
  * Machine type table - also only accessible during boot
  */
-extern struct machine_desc __arch_info_begin[], __arch_info_end[];
+extern const struct machine_desc __arch_info_begin[], __arch_info_end[];
 #define for_each_machine_desc(p)                        \
         for (p = __arch_info_begin; p < __arch_info_end; p++)
 
diff --git a/arch/arm/include/asm/mach/pci.h b/arch/arm/include/asm/mach/pci.h
index a1c90d7feb0e..454d642a4070 100644
--- a/arch/arm/include/asm/mach/pci.h
+++ b/arch/arm/include/asm/mach/pci.h
@@ -36,6 +36,8 @@ struct hw_pci {
                                           resource_size_t start,
                                           resource_size_t size,
                                           resource_size_t align);
+        void            (*add_bus)(struct pci_bus *bus);
+        void            (*remove_bus)(struct pci_bus *bus);
 };
 
 /*
@@ -63,6 +65,8 @@ struct pci_sys_data {
                                           resource_size_t start,
                                           resource_size_t size,
                                           resource_size_t align);
+        void            (*add_bus)(struct pci_bus *bus);
+        void            (*remove_bus)(struct pci_bus *bus);
         void            *private_data;  /* platform controller private data     */
 };
 
diff --git a/arch/arm/include/asm/memblock.h b/arch/arm/include/asm/memblock.h
index 00ca5f92648e..c2f5102ae659 100644
--- a/arch/arm/include/asm/memblock.h
+++ b/arch/arm/include/asm/memblock.h
@@ -4,8 +4,7 @@
 struct meminfo;
 struct machine_desc;
 
-extern void arm_memblock_init(struct meminfo *, struct machine_desc *);
-
+void arm_memblock_init(struct meminfo *, const struct machine_desc *);
 phys_addr_t arm_memblock_steal(phys_addr_t size, phys_addr_t align);
 
 #endif
diff --git a/arch/arm/include/asm/module.h b/arch/arm/include/asm/module.h
index 0d3a28dbc8e5..ed690c49ef93 100644
--- a/arch/arm/include/asm/module.h
+++ b/arch/arm/include/asm/module.h
@@ -12,6 +12,8 @@ enum {
         ARM_SEC_CORE,
         ARM_SEC_EXIT,
         ARM_SEC_DEVEXIT,
+        ARM_SEC_HOT,
+        ARM_SEC_UNLIKELY,
         ARM_SEC_MAX,
 };
 
diff --git a/arch/arm/include/asm/neon.h b/arch/arm/include/asm/neon.h
new file mode 100644
index 000000000000..8f730fe70093
--- /dev/null
+++ b/arch/arm/include/asm/neon.h
@@ -0,0 +1,36 @@
+/*
+ * linux/arch/arm/include/asm/neon.h
+ *
+ * Copyright (C) 2013 Linaro Ltd <ard.biesheuvel@linaro.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <asm/hwcap.h>
+
+#define cpu_has_neon()          (!!(elf_hwcap & HWCAP_NEON))
+
+#ifdef __ARM_NEON__
+
+/*
+ * If you are affected by the BUILD_BUG below, it probably means that you are
+ * using NEON code /and/ calling the kernel_neon_begin() function from the same
+ * compilation unit. To prevent issues that may arise from GCC reordering or
+ * generating(1) NEON instructions outside of these begin/end functions, the
+ * only supported way of using NEON code in the kernel is by isolating it in a
+ * separate compilation unit, and calling it from another unit from inside a
+ * kernel_neon_begin/kernel_neon_end pair.
+ *
+ * (1) Current GCC (4.7) might generate NEON instructions at O3 level if
+ *     -mpfu=neon is set.
+ */
+
+#define kernel_neon_begin() \
+        BUILD_BUG_ON_MSG(1, "kernel_neon_begin() called from NEON code")
+
+#else
+void kernel_neon_begin(void);
+#endif
+void kernel_neon_end(void);
diff --git a/arch/arm/include/asm/outercache.h b/arch/arm/include/asm/outercache.h
index 12f71a190422..f94784f0e3a6 100644
--- a/arch/arm/include/asm/outercache.h
+++ b/arch/arm/include/asm/outercache.h
@@ -37,10 +37,10 @@ struct outer_cache_fns {
         void (*resume)(void);
 };
 
-#ifdef CONFIG_OUTER_CACHE
-
 extern struct outer_cache_fns outer_cache;
 
+#ifdef CONFIG_OUTER_CACHE
+
 static inline void outer_inv_range(phys_addr_t start, phys_addr_t end)
 {
         if (outer_cache.inv_range)
diff --git a/arch/arm/include/asm/pgtable.h b/arch/arm/include/asm/pgtable.h
index 04aeb02d2e11..be956dbf6bae 100644
--- a/arch/arm/include/asm/pgtable.h
+++ b/arch/arm/include/asm/pgtable.h
@@ -100,7 +100,7 @@ extern pgprot_t		pgprot_s2_device;
 #define PAGE_HYP                _MOD_PROT(pgprot_kernel, L_PTE_HYP)
 #define PAGE_HYP_DEVICE         _MOD_PROT(pgprot_hyp_device, L_PTE_HYP)
 #define PAGE_S2                 _MOD_PROT(pgprot_s2, L_PTE_S2_RDONLY)
-#define PAGE_S2_DEVICE          _MOD_PROT(pgprot_s2_device, L_PTE_USER | L_PTE_S2_RDONLY)
+#define PAGE_S2_DEVICE          _MOD_PROT(pgprot_s2_device, L_PTE_S2_RDWR)
 
 #define __PAGE_NONE             __pgprot(_L_PTE_DEFAULT | L_PTE_RDONLY | L_PTE_XN | L_PTE_NONE)
 #define __PAGE_SHARED           __pgprot(_L_PTE_DEFAULT | L_PTE_USER | L_PTE_XN)
diff --git a/arch/arm/include/asm/prom.h b/arch/arm/include/asm/prom.h
index a219227c3e43..4a2985e21969 100644
--- a/arch/arm/include/asm/prom.h
+++ b/arch/arm/include/asm/prom.h
@@ -15,13 +15,13 @@
 
 #ifdef CONFIG_OF
 
-extern struct machine_desc *setup_machine_fdt(unsigned int dt_phys);
+extern const struct machine_desc *setup_machine_fdt(unsigned int dt_phys);
 extern void arm_dt_memblock_reserve(void);
 extern void __init arm_dt_init_cpu_maps(void);
 
 #else /* CONFIG_OF */
 
-static inline struct machine_desc *setup_machine_fdt(unsigned int dt_phys)
+static inline const struct machine_desc *setup_machine_fdt(unsigned int dt_phys)
 {
         return NULL;
 }
diff --git a/arch/arm/include/asm/spinlock.h b/arch/arm/include/asm/spinlock.h
index b07c09e5a0ac..4f2c28060c9a 100644
--- a/arch/arm/include/asm/spinlock.h
+++ b/arch/arm/include/asm/spinlock.h
@@ -46,7 +46,7 @@ static inline void dsb_sev(void)
 {
 #if __LINUX_ARM_ARCH__ >= 7
         __asm__ __volatile__ (
-                "dsb\n"
+                "dsb ishst\n"
                 SEV
         );
 #else
diff --git a/arch/arm/include/asm/switch_to.h b/arch/arm/include/asm/switch_to.h
index fa09e6b49bf1..c99e259469f7 100644
--- a/arch/arm/include/asm/switch_to.h
+++ b/arch/arm/include/asm/switch_to.h
@@ -4,6 +4,16 @@
 #include <linux/thread_info.h>
 
 /*
+ * For v7 SMP cores running a preemptible kernel we may be pre-empted
+ * during a TLB maintenance operation, so execute an inner-shareable dsb
+ * to ensure that the maintenance completes in case we migrate to another
+ * CPU.
+ */
+#if defined(CONFIG_PREEMPT) && defined(CONFIG_SMP) && defined(CONFIG_CPU_V7)
+#define finish_arch_switch(prev)        dsb(ish)
+#endif
+
+/*
  * switch_to(prev, next) should switch from task `prev' to `next'
  * `prev' will never be the same as `next'.  schedule() itself
  * contains the memory barrier to tell GCC not to cache `current'.
diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h
index 2b8114fcba09..df5e13d64f2c 100644
--- a/arch/arm/include/asm/thread_info.h
+++ b/arch/arm/include/asm/thread_info.h
@@ -43,6 +43,16 @@ struct cpu_context_save {
         __u32   extra[2];               /* Xscale 'acc' register, etc */
 };
 
+struct arm_restart_block {
+        union {
+                /* For user cache flushing */
+                struct {
+                        unsigned long start;
+                        unsigned long end;
+                } cache;
+        };
+};
+
 /*
  * low level task data that entry.S needs immediate access to.
  * __switch_to() assumes cpu_context follows immediately after cpu_domain.
@@ -68,6 +78,7 @@ struct thread_info {
         unsigned long           thumbee_state;  /* ThumbEE Handler Base register */
 #endif
         struct restart_block    restart_block;
+        struct arm_restart_block        arm_restart_block;
 };
 
 #define INIT_THREAD_INFO(tsk)                                           \
diff --git a/arch/arm/include/asm/tlbflush.h b/arch/arm/include/asm/tlbflush.h
index f467e9b3f8d5..38960264040c 100644
--- a/arch/arm/include/asm/tlbflush.h
+++ b/arch/arm/include/asm/tlbflush.h
@@ -319,67 +319,110 @@ extern struct cpu_tlb_fns cpu_tlb;
 #define tlb_op(f, regs, arg)    __tlb_op(f, "p15, 0, %0, " regs, arg)
 #define tlb_l2_op(f, regs, arg) __tlb_op(f, "p15, 1, %0, " regs, arg)
 
-static inline void local_flush_tlb_all(void)
+static inline void __local_flush_tlb_all(void)
 {
         const int zero = 0;
         const unsigned int __tlb_flag = __cpu_tlb_flags;
 
-        if (tlb_flag(TLB_WB))
-                dsb();
-
         tlb_op(TLB_V4_U_FULL | TLB_V6_U_FULL, "c8, c7, 0", zero);
         tlb_op(TLB_V4_D_FULL | TLB_V6_D_FULL, "c8, c6, 0", zero);
         tlb_op(TLB_V4_I_FULL | TLB_V6_I_FULL, "c8, c5, 0", zero);
-        tlb_op(TLB_V7_UIS_FULL, "c8, c3, 0", zero);
+}
+
+static inline void local_flush_tlb_all(void)
+{
+        const int zero = 0;
+        const unsigned int __tlb_flag = __cpu_tlb_flags;
+
+        if (tlb_flag(TLB_WB))
+                dsb(nshst);
+
+        __local_flush_tlb_all();
+        tlb_op(TLB_V7_UIS_FULL, "c8, c7, 0", zero);
 
         if (tlb_flag(TLB_BARRIER)) {
-                dsb();
+                dsb(nsh);
                 isb();
         }
 }
 
-static inline void local_flush_tlb_mm(struct mm_struct *mm)
+static inline void __flush_tlb_all(void)
 {
         const int zero = 0;
-        const int asid = ASID(mm);
         const unsigned int __tlb_flag = __cpu_tlb_flags;
 
         if (tlb_flag(TLB_WB))
-                dsb();
+                dsb(ishst);
+
+        __local_flush_tlb_all();
+        tlb_op(TLB_V7_UIS_FULL, "c8, c3, 0", zero);
+
+        if (tlb_flag(TLB_BARRIER)) {
+                dsb(ish);
+                isb();
+        }
+}
+
+static inline void __local_flush_tlb_mm(struct mm_struct *mm)
+{
+        const int zero = 0;
+        const int asid = ASID(mm);
+        const unsigned int __tlb_flag = __cpu_tlb_flags;
 
         if (possible_tlb_flags & (TLB_V4_U_FULL|TLB_V4_D_FULL|TLB_V4_I_FULL)) {
-                if (cpumask_test_cpu(get_cpu(), mm_cpumask(mm))) {
+                if (cpumask_test_cpu(smp_processor_id(), mm_cpumask(mm))) {
                         tlb_op(TLB_V4_U_FULL, "c8, c7, 0", zero);
                         tlb_op(TLB_V4_D_FULL, "c8, c6, 0", zero);
                         tlb_op(TLB_V4_I_FULL, "c8, c5, 0", zero);
                 }
-                put_cpu();
         }
 
         tlb_op(TLB_V6_U_ASID, "c8, c7, 2", asid);
         tlb_op(TLB_V6_D_ASID, "c8, c6, 2", asid);
         tlb_op(TLB_V6_I_ASID, "c8, c5, 2", asid);
+}
+
+static inline void local_flush_tlb_mm(struct mm_struct *mm)
+{
+        const int asid = ASID(mm);
+        const unsigned int __tlb_flag = __cpu_tlb_flags;
+
+        if (tlb_flag(TLB_WB))
+                dsb(nshst);
+
+        __local_flush_tlb_mm(mm);
+        tlb_op(TLB_V7_UIS_ASID, "c8, c7, 2", asid);
+
+        if (tlb_flag(TLB_BARRIER))
+                dsb(nsh);
+}
+
+static inline void __flush_tlb_mm(struct mm_struct *mm)
+{
+        const unsigned int __tlb_flag = __cpu_tlb_flags;
+
+        if (tlb_flag(TLB_WB))
+                dsb(ishst);
+
+        __local_flush_tlb_mm(mm);
 #ifdef CONFIG_ARM_ERRATA_720789
-        tlb_op(TLB_V7_UIS_ASID, "c8, c3, 0", zero);
+        tlb_op(TLB_V7_UIS_ASID, "c8, c3, 0", 0);
 #else
-        tlb_op(TLB_V7_UIS_ASID, "c8, c3, 2", asid);
+        tlb_op(TLB_V7_UIS_ASID, "c8, c3, 2", ASID(mm));
 #endif
 
         if (tlb_flag(TLB_BARRIER))
-                dsb();
+                dsb(ish);
 }
 
 static inline void
-local_flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
+__local_flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
 {
         const int zero = 0;
         const unsigned int __tlb_flag = __cpu_tlb_flags;
 
         uaddr = (uaddr & PAGE_MASK) | ASID(vma->vm_mm);
 
-        if (tlb_flag(TLB_WB))
-                dsb();
-
         if (possible_tlb_flags & (TLB_V4_U_PAGE|TLB_V4_D_PAGE|TLB_V4_I_PAGE|TLB_V4_I_FULL) &&
             cpumask_test_cpu(smp_processor_id(), mm_cpumask(vma->vm_mm))) {
                 tlb_op(TLB_V4_U_PAGE, "c8, c7, 1", uaddr);
@@ -392,6 +435,36 @@ local_flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
         tlb_op(TLB_V6_U_PAGE, "c8, c7, 1", uaddr);
         tlb_op(TLB_V6_D_PAGE, "c8, c6, 1", uaddr);
         tlb_op(TLB_V6_I_PAGE, "c8, c5, 1", uaddr);
+}
+
+static inline void
+local_flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
+{
+        const unsigned int __tlb_flag = __cpu_tlb_flags;
+
+        uaddr = (uaddr & PAGE_MASK) | ASID(vma->vm_mm);
+
+        if (tlb_flag(TLB_WB))
+                dsb(nshst);
+
+        __local_flush_tlb_page(vma, uaddr);
+        tlb_op(TLB_V7_UIS_PAGE, "c8, c7, 1", uaddr);
+
+        if (tlb_flag(TLB_BARRIER))
+                dsb(nsh);
+}
+
+static inline void
+__flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
+{
+        const unsigned int __tlb_flag = __cpu_tlb_flags;
+
+        uaddr = (uaddr & PAGE_MASK) | ASID(vma->vm_mm);
+
+        if (tlb_flag(TLB_WB))
+                dsb(ishst);
+
+        __local_flush_tlb_page(vma, uaddr);
 #ifdef CONFIG_ARM_ERRATA_720789
         tlb_op(TLB_V7_UIS_PAGE, "c8, c3, 3", uaddr & PAGE_MASK);
 #else
@@ -399,19 +472,14 @@ local_flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
 #endif
 
         if (tlb_flag(TLB_BARRIER))
-                dsb();
+                dsb(ish);
 }
 
-static inline void local_flush_tlb_kernel_page(unsigned long kaddr)
+static inline void __local_flush_tlb_kernel_page(unsigned long kaddr)
 {
         const int zero = 0;
         const unsigned int __tlb_flag = __cpu_tlb_flags;
 
-        kaddr &= PAGE_MASK;
-
-        if (tlb_flag(TLB_WB))
-                dsb();
-
         tlb_op(TLB_V4_U_PAGE, "c8, c7, 1", kaddr);
         tlb_op(TLB_V4_D_PAGE, "c8, c6, 1", kaddr);
         tlb_op(TLB_V4_I_PAGE, "c8, c5, 1", kaddr);
@@ -421,26 +489,75 @@ static inline void local_flush_tlb_kernel_page(unsigned long kaddr)
         tlb_op(TLB_V6_U_PAGE, "c8, c7, 1", kaddr);
         tlb_op(TLB_V6_D_PAGE, "c8, c6, 1", kaddr);
         tlb_op(TLB_V6_I_PAGE, "c8, c5, 1", kaddr);
+}
+
+static inline void local_flush_tlb_kernel_page(unsigned long kaddr)
+{
+        const unsigned int __tlb_flag = __cpu_tlb_flags;
+
+        kaddr &= PAGE_MASK;
+
+        if (tlb_flag(TLB_WB))
+                dsb(nshst);
+
+        __local_flush_tlb_kernel_page(kaddr);
+        tlb_op(TLB_V7_UIS_PAGE, "c8, c7, 1", kaddr);
+
+        if (tlb_flag(TLB_BARRIER)) {
+                dsb(nsh);
+                isb();
+        }
+}
+
+static inline void __flush_tlb_kernel_page(unsigned long kaddr)
+{
+        const unsigned int __tlb_flag = __cpu_tlb_flags;
+
+        kaddr &= PAGE_MASK;
+
+        if (tlb_flag(TLB_WB))
+                dsb(ishst);
+
+        __local_flush_tlb_kernel_page(kaddr);
         tlb_op(TLB_V7_UIS_PAGE, "c8, c3, 1", kaddr);
 
         if (tlb_flag(TLB_BARRIER)) {
-                dsb();
+                dsb(ish);
                 isb();
         }
 }
 
+/*
+ * Branch predictor maintenance is paired with full TLB invalidation, so
+ * there is no need for any barriers here.
+ */
+static inline void __local_flush_bp_all(void)
+{
+        const int zero = 0;
+        const unsigned int __tlb_flag = __cpu_tlb_flags;
+
+        if (tlb_flag(TLB_V6_BP))
+                asm("mcr p15, 0, %0, c7, c5, 6" : : "r" (zero));
+}
+
 static inline void local_flush_bp_all(void)
 {
         const int zero = 0;
         const unsigned int __tlb_flag = __cpu_tlb_flags;
 
+        __local_flush_bp_all();
         if (tlb_flag(TLB_V7_UIS_BP))
-                asm("mcr p15, 0, %0, c7, c1, 6" : : "r" (zero));
-        else if (tlb_flag(TLB_V6_BP))
                 asm("mcr p15, 0, %0, c7, c5, 6" : : "r" (zero));
+}
 
-        if (tlb_flag(TLB_BARRIER))
-                isb();
+static inline void __flush_bp_all(void)
+{
+        const int zero = 0;
+        const unsigned int __tlb_flag = __cpu_tlb_flags;
+
+        __local_flush_bp_all();
+        if (tlb_flag(TLB_V7_UIS_BP))
+                asm("mcr p15, 0, %0, c7, c1, 6" : : "r" (zero));
 }
 
 #include <asm/cputype.h>
@@ -461,7 +578,7 @@ static inline void dummy_flush_tlb_a15_erratum(void)
          * Dummy TLBIMVAIS. Using the unmapped address 0 and ASID 0.
          */
         asm("mcr p15, 0, %0, c8, c3, 1" : : "r" (0));
-        dsb();
+        dsb(ish);
 }
 #else
 static inline int erratum_a15_798181(void)
@@ -495,7 +612,7 @@ static inline void flush_pmd_entry(void *pmd)
         tlb_l2_op(TLB_L2CLEAN_FR, "c15, c9, 1  @ L2 flush_pmd", pmd);
 
         if (tlb_flag(TLB_WB))
-                dsb();
+                dsb(ishst);
 }
 
 static inline void clean_pmd_entry(void *pmd)
diff --git a/arch/arm/include/asm/types.h b/arch/arm/include/asm/types.h
new file mode 100644
index 000000000000..a53cdb8f068c
--- /dev/null
+++ b/arch/arm/include/asm/types.h
@@ -0,0 +1,40 @@
+#ifndef _ASM_TYPES_H
+#define _ASM_TYPES_H
+
+#include <asm-generic/int-ll64.h>
+
+/*
+ * The C99 types uintXX_t that are usually defined in 'stdint.h' are not as
+ * unambiguous on ARM as you would expect. For the types below, there is a
+ * difference on ARM between GCC built for bare metal ARM, GCC built for glibc
+ * and the kernel itself, which results in build errors if you try to build with
+ * -ffreestanding and include 'stdint.h' (such as when you include 'arm_neon.h'
+ * in order to use NEON intrinsics)
+ *
+ * As the typedefs for these types in 'stdint.h' are based on builtin defines
+ * supplied by GCC, we can tweak these to align with the kernel's idea of those
+ * types, so 'linux/types.h' and 'stdint.h' can be safely included from the same
+ * source file (provided that -ffreestanding is used).
+ *
+ *                    int32_t         uint32_t               uintptr_t
+ * bare metal GCC     long            unsigned long          unsigned int
+ * glibc GCC          int             unsigned int           unsigned int
+ * kernel             int             unsigned int           unsigned long
+ */
+
+#ifdef __INT32_TYPE__
+#undef __INT32_TYPE__
+#define __INT32_TYPE__          int
+#endif
+
+#ifdef __UINT32_TYPE__
+#undef __UINT32_TYPE__
+#define __UINT32_TYPE__ unsigned int
+#endif
+
+#ifdef __UINTPTR_TYPE__
+#undef __UINTPTR_TYPE__
+#define __UINTPTR_TYPE__        unsigned long
+#endif
+
+#endif /* _ASM_TYPES_H */
diff --git a/arch/arm/include/asm/v7m.h b/arch/arm/include/asm/v7m.h
index fa88d09fa3d9..615781c61627 100644
--- a/arch/arm/include/asm/v7m.h
+++ b/arch/arm/include/asm/v7m.h
@@ -15,6 +15,10 @@
 
 #define V7M_SCB_VTOR                    0x08
 
+#define V7M_SCB_AIRCR                   0x0c
+#define V7M_SCB_AIRCR_VECTKEY                   (0x05fa << 16)
+#define V7M_SCB_AIRCR_SYSRESETREQ               (1 << 2)
+
 #define V7M_SCB_SCR                     0x10
 #define V7M_SCB_SCR_SLEEPDEEP                   (1 << 2)
 
@@ -42,3 +46,11 @@
  */
 #define EXC_RET_STACK_MASK                      0x00000004
 #define EXC_RET_THREADMODE_PROCESSSTACK         0xfffffffd
+
+#ifndef __ASSEMBLY__
+
+enum reboot_mode;
+
+void armv7m_restart(enum reboot_mode mode, const char *cmd);
+
+#endif /* __ASSEMBLY__ */
diff --git a/arch/arm/include/asm/xor.h b/arch/arm/include/asm/xor.h
index 7604673dc427..4ffb26d4cad8 100644
--- a/arch/arm/include/asm/xor.h
+++ b/arch/arm/include/asm/xor.h
@@ -7,7 +7,10 @@
  * it under the terms of the GNU General Public License version 2 as
  * published by the Free Software Foundation.
  */
+#include <linux/hardirq.h>
 #include <asm-generic/xor.h>
+#include <asm/hwcap.h>
+#include <asm/neon.h>
 
 #define __XOR(a1, a2) a1 ^= a2
 
@@ -138,4 +141,74 @@ static struct xor_block_template xor_block_arm4regs = {
                 xor_speed(&xor_block_arm4regs); \
                 xor_speed(&xor_block_8regs);    \
                 xor_speed(&xor_block_32regs);   \
+                NEON_TEMPLATES;                 \
         } while (0)
+
+#ifdef CONFIG_KERNEL_MODE_NEON
+
+extern struct xor_block_template const xor_block_neon_inner;
+
+static void
+xor_neon_2(unsigned long bytes, unsigned long *p1, unsigned long *p2)
+{
+        if (in_interrupt()) {
+                xor_arm4regs_2(bytes, p1, p2);
+        } else {
+                kernel_neon_begin();
+                xor_block_neon_inner.do_2(bytes, p1, p2);
+                kernel_neon_end();
+        }
+}
+
+static void
+xor_neon_3(unsigned long bytes, unsigned long *p1, unsigned long *p2,
+                unsigned long *p3)
+{
+        if (in_interrupt()) {
+                xor_arm4regs_3(bytes, p1, p2, p3);
+        } else {
+                kernel_neon_begin();
+                xor_block_neon_inner.do_3(bytes, p1, p2, p3);
+                kernel_neon_end();
+        }
+}
+
+static void
+xor_neon_4(unsigned long bytes, unsigned long *p1, unsigned long *p2,
+                unsigned long *p3, unsigned long *p4)
+{
+        if (in_interrupt()) {
+                xor_arm4regs_4(bytes, p1, p2, p3, p4);
+        } else {
+                kernel_neon_begin();
+                xor_block_neon_inner.do_4(bytes, p1, p2, p3, p4);
+                kernel_neon_end();
+        }
+}
+
+static void
+xor_neon_5(unsigned long bytes, unsigned long *p1, unsigned long *p2,
+                unsigned long *p3, unsigned long *p4, unsigned long *p5)
+{
+        if (in_interrupt()) {
+                xor_arm4regs_5(bytes, p1, p2, p3, p4, p5);
+        } else {
+                kernel_neon_begin();
+                xor_block_neon_inner.do_5(bytes, p1, p2, p3, p4, p5);
+                kernel_neon_end();
+        }
+}
+
+static struct xor_block_template xor_block_neon = {
+        .name   = "neon",
+        .do_2   = xor_neon_2,
+        .do_3   = xor_neon_3,
+        .do_4   = xor_neon_4,
+        .do_5   = xor_neon_5
+};
+
+#define NEON_TEMPLATES  \
+        do { if (cpu_has_neon()) xor_speed(&xor_block_neon); } while (0)
+#else
+#define NEON_TEMPLATES
+#endif
diff --git a/arch/arm/include/debug/8250.S b/arch/arm/include/debug/8250.S
new file mode 100644
index 000000000000..7a2baf913aa0
--- /dev/null
+++ b/arch/arm/include/debug/8250.S
@@ -0,0 +1,54 @@
+/*
+ * arch/arm/include/debug/8250.S
+ *
+ *  Copyright (C) 1994-2013 Russell King
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/serial_reg.h>
+
+                .macro  addruart, rp, rv, tmp
+                ldr     \rp, =CONFIG_DEBUG_UART_PHYS
+                ldr     \rv, =CONFIG_DEBUG_UART_VIRT
+                .endm
+
+#ifdef CONFIG_DEBUG_UART_8250_WORD
+                .macro  store, rd, rx:vararg
+                str     \rd, \rx
+                .endm
+
+                .macro  load, rd, rx:vararg
+                ldr     \rd, \rx
+                .endm
+#else
+                .macro  store, rd, rx:vararg
+                strb    \rd, \rx
+                .endm
+
+                .macro  load, rd, rx:vararg
+                ldrb    \rd, \rx
+                .endm
+#endif
+
+#define UART_SHIFT CONFIG_DEBUG_UART_8250_SHIFT
+
+                .macro  senduart,rd,rx
+                store   \rd, [\rx, #UART_TX << UART_SHIFT]
+                .endm
+
+                .macro  busyuart,rd,rx
+1002:           load    \rd, [\rx, #UART_LSR << UART_SHIFT]
+                and     \rd, \rd, #UART_LSR_TEMT | UART_LSR_THRE
+                teq     \rd, #UART_LSR_TEMT | UART_LSR_THRE
+                bne     1002b
+                .endm
+
+                .macro  waituart,rd,rx
+#ifdef CONFIG_DEBUG_UART_8250_FLOW_CONTROL
+1001:           load    \rd, [\rx, #UART_MSR << UART_SHIFT]
+                tst     \rd, #UART_MSR_CTS
+                beq     1001b
+#endif
+                .endm
diff --git a/arch/arm/include/debug/8250_32.S b/arch/arm/include/debug/8250_32.S
deleted file mode 100644
index 8db01eeabbb4..000000000000
--- a/arch/arm/include/debug/8250_32.S
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2011 Picochip Ltd., Jamie Iles
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Derived from arch/arm/mach-davinci/include/mach/debug-macro.S to use 32-bit
- * accesses to the 8250.
- */
-
-#include <linux/serial_reg.h>
-
-                .macro  senduart,rd,rx
-                str     \rd, [\rx, #UART_TX << UART_SHIFT]
-                .endm
-
-                .macro  busyuart,rd,rx
-1002:           ldr     \rd, [\rx, #UART_LSR << UART_SHIFT]
-                and     \rd, \rd, #UART_LSR_TEMT | UART_LSR_THRE
-                teq     \rd, #UART_LSR_TEMT | UART_LSR_THRE
-                bne     1002b
-                .endm
-
-                /* The UART's don't have any flow control IO's wired up. */
-                .macro  waituart,rd,rx
-                .endm
diff --git a/arch/arm/include/debug/bcm2835.S b/arch/arm/include/debug/bcm2835.S
deleted file mode 100644
index aed9199bd847..000000000000
--- a/arch/arm/include/debug/bcm2835.S
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Debugging macro include header
- *
- * Copyright (C) 2010 Broadcom
- * Copyright (C) 1994-1999 Russell King
- * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-
-#define BCM2835_DEBUG_PHYS 0x20201000
-#define BCM2835_DEBUG_VIRT 0xf0201000
-
-        .macro  addruart, rp, rv, tmp
-        ldr     \rp, =BCM2835_DEBUG_PHYS
-        ldr     \rv, =BCM2835_DEBUG_VIRT
-        .endm
-
-#include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/include/debug/cns3xxx.S b/arch/arm/include/debug/cns3xxx.S
deleted file mode 100644
index d04c150baa1c..000000000000
--- a/arch/arm/include/debug/cns3xxx.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Debugging macro include header
- *
- * Copyright 1994-1999 Russell King
- * Copyright 2008 Cavium Networks
- * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * This file is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, Version 2, as
- * published by the Free Software Foundation.
- */
-
-                .macro  addruart,rp,rv,tmp
-                mov     \rp, #0x00009000
-                orr     \rv, \rp, #0xf0000000   @ virtual base
-                orr     \rp, \rp, #0x10000000
-                .endm
-
-#include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/include/debug/highbank.S b/arch/arm/include/debug/highbank.S
deleted file mode 100644
index 8cad4322a5a2..000000000000
--- a/arch/arm/include/debug/highbank.S
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Debugging macro include header
- *
- *  Copyright (C) 1994-1999 Russell King
- *  Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-                .macro  addruart,rp,rv,tmp
-                ldr     \rv, =0xfee36000
-                ldr     \rp, =0xfff36000
-                .endm
-
-#include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/include/debug/keystone.S b/arch/arm/include/debug/keystone.S
deleted file mode 100644
index 9aef9ba3f4f0..000000000000
--- a/arch/arm/include/debug/keystone.S
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Early serial debug output macro for Keystone SOCs
- *
- * Copyright 2013 Texas Instruments, Inc.
- *      Santosh Shilimkar <santosh.shilimkar@ti.com>
- *
- * Based on RMKs low level debug code.
- *  Copyright (C) 1994-1999 Russell King
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/serial_reg.h>
-
-#define UART_SHIFT 2
-#if defined(CONFIG_DEBUG_KEYSTONE_UART0)
-#define UART_PHYS               0x02530c00
-#define UART_VIRT               0xfeb30c00
-#elif defined(CONFIG_DEBUG_KEYSTONE_UART1)
-#define UART_PHYS               0x02531000
-#define UART_VIRT               0xfeb31000
-#endif
-
-        .macro  addruart, rp, rv, tmp
-        ldr     \rv, =UART_VIRT                 @ physical base address
-        ldr     \rp, =UART_PHYS                 @ virtual base address
-        .endm
-
-        .macro  senduart,rd,rx
-        str     \rd, [\rx, #UART_TX << UART_SHIFT]
-        .endm
-
-        .macro  busyuart,rd,rx
-1002:   ldr     \rd, [\rx, #UART_LSR << UART_SHIFT]
-        and     \rd, \rd, #UART_LSR_TEMT | UART_LSR_THRE
-        teq     \rd, #UART_LSR_TEMT | UART_LSR_THRE
-        bne     1002b
-        .endm
-
-        .macro  waituart,rd,rx
-        .endm
diff --git a/arch/arm/mach-msm/include/mach/debug-macro.S b/arch/arm/include/debug/msm.S
index 0e05f88abcd5..9166e1bc470e 100644
--- a/arch/arm/mach-msm/include/mach/debug-macro.S
+++ b/arch/arm/include/debug/msm.S
@@ -15,8 +15,36 @@
  *
  */
 
-#include <mach/hardware.h>
-#include <mach/msm_iomap.h>
+#if defined(CONFIG_ARCH_MSM7X00A) || defined(CONFIG_ARCH_QSD8X50)
+#define MSM_UART1_PHYS        0xA9A00000
+#define MSM_UART2_PHYS        0xA9B00000
+#define MSM_UART3_PHYS        0xA9C00000
+#elif defined(CONFIG_ARCH_MSM7X30)
+#define MSM_UART1_PHYS        0xACA00000
+#define MSM_UART2_PHYS        0xACB00000
+#define MSM_UART3_PHYS        0xACC00000
+#endif
+
+#if defined(CONFIG_DEBUG_MSM_UART1)
+#define MSM_DEBUG_UART_BASE     0xE1000000
+#define MSM_DEBUG_UART_PHYS     MSM_UART1_PHYS
+#elif defined(CONFIG_DEBUG_MSM_UART2)
+#define MSM_DEBUG_UART_BASE     0xE1000000
+#define MSM_DEBUG_UART_PHYS     MSM_UART2_PHYS
+#elif defined(CONFIG_DEBUG_MSM_UART3)
+#define MSM_DEBUG_UART_BASE     0xE1000000
+#define MSM_DEBUG_UART_PHYS     MSM_UART3_PHYS
+#endif
+
+#ifdef CONFIG_DEBUG_MSM8660_UART
+#define MSM_DEBUG_UART_BASE     0xF0040000
+#define MSM_DEBUG_UART_PHYS     0x19C40000
+#endif
+
+#ifdef CONFIG_DEBUG_MSM8960_UART
+#define MSM_DEBUG_UART_BASE     0xF0040000
+#define MSM_DEBUG_UART_PHYS     0x16440000
+#endif
 
         .macro  addruart, rp, rv, tmp
 #ifdef MSM_DEBUG_UART_PHYS
diff --git a/arch/arm/include/debug/mvebu.S b/arch/arm/include/debug/mvebu.S
deleted file mode 100644
index 6517311a1c91..000000000000
--- a/arch/arm/include/debug/mvebu.S
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Early serial output macro for Marvell  SoC
- *
- * Copyright (C) 2012 Marvell
- *
- * Lior Amsalem <alior@marvell.com>
- * Gregory Clement <gregory.clement@free-electrons.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#ifdef CONFIG_DEBUG_MVEBU_UART_ALTERNATE
-#define ARMADA_370_XP_REGS_PHYS_BASE    0xf1000000
-#else
-#define ARMADA_370_XP_REGS_PHYS_BASE    0xd0000000
-#endif
-
-#define ARMADA_370_XP_REGS_VIRT_BASE    0xfec00000
-
-        .macro  addruart, rp, rv, tmp
-        ldr     \rp, =ARMADA_370_XP_REGS_PHYS_BASE
-        ldr     \rv, =ARMADA_370_XP_REGS_VIRT_BASE
-        orr     \rp, \rp, #0x00012000
-        orr     \rv, \rv, #0x00012000
-        .endm
-
-#define UART_SHIFT      2
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/include/debug/mxs.S b/arch/arm/include/debug/mxs.S
deleted file mode 100644
index d86951551ca1..000000000000
--- a/arch/arm/include/debug/mxs.S
+++ /dev/null
@@ -1,27 +0,0 @@
-/* arch/arm/mach-mxs/include/mach/debug-macro.S
- *
- * Debugging macro include header
- *
- *  Copyright (C) 1994-1999 Russell King
- *  Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-
-#ifdef CONFIG_DEBUG_IMX23_UART
-#define UART_PADDR      0x80070000
-#elif defined (CONFIG_DEBUG_IMX28_UART)
-#define UART_PADDR      0x80074000
-#endif
-
-#define UART_VADDR      0xfe100000
-
-                .macro  addruart, rp, rv, tmp
-                ldr     \rp, =UART_PADDR        @ physical
-                ldr     \rv, =UART_VADDR        @ virtual
-                .endm
-
-#include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/include/debug/nomadik.S b/arch/arm/include/debug/nomadik.S
deleted file mode 100644
index 735417922ce2..000000000000
--- a/arch/arm/include/debug/nomadik.S
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Debugging macro include header
- *
- *  Copyright (C) 1994-1999 Russell King
- *  Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
-
-                .macro  addruart, rp, rv, tmp
-                mov     \rp, #0x00100000
-                add     \rp, \rp, #0x000fb000
-                add     \rv, \rp, #0xf0000000   @ virtual base
-                add     \rp, \rp, #0x10000000   @ physical base address
-                .endm
-
-#include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/include/debug/nspire.S b/arch/arm/include/debug/nspire.S
deleted file mode 100644
index 886fd276fcbc..000000000000
--- a/arch/arm/include/debug/nspire.S
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- *      linux/arch/arm/include/debug/nspire.S
- *
- *      Copyright (C) 2013 Daniel Tang <tangrs@tangrs.id.au>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2, as
- * published by the Free Software Foundation.
- *
- */
-
-#define NSPIRE_EARLY_UART_PHYS_BASE        0x90020000
-#define NSPIRE_EARLY_UART_VIRT_BASE        0xfee20000
-
-.macro  addruart, rp, rv, tmp
-        ldr \rp, =(NSPIRE_EARLY_UART_PHYS_BASE)         @ physical base address
-        ldr \rv, =(NSPIRE_EARLY_UART_VIRT_BASE)         @ virtual base address
-.endm
-
-
-#ifdef CONFIG_DEBUG_NSPIRE_CX_UART
-#include <asm/hardware/debug-pl01x.S>
-#endif
-
-#ifdef CONFIG_DEBUG_NSPIRE_CLASSIC_UART
-#define UART_SHIFT 2
-#include <asm/hardware/debug-8250.S>
-#endif
diff --git a/arch/arm/include/debug/picoxcell.S b/arch/arm/include/debug/picoxcell.S
deleted file mode 100644
index bc1f07c49cd4..000000000000
--- a/arch/arm/include/debug/picoxcell.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright (c) 2011 Picochip Ltd., Jamie Iles
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-
-#define UART_SHIFT 2
-#define PICOXCELL_UART1_BASE            0x80230000
-#define PHYS_TO_IO(x)                   (((x) & 0x00ffffff) | 0xfe000000)
-
-                .macro  addruart, rp, rv, tmp
-                ldr     \rv, =PHYS_TO_IO(PICOXCELL_UART1_BASE)
-                ldr     \rp, =PICOXCELL_UART1_BASE
-                .endm
-
-#include "8250_32.S"
diff --git a/arch/arm/include/asm/hardware/debug-pl01x.S b/arch/arm/include/debug/pl01x.S
index f9fd083eff63..37c6895b87e6 100644
--- a/arch/arm/include/asm/hardware/debug-pl01x.S
+++ b/arch/arm/include/debug/pl01x.S
@@ -1,4 +1,4 @@
-/* arch/arm/include/asm/hardware/debug-pl01x.S
+/* arch/arm/include/debug/pl01x.S
  *
  * Debugging macro include header
  *
@@ -12,6 +12,13 @@
 */
 #include <linux/amba/serial.h>
 
+#ifdef CONFIG_DEBUG_UART_PHYS
+                .macro  addruart, rp, rv, tmp
+                ldr     \rp, =CONFIG_DEBUG_UART_PHYS
+                ldr     \rv, =CONFIG_DEBUG_UART_VIRT
+                .endm
+#endif
+
                 .macro  senduart,rd,rx
                 strb    \rd, [\rx, #UART01x_DR]
                 .endm
diff --git a/arch/arm/include/debug/pxa.S b/arch/arm/include/debug/pxa.S
deleted file mode 100644
index e1e795aa3d7f..000000000000
--- a/arch/arm/include/debug/pxa.S
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Early serial output macro for Marvell PXA/MMP SoC
- *
- * Copyright (C) 1994-1999 Russell King
- * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * Copyright (C) 2013 Haojian Zhuang
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#if defined(CONFIG_DEBUG_PXA_UART1)
-#define PXA_UART_REG_PHYS_BASE  0x40100000
-#define PXA_UART_REG_VIRT_BASE  0xf2100000
-#elif defined(CONFIG_DEBUG_MMP_UART2)
-#define PXA_UART_REG_PHYS_BASE  0xd4017000
-#define PXA_UART_REG_VIRT_BASE  0xfe017000
-#elif defined(CONFIG_DEBUG_MMP_UART3)
-#define PXA_UART_REG_PHYS_BASE  0xd4018000
-#define PXA_UART_REG_VIRT_BASE  0xfe018000
-#else
-#error "Select uart for DEBUG_LL"
-#endif
-
-        .macro  addruart, rp, rv, tmp
-        ldr     \rp, =PXA_UART_REG_PHYS_BASE
-        ldr     \rv, =PXA_UART_REG_VIRT_BASE
-        .endm
-
-#define UART_SHIFT      2
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/include/debug/rockchip.S b/arch/arm/include/debug/rockchip.S
deleted file mode 100644
index cfd883e69588..000000000000
--- a/arch/arm/include/debug/rockchip.S
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Early serial output macro for Rockchip SoCs
- *
- * Copyright (C) 2012 Maxime Ripard
- *
- * Maxime Ripard <maxime.ripard@free-electrons.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#if defined(CONFIG_DEBUG_RK29_UART0)
-#define ROCKCHIP_UART_DEBUG_PHYS_BASE 0x20060000
-#define ROCKCHIP_UART_DEBUG_VIRT_BASE 0xfed60000
-#elif defined(CONFIG_DEBUG_RK29_UART1)
-#define ROCKCHIP_UART_DEBUG_PHYS_BASE 0x20064000
-#define ROCKCHIP_UART_DEBUG_VIRT_BASE 0xfed64000
-#elif defined(CONFIG_DEBUG_RK29_UART2)
-#define ROCKCHIP_UART_DEBUG_PHYS_BASE 0x20068000
-#define ROCKCHIP_UART_DEBUG_VIRT_BASE 0xfed68000
-#elif defined(CONFIG_DEBUG_RK3X_UART0)
-#define ROCKCHIP_UART_DEBUG_PHYS_BASE 0x10124000
-#define ROCKCHIP_UART_DEBUG_VIRT_BASE 0xfeb24000
-#elif defined(CONFIG_DEBUG_RK3X_UART1)
-#define ROCKCHIP_UART_DEBUG_PHYS_BASE 0x10126000
-#define ROCKCHIP_UART_DEBUG_VIRT_BASE 0xfeb26000
-#elif defined(CONFIG_DEBUG_RK3X_UART2)
-#define ROCKCHIP_UART_DEBUG_PHYS_BASE 0x20064000
-#define ROCKCHIP_UART_DEBUG_VIRT_BASE 0xfed64000
-#elif defined(CONFIG_DEBUG_RK3X_UART3)
-#define ROCKCHIP_UART_DEBUG_PHYS_BASE 0x20068000
-#define ROCKCHIP_UART_DEBUG_VIRT_BASE 0xfed68000
-#endif
-
-        .macro  addruart, rp, rv, tmp
-        ldr     \rp, =ROCKCHIP_UART_DEBUG_PHYS_BASE
-        ldr     \rv, =ROCKCHIP_UART_DEBUG_VIRT_BASE
-        .endm
-
-#define UART_SHIFT      2
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/include/debug/socfpga.S b/arch/arm/include/debug/socfpga.S
deleted file mode 100644
index 966b2f994946..000000000000
--- a/arch/arm/include/debug/socfpga.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  Copyright (C) 1994-1999 Russell King
- *  Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#define UART_SHIFT 2
-#define DEBUG_LL_UART_OFFSET    0x00002000
-
-                .macro  addruart, rp, rv, tmp
-                mov     \rp, #DEBUG_LL_UART_OFFSET
-                orr     \rp, \rp, #0x00c00000
-                orr     \rv, \rp, #0xfe000000   @ virtual base
-                orr     \rp, \rp, #0xff000000   @ physical base
-                .endm
-
-#include "8250_32.S"
-
diff --git a/arch/arm/include/debug/sunxi.S b/arch/arm/include/debug/sunxi.S
deleted file mode 100644
index 04eb56d5db2c..000000000000
--- a/arch/arm/include/debug/sunxi.S
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Early serial output macro for Allwinner A1X SoCs
- *
- * Copyright (C) 2012 Maxime Ripard
- *
- * Maxime Ripard <maxime.ripard@free-electrons.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#if defined(CONFIG_DEBUG_SUNXI_UART0)
-#define SUNXI_UART_DEBUG_PHYS_BASE 0x01c28000
-#define SUNXI_UART_DEBUG_VIRT_BASE 0xf1c28000
-#elif defined(CONFIG_DEBUG_SUNXI_UART1)
-#define SUNXI_UART_DEBUG_PHYS_BASE 0x01c28400
-#define SUNXI_UART_DEBUG_VIRT_BASE 0xf1c28400
-#endif
-
-        .macro  addruart, rp, rv, tmp
-        ldr     \rp, =SUNXI_UART_DEBUG_PHYS_BASE
-        ldr     \rv, =SUNXI_UART_DEBUG_VIRT_BASE
-        .endm
-
-#define UART_SHIFT      2
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/include/debug/tegra.S b/arch/arm/include/debug/tegra.S
index 883d7c22fd9d..be6a720dd183 100644
--- a/arch/arm/include/debug/tegra.S
+++ b/arch/arm/include/debug/tegra.S
@@ -221,3 +221,32 @@
 1002:
 #endif
                 .endm
+
+/*
+ * Storage for the state maintained by the macros above.
+ *
+ * In the kernel proper, this data is located in arch/arm/mach-tegra/common.c.
+ * That's because this header is included from multiple files, and we only
+ * want a single copy of the data. In particular, the UART probing code above
+ * assumes it's running using physical addresses. This is true when this file
+ * is included from head.o, but not when included from debug.o. So we need
+ * to share the probe results between the two copies, rather than having
+ * to re-run the probing again later.
+ *
+ * In the decompressor, we put the symbol/storage right here, since common.c
+ * isn't included in the decompressor build. This symbol gets put in .text
+ * even though it's really data, since .data is discarded from the
+ * decompressor. Luckily, .text is writeable in the decompressor, unless
+ * CONFIG_ZBOOT_ROM. That dependency is handled in arch/arm/Kconfig.debug.
+ */
+#if defined(ZIMAGE)
+tegra_uart_config:
+        /* Debug UART initialization required */
+        .word 1
+        /* Debug UART physical address */
+        .word 0
+        /* Debug UART virtual address */
+        .word 0
+        /* Scratch space for debug macro */
+        .word 0
+#endif
diff --git a/arch/arm/include/debug/u300.S b/arch/arm/include/debug/u300.S
deleted file mode 100644
index 6f04f08a203c..000000000000
--- a/arch/arm/include/debug/u300.S
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 2006-2013 ST-Ericsson AB
- * License terms: GNU General Public License (GPL) version 2
- * Debugging macro include header.
- * Author: Linus Walleij <linus.walleij@stericsson.com>
- */
-#define U300_SLOW_PER_PHYS_BASE         0xc0010000
-#define U300_SLOW_PER_VIRT_BASE         0xff000000
-
-        .macro  addruart, rp, rv, tmp
-        /* If we move the address using MMU, use this. */
-        ldr     \rp,      = U300_SLOW_PER_PHYS_BASE @ MMU off, physical address
-        ldr     \rv,      = U300_SLOW_PER_VIRT_BASE @ MMU on, virtual address
-        orr     \rp, \rp, #0x00003000
-        orr     \rv, \rv, #0x00003000
-        .endm
-
-#include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/include/debug/ux500.S b/arch/arm/include/debug/ux500.S
index fbd24beeb1fa..aa7f63a8b5e0 100644
--- a/arch/arm/include/debug/ux500.S
+++ b/arch/arm/include/debug/ux500.S
@@ -45,4 +45,4 @@
         ldr     \rv, =UART_VIRT_BASE            @ yes, virtual address
         .endm
 
-#include <asm/hardware/debug-pl01x.S>
+#include <debug/pl01x.S>
diff --git a/arch/arm/include/debug/vexpress.S b/arch/arm/include/debug/vexpress.S
index acafb229e2b6..524acd5a223e 100644
--- a/arch/arm/include/debug/vexpress.S
+++ b/arch/arm/include/debug/vexpress.S
@@ -47,51 +47,5 @@
 
                 .endm
 
-#include <asm/hardware/debug-pl01x.S>
-
-#elif defined(CONFIG_DEBUG_VEXPRESS_UART0_CA9)
-
-                .macro  addruart,rp,rv,tmp
-                mov     \rp, #DEBUG_LL_UART_OFFSET
-                orr     \rv, \rp, #DEBUG_LL_VIRT_BASE
-                orr     \rp, \rp, #DEBUG_LL_PHYS_BASE
-                .endm
-
-#include <asm/hardware/debug-pl01x.S>
-
-#elif defined(CONFIG_DEBUG_VEXPRESS_UART0_RS1)
-
-                .macro  addruart,rp,rv,tmp
-                mov     \rp, #DEBUG_LL_UART_OFFSET_RS1
-                orr     \rv, \rp, #DEBUG_LL_VIRT_BASE
-                orr     \rp, \rp, #DEBUG_LL_PHYS_BASE_RS1
-                .endm
-
-#include <asm/hardware/debug-pl01x.S>
-
-#elif defined(CONFIG_DEBUG_VEXPRESS_UART0_CRX)
-
-                .macro  addruart,rp,tmp,tmp2
-                ldr     \rp, =DEBUG_LL_UART_PHYS_CRX
-                .endm
-
-#include <asm/hardware/debug-pl01x.S>
-
-#else /* CONFIG_DEBUG_LL_UART_NONE */
-
-                .macro  addruart, rp, rv, tmp
-                /* Safe dummy values */
-                mov     \rp, #0
-                mov     \rv, #DEBUG_LL_VIRT_BASE
-                .endm
-
-                .macro  senduart,rd,rx
-                .endm
-
-                .macro  waituart,rd,rx
-                .endm
-
-                .macro  busyuart,rd,rx
-                .endm
-
+#include <debug/pl01x.S>
 #endif
diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile
index 86d10dd47dc4..5140df5f23aa 100644
--- a/arch/arm/kernel/Makefile
+++ b/arch/arm/kernel/Makefile
@@ -24,7 +24,7 @@ obj-$(CONFIG_ATAGS_PROC)	+= atags_proc.o
 obj-$(CONFIG_DEPRECATED_PARAM_STRUCT) += atags_compat.o
 
 ifeq ($(CONFIG_CPU_V7M),y)
-obj-y           += entry-v7m.o
+obj-y           += entry-v7m.o v7m.o
 else
 obj-y           += entry-armv.o
 endif
diff --git a/arch/arm/kernel/atags.h b/arch/arm/kernel/atags.h
index 9edc9692332d..ec4164da6e30 100644
--- a/arch/arm/kernel/atags.h
+++ b/arch/arm/kernel/atags.h
@@ -7,9 +7,10 @@ static inline void save_atags(struct tag *tags) { }
 void convert_to_tag_list(struct tag *tags);
 
 #ifdef CONFIG_ATAGS
-struct machine_desc *setup_machine_tags(phys_addr_t __atags_pointer, unsigned int machine_nr);
+const struct machine_desc *setup_machine_tags(phys_addr_t __atags_pointer,
+        unsigned int machine_nr);
 #else
-static inline struct machine_desc *
+static inline const struct machine_desc *
 setup_machine_tags(phys_addr_t __atags_pointer, unsigned int machine_nr)
 {
         early_print("no ATAGS support: can't continue\n");
diff --git a/arch/arm/kernel/atags_parse.c b/arch/arm/kernel/atags_parse.c
index 14512e6931d8..8c14de8180c0 100644
--- a/arch/arm/kernel/atags_parse.c
+++ b/arch/arm/kernel/atags_parse.c
@@ -178,11 +178,11 @@ static void __init squash_mem_tags(struct tag *tag)
                         tag->hdr.tag = ATAG_NONE;
 }
 
-struct machine_desc * __init setup_machine_tags(phys_addr_t __atags_pointer,
-                                                unsigned int machine_nr)
+const struct machine_desc * __init
+setup_machine_tags(phys_addr_t __atags_pointer, unsigned int machine_nr)
 {
         struct tag *tags = (struct tag *)&default_tags;
-        struct machine_desc *mdesc = NULL, *p;
+        const struct machine_desc *mdesc = NULL, *p;
         char *from = default_command_line;
 
         default_tags.mem.start = PHYS_OFFSET;
diff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c
index 261fcc826169..317da88ae65b 100644
--- a/arch/arm/kernel/bios32.c
+++ b/arch/arm/kernel/bios32.c
@@ -363,6 +363,20 @@ void pcibios_fixup_bus(struct pci_bus *bus)
 }
 EXPORT_SYMBOL(pcibios_fixup_bus);
 
+void pcibios_add_bus(struct pci_bus *bus)
+{
+        struct pci_sys_data *sys = bus->sysdata;
+        if (sys->add_bus)
+                sys->add_bus(bus);
+}
+
+void pcibios_remove_bus(struct pci_bus *bus)
+{
+        struct pci_sys_data *sys = bus->sysdata;
+        if (sys->remove_bus)
+                sys->remove_bus(bus);
+}
+
 /*
  * Swizzle the device pin each time we cross a bridge.  If a platform does
  * not provide a swizzle function, we perform the standard PCI swizzling.
@@ -464,6 +478,8 @@ static void pcibios_init_hw(struct device *parent, struct hw_pci *hw,
                 sys->swizzle = hw->swizzle;
                 sys->map_irq = hw->map_irq;
                 sys->align_resource = hw->align_resource;
+                sys->add_bus = hw->add_bus;
+                sys->remove_bus = hw->remove_bus;
                 INIT_LIST_HEAD(&sys->resources);
 
                 if (hw->private_data)
@@ -525,11 +541,6 @@ void pci_common_init_dev(struct device *parent, struct hw_pci *hw)
                          * Assign resources.
                          */
                         pci_bus_assign_resources(bus);
-
-                        /*
-                         * Enable bridges
-                         */
-                        pci_enable_bridges(bus);
                 }
 
                 /*
diff --git a/arch/arm/kernel/devtree.c b/arch/arm/kernel/devtree.c
index 5859c8bc727c..f35906b3d8c9 100644
--- a/arch/arm/kernel/devtree.c
+++ b/arch/arm/kernel/devtree.c
@@ -169,6 +169,11 @@ void __init arm_dt_init_cpu_maps(void)
         }
 }
 
+bool arch_match_cpu_phys_id(int cpu, u64 phys_id)
+{
+        return (phys_id & MPIDR_HWID_BITMASK) == cpu_logical_map(cpu);
+}
+
 /**
  * setup_machine_fdt - Machine setup when an dtb was passed to the kernel
  * @dt_phys: physical address of dt blob
@@ -176,10 +181,10 @@ void __init arm_dt_init_cpu_maps(void)
  * If a dtb was passed to the kernel in r2, then use it to choose the
  * correct machine_desc and to setup the system.
  */
-struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
+const struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
 {
         struct boot_param_header *devtree;
-        struct machine_desc *mdesc, *mdesc_best = NULL;
+        const struct machine_desc *mdesc, *mdesc_best = NULL;
         unsigned int score, mdesc_score = ~1;
         unsigned long dt_root;
         const char *model;
@@ -188,7 +193,7 @@ struct machine_desc * __init setup_machine_fdt(unsigned int dt_phys)
         DT_MACHINE_START(GENERIC_DT, "Generic DT based system")
         MACHINE_END
 
-        mdesc_best = (struct machine_desc *)&__mach_desc_GENERIC_DT;
+        mdesc_best = &__mach_desc_GENERIC_DT;
 #endif
 
         if (!dt_phys)
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 94104bf69719..74ad15d1a065 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -442,10 +442,10 @@ local_restart:
         ldrcc   pc, [tbl, scno, lsl #2]         @ call sys_* routine
 
         add     r1, sp, #S_OFF
-2:      mov     why, #0                         @ no longer a real syscall
         cmp     scno, #(__ARM_NR_BASE - __NR_SYSCALL_BASE)
         eor     r0, scno, #__NR_SYSCALL_BASE    @ put OS number back
-        bcs     arm_syscall     
+        bcs     arm_syscall
+2:      mov     why, #0                         @ no longer a real syscall
         b       sys_ni_syscall                  @ not private func
 
 #if defined(CONFIG_OABI_COMPAT) || !defined(CONFIG_AEABI)
diff --git a/arch/arm/kernel/module.c b/arch/arm/kernel/module.c
index 85c3fb6c93c2..084dc8896986 100644
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
@@ -292,12 +292,20 @@ int module_finalize(const Elf32_Ehdr *hdr, const Elf_Shdr *sechdrs,
                         maps[ARM_SEC_CORE].unw_sec = s;
                 else if (strcmp(".ARM.exidx.exit.text", secname) == 0)
                         maps[ARM_SEC_EXIT].unw_sec = s;
+                else if (strcmp(".ARM.exidx.text.unlikely", secname) == 0)
+                        maps[ARM_SEC_UNLIKELY].unw_sec = s;
+                else if (strcmp(".ARM.exidx.text.hot", secname) == 0)
+                        maps[ARM_SEC_HOT].unw_sec = s;
                 else if (strcmp(".init.text", secname) == 0)
                         maps[ARM_SEC_INIT].txt_sec = s;
                 else if (strcmp(".text", secname) == 0)
                         maps[ARM_SEC_CORE].txt_sec = s;
                 else if (strcmp(".exit.text", secname) == 0)
                         maps[ARM_SEC_EXIT].txt_sec = s;
+                else if (strcmp(".text.unlikely", secname) == 0)
+                        maps[ARM_SEC_UNLIKELY].txt_sec = s;
+                else if (strcmp(".text.hot", secname) == 0)
+                        maps[ARM_SEC_HOT].txt_sec = s;
         }
 
         for (i = 0; i < ARM_SEC_MAX; i++)
diff --git a/arch/arm/kernel/perf_event_cpu.c b/arch/arm/kernel/perf_event_cpu.c
index aebe0e99c153..8d6147b2001f 100644
--- a/arch/arm/kernel/perf_event_cpu.c
+++ b/arch/arm/kernel/perf_event_cpu.c
@@ -118,7 +118,8 @@ static int cpu_pmu_request_irq(struct arm_pmu *cpu_pmu, irq_handler_t handler)
                         continue;
                 }
 
-                err = request_irq(irq, handler, IRQF_NOBALANCING, "arm-pmu",
+                err = request_irq(irq, handler,
+                                  IRQF_NOBALANCING | IRQF_NO_THREAD, "arm-pmu",
                                   cpu_pmu);
                 if (err) {
                         pr_err("unable to request IRQ%d for ARM PMU counters\n",
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c
index afc2489ee13b..0e1e2b3afa45 100644
--- a/arch/arm/kernel/setup.c
+++ b/arch/arm/kernel/setup.c
@@ -72,10 +72,10 @@ static int __init fpe_setup(char *line)
 __setup("fpe=", fpe_setup);
 #endif
 
-extern void paging_init(struct machine_desc *desc);
+extern void paging_init(const struct machine_desc *desc);
 extern void sanity_check_meminfo(void);
 extern enum reboot_mode reboot_mode;
-extern void setup_dma_zone(struct machine_desc *desc);
+extern void setup_dma_zone(const struct machine_desc *desc);
 
 unsigned int processor_id;
 EXPORT_SYMBOL(processor_id);
@@ -139,7 +139,7 @@ EXPORT_SYMBOL(elf_platform);
 static const char *cpu_name;
 static const char *machine_name;
 static char __initdata cmd_line[COMMAND_LINE_SIZE];
-struct machine_desc *machine_desc __initdata;
+const struct machine_desc *machine_desc __initdata;
 
 static union { char c[4]; unsigned long l; } endian_test __initdata = { { 'l', '?', '?', 'b' } };
 #define ENDIANNESS ((char)endian_test.l)
@@ -607,7 +607,7 @@ static void __init setup_processor(void)
 
 void __init dump_machine_table(void)
 {
-        struct machine_desc *p;
+        const struct machine_desc *p;
 
         early_print("Available machine support:\n\nID (hex)\tNAME\n");
         for_each_machine_desc(p)
@@ -694,7 +694,7 @@ static int __init early_mem(char *p)
 }
 early_param("mem", early_mem);
 
-static void __init request_standard_resources(struct machine_desc *mdesc)
+static void __init request_standard_resources(const struct machine_desc *mdesc)
 {
         struct memblock_region *region;
         struct resource *res;
@@ -852,7 +852,7 @@ void __init hyp_mode_check(void)
 
 void __init setup_arch(char **cmdline_p)
 {
-        struct machine_desc *mdesc;
+        const struct machine_desc *mdesc;
 
         setup_processor();
         mdesc = setup_machine_fdt(__atags_pointer);
@@ -994,15 +994,6 @@ static int c_show(struct seq_file *m, void *v)
                 seq_printf(m, "model name\t: %s rev %d (%s)\n",
                            cpu_name, cpuid & 15, elf_platform);
 
-#if defined(CONFIG_SMP)
-                seq_printf(m, "BogoMIPS\t: %lu.%02lu\n",
-                           per_cpu(cpu_data, i).loops_per_jiffy / (500000UL/HZ),
-                           (per_cpu(cpu_data, i).loops_per_jiffy / (5000UL/HZ)) % 100);
-#else
-                seq_printf(m, "BogoMIPS\t: %lu.%02lu\n",
-                           loops_per_jiffy / (500000/HZ),
-                           (loops_per_jiffy / (5000/HZ)) % 100);
-#endif
                 /* dump out the processor features */
                 seq_puts(m, "Features\t: ");
 
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 2dc19349eb19..72024ea8a3a6 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -41,7 +41,6 @@
 #include <asm/sections.h>
 #include <asm/tlbflush.h>
 #include <asm/ptrace.h>
-#include <asm/localtimer.h>
 #include <asm/smp_plat.h>
 #include <asm/virt.h>
 #include <asm/mach/arch.h>
@@ -156,8 +155,6 @@ int platform_can_cpu_hotplug(void)
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
-static void percpu_timer_stop(void);
-
 static int platform_cpu_kill(unsigned int cpu)
 {
         if (smp_ops.cpu_kill)
@@ -201,11 +198,6 @@ int __cpu_disable(void)
         migrate_irqs();
 
         /*
-         * Stop the local timer for this CPU.
-         */
-        percpu_timer_stop();
-
-        /*
          * Flush user cache and TLB mappings, and then remove this CPU
          * from the vm mask set of all processes.
          *
@@ -326,8 +318,6 @@ static void smp_store_cpu_info(unsigned int cpuid)
         store_cpu_topology(cpuid);
 }
 
-static void percpu_timer_setup(void);
-
 /*
  * This is the secondary CPU boot entry.  We're using this CPUs
  * idle thread stack, but a set of temporary page tables.
@@ -382,11 +372,6 @@ asmlinkage void secondary_start_kernel(void)
         set_cpu_online(cpu, true);
         complete(&cpu_running);
 
-        /*
-         * Setup the percpu timer for this CPU.
-         */
-        percpu_timer_setup();
-
         local_irq_enable();
         local_fiq_enable();
 
@@ -398,17 +383,8 @@ asmlinkage void secondary_start_kernel(void)
 
 void __init smp_cpus_done(unsigned int max_cpus)
 {
-        int cpu;
-        unsigned long bogosum = 0;
-
-        for_each_online_cpu(cpu)
-                bogosum += per_cpu(cpu_data, cpu).loops_per_jiffy;
-
-        printk(KERN_INFO "SMP: Total of %d processors activated "
-               "(%lu.%02lu BogoMIPS).\n",
-               num_online_cpus(),
-               bogosum / (500000/HZ),
-               (bogosum / (5000/HZ)) % 100);
+        printk(KERN_INFO "SMP: Total of %d processors activated.\n",
+               num_online_cpus());
 
         hyp_mode_check();
 }
@@ -433,12 +409,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
                 max_cpus = ncores;
         if (ncores > 1 && max_cpus) {
                 /*
-                 * Enable the local timer or broadcast device for the
-                 * boot CPU, but only if we have more than one CPU.
-                 */
-                percpu_timer_setup();
-
-                /*
                  * Initialise the present map, which describes the set of CPUs
                  * actually populated at the present time. A platform should
                  * re-initialize the map in the platforms smp_prepare_cpus()
@@ -514,11 +484,6 @@ u64 smp_irq_stat_cpu(unsigned int cpu)
         return sum;
 }
 
-/*
- * Timer (local or broadcast) support
- */
-static DEFINE_PER_CPU(struct clock_event_device, percpu_clockevent);
-
 #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
 void tick_broadcast(const struct cpumask *mask)
 {
@@ -526,67 +491,6 @@ void tick_broadcast(const struct cpumask *mask)
 }
 #endif
 
-static void broadcast_timer_set_mode(enum clock_event_mode mode,
-        struct clock_event_device *evt)
-{
-}
-
-static void broadcast_timer_setup(struct clock_event_device *evt)
-{
-        evt->name       = "dummy_timer";
-        evt->features   = CLOCK_EVT_FEAT_ONESHOT |
-                          CLOCK_EVT_FEAT_PERIODIC |
-                          CLOCK_EVT_FEAT_DUMMY;
-        evt->rating     = 100;
-        evt->mult       = 1;
-        evt->set_mode   = broadcast_timer_set_mode;
-
-        clockevents_register_device(evt);
-}
-
-static struct local_timer_ops *lt_ops;
-
-#ifdef CONFIG_LOCAL_TIMERS
-int local_timer_register(struct local_timer_ops *ops)
-{
-        if (!is_smp() || !setup_max_cpus)
-                return -ENXIO;
-
-        if (lt_ops)
-                return -EBUSY;
-
-        lt_ops = ops;
-        return 0;
-}
-#endif
-
-static void percpu_timer_setup(void)
-{
-        unsigned int cpu = smp_processor_id();
-        struct clock_event_device *evt = &per_cpu(percpu_clockevent, cpu);
-
-        evt->cpumask = cpumask_of(cpu);
-
-        if (!lt_ops || lt_ops->setup(evt))
-                broadcast_timer_setup(evt);
-}
-
-#ifdef CONFIG_HOTPLUG_CPU
-/*
- * The generic clock events code purposely does not stop the local timer
- * on CPU_DEAD/CPU_DEAD_FROZEN hotplug events, so we have to do it
- * manually here.
- */
-static void percpu_timer_stop(void)
-{
-        unsigned int cpu = smp_processor_id();
-        struct clock_event_device *evt = &per_cpu(percpu_clockevent, cpu);
-
-        if (lt_ops)
-                lt_ops->stop(evt);
-}
-#endif
-
 static DEFINE_RAW_SPINLOCK(stop_lock);
 
 /*
diff --git a/arch/arm/kernel/smp_tlb.c b/arch/arm/kernel/smp_tlb.c
index c2edfff573c2..83ccca303df8 100644
--- a/arch/arm/kernel/smp_tlb.c
+++ b/arch/arm/kernel/smp_tlb.c
@@ -104,7 +104,7 @@ void flush_tlb_all(void)
         if (tlb_ops_need_broadcast())
                 on_each_cpu(ipi_flush_tlb_all, NULL, 1);
         else
-                local_flush_tlb_all();
+                __flush_tlb_all();
         broadcast_tlb_a15_erratum();
 }
 
@@ -113,7 +113,7 @@ void flush_tlb_mm(struct mm_struct *mm)
         if (tlb_ops_need_broadcast())
                 on_each_cpu_mask(mm_cpumask(mm), ipi_flush_tlb_mm, mm, 1);
         else
-                local_flush_tlb_mm(mm);
+                __flush_tlb_mm(mm);
         broadcast_tlb_mm_a15_erratum(mm);
 }
 
@@ -126,7 +126,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long uaddr)
                 on_each_cpu_mask(mm_cpumask(vma->vm_mm), ipi_flush_tlb_page,
                                         &ta, 1);
         } else
-                local_flush_tlb_page(vma, uaddr);
+                __flush_tlb_page(vma, uaddr);
         broadcast_tlb_mm_a15_erratum(vma->vm_mm);
 }
 
@@ -137,7 +137,7 @@ void flush_tlb_kernel_page(unsigned long kaddr)
                 ta.ta_start = kaddr;
                 on_each_cpu(ipi_flush_tlb_kernel_page, &ta, 1);
         } else
-                local_flush_tlb_kernel_page(kaddr);
+                __flush_tlb_kernel_page(kaddr);
         broadcast_tlb_a15_erratum();
 }
 
@@ -173,5 +173,5 @@ void flush_bp_all(void)
         if (tlb_ops_need_broadcast())
                 on_each_cpu(ipi_flush_bp_all, NULL, 1);
         else
-                local_flush_bp_all();
+                __flush_bp_all();
 }
diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
index 25956204ef23..2985c9f0905d 100644
--- a/arch/arm/kernel/smp_twd.c
+++ b/arch/arm/kernel/smp_twd.c
@@ -11,6 +11,7 @@
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/clk.h>
+#include <linux/cpu.h>
 #include <linux/delay.h>
 #include <linux/device.h>
 #include <linux/err.h>
@@ -24,7 +25,6 @@
 
 #include <asm/smp_plat.h>
 #include <asm/smp_twd.h>
-#include <asm/localtimer.h>
 
 /* set up by the platform code */
 static void __iomem *twd_base;
@@ -33,7 +33,7 @@ static struct clk *twd_clk;
 static unsigned long twd_timer_rate;
 static DEFINE_PER_CPU(bool, percpu_setup_called);
 
-static struct clock_event_device __percpu **twd_evt;
+static struct clock_event_device __percpu *twd_evt;
 static int twd_ppi;
 
 static void twd_set_mode(enum clock_event_mode mode,
@@ -90,8 +90,10 @@ static int twd_timer_ack(void)
         return 0;
 }
 
-static void twd_timer_stop(struct clock_event_device *clk)
+static void twd_timer_stop(void)
 {
+        struct clock_event_device *clk = __this_cpu_ptr(twd_evt);
+
         twd_set_mode(CLOCK_EVT_MODE_UNUSED, clk);
         disable_percpu_irq(clk->irq);
 }
@@ -106,7 +108,7 @@ static void twd_update_frequency(void *new_rate)
 {
         twd_timer_rate = *((unsigned long *) new_rate);
 
-        clockevents_update_freq(*__this_cpu_ptr(twd_evt), twd_timer_rate);
+        clockevents_update_freq(__this_cpu_ptr(twd_evt), twd_timer_rate);
 }
 
 static int twd_rate_change(struct notifier_block *nb,
@@ -132,7 +134,7 @@ static struct notifier_block twd_clk_nb = {
 
 static int twd_clk_init(void)
 {
-        if (twd_evt && *__this_cpu_ptr(twd_evt) && !IS_ERR(twd_clk))
+        if (twd_evt && __this_cpu_ptr(twd_evt) && !IS_ERR(twd_clk))
                 return clk_notifier_register(twd_clk, &twd_clk_nb);
 
         return 0;
@@ -151,7 +153,7 @@ static void twd_update_frequency(void *data)
 {
         twd_timer_rate = clk_get_rate(twd_clk);
 
-        clockevents_update_freq(*__this_cpu_ptr(twd_evt), twd_timer_rate);
+        clockevents_update_freq(__this_cpu_ptr(twd_evt), twd_timer_rate);
 }
 
 static int twd_cpufreq_transition(struct notifier_block *nb,
@@ -177,7 +179,7 @@ static struct notifier_block twd_cpufreq_nb = {
 
 static int twd_cpufreq_init(void)
 {
-        if (twd_evt && *__this_cpu_ptr(twd_evt) && !IS_ERR(twd_clk))
+        if (twd_evt && __this_cpu_ptr(twd_evt) && !IS_ERR(twd_clk))
                 return cpufreq_register_notifier(&twd_cpufreq_nb,
                         CPUFREQ_TRANSITION_NOTIFIER);
 
@@ -228,7 +230,7 @@ static void twd_calibrate_rate(void)
 
 static irqreturn_t twd_handler(int irq, void *dev_id)
 {
-        struct clock_event_device *evt = *(struct clock_event_device **)dev_id;
+        struct clock_event_device *evt = dev_id;
 
         if (twd_timer_ack()) {
                 evt->event_handler(evt);
@@ -265,9 +267,9 @@ static void twd_get_clock(struct device_node *np)
 /*
  * Setup the local clock events for a CPU.
  */
-static int twd_timer_setup(struct clock_event_device *clk)
+static void twd_timer_setup(void)
 {
-        struct clock_event_device **this_cpu_clk;
+        struct clock_event_device *clk = __this_cpu_ptr(twd_evt);
         int cpu = smp_processor_id();
 
         /*
@@ -276,9 +278,9 @@ static int twd_timer_setup(struct clock_event_device *clk)
          */
         if (per_cpu(percpu_setup_called, cpu)) {
                 __raw_writel(0, twd_base + TWD_TIMER_CONTROL);
-                clockevents_register_device(*__this_cpu_ptr(twd_evt));
+                clockevents_register_device(clk);
                 enable_percpu_irq(clk->irq, 0);
-                return 0;
+                return;
         }
         per_cpu(percpu_setup_called, cpu) = true;
 
@@ -297,27 +299,37 @@ static int twd_timer_setup(struct clock_event_device *clk)
         clk->set_mode = twd_set_mode;
         clk->set_next_event = twd_set_next_event;
         clk->irq = twd_ppi;
-
-        this_cpu_clk = __this_cpu_ptr(twd_evt);
-        *this_cpu_clk = clk;
+        clk->cpumask = cpumask_of(cpu);
 
         clockevents_config_and_register(clk, twd_timer_rate,
                                         0xf, 0xffffffff);
         enable_percpu_irq(clk->irq, 0);
+}
 
-        return 0;
+static int twd_timer_cpu_notify(struct notifier_block *self,
+                                unsigned long action, void *hcpu)
+{
+        switch (action & ~CPU_TASKS_FROZEN) {
+        case CPU_STARTING:
+                twd_timer_setup();
+                break;
+        case CPU_DYING:
+                twd_timer_stop();
+                break;
+        }
+
+        return NOTIFY_OK;
 }
 
-static struct local_timer_ops twd_lt_ops = {
-        .setup  = twd_timer_setup,
-        .stop   = twd_timer_stop,
+static struct notifier_block twd_timer_cpu_nb = {
+        .notifier_call = twd_timer_cpu_notify,
 };
 
 static int __init twd_local_timer_common_register(struct device_node *np)
 {
         int err;
 
-        twd_evt = alloc_percpu(struct clock_event_device *);
+        twd_evt = alloc_percpu(struct clock_event_device);
         if (!twd_evt) {
                 err = -ENOMEM;
                 goto out_free;
@@ -329,12 +341,22 @@ static int __init twd_local_timer_common_register(struct device_node *np)
                 goto out_free;
         }
 
-        err = local_timer_register(&twd_lt_ops);
+        err = register_cpu_notifier(&twd_timer_cpu_nb);
         if (err)
                 goto out_irq;
 
         twd_get_clock(np);
 
+        /*
+         * Immediately configure the timer on the boot CPU, unless we need
+         * jiffies to be incrementing to calibrate the rate in which case
+         * setup the timer in late_time_init.
+         */
+        if (twd_timer_rate)
+                twd_timer_setup();
+        else
+                late_time_init = twd_timer_setup;
+
         return 0;
 
 out_irq:
diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
index c5a59546a256..85a87370f144 100644
--- a/arch/arm/kernel/topology.c
+++ b/arch/arm/kernel/topology.c
@@ -74,12 +74,8 @@ struct cpu_efficiency table_efficiency[] = {
         {NULL, },
 };
 
-struct cpu_capacity {
-        unsigned long hwid;
-        unsigned long capacity;
-};
-
-struct cpu_capacity *cpu_capacity;
+unsigned long *__cpu_capacity;
+#define cpu_capacity(cpu)       __cpu_capacity[cpu]
 
 unsigned long middle_capacity = 1;
 
@@ -100,15 +96,19 @@ static void __init parse_dt_topology(void)
         unsigned long capacity = 0;
         int alloc_size, cpu = 0;
 
-        alloc_size = nr_cpu_ids * sizeof(struct cpu_capacity);
-        cpu_capacity = kzalloc(alloc_size, GFP_NOWAIT);
+        alloc_size = nr_cpu_ids * sizeof(*__cpu_capacity);
+        __cpu_capacity = kzalloc(alloc_size, GFP_NOWAIT);
 
-        while ((cn = of_find_node_by_type(cn, "cpu"))) {
-                const u32 *rate, *reg;
+        for_each_possible_cpu(cpu) {
+                const u32 *rate;
                 int len;
 
-                if (cpu >= num_possible_cpus())
-                        break;
+                /* too early to use cpu->of_node */
+                cn = of_get_cpu_node(cpu, NULL);
+                if (!cn) {
+                        pr_err("missing device node for CPU %d\n", cpu);
+                        continue;
+                }
 
                 for (cpu_eff = table_efficiency; cpu_eff->compatible; cpu_eff++)
                         if (of_device_is_compatible(cn, cpu_eff->compatible))
@@ -124,12 +124,6 @@ static void __init parse_dt_topology(void)
                         continue;
                 }
 
-                reg = of_get_property(cn, "reg", &len);
-                if (!reg || len != 4) {
-                        pr_err("%s missing reg property\n", cn->full_name);
-                        continue;
-                }
-
                 capacity = ((be32_to_cpup(rate)) >> 20) * cpu_eff->efficiency;
 
                 /* Save min capacity of the system */
@@ -140,13 +134,9 @@ static void __init parse_dt_topology(void)
                 if (capacity > max_capacity)
                         max_capacity = capacity;
 
-                cpu_capacity[cpu].capacity = capacity;
-                cpu_capacity[cpu++].hwid = be32_to_cpup(reg);
+                cpu_capacity(cpu) = capacity;
         }
 
-        if (cpu < num_possible_cpus())
-                cpu_capacity[cpu].hwid = (unsigned long)(-1);
-
         /* If min and max capacities are equals, we bypass the update of the
          * cpu_scale because all CPUs have the same capacity. Otherwise, we
          * compute a middle_capacity factor that will ensure that the capacity
@@ -154,9 +144,7 @@ static void __init parse_dt_topology(void)
          * SCHED_POWER_SCALE, which is the default value, but with the
          * constraint explained near table_efficiency[].
          */
-        if (min_capacity == max_capacity)
-                cpu_capacity[0].hwid = (unsigned long)(-1);
-        else if (4*max_capacity < (3*(max_capacity + min_capacity)))
+        if (4*max_capacity < (3*(max_capacity + min_capacity)))
                 middle_capacity = (min_capacity + max_capacity)
                                 >> (SCHED_POWER_SHIFT+1);
         else
@@ -170,23 +158,12 @@ static void __init parse_dt_topology(void)
  * boot. The update of all CPUs is in O(n^2) for heteregeneous system but the
  * function returns directly for SMP system.
  */
-void update_cpu_power(unsigned int cpu, unsigned long hwid)
+void update_cpu_power(unsigned int cpu)
 {
-        unsigned int idx = 0;
-
-        /* look for the cpu's hwid in the cpu capacity table */
-        for (idx = 0; idx < num_possible_cpus(); idx++) {
-                if (cpu_capacity[idx].hwid == hwid)
-                        break;
-
-                if (cpu_capacity[idx].hwid == -1)
-                        return;
-        }
-
-        if (idx == num_possible_cpus())
+        if (!cpu_capacity(cpu))
                 return;
 
-        set_power_scale(cpu, cpu_capacity[idx].capacity / middle_capacity);
+        set_power_scale(cpu, cpu_capacity(cpu) / middle_capacity);
 
         printk(KERN_INFO "CPU%u: update cpu_power %lu\n",
                 cpu, arch_scale_freq_power(NULL, cpu));
@@ -194,7 +171,7 @@ void update_cpu_power(unsigned int cpu, unsigned long hwid)
 
 #else
 static inline void parse_dt_topology(void) {}
-static inline void update_cpu_power(unsigned int cpuid, unsigned int mpidr) {}
+static inline void update_cpu_power(unsigned int cpuid) {}
 #endif
 
  /*
@@ -281,7 +258,7 @@ void store_cpu_topology(unsigned int cpuid)
 
         update_siblings_masks(cpuid);
 
-        update_cpu_power(cpuid, mpidr & MPIDR_HWID_BITMASK);
+        update_cpu_power(cpuid);
 
         printk(KERN_INFO "CPU%u: thread %d, cpu %d, socket %d, mpidr %x\n",
                 cpuid, cpu_topology[cpuid].thread_id,
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index ab517fcce21b..8fcda140358d 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -497,28 +497,64 @@ static int bad_syscall(int n, struct pt_regs *regs)
         return regs->ARM_r0;
 }
 
+static long do_cache_op_restart(struct restart_block *);
+
 static inline int
-do_cache_op(unsigned long start, unsigned long end, int flags)
+__do_cache_op(unsigned long start, unsigned long end)
 {
-        struct mm_struct *mm = current->active_mm;
-        struct vm_area_struct *vma;
+        int ret;
+        unsigned long chunk = PAGE_SIZE;
+
+        do {
+                if (signal_pending(current)) {
+                        struct thread_info *ti = current_thread_info();
+
+                        ti->restart_block = (struct restart_block) {
+                                .fn     = do_cache_op_restart,
+                        };
+
+                        ti->arm_restart_block = (struct arm_restart_block) {
+                                {
+                                        .cache = {
+                                                .start  = start,
+                                                .end    = end,
+                                        },
+                                },
+                        };
+
+                        return -ERESTART_RESTARTBLOCK;
+                }
+
+                ret = flush_cache_user_range(start, start + chunk);
+                if (ret)
+                        return ret;
 
+                cond_resched();
+                start += chunk;
+        } while (start < end);
+
+        return 0;
+}
+
+static long do_cache_op_restart(struct restart_block *unused)
+{
+        struct arm_restart_block *restart_block;
+
+        restart_block = &current_thread_info()->arm_restart_block;
+        return __do_cache_op(restart_block->cache.start,
+                             restart_block->cache.end);
+}
+
+static inline int
+do_cache_op(unsigned long start, unsigned long end, int flags)
+{
         if (end < start || flags)
                 return -EINVAL;
 
-        down_read(&mm->mmap_sem);
-        vma = find_vma(mm, start);
-        if (vma && vma->vm_start < end) {
-                if (start < vma->vm_start)
-                        start = vma->vm_start;
-                if (end > vma->vm_end)
-                        end = vma->vm_end;
+        if (!access_ok(VERIFY_READ, start, end - start))
+                return -EFAULT;
 
-                up_read(&mm->mmap_sem);
-                return flush_cache_user_range(start, end);
-        }
-        up_read(&mm->mmap_sem);
-        return -EINVAL;
+        return __do_cache_op(start, end);
 }
 
 /*
diff --git a/arch/arm/kernel/v7m.c b/arch/arm/kernel/v7m.c
new file mode 100644
index 000000000000..4d2cba94f5cc
--- /dev/null
+++ b/arch/arm/kernel/v7m.c
@@ -0,0 +1,19 @@
+/*
+ * Copyright (C) 2013 Uwe Kleine-Koenig for Pengutronix
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 2 as published by the
+ * Free Software Foundation.
+ */
+#include <linux/io.h>
+#include <linux/reboot.h>
+#include <asm/barrier.h>
+#include <asm/v7m.h>
+
+void armv7m_restart(enum reboot_mode mode, const char *cmd)
+{
+        dsb();
+        __raw_writel(V7M_SCB_AIRCR_VECTKEY | V7M_SCB_AIRCR_SYSRESETREQ,
+                        BASEADDR_V7M_SCB + V7M_SCB_AIRCR);
+        dsb();
+}
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index 741f66a2edbd..9c697db2787e 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -219,6 +219,10 @@ long kvm_arch_dev_ioctl(struct file *filp,
         return -EINVAL;
 }
 
+void kvm_arch_memslots_updated(struct kvm *kvm)
+{
+}
+
 int kvm_arch_prepare_memory_region(struct kvm *kvm,
                                    struct kvm_memory_slot *memslot,
                                    struct kvm_userspace_memory_region *mem,
diff --git a/arch/arm/kvm/init.S b/arch/arm/kvm/init.S
index f048338135f7..1b9844d369cc 100644
--- a/arch/arm/kvm/init.S
+++ b/arch/arm/kvm/init.S
@@ -142,7 +142,7 @@ target:	@ We're now in the trampoline code, switch page tables
 
         @ Invalidate the old TLBs
         mcr     p15, 4, r0, c8, c7, 0   @ TLBIALLH
-        dsb
+        dsb     ish
 
         eret
 
diff --git a/arch/arm/kvm/interrupts.S b/arch/arm/kvm/interrupts.S
index 16cd4ba5d7fd..ddc15539bad2 100644
--- a/arch/arm/kvm/interrupts.S
+++ b/arch/arm/kvm/interrupts.S
@@ -55,7 +55,7 @@ ENTRY(__kvm_tlb_flush_vmid_ipa)
         mcrr    p15, 6, r2, r3, c2      @ Write VTTBR
         isb
         mcr     p15, 0, r0, c8, c3, 0   @ TLBIALLIS (rt ignored)
-        dsb
+        dsb     ish
         isb
         mov     r2, #0
         mov     r3, #0
@@ -79,7 +79,7 @@ ENTRY(__kvm_flush_vm_context)
         mcr     p15, 4, r0, c8, c3, 4
         /* Invalidate instruction caches Inner Shareable (ICIALLUIS) */
         mcr     p15, 0, r0, c7, c1, 0
-        dsb
+        dsb     ish
         isb                             @ Not necessary if followed by eret
 
         bx      lr
@@ -492,10 +492,10 @@ __kvm_hyp_code_end:
         .section ".rodata"
 
 und_die_str:
-        .ascii  "unexpected undefined exception in Hyp mode at: %#08x"
+        .ascii  "unexpected undefined exception in Hyp mode at: %#08x\n"
 pabt_die_str:
-        .ascii  "unexpected prefetch abort in Hyp mode at: %#08x"
+        .ascii  "unexpected prefetch abort in Hyp mode at: %#08x\n"
 dabt_die_str:
-        .ascii  "unexpected data abort in Hyp mode at: %#08x"
+        .ascii  "unexpected data abort in Hyp mode at: %#08x\n"
 svc_die_str:
-        .ascii  "unexpected HVC/SVC trap in Hyp mode at: %#08x"
+        .ascii  "unexpected HVC/SVC trap in Hyp mode at: %#08x\n"
diff --git a/arch/arm/kvm/mmu.c b/arch/arm/kvm/mmu.c
index 0988d9e04dd4..b0de86b56c13 100644
--- a/arch/arm/kvm/mmu.c
+++ b/arch/arm/kvm/mmu.c
@@ -489,7 +489,6 @@ int kvm_phys_addr_ioremap(struct kvm *kvm, phys_addr_t guest_ipa,
 
         for (addr = guest_ipa; addr < end; addr += PAGE_SIZE) {
                 pte_t pte = pfn_pte(pfn, PAGE_S2_DEVICE);
-                kvm_set_s2pte_writable(&pte);
 
                 ret = mmu_topup_memory_cache(&cache, 2, 2);
                 if (ret)
diff --git a/arch/arm/kvm/reset.c b/arch/arm/kvm/reset.c
index b7840e7aa452..71e08baee209 100644
--- a/arch/arm/kvm/reset.c
+++ b/arch/arm/kvm/reset.c
@@ -40,7 +40,7 @@ static struct kvm_regs a15_regs_reset = {
 };
 
 static const struct kvm_irq_level a15_vtimer_irq = {
-        .irq = 27,
+        { .irq = 27 },
         .level = 1,
 };
 
diff --git a/arch/arm/kvm/trace.h b/arch/arm/kvm/trace.h
index a8e73ed5ad5b..b1d640f78623 100644
--- a/arch/arm/kvm/trace.h
+++ b/arch/arm/kvm/trace.h
@@ -59,10 +59,9 @@ TRACE_EVENT(kvm_guest_fault,
                 __entry->ipa                    = ipa;
         ),
 
-        TP_printk("guest fault at PC %#08lx (hxfar %#08lx, "
-                  "ipa %#16llx, hsr %#08lx",
-                  __entry->vcpu_pc, __entry->hxfar,
-                  __entry->ipa, __entry->hsr)
+        TP_printk("ipa %#llx, hsr %#08lx, hxfar %#08lx, pc %#08lx",
+                  __entry->ipa, __entry->hsr,
+                  __entry->hxfar, __entry->vcpu_pc)
 );
 
 TRACE_EVENT(kvm_irq_line,
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index af72969820b4..bd454b09133e 100644
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -45,3 +45,9 @@ lib-$(CONFIG_ARCH_SHARK)	+= io-shark.o
 
 $(obj)/csumpartialcopy.o:       $(obj)/csumpartialcopygeneric.S
 $(obj)/csumpartialcopyuser.o:   $(obj)/csumpartialcopygeneric.S
+
+ifeq ($(CONFIG_KERNEL_MODE_NEON),y)
+  NEON_FLAGS                    := -mfloat-abi=softfp -mfpu=neon
+  CFLAGS_xor-neon.o             += $(NEON_FLAGS)
+  obj-$(CONFIG_XOR_BLOCKS)      += xor-neon.o
+endif
diff --git a/arch/arm/lib/xor-neon.c b/arch/arm/lib/xor-neon.c
new file mode 100644
index 000000000000..2c40aeab3eaa
--- /dev/null
+++ b/arch/arm/lib/xor-neon.c
@@ -0,0 +1,46 @@
+/*
+ * linux/arch/arm/lib/xor-neon.c
+ *
+ * Copyright (C) 2013 Linaro Ltd <ard.biesheuvel@linaro.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/raid/xor.h>
+#include <linux/module.h>
+
+MODULE_LICENSE("GPL");
+
+#ifndef __ARM_NEON__
+#error You should compile this file with '-mfloat-abi=softfp -mfpu=neon'
+#endif
+
+/*
+ * Pull in the reference implementations while instructing GCC (through
+ * -ftree-vectorize) to attempt to exploit implicit parallelism and emit
+ * NEON instructions.
+ */
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6)
+#pragma GCC optimize "tree-vectorize"
+#else
+/*
+ * While older versions of GCC do not generate incorrect code, they fail to
+ * recognize the parallel nature of these functions, and emit plain ARM code,
+ * which is known to be slower than the optimized ARM code in asm-arm/xor.h.
+ */
+#warning This code requires at least version 4.6 of GCC
+#endif
+
+#pragma GCC diagnostic ignored "-Wunused-variable"
+#include <asm-generic/xor.h>
+
+struct xor_block_template const xor_block_neon_inner = {
+        .name   = "__inner_neon__",
+        .do_2   = xor_8regs_2,
+        .do_3   = xor_8regs_3,
+        .do_4   = xor_8regs_4,
+        .do_5   = xor_8regs_5,
+};
+EXPORT_SYMBOL(xor_block_neon_inner);
diff --git a/arch/arm/mach-at91/board-dt-sama5.c b/arch/arm/mach-at91/board-dt-sama5.c
index ad95f6a23a28..bf00d15d954d 100644
--- a/arch/arm/mach-at91/board-dt-sama5.c
+++ b/arch/arm/mach-at91/board-dt-sama5.c
@@ -42,20 +42,15 @@ static int ksz9021rn_phy_fixup(struct phy_device *phy)
 {
         int value;
 
-#define GMII_RCCPSR     260
-#define GMII_RRDPSR     261
-#define GMII_ERCR       11
-#define GMII_ERDWR      12
-
         /* Set delay values */
-        value = GMII_RCCPSR | 0x8000;
-        phy_write(phy, GMII_ERCR, value);
+        value = MICREL_KSZ9021_RGMII_CLK_CTRL_PAD_SCEW | 0x8000;
+        phy_write(phy, MICREL_KSZ9021_EXTREG_CTRL, value);
         value = 0xF2F4;
-        phy_write(phy, GMII_ERDWR, value);
-        value = GMII_RRDPSR | 0x8000;
-        phy_write(phy, GMII_ERCR, value);
+        phy_write(phy, MICREL_KSZ9021_EXTREG_DATA_WRITE, value);
+        value = MICREL_KSZ9021_RGMII_RX_DATA_PAD_SCEW | 0x8000;
+        phy_write(phy, MICREL_KSZ9021_EXTREG_CTRL, value);
         value = 0x2222;
-        phy_write(phy, GMII_ERDWR, value);
+        phy_write(phy, MICREL_KSZ9021_EXTREG_DATA_WRITE, value);
 
         return 0;
 }
diff --git a/arch/arm/mach-at91/board-snapper9260.c b/arch/arm/mach-at91/board-snapper9260.c
index 3aaa9784cf0e..f1d49e929ccb 100644
--- a/arch/arm/mach-at91/board-snapper9260.c
+++ b/arch/arm/mach-at91/board-snapper9260.c
@@ -26,7 +26,7 @@
 #include <linux/gpio.h>
 #include <linux/platform_device.h>
 #include <linux/spi/spi.h>
-#include <linux/i2c/pca953x.h>
+#include <linux/platform_data/pca953x.h>
 
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
diff --git a/arch/arm/mach-at91/include/mach/at91_adc.h b/arch/arm/mach-at91/include/mach/at91_adc.h
index 8e7ed5c90817..048a57f76bd3 100644
--- a/arch/arm/mach-at91/include/mach/at91_adc.h
+++ b/arch/arm/mach-at91/include/mach/at91_adc.h
@@ -28,9 +28,12 @@
 #define                 AT91_ADC_TRGSEL_EXTERNAL        (6 << 1)
 #define         AT91_ADC_LOWRES         (1 << 4)        /* Low Resolution */
 #define         AT91_ADC_SLEEP          (1 << 5)        /* Sleep Mode */
-#define         AT91_ADC_PRESCAL        (0x3f << 8)     /* Prescalar Rate Selection */
+#define         AT91_ADC_PRESCAL_9260   (0x3f << 8)     /* Prescalar Rate Selection */
+#define         AT91_ADC_PRESCAL_9G45   (0xff << 8)
 #define                 AT91_ADC_PRESCAL_(x)    ((x) << 8)
-#define         AT91_ADC_STARTUP        (0x1f << 16)    /* Startup Up Time */
+#define         AT91_ADC_STARTUP_9260   (0x1f << 16)    /* Startup Up Time */
+#define         AT91_ADC_STARTUP_9G45   (0x7f << 16)
+#define         AT91_ADC_STARTUP_9X5    (0xf << 16)
 #define                 AT91_ADC_STARTUP_(x)    ((x) << 16)
 #define         AT91_ADC_SHTIM          (0xf  << 24)    /* Sample & Hold Time */
 #define                 AT91_ADC_SHTIM_(x)      ((x) << 24)
@@ -48,6 +51,9 @@
 #define         AT91_ADC_ENDRX          (1 << 18)       /* End of RX Buffer */
 #define         AT91_ADC_RXFUFF         (1 << 19)       /* RX Buffer Full */
 
+#define AT91_ADC_SR_9X5         0x30            /* Status Register for 9x5 */
+#define         AT91_ADC_SR_DRDY_9X5    (1 << 24)       /* Data Ready */
+
 #define AT91_ADC_LCDR           0x20            /* Last Converted Data Register */
 #define         AT91_ADC_LDATA          (0x3ff)
 
@@ -58,4 +64,10 @@
 #define AT91_ADC_CHR(n)         (0x30 + ((n) * 4))      /* Channel Data Register N */
 #define         AT91_ADC_DATA           (0x3ff)
 
+#define AT91_ADC_CDR0_9X5       (0x50)                  /* Channel Data Register 0 for 9X5 */
+
+#define AT91_ADC_TRGR_9260      AT91_ADC_MR
+#define AT91_ADC_TRGR_9G45      0x08
+#define AT91_ADC_TRGR_9X5       0xC0
+
 #endif
diff --git a/arch/arm/mach-at91/include/mach/hardware.h b/arch/arm/mach-at91/include/mach/hardware.h
index a832e0707611..f17aa3150019 100644
--- a/arch/arm/mach-at91/include/mach/hardware.h
+++ b/arch/arm/mach-at91/include/mach/hardware.h
@@ -33,6 +33,7 @@
 #include <mach/at91sam9g45.h>
 #include <mach/at91sam9x5.h>
 #include <mach/at91sam9n12.h>
+#include <mach/sama5d3.h>
 
 /*
  * On all at91 except rm9200 and x40 have the System Controller starts
diff --git a/arch/arm/mach-at91/include/mach/sama5d3.h b/arch/arm/mach-at91/include/mach/sama5d3.h
index 6dc81ee38048..31096a8aaf1d 100644
--- a/arch/arm/mach-at91/include/mach/sama5d3.h
+++ b/arch/arm/mach-at91/include/mach/sama5d3.h
@@ -65,6 +65,14 @@
 #define SAMA5D3_ID_IRQ0         47      /* Advanced Interrupt Controller (IRQ0) */
 
 /*
+ * User Peripheral physical base addresses.
+ */
+#define SAMA5D3_BASE_USART0     0xf001c000
+#define SAMA5D3_BASE_USART1     0xf0020000
+#define SAMA5D3_BASE_USART2     0xf8020000
+#define SAMA5D3_BASE_USART3     0xf8024000
+
+/*
  * Internal Memory
  */
 #define SAMA5D3_SRAM_BASE       0x00300000      /* Internal SRAM base address */
diff --git a/arch/arm/mach-at91/include/mach/uncompress.h b/arch/arm/mach-at91/include/mach/uncompress.h
index 5659f7c72120..4bb644f8e87c 100644
--- a/arch/arm/mach-at91/include/mach/uncompress.h
+++ b/arch/arm/mach-at91/include/mach/uncompress.h
@@ -94,6 +94,15 @@ static const u32 uarts_sam9x5[] = {
         0,
 };
 
+static const u32 uarts_sama5[] = {
+        AT91_BASE_DBGU1,
+        SAMA5D3_BASE_USART0,
+        SAMA5D3_BASE_USART1,
+        SAMA5D3_BASE_USART2,
+        SAMA5D3_BASE_USART3,
+        0,
+};
+
 static inline const u32* decomp_soc_detect(void __iomem *dbgu_base)
 {
         u32 cidr, socid;
@@ -121,8 +130,12 @@ static inline const u32* decomp_soc_detect(void __iomem *dbgu_base)
         case ARCH_ID_AT91SAM9RL64:
                 return uarts_sam9rl;
 
+        case ARCH_ID_AT91SAM9N12:
         case ARCH_ID_AT91SAM9X5:
                 return uarts_sam9x5;
+
+        case ARCH_ID_SAMA5D3:
+                return uarts_sama5;
         }
 
         /* at91sam9g10 */
diff --git a/arch/arm/mach-bcm/Kconfig b/arch/arm/mach-bcm/Kconfig
index f11289519c39..69d67f714a2f 100644
--- a/arch/arm/mach-bcm/Kconfig
+++ b/arch/arm/mach-bcm/Kconfig
@@ -12,6 +12,7 @@ config ARCH_BCM
         select GPIO_BCM
         select SPARSE_IRQ
         select TICK_ONESHOT
+        select CACHE_L2X0
         help
           This enables support for system based on Broadcom SoCs.
           It currently supports the 'BCM281XX' family, which includes
diff --git a/arch/arm/mach-bcm/Makefile b/arch/arm/mach-bcm/Makefile
index 6adb6aecf48f..e3d03033a7e2 100644
--- a/arch/arm/mach-bcm/Makefile
+++ b/arch/arm/mach-bcm/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2012 Broadcom Corporation
+# Copyright (C) 2012-2013 Broadcom Corporation
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License as
@@ -10,6 +10,6 @@
 # of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-obj-$(CONFIG_ARCH_BCM)          := board_bcm.o bcm_kona_smc.o bcm_kona_smc_asm.o
+obj-$(CONFIG_ARCH_BCM)          := board_bcm281xx.o bcm_kona_smc.o bcm_kona_smc_asm.o kona.o
 plus_sec := $(call as-instr,.arch_extension sec,+sec)
 AFLAGS_bcm_kona_smc_asm.o       :=-Wa,-march=armv7-a$(plus_sec)
diff --git a/arch/arm/mach-bcm/bcm_kona_smc.c b/arch/arm/mach-bcm/bcm_kona_smc.c
index 56d9d19b2470..5e31e918f325 100644
--- a/arch/arm/mach-bcm/bcm_kona_smc.c
+++ b/arch/arm/mach-bcm/bcm_kona_smc.c
@@ -36,18 +36,20 @@ struct bcm_kona_smc_data {
 };
 
 static const struct of_device_id bcm_kona_smc_ids[] __initconst = {
-        {.compatible = "bcm,kona-smc"},
+        {.compatible = "brcm,kona-smc"},
+        {.compatible = "bcm,kona-smc"}, /* deprecated name */
         {},
 };
 
 /* Map in the bounce area */
-void __init bcm_kona_smc_init(void)
+int __init bcm_kona_smc_init(void)
 {
         struct device_node *node;
 
         /* Read buffer addr and size from the device tree node */
         node = of_find_matching_node(NULL, bcm_kona_smc_ids);
-        BUG_ON(!node);
+        if (!node)
+                return -ENODEV;
 
         /* Don't care about size or flags of the DT node */
         bridge_data.buffer_addr =
@@ -59,7 +61,9 @@ void __init bcm_kona_smc_init(void)
 
         bridge_data.initialized = 1;
 
-        pr_info("Secure API initialized!\n");
+        pr_info("Kona Secure API initialized\n");
+
+        return 0;
 }
 
 /* __bcm_kona_smc() should only run on CPU 0, with pre-emption disabled */
diff --git a/arch/arm/mach-bcm/bcm_kona_smc.h b/arch/arm/mach-bcm/bcm_kona_smc.h
index 3bedbed1c21b..d098a7e76744 100644
--- a/arch/arm/mach-bcm/bcm_kona_smc.h
+++ b/arch/arm/mach-bcm/bcm_kona_smc.h
@@ -64,7 +64,7 @@
 #define SSAPI_BRCM_START_VC_CORE        0x0E000008
 
 #ifndef __ASSEMBLY__
-extern void bcm_kona_smc_init(void);
+extern int __init bcm_kona_smc_init(void);
 
 extern unsigned bcm_kona_smc(unsigned service_id,
                              unsigned arg0,
diff --git a/arch/arm/mach-bcm/board_bcm.c b/arch/arm/mach-bcm/board_bcm281xx.c
index 28599326d4ad..8d9f931164bb 100644
--- a/arch/arm/mach-bcm/board_bcm.c
+++ b/arch/arm/mach-bcm/board_bcm281xx.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012 Broadcom Corporation
+ * Copyright (C) 2012-2013 Broadcom Corporation
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -21,23 +21,39 @@
 #include <asm/mach/time.h>
 #include <asm/hardware/cache-l2x0.h>
 
-
 #include "bcm_kona_smc.h"
+#include "kona.h"
 
 static int __init kona_l2_cache_init(void)
 {
         if (!IS_ENABLED(CONFIG_CACHE_L2X0))
                 return 0;
 
+        if (bcm_kona_smc_init() < 0) {
+                pr_info("Kona secure API not available. Skipping L2 init\n");
+                return 0;
+        }
+
         bcm_kona_smc(SSAPI_ENABLE_L2_CACHE, 0, 0, 0, 0);
 
         /*
          * The aux_val and aux_mask have no effect since L2 cache is already
          * enabled.  Pass 0s for aux_val and 1s for aux_mask for default value.
          */
-        l2x0_of_init(0, ~0);
+        return l2x0_of_init(0, ~0);
+}
 
-        return 0;
+static void bcm_board_setup_restart(void)
+{
+        struct device_node *np;
+
+        np = of_find_compatible_node(NULL, NULL, "brcm,bcm11351");
+        if (np) {
+                if (of_device_is_available(np))
+                        bcm_kona_setup_restart();
+                of_node_put(np);
+        }
+        /* Restart setup for other boards goes here */
 }
 
 static void __init board_init(void)
@@ -45,15 +61,15 @@ static void __init board_init(void)
         of_platform_populate(NULL, of_default_bus_match_table, NULL,
                 &platform_bus);
 
-        bcm_kona_smc_init();
-
+        bcm_board_setup_restart();
         kona_l2_cache_init();
 }
 
-static const char * const bcm11351_dt_compat[] = { "bcm,bcm11351", NULL, };
+static const char * const bcm11351_dt_compat[] = { "brcm,bcm11351", NULL, };
 
 DT_MACHINE_START(BCM11351_DT, "Broadcom Application Processor")
         .init_time = clocksource_of_init,
         .init_machine = board_init,
+        .restart = bcm_kona_restart,
         .dt_compat = bcm11351_dt_compat,
 MACHINE_END
diff --git a/arch/arm/mach-bcm/kona.c b/arch/arm/mach-bcm/kona.c
new file mode 100644
index 000000000000..6939d9017f63
--- /dev/null
+++ b/arch/arm/mach-bcm/kona.c
@@ -0,0 +1,65 @@
+/*
+ * Copyright (C) 2013 Broadcom Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/of_address.h>
+#include <asm/io.h>
+
+#include "kona.h"
+
+static void __iomem *watchdog_base;
+
+void bcm_kona_setup_restart(void)
+{
+        struct device_node *np_wdog;
+
+        /*
+         * The assumption is that whoever calls bcm_kona_setup_restart()
+         * also needs a Kona Watchdog Timer entry in Device Tree, i.e. we
+         * report an error if the DT entry is missing.
+         */
+        np_wdog = of_find_compatible_node(NULL, NULL, "brcm,kona-wdt");
+        if (!np_wdog) {
+                pr_err("brcm,kona-wdt not found in DT, reboot disabled\n");
+                return;
+        }
+        watchdog_base = of_iomap(np_wdog, 0);
+        WARN(!watchdog_base, "failed to map watchdog base");
+        of_node_put(np_wdog);
+}
+
+#define SECWDOG_OFFSET                  0x00000000
+#define SECWDOG_RESERVED_MASK           0xE2000000
+#define SECWDOG_WD_LOAD_FLAG_MASK       0x10000000
+#define SECWDOG_EN_MASK                 0x08000000
+#define SECWDOG_SRSTEN_MASK             0x04000000
+#define SECWDOG_CLKS_SHIFT              20
+#define SECWDOG_LOCK_SHIFT              0
+
+void bcm_kona_restart(enum reboot_mode mode, const char *cmd)
+{
+        uint32_t val;
+
+        if (!watchdog_base)
+                panic("Watchdog not mapped. Reboot failed.\n");
+
+        /* Enable watchdog2 with very short timeout. */
+        val = readl(watchdog_base + SECWDOG_OFFSET);
+        val &= SECWDOG_RESERVED_MASK | SECWDOG_WD_LOAD_FLAG_MASK;
+        val |= SECWDOG_EN_MASK | SECWDOG_SRSTEN_MASK |
+                (0x8 << SECWDOG_CLKS_SHIFT) |
+                (0x8 << SECWDOG_LOCK_SHIFT);
+        writel(val, watchdog_base + SECWDOG_OFFSET);
+
+        while (1)
+                ;
+}
diff --git a/arch/arm/mach-bcm/kona.h b/arch/arm/mach-bcm/kona.h
new file mode 100644
index 000000000000..291eca3e06ff
--- /dev/null
+++ b/arch/arm/mach-bcm/kona.h
@@ -0,0 +1,17 @@
+/*
+ * Copyright (C) 2013 Broadcom Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation version 2.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/reboot.h>
+
+void bcm_kona_setup_restart(void);
+void bcm_kona_restart(enum reboot_mode mode, const char *cmd);
diff --git a/arch/arm/mach-clps711x/Kconfig b/arch/arm/mach-clps711x/Kconfig
index 01ad4d41e728..bea6295c8c59 100644
--- a/arch/arm/mach-clps711x/Kconfig
+++ b/arch/arm/mach-clps711x/Kconfig
@@ -33,9 +33,6 @@ config ARCH_P720T
           Say Y here if you intend to run this kernel on the ARM Prospector
           720T.
 
-config ARCH_FORTUNET
-        bool "FORTUNET"
-
 config EP72XX_ROM_BOOT
         bool "EP721x/EP731x ROM boot"
         help
diff --git a/arch/arm/mach-clps711x/Makefile b/arch/arm/mach-clps711x/Makefile
index f30ed2b496fb..f04151efd96a 100644
--- a/arch/arm/mach-clps711x/Makefile
+++ b/arch/arm/mach-clps711x/Makefile
@@ -10,5 +10,4 @@ obj-$(CONFIG_ARCH_AUTCPU12)	+= board-autcpu12.o
 obj-$(CONFIG_ARCH_CDB89712)     += board-cdb89712.o
 obj-$(CONFIG_ARCH_CLEP7312)     += board-clep7312.o
 obj-$(CONFIG_ARCH_EDB7211)      += board-edb7211.o
-obj-$(CONFIG_ARCH_FORTUNET)     += board-fortunet.o
 obj-$(CONFIG_ARCH_P720T)        += board-p720t.o
diff --git a/arch/arm/mach-clps711x/board-autcpu12.c b/arch/arm/mach-clps711x/board-autcpu12.c
index 5867aebd8d0c..f8d71a89644a 100644
--- a/arch/arm/mach-clps711x/board-autcpu12.c
+++ b/arch/arm/mach-clps711x/board-autcpu12.c
@@ -259,11 +259,7 @@ static void __init autcpu12_init(void)
 static void __init autcpu12_init_late(void)
 {
         gpio_request_array(autcpu12_gpios, ARRAY_SIZE(autcpu12_gpios));
-
-        if (IS_ENABLED(MTD_NAND_GPIO) && IS_ENABLED(GPIO_GENERIC_PLATFORM)) {
-                /* We are need both drivers to handle NAND */
-                platform_device_register(&autcpu12_nand_pdev);
-        }
+        platform_device_register(&autcpu12_nand_pdev);
 }
 
 MACHINE_START(AUTCPU12, "autronix autcpu12")
diff --git a/arch/arm/mach-clps711x/board-edb7211.c b/arch/arm/mach-clps711x/board-edb7211.c
index 9dfb990f0801..fe6184ead896 100644
--- a/arch/arm/mach-clps711x/board-edb7211.c
+++ b/arch/arm/mach-clps711x/board-edb7211.c
@@ -126,21 +126,6 @@ static struct gpio edb7211_gpios[] __initconst = {
         { EDB7211_LCDBL,        GPIOF_OUT_INIT_LOW,     "LCD BACKLIGHT" },
 };
 
-static struct map_desc edb7211_io_desc[] __initdata = {
-        {       /* Memory-mapped extra keyboard row */
-                .virtual        = IO_ADDRESS(EDB7211_EXTKBD_BASE),
-                .pfn            = __phys_to_pfn(EDB7211_EXTKBD_BASE),
-                .length         = SZ_1M,
-                .type           = MT_DEVICE,
-        },
-};
-
-void __init edb7211_map_io(void)
-{
-        clps711x_map_io();
-        iotable_init(edb7211_io_desc, ARRAY_SIZE(edb7211_io_desc));
-}
-
 /* Reserve screen memory region at the start of main system memory. */
 static void __init edb7211_reserve(void)
 {
@@ -195,7 +180,7 @@ MACHINE_START(EDB7211, "CL-EDB7211 (EP7211 eval board)")
         .nr_irqs        = CLPS711X_NR_IRQS,
         .fixup          = fixup_edb7211,
         .reserve        = edb7211_reserve,
-        .map_io         = edb7211_map_io,
+        .map_io         = clps711x_map_io,
         .init_early     = clps711x_init_early,
         .init_irq       = clps711x_init_irq,
         .init_time      = clps711x_timer_init,
diff --git a/arch/arm/mach-clps711x/board-fortunet.c b/arch/arm/mach-clps711x/board-fortunet.c
deleted file mode 100644
index b1561e3d7c5c..000000000000
--- a/arch/arm/mach-clps711x/board-fortunet.c
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- *  linux/arch/arm/mach-clps711x/fortunet.c
- *
- *  Derived from linux/arch/arm/mach-integrator/arch.c
- *
- *  Copyright (C) 2000 Deep Blue Solutions Ltd
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-#include <linux/types.h>
-#include <linux/init.h>
-#include <linux/initrd.h>
-
-#include <mach/hardware.h>
-#include <asm/setup.h>
-#include <asm/mach-types.h>
-
-#include <asm/mach/arch.h>
-
-#include <asm/memory.h>
-
-#include "common.h"
-
-struct meminfo memmap = {
-        .nr_banks       = 1,
-        .bank           = {
-                {
-                        .start  = 0xC0000000,
-                        .size   = 0x01000000,
-                },
-        },
-};
-
-typedef struct tag_IMAGE_PARAMS
-{
-        int     ramdisk_ok;
-        int     ramdisk_address;
-        int     ramdisk_size;
-        int     ram_size;
-        int     extra_param_type;
-        int     extra_param_ptr;
-        int     command_line;
-} IMAGE_PARAMS;
-
-#define IMAGE_PARAMS_PHYS       0xC01F0000
-
-static void __init
-fortunet_fixup(struct tag *tags, char **cmdline, struct meminfo *mi)
-{
-        IMAGE_PARAMS *ip = phys_to_virt(IMAGE_PARAMS_PHYS);
-        *cmdline = phys_to_virt(ip->command_line);
-#ifdef CONFIG_BLK_DEV_INITRD
-        if(ip->ramdisk_ok)
-        {
-                initrd_start = __phys_to_virt(ip->ramdisk_address);
-                initrd_end = initrd_start + ip->ramdisk_size;
-        }
-#endif
-        memmap.bank[0].size = ip->ram_size;
-        *mi = memmap;
-}
-
-MACHINE_START(FORTUNET, "ARM-FortuNet")
-        /* Maintainer: FortuNet Inc. */
-        .nr_irqs        = CLPS711X_NR_IRQS,
-        .fixup          = fortunet_fixup,
-        .map_io         = clps711x_map_io,
-        .init_early     = clps711x_init_early,
-        .init_irq       = clps711x_init_irq,
-        .init_time      = clps711x_timer_init,
-        .handle_irq     = clps711x_handle_irq,
-        .restart        = clps711x_restart,
-MACHINE_END
diff --git a/arch/arm/mach-clps711x/devices.c b/arch/arm/mach-clps711x/devices.c
index 856b81cf2f8a..fb77d1448fec 100644
--- a/arch/arm/mach-clps711x/devices.c
+++ b/arch/arm/mach-clps711x/devices.c
@@ -57,7 +57,7 @@ static void __init clps711x_add_syscon(void)
         unsigned i;
 
         for (i = 0; i < ARRAY_SIZE(clps711x_syscon_res); i++)
-                platform_device_register_simple("clps711x-syscon", i + 1,
+                platform_device_register_simple("syscon", i + 1,
                                                 &clps711x_syscon_res[i], 1);
 }
 
diff --git a/arch/arm/mach-davinci/board-da830-evm.c b/arch/arm/mach-davinci/board-da830-evm.c
index 1332de8c52c9..c4bdc0a1c36e 100644
--- a/arch/arm/mach-davinci/board-da830-evm.c
+++ b/arch/arm/mach-davinci/board-da830-evm.c
@@ -185,10 +185,6 @@ static __init void da830_evm_usb_init(void)
                            __func__, ret);
 }
 
-static struct davinci_uart_config da830_evm_uart_config __initdata = {
-        .enabled_uarts = 0x7,
-};
-
 static const short da830_evm_mcasp1_pins[] = {
         DA830_AHCLKX1, DA830_ACLKX1, DA830_AFSX1, DA830_AHCLKR1, DA830_AFSR1,
         DA830_AMUTE1, DA830_AXR1_0, DA830_AXR1_1, DA830_AXR1_2, DA830_AXR1_5,
@@ -630,7 +626,7 @@ static __init void da830_evm_init(void)
                 pr_warning("da830_evm_init: watchdog registration failed: %d\n",
                                 ret);
 
-        davinci_serial_init(&da830_evm_uart_config);
+        davinci_serial_init(da8xx_serial_device);
         i2c_register_board_info(1, da830_evm_i2c_devices,
                         ARRAY_SIZE(da830_evm_i2c_devices));
 
diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index bea6793a7ede..dd1fb24521aa 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -19,7 +19,7 @@
 #include <linux/kernel.h>
 #include <linux/i2c.h>
 #include <linux/i2c/at24.h>
-#include <linux/i2c/pca953x.h>
+#include <linux/platform_data/pca953x.h>
 #include <linux/input.h>
 #include <linux/input/tps6507x-ts.h>
 #include <linux/mfd/tps6507x.h>
@@ -746,10 +746,6 @@ static struct davinci_i2c_platform_data da850_evm_i2c_0_pdata = {
         .bus_delay      = 0,    /* usec */
 };
 
-static struct davinci_uart_config da850_evm_uart_config __initdata = {
-        .enabled_uarts = 0x7,
-};
-
 /* davinci da850 evm audio machine driver */
 static u8 da850_iis_serializer_direction[] = {
         INACTIVE_MODE,  INACTIVE_MODE,  INACTIVE_MODE,  INACTIVE_MODE,
@@ -1249,12 +1245,10 @@ static struct vpif_capture_config da850_vpif_capture_config = {
 
 static struct adv7343_platform_data adv7343_pdata = {
         .mode_config = {
-                .dac_3 = 1,
-                .dac_2 = 1,
-                .dac_1 = 1,
+                .dac = { 1, 1, 1 },
         },
         .sd_config = {
-                .sd_dac_out1 = 1,
+                .sd_dac_out = { 1 },
         },
 };
 
@@ -1494,7 +1488,7 @@ static __init void da850_evm_init(void)
                                 __func__, ret);
         }
 
-        davinci_serial_init(&da850_evm_uart_config);
+        davinci_serial_init(da8xx_serial_device);
 
         i2c_register_board_info(1, da850_evm_i2c_devices,
                         ARRAY_SIZE(da850_evm_i2c_devices));
diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c
index c2a0a67d09e0..42b23a3194a0 100644
--- a/arch/arm/mach-davinci/board-dm355-evm.c
+++ b/arch/arm/mach-davinci/board-dm355-evm.c
@@ -314,10 +314,6 @@ static struct platform_device *davinci_evm_devices[] __initdata = {
         &davinci_nand_device,
 };
 
-static struct davinci_uart_config uart_config __initdata = {
-        .enabled_uarts = (1 << 0),
-};
-
 static void __init dm355_evm_map_io(void)
 {
         dm355_init();
@@ -393,7 +389,7 @@ static __init void dm355_evm_init(void)
         platform_add_devices(davinci_evm_devices,
                              ARRAY_SIZE(davinci_evm_devices));
         evm_init_i2c();
-        davinci_serial_init(&uart_config);
+        davinci_serial_init(dm355_serial_device);
 
         /* NOTE:  NAND flash timings set by the UBL are slower than
          * needed by MT29F16G08FAA chips ... EMIF.A1CR is 0x40400204
diff --git a/arch/arm/mach-davinci/board-dm355-leopard.c b/arch/arm/mach-davinci/board-dm355-leopard.c
index 139e42da25f0..65a984c52df6 100644
--- a/arch/arm/mach-davinci/board-dm355-leopard.c
+++ b/arch/arm/mach-davinci/board-dm355-leopard.c
@@ -173,10 +173,6 @@ static struct platform_device *davinci_leopard_devices[] __initdata = {
         &davinci_nand_device,
 };
 
-static struct davinci_uart_config uart_config __initdata = {
-        .enabled_uarts = (1 << 0),
-};
-
 static void __init dm355_leopard_map_io(void)
 {
         dm355_init();
@@ -252,7 +248,7 @@ static __init void dm355_leopard_init(void)
         platform_add_devices(davinci_leopard_devices,
                              ARRAY_SIZE(davinci_leopard_devices));
         leopard_init_i2c();
-        davinci_serial_init(&uart_config);
+        davinci_serial_init(dm355_serial_device);
 
         /* NOTE:  NAND flash timings set by the UBL are slower than
          * needed by MT29F16G08FAA chips ... EMIF.A1CR is 0x40400204
diff --git a/arch/arm/mach-davinci/board-dm365-evm.c b/arch/arm/mach-davinci/board-dm365-evm.c
index 4cdb61c54459..92b7f770615a 100644
--- a/arch/arm/mach-davinci/board-dm365-evm.c
+++ b/arch/arm/mach-davinci/board-dm365-evm.c
@@ -718,10 +718,6 @@ fail:
         /* REVISIT export switches: NTSC/PAL (SW5.6), EXTRA1 (SW5.2), etc */
 }
 
-static struct davinci_uart_config uart_config __initdata = {
-        .enabled_uarts = (1 << 0),
-};
-
 static void __init dm365_evm_map_io(void)
 {
         dm365_init();
@@ -748,7 +744,7 @@ static struct spi_board_info dm365_evm_spi_info[] __initconst = {
 static __init void dm365_evm_init(void)
 {
         evm_init_i2c();
-        davinci_serial_init(&uart_config);
+        davinci_serial_init(dm365_serial_device);
 
         dm365evm_emac_configure();
         dm365evm_mmc_configure();
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c
index fa4bfaf952d8..40bb9b5b87e8 100644
--- a/arch/arm/mach-davinci/board-dm644x-evm.c
+++ b/arch/arm/mach-davinci/board-dm644x-evm.c
@@ -727,10 +727,6 @@ static struct platform_device *davinci_evm_devices[] __initdata = {
         &rtc_dev,
 };
 
-static struct davinci_uart_config uart_config __initdata = {
-        .enabled_uarts = (1 << 0),
-};
-
 static void __init
 davinci_evm_map_io(void)
 {
@@ -792,7 +788,7 @@ static __init void davinci_evm_init(void)
         davinci_setup_mmc(0, &dm6446evm_mmc_config);
         dm644x_init_video(&dm644xevm_capture_cfg, &dm644xevm_display_cfg);
 
-        davinci_serial_init(&uart_config);
+        davinci_serial_init(dm644x_serial_device);
         dm644x_init_asp(&dm644x_evm_snd_data);
 
         /* irlml6401 switches over 1A, in under 8 msec */
diff --git a/arch/arm/mach-davinci/board-dm646x-evm.c b/arch/arm/mach-davinci/board-dm646x-evm.c
index 0c005e876cac..2bc3651d56cc 100644
--- a/arch/arm/mach-davinci/board-dm646x-evm.c
+++ b/arch/arm/mach-davinci/board-dm646x-evm.c
@@ -750,10 +750,6 @@ static void __init davinci_map_io(void)
         cdce_clk_init();
 }
 
-static struct davinci_uart_config uart_config __initdata = {
-        .enabled_uarts = (1 << 0),
-};
-
 #define DM646X_EVM_PHY_ID               "davinci_mdio-0:01"
 /*
  * The following EDMA channels/slots are not being used by drivers (for
@@ -793,7 +789,7 @@ static __init void evm_init(void)
         struct davinci_soc_info *soc_info = &davinci_soc_info;
 
         evm_init_i2c();
-        davinci_serial_init(&uart_config);
+        davinci_serial_init(dm646x_serial_device);
         dm646x_init_mcasp0(&dm646x_evm_snd_data[0]);
         dm646x_init_mcasp1(&dm646x_evm_snd_data[1]);
 
diff --git a/arch/arm/mach-davinci/board-mityomapl138.c b/arch/arm/mach-davinci/board-mityomapl138.c
index 9549d53aa63f..cd0f58730c2b 100644
--- a/arch/arm/mach-davinci/board-mityomapl138.c
+++ b/arch/arm/mach-davinci/board-mityomapl138.c
@@ -434,10 +434,6 @@ static void __init mityomapl138_setup_nand(void)
                                  ARRAY_SIZE(mityomapl138_devices));
 }
 
-static struct davinci_uart_config mityomapl138_uart_config __initdata = {
-        .enabled_uarts = 0x7,
-};
-
 static const short mityomap_mii_pins[] = {
         DA850_MII_TXEN, DA850_MII_TXCLK, DA850_MII_COL, DA850_MII_TXD_3,
         DA850_MII_TXD_2, DA850_MII_TXD_1, DA850_MII_TXD_0, DA850_MII_RXER,
@@ -517,7 +513,7 @@ static void __init mityomapl138_init(void)
         if (ret)
                 pr_warning("watchdog registration failed: %d\n", ret);
 
-        davinci_serial_init(&mityomapl138_uart_config);
+        davinci_serial_init(da8xx_serial_device);
 
         ret = da8xx_register_i2c(0, &mityomap_i2c_0_pdata);
         if (ret)
diff --git a/arch/arm/mach-davinci/board-neuros-osd2.c b/arch/arm/mach-davinci/board-neuros-osd2.c
index 808233b60e3d..46f336fca803 100644
--- a/arch/arm/mach-davinci/board-neuros-osd2.c
+++ b/arch/arm/mach-davinci/board-neuros-osd2.c
@@ -154,10 +154,6 @@ static struct platform_device *davinci_ntosd2_devices[] __initdata = {
         &ntosd2_leds_dev,
 };
 
-static struct davinci_uart_config uart_config __initdata = {
-        .enabled_uarts = (1 << 0),
-};
-
 static void __init davinci_ntosd2_map_io(void)
 {
         dm644x_init();
@@ -198,7 +194,7 @@ static __init void davinci_ntosd2_init(void)
         platform_add_devices(davinci_ntosd2_devices,
                                 ARRAY_SIZE(davinci_ntosd2_devices));
 
-        davinci_serial_init(&uart_config);
+        davinci_serial_init(dm644x_serial_device);
         dm644x_init_asp(&dm644x_ntosd2_snd_data);
 
         soc_info->emac_pdata->phy_id = NEUROS_OSD2_PHY_ID;
diff --git a/arch/arm/mach-davinci/board-omapl138-hawk.c b/arch/arm/mach-davinci/board-omapl138-hawk.c
index b8c20de10ca2..ab98c75cabb4 100644
--- a/arch/arm/mach-davinci/board-omapl138-hawk.c
+++ b/arch/arm/mach-davinci/board-omapl138-hawk.c
@@ -286,15 +286,11 @@ usb11_setup_oc_fail:
         gpio_free(DA850_USB1_VBUS_PIN);
 }
 
-static struct davinci_uart_config omapl138_hawk_uart_config __initdata = {
-        .enabled_uarts = 0x7,
-};
-
 static __init void omapl138_hawk_init(void)
 {
         int ret;
 
-        davinci_serial_init(&omapl138_hawk_uart_config);
+        davinci_serial_init(da8xx_serial_device);
 
         omapl138_hawk_config_emac();
 
diff --git a/arch/arm/mach-davinci/board-sffsdr.c b/arch/arm/mach-davinci/board-sffsdr.c
index 513eee14f77d..d84360148100 100644
--- a/arch/arm/mach-davinci/board-sffsdr.c
+++ b/arch/arm/mach-davinci/board-sffsdr.c
@@ -125,10 +125,6 @@ static struct platform_device *davinci_sffsdr_devices[] __initdata = {
         &davinci_sffsdr_nandflash_device,
 };
 
-static struct davinci_uart_config uart_config __initdata = {
-        .enabled_uarts = (1 << 0),
-};
-
 static void __init davinci_sffsdr_map_io(void)
 {
         dm644x_init();
@@ -141,7 +137,7 @@ static __init void davinci_sffsdr_init(void)
         platform_add_devices(davinci_sffsdr_devices,
                              ARRAY_SIZE(davinci_sffsdr_devices));
         sffsdr_init_i2c();
-        davinci_serial_init(&uart_config);
+        davinci_serial_init(dm644x_serial_device);
         soc_info->emac_pdata->phy_id = SFFSDR_PHY_ID;
         davinci_setup_usb(0, 0); /* We support only peripheral mode. */
 
diff --git a/arch/arm/mach-davinci/cpuidle.c b/arch/arm/mach-davinci/cpuidle.c
index 36aef3a7dedb..f1ac1c94ac0f 100644
--- a/arch/arm/mach-davinci/cpuidle.c
+++ b/arch/arm/mach-davinci/cpuidle.c
@@ -65,7 +65,7 @@ static struct cpuidle_driver davinci_idle_driver = {
         .states[1]              = {
                 .enter                  = davinci_enter_idle,
                 .exit_latency           = 10,
-                .target_residency       = 100000,
+                .target_residency       = 10000,
                 .flags                  = CPUIDLE_FLAG_TIME_VALID,
                 .name                   = "DDR SR",
                 .desc                   = "WFI and DDR Self Refresh",
diff --git a/arch/arm/mach-davinci/da830.c b/arch/arm/mach-davinci/da830.c
index abbaf0270be6..d6c746e35ad9 100644
--- a/arch/arm/mach-davinci/da830.c
+++ b/arch/arm/mach-davinci/da830.c
@@ -395,9 +395,9 @@ static struct clk_lookup da830_clks[] = {
         CLK(NULL,               "tptc0",        &tptc0_clk),
         CLK(NULL,               "tptc1",        &tptc1_clk),
         CLK("da830-mmc.0",      NULL,           &mmcsd_clk),
-        CLK(NULL,               "uart0",        &uart0_clk),
-        CLK(NULL,               "uart1",        &uart1_clk),
-        CLK(NULL,               "uart2",        &uart2_clk),
+        CLK("serial8250.0",     NULL,           &uart0_clk),
+        CLK("serial8250.1",     NULL,           &uart1_clk),
+        CLK("serial8250.2",     NULL,           &uart2_clk),
         CLK("spi_davinci.0",    NULL,           &spi0_clk),
         CLK("spi_davinci.1",    NULL,           &spi1_clk),
         CLK(NULL,               "ecap0",        &ecap0_clk),
@@ -417,6 +417,7 @@ static struct clk_lookup da830_clks[] = {
         CLK(NULL,               "aintc",        &aintc_clk),
         CLK(NULL,               "secu_mgr",     &secu_mgr_clk),
         CLK("davinci_emac.1",   NULL,           &emac_clk),
+        CLK("davinci_mdio.0",   "fck",          &emac_clk),
         CLK(NULL,               "gpio",         &gpio_clk),
         CLK("i2c_davinci.2",    NULL,           &i2c1_clk),
         CLK(NULL,               "usb11",        &usb11_clk),
@@ -1199,7 +1200,6 @@ static struct davinci_soc_info davinci_soc_info_da830 = {
         .gpio_base              = DA8XX_GPIO_BASE,
         .gpio_num               = 128,
         .gpio_irq               = IRQ_DA8XX_GPIO0,
-        .serial_dev             = &da8xx_serial_device,
         .emac_pdata             = &da8xx_emac_pdata,
 };
 
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index a0d4f6038b60..f56e5fbfa2fd 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -451,9 +451,9 @@ static struct clk_lookup da850_clks[] = {
         CLK(NULL,               "tpcc1",        &tpcc1_clk),
         CLK(NULL,               "tptc2",        &tptc2_clk),
         CLK("pruss_uio",        "pruss",        &pruss_clk),
-        CLK(NULL,               "uart0",        &uart0_clk),
-        CLK(NULL,               "uart1",        &uart1_clk),
-        CLK(NULL,               "uart2",        &uart2_clk),
+        CLK("serial8250.0",     NULL,           &uart0_clk),
+        CLK("serial8250.1",     NULL,           &uart1_clk),
+        CLK("serial8250.2",     NULL,           &uart2_clk),
         CLK(NULL,               "aintc",        &aintc_clk),
         CLK(NULL,               "gpio",         &gpio_clk),
         CLK("i2c_davinci.2",    NULL,           &i2c1_clk),
@@ -461,6 +461,7 @@ static struct clk_lookup da850_clks[] = {
         CLK(NULL,               "arm",          &arm_clk),
         CLK(NULL,               "rmii",         &rmii_clk),
         CLK("davinci_emac.1",   NULL,           &emac_clk),
+        CLK("davinci_mdio.0",   "fck",          &emac_clk),
         CLK("davinci-mcasp.0",  NULL,           &mcasp_clk),
         CLK("da8xx_lcdc.0",     "fck",          &lcdc_clk),
         CLK("da830-mmc.0",      NULL,           &mmcsd0_clk),
@@ -1301,7 +1302,6 @@ static struct davinci_soc_info davinci_soc_info_da850 = {
         .gpio_base              = DA8XX_GPIO_BASE,
         .gpio_num               = 144,
         .gpio_irq               = IRQ_DA8XX_GPIO0,
-        .serial_dev             = &da8xx_serial_device,
         .emac_pdata             = &da8xx_emac_pdata,
         .sram_dma               = DA8XX_SHARED_RAM_BASE,
         .sram_len               = SZ_128K,
diff --git a/arch/arm/mach-davinci/da8xx-dt.c b/arch/arm/mach-davinci/da8xx-dt.c
index 961aea8bbad5..d2bc574ae172 100644
--- a/arch/arm/mach-davinci/da8xx-dt.c
+++ b/arch/arm/mach-davinci/da8xx-dt.c
@@ -20,13 +20,6 @@
 
 #define DA8XX_NUM_UARTS 3
 
-static void __init da8xx_uart_clk_enable(void)
-{
-        int i;
-        for (i = 0; i < DA8XX_NUM_UARTS; i++)
-                davinci_serial_setup_clk(i, NULL);
-}
-
 static struct of_device_id da8xx_irq_match[] __initdata = {
         { .compatible = "ti,cp-intc", .data = cp_intc_of_init, },
         { }
@@ -47,6 +40,12 @@ static struct of_dev_auxdata da850_auxdata_lookup[] __initdata = {
         OF_DEV_AUXDATA("ti,da850-ecap", 0x01f07000, "ecap", NULL),
         OF_DEV_AUXDATA("ti,da850-ecap", 0x01f08000, "ecap", NULL),
         OF_DEV_AUXDATA("ti,da830-spi", 0x01f0e000, "spi_davinci.1", NULL),
+        OF_DEV_AUXDATA("ns16550a", 0x01c42000, "serial8250.0", NULL),
+        OF_DEV_AUXDATA("ns16550a", 0x01d0c000, "serial8250.1", NULL),
+        OF_DEV_AUXDATA("ns16550a", 0x01d0d000, "serial8250.2", NULL),
+        OF_DEV_AUXDATA("ti,davinci_mdio", 0x01e24000, "davinci_mdio.0", NULL),
+        OF_DEV_AUXDATA("ti,davinci-dm6467-emac", 0x01e20000, "davinci_emac.1",
+                       NULL),
         {}
 };
 
@@ -57,7 +56,6 @@ static void __init da850_init_machine(void)
         of_platform_populate(NULL, of_default_bus_match_table,
                              da850_auxdata_lookup, NULL);
 
-        da8xx_uart_clk_enable();
 }
 
 static const char *da850_boards_compat[] __initdata = {
diff --git a/arch/arm/mach-davinci/davinci.h b/arch/arm/mach-davinci/davinci.h
index a883043d0820..2ab5d577186f 100644
--- a/arch/arm/mach-davinci/davinci.h
+++ b/arch/arm/mach-davinci/davinci.h
@@ -106,4 +106,9 @@ int dm646x_init_edma(struct edma_rsv_info *rsv);
 void dm646x_video_init(void);
 void dm646x_setup_vpif(struct vpif_display_config *,
                        struct vpif_capture_config *);
+
+extern struct platform_device dm365_serial_device[];
+extern struct platform_device dm355_serial_device[];
+extern struct platform_device dm644x_serial_device[];
+extern struct platform_device dm646x_serial_device[];
 #endif /*__DAVINCI_H */
diff --git a/arch/arm/mach-davinci/devices-da8xx.c b/arch/arm/mach-davinci/devices-da8xx.c
index 71a46a348761..2e473fefd71e 100644
--- a/arch/arm/mach-davinci/devices-da8xx.c
+++ b/arch/arm/mach-davinci/devices-da8xx.c
@@ -68,7 +68,7 @@
 void __iomem *da8xx_syscfg0_base;
 void __iomem *da8xx_syscfg1_base;
 
-static struct plat_serial8250_port da8xx_serial_pdata[] = {
+static struct plat_serial8250_port da8xx_serial0_pdata[] = {
         {
                 .mapbase        = DA8XX_UART0_BASE,
                 .irq            = IRQ_DA8XX_UARTINT0,
@@ -78,6 +78,11 @@ static struct plat_serial8250_port da8xx_serial_pdata[] = {
                 .regshift       = 2,
         },
         {
+                .flags  = 0,
+        }
+};
+static struct plat_serial8250_port da8xx_serial1_pdata[] = {
+        {
                 .mapbase        = DA8XX_UART1_BASE,
                 .irq            = IRQ_DA8XX_UARTINT1,
                 .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |
@@ -86,6 +91,11 @@ static struct plat_serial8250_port da8xx_serial_pdata[] = {
                 .regshift       = 2,
         },
         {
+                .flags  = 0,
+        }
+};
+static struct plat_serial8250_port da8xx_serial2_pdata[] = {
+        {
                 .mapbase        = DA8XX_UART2_BASE,
                 .irq            = IRQ_DA8XX_UARTINT2,
                 .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |
@@ -95,15 +105,33 @@ static struct plat_serial8250_port da8xx_serial_pdata[] = {
         },
         {
                 .flags  = 0,
-        },
+        }
 };
 
-struct platform_device da8xx_serial_device = {
-        .name   = "serial8250",
-        .id     = PLAT8250_DEV_PLATFORM,
-        .dev    = {
-                .platform_data  = da8xx_serial_pdata,
+struct platform_device da8xx_serial_device[] = {
+        {
+                .name   = "serial8250",
+                .id     = PLAT8250_DEV_PLATFORM,
+                .dev    = {
+                        .platform_data  = da8xx_serial0_pdata,
+                }
+        },
+        {
+                .name   = "serial8250",
+                .id     = PLAT8250_DEV_PLATFORM1,
+                .dev    = {
+                        .platform_data  = da8xx_serial1_pdata,
+                }
+        },
+        {
+                .name   = "serial8250",
+                .id     = PLAT8250_DEV_PLATFORM2,
+                .dev    = {
+                        .platform_data  = da8xx_serial2_pdata,
+                }
         },
+        {
+        }
 };
 
 static s8 da8xx_queue_tc_mapping[][2] = {
@@ -453,12 +481,8 @@ int __init da8xx_register_emac(void)
         ret = platform_device_register(&da8xx_mdio_device);
         if (ret < 0)
                 return ret;
-        ret = platform_device_register(&da8xx_emac_device);
-        if (ret < 0)
-                return ret;
-        ret = clk_add_alias(NULL, dev_name(&da8xx_mdio_device.dev),
-                            NULL, &da8xx_emac_device.dev);
-        return ret;
+
+        return platform_device_register(&da8xx_emac_device);
 }
 
 static struct resource da830_mcasp1_resources[] = {
@@ -828,14 +852,7 @@ static struct platform_device da8xx_rtc_device = {
 
 int da8xx_register_rtc(void)
 {
-        int ret;
-
-        ret = platform_device_register(&da8xx_rtc_device);
-        if (!ret)
-                /* Atleast on DA850, RTC is a wakeup source */
-                device_init_wakeup(&da8xx_rtc_device.dev, true);
-
-        return ret;
+        return platform_device_register(&da8xx_rtc_device);
 }
 
 static void __iomem *da8xx_ddr2_ctlr_base;
diff --git a/arch/arm/mach-davinci/devices-tnetv107x.c b/arch/arm/mach-davinci/devices-tnetv107x.c
index 128cb9ae80f4..01d8686e553c 100644
--- a/arch/arm/mach-davinci/devices-tnetv107x.c
+++ b/arch/arm/mach-davinci/devices-tnetv107x.c
@@ -126,7 +126,7 @@ static struct platform_device edma_device = {
         .dev.platform_data = tnetv107x_edma_info,
 };
 
-static struct plat_serial8250_port serial_data[] = {
+static struct plat_serial8250_port serial0_platform_data[] = {
         {
                 .mapbase        = TNETV107X_UART0_BASE,
                 .irq            = IRQ_TNETV107X_UART0,
@@ -137,6 +137,11 @@ static struct plat_serial8250_port serial_data[] = {
                 .regshift       = 2,
         },
         {
+                .flags  = 0,
+        }
+};
+static struct plat_serial8250_port serial1_platform_data[] = {
+        {
                 .mapbase        = TNETV107X_UART1_BASE,
                 .irq            = IRQ_TNETV107X_UART1,
                 .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |
@@ -146,6 +151,11 @@ static struct plat_serial8250_port serial_data[] = {
                 .regshift       = 2,
         },
         {
+                .flags  = 0,
+        }
+};
+static struct plat_serial8250_port serial2_platform_data[] = {
+        {
                 .mapbase        = TNETV107X_UART2_BASE,
                 .irq            = IRQ_TNETV107X_UART2,
                 .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |
@@ -156,13 +166,28 @@ static struct plat_serial8250_port serial_data[] = {
         },
         {
                 .flags  = 0,
-        },
+        }
 };
 
-struct platform_device tnetv107x_serial_device = {
-        .name                   = "serial8250",
-        .id                     = PLAT8250_DEV_PLATFORM,
-        .dev.platform_data      = serial_data,
+
+struct platform_device tnetv107x_serial_device[] = {
+        {
+                .name                   = "serial8250",
+                .id                     = PLAT8250_DEV_PLATFORM,
+                .dev.platform_data      = serial0_platform_data,
+        },
+        {
+                .name                   = "serial8250",
+                .id                     = PLAT8250_DEV_PLATFORM1,
+                .dev.platform_data      = serial1_platform_data,
+        },
+        {
+                .name                   = "serial8250",
+                .id                     = PLAT8250_DEV_PLATFORM2,
+                .dev.platform_data      = serial2_platform_data,
+        },
+        {
+        }
 };
 
 static struct resource mmc0_resources[] = {
@@ -385,7 +410,7 @@ void __init tnetv107x_devices_init(struct tnetv107x_device_info *info)
         platform_device_register(&tsc_device);
 
         if (info->serial_config)
-                davinci_serial_init(info->serial_config);
+                davinci_serial_init(tnetv107x_serial_device);
 
         for (i = 0; i < 2; i++)
                 if (info->mmc_config[i]) {
diff --git a/arch/arm/mach-davinci/dm355.c b/arch/arm/mach-davinci/dm355.c
index 86100d179694..3eaa5f6b2160 100644
--- a/arch/arm/mach-davinci/dm355.c
+++ b/arch/arm/mach-davinci/dm355.c
@@ -357,9 +357,9 @@ static struct clk_lookup dm355_clks[] = {
         CLK(NULL, "clkout3", &clkout3_clk),
         CLK(NULL, "arm", &arm_clk),
         CLK(NULL, "mjcp", &mjcp_clk),
-        CLK(NULL, "uart0", &uart0_clk),
-        CLK(NULL, "uart1", &uart1_clk),
-        CLK(NULL, "uart2", &uart2_clk),
+        CLK("serial8250.0", NULL, &uart0_clk),
+        CLK("serial8250.1", NULL, &uart1_clk),
+        CLK("serial8250.2", NULL, &uart2_clk),
         CLK("i2c_davinci.1", NULL, &i2c_clk),
         CLK("davinci-mcbsp.0", NULL, &asp0_clk),
         CLK("davinci-mcbsp.1", NULL, &asp1_clk),
@@ -922,7 +922,7 @@ static struct davinci_timer_info dm355_timer_info = {
         .clocksource_id = T0_TOP,
 };
 
-static struct plat_serial8250_port dm355_serial_platform_data[] = {
+static struct plat_serial8250_port dm355_serial0_platform_data[] = {
         {
                 .mapbase        = DAVINCI_UART0_BASE,
                 .irq            = IRQ_UARTINT0,
@@ -932,6 +932,11 @@ static struct plat_serial8250_port dm355_serial_platform_data[] = {
                 .regshift       = 2,
         },
         {
+                .flags  = 0,
+        }
+};
+static struct plat_serial8250_port dm355_serial1_platform_data[] = {
+        {
                 .mapbase        = DAVINCI_UART1_BASE,
                 .irq            = IRQ_UARTINT1,
                 .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |
@@ -940,6 +945,11 @@ static struct plat_serial8250_port dm355_serial_platform_data[] = {
                 .regshift       = 2,
         },
         {
+                .flags  = 0,
+        }
+};
+static struct plat_serial8250_port dm355_serial2_platform_data[] = {
+        {
                 .mapbase        = DM355_UART2_BASE,
                 .irq            = IRQ_DM355_UARTINT2,
                 .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |
@@ -948,16 +958,34 @@ static struct plat_serial8250_port dm355_serial_platform_data[] = {
                 .regshift       = 2,
         },
         {
-                .flags          = 0
-        },
+                .flags  = 0,
+        }
 };
 
-static struct platform_device dm355_serial_device = {
-        .name                   = "serial8250",
-        .id                     = PLAT8250_DEV_PLATFORM,
-        .dev                    = {
-                .platform_data  = dm355_serial_platform_data,
+struct platform_device dm355_serial_device[] = {
+        {
+                .name                   = "serial8250",
+                .id                     = PLAT8250_DEV_PLATFORM,
+                .dev                    = {
+                        .platform_data  = dm355_serial0_platform_data,
+                }
+        },
+        {
+                .name                   = "serial8250",
+                .id                     = PLAT8250_DEV_PLATFORM1,
+                .dev                    = {
+                        .platform_data  = dm355_serial1_platform_data,
+                }
         },
+        {
+                .name                   = "serial8250",
+                .id                     = PLAT8250_DEV_PLATFORM2,
+                .dev                    = {
+                        .platform_data  = dm355_serial2_platform_data,
+                }
+        },
+        {
+        }
 };
 
 static struct davinci_soc_info davinci_soc_info_dm355 = {
@@ -981,7 +1009,6 @@ static struct davinci_soc_info davinci_soc_info_dm355 = {
         .gpio_base              = DAVINCI_GPIO_BASE,
         .gpio_num               = 104,
         .gpio_irq               = IRQ_DM355_GPIOBNK0,
-        .serial_dev             = &dm355_serial_device,
         .sram_dma               = 0x00010000,
         .sram_len               = SZ_32K,
 };
diff --git a/arch/arm/mach-davinci/dm365.c b/arch/arm/mach-davinci/dm365.c
index dad28029ba9b..c29e324eb0bb 100644
--- a/arch/arm/mach-davinci/dm365.c
+++ b/arch/arm/mach-davinci/dm365.c
@@ -455,8 +455,8 @@ static struct clk_lookup dm365_clks[] = {
         CLK("vpss", "master", &vpss_master_clk),
         CLK("vpss", "slave", &vpss_slave_clk),
         CLK(NULL, "arm", &arm_clk),
-        CLK(NULL, "uart0", &uart0_clk),
-        CLK(NULL, "uart1", &uart1_clk),
+        CLK("serial8250.0", NULL, &uart0_clk),
+        CLK("serial8250.1", NULL, &uart1_clk),
         CLK("i2c_davinci.1", NULL, &i2c_clk),
         CLK("da830-mmc.0", NULL, &mmcsd0_clk),
         CLK("da830-mmc.1", NULL, &mmcsd1_clk),
@@ -477,6 +477,7 @@ static struct clk_lookup dm365_clks[] = {
         CLK(NULL, "timer3", &timer3_clk),
         CLK(NULL, "usb", &usb_clk),
         CLK("davinci_emac.1", NULL, &emac_clk),
+        CLK("davinci_mdio.0", "fck", &emac_clk),
         CLK("davinci_voicecodec", NULL, &voicecodec_clk),
         CLK("davinci-mcbsp", NULL, &asp0_clk),
         CLK(NULL, "rto", &rto_clk),
@@ -1041,7 +1042,7 @@ static struct davinci_timer_info dm365_timer_info = {
 
 #define DM365_UART1_BASE        (IO_PHYS + 0x106000)
 
-static struct plat_serial8250_port dm365_serial_platform_data[] = {
+static struct plat_serial8250_port dm365_serial0_platform_data[] = {
         {
                 .mapbase        = DAVINCI_UART0_BASE,
                 .irq            = IRQ_UARTINT0,
@@ -1051,6 +1052,11 @@ static struct plat_serial8250_port dm365_serial_platform_data[] = {
                 .regshift       = 2,
         },
         {
+                .flags  = 0,
+        }
+};
+static struct plat_serial8250_port dm365_serial1_platform_data[] = {
+        {
                 .mapbase        = DM365_UART1_BASE,
                 .irq            = IRQ_UARTINT1,
                 .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |
@@ -1059,16 +1065,27 @@ static struct plat_serial8250_port dm365_serial_platform_data[] = {
                 .regshift       = 2,
         },
         {
-                .flags          = 0
-        },
+                .flags  = 0,
+        }
 };
 
-static struct platform_device dm365_serial_device = {
-        .name                   = "serial8250",
-        .id                     = PLAT8250_DEV_PLATFORM,
-        .dev                    = {
-                .platform_data  = dm365_serial_platform_data,
+struct platform_device dm365_serial_device[] = {
+        {
+                .name                   = "serial8250",
+                .id                     = PLAT8250_DEV_PLATFORM,
+                .dev                    = {
+                        .platform_data  = dm365_serial0_platform_data,
+                }
+        },
+        {
+                .name                   = "serial8250",
+                .id                     = PLAT8250_DEV_PLATFORM1,
+                .dev                    = {
+                        .platform_data  = dm365_serial1_platform_data,
+                }
         },
+        {
+        }
 };
 
 static struct davinci_soc_info davinci_soc_info_dm365 = {
@@ -1093,7 +1110,6 @@ static struct davinci_soc_info davinci_soc_info_dm365 = {
         .gpio_num               = 104,
         .gpio_irq               = IRQ_DM365_GPIO0,
         .gpio_unbanked          = 8,    /* really 16 ... skip muxed GPIOs */
-        .serial_dev             = &dm365_serial_device,
         .emac_pdata             = &dm365_emac_pdata,
         .sram_dma               = 0x00010000,
         .sram_len               = SZ_32K,
@@ -1407,8 +1423,6 @@ static int __init dm365_init_devices(void)
 
         platform_device_register(&dm365_mdio_device);
         platform_device_register(&dm365_emac_device);
-        clk_add_alias(NULL, dev_name(&dm365_mdio_device.dev),
-                      NULL, &dm365_emac_device.dev);
 
         return 0;
 }
diff --git a/arch/arm/mach-davinci/dm644x.c b/arch/arm/mach-davinci/dm644x.c
index a49d18246fe9..4f74682293d6 100644
--- a/arch/arm/mach-davinci/dm644x.c
+++ b/arch/arm/mach-davinci/dm644x.c
@@ -303,10 +303,11 @@ static struct clk_lookup dm644x_clks[] = {
         CLK("vpss", "master", &vpss_master_clk),
         CLK("vpss", "slave", &vpss_slave_clk),
         CLK(NULL, "arm", &arm_clk),
-        CLK(NULL, "uart0", &uart0_clk),
-        CLK(NULL, "uart1", &uart1_clk),
-        CLK(NULL, "uart2", &uart2_clk),
+        CLK("serial8250.0", NULL, &uart0_clk),
+        CLK("serial8250.1", NULL, &uart1_clk),
+        CLK("serial8250.2", NULL, &uart2_clk),
         CLK("davinci_emac.1", NULL, &emac_clk),
+        CLK("davinci_mdio.0", "fck", &emac_clk),
         CLK("i2c_davinci.1", NULL, &i2c_clk),
         CLK("palm_bk3710", NULL, &ide_clk),
         CLK("davinci-mcbsp", NULL, &asp_clk),
@@ -813,7 +814,7 @@ static struct davinci_timer_info dm644x_timer_info = {
         .clocksource_id = T0_TOP,
 };
 
-static struct plat_serial8250_port dm644x_serial_platform_data[] = {
+static struct plat_serial8250_port dm644x_serial0_platform_data[] = {
         {
                 .mapbase        = DAVINCI_UART0_BASE,
                 .irq            = IRQ_UARTINT0,
@@ -823,6 +824,11 @@ static struct plat_serial8250_port dm644x_serial_platform_data[] = {
                 .regshift       = 2,
         },
         {
+                .flags  = 0,
+        }
+};
+static struct plat_serial8250_port dm644x_serial1_platform_data[] = {
+        {
                 .mapbase        = DAVINCI_UART1_BASE,
                 .irq            = IRQ_UARTINT1,
                 .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |
@@ -831,6 +837,11 @@ static struct plat_serial8250_port dm644x_serial_platform_data[] = {
                 .regshift       = 2,
         },
         {
+                .flags  = 0,
+        }
+};
+static struct plat_serial8250_port dm644x_serial2_platform_data[] = {
+        {
                 .mapbase        = DAVINCI_UART2_BASE,
                 .irq            = IRQ_UARTINT2,
                 .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |
@@ -839,16 +850,34 @@ static struct plat_serial8250_port dm644x_serial_platform_data[] = {
                 .regshift       = 2,
         },
         {
-                .flags          = 0
-        },
+                .flags  = 0,
+        }
 };
 
-static struct platform_device dm644x_serial_device = {
-        .name                   = "serial8250",
-        .id                     = PLAT8250_DEV_PLATFORM,
-        .dev                    = {
-                .platform_data  = dm644x_serial_platform_data,
+struct platform_device dm644x_serial_device[] = {
+        {
+                .name                   = "serial8250",
+                .id                     = PLAT8250_DEV_PLATFORM,
+                .dev                    = {
+                        .platform_data  = dm644x_serial0_platform_data,
+                }
         },
+        {
+                .name                   = "serial8250",
+                .id                     = PLAT8250_DEV_PLATFORM1,
+                .dev                    = {
+                        .platform_data  = dm644x_serial1_platform_data,
+                }
+        },
+        {
+                .name                   = "serial8250",
+                .id                     = PLAT8250_DEV_PLATFORM2,
+                .dev                    = {
+                        .platform_data  = dm644x_serial2_platform_data,
+                }
+        },
+        {
+        }
 };
 
 static struct davinci_soc_info davinci_soc_info_dm644x = {
@@ -872,7 +901,6 @@ static struct davinci_soc_info davinci_soc_info_dm644x = {
         .gpio_base              = DAVINCI_GPIO_BASE,
         .gpio_num               = 71,
         .gpio_irq               = IRQ_GPIOBNK0,
-        .serial_dev             = &dm644x_serial_device,
         .emac_pdata             = &dm644x_emac_pdata,
         .sram_dma               = 0x00008000,
         .sram_len               = SZ_16K,
@@ -923,8 +951,6 @@ static int __init dm644x_init_devices(void)
 
         platform_device_register(&dm644x_mdio_device);
         platform_device_register(&dm644x_emac_device);
-        clk_add_alias(NULL, dev_name(&dm644x_mdio_device.dev),
-                      NULL, &dm644x_emac_device.dev);
 
         return 0;
 }
diff --git a/arch/arm/mach-davinci/dm646x.c b/arch/arm/mach-davinci/dm646x.c
index d1259e80141b..68f8d1f1aca1 100644
--- a/arch/arm/mach-davinci/dm646x.c
+++ b/arch/arm/mach-davinci/dm646x.c
@@ -342,15 +342,16 @@ static struct clk_lookup dm646x_clks[] = {
         CLK(NULL, "edma_tc1", &edma_tc1_clk),
         CLK(NULL, "edma_tc2", &edma_tc2_clk),
         CLK(NULL, "edma_tc3", &edma_tc3_clk),
-        CLK(NULL, "uart0", &uart0_clk),
-        CLK(NULL, "uart1", &uart1_clk),
-        CLK(NULL, "uart2", &uart2_clk),
+        CLK("serial8250.0", NULL, &uart0_clk),
+        CLK("serial8250.1", NULL, &uart1_clk),
+        CLK("serial8250.2", NULL, &uart2_clk),
         CLK("i2c_davinci.1", NULL, &i2c_clk),
         CLK(NULL, "gpio", &gpio_clk),
         CLK("davinci-mcasp.0", NULL, &mcasp0_clk),
         CLK("davinci-mcasp.1", NULL, &mcasp1_clk),
         CLK(NULL, "aemif", &aemif_clk),
         CLK("davinci_emac.1", NULL, &emac_clk),
+        CLK("davinci_mdio.0", "fck", &emac_clk),
         CLK(NULL, "pwm0", &pwm0_clk),
         CLK(NULL, "pwm1", &pwm1_clk),
         CLK(NULL, "timer0", &timer0_clk),
@@ -790,7 +791,7 @@ static struct davinci_timer_info dm646x_timer_info = {
         .clocksource_id = T0_TOP,
 };
 
-static struct plat_serial8250_port dm646x_serial_platform_data[] = {
+static struct plat_serial8250_port dm646x_serial0_platform_data[] = {
         {
                 .mapbase        = DAVINCI_UART0_BASE,
                 .irq            = IRQ_UARTINT0,
@@ -800,6 +801,11 @@ static struct plat_serial8250_port dm646x_serial_platform_data[] = {
                 .regshift       = 2,
         },
         {
+                .flags  = 0,
+        }
+};
+static struct plat_serial8250_port dm646x_serial1_platform_data[] = {
+        {
                 .mapbase        = DAVINCI_UART1_BASE,
                 .irq            = IRQ_UARTINT1,
                 .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |
@@ -808,6 +814,11 @@ static struct plat_serial8250_port dm646x_serial_platform_data[] = {
                 .regshift       = 2,
         },
         {
+                .flags  = 0,
+        }
+};
+static struct plat_serial8250_port dm646x_serial2_platform_data[] = {
+        {
                 .mapbase        = DAVINCI_UART2_BASE,
                 .irq            = IRQ_DM646X_UARTINT2,
                 .flags          = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST |
@@ -816,16 +827,34 @@ static struct plat_serial8250_port dm646x_serial_platform_data[] = {
                 .regshift       = 2,
         },
         {
-                .flags          = 0
-        },
+                .flags  = 0,
+        }
 };
 
-static struct platform_device dm646x_serial_device = {
-        .name                   = "serial8250",
-        .id                     = PLAT8250_DEV_PLATFORM,
-        .dev                    = {
-                .platform_data  = dm646x_serial_platform_data,
+struct platform_device dm646x_serial_device[] = {
+        {
+                .name                   = "serial8250",
+                .id                     = PLAT8250_DEV_PLATFORM,
+                .dev                    = {
+                        .platform_data  = dm646x_serial0_platform_data,
+                }
+        },
+        {
+                .name                   = "serial8250",
+                .id                     = PLAT8250_DEV_PLATFORM1,
+                .dev                    = {
+                        .platform_data  = dm646x_serial1_platform_data,
+                }
         },
+        {
+                .name                   = "serial8250",
+                .id                     = PLAT8250_DEV_PLATFORM2,
+                .dev                    = {
+                        .platform_data  = dm646x_serial2_platform_data,
+                }
+        },
+        {
+        }
 };
 
 static struct davinci_soc_info davinci_soc_info_dm646x = {
@@ -849,7 +878,6 @@ static struct davinci_soc_info davinci_soc_info_dm646x = {
         .gpio_base              = DAVINCI_GPIO_BASE,
         .gpio_num               = 43, /* Only 33 usable */
         .gpio_irq               = IRQ_DM646X_GPIOBNK0,
-        .serial_dev             = &dm646x_serial_device,
         .emac_pdata             = &dm646x_emac_pdata,
         .sram_dma               = 0x10010000,
         .sram_len               = SZ_32K,
@@ -913,8 +941,6 @@ static int __init dm646x_init_devices(void)
 
         platform_device_register(&dm646x_mdio_device);
         platform_device_register(&dm646x_emac_device);
-        clk_add_alias(NULL, dev_name(&dm646x_mdio_device.dev),
-                      NULL, &dm646x_emac_device.dev);
 
         return 0;
 }
diff --git a/arch/arm/mach-davinci/include/mach/common.h b/arch/arm/mach-davinci/include/mach/common.h
index cce316b92c06..0b3c169758ed 100644
--- a/arch/arm/mach-davinci/include/mach/common.h
+++ b/arch/arm/mach-davinci/include/mach/common.h
@@ -72,7 +72,6 @@ struct davinci_soc_info {
         unsigned                        gpio_unbanked;
         struct davinci_gpio_controller  *gpio_ctlrs;
         int                             gpio_ctlrs_num;
-        struct platform_device          *serial_dev;
         struct emac_platform_data       *emac_pdata;
         dma_addr_t                      sram_dma;
         unsigned                        sram_len;
diff --git a/arch/arm/mach-davinci/include/mach/da8xx.h b/arch/arm/mach-davinci/include/mach/da8xx.h
index 7b41a5e9bc31..aae53072c0eb 100644
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@ -111,7 +111,7 @@ void da8xx_restart(enum reboot_mode mode, const char *cmd);
 void da8xx_rproc_reserve_cma(void);
 int da8xx_register_rproc(void);
 
-extern struct platform_device da8xx_serial_device;
+extern struct platform_device da8xx_serial_device[];
 extern struct emac_platform_data da8xx_emac_pdata;
 extern struct da8xx_lcdc_platform_data sharp_lcd035q3dg01_pdata;
 extern struct da8xx_lcdc_platform_data sharp_lk043t1dg01_pdata;
diff --git a/arch/arm/mach-davinci/include/mach/debug-macro.S b/arch/arm/mach-davinci/include/mach/debug-macro.S
deleted file mode 100644
index b18b8ebc6508..000000000000
--- a/arch/arm/mach-davinci/include/mach/debug-macro.S
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Debugging macro for DaVinci
- *
- * Author: Kevin Hilman, MontaVista Software, Inc. <source@mvista.com>
- *
- * 2007 (c) MontaVista Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
- */
-
-/* Modifications
- * Jan 2009     Chaithrika U S  Added senduart, busyuart, waituart
- *                              macros, based on debug-8250.S file
- *                              but using 32-bit accesses required for
- *                              some davinci devices.
- */
-
-#include <linux/serial_reg.h>
-
-#include <mach/serial.h>
-
-#define UART_SHIFT      2
-
-#if defined(CONFIG_DEBUG_DAVINCI_DMx_UART0)
-#define UART_BASE       DAVINCI_UART0_BASE
-#elif defined(CONFIG_DEBUG_DAVINCI_DA8XX_UART1)
-#define UART_BASE       DA8XX_UART1_BASE
-#elif defined(CONFIG_DEBUG_DAVINCI_DA8XX_UART2)
-#define UART_BASE       DA8XX_UART2_BASE
-#elif defined(CONFIG_DEBUG_DAVINCI_TNETV107X_UART1)
-#define UART_BASE       TNETV107X_UART2_BASE
-#define UART_VIRTBASE   TNETV107X_UART2_VIRT
-#else
-#error "Select a specifc port for DEBUG_LL"
-#endif
-
-#ifndef UART_VIRTBASE
-#define UART_VIRTBASE   IO_ADDRESS(UART_BASE)
-#endif
-
-                .macro addruart, rp, rv, tmp
-                ldr     \rp, =UART_BASE
-                ldr     \rv, =UART_VIRTBASE
-                .endm
-
-                .macro  senduart,rd,rx
-                str     \rd, [\rx, #UART_TX << UART_SHIFT]
-                .endm
-
-                .macro  busyuart,rd,rx
-1002:           ldr     \rd, [\rx, #UART_LSR << UART_SHIFT]
-                and     \rd, \rd, #UART_LSR_TEMT | UART_LSR_THRE
-                teq     \rd, #UART_LSR_TEMT | UART_LSR_THRE
-                bne     1002b
-                .endm
-
-                .macro  waituart,rd,rx
-#ifdef FLOW_CONTROL
-1001:           ldr     \rd, [\rx, #UART_MSR << UART_SHIFT]
-                tst     \rd, #UART_MSR_CTS
-                beq     1001b
-#endif
-                .endm
-
diff --git a/arch/arm/mach-davinci/include/mach/serial.h b/arch/arm/mach-davinci/include/mach/serial.h
index 62ad300440f5..52b8571b2e70 100644
--- a/arch/arm/mach-davinci/include/mach/serial.h
+++ b/arch/arm/mach-davinci/include/mach/serial.h
@@ -15,6 +15,8 @@
 
 #include <mach/hardware.h>
 
+#include <linux/platform_device.h>
+
 #define DAVINCI_UART0_BASE      (IO_PHYS + 0x20000)
 #define DAVINCI_UART1_BASE      (IO_PHYS + 0x20400)
 #define DAVINCI_UART2_BASE      (IO_PHYS + 0x20800)
@@ -37,13 +39,7 @@
 #define UART_DM646X_SCR_TX_WATERMARK    0x08
 
 #ifndef __ASSEMBLY__
-struct davinci_uart_config {
-        /* Bit field of UARTs present; bit 0 --> UART0 */
-        unsigned int enabled_uarts;
-};
-
-extern int davinci_serial_init(struct davinci_uart_config *);
-extern int davinci_serial_setup_clk(unsigned instance, unsigned int *rate);
+extern int davinci_serial_init(struct platform_device *);
 #endif
 
 #endif /* __ASM_ARCH_SERIAL_H */
diff --git a/arch/arm/mach-davinci/include/mach/tnetv107x.h b/arch/arm/mach-davinci/include/mach/tnetv107x.h
index 16314c64f755..494fcf5ccfe1 100644
--- a/arch/arm/mach-davinci/include/mach/tnetv107x.h
+++ b/arch/arm/mach-davinci/include/mach/tnetv107x.h
@@ -42,7 +42,6 @@
 #include <mach/serial.h>
 
 struct tnetv107x_device_info {
-        struct davinci_uart_config      *serial_config;
         struct davinci_mmc_config       *mmc_config[2];  /* 2 controllers */
         struct davinci_nand_pdata       *nand_config[4]; /* 4 chipsels */
         struct matrix_keypad_platform_data *keypad_config;
@@ -50,7 +49,7 @@ struct tnetv107x_device_info {
 };
 
 extern struct platform_device tnetv107x_wdt_device;
-extern struct platform_device tnetv107x_serial_device;
+extern struct platform_device tnetv107x_serial_device[];
 
 extern void tnetv107x_init(void);
 extern void tnetv107x_devices_init(struct tnetv107x_device_info *);
diff --git a/arch/arm/mach-davinci/serial.c b/arch/arm/mach-davinci/serial.c
index f2625814c3c9..5e93a734c858 100644
--- a/arch/arm/mach-davinci/serial.c
+++ b/arch/arm/mach-davinci/serial.c
@@ -70,49 +70,36 @@ static void __init davinci_serial_reset(struct plat_serial8250_port *p)
                                  UART_DM646X_SCR_TX_WATERMARK);
 }
 
-/* Enable UART clock and obtain its rate */
-int __init davinci_serial_setup_clk(unsigned instance, unsigned int *rate)
+int __init davinci_serial_init(struct platform_device *serial_dev)
 {
-        char name[16];
+        int i, ret = 0;
+        struct device *dev;
+        struct plat_serial8250_port *p;
         struct clk *clk;
-        struct davinci_soc_info *soc_info = &davinci_soc_info;
-        struct device *dev = &soc_info->serial_dev->dev;
-
-        sprintf(name, "uart%d", instance);
-        clk = clk_get(dev, name);
-        if (IS_ERR(clk)) {
-                pr_err("%s:%d: failed to get UART%d clock\n",
-                                        __func__, __LINE__, instance);
-                return PTR_ERR(clk);
-        }
-
-        clk_prepare_enable(clk);
-
-        if (rate)
-                *rate = clk_get_rate(clk);
-
-        return 0;
-}
-
-int __init davinci_serial_init(struct davinci_uart_config *info)
-{
-        int i, ret;
-        struct davinci_soc_info *soc_info = &davinci_soc_info;
-        struct device *dev = &soc_info->serial_dev->dev;
-        struct plat_serial8250_port *p = dev->platform_data;
 
         /*
          * Make sure the serial ports are muxed on at this point.
          * You have to mux them off in device drivers later on if not needed.
          */
-        for (i = 0; p->flags; i++, p++) {
-                if (!(info->enabled_uarts & (1 << i)))
-                        continue;
+        for (i = 0; serial_dev[i].dev.platform_data != NULL; i++) {
+                dev = &serial_dev[i].dev;
+                p = dev->platform_data;
 
-                ret = davinci_serial_setup_clk(i, &p->uartclk);
+                ret = platform_device_register(&serial_dev[i]);
                 if (ret)
                         continue;
 
+                clk = clk_get(dev, NULL);
+                if (IS_ERR(clk)) {
+                        pr_err("%s:%d: failed to get UART%d clock\n",
+                               __func__, __LINE__, i);
+                        continue;
+                }
+
+                clk_prepare_enable(clk);
+
+                p->uartclk = clk_get_rate(clk);
+
                 if (!p->membase && p->mapbase) {
                         p->membase = ioremap(p->mapbase, SZ_4K);
 
@@ -125,6 +112,5 @@ int __init davinci_serial_init(struct davinci_uart_config *info)
                 if (p->membase && p->type != PORT_AR7)
                         davinci_serial_reset(p);
         }
-
-        return platform_device_register(soc_info->serial_dev);
+        return ret;
 }
diff --git a/arch/arm/mach-davinci/tnetv107x.c b/arch/arm/mach-davinci/tnetv107x.c
index 4545667ecd3c..f4d7fbb24b3b 100644
--- a/arch/arm/mach-davinci/tnetv107x.c
+++ b/arch/arm/mach-davinci/tnetv107x.c
@@ -264,7 +264,7 @@ static struct clk_lookup clks[] = {
         CLK(NULL,               "clk_chipcfg",          &clk_chipcfg),
         CLK("tnetv107x-ts.0",   NULL,                   &clk_tsc),
         CLK(NULL,               "clk_rom",              &clk_rom),
-        CLK(NULL,               "uart2",                &clk_uart2),
+        CLK("serial8250.2",     NULL,                   &clk_uart2),
         CLK(NULL,               "clk_pktsec",           &clk_pktsec),
         CLK("tnetv107x-rng.0",  NULL,                   &clk_rng),
         CLK("tnetv107x-pka.0",  NULL,                   &clk_pka),
@@ -274,8 +274,8 @@ static struct clk_lookup clks[] = {
         CLK(NULL,               "clk_gpio",             &clk_gpio),
         CLK(NULL,               "clk_mdio",             &clk_mdio),
         CLK("dm6441-mmc.0",     NULL,                   &clk_sdio0),
-        CLK(NULL,               "uart0",                &clk_uart0),
-        CLK(NULL,               "uart1",                &clk_uart1),
+        CLK("serial8250.0",     NULL,                   &clk_uart0),
+        CLK("serial8250.1",     NULL,                   &clk_uart1),
         CLK(NULL,               "timer0",               &clk_timer0),
         CLK(NULL,               "timer1",               &clk_timer1),
         CLK("tnetv107x_wdt.0",  NULL,                   &clk_wdt_arm),
@@ -757,7 +757,7 @@ static struct davinci_soc_info tnetv107x_soc_info = {
         .gpio_type              = GPIO_TYPE_TNETV107X,
         .gpio_num               = TNETV107X_N_GPIO,
         .timer_info             = &timer_info,
-        .serial_dev             = &tnetv107x_serial_device,
+        .serial_dev             = tnetv107x_serial_device,
 };
 
 void __init tnetv107x_init(void)
diff --git a/arch/arm/mach-dove/Kconfig b/arch/arm/mach-dove/Kconfig
index dff7b2fd4e20..0bc7cdf8cf46 100644
--- a/arch/arm/mach-dove/Kconfig
+++ b/arch/arm/mach-dove/Kconfig
@@ -23,6 +23,8 @@ config MACH_CM_A510
 config MACH_DOVE_DT
         bool "Marvell Dove Flattened Device Tree"
         select DOVE_CLK
+        select ORION_IRQCHIP
+        select ORION_TIMER
         select REGULATOR
         select REGULATOR_FIXED_VOLTAGE
         select USE_OF
diff --git a/arch/arm/mach-dove/Makefile b/arch/arm/mach-dove/Makefile
index 4d9d2ffc4535..cbc5c0618788 100644
--- a/arch/arm/mach-dove/Makefile
+++ b/arch/arm/mach-dove/Makefile
@@ -1,5 +1,5 @@
-obj-y                           += common.o irq.o
-obj-$(CONFIG_DOVE_LEGACY)       += mpp.o
+obj-y                           += common.o
+obj-$(CONFIG_DOVE_LEGACY)       += irq.o mpp.o
 obj-$(CONFIG_PCI)               += pcie.o
 obj-$(CONFIG_MACH_DOVE_DB)      += dove-db-setup.o
 obj-$(CONFIG_MACH_DOVE_DT)      += board-dt.o
diff --git a/arch/arm/mach-dove/board-dt.c b/arch/arm/mach-dove/board-dt.c
index f3755ac81148..49f72a848423 100644
--- a/arch/arm/mach-dove/board-dt.c
+++ b/arch/arm/mach-dove/board-dt.c
@@ -10,11 +10,14 @@
 
 #include <linux/init.h>
 #include <linux/clk-provider.h>
+#include <linux/clocksource.h>
+#include <linux/irqchip.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/platform_data/usb-ehci-orion.h>
 #include <asm/hardware/cache-tauros2.h>
 #include <asm/mach/arch.h>
+#include <mach/dove.h>
 #include <mach/pm.h>
 #include <plat/common.h>
 #include <plat/irq.h>
@@ -33,10 +36,6 @@ static void __init dove_legacy_clk_init(void)
         clkspec.np = np;
         clkspec.args_count = 1;
 
-        clkspec.args[0] = CLOCK_GATING_BIT_GBE;
-        orion_clkdev_add(NULL, "mv643xx_eth_port.0",
-                         of_clk_get_from_provider(&clkspec));
-
         clkspec.args[0] = CLOCK_GATING_BIT_PCIE0;
         orion_clkdev_add("0", "pcie",
                          of_clk_get_from_provider(&clkspec));
@@ -46,15 +45,18 @@ static void __init dove_legacy_clk_init(void)
                          of_clk_get_from_provider(&clkspec));
 }
 
-static void __init dove_of_clk_init(void)
+static void __init dove_dt_time_init(void)
 {
         of_clk_init(NULL);
-        dove_legacy_clk_init();
+        clocksource_of_init();
 }
 
-static struct mv643xx_eth_platform_data dove_dt_ge00_data = {
-        .phy_addr = MV643XX_ETH_PHY_ADDR_DEFAULT,
-};
+static void __init dove_dt_init_early(void)
+{
+        mvebu_mbus_init("marvell,dove-mbus",
+                        BRIDGE_WINS_BASE, BRIDGE_WINS_SZ,
+                        DOVE_MC_WINS_BASE, DOVE_MC_WINS_SZ);
+}
 
 static void __init dove_dt_init(void)
 {
@@ -65,11 +67,10 @@ static void __init dove_dt_init(void)
 #endif
         dove_setup_cpu_wins();
 
-        /* Setup root of clk tree */
-        dove_of_clk_init();
+        /* Setup clocks for legacy devices */
+        dove_legacy_clk_init();
 
         /* Internal devices not ported to DT yet */
-        dove_ge00_init(&dove_dt_ge00_data);
         dove_pcie_init(1, 1);
 
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
@@ -82,9 +83,8 @@ static const char * const dove_dt_board_compat[] = {
 
 DT_MACHINE_START(DOVE_DT, "Marvell Dove (Flattened Device Tree)")
         .map_io         = dove_map_io,
-        .init_early     = dove_init_early,
-        .init_irq       = orion_dt_init_irq,
-        .init_time      = dove_timer_init,
+        .init_early     = dove_dt_init_early,
+        .init_time      = dove_dt_time_init,
         .init_machine   = dove_dt_init,
         .restart        = dove_restart,
         .dt_compat      = dove_dt_board_compat,
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c
index 00247c771313..c122bcff9f7c 100644
--- a/arch/arm/mach-dove/common.c
+++ b/arch/arm/mach-dove/common.c
@@ -27,6 +27,22 @@
 #include <plat/time.h>
 #include "common.h"
 
+/* These can go away once Dove uses the mvebu-mbus DT binding */
+#define DOVE_MBUS_PCIE0_MEM_TARGET    0x4
+#define DOVE_MBUS_PCIE0_MEM_ATTR      0xe8
+#define DOVE_MBUS_PCIE0_IO_TARGET     0x4
+#define DOVE_MBUS_PCIE0_IO_ATTR       0xe0
+#define DOVE_MBUS_PCIE1_MEM_TARGET    0x8
+#define DOVE_MBUS_PCIE1_MEM_ATTR      0xe8
+#define DOVE_MBUS_PCIE1_IO_TARGET     0x8
+#define DOVE_MBUS_PCIE1_IO_ATTR       0xe0
+#define DOVE_MBUS_CESA_TARGET         0x3
+#define DOVE_MBUS_CESA_ATTR           0x1
+#define DOVE_MBUS_BOOTROM_TARGET      0x1
+#define DOVE_MBUS_BOOTROM_ATTR        0xfd
+#define DOVE_MBUS_SCRATCHPAD_TARGET   0xd
+#define DOVE_MBUS_SCRATCHPAD_ATTR     0x0
+
 /*****************************************************************************
  * I/O Address Mapping
  ****************************************************************************/
@@ -108,8 +124,8 @@ static void __init dove_clk_init(void)
         orion_clkdev_add(NULL, "sdhci-dove.1", sdio1);
         orion_clkdev_add(NULL, "orion_nand", nand);
         orion_clkdev_add(NULL, "cafe1000-ccic.0", camera);
-        orion_clkdev_add(NULL, "kirkwood-i2s.0", i2s0);
-        orion_clkdev_add(NULL, "kirkwood-i2s.1", i2s1);
+        orion_clkdev_add(NULL, "mvebu-audio.0", i2s0);
+        orion_clkdev_add(NULL, "mvebu-audio.1", i2s1);
         orion_clkdev_add(NULL, "mv_crypto", crypto);
         orion_clkdev_add(NULL, "dove-ac97", ac97);
         orion_clkdev_add(NULL, "dove-pdma", pdma);
@@ -332,34 +348,40 @@ void __init dove_setup_cpu_wins(void)
 {
         /*
          * The PCIe windows will no longer be statically allocated
-         * here once Dove is migrated to the pci-mvebu driver.
+         * here once Dove is migrated to the pci-mvebu driver. The
+         * non-PCIe windows will no longer be created here once Dove
+         * fully moves to DT.
          */
-        mvebu_mbus_add_window_remap_flags("pcie0.0",
+        mvebu_mbus_add_window_remap_by_id(DOVE_MBUS_PCIE0_IO_TARGET,
+                                          DOVE_MBUS_PCIE0_IO_ATTR,
                                           DOVE_PCIE0_IO_PHYS_BASE,
                                           DOVE_PCIE0_IO_SIZE,
-                                          DOVE_PCIE0_IO_BUS_BASE,
-                                          MVEBU_MBUS_PCI_IO);
-        mvebu_mbus_add_window_remap_flags("pcie1.0",
+                                          DOVE_PCIE0_IO_BUS_BASE);
+        mvebu_mbus_add_window_remap_by_id(DOVE_MBUS_PCIE1_IO_TARGET,
+                                          DOVE_MBUS_PCIE1_IO_ATTR,
                                           DOVE_PCIE1_IO_PHYS_BASE,
                                           DOVE_PCIE1_IO_SIZE,
-                                          DOVE_PCIE1_IO_BUS_BASE,
-                                          MVEBU_MBUS_PCI_IO);
-        mvebu_mbus_add_window_remap_flags("pcie0.0",
-                                          DOVE_PCIE0_MEM_PHYS_BASE,
-                                          DOVE_PCIE0_MEM_SIZE,
-                                          MVEBU_MBUS_NO_REMAP,
-                                          MVEBU_MBUS_PCI_MEM);
-        mvebu_mbus_add_window_remap_flags("pcie1.0",
-                                          DOVE_PCIE1_MEM_PHYS_BASE,
-                                          DOVE_PCIE1_MEM_SIZE,
-                                          MVEBU_MBUS_NO_REMAP,
-                                          MVEBU_MBUS_PCI_MEM);
-        mvebu_mbus_add_window("cesa", DOVE_CESA_PHYS_BASE,
-                              DOVE_CESA_SIZE);
-        mvebu_mbus_add_window("bootrom", DOVE_BOOTROM_PHYS_BASE,
-                              DOVE_BOOTROM_SIZE);
-        mvebu_mbus_add_window("scratchpad", DOVE_SCRATCHPAD_PHYS_BASE,
-                              DOVE_SCRATCHPAD_SIZE);
+                                          DOVE_PCIE1_IO_BUS_BASE);
+        mvebu_mbus_add_window_by_id(DOVE_MBUS_PCIE0_MEM_TARGET,
+                                    DOVE_MBUS_PCIE0_MEM_ATTR,
+                                    DOVE_PCIE0_MEM_PHYS_BASE,
+                                    DOVE_PCIE0_MEM_SIZE);
+        mvebu_mbus_add_window_by_id(DOVE_MBUS_PCIE1_MEM_TARGET,
+                                    DOVE_MBUS_PCIE1_MEM_ATTR,
+                                    DOVE_PCIE1_MEM_PHYS_BASE,
+                                    DOVE_PCIE1_MEM_SIZE);
+        mvebu_mbus_add_window_by_id(DOVE_MBUS_CESA_TARGET,
+                                    DOVE_MBUS_CESA_ATTR,
+                                    DOVE_CESA_PHYS_BASE,
+                                    DOVE_CESA_SIZE);
+        mvebu_mbus_add_window_by_id(DOVE_MBUS_BOOTROM_TARGET,
+                                    DOVE_MBUS_BOOTROM_ATTR,
+                                    DOVE_BOOTROM_PHYS_BASE,
+                                    DOVE_BOOTROM_SIZE);
+        mvebu_mbus_add_window_by_id(DOVE_MBUS_SCRATCHPAD_TARGET,
+                                    DOVE_MBUS_SCRATCHPAD_ATTR,
+                                    DOVE_SCRATCHPAD_PHYS_BASE,
+                                    DOVE_SCRATCHPAD_SIZE);
 }
 
 void __init dove_init(void)
diff --git a/arch/arm/mach-dove/include/mach/debug-macro.S b/arch/arm/mach-dove/include/mach/debug-macro.S
deleted file mode 100644
index 5929cbc59161..000000000000
--- a/arch/arm/mach-dove/include/mach/debug-macro.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * arch/arm/mach-dove/include/mach/debug-macro.S
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#include <mach/bridge-regs.h>
-
-        .macro  addruart, rp, rv, tmp
-        ldr     \rp, =DOVE_SB_REGS_PHYS_BASE
-        ldr     \rv, =DOVE_SB_REGS_VIRT_BASE
-        orr     \rp, \rp, #0x00012000
-        orr     \rv, \rv, #0x00012000
-        .endm
-
-#define UART_SHIFT      2
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-dove/mpp.c b/arch/arm/mach-dove/mpp.c
index 60bd729a1ba5..8a433a51289c 100644
--- a/arch/arm/mach-dove/mpp.c
+++ b/arch/arm/mach-dove/mpp.c
@@ -47,7 +47,7 @@ static const struct dove_mpp_grp dove_mpp_grp[] = {
 
 /* Enable gpio for a range of pins. mode should be a combination of
    GPIO_OUTPUT_OK | GPIO_INPUT_OK */
-static void dove_mpp_gpio_mode(int start, int end, int gpio_mode)
+static void __init dove_mpp_gpio_mode(int start, int end, int gpio_mode)
 {
         int i;
 
diff --git a/arch/arm/mach-ebsa110/include/mach/debug-macro.S b/arch/arm/mach-ebsa110/include/mach/debug-macro.S
deleted file mode 100644
index bb02c05e6812..000000000000
--- a/arch/arm/mach-ebsa110/include/mach/debug-macro.S
+++ /dev/null
@@ -1,22 +0,0 @@
-/* arch/arm/mach-ebsa110/include/mach/debug-macro.S
- *
- * Debugging macro include header
- *
- *  Copyright (C) 1994-1999 Russell King
- *  Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-**/
-
-                .macro  addruart, rp, rv, tmp
-                mov     \rp, #0xf0000000
-                orr     \rp, \rp, #0x00000be0
-                mov     \rp, \rv
-                .endm
-
-#define UART_SHIFT      2
-#define FLOW_CONTROL
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-ep93xx/Kconfig b/arch/arm/mach-ep93xx/Kconfig
index fe3c1fa5462b..93e54fd4e3d5 100644
--- a/arch/arm/mach-ep93xx/Kconfig
+++ b/arch/arm/mach-ep93xx/Kconfig
@@ -194,20 +194,6 @@ config MACH_VISION_EP9307
           Say 'Y' here if you want your kernel to support the
           Vision Engraving Systems EP9307 SoM.
 
-choice
-        prompt "Select a UART for early kernel messages"
-
-config EP93XX_EARLY_UART1
-        bool "UART1"
-
-config EP93XX_EARLY_UART2
-        bool "UART2"
-
-config EP93XX_EARLY_UART3
-        bool "UART3"
-
-endchoice
-
 endmenu
 
 endif
diff --git a/arch/arm/mach-ep93xx/core.c b/arch/arm/mach-ep93xx/core.c
index df8612fbbc9c..3f12b885c083 100644
--- a/arch/arm/mach-ep93xx/core.c
+++ b/arch/arm/mach-ep93xx/core.c
@@ -281,7 +281,7 @@ static AMBA_APB_DEVICE(uart1, "apb:uart1", 0x00041010, EP93XX_UART1_PHYS_BASE,
         { IRQ_EP93XX_UART1 }, &ep93xx_uart_data);
 
 static AMBA_APB_DEVICE(uart2, "apb:uart2", 0x00041010, EP93XX_UART2_PHYS_BASE,
-        { IRQ_EP93XX_UART2 }, &ep93xx_uart_data);
+        { IRQ_EP93XX_UART2 }, NULL);
 
 static AMBA_APB_DEVICE(uart3, "apb:uart3", 0x00041010, EP93XX_UART3_PHYS_BASE,
         { IRQ_EP93XX_UART3 }, &ep93xx_uart_data);
diff --git a/arch/arm/mach-ep93xx/include/mach/debug-macro.S b/arch/arm/mach-ep93xx/include/mach/debug-macro.S
deleted file mode 100644
index af54e43132cf..000000000000
--- a/arch/arm/mach-ep93xx/include/mach/debug-macro.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * arch/arm/mach-ep93xx/include/mach/debug-macro.S
- * Debugging macro include header
- *
- * Copyright (C) 2006 Lennert Buytenhek <buytenh@wantstofly.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or (at
- * your option) any later version.
- */
-#include <mach/ep93xx-regs.h>
-
-                .macro  addruart, rp, rv, tmp
-                ldr     \rp, =EP93XX_APB_PHYS_BASE      @ Physical base
-                ldr     \rv, =EP93XX_APB_VIRT_BASE      @ virtual base
-                orr     \rp, \rp, #0x000c0000
-                orr     \rv, \rv, #0x000c0000
-                .endm
-
-#include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/mach-ep93xx/include/mach/uncompress.h b/arch/arm/mach-ep93xx/include/mach/uncompress.h
index b5cc77d2380b..03c42e5400d2 100644
--- a/arch/arm/mach-ep93xx/include/mach/uncompress.h
+++ b/arch/arm/mach-ep93xx/include/mach/uncompress.h
@@ -31,18 +31,8 @@ static void __raw_writel(unsigned int value, unsigned int ptr)
         *((volatile unsigned int *)ptr) = value;
 }
 
-#if defined(CONFIG_EP93XX_EARLY_UART1)
-#define UART_BASE               EP93XX_UART1_PHYS_BASE
-#elif defined(CONFIG_EP93XX_EARLY_UART2)
-#define UART_BASE               EP93XX_UART2_PHYS_BASE
-#elif defined(CONFIG_EP93XX_EARLY_UART3)
-#define UART_BASE               EP93XX_UART3_PHYS_BASE
-#else
-#define UART_BASE               EP93XX_UART1_PHYS_BASE
-#endif
-
-#define PHYS_UART_DATA          (UART_BASE + 0x00)
-#define PHYS_UART_FLAG          (UART_BASE + 0x18)
+#define PHYS_UART_DATA          (CONFIG_DEBUG_UART_PHYS + 0x00)
+#define PHYS_UART_FLAG          (CONFIG_DEBUG_UART_PHYS + 0x18)
 #define UART_FLAG_TXFF          0x20
 
 static inline void putc(int c)
diff --git a/arch/arm/mach-ep93xx/vision_ep9307.c b/arch/arm/mach-ep93xx/vision_ep9307.c
index 605956fd07a2..6bc1c181581d 100644
--- a/arch/arm/mach-ep93xx/vision_ep9307.c
+++ b/arch/arm/mach-ep93xx/vision_ep9307.c
@@ -23,7 +23,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/i2c.h>
 #include <linux/i2c-gpio.h>
-#include <linux/i2c/pca953x.h>
+#include <linux/platform_data/pca953x.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
 #include <linux/spi/mmc_spi.h>
@@ -224,62 +224,15 @@ static struct ep93xx_spi_chip_ops vision_spi_flash_hw = {
 #define VISION_SPI_MMC_WP       EP93XX_GPIO_LINE_F(0)
 #define VISION_SPI_MMC_CD       EP93XX_GPIO_LINE_EGPIO15
 
-static struct gpio vision_spi_mmc_gpios[] = {
-        { VISION_SPI_MMC_WP, GPIOF_DIR_IN, "mmc_spi:wp" },
-        { VISION_SPI_MMC_CD, GPIOF_DIR_IN, "mmc_spi:cd" },
-};
-
-static int vision_spi_mmc_init(struct device *pdev,
-                        irqreturn_t (*func)(int, void *), void *pdata)
-{
-        int err;
-
-        err = gpio_request_array(vision_spi_mmc_gpios,
-                                 ARRAY_SIZE(vision_spi_mmc_gpios));
-        if (err)
-                return err;
-
-        err = gpio_set_debounce(VISION_SPI_MMC_CD, 1);
-        if (err)
-                goto exit_err;
-
-        err = request_irq(gpio_to_irq(VISION_SPI_MMC_CD), func,
-                        IRQ_TYPE_EDGE_BOTH, "mmc_spi:cd", pdata);
-        if (err)
-                goto exit_err;
-
-        return 0;
-
-exit_err:
-        gpio_free_array(vision_spi_mmc_gpios, ARRAY_SIZE(vision_spi_mmc_gpios));
-        return err;
-
-}
-
-static void vision_spi_mmc_exit(struct device *pdev, void *pdata)
-{
-        free_irq(gpio_to_irq(VISION_SPI_MMC_CD), pdata);
-        gpio_free_array(vision_spi_mmc_gpios, ARRAY_SIZE(vision_spi_mmc_gpios));
-}
-
-static int vision_spi_mmc_get_ro(struct device *pdev)
-{
-        return !!gpio_get_value(VISION_SPI_MMC_WP);
-}
-
-static int vision_spi_mmc_get_cd(struct device *pdev)
-{
-        return !gpio_get_value(VISION_SPI_MMC_CD);
-}
-
 static struct mmc_spi_platform_data vision_spi_mmc_data = {
-        .init           = vision_spi_mmc_init,
-        .exit           = vision_spi_mmc_exit,
-        .get_ro         = vision_spi_mmc_get_ro,
-        .get_cd         = vision_spi_mmc_get_cd,
         .detect_delay   = 100,
         .powerup_msecs  = 100,
         .ocr_mask       = MMC_VDD_32_33 | MMC_VDD_33_34,
+        .flags          = MMC_SPI_USE_CD_GPIO | MMC_SPI_USE_RO_GPIO,
+        .cd_gpio        = VISION_SPI_MMC_CD,
+        .cd_debounce    = 1,
+        .ro_gpio        = VISION_SPI_MMC_WP,
+        .caps2          = MMC_CAP2_RO_ACTIVE_HIGH,
 };
 
 static int vision_spi_mmc_hw_setup(struct spi_device *spi)
diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index 5952e68c76c4..56fe819ee10b 100644
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -36,6 +36,7 @@ config CPU_EXYNOS4210
         bool "SAMSUNG EXYNOS4210"
         default y
         depends on ARCH_EXYNOS4
+        select ARCH_HAS_BANDGAP
         select ARM_CPU_SUSPEND if PM
         select PINCTRL_EXYNOS
         select PM_GENERIC_DOMAINS if PM
@@ -49,7 +50,9 @@ config SOC_EXYNOS4212
         bool "SAMSUNG EXYNOS4212"
         default y
         depends on ARCH_EXYNOS4
+        select ARCH_HAS_BANDGAP
         select PINCTRL_EXYNOS
+        select PM_GENERIC_DOMAINS if PM
         select S5P_PM if PM
         select S5P_SLEEP if PM
         select SAMSUNG_DMADEV
@@ -60,7 +63,9 @@ config SOC_EXYNOS4412
         bool "SAMSUNG EXYNOS4412"
         default y
         depends on ARCH_EXYNOS4
+        select ARCH_HAS_BANDGAP
         select PINCTRL_EXYNOS
+        select PM_GENERIC_DOMAINS if PM
         select SAMSUNG_DMADEV
         help
           Enable EXYNOS4412 SoC support
@@ -69,6 +74,7 @@ config SOC_EXYNOS5250
         bool "SAMSUNG EXYNOS5250"
         default y
         depends on ARCH_EXYNOS5
+        select ARCH_HAS_BANDGAP
         select PINCTRL_EXYNOS
         select PM_GENERIC_DOMAINS if PM
         select S5P_PM if PM
@@ -93,6 +99,7 @@ config SOC_EXYNOS5440
         default y
         depends on ARCH_EXYNOS5
         select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
+        select ARCH_HAS_BANDGAP
         select ARCH_HAS_OPP
         select HAVE_ARM_ARCH_TIMER
         select AUTO_ZRELADDR
diff --git a/arch/arm/mach-exynos/common.h b/arch/arm/mach-exynos/common.h
index 972490fc09d6..8646a141ae46 100644
--- a/arch/arm/mach-exynos/common.h
+++ b/arch/arm/mach-exynos/common.h
@@ -17,7 +17,6 @@
 
 void mct_init(void __iomem *base, int irq_g0, int irq_l0, int irq_l1);
 void exynos_init_time(void);
-extern unsigned long xxti_f, xusbxti_f;
 
 struct map_desc;
 void exynos_init_io(void);
@@ -25,56 +24,14 @@ void exynos4_restart(enum reboot_mode mode, const char *cmd);
 void exynos5_restart(enum reboot_mode mode, const char *cmd);
 void exynos_init_late(void);
 
-/* ToDo: remove these after migrating legacy exynos4 platforms to dt */
-void exynos4_clk_init(struct device_node *np, int is_exynos4210, void __iomem *reg_base, unsigned long xom);
-void exynos4_clk_register_fixed_ext(unsigned long, unsigned long);
-
 void exynos_firmware_init(void);
 
-void exynos_set_timer_source(u8 channels);
-
 #ifdef CONFIG_PM_GENERIC_DOMAINS
 int exynos_pm_late_initcall(void);
 #else
 static inline int exynos_pm_late_initcall(void) { return 0; }
 #endif
 
-#ifdef CONFIG_ARCH_EXYNOS4
-void exynos4_register_clocks(void);
-void exynos4_setup_clocks(void);
-
-#else
-#define exynos4_register_clocks()
-#define exynos4_setup_clocks()
-#endif
-
-#ifdef CONFIG_ARCH_EXYNOS5
-void exynos5_register_clocks(void);
-void exynos5_setup_clocks(void);
-
-#else
-#define exynos5_register_clocks()
-#define exynos5_setup_clocks()
-#endif
-
-#ifdef CONFIG_CPU_EXYNOS4210
-void exynos4210_register_clocks(void);
-
-#else
-#define exynos4210_register_clocks()
-#endif
-
-#ifdef CONFIG_SOC_EXYNOS4212
-void exynos4212_register_clocks(void);
-
-#else
-#define exynos4212_register_clocks()
-#endif
-
-struct device_node;
-void combiner_init(void __iomem *combiner_base, struct device_node *np,
-                        unsigned int max_nr, int irq_base);
-
 extern struct smp_operations exynos_smp_ops;
 
 extern void exynos_cpu_die(unsigned int cpu);
diff --git a/arch/arm/mach-exynos/cpuidle.c b/arch/arm/mach-exynos/cpuidle.c
index 225ee8431c72..ac139226d63c 100644
--- a/arch/arm/mach-exynos/cpuidle.c
+++ b/arch/arm/mach-exynos/cpuidle.c
@@ -200,6 +200,9 @@ static int __init exynos4_init_cpuidle(void)
         if (soc_is_exynos5250())
                 exynos5_core_down_clk();
 
+        if (soc_is_exynos5440())
+                exynos4_idle_driver.state_count = 1;
+
         ret = cpuidle_register_driver(&exynos4_idle_driver);
         if (ret) {
                 printk(KERN_ERR "CPUidle failed to register driver\n");
diff --git a/arch/arm/mach-footbridge/include/mach/debug-macro.S b/arch/arm/mach-footbridge/include/mach/debug-macro.S
index c169f0c99b2a..02247f313e94 100644
--- a/arch/arm/mach-footbridge/include/mach/debug-macro.S
+++ b/arch/arm/mach-footbridge/include/mach/debug-macro.S
@@ -13,20 +13,6 @@
 
 #include <asm/hardware/dec21285.h>
 
-#ifndef CONFIG_DEBUG_DC21285_PORT
-        /* For NetWinder debugging */
-                .macro  addruart, rp, rv, tmp
-                mov     \rp, #0x000003f8
-                orr     \rv, \rp, #0xfe000000   @ virtual
-                orr     \rv, \rv, #0x00e00000   @ virtual
-                orr     \rp, \rp, #0x7c000000   @ physical
-                .endm
-
-#define UART_SHIFT      0
-#define FLOW_CONTROL
-#include <asm/hardware/debug-8250.S>
-
-#else
 #include <mach/hardware.h>
         /* For EBSA285 debugging */
                 .equ    dc21285_high, ARMCSR_BASE & 0xff000000
@@ -54,4 +40,3 @@
 
                 .macro  waituart,rd,rx
                 .endm
-#endif
diff --git a/arch/arm/mach-gemini/include/mach/debug-macro.S b/arch/arm/mach-gemini/include/mach/debug-macro.S
deleted file mode 100644
index 837670763b85..000000000000
--- a/arch/arm/mach-gemini/include/mach/debug-macro.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Debugging macro include header
- *
- *  Copyright (C) 1994-1999 Russell King
- *  Copyright (C) 2001-2006 Storlink, Corp.
- *  Copyright (C) 2008-2009 Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#include <mach/hardware.h>
-
-        .macro  addruart, rp, rv, tmp
-        ldr     \rp, =GEMINI_UART_BASE                  @ physical
-        ldr     \rv, =IO_ADDRESS(GEMINI_UART_BASE)      @ virtual
-        .endm
-
-#define UART_SHIFT      2
-#define FLOW_CONTROL
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig
index cd9fcb1cd7ab..8e8437dea3ce 100644
--- a/arch/arm/mach-highbank/Kconfig
+++ b/arch/arm/mach-highbank/Kconfig
@@ -1,9 +1,14 @@
 config ARCH_HIGHBANK
         bool "Calxeda ECX-1000/2000 (Highbank/Midway)" if ARCH_MULTI_V7
+        select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
         select ARCH_HAS_CPUFREQ
+        select ARCH_HAS_HOLES_MEMORYMODEL
         select ARCH_HAS_OPP
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select ARM_AMBA
+        select ARM_ERRATA_764369
+        select ARM_ERRATA_775420
+        select ARM_ERRATA_798181
         select ARM_GIC
         select ARM_TIMER_SP804
         select CACHE_L2X0
@@ -12,9 +17,10 @@ config ARCH_HIGHBANK
         select CPU_V7
         select GENERIC_CLOCKEVENTS
         select HAVE_ARM_SCU
-        select HAVE_ARM_TWD if LOCAL_TIMERS
+        select HAVE_ARM_TWD if SMP
         select HAVE_SMP
         select MAILBOX
         select PL320_MBOX
         select SPARSE_IRQ
         select USE_OF
+        select ZONE_DMA if ARM_LPAE
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c
index 88815795fe26..8e63ccdb0de3 100644
--- a/arch/arm/mach-highbank/highbank.c
+++ b/arch/arm/mach-highbank/highbank.c
@@ -18,14 +18,11 @@
 #include <linux/clocksource.h>
 #include <linux/dma-mapping.h>
 #include <linux/io.h>
-#include <linux/irq.h>
 #include <linux/irqchip.h>
-#include <linux/irqdomain.h>
 #include <linux/of.h>
 #include <linux/of_irq.h>
 #include <linux/of_platform.h>
 #include <linux/of_address.h>
-#include <linux/smp.h>
 #include <linux/amba/bus.h>
 #include <linux/clk-provider.h>
 
@@ -35,7 +32,6 @@
 #include <asm/hardware/cache-l2x0.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
-#include <asm/mach/time.h>
 
 #include "core.h"
 #include "sysregs.h"
@@ -65,13 +61,11 @@ void highbank_set_cpu_jump(int cpu, void *jump_addr)
                           HB_JUMP_TABLE_PHYS(cpu) + 15);
 }
 
-#ifdef CONFIG_CACHE_L2X0
 static void highbank_l2x0_disable(void)
 {
         /* Disable PL310 L2 Cache controller */
         highbank_smc1(0x102, 0x0);
 }
-#endif
 
 static void __init highbank_init_irq(void)
 {
@@ -80,12 +74,13 @@ static void __init highbank_init_irq(void)
         if (of_find_compatible_node(NULL, NULL, "arm,cortex-a9"))
                 highbank_scu_map_io();
 
-#ifdef CONFIG_CACHE_L2X0
         /* Enable PL310 L2 Cache controller */
-        highbank_smc1(0x102, 0x1);
-        l2x0_of_init(0, ~0UL);
-        outer_cache.disable = highbank_l2x0_disable;
-#endif
+        if (IS_ENABLED(CONFIG_CACHE_L2X0) &&
+            of_find_compatible_node(NULL, NULL, "arm,pl310-cache")) {
+                highbank_smc1(0x102, 0x1);
+                l2x0_of_init(0, ~0UL);
+                outer_cache.disable = highbank_l2x0_disable;
+        }
 }
 
 static void __init highbank_timer_init(void)
@@ -176,6 +171,9 @@ static const char *highbank_match[] __initconst = {
 };
 
 DT_MACHINE_START(HIGHBANK, "Highbank")
+#if defined(CONFIG_ZONE_DMA) && defined(CONFIG_ARM_LPAE)
+        .dma_zone_size  = (4ULL * SZ_1G),
+#endif
         .smp            = smp_ops(highbank_smp_ops),
         .init_irq       = highbank_init_irq,
         .init_time      = highbank_timer_init,
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index f54656091a9d..29a8af6922a8 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -1,6 +1,7 @@
 config ARCH_MXC
         bool "Freescale i.MX family" if ARCH_MULTI_V4_V5 || ARCH_MULTI_V6_V7
         select ARCH_REQUIRE_GPIOLIB
+        select ARM_CPU_SUSPEND if PM
         select ARM_PATCH_PHYS_VIRT
         select AUTO_ZRELADDR if !ZBOOT_ROM
         select CLKDEV_LOOKUP
@@ -8,6 +9,7 @@ config ARCH_MXC
         select GENERIC_ALLOCATOR
         select GENERIC_CLOCKEVENTS
         select GENERIC_IRQ_CHIP
+        select MIGHT_HAVE_CACHE_L2X0 if ARCH_MULTI_V6_V7
         select MULTI_IRQ_HANDLER
         select SPARSE_IRQ
         select USE_OF
@@ -785,7 +787,6 @@ config SOC_IMX6Q
         bool "i.MX6 Quad/DualLite support"
         select ARCH_HAS_CPUFREQ
         select ARCH_HAS_OPP
-        select ARM_CPU_SUSPEND if PM
         select ARM_ERRATA_754322
         select ARM_ERRATA_764369 if SMP
         select ARM_ERRATA_775420
@@ -793,7 +794,7 @@ config SOC_IMX6Q
         select COMMON_CLK
         select CPU_V7
         select HAVE_ARM_SCU if SMP
-        select HAVE_ARM_TWD if LOCAL_TIMERS
+        select HAVE_ARM_TWD if SMP
         select HAVE_IMX_ANATOP
         select HAVE_IMX_GPC
         select HAVE_IMX_MMDC
diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
index e20f22d58fd8..5383c589ad71 100644
--- a/arch/arm/mach-imx/Makefile
+++ b/arch/arm/mach-imx/Makefile
@@ -15,7 +15,8 @@ imx5-pm-$(CONFIG_PM) += pm-imx5.o
 obj-$(CONFIG_SOC_IMX5) += cpu-imx5.o mm-imx5.o clk-imx51-imx53.o ehci-imx5.o $(imx5-pm-y)
 
 obj-$(CONFIG_COMMON_CLK) += clk-pllv1.o clk-pllv2.o clk-pllv3.o clk-gate2.o \
-                            clk-pfd.o clk-busy.o clk.o
+                            clk-pfd.o clk-busy.o clk.o \
+                            clk-fixup-div.o clk-fixup-mux.o
 
 obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o
 obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
diff --git a/arch/arm/mach-imx/anatop.c b/arch/arm/mach-imx/anatop.c
index 0cfa07dd9aa4..ad3b755abb78 100644
--- a/arch/arm/mach-imx/anatop.c
+++ b/arch/arm/mach-imx/anatop.c
@@ -66,7 +66,7 @@ void imx_anatop_post_resume(void)
         imx_anatop_enable_weak2p5(false);
 }
 
-void imx_anatop_usb_chrg_detect_disable(void)
+static void imx_anatop_usb_chrg_detect_disable(void)
 {
         regmap_write(anatop, ANADIG_USB1_CHRG_DETECT,
                 BM_ANADIG_USB_CHRG_DETECT_EN_B
@@ -100,4 +100,6 @@ void __init imx_anatop_init(void)
                 pr_err("%s: failed to find imx6q-anatop regmap!\n", __func__);
                 return;
         }
+
+        imx_anatop_usb_chrg_detect_disable();
 }
diff --git a/arch/arm/mach-imx/clk-fixup-div.c b/arch/arm/mach-imx/clk-fixup-div.c
new file mode 100644
index 000000000000..21db020b1f2d
--- /dev/null
+++ b/arch/arm/mach-imx/clk-fixup-div.c
@@ -0,0 +1,129 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <linux/clk-provider.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/slab.h>
+#include "clk.h"
+
+#define to_clk_div(_hw) container_of(_hw, struct clk_divider, hw)
+#define div_mask(d)     ((1 << (d->width)) - 1)
+
+/**
+ * struct clk_fixup_div - imx integer fixup divider clock
+ * @divider: the parent class
+ * @ops: pointer to clk_ops of parent class
+ * @fixup: a hook to fixup the write value
+ *
+ * The imx fixup divider clock is a subclass of basic clk_divider
+ * with an addtional fixup hook.
+ */
+struct clk_fixup_div {
+        struct clk_divider divider;
+        const struct clk_ops *ops;
+        void (*fixup)(u32 *val);
+};
+
+static inline struct clk_fixup_div *to_clk_fixup_div(struct clk_hw *hw)
+{
+        struct clk_divider *divider = to_clk_div(hw);
+
+        return container_of(divider, struct clk_fixup_div, divider);
+}
+
+static unsigned long clk_fixup_div_recalc_rate(struct clk_hw *hw,
+                                         unsigned long parent_rate)
+{
+        struct clk_fixup_div *fixup_div = to_clk_fixup_div(hw);
+
+        return fixup_div->ops->recalc_rate(&fixup_div->divider.hw, parent_rate);
+}
+
+static long clk_fixup_div_round_rate(struct clk_hw *hw, unsigned long rate,
+                               unsigned long *prate)
+{
+        struct clk_fixup_div *fixup_div = to_clk_fixup_div(hw);
+
+        return fixup_div->ops->round_rate(&fixup_div->divider.hw, rate, prate);
+}
+
+static int clk_fixup_div_set_rate(struct clk_hw *hw, unsigned long rate,
+                            unsigned long parent_rate)
+{
+        struct clk_fixup_div *fixup_div = to_clk_fixup_div(hw);
+        struct clk_divider *div = to_clk_div(hw);
+        unsigned int divider, value;
+        unsigned long flags = 0;
+        u32 val;
+
+        divider = parent_rate / rate;
+
+        /* Zero based divider */
+        value = divider - 1;
+
+        if (value > div_mask(div))
+                value = div_mask(div);
+
+        spin_lock_irqsave(div->lock, flags);
+
+        val = readl(div->reg);
+        val &= ~(div_mask(div) << div->shift);
+        val |= value << div->shift;
+        fixup_div->fixup(&val);
+        writel(val, div->reg);
+
+        spin_unlock_irqrestore(div->lock, flags);
+
+        return 0;
+}
+
+static const struct clk_ops clk_fixup_div_ops = {
+        .recalc_rate = clk_fixup_div_recalc_rate,
+        .round_rate = clk_fixup_div_round_rate,
+        .set_rate = clk_fixup_div_set_rate,
+};
+
+struct clk *imx_clk_fixup_divider(const char *name, const char *parent,
+                                  void __iomem *reg, u8 shift, u8 width,
+                                  void (*fixup)(u32 *val))
+{
+        struct clk_fixup_div *fixup_div;
+        struct clk *clk;
+        struct clk_init_data init;
+
+        if (!fixup)
+                return ERR_PTR(-EINVAL);
+
+        fixup_div = kzalloc(sizeof(*fixup_div), GFP_KERNEL);
+        if (!fixup_div)
+                return ERR_PTR(-ENOMEM);
+
+        init.name = name;
+        init.ops = &clk_fixup_div_ops;
+        init.flags = CLK_SET_RATE_PARENT;
+        init.parent_names = parent ? &parent : NULL;
+        init.num_parents = parent ? 1 : 0;
+
+        fixup_div->divider.reg = reg;
+        fixup_div->divider.shift = shift;
+        fixup_div->divider.width = width;
+        fixup_div->divider.lock = &imx_ccm_lock;
+        fixup_div->divider.hw.init = &init;
+        fixup_div->ops = &clk_divider_ops;
+        fixup_div->fixup = fixup;
+
+        clk = clk_register(NULL, &fixup_div->divider.hw);
+        if (IS_ERR(clk))
+                kfree(fixup_div);
+
+        return clk;
+}
diff --git a/arch/arm/mach-imx/clk-fixup-mux.c b/arch/arm/mach-imx/clk-fixup-mux.c
new file mode 100644
index 000000000000..0d40b35c557c
--- /dev/null
+++ b/arch/arm/mach-imx/clk-fixup-mux.c
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+#include <linux/clk-provider.h>
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/slab.h>
+#include "clk.h"
+
+#define to_clk_mux(_hw) container_of(_hw, struct clk_mux, hw)
+
+/**
+ * struct clk_fixup_mux - imx integer fixup multiplexer clock
+ * @mux: the parent class
+ * @ops: pointer to clk_ops of parent class
+ * @fixup: a hook to fixup the write value
+ *
+ * The imx fixup multiplexer clock is a subclass of basic clk_mux
+ * with an addtional fixup hook.
+ */
+struct clk_fixup_mux {
+        struct clk_mux mux;
+        const struct clk_ops *ops;
+        void (*fixup)(u32 *val);
+};
+
+static inline struct clk_fixup_mux *to_clk_fixup_mux(struct clk_hw *hw)
+{
+        struct clk_mux *mux = to_clk_mux(hw);
+
+        return container_of(mux, struct clk_fixup_mux, mux);
+}
+
+static u8 clk_fixup_mux_get_parent(struct clk_hw *hw)
+{
+        struct clk_fixup_mux *fixup_mux = to_clk_fixup_mux(hw);
+
+        return fixup_mux->ops->get_parent(&fixup_mux->mux.hw);
+}
+
+static int clk_fixup_mux_set_parent(struct clk_hw *hw, u8 index)
+{
+        struct clk_fixup_mux *fixup_mux = to_clk_fixup_mux(hw);
+        struct clk_mux *mux = to_clk_mux(hw);
+        unsigned long flags = 0;
+        u32 val;
+
+        spin_lock_irqsave(mux->lock, flags);
+
+        val = readl(mux->reg);
+        val &= ~(mux->mask << mux->shift);
+        val |= index << mux->shift;
+        fixup_mux->fixup(&val);
+        writel(val, mux->reg);
+
+        spin_unlock_irqrestore(mux->lock, flags);
+
+        return 0;
+}
+
+static const struct clk_ops clk_fixup_mux_ops = {
+        .get_parent = clk_fixup_mux_get_parent,
+        .set_parent = clk_fixup_mux_set_parent,
+};
+
+struct clk *imx_clk_fixup_mux(const char *name, void __iomem *reg,
+                              u8 shift, u8 width, const char **parents,
+                              int num_parents, void (*fixup)(u32 *val))
+{
+        struct clk_fixup_mux *fixup_mux;
+        struct clk *clk;
+        struct clk_init_data init;
+
+        if (!fixup)
+                return ERR_PTR(-EINVAL);
+
+        fixup_mux = kzalloc(sizeof(*fixup_mux), GFP_KERNEL);
+        if (!fixup_mux)
+                return ERR_PTR(-ENOMEM);
+
+        init.name = name;
+        init.ops = &clk_fixup_mux_ops;
+        init.parent_names = parents;
+        init.num_parents = num_parents;
+        init.flags = 0;
+
+        fixup_mux->mux.reg = reg;
+        fixup_mux->mux.shift = shift;
+        fixup_mux->mux.mask = BIT(width) - 1;
+        fixup_mux->mux.lock = &imx_ccm_lock;
+        fixup_mux->mux.hw.init = &init;
+        fixup_mux->ops = &clk_mux_ops;
+        fixup_mux->fixup = fixup;
+
+        clk = clk_register(NULL, &fixup_mux->mux.hw);
+        if (IS_ERR(clk))
+                kfree(fixup_mux);
+
+        return clk;
+}
diff --git a/arch/arm/mach-imx/clk-imx27.c b/arch/arm/mach-imx/clk-imx27.c
index c3cfa4116dc0..c6b40f386786 100644
--- a/arch/arm/mach-imx/clk-imx27.c
+++ b/arch/arm/mach-imx/clk-imx27.c
@@ -285,7 +285,7 @@ int __init mx27_clocks_init(unsigned long fref)
         clk_register_clkdev(clk[ata_ahb_gate], "ata", NULL);
         clk_register_clkdev(clk[rtc_ipg_gate], NULL, "imx21-rtc");
         clk_register_clkdev(clk[scc_ipg_gate], "scc", NULL);
-        clk_register_clkdev(clk[cpu_div], NULL, "cpufreq-cpu0.0");
+        clk_register_clkdev(clk[cpu_div], NULL, "cpu0");
         clk_register_clkdev(clk[emi_ahb_gate], "emi_ahb" , NULL);
 
         mxc_timer_init(MX27_IO_ADDRESS(MX27_GPT1_BASE_ADDR), MX27_INT_GPT1);
diff --git a/arch/arm/mach-imx/clk-imx51-imx53.c b/arch/arm/mach-imx/clk-imx51-imx53.c
index 9afac26fa1cc..7c0dc4540aa4 100644
--- a/arch/arm/mach-imx/clk-imx51-imx53.c
+++ b/arch/arm/mach-imx/clk-imx51-imx53.c
@@ -119,7 +119,7 @@ enum imx5_clks {
         srtc_gate, pata_gate, sata_gate, spdif_xtal_sel, spdif0_sel,
         spdif1_sel, spdif0_pred, spdif0_podf, spdif1_pred, spdif1_podf,
         spdif0_com_s, spdif1_com_sel, spdif0_gate, spdif1_gate, spdif_ipg_gate,
-        clk_max
+        ocram, clk_max
 };
 
 static struct clk *clk[clk_max];
@@ -328,7 +328,7 @@ static void __init mx5_clocks_common_init(unsigned long rate_ckil,
         clk_register_clkdev(clk[ssi2_ipg_gate], NULL, "imx-ssi.1");
         clk_register_clkdev(clk[ssi3_ipg_gate], NULL, "imx-ssi.2");
         clk_register_clkdev(clk[sdma_gate], NULL, "imx35-sdma");
-        clk_register_clkdev(clk[cpu_podf], NULL, "cpufreq-cpu0.0");
+        clk_register_clkdev(clk[cpu_podf], NULL, "cpu0");
         clk_register_clkdev(clk[iim_gate], "iim", NULL);
         clk_register_clkdev(clk[dummy], NULL, "imx2-wdt.0");
         clk_register_clkdev(clk[dummy], NULL, "imx2-wdt.1");
@@ -397,7 +397,7 @@ int __init mx51_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,
                                 mx51_spdif_xtal_sel, ARRAY_SIZE(mx51_spdif_xtal_sel));
         clk[spdif1_sel] = imx_clk_mux("spdif1_sel", MXC_CCM_CSCMR2, 2, 2,
                                 spdif_sel, ARRAY_SIZE(spdif_sel));
-        clk[spdif1_pred] = imx_clk_divider("spdif1_podf", "spdif1_sel", MXC_CCM_CDCDR, 16, 3);
+        clk[spdif1_pred] = imx_clk_divider("spdif1_pred", "spdif1_sel", MXC_CCM_CDCDR, 16, 3);
         clk[spdif1_podf] = imx_clk_divider("spdif1_podf", "spdif1_pred", MXC_CCM_CDCDR, 9, 6);
         clk[spdif1_com_sel] = imx_clk_mux("spdif1_com_sel", MXC_CCM_CSCMR2, 5, 1,
                                 mx51_spdif1_com_sel, ARRAY_SIZE(mx51_spdif1_com_sel));
@@ -506,6 +506,7 @@ int __init mx53_clocks_init(unsigned long rate_ckil, unsigned long rate_osc,
                                 mx53_can_sel, ARRAY_SIZE(mx53_can_sel));
         clk[can1_serial_gate] = imx_clk_gate2("can1_serial_gate", "can_sel", MXC_CCM_CCGR6, 22);
         clk[can1_ipg_gate] = imx_clk_gate2("can1_ipg_gate", "ipg", MXC_CCM_CCGR6, 20);
+        clk[ocram] = imx_clk_gate2("ocram", "ahb", MXC_CCM_CCGR6, 2);
         clk[can2_serial_gate] = imx_clk_gate2("can2_serial_gate", "can_sel", MXC_CCM_CCGR4, 8);
         clk[can2_ipg_gate] = imx_clk_gate2("can2_ipg_gate", "ipg", MXC_CCM_CCGR4, 6);
         clk[i2c3_gate] = imx_clk_gate2("i2c3_gate", "per_root", MXC_CCM_CCGR1, 22);
diff --git a/arch/arm/mach-imx/clk-imx6q.c b/arch/arm/mach-imx/clk-imx6q.c
index 86567d980b07..9181a241d3a8 100644
--- a/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
@@ -206,6 +206,17 @@ static const char *vpu_axi_sels[]	= { "axi", "pll2_pfd2_396m", "pll2_pfd0_352m",
 static const char *cko1_sels[]  = { "pll3_usb_otg", "pll2_bus", "pll1_sys", "pll5_video_div",
                                     "dummy", "axi", "enfc", "ipu1_di0", "ipu1_di1", "ipu2_di0",
                                     "ipu2_di1", "ahb", "ipg", "ipg_per", "ckil", "pll4_post_div", };
+static const char *cko2_sels[] = {
+        "mmdc_ch0_axi", "mmdc_ch1_axi", "usdhc4", "usdhc1",
+        "gpu2d_axi", "dummy", "ecspi_root", "gpu3d_axi",
+        "usdhc3", "dummy", "arm", "ipu1",
+        "ipu2", "vdo_axi", "osc", "gpu2d_core",
+        "gpu3d_core", "usdhc2", "ssi1", "ssi2",
+        "ssi3", "gpu3d_shader", "vpu_axi", "can_root",
+        "ldb_di0", "ldb_di1", "esai", "eim_slow",
+        "uart_serial", "spdif", "asrc", "hsi_tx",
+};
+static const char *cko_sels[] = { "cko1", "cko2", };
 
 enum mx6q_clks {
         dummy, ckil, ckih, osc, pll2_pfd0_352m, pll2_pfd1_594m, pll2_pfd2_396m,
@@ -239,7 +250,8 @@ enum mx6q_clks {
         pll4_audio, pll5_video, pll8_mlb, pll7_usb_host, pll6_enet, ssi1_ipg,
         ssi2_ipg, ssi3_ipg, rom, usbphy1, usbphy2, ldb_di0_div_3_5, ldb_di1_div_3_5,
         sata_ref, sata_ref_100m, pcie_ref, pcie_ref_125m, enet_ref, usbphy1_gate,
-        usbphy2_gate, pll4_post_div, pll5_post_div, pll5_video_div, eim_slow, clk_max
+        usbphy2_gate, pll4_post_div, pll5_post_div, pll5_video_div, eim_slow,
+        spdif, cko2_sel, cko2_podf, cko2, cko, vdoa, clk_max
 };
 
 static struct clk *clk[clk_max];
@@ -276,6 +288,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
         struct device_node *np;
         void __iomem *base;
         int i, irq;
+        int ret;
 
         clk[dummy] = imx_clk_fixed("dummy", 0);
         clk[ckil] = imx_obtain_fixed_clock("ckil", 0);
@@ -384,19 +397,21 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
         clk[ipu2_di1_sel]     = imx_clk_mux("ipu2_di1_sel",     base + 0x38, 9,  3, ipu2_di1_sels,     ARRAY_SIZE(ipu2_di1_sels));
         clk[hsi_tx_sel]       = imx_clk_mux("hsi_tx_sel",       base + 0x30, 28, 1, hsi_tx_sels,       ARRAY_SIZE(hsi_tx_sels));
         clk[pcie_axi_sel]     = imx_clk_mux("pcie_axi_sel",     base + 0x18, 10, 1, pcie_axi_sels,     ARRAY_SIZE(pcie_axi_sels));
-        clk[ssi1_sel]         = imx_clk_mux("ssi1_sel",         base + 0x1c, 10, 2, ssi_sels,          ARRAY_SIZE(ssi_sels));
-        clk[ssi2_sel]         = imx_clk_mux("ssi2_sel",         base + 0x1c, 12, 2, ssi_sels,          ARRAY_SIZE(ssi_sels));
-        clk[ssi3_sel]         = imx_clk_mux("ssi3_sel",         base + 0x1c, 14, 2, ssi_sels,          ARRAY_SIZE(ssi_sels));
-        clk[usdhc1_sel]       = imx_clk_mux("usdhc1_sel",       base + 0x1c, 16, 1, usdhc_sels,        ARRAY_SIZE(usdhc_sels));
-        clk[usdhc2_sel]       = imx_clk_mux("usdhc2_sel",       base + 0x1c, 17, 1, usdhc_sels,        ARRAY_SIZE(usdhc_sels));
-        clk[usdhc3_sel]       = imx_clk_mux("usdhc3_sel",       base + 0x1c, 18, 1, usdhc_sels,        ARRAY_SIZE(usdhc_sels));
-        clk[usdhc4_sel]       = imx_clk_mux("usdhc4_sel",       base + 0x1c, 19, 1, usdhc_sels,        ARRAY_SIZE(usdhc_sels));
+        clk[ssi1_sel]         = imx_clk_fixup_mux("ssi1_sel",   base + 0x1c, 10, 2, ssi_sels,          ARRAY_SIZE(ssi_sels),          imx_cscmr1_fixup);
+        clk[ssi2_sel]         = imx_clk_fixup_mux("ssi2_sel",   base + 0x1c, 12, 2, ssi_sels,          ARRAY_SIZE(ssi_sels),          imx_cscmr1_fixup);
+        clk[ssi3_sel]         = imx_clk_fixup_mux("ssi3_sel",   base + 0x1c, 14, 2, ssi_sels,          ARRAY_SIZE(ssi_sels),          imx_cscmr1_fixup);
+        clk[usdhc1_sel]       = imx_clk_fixup_mux("usdhc1_sel", base + 0x1c, 16, 1, usdhc_sels,        ARRAY_SIZE(usdhc_sels),        imx_cscmr1_fixup);
+        clk[usdhc2_sel]       = imx_clk_fixup_mux("usdhc2_sel", base + 0x1c, 17, 1, usdhc_sels,        ARRAY_SIZE(usdhc_sels),        imx_cscmr1_fixup);
+        clk[usdhc3_sel]       = imx_clk_fixup_mux("usdhc3_sel", base + 0x1c, 18, 1, usdhc_sels,        ARRAY_SIZE(usdhc_sels),        imx_cscmr1_fixup);
+        clk[usdhc4_sel]       = imx_clk_fixup_mux("usdhc4_sel", base + 0x1c, 19, 1, usdhc_sels,        ARRAY_SIZE(usdhc_sels),        imx_cscmr1_fixup);
         clk[enfc_sel]         = imx_clk_mux("enfc_sel",         base + 0x2c, 16, 2, enfc_sels,         ARRAY_SIZE(enfc_sels));
-        clk[emi_sel]          = imx_clk_mux("emi_sel",          base + 0x1c, 27, 2, emi_sels,          ARRAY_SIZE(emi_sels));
-        clk[emi_slow_sel]     = imx_clk_mux("emi_slow_sel",     base + 0x1c, 29, 2, emi_slow_sels,     ARRAY_SIZE(emi_slow_sels));
+        clk[emi_sel]          = imx_clk_fixup_mux("emi_sel",      base + 0x1c, 27, 2, emi_sels,        ARRAY_SIZE(emi_sels),          imx_cscmr1_fixup);
+        clk[emi_slow_sel]     = imx_clk_fixup_mux("emi_slow_sel", base + 0x1c, 29, 2, emi_slow_sels,   ARRAY_SIZE(emi_slow_sels),     imx_cscmr1_fixup);
         clk[vdo_axi_sel]      = imx_clk_mux("vdo_axi_sel",      base + 0x18, 11, 1, vdo_axi_sels,      ARRAY_SIZE(vdo_axi_sels));
         clk[vpu_axi_sel]      = imx_clk_mux("vpu_axi_sel",      base + 0x18, 14, 2, vpu_axi_sels,      ARRAY_SIZE(vpu_axi_sels));
         clk[cko1_sel]         = imx_clk_mux("cko1_sel",         base + 0x60, 0,  4, cko1_sels,         ARRAY_SIZE(cko1_sels));
+        clk[cko2_sel]         = imx_clk_mux("cko2_sel",         base + 0x60, 16, 5, cko2_sels,         ARRAY_SIZE(cko2_sels));
+        clk[cko]              = imx_clk_mux("cko",              base + 0x60, 8, 1,  cko_sels,          ARRAY_SIZE(cko_sels));
 
         /*                              name         reg      shift width busy: reg, shift parent_names  num_parents */
         clk[periph]  = imx_clk_busy_mux("periph",  base + 0x14, 25,  1,   base + 0x48, 5,  periph_sels,  ARRAY_SIZE(periph_sels));
@@ -406,7 +421,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
         clk[periph_clk2]      = imx_clk_divider("periph_clk2",      "periph_clk2_sel",   base + 0x14, 27, 3);
         clk[periph2_clk2]     = imx_clk_divider("periph2_clk2",     "periph2_clk2_sel",  base + 0x14, 0,  3);
         clk[ipg]              = imx_clk_divider("ipg",              "ahb",               base + 0x14, 8,  2);
-        clk[ipg_per]          = imx_clk_divider("ipg_per",          "ipg",               base + 0x1c, 0,  6);
+        clk[ipg_per]          = imx_clk_fixup_divider("ipg_per",    "ipg",               base + 0x1c, 0,  6, imx_cscmr1_fixup);
         clk[esai_pred]        = imx_clk_divider("esai_pred",        "esai_sel",          base + 0x28, 9,  3);
         clk[esai_podf]        = imx_clk_divider("esai_podf",        "esai_pred",         base + 0x28, 25, 3);
         clk[asrc_pred]        = imx_clk_divider("asrc_pred",        "asrc_sel",          base + 0x30, 12, 3);
@@ -442,10 +457,11 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
         clk[usdhc4_podf]      = imx_clk_divider("usdhc4_podf",      "usdhc4_sel",        base + 0x24, 22, 3);
         clk[enfc_pred]        = imx_clk_divider("enfc_pred",        "enfc_sel",          base + 0x2c, 18, 3);
         clk[enfc_podf]        = imx_clk_divider("enfc_podf",        "enfc_pred",         base + 0x2c, 21, 6);
-        clk[emi_podf]         = imx_clk_divider("emi_podf",         "emi_sel",           base + 0x1c, 20, 3);
-        clk[emi_slow_podf]    = imx_clk_divider("emi_slow_podf",    "emi_slow_sel",      base + 0x1c, 23, 3);
+        clk[emi_podf]         = imx_clk_fixup_divider("emi_podf",   "emi_sel",           base + 0x1c, 20, 3, imx_cscmr1_fixup);
+        clk[emi_slow_podf]    = imx_clk_fixup_divider("emi_slow_podf", "emi_slow_sel",   base + 0x1c, 23, 3, imx_cscmr1_fixup);
         clk[vpu_axi_podf]     = imx_clk_divider("vpu_axi_podf",     "vpu_axi_sel",       base + 0x24, 25, 3);
         clk[cko1_podf]        = imx_clk_divider("cko1_podf",        "cko1_sel",          base + 0x60, 4,  3);
+        clk[cko2_podf]        = imx_clk_divider("cko2_podf",        "cko2_sel",          base + 0x60, 21, 3);
 
         /*                                            name                 parent_name    reg        shift width busy: reg, shift */
         clk[axi]               = imx_clk_busy_divider("axi",               "axi_sel",     base + 0x14, 16,  3,   base + 0x48, 0);
@@ -486,6 +502,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
         clk[i2c3]         = imx_clk_gate2("i2c3",          "ipg_per",           base + 0x70, 10);
         clk[iim]          = imx_clk_gate2("iim",           "ipg",               base + 0x70, 12);
         clk[enfc]         = imx_clk_gate2("enfc",          "enfc_podf",         base + 0x70, 14);
+        clk[vdoa]         = imx_clk_gate2("vdoa",          "vdo_axi",           base + 0x70, 26);
         clk[ipu1]         = imx_clk_gate2("ipu1",          "ipu1_podf",         base + 0x74, 0);
         clk[ipu1_di0]     = imx_clk_gate2("ipu1_di0",      "ipu1_di0_sel",      base + 0x74, 2);
         clk[ipu1_di1]     = imx_clk_gate2("ipu1_di1",      "ipu1_di1_sel",      base + 0x74, 4);
@@ -521,6 +538,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
         clk[sata]         = imx_clk_gate2("sata",          "ipg",               base + 0x7c, 4);
         clk[sdma]         = imx_clk_gate2("sdma",          "ahb",               base + 0x7c, 6);
         clk[spba]         = imx_clk_gate2("spba",          "ipg",               base + 0x7c, 12);
+        clk[spdif]        = imx_clk_gate2("spdif",         "spdif_podf",        base + 0x7c, 14);
         clk[ssi1_ipg]     = imx_clk_gate2("ssi1_ipg",      "ipg",               base + 0x7c, 18);
         clk[ssi2_ipg]     = imx_clk_gate2("ssi2_ipg",      "ipg",               base + 0x7c, 20);
         clk[ssi3_ipg]     = imx_clk_gate2("ssi3_ipg",      "ipg",               base + 0x7c, 22);
@@ -535,6 +553,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
         clk[vdo_axi]      = imx_clk_gate2("vdo_axi",       "vdo_axi_sel",       base + 0x80, 12);
         clk[vpu_axi]      = imx_clk_gate2("vpu_axi",       "vpu_axi_podf",      base + 0x80, 14);
         clk[cko1]         = imx_clk_gate("cko1",           "cko1_podf",         base + 0x60, 7);
+        clk[cko2]         = imx_clk_gate("cko2",           "cko2_podf",         base + 0x60, 24);
 
         for (i = 0; i < ARRAY_SIZE(clk); i++)
                 if (IS_ERR(clk[i]))
@@ -554,7 +573,7 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
         clk_register_clkdev(clk[pll4_post_div], "pll4_post_div", NULL);
         clk_register_clkdev(clk[pll4_audio], "pll4_audio", NULL);
 
-        if (imx6q_revision() != IMX_CHIP_REVISION_1_0) {
+        if ((imx6q_revision() != IMX_CHIP_REVISION_1_0) || cpu_is_imx6dl()) {
                 clk_set_parent(clk[ldb_di0_sel], clk[pll5_video_div]);
                 clk_set_parent(clk[ldb_di1_sel], clk[pll5_video_div]);
         }
@@ -574,6 +593,16 @@ static void __init imx6q_clocks_init(struct device_node *ccm_node)
                 clk_prepare_enable(clk[usbphy2_gate]);
         }
 
+        /*
+         * Let's initially set up CLKO with OSC24M, since this configuration
+         * is widely used by imx6q board designs to clock audio codec.
+         */
+        ret = clk_set_parent(clk[cko2_sel], clk[osc]);
+        if (!ret)
+                ret = clk_set_parent(clk[cko], clk[cko2]);
+        if (ret)
+                pr_warn("failed to set up CLKO: %d\n", ret);
+
         /* Set initial power mode */
         imx6q_set_lpm(WAIT_CLOCKED);
 
diff --git a/arch/arm/mach-imx/clk-imx6sl.c b/arch/arm/mach-imx/clk-imx6sl.c
index a307ac22dffe..a5c3c5d21aee 100644
--- a/arch/arm/mach-imx/clk-imx6sl.c
+++ b/arch/arm/mach-imx/clk-imx6sl.c
@@ -138,14 +138,14 @@ static void __init imx6sl_clocks_init(struct device_node *ccm_node)
         clks[IMX6SL_CLK_PERIPH_CLK2_SEL]  = imx_clk_mux("periph_clk2_sel",  base + 0x18, 12, 2, periph_clk2_sels,  ARRAY_SIZE(periph_clk2_sels));
         clks[IMX6SL_CLK_CSI_SEL]          = imx_clk_mux("csi_sel",          base + 0x3c, 9,  2, csi_lcdif_sels,    ARRAY_SIZE(csi_lcdif_sels));
         clks[IMX6SL_CLK_LCDIF_AXI_SEL]    = imx_clk_mux("lcdif_axi_sel",    base + 0x3c, 14, 2, csi_lcdif_sels,    ARRAY_SIZE(csi_lcdif_sels));
-        clks[IMX6SL_CLK_USDHC1_SEL]       = imx_clk_mux("usdhc1_sel",       base + 0x1c, 16, 1, usdhc_sels,        ARRAY_SIZE(usdhc_sels));
-        clks[IMX6SL_CLK_USDHC2_SEL]       = imx_clk_mux("usdhc2_sel",       base + 0x1c, 17, 1, usdhc_sels,        ARRAY_SIZE(usdhc_sels));
-        clks[IMX6SL_CLK_USDHC3_SEL]       = imx_clk_mux("usdhc3_sel",       base + 0x1c, 18, 1, usdhc_sels,        ARRAY_SIZE(usdhc_sels));
-        clks[IMX6SL_CLK_USDHC4_SEL]       = imx_clk_mux("usdhc4_sel",       base + 0x1c, 19, 1, usdhc_sels,        ARRAY_SIZE(usdhc_sels));
-        clks[IMX6SL_CLK_SSI1_SEL]         = imx_clk_mux("ssi1_sel",         base + 0x1c, 10, 2, ssi_sels,          ARRAY_SIZE(ssi_sels));
-        clks[IMX6SL_CLK_SSI2_SEL]         = imx_clk_mux("ssi2_sel",         base + 0x1c, 12, 2, ssi_sels,          ARRAY_SIZE(ssi_sels));
-        clks[IMX6SL_CLK_SSI3_SEL]         = imx_clk_mux("ssi3_sel",         base + 0x1c, 14, 2, ssi_sels,          ARRAY_SIZE(ssi_sels));
-        clks[IMX6SL_CLK_PERCLK_SEL]       = imx_clk_mux("perclk_sel",       base + 0x1c, 6,  1, perclk_sels,       ARRAY_SIZE(perclk_sels));
+        clks[IMX6SL_CLK_USDHC1_SEL]       = imx_clk_fixup_mux("usdhc1_sel", base + 0x1c, 16, 1, usdhc_sels,        ARRAY_SIZE(usdhc_sels),  imx_cscmr1_fixup);
+        clks[IMX6SL_CLK_USDHC2_SEL]       = imx_clk_fixup_mux("usdhc2_sel", base + 0x1c, 17, 1, usdhc_sels,        ARRAY_SIZE(usdhc_sels),  imx_cscmr1_fixup);
+        clks[IMX6SL_CLK_USDHC3_SEL]       = imx_clk_fixup_mux("usdhc3_sel", base + 0x1c, 18, 1, usdhc_sels,        ARRAY_SIZE(usdhc_sels),  imx_cscmr1_fixup);
+        clks[IMX6SL_CLK_USDHC4_SEL]       = imx_clk_fixup_mux("usdhc4_sel", base + 0x1c, 19, 1, usdhc_sels,        ARRAY_SIZE(usdhc_sels),  imx_cscmr1_fixup);
+        clks[IMX6SL_CLK_SSI1_SEL]         = imx_clk_fixup_mux("ssi1_sel",   base + 0x1c, 10, 2, ssi_sels,          ARRAY_SIZE(ssi_sels),    imx_cscmr1_fixup);
+        clks[IMX6SL_CLK_SSI2_SEL]         = imx_clk_fixup_mux("ssi2_sel",   base + 0x1c, 12, 2, ssi_sels,          ARRAY_SIZE(ssi_sels),    imx_cscmr1_fixup);
+        clks[IMX6SL_CLK_SSI3_SEL]         = imx_clk_fixup_mux("ssi3_sel",   base + 0x1c, 14, 2, ssi_sels,          ARRAY_SIZE(ssi_sels),    imx_cscmr1_fixup);
+        clks[IMX6SL_CLK_PERCLK_SEL]       = imx_clk_fixup_mux("perclk_sel", base + 0x1c, 6,  1, perclk_sels,       ARRAY_SIZE(perclk_sels), imx_cscmr1_fixup);
         clks[IMX6SL_CLK_PXP_AXI_SEL]      = imx_clk_mux("pxp_axi_sel",      base + 0x34, 6,  3, epdc_pxp_sels,     ARRAY_SIZE(epdc_pxp_sels));
         clks[IMX6SL_CLK_EPDC_AXI_SEL]     = imx_clk_mux("epdc_axi_sel",     base + 0x34, 15, 3, epdc_pxp_sels,     ARRAY_SIZE(epdc_pxp_sels));
         clks[IMX6SL_CLK_GPU2D_OVG_SEL]    = imx_clk_mux("gpu2d_ovg_sel",    base + 0x18, 4,  2, gpu2d_ovg_sels,    ARRAY_SIZE(gpu2d_ovg_sels));
@@ -179,14 +179,14 @@ static void __init imx6sl_clocks_init(struct device_node *ccm_node)
         clks[IMX6SL_CLK_SSI2_PODF]         = imx_clk_divider("ssi2_podf",         "ssi2_pred",         base + 0x2c, 0,  6);
         clks[IMX6SL_CLK_SSI3_PRED]         = imx_clk_divider("ssi3_pred",         "ssi3_sel",          base + 0x28, 22, 3);
         clks[IMX6SL_CLK_SSI3_PODF]         = imx_clk_divider("ssi3_podf",         "ssi3_pred",         base + 0x28, 16, 6);
-        clks[IMX6SL_CLK_PERCLK]            = imx_clk_divider("perclk",            "perclk_sel",        base + 0x1c, 0,  6);
+        clks[IMX6SL_CLK_PERCLK]            = imx_clk_fixup_divider("perclk",      "perclk_sel",        base + 0x1c, 0,  6, imx_cscmr1_fixup);
         clks[IMX6SL_CLK_PXP_AXI_PODF]      = imx_clk_divider("pxp_axi_podf",      "pxp_axi_sel",       base + 0x34, 3,  3);
         clks[IMX6SL_CLK_EPDC_AXI_PODF]     = imx_clk_divider("epdc_axi_podf",     "epdc_axi_sel",      base + 0x34, 12, 3);
         clks[IMX6SL_CLK_GPU2D_OVG_PODF]    = imx_clk_divider("gpu2d_ovg_podf",    "gpu2d_ovg_sel",     base + 0x18, 26, 3);
         clks[IMX6SL_CLK_GPU2D_PODF]        = imx_clk_divider("gpu2d_podf",        "gpu2d_sel",         base + 0x18, 29, 3);
         clks[IMX6SL_CLK_LCDIF_PIX_PRED]    = imx_clk_divider("lcdif_pix_pred",    "lcdif_pix_sel",     base + 0x38, 3,  3);
         clks[IMX6SL_CLK_EPDC_PIX_PRED]     = imx_clk_divider("epdc_pix_pred",     "epdc_pix_sel",      base + 0x38, 12, 3);
-        clks[IMX6SL_CLK_LCDIF_PIX_PODF]    = imx_clk_divider("lcdif_pix_podf",    "lcdif_pix_pred",    base + 0x1c, 20, 3);
+        clks[IMX6SL_CLK_LCDIF_PIX_PODF]    = imx_clk_fixup_divider("lcdif_pix_podf", "lcdif_pix_pred", base + 0x1c, 20, 3, imx_cscmr1_fixup);
         clks[IMX6SL_CLK_EPDC_PIX_PODF]     = imx_clk_divider("epdc_pix_podf",     "epdc_pix_pred",     base + 0x18, 23, 3);
         clks[IMX6SL_CLK_SPDIF0_PRED]       = imx_clk_divider("spdif0_pred",       "spdif0_sel",        base + 0x30, 25, 3);
         clks[IMX6SL_CLK_SPDIF0_PODF]       = imx_clk_divider("spdif0_podf",       "spdif0_pred",       base + 0x30, 22, 3);
diff --git a/arch/arm/mach-imx/clk-pllv3.c b/arch/arm/mach-imx/clk-pllv3.c
index a9fad5f8d340..f6640b6a7b31 100644
--- a/arch/arm/mach-imx/clk-pllv3.c
+++ b/arch/arm/mach-imx/clk-pllv3.c
@@ -48,7 +48,7 @@ struct clk_pllv3 {
 static int clk_pllv3_prepare(struct clk_hw *hw)
 {
         struct clk_pllv3 *pll = to_clk_pllv3(hw);
-        unsigned long timeout = jiffies + msecs_to_jiffies(10);
+        unsigned long timeout;
         u32 val;
 
         val = readl_relaxed(pll->base);
@@ -59,12 +59,19 @@ static int clk_pllv3_prepare(struct clk_hw *hw)
                 val &= ~BM_PLL_POWER;
         writel_relaxed(val, pll->base);
 
+        timeout = jiffies + msecs_to_jiffies(10);
         /* Wait for PLL to lock */
-        while (!(readl_relaxed(pll->base) & BM_PLL_LOCK))
+        do {
+                if (readl_relaxed(pll->base) & BM_PLL_LOCK)
+                        break;
                 if (time_after(jiffies, timeout))
-                        return -ETIMEDOUT;
+                        break;
+        } while (1);
 
-        return 0;
+        if (readl_relaxed(pll->base) & BM_PLL_LOCK)
+                return 0;
+        else
+                return -ETIMEDOUT;
 }
 
 static void clk_pllv3_unprepare(struct clk_hw *hw)
diff --git a/arch/arm/mach-imx/clk.c b/arch/arm/mach-imx/clk.c
index 55bc80a00666..edc35df7bed4 100644
--- a/arch/arm/mach-imx/clk.c
+++ b/arch/arm/mach-imx/clk.c
@@ -37,3 +37,29 @@ struct clk * __init imx_obtain_fixed_clock(
                 clk = imx_clk_fixed(name, rate);
         return clk;
 }
+
+/*
+ * This fixups the register CCM_CSCMR1 write value.
+ * The write/read/divider values of the aclk_podf field
+ * of that register have the relationship described by
+ * the following table:
+ *
+ * write value       read value        divider
+ * 3b'000            3b'110            7
+ * 3b'001            3b'111            8
+ * 3b'010            3b'100            5
+ * 3b'011            3b'101            6
+ * 3b'100            3b'010            3
+ * 3b'101            3b'011            4
+ * 3b'110            3b'000            1
+ * 3b'111            3b'001            2(default)
+ *
+ * That's why we do the xor operation below.
+ */
+#define CSCMR1_FIXUP    0x00600000
+
+void imx_cscmr1_fixup(u32 *val)
+{
+        *val ^= CSCMR1_FIXUP;
+        return;
+}
diff --git a/arch/arm/mach-imx/clk.h b/arch/arm/mach-imx/clk.h
index 0e4e8bb261b9..048c5ad8a80b 100644
--- a/arch/arm/mach-imx/clk.h
+++ b/arch/arm/mach-imx/clk.h
@@ -6,6 +6,8 @@
 
 extern spinlock_t imx_ccm_lock;
 
+extern void imx_cscmr1_fixup(u32 *val);
+
 struct clk *imx_clk_pllv1(const char *name, const char *parent,
                 void __iomem *base);
 
@@ -49,6 +51,14 @@ struct clk *imx_clk_busy_mux(const char *name, void __iomem *reg, u8 shift,
                              u8 width, void __iomem *busy_reg, u8 busy_shift,
                              const char **parent_names, int num_parents);
 
+struct clk *imx_clk_fixup_divider(const char *name, const char *parent,
+                                  void __iomem *reg, u8 shift, u8 width,
+                                  void (*fixup)(u32 *val));
+
+struct clk *imx_clk_fixup_mux(const char *name, void __iomem *reg,
+                              u8 shift, u8 width, const char **parents,
+                              int num_parents, void (*fixup)(u32 *val));
+
 static inline struct clk *imx_clk_fixed(const char *name, int rate)
 {
         return clk_register_fixed_rate(NULL, name, NULL, CLK_IS_ROOT, rate);
@@ -79,7 +89,8 @@ static inline struct clk *imx_clk_gate(const char *name, const char *parent,
 static inline struct clk *imx_clk_mux(const char *name, void __iomem *reg,
                 u8 shift, u8 width, const char **parents, int num_parents)
 {
-        return clk_register_mux(NULL, name, parents, num_parents, 0, reg, shift,
+        return clk_register_mux(NULL, name, parents, num_parents,
+                        CLK_SET_RATE_NO_REPARENT, reg, shift,
                         width, 0, &imx_ccm_lock);
 }
 
@@ -88,7 +99,7 @@ static inline struct clk *imx_clk_mux_flags(const char *name,
                 int num_parents, unsigned long flags)
 {
         return clk_register_mux(NULL, name, parents, num_parents,
-                        flags, reg, shift, width, 0,
+                        flags | CLK_SET_RATE_NO_REPARENT, reg, shift, width, 0,
                         &imx_ccm_lock);
 }
 
diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h
index cb6c838b63ed..4517fd760bfc 100644
--- a/arch/arm/mach-imx/common.h
+++ b/arch/arm/mach-imx/common.h
@@ -137,7 +137,6 @@ extern void imx_gpc_restore_all(void);
 extern void imx_anatop_init(void);
 extern void imx_anatop_pre_suspend(void);
 extern void imx_anatop_post_resume(void);
-extern void imx_anatop_usb_chrg_detect_disable(void);
 extern u32 imx_anatop_get_digprog(void);
 extern int imx6q_set_lpm(enum mxc_cpu_pwr_mode mode);
 extern void imx6q_set_chicken_bit(void);
@@ -147,12 +146,10 @@ extern int imx_cpu_kill(unsigned int cpu);
 
 #ifdef CONFIG_PM
 extern void imx6q_pm_init(void);
-extern void imx51_pm_init(void);
-extern void imx53_pm_init(void);
+extern void imx5_pm_init(void);
 #else
 static inline void imx6q_pm_init(void) {}
-static inline void imx51_pm_init(void) {}
-static inline void imx53_pm_init(void) {}
+static inline void imx5_pm_init(void) {}
 #endif
 
 #ifdef CONFIG_NEON
@@ -161,6 +158,12 @@ extern int mx51_neon_fixup(void);
 static inline int mx51_neon_fixup(void) { return 0; }
 #endif
 
+#ifdef CONFIG_CACHE_L2X0
+extern void imx_init_l2cache(void);
+#else
+static inline void imx_init_l2cache(void) {}
+#endif
+
 extern struct smp_operations imx_smp_ops;
 
 #endif
diff --git a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
index 29ac8ee651d2..97f9c6297fcf 100644
--- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
@@ -26,7 +26,7 @@
 #include <linux/platform_device.h>
 #include <linux/mtd/physmap.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pca953x.h>
+#include <linux/platform_data/pca953x.h>
 #include <linux/input.h>
 #include <linux/gpio.h>
 #include <linux/delay.h>
diff --git a/arch/arm/mach-imx/mach-imx6q.c b/arch/arm/mach-imx/mach-imx6q.c
index 7be13f8e69a0..90372a21087f 100644
--- a/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@ -31,7 +31,7 @@
 #include <linux/regmap.h>
 #include <linux/micrel_phy.h>
 #include <linux/mfd/syscon.h>
-#include <asm/hardware/cache-l2x0.h>
+#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/system_misc.h>
@@ -103,87 +103,77 @@ static int ksz9021rn_phy_fixup(struct phy_device *phydev)
 {
         if (IS_BUILTIN(CONFIG_PHYLIB)) {
                 /* min rx data delay */
-                phy_write(phydev, 0x0b, 0x8105);
-                phy_write(phydev, 0x0c, 0x0000);
+                phy_write(phydev, MICREL_KSZ9021_EXTREG_CTRL,
+                        0x8000 | MICREL_KSZ9021_RGMII_RX_DATA_PAD_SCEW);
+                phy_write(phydev, MICREL_KSZ9021_EXTREG_DATA_WRITE, 0x0000);
 
                 /* max rx/tx clock delay, min rx/tx control delay */
-                phy_write(phydev, 0x0b, 0x8104);
-                phy_write(phydev, 0x0c, 0xf0f0);
-                phy_write(phydev, 0x0b, 0x104);
+                phy_write(phydev, MICREL_KSZ9021_EXTREG_CTRL,
+                        0x8000 | MICREL_KSZ9021_RGMII_CLK_CTRL_PAD_SCEW);
+                phy_write(phydev, MICREL_KSZ9021_EXTREG_DATA_WRITE, 0xf0f0);
+                phy_write(phydev, MICREL_KSZ9021_EXTREG_CTRL,
+                        MICREL_KSZ9021_RGMII_CLK_CTRL_PAD_SCEW);
         }
 
         return 0;
 }
 
-static void __init imx6q_sabrelite_cko1_setup(void)
+static void mmd_write_reg(struct phy_device *dev, int device, int reg, int val)
 {
-        struct clk *cko1_sel, *ahb, *cko1;
-        unsigned long rate;
-
-        cko1_sel = clk_get_sys(NULL, "cko1_sel");
-        ahb = clk_get_sys(NULL, "ahb");
-        cko1 = clk_get_sys(NULL, "cko1");
-        if (IS_ERR(cko1_sel) || IS_ERR(ahb) || IS_ERR(cko1)) {
-                pr_err("cko1 setup failed!\n");
-                goto put_clk;
-        }
-        clk_set_parent(cko1_sel, ahb);
-        rate = clk_round_rate(cko1, 16000000);
-        clk_set_rate(cko1, rate);
-put_clk:
-        if (!IS_ERR(cko1_sel))
-                clk_put(cko1_sel);
-        if (!IS_ERR(ahb))
-                clk_put(ahb);
-        if (!IS_ERR(cko1))
-                clk_put(cko1);
+        phy_write(dev, 0x0d, device);
+        phy_write(dev, 0x0e, reg);
+        phy_write(dev, 0x0d, (1 << 14) | device);
+        phy_write(dev, 0x0e, val);
 }
 
-static void __init imx6q_sabrelite_init(void)
+static int ksz9031rn_phy_fixup(struct phy_device *dev)
 {
-        if (IS_BUILTIN(CONFIG_PHYLIB))
-                phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,
-                                ksz9021rn_phy_fixup);
-        imx6q_sabrelite_cko1_setup();
+        /*
+         * min rx data delay, max rx/tx clock delay,
+         * min rx/tx control delay
+         */
+        mmd_write_reg(dev, 2, 4, 0);
+        mmd_write_reg(dev, 2, 5, 0);
+        mmd_write_reg(dev, 2, 8, 0x003ff);
+
+        return 0;
 }
 
-static void __init imx6q_sabresd_cko1_setup(void)
+static int ar8031_phy_fixup(struct phy_device *dev)
 {
-        struct clk *cko1_sel, *pll4, *pll4_post, *cko1;
-        unsigned long rate;
-
-        cko1_sel = clk_get_sys(NULL, "cko1_sel");
-        pll4 = clk_get_sys(NULL, "pll4_audio");
-        pll4_post = clk_get_sys(NULL, "pll4_post_div");
-        cko1 = clk_get_sys(NULL, "cko1");
-        if (IS_ERR(cko1_sel) || IS_ERR(pll4)
-                        || IS_ERR(pll4_post) || IS_ERR(cko1)) {
-                pr_err("cko1 setup failed!\n");
-                goto put_clk;
-        }
-        /*
-         * Setting pll4 at 768MHz (24MHz * 32)
-         * So its child clock can get 24MHz easily
-         */
-        clk_set_rate(pll4, 768000000);
-
-        clk_set_parent(cko1_sel, pll4_post);
-        rate = clk_round_rate(cko1, 24000000);
-        clk_set_rate(cko1, rate);
-put_clk:
-        if (!IS_ERR(cko1_sel))
-                clk_put(cko1_sel);
-        if (!IS_ERR(pll4_post))
-                clk_put(pll4_post);
-        if (!IS_ERR(pll4))
-                clk_put(pll4);
-        if (!IS_ERR(cko1))
-                clk_put(cko1);
+        u16 val;
+
+        /* To enable AR8031 output a 125MHz clk from CLK_25M */
+        phy_write(dev, 0xd, 0x7);
+        phy_write(dev, 0xe, 0x8016);
+        phy_write(dev, 0xd, 0x4007);
+
+        val = phy_read(dev, 0xe);
+        val &= 0xffe3;
+        val |= 0x18;
+        phy_write(dev, 0xe, val);
+
+        /* introduce tx clock delay */
+        phy_write(dev, 0x1d, 0x5);
+        val = phy_read(dev, 0x1e);
+        val |= 0x0100;
+        phy_write(dev, 0x1e, val);
+
+        return 0;
 }
 
-static void __init imx6q_sabresd_init(void)
+#define PHY_ID_AR8031   0x004dd074
+
+static void __init imx6q_enet_phy_init(void)
 {
-        imx6q_sabresd_cko1_setup();
+        if (IS_BUILTIN(CONFIG_PHYLIB)) {
+                phy_register_fixup_for_uid(PHY_ID_KSZ9021, MICREL_PHY_ID_MASK,
+                                ksz9021rn_phy_fixup);
+                phy_register_fixup_for_uid(PHY_ID_KSZ9031, MICREL_PHY_ID_MASK,
+                                ksz9031rn_phy_fixup);
+                phy_register_fixup_for_uid(PHY_ID_AR8031, 0xffffffff,
+                                ar8031_phy_fixup);
+        }
 }
 
 static void __init imx6q_1588_init(void)
@@ -192,29 +182,22 @@ static void __init imx6q_1588_init(void)
 
         gpr = syscon_regmap_lookup_by_compatible("fsl,imx6q-iomuxc-gpr");
         if (!IS_ERR(gpr))
-                regmap_update_bits(gpr, 0x4, 1 << 21, 1 << 21);
+                regmap_update_bits(gpr, IOMUXC_GPR1,
+                                IMX6Q_GPR1_ENET_CLK_SEL_MASK,
+                                IMX6Q_GPR1_ENET_CLK_SEL_ANATOP);
         else
                 pr_err("failed to find fsl,imx6q-iomux-gpr regmap\n");
 
 }
-static void __init imx6q_usb_init(void)
-{
-        imx_anatop_usb_chrg_detect_disable();
-}
 
 static void __init imx6q_init_machine(void)
 {
-        if (of_machine_is_compatible("fsl,imx6q-sabrelite"))
-                imx6q_sabrelite_init();
-        else if (of_machine_is_compatible("fsl,imx6q-sabresd") ||
-                        of_machine_is_compatible("fsl,imx6dl-sabresd"))
-                imx6q_sabresd_init();
+        imx6q_enet_phy_init();
 
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 
         imx_anatop_init();
         imx6q_pm_init();
-        imx6q_usb_init();
         imx6q_1588_init();
 }
 
@@ -250,17 +233,21 @@ put_node:
         of_node_put(np);
 }
 
-static void __init imx6q_opp_init(struct device *cpu_dev)
+static void __init imx6q_opp_init(void)
 {
         struct device_node *np;
+        struct device *cpu_dev = get_cpu_device(0);
 
-        np = of_find_node_by_path("/cpus/cpu@0");
+        if (!cpu_dev) {
+                pr_warn("failed to get cpu0 device\n");
+                return;
+        }
+        np = of_node_get(cpu_dev->of_node);
         if (!np) {
                 pr_warn("failed to find cpu0 node\n");
                 return;
         }
 
-        cpu_dev->of_node = np;
         if (of_init_opp_table(cpu_dev)) {
                 pr_warn("failed to init OPP table\n");
                 goto put_node;
@@ -286,7 +273,7 @@ static void __init imx6q_init_late(void)
                 imx6q_cpuidle_init();
 
         if (IS_ENABLED(CONFIG_ARM_IMX6Q_CPUFREQ)) {
-                imx6q_opp_init(&imx6q_cpufreq_pdev.dev);
+                imx6q_opp_init();
                 platform_device_register(&imx6q_cpufreq_pdev);
         }
 }
@@ -297,44 +284,10 @@ static void __init imx6q_map_io(void)
         imx_scu_map_io();
 }
 
-#ifdef CONFIG_CACHE_L2X0
-static void __init imx6q_init_l2cache(void)
-{
-        void __iomem *l2x0_base;
-        struct device_node *np;
-        unsigned int val;
-
-        np = of_find_compatible_node(NULL, NULL, "arm,pl310-cache");
-        if (!np)
-                goto out;
-
-        l2x0_base = of_iomap(np, 0);
-        if (!l2x0_base) {
-                of_node_put(np);
-                goto out;
-        }
-
-        /* Configure the L2 PREFETCH and POWER registers */
-        val = readl_relaxed(l2x0_base + L2X0_PREFETCH_CTRL);
-        val |= 0x70800000;
-        writel_relaxed(val, l2x0_base + L2X0_PREFETCH_CTRL);
-        val = L2X0_DYNAMIC_CLK_GATING_EN | L2X0_STNDBY_MODE_EN;
-        writel_relaxed(val, l2x0_base + L2X0_POWER_CTRL);
-
-        iounmap(l2x0_base);
-        of_node_put(np);
-
-out:
-        l2x0_of_init(0, ~0UL);
-}
-#else
-static inline void imx6q_init_l2cache(void) {}
-#endif
-
 static void __init imx6q_init_irq(void)
 {
         imx6q_init_revision();
-        imx6q_init_l2cache();
+        imx_init_l2cache();
         imx_src_init();
         imx_gpc_init();
         irqchip_init();
diff --git a/arch/arm/mach-imx/mach-imx6sl.c b/arch/arm/mach-imx/mach-imx6sl.c
index 132db2609507..0d75dc54f715 100644
--- a/arch/arm/mach-imx/mach-imx6sl.c
+++ b/arch/arm/mach-imx/mach-imx6sl.c
@@ -11,7 +11,6 @@
 #include <linux/irqchip.h>
 #include <linux/of.h>
 #include <linux/of_platform.h>
-#include <asm/hardware/cache-l2x0.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
@@ -26,7 +25,7 @@ static void __init imx6sl_init_machine(void)
 
 static void __init imx6sl_init_irq(void)
 {
-        l2x0_of_init(0, ~0UL);
+        imx_init_l2cache();
         imx_src_init();
         imx_gpc_init();
         irqchip_init();
diff --git a/arch/arm/mach-imx/mach-mxt_td60.c b/arch/arm/mach-imx/mach-mxt_td60.c
index a27faaba98ec..c91894003da9 100644
--- a/arch/arm/mach-imx/mach-mxt_td60.c
+++ b/arch/arm/mach-imx/mach-mxt_td60.c
@@ -26,7 +26,7 @@
 #include <asm/mach/time.h>
 #include <asm/mach/map.h>
 #include <linux/gpio.h>
-#include <linux/i2c/pca953x.h>
+#include <linux/platform_data/pca953x.h>
 
 #include "common.h"
 #include "devices-imx27.h"
diff --git a/arch/arm/mach-imx/mm-imx25.c b/arch/arm/mach-imx/mm-imx25.c
index e065c117f5a6..5211f62c624e 100644
--- a/arch/arm/mach-imx/mm-imx25.c
+++ b/arch/arm/mach-imx/mm-imx25.c
@@ -61,25 +61,8 @@ void __init mx25_init_irq(void)
         mxc_init_irq(MX25_IO_ADDRESS(MX25_AVIC_BASE_ADDR));
 }
 
-static struct sdma_script_start_addrs imx25_sdma_script __initdata = {
-        .ap_2_ap_addr = 729,
-        .uart_2_mcu_addr = 904,
-        .per_2_app_addr = 1255,
-        .mcu_2_app_addr = 834,
-        .uartsh_2_mcu_addr = 1120,
-        .per_2_shp_addr = 1329,
-        .mcu_2_shp_addr = 1048,
-        .ata_2_mcu_addr = 1560,
-        .mcu_2_ata_addr = 1479,
-        .app_2_per_addr = 1189,
-        .app_2_mcu_addr = 770,
-        .shp_2_per_addr = 1407,
-        .shp_2_mcu_addr = 979,
-};
-
 static struct sdma_platform_data imx25_sdma_pdata __initdata = {
         .fw_name = "sdma-imx25.bin",
-        .script_addrs = &imx25_sdma_script,
 };
 
 static const struct resource imx25_audmux_res[] __initconst = {
diff --git a/arch/arm/mach-imx/mm-imx5.c b/arch/arm/mach-imx/mm-imx5.c
index cf193d87274a..eb3cce38c70d 100644
--- a/arch/arm/mach-imx/mm-imx5.c
+++ b/arch/arm/mach-imx/mm-imx5.c
@@ -103,22 +103,8 @@ void __init mx53_init_irq(void)
         tzic_init_irq(MX53_IO_ADDRESS(MX53_TZIC_BASE_ADDR));
 }
 
-static struct sdma_script_start_addrs imx51_sdma_script __initdata = {
-        .ap_2_ap_addr = 642,
-        .uart_2_mcu_addr = 817,
-        .mcu_2_app_addr = 747,
-        .mcu_2_shp_addr = 961,
-        .ata_2_mcu_addr = 1473,
-        .mcu_2_ata_addr = 1392,
-        .app_2_per_addr = 1033,
-        .app_2_mcu_addr = 683,
-        .shp_2_per_addr = 1251,
-        .shp_2_mcu_addr = 892,
-};
-
 static struct sdma_platform_data imx51_sdma_pdata __initdata = {
         .fw_name = "sdma-imx51.bin",
-        .script_addrs = &imx51_sdma_script,
 };
 
 static const struct resource imx51_audmux_res[] __initconst = {
@@ -153,10 +139,10 @@ void __init imx51_soc_init(void)
 void __init imx51_init_late(void)
 {
         mx51_neon_fixup();
-        imx51_pm_init();
+        imx5_pm_init();
 }
 
 void __init imx53_init_late(void)
 {
-        imx53_pm_init();
+        imx5_pm_init();
 }
diff --git a/arch/arm/mach-imx/pm-imx5.c b/arch/arm/mach-imx/pm-imx5.c
index 82e79c658eb2..58aeaf5baaf6 100644
--- a/arch/arm/mach-imx/pm-imx5.c
+++ b/arch/arm/mach-imx/pm-imx5.c
@@ -169,14 +169,9 @@ static int __init imx5_pm_common_init(void)
         return imx5_cpuidle_init();
 }
 
-void __init imx51_pm_init(void)
+void __init imx5_pm_init(void)
 {
         int ret = imx5_pm_common_init();
         if (!ret)
                 suspend_set_ops(&mx5_suspend_ops);
 }
-
-void __init imx53_pm_init(void)
-{
-        imx5_pm_common_init();
-}
diff --git a/arch/arm/mach-imx/system.c b/arch/arm/mach-imx/system.c
index 6fe81bb4d3c9..80c177c36c5f 100644
--- a/arch/arm/mach-imx/system.c
+++ b/arch/arm/mach-imx/system.c
@@ -27,6 +27,7 @@
 #include <asm/system_misc.h>
 #include <asm/proc-fns.h>
 #include <asm/mach-types.h>
+#include <asm/hardware/cache-l2x0.h>
 
 #include "common.h"
 #include "hardware.h"
@@ -95,3 +96,46 @@ void __init mxc_arch_reset_init_dt(void)
 
         clk_prepare(wdog_clk);
 }
+
+#ifdef CONFIG_CACHE_L2X0
+void __init imx_init_l2cache(void)
+{
+        void __iomem *l2x0_base;
+        struct device_node *np;
+        unsigned int val;
+
+        np = of_find_compatible_node(NULL, NULL, "arm,pl310-cache");
+        if (!np)
+                goto out;
+
+        l2x0_base = of_iomap(np, 0);
+        if (!l2x0_base) {
+                of_node_put(np);
+                goto out;
+        }
+
+        /* Configure the L2 PREFETCH and POWER registers */
+        val = readl_relaxed(l2x0_base + L2X0_PREFETCH_CTRL);
+        val |= 0x70800000;
+        /*
+         * The L2 cache controller(PL310) version on the i.MX6D/Q is r3p1-50rel0
+         * The L2 cache controller(PL310) version on the i.MX6DL/SOLO/SL is r3p2
+         * But according to ARM PL310 errata: 752271
+         * ID: 752271: Double linefill feature can cause data corruption
+         * Fault Status: Present in: r3p0, r3p1, r3p1-50rel0. Fixed in r3p2
+         * Workaround: The only workaround to this erratum is to disable the
+         * double linefill feature. This is the default behavior.
+         */
+        if (cpu_is_imx6q())
+                val &= ~(1 << 30 | 1 << 23);
+        writel_relaxed(val, l2x0_base + L2X0_PREFETCH_CTRL);
+        val = L2X0_DYNAMIC_CLK_GATING_EN | L2X0_STNDBY_MODE_EN;
+        writel_relaxed(val, l2x0_base + L2X0_POWER_CTRL);
+
+        iounmap(l2x0_base);
+        of_node_put(np);
+
+out:
+        l2x0_of_init(0, ~0UL);
+}
+#endif
diff --git a/arch/arm/mach-integrator/include/mach/debug-macro.S b/arch/arm/mach-integrator/include/mach/debug-macro.S
deleted file mode 100644
index 411b116077e4..000000000000
--- a/arch/arm/mach-integrator/include/mach/debug-macro.S
+++ /dev/null
@@ -1,20 +0,0 @@
-/* arch/arm/mach-integrator/include/mach/debug-macro.S
- *
- * Debugging macro include header
- *
- *  Copyright (C) 1994-1999 Russell King
- *  Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
-
-                .macro  addruart, rp, rv, tmp
-                mov     \rp, #0x16000000        @ physical base address
-                mov     \rv, #0xf0000000        @ virtual base
-                add     \rv, \rv, #0x16000000 >> 4
-                .endm
-
-#include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/mach-iop13xx/include/mach/debug-macro.S b/arch/arm/mach-iop13xx/include/mach/debug-macro.S
deleted file mode 100644
index d869a6f67e5c..000000000000
--- a/arch/arm/mach-iop13xx/include/mach/debug-macro.S
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * arch/arm/mach-iop13xx/include/mach/debug-macro.S
- *
- * Debugging macro include header
- *
- * Copyright (C) 1994-1999 Russell King
- * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-        .macro  addruart, rp, rv, tmp
-        mov     \rp, #0x00002300
-        orr     \rp, \rp, #0x00000040
-        orr     \rv, \rp, #0xfe000000   @ virtual
-        orr     \rv, \rv, #0x00e80000
-        orr     \rp, \rp, #0xff000000   @ physical
-        orr     \rp, \rp, #0x00d80000
-        .endm
-
-#define UART_SHIFT      2
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-iop32x/include/mach/debug-macro.S b/arch/arm/mach-iop32x/include/mach/debug-macro.S
deleted file mode 100644
index 363bdf90b34d..000000000000
--- a/arch/arm/mach-iop32x/include/mach/debug-macro.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * arch/arm/mach-iop32x/include/mach/debug-macro.S
- *
- * Debugging macro include header
- *
- * Copyright (C) 1994-1999 Russell King
- * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-                .macro  addruart, rp, rv, tmp
-                mov     \rp, #0xfe000000        @ physical as well as virtual
-                orr     \rp, \rp, #0x00800000   @ location of the UART
-                mov     \rv, \rp
-                .endm
-
-#define UART_SHIFT      0
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-iop33x/include/mach/debug-macro.S b/arch/arm/mach-iop33x/include/mach/debug-macro.S
deleted file mode 100644
index 361be1f6026e..000000000000
--- a/arch/arm/mach-iop33x/include/mach/debug-macro.S
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * arch/arm/mach-iop33x/include/mach/debug-macro.S
- *
- * Debugging macro include header
- *
- * Copyright (C) 1994-1999 Russell King
- * Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-                .macro  addruart, rp, rv, tmp
-                mov     \rp, #0x00ff0000
-                orr     \rp, \rp, #0x0000f700
-                orr     \rv, #0xfe000000        @ virtual
-                orr     \rp, #0xff000000        @ physical
-                .endm
-
-#define UART_SHIFT      2
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-ixp4xx/include/mach/debug-macro.S b/arch/arm/mach-ixp4xx/include/mach/debug-macro.S
deleted file mode 100644
index ff686cbc5df4..000000000000
--- a/arch/arm/mach-ixp4xx/include/mach/debug-macro.S
+++ /dev/null
@@ -1,26 +0,0 @@
-/* arch/arm/mach-ixp4xx/include/mach/debug-macro.S
- *
- * Debugging macro include header
- *
- *  Copyright (C) 1994-1999 Russell King
- *  Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-                .macro  addruart, rp, rv, tmp
-#ifdef __ARMEB__
-                mov     \rp, #3         @ Uart regs are at off set of 3 if
-                                        @ byte writes used - Big Endian.
-#else
-                mov     \rp, #0
-#endif
-                orr     \rv, \rp, #0xfe000000   @ virtual
-                orr     \rv, \rv, #0x00f00000
-                orr     \rp, \rp, #0xc8000000   @ physical
-                .endm
-
-#define UART_SHIFT      2
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-keystone/Kconfig b/arch/arm/mach-keystone/Kconfig
index 51a50e996840..366d1a3b418d 100644
--- a/arch/arm/mach-keystone/Kconfig
+++ b/arch/arm/mach-keystone/Kconfig
@@ -7,7 +7,6 @@ config ARCH_KEYSTONE
         select HAVE_SMP
         select CLKSRC_MMIO
         select GENERIC_CLOCKEVENTS
-        select HAVE_SCHED_CLOCK
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select ARM_ERRATA_798181 if SMP
         help
diff --git a/arch/arm/mach-keystone/platsmp.c b/arch/arm/mach-keystone/platsmp.c
index 14378e3fef16..c12296157d4a 100644
--- a/arch/arm/mach-keystone/platsmp.c
+++ b/arch/arm/mach-keystone/platsmp.c
@@ -38,6 +38,5 @@ static int keystone_smp_boot_secondary(unsigned int cpu,
 }
 
 struct smp_operations keystone_smp_ops __initdata = {
-        .smp_init_cpus          = arm_dt_init_cpu_maps,
         .smp_boot_secondary     = keystone_smp_boot_secondary,
 };
diff --git a/arch/arm/mach-keystone/smc.S b/arch/arm/mach-keystone/smc.S
index 9b9e4f7b241e..d15de8179fab 100644
--- a/arch/arm/mach-keystone/smc.S
+++ b/arch/arm/mach-keystone/smc.S
@@ -22,8 +22,7 @@
  * Return: Non zero value on failure
  */
 ENTRY(keystone_cpu_smc)
-        stmfd   sp!, {r4-r12, lr}
+        stmfd   sp!, {r4-r11, lr}
         smc     #0
-        dsb
-        ldmfd   sp!, {r4-r12, pc}
+        ldmfd   sp!, {r4-r11, pc}
 ENDPROC(keystone_cpu_smc)
diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig
index b634f9650a7b..fe8319ad3158 100644
--- a/arch/arm/mach-kirkwood/Kconfig
+++ b/arch/arm/mach-kirkwood/Kconfig
@@ -2,67 +2,32 @@ if ARCH_KIRKWOOD
 
 menu "Marvell Kirkwood Implementations"
 
+config KIRKWOOD_LEGACY
+        bool
+
 config MACH_D2NET_V2
         bool "LaCie d2 Network v2 NAS Board"
+        select KIRKWOOD_LEGACY
         help
           Say 'Y' here if you want your kernel to support the
           LaCie d2 Network v2 NAS.
 
-config MACH_DOCKSTAR
-        bool "Seagate FreeAgent DockStar"
-        help
-          Say 'Y' here if you want your kernel to support the
-          Seagate FreeAgent DockStar.
-
-config MACH_ESATA_SHEEVAPLUG
-        bool "Marvell eSATA SheevaPlug Reference Board"
-        help
-          Say 'Y' here if you want your kernel to support the
-          Marvell eSATA SheevaPlug Reference Board.
-
-config MACH_GURUPLUG
-        bool "Marvell GuruPlug Reference Board"
-        help
-          Say 'Y' here if you want your kernel to support the
-          Marvell GuruPlug Reference Board.
-
-config MACH_INETSPACE_V2
-        bool "LaCie Internet Space v2 NAS Board"
-        help
-          Say 'Y' here if you want your kernel to support the
-          LaCie Internet Space v2 NAS.
-
-config MACH_MV88F6281GTW_GE
-        bool "Marvell 88F6281 GTW GE Board"
-        help
-          Say 'Y' here if you want your kernel to support the
-          Marvell 88F6281 GTW GE Board.
-
 config MACH_NET2BIG_V2
         bool "LaCie 2Big Network v2 NAS Board"
+        select KIRKWOOD_LEGACY
         help
           Say 'Y' here if you want your kernel to support the
           LaCie 2Big Network v2 NAS.
 
 config MACH_NET5BIG_V2
         bool "LaCie 5Big Network v2 NAS Board"
+        select KIRKWOOD_LEGACY
         help
           Say 'Y' here if you want your kernel to support the
           LaCie 5Big Network v2 NAS.
 
-config MACH_NETSPACE_MAX_V2
-        bool "LaCie Network Space Max v2 NAS Board"
-        help
-          Say 'Y' here if you want your kernel to support the
-          LaCie Network Space Max v2 NAS.
-
-config MACH_NETSPACE_V2
-        bool "LaCie Network Space v2 NAS Board"
-        help
-          Say 'Y' here if you want your kernel to support the
-          LaCie Network Space v2 NAS.
-
 config MACH_OPENRD
+        select KIRKWOOD_LEGACY
         bool
 
 config MACH_OPENRD_BASE
@@ -88,30 +53,28 @@ config MACH_OPENRD_ULTIMATE
 
 config MACH_RD88F6192_NAS
         bool "Marvell RD-88F6192-NAS Reference Board"
+        select KIRKWOOD_LEGACY
         help
           Say 'Y' here if you want your kernel to support the
           Marvell RD-88F6192-NAS Reference Board.
 
 config MACH_RD88F6281
         bool "Marvell RD-88F6281 Reference Board"
+        select KIRKWOOD_LEGACY
         help
           Say 'Y' here if you want your kernel to support the
           Marvell RD-88F6281 Reference Board.
 
-config MACH_SHEEVAPLUG
-        bool "Marvell SheevaPlug Reference Board"
-        help
-          Say 'Y' here if you want your kernel to support the
-          Marvell SheevaPlug Reference Board.
-
 config MACH_T5325
         bool "HP t5325 Thin Client"
+        select KIRKWOOD_LEGACY
         help
           Say 'Y' here if you want your kernel to support the
           HP t5325 Thin Client.
 
 config MACH_TS219
         bool "QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and TS-219P+ Turbo NAS"
+        select KIRKWOOD_LEGACY
         help
           Say 'Y' here if you want your kernel to support the
           QNAP TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and
@@ -119,6 +82,7 @@ config MACH_TS219
 
 config MACH_TS41X
         bool "QNAP TS-410, TS-410U, TS-419P, TS-419P+ and TS-419U Turbo NAS"
+        select KIRKWOOD_LEGACY
         help
           Say 'Y' here if you want your kernel to support the
           QNAP TS-410, TS-410U, TS-419P, TS-419P+ and TS-419U Turbo
@@ -129,6 +93,9 @@ comment "Device tree entries"
 config ARCH_KIRKWOOD_DT
         bool "Marvell Kirkwood Flattened Device Tree"
         select KIRKWOOD_CLK
+        select OF_IRQ
+        select ORION_IRQCHIP
+        select ORION_TIMER
         select POWER_SUPPLY
         select POWER_RESET
         select POWER_RESET_GPIO
@@ -139,184 +106,12 @@ config ARCH_KIRKWOOD_DT
           Say 'Y' here if you want your kernel to support the
           Marvell Kirkwood using flattened device tree.
 
-config MACH_CLOUDBOX_DT
-        bool "LaCie CloudBox NAS (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        help
-          Say 'Y' here if you want your kernel to support the LaCie
-          CloudBox NAS, using Flattened Device Tree.
-
-config MACH_DB88F628X_BP_DT
-        bool "Marvell DB-88F628x-BP Development Board (Flattened Device Tree)"
-        help
-          Say 'Y' here if you want your kernel to support the Marvell
-          DB-88F6281-BP and DB-88F6282-BP Development Board (Flattened
-          Device Tree).
-
-config MACH_DLINK_KIRKWOOD_DT
-        bool "D-Link Kirkwood-based NAS (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        help
-          Say 'Y' here if you want your kernel to support the
-          Kirkwood-based D-Link NASes such as DNS-320 & DNS-325,
-          using Flattened Device Tree.
-
-config MACH_DOCKSTAR_DT
-        bool "Seagate FreeAgent Dockstar (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
+config MACH_MV88F6281GTW_GE_DT
+        bool "Marvell 88F6281 GTW GE Board (Flattened Device Tree)"
+        depends on ARCH_KIRKWOOD_DT
         help
           Say 'Y' here if you want your kernel to support the
-          Seagate FreeAgent Dockstar (Flattened Device Tree).
-
-config MACH_DREAMPLUG_DT
-        bool "Marvell DreamPlug (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        help
-          Say 'Y' here if you want your kernel to support the
-          Marvell DreamPlug (Flattened Device Tree).
-
-config MACH_GOFLEXNET_DT
-        bool "Seagate GoFlex Net (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        help
-          Say 'Y' here if you want your kernel to support the
-          Seagate GoFlex Net (Flattened Device Tree).
-
-config MACH_GURUPLUG_DT
-        bool "Marvell GuruPlug Reference Board (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        help
-          Say 'Y' here if you want your kernel to support the
-          Marvell GuruPlug Reference Board (Flattened Device Tree).
-
-config MACH_IB62X0_DT
-        bool "RaidSonic IB-NAS6210, IB-NAS6220 (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        help
-          Say 'Y' here if you want your kernel to support the
-          RaidSonic IB-NAS6210 & IB-NAS6220 devices, using
-          Flattened Device Tree.
-
-config MACH_ICONNECT_DT
-        bool "Iomega Iconnect (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        help
-          Say 'Y' here to enable Iomega Iconnect support.
-
-config MACH_INETSPACE_V2_DT
-        bool "LaCie Internet Space v2 NAS (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        help
-          Say 'Y' here if you want your kernel to support the LaCie
-          Internet Space v2 NAS, using Flattened Device Tree.
-
-config MACH_IOMEGA_IX2_200_DT
-        bool "Iomega StorCenter ix2-200 (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        help
-          Say 'Y' here if you want your kernel to support the
-          Iomega StorCenter ix2-200 (Flattened Device Tree).
-
-config MACH_KM_KIRKWOOD_DT
-        bool "Keymile Kirkwood Reference Design (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        help
-          Say 'Y' here if you want your kernel to support the
-          Keymile Kirkwood Reference Desgin, using Flattened Device Tree.
-
-config MACH_LSXL_DT
-        bool "Buffalo Linkstation LS-XHL, LS-CHLv2 (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        select POWER_RESET_RESTART
-        help
-          Say 'Y' here if you want your kernel to support the
-          Buffalo Linkstation LS-XHL & LS-CHLv2 devices, using
-          Flattened Device Tree.
-
-config MACH_MPLCEC4_DT
-        bool "MPL CEC4 (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        help
-          Say 'Y' here if you want your kernel to support the
-          MPL CEC4 (Flattened Device Tree).
-
-config MACH_NETSPACE_LITE_V2_DT
-        bool "LaCie Network Space Lite v2 NAS (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        help
-          Say 'Y' here if you want your kernel to support the LaCie
-          Network Space Lite v2 NAS, using Flattened Device Tree.
-
-config MACH_NETSPACE_MAX_V2_DT
-        bool "LaCie Network Space Max v2 NAS (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        help
-          Say 'Y' here if you want your kernel to support the LaCie
-          Network Space Max v2 NAS, using Flattened Device Tree.
-
-config MACH_NETSPACE_MINI_V2_DT
-        bool "LaCie Network Space Mini v2 NAS (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        help
-          Say 'Y' here if you want your kernel to support the LaCie
-          Network Space Mini v2 NAS using Flattened Device Tree.
-
-          This board is embedded in a product named CloudBox, which
-          provides automatic backup on a 100GB cloud storage. This
-          should not confused with a more recent LaCie NAS also named
-          CloudBox. For this last, the disk capacity is 1TB or above.
-
-config MACH_NETSPACE_V2_DT
-        bool "LaCie Network Space v2 NAS (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        help
-          Say 'Y' here if you want your kernel to support the LaCie
-          Network Space v2 NAS, using Flattened Device Tree.
-
-config MACH_OPENBLOCKS_A6_DT
-        bool "Plat'Home OpenBlocks A6 (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        help
-          Say 'Y' here if you want your kernel to support the
-          Plat'Home OpenBlocks A6 (Flattened Device Tree).
-
-config MACH_READYNAS_DT
-        bool "NETGEAR ReadyNAS Duo v2 (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        select ARM_APPENDED_DTB
-        select ARM_ATAG_DTB_COMPAT
-        help
-          Say 'Y' here if you want your kernel to support the
-          NETGEAR ReadyNAS Duo v2 using Fattened Device Tree.
-
-config MACH_SHEEVAPLUG_DT
-        bool "Marvell (eSATA) SheevaPlug (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        help
-          Say 'Y' here if you want your kernel to support the
-          Marvell (eSATA) SheevaPlug (Flattened Device Tree).
-
-config MACH_TOPKICK_DT
-        bool "USI Topkick (Flattened Device Tree)"
-        select ARCH_KIRKWOOD_DT
-        help
-          Say 'Y' here if you want your kernel to support the
-          USI Topkick, using Flattened Device Tree
-
-config MACH_TS219_DT
-        bool "Device Tree for QNAP TS-11X, TS-21X NAS"
-        select ARCH_KIRKWOOD_DT
-        select ARM_APPENDED_DTB
-        select ARM_ATAG_DTB_COMPAT
-        select POWER_RESET_QNAP
-        help
-          Say 'Y' here if you want your kernel to support the QNAP
-          TS-110, TS-119, TS-119P+, TS-210, TS-219, TS-219P and
-          TS-219P+ Turbo NAS devices using Fattened Device Tree.
-          There are two different Device Tree descriptions, depending
-          on if the device is based on an if the board uses the MV6281
-          or MV6282. If you have the wrong one, the buttons will not
-          work.
+          Marvell 88F6281 GTW GE Board (Flattened Device Tree).
 
 endmenu
 
diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile
index ac4cd75dd499..d1f8e3d0793b 100644
--- a/arch/arm/mach-kirkwood/Makefile
+++ b/arch/arm/mach-kirkwood/Makefile
@@ -1,44 +1,14 @@
-obj-y                           += common.o irq.o pcie.o mpp.o
-
+obj-y                           += common.o pcie.o
+obj-$(CONFIG_KIRKWOOD_LEGACY)   += irq.o mpp.o
 obj-$(CONFIG_MACH_D2NET_V2)             += d2net_v2-setup.o lacie_v2-common.o
-obj-$(CONFIG_MACH_DOCKSTAR)             += dockstar-setup.o
-obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG)     += sheevaplug-setup.o
-obj-$(CONFIG_MACH_GURUPLUG)             += guruplug-setup.o
-obj-$(CONFIG_MACH_INETSPACE_V2)         += netspace_v2-setup.o lacie_v2-common.o
-obj-$(CONFIG_MACH_MV88F6281GTW_GE)      += mv88f6281gtw_ge-setup.o
 obj-$(CONFIG_MACH_NET2BIG_V2)           += netxbig_v2-setup.o lacie_v2-common.o
 obj-$(CONFIG_MACH_NET5BIG_V2)           += netxbig_v2-setup.o lacie_v2-common.o
-obj-$(CONFIG_MACH_NETSPACE_MAX_V2)      += netspace_v2-setup.o lacie_v2-common.o
-obj-$(CONFIG_MACH_NETSPACE_V2)          += netspace_v2-setup.o lacie_v2-common.o
 obj-$(CONFIG_MACH_OPENRD)               += openrd-setup.o
 obj-$(CONFIG_MACH_RD88F6192_NAS)        += rd88f6192-nas-setup.o
 obj-$(CONFIG_MACH_RD88F6281)            += rd88f6281-setup.o
-obj-$(CONFIG_MACH_SHEEVAPLUG)           += sheevaplug-setup.o
 obj-$(CONFIG_MACH_T5325)                += t5325-setup.o
 obj-$(CONFIG_MACH_TS219)                += ts219-setup.o tsx1x-common.o
 obj-$(CONFIG_MACH_TS41X)                += ts41x-setup.o tsx1x-common.o
 
 obj-$(CONFIG_ARCH_KIRKWOOD_DT)          += board-dt.o
-obj-$(CONFIG_MACH_CLOUDBOX_DT)          += board-ns2.o
-obj-$(CONFIG_MACH_DB88F628X_BP_DT)      += board-db88f628x-bp.o
-obj-$(CONFIG_MACH_DLINK_KIRKWOOD_DT)    += board-dnskw.o
-obj-$(CONFIG_MACH_DOCKSTAR_DT)          += board-dockstar.o
-obj-$(CONFIG_MACH_DREAMPLUG_DT)         += board-dreamplug.o
-obj-$(CONFIG_MACH_GOFLEXNET_DT)         += board-goflexnet.o
-obj-$(CONFIG_MACH_GURUPLUG_DT)          += board-guruplug.o
-obj-$(CONFIG_MACH_IB62X0_DT)            += board-ib62x0.o
-obj-$(CONFIG_MACH_ICONNECT_DT)          += board-iconnect.o
-obj-$(CONFIG_MACH_INETSPACE_V2_DT)      += board-ns2.o
-obj-$(CONFIG_MACH_IOMEGA_IX2_200_DT)    += board-iomega_ix2_200.o
-obj-$(CONFIG_MACH_KM_KIRKWOOD_DT)       += board-km_kirkwood.o
-obj-$(CONFIG_MACH_LSXL_DT)              += board-lsxl.o
-obj-$(CONFIG_MACH_MPLCEC4_DT)           += board-mplcec4.o
-obj-$(CONFIG_MACH_NETSPACE_LITE_V2_DT)  += board-ns2.o
-obj-$(CONFIG_MACH_NETSPACE_MAX_V2_DT)   += board-ns2.o
-obj-$(CONFIG_MACH_NETSPACE_MINI_V2_DT)  += board-ns2.o
-obj-$(CONFIG_MACH_NETSPACE_V2_DT)       += board-ns2.o
-obj-$(CONFIG_MACH_OPENBLOCKS_A6_DT)     += board-openblocks_a6.o
-obj-$(CONFIG_MACH_READYNAS_DT)          += board-readynas.o
-obj-$(CONFIG_MACH_SHEEVAPLUG_DT)        += board-sheevaplug.o
-obj-$(CONFIG_MACH_TOPKICK_DT)           += board-usi_topkick.o
-obj-$(CONFIG_MACH_TS219_DT)             += board-ts219.o tsx1x-common.o
+obj-$(CONFIG_MACH_MV88F6281GTW_GE_DT)   += board-mv88f6281gtw_ge.o
diff --git a/arch/arm/mach-kirkwood/board-db88f628x-bp.c b/arch/arm/mach-kirkwood/board-db88f628x-bp.c
deleted file mode 100644
index 2f574bc8ed40..000000000000
--- a/arch/arm/mach-kirkwood/board-db88f628x-bp.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Saeed Bishara <saeed@marvell.com>
- *
- * Marvell DB-88F628{1,2}-BP Development Board Setup
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/of.h>
-#include <linux/mv643xx_eth.h>
-#include "common.h"
-
-static struct mv643xx_eth_platform_data db88f628x_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
-};
-
-void __init db88f628x_init(void)
-{
-        kirkwood_ge00_init(&db88f628x_ge00_data);
-}
diff --git a/arch/arm/mach-kirkwood/board-dnskw.c b/arch/arm/mach-kirkwood/board-dnskw.c
deleted file mode 100644
index a1aa87f09180..000000000000
--- a/arch/arm/mach-kirkwood/board-dnskw.c
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2012 (C), Jamie Lentin <jm@lentin.co.uk>
- *
- * arch/arm/mach-kirkwood/board-dnskw.c
- *
- * D-link DNS-320 & DNS-325 NAS Init for drivers not converted to
- * flattened device tree yet.
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/mv643xx_eth.h>
-#include <linux/gpio.h>
-#include "common.h"
-
-static struct mv643xx_eth_platform_data dnskw_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
-};
-
-/* Register any GPIO for output and set the value */
-static void __init dnskw_gpio_register(unsigned gpio, char *name, int def)
-{
-        if (gpio_request(gpio, name) == 0 &&
-            gpio_direction_output(gpio, 0) == 0) {
-                gpio_set_value(gpio, def);
-                if (gpio_export(gpio, 0) != 0)
-                        pr_err("dnskw: Failed to export GPIO %s\n", name);
-        } else
-                pr_err("dnskw: Failed to register %s\n", name);
-}
-
-void __init dnskw_init(void)
-{
-        kirkwood_ge00_init(&dnskw_ge00_data);
-
-        /* Set NAS to turn back on after a power failure */
-        dnskw_gpio_register(37, "dnskw:power:recover", 1);
-}
diff --git a/arch/arm/mach-kirkwood/board-dockstar.c b/arch/arm/mach-kirkwood/board-dockstar.c
deleted file mode 100644
index d7196db33984..000000000000
--- a/arch/arm/mach-kirkwood/board-dockstar.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/board-dockstar.c
- *
- * Seagate FreeAgent Dockstar Board Init for drivers not converted to
- * flattened device tree yet.
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- *
- * Copied and modified for Seagate GoFlex Net support by
- * Joshua Coombs <josh.coombs@gmail.com> based on ArchLinux ARM's
- * GoFlex kernel patches.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/mv643xx_eth.h>
-#include "common.h"
-
-static struct mv643xx_eth_platform_data dockstar_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
-};
-
-void __init dockstar_dt_init(void)
-{
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_ge00_init(&dockstar_ge00_data);
-}
diff --git a/arch/arm/mach-kirkwood/board-dreamplug.c b/arch/arm/mach-kirkwood/board-dreamplug.c
deleted file mode 100644
index 0903242c00dc..000000000000
--- a/arch/arm/mach-kirkwood/board-dreamplug.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2012 (C), Jason Cooper <jason@lakedaemon.net>
- *
- * arch/arm/mach-kirkwood/board-dreamplug.c
- *
- * Marvell DreamPlug Reference Board Init for drivers not converted to
- * flattened device tree yet.
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/mv643xx_eth.h>
-#include <linux/gpio.h>
-#include "common.h"
-
-static struct mv643xx_eth_platform_data dreamplug_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
-};
-
-static struct mv643xx_eth_platform_data dreamplug_ge01_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(1),
-};
-
-void __init dreamplug_init(void)
-{
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_ge00_init(&dreamplug_ge00_data);
-        kirkwood_ge01_init(&dreamplug_ge01_data);
-}
diff --git a/arch/arm/mach-kirkwood/board-dt.c b/arch/arm/mach-kirkwood/board-dt.c
index 6e122ed3282f..82d3ad8e87cf 100644
--- a/arch/arm/mach-kirkwood/board-dt.c
+++ b/arch/arm/mach-kirkwood/board-dt.c
@@ -15,6 +15,9 @@
 #include <linux/of.h>
 #include <linux/of_platform.h>
 #include <linux/clk-provider.h>
+#include <linux/clocksource.h>
+#include <linux/dma-mapping.h>
+#include <linux/irqchip.h>
 #include <linux/kexec.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -49,10 +52,6 @@ static void __init kirkwood_legacy_clk_init(void)
         orion_clkdev_add("1", "pcie",
                          of_clk_get_from_provider(&clkspec));
 
-        clkspec.args[0] = CGC_BIT_SDIO;
-        orion_clkdev_add(NULL, "mvsdio",
-                         of_clk_get_from_provider(&clkspec));
-
         /*
          * The ethernet interfaces forget the MAC address assigned by
          * u-boot if the clocks are turned off. Until proper DT support
@@ -60,19 +59,24 @@ static void __init kirkwood_legacy_clk_init(void)
          */
         clkspec.args[0] = CGC_BIT_GE0;
         clk = of_clk_get_from_provider(&clkspec);
-        orion_clkdev_add(NULL, "mv643xx_eth_port.0", clk);
         clk_prepare_enable(clk);
 
         clkspec.args[0] = CGC_BIT_GE1;
         clk = of_clk_get_from_provider(&clkspec);
-        orion_clkdev_add(NULL, "mv643xx_eth_port.1", clk);
         clk_prepare_enable(clk);
 }
 
-static void __init kirkwood_of_clk_init(void)
+static void __init kirkwood_dt_time_init(void)
 {
         of_clk_init(NULL);
-        kirkwood_legacy_clk_init();
+        clocksource_of_init();
+}
+
+static void __init kirkwood_dt_init_early(void)
+{
+        mvebu_mbus_init("marvell,kirkwood-mbus",
+                        BRIDGE_WINS_BASE, BRIDGE_WINS_SZ,
+                        DDR_WINDOW_CPU_BASE, DDR_WINDOW_CPU_SZ);
 }
 
 static void __init kirkwood_dt_init(void)
@@ -87,14 +91,15 @@ static void __init kirkwood_dt_init(void)
          */
         writel(readl(CPU_CONFIG) & ~CPU_CONFIG_ERROR_PROP, CPU_CONFIG);
 
+        BUG_ON(mvebu_mbus_dt_init());
         kirkwood_setup_wins();
 
         kirkwood_l2_init();
 
         kirkwood_cpufreq_init();
 
-        /* Setup root of clk tree */
-        kirkwood_of_clk_init();
+        /* Setup clocks for legacy devices */
+        kirkwood_legacy_clk_init();
 
         kirkwood_cpuidle_init();
 
@@ -102,105 +107,22 @@ static void __init kirkwood_dt_init(void)
         kexec_reinit = kirkwood_enable_pcie;
 #endif
 
-        if (of_machine_is_compatible("globalscale,dreamplug"))
-                dreamplug_init();
-
-        if (of_machine_is_compatible("globalscale,guruplug"))
-                guruplug_dt_init();
-
-        if (of_machine_is_compatible("globalscale,sheevaplug"))
-                sheevaplug_dt_init();
-
-        if (of_machine_is_compatible("dlink,dns-kirkwood"))
-                dnskw_init();
-
-        if (of_machine_is_compatible("iom,iconnect"))
-                iconnect_init();
-
-        if (of_machine_is_compatible("raidsonic,ib-nas62x0"))
-                ib62x0_init();
-
-        if (of_machine_is_compatible("qnap,ts219"))
-                qnap_dt_ts219_init();
-
-        if (of_machine_is_compatible("seagate,dockstar"))
-                dockstar_dt_init();
-
-        if (of_machine_is_compatible("seagate,goflexnet"))
-                goflexnet_init();
-
-        if (of_machine_is_compatible("buffalo,lsxl"))
-                lsxl_init();
-
-        if (of_machine_is_compatible("iom,ix2-200"))
-                iomega_ix2_200_init();
-
-        if (of_machine_is_compatible("keymile,km_kirkwood"))
-                km_kirkwood_init();
-
-        if (of_machine_is_compatible("lacie,cloudbox") ||
-            of_machine_is_compatible("lacie,inetspace_v2") ||
-            of_machine_is_compatible("lacie,netspace_lite_v2") ||
-            of_machine_is_compatible("lacie,netspace_max_v2") ||
-            of_machine_is_compatible("lacie,netspace_mini_v2") ||
-            of_machine_is_compatible("lacie,netspace_v2"))
-                ns2_init();
-
-        if (of_machine_is_compatible("marvell,db-88f6281-bp") ||
-            of_machine_is_compatible("marvell,db-88f6282-bp"))
-                db88f628x_init();
-
-        if (of_machine_is_compatible("mpl,cec4"))
-                mplcec4_init();
-
-        if (of_machine_is_compatible("netgear,readynas-duo-v2"))
-                netgear_readynas_init();
-
-        if (of_machine_is_compatible("plathome,openblocks-a6"))
-                openblocks_a6_init();
-
-        if (of_machine_is_compatible("usi,topkick"))
-                usi_topkick_init();
+        if (of_machine_is_compatible("marvell,mv88f6281gtw-ge"))
+                mv88f6281gtw_ge_init();
 
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
 static const char * const kirkwood_dt_board_compat[] = {
-        "globalscale,dreamplug",
-        "globalscale,guruplug",
-        "globalscale,sheevaplug",
-        "dlink,dns-320",
-        "dlink,dns-325",
-        "iom,iconnect",
-        "raidsonic,ib-nas62x0",
-        "qnap,ts219",
-        "seagate,dockstar",
-        "seagate,goflexnet",
-        "buffalo,lsxl",
-        "iom,ix2-200",
-        "keymile,km_kirkwood",
-        "lacie,cloudbox",
-        "lacie,inetspace_v2",
-        "lacie,netspace_lite_v2",
-        "lacie,netspace_max_v2",
-        "lacie,netspace_mini_v2",
-        "lacie,netspace_v2",
-        "marvell,db-88f6281-bp",
-        "marvell,db-88f6282-bp",
-        "mpl,cec4",
-        "netgear,readynas-duo-v2",
-        "plathome,openblocks-a6",
-        "usi,topkick",
-        "zyxel,nsa310",
+        "marvell,kirkwood",
         NULL
 };
 
 DT_MACHINE_START(KIRKWOOD_DT, "Marvell Kirkwood (Flattened Device Tree)")
         /* Maintainer: Jason Cooper <jason@lakedaemon.net> */
         .map_io         = kirkwood_map_io,
-        .init_early     = kirkwood_init_early,
-        .init_irq       = orion_dt_init_irq,
-        .init_time      = kirkwood_timer_init,
+        .init_early     = kirkwood_dt_init_early,
+        .init_time      = kirkwood_dt_time_init,
         .init_machine   = kirkwood_dt_init,
         .restart        = kirkwood_restart,
         .dt_compat      = kirkwood_dt_board_compat,
diff --git a/arch/arm/mach-kirkwood/board-goflexnet.c b/arch/arm/mach-kirkwood/board-goflexnet.c
deleted file mode 100644
index 9db979aec82e..000000000000
--- a/arch/arm/mach-kirkwood/board-goflexnet.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright 2012 (C), Jason Cooper <jason@lakedaemon.net>
- *
- * arch/arm/mach-kirkwood/board-goflexnet.c
- *
- * Seagate GoFlext Net Board Init for drivers not converted to
- * flattened device tree yet.
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- *
- * Copied and modified for Seagate GoFlex Net support by
- * Joshua Coombs <josh.coombs@gmail.com> based on ArchLinux ARM's
- * GoFlex kernel patches.
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/mv643xx_eth.h>
-#include "common.h"
-
-static struct mv643xx_eth_platform_data goflexnet_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
-};
-
-void __init goflexnet_init(void)
-{
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_ge00_init(&goflexnet_ge00_data);
-}
diff --git a/arch/arm/mach-kirkwood/board-guruplug.c b/arch/arm/mach-kirkwood/board-guruplug.c
deleted file mode 100644
index a857163954a5..000000000000
--- a/arch/arm/mach-kirkwood/board-guruplug.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/board-guruplug.c
- *
- * Marvell Guruplug Reference Board Init for drivers not converted to
- * flattened device tree yet.
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/mv643xx_eth.h>
-#include <linux/gpio.h>
-#include "common.h"
-
-static struct mv643xx_eth_platform_data guruplug_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
-};
-
-static struct mv643xx_eth_platform_data guruplug_ge01_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(1),
-};
-
-void __init guruplug_dt_init(void)
-{
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_ge00_init(&guruplug_ge00_data);
-        kirkwood_ge01_init(&guruplug_ge01_data);
-}
diff --git a/arch/arm/mach-kirkwood/board-ib62x0.c b/arch/arm/mach-kirkwood/board-ib62x0.c
deleted file mode 100644
index 9a857ae83984..000000000000
--- a/arch/arm/mach-kirkwood/board-ib62x0.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2012 (C), Simon Baatz <gmbnomis@gmail.com>
- *
- * arch/arm/mach-kirkwood/board-ib62x0.c
- *
- * RaidSonic ICY BOX IB-NAS6210 & IB-NAS6220 init for drivers not
- * converted to flattened device tree yet.
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/mv643xx_eth.h>
-#include "common.h"
-
-static struct mv643xx_eth_platform_data ib62x0_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
-};
-
-void __init ib62x0_init(void)
-{
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_ge00_init(&ib62x0_ge00_data);
-}
diff --git a/arch/arm/mach-kirkwood/board-iconnect.c b/arch/arm/mach-kirkwood/board-iconnect.c
deleted file mode 100644
index 98b5ad1bba90..000000000000
--- a/arch/arm/mach-kirkwood/board-iconnect.c
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/board-iconnect.c
- *
- * Iomega i-connect Board Setup
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/of.h>
-#include <linux/mv643xx_eth.h>
-#include "common.h"
-
-static struct mv643xx_eth_platform_data iconnect_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(11),
-};
-
-void __init iconnect_init(void)
-{
-        kirkwood_ge00_init(&iconnect_ge00_data);
-}
diff --git a/arch/arm/mach-kirkwood/board-iomega_ix2_200.c b/arch/arm/mach-kirkwood/board-iomega_ix2_200.c
deleted file mode 100644
index e5f70415905a..000000000000
--- a/arch/arm/mach-kirkwood/board-iomega_ix2_200.c
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/board-iomega_ix2_200.c
- *
- * Iomega StorCenter ix2-200
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/mv643xx_eth.h>
-#include <linux/ethtool.h>
-#include "common.h"
-
-static struct mv643xx_eth_platform_data iomega_ix2_200_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_NONE,
-        .speed          = SPEED_1000,
-        .duplex         = DUPLEX_FULL,
-};
-
-static struct mv643xx_eth_platform_data iomega_ix2_200_ge01_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(11),
-};
-
-void __init iomega_ix2_200_init(void)
-{
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_ge00_init(&iomega_ix2_200_ge00_data);
-        kirkwood_ge01_init(&iomega_ix2_200_ge01_data);
-}
diff --git a/arch/arm/mach-kirkwood/board-km_kirkwood.c b/arch/arm/mach-kirkwood/board-km_kirkwood.c
deleted file mode 100644
index 44e4605ba0bf..000000000000
--- a/arch/arm/mach-kirkwood/board-km_kirkwood.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright 2012 2012 KEYMILE AG, CH-3097 Bern
- * Valentin Longchamp <valentin.longchamp@keymile.com>
- *
- * arch/arm/mach-kirkwood/board-km_kirkwood.c
- *
- * Keymile km_kirkwood Reference Desing Init for drivers not converted to
- * flattened device tree yet.
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/mv643xx_eth.h>
-#include <linux/clk.h>
-#include <linux/clk-private.h>
-#include "common.h"
-
-static struct mv643xx_eth_platform_data km_kirkwood_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
-};
-
-void __init km_kirkwood_init(void)
-{
-        struct clk *sata_clk;
-        /*
-         * Our variant of kirkwood (integrated in the Bobcat) hangs on accessing
-         * SATA bits (14-15) of the Clock Gating Control Register. Since these
-         * devices are also not present in this variant, their clocks get
-         * disabled because unused when clk_disable_unused() gets called.
-         * That's why we change the flags to these clocks to CLK_IGNORE_UNUSED
-         */
-        sata_clk = clk_get_sys("sata_mv.0", "0");
-        if (!IS_ERR(sata_clk))
-                sata_clk->flags |= CLK_IGNORE_UNUSED;
-        sata_clk = clk_get_sys("sata_mv.0", "1");
-        if (!IS_ERR(sata_clk))
-                sata_clk->flags |= CLK_IGNORE_UNUSED;
-
-        kirkwood_ge00_init(&km_kirkwood_ge00_data);
-}
diff --git a/arch/arm/mach-kirkwood/board-lsxl.c b/arch/arm/mach-kirkwood/board-lsxl.c
deleted file mode 100644
index 348395238df6..000000000000
--- a/arch/arm/mach-kirkwood/board-lsxl.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2012 (C), Michael Walle <michael@walle.cc>
- *
- * arch/arm/mach-kirkwood/board-lsxl.c
- *
- * Buffalo Linkstation LS-XHL and LS-CHLv2 init for drivers not
- * converted to flattened device tree yet.
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/mv643xx_eth.h>
-#include "common.h"
-
-static struct mv643xx_eth_platform_data lsxl_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
-};
-
-static struct mv643xx_eth_platform_data lsxl_ge01_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
-};
-
-void __init lsxl_init(void)
-{
-        /*
-         * Basic setup. Needs to be called early.
-         */
-
-        kirkwood_ge00_init(&lsxl_ge00_data);
-        kirkwood_ge01_init(&lsxl_ge01_data);
-}
diff --git a/arch/arm/mach-kirkwood/board-mplcec4.c b/arch/arm/mach-kirkwood/board-mplcec4.c
deleted file mode 100644
index 938712e248f1..000000000000
--- a/arch/arm/mach-kirkwood/board-mplcec4.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2012 MPL AG, Switzerland
- * Stefan Peter <s.peter@mpl.ch>
- *
- * arch/arm/mach-kirkwood/board-mplcec4.c
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/mv643xx_eth.h>
-#include "common.h"
-
-static struct mv643xx_eth_platform_data mplcec4_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(1),
-};
-
-static struct mv643xx_eth_platform_data mplcec4_ge01_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(2),
-};
-
-void __init mplcec4_init(void)
-{
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_ge00_init(&mplcec4_ge00_data);
-        kirkwood_ge01_init(&mplcec4_ge01_data);
-}
-
-
-
diff --git a/arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c b/arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c
new file mode 100644
index 000000000000..ee5eea678c11
--- /dev/null
+++ b/arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c
@@ -0,0 +1,50 @@
+/*
+ * arch/arm/mach-kirkwood/board-mv88f6281gtw_ge.c
+ *
+ * Marvell 88F6281 GTW GE Board Setup
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without any
+ * warranty of any kind, whether express or implied.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/platform_device.h>
+#include <linux/irq.h>
+#include <linux/timer.h>
+#include <linux/mv643xx_eth.h>
+#include <linux/ethtool.h>
+#include <linux/gpio.h>
+#include <net/dsa.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+#include <asm/mach/pci.h>
+#include <mach/kirkwood.h>
+#include "common.h"
+
+static struct mv643xx_eth_platform_data mv88f6281gtw_ge_ge00_data = {
+        .phy_addr       = MV643XX_ETH_PHY_NONE,
+        .speed          = SPEED_1000,
+        .duplex         = DUPLEX_FULL,
+};
+
+static struct dsa_chip_data mv88f6281gtw_ge_switch_chip_data = {
+        .port_names[0]  = "lan1",
+        .port_names[1]  = "lan2",
+        .port_names[2]  = "lan3",
+        .port_names[3]  = "lan4",
+        .port_names[4]  = "wan",
+        .port_names[5]  = "cpu",
+};
+
+static struct dsa_platform_data mv88f6281gtw_ge_switch_plat_data = {
+        .nr_chips       = 1,
+        .chip           = &mv88f6281gtw_ge_switch_chip_data,
+};
+
+void __init mv88f6281gtw_ge_init(void)
+{
+        kirkwood_ge00_init(&mv88f6281gtw_ge_ge00_data);
+        kirkwood_ge00_switch_init(&mv88f6281gtw_ge_switch_plat_data, NO_IRQ);
+}
diff --git a/arch/arm/mach-kirkwood/board-ns2.c b/arch/arm/mach-kirkwood/board-ns2.c
deleted file mode 100644
index f8f660525ace..000000000000
--- a/arch/arm/mach-kirkwood/board-ns2.c
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright 2012 (C), Simon Guinot <simon.guinot@sequanux.org>
- *
- * arch/arm/mach-kirkwood/board-ns2.c
- *
- * LaCie Network Space v2 board (and parents) initialization for drivers
- * not converted to flattened device tree yet.
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/mv643xx_eth.h>
-#include <linux/of.h>
-#include "common.h"
-
-static struct mv643xx_eth_platform_data ns2_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
-};
-
-void __init ns2_init(void)
-{
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        if (of_machine_is_compatible("lacie,cloudbox") ||
-            of_machine_is_compatible("lacie,netspace_lite_v2") ||
-            of_machine_is_compatible("lacie,netspace_mini_v2"))
-                ns2_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
-        kirkwood_ge00_init(&ns2_ge00_data);
-}
diff --git a/arch/arm/mach-kirkwood/board-openblocks_a6.c b/arch/arm/mach-kirkwood/board-openblocks_a6.c
deleted file mode 100644
index b11d8fdeca93..000000000000
--- a/arch/arm/mach-kirkwood/board-openblocks_a6.c
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2012 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
- *
- * arch/arm/mach-kirkwood/board-openblocks_a6.c
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/mv643xx_eth.h>
-#include "common.h"
-
-static struct mv643xx_eth_platform_data openblocks_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
-};
-
-void __init openblocks_a6_init(void)
-{
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_ge00_init(&openblocks_ge00_data);
-}
diff --git a/arch/arm/mach-kirkwood/board-readynas.c b/arch/arm/mach-kirkwood/board-readynas.c
deleted file mode 100644
index 341b82d9cadb..000000000000
--- a/arch/arm/mach-kirkwood/board-readynas.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * NETGEAR ReadyNAS Duo v2 Board setup for drivers not already
- * converted to DT.
- *
- * Copyright (C) 2013, Arnaud EBALARD <arno@natisbad.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/mv643xx_eth.h>
-#include <mach/kirkwood.h>
-#include "common.h"
-
-static struct mv643xx_eth_platform_data netgear_readynas_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
-};
-
-void __init netgear_readynas_init(void)
-{
-        kirkwood_ge00_init(&netgear_readynas_ge00_data);
-}
diff --git a/arch/arm/mach-kirkwood/board-sheevaplug.c b/arch/arm/mach-kirkwood/board-sheevaplug.c
deleted file mode 100644
index fa389373ca74..000000000000
--- a/arch/arm/mach-kirkwood/board-sheevaplug.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/board-sheevaplug.c
- *
- * Marvell Sheevaplug Reference Board Init for drivers not converted to
- * flattened device tree yet.
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/mv643xx_eth.h>
-#include "common.h"
-
-static struct mv643xx_eth_platform_data sheevaplug_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
-};
-
-void __init sheevaplug_dt_init(void)
-{
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_ge00_init(&sheevaplug_ge00_data);
-}
diff --git a/arch/arm/mach-kirkwood/board-ts219.c b/arch/arm/mach-kirkwood/board-ts219.c
deleted file mode 100644
index 860f44ab457d..000000000000
--- a/arch/arm/mach-kirkwood/board-ts219.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- *
- * QNAP TS-11x/TS-21x Turbo NAS Board Setup via DT
- *
- * Copyright (C) 2012 Andrew Lunn <andrew@lunn.ch>
- *
- * Based on the board file ts219-setup.c:
- *
- * Copyright (C) 2009  Martin Michlmayr <tbm@cyrius.com>
- * Copyright (C) 2008  Byron Bradley <byron.bbradley@gmail.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version
- * 2 of the License, or (at your option) any later version.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/mv643xx_eth.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <mach/kirkwood.h>
-#include "common.h"
-
-static struct mv643xx_eth_platform_data qnap_ts219_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
-};
-
-void __init qnap_dt_ts219_init(void)
-{
-        u32 dev, rev;
-
-        kirkwood_pcie_id(&dev, &rev);
-        if (dev == MV88F6282_DEV_ID)
-                qnap_ts219_ge00_data.phy_addr = MV643XX_ETH_PHY_ADDR(0);
-
-        kirkwood_ge00_init(&qnap_ts219_ge00_data);
-}
diff --git a/arch/arm/mach-kirkwood/board-usi_topkick.c b/arch/arm/mach-kirkwood/board-usi_topkick.c
deleted file mode 100644
index 1cc04ec33f0b..000000000000
--- a/arch/arm/mach-kirkwood/board-usi_topkick.c
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright 2012 (C), Jason Cooper <jason@lakedaemon.net>
- *
- * arch/arm/mach-kirkwood/board-usi_topkick.c
- *
- * USI Topkick Init for drivers not converted to flattened device tree yet.
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/mv643xx_eth.h>
-#include <linux/gpio.h>
-#include "common.h"
-
-static struct mv643xx_eth_platform_data topkick_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
-};
-
-void __init usi_topkick_init(void)
-{
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_ge00_init(&topkick_ge00_data);
-}
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index e9238b5567ee..176761134a66 100644
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -37,6 +37,12 @@
 #include <linux/platform_data/dma-mv_xor.h>
 #include "common.h"
 
+/* These can go away once Kirkwood uses the mvebu-mbus DT binding */
+#define KIRKWOOD_MBUS_NAND_TARGET 0x01
+#define KIRKWOOD_MBUS_NAND_ATTR   0x2f
+#define KIRKWOOD_MBUS_SRAM_TARGET 0x03
+#define KIRKWOOD_MBUS_SRAM_ATTR   0x01
+
 /*****************************************************************************
  * I/O Address Mapping
  ****************************************************************************/
@@ -264,7 +270,7 @@ void __init kirkwood_clk_init(void)
         orion_clkdev_add(NULL, MV_XOR_NAME ".1", xor1);
         orion_clkdev_add("0", "pcie", pex0);
         orion_clkdev_add("1", "pcie", pex1);
-        orion_clkdev_add(NULL, "kirkwood-i2s", audio);
+        orion_clkdev_add(NULL, "mvebu-audio", audio);
         orion_clkdev_add(NULL, MV64XXX_I2C_CTLR_NAME ".0", runit);
         orion_clkdev_add(NULL, MV64XXX_I2C_CTLR_NAME ".1", runit);
 
@@ -528,10 +534,6 @@ void __init kirkwood_cpuidle_init(void)
 void __init kirkwood_init_early(void)
 {
         orion_time_set_base(TIMER_VIRT_BASE);
-
-        mvebu_mbus_init("marvell,kirkwood-mbus",
-                        BRIDGE_WINS_BASE, BRIDGE_WINS_SZ,
-                        DDR_WINDOW_CPU_BASE, DDR_WINDOW_CPU_SZ);
 }
 
 int kirkwood_tclk;
@@ -560,7 +562,7 @@ void __init kirkwood_timer_init(void)
 /*****************************************************************************
  * Audio
  ****************************************************************************/
-static struct resource kirkwood_i2s_resources[] = {
+static struct resource kirkwood_audio_resources[] = {
         [0] = {
                 .start  = AUDIO_PHYS_BASE,
                 .end    = AUDIO_PHYS_BASE + SZ_16K - 1,
@@ -573,29 +575,23 @@ static struct resource kirkwood_i2s_resources[] = {
         },
 };
 
-static struct kirkwood_asoc_platform_data kirkwood_i2s_data = {
+static struct kirkwood_asoc_platform_data kirkwood_audio_data = {
         .burst       = 128,
 };
 
-static struct platform_device kirkwood_i2s_device = {
-        .name           = "kirkwood-i2s",
+static struct platform_device kirkwood_audio_device = {
+        .name           = "mvebu-audio",
         .id             = -1,
-        .num_resources  = ARRAY_SIZE(kirkwood_i2s_resources),
-        .resource       = kirkwood_i2s_resources,
+        .num_resources  = ARRAY_SIZE(kirkwood_audio_resources),
+        .resource       = kirkwood_audio_resources,
         .dev            = {
-                .platform_data  = &kirkwood_i2s_data,
+                .platform_data  = &kirkwood_audio_data,
         },
 };
 
-static struct platform_device kirkwood_pcm_device = {
-        .name           = "kirkwood-pcm-audio",
-        .id             = -1,
-};
-
 void __init kirkwood_audio_init(void)
 {
-        platform_device_register(&kirkwood_i2s_device);
-        platform_device_register(&kirkwood_pcm_device);
+        platform_device_register(&kirkwood_audio_device);
 }
 
 /*****************************************************************************
@@ -672,10 +668,14 @@ char * __init kirkwood_id(void)
 
 void __init kirkwood_setup_wins(void)
 {
-        mvebu_mbus_add_window("nand", KIRKWOOD_NAND_MEM_PHYS_BASE,
-                              KIRKWOOD_NAND_MEM_SIZE);
-        mvebu_mbus_add_window("sram", KIRKWOOD_SRAM_PHYS_BASE,
-                              KIRKWOOD_SRAM_SIZE);
+        mvebu_mbus_add_window_by_id(KIRKWOOD_MBUS_NAND_TARGET,
+                                    KIRKWOOD_MBUS_NAND_ATTR,
+                                    KIRKWOOD_NAND_MEM_PHYS_BASE,
+                                    KIRKWOOD_NAND_MEM_SIZE);
+        mvebu_mbus_add_window_by_id(KIRKWOOD_MBUS_SRAM_TARGET,
+                                    KIRKWOOD_MBUS_SRAM_ATTR,
+                                    KIRKWOOD_SRAM_PHYS_BASE,
+                                    KIRKWOOD_SRAM_SIZE);
 }
 
 void __init kirkwood_l2_init(void)
@@ -703,6 +703,10 @@ void __init kirkwood_init(void)
          */
         writel(readl(CPU_CONFIG) & ~CPU_CONFIG_ERROR_PROP, CPU_CONFIG);
 
+        BUG_ON(mvebu_mbus_init("marvell,kirkwood-mbus",
+                        BRIDGE_WINS_BASE, BRIDGE_WINS_SZ,
+                        DDR_WINDOW_CPU_BASE, DDR_WINDOW_CPU_SZ));
+
         kirkwood_setup_wins();
 
         kirkwood_l2_init();
diff --git a/arch/arm/mach-kirkwood/common.h b/arch/arm/mach-kirkwood/common.h
index fcf3ba682e24..1296de94febf 100644
--- a/arch/arm/mach-kirkwood/common.h
+++ b/arch/arm/mach-kirkwood/common.h
@@ -59,119 +59,10 @@ void kirkwood_restart(enum reboot_mode, const char *);
 void kirkwood_clk_init(void);
 
 /* board init functions for boards not fully converted to fdt */
-#ifdef CONFIG_MACH_DREAMPLUG_DT
-void dreamplug_init(void);
+#ifdef CONFIG_MACH_MV88F6281GTW_GE_DT
+void mv88f6281gtw_ge_init(void);
 #else
-static inline void dreamplug_init(void) {};
-#endif
-#ifdef CONFIG_MACH_GURUPLUG_DT
-void guruplug_dt_init(void);
-#else
-static inline void guruplug_dt_init(void) {};
-#endif
-#ifdef CONFIG_MACH_SHEEVAPLUG_DT
-void sheevaplug_dt_init(void);
-#else
-static inline void sheevaplug_dt_init(void) {};
-#endif
-#ifdef CONFIG_MACH_TS219_DT
-void qnap_dt_ts219_init(void);
-#else
-static inline void qnap_dt_ts219_init(void) {};
-#endif
-
-#ifdef CONFIG_MACH_DLINK_KIRKWOOD_DT
-void dnskw_init(void);
-#else
-static inline void dnskw_init(void) {};
-#endif
-
-#ifdef CONFIG_MACH_ICONNECT_DT
-void iconnect_init(void);
-#else
-static inline void iconnect_init(void) {};
-#endif
-
-#ifdef CONFIG_MACH_IB62X0_DT
-void ib62x0_init(void);
-#else
-static inline void ib62x0_init(void) {};
-#endif
-
-#ifdef CONFIG_MACH_DOCKSTAR_DT
-void dockstar_dt_init(void);
-#else
-static inline void dockstar_dt_init(void) {};
-#endif
-
-#ifdef CONFIG_MACH_GOFLEXNET_DT
-void goflexnet_init(void);
-#else
-static inline void goflexnet_init(void) {};
-#endif
-
-#ifdef CONFIG_MACH_LSXL_DT
-void lsxl_init(void);
-#else
-static inline void lsxl_init(void) {};
-#endif
-
-#ifdef CONFIG_MACH_IOMEGA_IX2_200_DT
-void iomega_ix2_200_init(void);
-#else
-static inline void iomega_ix2_200_init(void) {};
-#endif
-
-#ifdef CONFIG_MACH_KM_KIRKWOOD_DT
-void km_kirkwood_init(void);
-#else
-static inline void km_kirkwood_init(void) {};
-#endif
-
-#ifdef CONFIG_MACH_DB88F628X_BP_DT
-void db88f628x_init(void);
-#else
-static inline void db88f628x_init(void) {};
-#endif
-
-#ifdef CONFIG_MACH_MPLCEC4_DT
-void mplcec4_init(void);
-#else
-static inline void mplcec4_init(void) {};
-#endif
-
-#if defined(CONFIG_MACH_INETSPACE_V2_DT) || \
-        defined(CONFIG_MACH_NETSPACE_V2_DT) || \
-        defined(CONFIG_MACH_NETSPACE_MAX_V2_DT) || \
-        defined(CONFIG_MACH_NETSPACE_LITE_V2_DT) || \
-        defined(CONFIG_MACH_NETSPACE_MINI_V2_DT)
-void ns2_init(void);
-#else
-static inline void ns2_init(void) {};
-#endif
-
-#ifdef CONFIG_MACH_OPENBLOCKS_A6_DT
-void openblocks_a6_init(void);
-#else
-static inline void openblocks_a6_init(void) {};
-#endif
-
-#ifdef CONFIG_MACH_READYNAS_DT
-void netgear_readynas_init(void);
-#else
-static inline void netgear_readynas_init(void) {};
-#endif
-
-#ifdef CONFIG_MACH_TOPKICK_DT
-void usi_topkick_init(void);
-#else
-static inline void usi_topkick_init(void) {};
-#endif
-
-#ifdef CONFIG_MACH_CLOUDBOX_DT
-void cloudbox_init(void);
-#else
-static inline void cloudbox_init(void) {};
+static inline void mv88f6281gtw_ge_init(void) {};
 #endif
 
 /* early init functions not converted to fdt yet */
diff --git a/arch/arm/mach-kirkwood/dockstar-setup.c b/arch/arm/mach-kirkwood/dockstar-setup.c
deleted file mode 100644
index 060ccf9cb63f..000000000000
--- a/arch/arm/mach-kirkwood/dockstar-setup.c
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/dockstar-setup.c
- *
- * Seagate FreeAgent DockStar Setup
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/ata_platform.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mv643xx_eth.h>
-#include <linux/gpio.h>
-#include <linux/leds.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <mach/kirkwood.h>
-#include "common.h"
-#include "mpp.h"
-
-static struct mtd_partition dockstar_nand_parts[] = {
-        {
-                .name = "u-boot",
-                .offset = 0,
-                .size = SZ_1M
-        }, {
-                .name = "uImage",
-                .offset = MTDPART_OFS_NXTBLK,
-                .size = SZ_4M
-        }, {
-                .name = "root",
-                .offset = MTDPART_OFS_NXTBLK,
-                .size = MTDPART_SIZ_FULL
-        },
-};
-
-static struct mv643xx_eth_platform_data dockstar_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
-};
-
-static struct gpio_led dockstar_led_pins[] = {
-        {
-                .name                   = "dockstar:green:health",
-                .default_trigger        = "default-on",
-                .gpio                   = 46,
-                .active_low             = 1,
-        },
-        {
-                .name                   = "dockstar:orange:misc",
-                .default_trigger        = "none",
-                .gpio                   = 47,
-                .active_low             = 1,
-        },
-};
-
-static struct gpio_led_platform_data dockstar_led_data = {
-        .leds           = dockstar_led_pins,
-        .num_leds       = ARRAY_SIZE(dockstar_led_pins),
-};
-
-static struct platform_device dockstar_leds = {
-        .name   = "leds-gpio",
-        .id     = -1,
-        .dev    = {
-                .platform_data  = &dockstar_led_data,
-        }
-};
-
-static unsigned int dockstar_mpp_config[] __initdata = {
-        MPP29_GPIO,     /* USB Power Enable */
-        MPP46_GPIO,     /* LED green */
-        MPP47_GPIO,     /* LED orange */
-        0
-};
-
-static void __init dockstar_init(void)
-{
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_init();
-
-        /* setup gpio pin select */
-        kirkwood_mpp_conf(dockstar_mpp_config);
-
-        kirkwood_uart0_init();
-        kirkwood_nand_init(ARRAY_AND_SIZE(dockstar_nand_parts), 25);
-
-        if (gpio_request(29, "USB Power Enable") != 0 ||
-            gpio_direction_output(29, 1) != 0)
-                pr_err("can't set up GPIO 29 (USB Power Enable)\n");
-        kirkwood_ehci_init();
-
-        kirkwood_ge00_init(&dockstar_ge00_data);
-
-        platform_device_register(&dockstar_leds);
-}
-
-MACHINE_START(DOCKSTAR, "Seagate FreeAgent DockStar")
-        .atag_offset    = 0x100,
-        .init_machine   = dockstar_init,
-        .map_io         = kirkwood_map_io,
-        .init_early     = kirkwood_init_early,
-        .init_irq       = kirkwood_init_irq,
-        .init_time      = kirkwood_timer_init,
-        .restart        = kirkwood_restart,
-MACHINE_END
diff --git a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c
deleted file mode 100644
index 08dd739aa709..000000000000
--- a/arch/arm/mach-kirkwood/guruplug-setup.c
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/guruplug-setup.c
- *
- * Marvell GuruPlug Reference Board Setup
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/partitions.h>
-#include <linux/ata_platform.h>
-#include <linux/mv643xx_eth.h>
-#include <linux/gpio.h>
-#include <linux/leds.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <mach/kirkwood.h>
-#include <linux/platform_data/mmc-mvsdio.h>
-#include "common.h"
-#include "mpp.h"
-
-static struct mtd_partition guruplug_nand_parts[] = {
-        {
-                .name = "u-boot",
-                .offset = 0,
-                .size = SZ_1M
-        }, {
-                .name = "uImage",
-                .offset = MTDPART_OFS_NXTBLK,
-                .size = SZ_4M
-        }, {
-                .name = "root",
-                .offset = MTDPART_OFS_NXTBLK,
-                .size = MTDPART_SIZ_FULL
-        },
-};
-
-static struct mv643xx_eth_platform_data guruplug_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
-};
-
-static struct mv643xx_eth_platform_data guruplug_ge01_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(1),
-};
-
-static struct mv_sata_platform_data guruplug_sata_data = {
-        .n_ports        = 1,
-};
-
-static struct mvsdio_platform_data guruplug_mvsdio_data = {
-        /* unfortunately the CD signal has not been connected */
-        .gpio_card_detect = -1,
-        .gpio_write_protect = -1,
-};
-
-static struct gpio_led guruplug_led_pins[] = {
-        {
-                .name                   = "guruplug:red:health",
-                .gpio                   = 46,
-                .active_low             = 1,
-        },
-        {
-                .name                   = "guruplug:green:health",
-                .gpio                   = 47,
-                .active_low             = 1,
-        },
-        {
-                .name                   = "guruplug:red:wmode",
-                .gpio                   = 48,
-                .active_low             = 1,
-        },
-        {
-                .name                   = "guruplug:green:wmode",
-                .gpio                   = 49,
-                .active_low             = 1,
-        },
-};
-
-static struct gpio_led_platform_data guruplug_led_data = {
-        .leds           = guruplug_led_pins,
-        .num_leds       = ARRAY_SIZE(guruplug_led_pins),
-};
-
-static struct platform_device guruplug_leds = {
-        .name   = "leds-gpio",
-        .id     = -1,
-        .dev    = {
-                .platform_data  = &guruplug_led_data,
-        }
-};
-
-static unsigned int guruplug_mpp_config[] __initdata = {
-        MPP46_GPIO,     /* M_RLED */
-        MPP47_GPIO,     /* M_GLED */
-        MPP48_GPIO,     /* B_RLED */
-        MPP49_GPIO,     /* B_GLED */
-        0
-};
-
-static void __init guruplug_init(void)
-{
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_init();
-        kirkwood_mpp_conf(guruplug_mpp_config);
-
-        kirkwood_uart0_init();
-        kirkwood_nand_init(ARRAY_AND_SIZE(guruplug_nand_parts), 25);
-
-        kirkwood_ehci_init();
-        kirkwood_ge00_init(&guruplug_ge00_data);
-        kirkwood_ge01_init(&guruplug_ge01_data);
-        kirkwood_sata_init(&guruplug_sata_data);
-        kirkwood_sdio_init(&guruplug_mvsdio_data);
-
-        platform_device_register(&guruplug_leds);
-}
-
-MACHINE_START(GURUPLUG, "Marvell GuruPlug Reference Board")
-        /* Maintainer: Siddarth Gore <gores@marvell.com> */
-        .atag_offset    = 0x100,
-        .init_machine   = guruplug_init,
-        .map_io         = kirkwood_map_io,
-        .init_early     = kirkwood_init_early,
-        .init_irq       = kirkwood_init_irq,
-        .init_time      = kirkwood_timer_init,
-        .restart        = kirkwood_restart,
-MACHINE_END
diff --git a/arch/arm/mach-kirkwood/include/mach/debug-macro.S b/arch/arm/mach-kirkwood/include/mach/debug-macro.S
deleted file mode 100644
index f785d401a607..000000000000
--- a/arch/arm/mach-kirkwood/include/mach/debug-macro.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/include/mach/debug-macro.S
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#include <mach/bridge-regs.h>
-
-        .macro  addruart, rp, rv, tmp
-        ldr     \rp, =KIRKWOOD_REGS_PHYS_BASE
-        ldr     \rv, =KIRKWOOD_REGS_VIRT_BASE
-        orr     \rp, \rp, #0x00012000
-        orr     \rv, \rv, #0x00012000
-        .endm
-
-#define UART_SHIFT      2
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c b/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
deleted file mode 100644
index ba384b992bef..000000000000
--- a/arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/mv88f6281gtw_ge-setup.c
- *
- * Marvell 88F6281 GTW GE Board Setup
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/pci.h>
-#include <linux/irq.h>
-#include <linux/mtd/physmap.h>
-#include <linux/timer.h>
-#include <linux/mv643xx_eth.h>
-#include <linux/ethtool.h>
-#include <linux/gpio.h>
-#include <linux/leds.h>
-#include <linux/input.h>
-#include <linux/gpio_keys.h>
-#include <linux/spi/flash.h>
-#include <linux/spi/spi.h>
-#include <net/dsa.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/pci.h>
-#include <mach/kirkwood.h>
-#include "common.h"
-#include "mpp.h"
-
-static struct mv643xx_eth_platform_data mv88f6281gtw_ge_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_NONE,
-        .speed          = SPEED_1000,
-        .duplex         = DUPLEX_FULL,
-};
-
-static struct dsa_chip_data mv88f6281gtw_ge_switch_chip_data = {
-        .port_names[0]  = "lan1",
-        .port_names[1]  = "lan2",
-        .port_names[2]  = "lan3",
-        .port_names[3]  = "lan4",
-        .port_names[4]  = "wan",
-        .port_names[5]  = "cpu",
-};
-
-static struct dsa_platform_data mv88f6281gtw_ge_switch_plat_data = {
-        .nr_chips       = 1,
-        .chip           = &mv88f6281gtw_ge_switch_chip_data,
-};
-
-static const struct flash_platform_data mv88f6281gtw_ge_spi_slave_data = {
-        .type           = "mx25l12805d",
-};
-
-static struct spi_board_info __initdata mv88f6281gtw_ge_spi_slave_info[] = {
-        {
-                .modalias       = "m25p80",
-                .platform_data  = &mv88f6281gtw_ge_spi_slave_data,
-                .irq            = -1,
-                .max_speed_hz   = 50000000,
-                .bus_num        = 0,
-                .chip_select    = 0,
-        },
-};
-
-static struct gpio_keys_button mv88f6281gtw_ge_button_pins[] = {
-        {
-                .code           = KEY_RESTART,
-                .gpio           = 47,
-                .desc           = "SWR Button",
-                .active_low     = 1,
-        }, {
-                .code           = KEY_WPS_BUTTON,
-                .gpio           = 46,
-                .desc           = "WPS Button",
-                .active_low     = 1,
-        },
-};
-
-static struct gpio_keys_platform_data mv88f6281gtw_ge_button_data = {
-        .buttons        = mv88f6281gtw_ge_button_pins,
-        .nbuttons       = ARRAY_SIZE(mv88f6281gtw_ge_button_pins),
-};
-
-static struct platform_device mv88f6281gtw_ge_buttons = {
-        .name           = "gpio-keys",
-        .id             = -1,
-        .num_resources  = 0,
-        .dev            = {
-                .platform_data  = &mv88f6281gtw_ge_button_data,
-        },
-};
-
-static struct gpio_led mv88f6281gtw_ge_led_pins[] = {
-        {
-                .name           = "gtw:green:Status",
-                .gpio           = 20,
-                .active_low     = 0,
-        }, {
-                .name           = "gtw:red:Status",
-                .gpio           = 21,
-                .active_low     = 0,
-        }, {
-                .name           = "gtw:green:USB",
-                .gpio           = 12,
-                .active_low     = 0,
-        },
-};
-
-static struct gpio_led_platform_data mv88f6281gtw_ge_led_data = {
-        .leds           = mv88f6281gtw_ge_led_pins,
-        .num_leds       = ARRAY_SIZE(mv88f6281gtw_ge_led_pins),
-};
-
-static struct platform_device mv88f6281gtw_ge_leds = {
-        .name   = "leds-gpio",
-        .id     = -1,
-        .dev    = {
-                .platform_data  = &mv88f6281gtw_ge_led_data,
-        },
-};
-
-static unsigned int mv88f6281gtw_ge_mpp_config[] __initdata = {
-        MPP12_GPO,      /* Status#_USB pin  */
-        MPP20_GPIO,     /* Status#_GLED pin */
-        MPP21_GPIO,     /* Status#_RLED pin */
-        MPP46_GPIO,     /* WPS_Switch pin   */
-        MPP47_GPIO,     /* SW_Init pin      */
-        0
-};
-
-static void __init mv88f6281gtw_ge_init(void)
-{
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_init();
-        kirkwood_mpp_conf(mv88f6281gtw_ge_mpp_config);
-
-        kirkwood_ehci_init();
-        kirkwood_ge00_init(&mv88f6281gtw_ge_ge00_data);
-        kirkwood_ge00_switch_init(&mv88f6281gtw_ge_switch_plat_data, NO_IRQ);
-        spi_register_board_info(mv88f6281gtw_ge_spi_slave_info,
-                                ARRAY_SIZE(mv88f6281gtw_ge_spi_slave_info));
-        kirkwood_spi_init();
-        kirkwood_uart0_init();
-        platform_device_register(&mv88f6281gtw_ge_leds);
-        platform_device_register(&mv88f6281gtw_ge_buttons);
-}
-
-static int __init mv88f6281gtw_ge_pci_init(void)
-{
-        if (machine_is_mv88f6281gtw_ge())
-                kirkwood_pcie_init(KW_PCIE0);
-
-        return 0;
-}
-subsys_initcall(mv88f6281gtw_ge_pci_init);
-
-MACHINE_START(MV88F6281GTW_GE, "Marvell 88F6281 GTW GE Board")
-        /* Maintainer: Lennert Buytenhek <buytenh@marvell.com> */
-        .atag_offset    = 0x100,
-        .init_machine   = mv88f6281gtw_ge_init,
-        .map_io         = kirkwood_map_io,
-        .init_early     = kirkwood_init_early,
-        .init_irq       = kirkwood_init_irq,
-        .init_time      = kirkwood_timer_init,
-        .restart        = kirkwood_restart,
-MACHINE_END
diff --git a/arch/arm/mach-kirkwood/netspace_v2-setup.c b/arch/arm/mach-kirkwood/netspace_v2-setup.c
deleted file mode 100644
index 3b706611da8e..000000000000
--- a/arch/arm/mach-kirkwood/netspace_v2-setup.c
+++ /dev/null
@@ -1,293 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/netspace_v2-setup.c
- *
- * LaCie Network Space v2 board setup
- *
- * Copyright (C) 2009 Simon Guinot <sguinot@lacie.com>
- * Copyright (C) 2009 Benoît Canet <benoit.canet@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/ata_platform.h>
-#include <linux/mv643xx_eth.h>
-#include <linux/input.h>
-#include <linux/gpio.h>
-#include <linux/gpio_keys.h>
-#include <linux/leds.h>
-#include <linux/gpio-fan.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <mach/kirkwood.h>
-#include <linux/platform_data/leds-kirkwood-ns2.h>
-#include "common.h"
-#include "mpp.h"
-#include "lacie_v2-common.h"
-
-/*****************************************************************************
- * Ethernet
- ****************************************************************************/
-
-static struct mv643xx_eth_platform_data netspace_v2_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(8),
-};
-
-/*****************************************************************************
- * SATA
- ****************************************************************************/
-
-static struct mv_sata_platform_data netspace_v2_sata_data = {
-        .n_ports        = 2,
-};
-
-/*****************************************************************************
- * GPIO keys
- ****************************************************************************/
-
-#define NETSPACE_V2_PUSH_BUTTON         32
-
-static struct gpio_keys_button netspace_v2_buttons[] = {
-        [0] = {
-                .code           = KEY_POWER,
-                .gpio           = NETSPACE_V2_PUSH_BUTTON,
-                .desc           = "Power push button",
-                .active_low     = 0,
-        },
-};
-
-static struct gpio_keys_platform_data netspace_v2_button_data = {
-        .buttons        = netspace_v2_buttons,
-        .nbuttons       = ARRAY_SIZE(netspace_v2_buttons),
-};
-
-static struct platform_device netspace_v2_gpio_buttons = {
-        .name           = "gpio-keys",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = &netspace_v2_button_data,
-        },
-};
-
-/*****************************************************************************
- * GPIO LEDs
- ****************************************************************************/
-
-#define NETSPACE_V2_GPIO_RED_LED        12
-
-static struct gpio_led netspace_v2_gpio_led_pins[] = {
-        {
-                .name   = "ns_v2:red:fail",
-                .gpio   = NETSPACE_V2_GPIO_RED_LED,
-        },
-};
-
-static struct gpio_led_platform_data netspace_v2_gpio_leds_data = {
-        .num_leds       = ARRAY_SIZE(netspace_v2_gpio_led_pins),
-        .leds           = netspace_v2_gpio_led_pins,
-};
-
-static struct platform_device netspace_v2_gpio_leds = {
-        .name           = "leds-gpio",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = &netspace_v2_gpio_leds_data,
-        },
-};
-
-/*****************************************************************************
- * Dual-GPIO CPLD LEDs
- ****************************************************************************/
-
-#define NETSPACE_V2_GPIO_BLUE_LED_SLOW  29
-#define NETSPACE_V2_GPIO_BLUE_LED_CMD   30
-
-static struct ns2_led netspace_v2_led_pins[] = {
-        {
-                .name   = "ns_v2:blue:sata",
-                .cmd    = NETSPACE_V2_GPIO_BLUE_LED_CMD,
-                .slow   = NETSPACE_V2_GPIO_BLUE_LED_SLOW,
-        },
-};
-
-static struct ns2_led_platform_data netspace_v2_leds_data = {
-        .num_leds       = ARRAY_SIZE(netspace_v2_led_pins),
-        .leds           = netspace_v2_led_pins,
-};
-
-static struct platform_device netspace_v2_leds = {
-        .name           = "leds-ns2",
-        .id             = -1,
-        .dev            = {
-                .platform_data  = &netspace_v2_leds_data,
-        },
-};
-
-/*****************************************************************************
- * GPIO fan
- ****************************************************************************/
-
-/* Designed for fan 40x40x16: ADDA AD0412LB-D50 6000rpm@12v */
-static struct gpio_fan_speed netspace_max_v2_fan_speed[] = {
-        {    0,  0 },
-        { 1500, 15 },
-        { 1700, 14 },
-        { 1800, 13 },
-        { 2100, 12 },
-        { 3100, 11 },
-        { 3300, 10 },
-        { 4300,  9 },
-        { 5500,  8 },
-};
-
-static unsigned netspace_max_v2_fan_ctrl[] = { 22, 7, 33, 23 };
-
-static struct gpio_fan_alarm netspace_max_v2_fan_alarm = {
-        .gpio           = 25,
-        .active_low     = 1,
-};
-
-static struct gpio_fan_platform_data netspace_max_v2_fan_data = {
-        .num_ctrl       = ARRAY_SIZE(netspace_max_v2_fan_ctrl),
-        .ctrl           = netspace_max_v2_fan_ctrl,
-        .alarm          = &netspace_max_v2_fan_alarm,
-        .num_speed      = ARRAY_SIZE(netspace_max_v2_fan_speed),
-        .speed          = netspace_max_v2_fan_speed,
-};
-
-static struct platform_device netspace_max_v2_gpio_fan = {
-        .name   = "gpio-fan",
-        .id     = -1,
-        .dev    = {
-                .platform_data  = &netspace_max_v2_fan_data,
-        },
-};
-
-/*****************************************************************************
- * General Setup
- ****************************************************************************/
-
-static unsigned int netspace_v2_mpp_config[] __initdata = {
-        MPP0_SPI_SCn,
-        MPP1_SPI_MOSI,
-        MPP2_SPI_SCK,
-        MPP3_SPI_MISO,
-        MPP4_NF_IO6,
-        MPP5_NF_IO7,
-        MPP6_SYSRST_OUTn,
-        MPP7_GPO,               /* Fan speed (bit 1) */
-        MPP8_TW0_SDA,
-        MPP9_TW0_SCK,
-        MPP10_UART0_TXD,
-        MPP11_UART0_RXD,
-        MPP12_GPO,              /* Red led */
-        MPP14_GPIO,             /* USB fuse */
-        MPP16_GPIO,             /* SATA 0 power */
-        MPP17_GPIO,             /* SATA 1 power */
-        MPP18_NF_IO0,
-        MPP19_NF_IO1,
-        MPP20_SATA1_ACTn,
-        MPP21_SATA0_ACTn,
-        MPP22_GPIO,             /* Fan speed (bit 0) */
-        MPP23_GPIO,             /* Fan power */
-        MPP24_GPIO,             /* USB mode select */
-        MPP25_GPIO,             /* Fan rotation fail */
-        MPP26_GPIO,             /* USB device vbus */
-        MPP28_GPIO,             /* USB enable host vbus */
-        MPP29_GPIO,             /* Blue led (slow register) */
-        MPP30_GPIO,             /* Blue led (command register) */
-        MPP31_GPIO,             /* Board power off */
-        MPP32_GPIO,             /* Power button (0 = Released, 1 = Pushed) */
-        MPP33_GPO,              /* Fan speed (bit 2) */
-        0
-};
-
-#define NETSPACE_V2_GPIO_POWER_OFF      31
-
-static void netspace_v2_power_off(void)
-{
-        gpio_set_value(NETSPACE_V2_GPIO_POWER_OFF, 1);
-}
-
-static void __init netspace_v2_init(void)
-{
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_init();
-        kirkwood_mpp_conf(netspace_v2_mpp_config);
-
-        if (machine_is_netspace_max_v2())
-                lacie_v2_hdd_power_init(2);
-        else
-                lacie_v2_hdd_power_init(1);
-
-        kirkwood_ehci_init();
-        kirkwood_ge00_init(&netspace_v2_ge00_data);
-        kirkwood_sata_init(&netspace_v2_sata_data);
-        kirkwood_uart0_init();
-        lacie_v2_register_flash();
-        lacie_v2_register_i2c_devices();
-
-        platform_device_register(&netspace_v2_leds);
-        platform_device_register(&netspace_v2_gpio_leds);
-        platform_device_register(&netspace_v2_gpio_buttons);
-        if (machine_is_netspace_max_v2())
-                platform_device_register(&netspace_max_v2_gpio_fan);
-
-        if (gpio_request(NETSPACE_V2_GPIO_POWER_OFF, "power-off") == 0 &&
-            gpio_direction_output(NETSPACE_V2_GPIO_POWER_OFF, 0) == 0)
-                pm_power_off = netspace_v2_power_off;
-        else
-                pr_err("netspace_v2: failed to configure power-off GPIO\n");
-}
-
-#ifdef CONFIG_MACH_NETSPACE_V2
-MACHINE_START(NETSPACE_V2, "LaCie Network Space v2")
-        .atag_offset    = 0x100,
-        .init_machine   = netspace_v2_init,
-        .map_io         = kirkwood_map_io,
-        .init_early     = kirkwood_init_early,
-        .init_irq       = kirkwood_init_irq,
-        .init_time      = kirkwood_timer_init,
-        .restart        = kirkwood_restart,
-MACHINE_END
-#endif
-
-#ifdef CONFIG_MACH_INETSPACE_V2
-MACHINE_START(INETSPACE_V2, "LaCie Internet Space v2")
-        .atag_offset    = 0x100,
-        .init_machine   = netspace_v2_init,
-        .map_io         = kirkwood_map_io,
-        .init_early     = kirkwood_init_early,
-        .init_irq       = kirkwood_init_irq,
-        .init_time      = kirkwood_timer_init,
-        .restart        = kirkwood_restart,
-MACHINE_END
-#endif
-
-#ifdef CONFIG_MACH_NETSPACE_MAX_V2
-MACHINE_START(NETSPACE_MAX_V2, "LaCie Network Space Max v2")
-        .atag_offset    = 0x100,
-        .init_machine   = netspace_v2_init,
-        .map_io         = kirkwood_map_io,
-        .init_early     = kirkwood_init_early,
-        .init_irq       = kirkwood_init_irq,
-        .init_time      = kirkwood_timer_init,
-        .restart        = kirkwood_restart,
-MACHINE_END
-#endif
diff --git a/arch/arm/mach-kirkwood/openrd-setup.c b/arch/arm/mach-kirkwood/openrd-setup.c
index 6a6eb548307d..e5cf84103583 100644
--- a/arch/arm/mach-kirkwood/openrd-setup.c
+++ b/arch/arm/mach-kirkwood/openrd-setup.c
@@ -158,7 +158,8 @@ static void __init openrd_init(void)
         kirkwood_mpp_conf(openrd_mpp_config);
 
         kirkwood_uart0_init();
-        kirkwood_nand_init(ARRAY_AND_SIZE(openrd_nand_parts), 25);
+        kirkwood_nand_init(openrd_nand_parts, ARRAY_SIZE(openrd_nand_parts),
+                           25);
 
         kirkwood_ehci_init();
 
diff --git a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c
index ddcb09f5bdd3..12d86f39f380 100644
--- a/arch/arm/mach-kirkwood/pcie.c
+++ b/arch/arm/mach-kirkwood/pcie.c
@@ -20,6 +20,16 @@
 #include <mach/bridge-regs.h>
 #include "common.h"
 
+/* These can go away once Kirkwood uses the mvebu-mbus DT binding */
+#define KIRKWOOD_MBUS_PCIE0_MEM_TARGET    0x4
+#define KIRKWOOD_MBUS_PCIE0_MEM_ATTR      0xe8
+#define KIRKWOOD_MBUS_PCIE0_IO_TARGET     0x4
+#define KIRKWOOD_MBUS_PCIE0_IO_ATTR       0xe0
+#define KIRKWOOD_MBUS_PCIE1_MEM_TARGET    0x4
+#define KIRKWOOD_MBUS_PCIE1_MEM_ATTR      0xd8
+#define KIRKWOOD_MBUS_PCIE1_IO_TARGET     0x4
+#define KIRKWOOD_MBUS_PCIE1_IO_ATTR       0xd0
+
 static void kirkwood_enable_pcie_clk(const char *port)
 {
         struct clk *clk;
@@ -254,26 +264,24 @@ static void __init add_pcie_port(int index, void __iomem *base)
 
 void __init kirkwood_pcie_init(unsigned int portmask)
 {
-        mvebu_mbus_add_window_remap_flags("pcie0.0",
+        mvebu_mbus_add_window_remap_by_id(KIRKWOOD_MBUS_PCIE0_IO_TARGET,
+                                          KIRKWOOD_MBUS_PCIE0_IO_ATTR,
                                           KIRKWOOD_PCIE_IO_PHYS_BASE,
                                           KIRKWOOD_PCIE_IO_SIZE,
-                                          KIRKWOOD_PCIE_IO_BUS_BASE,
-                                          MVEBU_MBUS_PCI_IO);
-        mvebu_mbus_add_window_remap_flags("pcie0.0",
-                                          KIRKWOOD_PCIE_MEM_PHYS_BASE,
-                                          KIRKWOOD_PCIE_MEM_SIZE,
-                                          MVEBU_MBUS_NO_REMAP,
-                                          MVEBU_MBUS_PCI_MEM);
-        mvebu_mbus_add_window_remap_flags("pcie1.0",
+                                          KIRKWOOD_PCIE_IO_BUS_BASE);
+        mvebu_mbus_add_window_by_id(KIRKWOOD_MBUS_PCIE0_MEM_TARGET,
+                                    KIRKWOOD_MBUS_PCIE0_MEM_ATTR,
+                                    KIRKWOOD_PCIE_MEM_PHYS_BASE,
+                                    KIRKWOOD_PCIE_MEM_SIZE);
+        mvebu_mbus_add_window_remap_by_id(KIRKWOOD_MBUS_PCIE1_IO_TARGET,
+                                          KIRKWOOD_MBUS_PCIE1_IO_ATTR,
                                           KIRKWOOD_PCIE1_IO_PHYS_BASE,
                                           KIRKWOOD_PCIE1_IO_SIZE,
-                                          KIRKWOOD_PCIE1_IO_BUS_BASE,
-                                          MVEBU_MBUS_PCI_IO);
-        mvebu_mbus_add_window_remap_flags("pcie1.0",
-                                          KIRKWOOD_PCIE1_MEM_PHYS_BASE,
-                                          KIRKWOOD_PCIE1_MEM_SIZE,
-                                          MVEBU_MBUS_NO_REMAP,
-                                          MVEBU_MBUS_PCI_MEM);
+                                          KIRKWOOD_PCIE1_IO_BUS_BASE);
+        mvebu_mbus_add_window_by_id(KIRKWOOD_MBUS_PCIE1_MEM_TARGET,
+                                    KIRKWOOD_MBUS_PCIE1_MEM_ATTR,
+                                    KIRKWOOD_PCIE1_MEM_PHYS_BASE,
+                                    KIRKWOOD_PCIE1_MEM_SIZE);
 
         vga_base = KIRKWOOD_PCIE_MEM_PHYS_BASE;
 
diff --git a/arch/arm/mach-kirkwood/rd88f6281-setup.c b/arch/arm/mach-kirkwood/rd88f6281-setup.c
index d24223166e06..5154bd2a3ad3 100644
--- a/arch/arm/mach-kirkwood/rd88f6281-setup.c
+++ b/arch/arm/mach-kirkwood/rd88f6281-setup.c
@@ -87,7 +87,9 @@ static void __init rd88f6281_init(void)
         kirkwood_init();
         kirkwood_mpp_conf(rd88f6281_mpp_config);
 
-        kirkwood_nand_init(ARRAY_AND_SIZE(rd88f6281_nand_parts), 25);
+        kirkwood_nand_init(rd88f6281_nand_parts,
+                           ARRAY_SIZE(rd88f6281_nand_parts),
+                           25);
         kirkwood_ehci_init();
 
         kirkwood_ge00_init(&rd88f6281_ge00_data);
diff --git a/arch/arm/mach-kirkwood/sheevaplug-setup.c b/arch/arm/mach-kirkwood/sheevaplug-setup.c
deleted file mode 100644
index 55b68fa39f45..000000000000
--- a/arch/arm/mach-kirkwood/sheevaplug-setup.c
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/sheevaplug-setup.c
- *
- * Marvell SheevaPlug Reference Board Setup
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/ata_platform.h>
-#include <linux/mtd/partitions.h>
-#include <linux/mv643xx_eth.h>
-#include <linux/gpio.h>
-#include <linux/leds.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <mach/kirkwood.h>
-#include <linux/platform_data/mmc-mvsdio.h>
-#include "common.h"
-#include "mpp.h"
-
-static struct mtd_partition sheevaplug_nand_parts[] = {
-        {
-                .name = "u-boot",
-                .offset = 0,
-                .size = SZ_1M
-        }, {
-                .name = "uImage",
-                .offset = MTDPART_OFS_NXTBLK,
-                .size = SZ_4M
-        }, {
-                .name = "root",
-                .offset = MTDPART_OFS_NXTBLK,
-                .size = MTDPART_SIZ_FULL
-        },
-};
-
-static struct mv643xx_eth_platform_data sheevaplug_ge00_data = {
-        .phy_addr       = MV643XX_ETH_PHY_ADDR(0),
-};
-
-static struct mv_sata_platform_data sheeva_esata_sata_data = {
-        .n_ports        = 2,
-};
-
-static struct mvsdio_platform_data sheevaplug_mvsdio_data = {
-        /* unfortunately the CD signal has not been connected */
-};
-
-static struct mvsdio_platform_data sheeva_esata_mvsdio_data = {
-        .gpio_write_protect = 44, /* MPP44 used as SD write protect */
-        .gpio_card_detect = 47,   /* MPP47 used as SD card detect */
-};
-
-static struct gpio_led sheevaplug_led_pins[] = {
-        {
-                .name                   = "plug:red:misc",
-                .default_trigger        = "none",
-                .gpio                   = 46,
-                .active_low             = 1,
-        },
-        {
-                .name                   = "plug:green:health",
-                .default_trigger        = "default-on",
-                .gpio                   = 49,
-                .active_low             = 1,
-        },
-};
-
-static struct gpio_led_platform_data sheevaplug_led_data = {
-        .leds           = sheevaplug_led_pins,
-        .num_leds       = ARRAY_SIZE(sheevaplug_led_pins),
-};
-
-static struct platform_device sheevaplug_leds = {
-        .name   = "leds-gpio",
-        .id     = -1,
-        .dev    = {
-                .platform_data  = &sheevaplug_led_data,
-        }
-};
-
-static unsigned int sheevaplug_mpp_config[] __initdata = {
-        MPP29_GPIO,     /* USB Power Enable */
-        MPP46_GPIO,     /* LED Red */
-        MPP49_GPIO,     /* LED */
-        0
-};
-
-static unsigned int sheeva_esata_mpp_config[] __initdata = {
-        MPP29_GPIO,     /* USB Power Enable */
-        MPP44_GPIO,     /* SD Write Protect */
-        MPP47_GPIO,     /* SD Card Detect */
-        MPP49_GPIO,     /* LED Green */
-        0
-};
-
-static void __init sheevaplug_init(void)
-{
-        /*
-         * Basic setup. Needs to be called early.
-         */
-        kirkwood_init();
-
-        /* setup gpio pin select */
-        if (machine_is_esata_sheevaplug())
-                kirkwood_mpp_conf(sheeva_esata_mpp_config);
-        else
-                kirkwood_mpp_conf(sheevaplug_mpp_config);
-
-        kirkwood_uart0_init();
-        kirkwood_nand_init(ARRAY_AND_SIZE(sheevaplug_nand_parts), 25);
-
-        if (gpio_request(29, "USB Power Enable") != 0 ||
-            gpio_direction_output(29, 1) != 0)
-                pr_err("can't set up GPIO 29 (USB Power Enable)\n");
-        kirkwood_ehci_init();
-
-        kirkwood_ge00_init(&sheevaplug_ge00_data);
-
-        /* honor lower power consumption for plugs with out eSATA */
-        if (machine_is_esata_sheevaplug())
-                kirkwood_sata_init(&sheeva_esata_sata_data);
-
-        /* enable sd wp and sd cd on plugs with esata */
-        if (machine_is_esata_sheevaplug())
-                kirkwood_sdio_init(&sheeva_esata_mvsdio_data);
-        else
-                kirkwood_sdio_init(&sheevaplug_mvsdio_data);
-
-        platform_device_register(&sheevaplug_leds);
-}
-
-#ifdef CONFIG_MACH_SHEEVAPLUG
-MACHINE_START(SHEEVAPLUG, "Marvell SheevaPlug Reference Board")
-        /* Maintainer: shadi Ammouri <shadi@marvell.com> */
-        .atag_offset    = 0x100,
-        .init_machine   = sheevaplug_init,
-        .map_io         = kirkwood_map_io,
-        .init_early     = kirkwood_init_early,
-        .init_irq       = kirkwood_init_irq,
-        .init_time      = kirkwood_timer_init,
-        .restart        = kirkwood_restart,
-MACHINE_END
-#endif
-
-#ifdef CONFIG_MACH_ESATA_SHEEVAPLUG
-MACHINE_START(ESATA_SHEEVAPLUG, "Marvell eSATA SheevaPlug Reference Board")
-        .atag_offset    = 0x100,
-        .init_machine   = sheevaplug_init,
-        .map_io         = kirkwood_map_io,
-        .init_early     = kirkwood_init_early,
-        .init_irq       = kirkwood_init_irq,
-        .init_time      = kirkwood_timer_init,
-        .restart        = kirkwood_restart,
-MACHINE_END
-#endif
diff --git a/arch/arm/mach-ks8695/board-acs5k.c b/arch/arm/mach-ks8695/board-acs5k.c
index 456d6386edf8..9f9c0441a917 100644
--- a/arch/arm/mach-ks8695/board-acs5k.c
+++ b/arch/arm/mach-ks8695/board-acs5k.c
@@ -20,7 +20,7 @@
 #include <linux/i2c.h>
 #include <linux/i2c-algo-bit.h>
 #include <linux/i2c-gpio.h>
-#include <linux/i2c/pca953x.h>
+#include <linux/platform_data/pca953x.h>
 
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
diff --git a/arch/arm/mach-lpc32xx/include/mach/debug-macro.S b/arch/arm/mach-lpc32xx/include/mach/debug-macro.S
deleted file mode 100644
index 351bd6c84909..000000000000
--- a/arch/arm/mach-lpc32xx/include/mach/debug-macro.S
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * arch/arm/mach-lpc32xx/include/mach/debug-macro.S
- *
- * Author: Kevin Wells <kevin.wells@nxp.com>
- *
- * Copyright (C) 2010 NXP Semiconductors
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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.
- */
-
-/*
- * Debug output is hardcoded to standard UART 5
-*/
-
-        .macro  addruart, rp, rv, tmp
-        ldreq   \rp, =0x40090000
-        ldrne   \rv, =0xF4090000
-        .endm
-
-#define UART_SHIFT      2
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-mmp/Makefile b/arch/arm/mach-mmp/Makefile
index 095c155d6fb8..9b702a1dc7b0 100644
--- a/arch/arm/mach-mmp/Makefile
+++ b/arch/arm/mach-mmp/Makefile
@@ -2,7 +2,7 @@
 # Makefile for Marvell's PXA168 processors line
 #
 
-obj-y                           += common.o devices.o time.o irq.o
+obj-y                           += common.o devices.o time.o
 
 # SoC support
 obj-$(CONFIG_CPU_PXA168)        += pxa168.o
diff --git a/arch/arm/mach-mmp/common.h b/arch/arm/mach-mmp/common.h
index 991d7e9877de..cf445bae6d77 100644
--- a/arch/arm/mach-mmp/common.h
+++ b/arch/arm/mach-mmp/common.h
@@ -3,7 +3,6 @@
 
 extern void timer_init(int irq);
 
-extern void __init icu_init_irq(void);
 extern void __init mmp_map_io(void);
 extern void mmp_restart(enum reboot_mode, const char *);
 extern void __init pxa168_clk_init(void);
diff --git a/arch/arm/mach-mmp/include/mach/entry-macro.S b/arch/arm/mach-mmp/include/mach/entry-macro.S
deleted file mode 100644
index bd152e24e6d7..000000000000
--- a/arch/arm/mach-mmp/include/mach/entry-macro.S
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * linux/arch/arm/mach-mmp/include/mach/entry-macro.S
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <asm/irq.h>
-#include <mach/regs-icu.h>
-
-        .macro  get_irqnr_preamble, base, tmp
-        mrc     p15, 0, \tmp, c0, c0, 0         @ CPUID
-        and     \tmp, \tmp, #0xff00
-        cmp     \tmp, #0x5800
-        ldr     \base, =mmp_icu_base
-        ldr     \base, [\base, #0]
-        addne   \base, \base, #0x10c            @ PJ1 AP INT SEL register
-        addeq   \base, \base, #0x104            @ PJ4 IRQ SEL register
-        .endm
-
-        .macro  get_irqnr_and_base, irqnr, irqstat, base, tmp
-        ldr     \tmp, [\base, #0]
-        and     \irqnr, \tmp, #0x3f
-        tst     \tmp, #(1 << 6)
-        .endm
diff --git a/arch/arm/mach-mmp/include/mach/pxa168.h b/arch/arm/mach-mmp/include/mach/pxa168.h
index 459c2d03eb5c..a83ba7cb525d 100644
--- a/arch/arm/mach-mmp/include/mach/pxa168.h
+++ b/arch/arm/mach-mmp/include/mach/pxa168.h
@@ -4,6 +4,7 @@
 #include <linux/reboot.h>
 
 extern void pxa168_timer_init(void);
+extern void __init icu_init_irq(void);
 extern void __init pxa168_init_irq(void);
 extern void pxa168_restart(enum reboot_mode, const char *);
 extern void pxa168_clear_keypad_wakeup(void);
diff --git a/arch/arm/mach-mmp/include/mach/pxa910.h b/arch/arm/mach-mmp/include/mach/pxa910.h
index b914afa1fcdc..92253203f5b4 100644
--- a/arch/arm/mach-mmp/include/mach/pxa910.h
+++ b/arch/arm/mach-mmp/include/mach/pxa910.h
@@ -2,6 +2,7 @@
 #define __ASM_MACH_PXA910_H
 
 extern void pxa910_timer_init(void);
+extern void __init icu_init_irq(void);
 extern void __init pxa910_init_irq(void);
 
 #include <linux/i2c.h>
diff --git a/arch/arm/mach-mmp/irq.c b/arch/arm/mach-mmp/irq.c
deleted file mode 100644
index 3c71246cd994..000000000000
--- a/arch/arm/mach-mmp/irq.c
+++ /dev/null
@@ -1,463 +0,0 @@
-/*
- *  linux/arch/arm/mach-mmp/irq.c
- *
- *  Generic IRQ handling, GPIO IRQ demultiplexing, etc.
- *  Copyright (C) 2008 - 2012 Marvell Technology Group Ltd.
- *
- *  Author:     Bin Yang <bin.yang@marvell.com>
- *              Haojian Zhuang <haojian.zhuang@gmail.com>
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- */
-
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/irq.h>
-#include <linux/irqdomain.h>
-#include <linux/io.h>
-#include <linux/ioport.h>
-#include <linux/of_address.h>
-#include <linux/of_irq.h>
-
-#include <mach/irqs.h>
-
-#ifdef CONFIG_CPU_MMP2
-#include <mach/pm-mmp2.h>
-#endif
-#ifdef CONFIG_CPU_PXA910
-#include <mach/pm-pxa910.h>
-#endif
-
-#include "common.h"
-
-#define MAX_ICU_NR              16
-
-struct icu_chip_data {
-        int                     nr_irqs;
-        unsigned int            virq_base;
-        unsigned int            cascade_irq;
-        void __iomem            *reg_status;
-        void __iomem            *reg_mask;
-        unsigned int            conf_enable;
-        unsigned int            conf_disable;
-        unsigned int            conf_mask;
-        unsigned int            clr_mfp_irq_base;
-        unsigned int            clr_mfp_hwirq;
-        struct irq_domain       *domain;
-};
-
-struct mmp_intc_conf {
-        unsigned int    conf_enable;
-        unsigned int    conf_disable;
-        unsigned int    conf_mask;
-};
-
-void __iomem *mmp_icu_base;
-static struct icu_chip_data icu_data[MAX_ICU_NR];
-static int max_icu_nr;
-
-extern void mmp2_clear_pmic_int(void);
-
-static void icu_mask_ack_irq(struct irq_data *d)
-{
-        struct irq_domain *domain = d->domain;
-        struct icu_chip_data *data = (struct icu_chip_data *)domain->host_data;
-        int hwirq;
-        u32 r;
-
-        hwirq = d->irq - data->virq_base;
-        if (data == &icu_data[0]) {
-                r = readl_relaxed(mmp_icu_base + (hwirq << 2));
-                r &= ~data->conf_mask;
-                r |= data->conf_disable;
-                writel_relaxed(r, mmp_icu_base + (hwirq << 2));
-        } else {
-#ifdef CONFIG_CPU_MMP2
-                if ((data->virq_base == data->clr_mfp_irq_base)
-                        && (hwirq == data->clr_mfp_hwirq))
-                        mmp2_clear_pmic_int();
-#endif
-                r = readl_relaxed(data->reg_mask) | (1 << hwirq);
-                writel_relaxed(r, data->reg_mask);
-        }
-}
-
-static void icu_mask_irq(struct irq_data *d)
-{
-        struct irq_domain *domain = d->domain;
-        struct icu_chip_data *data = (struct icu_chip_data *)domain->host_data;
-        int hwirq;
-        u32 r;
-
-        hwirq = d->irq - data->virq_base;
-        if (data == &icu_data[0]) {
-                r = readl_relaxed(mmp_icu_base + (hwirq << 2));
-                r &= ~data->conf_mask;
-                r |= data->conf_disable;
-                writel_relaxed(r, mmp_icu_base + (hwirq << 2));
-        } else {
-                r = readl_relaxed(data->reg_mask) | (1 << hwirq);
-                writel_relaxed(r, data->reg_mask);
-        }
-}
-
-static void icu_unmask_irq(struct irq_data *d)
-{
-        struct irq_domain *domain = d->domain;
-        struct icu_chip_data *data = (struct icu_chip_data *)domain->host_data;
-        int hwirq;
-        u32 r;
-
-        hwirq = d->irq - data->virq_base;
-        if (data == &icu_data[0]) {
-                r = readl_relaxed(mmp_icu_base + (hwirq << 2));
-                r &= ~data->conf_mask;
-                r |= data->conf_enable;
-                writel_relaxed(r, mmp_icu_base + (hwirq << 2));
-        } else {
-                r = readl_relaxed(data->reg_mask) & ~(1 << hwirq);
-                writel_relaxed(r, data->reg_mask);
-        }
-}
-
-static struct irq_chip icu_irq_chip = {
-        .name           = "icu_irq",
-        .irq_mask       = icu_mask_irq,
-        .irq_mask_ack   = icu_mask_ack_irq,
-        .irq_unmask     = icu_unmask_irq,
-};
-
-static void icu_mux_irq_demux(unsigned int irq, struct irq_desc *desc)
-{
-        struct irq_domain *domain;
-        struct icu_chip_data *data;
-        int i;
-        unsigned long mask, status, n;
-
-        for (i = 1; i < max_icu_nr; i++) {
-                if (irq == icu_data[i].cascade_irq) {
-                        domain = icu_data[i].domain;
-                        data = (struct icu_chip_data *)domain->host_data;
-                        break;
-                }
-        }
-        if (i >= max_icu_nr) {
-                pr_err("Spurious irq %d in MMP INTC\n", irq);
-                return;
-        }
-
-        mask = readl_relaxed(data->reg_mask);
-        while (1) {
-                status = readl_relaxed(data->reg_status) & ~mask;
-                if (status == 0)
-                        break;
-                for_each_set_bit(n, &status, BITS_PER_LONG) {
-                        generic_handle_irq(icu_data[i].virq_base + n);
-                }
-        }
-}
-
-static int mmp_irq_domain_map(struct irq_domain *d, unsigned int irq,
-                              irq_hw_number_t hw)
-{
-        irq_set_chip_and_handler(irq, &icu_irq_chip, handle_level_irq);
-        set_irq_flags(irq, IRQF_VALID);
-        return 0;
-}
-
-static int mmp_irq_domain_xlate(struct irq_domain *d, struct device_node *node,
-                                const u32 *intspec, unsigned int intsize,
-                                unsigned long *out_hwirq,
-                                unsigned int *out_type)
-{
-        *out_hwirq = intspec[0];
-        return 0;
-}
-
-const struct irq_domain_ops mmp_irq_domain_ops = {
-        .map            = mmp_irq_domain_map,
-        .xlate          = mmp_irq_domain_xlate,
-};
-
-static struct mmp_intc_conf mmp_conf = {
-        .conf_enable    = 0x51,
-        .conf_disable   = 0x0,
-        .conf_mask      = 0x7f,
-};
-
-static struct mmp_intc_conf mmp2_conf = {
-        .conf_enable    = 0x20,
-        .conf_disable   = 0x0,
-        .conf_mask      = 0x7f,
-};
-
-/* MMP (ARMv5) */
-void __init icu_init_irq(void)
-{
-        int irq;
-
-        max_icu_nr = 1;
-        mmp_icu_base = ioremap(0xd4282000, 0x1000);
-        icu_data[0].conf_enable = mmp_conf.conf_enable;
-        icu_data[0].conf_disable = mmp_conf.conf_disable;
-        icu_data[0].conf_mask = mmp_conf.conf_mask;
-        icu_data[0].nr_irqs = 64;
-        icu_data[0].virq_base = 0;
-        icu_data[0].domain = irq_domain_add_legacy(NULL, 64, 0, 0,
-                                                   &irq_domain_simple_ops,
-                                                   &icu_data[0]);
-        for (irq = 0; irq < 64; irq++) {
-                icu_mask_irq(irq_get_irq_data(irq));
-                irq_set_chip_and_handler(irq, &icu_irq_chip, handle_level_irq);
-                set_irq_flags(irq, IRQF_VALID);
-        }
-        irq_set_default_host(icu_data[0].domain);
-#ifdef CONFIG_CPU_PXA910
-        icu_irq_chip.irq_set_wake = pxa910_set_wake;
-#endif
-}
-
-/* MMP2 (ARMv7) */
-void __init mmp2_init_icu(void)
-{
-        int irq;
-
-        max_icu_nr = 8;
-        mmp_icu_base = ioremap(0xd4282000, 0x1000);
-        icu_data[0].conf_enable = mmp2_conf.conf_enable;
-        icu_data[0].conf_disable = mmp2_conf.conf_disable;
-        icu_data[0].conf_mask = mmp2_conf.conf_mask;
-        icu_data[0].nr_irqs = 64;
-        icu_data[0].virq_base = 0;
-        icu_data[0].domain = irq_domain_add_legacy(NULL, 64, 0, 0,
-                                                   &irq_domain_simple_ops,
-                                                   &icu_data[0]);
-        icu_data[1].reg_status = mmp_icu_base + 0x150;
-        icu_data[1].reg_mask = mmp_icu_base + 0x168;
-        icu_data[1].clr_mfp_irq_base = IRQ_MMP2_PMIC_BASE;
-        icu_data[1].clr_mfp_hwirq = IRQ_MMP2_PMIC - IRQ_MMP2_PMIC_BASE;
-        icu_data[1].nr_irqs = 2;
-        icu_data[1].cascade_irq = 4;
-        icu_data[1].virq_base = IRQ_MMP2_PMIC_BASE;
-        icu_data[1].domain = irq_domain_add_legacy(NULL, icu_data[1].nr_irqs,
-                                                   icu_data[1].virq_base, 0,
-                                                   &irq_domain_simple_ops,
-                                                   &icu_data[1]);
-        icu_data[2].reg_status = mmp_icu_base + 0x154;
-        icu_data[2].reg_mask = mmp_icu_base + 0x16c;
-        icu_data[2].nr_irqs = 2;
-        icu_data[2].cascade_irq = 5;
-        icu_data[2].virq_base = IRQ_MMP2_RTC_BASE;
-        icu_data[2].domain = irq_domain_add_legacy(NULL, icu_data[2].nr_irqs,
-                                                   icu_data[2].virq_base, 0,
-                                                   &irq_domain_simple_ops,
-                                                   &icu_data[2]);
-        icu_data[3].reg_status = mmp_icu_base + 0x180;
-        icu_data[3].reg_mask = mmp_icu_base + 0x17c;
-        icu_data[3].nr_irqs = 3;
-        icu_data[3].cascade_irq = 9;
-        icu_data[3].virq_base = IRQ_MMP2_KEYPAD_BASE;
-        icu_data[3].domain = irq_domain_add_legacy(NULL, icu_data[3].nr_irqs,
-                                                   icu_data[3].virq_base, 0,
-                                                   &irq_domain_simple_ops,
-                                                   &icu_data[3]);
-        icu_data[4].reg_status = mmp_icu_base + 0x158;
-        icu_data[4].reg_mask = mmp_icu_base + 0x170;
-        icu_data[4].nr_irqs = 5;
-        icu_data[4].cascade_irq = 17;
-        icu_data[4].virq_base = IRQ_MMP2_TWSI_BASE;
-        icu_data[4].domain = irq_domain_add_legacy(NULL, icu_data[4].nr_irqs,
-                                                   icu_data[4].virq_base, 0,
-                                                   &irq_domain_simple_ops,
-                                                   &icu_data[4]);
-        icu_data[5].reg_status = mmp_icu_base + 0x15c;
-        icu_data[5].reg_mask = mmp_icu_base + 0x174;
-        icu_data[5].nr_irqs = 15;
-        icu_data[5].cascade_irq = 35;
-        icu_data[5].virq_base = IRQ_MMP2_MISC_BASE;
-        icu_data[5].domain = irq_domain_add_legacy(NULL, icu_data[5].nr_irqs,
-                                                   icu_data[5].virq_base, 0,
-                                                   &irq_domain_simple_ops,
-                                                   &icu_data[5]);
-        icu_data[6].reg_status = mmp_icu_base + 0x160;
-        icu_data[6].reg_mask = mmp_icu_base + 0x178;
-        icu_data[6].nr_irqs = 2;
-        icu_data[6].cascade_irq = 51;
-        icu_data[6].virq_base = IRQ_MMP2_MIPI_HSI1_BASE;
-        icu_data[6].domain = irq_domain_add_legacy(NULL, icu_data[6].nr_irqs,
-                                                   icu_data[6].virq_base, 0,
-                                                   &irq_domain_simple_ops,
-                                                   &icu_data[6]);
-        icu_data[7].reg_status = mmp_icu_base + 0x188;
-        icu_data[7].reg_mask = mmp_icu_base + 0x184;
-        icu_data[7].nr_irqs = 2;
-        icu_data[7].cascade_irq = 55;
-        icu_data[7].virq_base = IRQ_MMP2_MIPI_HSI0_BASE;
-        icu_data[7].domain = irq_domain_add_legacy(NULL, icu_data[7].nr_irqs,
-                                                   icu_data[7].virq_base, 0,
-                                                   &irq_domain_simple_ops,
-                                                   &icu_data[7]);
-        for (irq = 0; irq < IRQ_MMP2_MUX_END; irq++) {
-                icu_mask_irq(irq_get_irq_data(irq));
-                switch (irq) {
-                case IRQ_MMP2_PMIC_MUX:
-                case IRQ_MMP2_RTC_MUX:
-                case IRQ_MMP2_KEYPAD_MUX:
-                case IRQ_MMP2_TWSI_MUX:
-                case IRQ_MMP2_MISC_MUX:
-                case IRQ_MMP2_MIPI_HSI1_MUX:
-                case IRQ_MMP2_MIPI_HSI0_MUX:
-                        irq_set_chip(irq, &icu_irq_chip);
-                        irq_set_chained_handler(irq, icu_mux_irq_demux);
-                        break;
-                default:
-                        irq_set_chip_and_handler(irq, &icu_irq_chip,
-                                                 handle_level_irq);
-                        break;
-                }
-                set_irq_flags(irq, IRQF_VALID);
-        }
-        irq_set_default_host(icu_data[0].domain);
-#ifdef CONFIG_CPU_MMP2
-        icu_irq_chip.irq_set_wake = mmp2_set_wake;
-#endif
-}
-
-#ifdef CONFIG_OF
-static const struct of_device_id intc_ids[] __initconst = {
-        { .compatible = "mrvl,mmp-intc", .data = &mmp_conf },
-        { .compatible = "mrvl,mmp2-intc", .data = &mmp2_conf },
-        {}
-};
-
-static const struct of_device_id mmp_mux_irq_match[] __initconst = {
-        { .compatible = "mrvl,mmp2-mux-intc" },
-        {}
-};
-
-int __init mmp2_mux_init(struct device_node *parent)
-{
-        struct device_node *node;
-        const struct of_device_id *of_id;
-        struct resource res;
-        int i, irq_base, ret, irq;
-        u32 nr_irqs, mfp_irq;
-
-        node = parent;
-        max_icu_nr = 1;
-        for (i = 1; i < MAX_ICU_NR; i++) {
-                node = of_find_matching_node(node, mmp_mux_irq_match);
-                if (!node)
-                        break;
-                of_id = of_match_node(&mmp_mux_irq_match[0], node);
-                ret = of_property_read_u32(node, "mrvl,intc-nr-irqs",
-                                           &nr_irqs);
-                if (ret) {
-                        pr_err("Not found mrvl,intc-nr-irqs property\n");
-                        ret = -EINVAL;
-                        goto err;
-                }
-                ret = of_address_to_resource(node, 0, &res);
-                if (ret < 0) {
-                        pr_err("Not found reg property\n");
-                        ret = -EINVAL;
-                        goto err;
-                }
-                icu_data[i].reg_status = mmp_icu_base + res.start;
-                ret = of_address_to_resource(node, 1, &res);
-                if (ret < 0) {
-                        pr_err("Not found reg property\n");
-                        ret = -EINVAL;
-                        goto err;
-                }
-                icu_data[i].reg_mask = mmp_icu_base + res.start;
-                icu_data[i].cascade_irq = irq_of_parse_and_map(node, 0);
-                if (!icu_data[i].cascade_irq) {
-                        ret = -EINVAL;
-                        goto err;
-                }
-
-                irq_base = irq_alloc_descs(-1, 0, nr_irqs, 0);
-                if (irq_base < 0) {
-                        pr_err("Failed to allocate IRQ numbers for mux intc\n");
-                        ret = irq_base;
-                        goto err;
-                }
-                if (!of_property_read_u32(node, "mrvl,clr-mfp-irq",
-                                          &mfp_irq)) {
-                        icu_data[i].clr_mfp_irq_base = irq_base;
-                        icu_data[i].clr_mfp_hwirq = mfp_irq;
-                }
-                irq_set_chained_handler(icu_data[i].cascade_irq,
-                                        icu_mux_irq_demux);
-                icu_data[i].nr_irqs = nr_irqs;
-                icu_data[i].virq_base = irq_base;
-                icu_data[i].domain = irq_domain_add_legacy(node, nr_irqs,
-                                                           irq_base, 0,
-                                                           &mmp_irq_domain_ops,
-                                                           &icu_data[i]);
-                for (irq = irq_base; irq < irq_base + nr_irqs; irq++)
-                        icu_mask_irq(irq_get_irq_data(irq));
-        }
-        max_icu_nr = i;
-        return 0;
-err:
-        of_node_put(node);
-        max_icu_nr = i;
-        return ret;
-}
-
-void __init mmp_dt_irq_init(void)
-{
-        struct device_node *node;
-        const struct of_device_id *of_id;
-        struct mmp_intc_conf *conf;
-        int nr_irqs, irq_base, ret, irq;
-
-        node = of_find_matching_node(NULL, intc_ids);
-        if (!node) {
-                pr_err("Failed to find interrupt controller in arch-mmp\n");
-                return;
-        }
-        of_id = of_match_node(intc_ids, node);
-        conf = of_id->data;
-
-        ret = of_property_read_u32(node, "mrvl,intc-nr-irqs", &nr_irqs);
-        if (ret) {
-                pr_err("Not found mrvl,intc-nr-irqs property\n");
-                return;
-        }
-
-        mmp_icu_base = of_iomap(node, 0);
-        if (!mmp_icu_base) {
-                pr_err("Failed to get interrupt controller register\n");
-                return;
-        }
-
-        irq_base = irq_alloc_descs(-1, 0, nr_irqs - NR_IRQS_LEGACY, 0);
-        if (irq_base < 0) {
-                pr_err("Failed to allocate IRQ numbers\n");
-                goto err;
-        } else if (irq_base != NR_IRQS_LEGACY) {
-                pr_err("ICU's irqbase should be started from 0\n");
-                goto err;
-        }
-        icu_data[0].conf_enable = conf->conf_enable;
-        icu_data[0].conf_disable = conf->conf_disable;
-        icu_data[0].conf_mask = conf->conf_mask;
-        icu_data[0].nr_irqs = nr_irqs;
-        icu_data[0].virq_base = 0;
-        icu_data[0].domain = irq_domain_add_legacy(node, nr_irqs, 0, 0,
-                                                   &mmp_irq_domain_ops,
-                                                   &icu_data[0]);
-        irq_set_default_host(icu_data[0].domain);
-        for (irq = 0; irq < nr_irqs; irq++)
-                icu_mask_irq(irq_get_irq_data(irq));
-        mmp2_mux_init(node);
-        return;
-err:
-        iounmap(mmp_icu_base);
-}
-#endif
diff --git a/arch/arm/mach-mmp/mmp-dt.c b/arch/arm/mach-mmp/mmp-dt.c
index b37915dc4470..cca529ceecb7 100644
--- a/arch/arm/mach-mmp/mmp-dt.c
+++ b/arch/arm/mach-mmp/mmp-dt.c
@@ -9,17 +9,13 @@
  *  publishhed by the Free Software Foundation.
  */
 
-#include <linux/irq.h>
-#include <linux/irqdomain.h>
-#include <linux/of_irq.h>
+#include <linux/irqchip.h>
 #include <linux/of_platform.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
-#include <mach/irqs.h>
 
 #include "common.h"
 
-extern void __init mmp_dt_irq_init(void);
 extern void __init mmp_dt_init_timer(void);
 
 static const struct of_dev_auxdata pxa168_auxdata_lookup[] __initconst = {
@@ -64,7 +60,6 @@ static const char *mmp_dt_board_compat[] __initdata = {
 
 DT_MACHINE_START(PXA168_DT, "Marvell PXA168 (Device Tree Support)")
         .map_io         = mmp_map_io,
-        .init_irq       = mmp_dt_irq_init,
         .init_time      = mmp_dt_init_timer,
         .init_machine   = pxa168_dt_init,
         .dt_compat      = mmp_dt_board_compat,
@@ -72,7 +67,6 @@ MACHINE_END
 
 DT_MACHINE_START(PXA910_DT, "Marvell PXA910 (Device Tree Support)")
         .map_io         = mmp_map_io,
-        .init_irq       = mmp_dt_irq_init,
         .init_time      = mmp_dt_init_timer,
         .init_machine   = pxa910_dt_init,
         .dt_compat      = mmp_dt_board_compat,
diff --git a/arch/arm/mach-mmp/mmp2-dt.c b/arch/arm/mach-mmp/mmp2-dt.c
index 4ac256720f7d..023cb453f157 100644
--- a/arch/arm/mach-mmp/mmp2-dt.c
+++ b/arch/arm/mach-mmp/mmp2-dt.c
@@ -10,18 +10,13 @@
  */
 
 #include <linux/io.h>
-#include <linux/irq.h>
-#include <linux/irqdomain.h>
-#include <linux/of_irq.h>
+#include <linux/irqchip.h>
 #include <linux/of_platform.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/time.h>
-#include <mach/irqs.h>
-#include <mach/regs-apbc.h>
 
 #include "common.h"
 
-extern void __init mmp_dt_irq_init(void);
 extern void __init mmp_dt_init_timer(void);
 
 static const struct of_dev_auxdata mmp2_auxdata_lookup[] __initconst = {
@@ -49,7 +44,6 @@ static const char *mmp2_dt_board_compat[] __initdata = {
 
 DT_MACHINE_START(MMP2_DT, "Marvell MMP2 (Device Tree Support)")
         .map_io         = mmp_map_io,
-        .init_irq       = mmp_dt_irq_init,
         .init_time      = mmp_dt_init_timer,
         .init_machine   = mmp2_dt_init,
         .dt_compat      = mmp2_dt_board_compat,
diff --git a/arch/arm/mach-mmp/mmp2.c b/arch/arm/mach-mmp/mmp2.c
index c7592f168bbd..a70b5530bd42 100644
--- a/arch/arm/mach-mmp/mmp2.c
+++ b/arch/arm/mach-mmp/mmp2.c
@@ -13,6 +13,8 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/irqchip/mmp.h>
 #include <linux/platform_device.h>
 
 #include <asm/hardware/cache-tauros2.h>
@@ -26,6 +28,7 @@
 #include <mach/mfp.h>
 #include <mach/devices.h>
 #include <mach/mmp2.h>
+#include <mach/pm-mmp2.h>
 
 #include "common.h"
 
@@ -94,6 +97,9 @@ void mmp2_clear_pmic_int(void)
 void __init mmp2_init_irq(void)
 {
         mmp2_init_icu();
+#ifdef CONFIG_PM
+        icu_irq_chip.irq_set_wake = mmp2_set_wake;
+#endif
 }
 
 static int __init mmp2_init(void)
diff --git a/arch/arm/mach-mmp/pxa910.c b/arch/arm/mach-mmp/pxa910.c
index ce6393acad86..eb57ee196842 100644
--- a/arch/arm/mach-mmp/pxa910.c
+++ b/arch/arm/mach-mmp/pxa910.c
@@ -12,6 +12,8 @@
 #include <linux/init.h>
 #include <linux/list.h>
 #include <linux/io.h>
+#include <linux/irq.h>
+#include <linux/irqchip/mmp.h>
 #include <linux/platform_device.h>
 
 #include <asm/hardware/cache-tauros2.h>
@@ -23,6 +25,8 @@
 #include <mach/dma.h>
 #include <mach/mfp.h>
 #include <mach/devices.h>
+#include <mach/pm-pxa910.h>
+#include <mach/pxa910.h>
 
 #include "common.h"
 
@@ -79,6 +83,9 @@ static struct mfp_addr_map pxa910_mfp_addr_map[] __initdata =
 void __init pxa910_init_irq(void)
 {
         icu_init_irq();
+#ifdef CONFIG_PM
+        icu_irq_chip.irq_set_wake = pxa910_set_wake;
+#endif
 }
 
 static int __init pxa910_init(void)
diff --git a/arch/arm/mach-mmp/ttc_dkb.c b/arch/arm/mach-mmp/ttc_dkb.c
index 8483906d4308..702232996c8c 100644
--- a/arch/arm/mach-mmp/ttc_dkb.c
+++ b/arch/arm/mach-mmp/ttc_dkb.c
@@ -15,7 +15,7 @@
 #include <linux/mtd/partitions.h>
 #include <linux/mtd/onenand.h>
 #include <linux/interrupt.h>
-#include <linux/i2c/pca953x.h>
+#include <linux/platform_data/pca953x.h>
 #include <linux/gpio.h>
 #include <linux/gpio-pxa.h>
 #include <linux/mfd/88pm860x.h>
diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile
index d257ff40e16b..d872634c2f85 100644
--- a/arch/arm/mach-msm/Makefile
+++ b/arch/arm/mach-msm/Makefile
@@ -1,17 +1,16 @@
-obj-y += io.o timer.o
+obj-y += timer.o
 obj-y += clock.o
 
 obj-$(CONFIG_MSM_VIC) += irq-vic.o
-obj-$(CONFIG_MSM_IOMMU) += devices-iommu.o
 
 obj-$(CONFIG_ARCH_MSM7X00A) += irq.o
 obj-$(CONFIG_ARCH_QSD8X50) += sirc.o
 
 obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o clock-pcom.o vreg.o
 
-obj-$(CONFIG_ARCH_MSM7X00A) += dma.o
-obj-$(CONFIG_ARCH_MSM7X30) += dma.o
-obj-$(CONFIG_ARCH_QSD8X50) += dma.o
+obj-$(CONFIG_ARCH_MSM7X00A) += dma.o io.o
+obj-$(CONFIG_ARCH_MSM7X30) += dma.o io.o
+obj-$(CONFIG_ARCH_QSD8X50) += dma.o io.o
 
 obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o
 obj-$(CONFIG_MSM_SMD) += last_radio_log.o
diff --git a/arch/arm/mach-msm/board-dt-8660.c b/arch/arm/mach-msm/board-dt-8660.c
index 492f5cd87b0a..c2946892f5e3 100644
--- a/arch/arm/mach-msm/board-dt-8660.c
+++ b/arch/arm/mach-msm/board-dt-8660.c
@@ -15,8 +15,8 @@
 #include <linux/of_platform.h>
 
 #include <asm/mach/arch.h>
+#include <asm/mach/map.h>
 
-#include <mach/board.h>
 #include "common.h"
 
 static void __init msm8x60_init_late(void)
@@ -42,9 +42,7 @@ static const char *msm8x60_fluid_match[] __initdata = {
 
 DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
         .smp = smp_ops(msm_smp_ops),
-        .map_io = msm_map_msm8x60_io,
         .init_machine = msm8x60_dt_init,
         .init_late = msm8x60_init_late,
-        .init_time      = msm_dt_timer_init,
         .dt_compat = msm8x60_fluid_match,
 MACHINE_END
diff --git a/arch/arm/mach-msm/board-dt-8960.c b/arch/arm/mach-msm/board-dt-8960.c
index bb5530957c4f..d4ca52c45111 100644
--- a/arch/arm/mach-msm/board-dt-8960.c
+++ b/arch/arm/mach-msm/board-dt-8960.c
@@ -14,6 +14,7 @@
 #include <linux/of_platform.h>
 
 #include <asm/mach/arch.h>
+#include <asm/mach/map.h>
 
 #include "common.h"
 
@@ -29,8 +30,6 @@ static const char * const msm8960_dt_match[] __initconst = {
 
 DT_MACHINE_START(MSM8960_DT, "Qualcomm MSM (Flattened Device Tree)")
         .smp = smp_ops(msm_smp_ops),
-        .map_io = msm_map_msm8960_io,
-        .init_time      = msm_dt_timer_init,
         .init_machine = msm_dt_init,
         .dt_compat = msm8960_dt_match,
 MACHINE_END
diff --git a/arch/arm/mach-msm/board-halibut.c b/arch/arm/mach-msm/board-halibut.c
index 803651ad4f62..a77529887cbc 100644
--- a/arch/arm/mach-msm/board-halibut.c
+++ b/arch/arm/mach-msm/board-halibut.c
@@ -29,7 +29,6 @@
 #include <asm/setup.h>
 
 #include <mach/irqs.h>
-#include <mach/board.h>
 #include <mach/msm_iomap.h>
 
 #include <linux/mtd/nand.h>
diff --git a/arch/arm/mach-msm/board-mahimahi.c b/arch/arm/mach-msm/board-mahimahi.c
index 30c3496db593..7d9981cb400e 100644
--- a/arch/arm/mach-msm/board-mahimahi.c
+++ b/arch/arm/mach-msm/board-mahimahi.c
@@ -28,12 +28,12 @@
 #include <asm/mach/map.h>
 #include <asm/setup.h>
 
-#include <mach/board.h>
 #include <mach/hardware.h>
 
 #include "board-mahimahi.h"
 #include "devices.h"
 #include "proc_comm.h"
+#include "common.h"
 
 static uint debug_uart;
 
diff --git a/arch/arm/mach-msm/board-msm7x30.c b/arch/arm/mach-msm/board-msm7x30.c
index db3d8c0bc8a4..f9af5a46e8b6 100644
--- a/arch/arm/mach-msm/board-msm7x30.c
+++ b/arch/arm/mach-msm/board-msm7x30.c
@@ -30,7 +30,6 @@
 #include <asm/memory.h>
 #include <asm/setup.h>
 
-#include <mach/board.h>
 #include <mach/msm_iomap.h>
 #include <mach/dma.h>
 
diff --git a/arch/arm/mach-msm/board-qsd8x50.c b/arch/arm/mach-msm/board-qsd8x50.c
index f14a73d86bc0..5f933bc50783 100644
--- a/arch/arm/mach-msm/board-qsd8x50.c
+++ b/arch/arm/mach-msm/board-qsd8x50.c
@@ -28,7 +28,6 @@
 #include <asm/io.h>
 #include <asm/setup.h>
 
-#include <mach/board.h>
 #include <mach/irqs.h>
 #include <mach/sirc.h>
 #include <mach/vreg.h>
diff --git a/arch/arm/mach-msm/board-sapphire.c b/arch/arm/mach-msm/board-sapphire.c
index 70730111b37c..327605174d63 100644
--- a/arch/arm/mach-msm/board-sapphire.c
+++ b/arch/arm/mach-msm/board-sapphire.c
@@ -28,7 +28,6 @@
 #include <asm/mach/map.h>
 #include <asm/mach/flash.h>
 #include <mach/vreg.h>
-#include <mach/board.h>
 
 #include <asm/io.h>
 #include <asm/delay.h>
@@ -41,6 +40,7 @@
 #include "board-sapphire.h"
 #include "proc_comm.h"
 #include "devices.h"
+#include "common.h"
 
 void msm_init_irq(void);
 void msm_init_gpio(void);
diff --git a/arch/arm/mach-msm/board-trout.c b/arch/arm/mach-msm/board-trout.c
index 64a46eb4fc49..ccf6621bc664 100644
--- a/arch/arm/mach-msm/board-trout.c
+++ b/arch/arm/mach-msm/board-trout.c
@@ -25,7 +25,6 @@
 #include <asm/mach/map.h>
 #include <asm/setup.h>
 
-#include <mach/board.h>
 #include <mach/hardware.h>
 #include <mach/msm_iomap.h>
 
diff --git a/arch/arm/mach-msm/board-trout.h b/arch/arm/mach-msm/board-trout.h
index 651851c3e1dd..b2379ede43bc 100644
--- a/arch/arm/mach-msm/board-trout.h
+++ b/arch/arm/mach-msm/board-trout.h
@@ -4,7 +4,7 @@
 #ifndef __ARCH_ARM_MACH_MSM_BOARD_TROUT_H
 #define __ARCH_ARM_MACH_MSM_BOARD_TROUT_H
 
-#include <mach/board.h>
+#include "common.h"
 
 #define MSM_SMI_BASE            0x00000000
 #define MSM_SMI_SIZE            0x00800000
diff --git a/arch/arm/mach-msm/common.h b/arch/arm/mach-msm/common.h
index 421cf7751a80..33c7725adae2 100644
--- a/arch/arm/mach-msm/common.h
+++ b/arch/arm/mach-msm/common.h
@@ -14,13 +14,10 @@
 
 extern void msm7x01_timer_init(void);
 extern void msm7x30_timer_init(void);
-extern void msm_dt_timer_init(void);
 extern void qsd8x50_timer_init(void);
 
 extern void msm_map_common_io(void);
 extern void msm_map_msm7x30_io(void);
-extern void msm_map_msm8x60_io(void);
-extern void msm_map_msm8960_io(void);
 extern void msm_map_qsd8x50_io(void);
 
 extern void __iomem *__msm_ioremap_caller(phys_addr_t phys_addr, size_t size,
@@ -29,4 +26,19 @@ extern void __iomem *__msm_ioremap_caller(phys_addr_t phys_addr, size_t size,
 extern struct smp_operations msm_smp_ops;
 extern void msm_cpu_die(unsigned int cpu);
 
+struct msm_mmc_platform_data;
+
+extern void msm_add_devices(void);
+extern void msm_init_irq(void);
+extern void msm_init_gpio(void);
+extern int msm_add_sdcc(unsigned int controller,
+                        struct msm_mmc_platform_data *plat,
+                        unsigned int stat_irq, unsigned long stat_irq_flags);
+
+#if defined(CONFIG_MSM_SMD) && defined(CONFIG_DEBUG_FS)
+extern int smd_debugfs_init(void);
+#else
+static inline int smd_debugfs_init(void) { return 0; }
+#endif
+
 #endif
diff --git a/arch/arm/mach-msm/devices-iommu.c b/arch/arm/mach-msm/devices-iommu.c
deleted file mode 100644
index 0fb7a17df398..000000000000
--- a/arch/arm/mach-msm/devices-iommu.c
+++ /dev/null
@@ -1,912 +0,0 @@
-/* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#include <linux/kernel.h>
-#include <linux/platform_device.h>
-#include <linux/bootmem.h>
-#include <linux/module.h>
-#include <mach/irqs.h>
-#include <mach/iommu.h>
-
-static struct resource msm_iommu_jpegd_resources[] = {
-        {
-                .start = 0x07300000,
-                .end   = 0x07300000 + SZ_1M - 1,
-                .name  = "physbase",
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .name = "nonsecure_irq",
-                .start = SMMU_JPEGD_CB_SC_NON_SECURE_IRQ,
-                .end   = SMMU_JPEGD_CB_SC_NON_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-        {
-                .name = "secure_irq",
-                .start = SMMU_JPEGD_CB_SC_SECURE_IRQ,
-                .end   = SMMU_JPEGD_CB_SC_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct resource msm_iommu_vpe_resources[] = {
-        {
-                .start = 0x07400000,
-                .end   = 0x07400000 + SZ_1M - 1,
-                .name  = "physbase",
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .name = "nonsecure_irq",
-                .start = SMMU_VPE_CB_SC_NON_SECURE_IRQ,
-                .end   = SMMU_VPE_CB_SC_NON_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-        {
-                .name = "secure_irq",
-                .start = SMMU_VPE_CB_SC_SECURE_IRQ,
-                .end   = SMMU_VPE_CB_SC_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct resource msm_iommu_mdp0_resources[] = {
-        {
-                .start = 0x07500000,
-                .end   = 0x07500000 + SZ_1M - 1,
-                .name  = "physbase",
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .name = "nonsecure_irq",
-                .start = SMMU_MDP0_CB_SC_NON_SECURE_IRQ,
-                .end   = SMMU_MDP0_CB_SC_NON_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-        {
-                .name = "secure_irq",
-                .start = SMMU_MDP0_CB_SC_SECURE_IRQ,
-                .end   = SMMU_MDP0_CB_SC_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct resource msm_iommu_mdp1_resources[] = {
-        {
-                .start = 0x07600000,
-                .end   = 0x07600000 + SZ_1M - 1,
-                .name  = "physbase",
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .name = "nonsecure_irq",
-                .start = SMMU_MDP1_CB_SC_NON_SECURE_IRQ,
-                .end   = SMMU_MDP1_CB_SC_NON_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-        {
-                .name = "secure_irq",
-                .start = SMMU_MDP1_CB_SC_SECURE_IRQ,
-                .end   = SMMU_MDP1_CB_SC_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct resource msm_iommu_rot_resources[] = {
-        {
-                .start = 0x07700000,
-                .end   = 0x07700000 + SZ_1M - 1,
-                .name  = "physbase",
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .name = "nonsecure_irq",
-                .start = SMMU_ROT_CB_SC_NON_SECURE_IRQ,
-                .end   = SMMU_ROT_CB_SC_NON_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-        {
-                .name = "secure_irq",
-                .start = SMMU_ROT_CB_SC_SECURE_IRQ,
-                .end   = SMMU_ROT_CB_SC_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct resource msm_iommu_ijpeg_resources[] = {
-        {
-                .start = 0x07800000,
-                .end   = 0x07800000 + SZ_1M - 1,
-                .name  = "physbase",
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .name = "nonsecure_irq",
-                .start = SMMU_IJPEG_CB_SC_NON_SECURE_IRQ,
-                .end   = SMMU_IJPEG_CB_SC_NON_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-        {
-                .name = "secure_irq",
-                .start = SMMU_IJPEG_CB_SC_SECURE_IRQ,
-                .end   = SMMU_IJPEG_CB_SC_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct resource msm_iommu_vfe_resources[] = {
-        {
-                .start = 0x07900000,
-                .end   = 0x07900000 + SZ_1M - 1,
-                .name  = "physbase",
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .name = "nonsecure_irq",
-                .start = SMMU_VFE_CB_SC_NON_SECURE_IRQ,
-                .end   = SMMU_VFE_CB_SC_NON_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-        {
-                .name = "secure_irq",
-                .start = SMMU_VFE_CB_SC_SECURE_IRQ,
-                .end   = SMMU_VFE_CB_SC_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct resource msm_iommu_vcodec_a_resources[] = {
-        {
-                .start = 0x07A00000,
-                .end   = 0x07A00000 + SZ_1M - 1,
-                .name  = "physbase",
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .name = "nonsecure_irq",
-                .start = SMMU_VCODEC_A_CB_SC_NON_SECURE_IRQ,
-                .end   = SMMU_VCODEC_A_CB_SC_NON_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-        {
-                .name = "secure_irq",
-                .start = SMMU_VCODEC_A_CB_SC_SECURE_IRQ,
-                .end   = SMMU_VCODEC_A_CB_SC_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct resource msm_iommu_vcodec_b_resources[] = {
-        {
-                .start = 0x07B00000,
-                .end   = 0x07B00000 + SZ_1M - 1,
-                .name  = "physbase",
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .name = "nonsecure_irq",
-                .start = SMMU_VCODEC_B_CB_SC_NON_SECURE_IRQ,
-                .end   = SMMU_VCODEC_B_CB_SC_NON_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-        {
-                .name = "secure_irq",
-                .start = SMMU_VCODEC_B_CB_SC_SECURE_IRQ,
-                .end   = SMMU_VCODEC_B_CB_SC_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct resource msm_iommu_gfx3d_resources[] = {
-        {
-                .start = 0x07C00000,
-                .end   = 0x07C00000 + SZ_1M - 1,
-                .name  = "physbase",
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .name = "nonsecure_irq",
-                .start = SMMU_GFX3D_CB_SC_NON_SECURE_IRQ,
-                .end   = SMMU_GFX3D_CB_SC_NON_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-        {
-                .name = "secure_irq",
-                .start = SMMU_GFX3D_CB_SC_SECURE_IRQ,
-                .end   = SMMU_GFX3D_CB_SC_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct resource msm_iommu_gfx2d0_resources[] = {
-        {
-                .start = 0x07D00000,
-                .end   = 0x07D00000 + SZ_1M - 1,
-                .name  = "physbase",
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .name = "nonsecure_irq",
-                .start = SMMU_GFX2D0_CB_SC_NON_SECURE_IRQ,
-                .end   = SMMU_GFX2D0_CB_SC_NON_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-        {
-                .name = "secure_irq",
-                .start = SMMU_GFX2D0_CB_SC_SECURE_IRQ,
-                .end   = SMMU_GFX2D0_CB_SC_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct resource msm_iommu_gfx2d1_resources[] = {
-        {
-                .start = 0x07E00000,
-                .end   = 0x07E00000 + SZ_1M - 1,
-                .name  = "physbase",
-                .flags = IORESOURCE_MEM,
-        },
-        {
-                .name = "nonsecure_irq",
-                .start = SMMU_GFX2D1_CB_SC_NON_SECURE_IRQ,
-                .end   = SMMU_GFX2D1_CB_SC_NON_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-        {
-                .name = "secure_irq",
-                .start = SMMU_GFX2D1_CB_SC_SECURE_IRQ,
-                .end   = SMMU_GFX2D1_CB_SC_SECURE_IRQ,
-                .flags = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device msm_root_iommu_dev = {
-        .name = "msm_iommu",
-        .id = -1,
-};
-
-static struct msm_iommu_dev jpegd_iommu = {
-        .name = "jpegd",
-        .ncb = 2,
-};
-
-static struct msm_iommu_dev vpe_iommu = {
-        .name = "vpe",
-        .ncb = 2,
-};
-
-static struct msm_iommu_dev mdp0_iommu = {
-        .name = "mdp0",
-        .ncb = 2,
-};
-
-static struct msm_iommu_dev mdp1_iommu = {
-        .name = "mdp1",
-        .ncb = 2,
-};
-
-static struct msm_iommu_dev rot_iommu = {
-        .name = "rot",
-        .ncb = 2,
-};
-
-static struct msm_iommu_dev ijpeg_iommu = {
-        .name = "ijpeg",
-        .ncb = 2,
-};
-
-static struct msm_iommu_dev vfe_iommu = {
-        .name = "vfe",
-        .ncb = 2,
-};
-
-static struct msm_iommu_dev vcodec_a_iommu = {
-        .name = "vcodec_a",
-        .ncb = 2,
-};
-
-static struct msm_iommu_dev vcodec_b_iommu = {
-        .name = "vcodec_b",
-        .ncb = 2,
-};
-
-static struct msm_iommu_dev gfx3d_iommu = {
-        .name = "gfx3d",
-        .ncb = 3,
-};
-
-static struct msm_iommu_dev gfx2d0_iommu = {
-        .name = "gfx2d0",
-        .ncb = 2,
-};
-
-static struct msm_iommu_dev gfx2d1_iommu = {
-        .name = "gfx2d1",
-        .ncb = 2,
-};
-
-static struct platform_device msm_device_iommu_jpegd = {
-        .name = "msm_iommu",
-        .id = 0,
-        .dev = {
-                .parent = &msm_root_iommu_dev.dev,
-        },
-        .num_resources = ARRAY_SIZE(msm_iommu_jpegd_resources),
-        .resource = msm_iommu_jpegd_resources,
-};
-
-static struct platform_device msm_device_iommu_vpe = {
-        .name = "msm_iommu",
-        .id = 1,
-        .dev = {
-                .parent = &msm_root_iommu_dev.dev,
-        },
-        .num_resources = ARRAY_SIZE(msm_iommu_vpe_resources),
-        .resource = msm_iommu_vpe_resources,
-};
-
-static struct platform_device msm_device_iommu_mdp0 = {
-        .name = "msm_iommu",
-        .id = 2,
-        .dev = {
-                .parent = &msm_root_iommu_dev.dev,
-        },
-        .num_resources = ARRAY_SIZE(msm_iommu_mdp0_resources),
-        .resource = msm_iommu_mdp0_resources,
-};
-
-static struct platform_device msm_device_iommu_mdp1 = {
-        .name = "msm_iommu",
-        .id = 3,
-        .dev = {
-                .parent = &msm_root_iommu_dev.dev,
-        },
-        .num_resources = ARRAY_SIZE(msm_iommu_mdp1_resources),
-        .resource = msm_iommu_mdp1_resources,
-};
-
-static struct platform_device msm_device_iommu_rot = {
-        .name = "msm_iommu",
-        .id = 4,
-        .dev = {
-                .parent = &msm_root_iommu_dev.dev,
-        },
-        .num_resources = ARRAY_SIZE(msm_iommu_rot_resources),
-        .resource = msm_iommu_rot_resources,
-};
-
-static struct platform_device msm_device_iommu_ijpeg = {
-        .name = "msm_iommu",
-        .id = 5,
-        .dev = {
-                .parent = &msm_root_iommu_dev.dev,
-        },
-        .num_resources = ARRAY_SIZE(msm_iommu_ijpeg_resources),
-        .resource = msm_iommu_ijpeg_resources,
-};
-
-static struct platform_device msm_device_iommu_vfe = {
-        .name = "msm_iommu",
-        .id = 6,
-        .dev = {
-                .parent = &msm_root_iommu_dev.dev,
-        },
-        .num_resources = ARRAY_SIZE(msm_iommu_vfe_resources),
-        .resource = msm_iommu_vfe_resources,
-};
-
-static struct platform_device msm_device_iommu_vcodec_a = {
-        .name = "msm_iommu",
-        .id = 7,
-        .dev = {
-                .parent = &msm_root_iommu_dev.dev,
-        },
-        .num_resources = ARRAY_SIZE(msm_iommu_vcodec_a_resources),
-        .resource = msm_iommu_vcodec_a_resources,
-};
-
-static struct platform_device msm_device_iommu_vcodec_b = {
-        .name = "msm_iommu",
-        .id = 8,
-        .dev = {
-                .parent = &msm_root_iommu_dev.dev,
-        },
-        .num_resources = ARRAY_SIZE(msm_iommu_vcodec_b_resources),
-        .resource = msm_iommu_vcodec_b_resources,
-};
-
-static struct platform_device msm_device_iommu_gfx3d = {
-        .name = "msm_iommu",
-        .id = 9,
-        .dev = {
-                .parent = &msm_root_iommu_dev.dev,
-        },
-        .num_resources = ARRAY_SIZE(msm_iommu_gfx3d_resources),
-        .resource = msm_iommu_gfx3d_resources,
-};
-
-static struct platform_device msm_device_iommu_gfx2d0 = {
-        .name = "msm_iommu",
-        .id = 10,
-        .dev = {
-                .parent = &msm_root_iommu_dev.dev,
-        },
-        .num_resources = ARRAY_SIZE(msm_iommu_gfx2d0_resources),
-        .resource = msm_iommu_gfx2d0_resources,
-};
-
-struct platform_device msm_device_iommu_gfx2d1 = {
-        .name = "msm_iommu",
-        .id = 11,
-        .dev = {
-                .parent = &msm_root_iommu_dev.dev,
-        },
-        .num_resources = ARRAY_SIZE(msm_iommu_gfx2d1_resources),
-        .resource = msm_iommu_gfx2d1_resources,
-};
-
-static struct msm_iommu_ctx_dev jpegd_src_ctx = {
-        .name = "jpegd_src",
-        .num = 0,
-        .mids = {0, -1}
-};
-
-static struct msm_iommu_ctx_dev jpegd_dst_ctx = {
-        .name = "jpegd_dst",
-        .num = 1,
-        .mids = {1, -1}
-};
-
-static struct msm_iommu_ctx_dev vpe_src_ctx = {
-        .name = "vpe_src",
-        .num = 0,
-        .mids = {0, -1}
-};
-
-static struct msm_iommu_ctx_dev vpe_dst_ctx = {
-        .name = "vpe_dst",
-        .num = 1,
-        .mids = {1, -1}
-};
-
-static struct msm_iommu_ctx_dev mdp_vg1_ctx = {
-        .name = "mdp_vg1",
-        .num = 0,
-        .mids = {0, 2, -1}
-};
-
-static struct msm_iommu_ctx_dev mdp_rgb1_ctx = {
-        .name = "mdp_rgb1",
-        .num = 1,
-        .mids = {1, 3, 4, 5, 6, 7, 8, 9, 10, -1}
-};
-
-static struct msm_iommu_ctx_dev mdp_vg2_ctx = {
-        .name = "mdp_vg2",
-        .num = 0,
-        .mids = {0, 2, -1}
-};
-
-static struct msm_iommu_ctx_dev mdp_rgb2_ctx = {
-        .name = "mdp_rgb2",
-        .num = 1,
-        .mids = {1, 3, 4, 5, 6, 7, 8, 9, 10, -1}
-};
-
-static struct msm_iommu_ctx_dev rot_src_ctx = {
-        .name = "rot_src",
-        .num = 0,
-        .mids = {0, -1}
-};
-
-static struct msm_iommu_ctx_dev rot_dst_ctx = {
-        .name = "rot_dst",
-        .num = 1,
-        .mids = {1, -1}
-};
-
-static struct msm_iommu_ctx_dev ijpeg_src_ctx = {
-        .name = "ijpeg_src",
-        .num = 0,
-        .mids = {0, -1}
-};
-
-static struct msm_iommu_ctx_dev ijpeg_dst_ctx = {
-        .name = "ijpeg_dst",
-        .num = 1,
-        .mids = {1, -1}
-};
-
-static struct msm_iommu_ctx_dev vfe_imgwr_ctx = {
-        .name = "vfe_imgwr",
-        .num = 0,
-        .mids = {2, 3, 4, 5, 6, 7, 8, -1}
-};
-
-static struct msm_iommu_ctx_dev vfe_misc_ctx = {
-        .name = "vfe_misc",
-        .num = 1,
-        .mids = {0, 1, 9, -1}
-};
-
-static struct msm_iommu_ctx_dev vcodec_a_stream_ctx = {
-        .name = "vcodec_a_stream",
-        .num = 0,
-        .mids = {2, 5, -1}
-};
-
-static struct msm_iommu_ctx_dev vcodec_a_mm1_ctx = {
-        .name = "vcodec_a_mm1",
-        .num = 1,
-        .mids = {0, 1, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, -1}
-};
-
-static struct msm_iommu_ctx_dev vcodec_b_mm2_ctx = {
-        .name = "vcodec_b_mm2",
-        .num = 0,
-        .mids = {0, 1, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, -1}
-};
-
-static struct msm_iommu_ctx_dev gfx3d_user_ctx = {
-        .name = "gfx3d_user",
-        .num = 0,
-        .mids = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, -1}
-};
-
-static struct msm_iommu_ctx_dev gfx3d_priv_ctx = {
-        .name = "gfx3d_priv",
-        .num = 1,
-        .mids = {16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
-                 31, -1}
-};
-
-static struct msm_iommu_ctx_dev gfx2d0_2d0_ctx = {
-        .name = "gfx2d0_2d0",
-        .num = 0,
-        .mids = {0, 1, 2, 3, 4, 5, 6, 7, -1}
-};
-
-static struct msm_iommu_ctx_dev gfx2d1_2d1_ctx = {
-        .name = "gfx2d1_2d1",
-        .num = 0,
-        .mids = {0, 1, 2, 3, 4, 5, 6, 7, -1}
-};
-
-static struct platform_device msm_device_jpegd_src_ctx = {
-        .name = "msm_iommu_ctx",
-        .id = 0,
-        .dev = {
-                .parent = &msm_device_iommu_jpegd.dev,
-        },
-};
-
-static struct platform_device msm_device_jpegd_dst_ctx = {
-        .name = "msm_iommu_ctx",
-        .id = 1,
-        .dev = {
-                .parent = &msm_device_iommu_jpegd.dev,
-        },
-};
-
-static struct platform_device msm_device_vpe_src_ctx = {
-        .name = "msm_iommu_ctx",
-        .id = 2,
-        .dev = {
-                .parent = &msm_device_iommu_vpe.dev,
-        },
-};
-
-static struct platform_device msm_device_vpe_dst_ctx = {
-        .name = "msm_iommu_ctx",
-        .id = 3,
-        .dev = {
-                .parent = &msm_device_iommu_vpe.dev,
-        },
-};
-
-static struct platform_device msm_device_mdp_vg1_ctx = {
-        .name = "msm_iommu_ctx",
-        .id = 4,
-        .dev = {
-                .parent = &msm_device_iommu_mdp0.dev,
-        },
-};
-
-static struct platform_device msm_device_mdp_rgb1_ctx = {
-        .name = "msm_iommu_ctx",
-        .id = 5,
-        .dev = {
-                .parent = &msm_device_iommu_mdp0.dev,
-        },
-};
-
-static struct platform_device msm_device_mdp_vg2_ctx = {
-        .name = "msm_iommu_ctx",
-        .id = 6,
-        .dev = {
-                .parent = &msm_device_iommu_mdp1.dev,
-        },
-};
-
-static struct platform_device msm_device_mdp_rgb2_ctx = {
-        .name = "msm_iommu_ctx",
-        .id = 7,
-        .dev = {
-                .parent = &msm_device_iommu_mdp1.dev,
-        },
-};
-
-static struct platform_device msm_device_rot_src_ctx = {
-        .name = "msm_iommu_ctx",
-        .id = 8,
-        .dev = {
-                .parent = &msm_device_iommu_rot.dev,
-        },
-};
-
-static struct platform_device msm_device_rot_dst_ctx = {
-        .name = "msm_iommu_ctx",
-        .id = 9,
-        .dev = {
-                .parent = &msm_device_iommu_rot.dev,
-        },
-};
-
-static struct platform_device msm_device_ijpeg_src_ctx = {
-        .name = "msm_iommu_ctx",
-        .id = 10,
-        .dev = {
-                .parent = &msm_device_iommu_ijpeg.dev,
-        },
-};
-
-static struct platform_device msm_device_ijpeg_dst_ctx = {
-        .name = "msm_iommu_ctx",
-        .id = 11,
-        .dev = {
-                .parent = &msm_device_iommu_ijpeg.dev,
-        },
-};
-
-static struct platform_device msm_device_vfe_imgwr_ctx = {
-        .name = "msm_iommu_ctx",
-        .id = 12,
-        .dev = {
-                .parent = &msm_device_iommu_vfe.dev,
-        },
-};
-
-static struct platform_device msm_device_vfe_misc_ctx = {
-        .name = "msm_iommu_ctx",
-        .id = 13,
-        .dev = {
-                .parent = &msm_device_iommu_vfe.dev,
-        },
-};
-
-static struct platform_device msm_device_vcodec_a_stream_ctx = {
-        .name = "msm_iommu_ctx",
-        .id = 14,
-        .dev = {
-                .parent = &msm_device_iommu_vcodec_a.dev,
-        },
-};
-
-static struct platform_device msm_device_vcodec_a_mm1_ctx = {
-        .name = "msm_iommu_ctx",
-        .id = 15,
-        .dev = {
-                .parent = &msm_device_iommu_vcodec_a.dev,
-        },
-};
-
-static struct platform_device msm_device_vcodec_b_mm2_ctx = {
-        .name = "msm_iommu_ctx",
-        .id = 16,
-        .dev = {
-                .parent = &msm_device_iommu_vcodec_b.dev,
-        },
-};
-
-static struct platform_device msm_device_gfx3d_user_ctx = {
-        .name = "msm_iommu_ctx",
-        .id = 17,
-        .dev = {
-                .parent = &msm_device_iommu_gfx3d.dev,
-        },
-};
-
-static struct platform_device msm_device_gfx3d_priv_ctx = {
-        .name = "msm_iommu_ctx",
-        .id = 18,
-        .dev = {
-                .parent = &msm_device_iommu_gfx3d.dev,
-        },
-};
-
-static struct platform_device msm_device_gfx2d0_2d0_ctx = {
-        .name = "msm_iommu_ctx",
-        .id = 19,
-        .dev = {
-                .parent = &msm_device_iommu_gfx2d0.dev,
-        },
-};
-
-static struct platform_device msm_device_gfx2d1_2d1_ctx = {
-        .name = "msm_iommu_ctx",
-        .id = 20,
-        .dev = {
-                .parent = &msm_device_iommu_gfx2d1.dev,
-        },
-};
-
-static struct platform_device *msm_iommu_devs[] = {
-        &msm_device_iommu_jpegd,
-        &msm_device_iommu_vpe,
-        &msm_device_iommu_mdp0,
-        &msm_device_iommu_mdp1,
-        &msm_device_iommu_rot,
-        &msm_device_iommu_ijpeg,
-        &msm_device_iommu_vfe,
-        &msm_device_iommu_vcodec_a,
-        &msm_device_iommu_vcodec_b,
-        &msm_device_iommu_gfx3d,
-        &msm_device_iommu_gfx2d0,
-        &msm_device_iommu_gfx2d1,
-};
-
-static struct msm_iommu_dev *msm_iommu_data[] = {
-        &jpegd_iommu,
-        &vpe_iommu,
-        &mdp0_iommu,
-        &mdp1_iommu,
-        &rot_iommu,
-        &ijpeg_iommu,
-        &vfe_iommu,
-        &vcodec_a_iommu,
-        &vcodec_b_iommu,
-        &gfx3d_iommu,
-        &gfx2d0_iommu,
-        &gfx2d1_iommu,
-};
-
-static struct platform_device *msm_iommu_ctx_devs[] = {
-        &msm_device_jpegd_src_ctx,
-        &msm_device_jpegd_dst_ctx,
-        &msm_device_vpe_src_ctx,
-        &msm_device_vpe_dst_ctx,
-        &msm_device_mdp_vg1_ctx,
-        &msm_device_mdp_rgb1_ctx,
-        &msm_device_mdp_vg2_ctx,
-        &msm_device_mdp_rgb2_ctx,
-        &msm_device_rot_src_ctx,
-        &msm_device_rot_dst_ctx,
-        &msm_device_ijpeg_src_ctx,
-        &msm_device_ijpeg_dst_ctx,
-        &msm_device_vfe_imgwr_ctx,
-        &msm_device_vfe_misc_ctx,
-        &msm_device_vcodec_a_stream_ctx,
-        &msm_device_vcodec_a_mm1_ctx,
-        &msm_device_vcodec_b_mm2_ctx,
-        &msm_device_gfx3d_user_ctx,
-        &msm_device_gfx3d_priv_ctx,
-        &msm_device_gfx2d0_2d0_ctx,
-        &msm_device_gfx2d1_2d1_ctx,
-};
-
-static struct msm_iommu_ctx_dev *msm_iommu_ctx_data[] = {
-        &jpegd_src_ctx,
-        &jpegd_dst_ctx,
-        &vpe_src_ctx,
-        &vpe_dst_ctx,
-        &mdp_vg1_ctx,
-        &mdp_rgb1_ctx,
-        &mdp_vg2_ctx,
-        &mdp_rgb2_ctx,
-        &rot_src_ctx,
-        &rot_dst_ctx,
-        &ijpeg_src_ctx,
-        &ijpeg_dst_ctx,
-        &vfe_imgwr_ctx,
-        &vfe_misc_ctx,
-        &vcodec_a_stream_ctx,
-        &vcodec_a_mm1_ctx,
-        &vcodec_b_mm2_ctx,
-        &gfx3d_user_ctx,
-        &gfx3d_priv_ctx,
-        &gfx2d0_2d0_ctx,
-        &gfx2d1_2d1_ctx,
-};
-
-static int __init msm8x60_iommu_init(void)
-{
-        int ret, i;
-
-        ret = platform_device_register(&msm_root_iommu_dev);
-        if (ret != 0) {
-                pr_err("Failed to register root IOMMU device!\n");
-                goto failure;
-        }
-
-        for (i = 0; i < ARRAY_SIZE(msm_iommu_devs); i++) {
-                ret = platform_device_add_data(msm_iommu_devs[i],
-                                               msm_iommu_data[i],
-                                               sizeof(struct msm_iommu_dev));
-                if (ret != 0) {
-                        pr_err("platform_device_add_data failed, "
-                               "i = %d\n", i);
-                        goto failure_unwind;
-                }
-
-                ret = platform_device_register(msm_iommu_devs[i]);
-
-                if (ret != 0) {
-                        pr_err("platform_device_register iommu failed, "
-                               "i = %d\n", i);
-                        goto failure_unwind;
-                }
-        }
-
-        for (i = 0; i < ARRAY_SIZE(msm_iommu_ctx_devs); i++) {
-                ret = platform_device_add_data(msm_iommu_ctx_devs[i],
-                                               msm_iommu_ctx_data[i],
-                                               sizeof(*msm_iommu_ctx_devs[i]));
-                if (ret != 0) {
-                        pr_err("platform_device_add_data iommu failed, "
-                               "i = %d\n", i);
-                        goto failure_unwind2;
-                }
-
-                ret = platform_device_register(msm_iommu_ctx_devs[i]);
-                if (ret != 0) {
-                        pr_err("platform_device_register ctx failed, "
-                               "i = %d\n", i);
-                        goto failure_unwind2;
-                }
-        }
-        return 0;
-
-failure_unwind2:
-        while (--i >= 0)
-                platform_device_unregister(msm_iommu_ctx_devs[i]);
-failure_unwind:
-        while (--i >= 0)
-                platform_device_unregister(msm_iommu_devs[i]);
-
-        platform_device_unregister(&msm_root_iommu_dev);
-failure:
-        return ret;
-}
-
-static void __exit msm8x60_iommu_exit(void)
-{
-        int i;
-
-        for (i = 0; i < ARRAY_SIZE(msm_iommu_ctx_devs); i++)
-                platform_device_unregister(msm_iommu_ctx_devs[i]);
-
-        for (i = 0; i < ARRAY_SIZE(msm_iommu_devs); ++i)
-                platform_device_unregister(msm_iommu_devs[i]);
-
-        platform_device_unregister(&msm_root_iommu_dev);
-}
-
-subsys_initcall(msm8x60_iommu_init);
-module_exit(msm8x60_iommu_exit);
-
-MODULE_LICENSE("GPL v2");
-MODULE_AUTHOR("Stepan Moskovchenko <stepanm@codeaurora.org>");
diff --git a/arch/arm/mach-msm/devices-msm7x00.c b/arch/arm/mach-msm/devices-msm7x00.c
index 6d50fb964863..d83404d4b328 100644
--- a/arch/arm/mach-msm/devices-msm7x00.c
+++ b/arch/arm/mach-msm/devices-msm7x00.c
@@ -456,9 +456,9 @@ static struct clk_pcom_desc msm_clocks_7x01a[] = {
         CLK_PCOM("tsif_ref_clk",        TSIF_REF_CLK,   NULL, 0),
         CLK_PCOM("tv_dac_clk",  TV_DAC_CLK,     NULL, 0),
         CLK_PCOM("tv_enc_clk",  TV_ENC_CLK,     NULL, 0),
-        CLK_PCOM("uart_clk",    UART1_CLK,      "msm_serial.0", OFF),
-        CLK_PCOM("uart_clk",    UART2_CLK,      "msm_serial.1", 0),
-        CLK_PCOM("uart_clk",    UART3_CLK,      "msm_serial.2", OFF),
+        CLK_PCOM("core",        UART1_CLK,      "msm_serial.0", OFF),
+        CLK_PCOM("core",        UART2_CLK,      "msm_serial.1", 0),
+        CLK_PCOM("core",        UART3_CLK,      "msm_serial.2", OFF),
         CLK_PCOM("uart1dm_clk", UART1DM_CLK,    NULL, OFF),
         CLK_PCOM("uart2dm_clk", UART2DM_CLK,    NULL, 0),
         CLK_PCOM("usb_hs_clk",  USB_HS_CLK,     "msm_hsusb", OFF),
diff --git a/arch/arm/mach-msm/devices-msm7x30.c b/arch/arm/mach-msm/devices-msm7x30.c
index d4db75acff56..c15ea8ab20a7 100644
--- a/arch/arm/mach-msm/devices-msm7x30.c
+++ b/arch/arm/mach-msm/devices-msm7x30.c
@@ -21,10 +21,10 @@
 #include <mach/irqs.h>
 #include <mach/msm_iomap.h>
 #include <mach/dma.h>
-#include <mach/board.h>
 
 #include "devices.h"
 #include "smd_private.h"
+#include "common.h"
 
 #include <asm/mach/flash.h>
 
@@ -211,7 +211,7 @@ static struct clk_pcom_desc msm_clocks_7x30[] = {
         CLK_PCOM("spi_pclk",    SPI_P_CLK,      NULL, 0),
         CLK_PCOM("tv_dac_clk",  TV_DAC_CLK,     NULL, 0),
         CLK_PCOM("tv_enc_clk",  TV_ENC_CLK,     NULL, 0),
-        CLK_PCOM("uart_clk",    UART2_CLK,      "msm_serial.1", 0),
+        CLK_PCOM("core",        UART2_CLK,      "msm_serial.1", 0),
         CLK_PCOM("usb_phy_clk", USB_PHY_CLK,    NULL, 0),
         CLK_PCOM("usb_hs_clk",          USB_HS_CLK,             NULL, OFF),
         CLK_PCOM("usb_hs_pclk",         USB_HS_P_CLK,           NULL, OFF),
diff --git a/arch/arm/mach-msm/devices-qsd8x50.c b/arch/arm/mach-msm/devices-qsd8x50.c
index f5518112284b..9e1e9ce07b1a 100644
--- a/arch/arm/mach-msm/devices-qsd8x50.c
+++ b/arch/arm/mach-msm/devices-qsd8x50.c
@@ -21,9 +21,9 @@
 #include <mach/irqs.h>
 #include <mach/msm_iomap.h>
 #include <mach/dma.h>
-#include <mach/board.h>
 
 #include "devices.h"
+#include "common.h"
 
 #include <asm/mach/flash.h>
 
@@ -358,9 +358,9 @@ static struct clk_pcom_desc msm_clocks_8x50[] = {
         CLK_PCOM("tsif_ref_clk",        TSIF_REF_CLK,   NULL, 0),
         CLK_PCOM("tv_dac_clk",  TV_DAC_CLK,     NULL, 0),
         CLK_PCOM("tv_enc_clk",  TV_ENC_CLK,     NULL, 0),
-        CLK_PCOM("uart_clk",    UART1_CLK,      NULL, OFF),
-        CLK_PCOM("uart_clk",    UART2_CLK,      NULL, 0),
-        CLK_PCOM("uart_clk",    UART3_CLK,      "msm_serial.2", OFF),
+        CLK_PCOM("core",        UART1_CLK,      NULL, OFF),
+        CLK_PCOM("core",        UART2_CLK,      NULL, 0),
+        CLK_PCOM("core",        UART3_CLK,      "msm_serial.2", OFF),
         CLK_PCOM("uartdm_clk",  UART1DM_CLK,    NULL, OFF),
         CLK_PCOM("uartdm_clk",  UART2DM_CLK,    NULL, 0),
         CLK_PCOM("usb_hs_clk",  USB_HS_CLK,     NULL, OFF),
diff --git a/arch/arm/mach-msm/include/mach/board.h b/arch/arm/mach-msm/include/mach/board.h
deleted file mode 100644
index c34e246a3e07..000000000000
--- a/arch/arm/mach-msm/include/mach/board.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/* arch/arm/mach-msm/include/mach/board.h
- *
- * Copyright (C) 2007 Google, Inc.
- * Author: Brian Swetland <swetland@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 __ASM_ARCH_MSM_BOARD_H
-#define __ASM_ARCH_MSM_BOARD_H
-
-#include <linux/types.h>
-#include <linux/platform_data/mmc-msm_sdcc.h>
-
-/* common init routines for use by arch/arm/mach-msm/board-*.c */
-
-void __init msm_add_devices(void);
-void __init msm_init_irq(void);
-void __init msm_init_gpio(void);
-int __init msm_add_sdcc(unsigned int controller,
-                        struct msm_mmc_platform_data *plat,
-                        unsigned int stat_irq, unsigned long stat_irq_flags);
-
-#if defined(CONFIG_MSM_SMD) && defined(CONFIG_DEBUG_FS)
-int smd_debugfs_init(void);
-#else
-static inline int smd_debugfs_init(void) { return 0; }
-#endif
-
-#endif
diff --git a/arch/arm/mach-msm/include/mach/iommu.h b/arch/arm/mach-msm/include/mach/iommu.h
deleted file mode 100644
index 5c7c955e6d25..000000000000
--- a/arch/arm/mach-msm/include/mach/iommu.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#ifndef MSM_IOMMU_H
-#define MSM_IOMMU_H
-
-#include <linux/interrupt.h>
-#include <linux/clk.h>
-
-/* Sharability attributes of MSM IOMMU mappings */
-#define MSM_IOMMU_ATTR_NON_SH           0x0
-#define MSM_IOMMU_ATTR_SH               0x4
-
-/* Cacheability attributes of MSM IOMMU mappings */
-#define MSM_IOMMU_ATTR_NONCACHED        0x0
-#define MSM_IOMMU_ATTR_CACHED_WB_WA     0x1
-#define MSM_IOMMU_ATTR_CACHED_WB_NWA    0x2
-#define MSM_IOMMU_ATTR_CACHED_WT        0x3
-
-/* Mask for the cache policy attribute */
-#define MSM_IOMMU_CP_MASK               0x03
-
-/* Maximum number of Machine IDs that we are allowing to be mapped to the same
- * context bank. The number of MIDs mapped to the same CB does not affect
- * performance, but there is a practical limit on how many distinct MIDs may
- * be present. These mappings are typically determined at design time and are
- * not expected to change at run time.
- */
-#define MAX_NUM_MIDS    32
-
-/**
- * struct msm_iommu_dev - a single IOMMU hardware instance
- * name         Human-readable name given to this IOMMU HW instance
- * ncb          Number of context banks present on this IOMMU HW instance
- */
-struct msm_iommu_dev {
-        const char *name;
-        int ncb;
-};
-
-/**
- * struct msm_iommu_ctx_dev - an IOMMU context bank instance
- * name         Human-readable name given to this context bank
- * num          Index of this context bank within the hardware
- * mids         List of Machine IDs that are to be mapped into this context
- *              bank, terminated by -1. The MID is a set of signals on the
- *              AXI bus that identifies the function associated with a specific
- *              memory request. (See ARM spec).
- */
-struct msm_iommu_ctx_dev {
-        const char *name;
-        int num;
-        int mids[MAX_NUM_MIDS];
-};
-
-
-/**
- * struct msm_iommu_drvdata - A single IOMMU hardware instance
- * @base:       IOMMU config port base address (VA)
- * @ncb         The number of contexts on this IOMMU
- * @irq:        Interrupt number
- * @clk:        The bus clock for this IOMMU hardware instance
- * @pclk:       The clock for the IOMMU bus interconnect
- *
- * A msm_iommu_drvdata holds the global driver data about a single piece
- * of an IOMMU hardware instance.
- */
-struct msm_iommu_drvdata {
-        void __iomem *base;
-        int irq;
-        int ncb;
-        struct clk *clk;
-        struct clk *pclk;
-};
-
-/**
- * struct msm_iommu_ctx_drvdata - an IOMMU context bank instance
- * @num:                Hardware context number of this context
- * @pdev:               Platform device associated wit this HW instance
- * @attached_elm:       List element for domains to track which devices are
- *                      attached to them
- *
- * A msm_iommu_ctx_drvdata holds the driver data for a single context bank
- * within each IOMMU hardware instance
- */
-struct msm_iommu_ctx_drvdata {
-        int num;
-        struct platform_device *pdev;
-        struct list_head attached_elm;
-};
-
-/*
- * Look up an IOMMU context device by its context name. NULL if none found.
- * Useful for testing and drivers that do not yet fully have IOMMU stuff in
- * their platform devices.
- */
-struct device *msm_iommu_get_ctx(const char *ctx_name);
-
-/*
- * Interrupt handler for the IOMMU context fault interrupt. Hooking the
- * interrupt is not supported in the API yet, but this will print an error
- * message and dump useful IOMMU registers.
- */
-irqreturn_t msm_iommu_fault_handler(int irq, void *dev_id);
-
-#endif
diff --git a/arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h b/arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h
deleted file mode 100644
index fc160101dead..000000000000
--- a/arch/arm/mach-msm/include/mach/iommu_hw-8xxx.h
+++ /dev/null
@@ -1,1865 +0,0 @@
-/* Copyright (c) 2010-2011, Code Aurora Forum. All rights reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 and
- * only version 2 as published by the Free Software Foundation.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- * 02110-1301, USA.
- */
-
-#ifndef __ARCH_ARM_MACH_MSM_IOMMU_HW_8XXX_H
-#define __ARCH_ARM_MACH_MSM_IOMMU_HW_8XXX_H
-
-#define CTX_SHIFT 12
-
-#define GET_GLOBAL_REG(reg, base) (readl((base) + (reg)))
-#define GET_CTX_REG(reg, base, ctx) \
-                                (readl((base) + (reg) + ((ctx) << CTX_SHIFT)))
-
-#define SET_GLOBAL_REG(reg, base, val)  writel((val), ((base) + (reg)))
-
-#define SET_CTX_REG(reg, base, ctx, val) \
-                        writel((val), ((base) + (reg) + ((ctx) << CTX_SHIFT)))
-
-/* Wrappers for numbered registers */
-#define SET_GLOBAL_REG_N(b, n, r, v) SET_GLOBAL_REG(b, ((r) + (n << 2)), (v))
-#define GET_GLOBAL_REG_N(b, n, r)    GET_GLOBAL_REG(b, ((r) + (n << 2)))
-
-/* Field wrappers */
-#define GET_GLOBAL_FIELD(b, r, F)    GET_FIELD(((b) + (r)), F##_MASK, F##_SHIFT)
-#define GET_CONTEXT_FIELD(b, c, r, F)   \
-        GET_FIELD(((b) + (r) + ((c) << CTX_SHIFT)), F##_MASK, F##_SHIFT)
-
-#define SET_GLOBAL_FIELD(b, r, F, v) \
-        SET_FIELD(((b) + (r)), F##_MASK, F##_SHIFT, (v))
-#define SET_CONTEXT_FIELD(b, c, r, F, v)        \
-        SET_FIELD(((b) + (r) + ((c) << CTX_SHIFT)), F##_MASK, F##_SHIFT, (v))
-
-#define GET_FIELD(addr, mask, shift)  ((readl(addr) >> (shift)) & (mask))
-
-#define SET_FIELD(addr, mask, shift, v) \
-do { \
-        int t = readl(addr); \
-        writel((t & ~((mask) << (shift))) + (((v) & (mask)) << (shift)), addr);\
-} while (0)
-
-
-#define NUM_FL_PTE      4096
-#define NUM_SL_PTE      256
-#define NUM_TEX_CLASS   8
-
-/* First-level page table bits */
-#define FL_BASE_MASK            0xFFFFFC00
-#define FL_TYPE_TABLE           (1 << 0)
-#define FL_TYPE_SECT            (2 << 0)
-#define FL_SUPERSECTION         (1 << 18)
-#define FL_AP_WRITE             (1 << 10)
-#define FL_AP_READ              (1 << 11)
-#define FL_SHARED               (1 << 16)
-#define FL_BUFFERABLE           (1 << 2)
-#define FL_CACHEABLE            (1 << 3)
-#define FL_TEX0                 (1 << 12)
-#define FL_OFFSET(va)           (((va) & 0xFFF00000) >> 20)
-#define FL_NG                   (1 << 17)
-
-/* Second-level page table bits */
-#define SL_BASE_MASK_LARGE      0xFFFF0000
-#define SL_BASE_MASK_SMALL      0xFFFFF000
-#define SL_TYPE_LARGE           (1 << 0)
-#define SL_TYPE_SMALL           (2 << 0)
-#define SL_AP0                  (1 << 4)
-#define SL_AP1                  (2 << 4)
-#define SL_SHARED               (1 << 10)
-#define SL_BUFFERABLE           (1 << 2)
-#define SL_CACHEABLE            (1 << 3)
-#define SL_TEX0                 (1 << 6)
-#define SL_OFFSET(va)           (((va) & 0xFF000) >> 12)
-#define SL_NG                   (1 << 11)
-
-/* Memory type and cache policy attributes */
-#define MT_SO                   0
-#define MT_DEV                  1
-#define MT_NORMAL               2
-#define CP_NONCACHED            0
-#define CP_WB_WA                1
-#define CP_WT                   2
-#define CP_WB_NWA               3
-
-/* Global register setters / getters */
-#define SET_M2VCBR_N(b, N, v)    SET_GLOBAL_REG_N(M2VCBR_N, N, (b), (v))
-#define SET_CBACR_N(b, N, v)     SET_GLOBAL_REG_N(CBACR_N, N, (b), (v))
-#define SET_TLBRSW(b, v)         SET_GLOBAL_REG(TLBRSW, (b), (v))
-#define SET_TLBTR0(b, v)         SET_GLOBAL_REG(TLBTR0, (b), (v))
-#define SET_TLBTR1(b, v)         SET_GLOBAL_REG(TLBTR1, (b), (v))
-#define SET_TLBTR2(b, v)         SET_GLOBAL_REG(TLBTR2, (b), (v))
-#define SET_TESTBUSCR(b, v)      SET_GLOBAL_REG(TESTBUSCR, (b), (v))
-#define SET_GLOBAL_TLBIALL(b, v) SET_GLOBAL_REG(GLOBAL_TLBIALL, (b), (v))
-#define SET_TLBIVMID(b, v)       SET_GLOBAL_REG(TLBIVMID, (b), (v))
-#define SET_CR(b, v)             SET_GLOBAL_REG(CR, (b), (v))
-#define SET_EAR(b, v)            SET_GLOBAL_REG(EAR, (b), (v))
-#define SET_ESR(b, v)            SET_GLOBAL_REG(ESR, (b), (v))
-#define SET_ESRRESTORE(b, v)     SET_GLOBAL_REG(ESRRESTORE, (b), (v))
-#define SET_ESYNR0(b, v)         SET_GLOBAL_REG(ESYNR0, (b), (v))
-#define SET_ESYNR1(b, v)         SET_GLOBAL_REG(ESYNR1, (b), (v))
-#define SET_RPU_ACR(b, v)        SET_GLOBAL_REG(RPU_ACR, (b), (v))
-
-#define GET_M2VCBR_N(b, N)       GET_GLOBAL_REG_N(M2VCBR_N, N, (b))
-#define GET_CBACR_N(b, N)        GET_GLOBAL_REG_N(CBACR_N, N, (b))
-#define GET_TLBTR0(b)            GET_GLOBAL_REG(TLBTR0, (b))
-#define GET_TLBTR1(b)            GET_GLOBAL_REG(TLBTR1, (b))
-#define GET_TLBTR2(b)            GET_GLOBAL_REG(TLBTR2, (b))
-#define GET_TESTBUSCR(b)         GET_GLOBAL_REG(TESTBUSCR, (b))
-#define GET_GLOBAL_TLBIALL(b)    GET_GLOBAL_REG(GLOBAL_TLBIALL, (b))
-#define GET_TLBIVMID(b)          GET_GLOBAL_REG(TLBIVMID, (b))
-#define GET_CR(b)                GET_GLOBAL_REG(CR, (b))
-#define GET_EAR(b)               GET_GLOBAL_REG(EAR, (b))
-#define GET_ESR(b)               GET_GLOBAL_REG(ESR, (b))
-#define GET_ESRRESTORE(b)        GET_GLOBAL_REG(ESRRESTORE, (b))
-#define GET_ESYNR0(b)            GET_GLOBAL_REG(ESYNR0, (b))
-#define GET_ESYNR1(b)            GET_GLOBAL_REG(ESYNR1, (b))
-#define GET_REV(b)               GET_GLOBAL_REG(REV, (b))
-#define GET_IDR(b)               GET_GLOBAL_REG(IDR, (b))
-#define GET_RPU_ACR(b)           GET_GLOBAL_REG(RPU_ACR, (b))
-
-
-/* Context register setters/getters */
-#define SET_SCTLR(b, c, v)       SET_CTX_REG(SCTLR, (b), (c), (v))
-#define SET_ACTLR(b, c, v)       SET_CTX_REG(ACTLR, (b), (c), (v))
-#define SET_CONTEXTIDR(b, c, v)  SET_CTX_REG(CONTEXTIDR, (b), (c), (v))
-#define SET_TTBR0(b, c, v)       SET_CTX_REG(TTBR0, (b), (c), (v))
-#define SET_TTBR1(b, c, v)       SET_CTX_REG(TTBR1, (b), (c), (v))
-#define SET_TTBCR(b, c, v)       SET_CTX_REG(TTBCR, (b), (c), (v))
-#define SET_PAR(b, c, v)         SET_CTX_REG(PAR, (b), (c), (v))
-#define SET_FSR(b, c, v)         SET_CTX_REG(FSR, (b), (c), (v))
-#define SET_FSRRESTORE(b, c, v)  SET_CTX_REG(FSRRESTORE, (b), (c), (v))
-#define SET_FAR(b, c, v)         SET_CTX_REG(FAR, (b), (c), (v))
-#define SET_FSYNR0(b, c, v)      SET_CTX_REG(FSYNR0, (b), (c), (v))
-#define SET_FSYNR1(b, c, v)      SET_CTX_REG(FSYNR1, (b), (c), (v))
-#define SET_PRRR(b, c, v)        SET_CTX_REG(PRRR, (b), (c), (v))
-#define SET_NMRR(b, c, v)        SET_CTX_REG(NMRR, (b), (c), (v))
-#define SET_TLBLKCR(b, c, v)     SET_CTX_REG(TLBLCKR, (b), (c), (v))
-#define SET_V2PSR(b, c, v)       SET_CTX_REG(V2PSR, (b), (c), (v))
-#define SET_TLBFLPTER(b, c, v)   SET_CTX_REG(TLBFLPTER, (b), (c), (v))
-#define SET_TLBSLPTER(b, c, v)   SET_CTX_REG(TLBSLPTER, (b), (c), (v))
-#define SET_BFBCR(b, c, v)       SET_CTX_REG(BFBCR, (b), (c), (v))
-#define SET_CTX_TLBIALL(b, c, v) SET_CTX_REG(CTX_TLBIALL, (b), (c), (v))
-#define SET_TLBIASID(b, c, v)    SET_CTX_REG(TLBIASID, (b), (c), (v))
-#define SET_TLBIVA(b, c, v)      SET_CTX_REG(TLBIVA, (b), (c), (v))
-#define SET_TLBIVAA(b, c, v)     SET_CTX_REG(TLBIVAA, (b), (c), (v))
-#define SET_V2PPR(b, c, v)       SET_CTX_REG(V2PPR, (b), (c), (v))
-#define SET_V2PPW(b, c, v)       SET_CTX_REG(V2PPW, (b), (c), (v))
-#define SET_V2PUR(b, c, v)       SET_CTX_REG(V2PUR, (b), (c), (v))
-#define SET_V2PUW(b, c, v)       SET_CTX_REG(V2PUW, (b), (c), (v))
-#define SET_RESUME(b, c, v)      SET_CTX_REG(RESUME, (b), (c), (v))
-
-#define GET_SCTLR(b, c)          GET_CTX_REG(SCTLR, (b), (c))
-#define GET_ACTLR(b, c)          GET_CTX_REG(ACTLR, (b), (c))
-#define GET_CONTEXTIDR(b, c)     GET_CTX_REG(CONTEXTIDR, (b), (c))
-#define GET_TTBR0(b, c)          GET_CTX_REG(TTBR0, (b), (c))
-#define GET_TTBR1(b, c)          GET_CTX_REG(TTBR1, (b), (c))
-#define GET_TTBCR(b, c)          GET_CTX_REG(TTBCR, (b), (c))
-#define GET_PAR(b, c)            GET_CTX_REG(PAR, (b), (c))
-#define GET_FSR(b, c)            GET_CTX_REG(FSR, (b), (c))
-#define GET_FSRRESTORE(b, c)     GET_CTX_REG(FSRRESTORE, (b), (c))
-#define GET_FAR(b, c)            GET_CTX_REG(FAR, (b), (c))
-#define GET_FSYNR0(b, c)         GET_CTX_REG(FSYNR0, (b), (c))
-#define GET_FSYNR1(b, c)         GET_CTX_REG(FSYNR1, (b), (c))
-#define GET_PRRR(b, c)           GET_CTX_REG(PRRR, (b), (c))
-#define GET_NMRR(b, c)           GET_CTX_REG(NMRR, (b), (c))
-#define GET_TLBLCKR(b, c)        GET_CTX_REG(TLBLCKR, (b), (c))
-#define GET_V2PSR(b, c)          GET_CTX_REG(V2PSR, (b), (c))
-#define GET_TLBFLPTER(b, c)      GET_CTX_REG(TLBFLPTER, (b), (c))
-#define GET_TLBSLPTER(b, c)      GET_CTX_REG(TLBSLPTER, (b), (c))
-#define GET_BFBCR(b, c)          GET_CTX_REG(BFBCR, (b), (c))
-#define GET_CTX_TLBIALL(b, c)    GET_CTX_REG(CTX_TLBIALL, (b), (c))
-#define GET_TLBIASID(b, c)       GET_CTX_REG(TLBIASID, (b), (c))
-#define GET_TLBIVA(b, c)         GET_CTX_REG(TLBIVA, (b), (c))
-#define GET_TLBIVAA(b, c)        GET_CTX_REG(TLBIVAA, (b), (c))
-#define GET_V2PPR(b, c)          GET_CTX_REG(V2PPR, (b), (c))
-#define GET_V2PPW(b, c)          GET_CTX_REG(V2PPW, (b), (c))
-#define GET_V2PUR(b, c)          GET_CTX_REG(V2PUR, (b), (c))
-#define GET_V2PUW(b, c)          GET_CTX_REG(V2PUW, (b), (c))
-#define GET_RESUME(b, c)         GET_CTX_REG(RESUME, (b), (c))
-
-
-/* Global field setters / getters */
-/* Global Field Setters: */
-/* CBACR_N */
-#define SET_RWVMID(b, n, v)   SET_GLOBAL_FIELD(b, (n<<2)|(CBACR_N), RWVMID, v)
-#define SET_RWE(b, n, v)      SET_GLOBAL_FIELD(b, (n<<2)|(CBACR_N), RWE, v)
-#define SET_RWGE(b, n, v)     SET_GLOBAL_FIELD(b, (n<<2)|(CBACR_N), RWGE, v)
-#define SET_CBVMID(b, n, v)   SET_GLOBAL_FIELD(b, (n<<2)|(CBACR_N), CBVMID, v)
-#define SET_IRPTNDX(b, n, v)  SET_GLOBAL_FIELD(b, (n<<2)|(CBACR_N), IRPTNDX, v)
-
-
-/* M2VCBR_N */
-#define SET_VMID(b, n, v)     SET_GLOBAL_FIELD(b, (n<<2)|(M2VCBR_N), VMID, v)
-#define SET_CBNDX(b, n, v)    SET_GLOBAL_FIELD(b, (n<<2)|(M2VCBR_N), CBNDX, v)
-#define SET_BYPASSD(b, n, v)  SET_GLOBAL_FIELD(b, (n<<2)|(M2VCBR_N), BYPASSD, v)
-#define SET_BPRCOSH(b, n, v)  SET_GLOBAL_FIELD(b, (n<<2)|(M2VCBR_N), BPRCOSH, v)
-#define SET_BPRCISH(b, n, v)  SET_GLOBAL_FIELD(b, (n<<2)|(M2VCBR_N), BPRCISH, v)
-#define SET_BPRCNSH(b, n, v)  SET_GLOBAL_FIELD(b, (n<<2)|(M2VCBR_N), BPRCNSH, v)
-#define SET_BPSHCFG(b, n, v)  SET_GLOBAL_FIELD(b, (n<<2)|(M2VCBR_N), BPSHCFG, v)
-#define SET_NSCFG(b, n, v)    SET_GLOBAL_FIELD(b, (n<<2)|(M2VCBR_N), NSCFG, v)
-#define SET_BPMTCFG(b, n, v)  SET_GLOBAL_FIELD(b, (n<<2)|(M2VCBR_N), BPMTCFG, v)
-#define SET_BPMEMTYPE(b, n, v) \
-        SET_GLOBAL_FIELD(b, (n<<2)|(M2VCBR_N), BPMEMTYPE, v)
-
-
-/* CR */
-#define SET_RPUE(b, v)           SET_GLOBAL_FIELD(b, CR, RPUE, v)
-#define SET_RPUERE(b, v)         SET_GLOBAL_FIELD(b, CR, RPUERE, v)
-#define SET_RPUEIE(b, v)         SET_GLOBAL_FIELD(b, CR, RPUEIE, v)
-#define SET_DCDEE(b, v)          SET_GLOBAL_FIELD(b, CR, DCDEE, v)
-#define SET_CLIENTPD(b, v)       SET_GLOBAL_FIELD(b, CR, CLIENTPD, v)
-#define SET_STALLD(b, v)         SET_GLOBAL_FIELD(b, CR, STALLD, v)
-#define SET_TLBLKCRWE(b, v)      SET_GLOBAL_FIELD(b, CR, TLBLKCRWE, v)
-#define SET_CR_TLBIALLCFG(b, v)  SET_GLOBAL_FIELD(b, CR, CR_TLBIALLCFG, v)
-#define SET_TLBIVMIDCFG(b, v)    SET_GLOBAL_FIELD(b, CR, TLBIVMIDCFG, v)
-#define SET_CR_HUME(b, v)        SET_GLOBAL_FIELD(b, CR, CR_HUME, v)
-
-
-/* ESR */
-#define SET_CFG(b, v)            SET_GLOBAL_FIELD(b, ESR, CFG, v)
-#define SET_BYPASS(b, v)         SET_GLOBAL_FIELD(b, ESR, BYPASS, v)
-#define SET_ESR_MULTI(b, v)      SET_GLOBAL_FIELD(b, ESR, ESR_MULTI, v)
-
-
-/* ESYNR0 */
-#define SET_ESYNR0_AMID(b, v)    SET_GLOBAL_FIELD(b, ESYNR0, ESYNR0_AMID, v)
-#define SET_ESYNR0_APID(b, v)    SET_GLOBAL_FIELD(b, ESYNR0, ESYNR0_APID, v)
-#define SET_ESYNR0_ABID(b, v)    SET_GLOBAL_FIELD(b, ESYNR0, ESYNR0_ABID, v)
-#define SET_ESYNR0_AVMID(b, v)   SET_GLOBAL_FIELD(b, ESYNR0, ESYNR0_AVMID, v)
-#define SET_ESYNR0_ATID(b, v)    SET_GLOBAL_FIELD(b, ESYNR0, ESYNR0_ATID, v)
-
-
-/* ESYNR1 */
-#define SET_ESYNR1_AMEMTYPE(b, v) \
-                        SET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_AMEMTYPE, v)
-#define SET_ESYNR1_ASHARED(b, v)  SET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_ASHARED, v)
-#define SET_ESYNR1_AINNERSHARED(b, v) \
-                        SET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_AINNERSHARED, v)
-#define SET_ESYNR1_APRIV(b, v)   SET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_APRIV, v)
-#define SET_ESYNR1_APROTNS(b, v) SET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_APROTNS, v)
-#define SET_ESYNR1_AINST(b, v)   SET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_AINST, v)
-#define SET_ESYNR1_AWRITE(b, v)  SET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_AWRITE, v)
-#define SET_ESYNR1_ABURST(b, v)  SET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_ABURST, v)
-#define SET_ESYNR1_ALEN(b, v)    SET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_ALEN, v)
-#define SET_ESYNR1_ASIZE(b, v)   SET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_ASIZE, v)
-#define SET_ESYNR1_ALOCK(b, v)   SET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_ALOCK, v)
-#define SET_ESYNR1_AOOO(b, v)    SET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_AOOO, v)
-#define SET_ESYNR1_AFULL(b, v)   SET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_AFULL, v)
-#define SET_ESYNR1_AC(b, v)      SET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_AC, v)
-#define SET_ESYNR1_DCD(b, v)     SET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_DCD, v)
-
-
-/* TESTBUSCR */
-#define SET_TBE(b, v)            SET_GLOBAL_FIELD(b, TESTBUSCR, TBE, v)
-#define SET_SPDMBE(b, v)         SET_GLOBAL_FIELD(b, TESTBUSCR, SPDMBE, v)
-#define SET_WGSEL(b, v)          SET_GLOBAL_FIELD(b, TESTBUSCR, WGSEL, v)
-#define SET_TBLSEL(b, v)         SET_GLOBAL_FIELD(b, TESTBUSCR, TBLSEL, v)
-#define SET_TBHSEL(b, v)         SET_GLOBAL_FIELD(b, TESTBUSCR, TBHSEL, v)
-#define SET_SPDM0SEL(b, v)       SET_GLOBAL_FIELD(b, TESTBUSCR, SPDM0SEL, v)
-#define SET_SPDM1SEL(b, v)       SET_GLOBAL_FIELD(b, TESTBUSCR, SPDM1SEL, v)
-#define SET_SPDM2SEL(b, v)       SET_GLOBAL_FIELD(b, TESTBUSCR, SPDM2SEL, v)
-#define SET_SPDM3SEL(b, v)       SET_GLOBAL_FIELD(b, TESTBUSCR, SPDM3SEL, v)
-
-
-/* TLBIVMID */
-#define SET_TLBIVMID_VMID(b, v)  SET_GLOBAL_FIELD(b, TLBIVMID, TLBIVMID_VMID, v)
-
-
-/* TLBRSW */
-#define SET_TLBRSW_INDEX(b, v)   SET_GLOBAL_FIELD(b, TLBRSW, TLBRSW_INDEX, v)
-#define SET_TLBBFBS(b, v)        SET_GLOBAL_FIELD(b, TLBRSW, TLBBFBS, v)
-
-
-/* TLBTR0 */
-#define SET_PR(b, v)             SET_GLOBAL_FIELD(b, TLBTR0, PR, v)
-#define SET_PW(b, v)             SET_GLOBAL_FIELD(b, TLBTR0, PW, v)
-#define SET_UR(b, v)             SET_GLOBAL_FIELD(b, TLBTR0, UR, v)
-#define SET_UW(b, v)             SET_GLOBAL_FIELD(b, TLBTR0, UW, v)
-#define SET_XN(b, v)             SET_GLOBAL_FIELD(b, TLBTR0, XN, v)
-#define SET_NSDESC(b, v)         SET_GLOBAL_FIELD(b, TLBTR0, NSDESC, v)
-#define SET_ISH(b, v)            SET_GLOBAL_FIELD(b, TLBTR0, ISH, v)
-#define SET_SH(b, v)             SET_GLOBAL_FIELD(b, TLBTR0, SH, v)
-#define SET_MT(b, v)             SET_GLOBAL_FIELD(b, TLBTR0, MT, v)
-#define SET_DPSIZR(b, v)         SET_GLOBAL_FIELD(b, TLBTR0, DPSIZR, v)
-#define SET_DPSIZC(b, v)         SET_GLOBAL_FIELD(b, TLBTR0, DPSIZC, v)
-
-
-/* TLBTR1 */
-#define SET_TLBTR1_VMID(b, v)    SET_GLOBAL_FIELD(b, TLBTR1, TLBTR1_VMID, v)
-#define SET_TLBTR1_PA(b, v)      SET_GLOBAL_FIELD(b, TLBTR1, TLBTR1_PA, v)
-
-
-/* TLBTR2 */
-#define SET_TLBTR2_ASID(b, v)    SET_GLOBAL_FIELD(b, TLBTR2, TLBTR2_ASID, v)
-#define SET_TLBTR2_V(b, v)       SET_GLOBAL_FIELD(b, TLBTR2, TLBTR2_V, v)
-#define SET_TLBTR2_NSTID(b, v)   SET_GLOBAL_FIELD(b, TLBTR2, TLBTR2_NSTID, v)
-#define SET_TLBTR2_NV(b, v)      SET_GLOBAL_FIELD(b, TLBTR2, TLBTR2_NV, v)
-#define SET_TLBTR2_VA(b, v)      SET_GLOBAL_FIELD(b, TLBTR2, TLBTR2_VA, v)
-
-
-/* Global Field Getters */
-/* CBACR_N */
-#define GET_RWVMID(b, n)         GET_GLOBAL_FIELD(b, (n<<2)|(CBACR_N), RWVMID)
-#define GET_RWE(b, n)            GET_GLOBAL_FIELD(b, (n<<2)|(CBACR_N), RWE)
-#define GET_RWGE(b, n)           GET_GLOBAL_FIELD(b, (n<<2)|(CBACR_N), RWGE)
-#define GET_CBVMID(b, n)         GET_GLOBAL_FIELD(b, (n<<2)|(CBACR_N), CBVMID)
-#define GET_IRPTNDX(b, n)        GET_GLOBAL_FIELD(b, (n<<2)|(CBACR_N), IRPTNDX)
-
-
-/* M2VCBR_N */
-#define GET_VMID(b, n)       GET_GLOBAL_FIELD(b, (n<<2)|(M2VCBR_N), VMID)
-#define GET_CBNDX(b, n)      GET_GLOBAL_FIELD(b, (n<<2)|(M2VCBR_N), CBNDX)
-#define GET_BYPASSD(b, n)    GET_GLOBAL_FIELD(b, (n<<2)|(M2VCBR_N), BYPASSD)
-#define GET_BPRCOSH(b, n)    GET_GLOBAL_FIELD(b, (n<<2)|(M2VCBR_N), BPRCOSH)
-#define GET_BPRCISH(b, n)    GET_GLOBAL_FIELD(b, (n<<2)|(M2VCBR_N), BPRCISH)
-#define GET_BPRCNSH(b, n)    GET_GLOBAL_FIELD(b, (n<<2)|(M2VCBR_N), BPRCNSH)
-#define GET_BPSHCFG(b, n)    GET_GLOBAL_FIELD(b, (n<<2)|(M2VCBR_N), BPSHCFG)
-#define GET_NSCFG(b, n)      GET_GLOBAL_FIELD(b, (n<<2)|(M2VCBR_N), NSCFG)
-#define GET_BPMTCFG(b, n)    GET_GLOBAL_FIELD(b, (n<<2)|(M2VCBR_N), BPMTCFG)
-#define GET_BPMEMTYPE(b, n)  GET_GLOBAL_FIELD(b, (n<<2)|(M2VCBR_N), BPMEMTYPE)
-
-
-/* CR */
-#define GET_RPUE(b)              GET_GLOBAL_FIELD(b, CR, RPUE)
-#define GET_RPUERE(b)            GET_GLOBAL_FIELD(b, CR, RPUERE)
-#define GET_RPUEIE(b)            GET_GLOBAL_FIELD(b, CR, RPUEIE)
-#define GET_DCDEE(b)             GET_GLOBAL_FIELD(b, CR, DCDEE)
-#define GET_CLIENTPD(b)          GET_GLOBAL_FIELD(b, CR, CLIENTPD)
-#define GET_STALLD(b)            GET_GLOBAL_FIELD(b, CR, STALLD)
-#define GET_TLBLKCRWE(b)         GET_GLOBAL_FIELD(b, CR, TLBLKCRWE)
-#define GET_CR_TLBIALLCFG(b)     GET_GLOBAL_FIELD(b, CR, CR_TLBIALLCFG)
-#define GET_TLBIVMIDCFG(b)       GET_GLOBAL_FIELD(b, CR, TLBIVMIDCFG)
-#define GET_CR_HUME(b)           GET_GLOBAL_FIELD(b, CR, CR_HUME)
-
-
-/* ESR */
-#define GET_CFG(b)               GET_GLOBAL_FIELD(b, ESR, CFG)
-#define GET_BYPASS(b)            GET_GLOBAL_FIELD(b, ESR, BYPASS)
-#define GET_ESR_MULTI(b)         GET_GLOBAL_FIELD(b, ESR, ESR_MULTI)
-
-
-/* ESYNR0 */
-#define GET_ESYNR0_AMID(b)       GET_GLOBAL_FIELD(b, ESYNR0, ESYNR0_AMID)
-#define GET_ESYNR0_APID(b)       GET_GLOBAL_FIELD(b, ESYNR0, ESYNR0_APID)
-#define GET_ESYNR0_ABID(b)       GET_GLOBAL_FIELD(b, ESYNR0, ESYNR0_ABID)
-#define GET_ESYNR0_AVMID(b)      GET_GLOBAL_FIELD(b, ESYNR0, ESYNR0_AVMID)
-#define GET_ESYNR0_ATID(b)       GET_GLOBAL_FIELD(b, ESYNR0, ESYNR0_ATID)
-
-
-/* ESYNR1 */
-#define GET_ESYNR1_AMEMTYPE(b)   GET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_AMEMTYPE)
-#define GET_ESYNR1_ASHARED(b)    GET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_ASHARED)
-#define GET_ESYNR1_AINNERSHARED(b) \
-                        GET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_AINNERSHARED)
-#define GET_ESYNR1_APRIV(b)      GET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_APRIV)
-#define GET_ESYNR1_APROTNS(b)    GET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_APROTNS)
-#define GET_ESYNR1_AINST(b)      GET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_AINST)
-#define GET_ESYNR1_AWRITE(b)     GET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_AWRITE)
-#define GET_ESYNR1_ABURST(b)     GET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_ABURST)
-#define GET_ESYNR1_ALEN(b)       GET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_ALEN)
-#define GET_ESYNR1_ASIZE(b)      GET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_ASIZE)
-#define GET_ESYNR1_ALOCK(b)      GET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_ALOCK)
-#define GET_ESYNR1_AOOO(b)       GET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_AOOO)
-#define GET_ESYNR1_AFULL(b)      GET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_AFULL)
-#define GET_ESYNR1_AC(b)         GET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_AC)
-#define GET_ESYNR1_DCD(b)        GET_GLOBAL_FIELD(b, ESYNR1, ESYNR1_DCD)
-
-
-/* IDR */
-#define GET_NM2VCBMT(b)          GET_GLOBAL_FIELD(b, IDR, NM2VCBMT)
-#define GET_HTW(b)               GET_GLOBAL_FIELD(b, IDR, HTW)
-#define GET_HUM(b)               GET_GLOBAL_FIELD(b, IDR, HUM)
-#define GET_TLBSIZE(b)           GET_GLOBAL_FIELD(b, IDR, TLBSIZE)
-#define GET_NCB(b)               GET_GLOBAL_FIELD(b, IDR, NCB)
-#define GET_NIRPT(b)             GET_GLOBAL_FIELD(b, IDR, NIRPT)
-
-
-/* REV */
-#define GET_MAJOR(b)             GET_GLOBAL_FIELD(b, REV, MAJOR)
-#define GET_MINOR(b)             GET_GLOBAL_FIELD(b, REV, MINOR)
-
-
-/* TESTBUSCR */
-#define GET_TBE(b)               GET_GLOBAL_FIELD(b, TESTBUSCR, TBE)
-#define GET_SPDMBE(b)            GET_GLOBAL_FIELD(b, TESTBUSCR, SPDMBE)
-#define GET_WGSEL(b)             GET_GLOBAL_FIELD(b, TESTBUSCR, WGSEL)
-#define GET_TBLSEL(b)            GET_GLOBAL_FIELD(b, TESTBUSCR, TBLSEL)
-#define GET_TBHSEL(b)            GET_GLOBAL_FIELD(b, TESTBUSCR, TBHSEL)
-#define GET_SPDM0SEL(b)          GET_GLOBAL_FIELD(b, TESTBUSCR, SPDM0SEL)
-#define GET_SPDM1SEL(b)          GET_GLOBAL_FIELD(b, TESTBUSCR, SPDM1SEL)
-#define GET_SPDM2SEL(b)          GET_GLOBAL_FIELD(b, TESTBUSCR, SPDM2SEL)
-#define GET_SPDM3SEL(b)          GET_GLOBAL_FIELD(b, TESTBUSCR, SPDM3SEL)
-
-
-/* TLBIVMID */
-#define GET_TLBIVMID_VMID(b)     GET_GLOBAL_FIELD(b, TLBIVMID, TLBIVMID_VMID)
-
-
-/* TLBTR0 */
-#define GET_PR(b)                GET_GLOBAL_FIELD(b, TLBTR0, PR)
-#define GET_PW(b)                GET_GLOBAL_FIELD(b, TLBTR0, PW)
-#define GET_UR(b)                GET_GLOBAL_FIELD(b, TLBTR0, UR)
-#define GET_UW(b)                GET_GLOBAL_FIELD(b, TLBTR0, UW)
-#define GET_XN(b)                GET_GLOBAL_FIELD(b, TLBTR0, XN)
-#define GET_NSDESC(b)            GET_GLOBAL_FIELD(b, TLBTR0, NSDESC)
-#define GET_ISH(b)               GET_GLOBAL_FIELD(b, TLBTR0, ISH)
-#define GET_SH(b)                GET_GLOBAL_FIELD(b, TLBTR0, SH)
-#define GET_MT(b)                GET_GLOBAL_FIELD(b, TLBTR0, MT)
-#define GET_DPSIZR(b)            GET_GLOBAL_FIELD(b, TLBTR0, DPSIZR)
-#define GET_DPSIZC(b)            GET_GLOBAL_FIELD(b, TLBTR0, DPSIZC)
-
-
-/* TLBTR1 */
-#define GET_TLBTR1_VMID(b)       GET_GLOBAL_FIELD(b, TLBTR1, TLBTR1_VMID)
-#define GET_TLBTR1_PA(b)         GET_GLOBAL_FIELD(b, TLBTR1, TLBTR1_PA)
-
-
-/* TLBTR2 */
-#define GET_TLBTR2_ASID(b)       GET_GLOBAL_FIELD(b, TLBTR2, TLBTR2_ASID)
-#define GET_TLBTR2_V(b)          GET_GLOBAL_FIELD(b, TLBTR2, TLBTR2_V)
-#define GET_TLBTR2_NSTID(b)      GET_GLOBAL_FIELD(b, TLBTR2, TLBTR2_NSTID)
-#define GET_TLBTR2_NV(b)         GET_GLOBAL_FIELD(b, TLBTR2, TLBTR2_NV)
-#define GET_TLBTR2_VA(b)         GET_GLOBAL_FIELD(b, TLBTR2, TLBTR2_VA)
-
-
-/* Context Register setters / getters */
-/* Context Register setters */
-/* ACTLR */
-#define SET_CFERE(b, c, v)       SET_CONTEXT_FIELD(b, c, ACTLR, CFERE, v)
-#define SET_CFEIE(b, c, v)       SET_CONTEXT_FIELD(b, c, ACTLR, CFEIE, v)
-#define SET_PTSHCFG(b, c, v)     SET_CONTEXT_FIELD(b, c, ACTLR, PTSHCFG, v)
-#define SET_RCOSH(b, c, v)       SET_CONTEXT_FIELD(b, c, ACTLR, RCOSH, v)
-#define SET_RCISH(b, c, v)       SET_CONTEXT_FIELD(b, c, ACTLR, RCISH, v)
-#define SET_RCNSH(b, c, v)       SET_CONTEXT_FIELD(b, c, ACTLR, RCNSH, v)
-#define SET_PRIVCFG(b, c, v)     SET_CONTEXT_FIELD(b, c, ACTLR, PRIVCFG, v)
-#define SET_DNA(b, c, v)         SET_CONTEXT_FIELD(b, c, ACTLR, DNA, v)
-#define SET_DNLV2PA(b, c, v)     SET_CONTEXT_FIELD(b, c, ACTLR, DNLV2PA, v)
-#define SET_TLBMCFG(b, c, v)     SET_CONTEXT_FIELD(b, c, ACTLR, TLBMCFG, v)
-#define SET_CFCFG(b, c, v)       SET_CONTEXT_FIELD(b, c, ACTLR, CFCFG, v)
-#define SET_TIPCF(b, c, v)       SET_CONTEXT_FIELD(b, c, ACTLR, TIPCF, v)
-#define SET_V2PCFG(b, c, v)      SET_CONTEXT_FIELD(b, c, ACTLR, V2PCFG, v)
-#define SET_HUME(b, c, v)        SET_CONTEXT_FIELD(b, c, ACTLR, HUME, v)
-#define SET_PTMTCFG(b, c, v)     SET_CONTEXT_FIELD(b, c, ACTLR, PTMTCFG, v)
-#define SET_PTMEMTYPE(b, c, v)   SET_CONTEXT_FIELD(b, c, ACTLR, PTMEMTYPE, v)
-
-
-/* BFBCR */
-#define SET_BFBDFE(b, c, v)      SET_CONTEXT_FIELD(b, c, BFBCR, BFBDFE, v)
-#define SET_BFBSFE(b, c, v)      SET_CONTEXT_FIELD(b, c, BFBCR, BFBSFE, v)
-#define SET_SFVS(b, c, v)        SET_CONTEXT_FIELD(b, c, BFBCR, SFVS, v)
-#define SET_FLVIC(b, c, v)       SET_CONTEXT_FIELD(b, c, BFBCR, FLVIC, v)
-#define SET_SLVIC(b, c, v)       SET_CONTEXT_FIELD(b, c, BFBCR, SLVIC, v)
-
-
-/* CONTEXTIDR */
-#define SET_CONTEXTIDR_ASID(b, c, v)   \
-                SET_CONTEXT_FIELD(b, c, CONTEXTIDR, CONTEXTIDR_ASID, v)
-#define SET_CONTEXTIDR_PROCID(b, c, v) \
-                SET_CONTEXT_FIELD(b, c, CONTEXTIDR, PROCID, v)
-
-
-/* FSR */
-#define SET_TF(b, c, v)          SET_CONTEXT_FIELD(b, c, FSR, TF, v)
-#define SET_AFF(b, c, v)         SET_CONTEXT_FIELD(b, c, FSR, AFF, v)
-#define SET_APF(b, c, v)         SET_CONTEXT_FIELD(b, c, FSR, APF, v)
-#define SET_TLBMF(b, c, v)       SET_CONTEXT_FIELD(b, c, FSR, TLBMF, v)
-#define SET_HTWDEEF(b, c, v)     SET_CONTEXT_FIELD(b, c, FSR, HTWDEEF, v)
-#define SET_HTWSEEF(b, c, v)     SET_CONTEXT_FIELD(b, c, FSR, HTWSEEF, v)
-#define SET_MHF(b, c, v)         SET_CONTEXT_FIELD(b, c, FSR, MHF, v)
-#define SET_SL(b, c, v)          SET_CONTEXT_FIELD(b, c, FSR, SL, v)
-#define SET_SS(b, c, v)          SET_CONTEXT_FIELD(b, c, FSR, SS, v)
-#define SET_MULTI(b, c, v)       SET_CONTEXT_FIELD(b, c, FSR, MULTI, v)
-
-
-/* FSYNR0 */
-#define SET_AMID(b, c, v)        SET_CONTEXT_FIELD(b, c, FSYNR0, AMID, v)
-#define SET_APID(b, c, v)        SET_CONTEXT_FIELD(b, c, FSYNR0, APID, v)
-#define SET_ABID(b, c, v)        SET_CONTEXT_FIELD(b, c, FSYNR0, ABID, v)
-#define SET_ATID(b, c, v)        SET_CONTEXT_FIELD(b, c, FSYNR0, ATID, v)
-
-
-/* FSYNR1 */
-#define SET_AMEMTYPE(b, c, v)    SET_CONTEXT_FIELD(b, c, FSYNR1, AMEMTYPE, v)
-#define SET_ASHARED(b, c, v)     SET_CONTEXT_FIELD(b, c, FSYNR1, ASHARED, v)
-#define SET_AINNERSHARED(b, c, v)  \
-                                SET_CONTEXT_FIELD(b, c, FSYNR1, AINNERSHARED, v)
-#define SET_APRIV(b, c, v)       SET_CONTEXT_FIELD(b, c, FSYNR1, APRIV, v)
-#define SET_APROTNS(b, c, v)     SET_CONTEXT_FIELD(b, c, FSYNR1, APROTNS, v)
-#define SET_AINST(b, c, v)       SET_CONTEXT_FIELD(b, c, FSYNR1, AINST, v)
-#define SET_AWRITE(b, c, v)      SET_CONTEXT_FIELD(b, c, FSYNR1, AWRITE, v)
-#define SET_ABURST(b, c, v)      SET_CONTEXT_FIELD(b, c, FSYNR1, ABURST, v)
-#define SET_ALEN(b, c, v)        SET_CONTEXT_FIELD(b, c, FSYNR1, ALEN, v)
-#define SET_FSYNR1_ASIZE(b, c, v) \
-                                SET_CONTEXT_FIELD(b, c, FSYNR1, FSYNR1_ASIZE, v)
-#define SET_ALOCK(b, c, v)       SET_CONTEXT_FIELD(b, c, FSYNR1, ALOCK, v)
-#define SET_AFULL(b, c, v)       SET_CONTEXT_FIELD(b, c, FSYNR1, AFULL, v)
-
-
-/* NMRR */
-#define SET_ICPC0(b, c, v)       SET_CONTEXT_FIELD(b, c, NMRR, ICPC0, v)
-#define SET_ICPC1(b, c, v)       SET_CONTEXT_FIELD(b, c, NMRR, ICPC1, v)
-#define SET_ICPC2(b, c, v)       SET_CONTEXT_FIELD(b, c, NMRR, ICPC2, v)
-#define SET_ICPC3(b, c, v)       SET_CONTEXT_FIELD(b, c, NMRR, ICPC3, v)
-#define SET_ICPC4(b, c, v)       SET_CONTEXT_FIELD(b, c, NMRR, ICPC4, v)
-#define SET_ICPC5(b, c, v)       SET_CONTEXT_FIELD(b, c, NMRR, ICPC5, v)
-#define SET_ICPC6(b, c, v)       SET_CONTEXT_FIELD(b, c, NMRR, ICPC6, v)
-#define SET_ICPC7(b, c, v)       SET_CONTEXT_FIELD(b, c, NMRR, ICPC7, v)
-#define SET_OCPC0(b, c, v)       SET_CONTEXT_FIELD(b, c, NMRR, OCPC0, v)
-#define SET_OCPC1(b, c, v)       SET_CONTEXT_FIELD(b, c, NMRR, OCPC1, v)
-#define SET_OCPC2(b, c, v)       SET_CONTEXT_FIELD(b, c, NMRR, OCPC2, v)
-#define SET_OCPC3(b, c, v)       SET_CONTEXT_FIELD(b, c, NMRR, OCPC3, v)
-#define SET_OCPC4(b, c, v)       SET_CONTEXT_FIELD(b, c, NMRR, OCPC4, v)
-#define SET_OCPC5(b, c, v)       SET_CONTEXT_FIELD(b, c, NMRR, OCPC5, v)
-#define SET_OCPC6(b, c, v)       SET_CONTEXT_FIELD(b, c, NMRR, OCPC6, v)
-#define SET_OCPC7(b, c, v)       SET_CONTEXT_FIELD(b, c, NMRR, OCPC7, v)
-
-
-/* PAR */
-#define SET_FAULT(b, c, v)       SET_CONTEXT_FIELD(b, c, PAR, FAULT, v)
-
-#define SET_FAULT_TF(b, c, v)    SET_CONTEXT_FIELD(b, c, PAR, FAULT_TF, v)
-#define SET_FAULT_AFF(b, c, v)   SET_CONTEXT_FIELD(b, c, PAR, FAULT_AFF, v)
-#define SET_FAULT_APF(b, c, v)   SET_CONTEXT_FIELD(b, c, PAR, FAULT_APF, v)
-#define SET_FAULT_TLBMF(b, c, v) SET_CONTEXT_FIELD(b, c, PAR, FAULT_TLBMF, v)
-#define SET_FAULT_HTWDEEF(b, c, v) \
-                                SET_CONTEXT_FIELD(b, c, PAR, FAULT_HTWDEEF, v)
-#define SET_FAULT_HTWSEEF(b, c, v) \
-                                SET_CONTEXT_FIELD(b, c, PAR, FAULT_HTWSEEF, v)
-#define SET_FAULT_MHF(b, c, v)   SET_CONTEXT_FIELD(b, c, PAR, FAULT_MHF, v)
-#define SET_FAULT_SL(b, c, v)    SET_CONTEXT_FIELD(b, c, PAR, FAULT_SL, v)
-#define SET_FAULT_SS(b, c, v)    SET_CONTEXT_FIELD(b, c, PAR, FAULT_SS, v)
-
-#define SET_NOFAULT_SS(b, c, v)  SET_CONTEXT_FIELD(b, c, PAR, NOFAULT_SS, v)
-#define SET_NOFAULT_MT(b, c, v)  SET_CONTEXT_FIELD(b, c, PAR, NOFAULT_MT, v)
-#define SET_NOFAULT_SH(b, c, v)  SET_CONTEXT_FIELD(b, c, PAR, NOFAULT_SH, v)
-#define SET_NOFAULT_NS(b, c, v)  SET_CONTEXT_FIELD(b, c, PAR, NOFAULT_NS, v)
-#define SET_NOFAULT_NOS(b, c, v) SET_CONTEXT_FIELD(b, c, PAR, NOFAULT_NOS, v)
-#define SET_NPFAULT_PA(b, c, v)  SET_CONTEXT_FIELD(b, c, PAR, NPFAULT_PA, v)
-
-
-/* PRRR */
-#define SET_MTC0(b, c, v)        SET_CONTEXT_FIELD(b, c, PRRR, MTC0, v)
-#define SET_MTC1(b, c, v)        SET_CONTEXT_FIELD(b, c, PRRR, MTC1, v)
-#define SET_MTC2(b, c, v)        SET_CONTEXT_FIELD(b, c, PRRR, MTC2, v)
-#define SET_MTC3(b, c, v)        SET_CONTEXT_FIELD(b, c, PRRR, MTC3, v)
-#define SET_MTC4(b, c, v)        SET_CONTEXT_FIELD(b, c, PRRR, MTC4, v)
-#define SET_MTC5(b, c, v)        SET_CONTEXT_FIELD(b, c, PRRR, MTC5, v)
-#define SET_MTC6(b, c, v)        SET_CONTEXT_FIELD(b, c, PRRR, MTC6, v)
-#define SET_MTC7(b, c, v)        SET_CONTEXT_FIELD(b, c, PRRR, MTC7, v)
-#define SET_SHDSH0(b, c, v)      SET_CONTEXT_FIELD(b, c, PRRR, SHDSH0, v)
-#define SET_SHDSH1(b, c, v)      SET_CONTEXT_FIELD(b, c, PRRR, SHDSH1, v)
-#define SET_SHNMSH0(b, c, v)     SET_CONTEXT_FIELD(b, c, PRRR, SHNMSH0, v)
-#define SET_SHNMSH1(b, c, v)     SET_CONTEXT_FIELD(b, c, PRRR, SHNMSH1, v)
-#define SET_NOS0(b, c, v)        SET_CONTEXT_FIELD(b, c, PRRR, NOS0, v)
-#define SET_NOS1(b, c, v)        SET_CONTEXT_FIELD(b, c, PRRR, NOS1, v)
-#define SET_NOS2(b, c, v)        SET_CONTEXT_FIELD(b, c, PRRR, NOS2, v)
-#define SET_NOS3(b, c, v)        SET_CONTEXT_FIELD(b, c, PRRR, NOS3, v)
-#define SET_NOS4(b, c, v)        SET_CONTEXT_FIELD(b, c, PRRR, NOS4, v)
-#define SET_NOS5(b, c, v)        SET_CONTEXT_FIELD(b, c, PRRR, NOS5, v)
-#define SET_NOS6(b, c, v)        SET_CONTEXT_FIELD(b, c, PRRR, NOS6, v)
-#define SET_NOS7(b, c, v)        SET_CONTEXT_FIELD(b, c, PRRR, NOS7, v)
-
-
-/* RESUME */
-#define SET_TNR(b, c, v)         SET_CONTEXT_FIELD(b, c, RESUME, TNR, v)
-
-
-/* SCTLR */
-#define SET_M(b, c, v)           SET_CONTEXT_FIELD(b, c, SCTLR, M, v)
-#define SET_TRE(b, c, v)         SET_CONTEXT_FIELD(b, c, SCTLR, TRE, v)
-#define SET_AFE(b, c, v)         SET_CONTEXT_FIELD(b, c, SCTLR, AFE, v)
-#define SET_HAF(b, c, v)         SET_CONTEXT_FIELD(b, c, SCTLR, HAF, v)
-#define SET_BE(b, c, v)          SET_CONTEXT_FIELD(b, c, SCTLR, BE, v)
-#define SET_AFFD(b, c, v)        SET_CONTEXT_FIELD(b, c, SCTLR, AFFD, v)
-
-
-/* TLBLKCR */
-#define SET_LKE(b, c, v)           SET_CONTEXT_FIELD(b, c, TLBLKCR, LKE, v)
-#define SET_TLBLKCR_TLBIALLCFG(b, c, v) \
-                        SET_CONTEXT_FIELD(b, c, TLBLKCR, TLBLCKR_TLBIALLCFG, v)
-#define SET_TLBIASIDCFG(b, c, v) \
-                        SET_CONTEXT_FIELD(b, c, TLBLKCR, TLBIASIDCFG, v)
-#define SET_TLBIVAACFG(b, c, v) SET_CONTEXT_FIELD(b, c, TLBLKCR, TLBIVAACFG, v)
-#define SET_FLOOR(b, c, v)      SET_CONTEXT_FIELD(b, c, TLBLKCR, FLOOR, v)
-#define SET_VICTIM(b, c, v)     SET_CONTEXT_FIELD(b, c, TLBLKCR, VICTIM, v)
-
-
-/* TTBCR */
-#define SET_N(b, c, v)           SET_CONTEXT_FIELD(b, c, TTBCR, N, v)
-#define SET_PD0(b, c, v)         SET_CONTEXT_FIELD(b, c, TTBCR, PD0, v)
-#define SET_PD1(b, c, v)         SET_CONTEXT_FIELD(b, c, TTBCR, PD1, v)
-
-
-/* TTBR0 */
-#define SET_TTBR0_IRGNH(b, c, v) SET_CONTEXT_FIELD(b, c, TTBR0, TTBR0_IRGNH, v)
-#define SET_TTBR0_SH(b, c, v)    SET_CONTEXT_FIELD(b, c, TTBR0, TTBR0_SH, v)
-#define SET_TTBR0_ORGN(b, c, v)  SET_CONTEXT_FIELD(b, c, TTBR0, TTBR0_ORGN, v)
-#define SET_TTBR0_NOS(b, c, v)   SET_CONTEXT_FIELD(b, c, TTBR0, TTBR0_NOS, v)
-#define SET_TTBR0_IRGNL(b, c, v) SET_CONTEXT_FIELD(b, c, TTBR0, TTBR0_IRGNL, v)
-#define SET_TTBR0_PA(b, c, v)    SET_CONTEXT_FIELD(b, c, TTBR0, TTBR0_PA, v)
-
-
-/* TTBR1 */
-#define SET_TTBR1_IRGNH(b, c, v) SET_CONTEXT_FIELD(b, c, TTBR1, TTBR1_IRGNH, v)
-#define SET_TTBR1_SH(b, c, v)    SET_CONTEXT_FIELD(b, c, TTBR1, TTBR1_SH, v)
-#define SET_TTBR1_ORGN(b, c, v)  SET_CONTEXT_FIELD(b, c, TTBR1, TTBR1_ORGN, v)
-#define SET_TTBR1_NOS(b, c, v)   SET_CONTEXT_FIELD(b, c, TTBR1, TTBR1_NOS, v)
-#define SET_TTBR1_IRGNL(b, c, v) SET_CONTEXT_FIELD(b, c, TTBR1, TTBR1_IRGNL, v)
-#define SET_TTBR1_PA(b, c, v)    SET_CONTEXT_FIELD(b, c, TTBR1, TTBR1_PA, v)
-
-
-/* V2PSR */
-#define SET_HIT(b, c, v)         SET_CONTEXT_FIELD(b, c, V2PSR, HIT, v)
-#define SET_INDEX(b, c, v)       SET_CONTEXT_FIELD(b, c, V2PSR, INDEX, v)
-
-
-/* Context Register getters */
-/* ACTLR */
-#define GET_CFERE(b, c)         GET_CONTEXT_FIELD(b, c, ACTLR, CFERE)
-#define GET_CFEIE(b, c)         GET_CONTEXT_FIELD(b, c, ACTLR, CFEIE)
-#define GET_PTSHCFG(b, c)       GET_CONTEXT_FIELD(b, c, ACTLR, PTSHCFG)
-#define GET_RCOSH(b, c)         GET_CONTEXT_FIELD(b, c, ACTLR, RCOSH)
-#define GET_RCISH(b, c)         GET_CONTEXT_FIELD(b, c, ACTLR, RCISH)
-#define GET_RCNSH(b, c)         GET_CONTEXT_FIELD(b, c, ACTLR, RCNSH)
-#define GET_PRIVCFG(b, c)       GET_CONTEXT_FIELD(b, c, ACTLR, PRIVCFG)
-#define GET_DNA(b, c)           GET_CONTEXT_FIELD(b, c, ACTLR, DNA)
-#define GET_DNLV2PA(b, c)       GET_CONTEXT_FIELD(b, c, ACTLR, DNLV2PA)
-#define GET_TLBMCFG(b, c)       GET_CONTEXT_FIELD(b, c, ACTLR, TLBMCFG)
-#define GET_CFCFG(b, c)         GET_CONTEXT_FIELD(b, c, ACTLR, CFCFG)
-#define GET_TIPCF(b, c)         GET_CONTEXT_FIELD(b, c, ACTLR, TIPCF)
-#define GET_V2PCFG(b, c)        GET_CONTEXT_FIELD(b, c, ACTLR, V2PCFG)
-#define GET_HUME(b, c)          GET_CONTEXT_FIELD(b, c, ACTLR, HUME)
-#define GET_PTMTCFG(b, c)       GET_CONTEXT_FIELD(b, c, ACTLR, PTMTCFG)
-#define GET_PTMEMTYPE(b, c)     GET_CONTEXT_FIELD(b, c, ACTLR, PTMEMTYPE)
-
-/* BFBCR */
-#define GET_BFBDFE(b, c)        GET_CONTEXT_FIELD(b, c, BFBCR, BFBDFE)
-#define GET_BFBSFE(b, c)        GET_CONTEXT_FIELD(b, c, BFBCR, BFBSFE)
-#define GET_SFVS(b, c)          GET_CONTEXT_FIELD(b, c, BFBCR, SFVS)
-#define GET_FLVIC(b, c)         GET_CONTEXT_FIELD(b, c, BFBCR, FLVIC)
-#define GET_SLVIC(b, c)         GET_CONTEXT_FIELD(b, c, BFBCR, SLVIC)
-
-
-/* CONTEXTIDR */
-#define GET_CONTEXTIDR_ASID(b, c) \
-                        GET_CONTEXT_FIELD(b, c, CONTEXTIDR, CONTEXTIDR_ASID)
-#define GET_CONTEXTIDR_PROCID(b, c) GET_CONTEXT_FIELD(b, c, CONTEXTIDR, PROCID)
-
-
-/* FSR */
-#define GET_TF(b, c)            GET_CONTEXT_FIELD(b, c, FSR, TF)
-#define GET_AFF(b, c)           GET_CONTEXT_FIELD(b, c, FSR, AFF)
-#define GET_APF(b, c)           GET_CONTEXT_FIELD(b, c, FSR, APF)
-#define GET_TLBMF(b, c)         GET_CONTEXT_FIELD(b, c, FSR, TLBMF)
-#define GET_HTWDEEF(b, c)       GET_CONTEXT_FIELD(b, c, FSR, HTWDEEF)
-#define GET_HTWSEEF(b, c)       GET_CONTEXT_FIELD(b, c, FSR, HTWSEEF)
-#define GET_MHF(b, c)           GET_CONTEXT_FIELD(b, c, FSR, MHF)
-#define GET_SL(b, c)            GET_CONTEXT_FIELD(b, c, FSR, SL)
-#define GET_SS(b, c)            GET_CONTEXT_FIELD(b, c, FSR, SS)
-#define GET_MULTI(b, c)         GET_CONTEXT_FIELD(b, c, FSR, MULTI)
-
-
-/* FSYNR0 */
-#define GET_AMID(b, c)          GET_CONTEXT_FIELD(b, c, FSYNR0, AMID)
-#define GET_APID(b, c)          GET_CONTEXT_FIELD(b, c, FSYNR0, APID)
-#define GET_ABID(b, c)          GET_CONTEXT_FIELD(b, c, FSYNR0, ABID)
-#define GET_ATID(b, c)          GET_CONTEXT_FIELD(b, c, FSYNR0, ATID)
-
-
-/* FSYNR1 */
-#define GET_AMEMTYPE(b, c)      GET_CONTEXT_FIELD(b, c, FSYNR1, AMEMTYPE)
-#define GET_ASHARED(b, c)       GET_CONTEXT_FIELD(b, c, FSYNR1, ASHARED)
-#define GET_AINNERSHARED(b, c)  GET_CONTEXT_FIELD(b, c, FSYNR1, AINNERSHARED)
-#define GET_APRIV(b, c)         GET_CONTEXT_FIELD(b, c, FSYNR1, APRIV)
-#define GET_APROTNS(b, c)       GET_CONTEXT_FIELD(b, c, FSYNR1, APROTNS)
-#define GET_AINST(b, c)         GET_CONTEXT_FIELD(b, c, FSYNR1, AINST)
-#define GET_AWRITE(b, c)        GET_CONTEXT_FIELD(b, c, FSYNR1, AWRITE)
-#define GET_ABURST(b, c)        GET_CONTEXT_FIELD(b, c, FSYNR1, ABURST)
-#define GET_ALEN(b, c)          GET_CONTEXT_FIELD(b, c, FSYNR1, ALEN)
-#define GET_FSYNR1_ASIZE(b, c)  GET_CONTEXT_FIELD(b, c, FSYNR1, FSYNR1_ASIZE)
-#define GET_ALOCK(b, c)         GET_CONTEXT_FIELD(b, c, FSYNR1, ALOCK)
-#define GET_AFULL(b, c)         GET_CONTEXT_FIELD(b, c, FSYNR1, AFULL)
-
-
-/* NMRR */
-#define GET_ICPC0(b, c)         GET_CONTEXT_FIELD(b, c, NMRR, ICPC0)
-#define GET_ICPC1(b, c)         GET_CONTEXT_FIELD(b, c, NMRR, ICPC1)
-#define GET_ICPC2(b, c)         GET_CONTEXT_FIELD(b, c, NMRR, ICPC2)
-#define GET_ICPC3(b, c)         GET_CONTEXT_FIELD(b, c, NMRR, ICPC3)
-#define GET_ICPC4(b, c)         GET_CONTEXT_FIELD(b, c, NMRR, ICPC4)
-#define GET_ICPC5(b, c)         GET_CONTEXT_FIELD(b, c, NMRR, ICPC5)
-#define GET_ICPC6(b, c)         GET_CONTEXT_FIELD(b, c, NMRR, ICPC6)
-#define GET_ICPC7(b, c)         GET_CONTEXT_FIELD(b, c, NMRR, ICPC7)
-#define GET_OCPC0(b, c)         GET_CONTEXT_FIELD(b, c, NMRR, OCPC0)
-#define GET_OCPC1(b, c)         GET_CONTEXT_FIELD(b, c, NMRR, OCPC1)
-#define GET_OCPC2(b, c)         GET_CONTEXT_FIELD(b, c, NMRR, OCPC2)
-#define GET_OCPC3(b, c)         GET_CONTEXT_FIELD(b, c, NMRR, OCPC3)
-#define GET_OCPC4(b, c)         GET_CONTEXT_FIELD(b, c, NMRR, OCPC4)
-#define GET_OCPC5(b, c)         GET_CONTEXT_FIELD(b, c, NMRR, OCPC5)
-#define GET_OCPC6(b, c)         GET_CONTEXT_FIELD(b, c, NMRR, OCPC6)
-#define GET_OCPC7(b, c)         GET_CONTEXT_FIELD(b, c, NMRR, OCPC7)
-#define NMRR_ICP(nmrr, n)       (((nmrr) & (3 << ((n) * 2))) >> ((n) * 2))
-#define NMRR_OCP(nmrr, n)       (((nmrr) & (3 << ((n) * 2 + 16))) >> \
-                                                                ((n) * 2 + 16))
-
-/* PAR */
-#define GET_FAULT(b, c)         GET_CONTEXT_FIELD(b, c, PAR, FAULT)
-
-#define GET_FAULT_TF(b, c)      GET_CONTEXT_FIELD(b, c, PAR, FAULT_TF)
-#define GET_FAULT_AFF(b, c)     GET_CONTEXT_FIELD(b, c, PAR, FAULT_AFF)
-#define GET_FAULT_APF(b, c)     GET_CONTEXT_FIELD(b, c, PAR, FAULT_APF)
-#define GET_FAULT_TLBMF(b, c)   GET_CONTEXT_FIELD(b, c, PAR, FAULT_TLBMF)
-#define GET_FAULT_HTWDEEF(b, c) GET_CONTEXT_FIELD(b, c, PAR, FAULT_HTWDEEF)
-#define GET_FAULT_HTWSEEF(b, c) GET_CONTEXT_FIELD(b, c, PAR, FAULT_HTWSEEF)
-#define GET_FAULT_MHF(b, c)     GET_CONTEXT_FIELD(b, c, PAR, FAULT_MHF)
-#define GET_FAULT_SL(b, c)      GET_CONTEXT_FIELD(b, c, PAR, FAULT_SL)
-#define GET_FAULT_SS(b, c)      GET_CONTEXT_FIELD(b, c, PAR, FAULT_SS)
-
-#define GET_NOFAULT_SS(b, c)    GET_CONTEXT_FIELD(b, c, PAR, PAR_NOFAULT_SS)
-#define GET_NOFAULT_MT(b, c)    GET_CONTEXT_FIELD(b, c, PAR, PAR_NOFAULT_MT)
-#define GET_NOFAULT_SH(b, c)    GET_CONTEXT_FIELD(b, c, PAR, PAR_NOFAULT_SH)
-#define GET_NOFAULT_NS(b, c)    GET_CONTEXT_FIELD(b, c, PAR, PAR_NOFAULT_NS)
-#define GET_NOFAULT_NOS(b, c)   GET_CONTEXT_FIELD(b, c, PAR, PAR_NOFAULT_NOS)
-#define GET_NPFAULT_PA(b, c)    GET_CONTEXT_FIELD(b, c, PAR, PAR_NPFAULT_PA)
-
-
-/* PRRR */
-#define GET_MTC0(b, c)          GET_CONTEXT_FIELD(b, c, PRRR, MTC0)
-#define GET_MTC1(b, c)          GET_CONTEXT_FIELD(b, c, PRRR, MTC1)
-#define GET_MTC2(b, c)          GET_CONTEXT_FIELD(b, c, PRRR, MTC2)
-#define GET_MTC3(b, c)          GET_CONTEXT_FIELD(b, c, PRRR, MTC3)
-#define GET_MTC4(b, c)          GET_CONTEXT_FIELD(b, c, PRRR, MTC4)
-#define GET_MTC5(b, c)          GET_CONTEXT_FIELD(b, c, PRRR, MTC5)
-#define GET_MTC6(b, c)          GET_CONTEXT_FIELD(b, c, PRRR, MTC6)
-#define GET_MTC7(b, c)          GET_CONTEXT_FIELD(b, c, PRRR, MTC7)
-#define GET_SHDSH0(b, c)        GET_CONTEXT_FIELD(b, c, PRRR, SHDSH0)
-#define GET_SHDSH1(b, c)        GET_CONTEXT_FIELD(b, c, PRRR, SHDSH1)
-#define GET_SHNMSH0(b, c)       GET_CONTEXT_FIELD(b, c, PRRR, SHNMSH0)
-#define GET_SHNMSH1(b, c)       GET_CONTEXT_FIELD(b, c, PRRR, SHNMSH1)
-#define GET_NOS0(b, c)          GET_CONTEXT_FIELD(b, c, PRRR, NOS0)
-#define GET_NOS1(b, c)          GET_CONTEXT_FIELD(b, c, PRRR, NOS1)
-#define GET_NOS2(b, c)          GET_CONTEXT_FIELD(b, c, PRRR, NOS2)
-#define GET_NOS3(b, c)          GET_CONTEXT_FIELD(b, c, PRRR, NOS3)
-#define GET_NOS4(b, c)          GET_CONTEXT_FIELD(b, c, PRRR, NOS4)
-#define GET_NOS5(b, c)          GET_CONTEXT_FIELD(b, c, PRRR, NOS5)
-#define GET_NOS6(b, c)          GET_CONTEXT_FIELD(b, c, PRRR, NOS6)
-#define GET_NOS7(b, c)          GET_CONTEXT_FIELD(b, c, PRRR, NOS7)
-#define PRRR_NOS(prrr, n)        ((prrr) & (1 << ((n) + 24)) ? 1 : 0)
-#define PRRR_MT(prrr, n)         ((((prrr) & (3 << ((n) * 2))) >> ((n) * 2)))
-
-
-/* RESUME */
-#define GET_TNR(b, c)           GET_CONTEXT_FIELD(b, c, RESUME, TNR)
-
-
-/* SCTLR */
-#define GET_M(b, c)             GET_CONTEXT_FIELD(b, c, SCTLR, M)
-#define GET_TRE(b, c)           GET_CONTEXT_FIELD(b, c, SCTLR, TRE)
-#define GET_AFE(b, c)           GET_CONTEXT_FIELD(b, c, SCTLR, AFE)
-#define GET_HAF(b, c)           GET_CONTEXT_FIELD(b, c, SCTLR, HAF)
-#define GET_BE(b, c)            GET_CONTEXT_FIELD(b, c, SCTLR, BE)
-#define GET_AFFD(b, c)          GET_CONTEXT_FIELD(b, c, SCTLR, AFFD)
-
-
-/* TLBLKCR */
-#define GET_LKE(b, c)           GET_CONTEXT_FIELD(b, c, TLBLKCR, LKE)
-#define GET_TLBLCKR_TLBIALLCFG(b, c) \
-                        GET_CONTEXT_FIELD(b, c, TLBLKCR, TLBLCKR_TLBIALLCFG)
-#define GET_TLBIASIDCFG(b, c)   GET_CONTEXT_FIELD(b, c, TLBLKCR, TLBIASIDCFG)
-#define GET_TLBIVAACFG(b, c)    GET_CONTEXT_FIELD(b, c, TLBLKCR, TLBIVAACFG)
-#define GET_FLOOR(b, c)         GET_CONTEXT_FIELD(b, c, TLBLKCR, FLOOR)
-#define GET_VICTIM(b, c)        GET_CONTEXT_FIELD(b, c, TLBLKCR, VICTIM)
-
-
-/* TTBCR */
-#define GET_N(b, c)             GET_CONTEXT_FIELD(b, c, TTBCR, N)
-#define GET_PD0(b, c)           GET_CONTEXT_FIELD(b, c, TTBCR, PD0)
-#define GET_PD1(b, c)           GET_CONTEXT_FIELD(b, c, TTBCR, PD1)
-
-
-/* TTBR0 */
-#define GET_TTBR0_IRGNH(b, c)   GET_CONTEXT_FIELD(b, c, TTBR0, TTBR0_IRGNH)
-#define GET_TTBR0_SH(b, c)      GET_CONTEXT_FIELD(b, c, TTBR0, TTBR0_SH)
-#define GET_TTBR0_ORGN(b, c)    GET_CONTEXT_FIELD(b, c, TTBR0, TTBR0_ORGN)
-#define GET_TTBR0_NOS(b, c)     GET_CONTEXT_FIELD(b, c, TTBR0, TTBR0_NOS)
-#define GET_TTBR0_IRGNL(b, c)   GET_CONTEXT_FIELD(b, c, TTBR0, TTBR0_IRGNL)
-#define GET_TTBR0_PA(b, c)      GET_CONTEXT_FIELD(b, c, TTBR0, TTBR0_PA)
-
-
-/* TTBR1 */
-#define GET_TTBR1_IRGNH(b, c)   GET_CONTEXT_FIELD(b, c, TTBR1, TTBR1_IRGNH)
-#define GET_TTBR1_SH(b, c)      GET_CONTEXT_FIELD(b, c, TTBR1, TTBR1_SH)
-#define GET_TTBR1_ORGN(b, c)    GET_CONTEXT_FIELD(b, c, TTBR1, TTBR1_ORGN)
-#define GET_TTBR1_NOS(b, c)     GET_CONTEXT_FIELD(b, c, TTBR1, TTBR1_NOS)
-#define GET_TTBR1_IRGNL(b, c)   GET_CONTEXT_FIELD(b, c, TTBR1, TTBR1_IRGNL)
-#define GET_TTBR1_PA(b, c)      GET_CONTEXT_FIELD(b, c, TTBR1, TTBR1_PA)
-
-
-/* V2PSR */
-#define GET_HIT(b, c)           GET_CONTEXT_FIELD(b, c, V2PSR, HIT)
-#define GET_INDEX(b, c)         GET_CONTEXT_FIELD(b, c, V2PSR, INDEX)
-
-
-/* Global Registers */
-#define M2VCBR_N        (0xFF000)
-#define CBACR_N         (0xFF800)
-#define TLBRSW          (0xFFE00)
-#define TLBTR0          (0xFFE80)
-#define TLBTR1          (0xFFE84)
-#define TLBTR2          (0xFFE88)
-#define TESTBUSCR       (0xFFE8C)
-#define GLOBAL_TLBIALL  (0xFFF00)
-#define TLBIVMID        (0xFFF04)
-#define CR              (0xFFF80)
-#define EAR             (0xFFF84)
-#define ESR             (0xFFF88)
-#define ESRRESTORE      (0xFFF8C)
-#define ESYNR0          (0xFFF90)
-#define ESYNR1          (0xFFF94)
-#define REV             (0xFFFF4)
-#define IDR             (0xFFFF8)
-#define RPU_ACR         (0xFFFFC)
-
-
-/* Context Bank Registers */
-#define SCTLR           (0x000)
-#define ACTLR           (0x004)
-#define CONTEXTIDR      (0x008)
-#define TTBR0           (0x010)
-#define TTBR1           (0x014)
-#define TTBCR           (0x018)
-#define PAR             (0x01C)
-#define FSR             (0x020)
-#define FSRRESTORE      (0x024)
-#define FAR             (0x028)
-#define FSYNR0          (0x02C)
-#define FSYNR1          (0x030)
-#define PRRR            (0x034)
-#define NMRR            (0x038)
-#define TLBLCKR         (0x03C)
-#define V2PSR           (0x040)
-#define TLBFLPTER       (0x044)
-#define TLBSLPTER       (0x048)
-#define BFBCR           (0x04C)
-#define CTX_TLBIALL     (0x800)
-#define TLBIASID        (0x804)
-#define TLBIVA          (0x808)
-#define TLBIVAA         (0x80C)
-#define V2PPR           (0x810)
-#define V2PPW           (0x814)
-#define V2PUR           (0x818)
-#define V2PUW           (0x81C)
-#define RESUME          (0x820)
-
-
-/* Global Register Fields */
-/* CBACRn */
-#define RWVMID        (RWVMID_MASK       << RWVMID_SHIFT)
-#define RWE           (RWE_MASK          << RWE_SHIFT)
-#define RWGE          (RWGE_MASK         << RWGE_SHIFT)
-#define CBVMID        (CBVMID_MASK       << CBVMID_SHIFT)
-#define IRPTNDX       (IRPTNDX_MASK      << IRPTNDX_SHIFT)
-
-
-/* CR */
-#define RPUE          (RPUE_MASK          << RPUE_SHIFT)
-#define RPUERE        (RPUERE_MASK        << RPUERE_SHIFT)
-#define RPUEIE        (RPUEIE_MASK        << RPUEIE_SHIFT)
-#define DCDEE         (DCDEE_MASK         << DCDEE_SHIFT)
-#define CLIENTPD      (CLIENTPD_MASK      << CLIENTPD_SHIFT)
-#define STALLD        (STALLD_MASK        << STALLD_SHIFT)
-#define TLBLKCRWE     (TLBLKCRWE_MASK     << TLBLKCRWE_SHIFT)
-#define CR_TLBIALLCFG (CR_TLBIALLCFG_MASK << CR_TLBIALLCFG_SHIFT)
-#define TLBIVMIDCFG   (TLBIVMIDCFG_MASK   << TLBIVMIDCFG_SHIFT)
-#define CR_HUME       (CR_HUME_MASK       << CR_HUME_SHIFT)
-
-
-/* ESR */
-#define CFG           (CFG_MASK          << CFG_SHIFT)
-#define BYPASS        (BYPASS_MASK       << BYPASS_SHIFT)
-#define ESR_MULTI     (ESR_MULTI_MASK    << ESR_MULTI_SHIFT)
-
-
-/* ESYNR0 */
-#define ESYNR0_AMID   (ESYNR0_AMID_MASK  << ESYNR0_AMID_SHIFT)
-#define ESYNR0_APID   (ESYNR0_APID_MASK  << ESYNR0_APID_SHIFT)
-#define ESYNR0_ABID   (ESYNR0_ABID_MASK  << ESYNR0_ABID_SHIFT)
-#define ESYNR0_AVMID  (ESYNR0_AVMID_MASK << ESYNR0_AVMID_SHIFT)
-#define ESYNR0_ATID   (ESYNR0_ATID_MASK  << ESYNR0_ATID_SHIFT)
-
-
-/* ESYNR1 */
-#define ESYNR1_AMEMTYPE      (ESYNR1_AMEMTYPE_MASK    << ESYNR1_AMEMTYPE_SHIFT)
-#define ESYNR1_ASHARED       (ESYNR1_ASHARED_MASK     << ESYNR1_ASHARED_SHIFT)
-#define ESYNR1_AINNERSHARED  (ESYNR1_AINNERSHARED_MASK<< \
-                                                ESYNR1_AINNERSHARED_SHIFT)
-#define ESYNR1_APRIV         (ESYNR1_APRIV_MASK       << ESYNR1_APRIV_SHIFT)
-#define ESYNR1_APROTNS       (ESYNR1_APROTNS_MASK     << ESYNR1_APROTNS_SHIFT)
-#define ESYNR1_AINST         (ESYNR1_AINST_MASK       << ESYNR1_AINST_SHIFT)
-#define ESYNR1_AWRITE        (ESYNR1_AWRITE_MASK      << ESYNR1_AWRITE_SHIFT)
-#define ESYNR1_ABURST        (ESYNR1_ABURST_MASK      << ESYNR1_ABURST_SHIFT)
-#define ESYNR1_ALEN          (ESYNR1_ALEN_MASK        << ESYNR1_ALEN_SHIFT)
-#define ESYNR1_ASIZE         (ESYNR1_ASIZE_MASK       << ESYNR1_ASIZE_SHIFT)
-#define ESYNR1_ALOCK         (ESYNR1_ALOCK_MASK       << ESYNR1_ALOCK_SHIFT)
-#define ESYNR1_AOOO          (ESYNR1_AOOO_MASK        << ESYNR1_AOOO_SHIFT)
-#define ESYNR1_AFULL         (ESYNR1_AFULL_MASK       << ESYNR1_AFULL_SHIFT)
-#define ESYNR1_AC            (ESYNR1_AC_MASK          << ESYNR1_AC_SHIFT)
-#define ESYNR1_DCD           (ESYNR1_DCD_MASK         << ESYNR1_DCD_SHIFT)
-
-
-/* IDR */
-#define NM2VCBMT      (NM2VCBMT_MASK     << NM2VCBMT_SHIFT)
-#define HTW           (HTW_MASK          << HTW_SHIFT)
-#define HUM           (HUM_MASK          << HUM_SHIFT)
-#define TLBSIZE       (TLBSIZE_MASK      << TLBSIZE_SHIFT)
-#define NCB           (NCB_MASK          << NCB_SHIFT)
-#define NIRPT         (NIRPT_MASK        << NIRPT_SHIFT)
-
-
-/* M2VCBRn */
-#define VMID          (VMID_MASK         << VMID_SHIFT)
-#define CBNDX         (CBNDX_MASK        << CBNDX_SHIFT)
-#define BYPASSD       (BYPASSD_MASK      << BYPASSD_SHIFT)
-#define BPRCOSH       (BPRCOSH_MASK      << BPRCOSH_SHIFT)
-#define BPRCISH       (BPRCISH_MASK      << BPRCISH_SHIFT)
-#define BPRCNSH       (BPRCNSH_MASK      << BPRCNSH_SHIFT)
-#define BPSHCFG       (BPSHCFG_MASK      << BPSHCFG_SHIFT)
-#define NSCFG         (NSCFG_MASK        << NSCFG_SHIFT)
-#define BPMTCFG       (BPMTCFG_MASK      << BPMTCFG_SHIFT)
-#define BPMEMTYPE     (BPMEMTYPE_MASK    << BPMEMTYPE_SHIFT)
-
-
-/* REV */
-#define IDR_MINOR     (MINOR_MASK        << MINOR_SHIFT)
-#define IDR_MAJOR     (MAJOR_MASK        << MAJOR_SHIFT)
-
-
-/* TESTBUSCR */
-#define TBE           (TBE_MASK          << TBE_SHIFT)
-#define SPDMBE        (SPDMBE_MASK       << SPDMBE_SHIFT)
-#define WGSEL         (WGSEL_MASK        << WGSEL_SHIFT)
-#define TBLSEL        (TBLSEL_MASK       << TBLSEL_SHIFT)
-#define TBHSEL        (TBHSEL_MASK       << TBHSEL_SHIFT)
-#define SPDM0SEL      (SPDM0SEL_MASK     << SPDM0SEL_SHIFT)
-#define SPDM1SEL      (SPDM1SEL_MASK     << SPDM1SEL_SHIFT)
-#define SPDM2SEL      (SPDM2SEL_MASK     << SPDM2SEL_SHIFT)
-#define SPDM3SEL      (SPDM3SEL_MASK     << SPDM3SEL_SHIFT)
-
-
-/* TLBIVMID */
-#define TLBIVMID_VMID (TLBIVMID_VMID_MASK << TLBIVMID_VMID_SHIFT)
-
-
-/* TLBRSW */
-#define TLBRSW_INDEX  (TLBRSW_INDEX_MASK << TLBRSW_INDEX_SHIFT)
-#define TLBBFBS       (TLBBFBS_MASK      << TLBBFBS_SHIFT)
-
-
-/* TLBTR0 */
-#define PR            (PR_MASK           << PR_SHIFT)
-#define PW            (PW_MASK           << PW_SHIFT)
-#define UR            (UR_MASK           << UR_SHIFT)
-#define UW            (UW_MASK           << UW_SHIFT)
-#define XN            (XN_MASK           << XN_SHIFT)
-#define NSDESC        (NSDESC_MASK       << NSDESC_SHIFT)
-#define ISH           (ISH_MASK          << ISH_SHIFT)
-#define SH            (SH_MASK           << SH_SHIFT)
-#define MT            (MT_MASK           << MT_SHIFT)
-#define DPSIZR        (DPSIZR_MASK       << DPSIZR_SHIFT)
-#define DPSIZC        (DPSIZC_MASK       << DPSIZC_SHIFT)
-
-
-/* TLBTR1 */
-#define TLBTR1_VMID   (TLBTR1_VMID_MASK  << TLBTR1_VMID_SHIFT)
-#define TLBTR1_PA     (TLBTR1_PA_MASK    << TLBTR1_PA_SHIFT)
-
-
-/* TLBTR2 */
-#define TLBTR2_ASID   (TLBTR2_ASID_MASK  << TLBTR2_ASID_SHIFT)
-#define TLBTR2_V      (TLBTR2_V_MASK     << TLBTR2_V_SHIFT)
-#define TLBTR2_NSTID  (TLBTR2_NSTID_MASK << TLBTR2_NSTID_SHIFT)
-#define TLBTR2_NV     (TLBTR2_NV_MASK    << TLBTR2_NV_SHIFT)
-#define TLBTR2_VA     (TLBTR2_VA_MASK    << TLBTR2_VA_SHIFT)
-
-
-/* Context Register Fields */
-/* ACTLR */
-#define CFERE              (CFERE_MASK              << CFERE_SHIFT)
-#define CFEIE              (CFEIE_MASK              << CFEIE_SHIFT)
-#define PTSHCFG            (PTSHCFG_MASK            << PTSHCFG_SHIFT)
-#define RCOSH              (RCOSH_MASK              << RCOSH_SHIFT)
-#define RCISH              (RCISH_MASK              << RCISH_SHIFT)
-#define RCNSH              (RCNSH_MASK              << RCNSH_SHIFT)
-#define PRIVCFG            (PRIVCFG_MASK            << PRIVCFG_SHIFT)
-#define DNA                (DNA_MASK                << DNA_SHIFT)
-#define DNLV2PA            (DNLV2PA_MASK            << DNLV2PA_SHIFT)
-#define TLBMCFG            (TLBMCFG_MASK            << TLBMCFG_SHIFT)
-#define CFCFG              (CFCFG_MASK              << CFCFG_SHIFT)
-#define TIPCF              (TIPCF_MASK              << TIPCF_SHIFT)
-#define V2PCFG             (V2PCFG_MASK             << V2PCFG_SHIFT)
-#define HUME               (HUME_MASK               << HUME_SHIFT)
-#define PTMTCFG            (PTMTCFG_MASK            << PTMTCFG_SHIFT)
-#define PTMEMTYPE          (PTMEMTYPE_MASK          << PTMEMTYPE_SHIFT)
-
-
-/* BFBCR */
-#define BFBDFE             (BFBDFE_MASK             << BFBDFE_SHIFT)
-#define BFBSFE             (BFBSFE_MASK             << BFBSFE_SHIFT)
-#define SFVS               (SFVS_MASK               << SFVS_SHIFT)
-#define FLVIC              (FLVIC_MASK              << FLVIC_SHIFT)
-#define SLVIC              (SLVIC_MASK              << SLVIC_SHIFT)
-
-
-/* CONTEXTIDR */
-#define CONTEXTIDR_ASID    (CONTEXTIDR_ASID_MASK    << CONTEXTIDR_ASID_SHIFT)
-#define PROCID             (PROCID_MASK             << PROCID_SHIFT)
-
-
-/* FSR */
-#define TF                 (TF_MASK                 << TF_SHIFT)
-#define AFF                (AFF_MASK                << AFF_SHIFT)
-#define APF                (APF_MASK                << APF_SHIFT)
-#define TLBMF              (TLBMF_MASK              << TLBMF_SHIFT)
-#define HTWDEEF            (HTWDEEF_MASK            << HTWDEEF_SHIFT)
-#define HTWSEEF            (HTWSEEF_MASK            << HTWSEEF_SHIFT)
-#define MHF                (MHF_MASK                << MHF_SHIFT)
-#define SL                 (SL_MASK                 << SL_SHIFT)
-#define SS                 (SS_MASK                 << SS_SHIFT)
-#define MULTI              (MULTI_MASK              << MULTI_SHIFT)
-
-
-/* FSYNR0 */
-#define AMID               (AMID_MASK               << AMID_SHIFT)
-#define APID               (APID_MASK               << APID_SHIFT)
-#define ABID               (ABID_MASK               << ABID_SHIFT)
-#define ATID               (ATID_MASK               << ATID_SHIFT)
-
-
-/* FSYNR1 */
-#define AMEMTYPE           (AMEMTYPE_MASK           << AMEMTYPE_SHIFT)
-#define ASHARED            (ASHARED_MASK            << ASHARED_SHIFT)
-#define AINNERSHARED       (AINNERSHARED_MASK       << AINNERSHARED_SHIFT)
-#define APRIV              (APRIV_MASK              << APRIV_SHIFT)
-#define APROTNS            (APROTNS_MASK            << APROTNS_SHIFT)
-#define AINST              (AINST_MASK              << AINST_SHIFT)
-#define AWRITE             (AWRITE_MASK             << AWRITE_SHIFT)
-#define ABURST             (ABURST_MASK             << ABURST_SHIFT)
-#define ALEN               (ALEN_MASK               << ALEN_SHIFT)
-#define FSYNR1_ASIZE       (FSYNR1_ASIZE_MASK       << FSYNR1_ASIZE_SHIFT)
-#define ALOCK              (ALOCK_MASK              << ALOCK_SHIFT)
-#define AFULL              (AFULL_MASK              << AFULL_SHIFT)
-
-
-/* NMRR */
-#define ICPC0              (ICPC0_MASK              << ICPC0_SHIFT)
-#define ICPC1              (ICPC1_MASK              << ICPC1_SHIFT)
-#define ICPC2              (ICPC2_MASK              << ICPC2_SHIFT)
-#define ICPC3              (ICPC3_MASK              << ICPC3_SHIFT)
-#define ICPC4              (ICPC4_MASK              << ICPC4_SHIFT)
-#define ICPC5              (ICPC5_MASK              << ICPC5_SHIFT)
-#define ICPC6              (ICPC6_MASK              << ICPC6_SHIFT)
-#define ICPC7              (ICPC7_MASK              << ICPC7_SHIFT)
-#define OCPC0              (OCPC0_MASK              << OCPC0_SHIFT)
-#define OCPC1              (OCPC1_MASK              << OCPC1_SHIFT)
-#define OCPC2              (OCPC2_MASK              << OCPC2_SHIFT)
-#define OCPC3              (OCPC3_MASK              << OCPC3_SHIFT)
-#define OCPC4              (OCPC4_MASK              << OCPC4_SHIFT)
-#define OCPC5              (OCPC5_MASK              << OCPC5_SHIFT)
-#define OCPC6              (OCPC6_MASK              << OCPC6_SHIFT)
-#define OCPC7              (OCPC7_MASK              << OCPC7_SHIFT)
-
-
-/* PAR */
-#define FAULT              (FAULT_MASK              << FAULT_SHIFT)
-/* If a fault is present, these are the
-same as the fault fields in the FAR */
-#define FAULT_TF           (FAULT_TF_MASK           << FAULT_TF_SHIFT)
-#define FAULT_AFF          (FAULT_AFF_MASK          << FAULT_AFF_SHIFT)
-#define FAULT_APF          (FAULT_APF_MASK          << FAULT_APF_SHIFT)
-#define FAULT_TLBMF        (FAULT_TLBMF_MASK        << FAULT_TLBMF_SHIFT)
-#define FAULT_HTWDEEF      (FAULT_HTWDEEF_MASK      << FAULT_HTWDEEF_SHIFT)
-#define FAULT_HTWSEEF      (FAULT_HTWSEEF_MASK      << FAULT_HTWSEEF_SHIFT)
-#define FAULT_MHF          (FAULT_MHF_MASK          << FAULT_MHF_SHIFT)
-#define FAULT_SL           (FAULT_SL_MASK           << FAULT_SL_SHIFT)
-#define FAULT_SS           (FAULT_SS_MASK           << FAULT_SS_SHIFT)
-
-/* If NO fault is present, the following fields are in effect */
-/* (FAULT remains as before) */
-#define PAR_NOFAULT_SS     (PAR_NOFAULT_SS_MASK     << PAR_NOFAULT_SS_SHIFT)
-#define PAR_NOFAULT_MT     (PAR_NOFAULT_MT_MASK     << PAR_NOFAULT_MT_SHIFT)
-#define PAR_NOFAULT_SH     (PAR_NOFAULT_SH_MASK     << PAR_NOFAULT_SH_SHIFT)
-#define PAR_NOFAULT_NS     (PAR_NOFAULT_NS_MASK     << PAR_NOFAULT_NS_SHIFT)
-#define PAR_NOFAULT_NOS    (PAR_NOFAULT_NOS_MASK    << PAR_NOFAULT_NOS_SHIFT)
-#define PAR_NPFAULT_PA     (PAR_NPFAULT_PA_MASK     << PAR_NPFAULT_PA_SHIFT)
-
-
-/* PRRR */
-#define MTC0               (MTC0_MASK               << MTC0_SHIFT)
-#define MTC1               (MTC1_MASK               << MTC1_SHIFT)
-#define MTC2               (MTC2_MASK               << MTC2_SHIFT)
-#define MTC3               (MTC3_MASK               << MTC3_SHIFT)
-#define MTC4               (MTC4_MASK               << MTC4_SHIFT)
-#define MTC5               (MTC5_MASK               << MTC5_SHIFT)
-#define MTC6               (MTC6_MASK               << MTC6_SHIFT)
-#define MTC7               (MTC7_MASK               << MTC7_SHIFT)
-#define SHDSH0             (SHDSH0_MASK             << SHDSH0_SHIFT)
-#define SHDSH1             (SHDSH1_MASK             << SHDSH1_SHIFT)
-#define SHNMSH0            (SHNMSH0_MASK            << SHNMSH0_SHIFT)
-#define SHNMSH1            (SHNMSH1_MASK            << SHNMSH1_SHIFT)
-#define NOS0               (NOS0_MASK               << NOS0_SHIFT)
-#define NOS1               (NOS1_MASK               << NOS1_SHIFT)
-#define NOS2               (NOS2_MASK               << NOS2_SHIFT)
-#define NOS3               (NOS3_MASK               << NOS3_SHIFT)
-#define NOS4               (NOS4_MASK               << NOS4_SHIFT)
-#define NOS5               (NOS5_MASK               << NOS5_SHIFT)
-#define NOS6               (NOS6_MASK               << NOS6_SHIFT)
-#define NOS7               (NOS7_MASK               << NOS7_SHIFT)
-
-
-/* RESUME */
-#define TNR                (TNR_MASK                << TNR_SHIFT)
-
-
-/* SCTLR */
-#define M                  (M_MASK                  << M_SHIFT)
-#define TRE                (TRE_MASK                << TRE_SHIFT)
-#define AFE                (AFE_MASK                << AFE_SHIFT)
-#define HAF                (HAF_MASK                << HAF_SHIFT)
-#define BE                 (BE_MASK                 << BE_SHIFT)
-#define AFFD               (AFFD_MASK               << AFFD_SHIFT)
-
-
-/* TLBIASID */
-#define TLBIASID_ASID      (TLBIASID_ASID_MASK      << TLBIASID_ASID_SHIFT)
-
-
-/* TLBIVA */
-#define TLBIVA_ASID        (TLBIVA_ASID_MASK        << TLBIVA_ASID_SHIFT)
-#define TLBIVA_VA          (TLBIVA_VA_MASK          << TLBIVA_VA_SHIFT)
-
-
-/* TLBIVAA */
-#define TLBIVAA_VA         (TLBIVAA_VA_MASK         << TLBIVAA_VA_SHIFT)
-
-
-/* TLBLCKR */
-#define LKE                (LKE_MASK                << LKE_SHIFT)
-#define TLBLCKR_TLBIALLCFG (TLBLCKR_TLBIALLCFG_MASK<<TLBLCKR_TLBIALLCFG_SHIFT)
-#define TLBIASIDCFG        (TLBIASIDCFG_MASK        << TLBIASIDCFG_SHIFT)
-#define TLBIVAACFG         (TLBIVAACFG_MASK         << TLBIVAACFG_SHIFT)
-#define FLOOR              (FLOOR_MASK              << FLOOR_SHIFT)
-#define VICTIM             (VICTIM_MASK             << VICTIM_SHIFT)
-
-
-/* TTBCR */
-#define N                  (N_MASK                  << N_SHIFT)
-#define PD0                (PD0_MASK                << PD0_SHIFT)
-#define PD1                (PD1_MASK                << PD1_SHIFT)
-
-
-/* TTBR0 */
-#define TTBR0_IRGNH        (TTBR0_IRGNH_MASK        << TTBR0_IRGNH_SHIFT)
-#define TTBR0_SH           (TTBR0_SH_MASK           << TTBR0_SH_SHIFT)
-#define TTBR0_ORGN         (TTBR0_ORGN_MASK         << TTBR0_ORGN_SHIFT)
-#define TTBR0_NOS          (TTBR0_NOS_MASK          << TTBR0_NOS_SHIFT)
-#define TTBR0_IRGNL        (TTBR0_IRGNL_MASK        << TTBR0_IRGNL_SHIFT)
-#define TTBR0_PA           (TTBR0_PA_MASK           << TTBR0_PA_SHIFT)
-
-
-/* TTBR1 */
-#define TTBR1_IRGNH        (TTBR1_IRGNH_MASK        << TTBR1_IRGNH_SHIFT)
-#define TTBR1_SH           (TTBR1_SH_MASK           << TTBR1_SH_SHIFT)
-#define TTBR1_ORGN         (TTBR1_ORGN_MASK         << TTBR1_ORGN_SHIFT)
-#define TTBR1_NOS          (TTBR1_NOS_MASK          << TTBR1_NOS_SHIFT)
-#define TTBR1_IRGNL        (TTBR1_IRGNL_MASK        << TTBR1_IRGNL_SHIFT)
-#define TTBR1_PA           (TTBR1_PA_MASK           << TTBR1_PA_SHIFT)
-
-
-/* V2PSR */
-#define HIT                (HIT_MASK                << HIT_SHIFT)
-#define INDEX              (INDEX_MASK              << INDEX_SHIFT)
-
-
-/* V2Pxx */
-#define V2Pxx_INDEX        (V2Pxx_INDEX_MASK        << V2Pxx_INDEX_SHIFT)
-#define V2Pxx_VA           (V2Pxx_VA_MASK           << V2Pxx_VA_SHIFT)
-
-
-/* Global Register Masks */
-/* CBACRn */
-#define RWVMID_MASK               0x1F
-#define RWE_MASK                  0x01
-#define RWGE_MASK                 0x01
-#define CBVMID_MASK               0x1F
-#define IRPTNDX_MASK              0xFF
-
-
-/* CR */
-#define RPUE_MASK                 0x01
-#define RPUERE_MASK               0x01
-#define RPUEIE_MASK               0x01
-#define DCDEE_MASK                0x01
-#define CLIENTPD_MASK             0x01
-#define STALLD_MASK               0x01
-#define TLBLKCRWE_MASK            0x01
-#define CR_TLBIALLCFG_MASK        0x01
-#define TLBIVMIDCFG_MASK          0x01
-#define CR_HUME_MASK              0x01
-
-
-/* ESR */
-#define CFG_MASK                  0x01
-#define BYPASS_MASK               0x01
-#define ESR_MULTI_MASK            0x01
-
-
-/* ESYNR0 */
-#define ESYNR0_AMID_MASK          0xFF
-#define ESYNR0_APID_MASK          0x1F
-#define ESYNR0_ABID_MASK          0x07
-#define ESYNR0_AVMID_MASK         0x1F
-#define ESYNR0_ATID_MASK          0xFF
-
-
-/* ESYNR1 */
-#define ESYNR1_AMEMTYPE_MASK             0x07
-#define ESYNR1_ASHARED_MASK              0x01
-#define ESYNR1_AINNERSHARED_MASK         0x01
-#define ESYNR1_APRIV_MASK                0x01
-#define ESYNR1_APROTNS_MASK              0x01
-#define ESYNR1_AINST_MASK                0x01
-#define ESYNR1_AWRITE_MASK               0x01
-#define ESYNR1_ABURST_MASK               0x01
-#define ESYNR1_ALEN_MASK                 0x0F
-#define ESYNR1_ASIZE_MASK                0x01
-#define ESYNR1_ALOCK_MASK                0x03
-#define ESYNR1_AOOO_MASK                 0x01
-#define ESYNR1_AFULL_MASK                0x01
-#define ESYNR1_AC_MASK                   0x01
-#define ESYNR1_DCD_MASK                  0x01
-
-
-/* IDR */
-#define NM2VCBMT_MASK             0x1FF
-#define HTW_MASK                  0x01
-#define HUM_MASK                  0x01
-#define TLBSIZE_MASK              0x0F
-#define NCB_MASK                  0xFF
-#define NIRPT_MASK                0xFF
-
-
-/* M2VCBRn */
-#define VMID_MASK                 0x1F
-#define CBNDX_MASK                0xFF
-#define BYPASSD_MASK              0x01
-#define BPRCOSH_MASK              0x01
-#define BPRCISH_MASK              0x01
-#define BPRCNSH_MASK              0x01
-#define BPSHCFG_MASK              0x03
-#define NSCFG_MASK                0x03
-#define BPMTCFG_MASK              0x01
-#define BPMEMTYPE_MASK            0x07
-
-
-/* REV */
-#define MINOR_MASK                0x0F
-#define MAJOR_MASK                0x0F
-
-
-/* TESTBUSCR */
-#define TBE_MASK                  0x01
-#define SPDMBE_MASK               0x01
-#define WGSEL_MASK                0x03
-#define TBLSEL_MASK               0x03
-#define TBHSEL_MASK               0x03
-#define SPDM0SEL_MASK             0x0F
-#define SPDM1SEL_MASK             0x0F
-#define SPDM2SEL_MASK             0x0F
-#define SPDM3SEL_MASK             0x0F
-
-
-/* TLBIMID */
-#define TLBIVMID_VMID_MASK        0x1F
-
-
-/* TLBRSW */
-#define TLBRSW_INDEX_MASK         0xFF
-#define TLBBFBS_MASK              0x03
-
-
-/* TLBTR0 */
-#define PR_MASK                   0x01
-#define PW_MASK                   0x01
-#define UR_MASK                   0x01
-#define UW_MASK                   0x01
-#define XN_MASK                   0x01
-#define NSDESC_MASK               0x01
-#define ISH_MASK                  0x01
-#define SH_MASK                   0x01
-#define MT_MASK                   0x07
-#define DPSIZR_MASK               0x07
-#define DPSIZC_MASK               0x07
-
-
-/* TLBTR1 */
-#define TLBTR1_VMID_MASK          0x1F
-#define TLBTR1_PA_MASK            0x000FFFFF
-
-
-/* TLBTR2 */
-#define TLBTR2_ASID_MASK          0xFF
-#define TLBTR2_V_MASK             0x01
-#define TLBTR2_NSTID_MASK         0x01
-#define TLBTR2_NV_MASK            0x01
-#define TLBTR2_VA_MASK            0x000FFFFF
-
-
-/* Global Register Shifts */
-/* CBACRn */
-#define RWVMID_SHIFT             0
-#define RWE_SHIFT                8
-#define RWGE_SHIFT               9
-#define CBVMID_SHIFT             16
-#define IRPTNDX_SHIFT            24
-
-
-/* CR */
-#define RPUE_SHIFT               0
-#define RPUERE_SHIFT             1
-#define RPUEIE_SHIFT             2
-#define DCDEE_SHIFT              3
-#define CLIENTPD_SHIFT           4
-#define STALLD_SHIFT             5
-#define TLBLKCRWE_SHIFT          6
-#define CR_TLBIALLCFG_SHIFT      7
-#define TLBIVMIDCFG_SHIFT        8
-#define CR_HUME_SHIFT            9
-
-
-/* ESR */
-#define CFG_SHIFT                0
-#define BYPASS_SHIFT             1
-#define ESR_MULTI_SHIFT          31
-
-
-/* ESYNR0 */
-#define ESYNR0_AMID_SHIFT        0
-#define ESYNR0_APID_SHIFT        8
-#define ESYNR0_ABID_SHIFT        13
-#define ESYNR0_AVMID_SHIFT       16
-#define ESYNR0_ATID_SHIFT        24
-
-
-/* ESYNR1 */
-#define ESYNR1_AMEMTYPE_SHIFT           0
-#define ESYNR1_ASHARED_SHIFT            3
-#define ESYNR1_AINNERSHARED_SHIFT       4
-#define ESYNR1_APRIV_SHIFT              5
-#define ESYNR1_APROTNS_SHIFT            6
-#define ESYNR1_AINST_SHIFT              7
-#define ESYNR1_AWRITE_SHIFT             8
-#define ESYNR1_ABURST_SHIFT             10
-#define ESYNR1_ALEN_SHIFT               12
-#define ESYNR1_ASIZE_SHIFT              16
-#define ESYNR1_ALOCK_SHIFT              20
-#define ESYNR1_AOOO_SHIFT               22
-#define ESYNR1_AFULL_SHIFT              24
-#define ESYNR1_AC_SHIFT                 30
-#define ESYNR1_DCD_SHIFT                31
-
-
-/* IDR */
-#define NM2VCBMT_SHIFT           0
-#define HTW_SHIFT                9
-#define HUM_SHIFT                10
-#define TLBSIZE_SHIFT            12
-#define NCB_SHIFT                16
-#define NIRPT_SHIFT              24
-
-
-/* M2VCBRn */
-#define VMID_SHIFT               0
-#define CBNDX_SHIFT              8
-#define BYPASSD_SHIFT            16
-#define BPRCOSH_SHIFT            17
-#define BPRCISH_SHIFT            18
-#define BPRCNSH_SHIFT            19
-#define BPSHCFG_SHIFT            20
-#define NSCFG_SHIFT              22
-#define BPMTCFG_SHIFT            24
-#define BPMEMTYPE_SHIFT          25
-
-
-/* REV */
-#define MINOR_SHIFT              0
-#define MAJOR_SHIFT              4
-
-
-/* TESTBUSCR */
-#define TBE_SHIFT                0
-#define SPDMBE_SHIFT             1
-#define WGSEL_SHIFT              8
-#define TBLSEL_SHIFT             12
-#define TBHSEL_SHIFT             14
-#define SPDM0SEL_SHIFT           16
-#define SPDM1SEL_SHIFT           20
-#define SPDM2SEL_SHIFT           24
-#define SPDM3SEL_SHIFT           28
-
-
-/* TLBIMID */
-#define TLBIVMID_VMID_SHIFT      0
-
-
-/* TLBRSW */
-#define TLBRSW_INDEX_SHIFT       0
-#define TLBBFBS_SHIFT            8
-
-
-/* TLBTR0 */
-#define PR_SHIFT                 0
-#define PW_SHIFT                 1
-#define UR_SHIFT                 2
-#define UW_SHIFT                 3
-#define XN_SHIFT                 4
-#define NSDESC_SHIFT             6
-#define ISH_SHIFT                7
-#define SH_SHIFT                 8
-#define MT_SHIFT                 9
-#define DPSIZR_SHIFT             16
-#define DPSIZC_SHIFT             20
-
-
-/* TLBTR1 */
-#define TLBTR1_VMID_SHIFT        0
-#define TLBTR1_PA_SHIFT          12
-
-
-/* TLBTR2 */
-#define TLBTR2_ASID_SHIFT        0
-#define TLBTR2_V_SHIFT           8
-#define TLBTR2_NSTID_SHIFT       9
-#define TLBTR2_NV_SHIFT          10
-#define TLBTR2_VA_SHIFT          12
-
-
-/* Context Register Masks */
-/* ACTLR */
-#define CFERE_MASK                       0x01
-#define CFEIE_MASK                       0x01
-#define PTSHCFG_MASK                     0x03
-#define RCOSH_MASK                       0x01
-#define RCISH_MASK                       0x01
-#define RCNSH_MASK                       0x01
-#define PRIVCFG_MASK                     0x03
-#define DNA_MASK                         0x01
-#define DNLV2PA_MASK                     0x01
-#define TLBMCFG_MASK                     0x03
-#define CFCFG_MASK                       0x01
-#define TIPCF_MASK                       0x01
-#define V2PCFG_MASK                      0x03
-#define HUME_MASK                        0x01
-#define PTMTCFG_MASK                     0x01
-#define PTMEMTYPE_MASK                   0x07
-
-
-/* BFBCR */
-#define BFBDFE_MASK                      0x01
-#define BFBSFE_MASK                      0x01
-#define SFVS_MASK                        0x01
-#define FLVIC_MASK                       0x0F
-#define SLVIC_MASK                       0x0F
-
-
-/* CONTEXTIDR */
-#define CONTEXTIDR_ASID_MASK             0xFF
-#define PROCID_MASK                      0x00FFFFFF
-
-
-/* FSR */
-#define TF_MASK                          0x01
-#define AFF_MASK                         0x01
-#define APF_MASK                         0x01
-#define TLBMF_MASK                       0x01
-#define HTWDEEF_MASK                     0x01
-#define HTWSEEF_MASK                     0x01
-#define MHF_MASK                         0x01
-#define SL_MASK                          0x01
-#define SS_MASK                          0x01
-#define MULTI_MASK                       0x01
-
-
-/* FSYNR0 */
-#define AMID_MASK                        0xFF
-#define APID_MASK                        0x1F
-#define ABID_MASK                        0x07
-#define ATID_MASK                        0xFF
-
-
-/* FSYNR1 */
-#define AMEMTYPE_MASK                    0x07
-#define ASHARED_MASK                     0x01
-#define AINNERSHARED_MASK                0x01
-#define APRIV_MASK                       0x01
-#define APROTNS_MASK                     0x01
-#define AINST_MASK                       0x01
-#define AWRITE_MASK                      0x01
-#define ABURST_MASK                      0x01
-#define ALEN_MASK                        0x0F
-#define FSYNR1_ASIZE_MASK                0x07
-#define ALOCK_MASK                       0x03
-#define AFULL_MASK                       0x01
-
-
-/* NMRR */
-#define ICPC0_MASK                       0x03
-#define ICPC1_MASK                       0x03
-#define ICPC2_MASK                       0x03
-#define ICPC3_MASK                       0x03
-#define ICPC4_MASK                       0x03
-#define ICPC5_MASK                       0x03
-#define ICPC6_MASK                       0x03
-#define ICPC7_MASK                       0x03
-#define OCPC0_MASK                       0x03
-#define OCPC1_MASK                       0x03
-#define OCPC2_MASK                       0x03
-#define OCPC3_MASK                       0x03
-#define OCPC4_MASK                       0x03
-#define OCPC5_MASK                       0x03
-#define OCPC6_MASK                       0x03
-#define OCPC7_MASK                       0x03
-
-
-/* PAR */
-#define FAULT_MASK                       0x01
-/* If a fault is present, these are the
-same as the fault fields in the FAR */
-#define FAULT_TF_MASK                    0x01
-#define FAULT_AFF_MASK                   0x01
-#define FAULT_APF_MASK                   0x01
-#define FAULT_TLBMF_MASK                 0x01
-#define FAULT_HTWDEEF_MASK               0x01
-#define FAULT_HTWSEEF_MASK               0x01
-#define FAULT_MHF_MASK                   0x01
-#define FAULT_SL_MASK                    0x01
-#define FAULT_SS_MASK                    0x01
-
-/* If NO fault is present, the following
- * fields are in effect
- * (FAULT remains as before) */
-#define PAR_NOFAULT_SS_MASK              0x01
-#define PAR_NOFAULT_MT_MASK              0x07
-#define PAR_NOFAULT_SH_MASK              0x01
-#define PAR_NOFAULT_NS_MASK              0x01
-#define PAR_NOFAULT_NOS_MASK             0x01
-#define PAR_NPFAULT_PA_MASK              0x000FFFFF
-
-
-/* PRRR */
-#define MTC0_MASK                        0x03
-#define MTC1_MASK                        0x03
-#define MTC2_MASK                        0x03
-#define MTC3_MASK                        0x03
-#define MTC4_MASK                        0x03
-#define MTC5_MASK                        0x03
-#define MTC6_MASK                        0x03
-#define MTC7_MASK                        0x03
-#define SHDSH0_MASK                      0x01
-#define SHDSH1_MASK                      0x01
-#define SHNMSH0_MASK                     0x01
-#define SHNMSH1_MASK                     0x01
-#define NOS0_MASK                        0x01
-#define NOS1_MASK                        0x01
-#define NOS2_MASK                        0x01
-#define NOS3_MASK                        0x01
-#define NOS4_MASK                        0x01
-#define NOS5_MASK                        0x01
-#define NOS6_MASK                        0x01
-#define NOS7_MASK                        0x01
-
-
-/* RESUME */
-#define TNR_MASK                         0x01
-
-
-/* SCTLR */
-#define M_MASK                           0x01
-#define TRE_MASK                         0x01
-#define AFE_MASK                         0x01
-#define HAF_MASK                         0x01
-#define BE_MASK                          0x01
-#define AFFD_MASK                        0x01
-
-
-/* TLBIASID */
-#define TLBIASID_ASID_MASK               0xFF
-
-
-/* TLBIVA */
-#define TLBIVA_ASID_MASK                 0xFF
-#define TLBIVA_VA_MASK                   0x000FFFFF
-
-
-/* TLBIVAA */
-#define TLBIVAA_VA_MASK                  0x000FFFFF
-
-
-/* TLBLCKR */
-#define LKE_MASK                         0x01
-#define TLBLCKR_TLBIALLCFG_MASK          0x01
-#define TLBIASIDCFG_MASK                 0x01
-#define TLBIVAACFG_MASK                  0x01
-#define FLOOR_MASK                       0xFF
-#define VICTIM_MASK                      0xFF
-
-
-/* TTBCR */
-#define N_MASK                           0x07
-#define PD0_MASK                         0x01
-#define PD1_MASK                         0x01
-
-
-/* TTBR0 */
-#define TTBR0_IRGNH_MASK                 0x01
-#define TTBR0_SH_MASK                    0x01
-#define TTBR0_ORGN_MASK                  0x03
-#define TTBR0_NOS_MASK                   0x01
-#define TTBR0_IRGNL_MASK                 0x01
-#define TTBR0_PA_MASK                    0x0003FFFF
-
-
-/* TTBR1 */
-#define TTBR1_IRGNH_MASK                 0x01
-#define TTBR1_SH_MASK                    0x01
-#define TTBR1_ORGN_MASK                  0x03
-#define TTBR1_NOS_MASK                   0x01
-#define TTBR1_IRGNL_MASK                 0x01
-#define TTBR1_PA_MASK                    0x0003FFFF
-
-
-/* V2PSR */
-#define HIT_MASK                         0x01
-#define INDEX_MASK                       0xFF
-
-
-/* V2Pxx */
-#define V2Pxx_INDEX_MASK                 0xFF
-#define V2Pxx_VA_MASK                    0x000FFFFF
-
-
-/* Context Register Shifts */
-/* ACTLR */
-#define CFERE_SHIFT                    0
-#define CFEIE_SHIFT                    1
-#define PTSHCFG_SHIFT                  2
-#define RCOSH_SHIFT                    4
-#define RCISH_SHIFT                    5
-#define RCNSH_SHIFT                    6
-#define PRIVCFG_SHIFT                  8
-#define DNA_SHIFT                      10
-#define DNLV2PA_SHIFT                  11
-#define TLBMCFG_SHIFT                  12
-#define CFCFG_SHIFT                    14
-#define TIPCF_SHIFT                    15
-#define V2PCFG_SHIFT                   16
-#define HUME_SHIFT                     18
-#define PTMTCFG_SHIFT                  20
-#define PTMEMTYPE_SHIFT                21
-
-
-/* BFBCR */
-#define BFBDFE_SHIFT                   0
-#define BFBSFE_SHIFT                   1
-#define SFVS_SHIFT                     2
-#define FLVIC_SHIFT                    4
-#define SLVIC_SHIFT                    8
-
-
-/* CONTEXTIDR */
-#define CONTEXTIDR_ASID_SHIFT          0
-#define PROCID_SHIFT                   8
-
-
-/* FSR */
-#define TF_SHIFT                       1
-#define AFF_SHIFT                      2
-#define APF_SHIFT                      3
-#define TLBMF_SHIFT                    4
-#define HTWDEEF_SHIFT                  5
-#define HTWSEEF_SHIFT                  6
-#define MHF_SHIFT                      7
-#define SL_SHIFT                       16
-#define SS_SHIFT                       30
-#define MULTI_SHIFT                    31
-
-
-/* FSYNR0 */
-#define AMID_SHIFT                     0
-#define APID_SHIFT                     8
-#define ABID_SHIFT                     13
-#define ATID_SHIFT                     24
-
-
-/* FSYNR1 */
-#define AMEMTYPE_SHIFT                 0
-#define ASHARED_SHIFT                  3
-#define AINNERSHARED_SHIFT             4
-#define APRIV_SHIFT                    5
-#define APROTNS_SHIFT                  6
-#define AINST_SHIFT                    7
-#define AWRITE_SHIFT                   8
-#define ABURST_SHIFT                   10
-#define ALEN_SHIFT                     12
-#define FSYNR1_ASIZE_SHIFT             16
-#define ALOCK_SHIFT                    20
-#define AFULL_SHIFT                    24
-
-
-/* NMRR */
-#define ICPC0_SHIFT                    0
-#define ICPC1_SHIFT                    2
-#define ICPC2_SHIFT                    4
-#define ICPC3_SHIFT                    6
-#define ICPC4_SHIFT                    8
-#define ICPC5_SHIFT                    10
-#define ICPC6_SHIFT                    12
-#define ICPC7_SHIFT                    14
-#define OCPC0_SHIFT                    16
-#define OCPC1_SHIFT                    18
-#define OCPC2_SHIFT                    20
-#define OCPC3_SHIFT                    22
-#define OCPC4_SHIFT                    24
-#define OCPC5_SHIFT                    26
-#define OCPC6_SHIFT                    28
-#define OCPC7_SHIFT                    30
-
-
-/* PAR */
-#define FAULT_SHIFT                    0
-/* If a fault is present, these are the
-same as the fault fields in the FAR */
-#define FAULT_TF_SHIFT                 1
-#define FAULT_AFF_SHIFT                2
-#define FAULT_APF_SHIFT                3
-#define FAULT_TLBMF_SHIFT              4
-#define FAULT_HTWDEEF_SHIFT            5
-#define FAULT_HTWSEEF_SHIFT            6
-#define FAULT_MHF_SHIFT                7
-#define FAULT_SL_SHIFT                 16
-#define FAULT_SS_SHIFT                 30
-
-/* If NO fault is present, the following
- * fields are in effect
- * (FAULT remains as before) */
-#define PAR_NOFAULT_SS_SHIFT           1
-#define PAR_NOFAULT_MT_SHIFT           4
-#define PAR_NOFAULT_SH_SHIFT           7
-#define PAR_NOFAULT_NS_SHIFT           9
-#define PAR_NOFAULT_NOS_SHIFT          10
-#define PAR_NPFAULT_PA_SHIFT           12
-
-
-/* PRRR */
-#define MTC0_SHIFT                     0
-#define MTC1_SHIFT                     2
-#define MTC2_SHIFT                     4
-#define MTC3_SHIFT                     6
-#define MTC4_SHIFT                     8
-#define MTC5_SHIFT                     10
-#define MTC6_SHIFT                     12
-#define MTC7_SHIFT                     14
-#define SHDSH0_SHIFT                   16
-#define SHDSH1_SHIFT                   17
-#define SHNMSH0_SHIFT                  18
-#define SHNMSH1_SHIFT                  19
-#define NOS0_SHIFT                     24
-#define NOS1_SHIFT                     25
-#define NOS2_SHIFT                     26
-#define NOS3_SHIFT                     27
-#define NOS4_SHIFT                     28
-#define NOS5_SHIFT                     29
-#define NOS6_SHIFT                     30
-#define NOS7_SHIFT                     31
-
-
-/* RESUME */
-#define TNR_SHIFT                      0
-
-
-/* SCTLR */
-#define M_SHIFT                        0
-#define TRE_SHIFT                      1
-#define AFE_SHIFT                      2
-#define HAF_SHIFT                      3
-#define BE_SHIFT                       4
-#define AFFD_SHIFT                     5
-
-
-/* TLBIASID */
-#define TLBIASID_ASID_SHIFT            0
-
-
-/* TLBIVA */
-#define TLBIVA_ASID_SHIFT              0
-#define TLBIVA_VA_SHIFT                12
-
-
-/* TLBIVAA */
-#define TLBIVAA_VA_SHIFT               12
-
-
-/* TLBLCKR */
-#define LKE_SHIFT                      0
-#define TLBLCKR_TLBIALLCFG_SHIFT       1
-#define TLBIASIDCFG_SHIFT              2
-#define TLBIVAACFG_SHIFT               3
-#define FLOOR_SHIFT                    8
-#define VICTIM_SHIFT                   8
-
-
-/* TTBCR */
-#define N_SHIFT                        3
-#define PD0_SHIFT                      4
-#define PD1_SHIFT                      5
-
-
-/* TTBR0 */
-#define TTBR0_IRGNH_SHIFT              0
-#define TTBR0_SH_SHIFT                 1
-#define TTBR0_ORGN_SHIFT               3
-#define TTBR0_NOS_SHIFT                5
-#define TTBR0_IRGNL_SHIFT              6
-#define TTBR0_PA_SHIFT                 14
-
-
-/* TTBR1 */
-#define TTBR1_IRGNH_SHIFT              0
-#define TTBR1_SH_SHIFT                 1
-#define TTBR1_ORGN_SHIFT               3
-#define TTBR1_NOS_SHIFT                5
-#define TTBR1_IRGNL_SHIFT              6
-#define TTBR1_PA_SHIFT                 14
-
-
-/* V2PSR */
-#define HIT_SHIFT                      0
-#define INDEX_SHIFT                    8
-
-
-/* V2Pxx */
-#define V2Pxx_INDEX_SHIFT              0
-#define V2Pxx_VA_SHIFT                 12
-
-#endif
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8960.h b/arch/arm/mach-msm/include/mach/msm_iomap-8960.h
deleted file mode 100644
index 7bca8d7108d6..000000000000
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8960.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved.
- * Author: Brian Swetland <swetland@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.
- *
- *
- * The MSM peripherals are spread all over across 768MB of physical
- * space, which makes just having a simple IO_ADDRESS macro to slide
- * them into the right virtual location rough.  Instead, we will
- * provide a master phys->virt mapping for peripherals here.
- *
- */
-
-#ifndef __ASM_ARCH_MSM_IOMAP_8960_H
-#define __ASM_ARCH_MSM_IOMAP_8960_H
-
-/* Physical base address and size of peripherals.
- * Ordered by the virtual base addresses they will be mapped at.
- *
- * If you add or remove entries here, you'll want to edit the
- * msm_io_desc array in arch/arm/mach-msm/io.c to reflect your
- * changes.
- *
- */
-
-#define MSM8960_TMR_PHYS        0x0200A000
-#define MSM8960_TMR_SIZE        SZ_4K
-
-#define MSM8960_TMR0_PHYS       0x0208A000
-#define MSM8960_TMR0_SIZE       SZ_4K
-
-#ifdef CONFIG_DEBUG_MSM8960_UART
-#define MSM_DEBUG_UART_BASE     0xF0040000
-#define MSM_DEBUG_UART_PHYS     0x16440000
-#endif
-
-#endif
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
deleted file mode 100644
index 75a7b62c1c74..000000000000
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2008-2011, Code Aurora Forum. All rights reserved.
- * Author: Brian Swetland <swetland@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.
- *
- *
- * The MSM peripherals are spread all over across 768MB of physical
- * space, which makes just having a simple IO_ADDRESS macro to slide
- * them into the right virtual location rough.  Instead, we will
- * provide a master phys->virt mapping for peripherals here.
- *
- */
-
-#ifndef __ASM_ARCH_MSM_IOMAP_8X60_H
-#define __ASM_ARCH_MSM_IOMAP_8X60_H
-
-/* Physical base address and size of peripherals.
- * Ordered by the virtual base addresses they will be mapped at.
- *
- * MSM_VIC_BASE must be an value that can be loaded via a "mov"
- * instruction, otherwise entry-macro.S will not compile.
- *
- * If you add or remove entries here, you'll want to edit the
- * msm_io_desc array in arch/arm/mach-msm/io.c to reflect your
- * changes.
- *
- */
-
-#define MSM_TLMM_BASE           IOMEM(0xF0004000)
-#define MSM_TLMM_PHYS           0x00800000
-#define MSM_TLMM_SIZE           SZ_16K
-
-#define MSM8X60_TMR_PHYS        0x02000000
-#define MSM8X60_TMR_SIZE        SZ_4K
-
-#define MSM8X60_TMR0_PHYS       0x02040000
-#define MSM8X60_TMR0_SIZE       SZ_4K
-
-#ifdef CONFIG_DEBUG_MSM8660_UART
-#define MSM_DEBUG_UART_BASE     0xF0040000
-#define MSM_DEBUG_UART_PHYS     0x19C40000
-#endif
-
-#endif
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap.h b/arch/arm/mach-msm/include/mach/msm_iomap.h
index c56e81ffdcde..0e4f49157684 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap.h
@@ -45,25 +45,8 @@
 #include "msm_iomap-7x00.h"
 #endif
 
-#include "msm_iomap-8x60.h"
-#include "msm_iomap-8960.h"
-
-#define MSM_DEBUG_UART_SIZE     SZ_4K
-#if defined(CONFIG_DEBUG_MSM_UART1)
-#define MSM_DEBUG_UART_BASE     0xE1000000
-#define MSM_DEBUG_UART_PHYS     MSM_UART1_PHYS
-#elif defined(CONFIG_DEBUG_MSM_UART2)
-#define MSM_DEBUG_UART_BASE     0xE1000000
-#define MSM_DEBUG_UART_PHYS     MSM_UART2_PHYS
-#elif defined(CONFIG_DEBUG_MSM_UART3)
-#define MSM_DEBUG_UART_BASE     0xE1000000
-#define MSM_DEBUG_UART_PHYS     MSM_UART3_PHYS
-#endif
-
 /* Virtual addresses shared across all MSM targets. */
 #define MSM_CSR_BASE            IOMEM(0xE0001000)
-#define MSM_TMR_BASE            IOMEM(0xF0200000)
-#define MSM_TMR0_BASE           IOMEM(0xF0201000)
 #define MSM_GPIO1_BASE          IOMEM(0xE0003000)
 #define MSM_GPIO2_BASE          IOMEM(0xE0004000)
 
diff --git a/arch/arm/mach-msm/include/mach/uncompress.h b/arch/arm/mach-msm/include/mach/uncompress.h
deleted file mode 100644
index 94324870fb04..000000000000
--- a/arch/arm/mach-msm/include/mach/uncompress.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2007 Google, Inc.
- * Copyright (c) 2011, Code Aurora Forum. All rights reserved.
- *
- * 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 __ASM_ARCH_MSM_UNCOMPRESS_H
-#define __ASM_ARCH_MSM_UNCOMPRESS_H
-
-#include <asm/barrier.h>
-#include <asm/processor.h>
-#include <mach/msm_iomap.h>
-
-#define UART_CSR      (*(volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x08))
-#define UART_TF       (*(volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x0c))
-
-#define UART_DM_SR    (*((volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x08)))
-#define UART_DM_CR    (*((volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x10)))
-#define UART_DM_ISR   (*((volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x14)))
-#define UART_DM_NCHAR (*((volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x40)))
-#define UART_DM_TF    (*((volatile uint32_t *)(MSM_DEBUG_UART_PHYS + 0x70)))
-
-static void putc(int c)
-{
-#if defined(MSM_DEBUG_UART_PHYS)
-#ifdef CONFIG_MSM_HAS_DEBUG_UART_HS
-        /*
-         * Wait for TX_READY to be set; but skip it if we have a
-         * TX underrun.
-         */
-        if (!(UART_DM_SR & 0x08))
-                while (!(UART_DM_ISR & 0x80))
-                        cpu_relax();
-
-        UART_DM_CR = 0x300;
-        UART_DM_NCHAR = 0x1;
-        UART_DM_TF = c;
-#else
-        while (!(UART_CSR & 0x04))
-                cpu_relax();
-        UART_TF = c;
-#endif
-#endif
-}
-
-static inline void flush(void)
-{
-}
-
-static inline void arch_decomp_setup(void)
-{
-}
-
-#endif
diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c
index 3dc04ccaf59f..adc8971c7266 100644
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@ -18,6 +18,7 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/bug.h>
 #include <linux/init.h>
 #include <linux/io.h>
 #include <linux/export.h>
@@ -27,8 +28,6 @@
 #include <mach/msm_iomap.h>
 #include <asm/mach/map.h>
 
-#include <mach/board.h>
-
 #include "common.h"
 
 #define MSM_CHIP_DEVICE_TYPE(name, chip, mem_type) {                          \
@@ -52,26 +51,38 @@ static struct map_desc msm_io_desc[] __initdata = {
         MSM_CHIP_DEVICE_TYPE(GPIO1, MSM7X00, MT_DEVICE_NONSHARED),
         MSM_CHIP_DEVICE_TYPE(GPIO2, MSM7X00, MT_DEVICE_NONSHARED),
         MSM_DEVICE_TYPE(CLK_CTL, MT_DEVICE_NONSHARED),
-#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \
-        defined(CONFIG_DEBUG_MSM_UART3)
-        MSM_DEVICE_TYPE(DEBUG_UART, MT_DEVICE_NONSHARED),
-#endif
         {
                 .virtual =  (unsigned long) MSM_SHARED_RAM_BASE,
                 .pfn = __phys_to_pfn(MSM_SHARED_RAM_PHYS),
                 .length =   MSM_SHARED_RAM_SIZE,
                 .type =     MT_DEVICE,
         },
+#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \
+                defined(CONFIG_DEBUG_MSM_UART3)
+        {
+                /* Must be last: virtual and pfn filled in by debug_ll_addr() */
+                .length = SZ_4K,
+                .type = MT_DEVICE_NONSHARED,
+        }
+#endif
 };
 
 void __init msm_map_common_io(void)
 {
+        size_t size = ARRAY_SIZE(msm_io_desc);
+
         /* Make sure the peripheral register window is closed, since
          * we will use PTE flags (TEX[1]=1,B=0,C=1) to determine which
          * pages are peripheral interface or not.
          */
         asm("mcr p15, 0, %0, c15, c2, 4" : : "r" (0));
-        iotable_init(msm_io_desc, ARRAY_SIZE(msm_io_desc));
+#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \
+                defined(CONFIG_DEBUG_MSM_UART3)
+        debug_ll_addr(&msm_io_desc[size - 1].pfn,
+                      &msm_io_desc[size - 1].virtual);
+        msm_io_desc[size - 1].pfn = __phys_to_pfn(msm_io_desc[size - 1].pfn);
+#endif
+        iotable_init(msm_io_desc, size);
 }
 #endif
 
@@ -87,10 +98,6 @@ static struct map_desc qsd8x50_io_desc[] __initdata = {
         MSM_DEVICE(SCPLL),
         MSM_DEVICE(AD5),
         MSM_DEVICE(MDC),
-#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \
-        defined(CONFIG_DEBUG_MSM_UART3)
-        MSM_DEVICE(DEBUG_UART),
-#endif
         {
                 .virtual =  (unsigned long) MSM_SHARED_RAM_BASE,
                 .pfn = __phys_to_pfn(MSM_SHARED_RAM_PHYS),
@@ -101,40 +108,11 @@ static struct map_desc qsd8x50_io_desc[] __initdata = {
 
 void __init msm_map_qsd8x50_io(void)
 {
+        debug_ll_io_init();
         iotable_init(qsd8x50_io_desc, ARRAY_SIZE(qsd8x50_io_desc));
 }
 #endif /* CONFIG_ARCH_QSD8X50 */
 
-#ifdef CONFIG_ARCH_MSM8X60
-static struct map_desc msm8x60_io_desc[] __initdata = {
-        MSM_CHIP_DEVICE(TMR, MSM8X60),
-        MSM_CHIP_DEVICE(TMR0, MSM8X60),
-#ifdef CONFIG_DEBUG_MSM8660_UART
-        MSM_DEVICE(DEBUG_UART),
-#endif
-};
-
-void __init msm_map_msm8x60_io(void)
-{
-        iotable_init(msm8x60_io_desc, ARRAY_SIZE(msm8x60_io_desc));
-}
-#endif /* CONFIG_ARCH_MSM8X60 */
-
-#ifdef CONFIG_ARCH_MSM8960
-static struct map_desc msm8960_io_desc[] __initdata = {
-        MSM_CHIP_DEVICE(TMR, MSM8960),
-        MSM_CHIP_DEVICE(TMR0, MSM8960),
-#ifdef CONFIG_DEBUG_MSM8960_UART
-        MSM_DEVICE(DEBUG_UART),
-#endif
-};
-
-void __init msm_map_msm8960_io(void)
-{
-        iotable_init(msm8960_io_desc, ARRAY_SIZE(msm8960_io_desc));
-}
-#endif /* CONFIG_ARCH_MSM8960 */
-
 #ifdef CONFIG_ARCH_MSM7X30
 static struct map_desc msm7x30_io_desc[] __initdata = {
         MSM_DEVICE(VIC),
@@ -150,10 +128,6 @@ static struct map_desc msm7x30_io_desc[] __initdata = {
         MSM_DEVICE(SAW),
         MSM_DEVICE(GCC),
         MSM_DEVICE(TCSR),
-#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \
-        defined(CONFIG_DEBUG_MSM_UART3)
-        MSM_DEVICE(DEBUG_UART),
-#endif
         {
                 .virtual =  (unsigned long) MSM_SHARED_RAM_BASE,
                 .pfn = __phys_to_pfn(MSM_SHARED_RAM_PHYS),
@@ -164,10 +138,12 @@ static struct map_desc msm7x30_io_desc[] __initdata = {
 
 void __init msm_map_msm7x30_io(void)
 {
+        debug_ll_io_init();
         iotable_init(msm7x30_io_desc, ARRAY_SIZE(msm7x30_io_desc));
 }
 #endif /* CONFIG_ARCH_MSM7X30 */
 
+#ifdef CONFIG_ARCH_MSM7X00A
 void __iomem *__msm_ioremap_caller(phys_addr_t phys_addr, size_t size,
                                    unsigned int mtype, void *caller)
 {
@@ -182,3 +158,4 @@ void __iomem *__msm_ioremap_caller(phys_addr_t phys_addr, size_t size,
 
         return __arm_ioremap_caller(phys_addr, size, mtype, caller);
 }
+#endif
diff --git a/arch/arm/mach-msm/timer.c b/arch/arm/mach-msm/timer.c
index 8697cfc0d0b6..696fb73296d0 100644
--- a/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@ -16,6 +16,7 @@
 
 #include <linux/clocksource.h>
 #include <linux/clockchips.h>
+#include <linux/cpu.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
@@ -26,7 +27,6 @@
 #include <linux/sched_clock.h>
 
 #include <asm/mach/time.h>
-#include <asm/localtimer.h>
 
 #include "common.h"
 
@@ -49,7 +49,7 @@ static void __iomem *sts_base;
 
 static irqreturn_t msm_timer_interrupt(int irq, void *dev_id)
 {
-        struct clock_event_device *evt = *(struct clock_event_device **)dev_id;
+        struct clock_event_device *evt = dev_id;
         /* Stop the timer tick */
         if (evt->mode == CLOCK_EVT_MODE_ONESHOT) {
                 u32 ctrl = readl_relaxed(event_base + TIMER_ENABLE);
@@ -101,18 +101,7 @@ static void msm_timer_set_mode(enum clock_event_mode mode,
         writel_relaxed(ctrl, event_base + TIMER_ENABLE);
 }
 
-static struct clock_event_device msm_clockevent = {
-        .name           = "gp_timer",
-        .features       = CLOCK_EVT_FEAT_ONESHOT,
-        .rating         = 200,
-        .set_next_event = msm_timer_set_next_event,
-        .set_mode       = msm_timer_set_mode,
-};
-
-static union {
-        struct clock_event_device *evt;
-        struct clock_event_device * __percpu *percpu_evt;
-} msm_evt;
+static struct clock_event_device __percpu *msm_evt;
 
 static void __iomem *source_base;
 
@@ -138,23 +127,34 @@ static struct clocksource msm_clocksource = {
         .flags  = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
-#ifdef CONFIG_LOCAL_TIMERS
+static int msm_timer_irq;
+static int msm_timer_has_ppi;
+
 static int msm_local_timer_setup(struct clock_event_device *evt)
 {
-        /* Use existing clock_event for cpu 0 */
-        if (!smp_processor_id())
-                return 0;
-
-        evt->irq = msm_clockevent.irq;
-        evt->name = "local_timer";
-        evt->features = msm_clockevent.features;
-        evt->rating = msm_clockevent.rating;
+        int cpu = smp_processor_id();
+        int err;
+
+        evt->irq = msm_timer_irq;
+        evt->name = "msm_timer";
+        evt->features = CLOCK_EVT_FEAT_ONESHOT;
+        evt->rating = 200;
         evt->set_mode = msm_timer_set_mode;
         evt->set_next_event = msm_timer_set_next_event;
+        evt->cpumask = cpumask_of(cpu);
+
+        clockevents_config_and_register(evt, GPT_HZ, 4, 0xffffffff);
+
+        if (msm_timer_has_ppi) {
+                enable_percpu_irq(evt->irq, IRQ_TYPE_EDGE_RISING);
+        } else {
+                err = request_irq(evt->irq, msm_timer_interrupt,
+                                IRQF_TIMER | IRQF_NOBALANCING |
+                                IRQF_TRIGGER_RISING, "gp_timer", evt);
+                if (err)
+                        pr_err("request_irq failed\n");
+        }
 
-        *__this_cpu_ptr(msm_evt.percpu_evt) = evt;
-        clockevents_config_and_register(evt, GPT_HZ, 4, 0xf0000000);
-        enable_percpu_irq(evt->irq, IRQ_TYPE_EDGE_RISING);
         return 0;
 }
 
@@ -164,11 +164,28 @@ static void msm_local_timer_stop(struct clock_event_device *evt)
         disable_percpu_irq(evt->irq);
 }
 
-static struct local_timer_ops msm_local_timer_ops = {
-        .setup  = msm_local_timer_setup,
-        .stop   = msm_local_timer_stop,
+static int msm_timer_cpu_notify(struct notifier_block *self,
+                                           unsigned long action, void *hcpu)
+{
+        /*
+         * Grab cpu pointer in each case to avoid spurious
+         * preemptible warnings
+         */
+        switch (action & ~CPU_TASKS_FROZEN) {
+        case CPU_STARTING:
+                msm_local_timer_setup(this_cpu_ptr(msm_evt));
+                break;
+        case CPU_DYING:
+                msm_local_timer_stop(this_cpu_ptr(msm_evt));
+                break;
+        }
+
+        return NOTIFY_OK;
+}
+
+static struct notifier_block msm_timer_cpu_nb = {
+        .notifier_call = msm_timer_cpu_notify,
 };
-#endif /* CONFIG_LOCAL_TIMERS */
 
 static notrace u32 msm_sched_clock_read(void)
 {
@@ -178,38 +195,35 @@ static notrace u32 msm_sched_clock_read(void)
 static void __init msm_timer_init(u32 dgt_hz, int sched_bits, int irq,
                                   bool percpu)
 {
-        struct clock_event_device *ce = &msm_clockevent;
         struct clocksource *cs = &msm_clocksource;
-        int res;
+        int res = 0;
+
+        msm_timer_irq = irq;
+        msm_timer_has_ppi = percpu;
+
+        msm_evt = alloc_percpu(struct clock_event_device);
+        if (!msm_evt) {
+                pr_err("memory allocation failed for clockevents\n");
+                goto err;
+        }
 
-        ce->cpumask = cpumask_of(0);
-        ce->irq = irq;
+        if (percpu)
+                res = request_percpu_irq(irq, msm_timer_interrupt,
+                                         "gp_timer", msm_evt);
 
-        clockevents_config_and_register(ce, GPT_HZ, 4, 0xffffffff);
-        if (percpu) {
-                msm_evt.percpu_evt = alloc_percpu(struct clock_event_device *);
-                if (!msm_evt.percpu_evt) {
-                        pr_err("memory allocation failed for %s\n", ce->name);
+        if (res) {
+                pr_err("request_percpu_irq failed\n");
+        } else {
+                res = register_cpu_notifier(&msm_timer_cpu_nb);
+                if (res) {
+                        free_percpu_irq(irq, msm_evt);
                         goto err;
                 }
-                *__this_cpu_ptr(msm_evt.percpu_evt) = ce;
-                res = request_percpu_irq(ce->irq, msm_timer_interrupt,
-                                         ce->name, msm_evt.percpu_evt);
-                if (!res) {
-                        enable_percpu_irq(ce->irq, IRQ_TYPE_EDGE_RISING);
-#ifdef CONFIG_LOCAL_TIMERS
-                        local_timer_register(&msm_local_timer_ops);
-#endif
-                }
-        } else {
-                msm_evt.evt = ce;
-                res = request_irq(ce->irq, msm_timer_interrupt,
-                                  IRQF_TIMER | IRQF_NOBALANCING |
-                                  IRQF_TRIGGER_RISING, ce->name, &msm_evt.evt);
+
+                /* Immediately configure the timer on the boot CPU */
+                msm_local_timer_setup(__this_cpu_ptr(msm_evt));
         }
 
-        if (res)
-                pr_err("request_irq failed for %s\n", ce->name);
 err:
         writel_relaxed(TIMER_ENABLE_EN, source_base + TIMER_ENABLE);
         res = clocksource_register_hz(cs, dgt_hz);
@@ -219,15 +233,8 @@ err:
 }
 
 #ifdef CONFIG_OF
-static const struct of_device_id msm_timer_match[] __initconst = {
-        { .compatible = "qcom,kpss-timer" },
-        { .compatible = "qcom,scss-timer" },
-        { },
-};
-
-void __init msm_dt_timer_init(void)
+static void __init msm_dt_timer_init(struct device_node *np)
 {
-        struct device_node *np;
         u32 freq;
         int irq;
         struct resource res;
@@ -235,12 +242,6 @@ void __init msm_dt_timer_init(void)
         void __iomem *base;
         void __iomem *cpu0_base;
 
-        np = of_find_matching_node(NULL, msm_timer_match);
-        if (!np) {
-                pr_err("Can't find msm timer DT node\n");
-                return;
-        }
-
         base = of_iomap(np, 0);
         if (!base) {
                 pr_err("Failed to map event base\n");
@@ -283,6 +284,8 @@ void __init msm_dt_timer_init(void)
 
         msm_timer_init(freq, 32, irq, !!percpu_offset);
 }
+CLOCKSOURCE_OF_DECLARE(kpss_timer, "qcom,kpss-timer", msm_dt_timer_init);
+CLOCKSOURCE_OF_DECLARE(scss_timer, "qcom,scss-timer", msm_dt_timer_init);
 #endif
 
 static int __init msm_timer_map(phys_addr_t addr, u32 event, u32 source,
diff --git a/arch/arm/mach-mv78xx0/include/mach/debug-macro.S b/arch/arm/mach-mv78xx0/include/mach/debug-macro.S
deleted file mode 100644
index a7df02b049b7..000000000000
--- a/arch/arm/mach-mv78xx0/include/mach/debug-macro.S
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * arch/arm/mach-mv78xx0/include/mach/debug-macro.S
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#include <mach/mv78xx0.h>
-
-        .macro  addruart, rp, rv, tmp
-        ldr     \rp, =MV78XX0_REGS_PHYS_BASE
-        ldr     \rv, =MV78XX0_REGS_VIRT_BASE
-        orr     \rp, \rp, #0x00012000
-        orr     \rv, \rv, #0x00012000
-        .endm
-
-#define UART_SHIFT      2
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c
index dc26a654c496..445e553f4a28 100644
--- a/arch/arm/mach-mv78xx0/pcie.c
+++ b/arch/arm/mach-mv78xx0/pcie.c
@@ -18,6 +18,11 @@
 #include <mach/mv78xx0.h>
 #include "common.h"
 
+#define MV78XX0_MBUS_PCIE_MEM_TARGET(port, lane) ((port) ? 8 : 4)
+#define MV78XX0_MBUS_PCIE_MEM_ATTR(port, lane)   (0xf8 & ~(0x10 << (lane)))
+#define MV78XX0_MBUS_PCIE_IO_TARGET(port, lane)  ((port) ? 8 : 4)
+#define MV78XX0_MBUS_PCIE_IO_ATTR(port, lane)    (0xf0 & ~(0x10 << (lane)))
+
 struct pcie_port {
         u8                      maj;
         u8                      min;
@@ -71,7 +76,6 @@ static void __init mv78xx0_pcie_preinit(void)
         start = MV78XX0_PCIE_MEM_PHYS_BASE;
         for (i = 0; i < num_pcie_ports; i++) {
                 struct pcie_port *pp = pcie_port + i;
-                char winname[MVEBU_MBUS_MAX_WINNAME_SZ];
 
                 snprintf(pp->mem_space_name, sizeof(pp->mem_space_name),
                         "PCIe %d.%d MEM", pp->maj, pp->min);
@@ -85,17 +89,12 @@ static void __init mv78xx0_pcie_preinit(void)
                 if (request_resource(&iomem_resource, &pp->res))
                         panic("can't allocate PCIe MEM sub-space");
 
-                snprintf(winname, sizeof(winname), "pcie%d.%d",
-                         pp->maj, pp->min);
-
-                mvebu_mbus_add_window_remap_flags(winname,
-                                                  pp->res.start,
-                                                  resource_size(&pp->res),
-                                                  MVEBU_MBUS_NO_REMAP,
-                                                  MVEBU_MBUS_PCI_MEM);
-                mvebu_mbus_add_window_remap_flags(winname,
-                                                  i * SZ_64K, SZ_64K,
-                                                  0, MVEBU_MBUS_PCI_IO);
+                mvebu_mbus_add_window_by_id(MV78XX0_MBUS_PCIE_MEM_TARGET(pp->maj, pp->min),
+                                            MV78XX0_MBUS_PCIE_MEM_ATTR(pp->maj, pp->min),
+                                            pp->res.start, resource_size(&pp->res));
+                mvebu_mbus_add_window_remap_by_id(MV78XX0_MBUS_PCIE_IO_TARGET(pp->maj, pp->min),
+                                                  MV78XX0_MBUS_PCIE_IO_ATTR(pp->maj, pp->min),
+                                                  i * SZ_64K, SZ_64K, 0);
         }
 }
 
diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index 97cbb8021919..e2acff98e750 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -18,7 +18,7 @@
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/io.h>
-#include <linux/time-armada-370-xp.h>
+#include <linux/clocksource.h>
 #include <linux/dma-mapping.h>
 #include <linux/mbus.h>
 #include <asm/hardware/cache-l2x0.h>
@@ -34,44 +34,12 @@ static void __init armada_370_xp_map_io(void)
         debug_ll_io_init();
 }
 
-/*
- * This initialization will be replaced by a DT-based
- * initialization once the mvebu-mbus driver gains DT support.
- */
-
-#define ARMADA_370_XP_MBUS_WINS_OFFS   0x20000
-#define ARMADA_370_XP_MBUS_WINS_SIZE   0x100
-#define ARMADA_370_XP_SDRAM_WINS_OFFS  0x20180
-#define ARMADA_370_XP_SDRAM_WINS_SIZE  0x20
-
-static void __init armada_370_xp_mbus_init(void)
-{
-        char *mbus_soc_name;
-        struct device_node *dn;
-        const __be32 mbus_wins_offs = cpu_to_be32(ARMADA_370_XP_MBUS_WINS_OFFS);
-        const __be32 sdram_wins_offs = cpu_to_be32(ARMADA_370_XP_SDRAM_WINS_OFFS);
-
-        if (of_machine_is_compatible("marvell,armada370"))
-                mbus_soc_name = "marvell,armada370-mbus";
-        else
-                mbus_soc_name = "marvell,armadaxp-mbus";
-
-        dn = of_find_node_by_name(NULL, "internal-regs");
-        BUG_ON(!dn);
-
-        mvebu_mbus_init(mbus_soc_name,
-                        of_translate_address(dn, &mbus_wins_offs),
-                        ARMADA_370_XP_MBUS_WINS_SIZE,
-                        of_translate_address(dn, &sdram_wins_offs),
-                        ARMADA_370_XP_SDRAM_WINS_SIZE);
-}
-
 static void __init armada_370_xp_timer_and_clk_init(void)
 {
         of_clk_init(NULL);
-        armada_370_xp_timer_init();
+        clocksource_of_init();
         coherency_init();
-        armada_370_xp_mbus_init();
+        BUG_ON(mvebu_mbus_dt_init());
 #ifdef CONFIG_CACHE_L2X0
         l2x0_of_init(0, ~0UL);
 #endif
diff --git a/arch/arm/mach-mvebu/platsmp.c b/arch/arm/mach-mvebu/platsmp.c
index ce81d3031405..ff69c2df298b 100644
--- a/arch/arm/mach-mvebu/platsmp.c
+++ b/arch/arm/mach-mvebu/platsmp.c
@@ -21,6 +21,7 @@
 #include <linux/smp.h>
 #include <linux/clk.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/mbus.h>
 #include <asm/cacheflush.h>
 #include <asm/smp_plat.h>
@@ -29,45 +30,43 @@
 #include "pmsu.h"
 #include "coherency.h"
 
+#define AXP_BOOTROM_BASE 0xfff00000
+#define AXP_BOOTROM_SIZE 0x100000
+
+static struct clk *__init get_cpu_clk(int cpu)
+{
+        struct clk *cpu_clk;
+        struct device_node *np = of_get_cpu_node(cpu, NULL);
+
+        if (WARN(!np, "missing cpu node\n"))
+                return NULL;
+        cpu_clk = of_clk_get(np, 0);
+        if (WARN_ON(IS_ERR(cpu_clk)))
+                return NULL;
+        return cpu_clk;
+}
+
 void __init set_secondary_cpus_clock(void)
 {
-        int thiscpu;
+        int thiscpu, cpu;
         unsigned long rate;
-        struct clk *cpu_clk = NULL;
-        struct device_node *np = NULL;
+        struct clk *cpu_clk;
 
         thiscpu = smp_processor_id();
-        for_each_node_by_type(np, "cpu") {
-                int err;
-                int cpu;
-
-                err = of_property_read_u32(np, "reg", &cpu);
-                if (WARN_ON(err))
-                        return;
-
-                if (cpu == thiscpu) {
-                        cpu_clk = of_clk_get(np, 0);
-                        break;
-                }
-        }
-        if (WARN_ON(IS_ERR(cpu_clk)))
+        cpu_clk = get_cpu_clk(thiscpu);
+        if (!cpu_clk)
                 return;
         clk_prepare_enable(cpu_clk);
         rate = clk_get_rate(cpu_clk);
 
         /* set all the other CPU clk to the same rate than the boot CPU */
-        for_each_node_by_type(np, "cpu") {
-                int err;
-                int cpu;
-
-                err = of_property_read_u32(np, "reg", &cpu);
-                if (WARN_ON(err))
+        for_each_possible_cpu(cpu) {
+                if (cpu == thiscpu)
+                        continue;
+                cpu_clk = get_cpu_clk(cpu);
+                if (!cpu_clk)
                         return;
-
-                if (cpu != thiscpu) {
-                        cpu_clk = of_clk_get(np, 0);
-                        clk_set_rate(cpu_clk, rate);
-                }
+                clk_set_rate(cpu_clk, rate);
         }
 }
 
@@ -87,37 +86,39 @@ static int armada_xp_boot_secondary(unsigned int cpu, struct task_struct *idle)
 
 static void __init armada_xp_smp_init_cpus(void)
 {
-        struct device_node *np;
-        unsigned int i, ncores;
+        unsigned int ncores = num_possible_cpus();
 
-        np = of_find_node_by_name(NULL, "cpus");
-        if (!np)
-                panic("No 'cpus' node found\n");
-
-        ncores = of_get_child_count(np);
         if (ncores == 0 || ncores > ARMADA_XP_MAX_CPUS)
                 panic("Invalid number of CPUs in DT\n");
 
-        /* Limit possible CPUs to defconfig */
-        if (ncores > nr_cpu_ids) {
-                pr_warn("SMP: %d CPUs physically present. Only %d configured.",
-                        ncores, nr_cpu_ids);
-                pr_warn("Clipping CPU count to %d\n", nr_cpu_ids);
-                ncores = nr_cpu_ids;
-        }
-
-        for (i = 0; i < ncores; i++)
-                set_cpu_possible(i, true);
-
         set_smp_cross_call(armada_mpic_send_doorbell);
 }
 
 void __init armada_xp_smp_prepare_cpus(unsigned int max_cpus)
 {
+        struct device_node *node;
+        struct resource res;
+        int err;
+
         set_secondary_cpus_clock();
         flush_cache_all();
         set_cpu_coherent(cpu_logical_map(smp_processor_id()), 0);
-        mvebu_mbus_add_window("bootrom", 0xfff00000, SZ_1M);
+
+        /*
+         * In order to boot the secondary CPUs we need to ensure
+         * the bootROM is mapped at the correct address.
+         */
+        node = of_find_compatible_node(NULL, NULL, "marvell,bootrom");
+        if (!node)
+                panic("Cannot find 'marvell,bootrom' compatible node");
+
+        err = of_address_to_resource(node, 0, &res);
+        if (err < 0)
+                panic("Cannot get 'bootrom' node address");
+
+        if (res.start != AXP_BOOTROM_BASE ||
+            resource_size(&res) != AXP_BOOTROM_SIZE)
+                panic("The address for the BootROM is incorrect");
 }
 
 struct smp_operations armada_xp_smp_ops __initdata = {
diff --git a/arch/arm/mach-mxs/mach-mxs.c b/arch/arm/mach-mxs/mach-mxs.c
index 4ce27b536dc9..98f6e2adb53e 100644
--- a/arch/arm/mach-mxs/mach-mxs.c
+++ b/arch/arm/mach-mxs/mach-mxs.c
@@ -14,6 +14,7 @@
 #include <linux/clk/mxs.h>
 #include <linux/clkdev.h>
 #include <linux/clocksource.h>
+#include <linux/clk-provider.h>
 #include <linux/delay.h>
 #include <linux/err.h>
 #include <linux/gpio.h>
@@ -61,6 +62,8 @@
 static u32 chipid;
 static u32 socid;
 
+static void __iomem *reset_addr;
+
 static inline void __mxs_setl(u32 mask, void __iomem *reg)
 {
         __raw_writel(mask, reg + MXS_SET_ADDR);
@@ -393,12 +396,33 @@ static const char __init *mxs_get_revision(void)
         u32 rev = mxs_get_cpu_rev();
 
         if (rev != MXS_CHIP_REV_UNKNOWN)
-                return kasprintf(GFP_KERNEL, "TO%d.%d", (rev >> 4) & 0xf,
+                return kasprintf(GFP_KERNEL, "%d.%d", (rev >> 4) & 0xf,
                                 rev & 0xf);
         else
                 return kasprintf(GFP_KERNEL, "%s", "Unknown");
 }
 
+#define MX23_CLKCTRL_RESET_OFFSET       0x120
+#define MX28_CLKCTRL_RESET_OFFSET       0x1e0
+
+static int __init mxs_restart_init(void)
+{
+        struct device_node *np;
+
+        np = of_find_compatible_node(NULL, NULL, "fsl,clkctrl");
+        reset_addr = of_iomap(np, 0);
+        if (!reset_addr)
+                return -ENODEV;
+
+        if (of_device_is_compatible(np, "fsl,imx23-clkctrl"))
+                reset_addr += MX23_CLKCTRL_RESET_OFFSET;
+        else
+                reset_addr += MX28_CLKCTRL_RESET_OFFSET;
+        of_node_put(np);
+
+        return 0;
+}
+
 static void __init mxs_machine_init(void)
 {
         struct device_node *root;
@@ -433,21 +457,18 @@ static void __init mxs_machine_init(void)
                 imx28_evk_init();
         else if (of_machine_is_compatible("bluegiga,apx4devkit"))
                 apx4devkit_init();
-        else if (of_machine_is_compatible("crystalfontz,cfa10037") ||
-                 of_machine_is_compatible("crystalfontz,cfa10049") ||
-                 of_machine_is_compatible("crystalfontz,cfa10055") ||
-                 of_machine_is_compatible("crystalfontz,cfa10057"))
+        else if (of_machine_is_compatible("crystalfontz,cfa10036"))
                 crystalfontz_init();
 
         of_platform_populate(NULL, of_default_bus_match_table,
                              NULL, parent);
 
+        mxs_restart_init();
+
         if (of_machine_is_compatible("karo,tx28"))
                 tx28_post_init();
 }
 
-#define MX23_CLKCTRL_RESET_OFFSET       0x120
-#define MX28_CLKCTRL_RESET_OFFSET       0x1e0
 #define MXS_CLKCTRL_RESET_CHIP          (1 << 1)
 
 /*
@@ -455,28 +476,16 @@ static void __init mxs_machine_init(void)
  */
 static void mxs_restart(enum reboot_mode mode, const char *cmd)
 {
-        struct device_node *np;
-        void __iomem *reset_addr;
+        if (reset_addr) {
+                /* reset the chip */
+                __mxs_setl(MXS_CLKCTRL_RESET_CHIP, reset_addr);
 
-        np = of_find_compatible_node(NULL, NULL, "fsl,clkctrl");
-        reset_addr = of_iomap(np, 0);
-        if (!reset_addr)
-                goto soft;
+                pr_err("Failed to assert the chip reset\n");
 
-        if (of_device_is_compatible(np, "fsl,imx23-clkctrl"))
-                reset_addr += MX23_CLKCTRL_RESET_OFFSET;
-        else
-                reset_addr += MX28_CLKCTRL_RESET_OFFSET;
-
-        /* reset the chip */
-        __mxs_setl(MXS_CLKCTRL_RESET_CHIP, reset_addr);
-
-        pr_err("Failed to assert the chip reset\n");
-
-        /* Delay to allow the serial port to show the message */
-        mdelay(50);
+                /* Delay to allow the serial port to show the message */
+                mdelay(50);
+        }
 
-soft:
         /* We'll take a jump through zero as a poor second */
         soft_restart(0);
 }
@@ -487,6 +496,7 @@ static void __init mxs_timer_init(void)
                 mx23_clocks_init();
         else
                 mx28_clocks_init();
+        of_clk_init(NULL);
         clocksource_of_init();
 }
 
diff --git a/arch/arm/mach-mxs/pm.c b/arch/arm/mach-mxs/pm.c
index b2494d2db2c4..0170e99fd70f 100644
--- a/arch/arm/mach-mxs/pm.c
+++ b/arch/arm/mach-mxs/pm.c
@@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/suspend.h>
 #include <linux/io.h>
+#include "pm.h"
 
 static int mxs_suspend_enter(suspend_state_t state)
 {
diff --git a/arch/arm/mach-nomadik/Kconfig b/arch/arm/mach-nomadik/Kconfig
index 5981c3db9b41..4d42da49753c 100644
--- a/arch/arm/mach-nomadik/Kconfig
+++ b/arch/arm/mach-nomadik/Kconfig
@@ -27,6 +27,7 @@ config MACH_NOMADIK_8815NHK
         select NOMADIK_8815
         select I2C
         select I2C_ALGOBIT
+        select I2C_NOMADIK
 
 endmenu
 endif
diff --git a/arch/arm/mach-omap1/include/mach/soc.h b/arch/arm/mach-omap1/include/mach/soc.h
index 6cf9c1cc2bef..612bd1cc257c 100644
--- a/arch/arm/mach-omap1/include/mach/soc.h
+++ b/arch/arm/mach-omap1/include/mach/soc.h
@@ -195,6 +195,7 @@ IS_OMAP_TYPE(1710, 0x1710)
 #define cpu_is_omap34xx()               0
 #define cpu_is_omap44xx()               0
 #define soc_is_omap54xx()               0
+#define soc_is_dra7xx()                 0
 #define soc_is_am33xx()                 0
 #define cpu_class_is_omap1()            1
 #define cpu_class_is_omap2()            0
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 3eed0006d189..b5fb5f7992df 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -37,9 +37,8 @@ config ARCH_OMAP4
         select CACHE_L2X0
         select CPU_V7
         select HAVE_ARM_SCU if SMP
-        select HAVE_ARM_TWD if LOCAL_TIMERS
+        select HAVE_ARM_TWD if SMP
         select HAVE_SMP
-        select LOCAL_TIMERS if SMP
         select OMAP_INTERCONNECT
         select PL310_ERRATA_588369
         select PL310_ERRATA_727915
@@ -65,7 +64,7 @@ config SOC_OMAP5
         select ARM_ERRATA_798181 if SMP
 
 config SOC_AM33XX
-        bool "AM33XX support"
+        bool "TI AM33XX"
         depends on ARCH_MULTI_V7
         select ARCH_OMAP2PLUS
         select ARM_CPU_SUSPEND if PM
@@ -118,7 +117,7 @@ config ARCH_OMAP2PLUS_TYPICAL
         select I2C
         select I2C_OMAP
         select MENELAUS if ARCH_OMAP2
-        select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5
+        select NEON if CPU_V7
         select PM_RUNTIME
         select REGULATOR
         select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
@@ -132,9 +131,17 @@ config SOC_HAS_OMAP2_SDRC
 
 config SOC_HAS_REALTIME_COUNTER
         bool "Real time free running counter"
-        depends on SOC_OMAP5
+        depends on SOC_OMAP5 || SOC_DRA7XX
         default y
 
+config SOC_DRA7XX
+        bool "TI DRA7XX"
+        select ARM_ARCH_TIMER
+        select CPU_V7
+        select ARM_GIC
+        select HAVE_SMP
+        select COMMON_CLK
+
 comment "OMAP Core Type"
         depends on ARCH_OMAP2
 
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index d4f671547c37..afb457c3135b 100644
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -23,6 +23,7 @@ obj-$(CONFIG_ARCH_OMAP4) += prm44xx.o $(hwmod-common) $(secure-common)
 obj-$(CONFIG_SOC_AM33XX) += irq.o $(hwmod-common)
 obj-$(CONFIG_SOC_OMAP5)  += prm44xx.o $(hwmod-common) $(secure-common)
 obj-$(CONFIG_SOC_AM43XX) += $(hwmod-common) $(secure-common)
+obj-$(CONFIG_SOC_DRA7XX) += prm44xx.o $(hwmod-common) $(secure-common)
 
 ifneq ($(CONFIG_SND_OMAP_SOC_MCBSP),)
 obj-y += mcbsp.o
@@ -39,6 +40,7 @@ omap-4-5-common				=  omap4-common.o omap-wakeupgen.o
 obj-$(CONFIG_ARCH_OMAP4)                += $(omap-4-5-common) $(smp-y) sleep44xx.o
 obj-$(CONFIG_SOC_OMAP5)                 += $(omap-4-5-common) $(smp-y) sleep44xx.o
 obj-$(CONFIG_SOC_AM43XX)                += $(omap-4-5-common)
+obj-$(CONFIG_SOC_DRA7XX)                += $(omap-4-5-common) $(smp-y)
 
 plus_sec := $(call as-instr,.arch_extension sec,+sec)
 AFLAGS_omap-headsmp.o                   :=-Wa,-march=armv7-a$(plus_sec)
@@ -61,6 +63,7 @@ obj-$(CONFIG_SOC_AM33XX)		+= am33xx-restart.o
 obj-$(CONFIG_ARCH_OMAP3)                += omap3-restart.o
 obj-$(CONFIG_ARCH_OMAP4)                += omap4-restart.o
 obj-$(CONFIG_SOC_OMAP5)                 += omap4-restart.o
+obj-$(CONFIG_SOC_DRA7XX)                += omap4-restart.o
 
 # Pin multiplexing
 obj-$(CONFIG_SOC_OMAP2420)              += mux2420.o
@@ -87,6 +90,7 @@ obj-$(CONFIG_ARCH_OMAP2)		+= sleep24xx.o
 obj-$(CONFIG_ARCH_OMAP3)                += pm34xx.o sleep34xx.o
 obj-$(CONFIG_ARCH_OMAP4)                += pm44xx.o omap-mpuss-lowpower.o
 obj-$(CONFIG_SOC_OMAP5)                 += omap-mpuss-lowpower.o
+obj-$(CONFIG_SOC_DRA7XX)                += omap-mpuss-lowpower.o
 obj-$(CONFIG_PM_DEBUG)                  += pm-debug.o
 
 obj-$(CONFIG_POWER_AVS_OMAP)            += sr_device.o
@@ -114,6 +118,7 @@ omap-prcm-4-5-common			=  cminst44xx.o cm44xx.o prm44xx.o \
                                            vc44xx_data.o vp44xx_data.o
 obj-$(CONFIG_ARCH_OMAP4)                += $(omap-prcm-4-5-common)
 obj-$(CONFIG_SOC_OMAP5)                 += $(omap-prcm-4-5-common)
+obj-$(CONFIG_SOC_DRA7XX)                += $(omap-prcm-4-5-common)
 
 # OMAP voltage domains
 voltagedomain-common                    := voltage.o vc.o vp.o
@@ -143,6 +148,8 @@ obj-$(CONFIG_SOC_AM33XX)		+= powerdomains33xx_data.o
 obj-$(CONFIG_SOC_AM43XX)                += $(powerdomain-common)
 obj-$(CONFIG_SOC_OMAP5)                 += $(powerdomain-common)
 obj-$(CONFIG_SOC_OMAP5)                 += powerdomains54xx_data.o
+obj-$(CONFIG_SOC_DRA7XX)                += $(powerdomain-common)
+obj-$(CONFIG_SOC_DRA7XX)                += powerdomains7xx_data.o
 
 # PRCM clockdomain control
 clockdomain-common                      += clockdomain.o
@@ -160,6 +167,8 @@ obj-$(CONFIG_SOC_AM33XX)		+= clockdomains33xx_data.o
 obj-$(CONFIG_SOC_AM43XX)                += $(clockdomain-common)
 obj-$(CONFIG_SOC_OMAP5)                 += $(clockdomain-common)
 obj-$(CONFIG_SOC_OMAP5)                 += clockdomains54xx_data.o
+obj-$(CONFIG_SOC_DRA7XX)                += $(clockdomain-common)
+obj-$(CONFIG_SOC_DRA7XX)                += clockdomains7xx_data.o
 
 # Clock framework
 obj-$(CONFIG_ARCH_OMAP2)                += $(clock-common) clock2xxx.o
@@ -203,6 +212,7 @@ obj-$(CONFIG_ARCH_OMAP3)		+= omap_hwmod_3xxx_data.o
 obj-$(CONFIG_SOC_AM33XX)                += omap_hwmod_33xx_data.o
 obj-$(CONFIG_ARCH_OMAP4)                += omap_hwmod_44xx_data.o
 obj-$(CONFIG_SOC_OMAP5)                 += omap_hwmod_54xx_data.o
+obj-$(CONFIG_SOC_DRA7XX)                += omap_hwmod_7xx_data.o
 
 # EMU peripherals
 obj-$(CONFIG_OMAP3_EMU)                 += emu.o
diff --git a/arch/arm/mach-omap2/am33xx-restart.c b/arch/arm/mach-omap2/am33xx-restart.c
index 1eae96212315..c88d8df753c2 100644
--- a/arch/arm/mach-omap2/am33xx-restart.c
+++ b/arch/arm/mach-omap2/am33xx-restart.c
@@ -24,8 +24,8 @@ void am33xx_restart(enum reboot_mode mode, const char *cmd)
 {
         /* TODO: Handle mode and cmd if necessary */
 
-        am33xx_prm_rmw_reg_bits(AM33XX_GLOBAL_WARM_SW_RST_MASK,
-                                AM33XX_GLOBAL_WARM_SW_RST_MASK,
+        am33xx_prm_rmw_reg_bits(AM33XX_RST_GLOBAL_WARM_SW_MASK,
+                                AM33XX_RST_GLOBAL_WARM_SW_MASK,
                                 AM33XX_PRM_DEVICE_MOD,
                                 AM33XX_PRM_RSTCTRL_OFFSET);
 
diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
index 244d8a5aa54b..c711ad6ac067 100644
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -100,39 +100,52 @@ static struct platform_device sdp2430_flash_device = {
         .resource       = &sdp2430_flash_resource,
 };
 
-static struct platform_device *sdp2430_devices[] __initdata = {
-        &sdp2430_flash_device,
-};
-
 /* LCD */
 #define SDP2430_LCD_PANEL_BACKLIGHT_GPIO        91
 #define SDP2430_LCD_PANEL_ENABLE_GPIO           154
 
-static struct panel_generic_dpi_data sdp2430_panel_data = {
-        .name                   = "nec_nl2432dr22-11b",
-        .num_gpios              = 2,
-        .gpios                  = {
-                SDP2430_LCD_PANEL_ENABLE_GPIO,
-                SDP2430_LCD_PANEL_BACKLIGHT_GPIO,
-        },
+static const struct display_timing sdp2430_lcd_videomode = {
+        .pixelclock     = { 0, 5400000, 0 },
+
+        .hactive = { 0, 240, 0 },
+        .hfront_porch = { 0, 3, 0 },
+        .hback_porch = { 0, 39, 0 },
+        .hsync_len = { 0, 3, 0 },
+
+        .vactive = { 0, 320, 0 },
+        .vfront_porch = { 0, 2, 0 },
+        .vback_porch = { 0, 7, 0 },
+        .vsync_len = { 0, 1, 0 },
+
+        .flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
+                DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_PIXDATA_POSEDGE,
 };
 
-static struct omap_dss_device sdp2430_lcd_device = {
-        .name                   = "lcd",
-        .driver_name            = "generic_dpi_panel",
-        .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .phy.dpi.data_lines     = 16,
-        .data                   = &sdp2430_panel_data,
+static struct panel_dpi_platform_data sdp2430_lcd_pdata = {
+        .name                   = "lcd",
+        .source                 = "dpi.0",
+
+        .data_lines             = 16,
+
+        .display_timing         = &sdp2430_lcd_videomode,
+
+        .enable_gpio            = SDP2430_LCD_PANEL_ENABLE_GPIO,
+        .backlight_gpio         = SDP2430_LCD_PANEL_BACKLIGHT_GPIO,
 };
 
-static struct omap_dss_device *sdp2430_dss_devices[] = {
-        &sdp2430_lcd_device,
+static struct platform_device sdp2430_lcd_device = {
+        .name                   = "panel-dpi",
+        .id                     = 0,
+        .dev.platform_data      = &sdp2430_lcd_pdata,
 };
 
 static struct omap_dss_board_info sdp2430_dss_data = {
-        .num_devices    = ARRAY_SIZE(sdp2430_dss_devices),
-        .devices        = sdp2430_dss_devices,
-        .default_device = &sdp2430_lcd_device,
+        .default_display_name = "lcd",
+};
+
+static struct platform_device *sdp2430_devices[] __initdata = {
+        &sdp2430_flash_device,
+        &sdp2430_lcd_device,
 };
 
 #if IS_ENABLED(CONFIG_SMC91X)
diff --git a/arch/arm/mach-omap2/board-3430sdp.c b/arch/arm/mach-omap2/board-3430sdp.c
index 23b004afa3f8..d95d0ef1354a 100644
--- a/arch/arm/mach-omap2/board-3430sdp.c
+++ b/arch/arm/mach-omap2/board-3430sdp.c
@@ -126,53 +126,65 @@ static void __init sdp3430_display_init(void)
 
 }
 
-static struct panel_sharp_ls037v7dw01_data sdp3430_lcd_data = {
-        .resb_gpio = SDP3430_LCD_PANEL_ENABLE_GPIO,
-        .ini_gpio = -1,
-        .mo_gpio = -1,
-        .lr_gpio = -1,
-        .ud_gpio = -1,
+static struct panel_sharp_ls037v7dw01_platform_data sdp3430_lcd_pdata = {
+        .name                   = "lcd",
+        .source                 = "dpi.0",
+
+        .data_lines             = 16,
+
+        .resb_gpio              = SDP3430_LCD_PANEL_ENABLE_GPIO,
+        .ini_gpio               = -1,
+        .mo_gpio                = -1,
+        .lr_gpio                = -1,
+        .ud_gpio                = -1,
+};
+
+static struct platform_device sdp3430_lcd_device = {
+        .name                   = "panel-sharp-ls037v7dw01",
+        .id                     = 0,
+        .dev.platform_data      = &sdp3430_lcd_pdata,
 };
 
-static struct omap_dss_device sdp3430_lcd_device = {
-        .name                   = "lcd",
-        .driver_name            = "sharp_ls_panel",
-        .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .phy.dpi.data_lines     = 16,
-        .data                   = &sdp3430_lcd_data,
+static struct connector_dvi_platform_data sdp3430_dvi_connector_pdata = {
+        .name                   = "dvi",
+        .source                 = "tfp410.0",
+        .i2c_bus_num            = -1,
 };
 
-static struct tfp410_platform_data dvi_panel = {
-        .power_down_gpio        = -1,
-        .i2c_bus_num            = -1,
+static struct platform_device sdp3430_dvi_connector_device = {
+        .name                   = "connector-dvi",
+        .id                     = 0,
+        .dev.platform_data      = &sdp3430_dvi_connector_pdata,
 };
 
-static struct omap_dss_device sdp3430_dvi_device = {
-        .name                   = "dvi",
-        .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .driver_name            = "tfp410",
-        .data                   = &dvi_panel,
-        .phy.dpi.data_lines     = 24,
+static struct encoder_tfp410_platform_data sdp3430_tfp410_pdata = {
+        .name                   = "tfp410.0",
+        .source                 = "dpi.0",
+        .data_lines             = 24,
+        .power_down_gpio        = -1,
 };
 
-static struct omap_dss_device sdp3430_tv_device = {
-        .name                   = "tv",
-        .driver_name            = "venc",
-        .type                   = OMAP_DISPLAY_TYPE_VENC,
-        .phy.venc.type          = OMAP_DSS_VENC_TYPE_SVIDEO,
+static struct platform_device sdp3430_tfp410_device = {
+        .name                   = "tfp410",
+        .id                     = 0,
+        .dev.platform_data      = &sdp3430_tfp410_pdata,
 };
 
+static struct connector_atv_platform_data sdp3430_tv_pdata = {
+        .name = "tv",
+        .source = "venc.0",
+        .connector_type = OMAP_DSS_VENC_TYPE_SVIDEO,
+        .invert_polarity = false,
+};
 
-static struct omap_dss_device *sdp3430_dss_devices[] = {
-        &sdp3430_lcd_device,
-        &sdp3430_dvi_device,
-        &sdp3430_tv_device,
+static struct platform_device sdp3430_tv_connector_device = {
+        .name                   = "connector-analog-tv",
+        .id                     = 0,
+        .dev.platform_data      = &sdp3430_tv_pdata,
 };
 
 static struct omap_dss_board_info sdp3430_dss_data = {
-        .num_devices    = ARRAY_SIZE(sdp3430_dss_devices),
-        .devices        = sdp3430_dss_devices,
-        .default_device = &sdp3430_lcd_device,
+        .default_display_name = "lcd",
 };
 
 static struct omap2_hsmmc_info mmc[] = {
@@ -583,6 +595,11 @@ static void __init omap_3430sdp_init(void)
         omap_hsmmc_init(mmc);
         omap3430_i2c_init();
         omap_display_init(&sdp3430_dss_data);
+        platform_device_register(&sdp3430_lcd_device);
+        platform_device_register(&sdp3430_tfp410_device);
+        platform_device_register(&sdp3430_dvi_connector_device);
+        platform_device_register(&sdp3430_tv_connector_device);
+
         if (omap_rev() > OMAP3430_REV_ES1_0)
                 gpio_pendown = SDP3430_TS_GPIO_IRQ_SDPV2;
         else
diff --git a/arch/arm/mach-omap2/board-am3517crane.c b/arch/arm/mach-omap2/board-am3517crane.c
index fc53911d0d13..0d499a1878f6 100644
--- a/arch/arm/mach-omap2/board-am3517crane.c
+++ b/arch/arm/mach-omap2/board-am3517crane.c
@@ -110,8 +110,6 @@ static void __init am3517_crane_i2c_init(void)
 
 static void __init am3517_crane_init(void)
 {
-        int ret;
-
         omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
         omap_serial_init();
         omap_sdrc_init(NULL, NULL);
diff --git a/arch/arm/mach-omap2/board-am3517evm.c b/arch/arm/mach-omap2/board-am3517evm.c
index d63f14b534b5..543d9a882de3 100644
--- a/arch/arm/mach-omap2/board-am3517evm.c
+++ b/arch/arm/mach-omap2/board-am3517evm.c
@@ -21,7 +21,7 @@
 #include <linux/clk.h>
 #include <linux/platform_device.h>
 #include <linux/gpio.h>
-#include <linux/i2c/pca953x.h>
+#include <linux/platform_data/pca953x.h>
 #include <linux/can/platform/ti_hecc.h>
 #include <linux/davinci_emac.h>
 #include <linux/mmc/host.h>
@@ -120,56 +120,95 @@ static int __init am3517_evm_i2c_init(void)
         return 0;
 }
 
-static struct panel_generic_dpi_data lcd_panel = {
-        .name                   = "sharp_lq",
-        .num_gpios              = 3,
-        .gpios                  = {
-                LCD_PANEL_PWR,
-                LCD_PANEL_BKLIGHT_PWR,
-                LCD_PANEL_PWM,
-        },
+static const struct display_timing am3517_evm_lcd_videomode = {
+        .pixelclock     = { 0, 9000000, 0 },
+
+        .hactive = { 0, 480, 0 },
+        .hfront_porch = { 0, 3, 0 },
+        .hback_porch = { 0, 2, 0 },
+        .hsync_len = { 0, 42, 0 },
+
+        .vactive = { 0, 272, 0 },
+        .vfront_porch = { 0, 3, 0 },
+        .vback_porch = { 0, 2, 0 },
+        .vsync_len = { 0, 11, 0 },
+
+        .flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
+                DISPLAY_FLAGS_DE_LOW | DISPLAY_FLAGS_PIXDATA_POSEDGE,
+};
+
+static struct panel_dpi_platform_data am3517_evm_lcd_pdata = {
+        .name                   = "lcd",
+        .source                 = "dpi.0",
+
+        .data_lines             = 16,
+
+        .display_timing         = &am3517_evm_lcd_videomode,
+
+        .enable_gpio            = LCD_PANEL_PWR,
+        .backlight_gpio         = LCD_PANEL_BKLIGHT_PWR,
+};
+
+static struct platform_device am3517_evm_lcd_device = {
+        .name                   = "panel-dpi",
+        .id                     = 0,
+        .dev.platform_data      = &am3517_evm_lcd_pdata,
 };
 
-static struct omap_dss_device am3517_evm_lcd_device = {
-        .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .name                   = "lcd",
-        .driver_name            = "generic_dpi_panel",
-        .data                   = &lcd_panel,
-        .phy.dpi.data_lines     = 16,
+static struct connector_dvi_platform_data am3517_evm_dvi_connector_pdata = {
+        .name                   = "dvi",
+        .source                 = "tfp410.0",
+        .i2c_bus_num            = -1,
 };
 
-static struct omap_dss_device am3517_evm_tv_device = {
-        .type                   = OMAP_DISPLAY_TYPE_VENC,
-        .name                   = "tv",
-        .driver_name            = "venc",
-        .phy.venc.type          = OMAP_DSS_VENC_TYPE_SVIDEO,
+static struct platform_device am3517_evm_dvi_connector_device = {
+        .name                   = "connector-dvi",
+        .id                     = 0,
+        .dev.platform_data      = &am3517_evm_dvi_connector_pdata,
 };
 
-static struct tfp410_platform_data dvi_panel = {
-        .power_down_gpio        = -1,
-        .i2c_bus_num            = -1,
+static struct encoder_tfp410_platform_data am3517_evm_tfp410_pdata = {
+        .name                   = "tfp410.0",
+        .source                 = "dpi.0",
+        .data_lines             = 24,
+        .power_down_gpio        = -1,
 };
 
-static struct omap_dss_device am3517_evm_dvi_device = {
-        .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .name                   = "dvi",
-        .driver_name            = "tfp410",
-        .data                   = &dvi_panel,
-        .phy.dpi.data_lines     = 24,
+static struct platform_device am3517_evm_tfp410_device = {
+        .name                   = "tfp410",
+        .id                     = 0,
+        .dev.platform_data      = &am3517_evm_tfp410_pdata,
 };
 
-static struct omap_dss_device *am3517_evm_dss_devices[] = {
-        &am3517_evm_lcd_device,
-        &am3517_evm_tv_device,
-        &am3517_evm_dvi_device,
+static struct connector_atv_platform_data am3517_evm_tv_pdata = {
+        .name = "tv",
+        .source = "venc.0",
+        .connector_type = OMAP_DSS_VENC_TYPE_SVIDEO,
+        .invert_polarity = false,
+};
+
+static struct platform_device am3517_evm_tv_connector_device = {
+        .name                   = "connector-analog-tv",
+        .id                     = 0,
+        .dev.platform_data      = &am3517_evm_tv_pdata,
 };
 
 static struct omap_dss_board_info am3517_evm_dss_data = {
-        .num_devices    = ARRAY_SIZE(am3517_evm_dss_devices),
-        .devices        = am3517_evm_dss_devices,
-        .default_device = &am3517_evm_lcd_device,
+        .default_display_name = "lcd",
 };
 
+static void __init am3517_evm_display_init(void)
+{
+        gpio_request_one(LCD_PANEL_PWM, GPIOF_OUT_INIT_HIGH, "lcd panel pwm");
+
+        omap_display_init(&am3517_evm_dss_data);
+
+        platform_device_register(&am3517_evm_tfp410_device);
+        platform_device_register(&am3517_evm_dvi_connector_device);
+        platform_device_register(&am3517_evm_lcd_device);
+        platform_device_register(&am3517_evm_tv_connector_device);
+}
+
 /*
  * Board initialization
  */
@@ -295,7 +334,9 @@ static void __init am3517_evm_init(void)
         omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
 
         am3517_evm_i2c_init();
-        omap_display_init(&am3517_evm_dss_data);
+
+        am3517_evm_display_init();
+
         omap_serial_init();
         omap_sdrc_init(NULL, NULL);
 
diff --git a/arch/arm/mach-omap2/board-cm-t35.c b/arch/arm/mach-omap2/board-cm-t35.c
index d4622ed26252..33d159e2386e 100644
--- a/arch/arm/mach-omap2/board-cm-t35.c
+++ b/arch/arm/mach-omap2/board-cm-t35.c
@@ -190,52 +190,81 @@ static inline void cm_t35_init_nand(void) {}
 #define CM_T35_LCD_BL_GPIO 58
 #define CM_T35_DVI_EN_GPIO 54
 
-static struct panel_generic_dpi_data lcd_panel = {
-        .name                   = "toppoly_tdo35s",
-        .num_gpios              = 1,
-        .gpios                  = {
-                CM_T35_LCD_BL_GPIO,
-        },
+static const struct display_timing cm_t35_lcd_videomode = {
+        .pixelclock     = { 0, 26000000, 0 },
+
+        .hactive = { 0, 480, 0 },
+        .hfront_porch = { 0, 104, 0 },
+        .hback_porch = { 0, 8, 0 },
+        .hsync_len = { 0, 8, 0 },
+
+        .vactive = { 0, 640, 0 },
+        .vfront_porch = { 0, 4, 0 },
+        .vback_porch = { 0, 2, 0 },
+        .vsync_len = { 0, 2, 0 },
+
+        .flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
+                DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_PIXDATA_NEGEDGE,
+};
+
+static struct panel_dpi_platform_data cm_t35_lcd_pdata = {
+        .name                   = "lcd",
+        .source                 = "dpi.0",
+
+        .data_lines             = 18,
+
+        .display_timing         = &cm_t35_lcd_videomode,
+
+        .enable_gpio            = -1,
+        .backlight_gpio         = CM_T35_LCD_BL_GPIO,
+};
+
+static struct platform_device cm_t35_lcd_device = {
+        .name                   = "panel-dpi",
+        .id                     = 0,
+        .dev.platform_data      = &cm_t35_lcd_pdata,
 };
 
-static struct omap_dss_device cm_t35_lcd_device = {
-        .name                   = "lcd",
-        .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .driver_name            = "generic_dpi_panel",
-        .data                   = &lcd_panel,
-        .phy.dpi.data_lines     = 18,
+static struct connector_dvi_platform_data cm_t35_dvi_connector_pdata = {
+        .name                   = "dvi",
+        .source                 = "tfp410.0",
+        .i2c_bus_num            = -1,
 };
 
-static struct tfp410_platform_data dvi_panel = {
-        .power_down_gpio        = CM_T35_DVI_EN_GPIO,
-        .i2c_bus_num            = -1,
+static struct platform_device cm_t35_dvi_connector_device = {
+        .name                   = "connector-dvi",
+        .id                     = 0,
+        .dev.platform_data      = &cm_t35_dvi_connector_pdata,
 };
 
-static struct omap_dss_device cm_t35_dvi_device = {
-        .name                   = "dvi",
-        .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .driver_name            = "tfp410",
-        .data                   = &dvi_panel,
-        .phy.dpi.data_lines     = 24,
+static struct encoder_tfp410_platform_data cm_t35_tfp410_pdata = {
+        .name                   = "tfp410.0",
+        .source                 = "dpi.0",
+        .data_lines             = 24,
+        .power_down_gpio        = CM_T35_DVI_EN_GPIO,
 };
 
-static struct omap_dss_device cm_t35_tv_device = {
-        .name                   = "tv",
-        .driver_name            = "venc",
-        .type                   = OMAP_DISPLAY_TYPE_VENC,
-        .phy.venc.type          = OMAP_DSS_VENC_TYPE_SVIDEO,
+static struct platform_device cm_t35_tfp410_device = {
+        .name                   = "tfp410",
+        .id                     = 0,
+        .dev.platform_data      = &cm_t35_tfp410_pdata,
 };
 
-static struct omap_dss_device *cm_t35_dss_devices[] = {
-        &cm_t35_lcd_device,
-        &cm_t35_dvi_device,
-        &cm_t35_tv_device,
+static struct connector_atv_platform_data cm_t35_tv_pdata = {
+        .name = "tv",
+        .source = "venc.0",
+        .connector_type = OMAP_DSS_VENC_TYPE_SVIDEO,
+        .invert_polarity = false,
+};
+
+static struct platform_device cm_t35_tv_connector_device = {
+        .name                   = "connector-analog-tv",
+        .id                     = 0,
+        .dev.platform_data      = &cm_t35_tv_pdata,
 };
 
 static struct omap_dss_board_info cm_t35_dss_data = {
-        .num_devices    = ARRAY_SIZE(cm_t35_dss_devices),
-        .devices        = cm_t35_dss_devices,
-        .default_device = &cm_t35_dvi_device,
+        .default_display_name = "dvi",
 };
 
 static struct omap2_mcspi_device_config tdo24m_mcspi_config = {
@@ -280,6 +309,11 @@ static void __init cm_t35_init_display(void)
                 pr_err("CM-T35: failed to register DSS device\n");
                 gpio_free(CM_T35_LCD_EN_GPIO);
         }
+
+        platform_device_register(&cm_t35_tfp410_device);
+        platform_device_register(&cm_t35_dvi_connector_device);
+        platform_device_register(&cm_t35_lcd_device);
+        platform_device_register(&cm_t35_tv_connector_device);
 }
 
 static struct regulator_consumer_supply cm_t35_vmmc1_supply[] = {
diff --git a/arch/arm/mach-omap2/board-devkit8000.c b/arch/arm/mach-omap2/board-devkit8000.c
index f1d91ba5d1ac..cdc4fb9960a9 100644
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
@@ -112,50 +112,81 @@ static struct regulator_consumer_supply devkit8000_vio_supply[] = {
         REGULATOR_SUPPLY("vcc", "spi2.0"),
 };
 
-static struct panel_generic_dpi_data lcd_panel = {
-        .name                   = "innolux_at070tn83",
-        /* gpios filled in code */
+static const struct display_timing devkit8000_lcd_videomode = {
+        .pixelclock     = { 0, 40000000, 0 },
+
+        .hactive = { 0, 800, 0 },
+        .hfront_porch = { 0, 1, 0 },
+        .hback_porch = { 0, 1, 0 },
+        .hsync_len = { 0, 48, 0 },
+
+        .vactive = { 0, 480, 0 },
+        .vfront_porch = { 0, 12, 0 },
+        .vback_porch = { 0, 25, 0 },
+        .vsync_len = { 0, 3, 0 },
+
+        .flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
+                DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_PIXDATA_POSEDGE,
 };
 
-static struct omap_dss_device devkit8000_lcd_device = {
+static struct panel_dpi_platform_data devkit8000_lcd_pdata = {
         .name                   = "lcd",
-        .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .driver_name            = "generic_dpi_panel",
-        .data                   = &lcd_panel,
-        .phy.dpi.data_lines     = 24,
+        .source                 = "dpi.0",
+
+        .data_lines             = 24,
+
+        .display_timing         = &devkit8000_lcd_videomode,
+
+        .enable_gpio            = -1,   /* filled in code */
+        .backlight_gpio         = -1,
 };
 
-static struct tfp410_platform_data dvi_panel = {
-        .power_down_gpio        = -1,
-        .i2c_bus_num            = 1,
+static struct platform_device devkit8000_lcd_device = {
+        .name                   = "panel-dpi",
+        .id                     = 0,
+        .dev.platform_data      = &devkit8000_lcd_pdata,
 };
 
-static struct omap_dss_device devkit8000_dvi_device = {
+static struct connector_dvi_platform_data devkit8000_dvi_connector_pdata = {
         .name                   = "dvi",
-        .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .driver_name            = "tfp410",
-        .data                   = &dvi_panel,
-        .phy.dpi.data_lines     = 24,
+        .source                 = "tfp410.0",
+        .i2c_bus_num            = 1,
 };
 
-static struct omap_dss_device devkit8000_tv_device = {
-        .name                   = "tv",
-        .driver_name            = "venc",
-        .type                   = OMAP_DISPLAY_TYPE_VENC,
-        .phy.venc.type          = OMAP_DSS_VENC_TYPE_SVIDEO,
+static struct platform_device devkit8000_dvi_connector_device = {
+        .name                   = "connector-dvi",
+        .id                     = 0,
+        .dev.platform_data      = &devkit8000_dvi_connector_pdata,
 };
 
+static struct encoder_tfp410_platform_data devkit8000_tfp410_pdata = {
+        .name                   = "tfp410.0",
+        .source                 = "dpi.0",
+        .data_lines             = 24,
+        .power_down_gpio        = -1,   /* filled in code */
+};
 
-static struct omap_dss_device *devkit8000_dss_devices[] = {
-        &devkit8000_lcd_device,
-        &devkit8000_dvi_device,
-        &devkit8000_tv_device,
+static struct platform_device devkit8000_tfp410_device = {
+        .name                   = "tfp410",
+        .id                     = 0,
+        .dev.platform_data      = &devkit8000_tfp410_pdata,
+};
+
+static struct connector_atv_platform_data devkit8000_tv_pdata = {
+        .name = "tv",
+        .source = "venc.0",
+        .connector_type = OMAP_DSS_VENC_TYPE_SVIDEO,
+        .invert_polarity = false,
+};
+
+static struct platform_device devkit8000_tv_connector_device = {
+        .name                   = "connector-analog-tv",
+        .id                     = 0,
+        .dev.platform_data      = &devkit8000_tv_pdata,
 };
 
 static struct omap_dss_board_info devkit8000_dss_data = {
-        .num_devices = ARRAY_SIZE(devkit8000_dss_devices),
-        .devices = devkit8000_dss_devices,
-        .default_device = &devkit8000_lcd_device,
+        .default_display_name = "lcd",
 };
 
 static uint32_t board_keymap[] = {
@@ -204,11 +235,10 @@ static int devkit8000_twl_gpio_setup(struct device *dev,
         gpio_leds[2].gpio = gpio + TWL4030_GPIO_MAX + 1;
 
         /* TWL4030_GPIO_MAX + 0 is "LCD_PWREN" (out, active high) */
-        lcd_panel.num_gpios = 1;
-        lcd_panel.gpios[0] = gpio + TWL4030_GPIO_MAX + 0;
+        devkit8000_lcd_pdata.enable_gpio = gpio + TWL4030_GPIO_MAX + 0;
 
         /* gpio + 7 is "DVI_PD" (out, active low) */
-        dvi_panel.power_down_gpio = gpio + 7;
+        devkit8000_tfp410_pdata.power_down_gpio = gpio + 7;
 
         return 0;
 }
@@ -413,6 +443,10 @@ static struct platform_device *devkit8000_devices[] __initdata = {
         &leds_gpio,
         &keys_gpio,
         &omap_dm9000_dev,
+        &devkit8000_lcd_device,
+        &devkit8000_tfp410_device,
+        &devkit8000_dvi_connector_device,
+        &devkit8000_tv_connector_device,
 };
 
 static struct usbhs_omap_platform_data usbhs_bdata __initdata = {
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index be5d005ebad2..39c78387ddec 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -222,3 +222,22 @@ DT_MACHINE_START(AM43_DT, "Generic AM43 (Flattened Device Tree)")
         .dt_compat      = am43_boards_compat,
 MACHINE_END
 #endif
+
+#ifdef CONFIG_SOC_DRA7XX
+static const char *dra7xx_boards_compat[] __initdata = {
+        "ti,dra7",
+        NULL,
+};
+
+DT_MACHINE_START(DRA7XX_DT, "Generic DRA7XX (Flattened Device Tree)")
+        .reserve        = omap_reserve,
+        .smp            = smp_ops(omap4_smp_ops),
+        .map_io         = omap5_map_io,
+        .init_early     = dra7xx_init_early,
+        .init_irq       = omap_gic_of_init,
+        .init_machine   = omap_generic_init,
+        .init_time      = omap5_realtime_timer_init,
+        .dt_compat      = dra7xx_boards_compat,
+        .restart        = omap44xx_restart,
+MACHINE_END
+#endif
diff --git a/arch/arm/mach-omap2/board-h4.c b/arch/arm/mach-omap2/board-h4.c
index 69c0acf5aa63..87e41a8b8d46 100644
--- a/arch/arm/mach-omap2/board-h4.c
+++ b/arch/arm/mach-omap2/board-h4.c
@@ -194,30 +194,48 @@ static struct platform_device h4_flash_device = {
         .resource       = &h4_flash_resource,
 };
 
-static struct platform_device *h4_devices[] __initdata = {
-        &h4_flash_device,
+static const struct display_timing cm_t35_lcd_videomode = {
+        .pixelclock     = { 0, 6250000, 0 },
+
+        .hactive = { 0, 240, 0 },
+        .hfront_porch = { 0, 15, 0 },
+        .hback_porch = { 0, 60, 0 },
+        .hsync_len = { 0, 15, 0 },
+
+        .vactive = { 0, 320, 0 },
+        .vfront_porch = { 0, 1, 0 },
+        .vback_porch = { 0, 1, 0 },
+        .vsync_len = { 0, 1, 0 },
+
+        .flags = DISPLAY_FLAGS_HSYNC_HIGH | DISPLAY_FLAGS_VSYNC_HIGH |
+                DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_PIXDATA_POSEDGE,
 };
 
-static struct panel_generic_dpi_data h4_panel_data = {
-        .name                   = "h4",
+static struct panel_dpi_platform_data cm_t35_lcd_pdata = {
+        .name                   = "lcd",
+        .source                 = "dpi.0",
+
+        .data_lines             = 16,
+
+        .display_timing         = &cm_t35_lcd_videomode,
+
+        .enable_gpio            = -1,
+        .backlight_gpio         = -1,
 };
 
-static struct omap_dss_device h4_lcd_device = {
-        .name                   = "lcd",
-        .driver_name            = "generic_dpi_panel",
-        .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .phy.dpi.data_lines     = 16,
-        .data                   = &h4_panel_data,
+static struct platform_device cm_t35_lcd_device = {
+        .name                   = "panel-dpi",
+        .id                     = 0,
+        .dev.platform_data      = &cm_t35_lcd_pdata,
 };
 
-static struct omap_dss_device *h4_dss_devices[] = {
-        &h4_lcd_device,
+static struct platform_device *h4_devices[] __initdata = {
+        &h4_flash_device,
+        &cm_t35_lcd_device,
 };
 
 static struct omap_dss_board_info h4_dss_data = {
-        .num_devices    = ARRAY_SIZE(h4_dss_devices),
-        .devices        = h4_dss_devices,
-        .default_device = &h4_lcd_device,
+        .default_display_name = "lcd",
 };
 
 /* 2420 Sysboot setup (2430 is different) */
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index 87e65dde8e13..06dbb2d3d38b 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -429,31 +429,39 @@ static struct twl4030_gpio_platform_data igep_twl4030_gpio_pdata = {
         .setup          = igep_twl_gpio_setup,
 };
 
-static struct tfp410_platform_data dvi_panel = {
-        .i2c_bus_num            = 3,
-        .power_down_gpio        = IGEP2_GPIO_DVI_PUP,
+static struct connector_dvi_platform_data omap3stalker_dvi_connector_pdata = {
+        .name                   = "dvi",
+        .source                 = "tfp410.0",
+        .i2c_bus_num            = 3,
 };
 
-static struct omap_dss_device igep2_dvi_device = {
-        .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .name                   = "dvi",
-        .driver_name            = "tfp410",
-        .data                   = &dvi_panel,
-        .phy.dpi.data_lines     = 24,
+static struct platform_device omap3stalker_dvi_connector_device = {
+        .name                   = "connector-dvi",
+        .id                     = 0,
+        .dev.platform_data      = &omap3stalker_dvi_connector_pdata,
 };
 
-static struct omap_dss_device *igep2_dss_devices[] = {
-        &igep2_dvi_device
+static struct encoder_tfp410_platform_data omap3stalker_tfp410_pdata = {
+        .name                   = "tfp410.0",
+        .source                 = "dpi.0",
+        .data_lines             = 24,
+        .power_down_gpio        = IGEP2_GPIO_DVI_PUP,
+};
+
+static struct platform_device omap3stalker_tfp410_device = {
+        .name                   = "tfp410",
+        .id                     = 0,
+        .dev.platform_data      = &omap3stalker_tfp410_pdata,
 };
 
 static struct omap_dss_board_info igep2_dss_data = {
-        .num_devices    = ARRAY_SIZE(igep2_dss_devices),
-        .devices        = igep2_dss_devices,
-        .default_device = &igep2_dvi_device,
+        .default_display_name = "dvi",
 };
 
 static struct platform_device *igep_devices[] __initdata = {
         &igep_vwlan_device,
+        &omap3stalker_tfp410_device,
+        &omap3stalker_dvi_connector_device,
 };
 
 static int igep2_keymap[] = {
diff --git a/arch/arm/mach-omap2/board-ldp.c b/arch/arm/mach-omap2/board-ldp.c
index 62e4f701b63b..dd8da2c5399f 100644
--- a/arch/arm/mach-omap2/board-ldp.c
+++ b/arch/arm/mach-omap2/board-ldp.c
@@ -184,45 +184,70 @@ static inline void __init ldp_init_smsc911x(void)
 #define LCD_PANEL_RESET_GPIO            55
 #define LCD_PANEL_QVGA_GPIO             56
 
-static struct panel_generic_dpi_data ldp_panel_data = {
-        .name                   = "nec_nl2432dr22-11b",
-        .num_gpios              = 4,
-        /* gpios filled in code */
+static const struct display_timing ldp_lcd_videomode = {
+        .pixelclock     = { 0, 5400000, 0 },
+
+        .hactive = { 0, 240, 0 },
+        .hfront_porch = { 0, 3, 0 },
+        .hback_porch = { 0, 39, 0 },
+        .hsync_len = { 0, 3, 0 },
+
+        .vactive = { 0, 320, 0 },
+        .vfront_porch = { 0, 2, 0 },
+        .vback_porch = { 0, 7, 0 },
+        .vsync_len = { 0, 1, 0 },
+
+        .flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
+                DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_PIXDATA_POSEDGE,
 };
 
-static struct omap_dss_device ldp_lcd_device = {
-        .name                   = "lcd",
-        .driver_name            = "generic_dpi_panel",
-        .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .phy.dpi.data_lines     = 18,
-        .data                   = &ldp_panel_data,
+static struct panel_dpi_platform_data ldp_lcd_pdata = {
+        .name                   = "lcd",
+        .source                 = "dpi.0",
+
+        .data_lines             = 18,
+
+        .display_timing         = &ldp_lcd_videomode,
+
+        .enable_gpio            = -1,   /* filled in code */
+        .backlight_gpio         = -1,   /* filled in code */
 };
 
-static struct omap_dss_device *ldp_dss_devices[] = {
-        &ldp_lcd_device,
+static struct platform_device ldp_lcd_device = {
+        .name                   = "panel-dpi",
+        .id                     = 0,
+        .dev.platform_data      = &ldp_lcd_pdata,
 };
 
 static struct omap_dss_board_info ldp_dss_data = {
-        .num_devices    = ARRAY_SIZE(ldp_dss_devices),
-        .devices        = ldp_dss_devices,
-        .default_device = &ldp_lcd_device,
+        .default_display_name = "lcd",
 };
 
 static void __init ldp_display_init(void)
 {
-        ldp_panel_data.gpios[2] = LCD_PANEL_RESET_GPIO;
-        ldp_panel_data.gpios[3] = LCD_PANEL_QVGA_GPIO;
+        int r;
+
+        static struct gpio gpios[] __initdata = {
+                {LCD_PANEL_RESET_GPIO, GPIOF_OUT_INIT_HIGH, "LCD RESET"},
+                {LCD_PANEL_QVGA_GPIO, GPIOF_OUT_INIT_HIGH, "LCD QVGA"},
+        };
+
+        r = gpio_request_array(gpios, ARRAY_SIZE(gpios));
+        if (r) {
+                pr_err("Cannot request LCD GPIOs, error %d\n", r);
+                return;
+        }
 
         omap_display_init(&ldp_dss_data);
 }
 
 static int ldp_twl_gpio_setup(struct device *dev, unsigned gpio, unsigned ngpio)
 {
-        ldp_panel_data.gpios[0] = gpio + 7;
-        ldp_panel_data.gpio_invert[0] = true;
+        /* LCD enable GPIO */
+        ldp_lcd_pdata.enable_gpio = gpio + 7;
 
-        ldp_panel_data.gpios[1] = gpio + 15;
-        ldp_panel_data.gpio_invert[1] = true;
+        /* Backlight enable GPIO */
+        ldp_lcd_pdata.backlight_gpio = gpio + 15;
 
         return 0;
 }
@@ -322,6 +347,7 @@ static struct omap2_hsmmc_info mmc[] __initdata = {
 
 static struct platform_device *ldp_devices[] __initdata = {
         &ldp_gpio_keys_device,
+        &ldp_lcd_device,
 };
 
 #ifdef CONFIG_OMAP_MUX
diff --git a/arch/arm/mach-omap2/board-omap3beagle.c b/arch/arm/mach-omap2/board-omap3beagle.c
index 04c116555412..f26918467efc 100644
--- a/arch/arm/mach-omap2/board-omap3beagle.c
+++ b/arch/arm/mach-omap2/board-omap3beagle.c
@@ -33,7 +33,7 @@
 #include <linux/mtd/nand.h>
 #include <linux/mmc/host.h>
 #include <linux/usb/phy.h>
-#include <linux/usb/nop-usb-xceiv.h>
+#include <linux/usb/usb_phy_gen_xceiv.h>
 
 #include <linux/regulator/machine.h>
 #include <linux/i2c/twl.h>
@@ -225,35 +225,46 @@ static struct mtd_partition omap3beagle_nand_partitions[] = {
 
 /* DSS */
 
-static struct tfp410_platform_data dvi_panel = {
-        .i2c_bus_num = 3,
-        .power_down_gpio = -1,
+static struct connector_dvi_platform_data beagle_dvi_connector_pdata = {
+        .name                   = "dvi",
+        .source                 = "tfp410.0",
+        .i2c_bus_num            = 3,
 };
 
-static struct omap_dss_device beagle_dvi_device = {
-        .type = OMAP_DISPLAY_TYPE_DPI,
-        .name = "dvi",
-        .driver_name = "tfp410",
-        .data = &dvi_panel,
-        .phy.dpi.data_lines = 24,
+static struct platform_device beagle_dvi_connector_device = {
+        .name                   = "connector-dvi",
+        .id                     = 0,
+        .dev.platform_data      = &beagle_dvi_connector_pdata,
 };
 
-static struct omap_dss_device beagle_tv_device = {
+static struct encoder_tfp410_platform_data beagle_tfp410_pdata = {
+        .name                   = "tfp410.0",
+        .source                 = "dpi.0",
+        .data_lines             = 24,
+        .power_down_gpio        = -1,
+};
+
+static struct platform_device beagle_tfp410_device = {
+        .name                   = "tfp410",
+        .id                     = 0,
+        .dev.platform_data      = &beagle_tfp410_pdata,
+};
+
+static struct connector_atv_platform_data beagle_tv_pdata = {
         .name = "tv",
-        .driver_name = "venc",
-        .type = OMAP_DISPLAY_TYPE_VENC,
-        .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
+        .source = "venc.0",
+        .connector_type = OMAP_DSS_VENC_TYPE_SVIDEO,
+        .invert_polarity = false,
 };
 
-static struct omap_dss_device *beagle_dss_devices[] = {
-        &beagle_dvi_device,
-        &beagle_tv_device,
+static struct platform_device beagle_tv_connector_device = {
+        .name                   = "connector-analog-tv",
+        .id                     = 0,
+        .dev.platform_data      = &beagle_tv_pdata,
 };
 
 static struct omap_dss_board_info beagle_dss_data = {
-        .num_devices = ARRAY_SIZE(beagle_dss_devices),
-        .devices = beagle_dss_devices,
-        .default_device = &beagle_dvi_device,
+        .default_display_name = "dvi",
 };
 
 #include "sdram-micron-mt46h32m32lf-6.h"
@@ -279,7 +290,7 @@ static struct regulator_consumer_supply beagle_vsim_supply[] = {
 static struct gpio_led gpio_leds[];
 
 /* PHY's VCC regulator might be added later, so flag that we need it */
-static struct nop_usb_xceiv_platform_data hsusb2_phy_data = {
+static struct usb_phy_gen_xceiv_platform_data hsusb2_phy_data = {
         .needs_vcc = true,
 };
 
@@ -332,7 +343,11 @@ static int beagle_twl_gpio_setup(struct device *dev,
                 if (gpio_request_one(gpio + 1, GPIOF_IN, "EHCI_nOC"))
                         pr_err("%s: unable to configure EHCI_nOC\n", __func__);
         }
-        dvi_panel.power_down_gpio = beagle_config.dvi_pd_gpio;
+        beagle_tfp410_pdata.power_down_gpio = beagle_config.dvi_pd_gpio;
+
+        platform_device_register(&beagle_tfp410_device);
+        platform_device_register(&beagle_dvi_connector_device);
+        platform_device_register(&beagle_tv_connector_device);
 
         /* TWL4030_GPIO_MAX i.e. LED_GPO controls HS USB Port 2 power */
         phy_data[0].vcc_gpio = gpio + TWL4030_GPIO_MAX;
@@ -547,6 +562,7 @@ static void __init omap3_beagle_init(void)
         if (gpio_is_valid(beagle_config.dvi_pd_gpio))
                 omap_mux_init_gpio(beagle_config.dvi_pd_gpio, OMAP_PIN_OUTPUT);
         omap_display_init(&beagle_dss_data);
+
         omap_serial_init();
         omap_sdrc_init(mt46h32m32lf6_sdrc_params,
                                   mt46h32m32lf6_sdrc_params);
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 8c026269baca..18143873346c 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -33,7 +33,7 @@
 #include <linux/i2c/twl.h>
 #include <linux/usb/otg.h>
 #include <linux/usb/musb.h>
-#include <linux/usb/nop-usb-xceiv.h>
+#include <linux/usb/usb_phy_gen_xceiv.h>
 #include <linux/smsc911x.h>
 
 #include <linux/wl12xx.h>
@@ -166,14 +166,6 @@ static inline void __init omap3evm_init_smsc911x(void) { return; }
  */
 #define OMAP3EVM_DVI_PANEL_EN_GPIO      199
 
-static struct panel_sharp_ls037v7dw01_data omap3_evm_lcd_data = {
-        .resb_gpio = OMAP3EVM_LCD_PANEL_RESB,
-        .ini_gpio = OMAP3EVM_LCD_PANEL_INI,
-        .mo_gpio = OMAP3EVM_LCD_PANEL_QVGA,
-        .lr_gpio = OMAP3EVM_LCD_PANEL_LR,
-        .ud_gpio = OMAP3EVM_LCD_PANEL_UD,
-};
-
 #ifdef CONFIG_BROKEN
 static void __init omap3_evm_display_init(void)
 {
@@ -196,44 +188,65 @@ static void __init omap3_evm_display_init(void)
 }
 #endif
 
-static struct omap_dss_device omap3_evm_lcd_device = {
-        .name                   = "lcd",
-        .driver_name            = "sharp_ls_panel",
-        .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .phy.dpi.data_lines     = 18,
-        .data                   = &omap3_evm_lcd_data,
+static struct panel_sharp_ls037v7dw01_platform_data omap3_evm_lcd_pdata = {
+        .name                   = "lcd",
+        .source                 = "dpi.0",
+
+        .data_lines             = 18,
+
+        .resb_gpio              = OMAP3EVM_LCD_PANEL_RESB,
+        .ini_gpio               = OMAP3EVM_LCD_PANEL_INI,
+        .mo_gpio                = OMAP3EVM_LCD_PANEL_QVGA,
+        .lr_gpio                = OMAP3EVM_LCD_PANEL_LR,
+        .ud_gpio                = OMAP3EVM_LCD_PANEL_UD,
+};
+
+static struct platform_device omap3_evm_lcd_device = {
+        .name                   = "panel-sharp-ls037v7dw01",
+        .id                     = 0,
+        .dev.platform_data      = &omap3_evm_lcd_pdata,
+};
+
+static struct connector_dvi_platform_data omap3_evm_dvi_connector_pdata = {
+        .name                   = "dvi",
+        .source                 = "tfp410.0",
+        .i2c_bus_num            = -1,
+};
+
+static struct platform_device omap3_evm_dvi_connector_device = {
+        .name                   = "connector-dvi",
+        .id                     = 0,
+        .dev.platform_data      = &omap3_evm_dvi_connector_pdata,
 };
 
-static struct omap_dss_device omap3_evm_tv_device = {
-        .name                   = "tv",
-        .driver_name            = "venc",
-        .type                   = OMAP_DISPLAY_TYPE_VENC,
-        .phy.venc.type          = OMAP_DSS_VENC_TYPE_SVIDEO,
+static struct encoder_tfp410_platform_data omap3_evm_tfp410_pdata = {
+        .name                   = "tfp410.0",
+        .source                 = "dpi.0",
+        .data_lines             = 24,
+        .power_down_gpio        = OMAP3EVM_DVI_PANEL_EN_GPIO,
 };
 
-static struct tfp410_platform_data dvi_panel = {
-        .power_down_gpio        = OMAP3EVM_DVI_PANEL_EN_GPIO,
-        .i2c_bus_num            = -1,
+static struct platform_device omap3_evm_tfp410_device = {
+        .name                   = "tfp410",
+        .id                     = 0,
+        .dev.platform_data      = &omap3_evm_tfp410_pdata,
 };
 
-static struct omap_dss_device omap3_evm_dvi_device = {
-        .name                   = "dvi",
-        .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .driver_name            = "tfp410",
-        .data                   = &dvi_panel,
-        .phy.dpi.data_lines     = 24,
+static struct connector_atv_platform_data omap3_evm_tv_pdata = {
+        .name = "tv",
+        .source = "venc.0",
+        .connector_type = OMAP_DSS_VENC_TYPE_SVIDEO,
+        .invert_polarity = false,
 };
 
-static struct omap_dss_device *omap3_evm_dss_devices[] = {
-        &omap3_evm_lcd_device,
-        &omap3_evm_tv_device,
-        &omap3_evm_dvi_device,
+static struct platform_device omap3_evm_tv_connector_device = {
+        .name                   = "connector-analog-tv",
+        .id                     = 0,
+        .dev.platform_data      = &omap3_evm_tv_pdata,
 };
 
 static struct omap_dss_board_info omap3_evm_dss_data = {
-        .num_devices    = ARRAY_SIZE(omap3_evm_dss_devices),
-        .devices        = omap3_evm_dss_devices,
-        .default_device = &omap3_evm_lcd_device,
+        .default_display_name = "lcd",
 };
 
 static struct regulator_consumer_supply omap3evm_vmmc1_supply[] = {
@@ -468,7 +481,7 @@ struct wl12xx_platform_data omap3evm_wlan_data __initdata = {
 static struct regulator_consumer_supply omap3evm_vaux2_supplies[] = {
         REGULATOR_SUPPLY("VDD_CSIPHY1", "omap3isp"),    /* OMAP ISP */
         REGULATOR_SUPPLY("VDD_CSIPHY2", "omap3isp"),    /* OMAP ISP */
-        REGULATOR_SUPPLY("vcc", "nop_usb_xceiv.2"),     /* hsusb port 2 */
+        REGULATOR_SUPPLY("vcc", "usb_phy_gen_xceiv.2"), /* hsusb port 2 */
         REGULATOR_SUPPLY("vaux2", NULL),
 };
 
@@ -678,6 +691,10 @@ static void __init omap3_evm_init(void)
         omap3_evm_i2c_init();
 
         omap_display_init(&omap3_evm_dss_data);
+        platform_device_register(&omap3_evm_lcd_device);
+        platform_device_register(&omap3_evm_tfp410_device);
+        platform_device_register(&omap3_evm_dvi_connector_device);
+        platform_device_register(&omap3_evm_tv_connector_device);
 
         omap_serial_init();
         omap_sdrc_init(mt46h32m32lf6_sdrc_params, NULL);
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c
index b1547a0edfcd..de1bc6bbe585 100644
--- a/arch/arm/mach-omap2/board-omap3pandora.c
+++ b/arch/arm/mach-omap2/board-omap3pandora.c
@@ -231,34 +231,21 @@ static struct twl4030_keypad_data pandora_kp_data = {
         .rep            = 1,
 };
 
-static struct panel_tpo_td043_data lcd_data = {
-        .nreset_gpio            = 157,
-};
-
-static struct omap_dss_device pandora_lcd_device = {
-        .name                   = "lcd",
-        .driver_name            = "tpo_td043mtea1_panel",
-        .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .phy.dpi.data_lines     = 24,
-        .data                   = &lcd_data,
-};
-
-static struct omap_dss_device pandora_tv_device = {
-        .name                   = "tv",
-        .driver_name            = "venc",
-        .type                   = OMAP_DISPLAY_TYPE_VENC,
-        .phy.venc.type          = OMAP_DSS_VENC_TYPE_SVIDEO,
+static struct connector_atv_platform_data pandora_tv_pdata = {
+        .name = "tv",
+        .source = "venc.0",
+        .connector_type = OMAP_DSS_VENC_TYPE_SVIDEO,
+        .invert_polarity = false,
 };
 
-static struct omap_dss_device *pandora_dss_devices[] = {
-        &pandora_lcd_device,
-        &pandora_tv_device,
+static struct platform_device pandora_tv_connector_device = {
+        .name                   = "connector-analog-tv",
+        .id                     = 0,
+        .dev.platform_data      = &pandora_tv_pdata,
 };
 
 static struct omap_dss_board_info pandora_dss_data = {
-        .num_devices    = ARRAY_SIZE(pandora_dss_devices),
-        .devices        = pandora_dss_devices,
-        .default_device = &pandora_lcd_device,
+        .default_display_name = "lcd",
 };
 
 static void pandora_wl1251_init_card(struct mmc_card *card)
@@ -348,11 +335,11 @@ static struct regulator_consumer_supply pandora_vdds_supplies[] = {
 };
 
 static struct regulator_consumer_supply pandora_vcc_lcd_supply[] = {
-        REGULATOR_SUPPLY("vcc", "display0"),
+        REGULATOR_SUPPLY("vcc", "spi1.1"),
 };
 
 static struct regulator_consumer_supply pandora_usb_phy_supply[] = {
-        REGULATOR_SUPPLY("vcc", "nop_usb_xceiv.2"),     /* hsusb port 2 */
+        REGULATOR_SUPPLY("vcc", "usb_phy_gen_xceiv.2"), /* hsusb port 2 */
 };
 
 /* ads7846 on SPI and 2 nub controllers on I2C */
@@ -529,13 +516,21 @@ static int __init omap3pandora_i2c_init(void)
         return 0;
 }
 
+static struct panel_tpo_td043mtea1_platform_data pandora_lcd_pdata = {
+        .name                   = "lcd",
+        .source                 = "dpi.0",
+
+        .data_lines             = 24,
+        .nreset_gpio            = 157,
+};
+
 static struct spi_board_info omap3pandora_spi_board_info[] __initdata = {
         {
-                .modalias               = "tpo_td043mtea1_panel_spi",
+                .modalias               = "panel-tpo-td043mtea1",
                 .bus_num                = 1,
                 .chip_select            = 1,
                 .max_speed_hz           = 375000,
-                .platform_data          = &pandora_lcd_device,
+                .platform_data          = &pandora_lcd_pdata,
         }
 };
 
@@ -580,6 +575,7 @@ static struct platform_device *omap3pandora_devices[] __initdata = {
         &pandora_keys_gpio,
         &pandora_vwlan_device,
         &pandora_backlight,
+        &pandora_tv_connector_device,
 };
 
 static struct usbhs_omap_platform_data usbhs_bdata __initdata = {
diff --git a/arch/arm/mach-omap2/board-omap3stalker.c b/arch/arm/mach-omap2/board-omap3stalker.c
index d37e6b187ae4..ba8342fef799 100644
--- a/arch/arm/mach-omap2/board-omap3stalker.c
+++ b/arch/arm/mach-omap2/board-omap3stalker.c
@@ -93,40 +93,50 @@ static void __init omap3_stalker_display_init(void)
 {
         return;
 }
+static struct connector_dvi_platform_data omap3stalker_dvi_connector_pdata = {
+        .name                   = "dvi",
+        .source                 = "tfp410.0",
+        .i2c_bus_num            = -1,
+};
 
-static struct omap_dss_device omap3_stalker_tv_device = {
-        .name                   = "tv",
-        .driver_name            = "venc",
-        .type                   = OMAP_DISPLAY_TYPE_VENC,
-#if defined(CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO)
-        .phy.venc.type          = OMAP_DSS_VENC_TYPE_SVIDEO,
-#elif defined(CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE)
-        .u.venc.type            = OMAP_DSS_VENC_TYPE_COMPOSITE,
-#endif
+static struct platform_device omap3stalker_dvi_connector_device = {
+        .name                   = "connector-dvi",
+        .id                     = 0,
+        .dev.platform_data      = &omap3stalker_dvi_connector_pdata,
 };
 
-static struct tfp410_platform_data dvi_panel = {
-        .power_down_gpio        = DSS_ENABLE_GPIO,
-        .i2c_bus_num            = -1,
+static struct encoder_tfp410_platform_data omap3stalker_tfp410_pdata = {
+        .name                   = "tfp410.0",
+        .source                 = "dpi.0",
+        .data_lines             = 24,
+        .power_down_gpio        = DSS_ENABLE_GPIO,
 };
 
-static struct omap_dss_device omap3_stalker_dvi_device = {
-        .name                   = "dvi",
-        .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .driver_name            = "tfp410",
-        .data                   = &dvi_panel,
-        .phy.dpi.data_lines     = 24,
+static struct platform_device omap3stalker_tfp410_device = {
+        .name                   = "tfp410",
+        .id                     = 0,
+        .dev.platform_data      = &omap3stalker_tfp410_pdata,
+};
+
+static struct connector_atv_platform_data omap3stalker_tv_pdata = {
+        .name = "tv",
+        .source = "venc.0",
+#if defined(CONFIG_OMAP2_VENC_OUT_TYPE_SVIDEO)
+        .connector_type = OMAP_DSS_VENC_TYPE_SVIDEO,
+#elif defined(CONFIG_OMAP2_VENC_OUT_TYPE_COMPOSITE)
+        .connector_type = OMAP_DSS_VENC_TYPE_COMPOSITE,
+#endif
+        .invert_polarity = false,
 };
 
-static struct omap_dss_device *omap3_stalker_dss_devices[] = {
-        &omap3_stalker_tv_device,
-        &omap3_stalker_dvi_device,
+static struct platform_device omap3stalker_tv_connector_device = {
+        .name                   = "connector-analog-tv",
+        .id                     = 0,
+        .dev.platform_data      = &omap3stalker_tv_pdata,
 };
 
 static struct omap_dss_board_info omap3_stalker_dss_data = {
-        .num_devices    = ARRAY_SIZE(omap3_stalker_dss_devices),
-        .devices        = omap3_stalker_dss_devices,
-        .default_device = &omap3_stalker_dvi_device,
+        .default_display_name = "dvi",
 };
 
 static struct regulator_consumer_supply omap3stalker_vmmc1_supply[] = {
@@ -356,6 +366,9 @@ static struct usbhs_phy_data phy_data[] __initdata = {
 
 static struct platform_device *omap3_stalker_devices[] __initdata = {
         &keys_gpio,
+        &omap3stalker_tfp410_device,
+        &omap3stalker_dvi_connector_device,
+        &omap3stalker_tv_connector_device,
 };
 
 static struct usbhs_omap_platform_data usbhs_bdata __initdata = {
diff --git a/arch/arm/mach-omap2/board-overo.c b/arch/arm/mach-omap2/board-overo.c
index 5748b5d06c23..f6d384111911 100644
--- a/arch/arm/mach-omap2/board-overo.c
+++ b/arch/arm/mach-omap2/board-overo.c
@@ -72,6 +72,9 @@
 #define OVERO_SMSC911X2_CS     4
 #define OVERO_SMSC911X2_GPIO   65
 
+/* whether to register LCD35 instead of LCD43 */
+static bool overo_use_lcd35;
+
 #if defined(CONFIG_TOUCHSCREEN_ADS7846) || \
         defined(CONFIG_TOUCHSCREEN_ADS7846_MODULE)
 
@@ -149,78 +152,94 @@ static inline void __init overo_init_smsc911x(void) { return; }
 #define OVERO_GPIO_LCD_EN 144
 #define OVERO_GPIO_LCD_BL 145
 
-static struct tfp410_platform_data dvi_panel = {
-        .i2c_bus_num            = 3,
-        .power_down_gpio        = -1,
+static struct connector_atv_platform_data overo_tv_pdata = {
+        .name = "tv",
+        .source = "venc.0",
+        .connector_type = OMAP_DSS_VENC_TYPE_SVIDEO,
+        .invert_polarity = false,
 };
 
-static struct omap_dss_device overo_dvi_device = {
-        .name                   = "dvi",
-        .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .driver_name            = "tfp410",
-        .data                   = &dvi_panel,
-        .phy.dpi.data_lines     = 24,
+static struct platform_device overo_tv_connector_device = {
+        .name                   = "connector-analog-tv",
+        .id                     = 0,
+        .dev.platform_data      = &overo_tv_pdata,
 };
 
-static struct omap_dss_device overo_tv_device = {
-        .name = "tv",
-        .driver_name = "venc",
-        .type = OMAP_DISPLAY_TYPE_VENC,
-        .phy.venc.type = OMAP_DSS_VENC_TYPE_SVIDEO,
+static const struct display_timing overo_lcd43_videomode = {
+        .pixelclock     = { 0, 9200000, 0 },
+
+        .hactive = { 0, 480, 0 },
+        .hfront_porch = { 0, 8, 0 },
+        .hback_porch = { 0, 4, 0 },
+        .hsync_len = { 0, 41, 0 },
+
+        .vactive = { 0, 272, 0 },
+        .vfront_porch = { 0, 4, 0 },
+        .vback_porch = { 0, 2, 0 },
+        .vsync_len = { 0, 10, 0 },
+
+        .flags = DISPLAY_FLAGS_HSYNC_LOW | DISPLAY_FLAGS_VSYNC_LOW |
+                DISPLAY_FLAGS_DE_HIGH | DISPLAY_FLAGS_PIXDATA_POSEDGE,
 };
 
-static struct panel_generic_dpi_data lcd43_panel = {
-        .name                   = "samsung_lte430wq_f0c",
-        .num_gpios              = 2,
-        .gpios                  = {
-                OVERO_GPIO_LCD_EN,
-                OVERO_GPIO_LCD_BL
-        },
+static struct panel_dpi_platform_data overo_lcd43_pdata = {
+        .name                   = "lcd43",
+        .source                 = "dpi.0",
+
+        .data_lines             = 24,
+
+        .display_timing         = &overo_lcd43_videomode,
+
+        .enable_gpio            = OVERO_GPIO_LCD_EN,
+        .backlight_gpio         = OVERO_GPIO_LCD_BL,
 };
 
-static struct omap_dss_device overo_lcd43_device = {
-        .name                   = "lcd43",
-        .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .driver_name            = "generic_dpi_panel",
-        .data                   = &lcd43_panel,
-        .phy.dpi.data_lines     = 24,
+static struct platform_device overo_lcd43_device = {
+        .name                   = "panel-dpi",
+        .id                     = 0,
+        .dev.platform_data      = &overo_lcd43_pdata,
 };
 
-#if defined(CONFIG_PANEL_LGPHILIPS_LB035Q02) || \
-        defined(CONFIG_PANEL_LGPHILIPS_LB035Q02_MODULE)
-static struct panel_generic_dpi_data lcd35_panel = {
-        .num_gpios              = 2,
-        .gpios                  = {
-                OVERO_GPIO_LCD_EN,
-                OVERO_GPIO_LCD_BL
-        },
+static struct connector_dvi_platform_data overo_dvi_connector_pdata = {
+        .name                   = "dvi",
+        .source                 = "tfp410.0",
+        .i2c_bus_num            = 3,
 };
 
-static struct omap_dss_device overo_lcd35_device = {
-        .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .name                   = "lcd35",
-        .driver_name            = "lgphilips_lb035q02_panel",
-        .phy.dpi.data_lines     = 24,
-        .data                   = &lcd35_panel,
+static struct platform_device overo_dvi_connector_device = {
+        .name                   = "connector-dvi",
+        .id                     = 0,
+        .dev.platform_data      = &overo_dvi_connector_pdata,
 };
-#endif
 
-static struct omap_dss_device *overo_dss_devices[] = {
-        &overo_dvi_device,
-        &overo_tv_device,
-#if defined(CONFIG_PANEL_LGPHILIPS_LB035Q02) || \
-        defined(CONFIG_PANEL_LGPHILIPS_LB035Q02_MODULE)
-        &overo_lcd35_device,
-#endif
-        &overo_lcd43_device,
+static struct encoder_tfp410_platform_data overo_tfp410_pdata = {
+        .name                   = "tfp410.0",
+        .source                 = "dpi.0",
+        .data_lines             = 24,
+        .power_down_gpio        = -1,
+};
+
+static struct platform_device overo_tfp410_device = {
+        .name                   = "tfp410",
+        .id                     = 0,
+        .dev.platform_data      = &overo_tfp410_pdata,
 };
 
 static struct omap_dss_board_info overo_dss_data = {
-        .num_devices    = ARRAY_SIZE(overo_dss_devices),
-        .devices        = overo_dss_devices,
-        .default_device = &overo_dvi_device,
+        .default_display_name = "lcd43",
 };
 
+static void __init overo_display_init(void)
+{
+        omap_display_init(&overo_dss_data);
+
+        if (!overo_use_lcd35)
+                platform_device_register(&overo_lcd43_device);
+        platform_device_register(&overo_tfp410_device);
+        platform_device_register(&overo_dvi_connector_device);
+        platform_device_register(&overo_tv_connector_device);
+}
+
 static struct mtd_partition overo_nand_partitions[] = {
         {
                 .name           = "xloader",
@@ -408,24 +427,41 @@ static int __init overo_i2c_init(void)
         return 0;
 }
 
+static struct panel_lb035q02_platform_data overo_lcd35_pdata = {
+        .name                   = "lcd35",
+        .source                 = "dpi.0",
+
+        .data_lines             = 24,
+
+        .enable_gpio            = OVERO_GPIO_LCD_EN,
+        .backlight_gpio         = OVERO_GPIO_LCD_BL,
+};
+
+/*
+ * NOTE: We need to add either the lgphilips panel, or the lcd43 panel. The
+ * selection is done based on the overo_use_lcd35 field. If new SPI
+ * devices are added here, extra work is needed to make only the lgphilips panel
+ * affected by the overo_use_lcd35 field.
+ */
 static struct spi_board_info overo_spi_board_info[] __initdata = {
-#if defined(CONFIG_PANEL_LGPHILIPS_LB035Q02) || \
-        defined(CONFIG_PANEL_LGPHILIPS_LB035Q02_MODULE)
         {
-                .modalias               = "lgphilips_lb035q02_panel-spi",
+                .modalias               = "panel_lgphilips_lb035q02",
                 .bus_num                = 1,
                 .chip_select            = 1,
                 .max_speed_hz           = 500000,
                 .mode                   = SPI_MODE_3,
+                .platform_data          = &overo_lcd35_pdata,
         },
-#endif
 };
 
 static int __init overo_spi_init(void)
 {
         overo_ads7846_init();
-        spi_register_board_info(overo_spi_board_info,
-                        ARRAY_SIZE(overo_spi_board_info));
+
+        if (overo_use_lcd35) {
+                spi_register_board_info(overo_spi_board_info,
+                                ARRAY_SIZE(overo_spi_board_info));
+        }
         return 0;
 }
 
@@ -463,11 +499,13 @@ static void __init overo_init(void)
 {
         int ret;
 
+        if (strstr(boot_command_line, "omapdss.def_disp=lcd35"))
+                overo_use_lcd35 = true;
+
         regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
         omap3_mux_init(board_mux, OMAP_PACKAGE_CBB);
         overo_i2c_init();
         omap_hsmmc_init(mmc);
-        omap_display_init(&overo_dss_data);
         omap_serial_init();
         omap_sdrc_init(mt46h32m32lf6_sdrc_params,
                                   mt46h32m32lf6_sdrc_params);
@@ -484,6 +522,8 @@ static void __init overo_init(void)
         overo_init_keys();
         omap_twl4030_audio_init("overo", NULL);
 
+        overo_display_init();
+
         /* Ensure SDRC pins are mux'd for self-refresh */
         omap_mux_init_signal("sdrc_cke0", OMAP_PIN_OUTPUT);
         omap_mux_init_signal("sdrc_cke1", OMAP_PIN_OUTPUT);
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c
index 9c2dd102fbbb..c3270c0f1fce 100644
--- a/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@ -45,6 +45,8 @@
 #include <linux/platform_data/tsl2563.h>
 #include <linux/lis3lv02d.h>
 
+#include <video/omap-panel-data.h>
+
 #if defined(CONFIG_IR_RX51) || defined(CONFIG_IR_RX51_MODULE)
 #include <media/ir-rx51.h>
 #endif
@@ -226,6 +228,15 @@ static struct lp55xx_platform_data rx51_lp5523_platform_data = {
 };
 #endif
 
+#define RX51_LCD_RESET_GPIO     90
+
+static struct panel_acx565akm_platform_data acx_pdata = {
+        .name           = "lcd",
+        .source         = "sdi.0",
+        .reset_gpio     = RX51_LCD_RESET_GPIO,
+        .datapairs      = 2,
+};
+
 static struct omap2_mcspi_device_config wl1251_mcspi_config = {
         .turbo_mode     = 0,
 };
@@ -254,6 +265,7 @@ static struct spi_board_info rx51_peripherals_spi_board_info[] __initdata = {
                 .chip_select            = 2,
                 .max_speed_hz           = 6000000,
                 .controller_data        = &mipid_mcspi_config,
+                .platform_data          = &acx_pdata,
         },
         [RX51_SPI_TSC2005] = {
                 .modalias               = "tsc2005",
diff --git a/arch/arm/mach-omap2/board-rx51-video.c b/arch/arm/mach-omap2/board-rx51-video.c
index bdd1e3a179e1..43a90c8d6837 100644
--- a/arch/arm/mach-omap2/board-rx51-video.c
+++ b/arch/arm/mach-omap2/board-rx51-video.c
@@ -29,34 +29,21 @@
 
 #if defined(CONFIG_FB_OMAP2) || defined(CONFIG_FB_OMAP2_MODULE)
 
-static struct panel_acx565akm_data lcd_data = {
-        .reset_gpio     = RX51_LCD_RESET_GPIO,
+static struct connector_atv_platform_data rx51_tv_pdata = {
+        .name = "tv",
+        .source = "venc.0",
+        .connector_type = OMAP_DSS_VENC_TYPE_COMPOSITE,
+        .invert_polarity = false,
 };
 
-static struct omap_dss_device rx51_lcd_device = {
-        .name                   = "lcd",
-        .driver_name            = "panel-acx565akm",
-        .type                   = OMAP_DISPLAY_TYPE_SDI,
-        .phy.sdi.datapairs      = 2,
-        .data                   = &lcd_data,
-};
-
-static struct omap_dss_device  rx51_tv_device = {
-        .name                   = "tv",
-        .type                   = OMAP_DISPLAY_TYPE_VENC,
-        .driver_name            = "venc",
-        .phy.venc.type          = OMAP_DSS_VENC_TYPE_COMPOSITE,
-};
-
-static struct omap_dss_device *rx51_dss_devices[] = {
-        &rx51_lcd_device,
-        &rx51_tv_device,
+static struct platform_device rx51_tv_connector_device = {
+        .name                   = "connector-analog-tv",
+        .id                     = 0,
+        .dev.platform_data      = &rx51_tv_pdata,
 };
 
 static struct omap_dss_board_info rx51_dss_board_info = {
-        .num_devices    = ARRAY_SIZE(rx51_dss_devices),
-        .devices        = rx51_dss_devices,
-        .default_device = &rx51_lcd_device,
+        .default_display_name = "lcd",
 };
 
 static int __init rx51_video_init(void)
@@ -71,6 +58,8 @@ static int __init rx51_video_init(void)
 
         omap_display_init(&rx51_dss_board_info);
 
+        platform_device_register(&rx51_tv_connector_device);
+
         return 0;
 }
 
diff --git a/arch/arm/mach-omap2/board-zoom-display.c b/arch/arm/mach-omap2/board-zoom-display.c
index c2a079cb76fc..3d8ecc1e05bd 100644
--- a/arch/arm/mach-omap2/board-zoom-display.c
+++ b/arch/arm/mach-omap2/board-zoom-display.c
@@ -25,32 +25,23 @@
 #define LCD_PANEL_RESET_GPIO_PILOT      55
 #define LCD_PANEL_QVGA_GPIO             56
 
-static struct panel_nec_nl8048_data zoom_lcd_data = {
-        /* res_gpio filled in code */
-        .qvga_gpio = LCD_PANEL_QVGA_GPIO,
-};
+static struct panel_nec_nl8048hl11_platform_data zoom_lcd_pdata = {
+        .name                   = "lcd",
+        .source                 = "dpi.0",
 
-static struct omap_dss_device zoom_lcd_device = {
-        .name                   = "lcd",
-        .driver_name            = "NEC_8048_panel",
-        .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .phy.dpi.data_lines     = 24,
-        .data                   = &zoom_lcd_data,
-};
+        .data_lines             = 24,
 
-static struct omap_dss_device *zoom_dss_devices[] = {
-        &zoom_lcd_device,
+        .res_gpio               = -1,   /* filled in code */
+        .qvga_gpio              = LCD_PANEL_QVGA_GPIO,
 };
 
 static struct omap_dss_board_info zoom_dss_data = {
-        .num_devices            = ARRAY_SIZE(zoom_dss_devices),
-        .devices                = zoom_dss_devices,
-        .default_device         = &zoom_lcd_device,
+        .default_display_name = "lcd",
 };
 
 static void __init zoom_lcd_panel_init(void)
 {
-        zoom_lcd_data.res_gpio = (omap_rev() > OMAP3430_REV_ES3_0) ?
+        zoom_lcd_pdata.res_gpio = (omap_rev() > OMAP3430_REV_ES3_0) ?
                         LCD_PANEL_RESET_GPIO_PROD :
                         LCD_PANEL_RESET_GPIO_PILOT;
 }
@@ -61,19 +52,20 @@ static struct omap2_mcspi_device_config dss_lcd_mcspi_config = {
 
 static struct spi_board_info nec_8048_spi_board_info[] __initdata = {
         [0] = {
-                .modalias               = "nec_8048_spi",
+                .modalias               = "panel-nec-nl8048hl11",
                 .bus_num                = 1,
                 .chip_select            = 2,
                 .max_speed_hz           = 375000,
                 .controller_data        = &dss_lcd_mcspi_config,
+                .platform_data          = &zoom_lcd_pdata,
         },
 };
 
 void __init zoom_display_init(void)
 {
         omap_display_init(&zoom_dss_data);
+        zoom_lcd_panel_init();
         spi_register_board_info(nec_8048_spi_board_info,
                                 ARRAY_SIZE(nec_8048_spi_board_info));
-        zoom_lcd_panel_init();
 }
 
diff --git a/arch/arm/mach-omap2/cclock33xx_data.c b/arch/arm/mach-omap2/cclock33xx_data.c
index ba6534d7f155..865d30ee812f 100644
--- a/arch/arm/mach-omap2/cclock33xx_data.c
+++ b/arch/arm/mach-omap2/cclock33xx_data.c
@@ -421,6 +421,10 @@ static struct clk aes0_fck;
 DEFINE_STRUCT_CLK_HW_OMAP(aes0_fck, NULL);
 DEFINE_STRUCT_CLK(aes0_fck, dpll_core_ck_parents, clk_ops_null);
 
+static struct clk rng_fck;
+DEFINE_STRUCT_CLK_HW_OMAP(rng_fck, NULL);
+DEFINE_STRUCT_CLK(rng_fck, dpll_core_ck_parents, clk_ops_null);
+
 /*
  * Modules clock nodes
  *
@@ -966,6 +970,7 @@ static struct omap_clk am33xx_clks[] = {
         CLK(NULL,       "smartreflex1_fck",     &smartreflex1_fck),
         CLK(NULL,       "sha0_fck",             &sha0_fck),
         CLK(NULL,       "aes0_fck",             &aes0_fck),
+        CLK(NULL,       "rng_fck",              &rng_fck),
         CLK(NULL,       "timer1_fck",           &timer1_fck),
         CLK(NULL,       "timer2_fck",           &timer2_fck),
         CLK(NULL,       "timer3_fck",           &timer3_fck),
diff --git a/arch/arm/mach-omap2/cclock44xx_data.c b/arch/arm/mach-omap2/cclock44xx_data.c
index 88e37a474334..b237950eb8a3 100644
--- a/arch/arm/mach-omap2/cclock44xx_data.c
+++ b/arch/arm/mach-omap2/cclock44xx_data.c
@@ -1632,7 +1632,7 @@ static struct omap_clk omap44xx_clks[] = {
         CLK(NULL,       "auxclk5_src_ck",               &auxclk5_src_ck),
         CLK(NULL,       "auxclk5_ck",                   &auxclk5_ck),
         CLK(NULL,       "auxclkreq5_ck",                &auxclkreq5_ck),
-        CLK("omap-gpmc",        "fck",                  &dummy_ck),
+        CLK("50000000.gpmc",    "fck",                  &dummy_ck),
         CLK("omap_i2c.1",       "ick",                  &dummy_ck),
         CLK("omap_i2c.2",       "ick",                  &dummy_ck),
         CLK("omap_i2c.3",       "ick",                  &dummy_ck),
@@ -1707,6 +1707,18 @@ int __init omap4xxx_clk_init(void)
         omap2_clk_disable_autoidle_all();
 
         /*
+         * A set rate of ABE DPLL inturn triggers a set rate of USB DPLL
+         * when its in bypass. So always lock USB before ABE DPLL.
+         */
+        /*
+         * Lock USB DPLL on OMAP4 devices so that the L3INIT power
+         * domain can transition to retention state when not in use.
+         */
+        rc = clk_set_rate(&dpll_usb_ck, OMAP4_DPLL_USB_DEFFREQ);
+        if (rc)
+                pr_err("%s: failed to configure USB DPLL!\n", __func__);
+
+        /*
          * On OMAP4460 the ABE DPLL fails to turn on if in idle low-power
          * state when turning the ABE clock domain. Workaround this by
          * locking the ABE DPLL on boot.
@@ -1718,13 +1730,5 @@ int __init omap4xxx_clk_init(void)
         if (rc)
                 pr_err("%s: failed to configure ABE DPLL!\n", __func__);
 
-        /*
-         * Lock USB DPLL on OMAP4 devices so that the L3INIT power
-         * domain can transition to retention state when not in use.
-         */
-        rc = clk_set_rate(&dpll_usb_ck, OMAP4_DPLL_USB_DEFFREQ);
-        if (rc)
-                pr_err("%s: failed to configure USB DPLL!\n", __func__);
-
         return 0;
 }
diff --git a/arch/arm/mach-omap2/clockdomain.h b/arch/arm/mach-omap2/clockdomain.h
index daeecf1b89fa..4b03394fa0c5 100644
--- a/arch/arm/mach-omap2/clockdomain.h
+++ b/arch/arm/mach-omap2/clockdomain.h
@@ -217,6 +217,7 @@ extern void __init omap3xxx_clockdomains_init(void);
 extern void __init am33xx_clockdomains_init(void);
 extern void __init omap44xx_clockdomains_init(void);
 extern void __init omap54xx_clockdomains_init(void);
+extern void __init dra7xx_clockdomains_init(void);
 
 extern void clkdm_add_autodeps(struct clockdomain *clkdm);
 extern void clkdm_del_autodeps(struct clockdomain *clkdm);
diff --git a/arch/arm/mach-omap2/clockdomains7xx_data.c b/arch/arm/mach-omap2/clockdomains7xx_data.c
new file mode 100644
index 000000000000..57d5df0c1fbd
--- /dev/null
+++ b/arch/arm/mach-omap2/clockdomains7xx_data.c
@@ -0,0 +1,740 @@
+/*
+ * DRA7xx Clock domains framework
+ *
+ * Copyright (C) 2009-2013 Texas Instruments, Inc.
+ * Copyright (C) 2009-2011 Nokia Corporation
+ *
+ * Generated by code originally written by:
+ * Abhijit Pagare (abhijitpagare@ti.com)
+ * Benoit Cousson (b-cousson@ti.com)
+ * Paul Walmsley (paul@pwsan.com)
+ *
+ * This file is automatically generated from the OMAP hardware databases.
+ * We respectfully ask that any modifications to this file be coordinated
+ * with the public linux-omap@vger.kernel.org mailing list and the
+ * authors above to ensure that the autogeneration scripts are kept
+ * up-to-date with the file contents.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/io.h>
+
+#include "clockdomain.h"
+#include "cm1_7xx.h"
+#include "cm2_7xx.h"
+
+#include "cm-regbits-7xx.h"
+#include "prm7xx.h"
+#include "prcm44xx.h"
+#include "prcm_mpu7xx.h"
+
+/* Static Dependencies for DRA7xx Clock Domains */
+
+static struct clkdm_dep cam_wkup_sleep_deps[] = {
+        { .clkdm_name = "emif_clkdm" },
+        { NULL },
+};
+
+static struct clkdm_dep dma_wkup_sleep_deps[] = {
+        { .clkdm_name = "dss_clkdm" },
+        { .clkdm_name = "emif_clkdm" },
+        { .clkdm_name = "ipu_clkdm" },
+        { .clkdm_name = "ipu1_clkdm" },
+        { .clkdm_name = "ipu2_clkdm" },
+        { .clkdm_name = "iva_clkdm" },
+        { .clkdm_name = "l3init_clkdm" },
+        { .clkdm_name = "l4cfg_clkdm" },
+        { .clkdm_name = "l4per_clkdm" },
+        { .clkdm_name = "l4per2_clkdm" },
+        { .clkdm_name = "l4per3_clkdm" },
+        { .clkdm_name = "l4sec_clkdm" },
+        { .clkdm_name = "pcie_clkdm" },
+        { .clkdm_name = "wkupaon_clkdm" },
+        { NULL },
+};
+
+static struct clkdm_dep dsp1_wkup_sleep_deps[] = {
+        { .clkdm_name = "atl_clkdm" },
+        { .clkdm_name = "cam_clkdm" },
+        { .clkdm_name = "dsp2_clkdm" },
+        { .clkdm_name = "dss_clkdm" },
+        { .clkdm_name = "emif_clkdm" },
+        { .clkdm_name = "eve1_clkdm" },
+        { .clkdm_name = "eve2_clkdm" },
+        { .clkdm_name = "eve3_clkdm" },
+        { .clkdm_name = "eve4_clkdm" },
+        { .clkdm_name = "gmac_clkdm" },
+        { .clkdm_name = "gpu_clkdm" },
+        { .clkdm_name = "ipu_clkdm" },
+        { .clkdm_name = "ipu1_clkdm" },
+        { .clkdm_name = "ipu2_clkdm" },
+        { .clkdm_name = "iva_clkdm" },
+        { .clkdm_name = "l3init_clkdm" },
+        { .clkdm_name = "l4per_clkdm" },
+        { .clkdm_name = "l4per2_clkdm" },
+        { .clkdm_name = "l4per3_clkdm" },
+        { .clkdm_name = "l4sec_clkdm" },
+        { .clkdm_name = "pcie_clkdm" },
+        { .clkdm_name = "vpe_clkdm" },
+        { .clkdm_name = "wkupaon_clkdm" },
+        { NULL },
+};
+
+static struct clkdm_dep dsp2_wkup_sleep_deps[] = {
+        { .clkdm_name = "atl_clkdm" },
+        { .clkdm_name = "cam_clkdm" },
+        { .clkdm_name = "dsp1_clkdm" },
+        { .clkdm_name = "dss_clkdm" },
+        { .clkdm_name = "emif_clkdm" },
+        { .clkdm_name = "eve1_clkdm" },
+        { .clkdm_name = "eve2_clkdm" },
+        { .clkdm_name = "eve3_clkdm" },
+        { .clkdm_name = "eve4_clkdm" },
+        { .clkdm_name = "gmac_clkdm" },
+        { .clkdm_name = "gpu_clkdm" },
+        { .clkdm_name = "ipu_clkdm" },
+        { .clkdm_name = "ipu1_clkdm" },
+        { .clkdm_name = "ipu2_clkdm" },
+        { .clkdm_name = "iva_clkdm" },
+        { .clkdm_name = "l3init_clkdm" },
+        { .clkdm_name = "l4per_clkdm" },
+        { .clkdm_name = "l4per2_clkdm" },
+        { .clkdm_name = "l4per3_clkdm" },
+        { .clkdm_name = "l4sec_clkdm" },
+        { .clkdm_name = "pcie_clkdm" },
+        { .clkdm_name = "vpe_clkdm" },
+        { .clkdm_name = "wkupaon_clkdm" },
+        { NULL },
+};
+
+static struct clkdm_dep dss_wkup_sleep_deps[] = {
+        { .clkdm_name = "emif_clkdm" },
+        { .clkdm_name = "iva_clkdm" },
+        { NULL },
+};
+
+static struct clkdm_dep eve1_wkup_sleep_deps[] = {
+        { .clkdm_name = "emif_clkdm" },
+        { .clkdm_name = "eve2_clkdm" },
+        { .clkdm_name = "eve3_clkdm" },
+        { .clkdm_name = "eve4_clkdm" },
+        { .clkdm_name = "iva_clkdm" },
+        { NULL },
+};
+
+static struct clkdm_dep eve2_wkup_sleep_deps[] = {
+        { .clkdm_name = "emif_clkdm" },
+        { .clkdm_name = "eve1_clkdm" },
+        { .clkdm_name = "eve3_clkdm" },
+        { .clkdm_name = "eve4_clkdm" },
+        { .clkdm_name = "iva_clkdm" },
+        { NULL },
+};
+
+static struct clkdm_dep eve3_wkup_sleep_deps[] = {
+        { .clkdm_name = "emif_clkdm" },
+        { .clkdm_name = "eve1_clkdm" },
+        { .clkdm_name = "eve2_clkdm" },
+        { .clkdm_name = "eve4_clkdm" },
+        { .clkdm_name = "iva_clkdm" },
+        { NULL },
+};
+
+static struct clkdm_dep eve4_wkup_sleep_deps[] = {
+        { .clkdm_name = "emif_clkdm" },
+        { .clkdm_name = "eve1_clkdm" },
+        { .clkdm_name = "eve2_clkdm" },
+        { .clkdm_name = "eve3_clkdm" },
+        { .clkdm_name = "iva_clkdm" },
+        { NULL },
+};
+
+static struct clkdm_dep gmac_wkup_sleep_deps[] = {
+        { .clkdm_name = "emif_clkdm" },
+        { .clkdm_name = "l4per2_clkdm" },
+        { NULL },
+};
+
+static struct clkdm_dep gpu_wkup_sleep_deps[] = {
+        { .clkdm_name = "emif_clkdm" },
+        { .clkdm_name = "iva_clkdm" },
+        { NULL },
+};
+
+static struct clkdm_dep ipu1_wkup_sleep_deps[] = {
+        { .clkdm_name = "atl_clkdm" },
+        { .clkdm_name = "dsp1_clkdm" },
+        { .clkdm_name = "dsp2_clkdm" },
+        { .clkdm_name = "dss_clkdm" },
+        { .clkdm_name = "emif_clkdm" },
+        { .clkdm_name = "eve1_clkdm" },
+        { .clkdm_name = "eve2_clkdm" },
+        { .clkdm_name = "eve3_clkdm" },
+        { .clkdm_name = "eve4_clkdm" },
+        { .clkdm_name = "gmac_clkdm" },
+        { .clkdm_name = "gpu_clkdm" },
+        { .clkdm_name = "ipu_clkdm" },
+        { .clkdm_name = "ipu2_clkdm" },
+        { .clkdm_name = "iva_clkdm" },
+        { .clkdm_name = "l3init_clkdm" },
+        { .clkdm_name = "l3main1_clkdm" },
+        { .clkdm_name = "l4cfg_clkdm" },
+        { .clkdm_name = "l4per_clkdm" },
+        { .clkdm_name = "l4per2_clkdm" },
+        { .clkdm_name = "l4per3_clkdm" },
+        { .clkdm_name = "l4sec_clkdm" },
+        { .clkdm_name = "pcie_clkdm" },
+        { .clkdm_name = "vpe_clkdm" },
+        { .clkdm_name = "wkupaon_clkdm" },
+        { NULL },
+};
+
+static struct clkdm_dep ipu2_wkup_sleep_deps[] = {
+        { .clkdm_name = "atl_clkdm" },
+        { .clkdm_name = "dsp1_clkdm" },
+        { .clkdm_name = "dsp2_clkdm" },
+        { .clkdm_name = "dss_clkdm" },
+        { .clkdm_name = "emif_clkdm" },
+        { .clkdm_name = "eve1_clkdm" },
+        { .clkdm_name = "eve2_clkdm" },
+        { .clkdm_name = "eve3_clkdm" },
+        { .clkdm_name = "eve4_clkdm" },
+        { .clkdm_name = "gmac_clkdm" },
+        { .clkdm_name = "gpu_clkdm" },
+        { .clkdm_name = "ipu_clkdm" },
+        { .clkdm_name = "ipu1_clkdm" },
+        { .clkdm_name = "iva_clkdm" },
+        { .clkdm_name = "l3init_clkdm" },
+        { .clkdm_name = "l3main1_clkdm" },
+        { .clkdm_name = "l4cfg_clkdm" },
+        { .clkdm_name = "l4per_clkdm" },
+        { .clkdm_name = "l4per2_clkdm" },
+        { .clkdm_name = "l4per3_clkdm" },
+        { .clkdm_name = "l4sec_clkdm" },
+        { .clkdm_name = "pcie_clkdm" },
+        { .clkdm_name = "vpe_clkdm" },
+        { .clkdm_name = "wkupaon_clkdm" },
+        { NULL },
+};
+
+static struct clkdm_dep iva_wkup_sleep_deps[] = {
+        { .clkdm_name = "emif_clkdm" },
+        { NULL },
+};
+
+static struct clkdm_dep l3init_wkup_sleep_deps[] = {
+        { .clkdm_name = "emif_clkdm" },
+        { .clkdm_name = "iva_clkdm" },
+        { .clkdm_name = "l4cfg_clkdm" },
+        { .clkdm_name = "l4per_clkdm" },
+        { .clkdm_name = "l4per3_clkdm" },
+        { .clkdm_name = "l4sec_clkdm" },
+        { .clkdm_name = "wkupaon_clkdm" },
+        { NULL },
+};
+
+static struct clkdm_dep l4per2_wkup_sleep_deps[] = {
+        { .clkdm_name = "dsp1_clkdm" },
+        { .clkdm_name = "dsp2_clkdm" },
+        { .clkdm_name = "ipu1_clkdm" },
+        { .clkdm_name = "ipu2_clkdm" },
+        { NULL },
+};
+
+static struct clkdm_dep l4sec_wkup_sleep_deps[] = {
+        { .clkdm_name = "emif_clkdm" },
+        { .clkdm_name = "l4per_clkdm" },
+        { NULL },
+};
+
+static struct clkdm_dep mpu_wkup_sleep_deps[] = {
+        { .clkdm_name = "cam_clkdm" },
+        { .clkdm_name = "dsp1_clkdm" },
+        { .clkdm_name = "dsp2_clkdm" },
+        { .clkdm_name = "dss_clkdm" },
+        { .clkdm_name = "emif_clkdm" },
+        { .clkdm_name = "eve1_clkdm" },
+        { .clkdm_name = "eve2_clkdm" },
+        { .clkdm_name = "eve3_clkdm" },
+        { .clkdm_name = "eve4_clkdm" },
+        { .clkdm_name = "gmac_clkdm" },
+        { .clkdm_name = "gpu_clkdm" },
+        { .clkdm_name = "ipu_clkdm" },
+        { .clkdm_name = "ipu1_clkdm" },
+        { .clkdm_name = "ipu2_clkdm" },
+        { .clkdm_name = "iva_clkdm" },
+        { .clkdm_name = "l3init_clkdm" },
+        { .clkdm_name = "l3main1_clkdm" },
+        { .clkdm_name = "l4cfg_clkdm" },
+        { .clkdm_name = "l4per_clkdm" },
+        { .clkdm_name = "l4per2_clkdm" },
+        { .clkdm_name = "l4per3_clkdm" },
+        { .clkdm_name = "l4sec_clkdm" },
+        { .clkdm_name = "pcie_clkdm" },
+        { .clkdm_name = "vpe_clkdm" },
+        { .clkdm_name = "wkupaon_clkdm" },
+        { NULL },
+};
+
+static struct clkdm_dep pcie_wkup_sleep_deps[] = {
+        { .clkdm_name = "atl_clkdm" },
+        { .clkdm_name = "cam_clkdm" },
+        { .clkdm_name = "dsp1_clkdm" },
+        { .clkdm_name = "dsp2_clkdm" },
+        { .clkdm_name = "dss_clkdm" },
+        { .clkdm_name = "emif_clkdm" },
+        { .clkdm_name = "eve1_clkdm" },
+        { .clkdm_name = "eve2_clkdm" },
+        { .clkdm_name = "eve3_clkdm" },
+        { .clkdm_name = "eve4_clkdm" },
+        { .clkdm_name = "gmac_clkdm" },
+        { .clkdm_name = "gpu_clkdm" },
+        { .clkdm_name = "ipu_clkdm" },
+        { .clkdm_name = "ipu1_clkdm" },
+        { .clkdm_name = "iva_clkdm" },
+        { .clkdm_name = "l3init_clkdm" },
+        { .clkdm_name = "l4cfg_clkdm" },
+        { .clkdm_name = "l4per_clkdm" },
+        { .clkdm_name = "l4per2_clkdm" },
+        { .clkdm_name = "l4per3_clkdm" },
+        { .clkdm_name = "l4sec_clkdm" },
+        { .clkdm_name = "vpe_clkdm" },
+        { NULL },
+};
+
+static struct clkdm_dep vpe_wkup_sleep_deps[] = {
+        { .clkdm_name = "emif_clkdm" },
+        { .clkdm_name = "l4per3_clkdm" },
+        { NULL },
+};
+
+static struct clockdomain l4per3_7xx_clkdm = {
+        .name             = "l4per3_clkdm",
+        .pwrdm            = { .name = "l4per_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_L4PER_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_L4PER_L4PER3_CDOFFS,
+        .dep_bit          = DRA7XX_L4PER3_STATDEP_SHIFT,
+        .flags            = CLKDM_CAN_HWSUP_SWSUP,
+};
+
+static struct clockdomain l4per2_7xx_clkdm = {
+        .name             = "l4per2_clkdm",
+        .pwrdm            = { .name = "l4per_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_L4PER_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_L4PER_L4PER2_CDOFFS,
+        .dep_bit          = DRA7XX_L4PER2_STATDEP_SHIFT,
+        .wkdep_srcs       = l4per2_wkup_sleep_deps,
+        .sleepdep_srcs    = l4per2_wkup_sleep_deps,
+        .flags            = CLKDM_CAN_HWSUP_SWSUP,
+};
+
+static struct clockdomain mpu0_7xx_clkdm = {
+        .name             = "mpu0_clkdm",
+        .pwrdm            = { .name = "cpu0_pwrdm" },
+        .prcm_partition   = DRA7XX_MPU_PRCM_PARTITION,
+        .cm_inst          = DRA7XX_MPU_PRCM_CM_C0_INST,
+        .clkdm_offs       = DRA7XX_MPU_PRCM_CM_C0_CPU0_CDOFFS,
+        .flags            = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP,
+};
+
+static struct clockdomain iva_7xx_clkdm = {
+        .name             = "iva_clkdm",
+        .pwrdm            = { .name = "iva_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_IVA_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_IVA_IVA_CDOFFS,
+        .dep_bit          = DRA7XX_IVA_STATDEP_SHIFT,
+        .wkdep_srcs       = iva_wkup_sleep_deps,
+        .sleepdep_srcs    = iva_wkup_sleep_deps,
+        .flags            = CLKDM_CAN_HWSUP_SWSUP,
+};
+
+static struct clockdomain coreaon_7xx_clkdm = {
+        .name             = "coreaon_clkdm",
+        .pwrdm            = { .name = "coreaon_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_COREAON_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_COREAON_COREAON_CDOFFS,
+        .flags            = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP,
+};
+
+static struct clockdomain ipu1_7xx_clkdm = {
+        .name             = "ipu1_clkdm",
+        .pwrdm            = { .name = "ipu_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_AON_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_AON_IPU_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_AON_IPU_IPU1_CDOFFS,
+        .dep_bit          = DRA7XX_IPU1_STATDEP_SHIFT,
+        .wkdep_srcs       = ipu1_wkup_sleep_deps,
+        .sleepdep_srcs    = ipu1_wkup_sleep_deps,
+        .flags            = CLKDM_CAN_HWSUP_SWSUP,
+};
+
+static struct clockdomain ipu2_7xx_clkdm = {
+        .name             = "ipu2_clkdm",
+        .pwrdm            = { .name = "core_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_CORE_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_CORE_IPU2_CDOFFS,
+        .dep_bit          = DRA7XX_IPU2_STATDEP_SHIFT,
+        .wkdep_srcs       = ipu2_wkup_sleep_deps,
+        .sleepdep_srcs    = ipu2_wkup_sleep_deps,
+        .flags            = CLKDM_CAN_HWSUP_SWSUP,
+};
+
+static struct clockdomain l3init_7xx_clkdm = {
+        .name             = "l3init_clkdm",
+        .pwrdm            = { .name = "l3init_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_L3INIT_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_L3INIT_L3INIT_CDOFFS,
+        .dep_bit          = DRA7XX_L3INIT_STATDEP_SHIFT,
+        .wkdep_srcs       = l3init_wkup_sleep_deps,
+        .sleepdep_srcs    = l3init_wkup_sleep_deps,
+        .flags            = CLKDM_CAN_HWSUP_SWSUP,
+};
+
+static struct clockdomain l4sec_7xx_clkdm = {
+        .name             = "l4sec_clkdm",
+        .pwrdm            = { .name = "l4per_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_L4PER_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_L4PER_L4SEC_CDOFFS,
+        .dep_bit          = DRA7XX_L4SEC_STATDEP_SHIFT,
+        .wkdep_srcs       = l4sec_wkup_sleep_deps,
+        .sleepdep_srcs    = l4sec_wkup_sleep_deps,
+        .flags            = CLKDM_CAN_HWSUP_SWSUP,
+};
+
+static struct clockdomain l3main1_7xx_clkdm = {
+        .name             = "l3main1_clkdm",
+        .pwrdm            = { .name = "core_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_CORE_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_CORE_L3MAIN1_CDOFFS,
+        .dep_bit          = DRA7XX_L3MAIN1_STATDEP_SHIFT,
+        .flags            = CLKDM_CAN_HWSUP,
+};
+
+static struct clockdomain vpe_7xx_clkdm = {
+        .name             = "vpe_clkdm",
+        .pwrdm            = { .name = "vpe_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_AON_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_AON_VPE_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_AON_VPE_VPE_CDOFFS,
+        .dep_bit          = DRA7XX_VPE_STATDEP_SHIFT,
+        .wkdep_srcs       = vpe_wkup_sleep_deps,
+        .sleepdep_srcs    = vpe_wkup_sleep_deps,
+        .flags            = CLKDM_CAN_HWSUP_SWSUP,
+};
+
+static struct clockdomain mpu_7xx_clkdm = {
+        .name             = "mpu_clkdm",
+        .pwrdm            = { .name = "mpu_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_AON_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_AON_MPU_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_AON_MPU_MPU_CDOFFS,
+        .wkdep_srcs       = mpu_wkup_sleep_deps,
+        .sleepdep_srcs    = mpu_wkup_sleep_deps,
+        .flags            = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP,
+};
+
+static struct clockdomain custefuse_7xx_clkdm = {
+        .name             = "custefuse_clkdm",
+        .pwrdm            = { .name = "custefuse_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_CUSTEFUSE_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_CUSTEFUSE_CUSTEFUSE_CDOFFS,
+        .flags            = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP,
+};
+
+static struct clockdomain ipu_7xx_clkdm = {
+        .name             = "ipu_clkdm",
+        .pwrdm            = { .name = "ipu_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_AON_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_AON_IPU_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_AON_IPU_IPU_CDOFFS,
+        .dep_bit          = DRA7XX_IPU_STATDEP_SHIFT,
+        .flags            = CLKDM_CAN_HWSUP_SWSUP,
+};
+
+static struct clockdomain mpu1_7xx_clkdm = {
+        .name             = "mpu1_clkdm",
+        .pwrdm            = { .name = "cpu1_pwrdm" },
+        .prcm_partition   = DRA7XX_MPU_PRCM_PARTITION,
+        .cm_inst          = DRA7XX_MPU_PRCM_CM_C1_INST,
+        .clkdm_offs       = DRA7XX_MPU_PRCM_CM_C1_CPU1_CDOFFS,
+        .flags            = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP,
+};
+
+static struct clockdomain gmac_7xx_clkdm = {
+        .name             = "gmac_clkdm",
+        .pwrdm            = { .name = "l3init_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_L3INIT_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_L3INIT_GMAC_CDOFFS,
+        .dep_bit          = DRA7XX_GMAC_STATDEP_SHIFT,
+        .wkdep_srcs       = gmac_wkup_sleep_deps,
+        .sleepdep_srcs    = gmac_wkup_sleep_deps,
+        .flags            = CLKDM_CAN_HWSUP_SWSUP,
+};
+
+static struct clockdomain l4cfg_7xx_clkdm = {
+        .name             = "l4cfg_clkdm",
+        .pwrdm            = { .name = "core_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_CORE_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_CORE_L4CFG_CDOFFS,
+        .dep_bit          = DRA7XX_L4CFG_STATDEP_SHIFT,
+        .flags            = CLKDM_CAN_HWSUP,
+};
+
+static struct clockdomain dma_7xx_clkdm = {
+        .name             = "dma_clkdm",
+        .pwrdm            = { .name = "core_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_CORE_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_CORE_DMA_CDOFFS,
+        .wkdep_srcs       = dma_wkup_sleep_deps,
+        .sleepdep_srcs    = dma_wkup_sleep_deps,
+        .flags            = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP,
+};
+
+static struct clockdomain rtc_7xx_clkdm = {
+        .name             = "rtc_clkdm",
+        .pwrdm            = { .name = "rtc_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_AON_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_AON_RTC_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_AON_RTC_RTC_CDOFFS,
+        .flags            = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP,
+};
+
+static struct clockdomain pcie_7xx_clkdm = {
+        .name             = "pcie_clkdm",
+        .pwrdm            = { .name = "l3init_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_L3INIT_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_L3INIT_PCIE_CDOFFS,
+        .dep_bit          = DRA7XX_PCIE_STATDEP_SHIFT,
+        .wkdep_srcs       = pcie_wkup_sleep_deps,
+        .sleepdep_srcs    = pcie_wkup_sleep_deps,
+        .flags            = CLKDM_CAN_HWSUP_SWSUP,
+};
+
+static struct clockdomain atl_7xx_clkdm = {
+        .name             = "atl_clkdm",
+        .pwrdm            = { .name = "core_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_CORE_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_CORE_ATL_CDOFFS,
+        .dep_bit          = DRA7XX_ATL_STATDEP_SHIFT,
+        .flags            = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP,
+};
+
+static struct clockdomain l3instr_7xx_clkdm = {
+        .name             = "l3instr_clkdm",
+        .pwrdm            = { .name = "core_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_CORE_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_CORE_L3INSTR_CDOFFS,
+};
+
+static struct clockdomain dss_7xx_clkdm = {
+        .name             = "dss_clkdm",
+        .pwrdm            = { .name = "dss_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_DSS_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_DSS_DSS_CDOFFS,
+        .dep_bit          = DRA7XX_DSS_STATDEP_SHIFT,
+        .wkdep_srcs       = dss_wkup_sleep_deps,
+        .sleepdep_srcs    = dss_wkup_sleep_deps,
+        .flags            = CLKDM_CAN_HWSUP_SWSUP,
+};
+
+static struct clockdomain emif_7xx_clkdm = {
+        .name             = "emif_clkdm",
+        .pwrdm            = { .name = "core_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_CORE_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_CORE_EMIF_CDOFFS,
+        .dep_bit          = DRA7XX_EMIF_STATDEP_SHIFT,
+        .flags            = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP,
+};
+
+static struct clockdomain emu_7xx_clkdm = {
+        .name             = "emu_clkdm",
+        .pwrdm            = { .name = "emu_pwrdm" },
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .cm_inst          = DRA7XX_PRM_EMU_CM_INST,
+        .clkdm_offs       = DRA7XX_PRM_EMU_CM_EMU_CDOFFS,
+        .flags            = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP,
+};
+
+static struct clockdomain dsp2_7xx_clkdm = {
+        .name             = "dsp2_clkdm",
+        .pwrdm            = { .name = "dsp2_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_AON_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_AON_DSP2_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_AON_DSP2_DSP2_CDOFFS,
+        .dep_bit          = DRA7XX_DSP2_STATDEP_SHIFT,
+        .wkdep_srcs       = dsp2_wkup_sleep_deps,
+        .sleepdep_srcs    = dsp2_wkup_sleep_deps,
+        .flags            = CLKDM_CAN_HWSUP_SWSUP,
+};
+
+static struct clockdomain dsp1_7xx_clkdm = {
+        .name             = "dsp1_clkdm",
+        .pwrdm            = { .name = "dsp1_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_AON_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_AON_DSP1_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_AON_DSP1_DSP1_CDOFFS,
+        .dep_bit          = DRA7XX_DSP1_STATDEP_SHIFT,
+        .wkdep_srcs       = dsp1_wkup_sleep_deps,
+        .sleepdep_srcs    = dsp1_wkup_sleep_deps,
+        .flags            = CLKDM_CAN_HWSUP_SWSUP,
+};
+
+static struct clockdomain cam_7xx_clkdm = {
+        .name             = "cam_clkdm",
+        .pwrdm            = { .name = "cam_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_CAM_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_CAM_CAM_CDOFFS,
+        .dep_bit          = DRA7XX_CAM_STATDEP_SHIFT,
+        .wkdep_srcs       = cam_wkup_sleep_deps,
+        .sleepdep_srcs    = cam_wkup_sleep_deps,
+        .flags            = CLKDM_CAN_HWSUP_SWSUP,
+};
+
+static struct clockdomain l4per_7xx_clkdm = {
+        .name             = "l4per_clkdm",
+        .pwrdm            = { .name = "l4per_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_L4PER_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_L4PER_L4PER_CDOFFS,
+        .dep_bit          = DRA7XX_L4PER_STATDEP_SHIFT,
+        .flags            = CLKDM_CAN_HWSUP_SWSUP,
+};
+
+static struct clockdomain gpu_7xx_clkdm = {
+        .name             = "gpu_clkdm",
+        .pwrdm            = { .name = "gpu_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_GPU_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_GPU_GPU_CDOFFS,
+        .dep_bit          = DRA7XX_GPU_STATDEP_SHIFT,
+        .wkdep_srcs       = gpu_wkup_sleep_deps,
+        .sleepdep_srcs    = gpu_wkup_sleep_deps,
+        .flags            = CLKDM_CAN_HWSUP_SWSUP,
+};
+
+static struct clockdomain eve4_7xx_clkdm = {
+        .name             = "eve4_clkdm",
+        .pwrdm            = { .name = "eve4_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_AON_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_AON_EVE4_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_AON_EVE4_EVE4_CDOFFS,
+        .dep_bit          = DRA7XX_EVE4_STATDEP_SHIFT,
+        .wkdep_srcs       = eve4_wkup_sleep_deps,
+        .sleepdep_srcs    = eve4_wkup_sleep_deps,
+        .flags            = CLKDM_CAN_HWSUP_SWSUP,
+};
+
+static struct clockdomain eve2_7xx_clkdm = {
+        .name             = "eve2_clkdm",
+        .pwrdm            = { .name = "eve2_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_AON_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_AON_EVE2_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_AON_EVE2_EVE2_CDOFFS,
+        .dep_bit          = DRA7XX_EVE2_STATDEP_SHIFT,
+        .wkdep_srcs       = eve2_wkup_sleep_deps,
+        .sleepdep_srcs    = eve2_wkup_sleep_deps,
+        .flags            = CLKDM_CAN_HWSUP_SWSUP,
+};
+
+static struct clockdomain eve3_7xx_clkdm = {
+        .name             = "eve3_clkdm",
+        .pwrdm            = { .name = "eve3_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_AON_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_AON_EVE3_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_AON_EVE3_EVE3_CDOFFS,
+        .dep_bit          = DRA7XX_EVE3_STATDEP_SHIFT,
+        .wkdep_srcs       = eve3_wkup_sleep_deps,
+        .sleepdep_srcs    = eve3_wkup_sleep_deps,
+        .flags            = CLKDM_CAN_HWSUP_SWSUP,
+};
+
+static struct clockdomain wkupaon_7xx_clkdm = {
+        .name             = "wkupaon_clkdm",
+        .pwrdm            = { .name = "wkupaon_pwrdm" },
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .cm_inst          = DRA7XX_PRM_WKUPAON_CM_INST,
+        .clkdm_offs       = DRA7XX_PRM_WKUPAON_CM_WKUPAON_CDOFFS,
+        .dep_bit          = DRA7XX_WKUPAON_STATDEP_SHIFT,
+        .flags            = CLKDM_CAN_FORCE_WAKEUP | CLKDM_CAN_HWSUP,
+};
+
+static struct clockdomain eve1_7xx_clkdm = {
+        .name             = "eve1_clkdm",
+        .pwrdm            = { .name = "eve1_pwrdm" },
+        .prcm_partition   = DRA7XX_CM_CORE_AON_PARTITION,
+        .cm_inst          = DRA7XX_CM_CORE_AON_EVE1_INST,
+        .clkdm_offs       = DRA7XX_CM_CORE_AON_EVE1_EVE1_CDOFFS,
+        .dep_bit          = DRA7XX_EVE1_STATDEP_SHIFT,
+        .wkdep_srcs       = eve1_wkup_sleep_deps,
+        .sleepdep_srcs    = eve1_wkup_sleep_deps,
+        .flags            = CLKDM_CAN_HWSUP_SWSUP,
+};
+
+/* As clockdomains are added or removed above, this list must also be changed */
+static struct clockdomain *clockdomains_dra7xx[] __initdata = {
+        &l4per3_7xx_clkdm,
+        &l4per2_7xx_clkdm,
+        &mpu0_7xx_clkdm,
+        &iva_7xx_clkdm,
+        &coreaon_7xx_clkdm,
+        &ipu1_7xx_clkdm,
+        &ipu2_7xx_clkdm,
+        &l3init_7xx_clkdm,
+        &l4sec_7xx_clkdm,
+        &l3main1_7xx_clkdm,
+        &vpe_7xx_clkdm,
+        &mpu_7xx_clkdm,
+        &custefuse_7xx_clkdm,
+        &ipu_7xx_clkdm,
+        &mpu1_7xx_clkdm,
+        &gmac_7xx_clkdm,
+        &l4cfg_7xx_clkdm,
+        &dma_7xx_clkdm,
+        &rtc_7xx_clkdm,
+        &pcie_7xx_clkdm,
+        &atl_7xx_clkdm,
+        &l3instr_7xx_clkdm,
+        &dss_7xx_clkdm,
+        &emif_7xx_clkdm,
+        &emu_7xx_clkdm,
+        &dsp2_7xx_clkdm,
+        &dsp1_7xx_clkdm,
+        &cam_7xx_clkdm,
+        &l4per_7xx_clkdm,
+        &gpu_7xx_clkdm,
+        &eve4_7xx_clkdm,
+        &eve2_7xx_clkdm,
+        &eve3_7xx_clkdm,
+        &wkupaon_7xx_clkdm,
+        &eve1_7xx_clkdm,
+        NULL
+};
+
+void __init dra7xx_clockdomains_init(void)
+{
+        clkdm_register_platform_funcs(&omap4_clkdm_operations);
+        clkdm_register_clkdms(clockdomains_dra7xx);
+        clkdm_complete_init();
+}
diff --git a/arch/arm/mach-omap2/cm-regbits-24xx.h b/arch/arm/mach-omap2/cm-regbits-24xx.h
index 669ef51b17a8..8538669cc2ad 100644
--- a/arch/arm/mach-omap2/cm-regbits-24xx.h
+++ b/arch/arm/mach-omap2/cm-regbits-24xx.h
@@ -14,439 +14,121 @@
  * published by the Free Software Foundation.
  */
 
-/* Bits shared between registers */
-
-/* CM_FCLKEN1_CORE and CM_ICLKEN1_CORE shared bits */
 #define OMAP24XX_EN_CAM_SHIFT                           31
-#define OMAP24XX_EN_CAM_MASK                            (1 << 31)
 #define OMAP24XX_EN_WDT4_SHIFT                          29
-#define OMAP24XX_EN_WDT4_MASK                           (1 << 29)
 #define OMAP2420_EN_WDT3_SHIFT                          28
-#define OMAP2420_EN_WDT3_MASK                           (1 << 28)
 #define OMAP24XX_EN_MSPRO_SHIFT                         27
-#define OMAP24XX_EN_MSPRO_MASK                          (1 << 27)
 #define OMAP24XX_EN_FAC_SHIFT                           25
-#define OMAP24XX_EN_FAC_MASK                            (1 << 25)
 #define OMAP2420_EN_EAC_SHIFT                           24
-#define OMAP2420_EN_EAC_MASK                            (1 << 24)
 #define OMAP24XX_EN_HDQ_SHIFT                           23
-#define OMAP24XX_EN_HDQ_MASK                            (1 << 23)
 #define OMAP2420_EN_I2C2_SHIFT                          20
-#define OMAP2420_EN_I2C2_MASK                           (1 << 20)
 #define OMAP2420_EN_I2C1_SHIFT                          19
-#define OMAP2420_EN_I2C1_MASK                           (1 << 19)
-
-/* CM_FCLKEN2_CORE and CM_ICLKEN2_CORE shared bits */
 #define OMAP2430_EN_MCBSP5_SHIFT                        5
-#define OMAP2430_EN_MCBSP5_MASK                         (1 << 5)
 #define OMAP2430_EN_MCBSP4_SHIFT                        4
-#define OMAP2430_EN_MCBSP4_MASK                         (1 << 4)
 #define OMAP2430_EN_MCBSP3_SHIFT                        3
-#define OMAP2430_EN_MCBSP3_MASK                         (1 << 3)
 #define OMAP24XX_EN_SSI_SHIFT                           1
-#define OMAP24XX_EN_SSI_MASK                            (1 << 1)
-
-/* CM_FCLKEN_WKUP and CM_ICLKEN_WKUP shared bits */
 #define OMAP24XX_EN_MPU_WDT_SHIFT                       3
-#define OMAP24XX_EN_MPU_WDT_MASK                        (1 << 3)
-
-/* Bits specific to each register */
-
-/* CM_IDLEST_MPU */
-/* 2430 only */
-#define OMAP2430_ST_MPU_MASK                            (1 << 0)
-
-/* CM_CLKSEL_MPU */
 #define OMAP24XX_CLKSEL_MPU_SHIFT                       0
-#define OMAP24XX_CLKSEL_MPU_MASK                        (0x1f << 0)
 #define OMAP24XX_CLKSEL_MPU_WIDTH                       5
-
-/* CM_CLKSTCTRL_MPU */
-#define OMAP24XX_AUTOSTATE_MPU_SHIFT                    0
 #define OMAP24XX_AUTOSTATE_MPU_MASK                     (1 << 0)
-
-/* CM_FCLKEN1_CORE specific bits*/
 #define OMAP24XX_EN_TV_SHIFT                            2
-#define OMAP24XX_EN_TV_MASK                             (1 << 2)
 #define OMAP24XX_EN_DSS2_SHIFT                          1
-#define OMAP24XX_EN_DSS2_MASK                           (1 << 1)
 #define OMAP24XX_EN_DSS1_SHIFT                          0
 #define OMAP24XX_EN_DSS1_MASK                           (1 << 0)
-
-/* CM_FCLKEN2_CORE specific bits */
 #define OMAP2430_EN_I2CHS2_SHIFT                        20
-#define OMAP2430_EN_I2CHS2_MASK                         (1 << 20)
 #define OMAP2430_EN_I2CHS1_SHIFT                        19
-#define OMAP2430_EN_I2CHS1_MASK                         (1 << 19)
 #define OMAP2430_EN_MMCHSDB2_SHIFT                      17
-#define OMAP2430_EN_MMCHSDB2_MASK                       (1 << 17)
 #define OMAP2430_EN_MMCHSDB1_SHIFT                      16
-#define OMAP2430_EN_MMCHSDB1_MASK                       (1 << 16)
-
-/* CM_ICLKEN1_CORE specific bits */
 #define OMAP24XX_EN_MAILBOXES_SHIFT                     30
-#define OMAP24XX_EN_MAILBOXES_MASK                      (1 << 30)
-#define OMAP24XX_EN_DSS_SHIFT                           0
-#define OMAP24XX_EN_DSS_MASK                            (1 << 0)
-
-/* CM_ICLKEN2_CORE specific bits */
-
-/* CM_ICLKEN3_CORE */
-/* 2430 only */
 #define OMAP2430_EN_SDRC_SHIFT                          2
-#define OMAP2430_EN_SDRC_MASK                           (1 << 2)
-
-/* CM_ICLKEN4_CORE */
 #define OMAP24XX_EN_PKA_SHIFT                           4
-#define OMAP24XX_EN_PKA_MASK                            (1 << 4)
 #define OMAP24XX_EN_AES_SHIFT                           3
-#define OMAP24XX_EN_AES_MASK                            (1 << 3)
 #define OMAP24XX_EN_RNG_SHIFT                           2
-#define OMAP24XX_EN_RNG_MASK                            (1 << 2)
 #define OMAP24XX_EN_SHA_SHIFT                           1
-#define OMAP24XX_EN_SHA_MASK                            (1 << 1)
 #define OMAP24XX_EN_DES_SHIFT                           0
-#define OMAP24XX_EN_DES_MASK                            (1 << 0)
-
-/* CM_IDLEST1_CORE specific bits */
 #define OMAP24XX_ST_MAILBOXES_SHIFT                     30
-#define OMAP24XX_ST_MAILBOXES_MASK                      (1 << 30)
-#define OMAP24XX_ST_WDT4_SHIFT                          29
-#define OMAP24XX_ST_WDT4_MASK                           (1 << 29)
-#define OMAP2420_ST_WDT3_SHIFT                          28
-#define OMAP2420_ST_WDT3_MASK                           (1 << 28)
-#define OMAP24XX_ST_MSPRO_SHIFT                         27
-#define OMAP24XX_ST_MSPRO_MASK                          (1 << 27)
-#define OMAP24XX_ST_FAC_SHIFT                           25
-#define OMAP24XX_ST_FAC_MASK                            (1 << 25)
-#define OMAP2420_ST_EAC_SHIFT                           24
-#define OMAP2420_ST_EAC_MASK                            (1 << 24)
 #define OMAP24XX_ST_HDQ_SHIFT                           23
-#define OMAP24XX_ST_HDQ_MASK                            (1 << 23)
 #define OMAP2420_ST_I2C2_SHIFT                          20
-#define OMAP2420_ST_I2C2_MASK                           (1 << 20)
 #define OMAP2430_ST_I2CHS1_SHIFT                        19
-#define OMAP2430_ST_I2CHS1_MASK                         (1 << 19)
 #define OMAP2420_ST_I2C1_SHIFT                          19
-#define OMAP2420_ST_I2C1_MASK                           (1 << 19)
 #define OMAP2430_ST_I2CHS2_SHIFT                        20
-#define OMAP2430_ST_I2CHS2_MASK                         (1 << 20)
 #define OMAP24XX_ST_MCBSP2_SHIFT                        16
-#define OMAP24XX_ST_MCBSP2_MASK                         (1 << 16)
 #define OMAP24XX_ST_MCBSP1_SHIFT                        15
-#define OMAP24XX_ST_MCBSP1_MASK                         (1 << 15)
 #define OMAP24XX_ST_DSS_SHIFT                           0
-#define OMAP24XX_ST_DSS_MASK                            (1 << 0)
-
-/* CM_IDLEST2_CORE */
 #define OMAP2430_ST_MCBSP5_SHIFT                        5
-#define OMAP2430_ST_MCBSP5_MASK                         (1 << 5)
 #define OMAP2430_ST_MCBSP4_SHIFT                        4
-#define OMAP2430_ST_MCBSP4_MASK                         (1 << 4)
 #define OMAP2430_ST_MCBSP3_SHIFT                        3
-#define OMAP2430_ST_MCBSP3_MASK                         (1 << 3)
-#define OMAP24XX_ST_SSI_SHIFT                           1
-#define OMAP24XX_ST_SSI_MASK                            (1 << 1)
-
-/* CM_IDLEST3_CORE */
-/* 2430 only */
-#define OMAP2430_ST_SDRC_MASK                           (1 << 2)
-
-/* CM_IDLEST4_CORE */
-#define OMAP24XX_ST_PKA_SHIFT                           4
-#define OMAP24XX_ST_PKA_MASK                            (1 << 4)
 #define OMAP24XX_ST_AES_SHIFT                           3
-#define OMAP24XX_ST_AES_MASK                            (1 << 3)
 #define OMAP24XX_ST_RNG_SHIFT                           2
-#define OMAP24XX_ST_RNG_MASK                            (1 << 2)
 #define OMAP24XX_ST_SHA_SHIFT                           1
-#define OMAP24XX_ST_SHA_MASK                            (1 << 1)
-#define OMAP24XX_ST_DES_SHIFT                           0
-#define OMAP24XX_ST_DES_MASK                            (1 << 0)
-
-/* CM_AUTOIDLE1_CORE */
-#define OMAP24XX_AUTO_CAM_MASK                          (1 << 31)
-#define OMAP24XX_AUTO_MAILBOXES_MASK                    (1 << 30)
-#define OMAP24XX_AUTO_WDT4_MASK                         (1 << 29)
-#define OMAP2420_AUTO_WDT3_MASK                         (1 << 28)
-#define OMAP24XX_AUTO_MSPRO_MASK                        (1 << 27)
-#define OMAP2420_AUTO_MMC_MASK                          (1 << 26)
-#define OMAP24XX_AUTO_FAC_MASK                          (1 << 25)
-#define OMAP2420_AUTO_EAC_MASK                          (1 << 24)
-#define OMAP24XX_AUTO_HDQ_MASK                          (1 << 23)
-#define OMAP24XX_AUTO_UART2_MASK                        (1 << 22)
-#define OMAP24XX_AUTO_UART1_MASK                        (1 << 21)
-#define OMAP24XX_AUTO_I2C2_MASK                         (1 << 20)
-#define OMAP24XX_AUTO_I2C1_MASK                         (1 << 19)
-#define OMAP24XX_AUTO_MCSPI2_MASK                       (1 << 18)
-#define OMAP24XX_AUTO_MCSPI1_MASK                       (1 << 17)
-#define OMAP24XX_AUTO_MCBSP2_MASK                       (1 << 16)
-#define OMAP24XX_AUTO_MCBSP1_MASK                       (1 << 15)
-#define OMAP24XX_AUTO_GPT12_MASK                        (1 << 14)
-#define OMAP24XX_AUTO_GPT11_MASK                        (1 << 13)
-#define OMAP24XX_AUTO_GPT10_MASK                        (1 << 12)
-#define OMAP24XX_AUTO_GPT9_MASK                         (1 << 11)
-#define OMAP24XX_AUTO_GPT8_MASK                         (1 << 10)
-#define OMAP24XX_AUTO_GPT7_MASK                         (1 << 9)
-#define OMAP24XX_AUTO_GPT6_MASK                         (1 << 8)
-#define OMAP24XX_AUTO_GPT5_MASK                         (1 << 7)
-#define OMAP24XX_AUTO_GPT4_MASK                         (1 << 6)
-#define OMAP24XX_AUTO_GPT3_MASK                         (1 << 5)
-#define OMAP24XX_AUTO_GPT2_MASK                         (1 << 4)
-#define OMAP2420_AUTO_VLYNQ_MASK                        (1 << 3)
-#define OMAP24XX_AUTO_DSS_MASK                          (1 << 0)
-
-/* CM_AUTOIDLE2_CORE */
-#define OMAP2430_AUTO_MDM_INTC_MASK                     (1 << 11)
-#define OMAP2430_AUTO_GPIO5_MASK                        (1 << 10)
-#define OMAP2430_AUTO_MCSPI3_MASK                       (1 << 9)
-#define OMAP2430_AUTO_MMCHS2_MASK                       (1 << 8)
-#define OMAP2430_AUTO_MMCHS1_MASK                       (1 << 7)
-#define OMAP2430_AUTO_USBHS_MASK                        (1 << 6)
-#define OMAP2430_AUTO_MCBSP5_MASK                       (1 << 5)
-#define OMAP2430_AUTO_MCBSP4_MASK                       (1 << 4)
-#define OMAP2430_AUTO_MCBSP3_MASK                       (1 << 3)
-#define OMAP24XX_AUTO_UART3_MASK                        (1 << 2)
-#define OMAP24XX_AUTO_SSI_MASK                          (1 << 1)
-#define OMAP24XX_AUTO_USB_MASK                          (1 << 0)
-
-/* CM_AUTOIDLE3_CORE */
 #define OMAP24XX_AUTO_SDRC_SHIFT                        2
-#define OMAP24XX_AUTO_SDRC_MASK                         (1 << 2)
 #define OMAP24XX_AUTO_GPMC_SHIFT                        1
-#define OMAP24XX_AUTO_GPMC_MASK                         (1 << 1)
 #define OMAP24XX_AUTO_SDMA_SHIFT                        0
-#define OMAP24XX_AUTO_SDMA_MASK                         (1 << 0)
-
-/* CM_AUTOIDLE4_CORE */
-#define OMAP24XX_AUTO_PKA_MASK                          (1 << 4)
-#define OMAP24XX_AUTO_AES_MASK                          (1 << 3)
-#define OMAP24XX_AUTO_RNG_MASK                          (1 << 2)
-#define OMAP24XX_AUTO_SHA_MASK                          (1 << 1)
-#define OMAP24XX_AUTO_DES_MASK                          (1 << 0)
-
-/* CM_CLKSEL1_CORE */
-#define OMAP24XX_CLKSEL_USB_SHIFT                       25
 #define OMAP24XX_CLKSEL_USB_MASK                        (0x7 << 25)
-#define OMAP24XX_CLKSEL_SSI_SHIFT                       20
 #define OMAP24XX_CLKSEL_SSI_MASK                        (0x1f << 20)
-#define OMAP2420_CLKSEL_VLYNQ_SHIFT                     15
 #define OMAP2420_CLKSEL_VLYNQ_MASK                      (0x1f << 15)
-#define OMAP24XX_CLKSEL_DSS2_SHIFT                      13
 #define OMAP24XX_CLKSEL_DSS2_MASK                       (0x1 << 13)
-#define OMAP24XX_CLKSEL_DSS1_SHIFT                      8
 #define OMAP24XX_CLKSEL_DSS1_MASK                       (0x1f << 8)
 #define OMAP24XX_CLKSEL_L4_SHIFT                        5
-#define OMAP24XX_CLKSEL_L4_MASK                         (0x3 << 5)
 #define OMAP24XX_CLKSEL_L4_WIDTH                        2
 #define OMAP24XX_CLKSEL_L3_SHIFT                        0
-#define OMAP24XX_CLKSEL_L3_MASK                         (0x1f << 0)
 #define OMAP24XX_CLKSEL_L3_WIDTH                        5
-
-/* CM_CLKSEL2_CORE */
-#define OMAP24XX_CLKSEL_GPT12_SHIFT                     22
 #define OMAP24XX_CLKSEL_GPT12_MASK                      (0x3 << 22)
-#define OMAP24XX_CLKSEL_GPT11_SHIFT                     20
 #define OMAP24XX_CLKSEL_GPT11_MASK                      (0x3 << 20)
-#define OMAP24XX_CLKSEL_GPT10_SHIFT                     18
 #define OMAP24XX_CLKSEL_GPT10_MASK                      (0x3 << 18)
-#define OMAP24XX_CLKSEL_GPT9_SHIFT                      16
 #define OMAP24XX_CLKSEL_GPT9_MASK                       (0x3 << 16)
-#define OMAP24XX_CLKSEL_GPT8_SHIFT                      14
 #define OMAP24XX_CLKSEL_GPT8_MASK                       (0x3 << 14)
-#define OMAP24XX_CLKSEL_GPT7_SHIFT                      12
 #define OMAP24XX_CLKSEL_GPT7_MASK                       (0x3 << 12)
-#define OMAP24XX_CLKSEL_GPT6_SHIFT                      10
 #define OMAP24XX_CLKSEL_GPT6_MASK                       (0x3 << 10)
-#define OMAP24XX_CLKSEL_GPT5_SHIFT                      8
 #define OMAP24XX_CLKSEL_GPT5_MASK                       (0x3 << 8)
-#define OMAP24XX_CLKSEL_GPT4_SHIFT                      6
 #define OMAP24XX_CLKSEL_GPT4_MASK                       (0x3 << 6)
-#define OMAP24XX_CLKSEL_GPT3_SHIFT                      4
 #define OMAP24XX_CLKSEL_GPT3_MASK                       (0x3 << 4)
-#define OMAP24XX_CLKSEL_GPT2_SHIFT                      2
 #define OMAP24XX_CLKSEL_GPT2_MASK                       (0x3 << 2)
-
-/* CM_CLKSTCTRL_CORE */
-#define OMAP24XX_AUTOSTATE_DSS_SHIFT                    2
 #define OMAP24XX_AUTOSTATE_DSS_MASK                     (1 << 2)
-#define OMAP24XX_AUTOSTATE_L4_SHIFT                     1
 #define OMAP24XX_AUTOSTATE_L4_MASK                      (1 << 1)
-#define OMAP24XX_AUTOSTATE_L3_SHIFT                     0
 #define OMAP24XX_AUTOSTATE_L3_MASK                      (1 << 0)
-
-/* CM_FCLKEN_GFX */
 #define OMAP24XX_EN_3D_SHIFT                            2
-#define OMAP24XX_EN_3D_MASK                             (1 << 2)
 #define OMAP24XX_EN_2D_SHIFT                            1
-#define OMAP24XX_EN_2D_MASK                             (1 << 1)
-
-/* CM_ICLKEN_GFX specific bits */
-
-/* CM_IDLEST_GFX specific bits */
-
-/* CM_CLKSEL_GFX specific bits */
-
-/* CM_CLKSTCTRL_GFX */
-#define OMAP24XX_AUTOSTATE_GFX_SHIFT                    0
 #define OMAP24XX_AUTOSTATE_GFX_MASK                     (1 << 0)
-
-/* CM_FCLKEN_WKUP specific bits */
-
-/* CM_ICLKEN_WKUP specific bits */
 #define OMAP2430_EN_ICR_SHIFT                           6
-#define OMAP2430_EN_ICR_MASK                            (1 << 6)
 #define OMAP24XX_EN_OMAPCTRL_SHIFT                      5
-#define OMAP24XX_EN_OMAPCTRL_MASK                       (1 << 5)
 #define OMAP24XX_EN_WDT1_SHIFT                          4
-#define OMAP24XX_EN_WDT1_MASK                           (1 << 4)
 #define OMAP24XX_EN_32KSYNC_SHIFT                       1
-#define OMAP24XX_EN_32KSYNC_MASK                        (1 << 1)
-
-/* CM_IDLEST_WKUP specific bits */
-#define OMAP2430_ST_ICR_SHIFT                           6
-#define OMAP2430_ST_ICR_MASK                            (1 << 6)
-#define OMAP24XX_ST_OMAPCTRL_SHIFT                      5
-#define OMAP24XX_ST_OMAPCTRL_MASK                       (1 << 5)
-#define OMAP24XX_ST_WDT1_SHIFT                          4
-#define OMAP24XX_ST_WDT1_MASK                           (1 << 4)
 #define OMAP24XX_ST_MPU_WDT_SHIFT                       3
-#define OMAP24XX_ST_MPU_WDT_MASK                        (1 << 3)
 #define OMAP24XX_ST_32KSYNC_SHIFT                       1
-#define OMAP24XX_ST_32KSYNC_MASK                        (1 << 1)
-
-/* CM_AUTOIDLE_WKUP */
-#define OMAP24XX_AUTO_OMAPCTRL_MASK                     (1 << 5)
-#define OMAP24XX_AUTO_WDT1_MASK                         (1 << 4)
-#define OMAP24XX_AUTO_MPU_WDT_MASK                      (1 << 3)
-#define OMAP24XX_AUTO_GPIOS_MASK                        (1 << 2)
-#define OMAP24XX_AUTO_32KSYNC_MASK                      (1 << 1)
-#define OMAP24XX_AUTO_GPT1_MASK                         (1 << 0)
-
-/* CM_CLKSEL_WKUP */
-#define OMAP24XX_CLKSEL_GPT1_SHIFT                      0
 #define OMAP24XX_CLKSEL_GPT1_MASK                       (0x3 << 0)
-
-/* CM_CLKEN_PLL */
 #define OMAP24XX_EN_54M_PLL_SHIFT                       6
-#define OMAP24XX_EN_54M_PLL_MASK                        (0x3 << 6)
 #define OMAP24XX_EN_96M_PLL_SHIFT                       2
-#define OMAP24XX_EN_96M_PLL_MASK                        (0x3 << 2)
-#define OMAP24XX_EN_DPLL_SHIFT                          0
 #define OMAP24XX_EN_DPLL_MASK                           (0x3 << 0)
-
-/* CM_IDLEST_CKGEN */
 #define OMAP24XX_ST_54M_APLL_SHIFT                      9
-#define OMAP24XX_ST_54M_APLL_MASK                       (1 << 9)
 #define OMAP24XX_ST_96M_APLL_SHIFT                      8
-#define OMAP24XX_ST_96M_APLL_MASK                       (1 << 8)
-#define OMAP24XX_ST_54M_CLK_MASK                        (1 << 6)
-#define OMAP24XX_ST_12M_CLK_MASK                        (1 << 5)
-#define OMAP24XX_ST_48M_CLK_MASK                        (1 << 4)
-#define OMAP24XX_ST_96M_CLK_MASK                        (1 << 2)
-#define OMAP24XX_ST_CORE_CLK_SHIFT                      0
-#define OMAP24XX_ST_CORE_CLK_MASK                       (0x3 << 0)
-
-/* CM_AUTOIDLE_PLL */
-#define OMAP24XX_AUTO_54M_SHIFT                         6
 #define OMAP24XX_AUTO_54M_MASK                          (0x3 << 6)
-#define OMAP24XX_AUTO_96M_SHIFT                         2
 #define OMAP24XX_AUTO_96M_MASK                          (0x3 << 2)
 #define OMAP24XX_AUTO_DPLL_SHIFT                        0
 #define OMAP24XX_AUTO_DPLL_MASK                         (0x3 << 0)
-
-/* CM_CLKSEL1_PLL */
-#define OMAP2430_MAXDPLLFASTLOCK_SHIFT                  28
-#define OMAP2430_MAXDPLLFASTLOCK_MASK                   (0x7 << 28)
 #define OMAP24XX_APLLS_CLKIN_SHIFT                      23
 #define OMAP24XX_APLLS_CLKIN_MASK                       (0x7 << 23)
-#define OMAP24XX_DPLL_MULT_SHIFT                        12
 #define OMAP24XX_DPLL_MULT_MASK                         (0x3ff << 12)
-#define OMAP24XX_DPLL_DIV_SHIFT                         8
 #define OMAP24XX_DPLL_DIV_MASK                          (0xf << 8)
 #define OMAP24XX_54M_SOURCE_SHIFT                       5
-#define OMAP24XX_54M_SOURCE_MASK                        (1 << 5)
 #define OMAP24XX_54M_SOURCE_WIDTH                       1
 #define OMAP2430_96M_SOURCE_SHIFT                       4
-#define OMAP2430_96M_SOURCE_MASK                        (1 << 4)
 #define OMAP2430_96M_SOURCE_WIDTH                       1
-#define OMAP24XX_48M_SOURCE_SHIFT                       3
 #define OMAP24XX_48M_SOURCE_MASK                        (1 << 3)
-#define OMAP2430_ALTCLK_SOURCE_SHIFT                    0
-#define OMAP2430_ALTCLK_SOURCE_MASK                     (0x7 << 0)
-
-/* CM_CLKSEL2_PLL */
-#define OMAP24XX_CORE_CLK_SRC_SHIFT                     0
 #define OMAP24XX_CORE_CLK_SRC_MASK                      (0x3 << 0)
-
-/* CM_FCLKEN_DSP */
 #define OMAP2420_EN_IVA_COP_SHIFT                       10
-#define OMAP2420_EN_IVA_COP_MASK                        (1 << 10)
 #define OMAP2420_EN_IVA_MPU_SHIFT                       8
-#define OMAP2420_EN_IVA_MPU_MASK                        (1 << 8)
 #define OMAP24XX_CM_FCLKEN_DSP_EN_DSP_SHIFT             0
-#define OMAP24XX_CM_FCLKEN_DSP_EN_DSP_MASK              (1 << 0)
-
-/* CM_ICLKEN_DSP */
 #define OMAP2420_EN_DSP_IPI_SHIFT                       1
-#define OMAP2420_EN_DSP_IPI_MASK                        (1 << 1)
-
-/* CM_IDLEST_DSP */
-#define OMAP2420_ST_IVA_MASK                            (1 << 8)
-#define OMAP2420_ST_IPI_MASK                            (1 << 1)
-#define OMAP24XX_ST_DSP_MASK                            (1 << 0)
-
-/* CM_AUTOIDLE_DSP */
-#define OMAP2420_AUTO_DSP_IPI_MASK                      (1 << 1)
-
-/* CM_CLKSEL_DSP */
-#define OMAP2420_SYNC_IVA_MASK                          (1 << 13)
-#define OMAP2420_CLKSEL_IVA_SHIFT                       8
 #define OMAP2420_CLKSEL_IVA_MASK                        (0x1f << 8)
-#define OMAP24XX_SYNC_DSP_MASK                          (1 << 7)
-#define OMAP24XX_CLKSEL_DSP_IF_SHIFT                    5
 #define OMAP24XX_CLKSEL_DSP_IF_MASK                     (0x3 << 5)
-#define OMAP24XX_CLKSEL_DSP_SHIFT                       0
 #define OMAP24XX_CLKSEL_DSP_MASK                        (0x1f << 0)
-
-/* CM_CLKSTCTRL_DSP */
-#define OMAP2420_AUTOSTATE_IVA_SHIFT                    8
 #define OMAP2420_AUTOSTATE_IVA_MASK                     (1 << 8)
-#define OMAP24XX_AUTOSTATE_DSP_SHIFT                    0
 #define OMAP24XX_AUTOSTATE_DSP_MASK                     (1 << 0)
-
-/* CM_FCLKEN_MDM */
-/* 2430 only */
 #define OMAP2430_EN_OSC_SHIFT                           1
-#define OMAP2430_EN_OSC_MASK                            (1 << 1)
-
-/* CM_ICLKEN_MDM */
-/* 2430 only */
 #define OMAP2430_CM_ICLKEN_MDM_EN_MDM_SHIFT             0
-#define OMAP2430_CM_ICLKEN_MDM_EN_MDM_MASK              (1 << 0)
-
-/* CM_IDLEST_MDM specific bits */
-/* 2430 only */
-
-/* CM_AUTOIDLE_MDM */
-/* 2430 only */
-#define OMAP2430_AUTO_OSC_MASK                          (1 << 1)
-#define OMAP2430_AUTO_MDM_MASK                          (1 << 0)
-
-/* CM_CLKSEL_MDM */
-/* 2430 only */
-#define OMAP2430_SYNC_MDM_MASK                          (1 << 4)
-#define OMAP2430_CLKSEL_MDM_SHIFT                       0
 #define OMAP2430_CLKSEL_MDM_MASK                        (0xf << 0)
-
-/* CM_CLKSTCTRL_MDM */
-/* 2430 only */
-#define OMAP2430_AUTOSTATE_MDM_SHIFT                    0
 #define OMAP2430_AUTOSTATE_MDM_MASK                     (1 << 0)
-
-/* OMAP24XX CM_CLKSTCTRL_*.AUTOSTATE_* register bit values */
 #define OMAP24XX_CLKSTCTRL_DISABLE_AUTO         0x0
 #define OMAP24XX_CLKSTCTRL_ENABLE_AUTO          0x1
-
-
 #endif
diff --git a/arch/arm/mach-omap2/cm-regbits-33xx.h b/arch/arm/mach-omap2/cm-regbits-33xx.h
index adf7bb79b18f..c0823fd6d5e0 100644
--- a/arch/arm/mach-omap2/cm-regbits-33xx.h
+++ b/arch/arm/mach-omap2/cm-regbits-33xx.h
@@ -20,798 +20,49 @@
 #ifndef __ARCH_ARM_MACH_OMAP2_CM_REGBITS_33XX_H
 #define __ARCH_ARM_MACH_OMAP2_CM_REGBITS_33XX_H
 
-/*
- * Used by CM_AUTOIDLE_DPLL_CORE, CM_AUTOIDLE_DPLL_DDR, CM_AUTOIDLE_DPLL_DISP,
- * CM_AUTOIDLE_DPLL_MPU, CM_AUTOIDLE_DPLL_PER
- */
-#define AM33XX_AUTO_DPLL_MODE_SHIFT                     0
-#define AM33XX_AUTO_DPLL_MODE_WIDTH                     3
-#define AM33XX_AUTO_DPLL_MODE_MASK                      (0x7 << 0)
-
-/* Used by CM_WKUP_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_ADC_FCLK_SHIFT               14
-#define AM33XX_CLKACTIVITY_ADC_FCLK_WIDTH               1
-#define AM33XX_CLKACTIVITY_ADC_FCLK_MASK                (1 << 16)
-
-/* Used by CM_PER_L4LS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_CAN_CLK_SHIFT                11
-#define AM33XX_CLKACTIVITY_CAN_CLK_WIDTH                1
-#define AM33XX_CLKACTIVITY_CAN_CLK_MASK                 (1 << 11)
-
-/* Used by CM_PER_CLK_24MHZ_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_CLK_24MHZ_GCLK_SHIFT         4
-#define AM33XX_CLKACTIVITY_CLK_24MHZ_GCLK_WIDTH         1
-#define AM33XX_CLKACTIVITY_CLK_24MHZ_GCLK_MASK          (1 << 4)
-
-/* Used by CM_PER_CPSW_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_CPSW_125MHZ_GCLK_SHIFT       4
-#define AM33XX_CLKACTIVITY_CPSW_125MHZ_GCLK_WIDTH       1
-#define AM33XX_CLKACTIVITY_CPSW_125MHZ_GCLK_MASK        (1 << 4)
-
-/* Used by CM_PER_L4HS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_CPSW_250MHZ_GCLK_SHIFT       4
-#define AM33XX_CLKACTIVITY_CPSW_250MHZ_GCLK_WIDTH       1
-#define AM33XX_CLKACTIVITY_CPSW_250MHZ_GCLK_MASK        (1 << 4)
-
-/* Used by CM_PER_L4HS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_CPSW_50MHZ_GCLK_SHIFT        5
-#define AM33XX_CLKACTIVITY_CPSW_50MHZ_GCLK_WIDTH        1
-#define AM33XX_CLKACTIVITY_CPSW_50MHZ_GCLK_MASK         (1 << 5)
-
-/* Used by CM_PER_L4HS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_CPSW_5MHZ_GCLK_SHIFT         6
-#define AM33XX_CLKACTIVITY_CPSW_5MHZ_GCLK_WIDTH         1
-#define AM33XX_CLKACTIVITY_CPSW_5MHZ_GCLK_MASK          (1 << 6)
-
-/* Used by CM_PER_L3_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_CPTS_RFT_GCLK_SHIFT          6
-#define AM33XX_CLKACTIVITY_CPTS_RFT_GCLK_WIDTH          1
-#define AM33XX_CLKACTIVITY_CPTS_RFT_GCLK_MASK           (1 << 6)
-
-/* Used by CM_CEFUSE_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_CUST_EFUSE_SYS_CLK_SHIFT     9
-#define AM33XX_CLKACTIVITY_CUST_EFUSE_SYS_CLK_WIDTH     1
-#define AM33XX_CLKACTIVITY_CUST_EFUSE_SYS_CLK_MASK      (1 << 9)
-
-/* Used by CM_L3_AON_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_DBGSYSCLK_SHIFT              2
-#define AM33XX_CLKACTIVITY_DBGSYSCLK_WIDTH              1
-#define AM33XX_CLKACTIVITY_DBGSYSCLK_MASK               (1 << 2)
-
-/* Used by CM_L3_AON_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_DEBUG_CLKA_SHIFT             4
-#define AM33XX_CLKACTIVITY_DEBUG_CLKA_WIDTH             1
-#define AM33XX_CLKACTIVITY_DEBUG_CLKA_MASK              (1 << 4)
-
-/* Used by CM_PER_L3_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_EMIF_GCLK_SHIFT              2
-#define AM33XX_CLKACTIVITY_EMIF_GCLK_WIDTH              1
-#define AM33XX_CLKACTIVITY_EMIF_GCLK_MASK               (1 << 2)
-
-/* Used by CM_GFX_L3_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_GFX_FCLK_SHIFT               9
-#define AM33XX_CLKACTIVITY_GFX_FCLK_WIDTH               1
-#define AM33XX_CLKACTIVITY_GFX_FCLK_MASK                (1 << 9)
-
-/* Used by CM_GFX_L3_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_GFX_L3_GCLK_SHIFT            8
-#define AM33XX_CLKACTIVITY_GFX_L3_GCLK_WIDTH            1
-#define AM33XX_CLKACTIVITY_GFX_L3_GCLK_MASK             (1 << 8)
-
-/* Used by CM_WKUP_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_GPIO0_GDBCLK_SHIFT           8
-#define AM33XX_CLKACTIVITY_GPIO0_GDBCLK_WIDTH           1
-#define AM33XX_CLKACTIVITY_GPIO0_GDBCLK_MASK            (1 << 8)
-
-/* Used by CM_PER_L4LS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_GPIO_1_GDBCLK_SHIFT          19
-#define AM33XX_CLKACTIVITY_GPIO_1_GDBCLK_WIDTH          1
-#define AM33XX_CLKACTIVITY_GPIO_1_GDBCLK_MASK           (1 << 19)
-
-/* Used by CM_PER_L4LS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_GPIO_2_GDBCLK_SHIFT          20
-#define AM33XX_CLKACTIVITY_GPIO_2_GDBCLK_WIDTH          1
-#define AM33XX_CLKACTIVITY_GPIO_2_GDBCLK_MASK           (1 << 20)
-
-/* Used by CM_PER_L4LS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_GPIO_3_GDBCLK_SHIFT          21
-#define AM33XX_CLKACTIVITY_GPIO_3_GDBCLK_WIDTH          1
-#define AM33XX_CLKACTIVITY_GPIO_3_GDBCLK_MASK           (1 << 21)
-
-/* Used by CM_PER_L4LS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_GPIO_4_GDBCLK_SHIFT          22
-#define AM33XX_CLKACTIVITY_GPIO_4_GDBCLK_WIDTH          1
-#define AM33XX_CLKACTIVITY_GPIO_4_GDBCLK_MASK           (1 << 22)
-
-/* Used by CM_PER_L4LS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_GPIO_5_GDBCLK_SHIFT          26
-#define AM33XX_CLKACTIVITY_GPIO_5_GDBCLK_WIDTH          1
-#define AM33XX_CLKACTIVITY_GPIO_5_GDBCLK_MASK           (1 << 26)
-
-/* Used by CM_PER_L4LS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_GPIO_6_GDBCLK_SHIFT          18
-#define AM33XX_CLKACTIVITY_GPIO_6_GDBCLK_WIDTH          1
-#define AM33XX_CLKACTIVITY_GPIO_6_GDBCLK_MASK           (1 << 18)
-
-/* Used by CM_WKUP_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_I2C0_GFCLK_SHIFT             11
-#define AM33XX_CLKACTIVITY_I2C0_GFCLK_WIDTH             1
-#define AM33XX_CLKACTIVITY_I2C0_GFCLK_MASK              (1 << 11)
-
-/* Used by CM_PER_L4LS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_I2C_FCLK_SHIFT               24
-#define AM33XX_CLKACTIVITY_I2C_FCLK_WIDTH               1
-#define AM33XX_CLKACTIVITY_I2C_FCLK_MASK                (1 << 24)
-
-/* Used by CM_PER_PRUSS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_PRUSS_IEP_GCLK_SHIFT         5
-#define AM33XX_CLKACTIVITY_PRUSS_IEP_GCLK_WIDTH         1
-#define AM33XX_CLKACTIVITY_PRUSS_IEP_GCLK_MASK          (1 << 5)
-
-/* Used by CM_PER_PRUSS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_PRUSS_OCP_GCLK_SHIFT         4
-#define AM33XX_CLKACTIVITY_PRUSS_OCP_GCLK_WIDTH         1
-#define AM33XX_CLKACTIVITY_PRUSS_OCP_GCLK_MASK          (1 << 4)
-
-/* Used by CM_PER_PRUSS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_PRUSS_UART_GCLK_SHIFT        6
-#define AM33XX_CLKACTIVITY_PRUSS_UART_GCLK_WIDTH        1
-#define AM33XX_CLKACTIVITY_PRUSS_UART_GCLK_MASK         (1 << 6)
-
-/* Used by CM_PER_L3S_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_L3S_GCLK_SHIFT               3
-#define AM33XX_CLKACTIVITY_L3S_GCLK_WIDTH               1
-#define AM33XX_CLKACTIVITY_L3S_GCLK_MASK                (1 << 3)
-
-/* Used by CM_L3_AON_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_L3_AON_GCLK_SHIFT            3
-#define AM33XX_CLKACTIVITY_L3_AON_GCLK_WIDTH            1
-#define AM33XX_CLKACTIVITY_L3_AON_GCLK_MASK             (1 << 3)
-
-/* Used by CM_PER_L3_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_L3_GCLK_SHIFT                4
-#define AM33XX_CLKACTIVITY_L3_GCLK_WIDTH                1
-#define AM33XX_CLKACTIVITY_L3_GCLK_MASK                 (1 << 4)
-
-/* Used by CM_PER_L4FW_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_L4FW_GCLK_SHIFT              8
-#define AM33XX_CLKACTIVITY_L4FW_GCLK_WIDTH              1
-#define AM33XX_CLKACTIVITY_L4FW_GCLK_MASK               (1 << 8)
-
-/* Used by CM_PER_L4HS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_L4HS_GCLK_SHIFT              3
-#define AM33XX_CLKACTIVITY_L4HS_GCLK_WIDTH              1
-#define AM33XX_CLKACTIVITY_L4HS_GCLK_MASK               (1 << 3)
-
-/* Used by CM_PER_L4LS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_L4LS_GCLK_SHIFT              8
-#define AM33XX_CLKACTIVITY_L4LS_GCLK_WIDTH              1
-#define AM33XX_CLKACTIVITY_L4LS_GCLK_MASK               (1 << 8)
-
-/* Used by CM_GFX_L4LS_GFX_CLKSTCTRL__1 */
-#define AM33XX_CLKACTIVITY_L4LS_GFX_GCLK_SHIFT          8
-#define AM33XX_CLKACTIVITY_L4LS_GFX_GCLK_WIDTH          1
-#define AM33XX_CLKACTIVITY_L4LS_GFX_GCLK_MASK           (1 << 8)
-
-/* Used by CM_CEFUSE_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_L4_CEFUSE_GICLK_SHIFT        8
-#define AM33XX_CLKACTIVITY_L4_CEFUSE_GICLK_WIDTH        1
-#define AM33XX_CLKACTIVITY_L4_CEFUSE_GICLK_MASK         (1 << 8)
-
-/* Used by CM_RTC_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_L4_RTC_GCLK_SHIFT            8
-#define AM33XX_CLKACTIVITY_L4_RTC_GCLK_WIDTH            1
-#define AM33XX_CLKACTIVITY_L4_RTC_GCLK_MASK             (1 << 8)
-
-/* Used by CM_L4_WKUP_AON_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_L4_WKUP_AON_GCLK_SHIFT       2
-#define AM33XX_CLKACTIVITY_L4_WKUP_AON_GCLK_WIDTH       1
-#define AM33XX_CLKACTIVITY_L4_WKUP_AON_GCLK_MASK        (1 << 2)
-
-/* Used by CM_WKUP_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_L4_WKUP_GCLK_SHIFT           2
-#define AM33XX_CLKACTIVITY_L4_WKUP_GCLK_WIDTH           1
-#define AM33XX_CLKACTIVITY_L4_WKUP_GCLK_MASK            (1 << 2)
-
-/* Used by CM_PER_L4LS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_LCDC_GCLK_SHIFT              17
-#define AM33XX_CLKACTIVITY_LCDC_GCLK_WIDTH              1
-#define AM33XX_CLKACTIVITY_LCDC_GCLK_MASK               (1 << 17)
-
-/* Used by CM_PER_LCDC_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_LCDC_L3_OCP_GCLK_SHIFT       4
-#define AM33XX_CLKACTIVITY_LCDC_L3_OCP_GCLK_WIDTH       1
-#define AM33XX_CLKACTIVITY_LCDC_L3_OCP_GCLK_MASK        (1 << 4)
-
-/* Used by CM_PER_LCDC_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_LCDC_L4_OCP_GCLK_SHIFT       5
-#define AM33XX_CLKACTIVITY_LCDC_L4_OCP_GCLK_WIDTH       1
-#define AM33XX_CLKACTIVITY_LCDC_L4_OCP_GCLK_MASK        (1 << 5)
-
-/* Used by CM_PER_L3_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_MCASP_GCLK_SHIFT             7
-#define AM33XX_CLKACTIVITY_MCASP_GCLK_WIDTH             1
-#define AM33XX_CLKACTIVITY_MCASP_GCLK_MASK              (1 << 7)
-
-/* Used by CM_PER_L3_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_MMC_FCLK_SHIFT               3
-#define AM33XX_CLKACTIVITY_MMC_FCLK_WIDTH               1
-#define AM33XX_CLKACTIVITY_MMC_FCLK_MASK                (1 << 3)
-
-/* Used by CM_MPU_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_MPU_CLK_SHIFT                2
-#define AM33XX_CLKACTIVITY_MPU_CLK_WIDTH                1
-#define AM33XX_CLKACTIVITY_MPU_CLK_MASK                 (1 << 2)
-
-/* Used by CM_PER_OCPWP_L3_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_OCPWP_L3_GCLK_SHIFT          4
-#define AM33XX_CLKACTIVITY_OCPWP_L3_GCLK_WIDTH          1
-#define AM33XX_CLKACTIVITY_OCPWP_L3_GCLK_MASK           (1 << 4)
-
-/* Used by CM_PER_OCPWP_L3_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_OCPWP_L4_GCLK_SHIFT          5
-#define AM33XX_CLKACTIVITY_OCPWP_L4_GCLK_WIDTH          1
-#define AM33XX_CLKACTIVITY_OCPWP_L4_GCLK_MASK           (1 << 5)
-
-/* Used by CM_RTC_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_RTC_32KCLK_SHIFT             9
-#define AM33XX_CLKACTIVITY_RTC_32KCLK_WIDTH             1
-#define AM33XX_CLKACTIVITY_RTC_32KCLK_MASK              (1 << 9)
-
-/* Used by CM_PER_L4LS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_SPI_GCLK_SHIFT               25
-#define AM33XX_CLKACTIVITY_SPI_GCLK_WIDTH               1
-#define AM33XX_CLKACTIVITY_SPI_GCLK_MASK                (1 << 25)
-
-/* Used by CM_WKUP_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_SR_SYSCLK_SHIFT              3
-#define AM33XX_CLKACTIVITY_SR_SYSCLK_WIDTH              1
-#define AM33XX_CLKACTIVITY_SR_SYSCLK_MASK               (1 << 3)
-
-/* Used by CM_WKUP_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_TIMER0_GCLK_SHIFT            10
-#define AM33XX_CLKACTIVITY_TIMER0_GCLK_WIDTH            1
-#define AM33XX_CLKACTIVITY_TIMER0_GCLK_MASK             (1 << 10)
-
-/* Used by CM_WKUP_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_TIMER1_GCLK_SHIFT            13
-#define AM33XX_CLKACTIVITY_TIMER1_GCLK_WIDTH            1
-#define AM33XX_CLKACTIVITY_TIMER1_GCLK_MASK             (1 << 13)
-
-/* Used by CM_PER_L4LS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_TIMER2_GCLK_SHIFT            14
-#define AM33XX_CLKACTIVITY_TIMER2_GCLK_WIDTH            1
-#define AM33XX_CLKACTIVITY_TIMER2_GCLK_MASK             (1 << 14)
-
-/* Used by CM_PER_L4LS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_TIMER3_GCLK_SHIFT            15
-#define AM33XX_CLKACTIVITY_TIMER3_GCLK_WIDTH            1
-#define AM33XX_CLKACTIVITY_TIMER3_GCLK_MASK             (1 << 15)
-
-/* Used by CM_PER_L4LS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_TIMER4_GCLK_SHIFT            16
-#define AM33XX_CLKACTIVITY_TIMER4_GCLK_WIDTH            1
-#define AM33XX_CLKACTIVITY_TIMER4_GCLK_MASK             (1 << 16)
-
-/* Used by CM_PER_L4LS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_TIMER5_GCLK_SHIFT            27
-#define AM33XX_CLKACTIVITY_TIMER5_GCLK_WIDTH            1
-#define AM33XX_CLKACTIVITY_TIMER5_GCLK_MASK             (1 << 27)
-
-/* Used by CM_PER_L4LS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_TIMER6_GCLK_SHIFT            28
-#define AM33XX_CLKACTIVITY_TIMER6_GCLK_WIDTH            1
-#define AM33XX_CLKACTIVITY_TIMER6_GCLK_MASK             (1 << 28)
-
-/* Used by CM_PER_L4LS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_TIMER7_GCLK_SHIFT            13
-#define AM33XX_CLKACTIVITY_TIMER7_GCLK_WIDTH            1
-#define AM33XX_CLKACTIVITY_TIMER7_GCLK_MASK             (1 << 13)
-
-/* Used by CM_WKUP_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_UART0_GFCLK_SHIFT            12
-#define AM33XX_CLKACTIVITY_UART0_GFCLK_WIDTH            1
-#define AM33XX_CLKACTIVITY_UART0_GFCLK_MASK             (1 << 12)
-
-/* Used by CM_PER_L4LS_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_UART_GFCLK_SHIFT             10
-#define AM33XX_CLKACTIVITY_UART_GFCLK_WIDTH             1
-#define AM33XX_CLKACTIVITY_UART_GFCLK_MASK              (1 << 10)
-
-/* Used by CM_WKUP_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_WDT0_GCLK_SHIFT              9
-#define AM33XX_CLKACTIVITY_WDT0_GCLK_WIDTH              1
-#define AM33XX_CLKACTIVITY_WDT0_GCLK_MASK               (1 << 9)
-
-/* Used by CM_WKUP_CLKSTCTRL */
-#define AM33XX_CLKACTIVITY_WDT1_GCLK_SHIFT              4
-#define AM33XX_CLKACTIVITY_WDT1_GCLK_WIDTH              1
-#define AM33XX_CLKACTIVITY_WDT1_GCLK_MASK               (1 << 4)
-
-/* Used by CLKSEL_GFX_FCLK */
-#define AM33XX_CLKDIV_SEL_GFX_FCLK_SHIFT                0
-#define AM33XX_CLKDIV_SEL_GFX_FCLK_WIDTH                1
-#define AM33XX_CLKDIV_SEL_GFX_FCLK_MASK                 (1 << 0)
-
-/* Used by CM_CLKOUT_CTRL */
 #define AM33XX_CLKOUT2DIV_SHIFT                         3
 #define AM33XX_CLKOUT2DIV_WIDTH                         3
-#define AM33XX_CLKOUT2DIV_MASK                          (0x7 << 3)
-
-/* Used by CM_CLKOUT_CTRL */
 #define AM33XX_CLKOUT2EN_SHIFT                          7
-#define AM33XX_CLKOUT2EN_WIDTH                          1
-#define AM33XX_CLKOUT2EN_MASK                           (1 << 7)
-
-/* Used by CM_CLKOUT_CTRL */
-#define AM33XX_CLKOUT2SOURCE_SHIFT                      0
-#define AM33XX_CLKOUT2SOURCE_WIDTH                      3
 #define AM33XX_CLKOUT2SOURCE_MASK                       (0x7 << 0)
-
-/*
- * Used by CLKSEL_GPIO0_DBCLK, CLKSEL_LCDC_PIXEL_CLK, CLKSEL_TIMER2_CLK,
- * CLKSEL_TIMER3_CLK, CLKSEL_TIMER4_CLK, CLKSEL_TIMER5_CLK, CLKSEL_TIMER6_CLK,
- * CLKSEL_TIMER7_CLK
- */
-#define AM33XX_CLKSEL_SHIFT                             0
-#define AM33XX_CLKSEL_WIDTH                             1
-#define AM33XX_CLKSEL_MASK                              (0x01 << 0)
-
-/*
- * Renamed from CLKSEL Used by CLKSEL_PRUSS_OCP_CLK, CLKSEL_WDT1_CLK,
- * CM_CPTS_RFT_CLKSEL
- */
 #define AM33XX_CLKSEL_0_0_SHIFT                         0
 #define AM33XX_CLKSEL_0_0_WIDTH                         1
 #define AM33XX_CLKSEL_0_0_MASK                          (1 << 0)
-
-#define AM33XX_CLKSEL_0_1_SHIFT                         0
-#define AM33XX_CLKSEL_0_1_WIDTH                         2
 #define AM33XX_CLKSEL_0_1_MASK                          (3 << 0)
-
-/* Renamed from CLKSEL Used by CLKSEL_TIMER1MS_CLK */
-#define AM33XX_CLKSEL_0_2_SHIFT                         0
-#define AM33XX_CLKSEL_0_2_WIDTH                         3
 #define AM33XX_CLKSEL_0_2_MASK                          (7 << 0)
-
-/* Used by CLKSEL_GFX_FCLK */
-#define AM33XX_CLKSEL_GFX_FCLK_SHIFT                    1
-#define AM33XX_CLKSEL_GFX_FCLK_WIDTH                    1
 #define AM33XX_CLKSEL_GFX_FCLK_MASK                     (1 << 1)
-
-/*
- * Used by CM_MPU_CLKSTCTRL, CM_RTC_CLKSTCTRL, CM_PER_CLK_24MHZ_CLKSTCTRL,
- * CM_PER_CPSW_CLKSTCTRL, CM_PER_PRUSS_CLKSTCTRL, CM_PER_L3S_CLKSTCTRL,
- * CM_PER_L3_CLKSTCTRL, CM_PER_L4FW_CLKSTCTRL, CM_PER_L4HS_CLKSTCTRL,
- * CM_PER_L4LS_CLKSTCTRL, CM_PER_LCDC_CLKSTCTRL, CM_PER_OCPWP_L3_CLKSTCTRL,
- * CM_L3_AON_CLKSTCTRL, CM_L4_WKUP_AON_CLKSTCTRL, CM_WKUP_CLKSTCTRL,
- * CM_GFX_L3_CLKSTCTRL, CM_GFX_L4LS_GFX_CLKSTCTRL__1, CM_CEFUSE_CLKSTCTRL
- */
 #define AM33XX_CLKTRCTRL_SHIFT                          0
-#define AM33XX_CLKTRCTRL_WIDTH                          2
 #define AM33XX_CLKTRCTRL_MASK                           (0x3 << 0)
-
-/*
- * Used by CM_SSC_DELTAMSTEP_DPLL_CORE, CM_SSC_DELTAMSTEP_DPLL_DDR,
- * CM_SSC_DELTAMSTEP_DPLL_DISP, CM_SSC_DELTAMSTEP_DPLL_MPU,
- * CM_SSC_DELTAMSTEP_DPLL_PER
- */
-#define AM33XX_DELTAMSTEP_SHIFT                         0
-#define AM33XX_DELTAMSTEP_WIDTH                         20
-#define AM33XX_DELTAMSTEP_MASK                          (0xfffff << 0)
-
-/* Used by CM_CLKSEL_DPLL_DDR, CM_CLKSEL_DPLL_DISP, CM_CLKSEL_DPLL_MPU */
-#define AM33XX_DPLL_BYP_CLKSEL_SHIFT                    23
-#define AM33XX_DPLL_BYP_CLKSEL_WIDTH                    1
-#define AM33XX_DPLL_BYP_CLKSEL_MASK                     (1 << 23)
-
-/* Used by CM_CLKDCOLDO_DPLL_PER */
-#define AM33XX_DPLL_CLKDCOLDO_GATE_CTRL_SHIFT           8
-#define AM33XX_DPLL_CLKDCOLDO_GATE_CTRL_WIDTH           1
-#define AM33XX_DPLL_CLKDCOLDO_GATE_CTRL_MASK            (1 << 8)
-
-/* Used by CM_CLKDCOLDO_DPLL_PER */
-#define AM33XX_DPLL_CLKDCOLDO_PWDN_SHIFT                12
-#define AM33XX_DPLL_CLKDCOLDO_PWDN_WIDTH                1
-#define AM33XX_DPLL_CLKDCOLDO_PWDN_MASK                 (1 << 12)
-
-/* Used by CM_DIV_M2_DPLL_DDR, CM_DIV_M2_DPLL_DISP, CM_DIV_M2_DPLL_MPU */
 #define AM33XX_DPLL_CLKOUT_DIV_SHIFT                    0
 #define AM33XX_DPLL_CLKOUT_DIV_WIDTH                    5
-#define AM33XX_DPLL_CLKOUT_DIV_MASK                     (0x1f << 0)
-
-/* Renamed from DPLL_CLKOUT_DIV Used by CM_DIV_M2_DPLL_PER */
-#define AM33XX_DPLL_CLKOUT_DIV_0_6_SHIFT                0
-#define AM33XX_DPLL_CLKOUT_DIV_0_6_WIDTH                7
-#define AM33XX_DPLL_CLKOUT_DIV_0_6_MASK                 (0x7f << 0)
-
-/* Used by CM_DIV_M2_DPLL_DDR, CM_DIV_M2_DPLL_DISP, CM_DIV_M2_DPLL_MPU */
-#define AM33XX_DPLL_CLKOUT_DIVCHACK_SHIFT               5
-#define AM33XX_DPLL_CLKOUT_DIVCHACK_WIDTH               1
-#define AM33XX_DPLL_CLKOUT_DIVCHACK_MASK                (1 << 5)
-
-/* Renamed from DPLL_CLKOUT_DIVCHACK Used by CM_DIV_M2_DPLL_PER */
-#define AM33XX_DPLL_CLKOUT_DIVCHACK_M2_PER_SHIFT        7
-#define AM33XX_DPLL_CLKOUT_DIVCHACK_M2_PER_WIDTH        1
-#define AM33XX_DPLL_CLKOUT_DIVCHACK_M2_PER_MASK         (1 << 7)
-
-/*
- * Used by CM_DIV_M2_DPLL_DDR, CM_DIV_M2_DPLL_DISP, CM_DIV_M2_DPLL_MPU,
- * CM_DIV_M2_DPLL_PER
- */
-#define AM33XX_DPLL_CLKOUT_GATE_CTRL_SHIFT              8
-#define AM33XX_DPLL_CLKOUT_GATE_CTRL_WIDTH              1
-#define AM33XX_DPLL_CLKOUT_GATE_CTRL_MASK               (1 << 8)
-
-/*
- * Used by CM_CLKSEL_DPLL_CORE, CM_CLKSEL_DPLL_DDR, CM_CLKSEL_DPLL_DISP,
- * CM_CLKSEL_DPLL_MPU
- */
-#define AM33XX_DPLL_DIV_SHIFT                           0
-#define AM33XX_DPLL_DIV_WIDTH                           7
 #define AM33XX_DPLL_DIV_MASK                            (0x7f << 0)
-
 #define AM33XX_DPLL_PER_DIV_MASK                        (0xff << 0)
-
-/* Renamed from DPLL_DIV Used by CM_CLKSEL_DPLL_PERIPH */
-#define AM33XX_DPLL_DIV_0_7_SHIFT                       0
-#define AM33XX_DPLL_DIV_0_7_WIDTH                       8
-#define AM33XX_DPLL_DIV_0_7_MASK                        (0xff << 0)
-
-/*
- * Used by CM_CLKMODE_DPLL_CORE, CM_CLKMODE_DPLL_DDR, CM_CLKMODE_DPLL_DISP,
- * CM_CLKMODE_DPLL_MPU
- */
-#define AM33XX_DPLL_DRIFTGUARD_EN_SHIFT                 8
-#define AM33XX_DPLL_DRIFTGUARD_EN_WIDTH                 1
-#define AM33XX_DPLL_DRIFTGUARD_EN_MASK                  (1 << 8)
-
-/*
- * Used by CM_CLKMODE_DPLL_CORE, CM_CLKMODE_DPLL_DDR, CM_CLKMODE_DPLL_DISP,
- * CM_CLKMODE_DPLL_MPU, CM_CLKMODE_DPLL_PER
- */
-#define AM33XX_DPLL_EN_SHIFT                            0
-#define AM33XX_DPLL_EN_WIDTH                            3
 #define AM33XX_DPLL_EN_MASK                             (0x7 << 0)
-
-/*
- * Used by CM_CLKMODE_DPLL_CORE, CM_CLKMODE_DPLL_DDR, CM_CLKMODE_DPLL_DISP,
- * CM_CLKMODE_DPLL_MPU
- */
-#define AM33XX_DPLL_LPMODE_EN_SHIFT                     10
-#define AM33XX_DPLL_LPMODE_EN_WIDTH                     1
-#define AM33XX_DPLL_LPMODE_EN_MASK                      (1 << 10)
-
-/*
- * Used by CM_CLKSEL_DPLL_CORE, CM_CLKSEL_DPLL_DDR, CM_CLKSEL_DPLL_DISP,
- * CM_CLKSEL_DPLL_MPU
- */
-#define AM33XX_DPLL_MULT_SHIFT                          8
-#define AM33XX_DPLL_MULT_WIDTH                          11
 #define AM33XX_DPLL_MULT_MASK                           (0x7ff << 8)
-
-/* Renamed from DPLL_MULT Used by CM_CLKSEL_DPLL_PERIPH */
-#define AM33XX_DPLL_MULT_PERIPH_SHIFT                   8
-#define AM33XX_DPLL_MULT_PERIPH_WIDTH                   12
 #define AM33XX_DPLL_MULT_PERIPH_MASK                    (0xfff << 8)
-
-/*
- * Used by CM_CLKMODE_DPLL_CORE, CM_CLKMODE_DPLL_DDR, CM_CLKMODE_DPLL_DISP,
- * CM_CLKMODE_DPLL_MPU
- */
-#define AM33XX_DPLL_REGM4XEN_SHIFT                      11
-#define AM33XX_DPLL_REGM4XEN_WIDTH                      1
-#define AM33XX_DPLL_REGM4XEN_MASK                       (1 << 11)
-
-/* Used by CM_CLKSEL_DPLL_PERIPH */
-#define AM33XX_DPLL_SD_DIV_SHIFT                        24
-#define AM33XX_DPLL_SD_DIV_WIDTH                        8
-#define AM33XX_DPLL_SD_DIV_MASK                         (0xff << 24)
-
-/*
- * Used by CM_CLKMODE_DPLL_CORE, CM_CLKMODE_DPLL_DDR, CM_CLKMODE_DPLL_DISP,
- * CM_CLKMODE_DPLL_MPU, CM_CLKMODE_DPLL_PER
- */
-#define AM33XX_DPLL_SSC_ACK_SHIFT                       13
-#define AM33XX_DPLL_SSC_ACK_WIDTH                       1
-#define AM33XX_DPLL_SSC_ACK_MASK                        (1 << 13)
-
-/*
- * Used by CM_CLKMODE_DPLL_CORE, CM_CLKMODE_DPLL_DDR, CM_CLKMODE_DPLL_DISP,
- * CM_CLKMODE_DPLL_MPU, CM_CLKMODE_DPLL_PER
- */
-#define AM33XX_DPLL_SSC_DOWNSPREAD_SHIFT                14
-#define AM33XX_DPLL_SSC_DOWNSPREAD_WIDTH                1
-#define AM33XX_DPLL_SSC_DOWNSPREAD_MASK                 (1 << 14)
-
-/*
- * Used by CM_CLKMODE_DPLL_CORE, CM_CLKMODE_DPLL_DDR, CM_CLKMODE_DPLL_DISP,
- * CM_CLKMODE_DPLL_MPU, CM_CLKMODE_DPLL_PER
- */
-#define AM33XX_DPLL_SSC_EN_SHIFT                        12
-#define AM33XX_DPLL_SSC_EN_WIDTH                        1
-#define AM33XX_DPLL_SSC_EN_MASK                         (1 << 12)
-
-/* Used by CM_DIV_M4_DPLL_CORE */
 #define AM33XX_HSDIVIDER_CLKOUT1_DIV_SHIFT              0
 #define AM33XX_HSDIVIDER_CLKOUT1_DIV_WIDTH              5
-#define AM33XX_HSDIVIDER_CLKOUT1_DIV_MASK               (0x1f << 0)
-
-/* Used by CM_DIV_M4_DPLL_CORE */
-#define AM33XX_HSDIVIDER_CLKOUT1_DIVCHACK_SHIFT         5
-#define AM33XX_HSDIVIDER_CLKOUT1_DIVCHACK_WIDTH         1
-#define AM33XX_HSDIVIDER_CLKOUT1_DIVCHACK_MASK          (1 << 5)
-
-/* Used by CM_DIV_M4_DPLL_CORE */
-#define AM33XX_HSDIVIDER_CLKOUT1_GATE_CTRL_SHIFT        8
-#define AM33XX_HSDIVIDER_CLKOUT1_GATE_CTRL_WIDTH        1
-#define AM33XX_HSDIVIDER_CLKOUT1_GATE_CTRL_MASK         (1 << 8)
-
-/* Used by CM_DIV_M4_DPLL_CORE */
-#define AM33XX_HSDIVIDER_CLKOUT1_PWDN_SHIFT             12
-#define AM33XX_HSDIVIDER_CLKOUT1_PWDN_WIDTH             1
-#define AM33XX_HSDIVIDER_CLKOUT1_PWDN_MASK              (1 << 12)
-
-/* Used by CM_DIV_M5_DPLL_CORE */
 #define AM33XX_HSDIVIDER_CLKOUT2_DIV_SHIFT              0
 #define AM33XX_HSDIVIDER_CLKOUT2_DIV_WIDTH              5
-#define AM33XX_HSDIVIDER_CLKOUT2_DIV_MASK               (0x1f << 0)
-
-/* Used by CM_DIV_M5_DPLL_CORE */
-#define AM33XX_HSDIVIDER_CLKOUT2_DIVCHACK_SHIFT         5
-#define AM33XX_HSDIVIDER_CLKOUT2_DIVCHACK_WIDTH         1
-#define AM33XX_HSDIVIDER_CLKOUT2_DIVCHACK_MASK          (1 << 5)
-
-/* Used by CM_DIV_M5_DPLL_CORE */
-#define AM33XX_HSDIVIDER_CLKOUT2_GATE_CTRL_SHIFT        8
-#define AM33XX_HSDIVIDER_CLKOUT2_GATE_CTRL_WIDTH        1
-#define AM33XX_HSDIVIDER_CLKOUT2_GATE_CTRL_MASK         (1 << 8)
-
-/* Used by CM_DIV_M5_DPLL_CORE */
-#define AM33XX_HSDIVIDER_CLKOUT2_PWDN_SHIFT             12
-#define AM33XX_HSDIVIDER_CLKOUT2_PWDN_WIDTH             1
-#define AM33XX_HSDIVIDER_CLKOUT2_PWDN_MASK              (1 << 12)
-
-/* Used by CM_DIV_M6_DPLL_CORE */
 #define AM33XX_HSDIVIDER_CLKOUT3_DIV_SHIFT              0
 #define AM33XX_HSDIVIDER_CLKOUT3_DIV_WIDTH              5
-#define AM33XX_HSDIVIDER_CLKOUT3_DIV_MASK               (0x1f << 0)
-
-/* Used by CM_DIV_M6_DPLL_CORE */
-#define AM33XX_HSDIVIDER_CLKOUT3_DIVCHACK_SHIFT         5
-#define AM33XX_HSDIVIDER_CLKOUT3_DIVCHACK_WIDTH         1
-#define AM33XX_HSDIVIDER_CLKOUT3_DIVCHACK_MASK          (1 << 5)
-
-/* Used by CM_DIV_M6_DPLL_CORE */
-#define AM33XX_HSDIVIDER_CLKOUT3_GATE_CTRL_SHIFT        8
-#define AM33XX_HSDIVIDER_CLKOUT3_GATE_CTRL_WIDTH        1
-#define AM33XX_HSDIVIDER_CLKOUT3_GATE_CTRL_MASK         (1 << 8)
-
-/* Used by CM_DIV_M6_DPLL_CORE */
-#define AM33XX_HSDIVIDER_CLKOUT3_PWDN_SHIFT             12
-#define AM33XX_HSDIVIDER_CLKOUT3_PWDN_WIDTH             1
-#define AM33XX_HSDIVIDER_CLKOUT3_PWDN_MASK              (1 << 12)
-
-/*
- * Used by CM_MPU_MPU_CLKCTRL, CM_RTC_RTC_CLKCTRL, CM_PER_AES0_CLKCTRL,
- * CM_PER_AES1_CLKCTRL, CM_PER_CLKDIV32K_CLKCTRL, CM_PER_CPGMAC0_CLKCTRL,
- * CM_PER_DCAN0_CLKCTRL, CM_PER_DCAN1_CLKCTRL, CM_PER_DES_CLKCTRL,
- * CM_PER_ELM_CLKCTRL, CM_PER_EMIF_CLKCTRL, CM_PER_EMIF_FW_CLKCTRL,
- * CM_PER_EPWMSS0_CLKCTRL, CM_PER_EPWMSS1_CLKCTRL, CM_PER_EPWMSS2_CLKCTRL,
- * CM_PER_GPIO1_CLKCTRL, CM_PER_GPIO2_CLKCTRL, CM_PER_GPIO3_CLKCTRL,
- * CM_PER_GPIO4_CLKCTRL, CM_PER_GPIO5_CLKCTRL, CM_PER_GPIO6_CLKCTRL,
- * CM_PER_GPMC_CLKCTRL, CM_PER_I2C1_CLKCTRL, CM_PER_I2C2_CLKCTRL,
- * CM_PER_PRUSS_CLKCTRL, CM_PER_IEEE5000_CLKCTRL, CM_PER_L3_CLKCTRL,
- * CM_PER_L3_INSTR_CLKCTRL, CM_PER_L4FW_CLKCTRL, CM_PER_L4HS_CLKCTRL,
- * CM_PER_L4LS_CLKCTRL, CM_PER_LCDC_CLKCTRL, CM_PER_MAILBOX0_CLKCTRL,
- * CM_PER_MAILBOX1_CLKCTRL, CM_PER_MCASP0_CLKCTRL, CM_PER_MCASP1_CLKCTRL,
- * CM_PER_MCASP2_CLKCTRL, CM_PER_MLB_CLKCTRL, CM_PER_MMC0_CLKCTRL,
- * CM_PER_MMC1_CLKCTRL, CM_PER_MMC2_CLKCTRL, CM_PER_MSTR_EXPS_CLKCTRL,
- * CM_PER_OCMCRAM_CLKCTRL, CM_PER_OCPWP_CLKCTRL, CM_PER_PCIE_CLKCTRL,
- * CM_PER_PKA_CLKCTRL, CM_PER_RNG_CLKCTRL, CM_PER_SHA0_CLKCTRL,
- * CM_PER_SLV_EXPS_CLKCTRL, CM_PER_SPARE0_CLKCTRL, CM_PER_SPARE1_CLKCTRL,
- * CM_PER_SPARE_CLKCTRL, CM_PER_SPI0_CLKCTRL, CM_PER_SPI1_CLKCTRL,
- * CM_PER_SPI2_CLKCTRL, CM_PER_SPI3_CLKCTRL, CM_PER_SPINLOCK_CLKCTRL,
- * CM_PER_TIMER2_CLKCTRL, CM_PER_TIMER3_CLKCTRL, CM_PER_TIMER4_CLKCTRL,
- * CM_PER_TIMER5_CLKCTRL, CM_PER_TIMER6_CLKCTRL, CM_PER_TIMER7_CLKCTRL,
- * CM_PER_TPCC_CLKCTRL, CM_PER_TPTC0_CLKCTRL, CM_PER_TPTC1_CLKCTRL,
- * CM_PER_TPTC2_CLKCTRL, CM_PER_UART1_CLKCTRL, CM_PER_UART2_CLKCTRL,
- * CM_PER_UART3_CLKCTRL, CM_PER_UART4_CLKCTRL, CM_PER_UART5_CLKCTRL,
- * CM_PER_USB0_CLKCTRL, CM_WKUP_ADC_TSC_CLKCTRL, CM_WKUP_CONTROL_CLKCTRL,
- * CM_WKUP_DEBUGSS_CLKCTRL, CM_WKUP_GPIO0_CLKCTRL, CM_WKUP_I2C0_CLKCTRL,
- * CM_WKUP_L4WKUP_CLKCTRL, CM_WKUP_SMARTREFLEX0_CLKCTRL,
- * CM_WKUP_SMARTREFLEX1_CLKCTRL, CM_WKUP_TIMER0_CLKCTRL,
- * CM_WKUP_TIMER1_CLKCTRL, CM_WKUP_UART0_CLKCTRL, CM_WKUP_WDT0_CLKCTRL,
- * CM_WKUP_WDT1_CLKCTRL, CM_GFX_BITBLT_CLKCTRL, CM_GFX_GFX_CLKCTRL,
- * CM_GFX_MMUCFG_CLKCTRL, CM_GFX_MMUDATA_CLKCTRL, CM_CEFUSE_CEFUSE_CLKCTRL
- */
 #define AM33XX_IDLEST_SHIFT                             16
-#define AM33XX_IDLEST_WIDTH                             2
 #define AM33XX_IDLEST_MASK                              (0x3 << 16)
-
-/* Used by CM_MAC_CLKSEL */
-#define AM33XX_MII_CLK_SEL_SHIFT                        2
-#define AM33XX_MII_CLK_SEL_WIDTH                        1
-#define AM33XX_MII_CLK_SEL_MASK                         (1 << 2)
-
-/*
- * Used by CM_SSC_MODFREQDIV_DPLL_CORE, CM_SSC_MODFREQDIV_DPLL_DDR,
- * CM_SSC_MODFREQDIV_DPLL_DISP, CM_SSC_MODFREQDIV_DPLL_MPU,
- * CM_SSC_MODFREQDIV_DPLL_PER
- */
-#define AM33XX_MODFREQDIV_EXPONENT_SHIFT                8
-#define AM33XX_MODFREQDIV_EXPONENT_WIDTH                3
-#define AM33XX_MODFREQDIV_EXPONENT_MASK                 (0x7 << 8)
-
-/*
- * Used by CM_SSC_MODFREQDIV_DPLL_CORE, CM_SSC_MODFREQDIV_DPLL_DDR,
- * CM_SSC_MODFREQDIV_DPLL_DISP, CM_SSC_MODFREQDIV_DPLL_MPU,
- * CM_SSC_MODFREQDIV_DPLL_PER
- */
-#define AM33XX_MODFREQDIV_MANTISSA_SHIFT                0
-#define AM33XX_MODFREQDIV_MANTISSA_WIDTH                7
-#define AM33XX_MODFREQDIV_MANTISSA_MASK                 (0x7f << 0)
-
-/*
- * Used by CM_MPU_MPU_CLKCTRL, CM_RTC_RTC_CLKCTRL, CM_PER_AES0_CLKCTRL,
- * CM_PER_AES1_CLKCTRL, CM_PER_CLKDIV32K_CLKCTRL, CM_PER_CPGMAC0_CLKCTRL,
- * CM_PER_DCAN0_CLKCTRL, CM_PER_DCAN1_CLKCTRL, CM_PER_DES_CLKCTRL,
- * CM_PER_ELM_CLKCTRL, CM_PER_EMIF_CLKCTRL, CM_PER_EMIF_FW_CLKCTRL,
- * CM_PER_EPWMSS0_CLKCTRL, CM_PER_EPWMSS1_CLKCTRL, CM_PER_EPWMSS2_CLKCTRL,
- * CM_PER_GPIO1_CLKCTRL, CM_PER_GPIO2_CLKCTRL, CM_PER_GPIO3_CLKCTRL,
- * CM_PER_GPIO4_CLKCTRL, CM_PER_GPIO5_CLKCTRL, CM_PER_GPIO6_CLKCTRL,
- * CM_PER_GPMC_CLKCTRL, CM_PER_I2C1_CLKCTRL, CM_PER_I2C2_CLKCTRL,
- * CM_PER_PRUSS_CLKCTRL, CM_PER_IEEE5000_CLKCTRL, CM_PER_L3_CLKCTRL,
- * CM_PER_L3_INSTR_CLKCTRL, CM_PER_L4FW_CLKCTRL, CM_PER_L4HS_CLKCTRL,
- * CM_PER_L4LS_CLKCTRL, CM_PER_LCDC_CLKCTRL, CM_PER_MAILBOX0_CLKCTRL,
- * CM_PER_MAILBOX1_CLKCTRL, CM_PER_MCASP0_CLKCTRL, CM_PER_MCASP1_CLKCTRL,
- * CM_PER_MCASP2_CLKCTRL, CM_PER_MLB_CLKCTRL, CM_PER_MMC0_CLKCTRL,
- * CM_PER_MMC1_CLKCTRL, CM_PER_MMC2_CLKCTRL, CM_PER_MSTR_EXPS_CLKCTRL,
- * CM_PER_OCMCRAM_CLKCTRL, CM_PER_OCPWP_CLKCTRL, CM_PER_PCIE_CLKCTRL,
- * CM_PER_PKA_CLKCTRL, CM_PER_RNG_CLKCTRL, CM_PER_SHA0_CLKCTRL,
- * CM_PER_SLV_EXPS_CLKCTRL, CM_PER_SPARE0_CLKCTRL, CM_PER_SPARE1_CLKCTRL,
- * CM_PER_SPARE_CLKCTRL, CM_PER_SPI0_CLKCTRL, CM_PER_SPI1_CLKCTRL,
- * CM_PER_SPI2_CLKCTRL, CM_PER_SPI3_CLKCTRL, CM_PER_SPINLOCK_CLKCTRL,
- * CM_PER_TIMER2_CLKCTRL, CM_PER_TIMER3_CLKCTRL, CM_PER_TIMER4_CLKCTRL,
- * CM_PER_TIMER5_CLKCTRL, CM_PER_TIMER6_CLKCTRL, CM_PER_TIMER7_CLKCTRL,
- * CM_PER_TPCC_CLKCTRL, CM_PER_TPTC0_CLKCTRL, CM_PER_TPTC1_CLKCTRL,
- * CM_PER_TPTC2_CLKCTRL, CM_PER_UART1_CLKCTRL, CM_PER_UART2_CLKCTRL,
- * CM_PER_UART3_CLKCTRL, CM_PER_UART4_CLKCTRL, CM_PER_UART5_CLKCTRL,
- * CM_PER_USB0_CLKCTRL, CM_WKUP_ADC_TSC_CLKCTRL, CM_WKUP_CONTROL_CLKCTRL,
- * CM_WKUP_DEBUGSS_CLKCTRL, CM_WKUP_GPIO0_CLKCTRL, CM_WKUP_I2C0_CLKCTRL,
- * CM_WKUP_L4WKUP_CLKCTRL, CM_WKUP_SMARTREFLEX0_CLKCTRL,
- * CM_WKUP_SMARTREFLEX1_CLKCTRL, CM_WKUP_TIMER0_CLKCTRL,
- * CM_WKUP_TIMER1_CLKCTRL, CM_WKUP_UART0_CLKCTRL, CM_WKUP_WDT0_CLKCTRL,
- * CM_WKUP_WDT1_CLKCTRL, CM_WKUP_WKUP_M3_CLKCTRL, CM_GFX_BITBLT_CLKCTRL,
- * CM_GFX_GFX_CLKCTRL, CM_GFX_MMUCFG_CLKCTRL, CM_GFX_MMUDATA_CLKCTRL,
- * CM_CEFUSE_CEFUSE_CLKCTRL
- */
 #define AM33XX_MODULEMODE_SHIFT                         0
-#define AM33XX_MODULEMODE_WIDTH                         2
 #define AM33XX_MODULEMODE_MASK                          (0x3 << 0)
-
-/* Used by CM_WKUP_DEBUGSS_CLKCTRL */
 #define AM33XX_OPTCLK_DEBUG_CLKA_SHIFT                  30
-#define AM33XX_OPTCLK_DEBUG_CLKA_WIDTH                  1
-#define AM33XX_OPTCLK_DEBUG_CLKA_MASK                   (1 << 30)
-
-/* Used by CM_WKUP_DEBUGSS_CLKCTRL */
 #define AM33XX_OPTFCLKEN_DBGSYSCLK_SHIFT                19
-#define AM33XX_OPTFCLKEN_DBGSYSCLK_WIDTH                1
-#define AM33XX_OPTFCLKEN_DBGSYSCLK_MASK                 (1 << 19)
-
-/* Used by CM_WKUP_GPIO0_CLKCTRL */
 #define AM33XX_OPTFCLKEN_GPIO0_GDBCLK_SHIFT             18
-#define AM33XX_OPTFCLKEN_GPIO0_GDBCLK_WIDTH             1
-#define AM33XX_OPTFCLKEN_GPIO0_GDBCLK_MASK              (1 << 18)
-
-/* Used by CM_PER_GPIO1_CLKCTRL */
 #define AM33XX_OPTFCLKEN_GPIO_1_GDBCLK_SHIFT            18
-#define AM33XX_OPTFCLKEN_GPIO_1_GDBCLK_WIDTH            1
-#define AM33XX_OPTFCLKEN_GPIO_1_GDBCLK_MASK             (1 << 18)
-
-/* Used by CM_PER_GPIO2_CLKCTRL */
 #define AM33XX_OPTFCLKEN_GPIO_2_GDBCLK_SHIFT            18
-#define AM33XX_OPTFCLKEN_GPIO_2_GDBCLK_WIDTH            1
-#define AM33XX_OPTFCLKEN_GPIO_2_GDBCLK_MASK             (1 << 18)
-
-/* Used by CM_PER_GPIO3_CLKCTRL */
 #define AM33XX_OPTFCLKEN_GPIO_3_GDBCLK_SHIFT            18
-#define AM33XX_OPTFCLKEN_GPIO_3_GDBCLK_WIDTH            1
-#define AM33XX_OPTFCLKEN_GPIO_3_GDBCLK_MASK             (1 << 18)
-
-/* Used by CM_PER_GPIO4_CLKCTRL */
-#define AM33XX_OPTFCLKEN_GPIO_4_GDBCLK_SHIFT            18
-#define AM33XX_OPTFCLKEN_GPIO_4_GDBCLK_WIDTH            1
-#define AM33XX_OPTFCLKEN_GPIO_4_GDBCLK_MASK             (1 << 18)
-
-/* Used by CM_PER_GPIO5_CLKCTRL */
-#define AM33XX_OPTFCLKEN_GPIO_5_GDBCLK_SHIFT            18
-#define AM33XX_OPTFCLKEN_GPIO_5_GDBCLK_WIDTH            1
-#define AM33XX_OPTFCLKEN_GPIO_5_GDBCLK_MASK             (1 << 18)
-
-/* Used by CM_PER_GPIO6_CLKCTRL */
-#define AM33XX_OPTFCLKEN_GPIO_6_GDBCLK_SHIFT            18
-#define AM33XX_OPTFCLKEN_GPIO_6_GDBCLK_WIDTH            1
-#define AM33XX_OPTFCLKEN_GPIO_6_GDBCLK_MASK             (1 << 18)
-
-/*
- * Used by CM_MPU_MPU_CLKCTRL, CM_PER_CPGMAC0_CLKCTRL, CM_PER_PRUSS_CLKCTRL,
- * CM_PER_IEEE5000_CLKCTRL, CM_PER_LCDC_CLKCTRL, CM_PER_MLB_CLKCTRL,
- * CM_PER_MSTR_EXPS_CLKCTRL, CM_PER_OCPWP_CLKCTRL, CM_PER_PCIE_CLKCTRL,
- * CM_PER_SPARE_CLKCTRL, CM_PER_TPTC0_CLKCTRL, CM_PER_TPTC1_CLKCTRL,
- * CM_PER_TPTC2_CLKCTRL, CM_PER_USB0_CLKCTRL, CM_WKUP_DEBUGSS_CLKCTRL,
- * CM_WKUP_WKUP_M3_CLKCTRL, CM_GFX_BITBLT_CLKCTRL, CM_GFX_GFX_CLKCTRL
- */
-#define AM33XX_STBYST_SHIFT                             18
-#define AM33XX_STBYST_WIDTH                             1
-#define AM33XX_STBYST_MASK                              (1 << 18)
-
-/* Used by CM_WKUP_DEBUGSS_CLKCTRL */
 #define AM33XX_STM_PMD_CLKDIVSEL_SHIFT                  27
 #define AM33XX_STM_PMD_CLKDIVSEL_WIDTH                  3
-#define AM33XX_STM_PMD_CLKDIVSEL_MASK                   (0x7 << 27)
-
-/* Used by CM_WKUP_DEBUGSS_CLKCTRL */
 #define AM33XX_STM_PMD_CLKSEL_SHIFT                     22
 #define AM33XX_STM_PMD_CLKSEL_WIDTH                     2
-#define AM33XX_STM_PMD_CLKSEL_MASK                      (0x3 << 22)
-
-/*
- * Used by CM_IDLEST_DPLL_CORE, CM_IDLEST_DPLL_DDR, CM_IDLEST_DPLL_DISP,
- * CM_IDLEST_DPLL_MPU, CM_IDLEST_DPLL_PER
- */
-#define AM33XX_ST_DPLL_CLK_SHIFT                        0
-#define AM33XX_ST_DPLL_CLK_WIDTH                        1
 #define AM33XX_ST_DPLL_CLK_MASK                         (1 << 0)
-
-/* Used by CM_CLKDCOLDO_DPLL_PER */
 #define AM33XX_ST_DPLL_CLKDCOLDO_SHIFT                  8
-#define AM33XX_ST_DPLL_CLKDCOLDO_WIDTH                  1
-#define AM33XX_ST_DPLL_CLKDCOLDO_MASK                   (1 << 8)
-
-/*
- * Used by CM_DIV_M2_DPLL_DDR, CM_DIV_M2_DPLL_DISP, CM_DIV_M2_DPLL_MPU,
- * CM_DIV_M2_DPLL_PER
- */
-#define AM33XX_ST_DPLL_CLKOUT_SHIFT                     9
-#define AM33XX_ST_DPLL_CLKOUT_WIDTH                     1
-#define AM33XX_ST_DPLL_CLKOUT_MASK                      (1 << 9)
-
-/* Used by CM_DIV_M4_DPLL_CORE */
-#define AM33XX_ST_HSDIVIDER_CLKOUT1_SHIFT               9
-#define AM33XX_ST_HSDIVIDER_CLKOUT1_WIDTH               1
-#define AM33XX_ST_HSDIVIDER_CLKOUT1_MASK                (1 << 9)
-
-/* Used by CM_DIV_M5_DPLL_CORE */
-#define AM33XX_ST_HSDIVIDER_CLKOUT2_SHIFT               9
-#define AM33XX_ST_HSDIVIDER_CLKOUT2_WIDTH               1
-#define AM33XX_ST_HSDIVIDER_CLKOUT2_MASK                (1 << 9)
-
-/* Used by CM_DIV_M6_DPLL_CORE */
-#define AM33XX_ST_HSDIVIDER_CLKOUT3_SHIFT               9
-#define AM33XX_ST_HSDIVIDER_CLKOUT3_WIDTH               1
-#define AM33XX_ST_HSDIVIDER_CLKOUT3_MASK                (1 << 9)
-
-/*
- * Used by CM_IDLEST_DPLL_CORE, CM_IDLEST_DPLL_DDR, CM_IDLEST_DPLL_DISP,
- * CM_IDLEST_DPLL_MPU, CM_IDLEST_DPLL_PER
- */
-#define AM33XX_ST_MN_BYPASS_SHIFT                       8
-#define AM33XX_ST_MN_BYPASS_WIDTH                       1
-#define AM33XX_ST_MN_BYPASS_MASK                        (1 << 8)
-
-/* Used by CM_WKUP_DEBUGSS_CLKCTRL */
 #define AM33XX_TRC_PMD_CLKDIVSEL_SHIFT                  24
 #define AM33XX_TRC_PMD_CLKDIVSEL_WIDTH                  3
-#define AM33XX_TRC_PMD_CLKDIVSEL_MASK                   (0x7 << 24)
-
-/* Used by CM_WKUP_DEBUGSS_CLKCTRL */
 #define AM33XX_TRC_PMD_CLKSEL_SHIFT                     20
 #define AM33XX_TRC_PMD_CLKSEL_WIDTH                     2
-#define AM33XX_TRC_PMD_CLKSEL_MASK                      (0x3 << 20)
-
-/* Used by CONTROL_SEC_CLK_CTRL */
-#define AM33XX_TIMER0_CLKSEL_WIDTH                      2
-#define AM33XX_TIMER0_CLKSEL_MASK                       (0x3 << 4)
 #endif
diff --git a/arch/arm/mach-omap2/cm-regbits-34xx.h b/arch/arm/mach-omap2/cm-regbits-34xx.h
index adf78d325804..04dab2fcf862 100644
--- a/arch/arm/mach-omap2/cm-regbits-34xx.h
+++ b/arch/arm/mach-omap2/cm-regbits-34xx.h
@@ -14,833 +14,201 @@
  * published by the Free Software Foundation.
  */
 
-/* Bits shared between registers */
-
-/* CM_FCLKEN1_CORE and CM_ICLKEN1_CORE shared bits */
-#define OMAP3430ES2_EN_MMC3_MASK                        (1 << 30)
 #define OMAP3430ES2_EN_MMC3_SHIFT                       30
-#define OMAP3430_EN_MSPRO_MASK                          (1 << 23)
 #define OMAP3430_EN_MSPRO_SHIFT                         23
-#define OMAP3430_EN_HDQ_MASK                            (1 << 22)
 #define OMAP3430_EN_HDQ_SHIFT                           22
-#define OMAP3430ES1_EN_FSHOSTUSB_MASK                   (1 << 5)
 #define OMAP3430ES1_EN_FSHOSTUSB_SHIFT                  5
-#define OMAP3430ES1_EN_D2D_MASK                         (1 << 3)
 #define OMAP3430ES1_EN_D2D_SHIFT                        3
-#define OMAP3430_EN_SSI_MASK                            (1 << 0)
 #define OMAP3430_EN_SSI_SHIFT                           0
-
-/* CM_FCLKEN3_CORE and CM_ICLKEN3_CORE shared bits */
 #define OMAP3430ES2_EN_USBTLL_SHIFT                     2
-#define OMAP3430ES2_EN_USBTLL_MASK                      (1 << 2)
-
-/* CM_FCLKEN_WKUP and CM_ICLKEN_WKUP shared bits */
-#define OMAP3430_EN_WDT2_MASK                           (1 << 5)
 #define OMAP3430_EN_WDT2_SHIFT                          5
-
-/* CM_ICLKEN_CAM, CM_FCLKEN_CAM shared bits */
-#define OMAP3430_EN_CAM_MASK                            (1 << 0)
 #define OMAP3430_EN_CAM_SHIFT                           0
-
-/* CM_FCLKEN_PER, CM_ICLKEN_PER shared bits */
-#define OMAP3430_EN_WDT3_MASK                           (1 << 12)
 #define OMAP3430_EN_WDT3_SHIFT                          12
-
-/* CM_CLKSEL2_EMU, CM_CLKSEL3_EMU shared bits */
-#define OMAP3430_OVERRIDE_ENABLE_MASK                   (1 << 19)
-
-
-/* Bits specific to each register */
-
-/* CM_FCLKEN_IVA2 */
 #define OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_MASK            (1 << 0)
 #define OMAP3430_CM_FCLKEN_IVA2_EN_IVA2_SHIFT           0
-
-/* CM_CLKEN_PLL_IVA2 */
-#define OMAP3430_IVA2_DPLL_RAMPTIME_SHIFT               8
-#define OMAP3430_IVA2_DPLL_RAMPTIME_MASK                (0x3 << 8)
-#define OMAP3430_IVA2_DPLL_FREQSEL_SHIFT                4
 #define OMAP3430_IVA2_DPLL_FREQSEL_MASK                 (0xf << 4)
 #define OMAP3430_EN_IVA2_DPLL_DRIFTGUARD_SHIFT          3
-#define OMAP3430_EN_IVA2_DPLL_DRIFTGUARD_MASK           (1 << 3)
-#define OMAP3430_EN_IVA2_DPLL_SHIFT                     0
 #define OMAP3430_EN_IVA2_DPLL_MASK                      (0x7 << 0)
-
-/* CM_IDLEST_IVA2 */
 #define OMAP3430_ST_IVA2_SHIFT                          0
-#define OMAP3430_ST_IVA2_MASK                           (1 << 0)
-
-/* CM_IDLEST_PLL_IVA2 */
-#define OMAP3430_ST_IVA2_CLK_SHIFT                      0
 #define OMAP3430_ST_IVA2_CLK_MASK                       (1 << 0)
-
-/* CM_AUTOIDLE_PLL_IVA2 */
-#define OMAP3430_AUTO_IVA2_DPLL_SHIFT                   0
 #define OMAP3430_AUTO_IVA2_DPLL_MASK                    (0x7 << 0)
-
-/* CM_CLKSEL1_PLL_IVA2 */
 #define OMAP3430_IVA2_CLK_SRC_SHIFT                     19
-#define OMAP3430_IVA2_CLK_SRC_MASK                      (0x7 << 19)
 #define OMAP3430_IVA2_CLK_SRC_WIDTH                     3
-#define OMAP3430_IVA2_DPLL_MULT_SHIFT                   8
 #define OMAP3430_IVA2_DPLL_MULT_MASK                    (0x7ff << 8)
-#define OMAP3430_IVA2_DPLL_DIV_SHIFT                    0
 #define OMAP3430_IVA2_DPLL_DIV_MASK                     (0x7f << 0)
-
-/* CM_CLKSEL2_PLL_IVA2 */
 #define OMAP3430_IVA2_DPLL_CLKOUT_DIV_SHIFT             0
-#define OMAP3430_IVA2_DPLL_CLKOUT_DIV_MASK              (0x1f << 0)
 #define OMAP3430_IVA2_DPLL_CLKOUT_DIV_WIDTH             5
-
-/* CM_CLKSTCTRL_IVA2 */
-#define OMAP3430_CLKTRCTRL_IVA2_SHIFT                   0
 #define OMAP3430_CLKTRCTRL_IVA2_MASK                    (0x3 << 0)
-
-/* CM_CLKSTST_IVA2 */
-#define OMAP3430_CLKACTIVITY_IVA2_SHIFT                 0
 #define OMAP3430_CLKACTIVITY_IVA2_MASK                  (1 << 0)
-
-/* CM_REVISION specific bits */
-
-/* CM_SYSCONFIG specific bits */
-
-/* CM_CLKEN_PLL_MPU */
-#define OMAP3430_MPU_DPLL_RAMPTIME_SHIFT                8
-#define OMAP3430_MPU_DPLL_RAMPTIME_MASK                 (0x3 << 8)
-#define OMAP3430_MPU_DPLL_FREQSEL_SHIFT                 4
 #define OMAP3430_MPU_DPLL_FREQSEL_MASK                  (0xf << 4)
 #define OMAP3430_EN_MPU_DPLL_DRIFTGUARD_SHIFT           3
-#define OMAP3430_EN_MPU_DPLL_DRIFTGUARD_MASK            (1 << 3)
-#define OMAP3430_EN_MPU_DPLL_SHIFT                      0
 #define OMAP3430_EN_MPU_DPLL_MASK                       (0x7 << 0)
-
-/* CM_IDLEST_MPU */
-#define OMAP3430_ST_MPU_MASK                            (1 << 0)
-
-/* CM_IDLEST_PLL_MPU */
 #define OMAP3430_ST_MPU_CLK_SHIFT                       0
 #define OMAP3430_ST_MPU_CLK_MASK                        (1 << 0)
 #define OMAP3430_ST_MPU_CLK_WIDTH                       1
-
-/* CM_AUTOIDLE_PLL_MPU */
-#define OMAP3430_AUTO_MPU_DPLL_SHIFT                    0
 #define OMAP3430_AUTO_MPU_DPLL_MASK                     (0x7 << 0)
-
-/* CM_CLKSEL1_PLL_MPU */
 #define OMAP3430_MPU_CLK_SRC_SHIFT                      19
-#define OMAP3430_MPU_CLK_SRC_MASK                       (0x7 << 19)
 #define OMAP3430_MPU_CLK_SRC_WIDTH                      3
-#define OMAP3430_MPU_DPLL_MULT_SHIFT                    8
 #define OMAP3430_MPU_DPLL_MULT_MASK                     (0x7ff << 8)
-#define OMAP3430_MPU_DPLL_DIV_SHIFT                     0
 #define OMAP3430_MPU_DPLL_DIV_MASK                      (0x7f << 0)
-
-/* CM_CLKSEL2_PLL_MPU */
 #define OMAP3430_MPU_DPLL_CLKOUT_DIV_SHIFT              0
-#define OMAP3430_MPU_DPLL_CLKOUT_DIV_MASK               (0x1f << 0)
 #define OMAP3430_MPU_DPLL_CLKOUT_DIV_WIDTH              5
-
-/* CM_CLKSTCTRL_MPU */
-#define OMAP3430_CLKTRCTRL_MPU_SHIFT                    0
 #define OMAP3430_CLKTRCTRL_MPU_MASK                     (0x3 << 0)
-
-/* CM_CLKSTST_MPU */
-#define OMAP3430_CLKACTIVITY_MPU_SHIFT                  0
-#define OMAP3430_CLKACTIVITY_MPU_MASK                   (1 << 0)
-
-/* CM_FCLKEN1_CORE specific bits */
-#define OMAP3430_EN_MODEM_MASK                          (1 << 31)
 #define OMAP3430_EN_MODEM_SHIFT                         31
-
-/* CM_ICLKEN1_CORE specific bits */
-#define OMAP3430_EN_ICR_MASK                            (1 << 29)
 #define OMAP3430_EN_ICR_SHIFT                           29
-#define OMAP3430_EN_AES2_MASK                           (1 << 28)
 #define OMAP3430_EN_AES2_SHIFT                          28
-#define OMAP3430_EN_SHA12_MASK                          (1 << 27)
 #define OMAP3430_EN_SHA12_SHIFT                         27
-#define OMAP3430_EN_DES2_MASK                           (1 << 26)
 #define OMAP3430_EN_DES2_SHIFT                          26
-#define OMAP3430ES1_EN_FAC_MASK                         (1 << 8)
 #define OMAP3430ES1_EN_FAC_SHIFT                        8
-#define OMAP3430_EN_MAILBOXES_MASK                      (1 << 7)
 #define OMAP3430_EN_MAILBOXES_SHIFT                     7
-#define OMAP3430_EN_OMAPCTRL_MASK                       (1 << 6)
 #define OMAP3430_EN_OMAPCTRL_SHIFT                      6
-#define OMAP3430_EN_SAD2D_MASK                          (1 << 3)
 #define OMAP3430_EN_SAD2D_SHIFT                         3
-#define OMAP3430_EN_SDRC_MASK                           (1 << 1)
 #define OMAP3430_EN_SDRC_SHIFT                          1
-
-/* AM35XX specific CM_ICLKEN1_CORE bits */
-#define AM35XX_EN_IPSS_MASK                             (1 << 4)
 #define AM35XX_EN_IPSS_SHIFT                            4
-
-/* CM_ICLKEN2_CORE */
-#define OMAP3430_EN_PKA_MASK                            (1 << 4)
 #define OMAP3430_EN_PKA_SHIFT                           4
-#define OMAP3430_EN_AES1_MASK                           (1 << 3)
 #define OMAP3430_EN_AES1_SHIFT                          3
-#define OMAP3430_EN_RNG_MASK                            (1 << 2)
 #define OMAP3430_EN_RNG_SHIFT                           2
-#define OMAP3430_EN_SHA11_MASK                          (1 << 1)
 #define OMAP3430_EN_SHA11_SHIFT                         1
-#define OMAP3430_EN_DES1_MASK                           (1 << 0)
 #define OMAP3430_EN_DES1_SHIFT                          0
-
-/* CM_ICLKEN3_CORE */
 #define OMAP3430_EN_MAD2D_SHIFT                         3
-#define OMAP3430_EN_MAD2D_MASK                          (1 << 3)
-
-/* CM_FCLKEN3_CORE specific bits */
 #define OMAP3430ES2_EN_TS_SHIFT                         1
-#define OMAP3430ES2_EN_TS_MASK                          (1 << 1)
 #define OMAP3430ES2_EN_CPEFUSE_SHIFT                    0
-#define OMAP3430ES2_EN_CPEFUSE_MASK                     (1 << 0)
-
-/* CM_IDLEST1_CORE specific bits */
-#define OMAP3430ES2_ST_MMC3_SHIFT                       30
-#define OMAP3430ES2_ST_MMC3_MASK                        (1 << 30)
-#define OMAP3430_ST_ICR_SHIFT                           29
-#define OMAP3430_ST_ICR_MASK                            (1 << 29)
 #define OMAP3430_ST_AES2_SHIFT                          28
-#define OMAP3430_ST_AES2_MASK                           (1 << 28)
 #define OMAP3430_ST_SHA12_SHIFT                         27
-#define OMAP3430_ST_SHA12_MASK                          (1 << 27)
-#define OMAP3430_ST_DES2_SHIFT                          26
-#define OMAP3430_ST_DES2_MASK                           (1 << 26)
-#define OMAP3430_ST_MSPRO_SHIFT                         23
-#define OMAP3430_ST_MSPRO_MASK                          (1 << 23)
 #define AM35XX_ST_UART4_SHIFT                           23
-#define AM35XX_ST_UART4_MASK                            (1 << 23)
 #define OMAP3430_ST_HDQ_SHIFT                           22
-#define OMAP3430_ST_HDQ_MASK                            (1 << 22)
-#define OMAP3430ES1_ST_FAC_SHIFT                        8
-#define OMAP3430ES1_ST_FAC_MASK                         (1 << 8)
 #define OMAP3430ES2_ST_SSI_IDLE_SHIFT                   8
-#define OMAP3430ES2_ST_SSI_IDLE_MASK                    (1 << 8)
 #define OMAP3430_ST_MAILBOXES_SHIFT                     7
-#define OMAP3430_ST_MAILBOXES_MASK                      (1 << 7)
-#define OMAP3430_ST_OMAPCTRL_SHIFT                      6
-#define OMAP3430_ST_OMAPCTRL_MASK                       (1 << 6)
 #define OMAP3430_ST_SAD2D_SHIFT                         3
-#define OMAP3430_ST_SAD2D_MASK                          (1 << 3)
 #define OMAP3430_ST_SDMA_SHIFT                          2
-#define OMAP3430_ST_SDMA_MASK                           (1 << 2)
-#define OMAP3430_ST_SDRC_SHIFT                          1
-#define OMAP3430_ST_SDRC_MASK                           (1 << 1)
-#define OMAP3430_ST_SSI_STDBY_SHIFT                     0
-#define OMAP3430_ST_SSI_STDBY_MASK                      (1 << 0)
-
-/* AM35xx specific CM_IDLEST1_CORE bits */
 #define AM35XX_ST_IPSS_SHIFT                            5
-#define AM35XX_ST_IPSS_MASK                             (1 << 5)
-
-/* CM_IDLEST2_CORE */
-#define OMAP3430_ST_PKA_SHIFT                           4
-#define OMAP3430_ST_PKA_MASK                            (1 << 4)
-#define OMAP3430_ST_AES1_SHIFT                          3
-#define OMAP3430_ST_AES1_MASK                           (1 << 3)
-#define OMAP3430_ST_RNG_SHIFT                           2
-#define OMAP3430_ST_RNG_MASK                            (1 << 2)
-#define OMAP3430_ST_SHA11_SHIFT                         1
-#define OMAP3430_ST_SHA11_MASK                          (1 << 1)
-#define OMAP3430_ST_DES1_SHIFT                          0
-#define OMAP3430_ST_DES1_MASK                           (1 << 0)
-
-/* CM_IDLEST3_CORE */
 #define OMAP3430ES2_ST_USBTLL_SHIFT                     2
-#define OMAP3430ES2_ST_USBTLL_MASK                      (1 << 2)
-#define OMAP3430ES2_ST_CPEFUSE_SHIFT                    0
-#define OMAP3430ES2_ST_CPEFUSE_MASK                     (1 << 0)
-
-/* CM_AUTOIDLE1_CORE */
-#define OMAP3430_AUTO_MODEM_MASK                        (1 << 31)
-#define OMAP3430_AUTO_MODEM_SHIFT                       31
-#define OMAP3430ES2_AUTO_MMC3_MASK                      (1 << 30)
-#define OMAP3430ES2_AUTO_MMC3_SHIFT                     30
-#define OMAP3430ES2_AUTO_ICR_MASK                       (1 << 29)
-#define OMAP3430ES2_AUTO_ICR_SHIFT                      29
-#define OMAP3430_AUTO_AES2_MASK                         (1 << 28)
-#define OMAP3430_AUTO_AES2_SHIFT                        28
-#define OMAP3430_AUTO_SHA12_MASK                        (1 << 27)
-#define OMAP3430_AUTO_SHA12_SHIFT                       27
-#define OMAP3430_AUTO_DES2_MASK                         (1 << 26)
-#define OMAP3430_AUTO_DES2_SHIFT                        26
-#define OMAP3430_AUTO_MMC2_MASK                         (1 << 25)
-#define OMAP3430_AUTO_MMC2_SHIFT                        25
-#define OMAP3430_AUTO_MMC1_MASK                         (1 << 24)
-#define OMAP3430_AUTO_MMC1_SHIFT                        24
-#define OMAP3430_AUTO_MSPRO_MASK                        (1 << 23)
-#define OMAP3430_AUTO_MSPRO_SHIFT                       23
-#define OMAP3430_AUTO_HDQ_MASK                          (1 << 22)
-#define OMAP3430_AUTO_HDQ_SHIFT                         22
-#define OMAP3430_AUTO_MCSPI4_MASK                       (1 << 21)
-#define OMAP3430_AUTO_MCSPI4_SHIFT                      21
-#define OMAP3430_AUTO_MCSPI3_MASK                       (1 << 20)
-#define OMAP3430_AUTO_MCSPI3_SHIFT                      20
-#define OMAP3430_AUTO_MCSPI2_MASK                       (1 << 19)
-#define OMAP3430_AUTO_MCSPI2_SHIFT                      19
-#define OMAP3430_AUTO_MCSPI1_MASK                       (1 << 18)
-#define OMAP3430_AUTO_MCSPI1_SHIFT                      18
-#define OMAP3430_AUTO_I2C3_MASK                         (1 << 17)
-#define OMAP3430_AUTO_I2C3_SHIFT                        17
-#define OMAP3430_AUTO_I2C2_MASK                         (1 << 16)
-#define OMAP3430_AUTO_I2C2_SHIFT                        16
-#define OMAP3430_AUTO_I2C1_MASK                         (1 << 15)
-#define OMAP3430_AUTO_I2C1_SHIFT                        15
-#define OMAP3430_AUTO_UART2_MASK                        (1 << 14)
-#define OMAP3430_AUTO_UART2_SHIFT                       14
-#define OMAP3430_AUTO_UART1_MASK                        (1 << 13)
-#define OMAP3430_AUTO_UART1_SHIFT                       13
-#define OMAP3430_AUTO_GPT11_MASK                        (1 << 12)
-#define OMAP3430_AUTO_GPT11_SHIFT                       12
-#define OMAP3430_AUTO_GPT10_MASK                        (1 << 11)
-#define OMAP3430_AUTO_GPT10_SHIFT                       11
-#define OMAP3430_AUTO_MCBSP5_MASK                       (1 << 10)
-#define OMAP3430_AUTO_MCBSP5_SHIFT                      10
-#define OMAP3430_AUTO_MCBSP1_MASK                       (1 << 9)
-#define OMAP3430_AUTO_MCBSP1_SHIFT                      9
-#define OMAP3430ES1_AUTO_FAC_MASK                       (1 << 8)
-#define OMAP3430ES1_AUTO_FAC_SHIFT                      8
-#define OMAP3430_AUTO_MAILBOXES_MASK                    (1 << 7)
-#define OMAP3430_AUTO_MAILBOXES_SHIFT                   7
-#define OMAP3430_AUTO_OMAPCTRL_MASK                     (1 << 6)
-#define OMAP3430_AUTO_OMAPCTRL_SHIFT                    6
-#define OMAP3430ES1_AUTO_FSHOSTUSB_MASK                 (1 << 5)
-#define OMAP3430ES1_AUTO_FSHOSTUSB_SHIFT                5
-#define OMAP3430_AUTO_HSOTGUSB_MASK                     (1 << 4)
-#define OMAP3430_AUTO_HSOTGUSB_SHIFT                    4
-#define OMAP3430ES1_AUTO_D2D_MASK                       (1 << 3)
-#define OMAP3430ES1_AUTO_D2D_SHIFT                      3
-#define OMAP3430_AUTO_SAD2D_MASK                        (1 << 3)
-#define OMAP3430_AUTO_SAD2D_SHIFT                       3
-#define OMAP3430_AUTO_SSI_MASK                          (1 << 0)
-#define OMAP3430_AUTO_SSI_SHIFT                         0
-
-/* CM_AUTOIDLE2_CORE */
-#define OMAP3430_AUTO_PKA_MASK                          (1 << 4)
-#define OMAP3430_AUTO_PKA_SHIFT                         4
-#define OMAP3430_AUTO_AES1_MASK                         (1 << 3)
-#define OMAP3430_AUTO_AES1_SHIFT                        3
-#define OMAP3430_AUTO_RNG_MASK                          (1 << 2)
-#define OMAP3430_AUTO_RNG_SHIFT                         2
-#define OMAP3430_AUTO_SHA11_MASK                        (1 << 1)
-#define OMAP3430_AUTO_SHA11_SHIFT                       1
-#define OMAP3430_AUTO_DES1_MASK                         (1 << 0)
-#define OMAP3430_AUTO_DES1_SHIFT                        0
-
-/* CM_AUTOIDLE3_CORE */
-#define OMAP3430ES2_AUTO_USBHOST                        (1 << 0)
-#define OMAP3430ES2_AUTO_USBHOST_SHIFT                  0
-#define OMAP3430ES2_AUTO_USBTLL                         (1 << 2)
-#define OMAP3430ES2_AUTO_USBTLL_SHIFT                   2
-#define OMAP3430ES2_AUTO_USBTLL_MASK                    (1 << 2)
-#define OMAP3430_AUTO_MAD2D_SHIFT                       3
-#define OMAP3430_AUTO_MAD2D_MASK                        (1 << 3)
-
-/* CM_CLKSEL_CORE */
-#define OMAP3430_CLKSEL_SSI_SHIFT                       8
 #define OMAP3430_CLKSEL_SSI_MASK                        (0xf << 8)
 #define OMAP3430_CLKSEL_GPT11_MASK                      (1 << 7)
-#define OMAP3430_CLKSEL_GPT11_SHIFT                     7
 #define OMAP3430_CLKSEL_GPT10_MASK                      (1 << 6)
-#define OMAP3430_CLKSEL_GPT10_SHIFT                     6
-#define OMAP3430ES1_CLKSEL_FSHOSTUSB_SHIFT              4
 #define OMAP3430ES1_CLKSEL_FSHOSTUSB_MASK               (0x3 << 4)
 #define OMAP3430_CLKSEL_L4_SHIFT                        2
-#define OMAP3430_CLKSEL_L4_MASK                         (0x3 << 2)
 #define OMAP3430_CLKSEL_L4_WIDTH                        2
 #define OMAP3430_CLKSEL_L3_SHIFT                        0
-#define OMAP3430_CLKSEL_L3_MASK                         (0x3 << 0)
 #define OMAP3430_CLKSEL_L3_WIDTH                        2
-#define OMAP3630_CLKSEL_96M_SHIFT                       12
 #define OMAP3630_CLKSEL_96M_MASK                        (0x3 << 12)
-#define OMAP3630_CLKSEL_96M_WIDTH                       2
-
-/* CM_CLKSTCTRL_CORE */
-#define OMAP3430ES1_CLKTRCTRL_D2D_SHIFT                 4
 #define OMAP3430ES1_CLKTRCTRL_D2D_MASK                  (0x3 << 4)
-#define OMAP3430_CLKTRCTRL_L4_SHIFT                     2
 #define OMAP3430_CLKTRCTRL_L4_MASK                      (0x3 << 2)
-#define OMAP3430_CLKTRCTRL_L3_SHIFT                     0
 #define OMAP3430_CLKTRCTRL_L3_MASK                      (0x3 << 0)
-
-/* CM_CLKSTST_CORE */
-#define OMAP3430ES1_CLKACTIVITY_D2D_SHIFT               2
-#define OMAP3430ES1_CLKACTIVITY_D2D_MASK                (1 << 2)
-#define OMAP3430_CLKACTIVITY_L4_SHIFT                   1
-#define OMAP3430_CLKACTIVITY_L4_MASK                    (1 << 1)
-#define OMAP3430_CLKACTIVITY_L3_SHIFT                   0
-#define OMAP3430_CLKACTIVITY_L3_MASK                    (1 << 0)
-
-/* CM_FCLKEN_GFX */
-#define OMAP3430ES1_EN_3D_MASK                          (1 << 2)
 #define OMAP3430ES1_EN_3D_SHIFT                         2
-#define OMAP3430ES1_EN_2D_MASK                          (1 << 1)
 #define OMAP3430ES1_EN_2D_SHIFT                         1
-
-/* CM_ICLKEN_GFX specific bits */
-
-/* CM_IDLEST_GFX specific bits */
-
-/* CM_CLKSEL_GFX specific bits */
-
-/* CM_SLEEPDEP_GFX specific bits */
-
-/* CM_CLKSTCTRL_GFX */
-#define OMAP3430ES1_CLKTRCTRL_GFX_SHIFT                 0
 #define OMAP3430ES1_CLKTRCTRL_GFX_MASK                  (0x3 << 0)
-
-/* CM_CLKSTST_GFX */
-#define OMAP3430ES1_CLKACTIVITY_GFX_SHIFT               0
-#define OMAP3430ES1_CLKACTIVITY_GFX_MASK                (1 << 0)
-
-/* CM_FCLKEN_SGX */
 #define OMAP3430ES2_CM_FCLKEN_SGX_EN_SGX_SHIFT          1
-#define OMAP3430ES2_CM_FCLKEN_SGX_EN_SGX_MASK           (1 << 1)
-
-/* CM_IDLEST_SGX */
-#define OMAP3430ES2_ST_SGX_SHIFT                        1
-#define OMAP3430ES2_ST_SGX_MASK                         (1 << 1)
-
-/* CM_ICLKEN_SGX */
 #define OMAP3430ES2_CM_ICLKEN_SGX_EN_SGX_SHIFT          0
-#define OMAP3430ES2_CM_ICLKEN_SGX_EN_SGX_MASK           (1 << 0)
-
-/* CM_CLKSEL_SGX */
-#define OMAP3430ES2_CLKSEL_SGX_SHIFT                    0
 #define OMAP3430ES2_CLKSEL_SGX_MASK                     (0x7 << 0)
-
-/* CM_CLKSTCTRL_SGX */
-#define OMAP3430ES2_CLKTRCTRL_SGX_SHIFT                 0
 #define OMAP3430ES2_CLKTRCTRL_SGX_MASK                  (0x3 << 0)
-
-/* CM_CLKSTST_SGX */
-#define OMAP3430ES2_CLKACTIVITY_SGX_SHIFT               0
-#define OMAP3430ES2_CLKACTIVITY_SGX_MASK                (1 << 0)
-
-/* CM_FCLKEN_WKUP specific bits */
 #define OMAP3430ES2_EN_USIMOCP_SHIFT                    9
-#define OMAP3430ES2_EN_USIMOCP_MASK                     (1 << 9)
-
-/* CM_ICLKEN_WKUP specific bits */
-#define OMAP3430_EN_WDT1_MASK                           (1 << 4)
 #define OMAP3430_EN_WDT1_SHIFT                          4
-#define OMAP3430_EN_32KSYNC_MASK                        (1 << 2)
 #define OMAP3430_EN_32KSYNC_SHIFT                       2
-
-/* CM_IDLEST_WKUP specific bits */
-#define OMAP3430ES2_ST_USIMOCP_SHIFT                    9
-#define OMAP3430ES2_ST_USIMOCP_MASK                     (1 << 9)
 #define OMAP3430_ST_WDT2_SHIFT                          5
-#define OMAP3430_ST_WDT2_MASK                           (1 << 5)
-#define OMAP3430_ST_WDT1_SHIFT                          4
-#define OMAP3430_ST_WDT1_MASK                           (1 << 4)
 #define OMAP3430_ST_32KSYNC_SHIFT                       2
-#define OMAP3430_ST_32KSYNC_MASK                        (1 << 2)
-
-/* CM_AUTOIDLE_WKUP */
-#define OMAP3430ES2_AUTO_USIMOCP_MASK                   (1 << 9)
-#define OMAP3430ES2_AUTO_USIMOCP_SHIFT                  9
-#define OMAP3430_AUTO_WDT2_MASK                         (1 << 5)
-#define OMAP3430_AUTO_WDT2_SHIFT                        5
-#define OMAP3430_AUTO_WDT1_MASK                         (1 << 4)
-#define OMAP3430_AUTO_WDT1_SHIFT                        4
-#define OMAP3430_AUTO_GPIO1_MASK                        (1 << 3)
-#define OMAP3430_AUTO_GPIO1_SHIFT                       3
-#define OMAP3430_AUTO_32KSYNC_MASK                      (1 << 2)
-#define OMAP3430_AUTO_32KSYNC_SHIFT                     2
-#define OMAP3430_AUTO_GPT12_MASK                        (1 << 1)
-#define OMAP3430_AUTO_GPT12_SHIFT                       1
-#define OMAP3430_AUTO_GPT1_MASK                         (1 << 0)
-#define OMAP3430_AUTO_GPT1_SHIFT                        0
-
-/* CM_CLKSEL_WKUP */
 #define OMAP3430ES2_CLKSEL_USIMOCP_MASK                 (0xf << 3)
 #define OMAP3430_CLKSEL_RM_SHIFT                        1
-#define OMAP3430_CLKSEL_RM_MASK                         (0x3 << 1)
 #define OMAP3430_CLKSEL_RM_WIDTH                        2
-#define OMAP3430_CLKSEL_GPT1_SHIFT                      0
 #define OMAP3430_CLKSEL_GPT1_MASK                       (1 << 0)
-
-/* CM_CLKEN_PLL */
 #define OMAP3430_PWRDN_EMU_PERIPH_SHIFT                 31
 #define OMAP3430_PWRDN_CAM_SHIFT                        30
 #define OMAP3430_PWRDN_DSS1_SHIFT                       29
 #define OMAP3430_PWRDN_TV_SHIFT                         28
 #define OMAP3430_PWRDN_96M_SHIFT                        27
-#define OMAP3430_PERIPH_DPLL_RAMPTIME_SHIFT             24
-#define OMAP3430_PERIPH_DPLL_RAMPTIME_MASK              (0x3 << 24)
-#define OMAP3430_PERIPH_DPLL_FREQSEL_SHIFT              20
 #define OMAP3430_PERIPH_DPLL_FREQSEL_MASK               (0xf << 20)
 #define OMAP3430_EN_PERIPH_DPLL_DRIFTGUARD_SHIFT        19
-#define OMAP3430_EN_PERIPH_DPLL_DRIFTGUARD_MASK         (1 << 19)
-#define OMAP3430_EN_PERIPH_DPLL_SHIFT                   16
 #define OMAP3430_EN_PERIPH_DPLL_MASK                    (0x7 << 16)
 #define OMAP3430_PWRDN_EMU_CORE_SHIFT                   12
-#define OMAP3430_CORE_DPLL_RAMPTIME_SHIFT               8
-#define OMAP3430_CORE_DPLL_RAMPTIME_MASK                (0x3 << 8)
-#define OMAP3430_CORE_DPLL_FREQSEL_SHIFT                4
 #define OMAP3430_CORE_DPLL_FREQSEL_MASK                 (0xf << 4)
 #define OMAP3430_EN_CORE_DPLL_DRIFTGUARD_SHIFT          3
-#define OMAP3430_EN_CORE_DPLL_DRIFTGUARD_MASK           (1 << 3)
-#define OMAP3430_EN_CORE_DPLL_SHIFT                     0
 #define OMAP3430_EN_CORE_DPLL_MASK                      (0x7 << 0)
-
-/* CM_CLKEN2_PLL */
-#define OMAP3430ES2_EN_PERIPH2_DPLL_LPMODE_SHIFT        10
-#define OMAP3430ES2_PERIPH2_DPLL_RAMPTIME_MASK          (0x3 << 8)
-#define OMAP3430ES2_PERIPH2_DPLL_FREQSEL_SHIFT          4
 #define OMAP3430ES2_PERIPH2_DPLL_FREQSEL_MASK           (0xf << 4)
 #define OMAP3430ES2_EN_PERIPH2_DPLL_DRIFTGUARD_SHIFT    3
-#define OMAP3430ES2_EN_PERIPH2_DPLL_SHIFT               0
 #define OMAP3430ES2_EN_PERIPH2_DPLL_MASK                (0x7 << 0)
-
-/* CM_IDLEST_CKGEN */
-#define OMAP3430_ST_54M_CLK_MASK                        (1 << 5)
-#define OMAP3430_ST_12M_CLK_MASK                        (1 << 4)
-#define OMAP3430_ST_48M_CLK_MASK                        (1 << 3)
-#define OMAP3430_ST_96M_CLK_MASK                        (1 << 2)
-#define OMAP3430_ST_PERIPH_CLK_SHIFT                    1
 #define OMAP3430_ST_PERIPH_CLK_MASK                     (1 << 1)
-#define OMAP3430_ST_CORE_CLK_SHIFT                      0
 #define OMAP3430_ST_CORE_CLK_MASK                       (1 << 0)
-
-/* CM_IDLEST2_CKGEN */
-#define OMAP3430ES2_ST_USIM_CLK_SHIFT                   2
-#define OMAP3430ES2_ST_USIM_CLK_MASK                    (1 << 2)
-#define OMAP3430ES2_ST_120M_CLK_SHIFT                   1
-#define OMAP3430ES2_ST_120M_CLK_MASK                    (1 << 1)
-#define OMAP3430ES2_ST_PERIPH2_CLK_SHIFT                0
 #define OMAP3430ES2_ST_PERIPH2_CLK_MASK                 (1 << 0)
-
-/* CM_AUTOIDLE_PLL */
-#define OMAP3430_AUTO_PERIPH_DPLL_SHIFT                 3
 #define OMAP3430_AUTO_PERIPH_DPLL_MASK                  (0x7 << 3)
-#define OMAP3430_AUTO_CORE_DPLL_SHIFT                   0
 #define OMAP3430_AUTO_CORE_DPLL_MASK                    (0x7 << 0)
-
-/* CM_AUTOIDLE2_PLL */
-#define OMAP3430ES2_AUTO_PERIPH2_DPLL_SHIFT             0
 #define OMAP3430ES2_AUTO_PERIPH2_DPLL_MASK              (0x7 << 0)
-
-/* CM_CLKSEL1_PLL */
-/* Note that OMAP3430_CORE_DPLL_CLKOUT_DIV_MASK was (0x3 << 27) on 3430ES1 */
 #define OMAP3430_CORE_DPLL_CLKOUT_DIV_SHIFT             27
-#define OMAP3430_CORE_DPLL_CLKOUT_DIV_MASK              (0x1f << 27)
 #define OMAP3430_CORE_DPLL_CLKOUT_DIV_WIDTH             5
-#define OMAP3430_CORE_DPLL_MULT_SHIFT                   16
 #define OMAP3430_CORE_DPLL_MULT_MASK                    (0x7ff << 16)
-#define OMAP3430_CORE_DPLL_DIV_SHIFT                    8
 #define OMAP3430_CORE_DPLL_DIV_MASK                     (0x7f << 8)
 #define OMAP3430_SOURCE_96M_SHIFT                       6
-#define OMAP3430_SOURCE_96M_MASK                        (1 << 6)
 #define OMAP3430_SOURCE_96M_WIDTH                       1
 #define OMAP3430_SOURCE_54M_SHIFT                       5
-#define OMAP3430_SOURCE_54M_MASK                        (1 << 5)
 #define OMAP3430_SOURCE_54M_WIDTH                       1
-#define OMAP3430_SOURCE_48M_SHIFT                       3
 #define OMAP3430_SOURCE_48M_MASK                        (1 << 3)
-
-/* CM_CLKSEL2_PLL */
-#define OMAP3430_PERIPH_DPLL_MULT_SHIFT                 8
 #define OMAP3430_PERIPH_DPLL_MULT_MASK                  (0x7ff << 8)
 #define OMAP3630_PERIPH_DPLL_MULT_MASK                  (0xfff << 8)
-#define OMAP3430_PERIPH_DPLL_DIV_SHIFT                  0
 #define OMAP3430_PERIPH_DPLL_DIV_MASK                   (0x7f << 0)
-#define OMAP3630_PERIPH_DPLL_DCO_SEL_SHIFT              21
 #define OMAP3630_PERIPH_DPLL_DCO_SEL_MASK               (0x7 << 21)
-#define OMAP3630_PERIPH_DPLL_SD_DIV_SHIFT               24
 #define OMAP3630_PERIPH_DPLL_SD_DIV_MASK                (0xff << 24)
-
-/* CM_CLKSEL3_PLL */
 #define OMAP3430_DIV_96M_SHIFT                          0
-#define OMAP3430_DIV_96M_MASK                           (0x1f << 0)
-#define OMAP3430_DIV_96M_WIDTH                          5
-#define OMAP3630_DIV_96M_MASK                           (0x3f << 0)
 #define OMAP3630_DIV_96M_WIDTH                          6
-
-/* CM_CLKSEL4_PLL */
-#define OMAP3430ES2_PERIPH2_DPLL_MULT_SHIFT             8
 #define OMAP3430ES2_PERIPH2_DPLL_MULT_MASK              (0x7ff << 8)
-#define OMAP3430ES2_PERIPH2_DPLL_DIV_SHIFT              0
 #define OMAP3430ES2_PERIPH2_DPLL_DIV_MASK               (0x7f << 0)
-
-/* CM_CLKSEL5_PLL */
 #define OMAP3430ES2_DIV_120M_SHIFT                      0
-#define OMAP3430ES2_DIV_120M_MASK                       (0x1f << 0)
 #define OMAP3430ES2_DIV_120M_WIDTH                      5
-
-/* CM_CLKOUT_CTRL */
 #define OMAP3430_CLKOUT2_EN_SHIFT                       7
-#define OMAP3430_CLKOUT2_EN_MASK                        (1 << 7)
 #define OMAP3430_CLKOUT2_DIV_SHIFT                      3
-#define OMAP3430_CLKOUT2_DIV_MASK                       (0x7 << 3)
 #define OMAP3430_CLKOUT2_DIV_WIDTH                      3
-#define OMAP3430_CLKOUT2SOURCE_SHIFT                    0
 #define OMAP3430_CLKOUT2SOURCE_MASK                     (0x3 << 0)
-
-/* CM_FCLKEN_DSS */
-#define OMAP3430_EN_TV_MASK                             (1 << 2)
 #define OMAP3430_EN_TV_SHIFT                            2
-#define OMAP3430_EN_DSS2_MASK                           (1 << 1)
 #define OMAP3430_EN_DSS2_SHIFT                          1
-#define OMAP3430_EN_DSS1_MASK                           (1 << 0)
 #define OMAP3430_EN_DSS1_SHIFT                          0
-
-/* CM_ICLKEN_DSS */
-#define OMAP3430_CM_ICLKEN_DSS_EN_DSS_MASK              (1 << 0)
 #define OMAP3430_CM_ICLKEN_DSS_EN_DSS_SHIFT             0
-
-/* CM_IDLEST_DSS */
 #define OMAP3430ES2_ST_DSS_IDLE_SHIFT                   1
-#define OMAP3430ES2_ST_DSS_IDLE_MASK                    (1 << 1)
 #define OMAP3430ES2_ST_DSS_STDBY_SHIFT                  0
-#define OMAP3430ES2_ST_DSS_STDBY_MASK                   (1 << 0)
 #define OMAP3430ES1_ST_DSS_SHIFT                        0
-#define OMAP3430ES1_ST_DSS_MASK                         (1 << 0)
-
-/* CM_AUTOIDLE_DSS */
-#define OMAP3430_AUTO_DSS_MASK                          (1 << 0)
-#define OMAP3430_AUTO_DSS_SHIFT                         0
-
-/* CM_CLKSEL_DSS */
 #define OMAP3430_CLKSEL_TV_SHIFT                        8
-#define OMAP3430_CLKSEL_TV_MASK                         (0x1f << 8)
-#define OMAP3430_CLKSEL_TV_WIDTH                        5
-#define OMAP3630_CLKSEL_TV_MASK                         (0x3f << 8)
 #define OMAP3630_CLKSEL_TV_WIDTH                        6
 #define OMAP3430_CLKSEL_DSS1_SHIFT                      0
-#define OMAP3430_CLKSEL_DSS1_MASK                       (0x1f << 0)
-#define OMAP3430_CLKSEL_DSS1_WIDTH                      5
-#define OMAP3630_CLKSEL_DSS1_MASK                       (0x3f << 0)
 #define OMAP3630_CLKSEL_DSS1_WIDTH                      6
-
-/* CM_SLEEPDEP_DSS specific bits */
-
-/* CM_CLKSTCTRL_DSS */
-#define OMAP3430_CLKTRCTRL_DSS_SHIFT                    0
 #define OMAP3430_CLKTRCTRL_DSS_MASK                     (0x3 << 0)
-
-/* CM_CLKSTST_DSS */
-#define OMAP3430_CLKACTIVITY_DSS_SHIFT                  0
-#define OMAP3430_CLKACTIVITY_DSS_MASK                   (1 << 0)
-
-/* CM_FCLKEN_CAM specific bits */
-#define OMAP3430_EN_CSI2_MASK                           (1 << 1)
 #define OMAP3430_EN_CSI2_SHIFT                          1
-
-/* CM_ICLKEN_CAM specific bits */
-
-/* CM_IDLEST_CAM */
-#define OMAP3430_ST_CAM_MASK                            (1 << 0)
-
-/* CM_AUTOIDLE_CAM */
-#define OMAP3430_AUTO_CAM_MASK                          (1 << 0)
-#define OMAP3430_AUTO_CAM_SHIFT                         0
-
-/* CM_CLKSEL_CAM */
 #define OMAP3430_CLKSEL_CAM_SHIFT                       0
-#define OMAP3430_CLKSEL_CAM_MASK                        (0x1f << 0)
-#define OMAP3430_CLKSEL_CAM_WIDTH                       5
-#define OMAP3630_CLKSEL_CAM_MASK                        (0x3f << 0)
 #define OMAP3630_CLKSEL_CAM_WIDTH                       6
-
-/* CM_SLEEPDEP_CAM specific bits */
-
-/* CM_CLKSTCTRL_CAM */
-#define OMAP3430_CLKTRCTRL_CAM_SHIFT                    0
 #define OMAP3430_CLKTRCTRL_CAM_MASK                     (0x3 << 0)
-
-/* CM_CLKSTST_CAM */
-#define OMAP3430_CLKACTIVITY_CAM_SHIFT                  0
-#define OMAP3430_CLKACTIVITY_CAM_MASK                   (1 << 0)
-
-/* CM_FCLKEN_PER specific bits */
-
-/* CM_ICLKEN_PER specific bits */
-
-/* CM_IDLEST_PER */
-#define OMAP3430_ST_WDT3_SHIFT                          12
-#define OMAP3430_ST_WDT3_MASK                           (1 << 12)
 #define OMAP3430_ST_MCBSP4_SHIFT                        2
-#define OMAP3430_ST_MCBSP4_MASK                         (1 << 2)
 #define OMAP3430_ST_MCBSP3_SHIFT                        1
-#define OMAP3430_ST_MCBSP3_MASK                         (1 << 1)
 #define OMAP3430_ST_MCBSP2_SHIFT                        0
-#define OMAP3430_ST_MCBSP2_MASK                         (1 << 0)
-
-/* CM_AUTOIDLE_PER */
-#define OMAP3630_AUTO_UART4_MASK                        (1 << 18)
-#define OMAP3630_AUTO_UART4_SHIFT                       18
-#define OMAP3430_AUTO_GPIO6_MASK                        (1 << 17)
-#define OMAP3430_AUTO_GPIO6_SHIFT                       17
-#define OMAP3430_AUTO_GPIO5_MASK                        (1 << 16)
-#define OMAP3430_AUTO_GPIO5_SHIFT                       16
-#define OMAP3430_AUTO_GPIO4_MASK                        (1 << 15)
-#define OMAP3430_AUTO_GPIO4_SHIFT                       15
-#define OMAP3430_AUTO_GPIO3_MASK                        (1 << 14)
-#define OMAP3430_AUTO_GPIO3_SHIFT                       14
-#define OMAP3430_AUTO_GPIO2_MASK                        (1 << 13)
-#define OMAP3430_AUTO_GPIO2_SHIFT                       13
-#define OMAP3430_AUTO_WDT3_MASK                         (1 << 12)
-#define OMAP3430_AUTO_WDT3_SHIFT                        12
-#define OMAP3430_AUTO_UART3_MASK                        (1 << 11)
-#define OMAP3430_AUTO_UART3_SHIFT                       11
-#define OMAP3430_AUTO_GPT9_MASK                         (1 << 10)
-#define OMAP3430_AUTO_GPT9_SHIFT                        10
-#define OMAP3430_AUTO_GPT8_MASK                         (1 << 9)
-#define OMAP3430_AUTO_GPT8_SHIFT                        9
-#define OMAP3430_AUTO_GPT7_MASK                         (1 << 8)
-#define OMAP3430_AUTO_GPT7_SHIFT                        8
-#define OMAP3430_AUTO_GPT6_MASK                         (1 << 7)
-#define OMAP3430_AUTO_GPT6_SHIFT                        7
-#define OMAP3430_AUTO_GPT5_MASK                         (1 << 6)
-#define OMAP3430_AUTO_GPT5_SHIFT                        6
-#define OMAP3430_AUTO_GPT4_MASK                         (1 << 5)
-#define OMAP3430_AUTO_GPT4_SHIFT                        5
-#define OMAP3430_AUTO_GPT3_MASK                         (1 << 4)
-#define OMAP3430_AUTO_GPT3_SHIFT                        4
-#define OMAP3430_AUTO_GPT2_MASK                         (1 << 3)
-#define OMAP3430_AUTO_GPT2_SHIFT                        3
-#define OMAP3430_AUTO_MCBSP4_MASK                       (1 << 2)
-#define OMAP3430_AUTO_MCBSP4_SHIFT                      2
-#define OMAP3430_AUTO_MCBSP3_MASK                       (1 << 1)
-#define OMAP3430_AUTO_MCBSP3_SHIFT                      1
-#define OMAP3430_AUTO_MCBSP2_MASK                       (1 << 0)
-#define OMAP3430_AUTO_MCBSP2_SHIFT                      0
-
-/* CM_CLKSEL_PER */
 #define OMAP3430_CLKSEL_GPT9_MASK                       (1 << 7)
-#define OMAP3430_CLKSEL_GPT9_SHIFT                      7
 #define OMAP3430_CLKSEL_GPT8_MASK                       (1 << 6)
-#define OMAP3430_CLKSEL_GPT8_SHIFT                      6
 #define OMAP3430_CLKSEL_GPT7_MASK                       (1 << 5)
-#define OMAP3430_CLKSEL_GPT7_SHIFT                      5
 #define OMAP3430_CLKSEL_GPT6_MASK                       (1 << 4)
-#define OMAP3430_CLKSEL_GPT6_SHIFT                      4
 #define OMAP3430_CLKSEL_GPT5_MASK                       (1 << 3)
-#define OMAP3430_CLKSEL_GPT5_SHIFT                      3
 #define OMAP3430_CLKSEL_GPT4_MASK                       (1 << 2)
-#define OMAP3430_CLKSEL_GPT4_SHIFT                      2
 #define OMAP3430_CLKSEL_GPT3_MASK                       (1 << 1)
-#define OMAP3430_CLKSEL_GPT3_SHIFT                      1
 #define OMAP3430_CLKSEL_GPT2_MASK                       (1 << 0)
-#define OMAP3430_CLKSEL_GPT2_SHIFT                      0
-
-/* CM_SLEEPDEP_PER specific bits */
-#define OMAP3430_CM_SLEEPDEP_PER_EN_IVA2_MASK           (1 << 2)
-
-/* CM_CLKSTCTRL_PER */
-#define OMAP3430_CLKTRCTRL_PER_SHIFT                    0
 #define OMAP3430_CLKTRCTRL_PER_MASK                     (0x3 << 0)
-
-/* CM_CLKSTST_PER */
-#define OMAP3430_CLKACTIVITY_PER_SHIFT                  0
-#define OMAP3430_CLKACTIVITY_PER_MASK                   (1 << 0)
-
-/* CM_CLKSEL1_EMU */
 #define OMAP3430_DIV_DPLL4_SHIFT                        24
-#define OMAP3430_DIV_DPLL4_MASK                         (0x1f << 24)
-#define OMAP3430_DIV_DPLL4_WIDTH                        5
-#define OMAP3630_DIV_DPLL4_MASK                         (0x3f << 24)
 #define OMAP3630_DIV_DPLL4_WIDTH                        6
 #define OMAP3430_DIV_DPLL3_SHIFT                        16
-#define OMAP3430_DIV_DPLL3_MASK                         (0x1f << 16)
 #define OMAP3430_DIV_DPLL3_WIDTH                        5
 #define OMAP3430_CLKSEL_TRACECLK_SHIFT                  11
-#define OMAP3430_CLKSEL_TRACECLK_MASK                   (0x7 << 11)
 #define OMAP3430_CLKSEL_TRACECLK_WIDTH                  3
 #define OMAP3430_CLKSEL_PCLK_SHIFT                      8
-#define OMAP3430_CLKSEL_PCLK_MASK                       (0x7 << 8)
 #define OMAP3430_CLKSEL_PCLK_WIDTH                      3
 #define OMAP3430_CLKSEL_PCLKX2_SHIFT                    6
-#define OMAP3430_CLKSEL_PCLKX2_MASK                     (0x3 << 6)
 #define OMAP3430_CLKSEL_PCLKX2_WIDTH                    2
 #define OMAP3430_CLKSEL_ATCLK_SHIFT                     4
-#define OMAP3430_CLKSEL_ATCLK_MASK                      (0x3 << 4)
 #define OMAP3430_CLKSEL_ATCLK_WIDTH                     2
 #define OMAP3430_TRACE_MUX_CTRL_SHIFT                   2
-#define OMAP3430_TRACE_MUX_CTRL_MASK                    (0x3 << 2)
 #define OMAP3430_TRACE_MUX_CTRL_WIDTH                   2
-#define OMAP3430_MUX_CTRL_SHIFT                         0
 #define OMAP3430_MUX_CTRL_MASK                          (0x3 << 0)
-#define OMAP3430_MUX_CTRL_WIDTH                         2
-
-/* CM_CLKSTCTRL_EMU */
-#define OMAP3430_CLKTRCTRL_EMU_SHIFT                    0
 #define OMAP3430_CLKTRCTRL_EMU_MASK                     (0x3 << 0)
-
-/* CM_CLKSTST_EMU */
-#define OMAP3430_CLKACTIVITY_EMU_SHIFT                  0
-#define OMAP3430_CLKACTIVITY_EMU_MASK                   (1 << 0)
-
-/* CM_CLKSEL2_EMU specific bits */
-#define OMAP3430_CORE_DPLL_EMU_MULT_SHIFT               8
-#define OMAP3430_CORE_DPLL_EMU_MULT_MASK                (0x7ff << 8)
-#define OMAP3430_CORE_DPLL_EMU_DIV_SHIFT                0
-#define OMAP3430_CORE_DPLL_EMU_DIV_MASK                 (0x7f << 0)
-
-/* CM_CLKSEL3_EMU specific bits */
-#define OMAP3430_PERIPH_DPLL_EMU_MULT_SHIFT             8
-#define OMAP3430_PERIPH_DPLL_EMU_MULT_MASK              (0x7ff << 8)
-#define OMAP3430_PERIPH_DPLL_EMU_DIV_SHIFT              0
-#define OMAP3430_PERIPH_DPLL_EMU_DIV_MASK               (0x7f << 0)
-
-/* CM_POLCTRL */
-#define OMAP3430_CLKOUT2_POL_MASK                       (1 << 0)
-
-/* CM_IDLEST_NEON */
-#define OMAP3430_ST_NEON_MASK                           (1 << 0)
-
-/* CM_CLKSTCTRL_NEON */
-#define OMAP3430_CLKTRCTRL_NEON_SHIFT                   0
 #define OMAP3430_CLKTRCTRL_NEON_MASK                    (0x3 << 0)
-
-/* CM_FCLKEN_USBHOST */
 #define OMAP3430ES2_EN_USBHOST2_SHIFT                   1
-#define OMAP3430ES2_EN_USBHOST2_MASK                    (1 << 1)
 #define OMAP3430ES2_EN_USBHOST1_SHIFT                   0
-#define OMAP3430ES2_EN_USBHOST1_MASK                    (1 << 0)
-
-/* CM_ICLKEN_USBHOST */
 #define OMAP3430ES2_EN_USBHOST_SHIFT                    0
-#define OMAP3430ES2_EN_USBHOST_MASK                     (1 << 0)
-
-/* CM_IDLEST_USBHOST */
 #define OMAP3430ES2_ST_USBHOST_IDLE_SHIFT               1
-#define OMAP3430ES2_ST_USBHOST_IDLE_MASK                (1 << 1)
 #define OMAP3430ES2_ST_USBHOST_STDBY_SHIFT              0
-#define OMAP3430ES2_ST_USBHOST_STDBY_MASK               (1 << 0)
-
-/* CM_AUTOIDLE_USBHOST */
-#define OMAP3430ES2_AUTO_USBHOST_SHIFT                  0
-#define OMAP3430ES2_AUTO_USBHOST_MASK                   (1 << 0)
-
-/* CM_SLEEPDEP_USBHOST */
-#define OMAP3430ES2_EN_MPU_SHIFT                        1
-#define OMAP3430ES2_EN_MPU_MASK                         (1 << 1)
-#define OMAP3430ES2_EN_IVA2_SHIFT                       2
-#define OMAP3430ES2_EN_IVA2_MASK                        (1 << 2)
-
-/* CM_CLKSTCTRL_USBHOST */
-#define OMAP3430ES2_CLKTRCTRL_USBHOST_SHIFT             0
 #define OMAP3430ES2_CLKTRCTRL_USBHOST_MASK              (3 << 0)
-
-/* CM_CLKSTST_USBHOST */
-#define OMAP3430ES2_CLKACTIVITY_USBHOST_SHIFT           0
-#define OMAP3430ES2_CLKACTIVITY_USBHOST_MASK            (1 << 0)
-
-/*
- *
- */
-
-/* OMAP3XXX CM_CLKSTCTRL_*.CLKTRCTRL_* register bit values */
 #define OMAP34XX_CLKSTCTRL_DISABLE_AUTO         0x0
 #define OMAP34XX_CLKSTCTRL_FORCE_SLEEP          0x1
 #define OMAP34XX_CLKSTCTRL_FORCE_WAKEUP         0x2
 #define OMAP34XX_CLKSTCTRL_ENABLE_AUTO          0x3
-
-
 #endif
diff --git a/arch/arm/mach-omap2/cm-regbits-44xx.h b/arch/arm/mach-omap2/cm-regbits-44xx.h
index 4c6c2f7de65b..4dbbd99b6e1e 100644
--- a/arch/arm/mach-omap2/cm-regbits-44xx.h
+++ b/arch/arm/mach-omap2/cm-regbits-44xx.h
@@ -22,1683 +22,125 @@
 #ifndef __ARCH_ARM_MACH_OMAP2_CM_REGBITS_44XX_H
 #define __ARCH_ARM_MACH_OMAP2_CM_REGBITS_44XX_H
 
-/* Used by CM_L3_1_DYNAMICDEP, CM_MPU_DYNAMICDEP, CM_TESLA_DYNAMICDEP */
-#define OMAP4430_ABE_DYNDEP_SHIFT                               3
-#define OMAP4430_ABE_DYNDEP_WIDTH                               0x1
-#define OMAP4430_ABE_DYNDEP_MASK                                (1 << 3)
-
-/*
- * Used by CM_D2D_STATICDEP, CM_DUCATI_STATICDEP, CM_L3INIT_STATICDEP,
- * CM_MPU_STATICDEP, CM_SDMA_STATICDEP, CM_TESLA_STATICDEP
- */
 #define OMAP4430_ABE_STATDEP_SHIFT                              3
-#define OMAP4430_ABE_STATDEP_WIDTH                              0x1
-#define OMAP4430_ABE_STATDEP_MASK                               (1 << 3)
-
-/* Used by CM_L4CFG_DYNAMICDEP */
-#define OMAP4430_ALWONCORE_DYNDEP_SHIFT                         16
-#define OMAP4430_ALWONCORE_DYNDEP_WIDTH                         0x1
-#define OMAP4430_ALWONCORE_DYNDEP_MASK                          (1 << 16)
-
-/* Used by CM_DUCATI_STATICDEP, CM_MPU_STATICDEP, CM_TESLA_STATICDEP */
-#define OMAP4430_ALWONCORE_STATDEP_SHIFT                        16
-#define OMAP4430_ALWONCORE_STATDEP_WIDTH                        0x1
-#define OMAP4430_ALWONCORE_STATDEP_MASK                         (1 << 16)
-
-/*
- * Used by CM_AUTOIDLE_DPLL_ABE, CM_AUTOIDLE_DPLL_CORE,
- * CM_AUTOIDLE_DPLL_DDRPHY, CM_AUTOIDLE_DPLL_IVA, CM_AUTOIDLE_DPLL_MPU,
- * CM_AUTOIDLE_DPLL_PER, CM_AUTOIDLE_DPLL_UNIPRO, CM_AUTOIDLE_DPLL_USB
- */
-#define OMAP4430_AUTO_DPLL_MODE_SHIFT                           0
-#define OMAP4430_AUTO_DPLL_MODE_WIDTH                           0x3
 #define OMAP4430_AUTO_DPLL_MODE_MASK                            (0x7 << 0)
-
-/* Used by CM_L4CFG_DYNAMICDEP */
-#define OMAP4430_CEFUSE_DYNDEP_SHIFT                            17
-#define OMAP4430_CEFUSE_DYNDEP_WIDTH                            0x1
-#define OMAP4430_CEFUSE_DYNDEP_MASK                             (1 << 17)
-
-/* Used by CM_DUCATI_STATICDEP, CM_MPU_STATICDEP, CM_TESLA_STATICDEP */
-#define OMAP4430_CEFUSE_STATDEP_SHIFT                           17
-#define OMAP4430_CEFUSE_STATDEP_WIDTH                           0x1
-#define OMAP4430_CEFUSE_STATDEP_MASK                            (1 << 17)
-
-/* Used by CM1_ABE_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_ABE_24M_GFCLK_SHIFT                13
-#define OMAP4430_CLKACTIVITY_ABE_24M_GFCLK_WIDTH                0x1
-#define OMAP4430_CLKACTIVITY_ABE_24M_GFCLK_MASK                 (1 << 13)
-
-/* Used by CM1_ABE_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_ABE_ALWON_32K_CLK_SHIFT            12
-#define OMAP4430_CLKACTIVITY_ABE_ALWON_32K_CLK_WIDTH            0x1
-#define OMAP4430_CLKACTIVITY_ABE_ALWON_32K_CLK_MASK             (1 << 12)
-
-/* Used by CM_WKUP_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_ABE_LP_CLK_SHIFT                   9
-#define OMAP4430_CLKACTIVITY_ABE_LP_CLK_WIDTH                   0x1
-#define OMAP4430_CLKACTIVITY_ABE_LP_CLK_MASK                    (1 << 9)
-
-/* Used by CM1_ABE_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_ABE_SYSCLK_SHIFT                   11
-#define OMAP4430_CLKACTIVITY_ABE_SYSCLK_WIDTH                   0x1
-#define OMAP4430_CLKACTIVITY_ABE_SYSCLK_MASK                    (1 << 11)
-
-/* Used by CM1_ABE_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_ABE_X2_CLK_SHIFT                   8
-#define OMAP4430_CLKACTIVITY_ABE_X2_CLK_WIDTH                   0x1
-#define OMAP4430_CLKACTIVITY_ABE_X2_CLK_MASK                    (1 << 8)
-
-/* Used by CM_MEMIF_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_ASYNC_DLL_CLK_SHIFT                11
-#define OMAP4430_CLKACTIVITY_ASYNC_DLL_CLK_WIDTH                0x1
-#define OMAP4430_CLKACTIVITY_ASYNC_DLL_CLK_MASK                 (1 << 11)
-
-/* Used by CM_MEMIF_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_ASYNC_PHY1_CLK_SHIFT               12
-#define OMAP4430_CLKACTIVITY_ASYNC_PHY1_CLK_WIDTH               0x1
-#define OMAP4430_CLKACTIVITY_ASYNC_PHY1_CLK_MASK                (1 << 12)
-
-/* Used by CM_MEMIF_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_ASYNC_PHY2_CLK_SHIFT               13
-#define OMAP4430_CLKACTIVITY_ASYNC_PHY2_CLK_WIDTH               0x1
-#define OMAP4430_CLKACTIVITY_ASYNC_PHY2_CLK_MASK                (1 << 13)
-
-/* Used by CM_CAM_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_CAM_PHY_CTRL_GCLK_SHIFT            9
-#define OMAP4430_CLKACTIVITY_CAM_PHY_CTRL_GCLK_WIDTH            0x1
-#define OMAP4430_CLKACTIVITY_CAM_PHY_CTRL_GCLK_MASK             (1 << 9)
-
-/* Used by CM_ALWON_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_CORE_ALWON_32K_GFCLK_SHIFT         12
-#define OMAP4430_CLKACTIVITY_CORE_ALWON_32K_GFCLK_WIDTH         0x1
-#define OMAP4430_CLKACTIVITY_CORE_ALWON_32K_GFCLK_MASK          (1 << 12)
-
-/* Used by CM_EMU_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_CORE_DPLL_EMU_CLK_SHIFT            9
-#define OMAP4430_CLKACTIVITY_CORE_DPLL_EMU_CLK_WIDTH            0x1
-#define OMAP4430_CLKACTIVITY_CORE_DPLL_EMU_CLK_MASK             (1 << 9)
-
-/* Used by CM_L4CFG_CLKSTCTRL */
-#define OMAP4460_CLKACTIVITY_CORE_TS_GFCLK_SHIFT                9
-#define OMAP4460_CLKACTIVITY_CORE_TS_GFCLK_WIDTH                0x1
-#define OMAP4460_CLKACTIVITY_CORE_TS_GFCLK_MASK                 (1 << 9)
-
-/* Used by CM_CEFUSE_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_CUST_EFUSE_SYS_CLK_SHIFT           9
-#define OMAP4430_CLKACTIVITY_CUST_EFUSE_SYS_CLK_WIDTH           0x1
-#define OMAP4430_CLKACTIVITY_CUST_EFUSE_SYS_CLK_MASK            (1 << 9)
-
-/* Used by CM_MEMIF_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_DLL_CLK_SHIFT                      9
-#define OMAP4430_CLKACTIVITY_DLL_CLK_WIDTH                      0x1
-#define OMAP4430_CLKACTIVITY_DLL_CLK_MASK                       (1 << 9)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_DMT10_GFCLK_SHIFT                  9
-#define OMAP4430_CLKACTIVITY_DMT10_GFCLK_WIDTH                  0x1
-#define OMAP4430_CLKACTIVITY_DMT10_GFCLK_MASK                   (1 << 9)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_DMT11_GFCLK_SHIFT                  10
-#define OMAP4430_CLKACTIVITY_DMT11_GFCLK_WIDTH                  0x1
-#define OMAP4430_CLKACTIVITY_DMT11_GFCLK_MASK                   (1 << 10)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_DMT2_GFCLK_SHIFT                   11
-#define OMAP4430_CLKACTIVITY_DMT2_GFCLK_WIDTH                   0x1
-#define OMAP4430_CLKACTIVITY_DMT2_GFCLK_MASK                    (1 << 11)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_DMT3_GFCLK_SHIFT                   12
-#define OMAP4430_CLKACTIVITY_DMT3_GFCLK_WIDTH                   0x1
-#define OMAP4430_CLKACTIVITY_DMT3_GFCLK_MASK                    (1 << 12)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_DMT4_GFCLK_SHIFT                   13
-#define OMAP4430_CLKACTIVITY_DMT4_GFCLK_WIDTH                   0x1
-#define OMAP4430_CLKACTIVITY_DMT4_GFCLK_MASK                    (1 << 13)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_DMT9_GFCLK_SHIFT                   14
-#define OMAP4430_CLKACTIVITY_DMT9_GFCLK_WIDTH                   0x1
-#define OMAP4430_CLKACTIVITY_DMT9_GFCLK_MASK                    (1 << 14)
-
-/* Used by CM_DSS_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_DSS_ALWON_SYS_CLK_SHIFT            10
-#define OMAP4430_CLKACTIVITY_DSS_ALWON_SYS_CLK_WIDTH            0x1
-#define OMAP4430_CLKACTIVITY_DSS_ALWON_SYS_CLK_MASK             (1 << 10)
-
-/* Used by CM_DSS_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_DSS_FCLK_SHIFT                     9
-#define OMAP4430_CLKACTIVITY_DSS_FCLK_WIDTH                     0x1
-#define OMAP4430_CLKACTIVITY_DSS_FCLK_MASK                      (1 << 9)
-
-/* Used by CM_DUCATI_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_DUCATI_GCLK_SHIFT                  8
-#define OMAP4430_CLKACTIVITY_DUCATI_GCLK_WIDTH                  0x1
-#define OMAP4430_CLKACTIVITY_DUCATI_GCLK_MASK                   (1 << 8)
-
-/* Used by CM_EMU_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_EMU_SYS_CLK_SHIFT                  8
-#define OMAP4430_CLKACTIVITY_EMU_SYS_CLK_WIDTH                  0x1
-#define OMAP4430_CLKACTIVITY_EMU_SYS_CLK_MASK                   (1 << 8)
-
-/* Used by CM_CAM_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_FDIF_GFCLK_SHIFT                   10
-#define OMAP4430_CLKACTIVITY_FDIF_GFCLK_WIDTH                   0x1
-#define OMAP4430_CLKACTIVITY_FDIF_GFCLK_MASK                    (1 << 10)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_FUNC_12M_GFCLK_SHIFT               15
-#define OMAP4430_CLKACTIVITY_FUNC_12M_GFCLK_WIDTH               0x1
-#define OMAP4430_CLKACTIVITY_FUNC_12M_GFCLK_MASK                (1 << 15)
-
-/* Used by CM1_ABE_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_FUNC_24M_GFCLK_SHIFT               10
-#define OMAP4430_CLKACTIVITY_FUNC_24M_GFCLK_WIDTH               0x1
-#define OMAP4430_CLKACTIVITY_FUNC_24M_GFCLK_MASK                (1 << 10)
-
-/* Used by CM_DSS_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_HDMI_PHY_48MHZ_GFCLK_SHIFT         11
-#define OMAP4430_CLKACTIVITY_HDMI_PHY_48MHZ_GFCLK_WIDTH         0x1
-#define OMAP4430_CLKACTIVITY_HDMI_PHY_48MHZ_GFCLK_MASK          (1 << 11)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_HSIC_P1_480M_GFCLK_SHIFT           20
-#define OMAP4430_CLKACTIVITY_HSIC_P1_480M_GFCLK_WIDTH           0x1
-#define OMAP4430_CLKACTIVITY_HSIC_P1_480M_GFCLK_MASK            (1 << 20)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_HSIC_P1_GFCLK_SHIFT                26
-#define OMAP4430_CLKACTIVITY_HSIC_P1_GFCLK_WIDTH                0x1
-#define OMAP4430_CLKACTIVITY_HSIC_P1_GFCLK_MASK                 (1 << 26)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_HSIC_P2_480M_GFCLK_SHIFT           21
-#define OMAP4430_CLKACTIVITY_HSIC_P2_480M_GFCLK_WIDTH           0x1
-#define OMAP4430_CLKACTIVITY_HSIC_P2_480M_GFCLK_MASK            (1 << 21)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_HSIC_P2_GFCLK_SHIFT                27
-#define OMAP4430_CLKACTIVITY_HSIC_P2_GFCLK_WIDTH                0x1
-#define OMAP4430_CLKACTIVITY_HSIC_P2_GFCLK_MASK                 (1 << 27)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_INIT_48MC_GFCLK_SHIFT              13
-#define OMAP4430_CLKACTIVITY_INIT_48MC_GFCLK_WIDTH              0x1
-#define OMAP4430_CLKACTIVITY_INIT_48MC_GFCLK_MASK               (1 << 13)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_INIT_48M_GFCLK_SHIFT               12
-#define OMAP4430_CLKACTIVITY_INIT_48M_GFCLK_WIDTH               0x1
-#define OMAP4430_CLKACTIVITY_INIT_48M_GFCLK_MASK                (1 << 12)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_INIT_60M_P1_GFCLK_SHIFT            28
-#define OMAP4430_CLKACTIVITY_INIT_60M_P1_GFCLK_WIDTH            0x1
-#define OMAP4430_CLKACTIVITY_INIT_60M_P1_GFCLK_MASK             (1 << 28)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_INIT_60M_P2_GFCLK_SHIFT            29
-#define OMAP4430_CLKACTIVITY_INIT_60M_P2_GFCLK_WIDTH            0x1
-#define OMAP4430_CLKACTIVITY_INIT_60M_P2_GFCLK_MASK             (1 << 29)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_INIT_96M_GFCLK_SHIFT               11
-#define OMAP4430_CLKACTIVITY_INIT_96M_GFCLK_WIDTH               0x1
-#define OMAP4430_CLKACTIVITY_INIT_96M_GFCLK_MASK                (1 << 11)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_INIT_HSI_GFCLK_SHIFT               16
-#define OMAP4430_CLKACTIVITY_INIT_HSI_GFCLK_WIDTH               0x1
-#define OMAP4430_CLKACTIVITY_INIT_HSI_GFCLK_MASK                (1 << 16)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_INIT_HSMMC1_GFCLK_SHIFT            17
-#define OMAP4430_CLKACTIVITY_INIT_HSMMC1_GFCLK_WIDTH            0x1
-#define OMAP4430_CLKACTIVITY_INIT_HSMMC1_GFCLK_MASK             (1 << 17)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_INIT_HSMMC2_GFCLK_SHIFT            18
-#define OMAP4430_CLKACTIVITY_INIT_HSMMC2_GFCLK_WIDTH            0x1
-#define OMAP4430_CLKACTIVITY_INIT_HSMMC2_GFCLK_MASK             (1 << 18)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_INIT_HSMMC6_GFCLK_SHIFT            19
-#define OMAP4430_CLKACTIVITY_INIT_HSMMC6_GFCLK_WIDTH            0x1
-#define OMAP4430_CLKACTIVITY_INIT_HSMMC6_GFCLK_MASK             (1 << 19)
-
-/* Used by CM_CAM_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_ISS_GCLK_SHIFT                     8
-#define OMAP4430_CLKACTIVITY_ISS_GCLK_WIDTH                     0x1
-#define OMAP4430_CLKACTIVITY_ISS_GCLK_MASK                      (1 << 8)
-
-/* Used by CM_IVAHD_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_IVAHD_ROOT_CLK_SHIFT               8
-#define OMAP4430_CLKACTIVITY_IVAHD_ROOT_CLK_WIDTH               0x1
-#define OMAP4430_CLKACTIVITY_IVAHD_ROOT_CLK_MASK                (1 << 8)
-
-/* Used by CM_D2D_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_L3X2_D2D_GICLK_SHIFT               10
-#define OMAP4430_CLKACTIVITY_L3X2_D2D_GICLK_WIDTH               0x1
-#define OMAP4430_CLKACTIVITY_L3X2_D2D_GICLK_MASK                (1 << 10)
-
-/* Used by CM_L3_1_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_L3_1_GICLK_SHIFT                   8
-#define OMAP4430_CLKACTIVITY_L3_1_GICLK_WIDTH                   0x1
-#define OMAP4430_CLKACTIVITY_L3_1_GICLK_MASK                    (1 << 8)
-
-/* Used by CM_L3_2_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_L3_2_GICLK_SHIFT                   8
-#define OMAP4430_CLKACTIVITY_L3_2_GICLK_WIDTH                   0x1
-#define OMAP4430_CLKACTIVITY_L3_2_GICLK_MASK                    (1 << 8)
-
-/* Used by CM_D2D_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_L3_D2D_GICLK_SHIFT                 8
-#define OMAP4430_CLKACTIVITY_L3_D2D_GICLK_WIDTH                 0x1
-#define OMAP4430_CLKACTIVITY_L3_D2D_GICLK_MASK                  (1 << 8)
-
-/* Used by CM_SDMA_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_L3_DMA_GICLK_SHIFT                 8
-#define OMAP4430_CLKACTIVITY_L3_DMA_GICLK_WIDTH                 0x1
-#define OMAP4430_CLKACTIVITY_L3_DMA_GICLK_MASK                  (1 << 8)
-
-/* Used by CM_DSS_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_L3_DSS_GICLK_SHIFT                 8
-#define OMAP4430_CLKACTIVITY_L3_DSS_GICLK_WIDTH                 0x1
-#define OMAP4430_CLKACTIVITY_L3_DSS_GICLK_MASK                  (1 << 8)
-
-/* Used by CM_MEMIF_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_L3_EMIF_GICLK_SHIFT                8
-#define OMAP4430_CLKACTIVITY_L3_EMIF_GICLK_WIDTH                0x1
-#define OMAP4430_CLKACTIVITY_L3_EMIF_GICLK_MASK                 (1 << 8)
-
-/* Used by CM_GFX_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_L3_GFX_GICLK_SHIFT                 8
-#define OMAP4430_CLKACTIVITY_L3_GFX_GICLK_WIDTH                 0x1
-#define OMAP4430_CLKACTIVITY_L3_GFX_GICLK_MASK                  (1 << 8)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_L3_INIT_GICLK_SHIFT                8
-#define OMAP4430_CLKACTIVITY_L3_INIT_GICLK_WIDTH                0x1
-#define OMAP4430_CLKACTIVITY_L3_INIT_GICLK_MASK                 (1 << 8)
-
-/* Used by CM_L3INSTR_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_L3_INSTR_GICLK_SHIFT               8
-#define OMAP4430_CLKACTIVITY_L3_INSTR_GICLK_WIDTH               0x1
-#define OMAP4430_CLKACTIVITY_L3_INSTR_GICLK_MASK                (1 << 8)
-
-/* Used by CM_L4SEC_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_L3_SECURE_GICLK_SHIFT              8
-#define OMAP4430_CLKACTIVITY_L3_SECURE_GICLK_WIDTH              0x1
-#define OMAP4430_CLKACTIVITY_L3_SECURE_GICLK_MASK               (1 << 8)
-
-/* Used by CM_ALWON_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_L4_AO_ICLK_SHIFT                   8
-#define OMAP4430_CLKACTIVITY_L4_AO_ICLK_WIDTH                   0x1
-#define OMAP4430_CLKACTIVITY_L4_AO_ICLK_MASK                    (1 << 8)
-
-/* Used by CM_CEFUSE_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_L4_CEFUSE_GICLK_SHIFT              8
-#define OMAP4430_CLKACTIVITY_L4_CEFUSE_GICLK_WIDTH              0x1
-#define OMAP4430_CLKACTIVITY_L4_CEFUSE_GICLK_MASK               (1 << 8)
-
-/* Used by CM_L4CFG_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_L4_CFG_GICLK_SHIFT                 8
-#define OMAP4430_CLKACTIVITY_L4_CFG_GICLK_WIDTH                 0x1
-#define OMAP4430_CLKACTIVITY_L4_CFG_GICLK_MASK                  (1 << 8)
-
-/* Used by CM_D2D_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_L4_D2D_GICLK_SHIFT                 9
-#define OMAP4430_CLKACTIVITY_L4_D2D_GICLK_WIDTH                 0x1
-#define OMAP4430_CLKACTIVITY_L4_D2D_GICLK_MASK                  (1 << 9)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_L4_INIT_GICLK_SHIFT                9
-#define OMAP4430_CLKACTIVITY_L4_INIT_GICLK_WIDTH                0x1
-#define OMAP4430_CLKACTIVITY_L4_INIT_GICLK_MASK                 (1 << 9)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_L4_PER_GICLK_SHIFT                 8
-#define OMAP4430_CLKACTIVITY_L4_PER_GICLK_WIDTH                 0x1
-#define OMAP4430_CLKACTIVITY_L4_PER_GICLK_MASK                  (1 << 8)
-
-/* Used by CM_L4SEC_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_L4_SECURE_GICLK_SHIFT              9
-#define OMAP4430_CLKACTIVITY_L4_SECURE_GICLK_WIDTH              0x1
-#define OMAP4430_CLKACTIVITY_L4_SECURE_GICLK_MASK               (1 << 9)
-
-/* Used by CM_WKUP_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_L4_WKUP_GICLK_SHIFT                12
-#define OMAP4430_CLKACTIVITY_L4_WKUP_GICLK_WIDTH                0x1
-#define OMAP4430_CLKACTIVITY_L4_WKUP_GICLK_MASK                 (1 << 12)
-
-/* Used by CM_MPU_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_MPU_DPLL_CLK_SHIFT                 8
-#define OMAP4430_CLKACTIVITY_MPU_DPLL_CLK_WIDTH                 0x1
-#define OMAP4430_CLKACTIVITY_MPU_DPLL_CLK_MASK                  (1 << 8)
-
-/* Used by CM1_ABE_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_OCP_ABE_GICLK_SHIFT                9
-#define OMAP4430_CLKACTIVITY_OCP_ABE_GICLK_WIDTH                0x1
-#define OMAP4430_CLKACTIVITY_OCP_ABE_GICLK_MASK                 (1 << 9)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_PER_24MC_GFCLK_SHIFT               16
-#define OMAP4430_CLKACTIVITY_PER_24MC_GFCLK_WIDTH               0x1
-#define OMAP4430_CLKACTIVITY_PER_24MC_GFCLK_MASK                (1 << 16)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_PER_32K_GFCLK_SHIFT                17
-#define OMAP4430_CLKACTIVITY_PER_32K_GFCLK_WIDTH                0x1
-#define OMAP4430_CLKACTIVITY_PER_32K_GFCLK_MASK                 (1 << 17)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_PER_48M_GFCLK_SHIFT                18
-#define OMAP4430_CLKACTIVITY_PER_48M_GFCLK_WIDTH                0x1
-#define OMAP4430_CLKACTIVITY_PER_48M_GFCLK_MASK                 (1 << 18)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_PER_96M_GFCLK_SHIFT                19
-#define OMAP4430_CLKACTIVITY_PER_96M_GFCLK_WIDTH                0x1
-#define OMAP4430_CLKACTIVITY_PER_96M_GFCLK_MASK                 (1 << 19)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_PER_ABE_24M_GFCLK_SHIFT            25
-#define OMAP4430_CLKACTIVITY_PER_ABE_24M_GFCLK_WIDTH            0x1
-#define OMAP4430_CLKACTIVITY_PER_ABE_24M_GFCLK_MASK             (1 << 25)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_PER_MCASP2_GFCLK_SHIFT             20
-#define OMAP4430_CLKACTIVITY_PER_MCASP2_GFCLK_WIDTH             0x1
-#define OMAP4430_CLKACTIVITY_PER_MCASP2_GFCLK_MASK              (1 << 20)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_PER_MCASP3_GFCLK_SHIFT             21
-#define OMAP4430_CLKACTIVITY_PER_MCASP3_GFCLK_MASK              (1 << 21)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_PER_MCBSP4_GFCLK_SHIFT             22
-#define OMAP4430_CLKACTIVITY_PER_MCBSP4_GFCLK_WIDTH             0x1
-#define OMAP4430_CLKACTIVITY_PER_MCBSP4_GFCLK_MASK              (1 << 22)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_PER_SYS_GFCLK_SHIFT                24
-#define OMAP4430_CLKACTIVITY_PER_SYS_GFCLK_WIDTH                0x1
-#define OMAP4430_CLKACTIVITY_PER_SYS_GFCLK_MASK                 (1 << 24)
-
-/* Used by CM_MEMIF_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_PHY_ROOT_CLK_SHIFT                 10
-#define OMAP4430_CLKACTIVITY_PHY_ROOT_CLK_WIDTH                 0x1
-#define OMAP4430_CLKACTIVITY_PHY_ROOT_CLK_MASK                  (1 << 10)
-
-/* Used by CM_GFX_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_SGX_GFCLK_SHIFT                    9
-#define OMAP4430_CLKACTIVITY_SGX_GFCLK_WIDTH                    0x1
-#define OMAP4430_CLKACTIVITY_SGX_GFCLK_MASK                     (1 << 9)
-
-/* Used by CM_ALWON_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_SR_CORE_SYSCLK_SHIFT               11
-#define OMAP4430_CLKACTIVITY_SR_CORE_SYSCLK_WIDTH               0x1
-#define OMAP4430_CLKACTIVITY_SR_CORE_SYSCLK_MASK                (1 << 11)
-
-/* Used by CM_ALWON_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_SR_IVA_SYSCLK_SHIFT                10
-#define OMAP4430_CLKACTIVITY_SR_IVA_SYSCLK_WIDTH                0x1
-#define OMAP4430_CLKACTIVITY_SR_IVA_SYSCLK_MASK                 (1 << 10)
-
-/* Used by CM_ALWON_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_SR_MPU_SYSCLK_SHIFT                9
-#define OMAP4430_CLKACTIVITY_SR_MPU_SYSCLK_WIDTH                0x1
-#define OMAP4430_CLKACTIVITY_SR_MPU_SYSCLK_MASK                 (1 << 9)
-
-/* Used by CM_WKUP_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_SYS_CLK_SHIFT                      8
-#define OMAP4430_CLKACTIVITY_SYS_CLK_WIDTH                      0x1
-#define OMAP4430_CLKACTIVITY_SYS_CLK_MASK                       (1 << 8)
-
-/* Used by CM_TESLA_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_TESLA_ROOT_CLK_SHIFT               8
-#define OMAP4430_CLKACTIVITY_TESLA_ROOT_CLK_WIDTH               0x1
-#define OMAP4430_CLKACTIVITY_TESLA_ROOT_CLK_MASK                (1 << 8)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_TLL_CH0_GFCLK_SHIFT                22
-#define OMAP4430_CLKACTIVITY_TLL_CH0_GFCLK_WIDTH                0x1
-#define OMAP4430_CLKACTIVITY_TLL_CH0_GFCLK_MASK                 (1 << 22)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_TLL_CH1_GFCLK_SHIFT                23
-#define OMAP4430_CLKACTIVITY_TLL_CH1_GFCLK_WIDTH                0x1
-#define OMAP4430_CLKACTIVITY_TLL_CH1_GFCLK_MASK                 (1 << 23)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_TLL_CH2_GFCLK_SHIFT                24
-#define OMAP4430_CLKACTIVITY_TLL_CH2_GFCLK_WIDTH                0x1
-#define OMAP4430_CLKACTIVITY_TLL_CH2_GFCLK_MASK                 (1 << 24)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_UNIPRO_DPLL_CLK_SHIFT              10
-#define OMAP4430_CLKACTIVITY_UNIPRO_DPLL_CLK_WIDTH              0x1
-#define OMAP4430_CLKACTIVITY_UNIPRO_DPLL_CLK_MASK               (1 << 10)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_USB_DPLL_CLK_SHIFT                 14
-#define OMAP4430_CLKACTIVITY_USB_DPLL_CLK_WIDTH                 0x1
-#define OMAP4430_CLKACTIVITY_USB_DPLL_CLK_MASK                  (1 << 14)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_USB_DPLL_HS_CLK_SHIFT              15
-#define OMAP4430_CLKACTIVITY_USB_DPLL_HS_CLK_WIDTH              0x1
-#define OMAP4430_CLKACTIVITY_USB_DPLL_HS_CLK_MASK               (1 << 15)
-
-/* Used by CM_WKUP_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_USIM_GFCLK_SHIFT                   10
-#define OMAP4430_CLKACTIVITY_USIM_GFCLK_WIDTH                   0x1
-#define OMAP4430_CLKACTIVITY_USIM_GFCLK_MASK                    (1 << 10)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_UTMI_P3_GFCLK_SHIFT                30
-#define OMAP4430_CLKACTIVITY_UTMI_P3_GFCLK_WIDTH                0x1
-#define OMAP4430_CLKACTIVITY_UTMI_P3_GFCLK_MASK                 (1 << 30)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_UTMI_ROOT_GFCLK_SHIFT              25
-#define OMAP4430_CLKACTIVITY_UTMI_ROOT_GFCLK_WIDTH              0x1
-#define OMAP4430_CLKACTIVITY_UTMI_ROOT_GFCLK_MASK               (1 << 25)
-
-/* Used by CM_WKUP_CLKSTCTRL */
-#define OMAP4430_CLKACTIVITY_WKUP_32K_GFCLK_SHIFT               11
-#define OMAP4430_CLKACTIVITY_WKUP_32K_GFCLK_WIDTH               0x1
-#define OMAP4430_CLKACTIVITY_WKUP_32K_GFCLK_MASK                (1 << 11)
-
-/* Used by CM_WKUP_CLKSTCTRL */
-#define OMAP4460_CLKACTIVITY_WKUP_TS_GFCLK_SHIFT                13
-#define OMAP4460_CLKACTIVITY_WKUP_TS_GFCLK_WIDTH                0x1
-#define OMAP4460_CLKACTIVITY_WKUP_TS_GFCLK_MASK                 (1 << 13)
-
-/*
- * Used by CM1_ABE_TIMER5_CLKCTRL, CM1_ABE_TIMER6_CLKCTRL,
- * CM1_ABE_TIMER7_CLKCTRL, CM1_ABE_TIMER8_CLKCTRL, CM_L3INIT_MMC1_CLKCTRL,
- * CM_L3INIT_MMC2_CLKCTRL, CM_L4PER_DMTIMER10_CLKCTRL,
- * CM_L4PER_DMTIMER11_CLKCTRL, CM_L4PER_DMTIMER2_CLKCTRL,
- * CM_L4PER_DMTIMER3_CLKCTRL, CM_L4PER_DMTIMER4_CLKCTRL,
- * CM_L4PER_DMTIMER9_CLKCTRL, CM_WKUP_TIMER1_CLKCTRL
- */
 #define OMAP4430_CLKSEL_SHIFT                                   24
 #define OMAP4430_CLKSEL_WIDTH                                   0x1
 #define OMAP4430_CLKSEL_MASK                                    (1 << 24)
-
-/*
- * Renamed from CLKSEL Used by CM_ABE_DSS_SYS_CLKSEL, CM_ABE_PLL_REF_CLKSEL,
- * CM_CLKSEL_DUCATI_ISS_ROOT, CM_CLKSEL_USB_60MHZ, CM_L4_WKUP_CLKSEL
- */
 #define OMAP4430_CLKSEL_0_0_SHIFT                               0
 #define OMAP4430_CLKSEL_0_0_WIDTH                               0x1
-#define OMAP4430_CLKSEL_0_0_MASK                                (1 << 0)
-
-/* Renamed from CLKSEL Used by CM_BYPCLK_DPLL_IVA, CM_BYPCLK_DPLL_MPU */
 #define OMAP4430_CLKSEL_0_1_SHIFT                               0
 #define OMAP4430_CLKSEL_0_1_WIDTH                               0x2
-#define OMAP4430_CLKSEL_0_1_MASK                                (0x3 << 0)
-
-/* Renamed from CLKSEL Used by CM_L3INIT_HSI_CLKCTRL */
 #define OMAP4430_CLKSEL_24_25_SHIFT                             24
 #define OMAP4430_CLKSEL_24_25_WIDTH                             0x2
-#define OMAP4430_CLKSEL_24_25_MASK                              (0x3 << 24)
-
-/* Used by CM_L3INIT_USB_OTG_CLKCTRL */
 #define OMAP4430_CLKSEL_60M_SHIFT                               24
 #define OMAP4430_CLKSEL_60M_WIDTH                               0x1
-#define OMAP4430_CLKSEL_60M_MASK                                (1 << 24)
-
-/* Used by CM_MPU_MPU_CLKCTRL */
-#define OMAP4460_CLKSEL_ABE_DIV_MODE_SHIFT                      25
-#define OMAP4460_CLKSEL_ABE_DIV_MODE_WIDTH                      0x1
-#define OMAP4460_CLKSEL_ABE_DIV_MODE_MASK                       (1 << 25)
-
-/* Used by CM1_ABE_AESS_CLKCTRL */
 #define OMAP4430_CLKSEL_AESS_FCLK_SHIFT                         24
 #define OMAP4430_CLKSEL_AESS_FCLK_WIDTH                         0x1
-#define OMAP4430_CLKSEL_AESS_FCLK_MASK                          (1 << 24)
-
-/* Used by CM_CLKSEL_CORE */
 #define OMAP4430_CLKSEL_CORE_SHIFT                              0
 #define OMAP4430_CLKSEL_CORE_WIDTH                              0x1
-#define OMAP4430_CLKSEL_CORE_MASK                               (1 << 0)
-
-/* Renamed from CLKSEL_CORE Used by CM_SHADOW_FREQ_CONFIG2 */
-#define OMAP4430_CLKSEL_CORE_1_1_SHIFT                          1
-#define OMAP4430_CLKSEL_CORE_1_1_WIDTH                          0x1
-#define OMAP4430_CLKSEL_CORE_1_1_MASK                           (1 << 1)
-
-/* Used by CM_WKUP_USIM_CLKCTRL */
 #define OMAP4430_CLKSEL_DIV_SHIFT                               24
 #define OMAP4430_CLKSEL_DIV_WIDTH                               0x1
-#define OMAP4430_CLKSEL_DIV_MASK                                (1 << 24)
-
-/* Used by CM_MPU_MPU_CLKCTRL */
-#define OMAP4460_CLKSEL_EMIF_DIV_MODE_SHIFT                     24
-#define OMAP4460_CLKSEL_EMIF_DIV_MODE_WIDTH                     0x1
-#define OMAP4460_CLKSEL_EMIF_DIV_MODE_MASK                      (1 << 24)
-
-/* Used by CM_CAM_FDIF_CLKCTRL */
 #define OMAP4430_CLKSEL_FCLK_SHIFT                              24
 #define OMAP4430_CLKSEL_FCLK_WIDTH                              0x2
-#define OMAP4430_CLKSEL_FCLK_MASK                               (0x3 << 24)
-
-/* Used by CM_L4PER_MCBSP4_CLKCTRL */
 #define OMAP4430_CLKSEL_INTERNAL_SOURCE_SHIFT                   25
 #define OMAP4430_CLKSEL_INTERNAL_SOURCE_WIDTH                   0x1
-#define OMAP4430_CLKSEL_INTERNAL_SOURCE_MASK                    (1 << 25)
-
-/*
- * Renamed from CLKSEL_INTERNAL_SOURCE Used by CM1_ABE_DMIC_CLKCTRL,
- * CM1_ABE_MCASP_CLKCTRL, CM1_ABE_MCBSP1_CLKCTRL, CM1_ABE_MCBSP2_CLKCTRL,
- * CM1_ABE_MCBSP3_CLKCTRL
- */
-#define OMAP4430_CLKSEL_INTERNAL_SOURCE_CM1_ABE_DMIC_SHIFT      26
-#define OMAP4430_CLKSEL_INTERNAL_SOURCE_CM1_ABE_DMIC_WIDTH      0x2
-#define OMAP4430_CLKSEL_INTERNAL_SOURCE_CM1_ABE_DMIC_MASK       (0x3 << 26)
-
-/* Used by CM_CLKSEL_CORE */
 #define OMAP4430_CLKSEL_L3_SHIFT                                4
 #define OMAP4430_CLKSEL_L3_WIDTH                                0x1
-#define OMAP4430_CLKSEL_L3_MASK                                 (1 << 4)
-
-/* Renamed from CLKSEL_L3 Used by CM_SHADOW_FREQ_CONFIG2 */
-#define OMAP4430_CLKSEL_L3_SHADOW_SHIFT                         2
-#define OMAP4430_CLKSEL_L3_SHADOW_WIDTH                         0x1
-#define OMAP4430_CLKSEL_L3_SHADOW_MASK                          (1 << 2)
-
-/* Used by CM_CLKSEL_CORE */
 #define OMAP4430_CLKSEL_L4_SHIFT                                8
 #define OMAP4430_CLKSEL_L4_WIDTH                                0x1
-#define OMAP4430_CLKSEL_L4_MASK                                 (1 << 8)
-
-/* Used by CM_CLKSEL_ABE */
 #define OMAP4430_CLKSEL_OPP_SHIFT                               0
 #define OMAP4430_CLKSEL_OPP_WIDTH                               0x2
-#define OMAP4430_CLKSEL_OPP_MASK                                (0x3 << 0)
-
-/* Used by CM_EMU_DEBUGSS_CLKCTRL */
 #define OMAP4430_CLKSEL_PMD_STM_CLK_SHIFT                       27
 #define OMAP4430_CLKSEL_PMD_STM_CLK_WIDTH                       0x3
-#define OMAP4430_CLKSEL_PMD_STM_CLK_MASK                        (0x7 << 27)
-
-/* Used by CM_EMU_DEBUGSS_CLKCTRL */
-#define OMAP4430_CLKSEL_PMD_TRACE_CLK_SHIFT                     24
-#define OMAP4430_CLKSEL_PMD_TRACE_CLK_WIDTH                     0x3
 #define OMAP4430_CLKSEL_PMD_TRACE_CLK_MASK                      (0x7 << 24)
-
-/* Used by CM_GFX_GFX_CLKCTRL */
-#define OMAP4430_CLKSEL_SGX_FCLK_SHIFT                          24
-#define OMAP4430_CLKSEL_SGX_FCLK_WIDTH                          0x1
 #define OMAP4430_CLKSEL_SGX_FCLK_MASK                           (1 << 24)
-
-/*
- * Used by CM1_ABE_DMIC_CLKCTRL, CM1_ABE_MCASP_CLKCTRL, CM1_ABE_MCBSP1_CLKCTRL,
- * CM1_ABE_MCBSP2_CLKCTRL, CM1_ABE_MCBSP3_CLKCTRL
- */
-#define OMAP4430_CLKSEL_SOURCE_SHIFT                            24
-#define OMAP4430_CLKSEL_SOURCE_WIDTH                            0x2
 #define OMAP4430_CLKSEL_SOURCE_MASK                             (0x3 << 24)
-
-/* Renamed from CLKSEL_SOURCE Used by CM_L4PER_MCBSP4_CLKCTRL */
-#define OMAP4430_CLKSEL_SOURCE_24_24_SHIFT                      24
-#define OMAP4430_CLKSEL_SOURCE_24_24_WIDTH                      0x1
 #define OMAP4430_CLKSEL_SOURCE_24_24_MASK                       (1 << 24)
-
-/* Used by CM_L3INIT_USB_HOST_CLKCTRL */
 #define OMAP4430_CLKSEL_UTMI_P1_SHIFT                           24
 #define OMAP4430_CLKSEL_UTMI_P1_WIDTH                           0x1
-#define OMAP4430_CLKSEL_UTMI_P1_MASK                            (1 << 24)
-
-/* Used by CM_L3INIT_USB_HOST_CLKCTRL */
 #define OMAP4430_CLKSEL_UTMI_P2_SHIFT                           25
 #define OMAP4430_CLKSEL_UTMI_P2_WIDTH                           0x1
-#define OMAP4430_CLKSEL_UTMI_P2_MASK                            (1 << 25)
-
-/*
- * Used by CM1_ABE_CLKSTCTRL, CM_ALWON_CLKSTCTRL, CM_CAM_CLKSTCTRL,
- * CM_CEFUSE_CLKSTCTRL, CM_D2D_CLKSTCTRL, CM_DSS_CLKSTCTRL,
- * CM_DUCATI_CLKSTCTRL, CM_EMU_CLKSTCTRL, CM_GFX_CLKSTCTRL, CM_IVAHD_CLKSTCTRL,
- * CM_L3INIT_CLKSTCTRL, CM_L3INSTR_CLKSTCTRL, CM_L3_1_CLKSTCTRL,
- * CM_L3_2_CLKSTCTRL, CM_L4CFG_CLKSTCTRL, CM_L4PER_CLKSTCTRL,
- * CM_L4SEC_CLKSTCTRL, CM_MEMIF_CLKSTCTRL, CM_MPU_CLKSTCTRL, CM_SDMA_CLKSTCTRL,
- * CM_TESLA_CLKSTCTRL, CM_WKUP_CLKSTCTRL
- */
 #define OMAP4430_CLKTRCTRL_SHIFT                                0
-#define OMAP4430_CLKTRCTRL_WIDTH                                0x2
 #define OMAP4430_CLKTRCTRL_MASK                                 (0x3 << 0)
-
-/* Used by CM_EMU_OVERRIDE_DPLL_CORE */
-#define OMAP4430_CORE_DPLL_EMU_DIV_SHIFT                        0
-#define OMAP4430_CORE_DPLL_EMU_DIV_WIDTH                        0x7
-#define OMAP4430_CORE_DPLL_EMU_DIV_MASK                         (0x7f << 0)
-
-/* Used by CM_EMU_OVERRIDE_DPLL_CORE */
-#define OMAP4430_CORE_DPLL_EMU_MULT_SHIFT                       8
-#define OMAP4430_CORE_DPLL_EMU_MULT_WIDTH                       0xb
-#define OMAP4430_CORE_DPLL_EMU_MULT_MASK                        (0x7ff << 8)
-
-/* Used by REVISION_CM1, REVISION_CM2 */
-#define OMAP4430_CUSTOM_SHIFT                                   6
-#define OMAP4430_CUSTOM_WIDTH                                   0x2
-#define OMAP4430_CUSTOM_MASK                                    (0x3 << 6)
-
-/* Used by CM_L3_2_DYNAMICDEP, CM_L4CFG_DYNAMICDEP */
-#define OMAP4430_D2D_DYNDEP_SHIFT                               18
-#define OMAP4430_D2D_DYNDEP_WIDTH                               0x1
-#define OMAP4430_D2D_DYNDEP_MASK                                (1 << 18)
-
-/* Used by CM_MPU_STATICDEP */
-#define OMAP4430_D2D_STATDEP_SHIFT                              18
-#define OMAP4430_D2D_STATDEP_WIDTH                              0x1
-#define OMAP4430_D2D_STATDEP_MASK                               (1 << 18)
-
-/* Used by CM_CLKSEL_DPLL_MPU */
-#define OMAP4460_DCC_COUNT_MAX_SHIFT                            24
-#define OMAP4460_DCC_COUNT_MAX_WIDTH                            0x8
-#define OMAP4460_DCC_COUNT_MAX_MASK                             (0xff << 24)
-
-/* Used by CM_CLKSEL_DPLL_MPU */
-#define OMAP4460_DCC_EN_SHIFT                                   22
-#define OMAP4460_DCC_EN_MASK                                    (1 << 22)
-
-/*
- * Used by CM_SSC_DELTAMSTEP_DPLL_ABE, CM_SSC_DELTAMSTEP_DPLL_CORE,
- * CM_SSC_DELTAMSTEP_DPLL_DDRPHY, CM_SSC_DELTAMSTEP_DPLL_IVA,
- * CM_SSC_DELTAMSTEP_DPLL_MPU, CM_SSC_DELTAMSTEP_DPLL_PER,
- * CM_SSC_DELTAMSTEP_DPLL_UNIPRO, CM_SSC_DELTAMSTEP_DPLL_USB
- */
-#define OMAP4430_DELTAMSTEP_SHIFT                               0
-#define OMAP4430_DELTAMSTEP_WIDTH                               0x14
-#define OMAP4430_DELTAMSTEP_MASK                                (0xfffff << 0)
-
-/* Renamed from DELTAMSTEP Used by CM_SSC_DELTAMSTEP_DPLL_USB */
-#define OMAP4460_DELTAMSTEP_0_20_SHIFT                          0
-#define OMAP4460_DELTAMSTEP_0_20_WIDTH                          0x15
-#define OMAP4460_DELTAMSTEP_0_20_MASK                           (0x1fffff << 0)
-
-/* Used by CM_DLL_CTRL */
-#define OMAP4430_DLL_OVERRIDE_SHIFT                             0
-#define OMAP4430_DLL_OVERRIDE_WIDTH                             0x1
-#define OMAP4430_DLL_OVERRIDE_MASK                              (1 << 0)
-
-/* Renamed from DLL_OVERRIDE Used by CM_SHADOW_FREQ_CONFIG1 */
-#define OMAP4430_DLL_OVERRIDE_2_2_SHIFT                         2
-#define OMAP4430_DLL_OVERRIDE_2_2_WIDTH                         0x1
-#define OMAP4430_DLL_OVERRIDE_2_2_MASK                          (1 << 2)
-
-/* Used by CM_SHADOW_FREQ_CONFIG1 */
-#define OMAP4430_DLL_RESET_SHIFT                                3
-#define OMAP4430_DLL_RESET_WIDTH                                0x1
-#define OMAP4430_DLL_RESET_MASK                                 (1 << 3)
-
-/*
- * Used by CM_CLKSEL_DPLL_ABE, CM_CLKSEL_DPLL_CORE, CM_CLKSEL_DPLL_DDRPHY,
- * CM_CLKSEL_DPLL_IVA, CM_CLKSEL_DPLL_MPU, CM_CLKSEL_DPLL_PER,
- * CM_CLKSEL_DPLL_UNIPRO, CM_CLKSEL_DPLL_USB
- */
 #define OMAP4430_DPLL_BYP_CLKSEL_SHIFT                          23
 #define OMAP4430_DPLL_BYP_CLKSEL_WIDTH                          0x1
-#define OMAP4430_DPLL_BYP_CLKSEL_MASK                           (1 << 23)
-
-/* Used by CM_CLKDCOLDO_DPLL_USB */
-#define OMAP4430_DPLL_CLKDCOLDO_GATE_CTRL_SHIFT                 8
-#define OMAP4430_DPLL_CLKDCOLDO_GATE_CTRL_WIDTH                 0x1
-#define OMAP4430_DPLL_CLKDCOLDO_GATE_CTRL_MASK                  (1 << 8)
-
-/* Used by CM_CLKSEL_DPLL_CORE */
-#define OMAP4430_DPLL_CLKOUTHIF_CLKSEL_SHIFT                    20
-#define OMAP4430_DPLL_CLKOUTHIF_CLKSEL_WIDTH                    0x1
-#define OMAP4430_DPLL_CLKOUTHIF_CLKSEL_MASK                     (1 << 20)
-
-/* Used by CM_DIV_M3_DPLL_ABE, CM_DIV_M3_DPLL_CORE, CM_DIV_M3_DPLL_PER */
-#define OMAP4430_DPLL_CLKOUTHIF_DIV_SHIFT                       0
-#define OMAP4430_DPLL_CLKOUTHIF_DIV_WIDTH                       0x5
 #define OMAP4430_DPLL_CLKOUTHIF_DIV_MASK                        (0x1f << 0)
-
-/* Used by CM_DIV_M3_DPLL_ABE, CM_DIV_M3_DPLL_CORE, CM_DIV_M3_DPLL_PER */
-#define OMAP4430_DPLL_CLKOUTHIF_DIVCHACK_SHIFT                  5
-#define OMAP4430_DPLL_CLKOUTHIF_DIVCHACK_WIDTH                  0x1
-#define OMAP4430_DPLL_CLKOUTHIF_DIVCHACK_MASK                   (1 << 5)
-
-/* Used by CM_DIV_M3_DPLL_ABE, CM_DIV_M3_DPLL_CORE, CM_DIV_M3_DPLL_PER */
 #define OMAP4430_DPLL_CLKOUTHIF_GATE_CTRL_SHIFT                 8
-#define OMAP4430_DPLL_CLKOUTHIF_GATE_CTRL_WIDTH                 0x1
-#define OMAP4430_DPLL_CLKOUTHIF_GATE_CTRL_MASK                  (1 << 8)
-
-/* Used by CM_DIV_M2_DPLL_ABE, CM_DIV_M2_DPLL_PER, CM_DIV_M2_DPLL_UNIPRO */
-#define OMAP4430_DPLL_CLKOUTX2_GATE_CTRL_SHIFT                  10
-#define OMAP4430_DPLL_CLKOUTX2_GATE_CTRL_WIDTH                  0x1
 #define OMAP4430_DPLL_CLKOUTX2_GATE_CTRL_MASK                   (1 << 10)
-
-/*
- * Used by CM_DIV_M2_DPLL_ABE, CM_DIV_M2_DPLL_CORE, CM_DIV_M2_DPLL_DDRPHY,
- * CM_DIV_M2_DPLL_MPU, CM_DIV_M2_DPLL_PER, CM_DIV_M2_DPLL_UNIPRO
- */
 #define OMAP4430_DPLL_CLKOUT_DIV_SHIFT                          0
 #define OMAP4430_DPLL_CLKOUT_DIV_WIDTH                          0x5
 #define OMAP4430_DPLL_CLKOUT_DIV_MASK                           (0x1f << 0)
-
-/* Renamed from DPLL_CLKOUT_DIV Used by CM_DIV_M2_DPLL_USB */
-#define OMAP4430_DPLL_CLKOUT_DIV_0_6_SHIFT                      0
-#define OMAP4430_DPLL_CLKOUT_DIV_0_6_WIDTH                      0x7
 #define OMAP4430_DPLL_CLKOUT_DIV_0_6_MASK                       (0x7f << 0)
-
-/*
- * Used by CM_DIV_M2_DPLL_ABE, CM_DIV_M2_DPLL_CORE, CM_DIV_M2_DPLL_DDRPHY,
- * CM_DIV_M2_DPLL_MPU, CM_DIV_M2_DPLL_PER, CM_DIV_M2_DPLL_UNIPRO
- */
-#define OMAP4430_DPLL_CLKOUT_DIVCHACK_SHIFT                     5
-#define OMAP4430_DPLL_CLKOUT_DIVCHACK_WIDTH                     0x1
-#define OMAP4430_DPLL_CLKOUT_DIVCHACK_MASK                      (1 << 5)
-
-/* Renamed from DPLL_CLKOUT_DIVCHACK Used by CM_DIV_M2_DPLL_USB */
-#define OMAP4430_DPLL_CLKOUT_DIVCHACK_M2_USB_SHIFT              7
-#define OMAP4430_DPLL_CLKOUT_DIVCHACK_M2_USB_WIDTH              0x1
-#define OMAP4430_DPLL_CLKOUT_DIVCHACK_M2_USB_MASK               (1 << 7)
-
-/*
- * Used by CM_DIV_M2_DPLL_ABE, CM_DIV_M2_DPLL_CORE, CM_DIV_M2_DPLL_DDRPHY,
- * CM_DIV_M2_DPLL_MPU, CM_DIV_M2_DPLL_PER, CM_DIV_M2_DPLL_USB
- */
-#define OMAP4430_DPLL_CLKOUT_GATE_CTRL_SHIFT                    8
-#define OMAP4430_DPLL_CLKOUT_GATE_CTRL_WIDTH                    0x1
 #define OMAP4430_DPLL_CLKOUT_GATE_CTRL_MASK                     (1 << 8)
-
-/* Used by CM_SHADOW_FREQ_CONFIG1 */
-#define OMAP4430_DPLL_CORE_DPLL_EN_SHIFT                        8
-#define OMAP4430_DPLL_CORE_DPLL_EN_WIDTH                        0x3
-#define OMAP4430_DPLL_CORE_DPLL_EN_MASK                         (0x7 << 8)
-
-/* Used by CM_SHADOW_FREQ_CONFIG1 */
-#define OMAP4430_DPLL_CORE_M2_DIV_SHIFT                         11
-#define OMAP4430_DPLL_CORE_M2_DIV_WIDTH                         0x5
-#define OMAP4430_DPLL_CORE_M2_DIV_MASK                          (0x1f << 11)
-
-/* Used by CM_SHADOW_FREQ_CONFIG2 */
-#define OMAP4430_DPLL_CORE_M5_DIV_SHIFT                         3
-#define OMAP4430_DPLL_CORE_M5_DIV_WIDTH                         0x5
-#define OMAP4430_DPLL_CORE_M5_DIV_MASK                          (0x1f << 3)
-
-/*
- * Used by CM_CLKSEL_DPLL_ABE, CM_CLKSEL_DPLL_CORE, CM_CLKSEL_DPLL_DDRPHY,
- * CM_CLKSEL_DPLL_IVA, CM_CLKSEL_DPLL_MPU, CM_CLKSEL_DPLL_PER,
- * CM_CLKSEL_DPLL_UNIPRO
- */
-#define OMAP4430_DPLL_DIV_SHIFT                                 0
-#define OMAP4430_DPLL_DIV_WIDTH                                 0x7
 #define OMAP4430_DPLL_DIV_MASK                                  (0x7f << 0)
-
-/* Renamed from DPLL_DIV Used by CM_CLKSEL_DPLL_USB */
-#define OMAP4430_DPLL_DIV_0_7_SHIFT                             0
-#define OMAP4430_DPLL_DIV_0_7_WIDTH                             0x8
 #define OMAP4430_DPLL_DIV_0_7_MASK                              (0xff << 0)
-
-/*
- * Used by CM_CLKMODE_DPLL_ABE, CM_CLKMODE_DPLL_CORE, CM_CLKMODE_DPLL_DDRPHY,
- * CM_CLKMODE_DPLL_IVA, CM_CLKMODE_DPLL_MPU, CM_CLKMODE_DPLL_PER
- */
-#define OMAP4430_DPLL_DRIFTGUARD_EN_SHIFT                       8
-#define OMAP4430_DPLL_DRIFTGUARD_EN_WIDTH                       0x1
-#define OMAP4430_DPLL_DRIFTGUARD_EN_MASK                        (1 << 8)
-
-/* Renamed from DPLL_DRIFTGUARD_EN Used by CM_CLKMODE_DPLL_UNIPRO */
-#define OMAP4430_DPLL_DRIFTGUARD_EN_3_3_SHIFT                   3
-#define OMAP4430_DPLL_DRIFTGUARD_EN_3_3_WIDTH                   0x1
-#define OMAP4430_DPLL_DRIFTGUARD_EN_3_3_MASK                    (1 << 3)
-
-/*
- * Used by CM_CLKMODE_DPLL_ABE, CM_CLKMODE_DPLL_CORE, CM_CLKMODE_DPLL_DDRPHY,
- * CM_CLKMODE_DPLL_IVA, CM_CLKMODE_DPLL_MPU, CM_CLKMODE_DPLL_PER,
- * CM_CLKMODE_DPLL_UNIPRO, CM_CLKMODE_DPLL_USB
- */
-#define OMAP4430_DPLL_EN_SHIFT                                  0
-#define OMAP4430_DPLL_EN_WIDTH                                  0x3
 #define OMAP4430_DPLL_EN_MASK                                   (0x7 << 0)
-
-/*
- * Used by CM_CLKMODE_DPLL_ABE, CM_CLKMODE_DPLL_CORE, CM_CLKMODE_DPLL_DDRPHY,
- * CM_CLKMODE_DPLL_IVA, CM_CLKMODE_DPLL_MPU, CM_CLKMODE_DPLL_PER,
- * CM_CLKMODE_DPLL_UNIPRO
- */
-#define OMAP4430_DPLL_LPMODE_EN_SHIFT                           10
-#define OMAP4430_DPLL_LPMODE_EN_WIDTH                           0x1
 #define OMAP4430_DPLL_LPMODE_EN_MASK                            (1 << 10)
-
-/*
- * Used by CM_CLKSEL_DPLL_ABE, CM_CLKSEL_DPLL_CORE, CM_CLKSEL_DPLL_DDRPHY,
- * CM_CLKSEL_DPLL_IVA, CM_CLKSEL_DPLL_MPU, CM_CLKSEL_DPLL_PER,
- * CM_CLKSEL_DPLL_UNIPRO
- */
-#define OMAP4430_DPLL_MULT_SHIFT                                8
-#define OMAP4430_DPLL_MULT_WIDTH                                0xb
 #define OMAP4430_DPLL_MULT_MASK                                 (0x7ff << 8)
-
-/* Renamed from DPLL_MULT Used by CM_CLKSEL_DPLL_USB */
-#define OMAP4430_DPLL_MULT_USB_SHIFT                            8
-#define OMAP4430_DPLL_MULT_USB_WIDTH                            0xc
 #define OMAP4430_DPLL_MULT_USB_MASK                             (0xfff << 8)
-
-/*
- * Used by CM_CLKMODE_DPLL_ABE, CM_CLKMODE_DPLL_CORE, CM_CLKMODE_DPLL_DDRPHY,
- * CM_CLKMODE_DPLL_IVA, CM_CLKMODE_DPLL_MPU, CM_CLKMODE_DPLL_PER,
- * CM_CLKMODE_DPLL_UNIPRO
- */
-#define OMAP4430_DPLL_REGM4XEN_SHIFT                            11
-#define OMAP4430_DPLL_REGM4XEN_WIDTH                            0x1
 #define OMAP4430_DPLL_REGM4XEN_MASK                             (1 << 11)
-
-/* Used by CM_CLKSEL_DPLL_USB */
-#define OMAP4430_DPLL_SD_DIV_SHIFT                              24
-#define OMAP4430_DPLL_SD_DIV_WIDTH                              0x8
 #define OMAP4430_DPLL_SD_DIV_MASK                               (0xff << 24)
-
-/*
- * Used by CM_CLKMODE_DPLL_ABE, CM_CLKMODE_DPLL_CORE, CM_CLKMODE_DPLL_DDRPHY,
- * CM_CLKMODE_DPLL_IVA, CM_CLKMODE_DPLL_MPU, CM_CLKMODE_DPLL_PER,
- * CM_CLKMODE_DPLL_UNIPRO, CM_CLKMODE_DPLL_USB
- */
-#define OMAP4430_DPLL_SSC_ACK_SHIFT                             13
-#define OMAP4430_DPLL_SSC_ACK_WIDTH                             0x1
-#define OMAP4430_DPLL_SSC_ACK_MASK                              (1 << 13)
-
-/*
- * Used by CM_CLKMODE_DPLL_ABE, CM_CLKMODE_DPLL_CORE, CM_CLKMODE_DPLL_DDRPHY,
- * CM_CLKMODE_DPLL_IVA, CM_CLKMODE_DPLL_MPU, CM_CLKMODE_DPLL_PER,
- * CM_CLKMODE_DPLL_UNIPRO, CM_CLKMODE_DPLL_USB
- */
-#define OMAP4430_DPLL_SSC_DOWNSPREAD_SHIFT                      14
-#define OMAP4430_DPLL_SSC_DOWNSPREAD_WIDTH                      0x1
-#define OMAP4430_DPLL_SSC_DOWNSPREAD_MASK                       (1 << 14)
-
-/*
- * Used by CM_CLKMODE_DPLL_ABE, CM_CLKMODE_DPLL_CORE, CM_CLKMODE_DPLL_DDRPHY,
- * CM_CLKMODE_DPLL_IVA, CM_CLKMODE_DPLL_MPU, CM_CLKMODE_DPLL_PER,
- * CM_CLKMODE_DPLL_UNIPRO, CM_CLKMODE_DPLL_USB
- */
-#define OMAP4430_DPLL_SSC_EN_SHIFT                              12
-#define OMAP4430_DPLL_SSC_EN_WIDTH                              0x1
-#define OMAP4430_DPLL_SSC_EN_MASK                               (1 << 12)
-
-/* Used by CM_L3_2_DYNAMICDEP, CM_L4CFG_DYNAMICDEP, CM_L4PER_DYNAMICDEP */
-#define OMAP4430_DSS_DYNDEP_SHIFT                               8
-#define OMAP4430_DSS_DYNDEP_WIDTH                               0x1
-#define OMAP4430_DSS_DYNDEP_MASK                                (1 << 8)
-
-/* Used by CM_DUCATI_STATICDEP, CM_MPU_STATICDEP, CM_SDMA_STATICDEP */
 #define OMAP4430_DSS_STATDEP_SHIFT                              8
-#define OMAP4430_DSS_STATDEP_WIDTH                              0x1
-#define OMAP4430_DSS_STATDEP_MASK                               (1 << 8)
-
-/* Used by CM_L3_2_DYNAMICDEP */
-#define OMAP4430_DUCATI_DYNDEP_SHIFT                            0
-#define OMAP4430_DUCATI_DYNDEP_WIDTH                            0x1
-#define OMAP4430_DUCATI_DYNDEP_MASK                             (1 << 0)
-
-/* Used by CM_MPU_STATICDEP, CM_SDMA_STATICDEP */
 #define OMAP4430_DUCATI_STATDEP_SHIFT                           0
-#define OMAP4430_DUCATI_STATDEP_WIDTH                           0x1
-#define OMAP4430_DUCATI_STATDEP_MASK                            (1 << 0)
-
-/* Used by CM_SHADOW_FREQ_CONFIG1 */
-#define OMAP4430_FREQ_UPDATE_SHIFT                              0
-#define OMAP4430_FREQ_UPDATE_WIDTH                              0x1
-#define OMAP4430_FREQ_UPDATE_MASK                               (1 << 0)
-
-/* Used by REVISION_CM1, REVISION_CM2 */
-#define OMAP4430_FUNC_SHIFT                                     16
-#define OMAP4430_FUNC_WIDTH                                     0xc
-#define OMAP4430_FUNC_MASK                                      (0xfff << 16)
-
-/* Used by CM_L3_2_DYNAMICDEP */
-#define OMAP4430_GFX_DYNDEP_SHIFT                               10
-#define OMAP4430_GFX_DYNDEP_WIDTH                               0x1
-#define OMAP4430_GFX_DYNDEP_MASK                                (1 << 10)
-
-/* Used by CM_DUCATI_STATICDEP, CM_MPU_STATICDEP */
 #define OMAP4430_GFX_STATDEP_SHIFT                              10
-#define OMAP4430_GFX_STATDEP_WIDTH                              0x1
-#define OMAP4430_GFX_STATDEP_MASK                               (1 << 10)
-
-/* Used by CM_SHADOW_FREQ_CONFIG2 */
-#define OMAP4430_GPMC_FREQ_UPDATE_SHIFT                         0
-#define OMAP4430_GPMC_FREQ_UPDATE_WIDTH                         0x1
-#define OMAP4430_GPMC_FREQ_UPDATE_MASK                          (1 << 0)
-
-/*
- * Used by CM_DIV_M4_DPLL_CORE, CM_DIV_M4_DPLL_DDRPHY, CM_DIV_M4_DPLL_IVA,
- * CM_DIV_M4_DPLL_PER
- */
-#define OMAP4430_HSDIVIDER_CLKOUT1_DIV_SHIFT                    0
-#define OMAP4430_HSDIVIDER_CLKOUT1_DIV_WIDTH                    0x5
 #define OMAP4430_HSDIVIDER_CLKOUT1_DIV_MASK                     (0x1f << 0)
-
-/*
- * Used by CM_DIV_M4_DPLL_CORE, CM_DIV_M4_DPLL_DDRPHY, CM_DIV_M4_DPLL_IVA,
- * CM_DIV_M4_DPLL_PER
- */
-#define OMAP4430_HSDIVIDER_CLKOUT1_DIVCHACK_SHIFT               5
-#define OMAP4430_HSDIVIDER_CLKOUT1_DIVCHACK_WIDTH               0x1
-#define OMAP4430_HSDIVIDER_CLKOUT1_DIVCHACK_MASK                (1 << 5)
-
-/*
- * Used by CM_DIV_M4_DPLL_CORE, CM_DIV_M4_DPLL_DDRPHY, CM_DIV_M4_DPLL_IVA,
- * CM_DIV_M4_DPLL_PER
- */
-#define OMAP4430_HSDIVIDER_CLKOUT1_GATE_CTRL_SHIFT              8
-#define OMAP4430_HSDIVIDER_CLKOUT1_GATE_CTRL_WIDTH              0x1
-#define OMAP4430_HSDIVIDER_CLKOUT1_GATE_CTRL_MASK               (1 << 8)
-
-/*
- * Used by CM_DIV_M4_DPLL_CORE, CM_DIV_M4_DPLL_DDRPHY, CM_DIV_M4_DPLL_IVA,
- * CM_DIV_M4_DPLL_PER
- */
-#define OMAP4430_HSDIVIDER_CLKOUT1_PWDN_SHIFT                   12
-#define OMAP4430_HSDIVIDER_CLKOUT1_PWDN_WIDTH                   0x1
-#define OMAP4430_HSDIVIDER_CLKOUT1_PWDN_MASK                    (1 << 12)
-
-/*
- * Used by CM_DIV_M5_DPLL_CORE, CM_DIV_M5_DPLL_DDRPHY, CM_DIV_M5_DPLL_IVA,
- * CM_DIV_M5_DPLL_PER
- */
-#define OMAP4430_HSDIVIDER_CLKOUT2_DIV_SHIFT                    0
-#define OMAP4430_HSDIVIDER_CLKOUT2_DIV_WIDTH                    0x5
 #define OMAP4430_HSDIVIDER_CLKOUT2_DIV_MASK                     (0x1f << 0)
-
-/*
- * Used by CM_DIV_M5_DPLL_CORE, CM_DIV_M5_DPLL_DDRPHY, CM_DIV_M5_DPLL_IVA,
- * CM_DIV_M5_DPLL_PER
- */
-#define OMAP4430_HSDIVIDER_CLKOUT2_DIVCHACK_SHIFT               5
-#define OMAP4430_HSDIVIDER_CLKOUT2_DIVCHACK_WIDTH               0x1
-#define OMAP4430_HSDIVIDER_CLKOUT2_DIVCHACK_MASK                (1 << 5)
-
-/*
- * Used by CM_DIV_M5_DPLL_CORE, CM_DIV_M5_DPLL_DDRPHY, CM_DIV_M5_DPLL_IVA,
- * CM_DIV_M5_DPLL_PER
- */
-#define OMAP4430_HSDIVIDER_CLKOUT2_GATE_CTRL_SHIFT              8
-#define OMAP4430_HSDIVIDER_CLKOUT2_GATE_CTRL_WIDTH              0x1
-#define OMAP4430_HSDIVIDER_CLKOUT2_GATE_CTRL_MASK               (1 << 8)
-
-/*
- * Used by CM_DIV_M5_DPLL_CORE, CM_DIV_M5_DPLL_DDRPHY, CM_DIV_M5_DPLL_IVA,
- * CM_DIV_M5_DPLL_PER
- */
-#define OMAP4430_HSDIVIDER_CLKOUT2_PWDN_SHIFT                   12
-#define OMAP4430_HSDIVIDER_CLKOUT2_PWDN_WIDTH                   0x1
-#define OMAP4430_HSDIVIDER_CLKOUT2_PWDN_MASK                    (1 << 12)
-
-/* Used by CM_DIV_M6_DPLL_CORE, CM_DIV_M6_DPLL_DDRPHY, CM_DIV_M6_DPLL_PER */
-#define OMAP4430_HSDIVIDER_CLKOUT3_DIV_SHIFT                    0
-#define OMAP4430_HSDIVIDER_CLKOUT3_DIV_WIDTH                    0x5
 #define OMAP4430_HSDIVIDER_CLKOUT3_DIV_MASK                     (0x1f << 0)
-
-/* Used by CM_DIV_M6_DPLL_CORE, CM_DIV_M6_DPLL_DDRPHY, CM_DIV_M6_DPLL_PER */
-#define OMAP4430_HSDIVIDER_CLKOUT3_DIVCHACK_SHIFT               5
-#define OMAP4430_HSDIVIDER_CLKOUT3_DIVCHACK_WIDTH               0x1
-#define OMAP4430_HSDIVIDER_CLKOUT3_DIVCHACK_MASK                (1 << 5)
-
-/* Used by CM_DIV_M6_DPLL_CORE, CM_DIV_M6_DPLL_DDRPHY, CM_DIV_M6_DPLL_PER */
-#define OMAP4430_HSDIVIDER_CLKOUT3_GATE_CTRL_SHIFT              8
-#define OMAP4430_HSDIVIDER_CLKOUT3_GATE_CTRL_WIDTH              0x1
-#define OMAP4430_HSDIVIDER_CLKOUT3_GATE_CTRL_MASK               (1 << 8)
-
-/* Used by CM_DIV_M6_DPLL_CORE, CM_DIV_M6_DPLL_DDRPHY, CM_DIV_M6_DPLL_PER */
-#define OMAP4430_HSDIVIDER_CLKOUT3_PWDN_SHIFT                   12
-#define OMAP4430_HSDIVIDER_CLKOUT3_PWDN_WIDTH                   0x1
-#define OMAP4430_HSDIVIDER_CLKOUT3_PWDN_MASK                    (1 << 12)
-
-/* Used by CM_DIV_M7_DPLL_CORE, CM_DIV_M7_DPLL_PER */
-#define OMAP4430_HSDIVIDER_CLKOUT4_DIV_SHIFT                    0
-#define OMAP4430_HSDIVIDER_CLKOUT4_DIV_WIDTH                    0x5
 #define OMAP4430_HSDIVIDER_CLKOUT4_DIV_MASK                     (0x1f << 0)
-
-/* Used by CM_DIV_M7_DPLL_CORE, CM_DIV_M7_DPLL_PER */
-#define OMAP4430_HSDIVIDER_CLKOUT4_DIVCHACK_SHIFT               5
-#define OMAP4430_HSDIVIDER_CLKOUT4_DIVCHACK_WIDTH               0x1
-#define OMAP4430_HSDIVIDER_CLKOUT4_DIVCHACK_MASK                (1 << 5)
-
-/* Used by CM_DIV_M7_DPLL_CORE, CM_DIV_M7_DPLL_PER */
-#define OMAP4430_HSDIVIDER_CLKOUT4_GATE_CTRL_SHIFT              8
-#define OMAP4430_HSDIVIDER_CLKOUT4_GATE_CTRL_WIDTH              0x1
-#define OMAP4430_HSDIVIDER_CLKOUT4_GATE_CTRL_MASK               (1 << 8)
-
-/* Used by CM_DIV_M7_DPLL_CORE, CM_DIV_M7_DPLL_PER */
-#define OMAP4430_HSDIVIDER_CLKOUT4_PWDN_SHIFT                   12
-#define OMAP4430_HSDIVIDER_CLKOUT4_PWDN_WIDTH                   0x1
-#define OMAP4430_HSDIVIDER_CLKOUT4_PWDN_MASK                    (1 << 12)
-
-/*
- * Used by CM1_ABE_AESS_CLKCTRL, CM1_ABE_DMIC_CLKCTRL, CM1_ABE_L4ABE_CLKCTRL,
- * CM1_ABE_MCASP_CLKCTRL, CM1_ABE_MCBSP1_CLKCTRL, CM1_ABE_MCBSP2_CLKCTRL,
- * CM1_ABE_MCBSP3_CLKCTRL, CM1_ABE_PDM_CLKCTRL, CM1_ABE_SLIMBUS_CLKCTRL,
- * CM1_ABE_TIMER5_CLKCTRL, CM1_ABE_TIMER6_CLKCTRL, CM1_ABE_TIMER7_CLKCTRL,
- * CM1_ABE_TIMER8_CLKCTRL, CM1_ABE_WDT3_CLKCTRL, CM_ALWON_SR_CORE_CLKCTRL,
- * CM_ALWON_SR_IVA_CLKCTRL, CM_ALWON_SR_MPU_CLKCTRL, CM_CAM_FDIF_CLKCTRL,
- * CM_CAM_ISS_CLKCTRL, CM_CEFUSE_CEFUSE_CLKCTRL, CM_CM1_PROFILING_CLKCTRL,
- * CM_CM2_PROFILING_CLKCTRL, CM_D2D_MODEM_ICR_CLKCTRL, CM_D2D_SAD2D_CLKCTRL,
- * CM_D2D_SAD2D_FW_CLKCTRL, CM_DSS_DSS_CLKCTRL, CM_DUCATI_DUCATI_CLKCTRL,
- * CM_EMU_DEBUGSS_CLKCTRL, CM_GFX_GFX_CLKCTRL, CM_IVAHD_IVAHD_CLKCTRL,
- * CM_IVAHD_SL2_CLKCTRL, CM_L3INIT_HSI_CLKCTRL, CM_L3INIT_MMC1_CLKCTRL,
- * CM_L3INIT_MMC2_CLKCTRL, CM_L3INIT_USBPHYOCP2SCP_CLKCTRL,
- * CM_L3INIT_USB_HOST_CLKCTRL, CM_L3INIT_USB_HOST_FS_CLKCTRL,
- * CM_L3INIT_USB_OTG_CLKCTRL, CM_L3INIT_USB_TLL_CLKCTRL,
- * CM_L3INSTR_L3_3_CLKCTRL, CM_L3INSTR_L3_INSTR_CLKCTRL,
- * CM_L3INSTR_OCP_WP1_CLKCTRL, CM_L3_1_L3_1_CLKCTRL, CM_L3_2_GPMC_CLKCTRL,
- * CM_L3_2_L3_2_CLKCTRL, CM_L3_2_OCMC_RAM_CLKCTRL, CM_L4CFG_HW_SEM_CLKCTRL,
- * CM_L4CFG_L4_CFG_CLKCTRL, CM_L4CFG_MAILBOX_CLKCTRL, CM_L4CFG_SAR_ROM_CLKCTRL,
- * CM_L4PER_DMTIMER10_CLKCTRL, CM_L4PER_DMTIMER11_CLKCTRL,
- * CM_L4PER_DMTIMER2_CLKCTRL, CM_L4PER_DMTIMER3_CLKCTRL,
- * CM_L4PER_DMTIMER4_CLKCTRL, CM_L4PER_DMTIMER9_CLKCTRL, CM_L4PER_ELM_CLKCTRL,
- * CM_L4PER_GPIO2_CLKCTRL, CM_L4PER_GPIO3_CLKCTRL, CM_L4PER_GPIO4_CLKCTRL,
- * CM_L4PER_GPIO5_CLKCTRL, CM_L4PER_GPIO6_CLKCTRL, CM_L4PER_HDQ1W_CLKCTRL,
- * CM_L4PER_I2C1_CLKCTRL, CM_L4PER_I2C2_CLKCTRL, CM_L4PER_I2C3_CLKCTRL,
- * CM_L4PER_I2C4_CLKCTRL, CM_L4PER_I2C5_CLKCTRL, CM_L4PER_L4PER_CLKCTRL,
- * CM_L4PER_MCBSP4_CLKCTRL, CM_L4PER_MCSPI1_CLKCTRL, CM_L4PER_MCSPI2_CLKCTRL,
- * CM_L4PER_MCSPI3_CLKCTRL, CM_L4PER_MCSPI4_CLKCTRL, CM_L4PER_MMCSD3_CLKCTRL,
- * CM_L4PER_MMCSD4_CLKCTRL, CM_L4PER_MMCSD5_CLKCTRL, CM_L4PER_SLIMBUS2_CLKCTRL,
- * CM_L4PER_UART1_CLKCTRL, CM_L4PER_UART2_CLKCTRL, CM_L4PER_UART3_CLKCTRL,
- * CM_L4PER_UART4_CLKCTRL, CM_L4SEC_AES1_CLKCTRL, CM_L4SEC_AES2_CLKCTRL,
- * CM_L4SEC_CRYPTODMA_CLKCTRL, CM_L4SEC_DES3DES_CLKCTRL,
- * CM_L4SEC_PKAEIP29_CLKCTRL, CM_L4SEC_RNG_CLKCTRL, CM_L4SEC_SHA2MD51_CLKCTRL,
- * CM_MEMIF_DMM_CLKCTRL, CM_MEMIF_EMIF_1_CLKCTRL, CM_MEMIF_EMIF_2_CLKCTRL,
- * CM_MEMIF_EMIF_FW_CLKCTRL, CM_MPU_MPU_CLKCTRL, CM_SDMA_SDMA_CLKCTRL,
- * CM_TESLA_TESLA_CLKCTRL, CM_WKUP_GPIO1_CLKCTRL, CM_WKUP_KEYBOARD_CLKCTRL,
- * CM_WKUP_L4WKUP_CLKCTRL, CM_WKUP_SARRAM_CLKCTRL, CM_WKUP_SYNCTIMER_CLKCTRL,
- * CM_WKUP_TIMER12_CLKCTRL, CM_WKUP_TIMER1_CLKCTRL, CM_WKUP_USIM_CLKCTRL,
- * CM_WKUP_WDT1_CLKCTRL, CM_WKUP_WDT2_CLKCTRL
- */
 #define OMAP4430_IDLEST_SHIFT                                   16
-#define OMAP4430_IDLEST_WIDTH                                   0x2
 #define OMAP4430_IDLEST_MASK                                    (0x3 << 16)
-
-/* Used by CM_DUCATI_DYNAMICDEP, CM_L3_2_DYNAMICDEP, CM_L4CFG_DYNAMICDEP */
-#define OMAP4430_ISS_DYNDEP_SHIFT                               9
-#define OMAP4430_ISS_DYNDEP_WIDTH                               0x1
-#define OMAP4430_ISS_DYNDEP_MASK                                (1 << 9)
-
-/*
- * Used by CM_DUCATI_STATICDEP, CM_MPU_STATICDEP, CM_SDMA_STATICDEP,
- * CM_TESLA_STATICDEP
- */
-#define OMAP4430_ISS_STATDEP_SHIFT                              9
-#define OMAP4430_ISS_STATDEP_WIDTH                              0x1
-#define OMAP4430_ISS_STATDEP_MASK                               (1 << 9)
-
-/* Used by CM_L3_2_DYNAMICDEP, CM_TESLA_DYNAMICDEP */
-#define OMAP4430_IVAHD_DYNDEP_SHIFT                             2
-#define OMAP4430_IVAHD_DYNDEP_WIDTH                             0x1
-#define OMAP4430_IVAHD_DYNDEP_MASK                              (1 << 2)
-
-/*
- * Used by CM_CAM_STATICDEP, CM_D2D_STATICDEP, CM_DSS_STATICDEP,
- * CM_DUCATI_STATICDEP, CM_GFX_STATICDEP, CM_L3INIT_STATICDEP,
- * CM_MPU_STATICDEP, CM_SDMA_STATICDEP, CM_TESLA_STATICDEP
- */
 #define OMAP4430_IVAHD_STATDEP_SHIFT                            2
-#define OMAP4430_IVAHD_STATDEP_WIDTH                            0x1
-#define OMAP4430_IVAHD_STATDEP_MASK                             (1 << 2)
-
-/* Used by CM_L3_2_DYNAMICDEP, CM_L4CFG_DYNAMICDEP, CM_L4PER_DYNAMICDEP */
-#define OMAP4430_L3INIT_DYNDEP_SHIFT                            7
-#define OMAP4430_L3INIT_DYNDEP_WIDTH                            0x1
-#define OMAP4430_L3INIT_DYNDEP_MASK                             (1 << 7)
-
-/*
- * Used by CM_D2D_STATICDEP, CM_DUCATI_STATICDEP, CM_MPU_STATICDEP,
- * CM_SDMA_STATICDEP, CM_TESLA_STATICDEP
- */
 #define OMAP4430_L3INIT_STATDEP_SHIFT                           7
-#define OMAP4430_L3INIT_STATDEP_WIDTH                           0x1
-#define OMAP4430_L3INIT_STATDEP_MASK                            (1 << 7)
-
-/*
- * Used by CM_DSS_DYNAMICDEP, CM_L3INIT_DYNAMICDEP, CM_L3_2_DYNAMICDEP,
- * CM_L4CFG_DYNAMICDEP, CM_MPU_DYNAMICDEP, CM_TESLA_DYNAMICDEP
- */
-#define OMAP4430_L3_1_DYNDEP_SHIFT                              5
-#define OMAP4430_L3_1_DYNDEP_WIDTH                              0x1
-#define OMAP4430_L3_1_DYNDEP_MASK                               (1 << 5)
-
-/*
- * Used by CM_CAM_STATICDEP, CM_D2D_STATICDEP, CM_DSS_STATICDEP,
- * CM_DUCATI_STATICDEP, CM_GFX_STATICDEP, CM_IVAHD_STATICDEP,
- * CM_L3INIT_STATICDEP, CM_L4SEC_STATICDEP, CM_MPU_STATICDEP,
- * CM_SDMA_STATICDEP, CM_TESLA_STATICDEP
- */
 #define OMAP4430_L3_1_STATDEP_SHIFT                             5
-#define OMAP4430_L3_1_STATDEP_WIDTH                             0x1
-#define OMAP4430_L3_1_STATDEP_MASK                              (1 << 5)
-
-/*
- * Used by CM_CAM_DYNAMICDEP, CM_D2D_DYNAMICDEP, CM_DUCATI_DYNAMICDEP,
- * CM_EMU_DYNAMICDEP, CM_GFX_DYNAMICDEP, CM_IVAHD_DYNAMICDEP,
- * CM_L3INIT_DYNAMICDEP, CM_L3_1_DYNAMICDEP, CM_L4CFG_DYNAMICDEP,
- * CM_L4SEC_DYNAMICDEP, CM_SDMA_DYNAMICDEP
- */
-#define OMAP4430_L3_2_DYNDEP_SHIFT                              6
-#define OMAP4430_L3_2_DYNDEP_WIDTH                              0x1
-#define OMAP4430_L3_2_DYNDEP_MASK                               (1 << 6)
-
-/*
- * Used by CM_CAM_STATICDEP, CM_D2D_STATICDEP, CM_DSS_STATICDEP,
- * CM_DUCATI_STATICDEP, CM_GFX_STATICDEP, CM_IVAHD_STATICDEP,
- * CM_L3INIT_STATICDEP, CM_L4SEC_STATICDEP, CM_MPU_STATICDEP,
- * CM_SDMA_STATICDEP, CM_TESLA_STATICDEP
- */
 #define OMAP4430_L3_2_STATDEP_SHIFT                             6
-#define OMAP4430_L3_2_STATDEP_WIDTH                             0x1
-#define OMAP4430_L3_2_STATDEP_MASK                              (1 << 6)
-
-/* Used by CM_L3_1_DYNAMICDEP */
-#define OMAP4430_L4CFG_DYNDEP_SHIFT                             12
-#define OMAP4430_L4CFG_DYNDEP_WIDTH                             0x1
-#define OMAP4430_L4CFG_DYNDEP_MASK                              (1 << 12)
-
-/*
- * Used by CM_D2D_STATICDEP, CM_DUCATI_STATICDEP, CM_L3INIT_STATICDEP,
- * CM_MPU_STATICDEP, CM_SDMA_STATICDEP, CM_TESLA_STATICDEP
- */
 #define OMAP4430_L4CFG_STATDEP_SHIFT                            12
-#define OMAP4430_L4CFG_STATDEP_WIDTH                            0x1
-#define OMAP4430_L4CFG_STATDEP_MASK                             (1 << 12)
-
-/* Used by CM_L3_2_DYNAMICDEP */
-#define OMAP4430_L4PER_DYNDEP_SHIFT                             13
-#define OMAP4430_L4PER_DYNDEP_WIDTH                             0x1
-#define OMAP4430_L4PER_DYNDEP_MASK                              (1 << 13)
-
-/*
- * Used by CM_D2D_STATICDEP, CM_DUCATI_STATICDEP, CM_L3INIT_STATICDEP,
- * CM_L4SEC_STATICDEP, CM_MPU_STATICDEP, CM_SDMA_STATICDEP, CM_TESLA_STATICDEP
- */
 #define OMAP4430_L4PER_STATDEP_SHIFT                            13
-#define OMAP4430_L4PER_STATDEP_WIDTH                            0x1
-#define OMAP4430_L4PER_STATDEP_MASK                             (1 << 13)
-
-/* Used by CM_L3_2_DYNAMICDEP, CM_L4PER_DYNAMICDEP */
-#define OMAP4430_L4SEC_DYNDEP_SHIFT                             14
-#define OMAP4430_L4SEC_DYNDEP_WIDTH                             0x1
-#define OMAP4430_L4SEC_DYNDEP_MASK                              (1 << 14)
-
-/*
- * Used by CM_DUCATI_STATICDEP, CM_L3INIT_STATICDEP, CM_MPU_STATICDEP,
- * CM_SDMA_STATICDEP
- */
 #define OMAP4430_L4SEC_STATDEP_SHIFT                            14
-#define OMAP4430_L4SEC_STATDEP_WIDTH                            0x1
-#define OMAP4430_L4SEC_STATDEP_MASK                             (1 << 14)
-
-/* Used by CM_L4CFG_DYNAMICDEP */
-#define OMAP4430_L4WKUP_DYNDEP_SHIFT                            15
-#define OMAP4430_L4WKUP_DYNDEP_WIDTH                            0x1
-#define OMAP4430_L4WKUP_DYNDEP_MASK                             (1 << 15)
-
-/*
- * Used by CM_DUCATI_STATICDEP, CM_L3INIT_STATICDEP, CM_MPU_STATICDEP,
- * CM_SDMA_STATICDEP, CM_TESLA_STATICDEP
- */
 #define OMAP4430_L4WKUP_STATDEP_SHIFT                           15
-#define OMAP4430_L4WKUP_STATDEP_WIDTH                           0x1
-#define OMAP4430_L4WKUP_STATDEP_MASK                            (1 << 15)
-
-/*
- * Used by CM_D2D_DYNAMICDEP, CM_L3_1_DYNAMICDEP, CM_L4CFG_DYNAMICDEP,
- * CM_MPU_DYNAMICDEP
- */
-#define OMAP4430_MEMIF_DYNDEP_SHIFT                             4
-#define OMAP4430_MEMIF_DYNDEP_WIDTH                             0x1
-#define OMAP4430_MEMIF_DYNDEP_MASK                              (1 << 4)
-
-/*
- * Used by CM_CAM_STATICDEP, CM_D2D_STATICDEP, CM_DSS_STATICDEP,
- * CM_DUCATI_STATICDEP, CM_GFX_STATICDEP, CM_IVAHD_STATICDEP,
- * CM_L3INIT_STATICDEP, CM_L4SEC_STATICDEP, CM_MPU_STATICDEP,
- * CM_SDMA_STATICDEP, CM_TESLA_STATICDEP
- */
 #define OMAP4430_MEMIF_STATDEP_SHIFT                            4
-#define OMAP4430_MEMIF_STATDEP_WIDTH                            0x1
-#define OMAP4430_MEMIF_STATDEP_MASK                             (1 << 4)
-
-/*
- * Used by CM_SSC_MODFREQDIV_DPLL_ABE, CM_SSC_MODFREQDIV_DPLL_CORE,
- * CM_SSC_MODFREQDIV_DPLL_DDRPHY, CM_SSC_MODFREQDIV_DPLL_IVA,
- * CM_SSC_MODFREQDIV_DPLL_MPU, CM_SSC_MODFREQDIV_DPLL_PER,
- * CM_SSC_MODFREQDIV_DPLL_UNIPRO, CM_SSC_MODFREQDIV_DPLL_USB
- */
-#define OMAP4430_MODFREQDIV_EXPONENT_SHIFT                      8
-#define OMAP4430_MODFREQDIV_EXPONENT_WIDTH                      0x3
-#define OMAP4430_MODFREQDIV_EXPONENT_MASK                       (0x7 << 8)
-
-/*
- * Used by CM_SSC_MODFREQDIV_DPLL_ABE, CM_SSC_MODFREQDIV_DPLL_CORE,
- * CM_SSC_MODFREQDIV_DPLL_DDRPHY, CM_SSC_MODFREQDIV_DPLL_IVA,
- * CM_SSC_MODFREQDIV_DPLL_MPU, CM_SSC_MODFREQDIV_DPLL_PER,
- * CM_SSC_MODFREQDIV_DPLL_UNIPRO, CM_SSC_MODFREQDIV_DPLL_USB
- */
-#define OMAP4430_MODFREQDIV_MANTISSA_SHIFT                      0
-#define OMAP4430_MODFREQDIV_MANTISSA_WIDTH                      0x7
-#define OMAP4430_MODFREQDIV_MANTISSA_MASK                       (0x7f << 0)
-
-/*
- * Used by CM1_ABE_AESS_CLKCTRL, CM1_ABE_DMIC_CLKCTRL, CM1_ABE_L4ABE_CLKCTRL,
- * CM1_ABE_MCASP_CLKCTRL, CM1_ABE_MCBSP1_CLKCTRL, CM1_ABE_MCBSP2_CLKCTRL,
- * CM1_ABE_MCBSP3_CLKCTRL, CM1_ABE_PDM_CLKCTRL, CM1_ABE_SLIMBUS_CLKCTRL,
- * CM1_ABE_TIMER5_CLKCTRL, CM1_ABE_TIMER6_CLKCTRL, CM1_ABE_TIMER7_CLKCTRL,
- * CM1_ABE_TIMER8_CLKCTRL, CM1_ABE_WDT3_CLKCTRL, CM_ALWON_SR_CORE_CLKCTRL,
- * CM_ALWON_SR_IVA_CLKCTRL, CM_ALWON_SR_MPU_CLKCTRL, CM_CAM_FDIF_CLKCTRL,
- * CM_CAM_ISS_CLKCTRL, CM_CEFUSE_CEFUSE_CLKCTRL, CM_CM1_PROFILING_CLKCTRL,
- * CM_CM2_PROFILING_CLKCTRL, CM_D2D_MODEM_ICR_CLKCTRL, CM_D2D_SAD2D_CLKCTRL,
- * CM_D2D_SAD2D_FW_CLKCTRL, CM_DSS_DSS_CLKCTRL, CM_DUCATI_DUCATI_CLKCTRL,
- * CM_EMU_DEBUGSS_CLKCTRL, CM_GFX_GFX_CLKCTRL, CM_IVAHD_IVAHD_CLKCTRL,
- * CM_IVAHD_SL2_CLKCTRL, CM_L3INIT_HSI_CLKCTRL, CM_L3INIT_MMC1_CLKCTRL,
- * CM_L3INIT_MMC2_CLKCTRL, CM_L3INIT_USBPHYOCP2SCP_CLKCTRL,
- * CM_L3INIT_USB_HOST_CLKCTRL, CM_L3INIT_USB_HOST_FS_CLKCTRL,
- * CM_L3INIT_USB_OTG_CLKCTRL, CM_L3INIT_USB_TLL_CLKCTRL,
- * CM_L3INSTR_L3_3_CLKCTRL, CM_L3INSTR_L3_INSTR_CLKCTRL,
- * CM_L3INSTR_OCP_WP1_CLKCTRL, CM_L3_1_L3_1_CLKCTRL, CM_L3_2_GPMC_CLKCTRL,
- * CM_L3_2_L3_2_CLKCTRL, CM_L3_2_OCMC_RAM_CLKCTRL, CM_L4CFG_HW_SEM_CLKCTRL,
- * CM_L4CFG_L4_CFG_CLKCTRL, CM_L4CFG_MAILBOX_CLKCTRL, CM_L4CFG_SAR_ROM_CLKCTRL,
- * CM_L4PER_DMTIMER10_CLKCTRL, CM_L4PER_DMTIMER11_CLKCTRL,
- * CM_L4PER_DMTIMER2_CLKCTRL, CM_L4PER_DMTIMER3_CLKCTRL,
- * CM_L4PER_DMTIMER4_CLKCTRL, CM_L4PER_DMTIMER9_CLKCTRL, CM_L4PER_ELM_CLKCTRL,
- * CM_L4PER_GPIO2_CLKCTRL, CM_L4PER_GPIO3_CLKCTRL, CM_L4PER_GPIO4_CLKCTRL,
- * CM_L4PER_GPIO5_CLKCTRL, CM_L4PER_GPIO6_CLKCTRL, CM_L4PER_HDQ1W_CLKCTRL,
- * CM_L4PER_I2C1_CLKCTRL, CM_L4PER_I2C2_CLKCTRL, CM_L4PER_I2C3_CLKCTRL,
- * CM_L4PER_I2C4_CLKCTRL, CM_L4PER_I2C5_CLKCTRL, CM_L4PER_L4PER_CLKCTRL,
- * CM_L4PER_MCBSP4_CLKCTRL, CM_L4PER_MCSPI1_CLKCTRL, CM_L4PER_MCSPI2_CLKCTRL,
- * CM_L4PER_MCSPI3_CLKCTRL, CM_L4PER_MCSPI4_CLKCTRL, CM_L4PER_MMCSD3_CLKCTRL,
- * CM_L4PER_MMCSD4_CLKCTRL, CM_L4PER_MMCSD5_CLKCTRL, CM_L4PER_SLIMBUS2_CLKCTRL,
- * CM_L4PER_UART1_CLKCTRL, CM_L4PER_UART2_CLKCTRL, CM_L4PER_UART3_CLKCTRL,
- * CM_L4PER_UART4_CLKCTRL, CM_L4SEC_AES1_CLKCTRL, CM_L4SEC_AES2_CLKCTRL,
- * CM_L4SEC_CRYPTODMA_CLKCTRL, CM_L4SEC_DES3DES_CLKCTRL,
- * CM_L4SEC_PKAEIP29_CLKCTRL, CM_L4SEC_RNG_CLKCTRL, CM_L4SEC_SHA2MD51_CLKCTRL,
- * CM_MEMIF_DMM_CLKCTRL, CM_MEMIF_EMIF_1_CLKCTRL, CM_MEMIF_EMIF_2_CLKCTRL,
- * CM_MEMIF_EMIF_FW_CLKCTRL, CM_MPU_MPU_CLKCTRL, CM_SDMA_SDMA_CLKCTRL,
- * CM_TESLA_TESLA_CLKCTRL, CM_WKUP_GPIO1_CLKCTRL, CM_WKUP_KEYBOARD_CLKCTRL,
- * CM_WKUP_L4WKUP_CLKCTRL, CM_WKUP_SARRAM_CLKCTRL, CM_WKUP_SYNCTIMER_CLKCTRL,
- * CM_WKUP_TIMER12_CLKCTRL, CM_WKUP_TIMER1_CLKCTRL, CM_WKUP_USIM_CLKCTRL,
- * CM_WKUP_WDT1_CLKCTRL, CM_WKUP_WDT2_CLKCTRL
- */
 #define OMAP4430_MODULEMODE_SHIFT                               0
-#define OMAP4430_MODULEMODE_WIDTH                               0x2
 #define OMAP4430_MODULEMODE_MASK                                (0x3 << 0)
-
-/* Used by CM_L4CFG_DYNAMICDEP */
-#define OMAP4460_MPU_DYNDEP_SHIFT                               19
-#define OMAP4460_MPU_DYNDEP_WIDTH                               0x1
-#define OMAP4460_MPU_DYNDEP_MASK                                (1 << 19)
-
-/* Used by CM_DSS_DSS_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_48MHZ_CLK_SHIFT                      9
-#define OMAP4430_OPTFCLKEN_48MHZ_CLK_WIDTH                      0x1
-#define OMAP4430_OPTFCLKEN_48MHZ_CLK_MASK                       (1 << 9)
-
-/* Used by CM_WKUP_BANDGAP_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_BGAP_32K_SHIFT                       8
-#define OMAP4430_OPTFCLKEN_BGAP_32K_WIDTH                       0x1
-#define OMAP4430_OPTFCLKEN_BGAP_32K_MASK                        (1 << 8)
-
-/* Used by CM_ALWON_USBPHY_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_CLK32K_SHIFT                         8
-#define OMAP4430_OPTFCLKEN_CLK32K_WIDTH                         0x1
-#define OMAP4430_OPTFCLKEN_CLK32K_MASK                          (1 << 8)
-
-/* Used by CM_CAM_ISS_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_CTRLCLK_SHIFT                        8
-#define OMAP4430_OPTFCLKEN_CTRLCLK_WIDTH                        0x1
-#define OMAP4430_OPTFCLKEN_CTRLCLK_MASK                         (1 << 8)
-
-/*
- * Used by CM_L4PER_GPIO2_CLKCTRL, CM_L4PER_GPIO3_CLKCTRL,
- * CM_L4PER_GPIO4_CLKCTRL, CM_L4PER_GPIO5_CLKCTRL, CM_L4PER_GPIO6_CLKCTRL,
- * CM_WKUP_GPIO1_CLKCTRL
- */
 #define OMAP4430_OPTFCLKEN_DBCLK_SHIFT                          8
-#define OMAP4430_OPTFCLKEN_DBCLK_WIDTH                          0x1
-#define OMAP4430_OPTFCLKEN_DBCLK_MASK                           (1 << 8)
-
-/* Used by CM_MEMIF_DLL_CLKCTRL, CM_MEMIF_DLL_H_CLKCTRL */
-#define OMAP4430_OPTFCLKEN_DLL_CLK_SHIFT                        8
-#define OMAP4430_OPTFCLKEN_DLL_CLK_WIDTH                        0x1
-#define OMAP4430_OPTFCLKEN_DLL_CLK_MASK                         (1 << 8)
-
-/* Used by CM_DSS_DSS_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_DSSCLK_SHIFT                         8
-#define OMAP4430_OPTFCLKEN_DSSCLK_WIDTH                         0x1
-#define OMAP4430_OPTFCLKEN_DSSCLK_MASK                          (1 << 8)
-
-/* Used by CM_WKUP_USIM_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_FCLK_SHIFT                           8
-#define OMAP4430_OPTFCLKEN_FCLK_WIDTH                           0x1
-#define OMAP4430_OPTFCLKEN_FCLK_MASK                            (1 << 8)
-
-/* Used by CM1_ABE_SLIMBUS_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_FCLK0_SHIFT                          8
-#define OMAP4430_OPTFCLKEN_FCLK0_WIDTH                          0x1
-#define OMAP4430_OPTFCLKEN_FCLK0_MASK                           (1 << 8)
-
-/* Used by CM1_ABE_SLIMBUS_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_FCLK1_SHIFT                          9
-#define OMAP4430_OPTFCLKEN_FCLK1_WIDTH                          0x1
-#define OMAP4430_OPTFCLKEN_FCLK1_MASK                           (1 << 9)
-
-/* Used by CM1_ABE_SLIMBUS_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_FCLK2_SHIFT                          10
-#define OMAP4430_OPTFCLKEN_FCLK2_WIDTH                          0x1
-#define OMAP4430_OPTFCLKEN_FCLK2_MASK                           (1 << 10)
-
-/* Used by CM_L3INIT_USB_HOST_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_FUNC48MCLK_SHIFT                     15
-#define OMAP4430_OPTFCLKEN_FUNC48MCLK_WIDTH                     0x1
-#define OMAP4430_OPTFCLKEN_FUNC48MCLK_MASK                      (1 << 15)
-
-/* Used by CM_L3INIT_USB_HOST_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_HSIC480M_P1_CLK_SHIFT                13
-#define OMAP4430_OPTFCLKEN_HSIC480M_P1_CLK_WIDTH                0x1
-#define OMAP4430_OPTFCLKEN_HSIC480M_P1_CLK_MASK                 (1 << 13)
-
-/* Used by CM_L3INIT_USB_HOST_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_HSIC480M_P2_CLK_SHIFT                14
-#define OMAP4430_OPTFCLKEN_HSIC480M_P2_CLK_WIDTH                0x1
-#define OMAP4430_OPTFCLKEN_HSIC480M_P2_CLK_MASK                 (1 << 14)
-
-/* Used by CM_L3INIT_USB_HOST_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_HSIC60M_P1_CLK_SHIFT                 11
-#define OMAP4430_OPTFCLKEN_HSIC60M_P1_CLK_WIDTH                 0x1
-#define OMAP4430_OPTFCLKEN_HSIC60M_P1_CLK_MASK                  (1 << 11)
-
-/* Used by CM_L3INIT_USB_HOST_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_HSIC60M_P2_CLK_SHIFT                 12
-#define OMAP4430_OPTFCLKEN_HSIC60M_P2_CLK_WIDTH                 0x1
-#define OMAP4430_OPTFCLKEN_HSIC60M_P2_CLK_MASK                  (1 << 12)
-
-/* Used by CM_L4PER_SLIMBUS2_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_PER24MC_GFCLK_SHIFT                  8
-#define OMAP4430_OPTFCLKEN_PER24MC_GFCLK_WIDTH                  0x1
-#define OMAP4430_OPTFCLKEN_PER24MC_GFCLK_MASK                   (1 << 8)
-
-/* Used by CM_L4PER_SLIMBUS2_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_PERABE24M_GFCLK_SHIFT                9
-#define OMAP4430_OPTFCLKEN_PERABE24M_GFCLK_WIDTH                0x1
-#define OMAP4430_OPTFCLKEN_PERABE24M_GFCLK_MASK                 (1 << 9)
-
-/* Used by CM_L3INIT_USBPHYOCP2SCP_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_PHY_48M_SHIFT                        8
-#define OMAP4430_OPTFCLKEN_PHY_48M_WIDTH                        0x1
-#define OMAP4430_OPTFCLKEN_PHY_48M_MASK                         (1 << 8)
-
-/* Used by CM_L4PER_SLIMBUS2_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_SLIMBUS_CLK_SHIFT                    10
-#define OMAP4430_OPTFCLKEN_SLIMBUS_CLK_WIDTH                    0x1
-#define OMAP4430_OPTFCLKEN_SLIMBUS_CLK_MASK                     (1 << 10)
-
-/* Renamed from OPTFCLKEN_SLIMBUS_CLK Used by CM1_ABE_SLIMBUS_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_SLIMBUS_CLK_11_11_SHIFT              11
-#define OMAP4430_OPTFCLKEN_SLIMBUS_CLK_11_11_WIDTH              0x1
-#define OMAP4430_OPTFCLKEN_SLIMBUS_CLK_11_11_MASK               (1 << 11)
-
-/* Used by CM_DSS_DSS_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_SYS_CLK_SHIFT                        10
-#define OMAP4430_OPTFCLKEN_SYS_CLK_WIDTH                        0x1
-#define OMAP4430_OPTFCLKEN_SYS_CLK_MASK                         (1 << 10)
-
-/* Used by CM_WKUP_BANDGAP_CLKCTRL */
 #define OMAP4460_OPTFCLKEN_TS_FCLK_SHIFT                        8
-#define OMAP4460_OPTFCLKEN_TS_FCLK_WIDTH                        0x1
-#define OMAP4460_OPTFCLKEN_TS_FCLK_MASK                         (1 << 8)
-
-/* Used by CM_DSS_DSS_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_TV_CLK_SHIFT                         11
-#define OMAP4430_OPTFCLKEN_TV_CLK_WIDTH                         0x1
-#define OMAP4430_OPTFCLKEN_TV_CLK_MASK                          (1 << 11)
-
-/* Used by CM_L3INIT_UNIPRO1_CLKCTRL */
-#define OMAP4430_OPTFCLKEN_TXPHYCLK_SHIFT                       8
-#define OMAP4430_OPTFCLKEN_TXPHYCLK_WIDTH                       0x1
-#define OMAP4430_OPTFCLKEN_TXPHYCLK_MASK                        (1 << 8)
-
-/* Used by CM_L3INIT_USB_TLL_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_USB_CH0_CLK_SHIFT                    8
-#define OMAP4430_OPTFCLKEN_USB_CH0_CLK_WIDTH                    0x1
-#define OMAP4430_OPTFCLKEN_USB_CH0_CLK_MASK                     (1 << 8)
-
-/* Used by CM_L3INIT_USB_TLL_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_USB_CH1_CLK_SHIFT                    9
-#define OMAP4430_OPTFCLKEN_USB_CH1_CLK_WIDTH                    0x1
-#define OMAP4430_OPTFCLKEN_USB_CH1_CLK_MASK                     (1 << 9)
-
-/* Used by CM_L3INIT_USB_TLL_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_USB_CH2_CLK_SHIFT                    10
-#define OMAP4430_OPTFCLKEN_USB_CH2_CLK_WIDTH                    0x1
-#define OMAP4430_OPTFCLKEN_USB_CH2_CLK_MASK                     (1 << 10)
-
-/* Used by CM_L3INIT_USB_HOST_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_UTMI_P1_CLK_SHIFT                    8
-#define OMAP4430_OPTFCLKEN_UTMI_P1_CLK_WIDTH                    0x1
-#define OMAP4430_OPTFCLKEN_UTMI_P1_CLK_MASK                     (1 << 8)
-
-/* Used by CM_L3INIT_USB_HOST_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_UTMI_P2_CLK_SHIFT                    9
-#define OMAP4430_OPTFCLKEN_UTMI_P2_CLK_WIDTH                    0x1
-#define OMAP4430_OPTFCLKEN_UTMI_P2_CLK_MASK                     (1 << 9)
-
-/* Used by CM_L3INIT_USB_HOST_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_UTMI_P3_CLK_SHIFT                    10
-#define OMAP4430_OPTFCLKEN_UTMI_P3_CLK_WIDTH                    0x1
-#define OMAP4430_OPTFCLKEN_UTMI_P3_CLK_MASK                     (1 << 10)
-
-/* Used by CM_L3INIT_USB_OTG_CLKCTRL */
 #define OMAP4430_OPTFCLKEN_XCLK_SHIFT                           8
-#define OMAP4430_OPTFCLKEN_XCLK_WIDTH                           0x1
-#define OMAP4430_OPTFCLKEN_XCLK_MASK                            (1 << 8)
-
-/* Used by CM_EMU_OVERRIDE_DPLL_CORE */
-#define OMAP4430_OVERRIDE_ENABLE_SHIFT                          19
-#define OMAP4430_OVERRIDE_ENABLE_WIDTH                          0x1
-#define OMAP4430_OVERRIDE_ENABLE_MASK                           (1 << 19)
-
-/* Used by CM_CLKSEL_ABE */
 #define OMAP4430_PAD_CLKS_GATE_SHIFT                            8
-#define OMAP4430_PAD_CLKS_GATE_WIDTH                            0x1
-#define OMAP4430_PAD_CLKS_GATE_MASK                             (1 << 8)
-
-/* Used by CM_CORE_DVFS_CURRENT, CM_IVA_DVFS_CURRENT */
-#define OMAP4430_PERF_CURRENT_SHIFT                             0
-#define OMAP4430_PERF_CURRENT_WIDTH                             0x8
-#define OMAP4430_PERF_CURRENT_MASK                              (0xff << 0)
-
-/*
- * Used by CM_CORE_DVFS_PERF1, CM_CORE_DVFS_PERF2, CM_CORE_DVFS_PERF3,
- * CM_CORE_DVFS_PERF4, CM_IVA_DVFS_PERF_ABE, CM_IVA_DVFS_PERF_IVAHD,
- * CM_IVA_DVFS_PERF_TESLA
- */
-#define OMAP4430_PERF_REQ_SHIFT                                 0
-#define OMAP4430_PERF_REQ_WIDTH                                 0x8
-#define OMAP4430_PERF_REQ_MASK                                  (0xff << 0)
-
-/* Used by CM_RESTORE_ST */
-#define OMAP4430_PHASE1_COMPLETED_SHIFT                         0
-#define OMAP4430_PHASE1_COMPLETED_WIDTH                         0x1
-#define OMAP4430_PHASE1_COMPLETED_MASK                          (1 << 0)
-
-/* Used by CM_RESTORE_ST */
-#define OMAP4430_PHASE2A_COMPLETED_SHIFT                        1
-#define OMAP4430_PHASE2A_COMPLETED_WIDTH                        0x1
-#define OMAP4430_PHASE2A_COMPLETED_MASK                         (1 << 1)
-
-/* Used by CM_RESTORE_ST */
-#define OMAP4430_PHASE2B_COMPLETED_SHIFT                        2
-#define OMAP4430_PHASE2B_COMPLETED_WIDTH                        0x1
-#define OMAP4430_PHASE2B_COMPLETED_MASK                         (1 << 2)
-
-/* Used by CM_EMU_DEBUGSS_CLKCTRL */
 #define OMAP4430_PMD_STM_MUX_CTRL_SHIFT                         20
 #define OMAP4430_PMD_STM_MUX_CTRL_WIDTH                         0x2
-#define OMAP4430_PMD_STM_MUX_CTRL_MASK                          (0x3 << 20)
-
-/* Used by CM_EMU_DEBUGSS_CLKCTRL */
 #define OMAP4430_PMD_TRACE_MUX_CTRL_SHIFT                       22
 #define OMAP4430_PMD_TRACE_MUX_CTRL_WIDTH                       0x2
-#define OMAP4430_PMD_TRACE_MUX_CTRL_MASK                        (0x3 << 22)
-
-/* Used by CM_DYN_DEP_PRESCAL */
-#define OMAP4430_PRESCAL_SHIFT                                  0
-#define OMAP4430_PRESCAL_WIDTH                                  0x6
-#define OMAP4430_PRESCAL_MASK                                   (0x3f << 0)
-
-/* Used by REVISION_CM1, REVISION_CM2 */
-#define OMAP4430_R_RTL_SHIFT                                    11
-#define OMAP4430_R_RTL_WIDTH                                    0x5
-#define OMAP4430_R_RTL_MASK                                     (0x1f << 11)
-
-/* Used by CM_L3INIT_USB_HOST_CLKCTRL, CM_L3INIT_USB_TLL_CLKCTRL */
-#define OMAP4430_SAR_MODE_SHIFT                                 4
-#define OMAP4430_SAR_MODE_WIDTH                                 0x1
-#define OMAP4430_SAR_MODE_MASK                                  (1 << 4)
-
-/* Used by CM_SCALE_FCLK */
 #define OMAP4430_SCALE_FCLK_SHIFT                               0
 #define OMAP4430_SCALE_FCLK_WIDTH                               0x1
-#define OMAP4430_SCALE_FCLK_MASK                                (1 << 0)
-
-/* Used by REVISION_CM1, REVISION_CM2 */
-#define OMAP4430_SCHEME_SHIFT                                   30
-#define OMAP4430_SCHEME_WIDTH                                   0x2
-#define OMAP4430_SCHEME_MASK                                    (0x3 << 30)
-
-/* Used by CM_L4CFG_DYNAMICDEP */
-#define OMAP4430_SDMA_DYNDEP_SHIFT                              11
-#define OMAP4430_SDMA_DYNDEP_WIDTH                              0x1
-#define OMAP4430_SDMA_DYNDEP_MASK                               (1 << 11)
-
-/* Used by CM_DUCATI_STATICDEP, CM_MPU_STATICDEP */
-#define OMAP4430_SDMA_STATDEP_SHIFT                             11
-#define OMAP4430_SDMA_STATDEP_WIDTH                             0x1
-#define OMAP4430_SDMA_STATDEP_MASK                              (1 << 11)
-
-/* Used by CM_CLKSEL_ABE */
 #define OMAP4430_SLIMBUS_CLK_GATE_SHIFT                         10
-#define OMAP4430_SLIMBUS_CLK_GATE_WIDTH                         0x1
-#define OMAP4430_SLIMBUS_CLK_GATE_MASK                          (1 << 10)
-
-/*
- * Used by CM1_ABE_AESS_CLKCTRL, CM_CAM_FDIF_CLKCTRL, CM_CAM_ISS_CLKCTRL,
- * CM_D2D_SAD2D_CLKCTRL, CM_DSS_DSS_CLKCTRL, CM_DUCATI_DUCATI_CLKCTRL,
- * CM_EMU_DEBUGSS_CLKCTRL, CM_GFX_GFX_CLKCTRL, CM_IVAHD_IVAHD_CLKCTRL,
- * CM_L3INIT_HSI_CLKCTRL, CM_L3INIT_MMC1_CLKCTRL, CM_L3INIT_MMC2_CLKCTRL,
- * CM_L3INIT_USB_HOST_CLKCTRL, CM_L3INIT_USB_HOST_FS_CLKCTRL,
- * CM_L3INIT_USB_OTG_CLKCTRL, CM_L4SEC_CRYPTODMA_CLKCTRL, CM_MPU_MPU_CLKCTRL,
- * CM_SDMA_SDMA_CLKCTRL, CM_TESLA_TESLA_CLKCTRL
- */
-#define OMAP4430_STBYST_SHIFT                                   18
-#define OMAP4430_STBYST_WIDTH                                   0x1
-#define OMAP4430_STBYST_MASK                                    (1 << 18)
-
-/*
- * Used by CM_IDLEST_DPLL_ABE, CM_IDLEST_DPLL_CORE, CM_IDLEST_DPLL_DDRPHY,
- * CM_IDLEST_DPLL_IVA, CM_IDLEST_DPLL_MPU, CM_IDLEST_DPLL_PER,
- * CM_IDLEST_DPLL_UNIPRO, CM_IDLEST_DPLL_USB
- */
-#define OMAP4430_ST_DPLL_CLK_SHIFT                              0
-#define OMAP4430_ST_DPLL_CLK_WIDTH                              0x1
 #define OMAP4430_ST_DPLL_CLK_MASK                               (1 << 0)
-
-/* Used by CM_CLKDCOLDO_DPLL_USB */
-#define OMAP4430_ST_DPLL_CLKDCOLDO_SHIFT                        9
-#define OMAP4430_ST_DPLL_CLKDCOLDO_WIDTH                        0x1
-#define OMAP4430_ST_DPLL_CLKDCOLDO_MASK                         (1 << 9)
-
-/*
- * Used by CM_DIV_M2_DPLL_ABE, CM_DIV_M2_DPLL_CORE, CM_DIV_M2_DPLL_DDRPHY,
- * CM_DIV_M2_DPLL_MPU, CM_DIV_M2_DPLL_PER, CM_DIV_M2_DPLL_USB
- */
-#define OMAP4430_ST_DPLL_CLKOUT_SHIFT                           9
-#define OMAP4430_ST_DPLL_CLKOUT_WIDTH                           0x1
-#define OMAP4430_ST_DPLL_CLKOUT_MASK                            (1 << 9)
-
-/* Used by CM_DIV_M3_DPLL_ABE, CM_DIV_M3_DPLL_CORE, CM_DIV_M3_DPLL_PER */
-#define OMAP4430_ST_DPLL_CLKOUTHIF_SHIFT                        9
-#define OMAP4430_ST_DPLL_CLKOUTHIF_WIDTH                        0x1
-#define OMAP4430_ST_DPLL_CLKOUTHIF_MASK                         (1 << 9)
-
-/* Used by CM_DIV_M2_DPLL_ABE, CM_DIV_M2_DPLL_PER, CM_DIV_M2_DPLL_UNIPRO */
-#define OMAP4430_ST_DPLL_CLKOUTX2_SHIFT                         11
-#define OMAP4430_ST_DPLL_CLKOUTX2_WIDTH                         0x1
-#define OMAP4430_ST_DPLL_CLKOUTX2_MASK                          (1 << 11)
-
-/*
- * Used by CM_DIV_M4_DPLL_CORE, CM_DIV_M4_DPLL_DDRPHY, CM_DIV_M4_DPLL_IVA,
- * CM_DIV_M4_DPLL_PER
- */
-#define OMAP4430_ST_HSDIVIDER_CLKOUT1_SHIFT                     9
-#define OMAP4430_ST_HSDIVIDER_CLKOUT1_WIDTH                     0x1
-#define OMAP4430_ST_HSDIVIDER_CLKOUT1_MASK                      (1 << 9)
-
-/*
- * Used by CM_DIV_M5_DPLL_CORE, CM_DIV_M5_DPLL_DDRPHY, CM_DIV_M5_DPLL_IVA,
- * CM_DIV_M5_DPLL_PER
- */
-#define OMAP4430_ST_HSDIVIDER_CLKOUT2_SHIFT                     9
-#define OMAP4430_ST_HSDIVIDER_CLKOUT2_WIDTH                     0x1
-#define OMAP4430_ST_HSDIVIDER_CLKOUT2_MASK                      (1 << 9)
-
-/* Used by CM_DIV_M6_DPLL_CORE, CM_DIV_M6_DPLL_DDRPHY, CM_DIV_M6_DPLL_PER */
-#define OMAP4430_ST_HSDIVIDER_CLKOUT3_SHIFT                     9
-#define OMAP4430_ST_HSDIVIDER_CLKOUT3_WIDTH                     0x1
-#define OMAP4430_ST_HSDIVIDER_CLKOUT3_MASK                      (1 << 9)
-
-/* Used by CM_DIV_M7_DPLL_CORE, CM_DIV_M7_DPLL_PER */
-#define OMAP4430_ST_HSDIVIDER_CLKOUT4_SHIFT                     9
-#define OMAP4430_ST_HSDIVIDER_CLKOUT4_WIDTH                     0x1
-#define OMAP4430_ST_HSDIVIDER_CLKOUT4_MASK                      (1 << 9)
-
-/*
- * Used by CM_IDLEST_DPLL_ABE, CM_IDLEST_DPLL_CORE, CM_IDLEST_DPLL_DDRPHY,
- * CM_IDLEST_DPLL_IVA, CM_IDLEST_DPLL_MPU, CM_IDLEST_DPLL_PER,
- * CM_IDLEST_DPLL_UNIPRO, CM_IDLEST_DPLL_USB
- */
-#define OMAP4430_ST_MN_BYPASS_SHIFT                             8
-#define OMAP4430_ST_MN_BYPASS_WIDTH                             0x1
-#define OMAP4430_ST_MN_BYPASS_MASK                              (1 << 8)
-
-/* Used by CM_SYS_CLKSEL */
 #define OMAP4430_SYS_CLKSEL_SHIFT                               0
 #define OMAP4430_SYS_CLKSEL_WIDTH                               0x3
-#define OMAP4430_SYS_CLKSEL_MASK                                (0x7 << 0)
-
-/* Used by CM_L4CFG_DYNAMICDEP */
-#define OMAP4430_TESLA_DYNDEP_SHIFT                             1
-#define OMAP4430_TESLA_DYNDEP_WIDTH                             0x1
-#define OMAP4430_TESLA_DYNDEP_MASK                              (1 << 1)
-
-/* Used by CM_DUCATI_STATICDEP, CM_MPU_STATICDEP */
 #define OMAP4430_TESLA_STATDEP_SHIFT                            1
-#define OMAP4430_TESLA_STATDEP_WIDTH                            0x1
-#define OMAP4430_TESLA_STATDEP_MASK                             (1 << 1)
-
-/*
- * Used by CM_D2D_DYNAMICDEP, CM_DUCATI_DYNAMICDEP, CM_EMU_DYNAMICDEP,
- * CM_L3_1_DYNAMICDEP, CM_L3_2_DYNAMICDEP, CM_L4CFG_DYNAMICDEP,
- * CM_L4PER_DYNAMICDEP, CM_MPU_DYNAMICDEP, CM_TESLA_DYNAMICDEP
- */
-#define OMAP4430_WINDOWSIZE_SHIFT                               24
-#define OMAP4430_WINDOWSIZE_WIDTH                               0x4
-#define OMAP4430_WINDOWSIZE_MASK                                (0xf << 24)
-
-/* Used by REVISION_CM1, REVISION_CM2 */
-#define OMAP4430_X_MAJOR_SHIFT                                  8
-#define OMAP4430_X_MAJOR_WIDTH                                  0x3
-#define OMAP4430_X_MAJOR_MASK                                   (0x7 << 8)
-
-/* Used by REVISION_CM1, REVISION_CM2 */
-#define OMAP4430_Y_MINOR_SHIFT                                  0
-#define OMAP4430_Y_MINOR_WIDTH                                  0x6
-#define OMAP4430_Y_MINOR_MASK                                   (0x3f << 0)
 #endif
diff --git a/arch/arm/mach-omap2/cm-regbits-54xx.h b/arch/arm/mach-omap2/cm-regbits-54xx.h
index e83b8e352b6e..896ae9fc4cfb 100644
--- a/arch/arm/mach-omap2/cm-regbits-54xx.h
+++ b/arch/arm/mach-omap2/cm-regbits-54xx.h
@@ -21,1717 +21,84 @@
 #ifndef __ARCH_ARM_MACH_OMAP2_CM_REGBITS_54XX_H
 #define __ARCH_ARM_MACH_OMAP2_CM_REGBITS_54XX_H
 
-/* Used by CM_DSP_DYNAMICDEP, CM_L3MAIN1_DYNAMICDEP, CM_MPU_DYNAMICDEP */
-#define OMAP54XX_ABE_DYNDEP_SHIFT                                       3
-#define OMAP54XX_ABE_DYNDEP_WIDTH                                       0x1
-#define OMAP54XX_ABE_DYNDEP_MASK                                        (1 << 3)
-
-/*
- * Used by CM_C2C_STATICDEP, CM_DMA_STATICDEP, CM_DSP_STATICDEP,
- * CM_IPU_STATICDEP, CM_L3INIT_STATICDEP, CM_MIPIEXT_STATICDEP, CM_MPU_STATICDEP
- */
 #define OMAP54XX_ABE_STATDEP_SHIFT                                      3
-#define OMAP54XX_ABE_STATDEP_WIDTH                                      0x1
-#define OMAP54XX_ABE_STATDEP_MASK                                       (1 << 3)
-
-/*
- * Used by CM_AUTOIDLE_DPLL_ABE, CM_AUTOIDLE_DPLL_CORE, CM_AUTOIDLE_DPLL_IVA,
- * CM_AUTOIDLE_DPLL_MPU, CM_AUTOIDLE_DPLL_PER, CM_AUTOIDLE_DPLL_UNIPRO1,
- * CM_AUTOIDLE_DPLL_UNIPRO2, CM_AUTOIDLE_DPLL_USB
- */
-#define OMAP54XX_AUTO_DPLL_MODE_SHIFT                                   0
-#define OMAP54XX_AUTO_DPLL_MODE_WIDTH                                   0x3
 #define OMAP54XX_AUTO_DPLL_MODE_MASK                                    (0x7 << 0)
-
-/* Used by CM_L3MAIN2_DYNAMICDEP, CM_L4CFG_DYNAMICDEP */
-#define OMAP54XX_C2C_DYNDEP_SHIFT                                       18
-#define OMAP54XX_C2C_DYNDEP_WIDTH                                       0x1
-#define OMAP54XX_C2C_DYNDEP_MASK                                        (1 << 18)
-
-/* Used by CM_MPU_STATICDEP */
-#define OMAP54XX_C2C_STATDEP_SHIFT                                      18
-#define OMAP54XX_C2C_STATDEP_WIDTH                                      0x1
-#define OMAP54XX_C2C_STATDEP_MASK                                       (1 << 18)
-
-/* Used by CM_IPU_DYNAMICDEP, CM_L3MAIN2_DYNAMICDEP, CM_L4CFG_DYNAMICDEP */
-#define OMAP54XX_CAM_DYNDEP_SHIFT                                       9
-#define OMAP54XX_CAM_DYNDEP_WIDTH                                       0x1
-#define OMAP54XX_CAM_DYNDEP_MASK                                        (1 << 9)
-
-/*
- * Used by CM_DMA_STATICDEP, CM_DSP_STATICDEP, CM_IPU_STATICDEP,
- * CM_MPU_STATICDEP
- */
-#define OMAP54XX_CAM_STATDEP_SHIFT                                      9
-#define OMAP54XX_CAM_STATDEP_WIDTH                                      0x1
-#define OMAP54XX_CAM_STATDEP_MASK                                       (1 << 9)
-
-/* Used by CM_ABE_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_ABE_24M_GFCLK_SHIFT                        13
-#define OMAP54XX_CLKACTIVITY_ABE_24M_GFCLK_WIDTH                        0x1
-#define OMAP54XX_CLKACTIVITY_ABE_24M_GFCLK_MASK                         (1 << 13)
-
-/* Used by CM_ABE_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_ABE_32K_CLK_SHIFT                          12
-#define OMAP54XX_CLKACTIVITY_ABE_32K_CLK_WIDTH                          0x1
-#define OMAP54XX_CLKACTIVITY_ABE_32K_CLK_MASK                           (1 << 12)
-
-/* Used by CM_ABE_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_ABE_GICLK_SHIFT                            9
-#define OMAP54XX_CLKACTIVITY_ABE_GICLK_WIDTH                            0x1
-#define OMAP54XX_CLKACTIVITY_ABE_GICLK_MASK                             (1 << 9)
-
-/* Used by CM_WKUPAON_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_ABE_LP_CLK_SHIFT                           9
-#define OMAP54XX_CLKACTIVITY_ABE_LP_CLK_WIDTH                           0x1
-#define OMAP54XX_CLKACTIVITY_ABE_LP_CLK_MASK                            (1 << 9)
-
-/* Used by CM_ABE_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_ABE_SYS_CLK_SHIFT                          11
-#define OMAP54XX_CLKACTIVITY_ABE_SYS_CLK_WIDTH                          0x1
-#define OMAP54XX_CLKACTIVITY_ABE_SYS_CLK_MASK                           (1 << 11)
-
-/* Used by CM_ABE_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_ABE_X2_CLK_SHIFT                           8
-#define OMAP54XX_CLKACTIVITY_ABE_X2_CLK_WIDTH                           0x1
-#define OMAP54XX_CLKACTIVITY_ABE_X2_CLK_MASK                            (1 << 8)
-
-/* Used by CM_DSS_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_BB2D_GFCLK_SHIFT                           13
-#define OMAP54XX_CLKACTIVITY_BB2D_GFCLK_WIDTH                           0x1
-#define OMAP54XX_CLKACTIVITY_BB2D_GFCLK_MASK                            (1 << 13)
-
-/* Used by CM_C2C_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_C2C_GFCLK_SHIFT                            9
-#define OMAP54XX_CLKACTIVITY_C2C_GFCLK_WIDTH                            0x1
-#define OMAP54XX_CLKACTIVITY_C2C_GFCLK_MASK                             (1 << 9)
-
-/* Used by CM_C2C_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_C2C_GICLK_SHIFT                            10
-#define OMAP54XX_CLKACTIVITY_C2C_GICLK_WIDTH                            0x1
-#define OMAP54XX_CLKACTIVITY_C2C_GICLK_MASK                             (1 << 10)
-
-/* Used by CM_C2C_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_C2C_L4_GICLK_SHIFT                         8
-#define OMAP54XX_CLKACTIVITY_C2C_L4_GICLK_WIDTH                         0x1
-#define OMAP54XX_CLKACTIVITY_C2C_L4_GICLK_MASK                          (1 << 8)
-
-/* Used by CM_CAM_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_CAM_BOOST_GCLK_SHIFT                       11
-#define OMAP54XX_CLKACTIVITY_CAM_BOOST_GCLK_WIDTH                       0x1
-#define OMAP54XX_CLKACTIVITY_CAM_BOOST_GCLK_MASK                        (1 << 11)
-
-/* Used by CM_CAM_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_CAM_GCLK_SHIFT                             8
-#define OMAP54XX_CLKACTIVITY_CAM_GCLK_WIDTH                             0x1
-#define OMAP54XX_CLKACTIVITY_CAM_GCLK_MASK                              (1 << 8)
-
-/* Used by CM_CAM_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_CAM_L3_GICLK_SHIFT                         12
-#define OMAP54XX_CLKACTIVITY_CAM_L3_GICLK_WIDTH                         0x1
-#define OMAP54XX_CLKACTIVITY_CAM_L3_GICLK_MASK                          (1 << 12)
-
-/* Used by CM_COREAON_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_COREAON_32K_GFCLK_SHIFT                    12
-#define OMAP54XX_CLKACTIVITY_COREAON_32K_GFCLK_WIDTH                    0x1
-#define OMAP54XX_CLKACTIVITY_COREAON_32K_GFCLK_MASK                     (1 << 12)
-
-/* Used by CM_COREAON_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_COREAON_IO_SRCOMP_GFCLK_SHIFT              14
-#define OMAP54XX_CLKACTIVITY_COREAON_IO_SRCOMP_GFCLK_WIDTH              0x1
-#define OMAP54XX_CLKACTIVITY_COREAON_IO_SRCOMP_GFCLK_MASK               (1 << 14)
-
-/* Used by CM_COREAON_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_COREAON_L4_GICLK_SHIFT                     8
-#define OMAP54XX_CLKACTIVITY_COREAON_L4_GICLK_WIDTH                     0x1
-#define OMAP54XX_CLKACTIVITY_COREAON_L4_GICLK_MASK                      (1 << 8)
-
-/* Used by CM_CAM_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_CSI_PHY_GFCLK_SHIFT                        9
-#define OMAP54XX_CLKACTIVITY_CSI_PHY_GFCLK_WIDTH                        0x1
-#define OMAP54XX_CLKACTIVITY_CSI_PHY_GFCLK_MASK                         (1 << 9)
-
-/* Used by CM_CUSTEFUSE_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_CUSTEFUSE_L4_GICLK_SHIFT                   8
-#define OMAP54XX_CLKACTIVITY_CUSTEFUSE_L4_GICLK_WIDTH                   0x1
-#define OMAP54XX_CLKACTIVITY_CUSTEFUSE_L4_GICLK_MASK                    (1 << 8)
-
-/* Used by CM_CUSTEFUSE_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_CUSTEFUSE_SYS_GFCLK_SHIFT                  9
-#define OMAP54XX_CLKACTIVITY_CUSTEFUSE_SYS_GFCLK_WIDTH                  0x1
-#define OMAP54XX_CLKACTIVITY_CUSTEFUSE_SYS_GFCLK_MASK                   (1 << 9)
-
-/* Used by CM_EMIF_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_DLL_GCLK_SHIFT                             9
-#define OMAP54XX_CLKACTIVITY_DLL_GCLK_WIDTH                             0x1
-#define OMAP54XX_CLKACTIVITY_DLL_GCLK_MASK                              (1 << 9)
-
-/* Used by CM_DMA_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_DMA_L3_GICLK_SHIFT                         8
-#define OMAP54XX_CLKACTIVITY_DMA_L3_GICLK_WIDTH                         0x1
-#define OMAP54XX_CLKACTIVITY_DMA_L3_GICLK_MASK                          (1 << 8)
-
-/* Used by CM_DSP_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_DSP_GCLK_SHIFT                             8
-#define OMAP54XX_CLKACTIVITY_DSP_GCLK_WIDTH                             0x1
-#define OMAP54XX_CLKACTIVITY_DSP_GCLK_MASK                              (1 << 8)
-
-/* Used by CM_DSS_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_DSS_GFCLK_SHIFT                            9
-#define OMAP54XX_CLKACTIVITY_DSS_GFCLK_WIDTH                            0x1
-#define OMAP54XX_CLKACTIVITY_DSS_GFCLK_MASK                             (1 << 9)
-
-/* Used by CM_DSS_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_DSS_L3_GICLK_SHIFT                         8
-#define OMAP54XX_CLKACTIVITY_DSS_L3_GICLK_WIDTH                         0x1
-#define OMAP54XX_CLKACTIVITY_DSS_L3_GICLK_MASK                          (1 << 8)
-
-/* Used by CM_DSS_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_DSS_SYS_GFCLK_SHIFT                        10
-#define OMAP54XX_CLKACTIVITY_DSS_SYS_GFCLK_WIDTH                        0x1
-#define OMAP54XX_CLKACTIVITY_DSS_SYS_GFCLK_MASK                         (1 << 10)
-
-/* Used by CM_EMIF_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_EMIF_L3_GICLK_SHIFT                        8
-#define OMAP54XX_CLKACTIVITY_EMIF_L3_GICLK_WIDTH                        0x1
-#define OMAP54XX_CLKACTIVITY_EMIF_L3_GICLK_MASK                         (1 << 8)
-
-/* Used by CM_EMIF_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_EMIF_LL_GCLK_SHIFT                         11
-#define OMAP54XX_CLKACTIVITY_EMIF_LL_GCLK_WIDTH                         0x1
-#define OMAP54XX_CLKACTIVITY_EMIF_LL_GCLK_MASK                          (1 << 11)
-
-/* Used by CM_EMIF_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_EMIF_PHY_GCLK_SHIFT                        10
-#define OMAP54XX_CLKACTIVITY_EMIF_PHY_GCLK_WIDTH                        0x1
-#define OMAP54XX_CLKACTIVITY_EMIF_PHY_GCLK_MASK                         (1 << 10)
-
-/* Used by CM_EMU_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_EMU_SYS_GCLK_SHIFT                         8
-#define OMAP54XX_CLKACTIVITY_EMU_SYS_GCLK_WIDTH                         0x1
-#define OMAP54XX_CLKACTIVITY_EMU_SYS_GCLK_MASK                          (1 << 8)
-
-/* Used by CM_CAM_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_FDIF_GCLK_SHIFT                            10
-#define OMAP54XX_CLKACTIVITY_FDIF_GCLK_WIDTH                            0x1
-#define OMAP54XX_CLKACTIVITY_FDIF_GCLK_MASK                             (1 << 10)
-
-/* Used by CM_ABE_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_FUNC_24M_GFCLK_SHIFT                       10
-#define OMAP54XX_CLKACTIVITY_FUNC_24M_GFCLK_WIDTH                       0x1
-#define OMAP54XX_CLKACTIVITY_FUNC_24M_GFCLK_MASK                        (1 << 10)
-
-/* Used by CM_GPU_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_GPU_CORE_GCLK_SHIFT                        9
-#define OMAP54XX_CLKACTIVITY_GPU_CORE_GCLK_WIDTH                        0x1
-#define OMAP54XX_CLKACTIVITY_GPU_CORE_GCLK_MASK                         (1 << 9)
-
-/* Used by CM_GPU_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_GPU_HYD_GCLK_SHIFT                         10
-#define OMAP54XX_CLKACTIVITY_GPU_HYD_GCLK_WIDTH                         0x1
-#define OMAP54XX_CLKACTIVITY_GPU_HYD_GCLK_MASK                          (1 << 10)
-
-/* Used by CM_GPU_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_GPU_SYS_GCLK_SHIFT                         8
-#define OMAP54XX_CLKACTIVITY_GPU_SYS_GCLK_WIDTH                         0x1
-#define OMAP54XX_CLKACTIVITY_GPU_SYS_GCLK_MASK                          (1 << 8)
-
-/* Used by CM_DSS_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_HDMI_CEC_GFCLK_SHIFT                       12
-#define OMAP54XX_CLKACTIVITY_HDMI_CEC_GFCLK_WIDTH                       0x1
-#define OMAP54XX_CLKACTIVITY_HDMI_CEC_GFCLK_MASK                        (1 << 12)
-
-/* Used by CM_DSS_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_HDMI_PHY_GFCLK_SHIFT                       11
-#define OMAP54XX_CLKACTIVITY_HDMI_PHY_GFCLK_WIDTH                       0x1
-#define OMAP54XX_CLKACTIVITY_HDMI_PHY_GFCLK_MASK                        (1 << 11)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_HSIC_P1_480M_GFCLK_SHIFT                   20
-#define OMAP54XX_CLKACTIVITY_HSIC_P1_480M_GFCLK_WIDTH                   0x1
-#define OMAP54XX_CLKACTIVITY_HSIC_P1_480M_GFCLK_MASK                    (1 << 20)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_HSIC_P1_GFCLK_SHIFT                        26
-#define OMAP54XX_CLKACTIVITY_HSIC_P1_GFCLK_WIDTH                        0x1
-#define OMAP54XX_CLKACTIVITY_HSIC_P1_GFCLK_MASK                         (1 << 26)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_HSIC_P2_480M_GFCLK_SHIFT                   21
-#define OMAP54XX_CLKACTIVITY_HSIC_P2_480M_GFCLK_WIDTH                   0x1
-#define OMAP54XX_CLKACTIVITY_HSIC_P2_480M_GFCLK_MASK                    (1 << 21)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_HSIC_P2_GFCLK_SHIFT                        27
-#define OMAP54XX_CLKACTIVITY_HSIC_P2_GFCLK_WIDTH                        0x1
-#define OMAP54XX_CLKACTIVITY_HSIC_P2_GFCLK_MASK                         (1 << 27)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_HSIC_P3_480M_GFCLK_SHIFT                   6
-#define OMAP54XX_CLKACTIVITY_HSIC_P3_480M_GFCLK_WIDTH                   0x1
-#define OMAP54XX_CLKACTIVITY_HSIC_P3_480M_GFCLK_MASK                    (1 << 6)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_HSIC_P3_GFCLK_SHIFT                        7
-#define OMAP54XX_CLKACTIVITY_HSIC_P3_GFCLK_WIDTH                        0x1
-#define OMAP54XX_CLKACTIVITY_HSIC_P3_GFCLK_MASK                         (1 << 7)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_HSI_GFCLK_SHIFT                            16
-#define OMAP54XX_CLKACTIVITY_HSI_GFCLK_WIDTH                            0x1
-#define OMAP54XX_CLKACTIVITY_HSI_GFCLK_MASK                             (1 << 16)
-
-/* Used by CM_IPU_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_IPU_GCLK_SHIFT                             8
-#define OMAP54XX_CLKACTIVITY_IPU_GCLK_WIDTH                             0x1
-#define OMAP54XX_CLKACTIVITY_IPU_GCLK_MASK                              (1 << 8)
-
-/* Used by CM_IVA_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_IVA_GCLK_SHIFT                             8
-#define OMAP54XX_CLKACTIVITY_IVA_GCLK_WIDTH                             0x1
-#define OMAP54XX_CLKACTIVITY_IVA_GCLK_MASK                              (1 << 8)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_L3INIT_48M_GFCLK_SHIFT                     12
-#define OMAP54XX_CLKACTIVITY_L3INIT_48M_GFCLK_WIDTH                     0x1
-#define OMAP54XX_CLKACTIVITY_L3INIT_48M_GFCLK_MASK                      (1 << 12)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_L3INIT_60M_P1_GFCLK_SHIFT                  28
-#define OMAP54XX_CLKACTIVITY_L3INIT_60M_P1_GFCLK_WIDTH                  0x1
-#define OMAP54XX_CLKACTIVITY_L3INIT_60M_P1_GFCLK_MASK                   (1 << 28)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_L3INIT_60M_P2_GFCLK_SHIFT                  29
-#define OMAP54XX_CLKACTIVITY_L3INIT_60M_P2_GFCLK_WIDTH                  0x1
-#define OMAP54XX_CLKACTIVITY_L3INIT_60M_P2_GFCLK_MASK                   (1 << 29)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_L3INIT_L3_GICLK_SHIFT                      8
-#define OMAP54XX_CLKACTIVITY_L3INIT_L3_GICLK_WIDTH                      0x1
-#define OMAP54XX_CLKACTIVITY_L3INIT_L3_GICLK_MASK                       (1 << 8)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_L3INIT_L4_GICLK_SHIFT                      9
-#define OMAP54XX_CLKACTIVITY_L3INIT_L4_GICLK_WIDTH                      0x1
-#define OMAP54XX_CLKACTIVITY_L3INIT_L4_GICLK_MASK                       (1 << 9)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_L3INIT_USB_OTG_SS_LFPS_TX_GFCLK_SHIFT      11
-#define OMAP54XX_CLKACTIVITY_L3INIT_USB_OTG_SS_LFPS_TX_GFCLK_WIDTH      0x1
-#define OMAP54XX_CLKACTIVITY_L3INIT_USB_OTG_SS_LFPS_TX_GFCLK_MASK       (1 << 11)
-
-/* Used by CM_L3INSTR_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_L3INSTR_DLL_AGING_GCLK_SHIFT               9
-#define OMAP54XX_CLKACTIVITY_L3INSTR_DLL_AGING_GCLK_WIDTH               0x1
-#define OMAP54XX_CLKACTIVITY_L3INSTR_DLL_AGING_GCLK_MASK                (1 << 9)
-
-/* Used by CM_L3INSTR_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_L3INSTR_L3_GICLK_SHIFT                     8
-#define OMAP54XX_CLKACTIVITY_L3INSTR_L3_GICLK_WIDTH                     0x1
-#define OMAP54XX_CLKACTIVITY_L3INSTR_L3_GICLK_MASK                      (1 << 8)
-
-/* Used by CM_L3INSTR_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_L3INSTR_TS_GCLK_SHIFT                      10
-#define OMAP54XX_CLKACTIVITY_L3INSTR_TS_GCLK_WIDTH                      0x1
-#define OMAP54XX_CLKACTIVITY_L3INSTR_TS_GCLK_MASK                       (1 << 10)
-
-/* Used by CM_L3MAIN1_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_L3MAIN1_L3_GICLK_SHIFT                     8
-#define OMAP54XX_CLKACTIVITY_L3MAIN1_L3_GICLK_WIDTH                     0x1
-#define OMAP54XX_CLKACTIVITY_L3MAIN1_L3_GICLK_MASK                      (1 << 8)
-
-/* Used by CM_L3MAIN2_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_L3MAIN2_L3_GICLK_SHIFT                     8
-#define OMAP54XX_CLKACTIVITY_L3MAIN2_L3_GICLK_WIDTH                     0x1
-#define OMAP54XX_CLKACTIVITY_L3MAIN2_L3_GICLK_MASK                      (1 << 8)
-
-/* Used by CM_L4CFG_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_L4CFG_L4_GICLK_SHIFT                       8
-#define OMAP54XX_CLKACTIVITY_L4CFG_L4_GICLK_WIDTH                       0x1
-#define OMAP54XX_CLKACTIVITY_L4CFG_L4_GICLK_MASK                        (1 << 8)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_L4PER_L4_GICLK_SHIFT                       8
-#define OMAP54XX_CLKACTIVITY_L4PER_L4_GICLK_WIDTH                       0x1
-#define OMAP54XX_CLKACTIVITY_L4PER_L4_GICLK_MASK                        (1 << 8)
-
-/* Used by CM_L4SEC_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_L4SEC_L3_GICLK_SHIFT                       8
-#define OMAP54XX_CLKACTIVITY_L4SEC_L3_GICLK_WIDTH                       0x1
-#define OMAP54XX_CLKACTIVITY_L4SEC_L3_GICLK_MASK                        (1 << 8)
-
-/* Used by CM_L4SEC_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_L4SEC_L4_GICLK_SHIFT                       9
-#define OMAP54XX_CLKACTIVITY_L4SEC_L4_GICLK_WIDTH                       0x1
-#define OMAP54XX_CLKACTIVITY_L4SEC_L4_GICLK_MASK                        (1 << 9)
-
-/* Used by CM_MIPIEXT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_MIPIEXT_L3_GICLK_SHIFT                     8
-#define OMAP54XX_CLKACTIVITY_MIPIEXT_L3_GICLK_WIDTH                     0x1
-#define OMAP54XX_CLKACTIVITY_MIPIEXT_L3_GICLK_MASK                      (1 << 8)
-
-/* Used by CM_MIPIEXT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_MIPIEXT_PHY_REF_GFCLK_SHIFT                11
-#define OMAP54XX_CLKACTIVITY_MIPIEXT_PHY_REF_GFCLK_WIDTH                0x1
-#define OMAP54XX_CLKACTIVITY_MIPIEXT_PHY_REF_GFCLK_MASK                 (1 << 11)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_MMC1_32K_GFCLK_SHIFT                       2
-#define OMAP54XX_CLKACTIVITY_MMC1_32K_GFCLK_WIDTH                       0x1
-#define OMAP54XX_CLKACTIVITY_MMC1_32K_GFCLK_MASK                        (1 << 2)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_MMC1_GFCLK_SHIFT                           17
-#define OMAP54XX_CLKACTIVITY_MMC1_GFCLK_WIDTH                           0x1
-#define OMAP54XX_CLKACTIVITY_MMC1_GFCLK_MASK                            (1 << 17)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_MMC2_GFCLK_SHIFT                           18
-#define OMAP54XX_CLKACTIVITY_MMC2_GFCLK_WIDTH                           0x1
-#define OMAP54XX_CLKACTIVITY_MMC2_GFCLK_MASK                            (1 << 18)
-
-/* Used by CM_MPU_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_MPU_GCLK_SHIFT                             8
-#define OMAP54XX_CLKACTIVITY_MPU_GCLK_WIDTH                             0x1
-#define OMAP54XX_CLKACTIVITY_MPU_GCLK_MASK                              (1 << 8)
-
-/* Used by CM_ABE_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_PAD_CLKS_SHIFT                             14
-#define OMAP54XX_CLKACTIVITY_PAD_CLKS_WIDTH                             0x1
-#define OMAP54XX_CLKACTIVITY_PAD_CLKS_MASK                              (1 << 14)
-
-/* Used by CM_ABE_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_PAD_SLIMBUS1_CLK_SHIFT                     15
-#define OMAP54XX_CLKACTIVITY_PAD_SLIMBUS1_CLK_WIDTH                     0x1
-#define OMAP54XX_CLKACTIVITY_PAD_SLIMBUS1_CLK_MASK                      (1 << 15)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_PAD_XCLK60MHSP1_SHIFT                      3
-#define OMAP54XX_CLKACTIVITY_PAD_XCLK60MHSP1_WIDTH                      0x1
-#define OMAP54XX_CLKACTIVITY_PAD_XCLK60MHSP1_MASK                       (1 << 3)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_PAD_XCLK60MHSP2_SHIFT                      4
-#define OMAP54XX_CLKACTIVITY_PAD_XCLK60MHSP2_WIDTH                      0x1
-#define OMAP54XX_CLKACTIVITY_PAD_XCLK60MHSP2_MASK                       (1 << 4)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_PER_12M_GFCLK_SHIFT                        15
-#define OMAP54XX_CLKACTIVITY_PER_12M_GFCLK_WIDTH                        0x1
-#define OMAP54XX_CLKACTIVITY_PER_12M_GFCLK_MASK                         (1 << 15)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_PER_32K_GFCLK_SHIFT                        17
-#define OMAP54XX_CLKACTIVITY_PER_32K_GFCLK_WIDTH                        0x1
-#define OMAP54XX_CLKACTIVITY_PER_32K_GFCLK_MASK                         (1 << 17)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_PER_48M_GFCLK_SHIFT                        18
-#define OMAP54XX_CLKACTIVITY_PER_48M_GFCLK_WIDTH                        0x1
-#define OMAP54XX_CLKACTIVITY_PER_48M_GFCLK_MASK                         (1 << 18)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_PER_96M_GFCLK_SHIFT                        19
-#define OMAP54XX_CLKACTIVITY_PER_96M_GFCLK_WIDTH                        0x1
-#define OMAP54XX_CLKACTIVITY_PER_96M_GFCLK_MASK                         (1 << 19)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_SATA_REF_GFCLK_SHIFT                       19
-#define OMAP54XX_CLKACTIVITY_SATA_REF_GFCLK_WIDTH                       0x1
-#define OMAP54XX_CLKACTIVITY_SATA_REF_GFCLK_MASK                        (1 << 19)
-
-/* Used by CM_COREAON_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_SR_CORE_SYS_GFCLK_SHIFT                    11
-#define OMAP54XX_CLKACTIVITY_SR_CORE_SYS_GFCLK_WIDTH                    0x1
-#define OMAP54XX_CLKACTIVITY_SR_CORE_SYS_GFCLK_MASK                     (1 << 11)
-
-/* Used by CM_COREAON_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_SR_MM_SYS_GFCLK_SHIFT                      10
-#define OMAP54XX_CLKACTIVITY_SR_MM_SYS_GFCLK_WIDTH                      0x1
-#define OMAP54XX_CLKACTIVITY_SR_MM_SYS_GFCLK_MASK                       (1 << 10)
-
-/* Used by CM_COREAON_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_SR_MPU_SYS_GFCLK_SHIFT                     9
-#define OMAP54XX_CLKACTIVITY_SR_MPU_SYS_GFCLK_WIDTH                     0x1
-#define OMAP54XX_CLKACTIVITY_SR_MPU_SYS_GFCLK_MASK                      (1 << 9)
-
-/* Used by CM_WKUPAON_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_SYS_CLK_SHIFT                              8
-#define OMAP54XX_CLKACTIVITY_SYS_CLK_WIDTH                              0x1
-#define OMAP54XX_CLKACTIVITY_SYS_CLK_MASK                               (1 << 8)
-
-/* Used by CM_WKUPAON_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_SYS_CLK_ALL_SHIFT                          15
-#define OMAP54XX_CLKACTIVITY_SYS_CLK_ALL_WIDTH                          0x1
-#define OMAP54XX_CLKACTIVITY_SYS_CLK_ALL_MASK                           (1 << 15)
-
-/* Used by CM_WKUPAON_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_SYS_CLK_FUNC_SHIFT                         14
-#define OMAP54XX_CLKACTIVITY_SYS_CLK_FUNC_WIDTH                         0x1
-#define OMAP54XX_CLKACTIVITY_SYS_CLK_FUNC_MASK                          (1 << 14)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_TIMER10_GFCLK_SHIFT                        9
-#define OMAP54XX_CLKACTIVITY_TIMER10_GFCLK_WIDTH                        0x1
-#define OMAP54XX_CLKACTIVITY_TIMER10_GFCLK_MASK                         (1 << 9)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_TIMER11_GFCLK_SHIFT                        10
-#define OMAP54XX_CLKACTIVITY_TIMER11_GFCLK_WIDTH                        0x1
-#define OMAP54XX_CLKACTIVITY_TIMER11_GFCLK_MASK                         (1 << 10)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_TIMER2_GFCLK_SHIFT                         11
-#define OMAP54XX_CLKACTIVITY_TIMER2_GFCLK_WIDTH                         0x1
-#define OMAP54XX_CLKACTIVITY_TIMER2_GFCLK_MASK                          (1 << 11)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_TIMER3_GFCLK_SHIFT                         12
-#define OMAP54XX_CLKACTIVITY_TIMER3_GFCLK_WIDTH                         0x1
-#define OMAP54XX_CLKACTIVITY_TIMER3_GFCLK_MASK                          (1 << 12)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_TIMER4_GFCLK_SHIFT                         13
-#define OMAP54XX_CLKACTIVITY_TIMER4_GFCLK_WIDTH                         0x1
-#define OMAP54XX_CLKACTIVITY_TIMER4_GFCLK_MASK                          (1 << 13)
-
-/* Used by CM_L4PER_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_TIMER9_GFCLK_SHIFT                         14
-#define OMAP54XX_CLKACTIVITY_TIMER9_GFCLK_WIDTH                         0x1
-#define OMAP54XX_CLKACTIVITY_TIMER9_GFCLK_MASK                          (1 << 14)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_TLL_CH0_GFCLK_SHIFT                        22
-#define OMAP54XX_CLKACTIVITY_TLL_CH0_GFCLK_WIDTH                        0x1
-#define OMAP54XX_CLKACTIVITY_TLL_CH0_GFCLK_MASK                         (1 << 22)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_TLL_CH1_GFCLK_SHIFT                        23
-#define OMAP54XX_CLKACTIVITY_TLL_CH1_GFCLK_WIDTH                        0x1
-#define OMAP54XX_CLKACTIVITY_TLL_CH1_GFCLK_MASK                         (1 << 23)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_TLL_CH2_GFCLK_SHIFT                        24
-#define OMAP54XX_CLKACTIVITY_TLL_CH2_GFCLK_WIDTH                        0x1
-#define OMAP54XX_CLKACTIVITY_TLL_CH2_GFCLK_MASK                         (1 << 24)
-
-/* Used by CM_MIPIEXT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_UNIPRO1_DPLL_CLK_SHIFT                     10
-#define OMAP54XX_CLKACTIVITY_UNIPRO1_DPLL_CLK_WIDTH                     0x1
-#define OMAP54XX_CLKACTIVITY_UNIPRO1_DPLL_CLK_MASK                      (1 << 10)
-
-/* Used by CM_MIPIEXT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_UNIPRO1_PHY_GFCLK_SHIFT                    13
-#define OMAP54XX_CLKACTIVITY_UNIPRO1_PHY_GFCLK_WIDTH                    0x1
-#define OMAP54XX_CLKACTIVITY_UNIPRO1_PHY_GFCLK_MASK                     (1 << 13)
-
-/* Used by CM_MIPIEXT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_UNIPRO1_TXPHY_LS_GFCLK_SHIFT               12
-#define OMAP54XX_CLKACTIVITY_UNIPRO1_TXPHY_LS_GFCLK_WIDTH               0x1
-#define OMAP54XX_CLKACTIVITY_UNIPRO1_TXPHY_LS_GFCLK_MASK                (1 << 12)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_UNIPRO2_DPLL_CLK_SHIFT                     10
-#define OMAP54XX_CLKACTIVITY_UNIPRO2_DPLL_CLK_WIDTH                     0x1
-#define OMAP54XX_CLKACTIVITY_UNIPRO2_DPLL_CLK_MASK                      (1 << 10)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_UNIPRO2_PHY_GFCLK_SHIFT                    13
-#define OMAP54XX_CLKACTIVITY_UNIPRO2_PHY_GFCLK_WIDTH                    0x1
-#define OMAP54XX_CLKACTIVITY_UNIPRO2_PHY_GFCLK_MASK                     (1 << 13)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_UNIPRO2_PHY_REF_GFCLK_SHIFT                5
-#define OMAP54XX_CLKACTIVITY_UNIPRO2_PHY_REF_GFCLK_WIDTH                0x1
-#define OMAP54XX_CLKACTIVITY_UNIPRO2_PHY_REF_GFCLK_MASK                 (1 << 5)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_USB_DPLL_CLK_SHIFT                         14
-#define OMAP54XX_CLKACTIVITY_USB_DPLL_CLK_WIDTH                         0x1
-#define OMAP54XX_CLKACTIVITY_USB_DPLL_CLK_MASK                          (1 << 14)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_USB_DPLL_HS_CLK_SHIFT                      15
-#define OMAP54XX_CLKACTIVITY_USB_DPLL_HS_CLK_WIDTH                      0x1
-#define OMAP54XX_CLKACTIVITY_USB_DPLL_HS_CLK_MASK                       (1 << 15)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_USB_OTG_SS_REF_CLK_SHIFT                   31
-#define OMAP54XX_CLKACTIVITY_USB_OTG_SS_REF_CLK_WIDTH                   0x1
-#define OMAP54XX_CLKACTIVITY_USB_OTG_SS_REF_CLK_MASK                    (1 << 31)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_UTMI_P3_GFCLK_SHIFT                        30
-#define OMAP54XX_CLKACTIVITY_UTMI_P3_GFCLK_WIDTH                        0x1
-#define OMAP54XX_CLKACTIVITY_UTMI_P3_GFCLK_MASK                         (1 << 30)
-
-/* Used by CM_L3INIT_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_UTMI_ROOT_GFCLK_SHIFT                      25
-#define OMAP54XX_CLKACTIVITY_UTMI_ROOT_GFCLK_WIDTH                      0x1
-#define OMAP54XX_CLKACTIVITY_UTMI_ROOT_GFCLK_MASK                       (1 << 25)
-
-/* Used by CM_WKUPAON_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_WKUPAON_32K_GFCLK_SHIFT                    11
-#define OMAP54XX_CLKACTIVITY_WKUPAON_32K_GFCLK_WIDTH                    0x1
-#define OMAP54XX_CLKACTIVITY_WKUPAON_32K_GFCLK_MASK                     (1 << 11)
-
-/* Used by CM_WKUPAON_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_WKUPAON_GICLK_SHIFT                        12
-#define OMAP54XX_CLKACTIVITY_WKUPAON_GICLK_WIDTH                        0x1
-#define OMAP54XX_CLKACTIVITY_WKUPAON_GICLK_MASK                         (1 << 12)
-
-/* Used by CM_WKUPAON_CLKSTCTRL */
-#define OMAP54XX_CLKACTIVITY_WKUPAON_IO_SRCOMP_GFCLK_SHIFT              13
-#define OMAP54XX_CLKACTIVITY_WKUPAON_IO_SRCOMP_GFCLK_WIDTH              0x1
-#define OMAP54XX_CLKACTIVITY_WKUPAON_IO_SRCOMP_GFCLK_MASK               (1 << 13)
-
-/* Used by CM_COREAON_IO_SRCOMP_CLKCTRL, CM_WKUPAON_IO_SRCOMP_CLKCTRL */
-#define OMAP54XX_CLKEN_SRCOMP_FCLK_SHIFT                                8
-#define OMAP54XX_CLKEN_SRCOMP_FCLK_WIDTH                                0x1
-#define OMAP54XX_CLKEN_SRCOMP_FCLK_MASK                                 (1 << 8)
-
-/*
- * Used by CM_ABE_TIMER5_CLKCTRL, CM_ABE_TIMER6_CLKCTRL, CM_ABE_TIMER7_CLKCTRL,
- * CM_ABE_TIMER8_CLKCTRL, CM_L3INIT_HSI_CLKCTRL, CM_L4PER_TIMER10_CLKCTRL,
- * CM_L4PER_TIMER11_CLKCTRL, CM_L4PER_TIMER2_CLKCTRL, CM_L4PER_TIMER3_CLKCTRL,
- * CM_L4PER_TIMER4_CLKCTRL, CM_L4PER_TIMER9_CLKCTRL, CM_WKUPAON_TIMER1_CLKCTRL
- */
 #define OMAP54XX_CLKSEL_SHIFT                                           24
 #define OMAP54XX_CLKSEL_WIDTH                                           0x1
-#define OMAP54XX_CLKSEL_MASK                                            (1 << 24)
-
-/*
- * Renamed from CLKSEL Used by CM_CLKSEL_ABE_DSS_SYS, CM_CLKSEL_ABE_PLL_REF,
- * CM_CLKSEL_USB_60MHZ, CM_CLKSEL_WKUPAON
- */
 #define OMAP54XX_CLKSEL_0_0_SHIFT                                       0
 #define OMAP54XX_CLKSEL_0_0_WIDTH                                       0x1
-#define OMAP54XX_CLKSEL_0_0_MASK                                        (1 << 0)
-
-/* Renamed from CLKSEL Used by CM_BYPCLK_DPLL_IVA, CM_BYPCLK_DPLL_MPU */
-#define OMAP54XX_CLKSEL_0_1_SHIFT                                       0
-#define OMAP54XX_CLKSEL_0_1_WIDTH                                       0x2
-#define OMAP54XX_CLKSEL_0_1_MASK                                        (0x3 << 0)
-
-/* Renamed from CLKSEL Used by CM_L3INSTR_CTRL_MODULE_BANDGAP_CLKCTRL */
-#define OMAP54XX_CLKSEL_24_25_SHIFT                                     24
-#define OMAP54XX_CLKSEL_24_25_WIDTH                                     0x2
-#define OMAP54XX_CLKSEL_24_25_MASK                                      (0x3 << 24)
-
-/* Used by CM_MPU_MPU_CLKCTRL */
-#define OMAP54XX_CLKSEL_ABE_DIV_MODE_SHIFT                              26
-#define OMAP54XX_CLKSEL_ABE_DIV_MODE_WIDTH                              0x1
-#define OMAP54XX_CLKSEL_ABE_DIV_MODE_MASK                               (1 << 26)
-
-/* Used by CM_ABE_AESS_CLKCTRL */
 #define OMAP54XX_CLKSEL_AESS_FCLK_SHIFT                                 24
 #define OMAP54XX_CLKSEL_AESS_FCLK_WIDTH                                 0x1
-#define OMAP54XX_CLKSEL_AESS_FCLK_MASK                                  (1 << 24)
-
-/* Used by CM_L3INIT_MMC1_CLKCTRL, CM_L3INIT_MMC2_CLKCTRL */
 #define OMAP54XX_CLKSEL_DIV_SHIFT                                       25
 #define OMAP54XX_CLKSEL_DIV_WIDTH                                       0x1
-#define OMAP54XX_CLKSEL_DIV_MASK                                        (1 << 25)
-
-/* Used by CM_MPU_MPU_CLKCTRL */
-#define OMAP54XX_CLKSEL_EMIF_DIV_MODE_SHIFT                             24
-#define OMAP54XX_CLKSEL_EMIF_DIV_MODE_WIDTH                             0x2
-#define OMAP54XX_CLKSEL_EMIF_DIV_MODE_MASK                              (0x3 << 24)
-
-/* Used by CM_CAM_FDIF_CLKCTRL */
 #define OMAP54XX_CLKSEL_FCLK_SHIFT                                      24
 #define OMAP54XX_CLKSEL_FCLK_WIDTH                                      0x1
-#define OMAP54XX_CLKSEL_FCLK_MASK                                       (1 << 24)
-
-/* Used by CM_GPU_GPU_CLKCTRL */
 #define OMAP54XX_CLKSEL_GPU_CORE_GCLK_SHIFT                             24
 #define OMAP54XX_CLKSEL_GPU_CORE_GCLK_WIDTH                             0x1
-#define OMAP54XX_CLKSEL_GPU_CORE_GCLK_MASK                              (1 << 24)
-
-/* Used by CM_GPU_GPU_CLKCTRL */
 #define OMAP54XX_CLKSEL_GPU_HYD_GCLK_SHIFT                              25
 #define OMAP54XX_CLKSEL_GPU_HYD_GCLK_WIDTH                              0x1
-#define OMAP54XX_CLKSEL_GPU_HYD_GCLK_MASK                               (1 << 25)
-
-/* Used by CM_GPU_GPU_CLKCTRL */
-#define OMAP54XX_CLKSEL_GPU_SYS_CLK_SHIFT                               26
-#define OMAP54XX_CLKSEL_GPU_SYS_CLK_WIDTH                               0x1
-#define OMAP54XX_CLKSEL_GPU_SYS_CLK_MASK                                (1 << 26)
-
-/*
- * Used by CM_ABE_DMIC_CLKCTRL, CM_ABE_MCASP_CLKCTRL, CM_ABE_MCBSP1_CLKCTRL,
- * CM_ABE_MCBSP2_CLKCTRL, CM_ABE_MCBSP3_CLKCTRL
- */
 #define OMAP54XX_CLKSEL_INTERNAL_SOURCE_SHIFT                           26
 #define OMAP54XX_CLKSEL_INTERNAL_SOURCE_WIDTH                           0x2
-#define OMAP54XX_CLKSEL_INTERNAL_SOURCE_MASK                            (0x3 << 26)
-
-/* Used by CM_CLKSEL_CORE */
-#define OMAP54XX_CLKSEL_L3_SHIFT                                        4
-#define OMAP54XX_CLKSEL_L3_WIDTH                                        0x1
-#define OMAP54XX_CLKSEL_L3_MASK                                         (1 << 4)
-
-/* Renamed from CLKSEL_L3 Used by CM_SHADOW_FREQ_CONFIG2 */
-#define OMAP54XX_CLKSEL_L3_1_1_SHIFT                                    1
-#define OMAP54XX_CLKSEL_L3_1_1_WIDTH                                    0x1
-#define OMAP54XX_CLKSEL_L3_1_1_MASK                                     (1 << 1)
-
-/* Used by CM_CLKSEL_CORE */
-#define OMAP54XX_CLKSEL_L4_SHIFT                                        8
-#define OMAP54XX_CLKSEL_L4_WIDTH                                        0x1
-#define OMAP54XX_CLKSEL_L4_MASK                                         (1 << 8)
-
-/* Used by CM_EMIF_EMIF1_CLKCTRL */
-#define OMAP54XX_CLKSEL_LL_SHIFT                                        24
-#define OMAP54XX_CLKSEL_LL_WIDTH                                        0x1
-#define OMAP54XX_CLKSEL_LL_MASK                                         (1 << 24)
-
-/* Used by CM_CLKSEL_ABE */
 #define OMAP54XX_CLKSEL_OPP_SHIFT                                       0
 #define OMAP54XX_CLKSEL_OPP_WIDTH                                       0x2
-#define OMAP54XX_CLKSEL_OPP_MASK                                        (0x3 << 0)
-
-/* Renamed from CLKSEL_OPP Used by CM_L3INIT_UNIPRO2_CLKCTRL */
-#define OMAP54XX_CLKSEL_OPP_24_24_SHIFT                                 24
-#define OMAP54XX_CLKSEL_OPP_24_24_WIDTH                                 0x1
-#define OMAP54XX_CLKSEL_OPP_24_24_MASK                                  (1 << 24)
-
-/*
- * Used by CM_ABE_DMIC_CLKCTRL, CM_ABE_MCASP_CLKCTRL, CM_ABE_MCBSP1_CLKCTRL,
- * CM_ABE_MCBSP2_CLKCTRL, CM_ABE_MCBSP3_CLKCTRL
- */
 #define OMAP54XX_CLKSEL_SOURCE_SHIFT                                    24
 #define OMAP54XX_CLKSEL_SOURCE_WIDTH                                    0x2
-#define OMAP54XX_CLKSEL_SOURCE_MASK                                     (0x3 << 24)
-
-/*
- * Renamed from CLKSEL_SOURCE Used by CM_L3INIT_MMC1_CLKCTRL,
- * CM_L3INIT_MMC2_CLKCTRL
- */
 #define OMAP54XX_CLKSEL_SOURCE_L3INIT_MMC1_SHIFT                        24
 #define OMAP54XX_CLKSEL_SOURCE_L3INIT_MMC1_WIDTH                        0x1
-#define OMAP54XX_CLKSEL_SOURCE_L3INIT_MMC1_MASK                         (1 << 24)
-
-/* Used by CM_L3INIT_USB_HOST_HS_CLKCTRL */
 #define OMAP54XX_CLKSEL_UTMI_P1_SHIFT                                   24
 #define OMAP54XX_CLKSEL_UTMI_P1_WIDTH                                   0x1
-#define OMAP54XX_CLKSEL_UTMI_P1_MASK                                    (1 << 24)
-
-/* Used by CM_L3INIT_USB_HOST_HS_CLKCTRL */
 #define OMAP54XX_CLKSEL_UTMI_P2_SHIFT                                   25
 #define OMAP54XX_CLKSEL_UTMI_P2_WIDTH                                   0x1
-#define OMAP54XX_CLKSEL_UTMI_P2_MASK                                    (1 << 25)
-
-/*
- * Used by CM_DIV_H11_DPLL_CORE, CM_DIV_H11_DPLL_IVA, CM_DIV_H11_DPLL_PER,
- * CM_DIV_H12_DPLL_CORE, CM_DIV_H12_DPLL_IVA, CM_DIV_H12_DPLL_PER,
- * CM_DIV_H13_DPLL_CORE, CM_DIV_H13_DPLL_PER, CM_DIV_H14_DPLL_CORE,
- * CM_DIV_H14_DPLL_PER, CM_DIV_H21_DPLL_CORE, CM_DIV_H22_DPLL_CORE,
- * CM_DIV_H23_DPLL_CORE, CM_DIV_H24_DPLL_CORE, CM_DIV_M2_DPLL_ABE,
- * CM_DIV_M2_DPLL_CORE, CM_DIV_M2_DPLL_MPU, CM_DIV_M2_DPLL_PER,
- * CM_DIV_M2_DPLL_UNIPRO1, CM_DIV_M2_DPLL_UNIPRO2, CM_DIV_M2_DPLL_USB,
- * CM_DIV_M3_DPLL_ABE, CM_DIV_M3_DPLL_CORE, CM_DIV_M3_DPLL_PER
- */
-#define OMAP54XX_CLKST_SHIFT                                            9
-#define OMAP54XX_CLKST_WIDTH                                            0x1
-#define OMAP54XX_CLKST_MASK                                             (1 << 9)
-
-/*
- * Used by CM_ABE_CLKSTCTRL, CM_C2C_CLKSTCTRL, CM_CAM_CLKSTCTRL,
- * CM_COREAON_CLKSTCTRL, CM_CUSTEFUSE_CLKSTCTRL, CM_DMA_CLKSTCTRL,
- * CM_DSP_CLKSTCTRL, CM_DSS_CLKSTCTRL, CM_EMIF_CLKSTCTRL, CM_EMU_CLKSTCTRL,
- * CM_GPU_CLKSTCTRL, CM_IPU_CLKSTCTRL, CM_IVA_CLKSTCTRL, CM_L3INIT_CLKSTCTRL,
- * CM_L3INSTR_CLKSTCTRL, CM_L3MAIN1_CLKSTCTRL, CM_L3MAIN2_CLKSTCTRL,
- * CM_L4CFG_CLKSTCTRL, CM_L4PER_CLKSTCTRL, CM_L4SEC_CLKSTCTRL,
- * CM_MIPIEXT_CLKSTCTRL, CM_MPU_CLKSTCTRL, CM_WKUPAON_CLKSTCTRL
- */
-#define OMAP54XX_CLKTRCTRL_SHIFT                                        0
-#define OMAP54XX_CLKTRCTRL_WIDTH                                        0x2
-#define OMAP54XX_CLKTRCTRL_MASK                                         (0x3 << 0)
-
-/* Used by CM_DIV_M2_DPLL_ABE, CM_DIV_M2_DPLL_PER */
-#define OMAP54XX_CLKX2ST_SHIFT                                          11
-#define OMAP54XX_CLKX2ST_WIDTH                                          0x1
-#define OMAP54XX_CLKX2ST_MASK                                           (1 << 11)
-
-/* Used by CM_L4CFG_DYNAMICDEP */
-#define OMAP54XX_COREAON_DYNDEP_SHIFT                                   16
-#define OMAP54XX_COREAON_DYNDEP_WIDTH                                   0x1
-#define OMAP54XX_COREAON_DYNDEP_MASK                                    (1 << 16)
-
-/* Used by CM_DSP_STATICDEP, CM_IPU_STATICDEP, CM_MPU_STATICDEP */
-#define OMAP54XX_COREAON_STATDEP_SHIFT                                  16
-#define OMAP54XX_COREAON_STATDEP_WIDTH                                  0x1
-#define OMAP54XX_COREAON_STATDEP_MASK                                   (1 << 16)
-
-/* Used by CM_L4CFG_DYNAMICDEP */
-#define OMAP54XX_CUSTEFUSE_DYNDEP_SHIFT                                 17
-#define OMAP54XX_CUSTEFUSE_DYNDEP_WIDTH                                 0x1
-#define OMAP54XX_CUSTEFUSE_DYNDEP_MASK                                  (1 << 17)
-
-/* Used by CM_DSP_STATICDEP, CM_IPU_STATICDEP, CM_MPU_STATICDEP */
-#define OMAP54XX_CUSTEFUSE_STATDEP_SHIFT                                17
-#define OMAP54XX_CUSTEFUSE_STATDEP_WIDTH                                0x1
-#define OMAP54XX_CUSTEFUSE_STATDEP_MASK                                 (1 << 17)
-
-/* Used by REVISION_CM_CORE, REVISION_CM_CORE_AON */
-#define OMAP54XX_CUSTOM_SHIFT                                           6
-#define OMAP54XX_CUSTOM_WIDTH                                           0x2
-#define OMAP54XX_CUSTOM_MASK                                            (0x3 << 6)
-
-/*
- * Used by CM_CLKSEL_DPLL_ABE, CM_CLKSEL_DPLL_CORE, CM_CLKSEL_DPLL_IVA,
- * CM_CLKSEL_DPLL_MPU, CM_CLKSEL_DPLL_PER, CM_CLKSEL_DPLL_UNIPRO1,
- * CM_CLKSEL_DPLL_UNIPRO2, CM_CLKSEL_DPLL_USB
- */
-#define OMAP54XX_DCC_EN_SHIFT                                           22
-#define OMAP54XX_DCC_EN_WIDTH                                           0x1
-#define OMAP54XX_DCC_EN_MASK                                            (1 << 22)
-
-/*
- * Used by CM_CORE_AON_DEBUG_CM_CORE_AON_FD_TRANS,
- * CM_CORE_AON_DEBUG_DSS_FD_TRANS, CM_CORE_AON_DEBUG_EMIF_FD_TRANS,
- * CM_CORE_AON_DEBUG_L4SEC_FD_TRANS
- */
-#define OMAP54XX_CM_DEBUG_OUT_SHIFT                                     0
-#define OMAP54XX_CM_DEBUG_OUT_WIDTH                                     0xd
-#define OMAP54XX_CM_DEBUG_OUT_MASK                                      (0x1fff << 0)
-
-/*
- * Renamed from DEBUG_OUT Used by CM_CORE_AON_DEBUG_ABE_FD_TRANS,
- * CM_CORE_AON_DEBUG_L3INIT_FD_TRANS, CM_CORE_AON_DEBUG_L4PER_FD_TRANS
- */
-#define OMAP54XX_DEBUG_OUT_0_31_SHIFT                                   0
-#define OMAP54XX_DEBUG_OUT_0_31_WIDTH                                   0x20
-#define OMAP54XX_DEBUG_OUT_0_31_MASK                                    (0xffffffff << 0)
-
-/*
- * Renamed from DEBUG_OUT Used by CM_CORE_AON_DEBUG_C2C_FD_TRANS,
- * CM_CORE_AON_DEBUG_COREAON_FD_TRANS, CM_CORE_AON_DEBUG_L4CFG_FD_TRANS
- */
-#define OMAP54XX_DEBUG_OUT_0_8_SHIFT                                    0
-#define OMAP54XX_DEBUG_OUT_0_8_WIDTH                                    0x9
-#define OMAP54XX_DEBUG_OUT_0_8_MASK                                     (0x1ff << 0)
-
-/*
- * Renamed from DEBUG_OUT Used by CM_CORE_AON_DEBUG_CUSTEFUSE_FD_TRANS,
- * CM_CORE_AON_DEBUG_DMA_FD_TRANS, CM_CORE_AON_DEBUG_L3MAIN1_FD_TRANS
- */
-#define OMAP54XX_DEBUG_OUT_0_4_SHIFT                                    0
-#define OMAP54XX_DEBUG_OUT_0_4_WIDTH                                    0x5
-#define OMAP54XX_DEBUG_OUT_0_4_MASK                                     (0x1f << 0)
-
-/*
- * Renamed from DEBUG_OUT Used by CM_CORE_AON_DEBUG_DSP_FD_TRANS,
- * CM_CORE_AON_DEBUG_IPU_FD_TRANS, CM_CORE_AON_DEBUG_MPU_FD_TRANS
- */
-#define OMAP54XX_DEBUG_OUT_0_5_SHIFT                                    0
-#define OMAP54XX_DEBUG_OUT_0_5_WIDTH                                    0x6
-#define OMAP54XX_DEBUG_OUT_0_5_MASK                                     (0x3f << 0)
-
-/*
- * Renamed from DEBUG_OUT Used by CM_CORE_AON_DEBUG_CAM_FD_TRANS,
- * CM_CORE_AON_DEBUG_MIPIEXT_FD_TRANS
- */
-#define OMAP54XX_DEBUG_OUT_0_10_SHIFT                                   0
-#define OMAP54XX_DEBUG_OUT_0_10_WIDTH                                   0xb
-#define OMAP54XX_DEBUG_OUT_0_10_MASK                                    (0x7ff << 0)
-
-/*
- * Renamed from DEBUG_OUT Used by CM_CORE_AON_DEBUG_IVA_FD_TRANS,
- * CM_CORE_AON_DEBUG_L3MAIN2_FD_TRANS
- */
-#define OMAP54XX_DEBUG_OUT_0_6_SHIFT                                    0
-#define OMAP54XX_DEBUG_OUT_0_6_WIDTH                                    0x7
-#define OMAP54XX_DEBUG_OUT_0_6_MASK                                     (0x7f << 0)
-
-/* Renamed from DEBUG_OUT Used by CM_CORE_AON_DEBUG_ABE_FD_TRANS2 */
-#define OMAP54XX_DEBUG_OUT_0_19_SHIFT                                   0
-#define OMAP54XX_DEBUG_OUT_0_19_WIDTH                                   0x14
-#define OMAP54XX_DEBUG_OUT_0_19_MASK                                    (0xfffff << 0)
-
-/* Renamed from DEBUG_OUT Used by CM_CORE_AON_DEBUG_GPU_FD_TRANS */
-#define OMAP54XX_DEBUG_OUT_0_9_SHIFT                                    0
-#define OMAP54XX_DEBUG_OUT_0_9_WIDTH                                    0xa
-#define OMAP54XX_DEBUG_OUT_0_9_MASK                                     (0x3ff << 0)
-
-/* Renamed from DEBUG_OUT Used by CM_CORE_AON_DEBUG_L3INIT_FD_TRANS2 */
-#define OMAP54XX_DEBUG_OUT_0_26_SHIFT                                   0
-#define OMAP54XX_DEBUG_OUT_0_26_WIDTH                                   0x1b
-#define OMAP54XX_DEBUG_OUT_0_26_MASK                                    (0x7ffffff << 0)
-
-/* Renamed from DEBUG_OUT Used by CM_CORE_AON_DEBUG_L3INSTR_FD_TRANS */
-#define OMAP54XX_DEBUG_OUT_0_13_SHIFT                                   0
-#define OMAP54XX_DEBUG_OUT_0_13_WIDTH                                   0xe
-#define OMAP54XX_DEBUG_OUT_0_13_MASK                                    (0x3fff << 0)
-
-/* Renamed from DEBUG_OUT Used by CM_CORE_AON_DEBUG_L4PER_FD_TRANS2 */
-#define OMAP54XX_DEBUG_OUT_0_21_SHIFT                                   0
-#define OMAP54XX_DEBUG_OUT_0_21_WIDTH                                   0x16
-#define OMAP54XX_DEBUG_OUT_0_21_MASK                                    (0x3fffff << 0)
-
-/*
- * Used by CM_SSC_DELTAMSTEP_DPLL_ABE, CM_SSC_DELTAMSTEP_DPLL_CORE,
- * CM_SSC_DELTAMSTEP_DPLL_IVA, CM_SSC_DELTAMSTEP_DPLL_MPU,
- * CM_SSC_DELTAMSTEP_DPLL_PER
- */
-#define OMAP54XX_DELTAMSTEP_SHIFT                                       0
-#define OMAP54XX_DELTAMSTEP_WIDTH                                       0x14
-#define OMAP54XX_DELTAMSTEP_MASK                                        (0xfffff << 0)
-
-/*
- * Renamed from DELTAMSTEP Used by CM_SSC_DELTAMSTEP_DPLL_UNIPRO1,
- * CM_SSC_DELTAMSTEP_DPLL_UNIPRO2, CM_SSC_DELTAMSTEP_DPLL_USB
- */
-#define OMAP54XX_DELTAMSTEP_0_20_SHIFT                                  0
-#define OMAP54XX_DELTAMSTEP_0_20_WIDTH                                  0x15
-#define OMAP54XX_DELTAMSTEP_0_20_MASK                                   (0x1fffff << 0)
-
-/*
- * Used by CM_DIV_H11_DPLL_CORE, CM_DIV_H11_DPLL_IVA, CM_DIV_H11_DPLL_PER,
- * CM_DIV_H12_DPLL_CORE, CM_DIV_H12_DPLL_IVA, CM_DIV_H12_DPLL_PER,
- * CM_DIV_H13_DPLL_CORE, CM_DIV_H13_DPLL_PER, CM_DIV_H14_DPLL_CORE,
- * CM_DIV_H14_DPLL_PER, CM_DIV_H21_DPLL_CORE, CM_DIV_H22_DPLL_CORE,
- * CM_DIV_H23_DPLL_CORE, CM_DIV_H24_DPLL_CORE
- */
-#define OMAP54XX_DIVHS_SHIFT                                            0
-#define OMAP54XX_DIVHS_WIDTH                                            0x6
 #define OMAP54XX_DIVHS_MASK                                             (0x3f << 0)
-
-/*
- * Renamed from DIVHS Used by CM_DIV_M2_DPLL_ABE, CM_DIV_M2_DPLL_CORE,
- * CM_DIV_M2_DPLL_MPU, CM_DIV_M2_DPLL_PER, CM_DIV_M3_DPLL_ABE,
- * CM_DIV_M3_DPLL_CORE, CM_DIV_M3_DPLL_PER
- */
-#define OMAP54XX_DIVHS_0_4_SHIFT                                        0
-#define OMAP54XX_DIVHS_0_4_WIDTH                                        0x5
 #define OMAP54XX_DIVHS_0_4_MASK                                         (0x1f << 0)
-
-/*
- * Renamed from DIVHS Used by CM_DIV_M2_DPLL_UNIPRO1, CM_DIV_M2_DPLL_UNIPRO2,
- * CM_DIV_M2_DPLL_USB
- */
-#define OMAP54XX_DIVHS_0_6_SHIFT                                        0
-#define OMAP54XX_DIVHS_0_6_WIDTH                                        0x7
 #define OMAP54XX_DIVHS_0_6_MASK                                         (0x7f << 0)
-
-/* Used by CM_DLL_CTRL */
-#define OMAP54XX_DLL_OVERRIDE_SHIFT                                     0
-#define OMAP54XX_DLL_OVERRIDE_WIDTH                                     0x1
-#define OMAP54XX_DLL_OVERRIDE_MASK                                      (1 << 0)
-
-/* Renamed from DLL_OVERRIDE Used by CM_SHADOW_FREQ_CONFIG1 */
-#define OMAP54XX_DLL_OVERRIDE_2_2_SHIFT                                 2
-#define OMAP54XX_DLL_OVERRIDE_2_2_WIDTH                                 0x1
-#define OMAP54XX_DLL_OVERRIDE_2_2_MASK                                  (1 << 2)
-
-/* Used by CM_SHADOW_FREQ_CONFIG1 */
-#define OMAP54XX_DLL_RESET_SHIFT                                        3
-#define OMAP54XX_DLL_RESET_WIDTH                                        0x1
-#define OMAP54XX_DLL_RESET_MASK                                         (1 << 3)
-
-/*
- * Used by CM_CLKSEL_DPLL_ABE, CM_CLKSEL_DPLL_CORE, CM_CLKSEL_DPLL_IVA,
- * CM_CLKSEL_DPLL_MPU, CM_CLKSEL_DPLL_PER, CM_CLKSEL_DPLL_UNIPRO1,
- * CM_CLKSEL_DPLL_UNIPRO2, CM_CLKSEL_DPLL_USB
- */
-#define OMAP54XX_DPLL_BYP_CLKSEL_SHIFT                                  23
-#define OMAP54XX_DPLL_BYP_CLKSEL_WIDTH                                  0x1
-#define OMAP54XX_DPLL_BYP_CLKSEL_MASK                                   (1 << 23)
-
-/* Used by CM_CLKSEL_DPLL_CORE */
-#define OMAP54XX_DPLL_CLKOUTHIF_CLKSEL_SHIFT                            20
-#define OMAP54XX_DPLL_CLKOUTHIF_CLKSEL_WIDTH                            0x1
-#define OMAP54XX_DPLL_CLKOUTHIF_CLKSEL_MASK                             (1 << 20)
-
-/* Used by CM_SHADOW_FREQ_CONFIG1 */
-#define OMAP54XX_DPLL_CORE_DPLL_EN_SHIFT                                8
-#define OMAP54XX_DPLL_CORE_DPLL_EN_WIDTH                                0x3
-#define OMAP54XX_DPLL_CORE_DPLL_EN_MASK                                 (0x7 << 8)
-
-/* Used by CM_SHADOW_FREQ_CONFIG2 */
-#define OMAP54XX_DPLL_CORE_H12_DIV_SHIFT                                2
-#define OMAP54XX_DPLL_CORE_H12_DIV_WIDTH                                0x6
-#define OMAP54XX_DPLL_CORE_H12_DIV_MASK                                 (0x3f << 2)
-
-/* Used by CM_SHADOW_FREQ_CONFIG1 */
-#define OMAP54XX_DPLL_CORE_M2_DIV_SHIFT                                 11
-#define OMAP54XX_DPLL_CORE_M2_DIV_WIDTH                                 0x5
-#define OMAP54XX_DPLL_CORE_M2_DIV_MASK                                  (0x1f << 11)
-
-/*
- * Used by CM_CLKSEL_DPLL_ABE, CM_CLKSEL_DPLL_CORE, CM_CLKSEL_DPLL_IVA,
- * CM_CLKSEL_DPLL_MPU, CM_CLKSEL_DPLL_PER
- */
-#define OMAP54XX_DPLL_DIV_SHIFT                                         0
-#define OMAP54XX_DPLL_DIV_WIDTH                                         0x7
 #define OMAP54XX_DPLL_DIV_MASK                                          (0x7f << 0)
-
-/*
- * Renamed from DPLL_DIV Used by CM_CLKSEL_DPLL_UNIPRO1,
- * CM_CLKSEL_DPLL_UNIPRO2, CM_CLKSEL_DPLL_USB
- */
-#define OMAP54XX_DPLL_DIV_0_7_SHIFT                                     0
-#define OMAP54XX_DPLL_DIV_0_7_WIDTH                                     0x8
-#define OMAP54XX_DPLL_DIV_0_7_MASK                                      (0xff << 0)
-
-/*
- * Used by CM_CLKMODE_DPLL_ABE, CM_CLKMODE_DPLL_CORE, CM_CLKMODE_DPLL_IVA,
- * CM_CLKMODE_DPLL_MPU, CM_CLKMODE_DPLL_PER
- */
-#define OMAP54XX_DPLL_DRIFTGUARD_EN_SHIFT                               8
-#define OMAP54XX_DPLL_DRIFTGUARD_EN_WIDTH                               0x1
-#define OMAP54XX_DPLL_DRIFTGUARD_EN_MASK                                (1 << 8)
-
-/*
- * Used by CM_CLKMODE_DPLL_ABE, CM_CLKMODE_DPLL_CORE, CM_CLKMODE_DPLL_IVA,
- * CM_CLKMODE_DPLL_MPU, CM_CLKMODE_DPLL_PER, CM_CLKMODE_DPLL_UNIPRO1,
- * CM_CLKMODE_DPLL_UNIPRO2, CM_CLKMODE_DPLL_USB
- */
-#define OMAP54XX_DPLL_EN_SHIFT                                          0
-#define OMAP54XX_DPLL_EN_WIDTH                                          0x3
 #define OMAP54XX_DPLL_EN_MASK                                           (0x7 << 0)
-
-/*
- * Used by CM_CLKMODE_DPLL_ABE, CM_CLKMODE_DPLL_CORE, CM_CLKMODE_DPLL_IVA,
- * CM_CLKMODE_DPLL_MPU, CM_CLKMODE_DPLL_PER
- */
-#define OMAP54XX_DPLL_LPMODE_EN_SHIFT                                   10
-#define OMAP54XX_DPLL_LPMODE_EN_WIDTH                                   0x1
 #define OMAP54XX_DPLL_LPMODE_EN_MASK                                    (1 << 10)
-
-/*
- * Used by CM_CLKSEL_DPLL_ABE, CM_CLKSEL_DPLL_CORE, CM_CLKSEL_DPLL_IVA,
- * CM_CLKSEL_DPLL_MPU, CM_CLKSEL_DPLL_PER
- */
-#define OMAP54XX_DPLL_MULT_SHIFT                                        8
-#define OMAP54XX_DPLL_MULT_WIDTH                                        0xb
 #define OMAP54XX_DPLL_MULT_MASK                                         (0x7ff << 8)
-
-/*
- * Renamed from DPLL_MULT Used by CM_CLKSEL_DPLL_UNIPRO1,
- * CM_CLKSEL_DPLL_UNIPRO2, CM_CLKSEL_DPLL_USB
- */
-#define OMAP54XX_DPLL_MULT_UNIPRO1_SHIFT                                8
-#define OMAP54XX_DPLL_MULT_UNIPRO1_WIDTH                                0xc
-#define OMAP54XX_DPLL_MULT_UNIPRO1_MASK                                 (0xfff << 8)
-
-/*
- * Used by CM_CLKMODE_DPLL_ABE, CM_CLKMODE_DPLL_CORE, CM_CLKMODE_DPLL_IVA,
- * CM_CLKMODE_DPLL_MPU, CM_CLKMODE_DPLL_PER
- */
-#define OMAP54XX_DPLL_REGM4XEN_SHIFT                                    11
-#define OMAP54XX_DPLL_REGM4XEN_WIDTH                                    0x1
 #define OMAP54XX_DPLL_REGM4XEN_MASK                                     (1 << 11)
-
-/* Used by CM_CLKSEL_DPLL_UNIPRO1, CM_CLKSEL_DPLL_UNIPRO2, CM_CLKSEL_DPLL_USB */
-#define OMAP54XX_DPLL_SD_DIV_SHIFT                                      24
-#define OMAP54XX_DPLL_SD_DIV_WIDTH                                      0x8
 #define OMAP54XX_DPLL_SD_DIV_MASK                                       (0xff << 24)
-
-/* Used by CM_CLKSEL_DPLL_UNIPRO1, CM_CLKSEL_DPLL_UNIPRO2, CM_CLKSEL_DPLL_USB */
-#define OMAP54XX_DPLL_SELFREQDCO_SHIFT                                  21
-#define OMAP54XX_DPLL_SELFREQDCO_WIDTH                                  0x1
-#define OMAP54XX_DPLL_SELFREQDCO_MASK                                   (1 << 21)
-
-/*
- * Used by CM_CLKMODE_DPLL_ABE, CM_CLKMODE_DPLL_CORE, CM_CLKMODE_DPLL_IVA,
- * CM_CLKMODE_DPLL_MPU, CM_CLKMODE_DPLL_PER, CM_CLKMODE_DPLL_UNIPRO1,
- * CM_CLKMODE_DPLL_UNIPRO2, CM_CLKMODE_DPLL_USB
- */
-#define OMAP54XX_DPLL_SSC_ACK_SHIFT                                     13
-#define OMAP54XX_DPLL_SSC_ACK_WIDTH                                     0x1
-#define OMAP54XX_DPLL_SSC_ACK_MASK                                      (1 << 13)
-
-/*
- * Used by CM_CLKMODE_DPLL_ABE, CM_CLKMODE_DPLL_CORE, CM_CLKMODE_DPLL_IVA,
- * CM_CLKMODE_DPLL_MPU, CM_CLKMODE_DPLL_PER, CM_CLKMODE_DPLL_UNIPRO1,
- * CM_CLKMODE_DPLL_UNIPRO2, CM_CLKMODE_DPLL_USB
- */
-#define OMAP54XX_DPLL_SSC_DOWNSPREAD_SHIFT                              14
-#define OMAP54XX_DPLL_SSC_DOWNSPREAD_WIDTH                              0x1
-#define OMAP54XX_DPLL_SSC_DOWNSPREAD_MASK                               (1 << 14)
-
-/*
- * Used by CM_CLKMODE_DPLL_ABE, CM_CLKMODE_DPLL_CORE, CM_CLKMODE_DPLL_IVA,
- * CM_CLKMODE_DPLL_MPU, CM_CLKMODE_DPLL_PER, CM_CLKMODE_DPLL_UNIPRO1,
- * CM_CLKMODE_DPLL_UNIPRO2, CM_CLKMODE_DPLL_USB
- */
-#define OMAP54XX_DPLL_SSC_EN_SHIFT                                      12
-#define OMAP54XX_DPLL_SSC_EN_WIDTH                                      0x1
-#define OMAP54XX_DPLL_SSC_EN_MASK                                       (1 << 12)
-
-/* Used by CM_L4CFG_DYNAMICDEP */
-#define OMAP54XX_DSP_DYNDEP_SHIFT                                       1
-#define OMAP54XX_DSP_DYNDEP_WIDTH                                       0x1
-#define OMAP54XX_DSP_DYNDEP_MASK                                        (1 << 1)
-
-/* Used by CM_IPU_STATICDEP, CM_MPU_STATICDEP */
 #define OMAP54XX_DSP_STATDEP_SHIFT                                      1
-#define OMAP54XX_DSP_STATDEP_WIDTH                                      0x1
-#define OMAP54XX_DSP_STATDEP_MASK                                       (1 << 1)
-
-/* Used by CM_L3MAIN2_DYNAMICDEP, CM_L4PER_DYNAMICDEP */
-#define OMAP54XX_DSS_DYNDEP_SHIFT                                       8
-#define OMAP54XX_DSS_DYNDEP_WIDTH                                       0x1
-#define OMAP54XX_DSS_DYNDEP_MASK                                        (1 << 8)
-
-/* Used by CM_DMA_STATICDEP, CM_IPU_STATICDEP, CM_MPU_STATICDEP */
 #define OMAP54XX_DSS_STATDEP_SHIFT                                      8
-#define OMAP54XX_DSS_STATDEP_WIDTH                                      0x1
-#define OMAP54XX_DSS_STATDEP_MASK                                       (1 << 8)
-
-/*
- * Used by CM_C2C_DYNAMICDEP, CM_L3MAIN1_DYNAMICDEP, CM_L4CFG_DYNAMICDEP,
- * CM_MIPIEXT_DYNAMICDEP, CM_MPU_DYNAMICDEP
- */
-#define OMAP54XX_EMIF_DYNDEP_SHIFT                                      4
-#define OMAP54XX_EMIF_DYNDEP_WIDTH                                      0x1
-#define OMAP54XX_EMIF_DYNDEP_MASK                                       (1 << 4)
-
-/*
- * Used by CM_C2C_STATICDEP, CM_CAM_STATICDEP, CM_DMA_STATICDEP,
- * CM_DSP_STATICDEP, CM_DSS_STATICDEP, CM_GPU_STATICDEP, CM_IPU_STATICDEP,
- * CM_IVA_STATICDEP, CM_L3INIT_STATICDEP, CM_L4SEC_STATICDEP,
- * CM_MIPIEXT_STATICDEP, CM_MPU_STATICDEP
- */
 #define OMAP54XX_EMIF_STATDEP_SHIFT                                     4
-#define OMAP54XX_EMIF_STATDEP_WIDTH                                     0x1
-#define OMAP54XX_EMIF_STATDEP_MASK                                      (1 << 4)
-
-/* Used by CM_SHADOW_FREQ_CONFIG1 */
-#define OMAP54XX_FREQ_UPDATE_SHIFT                                      0
-#define OMAP54XX_FREQ_UPDATE_WIDTH                                      0x1
-#define OMAP54XX_FREQ_UPDATE_MASK                                       (1 << 0)
-
-/* Used by REVISION_CM_CORE, REVISION_CM_CORE_AON */
-#define OMAP54XX_FUNC_SHIFT                                             16
-#define OMAP54XX_FUNC_WIDTH                                             0xc
-#define OMAP54XX_FUNC_MASK                                              (0xfff << 16)
-
-/* Used by CM_SHADOW_FREQ_CONFIG2 */
-#define OMAP54XX_GPMC_FREQ_UPDATE_SHIFT                                 0
-#define OMAP54XX_GPMC_FREQ_UPDATE_WIDTH                                 0x1
-#define OMAP54XX_GPMC_FREQ_UPDATE_MASK                                  (1 << 0)
-
-/* Used by CM_L3MAIN2_DYNAMICDEP */
-#define OMAP54XX_GPU_DYNDEP_SHIFT                                       10
-#define OMAP54XX_GPU_DYNDEP_WIDTH                                       0x1
-#define OMAP54XX_GPU_DYNDEP_MASK                                        (1 << 10)
-
-/* Used by CM_IPU_STATICDEP, CM_MPU_STATICDEP */
 #define OMAP54XX_GPU_STATDEP_SHIFT                                      10
-#define OMAP54XX_GPU_STATDEP_WIDTH                                      0x1
-#define OMAP54XX_GPU_STATDEP_MASK                                       (1 << 10)
-
-/*
- * Used by CM_ABE_AESS_CLKCTRL, CM_ABE_DMIC_CLKCTRL, CM_ABE_L4_ABE_CLKCTRL,
- * CM_ABE_MCASP_CLKCTRL, CM_ABE_MCBSP1_CLKCTRL, CM_ABE_MCBSP2_CLKCTRL,
- * CM_ABE_MCBSP3_CLKCTRL, CM_ABE_MCPDM_CLKCTRL, CM_ABE_SLIMBUS1_CLKCTRL,
- * CM_ABE_TIMER5_CLKCTRL, CM_ABE_TIMER6_CLKCTRL, CM_ABE_TIMER7_CLKCTRL,
- * CM_ABE_TIMER8_CLKCTRL, CM_ABE_WD_TIMER3_CLKCTRL, CM_C2C_C2C_CLKCTRL,
- * CM_C2C_C2C_OCP_FW_CLKCTRL, CM_C2C_MODEM_ICR_CLKCTRL, CM_CAM_CAL_CLKCTRL,
- * CM_CAM_FDIF_CLKCTRL, CM_CAM_ISS_CLKCTRL, CM_CM_CORE_AON_PROFILING_CLKCTRL,
- * CM_CM_CORE_PROFILING_CLKCTRL, CM_COREAON_SMARTREFLEX_CORE_CLKCTRL,
- * CM_COREAON_SMARTREFLEX_MM_CLKCTRL, CM_COREAON_SMARTREFLEX_MPU_CLKCTRL,
- * CM_CUSTEFUSE_EFUSE_CTRL_CUST_CLKCTRL, CM_DMA_DMA_SYSTEM_CLKCTRL,
- * CM_DSP_DSP_CLKCTRL, CM_DSS_BB2D_CLKCTRL, CM_DSS_DSS_CLKCTRL,
- * CM_EMIF_DMM_CLKCTRL, CM_EMIF_EMIF1_CLKCTRL, CM_EMIF_EMIF2_CLKCTRL,
- * CM_EMIF_EMIF_OCP_FW_CLKCTRL, CM_EMU_DEBUGSS_CLKCTRL,
- * CM_EMU_MPU_EMU_DBG_CLKCTRL, CM_GPU_GPU_CLKCTRL, CM_IPU_IPU_CLKCTRL,
- * CM_IVA_IVA_CLKCTRL, CM_IVA_SL2_CLKCTRL, CM_L3INIT_HSI_CLKCTRL,
- * CM_L3INIT_IEEE1500_2_OCP_CLKCTRL, CM_L3INIT_MMC1_CLKCTRL,
- * CM_L3INIT_MMC2_CLKCTRL, CM_L3INIT_MPHY_UNIPRO2_CLKCTRL,
- * CM_L3INIT_OCP2SCP1_CLKCTRL, CM_L3INIT_OCP2SCP3_CLKCTRL,
- * CM_L3INIT_SATA_CLKCTRL, CM_L3INIT_UNIPRO2_CLKCTRL,
- * CM_L3INIT_USB_HOST_HS_CLKCTRL, CM_L3INIT_USB_OTG_SS_CLKCTRL,
- * CM_L3INIT_USB_TLL_HS_CLKCTRL, CM_L3INSTR_CTRL_MODULE_BANDGAP_CLKCTRL,
- * CM_L3INSTR_DLL_AGING_CLKCTRL, CM_L3INSTR_L3_INSTR_CLKCTRL,
- * CM_L3INSTR_L3_MAIN_3_CLKCTRL, CM_L3INSTR_OCP_WP_NOC_CLKCTRL,
- * CM_L3MAIN1_L3_MAIN_1_CLKCTRL, CM_L3MAIN2_GPMC_CLKCTRL,
- * CM_L3MAIN2_L3_MAIN_2_CLKCTRL, CM_L3MAIN2_OCMC_RAM_CLKCTRL,
- * CM_L4CFG_L4_CFG_CLKCTRL, CM_L4CFG_MAILBOX_CLKCTRL,
- * CM_L4CFG_OCP2SCP2_CLKCTRL, CM_L4CFG_SAR_ROM_CLKCTRL,
- * CM_L4CFG_SPINLOCK_CLKCTRL, CM_L4PER_ELM_CLKCTRL, CM_L4PER_GPIO2_CLKCTRL,
- * CM_L4PER_GPIO3_CLKCTRL, CM_L4PER_GPIO4_CLKCTRL, CM_L4PER_GPIO5_CLKCTRL,
- * CM_L4PER_GPIO6_CLKCTRL, CM_L4PER_GPIO7_CLKCTRL, CM_L4PER_GPIO8_CLKCTRL,
- * CM_L4PER_HDQ1W_CLKCTRL, CM_L4PER_I2C1_CLKCTRL, CM_L4PER_I2C2_CLKCTRL,
- * CM_L4PER_I2C3_CLKCTRL, CM_L4PER_I2C4_CLKCTRL, CM_L4PER_I2C5_CLKCTRL,
- * CM_L4PER_L4_PER_CLKCTRL, CM_L4PER_MCSPI1_CLKCTRL, CM_L4PER_MCSPI2_CLKCTRL,
- * CM_L4PER_MCSPI3_CLKCTRL, CM_L4PER_MCSPI4_CLKCTRL, CM_L4PER_MMC3_CLKCTRL,
- * CM_L4PER_MMC4_CLKCTRL, CM_L4PER_MMC5_CLKCTRL, CM_L4PER_TIMER10_CLKCTRL,
- * CM_L4PER_TIMER11_CLKCTRL, CM_L4PER_TIMER2_CLKCTRL, CM_L4PER_TIMER3_CLKCTRL,
- * CM_L4PER_TIMER4_CLKCTRL, CM_L4PER_TIMER9_CLKCTRL, CM_L4PER_UART1_CLKCTRL,
- * CM_L4PER_UART2_CLKCTRL, CM_L4PER_UART3_CLKCTRL, CM_L4PER_UART4_CLKCTRL,
- * CM_L4PER_UART5_CLKCTRL, CM_L4PER_UART6_CLKCTRL, CM_L4SEC_AES1_CLKCTRL,
- * CM_L4SEC_AES2_CLKCTRL, CM_L4SEC_DES3DES_CLKCTRL,
- * CM_L4SEC_DMA_CRYPTO_CLKCTRL, CM_L4SEC_FPKA_CLKCTRL, CM_L4SEC_RNG_CLKCTRL,
- * CM_L4SEC_SHA2MD5_CLKCTRL, CM_MIPIEXT_LLI_CLKCTRL,
- * CM_MIPIEXT_LLI_OCP_FW_CLKCTRL, CM_MIPIEXT_MPHY_CLKCTRL, CM_MPU_MPU_CLKCTRL,
- * CM_MPU_MPU_MPU_DBG_CLKCTRL, CM_WKUPAON_COUNTER_32K_CLKCTRL,
- * CM_WKUPAON_GPIO1_CLKCTRL, CM_WKUPAON_KBD_CLKCTRL,
- * CM_WKUPAON_L4_WKUP_CLKCTRL, CM_WKUPAON_SAR_RAM_CLKCTRL,
- * CM_WKUPAON_TIMER12_CLKCTRL, CM_WKUPAON_TIMER1_CLKCTRL,
- * CM_WKUPAON_WD_TIMER1_CLKCTRL, CM_WKUPAON_WD_TIMER2_CLKCTRL
- */
-#define OMAP54XX_IDLEST_SHIFT                                           16
-#define OMAP54XX_IDLEST_WIDTH                                           0x2
-#define OMAP54XX_IDLEST_MASK                                            (0x3 << 16)
-
-/* Used by CM_L3MAIN2_DYNAMICDEP */
-#define OMAP54XX_IPU_DYNDEP_SHIFT                                       0
-#define OMAP54XX_IPU_DYNDEP_WIDTH                                       0x1
-#define OMAP54XX_IPU_DYNDEP_MASK                                        (1 << 0)
-
-/* Used by CM_DMA_STATICDEP, CM_MPU_STATICDEP */
 #define OMAP54XX_IPU_STATDEP_SHIFT                                      0
-#define OMAP54XX_IPU_STATDEP_WIDTH                                      0x1
-#define OMAP54XX_IPU_STATDEP_MASK                                       (1 << 0)
-
-/* Used by CM_DSP_DYNAMICDEP, CM_L3MAIN2_DYNAMICDEP */
-#define OMAP54XX_IVA_DYNDEP_SHIFT                                       2
-#define OMAP54XX_IVA_DYNDEP_WIDTH                                       0x1
-#define OMAP54XX_IVA_DYNDEP_MASK                                        (1 << 2)
-
-/*
- * Used by CM_C2C_STATICDEP, CM_CAM_STATICDEP, CM_DMA_STATICDEP,
- * CM_DSP_STATICDEP, CM_DSS_STATICDEP, CM_GPU_STATICDEP, CM_IPU_STATICDEP,
- * CM_L3INIT_STATICDEP, CM_MIPIEXT_STATICDEP, CM_MPU_STATICDEP
- */
 #define OMAP54XX_IVA_STATDEP_SHIFT                                      2
-#define OMAP54XX_IVA_STATDEP_WIDTH                                      0x1
-#define OMAP54XX_IVA_STATDEP_MASK                                       (1 << 2)
-
-/* Used by CM_L4CFG_DYNAMICDEP, CM_L4PER_DYNAMICDEP */
-#define OMAP54XX_L3INIT_DYNDEP_SHIFT                                    7
-#define OMAP54XX_L3INIT_DYNDEP_WIDTH                                    0x1
-#define OMAP54XX_L3INIT_DYNDEP_MASK                                     (1 << 7)
-
-/*
- * Used by CM_C2C_STATICDEP, CM_DMA_STATICDEP, CM_DSP_STATICDEP,
- * CM_IPU_STATICDEP, CM_MIPIEXT_STATICDEP, CM_MPU_STATICDEP
- */
 #define OMAP54XX_L3INIT_STATDEP_SHIFT                                   7
-#define OMAP54XX_L3INIT_STATDEP_WIDTH                                   0x1
-#define OMAP54XX_L3INIT_STATDEP_MASK                                    (1 << 7)
-
-/*
- * Used by CM_DSP_DYNAMICDEP, CM_DSS_DYNAMICDEP, CM_L3INIT_DYNAMICDEP,
- * CM_L3MAIN2_DYNAMICDEP, CM_L4CFG_DYNAMICDEP, CM_MPU_DYNAMICDEP
- */
-#define OMAP54XX_L3MAIN1_DYNDEP_SHIFT                                   5
-#define OMAP54XX_L3MAIN1_DYNDEP_WIDTH                                   0x1
-#define OMAP54XX_L3MAIN1_DYNDEP_MASK                                    (1 << 5)
-
-/*
- * Used by CM_C2C_STATICDEP, CM_CAM_STATICDEP, CM_DMA_STATICDEP,
- * CM_DSP_STATICDEP, CM_DSS_STATICDEP, CM_GPU_STATICDEP, CM_IPU_STATICDEP,
- * CM_IVA_STATICDEP, CM_L3INIT_STATICDEP, CM_L4SEC_STATICDEP,
- * CM_MIPIEXT_STATICDEP, CM_MPU_STATICDEP
- */
 #define OMAP54XX_L3MAIN1_STATDEP_SHIFT                                  5
-#define OMAP54XX_L3MAIN1_STATDEP_WIDTH                                  0x1
-#define OMAP54XX_L3MAIN1_STATDEP_MASK                                   (1 << 5)
-
-/*
- * Used by CM_C2C_DYNAMICDEP, CM_CAM_DYNAMICDEP, CM_DMA_DYNAMICDEP,
- * CM_DSS_DYNAMICDEP, CM_EMU_DYNAMICDEP, CM_GPU_DYNAMICDEP, CM_IPU_DYNAMICDEP,
- * CM_IVA_DYNAMICDEP, CM_L3INIT_DYNAMICDEP, CM_L3MAIN1_DYNAMICDEP,
- * CM_L4CFG_DYNAMICDEP, CM_L4SEC_DYNAMICDEP, CM_MIPIEXT_DYNAMICDEP
- */
-#define OMAP54XX_L3MAIN2_DYNDEP_SHIFT                                   6
-#define OMAP54XX_L3MAIN2_DYNDEP_WIDTH                                   0x1
-#define OMAP54XX_L3MAIN2_DYNDEP_MASK                                    (1 << 6)
-
-/*
- * Used by CM_C2C_STATICDEP, CM_CAM_STATICDEP, CM_DMA_STATICDEP,
- * CM_DSP_STATICDEP, CM_DSS_STATICDEP, CM_GPU_STATICDEP, CM_IPU_STATICDEP,
- * CM_IVA_STATICDEP, CM_L3INIT_STATICDEP, CM_L4SEC_STATICDEP,
- * CM_MIPIEXT_STATICDEP, CM_MPU_STATICDEP
- */
 #define OMAP54XX_L3MAIN2_STATDEP_SHIFT                                  6
-#define OMAP54XX_L3MAIN2_STATDEP_WIDTH                                  0x1
-#define OMAP54XX_L3MAIN2_STATDEP_MASK                                   (1 << 6)
-
-/* Used by CM_L3MAIN1_DYNAMICDEP */
-#define OMAP54XX_L4CFG_DYNDEP_SHIFT                                     12
-#define OMAP54XX_L4CFG_DYNDEP_WIDTH                                     0x1
-#define OMAP54XX_L4CFG_DYNDEP_MASK                                      (1 << 12)
-
-/*
- * Used by CM_C2C_STATICDEP, CM_DMA_STATICDEP, CM_DSP_STATICDEP,
- * CM_IPU_STATICDEP, CM_L3INIT_STATICDEP, CM_MIPIEXT_STATICDEP, CM_MPU_STATICDEP
- */
 #define OMAP54XX_L4CFG_STATDEP_SHIFT                                    12
-#define OMAP54XX_L4CFG_STATDEP_WIDTH                                    0x1
-#define OMAP54XX_L4CFG_STATDEP_MASK                                     (1 << 12)
-
-/* Used by CM_L3MAIN2_DYNAMICDEP */
-#define OMAP54XX_L4PER_DYNDEP_SHIFT                                     13
-#define OMAP54XX_L4PER_DYNDEP_WIDTH                                     0x1
-#define OMAP54XX_L4PER_DYNDEP_MASK                                      (1 << 13)
-
-/*
- * Used by CM_C2C_STATICDEP, CM_DMA_STATICDEP, CM_DSP_STATICDEP,
- * CM_IPU_STATICDEP, CM_L3INIT_STATICDEP, CM_L4SEC_STATICDEP,
- * CM_MIPIEXT_STATICDEP, CM_MPU_STATICDEP
- */
 #define OMAP54XX_L4PER_STATDEP_SHIFT                                    13
-#define OMAP54XX_L4PER_STATDEP_WIDTH                                    0x1
-#define OMAP54XX_L4PER_STATDEP_MASK                                     (1 << 13)
-
-/* Used by CM_L3MAIN2_DYNAMICDEP, CM_L4PER_DYNAMICDEP */
-#define OMAP54XX_L4SEC_DYNDEP_SHIFT                                     14
-#define OMAP54XX_L4SEC_DYNDEP_WIDTH                                     0x1
-#define OMAP54XX_L4SEC_DYNDEP_MASK                                      (1 << 14)
-
-/*
- * Used by CM_DMA_STATICDEP, CM_IPU_STATICDEP, CM_L3INIT_STATICDEP,
- * CM_MPU_STATICDEP
- */
 #define OMAP54XX_L4SEC_STATDEP_SHIFT                                    14
-#define OMAP54XX_L4SEC_STATDEP_WIDTH                                    0x1
-#define OMAP54XX_L4SEC_STATDEP_MASK                                     (1 << 14)
-
-/* Used by CM_L3MAIN2_DYNAMICDEP, CM_L4CFG_DYNAMICDEP */
-#define OMAP54XX_MIPIEXT_DYNDEP_SHIFT                                   21
-#define OMAP54XX_MIPIEXT_DYNDEP_WIDTH                                   0x1
-#define OMAP54XX_MIPIEXT_DYNDEP_MASK                                    (1 << 21)
-
-/* Used by CM_MPU_STATICDEP */
-#define OMAP54XX_MIPIEXT_STATDEP_SHIFT                                  21
-#define OMAP54XX_MIPIEXT_STATDEP_WIDTH                                  0x1
-#define OMAP54XX_MIPIEXT_STATDEP_MASK                                   (1 << 21)
-
-/*
- * Used by CM_SSC_MODFREQDIV_DPLL_ABE, CM_SSC_MODFREQDIV_DPLL_CORE,
- * CM_SSC_MODFREQDIV_DPLL_IVA, CM_SSC_MODFREQDIV_DPLL_MPU,
- * CM_SSC_MODFREQDIV_DPLL_PER, CM_SSC_MODFREQDIV_DPLL_UNIPRO1,
- * CM_SSC_MODFREQDIV_DPLL_UNIPRO2, CM_SSC_MODFREQDIV_DPLL_USB
- */
-#define OMAP54XX_MODFREQDIV_EXPONENT_SHIFT                              8
-#define OMAP54XX_MODFREQDIV_EXPONENT_WIDTH                              0x3
-#define OMAP54XX_MODFREQDIV_EXPONENT_MASK                               (0x7 << 8)
-
-/*
- * Used by CM_SSC_MODFREQDIV_DPLL_ABE, CM_SSC_MODFREQDIV_DPLL_CORE,
- * CM_SSC_MODFREQDIV_DPLL_IVA, CM_SSC_MODFREQDIV_DPLL_MPU,
- * CM_SSC_MODFREQDIV_DPLL_PER, CM_SSC_MODFREQDIV_DPLL_UNIPRO1,
- * CM_SSC_MODFREQDIV_DPLL_UNIPRO2, CM_SSC_MODFREQDIV_DPLL_USB
- */
-#define OMAP54XX_MODFREQDIV_MANTISSA_SHIFT                              0
-#define OMAP54XX_MODFREQDIV_MANTISSA_WIDTH                              0x7
-#define OMAP54XX_MODFREQDIV_MANTISSA_MASK                               (0x7f << 0)
-
-/*
- * Used by CM_ABE_AESS_CLKCTRL, CM_ABE_DMIC_CLKCTRL, CM_ABE_L4_ABE_CLKCTRL,
- * CM_ABE_MCASP_CLKCTRL, CM_ABE_MCBSP1_CLKCTRL, CM_ABE_MCBSP2_CLKCTRL,
- * CM_ABE_MCBSP3_CLKCTRL, CM_ABE_MCPDM_CLKCTRL, CM_ABE_SLIMBUS1_CLKCTRL,
- * CM_ABE_TIMER5_CLKCTRL, CM_ABE_TIMER6_CLKCTRL, CM_ABE_TIMER7_CLKCTRL,
- * CM_ABE_TIMER8_CLKCTRL, CM_ABE_WD_TIMER3_CLKCTRL, CM_C2C_C2C_CLKCTRL,
- * CM_C2C_C2C_OCP_FW_CLKCTRL, CM_C2C_MODEM_ICR_CLKCTRL, CM_CAM_CAL_CLKCTRL,
- * CM_CAM_FDIF_CLKCTRL, CM_CAM_ISS_CLKCTRL, CM_CM_CORE_AON_PROFILING_CLKCTRL,
- * CM_CM_CORE_PROFILING_CLKCTRL, CM_COREAON_SMARTREFLEX_CORE_CLKCTRL,
- * CM_COREAON_SMARTREFLEX_MM_CLKCTRL, CM_COREAON_SMARTREFLEX_MPU_CLKCTRL,
- * CM_CUSTEFUSE_EFUSE_CTRL_CUST_CLKCTRL, CM_DMA_DMA_SYSTEM_CLKCTRL,
- * CM_DSP_DSP_CLKCTRL, CM_DSS_BB2D_CLKCTRL, CM_DSS_DSS_CLKCTRL,
- * CM_EMIF_DMM_CLKCTRL, CM_EMIF_EMIF1_CLKCTRL, CM_EMIF_EMIF2_CLKCTRL,
- * CM_EMIF_EMIF_OCP_FW_CLKCTRL, CM_EMU_DEBUGSS_CLKCTRL,
- * CM_EMU_MPU_EMU_DBG_CLKCTRL, CM_GPU_GPU_CLKCTRL, CM_IPU_IPU_CLKCTRL,
- * CM_IVA_IVA_CLKCTRL, CM_IVA_SL2_CLKCTRL, CM_L3INIT_HSI_CLKCTRL,
- * CM_L3INIT_IEEE1500_2_OCP_CLKCTRL, CM_L3INIT_MMC1_CLKCTRL,
- * CM_L3INIT_MMC2_CLKCTRL, CM_L3INIT_MPHY_UNIPRO2_CLKCTRL,
- * CM_L3INIT_OCP2SCP1_CLKCTRL, CM_L3INIT_OCP2SCP3_CLKCTRL,
- * CM_L3INIT_SATA_CLKCTRL, CM_L3INIT_UNIPRO2_CLKCTRL,
- * CM_L3INIT_USB_HOST_HS_CLKCTRL, CM_L3INIT_USB_OTG_SS_CLKCTRL,
- * CM_L3INIT_USB_TLL_HS_CLKCTRL, CM_L3INSTR_CTRL_MODULE_BANDGAP_CLKCTRL,
- * CM_L3INSTR_DLL_AGING_CLKCTRL, CM_L3INSTR_L3_INSTR_CLKCTRL,
- * CM_L3INSTR_L3_MAIN_3_CLKCTRL, CM_L3INSTR_OCP_WP_NOC_CLKCTRL,
- * CM_L3MAIN1_L3_MAIN_1_CLKCTRL, CM_L3MAIN2_GPMC_CLKCTRL,
- * CM_L3MAIN2_L3_MAIN_2_CLKCTRL, CM_L3MAIN2_OCMC_RAM_CLKCTRL,
- * CM_L4CFG_L4_CFG_CLKCTRL, CM_L4CFG_MAILBOX_CLKCTRL,
- * CM_L4CFG_OCP2SCP2_CLKCTRL, CM_L4CFG_SAR_ROM_CLKCTRL,
- * CM_L4CFG_SPINLOCK_CLKCTRL, CM_L4PER_ELM_CLKCTRL, CM_L4PER_GPIO2_CLKCTRL,
- * CM_L4PER_GPIO3_CLKCTRL, CM_L4PER_GPIO4_CLKCTRL, CM_L4PER_GPIO5_CLKCTRL,
- * CM_L4PER_GPIO6_CLKCTRL, CM_L4PER_GPIO7_CLKCTRL, CM_L4PER_GPIO8_CLKCTRL,
- * CM_L4PER_HDQ1W_CLKCTRL, CM_L4PER_I2C1_CLKCTRL, CM_L4PER_I2C2_CLKCTRL,
- * CM_L4PER_I2C3_CLKCTRL, CM_L4PER_I2C4_CLKCTRL, CM_L4PER_I2C5_CLKCTRL,
- * CM_L4PER_L4_PER_CLKCTRL, CM_L4PER_MCSPI1_CLKCTRL, CM_L4PER_MCSPI2_CLKCTRL,
- * CM_L4PER_MCSPI3_CLKCTRL, CM_L4PER_MCSPI4_CLKCTRL, CM_L4PER_MMC3_CLKCTRL,
- * CM_L4PER_MMC4_CLKCTRL, CM_L4PER_MMC5_CLKCTRL, CM_L4PER_TIMER10_CLKCTRL,
- * CM_L4PER_TIMER11_CLKCTRL, CM_L4PER_TIMER2_CLKCTRL, CM_L4PER_TIMER3_CLKCTRL,
- * CM_L4PER_TIMER4_CLKCTRL, CM_L4PER_TIMER9_CLKCTRL, CM_L4PER_UART1_CLKCTRL,
- * CM_L4PER_UART2_CLKCTRL, CM_L4PER_UART3_CLKCTRL, CM_L4PER_UART4_CLKCTRL,
- * CM_L4PER_UART5_CLKCTRL, CM_L4PER_UART6_CLKCTRL, CM_L4SEC_AES1_CLKCTRL,
- * CM_L4SEC_AES2_CLKCTRL, CM_L4SEC_DES3DES_CLKCTRL,
- * CM_L4SEC_DMA_CRYPTO_CLKCTRL, CM_L4SEC_FPKA_CLKCTRL, CM_L4SEC_RNG_CLKCTRL,
- * CM_L4SEC_SHA2MD5_CLKCTRL, CM_MIPIEXT_LLI_CLKCTRL,
- * CM_MIPIEXT_LLI_OCP_FW_CLKCTRL, CM_MIPIEXT_MPHY_CLKCTRL, CM_MPU_MPU_CLKCTRL,
- * CM_MPU_MPU_MPU_DBG_CLKCTRL, CM_WKUPAON_COUNTER_32K_CLKCTRL,
- * CM_WKUPAON_GPIO1_CLKCTRL, CM_WKUPAON_KBD_CLKCTRL,
- * CM_WKUPAON_L4_WKUP_CLKCTRL, CM_WKUPAON_SAR_RAM_CLKCTRL,
- * CM_WKUPAON_TIMER12_CLKCTRL, CM_WKUPAON_TIMER1_CLKCTRL,
- * CM_WKUPAON_WD_TIMER1_CLKCTRL, CM_WKUPAON_WD_TIMER2_CLKCTRL
- */
-#define OMAP54XX_MODULEMODE_SHIFT                                       0
-#define OMAP54XX_MODULEMODE_WIDTH                                       0x2
-#define OMAP54XX_MODULEMODE_MASK                                        (0x3 << 0)
-
-/* Used by CM_L4CFG_DYNAMICDEP */
-#define OMAP54XX_MPU_DYNDEP_SHIFT                                       19
-#define OMAP54XX_MPU_DYNDEP_WIDTH                                       0x1
-#define OMAP54XX_MPU_DYNDEP_MASK                                        (1 << 19)
-
-/* Used by CM_DSS_DSS_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_32KHZ_CLK_SHIFT                              11
-#define OMAP54XX_OPTFCLKEN_32KHZ_CLK_WIDTH                              0x1
-#define OMAP54XX_OPTFCLKEN_32KHZ_CLK_MASK                               (1 << 11)
-
-/* Renamed from OPTFCLKEN_32KHZ_CLK Used by CM_L3INIT_MMC1_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_32KHZ_CLK_8_8_SHIFT                          8
-#define OMAP54XX_OPTFCLKEN_32KHZ_CLK_8_8_WIDTH                          0x1
-#define OMAP54XX_OPTFCLKEN_32KHZ_CLK_8_8_MASK                           (1 << 8)
-
-/* Used by CM_DSS_DSS_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_48MHZ_CLK_SHIFT                              9
-#define OMAP54XX_OPTFCLKEN_48MHZ_CLK_WIDTH                              0x1
-#define OMAP54XX_OPTFCLKEN_48MHZ_CLK_MASK                               (1 << 9)
-
-/* Used by CM_COREAON_USB_PHY_CORE_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_CLK32K_SHIFT                                 8
-#define OMAP54XX_OPTFCLKEN_CLK32K_WIDTH                                 0x1
-#define OMAP54XX_OPTFCLKEN_CLK32K_MASK                                  (1 << 8)
-
-/* Used by CM_CAM_ISS_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_CTRLCLK_SHIFT                                8
-#define OMAP54XX_OPTFCLKEN_CTRLCLK_WIDTH                                0x1
-#define OMAP54XX_OPTFCLKEN_CTRLCLK_MASK                                 (1 << 8)
-
-/*
- * Used by CM_L4PER_GPIO2_CLKCTRL, CM_L4PER_GPIO3_CLKCTRL,
- * CM_L4PER_GPIO4_CLKCTRL, CM_L4PER_GPIO5_CLKCTRL, CM_L4PER_GPIO6_CLKCTRL,
- * CM_L4PER_GPIO7_CLKCTRL, CM_L4PER_GPIO8_CLKCTRL, CM_WKUPAON_GPIO1_CLKCTRL
- */
 #define OMAP54XX_OPTFCLKEN_DBCLK_SHIFT                                  8
-#define OMAP54XX_OPTFCLKEN_DBCLK_WIDTH                                  0x1
-#define OMAP54XX_OPTFCLKEN_DBCLK_MASK                                   (1 << 8)
-
-/* Used by CM_EMIF_EMIF_DLL_CLKCTRL */
-#define OMAP54XX_OPTFCLKEN_DLL_CLK_SHIFT                                8
-#define OMAP54XX_OPTFCLKEN_DLL_CLK_WIDTH                                0x1
-#define OMAP54XX_OPTFCLKEN_DLL_CLK_MASK                                 (1 << 8)
-
-/* Used by CM_DSS_DSS_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_DSSCLK_SHIFT                                 8
-#define OMAP54XX_OPTFCLKEN_DSSCLK_WIDTH                                 0x1
-#define OMAP54XX_OPTFCLKEN_DSSCLK_MASK                                  (1 << 8)
-
-/* Used by CM_ABE_SLIMBUS1_CLKCTRL */
-#define OMAP54XX_OPTFCLKEN_FCLK0_SHIFT                                  8
-#define OMAP54XX_OPTFCLKEN_FCLK0_WIDTH                                  0x1
-#define OMAP54XX_OPTFCLKEN_FCLK0_MASK                                   (1 << 8)
-
-/* Used by CM_ABE_SLIMBUS1_CLKCTRL */
-#define OMAP54XX_OPTFCLKEN_FCLK1_SHIFT                                  9
-#define OMAP54XX_OPTFCLKEN_FCLK1_WIDTH                                  0x1
-#define OMAP54XX_OPTFCLKEN_FCLK1_MASK                                   (1 << 9)
-
-/* Used by CM_ABE_SLIMBUS1_CLKCTRL */
-#define OMAP54XX_OPTFCLKEN_FCLK2_SHIFT                                  10
-#define OMAP54XX_OPTFCLKEN_FCLK2_WIDTH                                  0x1
-#define OMAP54XX_OPTFCLKEN_FCLK2_MASK                                   (1 << 10)
-
-/* Used by CM_L3INIT_USB_HOST_HS_CLKCTRL */
-#define OMAP54XX_OPTFCLKEN_FUNC48M_CLK_SHIFT                            15
-#define OMAP54XX_OPTFCLKEN_FUNC48M_CLK_WIDTH                            0x1
-#define OMAP54XX_OPTFCLKEN_FUNC48M_CLK_MASK                             (1 << 15)
-
-/* Used by CM_L3INIT_USB_HOST_HS_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_HSIC480M_P1_CLK_SHIFT                        13
-#define OMAP54XX_OPTFCLKEN_HSIC480M_P1_CLK_WIDTH                        0x1
-#define OMAP54XX_OPTFCLKEN_HSIC480M_P1_CLK_MASK                         (1 << 13)
-
-/* Used by CM_L3INIT_USB_HOST_HS_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_HSIC480M_P2_CLK_SHIFT                        14
-#define OMAP54XX_OPTFCLKEN_HSIC480M_P2_CLK_WIDTH                        0x1
-#define OMAP54XX_OPTFCLKEN_HSIC480M_P2_CLK_MASK                         (1 << 14)
-
-/* Used by CM_L3INIT_USB_HOST_HS_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_HSIC480M_P3_CLK_SHIFT                        7
-#define OMAP54XX_OPTFCLKEN_HSIC480M_P3_CLK_WIDTH                        0x1
-#define OMAP54XX_OPTFCLKEN_HSIC480M_P3_CLK_MASK                         (1 << 7)
-
-/* Used by CM_L3INIT_USB_HOST_HS_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_HSIC60M_P1_CLK_SHIFT                         11
-#define OMAP54XX_OPTFCLKEN_HSIC60M_P1_CLK_WIDTH                         0x1
-#define OMAP54XX_OPTFCLKEN_HSIC60M_P1_CLK_MASK                          (1 << 11)
-
-/* Used by CM_L3INIT_USB_HOST_HS_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_HSIC60M_P2_CLK_SHIFT                         12
-#define OMAP54XX_OPTFCLKEN_HSIC60M_P2_CLK_WIDTH                         0x1
-#define OMAP54XX_OPTFCLKEN_HSIC60M_P2_CLK_MASK                          (1 << 12)
-
-/* Used by CM_L3INIT_USB_HOST_HS_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_HSIC60M_P3_CLK_SHIFT                         6
-#define OMAP54XX_OPTFCLKEN_HSIC60M_P3_CLK_WIDTH                         0x1
-#define OMAP54XX_OPTFCLKEN_HSIC60M_P3_CLK_MASK                          (1 << 6)
-
-/* Used by CM_L3INIT_USB_OTG_SS_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_REFCLK960M_SHIFT                             8
-#define OMAP54XX_OPTFCLKEN_REFCLK960M_WIDTH                             0x1
-#define OMAP54XX_OPTFCLKEN_REFCLK960M_MASK                              (1 << 8)
-
-/* Used by CM_L3INIT_SATA_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_REF_CLK_SHIFT                                8
-#define OMAP54XX_OPTFCLKEN_REF_CLK_WIDTH                                0x1
-#define OMAP54XX_OPTFCLKEN_REF_CLK_MASK                                 (1 << 8)
-
-/* Used by CM_WKUPAON_SCRM_CLKCTRL */
-#define OMAP54XX_OPTFCLKEN_SCRM_CORE_SHIFT                              8
-#define OMAP54XX_OPTFCLKEN_SCRM_CORE_WIDTH                              0x1
-#define OMAP54XX_OPTFCLKEN_SCRM_CORE_MASK                               (1 << 8)
-
-/* Used by CM_WKUPAON_SCRM_CLKCTRL */
-#define OMAP54XX_OPTFCLKEN_SCRM_PER_SHIFT                               9
-#define OMAP54XX_OPTFCLKEN_SCRM_PER_WIDTH                               0x1
-#define OMAP54XX_OPTFCLKEN_SCRM_PER_MASK                                (1 << 9)
-
-/* Used by CM_ABE_SLIMBUS1_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_SLIMBUS_CLK_SHIFT                            11
-#define OMAP54XX_OPTFCLKEN_SLIMBUS_CLK_WIDTH                            0x1
-#define OMAP54XX_OPTFCLKEN_SLIMBUS_CLK_MASK                             (1 << 11)
-
-/* Used by CM_DSS_DSS_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_SYS_CLK_SHIFT                                10
-#define OMAP54XX_OPTFCLKEN_SYS_CLK_WIDTH                                0x1
-#define OMAP54XX_OPTFCLKEN_SYS_CLK_MASK                                 (1 << 10)
-
-/* Used by CM_MIPIEXT_LLI_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_TXPHY_CLK_SHIFT                              8
-#define OMAP54XX_OPTFCLKEN_TXPHY_CLK_WIDTH                              0x1
-#define OMAP54XX_OPTFCLKEN_TXPHY_CLK_MASK                               (1 << 8)
-
-/* Used by CM_MIPIEXT_LLI_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_TXPHY_LS_CLK_SHIFT                           9
-#define OMAP54XX_OPTFCLKEN_TXPHY_LS_CLK_WIDTH                           0x1
-#define OMAP54XX_OPTFCLKEN_TXPHY_LS_CLK_MASK                            (1 << 9)
-
-/* Used by CM_L3INIT_USB_TLL_HS_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_USB_CH0_CLK_SHIFT                            8
-#define OMAP54XX_OPTFCLKEN_USB_CH0_CLK_WIDTH                            0x1
-#define OMAP54XX_OPTFCLKEN_USB_CH0_CLK_MASK                             (1 << 8)
-
-/* Used by CM_L3INIT_USB_TLL_HS_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_USB_CH1_CLK_SHIFT                            9
-#define OMAP54XX_OPTFCLKEN_USB_CH1_CLK_WIDTH                            0x1
-#define OMAP54XX_OPTFCLKEN_USB_CH1_CLK_MASK                             (1 << 9)
-
-/* Used by CM_L3INIT_USB_TLL_HS_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_USB_CH2_CLK_SHIFT                            10
-#define OMAP54XX_OPTFCLKEN_USB_CH2_CLK_WIDTH                            0x1
-#define OMAP54XX_OPTFCLKEN_USB_CH2_CLK_MASK                             (1 << 10)
-
-/* Used by CM_L3INIT_USB_HOST_HS_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_UTMI_P1_CLK_SHIFT                            8
-#define OMAP54XX_OPTFCLKEN_UTMI_P1_CLK_WIDTH                            0x1
-#define OMAP54XX_OPTFCLKEN_UTMI_P1_CLK_MASK                             (1 << 8)
-
-/* Used by CM_L3INIT_USB_HOST_HS_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_UTMI_P2_CLK_SHIFT                            9
-#define OMAP54XX_OPTFCLKEN_UTMI_P2_CLK_WIDTH                            0x1
-#define OMAP54XX_OPTFCLKEN_UTMI_P2_CLK_MASK                             (1 << 9)
-
-/* Used by CM_L3INIT_USB_HOST_HS_CLKCTRL */
 #define OMAP54XX_OPTFCLKEN_UTMI_P3_CLK_SHIFT                            10
-#define OMAP54XX_OPTFCLKEN_UTMI_P3_CLK_WIDTH                            0x1
-#define OMAP54XX_OPTFCLKEN_UTMI_P3_CLK_MASK                             (1 << 10)
-
-/* Used by CM_CORE_AON_DEBUG_OUT, CM_CORE_DEBUG_OUT */
-#define OMAP54XX_OUTPUT_SHIFT                                           0
-#define OMAP54XX_OUTPUT_WIDTH                                           0x20
-#define OMAP54XX_OUTPUT_MASK                                            (0xffffffff << 0)
-
-/* Used by CM_CLKSEL_ABE */
 #define OMAP54XX_PAD_CLKS_GATE_SHIFT                                    8
-#define OMAP54XX_PAD_CLKS_GATE_WIDTH                                    0x1
-#define OMAP54XX_PAD_CLKS_GATE_MASK                                     (1 << 8)
-
-/* Used by CM_RESTORE_ST */
-#define OMAP54XX_PHASE1_COMPLETED_SHIFT                                 0
-#define OMAP54XX_PHASE1_COMPLETED_WIDTH                                 0x1
-#define OMAP54XX_PHASE1_COMPLETED_MASK                                  (1 << 0)
-
-/* Used by CM_RESTORE_ST */
-#define OMAP54XX_PHASE2A_COMPLETED_SHIFT                                1
-#define OMAP54XX_PHASE2A_COMPLETED_WIDTH                                0x1
-#define OMAP54XX_PHASE2A_COMPLETED_MASK                                 (1 << 1)
-
-/* Used by CM_RESTORE_ST */
-#define OMAP54XX_PHASE2B_COMPLETED_SHIFT                                2
-#define OMAP54XX_PHASE2B_COMPLETED_WIDTH                                0x1
-#define OMAP54XX_PHASE2B_COMPLETED_MASK                                 (1 << 2)
-
-/* Used by CM_DYN_DEP_PRESCAL */
-#define OMAP54XX_PRESCAL_SHIFT                                          0
-#define OMAP54XX_PRESCAL_WIDTH                                          0x6
-#define OMAP54XX_PRESCAL_MASK                                           (0x3f << 0)
-
-/* Used by REVISION_CM_CORE, REVISION_CM_CORE_AON */
-#define OMAP54XX_R_RTL_SHIFT                                            11
-#define OMAP54XX_R_RTL_WIDTH                                            0x5
-#define OMAP54XX_R_RTL_MASK                                             (0x1f << 11)
-
-/* Used by CM_L3INIT_USB_HOST_HS_CLKCTRL, CM_L3INIT_USB_TLL_HS_CLKCTRL */
-#define OMAP54XX_SAR_MODE_SHIFT                                         4
-#define OMAP54XX_SAR_MODE_WIDTH                                         0x1
-#define OMAP54XX_SAR_MODE_MASK                                          (1 << 4)
-
-/* Used by REVISION_CM_CORE, REVISION_CM_CORE_AON */
-#define OMAP54XX_SCHEME_SHIFT                                           30
-#define OMAP54XX_SCHEME_WIDTH                                           0x2
-#define OMAP54XX_SCHEME_MASK                                            (0x3 << 30)
-
-/* Used by CM_L4CFG_DYNAMICDEP */
-#define OMAP54XX_SDMA_DYNDEP_SHIFT                                      11
-#define OMAP54XX_SDMA_DYNDEP_WIDTH                                      0x1
-#define OMAP54XX_SDMA_DYNDEP_MASK                                       (1 << 11)
-
-/* Used by CM_IPU_STATICDEP, CM_MPU_STATICDEP */
-#define OMAP54XX_SDMA_STATDEP_SHIFT                                     11
-#define OMAP54XX_SDMA_STATDEP_WIDTH                                     0x1
-#define OMAP54XX_SDMA_STATDEP_MASK                                      (1 << 11)
-
-/* Used by CM_CORE_AON_DEBUG_CFG */
-#define OMAP54XX_SEL0_SHIFT                                             0
-#define OMAP54XX_SEL0_WIDTH                                             0x7
-#define OMAP54XX_SEL0_MASK                                              (0x7f << 0)
-
-/* Renamed from SEL0 Used by CM_CORE_DEBUG_CFG */
-#define OMAP54XX_SEL0_0_7_SHIFT                                         0
-#define OMAP54XX_SEL0_0_7_WIDTH                                         0x8
-#define OMAP54XX_SEL0_0_7_MASK                                          (0xff << 0)
-
-/* Used by CM_CORE_AON_DEBUG_CFG */
-#define OMAP54XX_SEL1_SHIFT                                             8
-#define OMAP54XX_SEL1_WIDTH                                             0x7
-#define OMAP54XX_SEL1_MASK                                              (0x7f << 8)
-
-/* Renamed from SEL1 Used by CM_CORE_DEBUG_CFG */
-#define OMAP54XX_SEL1_CORE_DEBUG_CFG_SHIFT                              8
-#define OMAP54XX_SEL1_CORE_DEBUG_CFG_WIDTH                              0x8
-#define OMAP54XX_SEL1_CORE_DEBUG_CFG_MASK                               (0xff << 8)
-
-/* Used by CM_CORE_AON_DEBUG_CFG */
-#define OMAP54XX_SEL2_SHIFT                                             16
-#define OMAP54XX_SEL2_WIDTH                                             0x7
-#define OMAP54XX_SEL2_MASK                                              (0x7f << 16)
-
-/* Renamed from SEL2 Used by CM_CORE_DEBUG_CFG */
-#define OMAP54XX_SEL2_CORE_DEBUG_CFG_SHIFT                              16
-#define OMAP54XX_SEL2_CORE_DEBUG_CFG_WIDTH                              0x8
-#define OMAP54XX_SEL2_CORE_DEBUG_CFG_MASK                               (0xff << 16)
-
-/* Used by CM_CORE_AON_DEBUG_CFG */
-#define OMAP54XX_SEL3_SHIFT                                             24
-#define OMAP54XX_SEL3_WIDTH                                             0x7
-#define OMAP54XX_SEL3_MASK                                              (0x7f << 24)
-
-/* Renamed from SEL3 Used by CM_CORE_DEBUG_CFG */
-#define OMAP54XX_SEL3_CORE_DEBUG_CFG_SHIFT                              24
-#define OMAP54XX_SEL3_CORE_DEBUG_CFG_WIDTH                              0x8
-#define OMAP54XX_SEL3_CORE_DEBUG_CFG_MASK                               (0xff << 24)
-
-/* Used by CM_CLKSEL_ABE */
 #define OMAP54XX_SLIMBUS1_CLK_GATE_SHIFT                                10
-#define OMAP54XX_SLIMBUS1_CLK_GATE_WIDTH                                0x1
-#define OMAP54XX_SLIMBUS1_CLK_GATE_MASK                                 (1 << 10)
-
-/*
- * Used by CM_ABE_AESS_CLKCTRL, CM_C2C_C2C_CLKCTRL, CM_CAM_FDIF_CLKCTRL,
- * CM_CAM_ISS_CLKCTRL, CM_DMA_DMA_SYSTEM_CLKCTRL, CM_DSP_DSP_CLKCTRL,
- * CM_DSS_BB2D_CLKCTRL, CM_DSS_DSS_CLKCTRL, CM_EMU_DEBUGSS_CLKCTRL,
- * CM_GPU_GPU_CLKCTRL, CM_IPU_IPU_CLKCTRL, CM_IVA_IVA_CLKCTRL,
- * CM_L3INIT_HSI_CLKCTRL, CM_L3INIT_IEEE1500_2_OCP_CLKCTRL,
- * CM_L3INIT_MMC1_CLKCTRL, CM_L3INIT_MMC2_CLKCTRL, CM_L3INIT_SATA_CLKCTRL,
- * CM_L3INIT_UNIPRO2_CLKCTRL, CM_L3INIT_USB_HOST_HS_CLKCTRL,
- * CM_L3INIT_USB_OTG_SS_CLKCTRL, CM_L4SEC_DMA_CRYPTO_CLKCTRL,
- * CM_MIPIEXT_LLI_CLKCTRL, CM_MPU_MPU_CLKCTRL
- */
-#define OMAP54XX_STBYST_SHIFT                                           18
-#define OMAP54XX_STBYST_WIDTH                                           0x1
-#define OMAP54XX_STBYST_MASK                                            (1 << 18)
-
-/*
- * Used by CM_IDLEST_DPLL_ABE, CM_IDLEST_DPLL_CORE, CM_IDLEST_DPLL_IVA,
- * CM_IDLEST_DPLL_MPU, CM_IDLEST_DPLL_PER, CM_IDLEST_DPLL_UNIPRO1,
- * CM_IDLEST_DPLL_UNIPRO2, CM_IDLEST_DPLL_USB
- */
-#define OMAP54XX_ST_DPLL_CLK_SHIFT                                      0
-#define OMAP54XX_ST_DPLL_CLK_WIDTH                                      0x1
 #define OMAP54XX_ST_DPLL_CLK_MASK                                       (1 << 0)
-
-/*
- * Used by CM_CLKDCOLDO_DPLL_UNIPRO1, CM_CLKDCOLDO_DPLL_UNIPRO2,
- * CM_CLKDCOLDO_DPLL_USB
- */
-#define OMAP54XX_ST_DPLL_CLKDCOLDO_SHIFT                                9
-#define OMAP54XX_ST_DPLL_CLKDCOLDO_WIDTH                                0x1
-#define OMAP54XX_ST_DPLL_CLKDCOLDO_MASK                                 (1 << 9)
-
-/*
- * Used by CM_IDLEST_DPLL_ABE, CM_IDLEST_DPLL_CORE, CM_IDLEST_DPLL_IVA,
- * CM_IDLEST_DPLL_MPU, CM_IDLEST_DPLL_PER, CM_IDLEST_DPLL_UNIPRO1,
- * CM_IDLEST_DPLL_UNIPRO2, CM_IDLEST_DPLL_USB
- */
-#define OMAP54XX_ST_DPLL_INIT_SHIFT                                     4
-#define OMAP54XX_ST_DPLL_INIT_WIDTH                                     0x1
-#define OMAP54XX_ST_DPLL_INIT_MASK                                      (1 << 4)
-
-/*
- * Used by CM_IDLEST_DPLL_ABE, CM_IDLEST_DPLL_CORE, CM_IDLEST_DPLL_IVA,
- * CM_IDLEST_DPLL_MPU, CM_IDLEST_DPLL_PER, CM_IDLEST_DPLL_UNIPRO1,
- * CM_IDLEST_DPLL_UNIPRO2, CM_IDLEST_DPLL_USB
- */
-#define OMAP54XX_ST_DPLL_MODE_SHIFT                                     1
-#define OMAP54XX_ST_DPLL_MODE_WIDTH                                     0x3
-#define OMAP54XX_ST_DPLL_MODE_MASK                                      (0x7 << 1)
-
-/* Used by CM_CLKSEL_SYS */
 #define OMAP54XX_SYS_CLKSEL_SHIFT                                       0
 #define OMAP54XX_SYS_CLKSEL_WIDTH                                       0x3
-#define OMAP54XX_SYS_CLKSEL_MASK                                        (0x7 << 0)
-
-/*
- * Used by CM_C2C_DYNAMICDEP, CM_DSP_DYNAMICDEP, CM_EMU_DYNAMICDEP,
- * CM_IPU_DYNAMICDEP, CM_L3MAIN1_DYNAMICDEP, CM_L3MAIN2_DYNAMICDEP,
- * CM_L4CFG_DYNAMICDEP, CM_L4PER_DYNAMICDEP, CM_MIPIEXT_DYNAMICDEP,
- * CM_MPU_DYNAMICDEP
- */
-#define OMAP54XX_WINDOWSIZE_SHIFT                                       24
-#define OMAP54XX_WINDOWSIZE_WIDTH                                       0x4
-#define OMAP54XX_WINDOWSIZE_MASK                                        (0xf << 24)
-
-/* Used by CM_L3MAIN1_DYNAMICDEP */
-#define OMAP54XX_WKUPAON_DYNDEP_SHIFT                                   15
-#define OMAP54XX_WKUPAON_DYNDEP_WIDTH                                   0x1
-#define OMAP54XX_WKUPAON_DYNDEP_MASK                                    (1 << 15)
-
-/*
- * Used by CM_DMA_STATICDEP, CM_DSP_STATICDEP, CM_IPU_STATICDEP,
- * CM_L3INIT_STATICDEP, CM_MPU_STATICDEP
- */
 #define OMAP54XX_WKUPAON_STATDEP_SHIFT                                  15
-#define OMAP54XX_WKUPAON_STATDEP_WIDTH                                  0x1
-#define OMAP54XX_WKUPAON_STATDEP_MASK                                   (1 << 15)
-
-/* Used by REVISION_CM_CORE, REVISION_CM_CORE_AON */
-#define OMAP54XX_X_MAJOR_SHIFT                                          8
-#define OMAP54XX_X_MAJOR_WIDTH                                          0x3
-#define OMAP54XX_X_MAJOR_MASK                                           (0x7 << 8)
-
-/* Used by REVISION_CM_CORE, REVISION_CM_CORE_AON */
-#define OMAP54XX_Y_MINOR_SHIFT                                          0
-#define OMAP54XX_Y_MINOR_WIDTH                                          0x6
-#define OMAP54XX_Y_MINOR_MASK                                           (0x3f << 0)
 #endif
diff --git a/arch/arm/mach-omap2/cm-regbits-7xx.h b/arch/arm/mach-omap2/cm-regbits-7xx.h
new file mode 100644
index 000000000000..ad8f81ce9b16
--- /dev/null
+++ b/arch/arm/mach-omap2/cm-regbits-7xx.h
@@ -0,0 +1,51 @@
+/*
+ * DRA7xx Clock Management register bits
+ *
+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com
+ *
+ * Generated by code originally written by:
+ * Paul Walmsley (paul@pwsan.com)
+ * Rajendra Nayak (rnayak@ti.com)
+ * Benoit Cousson (b-cousson@ti.com)
+ *
+ * This file is automatically generated from the OMAP hardware databases.
+ * We respectfully ask that any modifications to this file be coordinated
+ * with the public linux-omap@vger.kernel.org mailing list and the
+ * authors above to ensure that the autogeneration scripts are kept
+ * up-to-date with the file contents.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __ARCH_ARM_MACH_OMAP2_CM_REGBITS_7XX_H
+#define __ARCH_ARM_MACH_OMAP2_CM_REGBITS_7XX_H
+
+#define DRA7XX_ATL_STATDEP_SHIFT                                30
+#define DRA7XX_CAM_STATDEP_SHIFT                                9
+#define DRA7XX_DSP1_STATDEP_SHIFT                               1
+#define DRA7XX_DSP2_STATDEP_SHIFT                               18
+#define DRA7XX_DSS_STATDEP_SHIFT                                8
+#define DRA7XX_EMIF_STATDEP_SHIFT                               4
+#define DRA7XX_EVE1_STATDEP_SHIFT                               19
+#define DRA7XX_EVE2_STATDEP_SHIFT                               20
+#define DRA7XX_EVE3_STATDEP_SHIFT                               21
+#define DRA7XX_EVE4_STATDEP_SHIFT                               22
+#define DRA7XX_GMAC_STATDEP_SHIFT                               25
+#define DRA7XX_GPU_STATDEP_SHIFT                                10
+#define DRA7XX_IPU1_STATDEP_SHIFT                               23
+#define DRA7XX_IPU2_STATDEP_SHIFT                               0
+#define DRA7XX_IPU_STATDEP_SHIFT                                24
+#define DRA7XX_IVA_STATDEP_SHIFT                                2
+#define DRA7XX_L3INIT_STATDEP_SHIFT                             7
+#define DRA7XX_L3MAIN1_STATDEP_SHIFT                            5
+#define DRA7XX_L4CFG_STATDEP_SHIFT                              12
+#define DRA7XX_L4PER2_STATDEP_SHIFT                             26
+#define DRA7XX_L4PER3_STATDEP_SHIFT                             27
+#define DRA7XX_L4PER_STATDEP_SHIFT                              13
+#define DRA7XX_L4SEC_STATDEP_SHIFT                              14
+#define DRA7XX_PCIE_STATDEP_SHIFT                               29
+#define DRA7XX_VPE_STATDEP_SHIFT                                28
+#define DRA7XX_WKUPAON_STATDEP_SHIFT                            15
+#endif
diff --git a/arch/arm/mach-omap2/cm1_7xx.h b/arch/arm/mach-omap2/cm1_7xx.h
new file mode 100644
index 000000000000..ca6fa1febaac
--- /dev/null
+++ b/arch/arm/mach-omap2/cm1_7xx.h
@@ -0,0 +1,324 @@
+/*
+ * DRA7xx CM1 instance offset macros
+ *
+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com
+ *
+ * Generated by code originally written by:
+ * Paul Walmsley (paul@pwsan.com)
+ * Rajendra Nayak (rnayak@ti.com)
+ * Benoit Cousson (b-cousson@ti.com)
+ *
+ * This file is automatically generated from the OMAP hardware databases.
+ * We respectfully ask that any modifications to this file be coordinated
+ * with the public linux-omap@vger.kernel.org mailing list and the
+ * authors above to ensure that the autogeneration scripts are kept
+ * up-to-date with the file contents.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#ifndef __ARCH_ARM_MACH_OMAP2_CM1_7XX_H
+#define __ARCH_ARM_MACH_OMAP2_CM1_7XX_H
+
+#include "cm_44xx_54xx.h"
+
+/* CM1 base address */
+#define DRA7XX_CM_CORE_AON_BASE         0x4a005000
+
+#define DRA7XX_CM_CORE_AON_REGADDR(inst, reg)                           \
+        OMAP2_L4_IO_ADDRESS(DRA7XX_CM_CORE_AON_BASE + (inst) + (reg))
+
+/* CM_CORE_AON instances */
+#define DRA7XX_CM_CORE_AON_OCP_SOCKET_INST      0x0000
+#define DRA7XX_CM_CORE_AON_CKGEN_INST           0x0100
+#define DRA7XX_CM_CORE_AON_MPU_INST             0x0300
+#define DRA7XX_CM_CORE_AON_DSP1_INST            0x0400
+#define DRA7XX_CM_CORE_AON_IPU_INST             0x0500
+#define DRA7XX_CM_CORE_AON_DSP2_INST            0x0600
+#define DRA7XX_CM_CORE_AON_EVE1_INST            0x0640
+#define DRA7XX_CM_CORE_AON_EVE2_INST            0x0680
+#define DRA7XX_CM_CORE_AON_EVE3_INST            0x06c0
+#define DRA7XX_CM_CORE_AON_EVE4_INST            0x0700
+#define DRA7XX_CM_CORE_AON_RTC_INST             0x0740
+#define DRA7XX_CM_CORE_AON_VPE_INST             0x0760
+#define DRA7XX_CM_CORE_AON_RESTORE_INST         0x0e00
+#define DRA7XX_CM_CORE_AON_INSTR_INST           0x0f00
+
+/* CM_CORE_AON clockdomain register offsets (from instance start) */
+#define DRA7XX_CM_CORE_AON_MPU_MPU_CDOFFS       0x0000
+#define DRA7XX_CM_CORE_AON_DSP1_DSP1_CDOFFS     0x0000
+#define DRA7XX_CM_CORE_AON_IPU_IPU1_CDOFFS      0x0000
+#define DRA7XX_CM_CORE_AON_IPU_IPU_CDOFFS       0x0040
+#define DRA7XX_CM_CORE_AON_DSP2_DSP2_CDOFFS     0x0000
+#define DRA7XX_CM_CORE_AON_EVE1_EVE1_CDOFFS     0x0000
+#define DRA7XX_CM_CORE_AON_EVE2_EVE2_CDOFFS     0x0000
+#define DRA7XX_CM_CORE_AON_EVE3_EVE3_CDOFFS     0x0000
+#define DRA7XX_CM_CORE_AON_EVE4_EVE4_CDOFFS     0x0000
+#define DRA7XX_CM_CORE_AON_RTC_RTC_CDOFFS       0x0000
+#define DRA7XX_CM_CORE_AON_VPE_VPE_CDOFFS       0x0000
+
+/* CM_CORE_AON */
+
+/* CM_CORE_AON.OCP_SOCKET_CM_CORE_AON register offsets */
+#define DRA7XX_REVISION_CM_CORE_AON_OFFSET              0x0000
+#define DRA7XX_CM_CM_CORE_AON_PROFILING_CLKCTRL_OFFSET  0x0040
+#define DRA7XX_CM_CM_CORE_AON_PROFILING_CLKCTRL         DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_OCP_SOCKET_INST, 0x0040)
+#define DRA7XX_CM_CORE_AON_DEBUG_OUT_OFFSET             0x00ec
+#define DRA7XX_CM_CORE_AON_DEBUG_CFG0_OFFSET            0x00f0
+#define DRA7XX_CM_CORE_AON_DEBUG_CFG1_OFFSET            0x00f4
+#define DRA7XX_CM_CORE_AON_DEBUG_CFG2_OFFSET            0x00f8
+#define DRA7XX_CM_CORE_AON_DEBUG_CFG3_OFFSET            0x00fc
+
+/* CM_CORE_AON.CKGEN_CM_CORE_AON register offsets */
+#define DRA7XX_CM_CLKSEL_CORE_OFFSET                    0x0000
+#define DRA7XX_CM_CLKSEL_CORE                           DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0000)
+#define DRA7XX_CM_CLKSEL_ABE_OFFSET                     0x0008
+#define DRA7XX_CM_CLKSEL_ABE                            DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0008)
+#define DRA7XX_CM_DLL_CTRL_OFFSET                       0x0010
+#define DRA7XX_CM_CLKMODE_DPLL_CORE_OFFSET              0x0020
+#define DRA7XX_CM_CLKMODE_DPLL_CORE                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0020)
+#define DRA7XX_CM_IDLEST_DPLL_CORE_OFFSET               0x0024
+#define DRA7XX_CM_IDLEST_DPLL_CORE                      DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0024)
+#define DRA7XX_CM_AUTOIDLE_DPLL_CORE_OFFSET             0x0028
+#define DRA7XX_CM_AUTOIDLE_DPLL_CORE                    DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0028)
+#define DRA7XX_CM_CLKSEL_DPLL_CORE_OFFSET               0x002c
+#define DRA7XX_CM_CLKSEL_DPLL_CORE                      DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x002c)
+#define DRA7XX_CM_DIV_M2_DPLL_CORE_OFFSET               0x0030
+#define DRA7XX_CM_DIV_M2_DPLL_CORE                      DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0030)
+#define DRA7XX_CM_DIV_M3_DPLL_CORE_OFFSET               0x0034
+#define DRA7XX_CM_DIV_M3_DPLL_CORE                      DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0034)
+#define DRA7XX_CM_DIV_H11_DPLL_CORE_OFFSET              0x0038
+#define DRA7XX_CM_DIV_H11_DPLL_CORE                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0038)
+#define DRA7XX_CM_DIV_H12_DPLL_CORE_OFFSET              0x003c
+#define DRA7XX_CM_DIV_H12_DPLL_CORE                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x003c)
+#define DRA7XX_CM_DIV_H13_DPLL_CORE_OFFSET              0x0040
+#define DRA7XX_CM_DIV_H13_DPLL_CORE                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0040)
+#define DRA7XX_CM_DIV_H14_DPLL_CORE_OFFSET              0x0044
+#define DRA7XX_CM_DIV_H14_DPLL_CORE                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0044)
+#define DRA7XX_CM_SSC_DELTAMSTEP_DPLL_CORE_OFFSET       0x0048
+#define DRA7XX_CM_SSC_MODFREQDIV_DPLL_CORE_OFFSET       0x004c
+#define DRA7XX_CM_DIV_H21_DPLL_CORE_OFFSET              0x0050
+#define DRA7XX_CM_DIV_H21_DPLL_CORE                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0050)
+#define DRA7XX_CM_DIV_H22_DPLL_CORE_OFFSET              0x0054
+#define DRA7XX_CM_DIV_H22_DPLL_CORE                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0054)
+#define DRA7XX_CM_DIV_H23_DPLL_CORE_OFFSET              0x0058
+#define DRA7XX_CM_DIV_H23_DPLL_CORE                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0058)
+#define DRA7XX_CM_DIV_H24_DPLL_CORE_OFFSET              0x005c
+#define DRA7XX_CM_DIV_H24_DPLL_CORE                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x005c)
+#define DRA7XX_CM_CLKMODE_DPLL_MPU_OFFSET               0x0060
+#define DRA7XX_CM_CLKMODE_DPLL_MPU                      DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0060)
+#define DRA7XX_CM_IDLEST_DPLL_MPU_OFFSET                0x0064
+#define DRA7XX_CM_IDLEST_DPLL_MPU                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0064)
+#define DRA7XX_CM_AUTOIDLE_DPLL_MPU_OFFSET              0x0068
+#define DRA7XX_CM_AUTOIDLE_DPLL_MPU                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0068)
+#define DRA7XX_CM_CLKSEL_DPLL_MPU_OFFSET                0x006c
+#define DRA7XX_CM_CLKSEL_DPLL_MPU                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x006c)
+#define DRA7XX_CM_DIV_M2_DPLL_MPU_OFFSET                0x0070
+#define DRA7XX_CM_DIV_M2_DPLL_MPU                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0070)
+#define DRA7XX_CM_SSC_DELTAMSTEP_DPLL_MPU_OFFSET        0x0088
+#define DRA7XX_CM_SSC_MODFREQDIV_DPLL_MPU_OFFSET        0x008c
+#define DRA7XX_CM_BYPCLK_DPLL_MPU_OFFSET                0x009c
+#define DRA7XX_CM_BYPCLK_DPLL_MPU                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x009c)
+#define DRA7XX_CM_CLKMODE_DPLL_IVA_OFFSET               0x00a0
+#define DRA7XX_CM_CLKMODE_DPLL_IVA                      DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x00a0)
+#define DRA7XX_CM_IDLEST_DPLL_IVA_OFFSET                0x00a4
+#define DRA7XX_CM_IDLEST_DPLL_IVA                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x00a4)
+#define DRA7XX_CM_AUTOIDLE_DPLL_IVA_OFFSET              0x00a8
+#define DRA7XX_CM_AUTOIDLE_DPLL_IVA                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x00a8)
+#define DRA7XX_CM_CLKSEL_DPLL_IVA_OFFSET                0x00ac
+#define DRA7XX_CM_CLKSEL_DPLL_IVA                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x00ac)
+#define DRA7XX_CM_DIV_M2_DPLL_IVA_OFFSET                0x00b0
+#define DRA7XX_CM_DIV_M2_DPLL_IVA                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x00b0)
+#define DRA7XX_CM_DIV_M3_DPLL_IVA_OFFSET                0x00b4
+#define DRA7XX_CM_DIV_M3_DPLL_IVA                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x00b4)
+#define DRA7XX_CM_SSC_DELTAMSTEP_DPLL_IVA_OFFSET        0x00c8
+#define DRA7XX_CM_SSC_MODFREQDIV_DPLL_IVA_OFFSET        0x00cc
+#define DRA7XX_CM_BYPCLK_DPLL_IVA_OFFSET                0x00dc
+#define DRA7XX_CM_BYPCLK_DPLL_IVA                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x00dc)
+#define DRA7XX_CM_CLKMODE_DPLL_ABE_OFFSET               0x00e0
+#define DRA7XX_CM_CLKMODE_DPLL_ABE                      DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x00e0)
+#define DRA7XX_CM_IDLEST_DPLL_ABE_OFFSET                0x00e4
+#define DRA7XX_CM_IDLEST_DPLL_ABE                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x00e4)
+#define DRA7XX_CM_AUTOIDLE_DPLL_ABE_OFFSET              0x00e8
+#define DRA7XX_CM_AUTOIDLE_DPLL_ABE                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x00e8)
+#define DRA7XX_CM_CLKSEL_DPLL_ABE_OFFSET                0x00ec
+#define DRA7XX_CM_CLKSEL_DPLL_ABE                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x00ec)
+#define DRA7XX_CM_DIV_M2_DPLL_ABE_OFFSET                0x00f0
+#define DRA7XX_CM_DIV_M2_DPLL_ABE                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x00f0)
+#define DRA7XX_CM_DIV_M3_DPLL_ABE_OFFSET                0x00f4
+#define DRA7XX_CM_DIV_M3_DPLL_ABE                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x00f4)
+#define DRA7XX_CM_SSC_DELTAMSTEP_DPLL_ABE_OFFSET        0x0108
+#define DRA7XX_CM_SSC_MODFREQDIV_DPLL_ABE_OFFSET        0x010c
+#define DRA7XX_CM_CLKMODE_DPLL_DDR_OFFSET               0x0110
+#define DRA7XX_CM_CLKMODE_DPLL_DDR                      DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0110)
+#define DRA7XX_CM_IDLEST_DPLL_DDR_OFFSET                0x0114
+#define DRA7XX_CM_IDLEST_DPLL_DDR                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0114)
+#define DRA7XX_CM_AUTOIDLE_DPLL_DDR_OFFSET              0x0118
+#define DRA7XX_CM_AUTOIDLE_DPLL_DDR                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0118)
+#define DRA7XX_CM_CLKSEL_DPLL_DDR_OFFSET                0x011c
+#define DRA7XX_CM_CLKSEL_DPLL_DDR                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x011c)
+#define DRA7XX_CM_DIV_M2_DPLL_DDR_OFFSET                0x0120
+#define DRA7XX_CM_DIV_M2_DPLL_DDR                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0120)
+#define DRA7XX_CM_DIV_M3_DPLL_DDR_OFFSET                0x0124
+#define DRA7XX_CM_DIV_M3_DPLL_DDR                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0124)
+#define DRA7XX_CM_DIV_H11_DPLL_DDR_OFFSET               0x0128
+#define DRA7XX_CM_DIV_H11_DPLL_DDR                      DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0128)
+#define DRA7XX_CM_SSC_DELTAMSTEP_DPLL_DDR_OFFSET        0x012c
+#define DRA7XX_CM_SSC_MODFREQDIV_DPLL_DDR_OFFSET        0x0130
+#define DRA7XX_CM_CLKMODE_DPLL_DSP_OFFSET               0x0134
+#define DRA7XX_CM_CLKMODE_DPLL_DSP                      DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0134)
+#define DRA7XX_CM_IDLEST_DPLL_DSP_OFFSET                0x0138
+#define DRA7XX_CM_IDLEST_DPLL_DSP                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0138)
+#define DRA7XX_CM_AUTOIDLE_DPLL_DSP_OFFSET              0x013c
+#define DRA7XX_CM_AUTOIDLE_DPLL_DSP                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x013c)
+#define DRA7XX_CM_CLKSEL_DPLL_DSP_OFFSET                0x0140
+#define DRA7XX_CM_CLKSEL_DPLL_DSP                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0140)
+#define DRA7XX_CM_DIV_M2_DPLL_DSP_OFFSET                0x0144
+#define DRA7XX_CM_DIV_M2_DPLL_DSP                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0144)
+#define DRA7XX_CM_DIV_M3_DPLL_DSP_OFFSET                0x0148
+#define DRA7XX_CM_DIV_M3_DPLL_DSP                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0148)
+#define DRA7XX_CM_SSC_DELTAMSTEP_DPLL_DSP_OFFSET        0x014c
+#define DRA7XX_CM_SSC_MODFREQDIV_DPLL_DSP_OFFSET        0x0150
+#define DRA7XX_CM_BYPCLK_DPLL_DSP_OFFSET                0x0154
+#define DRA7XX_CM_BYPCLK_DPLL_DSP                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0154)
+#define DRA7XX_CM_SHADOW_FREQ_CONFIG1_OFFSET            0x0160
+#define DRA7XX_CM_SHADOW_FREQ_CONFIG2_OFFSET            0x0164
+#define DRA7XX_CM_DYN_DEP_PRESCAL_OFFSET                0x0170
+#define DRA7XX_CM_RESTORE_ST_OFFSET                     0x0180
+#define DRA7XX_CM_CLKMODE_DPLL_EVE_OFFSET               0x0184
+#define DRA7XX_CM_CLKMODE_DPLL_EVE                      DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0184)
+#define DRA7XX_CM_IDLEST_DPLL_EVE_OFFSET                0x0188
+#define DRA7XX_CM_IDLEST_DPLL_EVE                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0188)
+#define DRA7XX_CM_AUTOIDLE_DPLL_EVE_OFFSET              0x018c
+#define DRA7XX_CM_AUTOIDLE_DPLL_EVE                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x018c)
+#define DRA7XX_CM_CLKSEL_DPLL_EVE_OFFSET                0x0190
+#define DRA7XX_CM_CLKSEL_DPLL_EVE                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0190)
+#define DRA7XX_CM_DIV_M2_DPLL_EVE_OFFSET                0x0194
+#define DRA7XX_CM_DIV_M2_DPLL_EVE                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0194)
+#define DRA7XX_CM_DIV_M3_DPLL_EVE_OFFSET                0x0198
+#define DRA7XX_CM_DIV_M3_DPLL_EVE                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x0198)
+#define DRA7XX_CM_SSC_DELTAMSTEP_DPLL_EVE_OFFSET        0x019c
+#define DRA7XX_CM_SSC_MODFREQDIV_DPLL_EVE_OFFSET        0x01a0
+#define DRA7XX_CM_BYPCLK_DPLL_EVE_OFFSET                0x01a4
+#define DRA7XX_CM_BYPCLK_DPLL_EVE                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x01a4)
+#define DRA7XX_CM_CLKMODE_DPLL_GMAC_OFFSET              0x01a8
+#define DRA7XX_CM_CLKMODE_DPLL_GMAC                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x01a8)
+#define DRA7XX_CM_IDLEST_DPLL_GMAC_OFFSET               0x01ac
+#define DRA7XX_CM_IDLEST_DPLL_GMAC                      DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x01ac)
+#define DRA7XX_CM_AUTOIDLE_DPLL_GMAC_OFFSET             0x01b0
+#define DRA7XX_CM_AUTOIDLE_DPLL_GMAC                    DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x01b0)
+#define DRA7XX_CM_CLKSEL_DPLL_GMAC_OFFSET               0x01b4
+#define DRA7XX_CM_CLKSEL_DPLL_GMAC                      DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x01b4)
+#define DRA7XX_CM_DIV_M2_DPLL_GMAC_OFFSET               0x01b8
+#define DRA7XX_CM_DIV_M2_DPLL_GMAC                      DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x01b8)
+#define DRA7XX_CM_DIV_M3_DPLL_GMAC_OFFSET               0x01bc
+#define DRA7XX_CM_DIV_M3_DPLL_GMAC                      DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x01bc)
+#define DRA7XX_CM_DIV_H11_DPLL_GMAC_OFFSET              0x01c0
+#define DRA7XX_CM_DIV_H11_DPLL_GMAC                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x01c0)
+#define DRA7XX_CM_DIV_H12_DPLL_GMAC_OFFSET              0x01c4
+#define DRA7XX_CM_DIV_H12_DPLL_GMAC                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x01c4)
+#define DRA7XX_CM_DIV_H13_DPLL_GMAC_OFFSET              0x01c8
+#define DRA7XX_CM_DIV_H13_DPLL_GMAC                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x01c8)
+#define DRA7XX_CM_DIV_H14_DPLL_GMAC_OFFSET              0x01cc
+#define DRA7XX_CM_DIV_H14_DPLL_GMAC                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x01cc)
+#define DRA7XX_CM_SSC_DELTAMSTEP_DPLL_GMAC_OFFSET       0x01d0
+#define DRA7XX_CM_SSC_MODFREQDIV_DPLL_GMAC_OFFSET       0x01d4
+#define DRA7XX_CM_CLKMODE_DPLL_GPU_OFFSET               0x01d8
+#define DRA7XX_CM_CLKMODE_DPLL_GPU                      DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x01d8)
+#define DRA7XX_CM_IDLEST_DPLL_GPU_OFFSET                0x01dc
+#define DRA7XX_CM_IDLEST_DPLL_GPU                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x01dc)
+#define DRA7XX_CM_AUTOIDLE_DPLL_GPU_OFFSET              0x01e0
+#define DRA7XX_CM_AUTOIDLE_DPLL_GPU                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x01e0)
+#define DRA7XX_CM_CLKSEL_DPLL_GPU_OFFSET                0x01e4
+#define DRA7XX_CM_CLKSEL_DPLL_GPU                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x01e4)
+#define DRA7XX_CM_DIV_M2_DPLL_GPU_OFFSET                0x01e8
+#define DRA7XX_CM_DIV_M2_DPLL_GPU                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x01e8)
+#define DRA7XX_CM_DIV_M3_DPLL_GPU_OFFSET                0x01ec
+#define DRA7XX_CM_DIV_M3_DPLL_GPU                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_CKGEN_INST, 0x01ec)
+#define DRA7XX_CM_SSC_DELTAMSTEP_DPLL_GPU_OFFSET        0x01f0
+#define DRA7XX_CM_SSC_MODFREQDIV_DPLL_GPU_OFFSET        0x01f4
+
+/* CM_CORE_AON.MPU_CM_CORE_AON register offsets */
+#define DRA7XX_CM_MPU_CLKSTCTRL_OFFSET                  0x0000
+#define DRA7XX_CM_MPU_STATICDEP_OFFSET                  0x0004
+#define DRA7XX_CM_MPU_DYNAMICDEP_OFFSET                 0x0008
+#define DRA7XX_CM_MPU_MPU_CLKCTRL_OFFSET                0x0020
+#define DRA7XX_CM_MPU_MPU_CLKCTRL                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_MPU_INST, 0x0020)
+#define DRA7XX_CM_MPU_MPU_MPU_DBG_CLKCTRL_OFFSET        0x0028
+#define DRA7XX_CM_MPU_MPU_MPU_DBG_CLKCTRL               DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_MPU_INST, 0x0028)
+
+/* CM_CORE_AON.DSP1_CM_CORE_AON register offsets */
+#define DRA7XX_CM_DSP1_CLKSTCTRL_OFFSET                 0x0000
+#define DRA7XX_CM_DSP1_STATICDEP_OFFSET                 0x0004
+#define DRA7XX_CM_DSP1_DYNAMICDEP_OFFSET                0x0008
+#define DRA7XX_CM_DSP1_DSP1_CLKCTRL_OFFSET              0x0020
+#define DRA7XX_CM_DSP1_DSP1_CLKCTRL                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_DSP1_INST, 0x0020)
+
+/* CM_CORE_AON.IPU_CM_CORE_AON register offsets */
+#define DRA7XX_CM_IPU1_CLKSTCTRL_OFFSET                 0x0000
+#define DRA7XX_CM_IPU1_STATICDEP_OFFSET                 0x0004
+#define DRA7XX_CM_IPU1_DYNAMICDEP_OFFSET                0x0008
+#define DRA7XX_CM_IPU1_IPU1_CLKCTRL_OFFSET              0x0020
+#define DRA7XX_CM_IPU1_IPU1_CLKCTRL                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_IPU_INST, 0x0020)
+#define DRA7XX_CM_IPU_CLKSTCTRL_OFFSET                  0x0040
+#define DRA7XX_CM_IPU_MCASP1_CLKCTRL_OFFSET             0x0050
+#define DRA7XX_CM_IPU_MCASP1_CLKCTRL                    DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_IPU_INST, 0x0050)
+#define DRA7XX_CM_IPU_TIMER5_CLKCTRL_OFFSET             0x0058
+#define DRA7XX_CM_IPU_TIMER5_CLKCTRL                    DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_IPU_INST, 0x0058)
+#define DRA7XX_CM_IPU_TIMER6_CLKCTRL_OFFSET             0x0060
+#define DRA7XX_CM_IPU_TIMER6_CLKCTRL                    DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_IPU_INST, 0x0060)
+#define DRA7XX_CM_IPU_TIMER7_CLKCTRL_OFFSET             0x0068
+#define DRA7XX_CM_IPU_TIMER7_CLKCTRL                    DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_IPU_INST, 0x0068)
+#define DRA7XX_CM_IPU_TIMER8_CLKCTRL_OFFSET             0x0070
+#define DRA7XX_CM_IPU_TIMER8_CLKCTRL                    DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_IPU_INST, 0x0070)
+#define DRA7XX_CM_IPU_I2C5_CLKCTRL_OFFSET               0x0078
+#define DRA7XX_CM_IPU_I2C5_CLKCTRL                      DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_IPU_INST, 0x0078)
+#define DRA7XX_CM_IPU_UART6_CLKCTRL_OFFSET              0x0080
+#define DRA7XX_CM_IPU_UART6_CLKCTRL                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_IPU_INST, 0x0080)
+
+/* CM_CORE_AON.DSP2_CM_CORE_AON register offsets */
+#define DRA7XX_CM_DSP2_CLKSTCTRL_OFFSET                 0x0000
+#define DRA7XX_CM_DSP2_STATICDEP_OFFSET                 0x0004
+#define DRA7XX_CM_DSP2_DYNAMICDEP_OFFSET                0x0008
+#define DRA7XX_CM_DSP2_DSP2_CLKCTRL_OFFSET              0x0020
+#define DRA7XX_CM_DSP2_DSP2_CLKCTRL                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_DSP2_INST, 0x0020)
+
+/* CM_CORE_AON.EVE1_CM_CORE_AON register offsets */
+#define DRA7XX_CM_EVE1_CLKSTCTRL_OFFSET                 0x0000
+#define DRA7XX_CM_EVE1_STATICDEP_OFFSET                 0x0004
+#define DRA7XX_CM_EVE1_EVE1_CLKCTRL_OFFSET              0x0020
+#define DRA7XX_CM_EVE1_EVE1_CLKCTRL                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_EVE1_INST, 0x0020)
+
+/* CM_CORE_AON.EVE2_CM_CORE_AON register offsets */
+#define DRA7XX_CM_EVE2_CLKSTCTRL_OFFSET                 0x0000
+#define DRA7XX_CM_EVE2_STATICDEP_OFFSET                 0x0004
+#define DRA7XX_CM_EVE2_EVE2_CLKCTRL_OFFSET              0x0020
+#define DRA7XX_CM_EVE2_EVE2_CLKCTRL                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_EVE2_INST, 0x0020)
+
+/* CM_CORE_AON.EVE3_CM_CORE_AON register offsets */
+#define DRA7XX_CM_EVE3_CLKSTCTRL_OFFSET                 0x0000
+#define DRA7XX_CM_EVE3_STATICDEP_OFFSET                 0x0004
+#define DRA7XX_CM_EVE3_EVE3_CLKCTRL_OFFSET              0x0020
+#define DRA7XX_CM_EVE3_EVE3_CLKCTRL                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_EVE3_INST, 0x0020)
+
+/* CM_CORE_AON.EVE4_CM_CORE_AON register offsets */
+#define DRA7XX_CM_EVE4_CLKSTCTRL_OFFSET                 0x0000
+#define DRA7XX_CM_EVE4_STATICDEP_OFFSET                 0x0004
+#define DRA7XX_CM_EVE4_EVE4_CLKCTRL_OFFSET              0x0020
+#define DRA7XX_CM_EVE4_EVE4_CLKCTRL                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_EVE4_INST, 0x0020)
+
+/* CM_CORE_AON.RTC_CM_CORE_AON register offsets */
+#define DRA7XX_CM_RTC_CLKSTCTRL_OFFSET                  0x0000
+#define DRA7XX_CM_RTC_RTCSS_CLKCTRL_OFFSET              0x0004
+#define DRA7XX_CM_RTC_RTCSS_CLKCTRL                     DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_RTC_INST, 0x0004)
+
+/* CM_CORE_AON.VPE_CM_CORE_AON register offsets */
+#define DRA7XX_CM_VPE_CLKSTCTRL_OFFSET                  0x0000
+#define DRA7XX_CM_VPE_VPE_CLKCTRL_OFFSET                0x0004
+#define DRA7XX_CM_VPE_VPE_CLKCTRL                       DRA7XX_CM_CORE_AON_REGADDR(DRA7XX_CM_CORE_AON_VPE_INST, 0x0004)
+#define DRA7XX_CM_VPE_STATICDEP_OFFSET                  0x0008
+
+#endif
diff --git a/arch/arm/mach-omap2/cm2_7xx.h b/arch/arm/mach-omap2/cm2_7xx.h
new file mode 100644
index 000000000000..9ad7594e7622
--- /dev/null
+++ b/arch/arm/mach-omap2/cm2_7xx.h
@@ -0,0 +1,513 @@
+/*
+ * DRA7xx CM2 instance offset macros
+ *
+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com
+ *
+ * Generated by code originally written by:
+ * Paul Walmsley (paul@pwsan.com)
+ * Rajendra Nayak (rnayak@ti.com)
+ * Benoit Cousson (b-cousson@ti.com)
+ *
+ * This file is automatically generated from the OMAP hardware databases.
+ * We respectfully ask that any modifications to this file be coordinated
+ * with the public linux-omap@vger.kernel.org mailing list and the
+ * authors above to ensure that the autogeneration scripts are kept
+ * up-to-date with the file contents.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __ARCH_ARM_MACH_OMAP2_CM2_7XX_H
+#define __ARCH_ARM_MACH_OMAP2_CM2_7XX_H
+
+#include "cm_44xx_54xx.h"
+
+/* CM2 base address */
+#define DRA7XX_CM_CORE_BASE             0x4a008000
+
+#define DRA7XX_CM_CORE_REGADDR(inst, reg)                               \
+        OMAP2_L4_IO_ADDRESS(DRA7XX_CM_CORE_BASE + (inst) + (reg))
+
+/* CM_CORE instances */
+#define DRA7XX_CM_CORE_OCP_SOCKET_INST  0x0000
+#define DRA7XX_CM_CORE_CKGEN_INST       0x0104
+#define DRA7XX_CM_CORE_COREAON_INST     0x0600
+#define DRA7XX_CM_CORE_CORE_INST        0x0700
+#define DRA7XX_CM_CORE_IVA_INST         0x0f00
+#define DRA7XX_CM_CORE_CAM_INST         0x1000
+#define DRA7XX_CM_CORE_DSS_INST         0x1100
+#define DRA7XX_CM_CORE_GPU_INST         0x1200
+#define DRA7XX_CM_CORE_L3INIT_INST      0x1300
+#define DRA7XX_CM_CORE_CUSTEFUSE_INST   0x1600
+#define DRA7XX_CM_CORE_L4PER_INST       0x1700
+#define DRA7XX_CM_CORE_RESTORE_INST     0x1e18
+
+/* CM_CORE clockdomain register offsets (from instance start) */
+#define DRA7XX_CM_CORE_COREAON_COREAON_CDOFFS           0x0000
+#define DRA7XX_CM_CORE_CORE_L3MAIN1_CDOFFS              0x0000
+#define DRA7XX_CM_CORE_CORE_IPU2_CDOFFS                 0x0200
+#define DRA7XX_CM_CORE_CORE_DMA_CDOFFS                  0x0300
+#define DRA7XX_CM_CORE_CORE_EMIF_CDOFFS                 0x0400
+#define DRA7XX_CM_CORE_CORE_ATL_CDOFFS                  0x0520
+#define DRA7XX_CM_CORE_CORE_L4CFG_CDOFFS                0x0600
+#define DRA7XX_CM_CORE_CORE_L3INSTR_CDOFFS              0x0700
+#define DRA7XX_CM_CORE_IVA_IVA_CDOFFS                   0x0000
+#define DRA7XX_CM_CORE_CAM_CAM_CDOFFS                   0x0000
+#define DRA7XX_CM_CORE_DSS_DSS_CDOFFS                   0x0000
+#define DRA7XX_CM_CORE_GPU_GPU_CDOFFS                   0x0000
+#define DRA7XX_CM_CORE_L3INIT_L3INIT_CDOFFS             0x0000
+#define DRA7XX_CM_CORE_L3INIT_PCIE_CDOFFS               0x00a0
+#define DRA7XX_CM_CORE_L3INIT_GMAC_CDOFFS               0x00c0
+#define DRA7XX_CM_CORE_CUSTEFUSE_CUSTEFUSE_CDOFFS       0x0000
+#define DRA7XX_CM_CORE_L4PER_L4PER_CDOFFS               0x0000
+#define DRA7XX_CM_CORE_L4PER_L4SEC_CDOFFS               0x0180
+#define DRA7XX_CM_CORE_L4PER_L4PER2_CDOFFS              0x01fc
+#define DRA7XX_CM_CORE_L4PER_L4PER3_CDOFFS              0x0210
+
+/* CM_CORE */
+
+/* CM_CORE.OCP_SOCKET_CM_CORE register offsets */
+#define DRA7XX_REVISION_CM_CORE_OFFSET                          0x0000
+#define DRA7XX_CM_CM_CORE_PROFILING_CLKCTRL_OFFSET              0x0040
+#define DRA7XX_CM_CM_CORE_PROFILING_CLKCTRL                     DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_OCP_SOCKET_INST, 0x0040)
+#define DRA7XX_CM_CORE_DEBUG_CFG_OFFSET                         0x00f0
+
+/* CM_CORE.CKGEN_CM_CORE register offsets */
+#define DRA7XX_CM_CLKSEL_USB_60MHZ_OFFSET                       0x0000
+#define DRA7XX_CM_CLKSEL_USB_60MHZ                              DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x0000)
+#define DRA7XX_CM_CLKMODE_DPLL_PER_OFFSET                       0x003c
+#define DRA7XX_CM_CLKMODE_DPLL_PER                              DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x003c)
+#define DRA7XX_CM_IDLEST_DPLL_PER_OFFSET                        0x0040
+#define DRA7XX_CM_IDLEST_DPLL_PER                               DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x0040)
+#define DRA7XX_CM_AUTOIDLE_DPLL_PER_OFFSET                      0x0044
+#define DRA7XX_CM_AUTOIDLE_DPLL_PER                             DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x0044)
+#define DRA7XX_CM_CLKSEL_DPLL_PER_OFFSET                        0x0048
+#define DRA7XX_CM_CLKSEL_DPLL_PER                               DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x0048)
+#define DRA7XX_CM_DIV_M2_DPLL_PER_OFFSET                        0x004c
+#define DRA7XX_CM_DIV_M2_DPLL_PER                               DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x004c)
+#define DRA7XX_CM_DIV_M3_DPLL_PER_OFFSET                        0x0050
+#define DRA7XX_CM_DIV_M3_DPLL_PER                               DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x0050)
+#define DRA7XX_CM_DIV_H11_DPLL_PER_OFFSET                       0x0054
+#define DRA7XX_CM_DIV_H11_DPLL_PER                              DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x0054)
+#define DRA7XX_CM_DIV_H12_DPLL_PER_OFFSET                       0x0058
+#define DRA7XX_CM_DIV_H12_DPLL_PER                              DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x0058)
+#define DRA7XX_CM_DIV_H13_DPLL_PER_OFFSET                       0x005c
+#define DRA7XX_CM_DIV_H13_DPLL_PER                              DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x005c)
+#define DRA7XX_CM_DIV_H14_DPLL_PER_OFFSET                       0x0060
+#define DRA7XX_CM_DIV_H14_DPLL_PER                              DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x0060)
+#define DRA7XX_CM_SSC_DELTAMSTEP_DPLL_PER_OFFSET                0x0064
+#define DRA7XX_CM_SSC_MODFREQDIV_DPLL_PER_OFFSET                0x0068
+#define DRA7XX_CM_CLKMODE_DPLL_USB_OFFSET                       0x007c
+#define DRA7XX_CM_CLKMODE_DPLL_USB                              DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x007c)
+#define DRA7XX_CM_IDLEST_DPLL_USB_OFFSET                        0x0080
+#define DRA7XX_CM_IDLEST_DPLL_USB                               DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x0080)
+#define DRA7XX_CM_AUTOIDLE_DPLL_USB_OFFSET                      0x0084
+#define DRA7XX_CM_AUTOIDLE_DPLL_USB                             DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x0084)
+#define DRA7XX_CM_CLKSEL_DPLL_USB_OFFSET                        0x0088
+#define DRA7XX_CM_CLKSEL_DPLL_USB                               DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x0088)
+#define DRA7XX_CM_DIV_M2_DPLL_USB_OFFSET                        0x008c
+#define DRA7XX_CM_DIV_M2_DPLL_USB                               DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x008c)
+#define DRA7XX_CM_SSC_DELTAMSTEP_DPLL_USB_OFFSET                0x00a4
+#define DRA7XX_CM_SSC_MODFREQDIV_DPLL_USB_OFFSET                0x00a8
+#define DRA7XX_CM_CLKDCOLDO_DPLL_USB_OFFSET                     0x00b0
+#define DRA7XX_CM_CLKDCOLDO_DPLL_USB                            DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x00b0)
+#define DRA7XX_CM_CLKMODE_DPLL_PCIE_REF_OFFSET                  0x00fc
+#define DRA7XX_CM_CLKMODE_DPLL_PCIE_REF                         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x00fc)
+#define DRA7XX_CM_IDLEST_DPLL_PCIE_REF_OFFSET                   0x0100
+#define DRA7XX_CM_IDLEST_DPLL_PCIE_REF                          DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x0100)
+#define DRA7XX_CM_AUTOIDLE_DPLL_PCIE_REF_OFFSET                 0x0104
+#define DRA7XX_CM_AUTOIDLE_DPLL_PCIE_REF                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x0104)
+#define DRA7XX_CM_CLKSEL_DPLL_PCIE_REF_OFFSET                   0x0108
+#define DRA7XX_CM_CLKSEL_DPLL_PCIE_REF                          DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x0108)
+#define DRA7XX_CM_DIV_M2_DPLL_PCIE_REF_OFFSET                   0x010c
+#define DRA7XX_CM_DIV_M2_DPLL_PCIE_REF                          DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x010c)
+#define DRA7XX_CM_SSC_DELTAMSTEP_DPLL_PCIE_REF_OFFSET           0x0110
+#define DRA7XX_CM_SSC_MODFREQDIV_DPLL_PCIE_REF_OFFSET           0x0114
+#define DRA7XX_CM_CLKMODE_APLL_PCIE_OFFSET                      0x0118
+#define DRA7XX_CM_CLKMODE_APLL_PCIE                             DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x0118)
+#define DRA7XX_CM_IDLEST_APLL_PCIE_OFFSET                       0x011c
+#define DRA7XX_CM_IDLEST_APLL_PCIE                              DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x011c)
+#define DRA7XX_CM_DIV_M2_APLL_PCIE_OFFSET                       0x0120
+#define DRA7XX_CM_DIV_M2_APLL_PCIE                              DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x0120)
+#define DRA7XX_CM_CLKVCOLDO_APLL_PCIE_OFFSET                    0x0124
+#define DRA7XX_CM_CLKVCOLDO_APLL_PCIE                           DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CKGEN_INST, 0x0124)
+
+/* CM_CORE.COREAON_CM_CORE register offsets */
+#define DRA7XX_CM_COREAON_CLKSTCTRL_OFFSET                      0x0000
+#define DRA7XX_CM_COREAON_SMARTREFLEX_MPU_CLKCTRL_OFFSET        0x0028
+#define DRA7XX_CM_COREAON_SMARTREFLEX_MPU_CLKCTRL               DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_COREAON_INST, 0x0028)
+#define DRA7XX_CM_COREAON_SMARTREFLEX_CORE_CLKCTRL_OFFSET       0x0038
+#define DRA7XX_CM_COREAON_SMARTREFLEX_CORE_CLKCTRL              DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_COREAON_INST, 0x0038)
+#define DRA7XX_CM_COREAON_USB_PHY1_CORE_CLKCTRL_OFFSET          0x0040
+#define DRA7XX_CM_COREAON_USB_PHY1_CORE_CLKCTRL                 DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_COREAON_INST, 0x0040)
+#define DRA7XX_CM_COREAON_IO_SRCOMP_CLKCTRL_OFFSET              0x0050
+#define DRA7XX_CM_COREAON_IO_SRCOMP_CLKCTRL                     DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_COREAON_INST, 0x0050)
+#define DRA7XX_CM_COREAON_SMARTREFLEX_GPU_CLKCTRL_OFFSET        0x0058
+#define DRA7XX_CM_COREAON_SMARTREFLEX_GPU_CLKCTRL               DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_COREAON_INST, 0x0058)
+#define DRA7XX_CM_COREAON_SMARTREFLEX_DSPEVE_CLKCTRL_OFFSET     0x0068
+#define DRA7XX_CM_COREAON_SMARTREFLEX_DSPEVE_CLKCTRL            DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_COREAON_INST, 0x0068)
+#define DRA7XX_CM_COREAON_SMARTREFLEX_IVAHD_CLKCTRL_OFFSET      0x0078
+#define DRA7XX_CM_COREAON_SMARTREFLEX_IVAHD_CLKCTRL             DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_COREAON_INST, 0x0078)
+#define DRA7XX_CM_COREAON_USB_PHY2_CORE_CLKCTRL_OFFSET          0x0088
+#define DRA7XX_CM_COREAON_USB_PHY2_CORE_CLKCTRL                 DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_COREAON_INST, 0x0088)
+#define DRA7XX_CM_COREAON_USB_PHY3_CORE_CLKCTRL_OFFSET          0x0098
+#define DRA7XX_CM_COREAON_USB_PHY3_CORE_CLKCTRL                 DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_COREAON_INST, 0x0098)
+#define DRA7XX_CM_COREAON_DUMMY_MODULE1_CLKCTRL_OFFSET          0x00a0
+#define DRA7XX_CM_COREAON_DUMMY_MODULE1_CLKCTRL                 DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_COREAON_INST, 0x00a0)
+#define DRA7XX_CM_COREAON_DUMMY_MODULE2_CLKCTRL_OFFSET          0x00b0
+#define DRA7XX_CM_COREAON_DUMMY_MODULE2_CLKCTRL                 DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_COREAON_INST, 0x00b0)
+#define DRA7XX_CM_COREAON_DUMMY_MODULE3_CLKCTRL_OFFSET          0x00c0
+#define DRA7XX_CM_COREAON_DUMMY_MODULE3_CLKCTRL                 DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_COREAON_INST, 0x00c0)
+#define DRA7XX_CM_COREAON_DUMMY_MODULE4_CLKCTRL_OFFSET          0x00d0
+#define DRA7XX_CM_COREAON_DUMMY_MODULE4_CLKCTRL                 DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_COREAON_INST, 0x00d0)
+
+/* CM_CORE.CORE_CM_CORE register offsets */
+#define DRA7XX_CM_L3MAIN1_CLKSTCTRL_OFFSET                      0x0000
+#define DRA7XX_CM_L3MAIN1_DYNAMICDEP_OFFSET                     0x0008
+#define DRA7XX_CM_L3MAIN1_L3_MAIN_1_CLKCTRL_OFFSET              0x0020
+#define DRA7XX_CM_L3MAIN1_L3_MAIN_1_CLKCTRL                     DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0020)
+#define DRA7XX_CM_L3MAIN1_GPMC_CLKCTRL_OFFSET                   0x0028
+#define DRA7XX_CM_L3MAIN1_GPMC_CLKCTRL                          DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0028)
+#define DRA7XX_CM_L3MAIN1_MMU_EDMA_CLKCTRL_OFFSET               0x0030
+#define DRA7XX_CM_L3MAIN1_MMU_EDMA_CLKCTRL                      DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0030)
+#define DRA7XX_CM_L3MAIN1_OCMC_RAM1_CLKCTRL_OFFSET              0x0050
+#define DRA7XX_CM_L3MAIN1_OCMC_RAM1_CLKCTRL                     DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0050)
+#define DRA7XX_CM_L3MAIN1_OCMC_RAM2_CLKCTRL_OFFSET              0x0058
+#define DRA7XX_CM_L3MAIN1_OCMC_RAM2_CLKCTRL                     DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0058)
+#define DRA7XX_CM_L3MAIN1_OCMC_RAM3_CLKCTRL_OFFSET              0x0060
+#define DRA7XX_CM_L3MAIN1_OCMC_RAM3_CLKCTRL                     DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0060)
+#define DRA7XX_CM_L3MAIN1_OCMC_ROM_CLKCTRL_OFFSET               0x0068
+#define DRA7XX_CM_L3MAIN1_OCMC_ROM_CLKCTRL                      DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0068)
+#define DRA7XX_CM_L3MAIN1_TPCC_CLKCTRL_OFFSET                   0x0070
+#define DRA7XX_CM_L3MAIN1_TPCC_CLKCTRL                          DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0070)
+#define DRA7XX_CM_L3MAIN1_TPTC1_CLKCTRL_OFFSET                  0x0078
+#define DRA7XX_CM_L3MAIN1_TPTC1_CLKCTRL                         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0078)
+#define DRA7XX_CM_L3MAIN1_TPTC2_CLKCTRL_OFFSET                  0x0080
+#define DRA7XX_CM_L3MAIN1_TPTC2_CLKCTRL                         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0080)
+#define DRA7XX_CM_L3MAIN1_VCP1_CLKCTRL_OFFSET                   0x0088
+#define DRA7XX_CM_L3MAIN1_VCP1_CLKCTRL                          DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0088)
+#define DRA7XX_CM_L3MAIN1_VCP2_CLKCTRL_OFFSET                   0x0090
+#define DRA7XX_CM_L3MAIN1_VCP2_CLKCTRL                          DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0090)
+#define DRA7XX_CM_L3MAIN1_SPARE_CME_CLKCTRL_OFFSET              0x0098
+#define DRA7XX_CM_L3MAIN1_SPARE_CME_CLKCTRL                     DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0098)
+#define DRA7XX_CM_L3MAIN1_SPARE_HDMI_CLKCTRL_OFFSET             0x00a0
+#define DRA7XX_CM_L3MAIN1_SPARE_HDMI_CLKCTRL                    DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x00a0)
+#define DRA7XX_CM_L3MAIN1_SPARE_ICM_CLKCTRL_OFFSET              0x00a8
+#define DRA7XX_CM_L3MAIN1_SPARE_ICM_CLKCTRL                     DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x00a8)
+#define DRA7XX_CM_L3MAIN1_SPARE_IVA2_CLKCTRL_OFFSET             0x00b0
+#define DRA7XX_CM_L3MAIN1_SPARE_IVA2_CLKCTRL                    DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x00b0)
+#define DRA7XX_CM_L3MAIN1_SPARE_SATA2_CLKCTRL_OFFSET            0x00b8
+#define DRA7XX_CM_L3MAIN1_SPARE_SATA2_CLKCTRL                   DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x00b8)
+#define DRA7XX_CM_L3MAIN1_SPARE_UNKNOWN4_CLKCTRL_OFFSET         0x00c0
+#define DRA7XX_CM_L3MAIN1_SPARE_UNKNOWN4_CLKCTRL                DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x00c0)
+#define DRA7XX_CM_L3MAIN1_SPARE_UNKNOWN5_CLKCTRL_OFFSET         0x00c8
+#define DRA7XX_CM_L3MAIN1_SPARE_UNKNOWN5_CLKCTRL                DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x00c8)
+#define DRA7XX_CM_L3MAIN1_SPARE_UNKNOWN6_CLKCTRL_OFFSET         0x00d0
+#define DRA7XX_CM_L3MAIN1_SPARE_UNKNOWN6_CLKCTRL                DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x00d0)
+#define DRA7XX_CM_L3MAIN1_SPARE_VIDEOPLL1_CLKCTRL_OFFSET        0x00d8
+#define DRA7XX_CM_L3MAIN1_SPARE_VIDEOPLL1_CLKCTRL               DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x00d8)
+#define DRA7XX_CM_L3MAIN1_SPARE_VIDEOPLL2_CLKCTRL_OFFSET        0x00f0
+#define DRA7XX_CM_L3MAIN1_SPARE_VIDEOPLL2_CLKCTRL               DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x00f0)
+#define DRA7XX_CM_L3MAIN1_SPARE_VIDEOPLL3_CLKCTRL_OFFSET        0x00f8
+#define DRA7XX_CM_L3MAIN1_SPARE_VIDEOPLL3_CLKCTRL               DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x00f8)
+#define DRA7XX_CM_IPU2_CLKSTCTRL_OFFSET                         0x0200
+#define DRA7XX_CM_IPU2_STATICDEP_OFFSET                         0x0204
+#define DRA7XX_CM_IPU2_DYNAMICDEP_OFFSET                        0x0208
+#define DRA7XX_CM_IPU2_IPU2_CLKCTRL_OFFSET                      0x0220
+#define DRA7XX_CM_IPU2_IPU2_CLKCTRL                             DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0220)
+#define DRA7XX_CM_DMA_CLKSTCTRL_OFFSET                          0x0300
+#define DRA7XX_CM_DMA_STATICDEP_OFFSET                          0x0304
+#define DRA7XX_CM_DMA_DYNAMICDEP_OFFSET                         0x0308
+#define DRA7XX_CM_DMA_DMA_SYSTEM_CLKCTRL_OFFSET                 0x0320
+#define DRA7XX_CM_DMA_DMA_SYSTEM_CLKCTRL                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0320)
+#define DRA7XX_CM_EMIF_CLKSTCTRL_OFFSET                         0x0400
+#define DRA7XX_CM_EMIF_DMM_CLKCTRL_OFFSET                       0x0420
+#define DRA7XX_CM_EMIF_DMM_CLKCTRL                              DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0420)
+#define DRA7XX_CM_EMIF_EMIF_OCP_FW_CLKCTRL_OFFSET               0x0428
+#define DRA7XX_CM_EMIF_EMIF_OCP_FW_CLKCTRL                      DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0428)
+#define DRA7XX_CM_EMIF_EMIF1_CLKCTRL_OFFSET                     0x0430
+#define DRA7XX_CM_EMIF_EMIF1_CLKCTRL                            DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0430)
+#define DRA7XX_CM_EMIF_EMIF2_CLKCTRL_OFFSET                     0x0438
+#define DRA7XX_CM_EMIF_EMIF2_CLKCTRL                            DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0438)
+#define DRA7XX_CM_EMIF_EMIF_DLL_CLKCTRL_OFFSET                  0x0440
+#define DRA7XX_CM_EMIF_EMIF_DLL_CLKCTRL                         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0440)
+#define DRA7XX_CM_ATL_ATL_CLKCTRL_OFFSET                        0x0500
+#define DRA7XX_CM_ATL_ATL_CLKCTRL                               DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0500)
+#define DRA7XX_CM_ATL_CLKSTCTRL_OFFSET                          0x0520
+#define DRA7XX_CM_L4CFG_CLKSTCTRL_OFFSET                        0x0600
+#define DRA7XX_CM_L4CFG_DYNAMICDEP_OFFSET                       0x0608
+#define DRA7XX_CM_L4CFG_L4_CFG_CLKCTRL_OFFSET                   0x0620
+#define DRA7XX_CM_L4CFG_L4_CFG_CLKCTRL                          DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0620)
+#define DRA7XX_CM_L4CFG_SPINLOCK_CLKCTRL_OFFSET                 0x0628
+#define DRA7XX_CM_L4CFG_SPINLOCK_CLKCTRL                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0628)
+#define DRA7XX_CM_L4CFG_MAILBOX1_CLKCTRL_OFFSET                 0x0630
+#define DRA7XX_CM_L4CFG_MAILBOX1_CLKCTRL                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0630)
+#define DRA7XX_CM_L4CFG_SAR_ROM_CLKCTRL_OFFSET                  0x0638
+#define DRA7XX_CM_L4CFG_SAR_ROM_CLKCTRL                         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0638)
+#define DRA7XX_CM_L4CFG_OCP2SCP2_CLKCTRL_OFFSET                 0x0640
+#define DRA7XX_CM_L4CFG_OCP2SCP2_CLKCTRL                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0640)
+#define DRA7XX_CM_L4CFG_MAILBOX2_CLKCTRL_OFFSET                 0x0648
+#define DRA7XX_CM_L4CFG_MAILBOX2_CLKCTRL                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0648)
+#define DRA7XX_CM_L4CFG_MAILBOX3_CLKCTRL_OFFSET                 0x0650
+#define DRA7XX_CM_L4CFG_MAILBOX3_CLKCTRL                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0650)
+#define DRA7XX_CM_L4CFG_MAILBOX4_CLKCTRL_OFFSET                 0x0658
+#define DRA7XX_CM_L4CFG_MAILBOX4_CLKCTRL                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0658)
+#define DRA7XX_CM_L4CFG_MAILBOX5_CLKCTRL_OFFSET                 0x0660
+#define DRA7XX_CM_L4CFG_MAILBOX5_CLKCTRL                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0660)
+#define DRA7XX_CM_L4CFG_MAILBOX6_CLKCTRL_OFFSET                 0x0668
+#define DRA7XX_CM_L4CFG_MAILBOX6_CLKCTRL                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0668)
+#define DRA7XX_CM_L4CFG_MAILBOX7_CLKCTRL_OFFSET                 0x0670
+#define DRA7XX_CM_L4CFG_MAILBOX7_CLKCTRL                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0670)
+#define DRA7XX_CM_L4CFG_MAILBOX8_CLKCTRL_OFFSET                 0x0678
+#define DRA7XX_CM_L4CFG_MAILBOX8_CLKCTRL                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0678)
+#define DRA7XX_CM_L4CFG_MAILBOX9_CLKCTRL_OFFSET                 0x0680
+#define DRA7XX_CM_L4CFG_MAILBOX9_CLKCTRL                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0680)
+#define DRA7XX_CM_L4CFG_MAILBOX10_CLKCTRL_OFFSET                0x0688
+#define DRA7XX_CM_L4CFG_MAILBOX10_CLKCTRL                       DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0688)
+#define DRA7XX_CM_L4CFG_MAILBOX11_CLKCTRL_OFFSET                0x0690
+#define DRA7XX_CM_L4CFG_MAILBOX11_CLKCTRL                       DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0690)
+#define DRA7XX_CM_L4CFG_MAILBOX12_CLKCTRL_OFFSET                0x0698
+#define DRA7XX_CM_L4CFG_MAILBOX12_CLKCTRL                       DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0698)
+#define DRA7XX_CM_L4CFG_MAILBOX13_CLKCTRL_OFFSET                0x06a0
+#define DRA7XX_CM_L4CFG_MAILBOX13_CLKCTRL                       DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x06a0)
+#define DRA7XX_CM_L4CFG_SPARE_SMARTREFLEX_RTC_CLKCTRL_OFFSET    0x06a8
+#define DRA7XX_CM_L4CFG_SPARE_SMARTREFLEX_RTC_CLKCTRL           DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x06a8)
+#define DRA7XX_CM_L4CFG_SPARE_SMARTREFLEX_SDRAM_CLKCTRL_OFFSET  0x06b0
+#define DRA7XX_CM_L4CFG_SPARE_SMARTREFLEX_SDRAM_CLKCTRL         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x06b0)
+#define DRA7XX_CM_L4CFG_SPARE_SMARTREFLEX_WKUP_CLKCTRL_OFFSET   0x06b8
+#define DRA7XX_CM_L4CFG_SPARE_SMARTREFLEX_WKUP_CLKCTRL          DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x06b8)
+#define DRA7XX_CM_L4CFG_IO_DELAY_BLOCK_CLKCTRL_OFFSET           0x06c0
+#define DRA7XX_CM_L4CFG_IO_DELAY_BLOCK_CLKCTRL                  DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x06c0)
+#define DRA7XX_CM_L3INSTR_CLKSTCTRL_OFFSET                      0x0700
+#define DRA7XX_CM_L3INSTR_L3_MAIN_2_CLKCTRL_OFFSET              0x0720
+#define DRA7XX_CM_L3INSTR_L3_MAIN_2_CLKCTRL                     DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0720)
+#define DRA7XX_CM_L3INSTR_L3_INSTR_CLKCTRL_OFFSET               0x0728
+#define DRA7XX_CM_L3INSTR_L3_INSTR_CLKCTRL                      DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0728)
+#define DRA7XX_CM_L3INSTR_OCP_WP_NOC_CLKCTRL_OFFSET             0x0740
+#define DRA7XX_CM_L3INSTR_OCP_WP_NOC_CLKCTRL                    DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0740)
+#define DRA7XX_CM_L3INSTR_DLL_AGING_CLKCTRL_OFFSET              0x0748
+#define DRA7XX_CM_L3INSTR_DLL_AGING_CLKCTRL                     DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0748)
+#define DRA7XX_CM_L3INSTR_CTRL_MODULE_BANDGAP_CLKCTRL_OFFSET    0x0750
+#define DRA7XX_CM_L3INSTR_CTRL_MODULE_BANDGAP_CLKCTRL           DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CORE_INST, 0x0750)
+
+/* CM_CORE.IVA_CM_CORE register offsets */
+#define DRA7XX_CM_IVA_CLKSTCTRL_OFFSET                          0x0000
+#define DRA7XX_CM_IVA_STATICDEP_OFFSET                          0x0004
+#define DRA7XX_CM_IVA_DYNAMICDEP_OFFSET                         0x0008
+#define DRA7XX_CM_IVA_IVA_CLKCTRL_OFFSET                        0x0020
+#define DRA7XX_CM_IVA_IVA_CLKCTRL                               DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_IVA_INST, 0x0020)
+#define DRA7XX_CM_IVA_SL2_CLKCTRL_OFFSET                        0x0028
+#define DRA7XX_CM_IVA_SL2_CLKCTRL                               DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_IVA_INST, 0x0028)
+
+/* CM_CORE.CAM_CM_CORE register offsets */
+#define DRA7XX_CM_CAM_CLKSTCTRL_OFFSET                          0x0000
+#define DRA7XX_CM_CAM_STATICDEP_OFFSET                          0x0004
+#define DRA7XX_CM_CAM_VIP1_CLKCTRL_OFFSET                       0x0020
+#define DRA7XX_CM_CAM_VIP1_CLKCTRL                              DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CAM_INST, 0x0020)
+#define DRA7XX_CM_CAM_VIP2_CLKCTRL_OFFSET                       0x0028
+#define DRA7XX_CM_CAM_VIP2_CLKCTRL                              DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CAM_INST, 0x0028)
+#define DRA7XX_CM_CAM_VIP3_CLKCTRL_OFFSET                       0x0030
+#define DRA7XX_CM_CAM_VIP3_CLKCTRL                              DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CAM_INST, 0x0030)
+#define DRA7XX_CM_CAM_LVDSRX_CLKCTRL_OFFSET                     0x0038
+#define DRA7XX_CM_CAM_LVDSRX_CLKCTRL                            DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CAM_INST, 0x0038)
+#define DRA7XX_CM_CAM_CSI1_CLKCTRL_OFFSET                       0x0040
+#define DRA7XX_CM_CAM_CSI1_CLKCTRL                              DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CAM_INST, 0x0040)
+#define DRA7XX_CM_CAM_CSI2_CLKCTRL_OFFSET                       0x0048
+#define DRA7XX_CM_CAM_CSI2_CLKCTRL                              DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CAM_INST, 0x0048)
+
+/* CM_CORE.DSS_CM_CORE register offsets */
+#define DRA7XX_CM_DSS_CLKSTCTRL_OFFSET                          0x0000
+#define DRA7XX_CM_DSS_STATICDEP_OFFSET                          0x0004
+#define DRA7XX_CM_DSS_DYNAMICDEP_OFFSET                         0x0008
+#define DRA7XX_CM_DSS_DSS_CLKCTRL_OFFSET                        0x0020
+#define DRA7XX_CM_DSS_DSS_CLKCTRL                               DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_DSS_INST, 0x0020)
+#define DRA7XX_CM_DSS_BB2D_CLKCTRL_OFFSET                       0x0030
+#define DRA7XX_CM_DSS_BB2D_CLKCTRL                              DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_DSS_INST, 0x0030)
+#define DRA7XX_CM_DSS_SDVENC_CLKCTRL_OFFSET                     0x003c
+#define DRA7XX_CM_DSS_SDVENC_CLKCTRL                            DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_DSS_INST, 0x003c)
+
+/* CM_CORE.GPU_CM_CORE register offsets */
+#define DRA7XX_CM_GPU_CLKSTCTRL_OFFSET                          0x0000
+#define DRA7XX_CM_GPU_STATICDEP_OFFSET                          0x0004
+#define DRA7XX_CM_GPU_DYNAMICDEP_OFFSET                         0x0008
+#define DRA7XX_CM_GPU_GPU_CLKCTRL_OFFSET                        0x0020
+#define DRA7XX_CM_GPU_GPU_CLKCTRL                               DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_GPU_INST, 0x0020)
+
+/* CM_CORE.L3INIT_CM_CORE register offsets */
+#define DRA7XX_CM_L3INIT_CLKSTCTRL_OFFSET                       0x0000
+#define DRA7XX_CM_L3INIT_STATICDEP_OFFSET                       0x0004
+#define DRA7XX_CM_L3INIT_DYNAMICDEP_OFFSET                      0x0008
+#define DRA7XX_CM_L3INIT_MMC1_CLKCTRL_OFFSET                    0x0028
+#define DRA7XX_CM_L3INIT_MMC1_CLKCTRL                           DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L3INIT_INST, 0x0028)
+#define DRA7XX_CM_L3INIT_MMC2_CLKCTRL_OFFSET                    0x0030
+#define DRA7XX_CM_L3INIT_MMC2_CLKCTRL                           DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L3INIT_INST, 0x0030)
+#define DRA7XX_CM_L3INIT_USB_OTG_SS2_CLKCTRL_OFFSET             0x0040
+#define DRA7XX_CM_L3INIT_USB_OTG_SS2_CLKCTRL                    DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L3INIT_INST, 0x0040)
+#define DRA7XX_CM_L3INIT_USB_OTG_SS3_CLKCTRL_OFFSET             0x0048
+#define DRA7XX_CM_L3INIT_USB_OTG_SS3_CLKCTRL                    DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L3INIT_INST, 0x0048)
+#define DRA7XX_CM_L3INIT_USB_OTG_SS4_CLKCTRL_OFFSET             0x0050
+#define DRA7XX_CM_L3INIT_USB_OTG_SS4_CLKCTRL                    DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L3INIT_INST, 0x0050)
+#define DRA7XX_CM_L3INIT_MLB_SS_CLKCTRL_OFFSET                  0x0058
+#define DRA7XX_CM_L3INIT_MLB_SS_CLKCTRL                         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L3INIT_INST, 0x0058)
+#define DRA7XX_CM_L3INIT_IEEE1500_2_OCP_CLKCTRL_OFFSET          0x0078
+#define DRA7XX_CM_L3INIT_IEEE1500_2_OCP_CLKCTRL                 DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L3INIT_INST, 0x0078)
+#define DRA7XX_CM_L3INIT_SATA_CLKCTRL_OFFSET                    0x0088
+#define DRA7XX_CM_L3INIT_SATA_CLKCTRL                           DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L3INIT_INST, 0x0088)
+#define DRA7XX_CM_PCIE_CLKSTCTRL_OFFSET                         0x00a0
+#define DRA7XX_CM_PCIE_STATICDEP_OFFSET                         0x00a4
+#define DRA7XX_CM_GMAC_CLKSTCTRL_OFFSET                         0x00c0
+#define DRA7XX_CM_GMAC_STATICDEP_OFFSET                         0x00c4
+#define DRA7XX_CM_GMAC_DYNAMICDEP_OFFSET                        0x00c8
+#define DRA7XX_CM_GMAC_GMAC_CLKCTRL_OFFSET                      0x00d0
+#define DRA7XX_CM_GMAC_GMAC_CLKCTRL                             DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L3INIT_INST, 0x00d0)
+#define DRA7XX_CM_L3INIT_OCP2SCP1_CLKCTRL_OFFSET                0x00e0
+#define DRA7XX_CM_L3INIT_OCP2SCP1_CLKCTRL                       DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L3INIT_INST, 0x00e0)
+#define DRA7XX_CM_L3INIT_OCP2SCP3_CLKCTRL_OFFSET                0x00e8
+#define DRA7XX_CM_L3INIT_OCP2SCP3_CLKCTRL                       DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L3INIT_INST, 0x00e8)
+#define DRA7XX_CM_L3INIT_USB_OTG_SS1_CLKCTRL_OFFSET             0x00f0
+#define DRA7XX_CM_L3INIT_USB_OTG_SS1_CLKCTRL                    DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L3INIT_INST, 0x00f0)
+
+/* CM_CORE.CUSTEFUSE_CM_CORE register offsets */
+#define DRA7XX_CM_CUSTEFUSE_CLKSTCTRL_OFFSET                    0x0000
+#define DRA7XX_CM_CUSTEFUSE_EFUSE_CTRL_CUST_CLKCTRL_OFFSET      0x0020
+#define DRA7XX_CM_CUSTEFUSE_EFUSE_CTRL_CUST_CLKCTRL             DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_CUSTEFUSE_INST, 0x0020)
+
+/* CM_CORE.L4PER_CM_CORE register offsets */
+#define DRA7XX_CM_L4PER_CLKSTCTRL_OFFSET                        0x0000
+#define DRA7XX_CM_L4PER_DYNAMICDEP_OFFSET                       0x0008
+#define DRA7XX_CM_L4PER2_L4_PER2_CLKCTRL_OFFSET                 0x000c
+#define DRA7XX_CM_L4PER2_L4_PER2_CLKCTRL                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x000c)
+#define DRA7XX_CM_L4PER3_L4_PER3_CLKCTRL_OFFSET                 0x0014
+#define DRA7XX_CM_L4PER3_L4_PER3_CLKCTRL                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0014)
+#define DRA7XX_CM_L4PER2_PRUSS1_CLKCTRL_OFFSET                  0x0018
+#define DRA7XX_CM_L4PER2_PRUSS1_CLKCTRL                         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0018)
+#define DRA7XX_CM_L4PER2_PRUSS2_CLKCTRL_OFFSET                  0x0020
+#define DRA7XX_CM_L4PER2_PRUSS2_CLKCTRL                         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0020)
+#define DRA7XX_CM_L4PER_TIMER10_CLKCTRL_OFFSET                  0x0028
+#define DRA7XX_CM_L4PER_TIMER10_CLKCTRL                         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0028)
+#define DRA7XX_CM_L4PER_TIMER11_CLKCTRL_OFFSET                  0x0030
+#define DRA7XX_CM_L4PER_TIMER11_CLKCTRL                         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0030)
+#define DRA7XX_CM_L4PER_TIMER2_CLKCTRL_OFFSET                   0x0038
+#define DRA7XX_CM_L4PER_TIMER2_CLKCTRL                          DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0038)
+#define DRA7XX_CM_L4PER_TIMER3_CLKCTRL_OFFSET                   0x0040
+#define DRA7XX_CM_L4PER_TIMER3_CLKCTRL                          DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0040)
+#define DRA7XX_CM_L4PER_TIMER4_CLKCTRL_OFFSET                   0x0048
+#define DRA7XX_CM_L4PER_TIMER4_CLKCTRL                          DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0048)
+#define DRA7XX_CM_L4PER_TIMER9_CLKCTRL_OFFSET                   0x0050
+#define DRA7XX_CM_L4PER_TIMER9_CLKCTRL                          DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0050)
+#define DRA7XX_CM_L4PER_ELM_CLKCTRL_OFFSET                      0x0058
+#define DRA7XX_CM_L4PER_ELM_CLKCTRL                             DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0058)
+#define DRA7XX_CM_L4PER_GPIO2_CLKCTRL_OFFSET                    0x0060
+#define DRA7XX_CM_L4PER_GPIO2_CLKCTRL                           DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0060)
+#define DRA7XX_CM_L4PER_GPIO3_CLKCTRL_OFFSET                    0x0068
+#define DRA7XX_CM_L4PER_GPIO3_CLKCTRL                           DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0068)
+#define DRA7XX_CM_L4PER_GPIO4_CLKCTRL_OFFSET                    0x0070
+#define DRA7XX_CM_L4PER_GPIO4_CLKCTRL                           DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0070)
+#define DRA7XX_CM_L4PER_GPIO5_CLKCTRL_OFFSET                    0x0078
+#define DRA7XX_CM_L4PER_GPIO5_CLKCTRL                           DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0078)
+#define DRA7XX_CM_L4PER_GPIO6_CLKCTRL_OFFSET                    0x0080
+#define DRA7XX_CM_L4PER_GPIO6_CLKCTRL                           DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0080)
+#define DRA7XX_CM_L4PER_HDQ1W_CLKCTRL_OFFSET                    0x0088
+#define DRA7XX_CM_L4PER_HDQ1W_CLKCTRL                           DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0088)
+#define DRA7XX_CM_L4PER2_PWMSS2_CLKCTRL_OFFSET                  0x0090
+#define DRA7XX_CM_L4PER2_PWMSS2_CLKCTRL                         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0090)
+#define DRA7XX_CM_L4PER2_PWMSS3_CLKCTRL_OFFSET                  0x0098
+#define DRA7XX_CM_L4PER2_PWMSS3_CLKCTRL                         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0098)
+#define DRA7XX_CM_L4PER_I2C1_CLKCTRL_OFFSET                     0x00a0
+#define DRA7XX_CM_L4PER_I2C1_CLKCTRL                            DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x00a0)
+#define DRA7XX_CM_L4PER_I2C2_CLKCTRL_OFFSET                     0x00a8
+#define DRA7XX_CM_L4PER_I2C2_CLKCTRL                            DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x00a8)
+#define DRA7XX_CM_L4PER_I2C3_CLKCTRL_OFFSET                     0x00b0
+#define DRA7XX_CM_L4PER_I2C3_CLKCTRL                            DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x00b0)
+#define DRA7XX_CM_L4PER_I2C4_CLKCTRL_OFFSET                     0x00b8
+#define DRA7XX_CM_L4PER_I2C4_CLKCTRL                            DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x00b8)
+#define DRA7XX_CM_L4PER_L4_PER1_CLKCTRL_OFFSET                  0x00c0
+#define DRA7XX_CM_L4PER_L4_PER1_CLKCTRL                         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x00c0)
+#define DRA7XX_CM_L4PER2_PWMSS1_CLKCTRL_OFFSET                  0x00c4
+#define DRA7XX_CM_L4PER2_PWMSS1_CLKCTRL                         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x00c4)
+#define DRA7XX_CM_L4PER3_TIMER13_CLKCTRL_OFFSET                 0x00c8
+#define DRA7XX_CM_L4PER3_TIMER13_CLKCTRL                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x00c8)
+#define DRA7XX_CM_L4PER3_TIMER14_CLKCTRL_OFFSET                 0x00d0
+#define DRA7XX_CM_L4PER3_TIMER14_CLKCTRL                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x00d0)
+#define DRA7XX_CM_L4PER3_TIMER15_CLKCTRL_OFFSET                 0x00d8
+#define DRA7XX_CM_L4PER3_TIMER15_CLKCTRL                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x00d8)
+#define DRA7XX_CM_L4PER_MCSPI1_CLKCTRL_OFFSET                   0x00f0
+#define DRA7XX_CM_L4PER_MCSPI1_CLKCTRL                          DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x00f0)
+#define DRA7XX_CM_L4PER_MCSPI2_CLKCTRL_OFFSET                   0x00f8
+#define DRA7XX_CM_L4PER_MCSPI2_CLKCTRL                          DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x00f8)
+#define DRA7XX_CM_L4PER_MCSPI3_CLKCTRL_OFFSET                   0x0100
+#define DRA7XX_CM_L4PER_MCSPI3_CLKCTRL                          DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0100)
+#define DRA7XX_CM_L4PER_MCSPI4_CLKCTRL_OFFSET                   0x0108
+#define DRA7XX_CM_L4PER_MCSPI4_CLKCTRL                          DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0108)
+#define DRA7XX_CM_L4PER_GPIO7_CLKCTRL_OFFSET                    0x0110
+#define DRA7XX_CM_L4PER_GPIO7_CLKCTRL                           DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0110)
+#define DRA7XX_CM_L4PER_GPIO8_CLKCTRL_OFFSET                    0x0118
+#define DRA7XX_CM_L4PER_GPIO8_CLKCTRL                           DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0118)
+#define DRA7XX_CM_L4PER_MMC3_CLKCTRL_OFFSET                     0x0120
+#define DRA7XX_CM_L4PER_MMC3_CLKCTRL                            DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0120)
+#define DRA7XX_CM_L4PER_MMC4_CLKCTRL_OFFSET                     0x0128
+#define DRA7XX_CM_L4PER_MMC4_CLKCTRL                            DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0128)
+#define DRA7XX_CM_L4PER3_TIMER16_CLKCTRL_OFFSET                 0x0130
+#define DRA7XX_CM_L4PER3_TIMER16_CLKCTRL                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0130)
+#define DRA7XX_CM_L4PER2_QSPI_CLKCTRL_OFFSET                    0x0138
+#define DRA7XX_CM_L4PER2_QSPI_CLKCTRL                           DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0138)
+#define DRA7XX_CM_L4PER_UART1_CLKCTRL_OFFSET                    0x0140
+#define DRA7XX_CM_L4PER_UART1_CLKCTRL                           DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0140)
+#define DRA7XX_CM_L4PER_UART2_CLKCTRL_OFFSET                    0x0148
+#define DRA7XX_CM_L4PER_UART2_CLKCTRL                           DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0148)
+#define DRA7XX_CM_L4PER_UART3_CLKCTRL_OFFSET                    0x0150
+#define DRA7XX_CM_L4PER_UART3_CLKCTRL                           DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0150)
+#define DRA7XX_CM_L4PER_UART4_CLKCTRL_OFFSET                    0x0158
+#define DRA7XX_CM_L4PER_UART4_CLKCTRL                           DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0158)
+#define DRA7XX_CM_L4PER2_MCASP2_CLKCTRL_OFFSET                  0x0160
+#define DRA7XX_CM_L4PER2_MCASP2_CLKCTRL                         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0160)
+#define DRA7XX_CM_L4PER2_MCASP3_CLKCTRL_OFFSET                  0x0168
+#define DRA7XX_CM_L4PER2_MCASP3_CLKCTRL                         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0168)
+#define DRA7XX_CM_L4PER_UART5_CLKCTRL_OFFSET                    0x0170
+#define DRA7XX_CM_L4PER_UART5_CLKCTRL                           DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0170)
+#define DRA7XX_CM_L4PER2_MCASP5_CLKCTRL_OFFSET                  0x0178
+#define DRA7XX_CM_L4PER2_MCASP5_CLKCTRL                         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0178)
+#define DRA7XX_CM_L4SEC_CLKSTCTRL_OFFSET                        0x0180
+#define DRA7XX_CM_L4SEC_STATICDEP_OFFSET                        0x0184
+#define DRA7XX_CM_L4SEC_DYNAMICDEP_OFFSET                       0x0188
+#define DRA7XX_CM_L4PER2_MCASP8_CLKCTRL_OFFSET                  0x0190
+#define DRA7XX_CM_L4PER2_MCASP8_CLKCTRL                         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0190)
+#define DRA7XX_CM_L4PER2_MCASP4_CLKCTRL_OFFSET                  0x0198
+#define DRA7XX_CM_L4PER2_MCASP4_CLKCTRL                         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0198)
+#define DRA7XX_CM_L4SEC_AES1_CLKCTRL_OFFSET                     0x01a0
+#define DRA7XX_CM_L4SEC_AES1_CLKCTRL                            DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x01a0)
+#define DRA7XX_CM_L4SEC_AES2_CLKCTRL_OFFSET                     0x01a8
+#define DRA7XX_CM_L4SEC_AES2_CLKCTRL                            DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x01a8)
+#define DRA7XX_CM_L4SEC_DES3DES_CLKCTRL_OFFSET                  0x01b0
+#define DRA7XX_CM_L4SEC_DES3DES_CLKCTRL                         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x01b0)
+#define DRA7XX_CM_L4SEC_FPKA_CLKCTRL_OFFSET                     0x01b8
+#define DRA7XX_CM_L4SEC_FPKA_CLKCTRL                            DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x01b8)
+#define DRA7XX_CM_L4SEC_RNG_CLKCTRL_OFFSET                      0x01c0
+#define DRA7XX_CM_L4SEC_RNG_CLKCTRL                             DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x01c0)
+#define DRA7XX_CM_L4SEC_SHA2MD51_CLKCTRL_OFFSET                 0x01c8
+#define DRA7XX_CM_L4SEC_SHA2MD51_CLKCTRL                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x01c8)
+#define DRA7XX_CM_L4PER2_UART7_CLKCTRL_OFFSET                   0x01d0
+#define DRA7XX_CM_L4PER2_UART7_CLKCTRL                          DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x01d0)
+#define DRA7XX_CM_L4SEC_DMA_CRYPTO_CLKCTRL_OFFSET               0x01d8
+#define DRA7XX_CM_L4SEC_DMA_CRYPTO_CLKCTRL                      DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x01d8)
+#define DRA7XX_CM_L4PER2_UART8_CLKCTRL_OFFSET                   0x01e0
+#define DRA7XX_CM_L4PER2_UART8_CLKCTRL                          DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x01e0)
+#define DRA7XX_CM_L4PER2_UART9_CLKCTRL_OFFSET                   0x01e8
+#define DRA7XX_CM_L4PER2_UART9_CLKCTRL                          DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x01e8)
+#define DRA7XX_CM_L4PER2_DCAN2_CLKCTRL_OFFSET                   0x01f0
+#define DRA7XX_CM_L4PER2_DCAN2_CLKCTRL                          DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x01f0)
+#define DRA7XX_CM_L4SEC_SHA2MD52_CLKCTRL_OFFSET                 0x01f8
+#define DRA7XX_CM_L4SEC_SHA2MD52_CLKCTRL                        DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x01f8)
+#define DRA7XX_CM_L4PER2_CLKSTCTRL_OFFSET                       0x01fc
+#define DRA7XX_CM_L4PER2_DYNAMICDEP_OFFSET                      0x0200
+#define DRA7XX_CM_L4PER2_MCASP6_CLKCTRL_OFFSET                  0x0204
+#define DRA7XX_CM_L4PER2_MCASP6_CLKCTRL                         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0204)
+#define DRA7XX_CM_L4PER2_MCASP7_CLKCTRL_OFFSET                  0x0208
+#define DRA7XX_CM_L4PER2_MCASP7_CLKCTRL                         DRA7XX_CM_CORE_REGADDR(DRA7XX_CM_CORE_L4PER_INST, 0x0208)
+#define DRA7XX_CM_L4PER2_STATICDEP_OFFSET                       0x020c
+#define DRA7XX_CM_L4PER3_CLKSTCTRL_OFFSET                       0x0210
+#define DRA7XX_CM_L4PER3_DYNAMICDEP_OFFSET                      0x0214
+
+#endif
diff --git a/arch/arm/mach-omap2/common.h b/arch/arm/mach-omap2/common.h
index dfcc182ecff9..4a5684b96492 100644
--- a/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@ -110,6 +110,7 @@ void omap3630_init_late(void);
 void am35xx_init_late(void);
 void ti81xx_init_late(void);
 int omap2_common_pm_late_init(void);
+void dra7xx_init_early(void);
 
 #ifdef CONFIG_SOC_BUS
 void omap_soc_device_init(void);
diff --git a/arch/arm/mach-omap2/cpuidle44xx.c b/arch/arm/mach-omap2/cpuidle44xx.c
index c443f2e97e10..4c8982ae9529 100644
--- a/arch/arm/mach-omap2/cpuidle44xx.c
+++ b/arch/arm/mach-omap2/cpuidle44xx.c
@@ -143,7 +143,7 @@ static int omap_enter_idle_coupled(struct cpuidle_device *dev,
          * Call idle CPU cluster PM exit notifier chain
          * to restore GIC and wakeupgen context.
          */
-        if ((cx->mpu_state == PWRDM_POWER_RET) &&
+        if (dev->cpu == 0 && (cx->mpu_state == PWRDM_POWER_RET) &&
                 (cx->mpu_logic_state == PWRDM_POWER_OFF))
                 cpu_cluster_pm_exit();
 
diff --git a/arch/arm/mach-omap2/devices.c b/arch/arm/mach-omap2/devices.c
index 3c1279f27d1f..5c5315ba129b 100644
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@ -327,44 +327,6 @@ static void omap_init_audio(void)
 static inline void omap_init_audio(void) {}
 #endif
 
-#if defined(CONFIG_SND_OMAP_SOC_MCPDM) || \
-                defined(CONFIG_SND_OMAP_SOC_MCPDM_MODULE)
-
-static void __init omap_init_mcpdm(void)
-{
-        struct omap_hwmod *oh;
-        struct platform_device *pdev;
-
-        oh = omap_hwmod_lookup("mcpdm");
-        if (!oh)
-                return;
-
-        pdev = omap_device_build("omap-mcpdm", -1, oh, NULL, 0);
-        WARN(IS_ERR(pdev), "Can't build omap_device for omap-mcpdm.\n");
-}
-#else
-static inline void omap_init_mcpdm(void) {}
-#endif
-
-#if defined(CONFIG_SND_OMAP_SOC_DMIC) || \
-                defined(CONFIG_SND_OMAP_SOC_DMIC_MODULE)
-
-static void __init omap_init_dmic(void)
-{
-        struct omap_hwmod *oh;
-        struct platform_device *pdev;
-
-        oh = omap_hwmod_lookup("dmic");
-        if (!oh)
-                return;
-
-        pdev = omap_device_build("omap-dmic", -1, oh, NULL, 0);
-        WARN(IS_ERR(pdev), "Can't build omap_device for omap-dmic.\n");
-}
-#else
-static inline void omap_init_dmic(void) {}
-#endif
-
 #if defined(CONFIG_SND_OMAP_SOC_OMAP_HDMI) || \
                 defined(CONFIG_SND_OMAP_SOC_OMAP_HDMI_MODULE)
 
@@ -565,17 +527,15 @@ static int __init omap2_init_devices(void)
         omap_init_mbox();
         /* If dtb is there, the devices will be created dynamically */
         if (!of_have_populated_dt()) {
-                omap_init_dmic();
-                omap_init_mcpdm();
                 omap_init_mcspi();
                 omap_init_sham();
                 omap_init_aes();
+                omap_init_rng();
         } else {
                 /* These can be removed when bindings are done */
                 omap_init_wl12xx_of();
         }
         omap_init_sti();
-        omap_init_rng();
         omap_init_vout();
 
         return 0;
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index ff37be1f6f93..03a0516c7f67 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -400,7 +400,7 @@ int __init omap_display_init(struct omap_dss_board_info *board_data)
 
         /* Create devices for DPI and SDI */
 
-        pdev = create_simple_dss_pdev("omapdss_dpi", -1,
+        pdev = create_simple_dss_pdev("omapdss_dpi", 0,
                         board_data, sizeof(*board_data), dss_pdev);
         if (IS_ERR(pdev)) {
                 pr_err("Could not build platform_device for omapdss_dpi\n");
@@ -408,7 +408,7 @@ int __init omap_display_init(struct omap_dss_board_info *board_data)
         }
 
         if (cpu_is_omap34xx()) {
-                pdev = create_simple_dss_pdev("omapdss_sdi", -1,
+                pdev = create_simple_dss_pdev("omapdss_sdi", 0,
                                 board_data, sizeof(*board_data), dss_pdev);
                 if (IS_ERR(pdev)) {
                         pr_err("Could not build platform_device for omapdss_sdi\n");
diff --git a/arch/arm/mach-omap2/dss-common.c b/arch/arm/mach-omap2/dss-common.c
index 043e5705f2a6..bf89effa4c99 100644
--- a/arch/arm/mach-omap2/dss-common.c
+++ b/arch/arm/mach-omap2/dss-common.c
@@ -25,6 +25,7 @@
 
 #include <linux/kernel.h>
 #include <linux/gpio.h>
+#include <linux/platform_device.h>
 
 #include <video/omapdss.h>
 #include <video/omap-panel-data.h>
@@ -37,70 +38,76 @@
 #define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */
 #define HDMI_GPIO_HPD  63 /* Hotplug detect */
 
-/* Display DVI */
 #define PANDA_DVI_TFP410_POWER_DOWN_GPIO        0
 
-/* Using generic display panel */
-static struct tfp410_platform_data omap4_dvi_panel = {
-        .i2c_bus_num            = 2,
-        .power_down_gpio        = PANDA_DVI_TFP410_POWER_DOWN_GPIO,
+/* DVI Connector */
+static struct connector_dvi_platform_data omap4_panda_dvi_connector_pdata = {
+        .name                   = "dvi",
+        .source                 = "tfp410.0",
+        .i2c_bus_num            = 2,
 };
 
-static struct omap_dss_device omap4_panda_dvi_device = {
-        .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .name                   = "dvi",
-        .driver_name            = "tfp410",
-        .data                   = &omap4_dvi_panel,
-        .phy.dpi.data_lines     = 24,
-        .channel                = OMAP_DSS_CHANNEL_LCD2,
+static struct platform_device omap4_panda_dvi_connector_device = {
+        .name                   = "connector-dvi",
+        .id                     = 0,
+        .dev.platform_data      = &omap4_panda_dvi_connector_pdata,
 };
 
-static struct omap_dss_hdmi_data omap4_panda_hdmi_data = {
+/* TFP410 DPI-to-DVI chip */
+static struct encoder_tfp410_platform_data omap4_panda_tfp410_pdata = {
+        .name                   = "tfp410.0",
+        .source                 = "dpi.0",
+        .data_lines             = 24,
+        .power_down_gpio        = PANDA_DVI_TFP410_POWER_DOWN_GPIO,
+};
+
+static struct platform_device omap4_panda_tfp410_device = {
+        .name                   = "tfp410",
+        .id                     = 0,
+        .dev.platform_data      = &omap4_panda_tfp410_pdata,
+};
+
+/* HDMI Connector */
+static struct connector_hdmi_platform_data omap4_panda_hdmi_connector_pdata = {
+        .name                   = "hdmi",
+        .source                 = "tpd12s015.0",
+};
+
+static struct platform_device omap4_panda_hdmi_connector_device = {
+        .name                   = "connector-hdmi",
+        .id                     = 0,
+        .dev.platform_data      = &omap4_panda_hdmi_connector_pdata,
+};
+
+/* TPD12S015 HDMI ESD protection & level shifter chip */
+static struct encoder_tpd12s015_platform_data omap4_panda_tpd_pdata = {
+        .name                   = "tpd12s015.0",
+        .source                 = "hdmi.0",
+
         .ct_cp_hpd_gpio = HDMI_GPIO_CT_CP_HPD,
         .ls_oe_gpio = HDMI_GPIO_LS_OE,
         .hpd_gpio = HDMI_GPIO_HPD,
 };
 
-static struct omap_dss_device  omap4_panda_hdmi_device = {
-        .name = "hdmi",
-        .driver_name = "hdmi_panel",
-        .type = OMAP_DISPLAY_TYPE_HDMI,
-        .channel = OMAP_DSS_CHANNEL_DIGIT,
-        .data = &omap4_panda_hdmi_data,
-};
-
-static struct omap_dss_device *omap4_panda_dss_devices[] = {
-        &omap4_panda_dvi_device,
-        &omap4_panda_hdmi_device,
+static struct platform_device omap4_panda_tpd_device = {
+        .name                   = "tpd12s015",
+        .id                     = 0,
+        .dev.platform_data      = &omap4_panda_tpd_pdata,
 };
 
 static struct omap_dss_board_info omap4_panda_dss_data = {
-        .num_devices    = ARRAY_SIZE(omap4_panda_dss_devices),
-        .devices        = omap4_panda_dss_devices,
-        .default_device = &omap4_panda_dvi_device,
+        .default_display_name = "dvi",
 };
 
-void __init omap4_panda_display_init(void)
+void __init omap4_panda_display_init_of(void)
 {
         omap_display_init(&omap4_panda_dss_data);
 
-        /*
-         * OMAP4460SDP/Blaze and OMAP4430 ES2.3 SDP/Blaze boards and
-         * later have external pull up on the HDMI I2C lines
-         */
-        if (cpu_is_omap446x() || omap_rev() > OMAP4430_REV_ES2_2)
-                omap_hdmi_init(OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP);
-        else
-                omap_hdmi_init(0);
-
-        omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT);
-        omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT);
-        omap_mux_init_gpio(HDMI_GPIO_HPD, OMAP_PIN_INPUT_PULLDOWN);
-}
+        platform_device_register(&omap4_panda_tfp410_device);
+        platform_device_register(&omap4_panda_dvi_connector_device);
 
-void __init omap4_panda_display_init_of(void)
-{
-        omap_display_init(&omap4_panda_dss_data);
+        platform_device_register(&omap4_panda_tpd_device);
+        platform_device_register(&omap4_panda_hdmi_connector_device);
 }
 
 
@@ -109,93 +116,73 @@ void __init omap4_panda_display_init_of(void)
 #define DISPLAY_SEL_GPIO        59      /* LCD2/PicoDLP switch */
 #define DLP_POWER_ON_GPIO       40
 
-static struct nokia_dsi_panel_data dsi1_panel = {
-                .name           = "taal",
-                .reset_gpio     = 102,
-                .use_ext_te     = false,
-                .ext_te_gpio    = 101,
-                .esd_interval   = 0,
-                .pin_config = {
-                        .num_pins       = 6,
-                        .pins           = { 0, 1, 2, 3, 4, 5 },
-                },
-};
-
-static struct omap_dss_device sdp4430_lcd_device = {
-        .name                   = "lcd",
-        .driver_name            = "taal",
-        .type                   = OMAP_DISPLAY_TYPE_DSI,
-        .data                   = &dsi1_panel,
-        .phy.dsi                = {
-                .module         = 0,
+static struct panel_dsicm_platform_data dsi1_panel = {
+        .name           = "lcd",
+        .source         = "dsi.0",
+        .reset_gpio     = 102,
+        .use_ext_te     = false,
+        .ext_te_gpio    = 101,
+        .pin_config = {
+                .num_pins       = 6,
+                .pins           = { 0, 1, 2, 3, 4, 5 },
         },
-        .channel                = OMAP_DSS_CHANNEL_LCD,
 };
 
-static struct nokia_dsi_panel_data dsi2_panel = {
-                .name           = "taal",
-                .reset_gpio     = 104,
-                .use_ext_te     = false,
-                .ext_te_gpio    = 103,
-                .esd_interval   = 0,
-                .pin_config = {
-                        .num_pins       = 6,
-                        .pins           = { 0, 1, 2, 3, 4, 5 },
-                },
+static struct platform_device sdp4430_lcd_device = {
+        .name                   = "panel-dsi-cm",
+        .id                     = 0,
+        .dev.platform_data      = &dsi1_panel,
 };
 
-static struct omap_dss_device sdp4430_lcd2_device = {
-        .name                   = "lcd2",
-        .driver_name            = "taal",
-        .type                   = OMAP_DISPLAY_TYPE_DSI,
-        .data                   = &dsi2_panel,
-        .phy.dsi                = {
-
-                .module         = 1,
+static struct panel_dsicm_platform_data dsi2_panel = {
+        .name           = "lcd2",
+        .source         = "dsi.1",
+        .reset_gpio     = 104,
+        .use_ext_te     = false,
+        .ext_te_gpio    = 103,
+        .pin_config = {
+                .num_pins       = 6,
+                .pins           = { 0, 1, 2, 3, 4, 5 },
         },
-        .channel                = OMAP_DSS_CHANNEL_LCD2,
 };
 
-static struct omap_dss_hdmi_data sdp4430_hdmi_data = {
-        .ct_cp_hpd_gpio = HDMI_GPIO_CT_CP_HPD,
-        .ls_oe_gpio = HDMI_GPIO_LS_OE,
-        .hpd_gpio = HDMI_GPIO_HPD,
+static struct platform_device sdp4430_lcd2_device = {
+        .name                   = "panel-dsi-cm",
+        .id                     = 1,
+        .dev.platform_data      = &dsi2_panel,
 };
 
-static struct omap_dss_device sdp4430_hdmi_device = {
-        .name = "hdmi",
-        .driver_name = "hdmi_panel",
-        .type = OMAP_DISPLAY_TYPE_HDMI,
-        .channel = OMAP_DSS_CHANNEL_DIGIT,
-        .data = &sdp4430_hdmi_data,
+/* HDMI Connector */
+static struct connector_hdmi_platform_data sdp4430_hdmi_connector_pdata = {
+        .name                   = "hdmi",
+        .source                 = "tpd12s015.0",
 };
 
-static struct picodlp_panel_data sdp4430_picodlp_pdata = {
-        .picodlp_adapter_id     = 2,
-        .emu_done_gpio          = 44,
-        .pwrgood_gpio           = 45,
+static struct platform_device sdp4430_hdmi_connector_device = {
+        .name                   = "connector-hdmi",
+        .id                     = 0,
+        .dev.platform_data      = &sdp4430_hdmi_connector_pdata,
 };
 
-static struct omap_dss_device sdp4430_picodlp_device = {
-        .name                   = "picodlp",
-        .driver_name            = "picodlp_panel",
-        .type                   = OMAP_DISPLAY_TYPE_DPI,
-        .phy.dpi.data_lines     = 24,
-        .channel                = OMAP_DSS_CHANNEL_LCD2,
-        .data                   = &sdp4430_picodlp_pdata,
+/* TPD12S015 HDMI ESD protection & level shifter chip */
+static struct encoder_tpd12s015_platform_data sdp4430_tpd_pdata = {
+        .name                   = "tpd12s015.0",
+        .source                 = "hdmi.0",
+
+        .ct_cp_hpd_gpio = HDMI_GPIO_CT_CP_HPD,
+        .ls_oe_gpio = HDMI_GPIO_LS_OE,
+        .hpd_gpio = HDMI_GPIO_HPD,
 };
 
-static struct omap_dss_device *sdp4430_dss_devices[] = {
-        &sdp4430_lcd_device,
-        &sdp4430_lcd2_device,
-        &sdp4430_hdmi_device,
-        &sdp4430_picodlp_device,
+static struct platform_device sdp4430_tpd_device = {
+        .name                   = "tpd12s015",
+        .id                     = 0,
+        .dev.platform_data      = &sdp4430_tpd_pdata,
 };
 
+
 static struct omap_dss_board_info sdp4430_dss_data = {
-        .num_devices    = ARRAY_SIZE(sdp4430_dss_devices),
-        .devices        = sdp4430_dss_devices,
-        .default_device = &sdp4430_lcd_device,
+        .default_display_name = "lcd",
 };
 
 /*
@@ -204,7 +191,7 @@ static struct omap_dss_board_info sdp4430_dss_data = {
  * used by picodlp on the 4430sdp platform. Keep this gpio disabled as LCD2 is
  * selected by default
  */
-void __init omap_4430sdp_display_init(void)
+void __init omap_4430sdp_display_init_of(void)
 {
         int r;
 
@@ -219,33 +206,10 @@ void __init omap_4430sdp_display_init(void)
                 pr_err("%s: Could not get DLP POWER ON GPIO\n", __func__);
 
         omap_display_init(&sdp4430_dss_data);
-        /*
-         * OMAP4460SDP/Blaze and OMAP4430 ES2.3 SDP/Blaze boards and
-         * later have external pull up on the HDMI I2C lines
-         */
-        if (cpu_is_omap446x() || omap_rev() > OMAP4430_REV_ES2_2)
-                omap_hdmi_init(OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP);
-        else
-                omap_hdmi_init(0);
-
-        omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT);
-        omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT);
-        omap_mux_init_gpio(HDMI_GPIO_HPD, OMAP_PIN_INPUT_PULLDOWN);
-}
-
-void __init omap_4430sdp_display_init_of(void)
-{
-        int r;
 
-        r = gpio_request_one(DISPLAY_SEL_GPIO, GPIOF_OUT_INIT_HIGH,
-                        "display_sel");
-        if (r)
-                pr_err("%s: Could not get display_sel GPIO\n", __func__);
-
-        r = gpio_request_one(DLP_POWER_ON_GPIO, GPIOF_OUT_INIT_LOW,
-                "DLP POWER ON");
-        if (r)
-                pr_err("%s: Could not get DLP POWER ON GPIO\n", __func__);
+        platform_device_register(&sdp4430_lcd_device);
+        platform_device_register(&sdp4430_lcd2_device);
 
-        omap_display_init(&sdp4430_dss_data);
+        platform_device_register(&sdp4430_tpd_device);
+        platform_device_register(&sdp4430_hdmi_connector_device);
 }
diff --git a/arch/arm/mach-omap2/dss-common.h b/arch/arm/mach-omap2/dss-common.h
index 915f6fff5106..c28fe3c03588 100644
--- a/arch/arm/mach-omap2/dss-common.h
+++ b/arch/arm/mach-omap2/dss-common.h
@@ -6,9 +6,7 @@
  * This file will be removed when DSS supports DT.
  */
 
-void __init omap4_panda_display_init(void);
 void __init omap4_panda_display_init_of(void);
-void __init omap_4430sdp_display_init(void);
 void __init omap_4430sdp_display_init_of(void);
 
 #endif
diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index f3fdd6afa213..579697adaae7 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -149,7 +149,7 @@ struct omap3_gpmc_regs {
 
 static struct gpmc_client_irq gpmc_client_irq[GPMC_NR_IRQ];
 static struct irq_chip gpmc_irq_chip;
-static unsigned gpmc_irq_start;
+static int gpmc_irq_start;
 
 static struct resource  gpmc_mem_root;
 static struct resource  gpmc_cs_mem[GPMC_CS_NUM];
@@ -1491,8 +1491,8 @@ static int gpmc_probe_generic_child(struct platform_device *pdev,
          */
         ret = gpmc_cs_remap(cs, res.start);
         if (ret < 0) {
-                dev_err(&pdev->dev, "cannot remap GPMC CS %d to 0x%x\n",
-                        cs, res.start);
+                dev_err(&pdev->dev, "cannot remap GPMC CS %d to %pa\n",
+                        cs, &res.start);
                 goto err;
         }
 
diff --git a/arch/arm/mach-omap2/i2c.c b/arch/arm/mach-omap2/i2c.c
index d940e53dd9f2..b456b4471f35 100644
--- a/arch/arm/mach-omap2/i2c.c
+++ b/arch/arm/mach-omap2/i2c.c
@@ -181,7 +181,7 @@ int __init omap_i2c_add_bus(struct omap_i2c_bus_platform_data *i2c_pdata,
                                  sizeof(struct omap_i2c_bus_platform_data));
         WARN(IS_ERR(pdev), "Could not build omap_device for %s\n", name);
 
-        return PTR_RET(pdev);
+        return PTR_ERR_OR_ZERO(pdev);
 }
 
 static  int __init omap_i2c_cmdline(void)
diff --git a/arch/arm/mach-omap2/id.c b/arch/arm/mach-omap2/id.c
index 2dc62a25f2c3..0289adcb6efb 100644
--- a/arch/arm/mach-omap2/id.c
+++ b/arch/arm/mach-omap2/id.c
@@ -61,7 +61,7 @@ int omap_type(void)
                 val = omap_ctrl_readl(OMAP343X_CONTROL_STATUS);
         } else if (cpu_is_omap44xx()) {
                 val = omap_ctrl_readl(OMAP4_CTRL_MODULE_CORE_STATUS);
-        } else if (soc_is_omap54xx()) {
+        } else if (soc_is_omap54xx() || soc_is_dra7xx()) {
                 val = omap_ctrl_readl(OMAP5XXX_CONTROL_STATUS);
                 val &= OMAP5_DEVICETYPE_MASK;
                 val >>= 6;
@@ -116,7 +116,7 @@ static u16 tap_prod_id;
 
 void omap_get_die_id(struct omap_die_id *odi)
 {
-        if (cpu_is_omap44xx() || soc_is_omap54xx()) {
+        if (cpu_is_omap44xx() || soc_is_omap54xx() || soc_is_dra7xx()) {
                 odi->id_0 = read_tap_reg(OMAP_TAP_DIE_ID_44XX_0);
                 odi->id_1 = read_tap_reg(OMAP_TAP_DIE_ID_44XX_1);
                 odi->id_2 = read_tap_reg(OMAP_TAP_DIE_ID_44XX_2);
diff --git a/arch/arm/mach-omap2/io.c b/arch/arm/mach-omap2/io.c
index 4a3f06f02859..ff2113ce4014 100644
--- a/arch/arm/mach-omap2/io.c
+++ b/arch/arm/mach-omap2/io.c
@@ -251,7 +251,7 @@ static struct map_desc omap44xx_io_desc[] __initdata = {
 };
 #endif
 
-#ifdef  CONFIG_SOC_OMAP5
+#if defined(CONFIG_SOC_OMAP5) || defined(CONFIG_SOC_DRA7XX)
 static struct map_desc omap54xx_io_desc[] __initdata = {
         {
                 .virtual        = L3_54XX_VIRT,
@@ -333,7 +333,7 @@ void __init omap4_map_io(void)
 }
 #endif
 
-#ifdef CONFIG_SOC_OMAP5
+#if defined(CONFIG_SOC_OMAP5) ||  defined(CONFIG_SOC_DRA7XX)
 void __init omap5_map_io(void)
 {
         iotable_init(omap54xx_io_desc, ARRAY_SIZE(omap54xx_io_desc));
@@ -653,6 +653,27 @@ void __init omap5_init_early(void)
 }
 #endif
 
+#ifdef CONFIG_SOC_DRA7XX
+void __init dra7xx_init_early(void)
+{
+        omap2_set_globals_tap(-1, OMAP2_L4_IO_ADDRESS(DRA7XX_TAP_BASE));
+        omap2_set_globals_control(OMAP2_L4_IO_ADDRESS(OMAP54XX_SCM_BASE),
+                                  OMAP2_L4_IO_ADDRESS(DRA7XX_CTRL_BASE));
+        omap2_set_globals_prm(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRM_BASE));
+        omap2_set_globals_cm(OMAP2_L4_IO_ADDRESS(DRA7XX_CM_CORE_AON_BASE),
+                             OMAP2_L4_IO_ADDRESS(OMAP54XX_CM_CORE_BASE));
+        omap2_set_globals_prcm_mpu(OMAP2_L4_IO_ADDRESS(OMAP54XX_PRCM_MPU_BASE));
+        omap_prm_base_init();
+        omap_cm_base_init();
+        omap44xx_prm_init();
+        dra7xx_powerdomains_init();
+        dra7xx_clockdomains_init();
+        dra7xx_hwmod_init();
+        omap_hwmod_init_postsetup();
+}
+#endif
+
+
 void __init omap_sdrc_init(struct omap_sdrc_params *sdrc_cs0,
                                       struct omap_sdrc_params *sdrc_cs1)
 {
diff --git a/arch/arm/mach-omap2/mux34xx.c b/arch/arm/mach-omap2/mux34xx.c
index c53609f46294..be271f1d585b 100644
--- a/arch/arm/mach-omap2/mux34xx.c
+++ b/arch/arm/mach-omap2/mux34xx.c
@@ -620,7 +620,7 @@ static struct omap_mux __initdata omap3_muxmodes[] = {
                 "uart1_rts", "ssi1_flag_tx", NULL, NULL,
                 "gpio_149", NULL, NULL, "safe_mode"),
         _OMAP3_MUXENTRY(UART1_RX, 151,
-                "uart1_rx", "ss1_wake_tx", "mcbsp1_clkr", "mcspi4_clk",
+                "uart1_rx", "ssi1_wake_tx", "mcbsp1_clkr", "mcspi4_clk",
                 "gpio_151", NULL, NULL, "safe_mode"),
         _OMAP3_MUXENTRY(UART1_TX, 148,
                 "uart1_tx", "ssi1_dat_tx", NULL, NULL,
diff --git a/arch/arm/mach-omap2/omap-smp.c b/arch/arm/mach-omap2/omap-smp.c
index 8708b2a9da45..891211093295 100644
--- a/arch/arm/mach-omap2/omap-smp.c
+++ b/arch/arm/mach-omap2/omap-smp.c
@@ -1,5 +1,5 @@
 /*
- * OMAP4 SMP source file. It contains platform specific fucntions
+ * OMAP4 SMP source file. It contains platform specific functions
  * needed for the linux smp kernel.
  *
  * Copyright (C) 2009 Texas Instruments, Inc.
diff --git a/arch/arm/mach-omap2/omap54xx.h b/arch/arm/mach-omap2/omap54xx.h
index a086ba15868b..2d35c5709408 100644
--- a/arch/arm/mach-omap2/omap54xx.h
+++ b/arch/arm/mach-omap2/omap54xx.h
@@ -30,4 +30,8 @@
 #define OMAP54XX_CTRL_BASE              0x4a002800
 #define OMAP54XX_SAR_RAM_BASE           0x4ae26000
 
+#define DRA7XX_CM_CORE_AON_BASE         0x4a005000
+#define DRA7XX_CTRL_BASE                0x4a003400
+#define DRA7XX_TAP_BASE                 0x4ae0c000
+
 #endif /* __ASM_SOC_OMAP555554XX_H */
diff --git a/arch/arm/mach-omap2/omap_device.c b/arch/arm/mach-omap2/omap_device.c
index f99f68e1e85b..b69dd9abb50a 100644
--- a/arch/arm/mach-omap2/omap_device.c
+++ b/arch/arm/mach-omap2/omap_device.c
@@ -158,7 +158,7 @@ static int omap_device_build_from_dt(struct platform_device *pdev)
         }
 
         od = omap_device_alloc(pdev, hwmods, oh_cnt);
-        if (!od) {
+        if (IS_ERR(od)) {
                 dev_err(&pdev->dev, "Cannot allocate omap_device for :%s\n",
                         oh_name);
                 ret = PTR_ERR(od);
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index 7f4db12b1459..d9ee0ff094d4 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -1405,7 +1405,9 @@ static void _enable_sysc(struct omap_hwmod *oh)
             (sf & SYSC_HAS_CLOCKACTIVITY))
                 _set_clockactivity(oh, oh->class->sysc->clockact, &v);
 
-        _write_sysconfig(v, oh);
+        /* If the cached value is the same as the new value, skip the write */
+        if (oh->_sysc_cache != v)
+                _write_sysconfig(v, oh);
 
         /*
          * Set the autoidle bit only after setting the smartidle bit
@@ -4113,7 +4115,7 @@ void __init omap_hwmod_init(void)
                 soc_ops.assert_hardreset = _omap2_assert_hardreset;
                 soc_ops.deassert_hardreset = _omap2_deassert_hardreset;
                 soc_ops.is_hardreset_asserted = _omap2_is_hardreset_asserted;
-        } else if (cpu_is_omap44xx() || soc_is_omap54xx()) {
+        } else if (cpu_is_omap44xx() || soc_is_omap54xx() || soc_is_dra7xx()) {
                 soc_ops.enable_module = _omap4_enable_module;
                 soc_ops.disable_module = _omap4_disable_module;
                 soc_ops.wait_target_ready = _omap4_wait_target_ready;
diff --git a/arch/arm/mach-omap2/omap_hwmod.h b/arch/arm/mach-omap2/omap_hwmod.h
index e1482a9b3bc2..d02acf9308d3 100644
--- a/arch/arm/mach-omap2/omap_hwmod.h
+++ b/arch/arm/mach-omap2/omap_hwmod.h
@@ -751,6 +751,7 @@ extern int omap3xxx_hwmod_init(void);
 extern int omap44xx_hwmod_init(void);
 extern int omap54xx_hwmod_init(void);
 extern int am33xx_hwmod_init(void);
+extern int dra7xx_hwmod_init(void);
 
 extern int __init omap_hwmod_register_links(struct omap_hwmod_ocp_if **ois);
 
diff --git a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
index eb2f3b93b51c..215894f8910d 100644
--- a/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_33xx_data.c
@@ -325,7 +325,6 @@ static struct omap_hwmod am33xx_adc_tsc_hwmod = {
  *
  *    - cEFUSE (doesn't fall under any ocp_if)
  *    - clkdiv32k
- *    - debugss
  *    - ocp watch point
  */
 #if 0
@@ -369,27 +368,6 @@ static struct omap_hwmod am33xx_clkdiv32k_hwmod = {
         },
 };
 
-/*
- * 'debugss' class
- * debug sub system
- */
-static struct omap_hwmod_class am33xx_debugss_hwmod_class = {
-        .name           = "debugss",
-};
-
-static struct omap_hwmod am33xx_debugss_hwmod = {
-        .name           = "debugss",
-        .class          = &am33xx_debugss_hwmod_class,
-        .clkdm_name     = "l3_aon_clkdm",
-        .main_clk       = "debugss_ick",
-        .prcm           = {
-                .omap4  = {
-                        .clkctrl_offs   = AM33XX_CM_WKUP_DEBUGSS_CLKCTRL_OFFSET,
-                        .modulemode     = MODULEMODE_SWCTRL,
-                },
-        },
-};
-
 /* ocpwp */
 static struct omap_hwmod_class am33xx_ocpwp_hwmod_class = {
         .name           = "ocpwp",
@@ -482,6 +460,34 @@ static struct omap_hwmod am33xx_ocmcram_hwmod = {
         },
 };
 
+/*
+ * 'debugss' class
+ * debug sub system
+ */
+static struct omap_hwmod_opt_clk debugss_opt_clks[] = {
+        { .role = "dbg_sysclk", .clk = "dbg_sysclk_ck" },
+        { .role = "dbg_clka", .clk = "dbg_clka_ck" },
+};
+
+static struct omap_hwmod_class am33xx_debugss_hwmod_class = {
+        .name           = "debugss",
+};
+
+static struct omap_hwmod am33xx_debugss_hwmod = {
+        .name           = "debugss",
+        .class          = &am33xx_debugss_hwmod_class,
+        .clkdm_name     = "l3_aon_clkdm",
+        .main_clk       = "trace_clk_div_ck",
+        .prcm           = {
+                .omap4  = {
+                        .clkctrl_offs   = AM33XX_CM_WKUP_DEBUGSS_CLKCTRL_OFFSET,
+                        .modulemode     = MODULEMODE_SWCTRL,
+                },
+        },
+        .opt_clks       = debugss_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(debugss_opt_clks),
+};
+
 /* 'smartreflex' class */
 static struct omap_hwmod_class am33xx_smartreflex_hwmod_class = {
         .name           = "smartreflex",
@@ -1796,6 +1802,24 @@ static struct omap_hwmod_ocp_if am33xx_l3_main__gfx = {
         .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
+/* l3_main -> debugss */
+static struct omap_hwmod_addr_space am33xx_debugss_addrs[] = {
+        {
+                .pa_start       = 0x4b000000,
+                .pa_end         = 0x4b000000 + SZ_16M - 1,
+                .flags          = ADDR_TYPE_RT
+        },
+        { }
+};
+
+static struct omap_hwmod_ocp_if am33xx_l3_main__debugss = {
+        .master         = &am33xx_l3_main_hwmod,
+        .slave          = &am33xx_debugss_hwmod,
+        .clk            = "dpll_core_m4_ck",
+        .addr           = am33xx_debugss_addrs,
+        .user           = OCP_USER_MPU,
+};
+
 /* l4 wkup -> smartreflex0 */
 static struct omap_hwmod_ocp_if am33xx_l4_wkup__smartreflex0 = {
         .master         = &am33xx_l4_wkup_hwmod,
@@ -2470,6 +2494,7 @@ static struct omap_hwmod_ocp_if *am33xx_hwmod_ocp_ifs[] __initdata = {
         &am33xx_pruss__l3_main,
         &am33xx_wkup_m3__l4_wkup,
         &am33xx_gfx__l3_main,
+        &am33xx_l3_main__debugss,
         &am33xx_l4_wkup__wkup_m3,
         &am33xx_l4_wkup__control,
         &am33xx_l4_wkup__smartreflex0,
diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
index 3c70f5c1860f..cde415570e04 100644
--- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
@@ -32,7 +32,6 @@
 #include "cm1_54xx.h"
 #include "cm2_54xx.h"
 #include "prm54xx.h"
-#include "prm-regbits-54xx.h"
 #include "i2c.h"
 #include "mmc.h"
 #include "wd_timer.h"
@@ -741,6 +740,39 @@ static struct omap_hwmod omap54xx_kbd_hwmod = {
 };
 
 /*
+ * 'mailbox' class
+ * mailbox module allowing communication between the on-chip processors using a
+ * queued mailbox-interrupt mechanism.
+ */
+
+static struct omap_hwmod_class_sysconfig omap54xx_mailbox_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .sysc_flags     = (SYSC_HAS_RESET_STATUS | SYSC_HAS_SIDLEMODE |
+                           SYSC_HAS_SOFTRESET),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART),
+        .sysc_fields    = &omap_hwmod_sysc_type2,
+};
+
+static struct omap_hwmod_class omap54xx_mailbox_hwmod_class = {
+        .name   = "mailbox",
+        .sysc   = &omap54xx_mailbox_sysc,
+};
+
+/* mailbox */
+static struct omap_hwmod omap54xx_mailbox_hwmod = {
+        .name           = "mailbox",
+        .class          = &omap54xx_mailbox_hwmod_class,
+        .clkdm_name     = "l4cfg_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = OMAP54XX_CM_L4CFG_MAILBOX_CLKCTRL_OFFSET,
+                        .context_offs = OMAP54XX_RM_L4CFG_MAILBOX_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/*
  * 'mcbsp' class
  * multi channel buffered serial port controller
  */
@@ -1808,6 +1840,14 @@ static struct omap_hwmod_ocp_if omap54xx_l4_wkup__kbd = {
         .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };
 
+/* l4_cfg -> mailbox */
+static struct omap_hwmod_ocp_if omap54xx_l4_cfg__mailbox = {
+        .master         = &omap54xx_l4_cfg_hwmod,
+        .slave          = &omap54xx_mailbox_hwmod,
+        .clk            = "l4_root_clk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
 /* l4_abe -> mcbsp1 */
 static struct omap_hwmod_ocp_if omap54xx_l4_abe__mcbsp1 = {
         .master         = &omap54xx_l4_abe_hwmod,
@@ -2108,6 +2148,7 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = {
         &omap54xx_l4_per__i2c4,
         &omap54xx_l4_per__i2c5,
         &omap54xx_l4_wkup__kbd,
+        &omap54xx_l4_cfg__mailbox,
         &omap54xx_l4_abe__mcbsp1,
         &omap54xx_l4_abe__mcbsp2,
         &omap54xx_l4_abe__mcbsp3,
diff --git a/arch/arm/mach-omap2/omap_hwmod_7xx_data.c b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
new file mode 100644
index 000000000000..db32d5380b11
--- /dev/null
+++ b/arch/arm/mach-omap2/omap_hwmod_7xx_data.c
@@ -0,0 +1,2724 @@
+/*
+ * Hardware modules present on the DRA7xx chips
+ *
+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com
+ *
+ * Paul Walmsley
+ * Benoit Cousson
+ *
+ * This file is automatically generated from the OMAP hardware databases.
+ * We respectfully ask that any modifications to this file be coordinated
+ * with the public linux-omap@vger.kernel.org mailing list and the
+ * authors above to ensure that the autogeneration scripts are kept
+ * up-to-date with the file contents.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/io.h>
+#include <linux/platform_data/gpio-omap.h>
+#include <linux/power/smartreflex.h>
+#include <linux/i2c-omap.h>
+
+#include <linux/omap-dma.h>
+#include <linux/platform_data/spi-omap2-mcspi.h>
+#include <linux/platform_data/asoc-ti-mcbsp.h>
+#include <plat/dmtimer.h>
+
+#include "omap_hwmod.h"
+#include "omap_hwmod_common_data.h"
+#include "cm1_7xx.h"
+#include "cm2_7xx.h"
+#include "prm7xx.h"
+#include "i2c.h"
+#include "mmc.h"
+#include "wd_timer.h"
+
+/* Base offset for all DRA7XX interrupts external to MPUSS */
+#define DRA7XX_IRQ_GIC_START    32
+
+/* Base offset for all DRA7XX dma requests */
+#define DRA7XX_DMA_REQ_START    1
+
+
+/*
+ * IP blocks
+ */
+
+/*
+ * 'l3' class
+ * instance(s): l3_instr, l3_main_1, l3_main_2
+ */
+static struct omap_hwmod_class dra7xx_l3_hwmod_class = {
+        .name   = "l3",
+};
+
+/* l3_instr */
+static struct omap_hwmod dra7xx_l3_instr_hwmod = {
+        .name           = "l3_instr",
+        .class          = &dra7xx_l3_hwmod_class,
+        .clkdm_name     = "l3instr_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L3INSTR_L3_INSTR_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L3INSTR_L3_INSTR_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_HWCTRL,
+                },
+        },
+};
+
+/* l3_main_1 */
+static struct omap_hwmod dra7xx_l3_main_1_hwmod = {
+        .name           = "l3_main_1",
+        .class          = &dra7xx_l3_hwmod_class,
+        .clkdm_name     = "l3main1_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L3MAIN1_L3_MAIN_1_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L3MAIN1_L3_MAIN_1_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/* l3_main_2 */
+static struct omap_hwmod dra7xx_l3_main_2_hwmod = {
+        .name           = "l3_main_2",
+        .class          = &dra7xx_l3_hwmod_class,
+        .clkdm_name     = "l3instr_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L3INSTR_L3_MAIN_2_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L3INSTR_L3_MAIN_2_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_HWCTRL,
+                },
+        },
+};
+
+/*
+ * 'l4' class
+ * instance(s): l4_cfg, l4_per1, l4_per2, l4_per3, l4_wkup
+ */
+static struct omap_hwmod_class dra7xx_l4_hwmod_class = {
+        .name   = "l4",
+};
+
+/* l4_cfg */
+static struct omap_hwmod dra7xx_l4_cfg_hwmod = {
+        .name           = "l4_cfg",
+        .class          = &dra7xx_l4_hwmod_class,
+        .clkdm_name     = "l4cfg_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4CFG_L4_CFG_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4CFG_L4_CFG_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/* l4_per1 */
+static struct omap_hwmod dra7xx_l4_per1_hwmod = {
+        .name           = "l4_per1",
+        .class          = &dra7xx_l4_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_L4_PER1_CLKCTRL_OFFSET,
+                        .flags = HWMOD_OMAP4_NO_CONTEXT_LOSS_BIT,
+                },
+        },
+};
+
+/* l4_per2 */
+static struct omap_hwmod dra7xx_l4_per2_hwmod = {
+        .name           = "l4_per2",
+        .class          = &dra7xx_l4_hwmod_class,
+        .clkdm_name     = "l4per2_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER2_L4_PER2_CLKCTRL_OFFSET,
+                        .flags = HWMOD_OMAP4_NO_CONTEXT_LOSS_BIT,
+                },
+        },
+};
+
+/* l4_per3 */
+static struct omap_hwmod dra7xx_l4_per3_hwmod = {
+        .name           = "l4_per3",
+        .class          = &dra7xx_l4_hwmod_class,
+        .clkdm_name     = "l4per3_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER3_L4_PER3_CLKCTRL_OFFSET,
+                        .flags = HWMOD_OMAP4_NO_CONTEXT_LOSS_BIT,
+                },
+        },
+};
+
+/* l4_wkup */
+static struct omap_hwmod dra7xx_l4_wkup_hwmod = {
+        .name           = "l4_wkup",
+        .class          = &dra7xx_l4_hwmod_class,
+        .clkdm_name     = "wkupaon_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_WKUPAON_L4_WKUP_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_WKUPAON_L4_WKUP_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/*
+ * 'atl' class
+ *
+ */
+
+static struct omap_hwmod_class dra7xx_atl_hwmod_class = {
+        .name   = "atl",
+};
+
+/* atl */
+static struct omap_hwmod dra7xx_atl_hwmod = {
+        .name           = "atl",
+        .class          = &dra7xx_atl_hwmod_class,
+        .clkdm_name     = "atl_clkdm",
+        .main_clk       = "atl_gfclk_mux",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_ATL_ATL_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_ATL_ATL_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/*
+ * 'bb2d' class
+ *
+ */
+
+static struct omap_hwmod_class dra7xx_bb2d_hwmod_class = {
+        .name   = "bb2d",
+};
+
+/* bb2d */
+static struct omap_hwmod dra7xx_bb2d_hwmod = {
+        .name           = "bb2d",
+        .class          = &dra7xx_bb2d_hwmod_class,
+        .clkdm_name     = "dss_clkdm",
+        .main_clk       = "dpll_core_h24x2_ck",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_DSS_BB2D_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_DSS_BB2D_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/*
+ * 'counter' class
+ *
+ */
+
+static struct omap_hwmod_class_sysconfig dra7xx_counter_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .sysc_flags     = SYSC_HAS_SIDLEMODE,
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP),
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class dra7xx_counter_hwmod_class = {
+        .name   = "counter",
+        .sysc   = &dra7xx_counter_sysc,
+};
+
+/* counter_32k */
+static struct omap_hwmod dra7xx_counter_32k_hwmod = {
+        .name           = "counter_32k",
+        .class          = &dra7xx_counter_hwmod_class,
+        .clkdm_name     = "wkupaon_clkdm",
+        .flags          = HWMOD_SWSUP_SIDLE,
+        .main_clk       = "wkupaon_iclk_mux",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_WKUPAON_COUNTER_32K_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_WKUPAON_COUNTER_32K_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/*
+ * 'ctrl_module' class
+ *
+ */
+
+static struct omap_hwmod_class dra7xx_ctrl_module_hwmod_class = {
+        .name   = "ctrl_module",
+};
+
+/* ctrl_module_wkup */
+static struct omap_hwmod dra7xx_ctrl_module_wkup_hwmod = {
+        .name           = "ctrl_module_wkup",
+        .class          = &dra7xx_ctrl_module_hwmod_class,
+        .clkdm_name     = "wkupaon_clkdm",
+        .prcm = {
+                .omap4 = {
+                        .flags = HWMOD_OMAP4_NO_CONTEXT_LOSS_BIT,
+                },
+        },
+};
+
+/*
+ * 'dcan' class
+ *
+ */
+
+static struct omap_hwmod_class dra7xx_dcan_hwmod_class = {
+        .name   = "dcan",
+};
+
+/* dcan1 */
+static struct omap_hwmod dra7xx_dcan1_hwmod = {
+        .name           = "dcan1",
+        .class          = &dra7xx_dcan_hwmod_class,
+        .clkdm_name     = "wkupaon_clkdm",
+        .main_clk       = "dcan1_sys_clk_mux",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_WKUPAON_DCAN1_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_WKUPAON_DCAN1_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/* dcan2 */
+static struct omap_hwmod dra7xx_dcan2_hwmod = {
+        .name           = "dcan2",
+        .class          = &dra7xx_dcan_hwmod_class,
+        .clkdm_name     = "l4per2_clkdm",
+        .main_clk       = "sys_clkin1",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER2_DCAN2_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER2_DCAN2_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/*
+ * 'dma' class
+ *
+ */
+
+static struct omap_hwmod_class_sysconfig dra7xx_dma_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x002c,
+        .syss_offs      = 0x0028,
+        .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_CLOCKACTIVITY |
+                           SYSC_HAS_EMUFREE | SYSC_HAS_MIDLEMODE |
+                           SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
+                           SYSS_HAS_RESET_STATUS),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO |
+                           MSTANDBY_SMART | MSTANDBY_SMART_WKUP),
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class dra7xx_dma_hwmod_class = {
+        .name   = "dma",
+        .sysc   = &dra7xx_dma_sysc,
+};
+
+/* dma dev_attr */
+static struct omap_dma_dev_attr dma_dev_attr = {
+        .dev_caps       = RESERVE_CHANNEL | DMA_LINKED_LCH | GLOBAL_PRIORITY |
+                          IS_CSSA_32 | IS_CDSA_32 | IS_RW_PRIORITY,
+        .lch_count      = 32,
+};
+
+/* dma_system */
+static struct omap_hwmod_irq_info dra7xx_dma_system_irqs[] = {
+        { .name = "0", .irq = 12 + DRA7XX_IRQ_GIC_START },
+        { .name = "1", .irq = 13 + DRA7XX_IRQ_GIC_START },
+        { .name = "2", .irq = 14 + DRA7XX_IRQ_GIC_START },
+        { .name = "3", .irq = 15 + DRA7XX_IRQ_GIC_START },
+        { .irq = -1 }
+};
+
+static struct omap_hwmod dra7xx_dma_system_hwmod = {
+        .name           = "dma_system",
+        .class          = &dra7xx_dma_hwmod_class,
+        .clkdm_name     = "dma_clkdm",
+        .mpu_irqs       = dra7xx_dma_system_irqs,
+        .main_clk       = "l3_iclk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_DMA_DMA_SYSTEM_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_DMA_DMA_SYSTEM_CONTEXT_OFFSET,
+                },
+        },
+        .dev_attr       = &dma_dev_attr,
+};
+
+/*
+ * 'dss' class
+ *
+ */
+
+static struct omap_hwmod_class_sysconfig dra7xx_dss_sysc = {
+        .rev_offs       = 0x0000,
+        .syss_offs      = 0x0014,
+        .sysc_flags     = SYSS_HAS_RESET_STATUS,
+};
+
+static struct omap_hwmod_class dra7xx_dss_hwmod_class = {
+        .name   = "dss",
+        .sysc   = &dra7xx_dss_sysc,
+        .reset  = omap_dss_reset,
+};
+
+/* dss */
+static struct omap_hwmod_dma_info dra7xx_dss_sdma_reqs[] = {
+        { .dma_req = 75 + DRA7XX_DMA_REQ_START },
+        { .dma_req = -1 }
+};
+
+static struct omap_hwmod_opt_clk dss_opt_clks[] = {
+        { .role = "dss_clk", .clk = "dss_dss_clk" },
+        { .role = "hdmi_phy_clk", .clk = "dss_48mhz_clk" },
+        { .role = "32khz_clk", .clk = "dss_32khz_clk" },
+        { .role = "video2_clk", .clk = "dss_video2_clk" },
+        { .role = "video1_clk", .clk = "dss_video1_clk" },
+        { .role = "hdmi_clk", .clk = "dss_hdmi_clk" },
+};
+
+static struct omap_hwmod dra7xx_dss_hwmod = {
+        .name           = "dss_core",
+        .class          = &dra7xx_dss_hwmod_class,
+        .clkdm_name     = "dss_clkdm",
+        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
+        .sdma_reqs      = dra7xx_dss_sdma_reqs,
+        .main_clk       = "dss_dss_clk",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_DSS_DSS_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_DSS_DSS_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+        .opt_clks       = dss_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(dss_opt_clks),
+};
+
+/*
+ * 'dispc' class
+ * display controller
+ */
+
+static struct omap_hwmod_class_sysconfig dra7xx_dispc_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .syss_offs      = 0x0014,
+        .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_CLOCKACTIVITY |
+                           SYSC_HAS_ENAWAKEUP | SYSC_HAS_MIDLEMODE |
+                           SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
+                           SYSS_HAS_RESET_STATUS),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           MSTANDBY_FORCE | MSTANDBY_NO | MSTANDBY_SMART),
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class dra7xx_dispc_hwmod_class = {
+        .name   = "dispc",
+        .sysc   = &dra7xx_dispc_sysc,
+};
+
+/* dss_dispc */
+/* dss_dispc dev_attr */
+static struct omap_dss_dispc_dev_attr dss_dispc_dev_attr = {
+        .has_framedonetv_irq    = 1,
+        .manager_count          = 4,
+};
+
+static struct omap_hwmod dra7xx_dss_dispc_hwmod = {
+        .name           = "dss_dispc",
+        .class          = &dra7xx_dispc_hwmod_class,
+        .clkdm_name     = "dss_clkdm",
+        .main_clk       = "dss_dss_clk",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_DSS_DSS_CLKCTRL_OFFSET,
+                        .flags = HWMOD_OMAP4_NO_CONTEXT_LOSS_BIT,
+                },
+        },
+        .dev_attr       = &dss_dispc_dev_attr,
+};
+
+/*
+ * 'hdmi' class
+ * hdmi controller
+ */
+
+static struct omap_hwmod_class_sysconfig dra7xx_hdmi_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .sysc_flags     = (SYSC_HAS_RESET_STATUS | SYSC_HAS_SIDLEMODE |
+                           SYSC_HAS_SOFTRESET),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP),
+        .sysc_fields    = &omap_hwmod_sysc_type2,
+};
+
+static struct omap_hwmod_class dra7xx_hdmi_hwmod_class = {
+        .name   = "hdmi",
+        .sysc   = &dra7xx_hdmi_sysc,
+};
+
+/* dss_hdmi */
+
+static struct omap_hwmod_opt_clk dss_hdmi_opt_clks[] = {
+        { .role = "sys_clk", .clk = "dss_hdmi_clk" },
+};
+
+static struct omap_hwmod dra7xx_dss_hdmi_hwmod = {
+        .name           = "dss_hdmi",
+        .class          = &dra7xx_hdmi_hwmod_class,
+        .clkdm_name     = "dss_clkdm",
+        .main_clk       = "dss_48mhz_clk",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_DSS_DSS_CLKCTRL_OFFSET,
+                        .flags = HWMOD_OMAP4_NO_CONTEXT_LOSS_BIT,
+                },
+        },
+        .opt_clks       = dss_hdmi_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(dss_hdmi_opt_clks),
+};
+
+/*
+ * 'elm' class
+ *
+ */
+
+static struct omap_hwmod_class_sysconfig dra7xx_elm_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .syss_offs      = 0x0014,
+        .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_CLOCKACTIVITY |
+                           SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
+                           SYSS_HAS_RESET_STATUS),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP),
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class dra7xx_elm_hwmod_class = {
+        .name   = "elm",
+        .sysc   = &dra7xx_elm_sysc,
+};
+
+/* elm */
+
+static struct omap_hwmod dra7xx_elm_hwmod = {
+        .name           = "elm",
+        .class          = &dra7xx_elm_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .main_clk       = "l3_iclk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_ELM_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_ELM_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/*
+ * 'gpio' class
+ *
+ */
+
+static struct omap_hwmod_class_sysconfig dra7xx_gpio_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .syss_offs      = 0x0114,
+        .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_ENAWAKEUP |
+                           SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
+                           SYSS_HAS_RESET_STATUS),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP),
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class dra7xx_gpio_hwmod_class = {
+        .name   = "gpio",
+        .sysc   = &dra7xx_gpio_sysc,
+        .rev    = 2,
+};
+
+/* gpio dev_attr */
+static struct omap_gpio_dev_attr gpio_dev_attr = {
+        .bank_width     = 32,
+        .dbck_flag      = true,
+};
+
+/* gpio1 */
+static struct omap_hwmod_opt_clk gpio1_opt_clks[] = {
+        { .role = "dbclk", .clk = "gpio1_dbclk" },
+};
+
+static struct omap_hwmod dra7xx_gpio1_hwmod = {
+        .name           = "gpio1",
+        .class          = &dra7xx_gpio_hwmod_class,
+        .clkdm_name     = "wkupaon_clkdm",
+        .main_clk       = "wkupaon_iclk_mux",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_WKUPAON_GPIO1_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_WKUPAON_GPIO1_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_HWCTRL,
+                },
+        },
+        .opt_clks       = gpio1_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(gpio1_opt_clks),
+        .dev_attr       = &gpio_dev_attr,
+};
+
+/* gpio2 */
+static struct omap_hwmod_opt_clk gpio2_opt_clks[] = {
+        { .role = "dbclk", .clk = "gpio2_dbclk" },
+};
+
+static struct omap_hwmod dra7xx_gpio2_hwmod = {
+        .name           = "gpio2",
+        .class          = &dra7xx_gpio_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
+        .main_clk       = "l3_iclk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_GPIO2_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_GPIO2_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_HWCTRL,
+                },
+        },
+        .opt_clks       = gpio2_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(gpio2_opt_clks),
+        .dev_attr       = &gpio_dev_attr,
+};
+
+/* gpio3 */
+static struct omap_hwmod_opt_clk gpio3_opt_clks[] = {
+        { .role = "dbclk", .clk = "gpio3_dbclk" },
+};
+
+static struct omap_hwmod dra7xx_gpio3_hwmod = {
+        .name           = "gpio3",
+        .class          = &dra7xx_gpio_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
+        .main_clk       = "l3_iclk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_GPIO3_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_GPIO3_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_HWCTRL,
+                },
+        },
+        .opt_clks       = gpio3_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(gpio3_opt_clks),
+        .dev_attr       = &gpio_dev_attr,
+};
+
+/* gpio4 */
+static struct omap_hwmod_opt_clk gpio4_opt_clks[] = {
+        { .role = "dbclk", .clk = "gpio4_dbclk" },
+};
+
+static struct omap_hwmod dra7xx_gpio4_hwmod = {
+        .name           = "gpio4",
+        .class          = &dra7xx_gpio_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
+        .main_clk       = "l3_iclk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_GPIO4_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_GPIO4_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_HWCTRL,
+                },
+        },
+        .opt_clks       = gpio4_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(gpio4_opt_clks),
+        .dev_attr       = &gpio_dev_attr,
+};
+
+/* gpio5 */
+static struct omap_hwmod_opt_clk gpio5_opt_clks[] = {
+        { .role = "dbclk", .clk = "gpio5_dbclk" },
+};
+
+static struct omap_hwmod dra7xx_gpio5_hwmod = {
+        .name           = "gpio5",
+        .class          = &dra7xx_gpio_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
+        .main_clk       = "l3_iclk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_GPIO5_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_GPIO5_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_HWCTRL,
+                },
+        },
+        .opt_clks       = gpio5_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(gpio5_opt_clks),
+        .dev_attr       = &gpio_dev_attr,
+};
+
+/* gpio6 */
+static struct omap_hwmod_opt_clk gpio6_opt_clks[] = {
+        { .role = "dbclk", .clk = "gpio6_dbclk" },
+};
+
+static struct omap_hwmod dra7xx_gpio6_hwmod = {
+        .name           = "gpio6",
+        .class          = &dra7xx_gpio_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
+        .main_clk       = "l3_iclk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_GPIO6_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_GPIO6_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_HWCTRL,
+                },
+        },
+        .opt_clks       = gpio6_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(gpio6_opt_clks),
+        .dev_attr       = &gpio_dev_attr,
+};
+
+/* gpio7 */
+static struct omap_hwmod_opt_clk gpio7_opt_clks[] = {
+        { .role = "dbclk", .clk = "gpio7_dbclk" },
+};
+
+static struct omap_hwmod dra7xx_gpio7_hwmod = {
+        .name           = "gpio7",
+        .class          = &dra7xx_gpio_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
+        .main_clk       = "l3_iclk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_GPIO7_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_GPIO7_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_HWCTRL,
+                },
+        },
+        .opt_clks       = gpio7_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(gpio7_opt_clks),
+        .dev_attr       = &gpio_dev_attr,
+};
+
+/* gpio8 */
+static struct omap_hwmod_opt_clk gpio8_opt_clks[] = {
+        { .role = "dbclk", .clk = "gpio8_dbclk" },
+};
+
+static struct omap_hwmod dra7xx_gpio8_hwmod = {
+        .name           = "gpio8",
+        .class          = &dra7xx_gpio_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .flags          = HWMOD_CONTROL_OPT_CLKS_IN_RESET,
+        .main_clk       = "l3_iclk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_GPIO8_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_GPIO8_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_HWCTRL,
+                },
+        },
+        .opt_clks       = gpio8_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(gpio8_opt_clks),
+        .dev_attr       = &gpio_dev_attr,
+};
+
+/*
+ * 'gpmc' class
+ *
+ */
+
+static struct omap_hwmod_class_sysconfig dra7xx_gpmc_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .syss_offs      = 0x0014,
+        .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_SIDLEMODE |
+                           SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP),
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class dra7xx_gpmc_hwmod_class = {
+        .name   = "gpmc",
+        .sysc   = &dra7xx_gpmc_sysc,
+};
+
+/* gpmc */
+
+static struct omap_hwmod dra7xx_gpmc_hwmod = {
+        .name           = "gpmc",
+        .class          = &dra7xx_gpmc_hwmod_class,
+        .clkdm_name     = "l3main1_clkdm",
+        .flags          = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
+        .main_clk       = "l3_iclk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L3MAIN1_GPMC_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L3MAIN1_GPMC_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_HWCTRL,
+                },
+        },
+};
+
+/*
+ * 'hdq1w' class
+ *
+ */
+
+static struct omap_hwmod_class_sysconfig dra7xx_hdq1w_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0014,
+        .syss_offs      = 0x0018,
+        .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_SOFTRESET |
+                           SYSS_HAS_RESET_STATUS),
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class dra7xx_hdq1w_hwmod_class = {
+        .name   = "hdq1w",
+        .sysc   = &dra7xx_hdq1w_sysc,
+};
+
+/* hdq1w */
+
+static struct omap_hwmod dra7xx_hdq1w_hwmod = {
+        .name           = "hdq1w",
+        .class          = &dra7xx_hdq1w_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .flags          = HWMOD_INIT_NO_RESET,
+        .main_clk       = "func_12m_fclk",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_HDQ1W_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_HDQ1W_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/*
+ * 'i2c' class
+ *
+ */
+
+static struct omap_hwmod_class_sysconfig dra7xx_i2c_sysc = {
+        .sysc_offs      = 0x0010,
+        .syss_offs      = 0x0090,
+        .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_CLOCKACTIVITY |
+                           SYSC_HAS_ENAWAKEUP | SYSC_HAS_SIDLEMODE |
+                           SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP),
+        .clockact       = CLOCKACT_TEST_ICLK,
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class dra7xx_i2c_hwmod_class = {
+        .name   = "i2c",
+        .sysc   = &dra7xx_i2c_sysc,
+        .reset  = &omap_i2c_reset,
+        .rev    = OMAP_I2C_IP_VERSION_2,
+};
+
+/* i2c dev_attr */
+static struct omap_i2c_dev_attr i2c_dev_attr = {
+        .flags  = OMAP_I2C_FLAG_BUS_SHIFT_NONE,
+};
+
+/* i2c1 */
+static struct omap_hwmod dra7xx_i2c1_hwmod = {
+        .name           = "i2c1",
+        .class          = &dra7xx_i2c_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .flags          = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,
+        .main_clk       = "func_96m_fclk",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_I2C1_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_I2C1_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+        .dev_attr       = &i2c_dev_attr,
+};
+
+/* i2c2 */
+static struct omap_hwmod dra7xx_i2c2_hwmod = {
+        .name           = "i2c2",
+        .class          = &dra7xx_i2c_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .flags          = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,
+        .main_clk       = "func_96m_fclk",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_I2C2_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_I2C2_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+        .dev_attr       = &i2c_dev_attr,
+};
+
+/* i2c3 */
+static struct omap_hwmod dra7xx_i2c3_hwmod = {
+        .name           = "i2c3",
+        .class          = &dra7xx_i2c_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .flags          = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,
+        .main_clk       = "func_96m_fclk",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_I2C3_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_I2C3_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+        .dev_attr       = &i2c_dev_attr,
+};
+
+/* i2c4 */
+static struct omap_hwmod dra7xx_i2c4_hwmod = {
+        .name           = "i2c4",
+        .class          = &dra7xx_i2c_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .flags          = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,
+        .main_clk       = "func_96m_fclk",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_I2C4_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_I2C4_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+        .dev_attr       = &i2c_dev_attr,
+};
+
+/* i2c5 */
+static struct omap_hwmod dra7xx_i2c5_hwmod = {
+        .name           = "i2c5",
+        .class          = &dra7xx_i2c_hwmod_class,
+        .clkdm_name     = "ipu_clkdm",
+        .flags          = HWMOD_16BIT_REG | HWMOD_SET_DEFAULT_CLOCKACT,
+        .main_clk       = "func_96m_fclk",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_IPU_I2C5_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_IPU_I2C5_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+        .dev_attr       = &i2c_dev_attr,
+};
+
+/*
+ * 'mcspi' class
+ *
+ */
+
+static struct omap_hwmod_class_sysconfig dra7xx_mcspi_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .sysc_flags     = (SYSC_HAS_EMUFREE | SYSC_HAS_RESET_STATUS |
+                           SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP),
+        .sysc_fields    = &omap_hwmod_sysc_type2,
+};
+
+static struct omap_hwmod_class dra7xx_mcspi_hwmod_class = {
+        .name   = "mcspi",
+        .sysc   = &dra7xx_mcspi_sysc,
+        .rev    = OMAP4_MCSPI_REV,
+};
+
+/* mcspi1 */
+/* mcspi1 dev_attr */
+static struct omap2_mcspi_dev_attr mcspi1_dev_attr = {
+        .num_chipselect = 4,
+};
+
+static struct omap_hwmod dra7xx_mcspi1_hwmod = {
+        .name           = "mcspi1",
+        .class          = &dra7xx_mcspi_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .main_clk       = "func_48m_fclk",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_MCSPI1_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_MCSPI1_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+        .dev_attr       = &mcspi1_dev_attr,
+};
+
+/* mcspi2 */
+/* mcspi2 dev_attr */
+static struct omap2_mcspi_dev_attr mcspi2_dev_attr = {
+        .num_chipselect = 2,
+};
+
+static struct omap_hwmod dra7xx_mcspi2_hwmod = {
+        .name           = "mcspi2",
+        .class          = &dra7xx_mcspi_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .main_clk       = "func_48m_fclk",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_MCSPI2_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_MCSPI2_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+        .dev_attr       = &mcspi2_dev_attr,
+};
+
+/* mcspi3 */
+/* mcspi3 dev_attr */
+static struct omap2_mcspi_dev_attr mcspi3_dev_attr = {
+        .num_chipselect = 2,
+};
+
+static struct omap_hwmod dra7xx_mcspi3_hwmod = {
+        .name           = "mcspi3",
+        .class          = &dra7xx_mcspi_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .main_clk       = "func_48m_fclk",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_MCSPI3_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_MCSPI3_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+        .dev_attr       = &mcspi3_dev_attr,
+};
+
+/* mcspi4 */
+/* mcspi4 dev_attr */
+static struct omap2_mcspi_dev_attr mcspi4_dev_attr = {
+        .num_chipselect = 1,
+};
+
+static struct omap_hwmod dra7xx_mcspi4_hwmod = {
+        .name           = "mcspi4",
+        .class          = &dra7xx_mcspi_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .main_clk       = "func_48m_fclk",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_MCSPI4_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_MCSPI4_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+        .dev_attr       = &mcspi4_dev_attr,
+};
+
+/*
+ * 'mmc' class
+ *
+ */
+
+static struct omap_hwmod_class_sysconfig dra7xx_mmc_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .sysc_flags     = (SYSC_HAS_EMUFREE | SYSC_HAS_MIDLEMODE |
+                           SYSC_HAS_RESET_STATUS | SYSC_HAS_SIDLEMODE |
+                           SYSC_HAS_SOFTRESET),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO |
+                           MSTANDBY_SMART | MSTANDBY_SMART_WKUP),
+        .sysc_fields    = &omap_hwmod_sysc_type2,
+};
+
+static struct omap_hwmod_class dra7xx_mmc_hwmod_class = {
+        .name   = "mmc",
+        .sysc   = &dra7xx_mmc_sysc,
+};
+
+/* mmc1 */
+static struct omap_hwmod_opt_clk mmc1_opt_clks[] = {
+        { .role = "clk32k", .clk = "mmc1_clk32k" },
+};
+
+/* mmc1 dev_attr */
+static struct omap_mmc_dev_attr mmc1_dev_attr = {
+        .flags  = OMAP_HSMMC_SUPPORTS_DUAL_VOLT,
+};
+
+static struct omap_hwmod dra7xx_mmc1_hwmod = {
+        .name           = "mmc1",
+        .class          = &dra7xx_mmc_hwmod_class,
+        .clkdm_name     = "l3init_clkdm",
+        .main_clk       = "mmc1_fclk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L3INIT_MMC1_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L3INIT_MMC1_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+        .opt_clks       = mmc1_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(mmc1_opt_clks),
+        .dev_attr       = &mmc1_dev_attr,
+};
+
+/* mmc2 */
+static struct omap_hwmod_opt_clk mmc2_opt_clks[] = {
+        { .role = "clk32k", .clk = "mmc2_clk32k" },
+};
+
+static struct omap_hwmod dra7xx_mmc2_hwmod = {
+        .name           = "mmc2",
+        .class          = &dra7xx_mmc_hwmod_class,
+        .clkdm_name     = "l3init_clkdm",
+        .main_clk       = "mmc2_fclk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L3INIT_MMC2_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L3INIT_MMC2_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+        .opt_clks       = mmc2_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(mmc2_opt_clks),
+};
+
+/* mmc3 */
+static struct omap_hwmod_opt_clk mmc3_opt_clks[] = {
+        { .role = "clk32k", .clk = "mmc3_clk32k" },
+};
+
+static struct omap_hwmod dra7xx_mmc3_hwmod = {
+        .name           = "mmc3",
+        .class          = &dra7xx_mmc_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .main_clk       = "mmc3_gfclk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_MMC3_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_MMC3_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+        .opt_clks       = mmc3_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(mmc3_opt_clks),
+};
+
+/* mmc4 */
+static struct omap_hwmod_opt_clk mmc4_opt_clks[] = {
+        { .role = "clk32k", .clk = "mmc4_clk32k" },
+};
+
+static struct omap_hwmod dra7xx_mmc4_hwmod = {
+        .name           = "mmc4",
+        .class          = &dra7xx_mmc_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .main_clk       = "mmc4_gfclk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_MMC4_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_MMC4_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+        .opt_clks       = mmc4_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(mmc4_opt_clks),
+};
+
+/*
+ * 'mpu' class
+ *
+ */
+
+static struct omap_hwmod_class dra7xx_mpu_hwmod_class = {
+        .name   = "mpu",
+};
+
+/* mpu */
+static struct omap_hwmod dra7xx_mpu_hwmod = {
+        .name           = "mpu",
+        .class          = &dra7xx_mpu_hwmod_class,
+        .clkdm_name     = "mpu_clkdm",
+        .flags          = HWMOD_INIT_NO_IDLE | HWMOD_INIT_NO_RESET,
+        .main_clk       = "dpll_mpu_m2_ck",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_MPU_MPU_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_MPU_MPU_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/*
+ * 'ocp2scp' class
+ *
+ */
+
+static struct omap_hwmod_class_sysconfig dra7xx_ocp2scp_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .syss_offs      = 0x0014,
+        .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_SIDLEMODE |
+                           SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP),
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class dra7xx_ocp2scp_hwmod_class = {
+        .name   = "ocp2scp",
+        .sysc   = &dra7xx_ocp2scp_sysc,
+};
+
+/* ocp2scp1 */
+static struct omap_hwmod dra7xx_ocp2scp1_hwmod = {
+        .name           = "ocp2scp1",
+        .class          = &dra7xx_ocp2scp_hwmod_class,
+        .clkdm_name     = "l3init_clkdm",
+        .main_clk       = "l4_root_clk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L3INIT_OCP2SCP1_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L3INIT_OCP2SCP1_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_HWCTRL,
+                },
+        },
+};
+
+/*
+ * 'qspi' class
+ *
+ */
+
+static struct omap_hwmod_class_sysconfig dra7xx_qspi_sysc = {
+        .sysc_offs      = 0x0010,
+        .sysc_flags     = SYSC_HAS_SIDLEMODE,
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP),
+        .sysc_fields    = &omap_hwmod_sysc_type2,
+};
+
+static struct omap_hwmod_class dra7xx_qspi_hwmod_class = {
+        .name   = "qspi",
+        .sysc   = &dra7xx_qspi_sysc,
+};
+
+/* qspi */
+static struct omap_hwmod dra7xx_qspi_hwmod = {
+        .name           = "qspi",
+        .class          = &dra7xx_qspi_hwmod_class,
+        .clkdm_name     = "l4per2_clkdm",
+        .main_clk       = "qspi_gfclk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER2_QSPI_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER2_QSPI_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/*
+ * 'sata' class
+ *
+ */
+
+static struct omap_hwmod_class_sysconfig dra7xx_sata_sysc = {
+        .sysc_offs      = 0x0000,
+        .sysc_flags     = (SYSC_HAS_MIDLEMODE | SYSC_HAS_SIDLEMODE),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP | MSTANDBY_FORCE | MSTANDBY_NO |
+                           MSTANDBY_SMART | MSTANDBY_SMART_WKUP),
+        .sysc_fields    = &omap_hwmod_sysc_type2,
+};
+
+static struct omap_hwmod_class dra7xx_sata_hwmod_class = {
+        .name   = "sata",
+        .sysc   = &dra7xx_sata_sysc,
+};
+
+/* sata */
+static struct omap_hwmod_opt_clk sata_opt_clks[] = {
+        { .role = "ref_clk", .clk = "sata_ref_clk" },
+};
+
+static struct omap_hwmod dra7xx_sata_hwmod = {
+        .name           = "sata",
+        .class          = &dra7xx_sata_hwmod_class,
+        .clkdm_name     = "l3init_clkdm",
+        .flags          = HWMOD_SWSUP_SIDLE | HWMOD_SWSUP_MSTANDBY,
+        .main_clk       = "func_48m_fclk",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L3INIT_SATA_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L3INIT_SATA_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+        .opt_clks       = sata_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(sata_opt_clks),
+};
+
+/*
+ * 'smartreflex' class
+ *
+ */
+
+/* The IP is not compliant to type1 / type2 scheme */
+static struct omap_hwmod_sysc_fields omap_hwmod_sysc_type_smartreflex = {
+        .sidle_shift    = 24,
+        .enwkup_shift   = 26,
+};
+
+static struct omap_hwmod_class_sysconfig dra7xx_smartreflex_sysc = {
+        .sysc_offs      = 0x0038,
+        .sysc_flags     = (SYSC_HAS_ENAWAKEUP | SYSC_HAS_SIDLEMODE),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP),
+        .sysc_fields    = &omap_hwmod_sysc_type_smartreflex,
+};
+
+static struct omap_hwmod_class dra7xx_smartreflex_hwmod_class = {
+        .name   = "smartreflex",
+        .sysc   = &dra7xx_smartreflex_sysc,
+        .rev    = 2,
+};
+
+/* smartreflex_core */
+/* smartreflex_core dev_attr */
+static struct omap_smartreflex_dev_attr smartreflex_core_dev_attr = {
+        .sensor_voltdm_name     = "core",
+};
+
+static struct omap_hwmod dra7xx_smartreflex_core_hwmod = {
+        .name           = "smartreflex_core",
+        .class          = &dra7xx_smartreflex_hwmod_class,
+        .clkdm_name     = "coreaon_clkdm",
+        .main_clk       = "wkupaon_iclk_mux",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_COREAON_SMARTREFLEX_CORE_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_COREAON_SMARTREFLEX_CORE_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+        .dev_attr       = &smartreflex_core_dev_attr,
+};
+
+/* smartreflex_mpu */
+/* smartreflex_mpu dev_attr */
+static struct omap_smartreflex_dev_attr smartreflex_mpu_dev_attr = {
+        .sensor_voltdm_name     = "mpu",
+};
+
+static struct omap_hwmod dra7xx_smartreflex_mpu_hwmod = {
+        .name           = "smartreflex_mpu",
+        .class          = &dra7xx_smartreflex_hwmod_class,
+        .clkdm_name     = "coreaon_clkdm",
+        .main_clk       = "wkupaon_iclk_mux",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_COREAON_SMARTREFLEX_MPU_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_COREAON_SMARTREFLEX_MPU_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+        .dev_attr       = &smartreflex_mpu_dev_attr,
+};
+
+/*
+ * 'spinlock' class
+ *
+ */
+
+static struct omap_hwmod_class_sysconfig dra7xx_spinlock_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .syss_offs      = 0x0014,
+        .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_CLOCKACTIVITY |
+                           SYSC_HAS_ENAWAKEUP | SYSC_HAS_SIDLEMODE |
+                           SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP),
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class dra7xx_spinlock_hwmod_class = {
+        .name   = "spinlock",
+        .sysc   = &dra7xx_spinlock_sysc,
+};
+
+/* spinlock */
+static struct omap_hwmod dra7xx_spinlock_hwmod = {
+        .name           = "spinlock",
+        .class          = &dra7xx_spinlock_hwmod_class,
+        .clkdm_name     = "l4cfg_clkdm",
+        .main_clk       = "l3_iclk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4CFG_SPINLOCK_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4CFG_SPINLOCK_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/*
+ * 'timer' class
+ *
+ * This class contains several variants: ['timer_1ms', 'timer_secure',
+ * 'timer']
+ */
+
+static struct omap_hwmod_class_sysconfig dra7xx_timer_1ms_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .sysc_flags     = (SYSC_HAS_EMUFREE | SYSC_HAS_RESET_STATUS |
+                           SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP),
+        .sysc_fields    = &omap_hwmod_sysc_type2,
+};
+
+static struct omap_hwmod_class dra7xx_timer_1ms_hwmod_class = {
+        .name   = "timer",
+        .sysc   = &dra7xx_timer_1ms_sysc,
+};
+
+static struct omap_hwmod_class_sysconfig dra7xx_timer_secure_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .sysc_flags     = (SYSC_HAS_EMUFREE | SYSC_HAS_RESET_STATUS |
+                           SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP),
+        .sysc_fields    = &omap_hwmod_sysc_type2,
+};
+
+static struct omap_hwmod_class dra7xx_timer_secure_hwmod_class = {
+        .name   = "timer",
+        .sysc   = &dra7xx_timer_secure_sysc,
+};
+
+static struct omap_hwmod_class_sysconfig dra7xx_timer_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .sysc_flags     = (SYSC_HAS_EMUFREE | SYSC_HAS_RESET_STATUS |
+                           SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP),
+        .sysc_fields    = &omap_hwmod_sysc_type2,
+};
+
+static struct omap_hwmod_class dra7xx_timer_hwmod_class = {
+        .name   = "timer",
+        .sysc   = &dra7xx_timer_sysc,
+};
+
+/* timer1 */
+static struct omap_hwmod dra7xx_timer1_hwmod = {
+        .name           = "timer1",
+        .class          = &dra7xx_timer_1ms_hwmod_class,
+        .clkdm_name     = "wkupaon_clkdm",
+        .main_clk       = "timer1_gfclk_mux",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_WKUPAON_TIMER1_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_WKUPAON_TIMER1_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/* timer2 */
+static struct omap_hwmod dra7xx_timer2_hwmod = {
+        .name           = "timer2",
+        .class          = &dra7xx_timer_1ms_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .main_clk       = "timer2_gfclk_mux",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_TIMER2_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_TIMER2_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/* timer3 */
+static struct omap_hwmod dra7xx_timer3_hwmod = {
+        .name           = "timer3",
+        .class          = &dra7xx_timer_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .main_clk       = "timer3_gfclk_mux",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_TIMER3_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_TIMER3_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/* timer4 */
+static struct omap_hwmod dra7xx_timer4_hwmod = {
+        .name           = "timer4",
+        .class          = &dra7xx_timer_secure_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .main_clk       = "timer4_gfclk_mux",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_TIMER4_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_TIMER4_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/* timer5 */
+static struct omap_hwmod dra7xx_timer5_hwmod = {
+        .name           = "timer5",
+        .class          = &dra7xx_timer_hwmod_class,
+        .clkdm_name     = "ipu_clkdm",
+        .main_clk       = "timer5_gfclk_mux",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_IPU_TIMER5_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_IPU_TIMER5_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/* timer6 */
+static struct omap_hwmod dra7xx_timer6_hwmod = {
+        .name           = "timer6",
+        .class          = &dra7xx_timer_hwmod_class,
+        .clkdm_name     = "ipu_clkdm",
+        .main_clk       = "timer6_gfclk_mux",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_IPU_TIMER6_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_IPU_TIMER6_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/* timer7 */
+static struct omap_hwmod dra7xx_timer7_hwmod = {
+        .name           = "timer7",
+        .class          = &dra7xx_timer_hwmod_class,
+        .clkdm_name     = "ipu_clkdm",
+        .main_clk       = "timer7_gfclk_mux",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_IPU_TIMER7_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_IPU_TIMER7_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/* timer8 */
+static struct omap_hwmod dra7xx_timer8_hwmod = {
+        .name           = "timer8",
+        .class          = &dra7xx_timer_hwmod_class,
+        .clkdm_name     = "ipu_clkdm",
+        .main_clk       = "timer8_gfclk_mux",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_IPU_TIMER8_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_IPU_TIMER8_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/* timer9 */
+static struct omap_hwmod dra7xx_timer9_hwmod = {
+        .name           = "timer9",
+        .class          = &dra7xx_timer_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .main_clk       = "timer9_gfclk_mux",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_TIMER9_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_TIMER9_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/* timer10 */
+static struct omap_hwmod dra7xx_timer10_hwmod = {
+        .name           = "timer10",
+        .class          = &dra7xx_timer_1ms_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .main_clk       = "timer10_gfclk_mux",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_TIMER10_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_TIMER10_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/* timer11 */
+static struct omap_hwmod dra7xx_timer11_hwmod = {
+        .name           = "timer11",
+        .class          = &dra7xx_timer_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .main_clk       = "timer11_gfclk_mux",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_TIMER11_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_TIMER11_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/*
+ * 'uart' class
+ *
+ */
+
+static struct omap_hwmod_class_sysconfig dra7xx_uart_sysc = {
+        .rev_offs       = 0x0050,
+        .sysc_offs      = 0x0054,
+        .syss_offs      = 0x0058,
+        .sysc_flags     = (SYSC_HAS_AUTOIDLE | SYSC_HAS_ENAWAKEUP |
+                           SYSC_HAS_SIDLEMODE | SYSC_HAS_SOFTRESET |
+                           SYSS_HAS_RESET_STATUS),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP),
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class dra7xx_uart_hwmod_class = {
+        .name   = "uart",
+        .sysc   = &dra7xx_uart_sysc,
+};
+
+/* uart1 */
+static struct omap_hwmod dra7xx_uart1_hwmod = {
+        .name           = "uart1",
+        .class          = &dra7xx_uart_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .main_clk       = "uart1_gfclk_mux",
+        .flags          = HWMOD_SWSUP_SIDLE_ACT,
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_UART1_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_UART1_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/* uart2 */
+static struct omap_hwmod dra7xx_uart2_hwmod = {
+        .name           = "uart2",
+        .class          = &dra7xx_uart_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .main_clk       = "uart2_gfclk_mux",
+        .flags          = HWMOD_SWSUP_SIDLE_ACT,
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_UART2_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_UART2_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/* uart3 */
+static struct omap_hwmod dra7xx_uart3_hwmod = {
+        .name           = "uart3",
+        .class          = &dra7xx_uart_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .main_clk       = "uart3_gfclk_mux",
+        .flags          = HWMOD_SWSUP_SIDLE_ACT,
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_UART3_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_UART3_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/* uart4 */
+static struct omap_hwmod dra7xx_uart4_hwmod = {
+        .name           = "uart4",
+        .class          = &dra7xx_uart_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .main_clk       = "uart4_gfclk_mux",
+        .flags          = HWMOD_SWSUP_SIDLE_ACT,
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_UART4_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_UART4_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/* uart5 */
+static struct omap_hwmod dra7xx_uart5_hwmod = {
+        .name           = "uart5",
+        .class          = &dra7xx_uart_hwmod_class,
+        .clkdm_name     = "l4per_clkdm",
+        .main_clk       = "uart5_gfclk_mux",
+        .flags          = HWMOD_SWSUP_SIDLE_ACT,
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L4PER_UART5_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L4PER_UART5_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/* uart6 */
+static struct omap_hwmod dra7xx_uart6_hwmod = {
+        .name           = "uart6",
+        .class          = &dra7xx_uart_hwmod_class,
+        .clkdm_name     = "ipu_clkdm",
+        .main_clk       = "uart6_gfclk_mux",
+        .flags          = HWMOD_SWSUP_SIDLE_ACT,
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_IPU_UART6_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_IPU_UART6_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+/*
+ * 'usb_otg_ss' class
+ *
+ */
+
+static struct omap_hwmod_class dra7xx_usb_otg_ss_hwmod_class = {
+        .name   = "usb_otg_ss",
+};
+
+/* usb_otg_ss1 */
+static struct omap_hwmod_opt_clk usb_otg_ss1_opt_clks[] = {
+        { .role = "refclk960m", .clk = "usb_otg_ss1_refclk960m" },
+};
+
+static struct omap_hwmod dra7xx_usb_otg_ss1_hwmod = {
+        .name           = "usb_otg_ss1",
+        .class          = &dra7xx_usb_otg_ss_hwmod_class,
+        .clkdm_name     = "l3init_clkdm",
+        .main_clk       = "dpll_core_h13x2_ck",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L3INIT_USB_OTG_SS1_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L3INIT_USB_OTG_SS1_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_HWCTRL,
+                },
+        },
+        .opt_clks       = usb_otg_ss1_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(usb_otg_ss1_opt_clks),
+};
+
+/* usb_otg_ss2 */
+static struct omap_hwmod_opt_clk usb_otg_ss2_opt_clks[] = {
+        { .role = "refclk960m", .clk = "usb_otg_ss2_refclk960m" },
+};
+
+static struct omap_hwmod dra7xx_usb_otg_ss2_hwmod = {
+        .name           = "usb_otg_ss2",
+        .class          = &dra7xx_usb_otg_ss_hwmod_class,
+        .clkdm_name     = "l3init_clkdm",
+        .main_clk       = "dpll_core_h13x2_ck",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L3INIT_USB_OTG_SS2_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L3INIT_USB_OTG_SS2_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_HWCTRL,
+                },
+        },
+        .opt_clks       = usb_otg_ss2_opt_clks,
+        .opt_clks_cnt   = ARRAY_SIZE(usb_otg_ss2_opt_clks),
+};
+
+/* usb_otg_ss3 */
+static struct omap_hwmod dra7xx_usb_otg_ss3_hwmod = {
+        .name           = "usb_otg_ss3",
+        .class          = &dra7xx_usb_otg_ss_hwmod_class,
+        .clkdm_name     = "l3init_clkdm",
+        .main_clk       = "dpll_core_h13x2_ck",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L3INIT_USB_OTG_SS3_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L3INIT_USB_OTG_SS3_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_HWCTRL,
+                },
+        },
+};
+
+/* usb_otg_ss4 */
+static struct omap_hwmod dra7xx_usb_otg_ss4_hwmod = {
+        .name           = "usb_otg_ss4",
+        .class          = &dra7xx_usb_otg_ss_hwmod_class,
+        .clkdm_name     = "l3init_clkdm",
+        .main_clk       = "dpll_core_h13x2_ck",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L3INIT_USB_OTG_SS4_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L3INIT_USB_OTG_SS4_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_HWCTRL,
+                },
+        },
+};
+
+/*
+ * 'vcp' class
+ *
+ */
+
+static struct omap_hwmod_class dra7xx_vcp_hwmod_class = {
+        .name   = "vcp",
+};
+
+/* vcp1 */
+static struct omap_hwmod dra7xx_vcp1_hwmod = {
+        .name           = "vcp1",
+        .class          = &dra7xx_vcp_hwmod_class,
+        .clkdm_name     = "l3main1_clkdm",
+        .main_clk       = "l3_iclk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L3MAIN1_VCP1_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L3MAIN1_VCP1_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/* vcp2 */
+static struct omap_hwmod dra7xx_vcp2_hwmod = {
+        .name           = "vcp2",
+        .class          = &dra7xx_vcp_hwmod_class,
+        .clkdm_name     = "l3main1_clkdm",
+        .main_clk       = "l3_iclk_div",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_L3MAIN1_VCP2_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_L3MAIN1_VCP2_CONTEXT_OFFSET,
+                },
+        },
+};
+
+/*
+ * 'wd_timer' class
+ *
+ */
+
+static struct omap_hwmod_class_sysconfig dra7xx_wd_timer_sysc = {
+        .rev_offs       = 0x0000,
+        .sysc_offs      = 0x0010,
+        .syss_offs      = 0x0014,
+        .sysc_flags     = (SYSC_HAS_EMUFREE | SYSC_HAS_SIDLEMODE |
+                           SYSC_HAS_SOFTRESET | SYSS_HAS_RESET_STATUS),
+        .idlemodes      = (SIDLE_FORCE | SIDLE_NO | SIDLE_SMART |
+                           SIDLE_SMART_WKUP),
+        .sysc_fields    = &omap_hwmod_sysc_type1,
+};
+
+static struct omap_hwmod_class dra7xx_wd_timer_hwmod_class = {
+        .name           = "wd_timer",
+        .sysc           = &dra7xx_wd_timer_sysc,
+        .pre_shutdown   = &omap2_wd_timer_disable,
+        .reset          = &omap2_wd_timer_reset,
+};
+
+/* wd_timer2 */
+static struct omap_hwmod dra7xx_wd_timer2_hwmod = {
+        .name           = "wd_timer2",
+        .class          = &dra7xx_wd_timer_hwmod_class,
+        .clkdm_name     = "wkupaon_clkdm",
+        .main_clk       = "sys_32k_ck",
+        .prcm = {
+                .omap4 = {
+                        .clkctrl_offs = DRA7XX_CM_WKUPAON_WD_TIMER2_CLKCTRL_OFFSET,
+                        .context_offs = DRA7XX_RM_WKUPAON_WD_TIMER2_CONTEXT_OFFSET,
+                        .modulemode   = MODULEMODE_SWCTRL,
+                },
+        },
+};
+
+
+/*
+ * Interfaces
+ */
+
+/* l3_main_2 -> l3_instr */
+static struct omap_hwmod_ocp_if dra7xx_l3_main_2__l3_instr = {
+        .master         = &dra7xx_l3_main_2_hwmod,
+        .slave          = &dra7xx_l3_instr_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_cfg -> l3_main_1 */
+static struct omap_hwmod_ocp_if dra7xx_l4_cfg__l3_main_1 = {
+        .master         = &dra7xx_l4_cfg_hwmod,
+        .slave          = &dra7xx_l3_main_1_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* mpu -> l3_main_1 */
+static struct omap_hwmod_ocp_if dra7xx_mpu__l3_main_1 = {
+        .master         = &dra7xx_mpu_hwmod,
+        .slave          = &dra7xx_l3_main_1_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU,
+};
+
+/* l3_main_1 -> l3_main_2 */
+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__l3_main_2 = {
+        .master         = &dra7xx_l3_main_1_hwmod,
+        .slave          = &dra7xx_l3_main_2_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU,
+};
+
+/* l4_cfg -> l3_main_2 */
+static struct omap_hwmod_ocp_if dra7xx_l4_cfg__l3_main_2 = {
+        .master         = &dra7xx_l4_cfg_hwmod,
+        .slave          = &dra7xx_l3_main_2_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l3_main_1 -> l4_cfg */
+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__l4_cfg = {
+        .master         = &dra7xx_l3_main_1_hwmod,
+        .slave          = &dra7xx_l4_cfg_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l3_main_1 -> l4_per1 */
+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__l4_per1 = {
+        .master         = &dra7xx_l3_main_1_hwmod,
+        .slave          = &dra7xx_l4_per1_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l3_main_1 -> l4_per2 */
+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__l4_per2 = {
+        .master         = &dra7xx_l3_main_1_hwmod,
+        .slave          = &dra7xx_l4_per2_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l3_main_1 -> l4_per3 */
+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__l4_per3 = {
+        .master         = &dra7xx_l3_main_1_hwmod,
+        .slave          = &dra7xx_l4_per3_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l3_main_1 -> l4_wkup */
+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__l4_wkup = {
+        .master         = &dra7xx_l3_main_1_hwmod,
+        .slave          = &dra7xx_l4_wkup_hwmod,
+        .clk            = "wkupaon_iclk_mux",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per2 -> atl */
+static struct omap_hwmod_ocp_if dra7xx_l4_per2__atl = {
+        .master         = &dra7xx_l4_per2_hwmod,
+        .slave          = &dra7xx_atl_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l3_main_1 -> bb2d */
+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__bb2d = {
+        .master         = &dra7xx_l3_main_1_hwmod,
+        .slave          = &dra7xx_bb2d_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_wkup -> counter_32k */
+static struct omap_hwmod_ocp_if dra7xx_l4_wkup__counter_32k = {
+        .master         = &dra7xx_l4_wkup_hwmod,
+        .slave          = &dra7xx_counter_32k_hwmod,
+        .clk            = "wkupaon_iclk_mux",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_wkup -> ctrl_module_wkup */
+static struct omap_hwmod_ocp_if dra7xx_l4_wkup__ctrl_module_wkup = {
+        .master         = &dra7xx_l4_wkup_hwmod,
+        .slave          = &dra7xx_ctrl_module_wkup_hwmod,
+        .clk            = "wkupaon_iclk_mux",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_wkup -> dcan1 */
+static struct omap_hwmod_ocp_if dra7xx_l4_wkup__dcan1 = {
+        .master         = &dra7xx_l4_wkup_hwmod,
+        .slave          = &dra7xx_dcan1_hwmod,
+        .clk            = "wkupaon_iclk_mux",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per2 -> dcan2 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per2__dcan2 = {
+        .master         = &dra7xx_l4_per2_hwmod,
+        .slave          = &dra7xx_dcan2_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_addr_space dra7xx_dma_system_addrs[] = {
+        {
+                .pa_start       = 0x4a056000,
+                .pa_end         = 0x4a056fff,
+                .flags          = ADDR_TYPE_RT
+        },
+        { }
+};
+
+/* l4_cfg -> dma_system */
+static struct omap_hwmod_ocp_if dra7xx_l4_cfg__dma_system = {
+        .master         = &dra7xx_l4_cfg_hwmod,
+        .slave          = &dra7xx_dma_system_hwmod,
+        .clk            = "l3_iclk_div",
+        .addr           = dra7xx_dma_system_addrs,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_addr_space dra7xx_dss_addrs[] = {
+        {
+                .name           = "family",
+                .pa_start       = 0x58000000,
+                .pa_end         = 0x5800007f,
+                .flags          = ADDR_TYPE_RT
+        },
+};
+
+/* l3_main_1 -> dss */
+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__dss = {
+        .master         = &dra7xx_l3_main_1_hwmod,
+        .slave          = &dra7xx_dss_hwmod,
+        .clk            = "l3_iclk_div",
+        .addr           = dra7xx_dss_addrs,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_addr_space dra7xx_dss_dispc_addrs[] = {
+        {
+                .name           = "dispc",
+                .pa_start       = 0x58001000,
+                .pa_end         = 0x58001fff,
+                .flags          = ADDR_TYPE_RT
+        },
+};
+
+/* l3_main_1 -> dispc */
+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__dispc = {
+        .master         = &dra7xx_l3_main_1_hwmod,
+        .slave          = &dra7xx_dss_dispc_hwmod,
+        .clk            = "l3_iclk_div",
+        .addr           = dra7xx_dss_dispc_addrs,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_addr_space dra7xx_dss_hdmi_addrs[] = {
+        {
+                .name           = "hdmi_wp",
+                .pa_start       = 0x58040000,
+                .pa_end         = 0x580400ff,
+                .flags          = ADDR_TYPE_RT
+        },
+        { }
+};
+
+/* l3_main_1 -> dispc */
+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__hdmi = {
+        .master         = &dra7xx_l3_main_1_hwmod,
+        .slave          = &dra7xx_dss_hdmi_hwmod,
+        .clk            = "l3_iclk_div",
+        .addr           = dra7xx_dss_hdmi_addrs,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_addr_space dra7xx_elm_addrs[] = {
+        {
+                .pa_start       = 0x48078000,
+                .pa_end         = 0x48078fff,
+                .flags          = ADDR_TYPE_RT
+        },
+        { }
+};
+
+/* l4_per1 -> elm */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__elm = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_elm_hwmod,
+        .clk            = "l3_iclk_div",
+        .addr           = dra7xx_elm_addrs,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_wkup -> gpio1 */
+static struct omap_hwmod_ocp_if dra7xx_l4_wkup__gpio1 = {
+        .master         = &dra7xx_l4_wkup_hwmod,
+        .slave          = &dra7xx_gpio1_hwmod,
+        .clk            = "wkupaon_iclk_mux",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> gpio2 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__gpio2 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_gpio2_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> gpio3 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__gpio3 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_gpio3_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> gpio4 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__gpio4 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_gpio4_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> gpio5 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__gpio5 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_gpio5_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> gpio6 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__gpio6 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_gpio6_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> gpio7 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__gpio7 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_gpio7_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> gpio8 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__gpio8 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_gpio8_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_addr_space dra7xx_gpmc_addrs[] = {
+        {
+                .pa_start       = 0x50000000,
+                .pa_end         = 0x500003ff,
+                .flags          = ADDR_TYPE_RT
+        },
+        { }
+};
+
+/* l3_main_1 -> gpmc */
+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__gpmc = {
+        .master         = &dra7xx_l3_main_1_hwmod,
+        .slave          = &dra7xx_gpmc_hwmod,
+        .clk            = "l3_iclk_div",
+        .addr           = dra7xx_gpmc_addrs,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_addr_space dra7xx_hdq1w_addrs[] = {
+        {
+                .pa_start       = 0x480b2000,
+                .pa_end         = 0x480b201f,
+                .flags          = ADDR_TYPE_RT
+        },
+        { }
+};
+
+/* l4_per1 -> hdq1w */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__hdq1w = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_hdq1w_hwmod,
+        .clk            = "l3_iclk_div",
+        .addr           = dra7xx_hdq1w_addrs,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> i2c1 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__i2c1 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_i2c1_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> i2c2 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__i2c2 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_i2c2_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> i2c3 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__i2c3 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_i2c3_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> i2c4 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__i2c4 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_i2c4_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> i2c5 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__i2c5 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_i2c5_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> mcspi1 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__mcspi1 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_mcspi1_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> mcspi2 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__mcspi2 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_mcspi2_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> mcspi3 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__mcspi3 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_mcspi3_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> mcspi4 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__mcspi4 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_mcspi4_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> mmc1 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__mmc1 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_mmc1_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> mmc2 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__mmc2 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_mmc2_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> mmc3 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__mmc3 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_mmc3_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> mmc4 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__mmc4 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_mmc4_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_cfg -> mpu */
+static struct omap_hwmod_ocp_if dra7xx_l4_cfg__mpu = {
+        .master         = &dra7xx_l4_cfg_hwmod,
+        .slave          = &dra7xx_mpu_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_addr_space dra7xx_ocp2scp1_addrs[] = {
+        {
+                .pa_start       = 0x4a080000,
+                .pa_end         = 0x4a08001f,
+                .flags          = ADDR_TYPE_RT
+        },
+        { }
+};
+
+/* l4_cfg -> ocp2scp1 */
+static struct omap_hwmod_ocp_if dra7xx_l4_cfg__ocp2scp1 = {
+        .master         = &dra7xx_l4_cfg_hwmod,
+        .slave          = &dra7xx_ocp2scp1_hwmod,
+        .clk            = "l4_root_clk_div",
+        .addr           = dra7xx_ocp2scp1_addrs,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_addr_space dra7xx_qspi_addrs[] = {
+        {
+                .pa_start       = 0x4b300000,
+                .pa_end         = 0x4b30007f,
+                .flags          = ADDR_TYPE_RT
+        },
+        { }
+};
+
+/* l3_main_1 -> qspi */
+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__qspi = {
+        .master         = &dra7xx_l3_main_1_hwmod,
+        .slave          = &dra7xx_qspi_hwmod,
+        .clk            = "l3_iclk_div",
+        .addr           = dra7xx_qspi_addrs,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_addr_space dra7xx_sata_addrs[] = {
+        {
+                .name           = "sysc",
+                .pa_start       = 0x4a141100,
+                .pa_end         = 0x4a141107,
+                .flags          = ADDR_TYPE_RT
+        },
+        { }
+};
+
+/* l4_cfg -> sata */
+static struct omap_hwmod_ocp_if dra7xx_l4_cfg__sata = {
+        .master         = &dra7xx_l4_cfg_hwmod,
+        .slave          = &dra7xx_sata_hwmod,
+        .clk            = "l3_iclk_div",
+        .addr           = dra7xx_sata_addrs,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_addr_space dra7xx_smartreflex_core_addrs[] = {
+        {
+                .pa_start       = 0x4a0dd000,
+                .pa_end         = 0x4a0dd07f,
+                .flags          = ADDR_TYPE_RT
+        },
+        { }
+};
+
+/* l4_cfg -> smartreflex_core */
+static struct omap_hwmod_ocp_if dra7xx_l4_cfg__smartreflex_core = {
+        .master         = &dra7xx_l4_cfg_hwmod,
+        .slave          = &dra7xx_smartreflex_core_hwmod,
+        .clk            = "l4_root_clk_div",
+        .addr           = dra7xx_smartreflex_core_addrs,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_addr_space dra7xx_smartreflex_mpu_addrs[] = {
+        {
+                .pa_start       = 0x4a0d9000,
+                .pa_end         = 0x4a0d907f,
+                .flags          = ADDR_TYPE_RT
+        },
+        { }
+};
+
+/* l4_cfg -> smartreflex_mpu */
+static struct omap_hwmod_ocp_if dra7xx_l4_cfg__smartreflex_mpu = {
+        .master         = &dra7xx_l4_cfg_hwmod,
+        .slave          = &dra7xx_smartreflex_mpu_hwmod,
+        .clk            = "l4_root_clk_div",
+        .addr           = dra7xx_smartreflex_mpu_addrs,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_addr_space dra7xx_spinlock_addrs[] = {
+        {
+                .pa_start       = 0x4a0f6000,
+                .pa_end         = 0x4a0f6fff,
+                .flags          = ADDR_TYPE_RT
+        },
+        { }
+};
+
+/* l4_cfg -> spinlock */
+static struct omap_hwmod_ocp_if dra7xx_l4_cfg__spinlock = {
+        .master         = &dra7xx_l4_cfg_hwmod,
+        .slave          = &dra7xx_spinlock_hwmod,
+        .clk            = "l3_iclk_div",
+        .addr           = dra7xx_spinlock_addrs,
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_wkup -> timer1 */
+static struct omap_hwmod_ocp_if dra7xx_l4_wkup__timer1 = {
+        .master         = &dra7xx_l4_wkup_hwmod,
+        .slave          = &dra7xx_timer1_hwmod,
+        .clk            = "wkupaon_iclk_mux",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> timer2 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__timer2 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_timer2_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> timer3 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__timer3 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_timer3_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> timer4 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__timer4 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_timer4_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> timer5 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__timer5 = {
+        .master         = &dra7xx_l4_per3_hwmod,
+        .slave          = &dra7xx_timer5_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> timer6 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__timer6 = {
+        .master         = &dra7xx_l4_per3_hwmod,
+        .slave          = &dra7xx_timer6_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> timer7 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__timer7 = {
+        .master         = &dra7xx_l4_per3_hwmod,
+        .slave          = &dra7xx_timer7_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> timer8 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__timer8 = {
+        .master         = &dra7xx_l4_per3_hwmod,
+        .slave          = &dra7xx_timer8_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> timer9 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__timer9 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_timer9_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> timer10 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__timer10 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_timer10_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> timer11 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__timer11 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_timer11_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> uart1 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__uart1 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_uart1_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> uart2 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__uart2 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_uart2_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> uart3 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__uart3 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_uart3_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> uart4 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__uart4 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_uart4_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> uart5 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__uart5 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_uart5_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per1 -> uart6 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per1__uart6 = {
+        .master         = &dra7xx_l4_per1_hwmod,
+        .slave          = &dra7xx_uart6_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> usb_otg_ss1 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__usb_otg_ss1 = {
+        .master         = &dra7xx_l4_per3_hwmod,
+        .slave          = &dra7xx_usb_otg_ss1_hwmod,
+        .clk            = "dpll_core_h13x2_ck",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> usb_otg_ss2 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__usb_otg_ss2 = {
+        .master         = &dra7xx_l4_per3_hwmod,
+        .slave          = &dra7xx_usb_otg_ss2_hwmod,
+        .clk            = "dpll_core_h13x2_ck",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> usb_otg_ss3 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__usb_otg_ss3 = {
+        .master         = &dra7xx_l4_per3_hwmod,
+        .slave          = &dra7xx_usb_otg_ss3_hwmod,
+        .clk            = "dpll_core_h13x2_ck",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per3 -> usb_otg_ss4 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per3__usb_otg_ss4 = {
+        .master         = &dra7xx_l4_per3_hwmod,
+        .slave          = &dra7xx_usb_otg_ss4_hwmod,
+        .clk            = "dpll_core_h13x2_ck",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l3_main_1 -> vcp1 */
+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__vcp1 = {
+        .master         = &dra7xx_l3_main_1_hwmod,
+        .slave          = &dra7xx_vcp1_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per2 -> vcp1 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per2__vcp1 = {
+        .master         = &dra7xx_l4_per2_hwmod,
+        .slave          = &dra7xx_vcp1_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l3_main_1 -> vcp2 */
+static struct omap_hwmod_ocp_if dra7xx_l3_main_1__vcp2 = {
+        .master         = &dra7xx_l3_main_1_hwmod,
+        .slave          = &dra7xx_vcp2_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_per2 -> vcp2 */
+static struct omap_hwmod_ocp_if dra7xx_l4_per2__vcp2 = {
+        .master         = &dra7xx_l4_per2_hwmod,
+        .slave          = &dra7xx_vcp2_hwmod,
+        .clk            = "l3_iclk_div",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+/* l4_wkup -> wd_timer2 */
+static struct omap_hwmod_ocp_if dra7xx_l4_wkup__wd_timer2 = {
+        .master         = &dra7xx_l4_wkup_hwmod,
+        .slave          = &dra7xx_wd_timer2_hwmod,
+        .clk            = "wkupaon_iclk_mux",
+        .user           = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
+static struct omap_hwmod_ocp_if *dra7xx_hwmod_ocp_ifs[] __initdata = {
+        &dra7xx_l3_main_2__l3_instr,
+        &dra7xx_l4_cfg__l3_main_1,
+        &dra7xx_mpu__l3_main_1,
+        &dra7xx_l3_main_1__l3_main_2,
+        &dra7xx_l4_cfg__l3_main_2,
+        &dra7xx_l3_main_1__l4_cfg,
+        &dra7xx_l3_main_1__l4_per1,
+        &dra7xx_l3_main_1__l4_per2,
+        &dra7xx_l3_main_1__l4_per3,
+        &dra7xx_l3_main_1__l4_wkup,
+        &dra7xx_l4_per2__atl,
+        &dra7xx_l3_main_1__bb2d,
+        &dra7xx_l4_wkup__counter_32k,
+        &dra7xx_l4_wkup__ctrl_module_wkup,
+        &dra7xx_l4_wkup__dcan1,
+        &dra7xx_l4_per2__dcan2,
+        &dra7xx_l4_cfg__dma_system,
+        &dra7xx_l3_main_1__dss,
+        &dra7xx_l3_main_1__dispc,
+        &dra7xx_l3_main_1__hdmi,
+        &dra7xx_l4_per1__elm,
+        &dra7xx_l4_wkup__gpio1,
+        &dra7xx_l4_per1__gpio2,
+        &dra7xx_l4_per1__gpio3,
+        &dra7xx_l4_per1__gpio4,
+        &dra7xx_l4_per1__gpio5,
+        &dra7xx_l4_per1__gpio6,
+        &dra7xx_l4_per1__gpio7,
+        &dra7xx_l4_per1__gpio8,
+        &dra7xx_l3_main_1__gpmc,
+        &dra7xx_l4_per1__hdq1w,
+        &dra7xx_l4_per1__i2c1,
+        &dra7xx_l4_per1__i2c2,
+        &dra7xx_l4_per1__i2c3,
+        &dra7xx_l4_per1__i2c4,
+        &dra7xx_l4_per1__i2c5,
+        &dra7xx_l4_per1__mcspi1,
+        &dra7xx_l4_per1__mcspi2,
+        &dra7xx_l4_per1__mcspi3,
+        &dra7xx_l4_per1__mcspi4,
+        &dra7xx_l4_per1__mmc1,
+        &dra7xx_l4_per1__mmc2,
+        &dra7xx_l4_per1__mmc3,
+        &dra7xx_l4_per1__mmc4,
+        &dra7xx_l4_cfg__mpu,
+        &dra7xx_l4_cfg__ocp2scp1,
+        &dra7xx_l3_main_1__qspi,
+        &dra7xx_l4_cfg__sata,
+        &dra7xx_l4_cfg__smartreflex_core,
+        &dra7xx_l4_cfg__smartreflex_mpu,
+        &dra7xx_l4_cfg__spinlock,
+        &dra7xx_l4_wkup__timer1,
+        &dra7xx_l4_per1__timer2,
+        &dra7xx_l4_per1__timer3,
+        &dra7xx_l4_per1__timer4,
+        &dra7xx_l4_per3__timer5,
+        &dra7xx_l4_per3__timer6,
+        &dra7xx_l4_per3__timer7,
+        &dra7xx_l4_per3__timer8,
+        &dra7xx_l4_per1__timer9,
+        &dra7xx_l4_per1__timer10,
+        &dra7xx_l4_per1__timer11,
+        &dra7xx_l4_per1__uart1,
+        &dra7xx_l4_per1__uart2,
+        &dra7xx_l4_per1__uart3,
+        &dra7xx_l4_per1__uart4,
+        &dra7xx_l4_per1__uart5,
+        &dra7xx_l4_per1__uart6,
+        &dra7xx_l4_per3__usb_otg_ss1,
+        &dra7xx_l4_per3__usb_otg_ss2,
+        &dra7xx_l4_per3__usb_otg_ss3,
+        &dra7xx_l4_per3__usb_otg_ss4,
+        &dra7xx_l3_main_1__vcp1,
+        &dra7xx_l4_per2__vcp1,
+        &dra7xx_l3_main_1__vcp2,
+        &dra7xx_l4_per2__vcp2,
+        &dra7xx_l4_wkup__wd_timer2,
+        NULL,
+};
+
+int __init dra7xx_hwmod_init(void)
+{
+        omap_hwmod_init();
+        return omap_hwmod_register_links(dra7xx_hwmod_ocp_ifs);
+}
diff --git a/arch/arm/mach-omap2/powerdomain.h b/arch/arm/mach-omap2/powerdomain.h
index e4d7bd6f94b8..baf3d8bf6bea 100644
--- a/arch/arm/mach-omap2/powerdomain.h
+++ b/arch/arm/mach-omap2/powerdomain.h
@@ -256,6 +256,7 @@ extern void omap3xxx_powerdomains_init(void);
 extern void am33xx_powerdomains_init(void);
 extern void omap44xx_powerdomains_init(void);
 extern void omap54xx_powerdomains_init(void);
+extern void dra7xx_powerdomains_init(void);
 
 extern struct pwrdm_ops omap2_pwrdm_operations;
 extern struct pwrdm_ops omap3_pwrdm_operations;
diff --git a/arch/arm/mach-omap2/powerdomains3xxx_data.c b/arch/arm/mach-omap2/powerdomains3xxx_data.c
index e2d4bd804523..328c1037cb60 100644
--- a/arch/arm/mach-omap2/powerdomains3xxx_data.c
+++ b/arch/arm/mach-omap2/powerdomains3xxx_data.c
@@ -336,6 +336,13 @@ static struct powerdomain dpll5_pwrdm = {
         .voltdm           = { .name = "core" },
 };
 
+static struct powerdomain alwon_81xx_pwrdm = {
+        .name             = "alwon_pwrdm",
+        .prcm_offs        = TI81XX_PRM_ALWON_MOD,
+        .pwrsts           = PWRSTS_OFF_ON,
+        .voltdm           = { .name = "core" },
+};
+
 static struct powerdomain device_81xx_pwrdm = {
         .name             = "device_pwrdm",
         .prcm_offs        = TI81XX_PRM_DEVICE_MOD,
@@ -442,6 +449,7 @@ static struct powerdomain *powerdomains_am35x[] __initdata = {
 };
 
 static struct powerdomain *powerdomains_ti81xx[] __initdata = {
+        &alwon_81xx_pwrdm,
         &device_81xx_pwrdm,
         &active_816x_pwrdm,
         &default_816x_pwrdm,
diff --git a/arch/arm/mach-omap2/powerdomains54xx_data.c b/arch/arm/mach-omap2/powerdomains54xx_data.c
index 81f8a7cc26ee..ce1d752af991 100644
--- a/arch/arm/mach-omap2/powerdomains54xx_data.c
+++ b/arch/arm/mach-omap2/powerdomains54xx_data.c
@@ -25,7 +25,6 @@
 
 #include "prcm-common.h"
 #include "prcm44xx.h"
-#include "prm-regbits-54xx.h"
 #include "prm54xx.h"
 #include "prcm_mpu54xx.h"
 
diff --git a/arch/arm/mach-omap2/powerdomains7xx_data.c b/arch/arm/mach-omap2/powerdomains7xx_data.c
new file mode 100644
index 000000000000..48151d1cfde0
--- /dev/null
+++ b/arch/arm/mach-omap2/powerdomains7xx_data.c
@@ -0,0 +1,454 @@
+/*
+ * DRA7xx Power domains framework
+ *
+ * Copyright (C) 2009-2013 Texas Instruments, Inc.
+ * Copyright (C) 2009-2011 Nokia Corporation
+ *
+ * Generated by code originally written by:
+ * Abhijit Pagare (abhijitpagare@ti.com)
+ * Benoit Cousson (b-cousson@ti.com)
+ * Paul Walmsley (paul@pwsan.com)
+ *
+ * This file is automatically generated from the OMAP hardware databases.
+ * We respectfully ask that any modifications to this file be coordinated
+ * with the public linux-omap@vger.kernel.org mailing list and the
+ * authors above to ensure that the autogeneration scripts are kept
+ * up-to-date with the file contents.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/kernel.h>
+#include <linux/init.h>
+
+#include "powerdomain.h"
+
+#include "prcm-common.h"
+#include "prcm44xx.h"
+#include "prm7xx.h"
+#include "prcm_mpu7xx.h"
+
+/* iva_7xx_pwrdm: IVA-HD power domain */
+static struct powerdomain iva_7xx_pwrdm = {
+        .name             = "iva_pwrdm",
+        .prcm_offs        = DRA7XX_PRM_IVA_INST,
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .pwrsts           = PWRSTS_OFF_RET_ON,
+        .pwrsts_logic_ret = PWRSTS_OFF,
+        .banks            = 4,
+        .pwrsts_mem_ret = {
+                [0] = PWRSTS_OFF_RET,   /* hwa_mem */
+                [1] = PWRSTS_OFF_RET,   /* sl2_mem */
+                [2] = PWRSTS_OFF_RET,   /* tcm1_mem */
+                [3] = PWRSTS_OFF_RET,   /* tcm2_mem */
+        },
+        .pwrsts_mem_on  = {
+                [0] = PWRSTS_OFF_RET,   /* hwa_mem */
+                [1] = PWRSTS_OFF_RET,   /* sl2_mem */
+                [2] = PWRSTS_OFF_RET,   /* tcm1_mem */
+                [3] = PWRSTS_OFF_RET,   /* tcm2_mem */
+        },
+        .flags            = PWRDM_HAS_LOWPOWERSTATECHANGE,
+};
+
+/* rtc_7xx_pwrdm:  */
+static struct powerdomain rtc_7xx_pwrdm = {
+        .name             = "rtc_pwrdm",
+        .prcm_offs        = DRA7XX_PRM_RTC_INST,
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .pwrsts           = PWRSTS_ON,
+};
+
+/* custefuse_7xx_pwrdm: Customer efuse controller power domain */
+static struct powerdomain custefuse_7xx_pwrdm = {
+        .name             = "custefuse_pwrdm",
+        .prcm_offs        = DRA7XX_PRM_CUSTEFUSE_INST,
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .pwrsts           = PWRSTS_OFF_ON,
+        .flags            = PWRDM_HAS_LOWPOWERSTATECHANGE,
+};
+
+/* ipu_7xx_pwrdm: Audio back end power domain */
+static struct powerdomain ipu_7xx_pwrdm = {
+        .name             = "ipu_pwrdm",
+        .prcm_offs        = DRA7XX_PRM_IPU_INST,
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .pwrsts           = PWRSTS_OFF_RET_ON,
+        .pwrsts_logic_ret = PWRSTS_OFF,
+        .banks            = 2,
+        .pwrsts_mem_ret = {
+                [0] = PWRSTS_OFF_RET,   /* aessmem */
+                [1] = PWRSTS_OFF_RET,   /* periphmem */
+        },
+        .pwrsts_mem_on  = {
+                [0] = PWRSTS_OFF_RET,   /* aessmem */
+                [1] = PWRSTS_OFF_RET,   /* periphmem */
+        },
+        .flags            = PWRDM_HAS_LOWPOWERSTATECHANGE,
+};
+
+/* dss_7xx_pwrdm: Display subsystem power domain */
+static struct powerdomain dss_7xx_pwrdm = {
+        .name             = "dss_pwrdm",
+        .prcm_offs        = DRA7XX_PRM_DSS_INST,
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .pwrsts           = PWRSTS_OFF_RET_ON,
+        .pwrsts_logic_ret = PWRSTS_OFF,
+        .banks            = 1,
+        .pwrsts_mem_ret = {
+                [0] = PWRSTS_OFF_RET,   /* dss_mem */
+        },
+        .pwrsts_mem_on  = {
+                [0] = PWRSTS_OFF_RET,   /* dss_mem */
+        },
+        .flags            = PWRDM_HAS_LOWPOWERSTATECHANGE,
+};
+
+/* l4per_7xx_pwrdm: Target peripherals power domain */
+static struct powerdomain l4per_7xx_pwrdm = {
+        .name             = "l4per_pwrdm",
+        .prcm_offs        = DRA7XX_PRM_L4PER_INST,
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .pwrsts           = PWRSTS_RET_ON,
+        .pwrsts_logic_ret = PWRSTS_OFF_RET,
+        .banks            = 2,
+        .pwrsts_mem_ret = {
+                [0] = PWRSTS_OFF_RET,   /* nonretained_bank */
+                [1] = PWRSTS_OFF_RET,   /* retained_bank */
+        },
+        .pwrsts_mem_on  = {
+                [0] = PWRSTS_OFF_RET,   /* nonretained_bank */
+                [1] = PWRSTS_OFF_RET,   /* retained_bank */
+        },
+        .flags            = PWRDM_HAS_LOWPOWERSTATECHANGE,
+};
+
+/* gpu_7xx_pwrdm: 3D accelerator power domain */
+static struct powerdomain gpu_7xx_pwrdm = {
+        .name             = "gpu_pwrdm",
+        .prcm_offs        = DRA7XX_PRM_GPU_INST,
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .pwrsts           = PWRSTS_OFF_ON,
+        .banks            = 1,
+        .pwrsts_mem_ret = {
+                [0] = PWRSTS_OFF_RET,   /* gpu_mem */
+        },
+        .pwrsts_mem_on  = {
+                [0] = PWRSTS_OFF_RET,   /* gpu_mem */
+        },
+        .flags            = PWRDM_HAS_LOWPOWERSTATECHANGE,
+};
+
+/* wkupaon_7xx_pwrdm: Wake-up power domain */
+static struct powerdomain wkupaon_7xx_pwrdm = {
+        .name             = "wkupaon_pwrdm",
+        .prcm_offs        = DRA7XX_PRM_WKUPAON_INST,
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .pwrsts           = PWRSTS_ON,
+        .banks            = 1,
+        .pwrsts_mem_ret = {
+        },
+        .pwrsts_mem_on  = {
+                [0] = PWRSTS_ON,        /* wkup_bank */
+        },
+};
+
+/* core_7xx_pwrdm: CORE power domain */
+static struct powerdomain core_7xx_pwrdm = {
+        .name             = "core_pwrdm",
+        .prcm_offs        = DRA7XX_PRM_CORE_INST,
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .pwrsts           = PWRSTS_RET_ON,
+        .pwrsts_logic_ret = PWRSTS_OFF_RET,
+        .banks            = 5,
+        .pwrsts_mem_ret = {
+                [0] = PWRSTS_OFF_RET,   /* core_nret_bank */
+                [1] = PWRSTS_OFF_RET,   /* core_ocmram */
+                [2] = PWRSTS_OFF_RET,   /* core_other_bank */
+                [3] = PWRSTS_OFF_RET,   /* ipu_l2ram */
+                [4] = PWRSTS_OFF_RET,   /* ipu_unicache */
+        },
+        .pwrsts_mem_on  = {
+                [0] = PWRSTS_OFF_RET,   /* core_nret_bank */
+                [1] = PWRSTS_OFF_RET,   /* core_ocmram */
+                [2] = PWRSTS_OFF_RET,   /* core_other_bank */
+                [3] = PWRSTS_OFF_RET,   /* ipu_l2ram */
+                [4] = PWRSTS_OFF_RET,   /* ipu_unicache */
+        },
+        .flags            = PWRDM_HAS_LOWPOWERSTATECHANGE,
+};
+
+/* coreaon_7xx_pwrdm: Always ON logic that sits in VDD_CORE voltage domain */
+static struct powerdomain coreaon_7xx_pwrdm = {
+        .name             = "coreaon_pwrdm",
+        .prcm_offs        = DRA7XX_PRM_COREAON_INST,
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .pwrsts           = PWRSTS_ON,
+};
+
+/* cpu0_7xx_pwrdm: MPU0 processor and Neon coprocessor power domain */
+static struct powerdomain cpu0_7xx_pwrdm = {
+        .name             = "cpu0_pwrdm",
+        .prcm_offs        = DRA7XX_MPU_PRCM_PRM_C0_INST,
+        .prcm_partition   = DRA7XX_MPU_PRCM_PARTITION,
+        .pwrsts           = PWRSTS_OFF_RET_ON,
+        .pwrsts_logic_ret = PWRSTS_OFF_RET,
+        .banks            = 1,
+        .pwrsts_mem_ret = {
+                [0] = PWRSTS_OFF_RET,   /* cpu0_l1 */
+        },
+        .pwrsts_mem_on  = {
+                [0] = PWRSTS_ON,        /* cpu0_l1 */
+        },
+};
+
+/* cpu1_7xx_pwrdm: MPU1 processor and Neon coprocessor power domain */
+static struct powerdomain cpu1_7xx_pwrdm = {
+        .name             = "cpu1_pwrdm",
+        .prcm_offs        = DRA7XX_MPU_PRCM_PRM_C1_INST,
+        .prcm_partition   = DRA7XX_MPU_PRCM_PARTITION,
+        .pwrsts           = PWRSTS_OFF_RET_ON,
+        .pwrsts_logic_ret = PWRSTS_OFF_RET,
+        .banks            = 1,
+        .pwrsts_mem_ret = {
+                [0] = PWRSTS_OFF_RET,   /* cpu1_l1 */
+        },
+        .pwrsts_mem_on  = {
+                [0] = PWRSTS_ON,        /* cpu1_l1 */
+        },
+};
+
+/* vpe_7xx_pwrdm:  */
+static struct powerdomain vpe_7xx_pwrdm = {
+        .name             = "vpe_pwrdm",
+        .prcm_offs        = DRA7XX_PRM_VPE_INST,
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .pwrsts           = PWRSTS_OFF_RET_ON,
+        .pwrsts_logic_ret = PWRSTS_OFF_RET,
+        .banks            = 1,
+        .pwrsts_mem_ret = {
+                [0] = PWRSTS_OFF_RET,   /* vpe_bank */
+        },
+        .pwrsts_mem_on  = {
+                [0] = PWRSTS_OFF_RET,   /* vpe_bank */
+        },
+        .flags            = PWRDM_HAS_LOWPOWERSTATECHANGE,
+};
+
+/* mpu_7xx_pwrdm: Modena processor and the Neon coprocessor power domain */
+static struct powerdomain mpu_7xx_pwrdm = {
+        .name             = "mpu_pwrdm",
+        .prcm_offs        = DRA7XX_PRM_MPU_INST,
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .pwrsts           = PWRSTS_RET_ON,
+        .pwrsts_logic_ret = PWRSTS_OFF_RET,
+        .banks            = 2,
+        .pwrsts_mem_ret = {
+                [0] = PWRSTS_OFF_RET,   /* mpu_l2 */
+                [1] = PWRSTS_RET,       /* mpu_ram */
+        },
+        .pwrsts_mem_on  = {
+                [0] = PWRSTS_OFF_RET,   /* mpu_l2 */
+                [1] = PWRSTS_OFF_RET,   /* mpu_ram */
+        },
+};
+
+/* l3init_7xx_pwrdm: L3 initators pheripherals power domain  */
+static struct powerdomain l3init_7xx_pwrdm = {
+        .name             = "l3init_pwrdm",
+        .prcm_offs        = DRA7XX_PRM_L3INIT_INST,
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .pwrsts           = PWRSTS_RET_ON,
+        .pwrsts_logic_ret = PWRSTS_OFF_RET,
+        .banks            = 3,
+        .pwrsts_mem_ret = {
+                [0] = PWRSTS_OFF_RET,   /* gmac_bank */
+                [1] = PWRSTS_OFF_RET,   /* l3init_bank1 */
+                [2] = PWRSTS_OFF_RET,   /* l3init_bank2 */
+        },
+        .pwrsts_mem_on  = {
+                [0] = PWRSTS_OFF_RET,   /* gmac_bank */
+                [1] = PWRSTS_OFF_RET,   /* l3init_bank1 */
+                [2] = PWRSTS_OFF_RET,   /* l3init_bank2 */
+        },
+        .flags            = PWRDM_HAS_LOWPOWERSTATECHANGE,
+};
+
+/* eve3_7xx_pwrdm:  */
+static struct powerdomain eve3_7xx_pwrdm = {
+        .name             = "eve3_pwrdm",
+        .prcm_offs        = DRA7XX_PRM_EVE3_INST,
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .pwrsts           = PWRSTS_OFF_ON,
+        .banks            = 1,
+        .pwrsts_mem_ret = {
+                [0] = PWRSTS_OFF_RET,   /* eve3_bank */
+        },
+        .pwrsts_mem_on  = {
+                [0] = PWRSTS_OFF_RET,   /* eve3_bank */
+        },
+        .flags            = PWRDM_HAS_LOWPOWERSTATECHANGE,
+};
+
+/* emu_7xx_pwrdm: Emulation power domain */
+static struct powerdomain emu_7xx_pwrdm = {
+        .name             = "emu_pwrdm",
+        .prcm_offs        = DRA7XX_PRM_EMU_INST,
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .pwrsts           = PWRSTS_OFF_ON,
+        .banks            = 1,
+        .pwrsts_mem_ret = {
+                [0] = PWRSTS_OFF_RET,   /* emu_bank */
+        },
+        .pwrsts_mem_on  = {
+                [0] = PWRSTS_OFF_RET,   /* emu_bank */
+        },
+};
+
+/* dsp2_7xx_pwrdm:  */
+static struct powerdomain dsp2_7xx_pwrdm = {
+        .name             = "dsp2_pwrdm",
+        .prcm_offs        = DRA7XX_PRM_DSP2_INST,
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .pwrsts           = PWRSTS_OFF_ON,
+        .banks            = 3,
+        .pwrsts_mem_ret = {
+                [0] = PWRSTS_OFF_RET,   /* dsp2_edma */
+                [1] = PWRSTS_OFF_RET,   /* dsp2_l1 */
+                [2] = PWRSTS_OFF_RET,   /* dsp2_l2 */
+        },
+        .pwrsts_mem_on  = {
+                [0] = PWRSTS_OFF_RET,   /* dsp2_edma */
+                [1] = PWRSTS_OFF_RET,   /* dsp2_l1 */
+                [2] = PWRSTS_OFF_RET,   /* dsp2_l2 */
+        },
+        .flags            = PWRDM_HAS_LOWPOWERSTATECHANGE,
+};
+
+/* dsp1_7xx_pwrdm: Tesla processor power domain */
+static struct powerdomain dsp1_7xx_pwrdm = {
+        .name             = "dsp1_pwrdm",
+        .prcm_offs        = DRA7XX_PRM_DSP1_INST,
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .pwrsts           = PWRSTS_OFF_ON,
+        .banks            = 3,
+        .pwrsts_mem_ret = {
+                [0] = PWRSTS_OFF_RET,   /* dsp1_edma */
+                [1] = PWRSTS_OFF_RET,   /* dsp1_l1 */
+                [2] = PWRSTS_OFF_RET,   /* dsp1_l2 */
+        },
+        .pwrsts_mem_on  = {
+                [0] = PWRSTS_OFF_RET,   /* dsp1_edma */
+                [1] = PWRSTS_OFF_RET,   /* dsp1_l1 */
+                [2] = PWRSTS_OFF_RET,   /* dsp1_l2 */
+        },
+        .flags            = PWRDM_HAS_LOWPOWERSTATECHANGE,
+};
+
+/* cam_7xx_pwrdm: Camera subsystem power domain */
+static struct powerdomain cam_7xx_pwrdm = {
+        .name             = "cam_pwrdm",
+        .prcm_offs        = DRA7XX_PRM_CAM_INST,
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .pwrsts           = PWRSTS_OFF_ON,
+        .banks            = 1,
+        .pwrsts_mem_ret = {
+                [0] = PWRSTS_OFF_RET,   /* vip_bank */
+        },
+        .pwrsts_mem_on  = {
+                [0] = PWRSTS_OFF_RET,   /* vip_bank */
+        },
+        .flags            = PWRDM_HAS_LOWPOWERSTATECHANGE,
+};
+
+/* eve4_7xx_pwrdm:  */
+static struct powerdomain eve4_7xx_pwrdm = {
+        .name             = "eve4_pwrdm",
+        .prcm_offs        = DRA7XX_PRM_EVE4_INST,
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .pwrsts           = PWRSTS_OFF_ON,
+        .banks            = 1,
+        .pwrsts_mem_ret = {
+                [0] = PWRSTS_OFF_RET,   /* eve4_bank */
+        },
+        .pwrsts_mem_on  = {
+                [0] = PWRSTS_OFF_RET,   /* eve4_bank */
+        },
+        .flags            = PWRDM_HAS_LOWPOWERSTATECHANGE,
+};
+
+/* eve2_7xx_pwrdm:  */
+static struct powerdomain eve2_7xx_pwrdm = {
+        .name             = "eve2_pwrdm",
+        .prcm_offs        = DRA7XX_PRM_EVE2_INST,
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .pwrsts           = PWRSTS_OFF_ON,
+        .banks            = 1,
+        .pwrsts_mem_ret = {
+                [0] = PWRSTS_OFF_RET,   /* eve2_bank */
+        },
+        .pwrsts_mem_on  = {
+                [0] = PWRSTS_OFF_RET,   /* eve2_bank */
+        },
+        .flags            = PWRDM_HAS_LOWPOWERSTATECHANGE,
+};
+
+/* eve1_7xx_pwrdm:  */
+static struct powerdomain eve1_7xx_pwrdm = {
+        .name             = "eve1_pwrdm",
+        .prcm_offs        = DRA7XX_PRM_EVE1_INST,
+        .prcm_partition   = DRA7XX_PRM_PARTITION,
+        .pwrsts           = PWRSTS_OFF_ON,
+        .banks            = 1,
+        .pwrsts_mem_ret = {
+                [0] = PWRSTS_OFF_RET,   /* eve1_bank */
+        },
+        .pwrsts_mem_on  = {
+                [0] = PWRSTS_OFF_RET,   /* eve1_bank */
+        },
+        .flags            = PWRDM_HAS_LOWPOWERSTATECHANGE,
+};
+
+/*
+ * The following power domains are not under SW control
+ *
+ * mpuaon
+ * mmaon
+ */
+
+/* As powerdomains are added or removed above, this list must also be changed */
+static struct powerdomain *powerdomains_dra7xx[] __initdata = {
+        &iva_7xx_pwrdm,
+        &rtc_7xx_pwrdm,
+        &custefuse_7xx_pwrdm,
+        &ipu_7xx_pwrdm,
+        &dss_7xx_pwrdm,
+        &l4per_7xx_pwrdm,
+        &gpu_7xx_pwrdm,
+        &wkupaon_7xx_pwrdm,
+        &core_7xx_pwrdm,
+        &coreaon_7xx_pwrdm,
+        &cpu0_7xx_pwrdm,
+        &cpu1_7xx_pwrdm,
+        &vpe_7xx_pwrdm,
+        &mpu_7xx_pwrdm,
+        &l3init_7xx_pwrdm,
+        &eve3_7xx_pwrdm,
+        &emu_7xx_pwrdm,
+        &dsp2_7xx_pwrdm,
+        &dsp1_7xx_pwrdm,
+        &cam_7xx_pwrdm,
+        &eve4_7xx_pwrdm,
+        &eve2_7xx_pwrdm,
+        &eve1_7xx_pwrdm,
+        NULL
+};
+
+void __init dra7xx_powerdomains_init(void)
+{
+        pwrdm_register_platform_funcs(&omap4_pwrdm_operations);
+        pwrdm_register_pwrdms(powerdomains_dra7xx);
+        pwrdm_complete_init();
+}
diff --git a/arch/arm/mach-omap2/prcm-common.h b/arch/arm/mach-omap2/prcm-common.h
index ff1ac4a82a04..0e841fd9498a 100644
--- a/arch/arm/mach-omap2/prcm-common.h
+++ b/arch/arm/mach-omap2/prcm-common.h
@@ -58,6 +58,7 @@
 #define TI816X_PRM_IVAHD1_MOD                   0x0d00
 #define TI816X_PRM_IVAHD2_MOD                   0x0e00
 #define TI816X_PRM_SGX_MOD                              0x0f00
+#define TI81XX_PRM_ALWON_MOD                    0x1800
 
 /* 24XX register bits shared between CM & PRM registers */
 
diff --git a/arch/arm/mach-omap2/prcm44xx.h b/arch/arm/mach-omap2/prcm44xx.h
index f429cdd5a118..4fea2cfdf2c3 100644
--- a/arch/arm/mach-omap2/prcm44xx.h
+++ b/arch/arm/mach-omap2/prcm44xx.h
@@ -38,6 +38,11 @@
 #define OMAP54XX_SCRM_PARTITION                 4
 #define OMAP54XX_PRCM_MPU_PARTITION             5
 
+#define DRA7XX_PRM_PARTITION                   1
+#define DRA7XX_CM_CORE_AON_PARTITION           2
+#define DRA7XX_CM_CORE_PARTITION               3
+#define DRA7XX_MPU_PRCM_PARTITION              5
+
 /*
  * OMAP4_MAX_PRCM_PARTITIONS: set to the highest value of the PRCM partition
  * IDs, plus one
diff --git a/arch/arm/mach-omap2/prcm_mpu7xx.h b/arch/arm/mach-omap2/prcm_mpu7xx.h
new file mode 100644
index 000000000000..9ebb5ce0878f
--- /dev/null
+++ b/arch/arm/mach-omap2/prcm_mpu7xx.h
@@ -0,0 +1,78 @@
+/*
+ * DRA7xx PRCM MPU instance offset macros
+ *
+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com
+ *
+ * Generated by code originally written by:
+ * Paul Walmsley (paul@pwsan.com)
+ * Rajendra Nayak (rnayak@ti.com)
+ * Benoit Cousson (b-cousson@ti.com)
+ *
+ * This file is automatically generated from the OMAP hardware databases.
+ * We respectfully ask that any modifications to this file be coordinated
+ * with the public linux-omap@vger.kernel.org mailing list and the
+ * authors above to ensure that the autogeneration scripts are kept
+ * up-to-date with the file contents.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __ARCH_ARM_MACH_OMAP2_PRCM_MPU7XX_H
+#define __ARCH_ARM_MACH_OMAP2_PRCM_MPU7XX_H
+
+#include "prcm_mpu_44xx_54xx.h"
+
+#define DRA7XX_PRCM_MPU_BASE                    0x48243000
+
+#define DRA7XX_PRCM_MPU_REGADDR(inst, reg)                              \
+        OMAP2_L4_IO_ADDRESS(DRA7XX_PRCM_MPU_BASE + (inst) + (reg))
+
+/* MPU_PRCM instances */
+#define DRA7XX_MPU_PRCM_OCP_SOCKET_INST 0x0000
+#define DRA7XX_MPU_PRCM_DEVICE_INST     0x0200
+#define DRA7XX_MPU_PRCM_PRM_C0_INST     0x0400
+#define DRA7XX_MPU_PRCM_CM_C0_INST      0x0600
+#define DRA7XX_MPU_PRCM_PRM_C1_INST     0x0800
+#define DRA7XX_MPU_PRCM_CM_C1_INST      0x0a00
+
+/* PRCM_MPU clockdomain register offsets (from instance start) */
+#define DRA7XX_MPU_PRCM_CM_C0_CPU0_CDOFFS       0x0000
+#define DRA7XX_MPU_PRCM_CM_C1_CPU1_CDOFFS       0x0000
+
+
+/* MPU_PRCM */
+
+/* MPU_PRCM.PRCM_MPU_OCP_SOCKET register offsets */
+#define DRA7XX_REVISION_PRCM_MPU_OFFSET                         0x0000
+
+/* MPU_PRCM.PRCM_MPU_DEVICE register offsets */
+#define DRA7XX_PRM_FRAC_INCREMENTER_NUMERATOR_OFFSET            0x0010
+#define DRA7XX_PRM_FRAC_INCREMENTER_DENUMERATOR_RELOAD_OFFSET   0x0014
+
+/* MPU_PRCM.PRCM_MPU_PRM_C0 register offsets */
+#define DRA7XX_PM_CPU0_PWRSTCTRL_OFFSET                         0x0000
+#define DRA7XX_PM_CPU0_PWRSTST_OFFSET                           0x0004
+#define DRA7XX_RM_CPU0_CPU0_RSTCTRL_OFFSET                      0x0010
+#define DRA7XX_RM_CPU0_CPU0_RSTST_OFFSET                        0x0014
+#define DRA7XX_RM_CPU0_CPU0_CONTEXT_OFFSET                      0x0024
+
+/* MPU_PRCM.PRCM_MPU_CM_C0 register offsets */
+#define DRA7XX_CM_CPU0_CLKSTCTRL_OFFSET                         0x0000
+#define DRA7XX_CM_CPU0_CPU0_CLKCTRL_OFFSET                      0x0020
+#define DRA7XX_CM_CPU0_CPU0_CLKCTRL                             DRA7XX_MPU_PRCM_REGADDR(DRA7XX_MPU_PRCM_CM_C0_INST, 0x0020)
+
+/* MPU_PRCM.PRCM_MPU_PRM_C1 register offsets */
+#define DRA7XX_PM_CPU1_PWRSTCTRL_OFFSET                         0x0000
+#define DRA7XX_PM_CPU1_PWRSTST_OFFSET                           0x0004
+#define DRA7XX_RM_CPU1_CPU1_RSTCTRL_OFFSET                      0x0010
+#define DRA7XX_RM_CPU1_CPU1_RSTST_OFFSET                        0x0014
+#define DRA7XX_RM_CPU1_CPU1_CONTEXT_OFFSET                      0x0024
+
+/* MPU_PRCM.PRCM_MPU_CM_C1 register offsets */
+#define DRA7XX_CM_CPU1_CLKSTCTRL_OFFSET                         0x0000
+#define DRA7XX_CM_CPU1_CPU1_CLKCTRL_OFFSET                      0x0020
+#define DRA7XX_CM_CPU1_CPU1_CLKCTRL                             DRA7XX_MPU_PRCM_REGADDR(DRA7XX_MPU_PRCM_CM_C1_INST, 0x0020)
+
+#endif
diff --git a/arch/arm/mach-omap2/prm-regbits-24xx.h b/arch/arm/mach-omap2/prm-regbits-24xx.h
index 91aa5106d637..37fc905c9636 100644
--- a/arch/arm/mach-omap2/prm-regbits-24xx.h
+++ b/arch/arm/mach-omap2/prm-regbits-24xx.h
@@ -16,274 +16,27 @@
 
 #include "prm2xxx.h"
 
-/* Bits shared between registers */
-
-/* PRCM_IRQSTATUS_MPU, PM_IRQSTATUS_DSP, PRCM_IRQSTATUS_IVA shared bits */
-#define OMAP24XX_VOLTTRANS_ST_MASK                      (1 << 2)
-#define OMAP24XX_WKUP2_ST_MASK                          (1 << 1)
-#define OMAP24XX_WKUP1_ST_MASK                          (1 << 0)
-
-/* PRCM_IRQENABLE_MPU, PM_IRQENABLE_DSP, PRCM_IRQENABLE_IVA shared bits */
-#define OMAP24XX_VOLTTRANS_EN_MASK                      (1 << 2)
-#define OMAP24XX_WKUP2_EN_MASK                          (1 << 1)
-#define OMAP24XX_WKUP1_EN_MASK                          (1 << 0)
-
-/* PM_WKDEP_GFX, PM_WKDEP_MPU, PM_WKDEP_DSP, PM_WKDEP_MDM shared bits */
-#define OMAP24XX_EN_MPU_SHIFT                           1
-#define OMAP24XX_EN_MPU_MASK                            (1 << 1)
 #define OMAP24XX_EN_CORE_SHIFT                          0
-#define OMAP24XX_EN_CORE_MASK                           (1 << 0)
-
-/*
- * PM_PWSTCTRL_MPU, PM_PWSTCTRL_GFX, PM_PWSTCTRL_DSP, PM_PWSTCTRL_MDM
- * shared bits
- */
-#define OMAP24XX_MEMONSTATE_SHIFT                       10
-#define OMAP24XX_MEMONSTATE_MASK                        (0x3 << 10)
-#define OMAP24XX_MEMRETSTATE_MASK                       (1 << 3)
-
-/* PM_PWSTCTRL_GFX, PM_PWSTCTRL_DSP, PM_PWSTCTRL_MDM shared bits */
 #define OMAP24XX_FORCESTATE_MASK                        (1 << 18)
-
-/*
- * PM_PWSTST_CORE, PM_PWSTST_GFX, PM_PWSTST_MPU, PM_PWSTST_DSP,
- * PM_PWSTST_MDM shared bits
- */
-#define OMAP24XX_CLKACTIVITY_MASK                       (1 << 19)
-
-/* PM_PWSTST_MPU, PM_PWSTST_CORE, PM_PWSTST_DSP shared bits */
-#define OMAP24XX_LASTSTATEENTERED_SHIFT                 4
-#define OMAP24XX_LASTSTATEENTERED_MASK                  (0x3 << 4)
-
-/* PM_PWSTST_MPU and PM_PWSTST_DSP shared bits */
-#define OMAP2430_MEMSTATEST_SHIFT                       10
-#define OMAP2430_MEMSTATEST_MASK                        (0x3 << 10)
-
-/* PM_PWSTST_GFX, PM_PWSTST_DSP, PM_PWSTST_MDM shared bits */
-#define OMAP24XX_POWERSTATEST_SHIFT                     0
-#define OMAP24XX_POWERSTATEST_MASK                      (0x3 << 0)
-
-
-/* Bits specific to each register */
-
-/* PRCM_REVISION */
-#define OMAP24XX_REV_SHIFT                              0
-#define OMAP24XX_REV_MASK                               (0xff << 0)
-
-/* PRCM_SYSCONFIG */
 #define OMAP24XX_AUTOIDLE_MASK                          (1 << 0)
-
-/* PRCM_IRQSTATUS_MPU specific bits */
-#define OMAP2430_DPLL_RECAL_ST_MASK                     (1 << 6)
-#define OMAP24XX_TRANSITION_ST_MASK                     (1 << 5)
-#define OMAP24XX_EVGENOFF_ST_MASK                       (1 << 4)
-#define OMAP24XX_EVGENON_ST_MASK                        (1 << 3)
-
-/* PRCM_IRQENABLE_MPU specific bits */
-#define OMAP2430_DPLL_RECAL_EN_MASK                     (1 << 6)
-#define OMAP24XX_TRANSITION_EN_MASK                     (1 << 5)
-#define OMAP24XX_EVGENOFF_EN_MASK                       (1 << 4)
-#define OMAP24XX_EVGENON_EN_MASK                        (1 << 3)
-
-/* PRCM_VOLTCTRL */
 #define OMAP24XX_AUTO_EXTVOLT_MASK                      (1 << 15)
-#define OMAP24XX_FORCE_EXTVOLT_MASK                     (1 << 14)
 #define OMAP24XX_SETOFF_LEVEL_SHIFT                     12
-#define OMAP24XX_SETOFF_LEVEL_MASK                      (0x3 << 12)
 #define OMAP24XX_MEMRETCTRL_MASK                        (1 << 8)
 #define OMAP24XX_SETRET_LEVEL_SHIFT                     6
-#define OMAP24XX_SETRET_LEVEL_MASK                      (0x3 << 6)
 #define OMAP24XX_VOLT_LEVEL_SHIFT                       0
-#define OMAP24XX_VOLT_LEVEL_MASK                        (0x3 << 0)
-
-/* PRCM_VOLTST */
-#define OMAP24XX_ST_VOLTLEVEL_SHIFT                     0
-#define OMAP24XX_ST_VOLTLEVEL_MASK                      (0x3 << 0)
-
-/* PRCM_CLKSRC_CTRL specific bits */
-
-/* PRCM_CLKOUT_CTRL */
 #define OMAP2420_CLKOUT2_EN_SHIFT                       15
-#define OMAP2420_CLKOUT2_EN_MASK                        (1 << 15)
 #define OMAP2420_CLKOUT2_DIV_SHIFT                      11
-#define OMAP2420_CLKOUT2_DIV_MASK                       (0x7 << 11)
 #define OMAP2420_CLKOUT2_DIV_WIDTH                      3
-#define OMAP2420_CLKOUT2_SOURCE_SHIFT                   8
 #define OMAP2420_CLKOUT2_SOURCE_MASK                    (0x3 << 8)
 #define OMAP24XX_CLKOUT_EN_SHIFT                        7
-#define OMAP24XX_CLKOUT_EN_MASK                         (1 << 7)
 #define OMAP24XX_CLKOUT_DIV_SHIFT                       3
-#define OMAP24XX_CLKOUT_DIV_MASK                        (0x7 << 3)
 #define OMAP24XX_CLKOUT_DIV_WIDTH                       3
-#define OMAP24XX_CLKOUT_SOURCE_SHIFT                    0
 #define OMAP24XX_CLKOUT_SOURCE_MASK                     (0x3 << 0)
-
-/* PRCM_CLKEMUL_CTRL */
 #define OMAP24XX_EMULATION_EN_SHIFT                     0
-#define OMAP24XX_EMULATION_EN_MASK                      (1 << 0)
-
-/* PRCM_CLKCFG_CTRL */
-#define OMAP24XX_VALID_CONFIG_MASK                      (1 << 0)
-
-/* PRCM_CLKCFG_STATUS */
-#define OMAP24XX_CONFIG_STATUS_MASK                     (1 << 0)
-
-/* PRCM_VOLTSETUP specific bits */
-
-/* PRCM_CLKSSETUP specific bits */
-
-/* PRCM_POLCTRL */
-#define OMAP2420_CLKOUT2_POL_MASK                       (1 << 10)
-#define OMAP24XX_CLKOUT_POL_MASK                        (1 << 9)
-#define OMAP24XX_CLKREQ_POL_MASK                        (1 << 8)
-#define OMAP2430_USE_POWEROK_MASK                       (1 << 2)
-#define OMAP2430_POWEROK_POL_MASK                       (1 << 1)
-#define OMAP24XX_EXTVOL_POL_MASK                        (1 << 0)
-
-/* RM_RSTST_MPU specific bits */
-/* 2430 calls GLOBALWMPU_RST "GLOBALWARM_RST" instead */
-
-/* PM_WKDEP_MPU specific bits */
 #define OMAP2430_PM_WKDEP_MPU_EN_MDM_SHIFT              5
-#define OMAP2430_PM_WKDEP_MPU_EN_MDM_MASK               (1 << 5)
 #define OMAP24XX_PM_WKDEP_MPU_EN_DSP_SHIFT              2
-#define OMAP24XX_PM_WKDEP_MPU_EN_DSP_MASK               (1 << 2)
-
-/* PM_EVGENCTRL_MPU specific bits */
-
-/* PM_EVEGENONTIM_MPU specific bits */
-
-/* PM_EVEGENOFFTIM_MPU specific bits */
-
-/* PM_PWSTCTRL_MPU specific bits */
-#define OMAP2430_FORCESTATE_MASK                        (1 << 18)
-
-/* PM_PWSTST_MPU specific bits */
-/* INTRANSITION, CLKACTIVITY, POWERSTATE, MEMSTATEST are 2430 only */
-
-/* PM_WKEN1_CORE specific bits */
-
-/* PM_WKEN2_CORE specific bits */
-
-/* PM_WKST1_CORE specific bits*/
-
-/* PM_WKST2_CORE specific bits */
-
-/* PM_WKDEP_CORE specific bits*/
-#define OMAP2430_PM_WKDEP_CORE_EN_MDM_MASK              (1 << 5)
-#define OMAP24XX_PM_WKDEP_CORE_EN_GFX_MASK              (1 << 3)
-#define OMAP24XX_PM_WKDEP_CORE_EN_DSP_MASK              (1 << 2)
-
-/* PM_PWSTCTRL_CORE specific bits */
-#define OMAP24XX_MEMORYCHANGE_MASK                      (1 << 20)
-#define OMAP24XX_MEM3ONSTATE_SHIFT                      14
-#define OMAP24XX_MEM3ONSTATE_MASK                       (0x3 << 14)
-#define OMAP24XX_MEM2ONSTATE_SHIFT                      12
-#define OMAP24XX_MEM2ONSTATE_MASK                       (0x3 << 12)
-#define OMAP24XX_MEM1ONSTATE_SHIFT                      10
-#define OMAP24XX_MEM1ONSTATE_MASK                       (0x3 << 10)
-#define OMAP24XX_MEM3RETSTATE_MASK                      (1 << 5)
-#define OMAP24XX_MEM2RETSTATE_MASK                      (1 << 4)
-#define OMAP24XX_MEM1RETSTATE_MASK                      (1 << 3)
-
-/* PM_PWSTST_CORE specific bits */
-#define OMAP24XX_MEM3STATEST_SHIFT                      14
-#define OMAP24XX_MEM3STATEST_MASK                       (0x3 << 14)
-#define OMAP24XX_MEM2STATEST_SHIFT                      12
-#define OMAP24XX_MEM2STATEST_MASK                       (0x3 << 12)
-#define OMAP24XX_MEM1STATEST_SHIFT                      10
-#define OMAP24XX_MEM1STATEST_MASK                       (0x3 << 10)
-
-/* RM_RSTCTRL_GFX */
-#define OMAP24XX_GFX_RST_MASK                           (1 << 0)
-
-/* RM_RSTST_GFX specific bits */
-#define OMAP24XX_GFX_SW_RST_MASK                        (1 << 4)
-
-/* PM_PWSTCTRL_GFX specific bits */
-
-/* PM_WKDEP_GFX specific bits */
-/* 2430 often calls EN_WAKEUP "EN_WKUP" */
-
-/* RM_RSTCTRL_WKUP specific bits */
-
-/* RM_RSTTIME_WKUP specific bits */
-
-/* RM_RSTST_WKUP specific bits */
-/* 2430 calls EXTWMPU_RST "EXTWARM_RST" and GLOBALWMPU_RST "GLOBALWARM_RST" */
 #define OMAP24XX_EXTWMPU_RST_SHIFT                      6
-#define OMAP24XX_EXTWMPU_RST_MASK                       (1 << 6)
 #define OMAP24XX_SECU_WD_RST_SHIFT                      5
-#define OMAP24XX_SECU_WD_RST_MASK                       (1 << 5)
 #define OMAP24XX_MPU_WD_RST_SHIFT                       4
-#define OMAP24XX_MPU_WD_RST_MASK                        (1 << 4)
 #define OMAP24XX_SECU_VIOL_RST_SHIFT                    3
-#define OMAP24XX_SECU_VIOL_RST_MASK                     (1 << 3)
-
-/* PM_WKEN_WKUP specific bits */
-
-/* PM_WKST_WKUP specific bits */
-
-/* RM_RSTCTRL_DSP */
-#define OMAP2420_RST_IVA_MASK                           (1 << 8)
-#define OMAP24XX_RST2_DSP_MASK                          (1 << 1)
-#define OMAP24XX_RST1_DSP_MASK                          (1 << 0)
-
-/* RM_RSTST_DSP specific bits */
-/* 2430 calls GLOBALWMPU_RST "GLOBALWARM_RST" */
-#define OMAP2420_IVA_SW_RST_MASK                        (1 << 8)
-#define OMAP24XX_DSP_SW_RST2_MASK                       (1 << 5)
-#define OMAP24XX_DSP_SW_RST1_MASK                       (1 << 4)
-
-/* PM_WKDEP_DSP specific bits */
-
-/* PM_PWSTCTRL_DSP specific bits */
-/* 2430 only: MEMONSTATE, MEMRETSTATE */
-#define OMAP2420_MEMIONSTATE_SHIFT                      12
-#define OMAP2420_MEMIONSTATE_MASK                       (0x3 << 12)
-#define OMAP2420_MEMIRETSTATE_MASK                      (1 << 4)
-
-/* PM_PWSTST_DSP specific bits */
-/* MEMSTATEST is 2430 only */
-#define OMAP2420_MEMISTATEST_SHIFT                      12
-#define OMAP2420_MEMISTATEST_MASK                       (0x3 << 12)
-
-/* PRCM_IRQSTATUS_DSP specific bits */
-
-/* PRCM_IRQENABLE_DSP specific bits */
-
-/* RM_RSTCTRL_MDM */
-/* 2430 only */
-#define OMAP2430_PWRON1_MDM_MASK                        (1 << 1)
-#define OMAP2430_RST1_MDM_MASK                          (1 << 0)
-
-/* RM_RSTST_MDM specific bits */
-/* 2430 only */
-#define OMAP2430_MDM_SECU_VIOL_MASK                     (1 << 6)
-#define OMAP2430_MDM_SW_PWRON1_MASK                     (1 << 5)
-#define OMAP2430_MDM_SW_RST1_MASK                       (1 << 4)
-
-/* PM_WKEN_MDM */
-/* 2430 only */
-#define OMAP2430_PM_WKEN_MDM_EN_MDM_MASK                (1 << 0)
-
-/* PM_WKST_MDM specific bits */
-/* 2430 only */
-
-/* PM_WKDEP_MDM specific bits */
-/* 2430 only */
-
-/* PM_PWSTCTRL_MDM specific bits */
-/* 2430 only */
-#define OMAP2430_KILLDOMAINWKUP_MASK                    (1 << 19)
-
-/* PM_PWSTST_MDM specific bits */
-/* 2430 only */
-
-/* PRCM_IRQSTATUS_IVA */
-/* 2420 only */
-
-/* PRCM_IRQENABLE_IVA */
-/* 2420 only */
-
 #endif
diff --git a/arch/arm/mach-omap2/prm-regbits-33xx.h b/arch/arm/mach-omap2/prm-regbits-33xx.h
index 0221b5c20e87..84feecee4fe6 100644
--- a/arch/arm/mach-omap2/prm-regbits-33xx.h
+++ b/arch/arm/mach-omap2/prm-regbits-33xx.h
@@ -18,340 +18,35 @@
 
 #include "prm.h"
 
-/* Used by PRM_LDO_SRAM_CORE_SETUP, PRM_LDO_SRAM_MPU_SETUP */
-#define AM33XX_ABBOFF_ACT_EXPORT_SHIFT                  1
-#define AM33XX_ABBOFF_ACT_EXPORT_MASK                   (1 << 1)
-
-/* Used by PRM_LDO_SRAM_CORE_SETUP, PRM_LDO_SRAM_MPU_SETUP */
-#define AM33XX_ABBOFF_SLEEP_EXPORT_SHIFT                2
-#define AM33XX_ABBOFF_SLEEP_EXPORT_MASK                 (1 << 2)
-
-/* Used by PRM_LDO_SRAM_CORE_SETUP, PRM_LDO_SRAM_MPU_SETUP */
-#define AM33XX_AIPOFF_SHIFT                             8
-#define AM33XX_AIPOFF_MASK                              (1 << 8)
-
-/* Used by PM_WKUP_PWRSTST */
-#define AM33XX_DEBUGSS_MEM_STATEST_SHIFT                17
-#define AM33XX_DEBUGSS_MEM_STATEST_MASK                 (0x3 << 17)
-
-/* Used by PRM_LDO_SRAM_CORE_SETUP, PRM_LDO_SRAM_MPU_SETUP */
-#define AM33XX_DISABLE_RTA_EXPORT_SHIFT                 0
-#define AM33XX_DISABLE_RTA_EXPORT_MASK                  (1 << 0)
-
-/* Used by PRM_IRQENABLE_M3, PRM_IRQENABLE_MPU */
-#define AM33XX_DPLL_CORE_RECAL_EN_SHIFT                 12
-#define AM33XX_DPLL_CORE_RECAL_EN_MASK                  (1 << 12)
-
-/* Used by PRM_IRQSTATUS_M3, PRM_IRQSTATUS_MPU */
-#define AM33XX_DPLL_CORE_RECAL_ST_SHIFT                 12
-#define AM33XX_DPLL_CORE_RECAL_ST_MASK                  (1 << 12)
-
-/* Used by PRM_IRQENABLE_M3, PRM_IRQENABLE_MPU */
-#define AM33XX_DPLL_DDR_RECAL_EN_SHIFT                  14
-#define AM33XX_DPLL_DDR_RECAL_EN_MASK                   (1 << 14)
-
-/* Used by PRM_IRQSTATUS_M3, PRM_IRQSTATUS_MPU */
-#define AM33XX_DPLL_DDR_RECAL_ST_SHIFT                  14
-#define AM33XX_DPLL_DDR_RECAL_ST_MASK                   (1 << 14)
-
-/* Used by PRM_IRQENABLE_M3, PRM_IRQENABLE_MPU */
-#define AM33XX_DPLL_DISP_RECAL_EN_SHIFT                 15
-#define AM33XX_DPLL_DISP_RECAL_EN_MASK                  (1 << 15)
-
-/* Used by PRM_IRQSTATUS_M3, PRM_IRQSTATUS_MPU */
-#define AM33XX_DPLL_DISP_RECAL_ST_SHIFT                 13
-#define AM33XX_DPLL_DISP_RECAL_ST_MASK                  (1 << 13)
-
-/* Used by PRM_IRQENABLE_M3, PRM_IRQENABLE_MPU */
-#define AM33XX_DPLL_MPU_RECAL_EN_SHIFT                  11
-#define AM33XX_DPLL_MPU_RECAL_EN_MASK                   (1 << 11)
-
-/* Used by PRM_IRQSTATUS_M3, PRM_IRQSTATUS_MPU */
-#define AM33XX_DPLL_MPU_RECAL_ST_SHIFT                  11
-#define AM33XX_DPLL_MPU_RECAL_ST_MASK                   (1 << 11)
-
-/* Used by PRM_IRQENABLE_M3, PRM_IRQENABLE_MPU */
-#define AM33XX_DPLL_PER_RECAL_EN_SHIFT                  13
-#define AM33XX_DPLL_PER_RECAL_EN_MASK                   (1 << 13)
-
-/* Used by PRM_IRQSTATUS_M3, PRM_IRQSTATUS_MPU */
-#define AM33XX_DPLL_PER_RECAL_ST_SHIFT                  15
-#define AM33XX_DPLL_PER_RECAL_ST_MASK                   (1 << 15)
-
-/* Used by RM_WKUP_RSTST */
-#define AM33XX_EMULATION_M3_RST_SHIFT                   6
-#define AM33XX_EMULATION_M3_RST_MASK                    (1 << 6)
-
-/* Used by RM_MPU_RSTST */
-#define AM33XX_EMULATION_MPU_RST_SHIFT                  5
-#define AM33XX_EMULATION_MPU_RST_MASK                   (1 << 5)
-
-/* Used by PRM_LDO_SRAM_CORE_SETUP, PRM_LDO_SRAM_MPU_SETUP */
-#define AM33XX_ENFUNC1_EXPORT_SHIFT                     3
-#define AM33XX_ENFUNC1_EXPORT_MASK                      (1 << 3)
-
-/* Used by PRM_LDO_SRAM_CORE_SETUP, PRM_LDO_SRAM_MPU_SETUP */
-#define AM33XX_ENFUNC3_EXPORT_SHIFT                     5
-#define AM33XX_ENFUNC3_EXPORT_MASK                      (1 << 5)
-
-/* Used by PRM_LDO_SRAM_CORE_SETUP, PRM_LDO_SRAM_MPU_SETUP */
-#define AM33XX_ENFUNC4_SHIFT                            6
-#define AM33XX_ENFUNC4_MASK                             (1 << 6)
-
-/* Used by PRM_LDO_SRAM_CORE_SETUP, PRM_LDO_SRAM_MPU_SETUP */
-#define AM33XX_ENFUNC5_SHIFT                            7
-#define AM33XX_ENFUNC5_MASK                             (1 << 7)
-
-/* Used by PRM_RSTST */
-#define AM33XX_EXTERNAL_WARM_RST_SHIFT                  5
-#define AM33XX_EXTERNAL_WARM_RST_MASK                   (1 << 5)
-
-/* Used by PRM_IRQENABLE_M3, PRM_IRQENABLE_MPU */
-#define AM33XX_FORCEWKUP_EN_SHIFT                       10
-#define AM33XX_FORCEWKUP_EN_MASK                        (1 << 10)
-
-/* Used by PRM_IRQSTATUS_M3, PRM_IRQSTATUS_MPU */
-#define AM33XX_FORCEWKUP_ST_SHIFT                       10
-#define AM33XX_FORCEWKUP_ST_MASK                        (1 << 10)
-
-/* Used by PM_GFX_PWRSTCTRL */
-#define AM33XX_GFX_MEM_ONSTATE_SHIFT                    17
 #define AM33XX_GFX_MEM_ONSTATE_MASK                     (0x3 << 17)
-
-/* Used by PM_GFX_PWRSTCTRL */
-#define AM33XX_GFX_MEM_RETSTATE_SHIFT                   6
 #define AM33XX_GFX_MEM_RETSTATE_MASK                    (1 << 6)
-
-/* Used by PM_GFX_PWRSTST */
-#define AM33XX_GFX_MEM_STATEST_SHIFT                    4
 #define AM33XX_GFX_MEM_STATEST_MASK                     (0x3 << 4)
-
-/* Used by RM_GFX_RSTCTRL, RM_GFX_RSTST */
-#define AM33XX_GFX_RST_SHIFT                            0
-#define AM33XX_GFX_RST_MASK                             (1 << 0)
-
-/* Used by PRM_RSTST */
-#define AM33XX_GLOBAL_COLD_RST_SHIFT                    0
-#define AM33XX_GLOBAL_COLD_RST_MASK                     (1 << 0)
-
-/* Used by PRM_RSTST */
-#define AM33XX_GLOBAL_WARM_SW_RST_SHIFT                 1
 #define AM33XX_GLOBAL_WARM_SW_RST_MASK                  (1 << 1)
-
-/* Used by RM_WKUP_RSTST */
-#define AM33XX_ICECRUSHER_M3_RST_SHIFT                  7
-#define AM33XX_ICECRUSHER_M3_RST_MASK                   (1 << 7)
-
-/* Used by RM_MPU_RSTST */
-#define AM33XX_ICECRUSHER_MPU_RST_SHIFT                 6
-#define AM33XX_ICECRUSHER_MPU_RST_MASK                  (1 << 6)
-
-/* Used by PRM_RSTST */
-#define AM33XX_ICEPICK_RST_SHIFT                        9
-#define AM33XX_ICEPICK_RST_MASK                         (1 << 9)
-
-/* Used by RM_PER_RSTCTRL */
-#define AM33XX_PRUSS_LRST_SHIFT                         1
-#define AM33XX_PRUSS_LRST_MASK                          (1 << 1)
-
-/* Used by PM_PER_PWRSTCTRL */
-#define AM33XX_PRUSS_MEM_ONSTATE_SHIFT                  5
+#define AM33XX_RST_GLOBAL_WARM_SW_MASK                  (1 << 0)
 #define AM33XX_PRUSS_MEM_ONSTATE_MASK                   (0x3 << 5)
-
-/* Used by PM_PER_PWRSTCTRL */
-#define AM33XX_PRUSS_MEM_RETSTATE_SHIFT                 7
 #define AM33XX_PRUSS_MEM_RETSTATE_MASK                  (1 << 7)
-
-/* Used by PM_PER_PWRSTST */
-#define AM33XX_PRUSS_MEM_STATEST_SHIFT                  23
 #define AM33XX_PRUSS_MEM_STATEST_MASK                   (0x3 << 23)
-
-/*
- * Used by PM_GFX_PWRSTST, PM_CEFUSE_PWRSTST, PM_PER_PWRSTST, PM_MPU_PWRSTST,
- * PM_WKUP_PWRSTST, PM_RTC_PWRSTST
- */
-#define AM33XX_INTRANSITION_SHIFT                       20
-#define AM33XX_INTRANSITION_MASK                        (1 << 20)
-
-/* Used by PM_CEFUSE_PWRSTST */
 #define AM33XX_LASTPOWERSTATEENTERED_SHIFT              24
 #define AM33XX_LASTPOWERSTATEENTERED_MASK               (0x3 << 24)
-
-/* Used by PM_GFX_PWRSTCTRL, PM_MPU_PWRSTCTRL, PM_RTC_PWRSTCTRL */
-#define AM33XX_LOGICRETSTATE_SHIFT                      2
 #define AM33XX_LOGICRETSTATE_MASK                       (1 << 2)
-
-/* Renamed from LOGICRETSTATE Used by PM_PER_PWRSTCTRL, PM_WKUP_PWRSTCTRL */
-#define AM33XX_LOGICRETSTATE_3_3_SHIFT                  3
 #define AM33XX_LOGICRETSTATE_3_3_MASK                   (1 << 3)
-
-/*
- * Used by PM_GFX_PWRSTST, PM_CEFUSE_PWRSTST, PM_PER_PWRSTST, PM_MPU_PWRSTST,
- * PM_WKUP_PWRSTST, PM_RTC_PWRSTST
- */
 #define AM33XX_LOGICSTATEST_SHIFT                       2
 #define AM33XX_LOGICSTATEST_MASK                        (1 << 2)
-
-/*
- * Used by PM_GFX_PWRSTCTRL, PM_CEFUSE_PWRSTCTRL, PM_PER_PWRSTCTRL,
- * PM_MPU_PWRSTCTRL, PM_WKUP_PWRSTCTRL, PM_RTC_PWRSTCTRL
- */
 #define AM33XX_LOWPOWERSTATECHANGE_SHIFT                4
 #define AM33XX_LOWPOWERSTATECHANGE_MASK                 (1 << 4)
-
-/* Used by PM_MPU_PWRSTCTRL */
-#define AM33XX_MPU_L1_ONSTATE_SHIFT                     18
 #define AM33XX_MPU_L1_ONSTATE_MASK                      (0x3 << 18)
-
-/* Used by PM_MPU_PWRSTCTRL */
-#define AM33XX_MPU_L1_RETSTATE_SHIFT                    22
 #define AM33XX_MPU_L1_RETSTATE_MASK                     (1 << 22)
-
-/* Used by PM_MPU_PWRSTST */
-#define AM33XX_MPU_L1_STATEST_SHIFT                     6
 #define AM33XX_MPU_L1_STATEST_MASK                      (0x3 << 6)
-
-/* Used by PM_MPU_PWRSTCTRL */
-#define AM33XX_MPU_L2_ONSTATE_SHIFT                     20
 #define AM33XX_MPU_L2_ONSTATE_MASK                      (0x3 << 20)
-
-/* Used by PM_MPU_PWRSTCTRL */
-#define AM33XX_MPU_L2_RETSTATE_SHIFT                    23
 #define AM33XX_MPU_L2_RETSTATE_MASK                     (1 << 23)
-
-/* Used by PM_MPU_PWRSTST */
-#define AM33XX_MPU_L2_STATEST_SHIFT                     8
 #define AM33XX_MPU_L2_STATEST_MASK                      (0x3 << 8)
-
-/* Used by PM_MPU_PWRSTCTRL */
-#define AM33XX_MPU_RAM_ONSTATE_SHIFT                    16
 #define AM33XX_MPU_RAM_ONSTATE_MASK                     (0x3 << 16)
-
-/* Used by PM_MPU_PWRSTCTRL */
-#define AM33XX_MPU_RAM_RETSTATE_SHIFT                   24
 #define AM33XX_MPU_RAM_RETSTATE_MASK                    (1 << 24)
-
-/* Used by PM_MPU_PWRSTST */
-#define AM33XX_MPU_RAM_STATEST_SHIFT                    4
 #define AM33XX_MPU_RAM_STATEST_MASK                     (0x3 << 4)
-
-/* Used by PRM_RSTST */
-#define AM33XX_MPU_SECURITY_VIOL_RST_SHIFT              2
-#define AM33XX_MPU_SECURITY_VIOL_RST_MASK               (1 << 2)
-
-/* Used by PRM_SRAM_COUNT */
-#define AM33XX_PCHARGECNT_VALUE_SHIFT                   0
-#define AM33XX_PCHARGECNT_VALUE_MASK                    (0x3f << 0)
-
-/* Used by RM_PER_RSTCTRL */
-#define AM33XX_PCI_LRST_SHIFT                           0
-#define AM33XX_PCI_LRST_MASK                            (1 << 0)
-
-/* Renamed from PCI_LRST Used by RM_PER_RSTST */
-#define AM33XX_PCI_LRST_5_5_SHIFT                       5
-#define AM33XX_PCI_LRST_5_5_MASK                        (1 << 5)
-
-/* Used by PM_PER_PWRSTCTRL */
-#define AM33XX_PER_MEM_ONSTATE_SHIFT                    25
 #define AM33XX_PER_MEM_ONSTATE_MASK                     (0x3 << 25)
-
-/* Used by PM_PER_PWRSTCTRL */
-#define AM33XX_PER_MEM_RETSTATE_SHIFT                   29
 #define AM33XX_PER_MEM_RETSTATE_MASK                    (1 << 29)
-
-/* Used by PM_PER_PWRSTST */
-#define AM33XX_PER_MEM_STATEST_SHIFT                    17
 #define AM33XX_PER_MEM_STATEST_MASK                     (0x3 << 17)
-
-/*
- * Used by PM_GFX_PWRSTCTRL, PM_CEFUSE_PWRSTCTRL, PM_PER_PWRSTCTRL,
- * PM_MPU_PWRSTCTRL
- */
-#define AM33XX_POWERSTATE_SHIFT                         0
-#define AM33XX_POWERSTATE_MASK                          (0x3 << 0)
-
-/* Used by PM_GFX_PWRSTST, PM_CEFUSE_PWRSTST, PM_PER_PWRSTST, PM_MPU_PWRSTST */
-#define AM33XX_POWERSTATEST_SHIFT                       0
-#define AM33XX_POWERSTATEST_MASK                        (0x3 << 0)
-
-/* Used by PM_PER_PWRSTCTRL */
-#define AM33XX_RAM_MEM_ONSTATE_SHIFT                    30
 #define AM33XX_RAM_MEM_ONSTATE_MASK                     (0x3 << 30)
-
-/* Used by PM_PER_PWRSTCTRL */
-#define AM33XX_RAM_MEM_RETSTATE_SHIFT                   27
 #define AM33XX_RAM_MEM_RETSTATE_MASK                    (1 << 27)
-
-/* Used by PM_PER_PWRSTST */
-#define AM33XX_RAM_MEM_STATEST_SHIFT                    21
 #define AM33XX_RAM_MEM_STATEST_MASK                     (0x3 << 21)
-
-/* Used by PRM_LDO_SRAM_CORE_CTRL, PRM_LDO_SRAM_MPU_CTRL */
-#define AM33XX_RETMODE_ENABLE_SHIFT                     0
-#define AM33XX_RETMODE_ENABLE_MASK                      (1 << 0)
-
-/* Used by REVISION_PRM */
-#define AM33XX_REV_SHIFT                                0
-#define AM33XX_REV_MASK                                 (0xff << 0)
-
-/* Used by PRM_RSTTIME */
-#define AM33XX_RSTTIME1_SHIFT                           0
-#define AM33XX_RSTTIME1_MASK                            (0xff << 0)
-
-/* Used by PRM_RSTTIME */
-#define AM33XX_RSTTIME2_SHIFT                           8
-#define AM33XX_RSTTIME2_MASK                            (0x1f << 8)
-
-/* Used by PRM_RSTCTRL */
-#define AM33XX_RST_GLOBAL_COLD_SW_SHIFT                 1
-#define AM33XX_RST_GLOBAL_COLD_SW_MASK                  (1 << 1)
-
-/* Used by PRM_RSTCTRL */
-#define AM33XX_RST_GLOBAL_WARM_SW_SHIFT                 0
-#define AM33XX_RST_GLOBAL_WARM_SW_MASK                  (1 << 0)
-
-/* Used by PRM_SRAM_COUNT */
-#define AM33XX_SLPCNT_VALUE_SHIFT                       16
-#define AM33XX_SLPCNT_VALUE_MASK                        (0xff << 16)
-
-/* Used by PRM_LDO_SRAM_CORE_CTRL, PRM_LDO_SRAM_MPU_CTRL */
-#define AM33XX_SRAMLDO_STATUS_SHIFT                     8
-#define AM33XX_SRAMLDO_STATUS_MASK                      (1 << 8)
-
-/* Used by PRM_LDO_SRAM_CORE_CTRL, PRM_LDO_SRAM_MPU_CTRL */
-#define AM33XX_SRAM_IN_TRANSITION_SHIFT                 9
-#define AM33XX_SRAM_IN_TRANSITION_MASK                  (1 << 9)
-
-/* Used by PRM_SRAM_COUNT */
-#define AM33XX_STARTUP_COUNT_SHIFT                      24
-#define AM33XX_STARTUP_COUNT_MASK                       (0xff << 24)
-
-/* Used by PRM_IRQENABLE_M3, PRM_IRQENABLE_MPU */
-#define AM33XX_TRANSITION_EN_SHIFT                      8
-#define AM33XX_TRANSITION_EN_MASK                       (1 << 8)
-
-/* Used by PRM_IRQSTATUS_M3, PRM_IRQSTATUS_MPU */
-#define AM33XX_TRANSITION_ST_SHIFT                      8
-#define AM33XX_TRANSITION_ST_MASK                       (1 << 8)
-
-/* Used by PRM_SRAM_COUNT */
-#define AM33XX_VSETUPCNT_VALUE_SHIFT                    8
-#define AM33XX_VSETUPCNT_VALUE_MASK                     (0xff << 8)
-
-/* Used by PRM_RSTST */
-#define AM33XX_WDT0_RST_SHIFT                           3
-#define AM33XX_WDT0_RST_MASK                            (1 << 3)
-
-/* Used by PRM_RSTST */
-#define AM33XX_WDT1_RST_SHIFT                           4
-#define AM33XX_WDT1_RST_MASK                            (1 << 4)
-
-/* Used by RM_WKUP_RSTCTRL */
-#define AM33XX_WKUP_M3_LRST_SHIFT                       3
-#define AM33XX_WKUP_M3_LRST_MASK                        (1 << 3)
-
-/* Renamed from WKUP_M3_LRST Used by RM_WKUP_RSTST */
-#define AM33XX_WKUP_M3_LRST_5_5_SHIFT                   5
-#define AM33XX_WKUP_M3_LRST_5_5_MASK                    (1 << 5)
-
 #endif
diff --git a/arch/arm/mach-omap2/prm-regbits-34xx.h b/arch/arm/mach-omap2/prm-regbits-34xx.h
index b0a2142eeb91..cebad565ed37 100644
--- a/arch/arm/mach-omap2/prm-regbits-34xx.h
+++ b/arch/arm/mach-omap2/prm-regbits-34xx.h
@@ -16,115 +16,25 @@
 
 #include "prm3xxx.h"
 
-/* Shared register bits */
-
-/* PRM_VC_CMD_VAL_0, PRM_VC_CMD_VAL_1 shared bits */
-#define OMAP3430_ON_SHIFT                               24
-#define OMAP3430_ON_MASK                                (0xff << 24)
-#define OMAP3430_ONLP_SHIFT                             16
-#define OMAP3430_ONLP_MASK                              (0xff << 16)
-#define OMAP3430_RET_SHIFT                              8
-#define OMAP3430_RET_MASK                               (0xff << 8)
-#define OMAP3430_OFF_SHIFT                              0
-#define OMAP3430_OFF_MASK                               (0xff << 0)
-
-/* PRM_VP1_CONFIG, PRM_VP2_CONFIG shared bits */
-#define OMAP3430_ERROROFFSET_SHIFT                      24
 #define OMAP3430_ERROROFFSET_MASK                       (0xff << 24)
-#define OMAP3430_ERRORGAIN_SHIFT                        16
 #define OMAP3430_ERRORGAIN_MASK                         (0xff << 16)
-#define OMAP3430_INITVOLTAGE_SHIFT                      8
 #define OMAP3430_INITVOLTAGE_MASK                       (0xff << 8)
 #define OMAP3430_TIMEOUTEN_MASK                         (1 << 3)
 #define OMAP3430_INITVDD_MASK                           (1 << 2)
 #define OMAP3430_FORCEUPDATE_MASK                       (1 << 1)
 #define OMAP3430_VPENABLE_MASK                          (1 << 0)
-
-/* PRM_VP1_VSTEPMIN, PRM_VP2_VSTEPMIN shared bits */
 #define OMAP3430_SMPSWAITTIMEMIN_SHIFT                  8
-#define OMAP3430_SMPSWAITTIMEMIN_MASK                   (0xffff << 8)
 #define OMAP3430_VSTEPMIN_SHIFT                         0
-#define OMAP3430_VSTEPMIN_MASK                          (0xff << 0)
-
-/* PRM_VP1_VSTEPMAX, PRM_VP2_VSTEPMAX shared bits */
 #define OMAP3430_SMPSWAITTIMEMAX_SHIFT                  8
-#define OMAP3430_SMPSWAITTIMEMAX_MASK                   (0xffff << 8)
 #define OMAP3430_VSTEPMAX_SHIFT                         0
-#define OMAP3430_VSTEPMAX_MASK                          (0xff << 0)
-
-/* PRM_VP1_VLIMITTO, PRM_VP2_VLIMITTO shared bits */
 #define OMAP3430_VDDMAX_SHIFT                           24
-#define OMAP3430_VDDMAX_MASK                            (0xff << 24)
 #define OMAP3430_VDDMIN_SHIFT                           16
-#define OMAP3430_VDDMIN_MASK                            (0xff << 16)
 #define OMAP3430_TIMEOUT_SHIFT                          0
-#define OMAP3430_TIMEOUT_MASK                           (0xffff << 0)
-
-/* PRM_VP1_VOLTAGE, PRM_VP2_VOLTAGE shared bits */
-#define OMAP3430_VPVOLTAGE_SHIFT                        0
 #define OMAP3430_VPVOLTAGE_MASK                         (0xff << 0)
-
-/* PRM_VP1_STATUS, PRM_VP2_STATUS shared bits */
-#define OMAP3430_VPINIDLE_MASK                          (1 << 0)
-
-/* PM_WKDEP_IVA2, PM_WKDEP_MPU shared bits */
 #define OMAP3430_EN_PER_SHIFT                           7
-#define OMAP3430_EN_PER_MASK                            (1 << 7)
-
-/* PM_PWSTCTRL_IVA2, PM_PWSTCTRL_MPU, PM_PWSTCTRL_CORE shared bits */
-#define OMAP3430_MEMORYCHANGE_MASK                      (1 << 3)
-
-/* PM_PWSTST_IVA2, PM_PWSTST_CORE shared bits */
 #define OMAP3430_LOGICSTATEST_MASK                      (1 << 2)
-
-/* PM_PREPWSTST_IVA2, PM_PREPWSTST_CORE shared bits */
 #define OMAP3430_LASTLOGICSTATEENTERED_MASK             (1 << 2)
-
-/*
- * PM_PREPWSTST_IVA2, PM_PREPWSTST_MPU, PM_PREPWSTST_CORE,
- * PM_PREPWSTST_GFX, PM_PREPWSTST_DSS, PM_PREPWSTST_CAM,
- * PM_PREPWSTST_PER, PM_PREPWSTST_NEON shared bits
- */
-#define OMAP3430_LASTPOWERSTATEENTERED_SHIFT            0
 #define OMAP3430_LASTPOWERSTATEENTERED_MASK             (0x3 << 0)
-
-/* PRM_IRQSTATUS_IVA2, PRM_IRQSTATUS_MPU shared bits */
-#define OMAP3430_WKUP_ST_MASK                           (1 << 0)
-
-/* PRM_IRQENABLE_IVA2, PRM_IRQENABLE_MPU shared bits */
-#define OMAP3430_WKUP_EN_MASK                           (1 << 0)
-
-/* PM_MPUGRPSEL1_CORE, PM_IVA2GRPSEL1_CORE shared bits */
-#define OMAP3430_GRPSEL_MMC2_MASK                       (1 << 25)
-#define OMAP3430_GRPSEL_MMC1_MASK                       (1 << 24)
-#define OMAP3430_GRPSEL_MCSPI4_MASK                     (1 << 21)
-#define OMAP3430_GRPSEL_MCSPI3_MASK                     (1 << 20)
-#define OMAP3430_GRPSEL_MCSPI2_MASK                     (1 << 19)
-#define OMAP3430_GRPSEL_MCSPI1_MASK                     (1 << 18)
-#define OMAP3430_GRPSEL_I2C3_SHIFT                      17
-#define OMAP3430_GRPSEL_I2C3_MASK                       (1 << 17)
-#define OMAP3430_GRPSEL_I2C2_SHIFT                      16
-#define OMAP3430_GRPSEL_I2C2_MASK                       (1 << 16)
-#define OMAP3430_GRPSEL_I2C1_SHIFT                      15
-#define OMAP3430_GRPSEL_I2C1_MASK                       (1 << 15)
-#define OMAP3430_GRPSEL_UART2_MASK                      (1 << 14)
-#define OMAP3430_GRPSEL_UART1_MASK                      (1 << 13)
-#define OMAP3430_GRPSEL_GPT11_MASK                      (1 << 12)
-#define OMAP3430_GRPSEL_GPT10_MASK                      (1 << 11)
-#define OMAP3430_GRPSEL_MCBSP5_MASK                     (1 << 10)
-#define OMAP3430_GRPSEL_MCBSP1_MASK                     (1 << 9)
-#define OMAP3430_GRPSEL_HSOTGUSB_MASK                   (1 << 4)
-#define OMAP3430_GRPSEL_D2D_MASK                        (1 << 3)
-
-/*
- * PM_PWSTCTRL_GFX, PM_PWSTCTRL_DSS, PM_PWSTCTRL_CAM,
- * PM_PWSTCTRL_PER shared bits
- */
-#define OMAP3430_MEMONSTATE_SHIFT                       16
-#define OMAP3430_MEMONSTATE_MASK                        (0x3 << 16)
-#define OMAP3430_MEMRETSTATE_MASK                       (1 << 8)
-
-/* PM_MPUGRPSEL_PER, PM_IVA2GRPSEL_PER shared bits */
 #define OMAP3630_GRPSEL_UART4_MASK                      (1 << 18)
 #define OMAP3430_GRPSEL_GPIO6_MASK                      (1 << 17)
 #define OMAP3430_GRPSEL_GPIO5_MASK                      (1 << 16)
@@ -132,480 +42,89 @@
 #define OMAP3430_GRPSEL_GPIO3_MASK                      (1 << 14)
 #define OMAP3430_GRPSEL_GPIO2_MASK                      (1 << 13)
 #define OMAP3430_GRPSEL_UART3_MASK                      (1 << 11)
-#define OMAP3430_GRPSEL_GPT9_MASK                       (1 << 10)
-#define OMAP3430_GRPSEL_GPT8_MASK                       (1 << 9)
-#define OMAP3430_GRPSEL_GPT7_MASK                       (1 << 8)
-#define OMAP3430_GRPSEL_GPT6_MASK                       (1 << 7)
-#define OMAP3430_GRPSEL_GPT5_MASK                       (1 << 6)
-#define OMAP3430_GRPSEL_GPT4_MASK                       (1 << 5)
-#define OMAP3430_GRPSEL_GPT3_MASK                       (1 << 4)
-#define OMAP3430_GRPSEL_GPT2_MASK                       (1 << 3)
 #define OMAP3430_GRPSEL_MCBSP4_MASK                     (1 << 2)
 #define OMAP3430_GRPSEL_MCBSP3_MASK                     (1 << 1)
 #define OMAP3430_GRPSEL_MCBSP2_MASK                     (1 << 0)
-
-/* PM_MPUGRPSEL_WKUP, PM_IVA2GRPSEL_WKUP shared bits */
-#define OMAP3430_GRPSEL_IO_MASK                         (1 << 8)
-#define OMAP3430_GRPSEL_SR2_MASK                        (1 << 7)
-#define OMAP3430_GRPSEL_SR1_MASK                        (1 << 6)
 #define OMAP3430_GRPSEL_GPIO1_MASK                      (1 << 3)
 #define OMAP3430_GRPSEL_GPT12_MASK                      (1 << 1)
 #define OMAP3430_GRPSEL_GPT1_MASK                       (1 << 0)
-
-/* Bits specific to each register */
-
-/* RM_RSTCTRL_IVA2 */
 #define OMAP3430_RST3_IVA2_MASK                         (1 << 2)
 #define OMAP3430_RST2_IVA2_MASK                         (1 << 1)
 #define OMAP3430_RST1_IVA2_MASK                         (1 << 0)
-
-/* RM_RSTST_IVA2 specific bits */
-#define OMAP3430_EMULATION_VSEQ_RST_MASK                (1 << 13)
-#define OMAP3430_EMULATION_VHWA_RST_MASK                (1 << 12)
-#define OMAP3430_EMULATION_IVA2_RST_MASK                (1 << 11)
-#define OMAP3430_IVA2_SW_RST3_MASK                      (1 << 10)
-#define OMAP3430_IVA2_SW_RST2_MASK                      (1 << 9)
-#define OMAP3430_IVA2_SW_RST1_MASK                      (1 << 8)
-
-/* PM_WKDEP_IVA2 specific bits */
-
-/* PM_PWSTCTRL_IVA2 specific bits */
-#define OMAP3430_L2FLATMEMONSTATE_SHIFT                 22
 #define OMAP3430_L2FLATMEMONSTATE_MASK                  (0x3 << 22)
-#define OMAP3430_SHAREDL2CACHEFLATONSTATE_SHIFT         20
 #define OMAP3430_SHAREDL2CACHEFLATONSTATE_MASK          (0x3 << 20)
-#define OMAP3430_L1FLATMEMONSTATE_SHIFT                 18
 #define OMAP3430_L1FLATMEMONSTATE_MASK                  (0x3 << 18)
-#define OMAP3430_SHAREDL1CACHEFLATONSTATE_SHIFT         16
 #define OMAP3430_SHAREDL1CACHEFLATONSTATE_MASK          (0x3 << 16)
 #define OMAP3430_L2FLATMEMRETSTATE_MASK                 (1 << 11)
 #define OMAP3430_SHAREDL2CACHEFLATRETSTATE_MASK         (1 << 10)
 #define OMAP3430_L1FLATMEMRETSTATE_MASK                 (1 << 9)
 #define OMAP3430_SHAREDL1CACHEFLATRETSTATE_MASK         (1 << 8)
-
-/* PM_PWSTST_IVA2 specific bits */
-#define OMAP3430_L2FLATMEMSTATEST_SHIFT                 10
 #define OMAP3430_L2FLATMEMSTATEST_MASK                  (0x3 << 10)
-#define OMAP3430_SHAREDL2CACHEFLATSTATEST_SHIFT         8
 #define OMAP3430_SHAREDL2CACHEFLATSTATEST_MASK          (0x3 << 8)
-#define OMAP3430_L1FLATMEMSTATEST_SHIFT                 6
 #define OMAP3430_L1FLATMEMSTATEST_MASK                  (0x3 << 6)
-#define OMAP3430_SHAREDL1CACHEFLATSTATEST_SHIFT         4
 #define OMAP3430_SHAREDL1CACHEFLATSTATEST_MASK          (0x3 << 4)
-
-/* PM_PREPWSTST_IVA2 specific bits */
-#define OMAP3430_LASTL2FLATMEMSTATEENTERED_SHIFT                10
 #define OMAP3430_LASTL2FLATMEMSTATEENTERED_MASK                 (0x3 << 10)
-#define OMAP3430_LASTSHAREDL2CACHEFLATSTATEENTERED_SHIFT        8
 #define OMAP3430_LASTSHAREDL2CACHEFLATSTATEENTERED_MASK         (0x3 << 8)
-#define OMAP3430_LASTL1FLATMEMSTATEENTERED_SHIFT                6
-#define OMAP3430_LASTL1FLATMEMSTATEENTERED_MASK                 (0x3 << 6)
-#define OMAP3430_LASTSHAREDL1CACHEFLATSTATEENTERED_SHIFT        4
-#define OMAP3430_LASTSHAREDL1CACHEFLATSTATEENTERED_MASK         (0x3 << 4)
-
-/* PRM_IRQSTATUS_IVA2 specific bits */
-#define OMAP3430_PRM_IRQSTATUS_IVA2_IVA2_DPLL_ST_MASK   (1 << 2)
-#define OMAP3430_FORCEWKUP_ST_MASK                      (1 << 1)
-
-/* PRM_IRQENABLE_IVA2 specific bits */
-#define OMAP3430_PRM_IRQENABLE_IVA2_IVA2_DPLL_RECAL_EN_MASK     (1 << 2)
-#define OMAP3430_FORCEWKUP_EN_MASK                              (1 << 1)
-
-/* PRM_REVISION specific bits */
-
-/* PRM_SYSCONFIG specific bits */
-
-/* PRM_IRQSTATUS_MPU specific bits */
 #define OMAP3430ES2_SND_PERIPH_DPLL_ST_SHIFT            25
-#define OMAP3430ES2_SND_PERIPH_DPLL_ST_MASK             (1 << 25)
-#define OMAP3430_VC_TIMEOUTERR_ST_MASK                  (1 << 24)
-#define OMAP3430_VC_RAERR_ST_MASK                       (1 << 23)
-#define OMAP3430_VC_SAERR_ST_MASK                       (1 << 22)
 #define OMAP3430_VP2_TRANXDONE_ST_MASK                  (1 << 21)
-#define OMAP3430_VP2_EQVALUE_ST_MASK                    (1 << 20)
-#define OMAP3430_VP2_NOSMPSACK_ST_MASK                  (1 << 19)
-#define OMAP3430_VP2_MAXVDD_ST_MASK                     (1 << 18)
-#define OMAP3430_VP2_MINVDD_ST_MASK                     (1 << 17)
-#define OMAP3430_VP2_OPPCHANGEDONE_ST_MASK              (1 << 16)
 #define OMAP3430_VP1_TRANXDONE_ST_MASK                  (1 << 15)
-#define OMAP3430_VP1_EQVALUE_ST_MASK                    (1 << 14)
-#define OMAP3430_VP1_NOSMPSACK_ST_MASK                  (1 << 13)
-#define OMAP3430_VP1_MAXVDD_ST_MASK                     (1 << 12)
-#define OMAP3430_VP1_MINVDD_ST_MASK                     (1 << 11)
-#define OMAP3430_VP1_OPPCHANGEDONE_ST_MASK              (1 << 10)
-#define OMAP3430_IO_ST_MASK                             (1 << 9)
-#define OMAP3430_PRM_IRQSTATUS_MPU_IVA2_DPLL_ST_MASK    (1 << 8)
 #define OMAP3430_PRM_IRQSTATUS_MPU_IVA2_DPLL_ST_SHIFT   8
-#define OMAP3430_MPU_DPLL_ST_MASK                       (1 << 7)
 #define OMAP3430_MPU_DPLL_ST_SHIFT                      7
-#define OMAP3430_PERIPH_DPLL_ST_MASK                    (1 << 6)
 #define OMAP3430_PERIPH_DPLL_ST_SHIFT                   6
-#define OMAP3430_CORE_DPLL_ST_MASK                      (1 << 5)
 #define OMAP3430_CORE_DPLL_ST_SHIFT                     5
-#define OMAP3430_TRANSITION_ST_MASK                     (1 << 4)
-#define OMAP3430_EVGENOFF_ST_MASK                       (1 << 3)
-#define OMAP3430_EVGENON_ST_MASK                        (1 << 2)
-#define OMAP3430_FS_USB_WKUP_ST_MASK                    (1 << 1)
-
-/* PRM_IRQENABLE_MPU specific bits */
 #define OMAP3430ES2_SND_PERIPH_DPLL_RECAL_EN_SHIFT              25
-#define OMAP3430ES2_SND_PERIPH_DPLL_RECAL_EN_MASK               (1 << 25)
-#define OMAP3430_VC_TIMEOUTERR_EN_MASK                          (1 << 24)
-#define OMAP3430_VC_RAERR_EN_MASK                               (1 << 23)
-#define OMAP3430_VC_SAERR_EN_MASK                               (1 << 22)
-#define OMAP3430_VP2_TRANXDONE_EN_MASK                          (1 << 21)
-#define OMAP3430_VP2_EQVALUE_EN_MASK                            (1 << 20)
-#define OMAP3430_VP2_NOSMPSACK_EN_MASK                          (1 << 19)
-#define OMAP3430_VP2_MAXVDD_EN_MASK                             (1 << 18)
-#define OMAP3430_VP2_MINVDD_EN_MASK                             (1 << 17)
-#define OMAP3430_VP2_OPPCHANGEDONE_EN_MASK                      (1 << 16)
-#define OMAP3430_VP1_TRANXDONE_EN_MASK                          (1 << 15)
-#define OMAP3430_VP1_EQVALUE_EN_MASK                            (1 << 14)
-#define OMAP3430_VP1_NOSMPSACK_EN_MASK                          (1 << 13)
-#define OMAP3430_VP1_MAXVDD_EN_MASK                             (1 << 12)
-#define OMAP3430_VP1_MINVDD_EN_MASK                             (1 << 11)
-#define OMAP3430_VP1_OPPCHANGEDONE_EN_MASK                      (1 << 10)
-#define OMAP3430_IO_EN_MASK                                     (1 << 9)
-#define OMAP3430_PRM_IRQENABLE_MPU_IVA2_DPLL_RECAL_EN_MASK      (1 << 8)
 #define OMAP3430_PRM_IRQENABLE_MPU_IVA2_DPLL_RECAL_EN_SHIFT     8
-#define OMAP3430_MPU_DPLL_RECAL_EN_MASK                         (1 << 7)
 #define OMAP3430_MPU_DPLL_RECAL_EN_SHIFT                        7
-#define OMAP3430_PERIPH_DPLL_RECAL_EN_MASK                      (1 << 6)
 #define OMAP3430_PERIPH_DPLL_RECAL_EN_SHIFT                     6
-#define OMAP3430_CORE_DPLL_RECAL_EN_MASK                        (1 << 5)
 #define OMAP3430_CORE_DPLL_RECAL_EN_SHIFT                       5
-#define OMAP3430_TRANSITION_EN_MASK                             (1 << 4)
-#define OMAP3430_EVGENOFF_EN_MASK                               (1 << 3)
-#define OMAP3430_EVGENON_EN_MASK                                (1 << 2)
-#define OMAP3430_FS_USB_WKUP_EN_MASK                            (1 << 1)
-
-/* RM_RSTST_MPU specific bits */
-#define OMAP3430_EMULATION_MPU_RST_MASK                 (1 << 11)
-
-/* PM_WKDEP_MPU specific bits */
 #define OMAP3430_PM_WKDEP_MPU_EN_DSS_SHIFT              5
-#define OMAP3430_PM_WKDEP_MPU_EN_DSS_MASK               (1 << 5)
 #define OMAP3430_PM_WKDEP_MPU_EN_IVA2_SHIFT             2
-#define OMAP3430_PM_WKDEP_MPU_EN_IVA2_MASK              (1 << 2)
-
-/* PM_EVGENCTRL_MPU */
-#define OMAP3430_OFFLOADMODE_SHIFT                      3
-#define OMAP3430_OFFLOADMODE_MASK                       (0x3 << 3)
-#define OMAP3430_ONLOADMODE_SHIFT                       1
-#define OMAP3430_ONLOADMODE_MASK                        (0x3 << 1)
-#define OMAP3430_ENABLE_MASK                            (1 << 0)
-
-/* PM_EVGENONTIM_MPU */
-#define OMAP3430_ONTIMEVAL_SHIFT                        0
-#define OMAP3430_ONTIMEVAL_MASK                         (0xffffffff << 0)
-
-/* PM_EVGENOFFTIM_MPU */
-#define OMAP3430_OFFTIMEVAL_SHIFT                       0
-#define OMAP3430_OFFTIMEVAL_MASK                        (0xffffffff << 0)
-
-/* PM_PWSTCTRL_MPU specific bits */
-#define OMAP3430_L2CACHEONSTATE_SHIFT                   16
-#define OMAP3430_L2CACHEONSTATE_MASK                    (0x3 << 16)
-#define OMAP3430_L2CACHERETSTATE_MASK                   (1 << 8)
-#define OMAP3430_LOGICL1CACHERETSTATE_MASK              (1 << 2)
-
-/* PM_PWSTST_MPU specific bits */
-#define OMAP3430_L2CACHESTATEST_SHIFT                   6
-#define OMAP3430_L2CACHESTATEST_MASK                    (0x3 << 6)
-#define OMAP3430_LOGICL1CACHESTATEST_MASK               (1 << 2)
-
-/* PM_PREPWSTST_MPU specific bits */
-#define OMAP3430_LASTL2CACHESTATEENTERED_SHIFT          6
-#define OMAP3430_LASTL2CACHESTATEENTERED_MASK           (0x3 << 6)
-#define OMAP3430_LASTLOGICL1CACHESTATEENTERED_MASK      (1 << 2)
-
-/* RM_RSTCTRL_CORE */
 #define OMAP3430_RM_RSTCTRL_CORE_MODEM_SW_RSTPWRON_MASK         (1 << 1)
 #define OMAP3430_RM_RSTCTRL_CORE_MODEM_SW_RST_MASK              (1 << 0)
-
-/* RM_RSTST_CORE specific bits */
-#define OMAP3430_MODEM_SECURITY_VIOL_RST_MASK           (1 << 10)
-#define OMAP3430_RM_RSTST_CORE_MODEM_SW_RSTPWRON_MASK   (1 << 9)
-#define OMAP3430_RM_RSTST_CORE_MODEM_SW_RST_MASK        (1 << 8)
-
-/* PM_WKEN1_CORE specific bits */
-
-/* PM_MPUGRPSEL1_CORE specific bits */
-#define OMAP3430_GRPSEL_FSHOSTUSB_MASK                  (1 << 5)
-
-/* PM_IVA2GRPSEL1_CORE specific bits */
-
-/* PM_WKST1_CORE specific bits */
-
-/* PM_PWSTCTRL_CORE specific bits */
-#define OMAP3430_MEM2ONSTATE_SHIFT                      18
-#define OMAP3430_MEM2ONSTATE_MASK                       (0x3 << 18)
-#define OMAP3430_MEM1ONSTATE_SHIFT                      16
-#define OMAP3430_MEM1ONSTATE_MASK                       (0x3 << 16)
-#define OMAP3430_MEM2RETSTATE_MASK                      (1 << 9)
-#define OMAP3430_MEM1RETSTATE_MASK                      (1 << 8)
-
-/* PM_PWSTST_CORE specific bits */
-#define OMAP3430_MEM2STATEST_SHIFT                      6
-#define OMAP3430_MEM2STATEST_MASK                       (0x3 << 6)
-#define OMAP3430_MEM1STATEST_SHIFT                      4
-#define OMAP3430_MEM1STATEST_MASK                       (0x3 << 4)
-
-/* PM_PREPWSTST_CORE specific bits */
-#define OMAP3430_LASTMEM2STATEENTERED_SHIFT             6
 #define OMAP3430_LASTMEM2STATEENTERED_MASK              (0x3 << 6)
-#define OMAP3430_LASTMEM1STATEENTERED_SHIFT             4
 #define OMAP3430_LASTMEM1STATEENTERED_MASK              (0x3 << 4)
-
-/* RM_RSTST_GFX specific bits */
-
-/* PM_WKDEP_GFX specific bits */
-#define OMAP3430_PM_WKDEP_GFX_EN_IVA2_MASK              (1 << 2)
-
-/* PM_PWSTCTRL_GFX specific bits */
-
-/* PM_PWSTST_GFX specific bits */
-
-/* PM_PREPWSTST_GFX specific bits */
-
-/* PM_WKEN_WKUP specific bits */
 #define OMAP3430_EN_IO_CHAIN_MASK                       (1 << 16)
 #define OMAP3430_EN_IO_MASK                             (1 << 8)
 #define OMAP3430_EN_GPIO1_MASK                          (1 << 3)
-
-/* PM_MPUGRPSEL_WKUP specific bits */
-
-/* PM_IVA2GRPSEL_WKUP specific bits */
-
-/* PM_WKST_WKUP specific bits */
 #define OMAP3430_ST_IO_CHAIN_MASK                       (1 << 16)
 #define OMAP3430_ST_IO_MASK                             (1 << 8)
-
-/* PRM_CLKSEL */
 #define OMAP3430_SYS_CLKIN_SEL_SHIFT                    0
-#define OMAP3430_SYS_CLKIN_SEL_MASK                     (0x7 << 0)
 #define OMAP3430_SYS_CLKIN_SEL_WIDTH                    3
-
-/* PRM_CLKOUT_CTRL */
-#define OMAP3430_CLKOUT_EN_MASK                         (1 << 7)
 #define OMAP3430_CLKOUT_EN_SHIFT                        7
-
-/* RM_RSTST_DSS specific bits */
-
-/* PM_WKEN_DSS */
 #define OMAP3430_PM_WKEN_DSS_EN_DSS_MASK                (1 << 0)
-
-/* PM_WKDEP_DSS specific bits */
-#define OMAP3430_PM_WKDEP_DSS_EN_IVA2_MASK              (1 << 2)
-
-/* PM_PWSTCTRL_DSS specific bits */
-
-/* PM_PWSTST_DSS specific bits */
-
-/* PM_PREPWSTST_DSS specific bits */
-
-/* RM_RSTST_CAM specific bits */
-
-/* PM_WKDEP_CAM specific bits */
-#define OMAP3430_PM_WKDEP_CAM_EN_IVA2_MASK              (1 << 2)
-
-/* PM_PWSTCTRL_CAM specific bits */
-
-/* PM_PWSTST_CAM specific bits */
-
-/* PM_PREPWSTST_CAM specific bits */
-
-/* PM_PWSTCTRL_USBHOST specific bits */
 #define OMAP3430ES2_SAVEANDRESTORE_SHIFT                4
-
-/* RM_RSTST_PER specific bits */
-
-/* PM_WKEN_PER specific bits */
-
-/* PM_MPUGRPSEL_PER specific bits */
-
-/* PM_IVA2GRPSEL_PER specific bits */
-
-/* PM_WKST_PER specific bits */
-
-/* PM_WKDEP_PER specific bits */
-#define OMAP3430_PM_WKDEP_PER_EN_IVA2_MASK              (1 << 2)
-
-/* PM_PWSTCTRL_PER specific bits */
-
-/* PM_PWSTST_PER specific bits */
-
-/* PM_PREPWSTST_PER specific bits */
-
-/* RM_RSTST_EMU specific bits */
-
-/* PM_PWSTST_EMU specific bits */
-
-/* PRM_VC_SMPS_SA */
 #define OMAP3430_PRM_VC_SMPS_SA_SA1_SHIFT               16
 #define OMAP3430_PRM_VC_SMPS_SA_SA1_MASK                (0x7f << 16)
 #define OMAP3430_PRM_VC_SMPS_SA_SA0_SHIFT               0
 #define OMAP3430_PRM_VC_SMPS_SA_SA0_MASK                (0x7f << 0)
-
-/* PRM_VC_SMPS_VOL_RA */
-#define OMAP3430_VOLRA1_SHIFT                           16
 #define OMAP3430_VOLRA1_MASK                            (0xff << 16)
-#define OMAP3430_VOLRA0_SHIFT                           0
 #define OMAP3430_VOLRA0_MASK                            (0xff << 0)
-
-/* PRM_VC_SMPS_CMD_RA */
-#define OMAP3430_CMDRA1_SHIFT                           16
 #define OMAP3430_CMDRA1_MASK                            (0xff << 16)
-#define OMAP3430_CMDRA0_SHIFT                           0
 #define OMAP3430_CMDRA0_MASK                            (0xff << 0)
-
-/* PRM_VC_CMD_VAL_0 specific bits */
 #define OMAP3430_VC_CMD_ON_SHIFT                        24
 #define OMAP3430_VC_CMD_ON_MASK                         (0xFF << 24)
 #define OMAP3430_VC_CMD_ONLP_SHIFT                      16
-#define OMAP3430_VC_CMD_ONLP_MASK                       (0xFF << 16)
 #define OMAP3430_VC_CMD_RET_SHIFT                       8
-#define OMAP3430_VC_CMD_RET_MASK                        (0xFF << 8)
 #define OMAP3430_VC_CMD_OFF_SHIFT                       0
-#define OMAP3430_VC_CMD_OFF_MASK                        (0xFF << 0)
-
-/* PRM_VC_CMD_VAL_1 specific bits */
-
-/* PRM_VC_CH_CONF */
-#define OMAP3430_CMD1_MASK                              (1 << 20)
-#define OMAP3430_RACEN1_MASK                            (1 << 19)
-#define OMAP3430_RAC1_MASK                              (1 << 18)
-#define OMAP3430_RAV1_MASK                              (1 << 17)
-#define OMAP3430_PRM_VC_CH_CONF_SA1_MASK                (1 << 16)
-#define OMAP3430_CMD0_MASK                              (1 << 4)
-#define OMAP3430_RACEN0_MASK                            (1 << 3)
-#define OMAP3430_RAC0_MASK                              (1 << 2)
-#define OMAP3430_RAV0_MASK                              (1 << 1)
-#define OMAP3430_PRM_VC_CH_CONF_SA0_MASK                (1 << 0)
-
-/* PRM_VC_I2C_CFG */
-#define OMAP3430_HSMASTER_MASK                          (1 << 5)
-#define OMAP3430_SREN_MASK                              (1 << 4)
 #define OMAP3430_HSEN_MASK                              (1 << 3)
-#define OMAP3430_MCODE_SHIFT                            0
 #define OMAP3430_MCODE_MASK                             (0x7 << 0)
-
-/* PRM_VC_BYPASS_VAL */
 #define OMAP3430_VALID_MASK                             (1 << 24)
 #define OMAP3430_DATA_SHIFT                             16
-#define OMAP3430_DATA_MASK                              (0xff << 16)
 #define OMAP3430_REGADDR_SHIFT                          8
-#define OMAP3430_REGADDR_MASK                           (0xff << 8)
 #define OMAP3430_SLAVEADDR_SHIFT                        0
-#define OMAP3430_SLAVEADDR_MASK                         (0x7f << 0)
-
-/* PRM_RSTCTRL */
-#define OMAP3430_RST_DPLL3_MASK                         (1 << 2)
-#define OMAP3430_RST_GS_MASK                            (1 << 1)
-
-/* PRM_RSTTIME */
-#define OMAP3430_RSTTIME2_SHIFT                         8
-#define OMAP3430_RSTTIME2_MASK                          (0x1f << 8)
-#define OMAP3430_RSTTIME1_SHIFT                         0
-#define OMAP3430_RSTTIME1_MASK                          (0xff << 0)
-
-/* PRM_RSTST */
 #define OMAP3430_ICECRUSHER_RST_SHIFT                   10
-#define OMAP3430_ICECRUSHER_RST_MASK                    (1 << 10)
 #define OMAP3430_ICEPICK_RST_SHIFT                      9
-#define OMAP3430_ICEPICK_RST_MASK                       (1 << 9)
 #define OMAP3430_VDD2_VOLTAGE_MANAGER_RST_SHIFT         8
-#define OMAP3430_VDD2_VOLTAGE_MANAGER_RST_MASK          (1 << 8)
 #define OMAP3430_VDD1_VOLTAGE_MANAGER_RST_SHIFT         7
-#define OMAP3430_VDD1_VOLTAGE_MANAGER_RST_MASK          (1 << 7)
 #define OMAP3430_EXTERNAL_WARM_RST_SHIFT                6
-#define OMAP3430_EXTERNAL_WARM_RST_MASK                 (1 << 6)
 #define OMAP3430_SECURE_WD_RST_SHIFT                    5
-#define OMAP3430_SECURE_WD_RST_MASK                     (1 << 5)
 #define OMAP3430_MPU_WD_RST_SHIFT                       4
-#define OMAP3430_MPU_WD_RST_MASK                        (1 << 4)
 #define OMAP3430_SECURITY_VIOL_RST_SHIFT                3
-#define OMAP3430_SECURITY_VIOL_RST_MASK                 (1 << 3)
 #define OMAP3430_GLOBAL_SW_RST_SHIFT                    1
-#define OMAP3430_GLOBAL_SW_RST_MASK                     (1 << 1)
 #define OMAP3430_GLOBAL_COLD_RST_SHIFT                  0
 #define OMAP3430_GLOBAL_COLD_RST_MASK                   (1 << 0)
-
-/* PRM_VOLTCTRL */
-#define OMAP3430_SEL_VMODE_MASK                         (1 << 4)
 #define OMAP3430_SEL_OFF_MASK                           (1 << 3)
 #define OMAP3430_AUTO_OFF_MASK                          (1 << 2)
-#define OMAP3430_AUTO_RET_MASK                          (1 << 1)
-#define OMAP3430_AUTO_SLEEP_MASK                        (1 << 0)
-
-/* PRM_SRAM_PCHARGE */
-#define OMAP3430_PCHARGE_TIME_SHIFT                     0
-#define OMAP3430_PCHARGE_TIME_MASK                      (0xff << 0)
-
-/* PRM_CLKSRC_CTRL */
-#define OMAP3430_SYSCLKDIV_SHIFT                        6
-#define OMAP3430_SYSCLKDIV_MASK                         (0x3 << 6)
-#define OMAP3430_AUTOEXTCLKMODE_SHIFT                   3
-#define OMAP3430_AUTOEXTCLKMODE_MASK                    (0x3 << 3)
-#define OMAP3430_SYSCLKSEL_SHIFT                        0
-#define OMAP3430_SYSCLKSEL_MASK                         (0x3 << 0)
-
-/* PRM_VOLTSETUP1 */
-#define OMAP3430_SETUP_TIME2_SHIFT                      16
 #define OMAP3430_SETUP_TIME2_MASK                       (0xffff << 16)
-#define OMAP3430_SETUP_TIME1_SHIFT                      0
 #define OMAP3430_SETUP_TIME1_MASK                       (0xffff << 0)
-
-/* PRM_VOLTOFFSET */
-#define OMAP3430_OFFSET_TIME_SHIFT                      0
-#define OMAP3430_OFFSET_TIME_MASK                       (0xffff << 0)
-
-/* PRM_CLKSETUP */
-#define OMAP3430_SETUP_TIME_SHIFT                       0
-#define OMAP3430_SETUP_TIME_MASK                        (0xffff << 0)
-
-/* PRM_POLCTRL */
-#define OMAP3430_OFFMODE_POL_MASK                       (1 << 3)
-#define OMAP3430_CLKOUT_POL_MASK                        (1 << 2)
-#define OMAP3430_CLKREQ_POL_MASK                        (1 << 1)
-#define OMAP3430_EXTVOL_POL_MASK                        (1 << 0)
-
-/* PRM_VOLTSETUP2 */
-#define OMAP3430_OFFMODESETUPTIME_SHIFT                 0
-#define OMAP3430_OFFMODESETUPTIME_MASK                  (0xffff << 0)
-
-/* PRM_VP1_CONFIG specific bits */
-
-/* PRM_VP1_VSTEPMIN specific bits */
-
-/* PRM_VP1_VSTEPMAX specific bits */
-
-/* PRM_VP1_VLIMITTO specific bits */
-
-/* PRM_VP1_VOLTAGE specific bits */
-
-/* PRM_VP1_STATUS specific bits */
-
-/* PRM_VP2_CONFIG specific bits */
-
-/* PRM_VP2_VSTEPMIN specific bits */
-
-/* PRM_VP2_VSTEPMAX specific bits */
-
-/* PRM_VP2_VLIMITTO specific bits */
-
-/* PRM_VP2_VOLTAGE specific bits */
-
-/* PRM_VP2_STATUS specific bits */
-
-/* RM_RSTST_NEON specific bits */
-
-/* PM_WKDEP_NEON specific bits */
-
-/* PM_PWSTCTRL_NEON specific bits */
-
-/* PM_PWSTST_NEON specific bits */
-
-/* PM_PREPWSTST_NEON specific bits */
-
 #endif
diff --git a/arch/arm/mach-omap2/prm-regbits-44xx.h b/arch/arm/mach-omap2/prm-regbits-44xx.h
index 3cb247bebdaa..b1c7a33e00e7 100644
--- a/arch/arm/mach-omap2/prm-regbits-44xx.h
+++ b/arch/arm/mach-omap2/prm-regbits-44xx.h
@@ -22,2306 +22,80 @@
 #ifndef __ARCH_ARM_MACH_OMAP2_PRM_REGBITS_44XX_H
 #define __ARCH_ARM_MACH_OMAP2_PRM_REGBITS_44XX_H
 
-
-/*
- * Used by PRM_LDO_SRAM_CORE_SETUP, PRM_LDO_SRAM_IVA_SETUP,
- * PRM_LDO_SRAM_MPU_SETUP
- */
-#define OMAP4430_ABBOFF_ACT_EXPORT_SHIFT                                1
-#define OMAP4430_ABBOFF_ACT_EXPORT_MASK                                 (1 << 1)
-
-/*
- * Used by PRM_LDO_SRAM_CORE_SETUP, PRM_LDO_SRAM_IVA_SETUP,
- * PRM_LDO_SRAM_MPU_SETUP
- */
-#define OMAP4430_ABBOFF_SLEEP_EXPORT_SHIFT                              2
-#define OMAP4430_ABBOFF_SLEEP_EXPORT_MASK                               (1 << 2)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_ABB_IVA_DONE_EN_SHIFT                                  31
-#define OMAP4430_ABB_IVA_DONE_EN_MASK                                   (1 << 31)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_ABB_IVA_DONE_ST_SHIFT                                  31
-#define OMAP4430_ABB_IVA_DONE_ST_MASK                                   (1 << 31)
-
-/* Used by PRM_IRQENABLE_MPU_2 */
-#define OMAP4430_ABB_MPU_DONE_EN_SHIFT                                  7
-#define OMAP4430_ABB_MPU_DONE_EN_MASK                                   (1 << 7)
-
-/* Used by PRM_IRQSTATUS_MPU_2 */
-#define OMAP4430_ABB_MPU_DONE_ST_SHIFT                                  7
-#define OMAP4430_ABB_MPU_DONE_ST_MASK                                   (1 << 7)
-
-/* Used by PRM_LDO_ABB_IVA_SETUP, PRM_LDO_ABB_MPU_SETUP */
-#define OMAP4430_ACTIVE_FBB_SEL_SHIFT                                   2
-#define OMAP4430_ACTIVE_FBB_SEL_MASK                                    (1 << 2)
-
-/* Used by PRM_LDO_ABB_IVA_SETUP, PRM_LDO_ABB_MPU_SETUP */
-#define OMAP4430_ACTIVE_RBB_SEL_SHIFT                                   1
-#define OMAP4430_ACTIVE_RBB_SEL_MASK                                    (1 << 1)
-
-/* Used by PM_ABE_PWRSTCTRL */
-#define OMAP4430_AESSMEM_ONSTATE_SHIFT                                  16
-#define OMAP4430_AESSMEM_ONSTATE_MASK                                   (0x3 << 16)
-
-/* Used by PM_ABE_PWRSTCTRL */
-#define OMAP4430_AESSMEM_RETSTATE_SHIFT                                 8
-#define OMAP4430_AESSMEM_RETSTATE_MASK                                  (1 << 8)
-
-/* Used by PM_ABE_PWRSTST */
-#define OMAP4430_AESSMEM_STATEST_SHIFT                                  4
-#define OMAP4430_AESSMEM_STATEST_MASK                                   (0x3 << 4)
-
-/*
- * Used by PRM_LDO_SRAM_CORE_SETUP, PRM_LDO_SRAM_IVA_SETUP,
- * PRM_LDO_SRAM_MPU_SETUP
- */
-#define OMAP4430_AIPOFF_SHIFT                                           8
-#define OMAP4430_AIPOFF_MASK                                            (1 << 8)
-
-/* Used by PRM_VOLTCTRL */
-#define OMAP4430_AUTO_CTRL_VDD_CORE_L_SHIFT                             0
-#define OMAP4430_AUTO_CTRL_VDD_CORE_L_MASK                              (0x3 << 0)
-
-/* Used by PRM_VOLTCTRL */
-#define OMAP4430_AUTO_CTRL_VDD_IVA_L_SHIFT                              4
-#define OMAP4430_AUTO_CTRL_VDD_IVA_L_MASK                               (0x3 << 4)
-
-/* Used by PRM_VOLTCTRL */
-#define OMAP4430_AUTO_CTRL_VDD_MPU_L_SHIFT                              2
-#define OMAP4430_AUTO_CTRL_VDD_MPU_L_MASK                               (0x3 << 2)
-
-/* Used by PRM_VC_ERRST */
-#define OMAP4430_BYPS_RA_ERR_SHIFT                                      25
-#define OMAP4430_BYPS_RA_ERR_MASK                                       (1 << 25)
-
-/* Used by PRM_VC_ERRST */
-#define OMAP4430_BYPS_SA_ERR_SHIFT                                      24
-#define OMAP4430_BYPS_SA_ERR_MASK                                       (1 << 24)
-
-/* Used by PRM_VC_ERRST */
-#define OMAP4430_BYPS_TIMEOUT_ERR_SHIFT                                 26
-#define OMAP4430_BYPS_TIMEOUT_ERR_MASK                                  (1 << 26)
-
-/* Used by PRM_RSTST */
 #define OMAP4430_C2C_RST_SHIFT                                          10
-#define OMAP4430_C2C_RST_MASK                                           (1 << 10)
-
-/* Used by PM_CAM_PWRSTCTRL */
-#define OMAP4430_CAM_MEM_ONSTATE_SHIFT                                  16
-#define OMAP4430_CAM_MEM_ONSTATE_MASK                                   (0x3 << 16)
-
-/* Used by PM_CAM_PWRSTST */
-#define OMAP4430_CAM_MEM_STATEST_SHIFT                                  4
-#define OMAP4430_CAM_MEM_STATEST_MASK                                   (0x3 << 4)
-
-/* Used by PRM_CLKREQCTRL */
-#define OMAP4430_CLKREQ_COND_SHIFT                                      0
-#define OMAP4430_CLKREQ_COND_MASK                                       (0x7 << 0)
-
-/* Used by PRM_VC_VAL_SMPS_RA_CMD */
-#define OMAP4430_CMDRA_VDD_CORE_L_SHIFT                                 0
 #define OMAP4430_CMDRA_VDD_CORE_L_MASK                                  (0xff << 0)
-
-/* Used by PRM_VC_VAL_SMPS_RA_CMD */
-#define OMAP4430_CMDRA_VDD_IVA_L_SHIFT                                  8
 #define OMAP4430_CMDRA_VDD_IVA_L_MASK                                   (0xff << 8)
-
-/* Used by PRM_VC_VAL_SMPS_RA_CMD */
-#define OMAP4430_CMDRA_VDD_MPU_L_SHIFT                                  16
 #define OMAP4430_CMDRA_VDD_MPU_L_MASK                                   (0xff << 16)
-
-/* Used by PRM_VC_CFG_CHANNEL */
-#define OMAP4430_CMD_VDD_CORE_L_SHIFT                                   4
-#define OMAP4430_CMD_VDD_CORE_L_MASK                                    (1 << 4)
-
-/* Used by PRM_VC_CFG_CHANNEL */
-#define OMAP4430_CMD_VDD_IVA_L_SHIFT                                    12
-#define OMAP4430_CMD_VDD_IVA_L_MASK                                     (1 << 12)
-
-/* Used by PRM_VC_CFG_CHANNEL */
-#define OMAP4430_CMD_VDD_MPU_L_SHIFT                                    17
-#define OMAP4430_CMD_VDD_MPU_L_MASK                                     (1 << 17)
-
-/* Used by PM_CORE_PWRSTCTRL */
-#define OMAP4430_CORE_OCMRAM_ONSTATE_SHIFT                              18
-#define OMAP4430_CORE_OCMRAM_ONSTATE_MASK                               (0x3 << 18)
-
-/* Used by PM_CORE_PWRSTCTRL */
-#define OMAP4430_CORE_OCMRAM_RETSTATE_SHIFT                             9
-#define OMAP4430_CORE_OCMRAM_RETSTATE_MASK                              (1 << 9)
-
-/* Used by PM_CORE_PWRSTST */
-#define OMAP4430_CORE_OCMRAM_STATEST_SHIFT                              6
-#define OMAP4430_CORE_OCMRAM_STATEST_MASK                               (0x3 << 6)
-
-/* Used by PM_CORE_PWRSTCTRL */
-#define OMAP4430_CORE_OTHER_BANK_ONSTATE_SHIFT                          16
-#define OMAP4430_CORE_OTHER_BANK_ONSTATE_MASK                           (0x3 << 16)
-
-/* Used by PM_CORE_PWRSTCTRL */
-#define OMAP4430_CORE_OTHER_BANK_RETSTATE_SHIFT                         8
-#define OMAP4430_CORE_OTHER_BANK_RETSTATE_MASK                          (1 << 8)
-
-/* Used by PM_CORE_PWRSTST */
-#define OMAP4430_CORE_OTHER_BANK_STATEST_SHIFT                          4
-#define OMAP4430_CORE_OTHER_BANK_STATEST_MASK                           (0x3 << 4)
-
-/* Used by REVISION_PRM */
-#define OMAP4430_CUSTOM_SHIFT                                           6
-#define OMAP4430_CUSTOM_MASK                                            (0x3 << 6)
-
-/* Used by PRM_VC_VAL_BYPASS */
 #define OMAP4430_DATA_SHIFT                                             16
-#define OMAP4430_DATA_MASK                                              (0xff << 16)
-
-/* Used by PRM_DEVICE_OFF_CTRL */
-#define OMAP4430_DEVICE_OFF_ENABLE_SHIFT                                0
-#define OMAP4430_DEVICE_OFF_ENABLE_MASK                                 (1 << 0)
-
-/* Used by PRM_VC_CFG_I2C_MODE */
-#define OMAP4430_DFILTEREN_SHIFT                                        6
-#define OMAP4430_DFILTEREN_MASK                                         (1 << 6)
-
-/*
- * Used by PRM_LDO_SRAM_CORE_SETUP, PRM_LDO_SRAM_IVA_SETUP,
- * PRM_LDO_SRAM_MPU_SETUP, PRM_SRAM_WKUP_SETUP
- */
-#define OMAP4430_DISABLE_RTA_EXPORT_SHIFT                               0
-#define OMAP4430_DISABLE_RTA_EXPORT_MASK                                (1 << 0)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU, PRM_IRQENABLE_TESLA */
-#define OMAP4430_DPLL_ABE_RECAL_EN_SHIFT                                4
-#define OMAP4430_DPLL_ABE_RECAL_EN_MASK                                 (1 << 4)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU, PRM_IRQSTATUS_TESLA */
-#define OMAP4430_DPLL_ABE_RECAL_ST_SHIFT                                4
-#define OMAP4430_DPLL_ABE_RECAL_ST_MASK                                 (1 << 4)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_DPLL_CORE_RECAL_EN_SHIFT                               0
-#define OMAP4430_DPLL_CORE_RECAL_EN_MASK                                (1 << 0)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_DPLL_CORE_RECAL_ST_SHIFT                               0
-#define OMAP4430_DPLL_CORE_RECAL_ST_MASK                                (1 << 0)
-
-/* Used by PRM_IRQENABLE_MPU */
-#define OMAP4430_DPLL_DDRPHY_RECAL_EN_SHIFT                             6
-#define OMAP4430_DPLL_DDRPHY_RECAL_EN_MASK                              (1 << 6)
-
-/* Used by PRM_IRQSTATUS_MPU */
-#define OMAP4430_DPLL_DDRPHY_RECAL_ST_SHIFT                             6
-#define OMAP4430_DPLL_DDRPHY_RECAL_ST_MASK                              (1 << 6)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU, PRM_IRQENABLE_TESLA */
-#define OMAP4430_DPLL_IVA_RECAL_EN_SHIFT                                2
-#define OMAP4430_DPLL_IVA_RECAL_EN_MASK                                 (1 << 2)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU, PRM_IRQSTATUS_TESLA */
-#define OMAP4430_DPLL_IVA_RECAL_ST_SHIFT                                2
-#define OMAP4430_DPLL_IVA_RECAL_ST_MASK                                 (1 << 2)
-
-/* Used by PRM_IRQENABLE_MPU */
-#define OMAP4430_DPLL_MPU_RECAL_EN_SHIFT                                1
-#define OMAP4430_DPLL_MPU_RECAL_EN_MASK                                 (1 << 1)
-
-/* Used by PRM_IRQSTATUS_MPU */
-#define OMAP4430_DPLL_MPU_RECAL_ST_SHIFT                                1
-#define OMAP4430_DPLL_MPU_RECAL_ST_MASK                                 (1 << 1)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_DPLL_PER_RECAL_EN_SHIFT                                3
-#define OMAP4430_DPLL_PER_RECAL_EN_MASK                                 (1 << 3)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_DPLL_PER_RECAL_ST_SHIFT                                3
-#define OMAP4430_DPLL_PER_RECAL_ST_MASK                                 (1 << 3)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_DPLL_UNIPRO_RECAL_EN_SHIFT                             7
-#define OMAP4430_DPLL_UNIPRO_RECAL_EN_MASK                              (1 << 7)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_DPLL_UNIPRO_RECAL_ST_SHIFT                             7
-#define OMAP4430_DPLL_UNIPRO_RECAL_ST_MASK                              (1 << 7)
-
-/* Used by PM_DSS_PWRSTCTRL */
-#define OMAP4430_DSS_MEM_ONSTATE_SHIFT                                  16
-#define OMAP4430_DSS_MEM_ONSTATE_MASK                                   (0x3 << 16)
-
-/* Used by PM_DSS_PWRSTCTRL */
-#define OMAP4430_DSS_MEM_RETSTATE_SHIFT                                 8
-#define OMAP4430_DSS_MEM_RETSTATE_MASK                                  (1 << 8)
-
-/* Used by PM_DSS_PWRSTST */
-#define OMAP4430_DSS_MEM_STATEST_SHIFT                                  4
-#define OMAP4430_DSS_MEM_STATEST_MASK                                   (0x3 << 4)
-
-/* Used by PM_CORE_PWRSTCTRL */
-#define OMAP4430_DUCATI_L2RAM_ONSTATE_SHIFT                             20
-#define OMAP4430_DUCATI_L2RAM_ONSTATE_MASK                              (0x3 << 20)
-
-/* Used by PM_CORE_PWRSTCTRL */
-#define OMAP4430_DUCATI_L2RAM_RETSTATE_SHIFT                            10
-#define OMAP4430_DUCATI_L2RAM_RETSTATE_MASK                             (1 << 10)
-
-/* Used by PM_CORE_PWRSTST */
-#define OMAP4430_DUCATI_L2RAM_STATEST_SHIFT                             8
-#define OMAP4430_DUCATI_L2RAM_STATEST_MASK                              (0x3 << 8)
-
-/* Used by PM_CORE_PWRSTCTRL */
-#define OMAP4430_DUCATI_UNICACHE_ONSTATE_SHIFT                          22
-#define OMAP4430_DUCATI_UNICACHE_ONSTATE_MASK                           (0x3 << 22)
-
-/* Used by PM_CORE_PWRSTCTRL */
-#define OMAP4430_DUCATI_UNICACHE_RETSTATE_SHIFT                         11
-#define OMAP4430_DUCATI_UNICACHE_RETSTATE_MASK                          (1 << 11)
-
-/* Used by PM_CORE_PWRSTST */
-#define OMAP4430_DUCATI_UNICACHE_STATEST_SHIFT                          10
-#define OMAP4430_DUCATI_UNICACHE_STATEST_MASK                           (0x3 << 10)
-
-/* Used by PRM_DEVICE_OFF_CTRL */
-#define OMAP4460_EMIF1_OFFWKUP_DISABLE_SHIFT                            8
-#define OMAP4460_EMIF1_OFFWKUP_DISABLE_MASK                             (1 << 8)
-
-/* Used by PRM_DEVICE_OFF_CTRL */
-#define OMAP4460_EMIF2_OFFWKUP_DISABLE_SHIFT                            9
-#define OMAP4460_EMIF2_OFFWKUP_DISABLE_MASK                             (1 << 9)
-
-/* Used by RM_MPU_RSTST */
-#define OMAP4430_EMULATION_RST_SHIFT                                    0
-#define OMAP4430_EMULATION_RST_MASK                                     (1 << 0)
-
-/* Used by RM_DUCATI_RSTST */
-#define OMAP4430_EMULATION_RST1ST_SHIFT                                 3
-#define OMAP4430_EMULATION_RST1ST_MASK                                  (1 << 3)
-
-/* Used by RM_DUCATI_RSTST */
-#define OMAP4430_EMULATION_RST2ST_SHIFT                                 4
-#define OMAP4430_EMULATION_RST2ST_MASK                                  (1 << 4)
-
-/* Used by RM_IVAHD_RSTST */
-#define OMAP4430_EMULATION_SEQ1_RST1ST_SHIFT                            3
-#define OMAP4430_EMULATION_SEQ1_RST1ST_MASK                             (1 << 3)
-
-/* Used by RM_IVAHD_RSTST */
-#define OMAP4430_EMULATION_SEQ2_RST2ST_SHIFT                            4
-#define OMAP4430_EMULATION_SEQ2_RST2ST_MASK                             (1 << 4)
-
-/* Used by PM_EMU_PWRSTCTRL */
-#define OMAP4430_EMU_BANK_ONSTATE_SHIFT                                 16
-#define OMAP4430_EMU_BANK_ONSTATE_MASK                                  (0x3 << 16)
-
-/* Used by PM_EMU_PWRSTST */
-#define OMAP4430_EMU_BANK_STATEST_SHIFT                                 4
-#define OMAP4430_EMU_BANK_STATEST_MASK                                  (0x3 << 4)
-
-/*
- * Used by PRM_LDO_SRAM_CORE_SETUP, PRM_LDO_SRAM_IVA_SETUP,
- * PRM_LDO_SRAM_MPU_SETUP
- */
-#define OMAP4430_ENFUNC1_EXPORT_SHIFT                                   3
-#define OMAP4430_ENFUNC1_EXPORT_MASK                                    (1 << 3)
-
-/*
- * Used by PRM_LDO_SRAM_CORE_SETUP, PRM_LDO_SRAM_IVA_SETUP,
- * PRM_LDO_SRAM_MPU_SETUP
- */
-#define OMAP4430_ENFUNC3_EXPORT_SHIFT                                   5
-#define OMAP4430_ENFUNC3_EXPORT_MASK                                    (1 << 5)
-
-/*
- * Used by PRM_LDO_SRAM_CORE_SETUP, PRM_LDO_SRAM_IVA_SETUP,
- * PRM_LDO_SRAM_MPU_SETUP
- */
-#define OMAP4430_ENFUNC4_SHIFT                                          6
-#define OMAP4430_ENFUNC4_MASK                                           (1 << 6)
-
-/*
- * Used by PRM_LDO_SRAM_CORE_SETUP, PRM_LDO_SRAM_IVA_SETUP,
- * PRM_LDO_SRAM_MPU_SETUP
- */
-#define OMAP4430_ENFUNC5_SHIFT                                          7
-#define OMAP4430_ENFUNC5_MASK                                           (1 << 7)
-
-/* Used by PRM_VP_CORE_CONFIG, PRM_VP_IVA_CONFIG, PRM_VP_MPU_CONFIG */
-#define OMAP4430_ERRORGAIN_SHIFT                                        16
 #define OMAP4430_ERRORGAIN_MASK                                         (0xff << 16)
-
-/* Used by PRM_VP_CORE_CONFIG, PRM_VP_IVA_CONFIG, PRM_VP_MPU_CONFIG */
-#define OMAP4430_ERROROFFSET_SHIFT                                      24
 #define OMAP4430_ERROROFFSET_MASK                                       (0xff << 24)
-
-/* Used by PRM_RSTST */
 #define OMAP4430_EXTERNAL_WARM_RST_SHIFT                                5
-#define OMAP4430_EXTERNAL_WARM_RST_MASK                                 (1 << 5)
-
-/* Used by PRM_VP_CORE_CONFIG, PRM_VP_IVA_CONFIG, PRM_VP_MPU_CONFIG */
-#define OMAP4430_FORCEUPDATE_SHIFT                                      1
 #define OMAP4430_FORCEUPDATE_MASK                                       (1 << 1)
-
-/* Used by PRM_VP_CORE_VOLTAGE, PRM_VP_IVA_VOLTAGE, PRM_VP_MPU_VOLTAGE */
-#define OMAP4430_FORCEUPDATEWAIT_SHIFT                                  8
-#define OMAP4430_FORCEUPDATEWAIT_MASK                                   (0xffffff << 8)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_TESLA */
-#define OMAP4430_FORCEWKUP_EN_SHIFT                                     10
-#define OMAP4430_FORCEWKUP_EN_MASK                                      (1 << 10)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_TESLA */
-#define OMAP4430_FORCEWKUP_ST_SHIFT                                     10
-#define OMAP4430_FORCEWKUP_ST_MASK                                      (1 << 10)
-
-/* Used by REVISION_PRM */
-#define OMAP4430_FUNC_SHIFT                                             16
-#define OMAP4430_FUNC_MASK                                              (0xfff << 16)
-
-/* Used by PM_GFX_PWRSTCTRL */
-#define OMAP4430_GFX_MEM_ONSTATE_SHIFT                                  16
-#define OMAP4430_GFX_MEM_ONSTATE_MASK                                   (0x3 << 16)
-
-/* Used by PM_GFX_PWRSTST */
-#define OMAP4430_GFX_MEM_STATEST_SHIFT                                  4
-#define OMAP4430_GFX_MEM_STATEST_MASK                                   (0x3 << 4)
-
-/* Used by PRM_RSTST */
 #define OMAP4430_GLOBAL_COLD_RST_SHIFT                                  0
-#define OMAP4430_GLOBAL_COLD_RST_MASK                                   (1 << 0)
-
-/* Used by PRM_RSTST */
 #define OMAP4430_GLOBAL_WARM_SW_RST_SHIFT                               1
-#define OMAP4430_GLOBAL_WARM_SW_RST_MASK                                (1 << 1)
-
-/* Used by PRM_IO_PMCTRL */
-#define OMAP4430_GLOBAL_WUEN_SHIFT                                      16
 #define OMAP4430_GLOBAL_WUEN_MASK                                       (1 << 16)
-
-/* Used by PRM_VC_CFG_I2C_MODE */
-#define OMAP4430_HSMCODE_SHIFT                                          0
 #define OMAP4430_HSMCODE_MASK                                           (0x7 << 0)
-
-/* Used by PRM_VC_CFG_I2C_MODE */
-#define OMAP4430_HSMODEEN_SHIFT                                         3
 #define OMAP4430_HSMODEEN_MASK                                          (1 << 3)
-
-/* Used by PRM_VC_CFG_I2C_CLK */
-#define OMAP4430_HSSCLH_SHIFT                                           16
-#define OMAP4430_HSSCLH_MASK                                            (0xff << 16)
-
-/* Used by PRM_VC_CFG_I2C_CLK */
 #define OMAP4430_HSSCLL_SHIFT                                           24
-#define OMAP4430_HSSCLL_MASK                                            (0xff << 24)
-
-/* Used by PM_IVAHD_PWRSTCTRL */
-#define OMAP4430_HWA_MEM_ONSTATE_SHIFT                                  16
-#define OMAP4430_HWA_MEM_ONSTATE_MASK                                   (0x3 << 16)
-
-/* Used by PM_IVAHD_PWRSTCTRL */
-#define OMAP4430_HWA_MEM_RETSTATE_SHIFT                                 8
-#define OMAP4430_HWA_MEM_RETSTATE_MASK                                  (1 << 8)
-
-/* Used by PM_IVAHD_PWRSTST */
-#define OMAP4430_HWA_MEM_STATEST_SHIFT                                  4
-#define OMAP4430_HWA_MEM_STATEST_MASK                                   (0x3 << 4)
-
-/* Used by RM_MPU_RSTST */
-#define OMAP4430_ICECRUSHER_MPU_RST_SHIFT                               1
-#define OMAP4430_ICECRUSHER_MPU_RST_MASK                                (1 << 1)
-
-/* Used by RM_DUCATI_RSTST */
-#define OMAP4430_ICECRUSHER_RST1ST_SHIFT                                5
-#define OMAP4430_ICECRUSHER_RST1ST_MASK                                 (1 << 5)
-
-/* Used by RM_DUCATI_RSTST */
-#define OMAP4430_ICECRUSHER_RST2ST_SHIFT                                6
-#define OMAP4430_ICECRUSHER_RST2ST_MASK                                 (1 << 6)
-
-/* Used by RM_IVAHD_RSTST */
-#define OMAP4430_ICECRUSHER_SEQ1_RST1ST_SHIFT                           5
-#define OMAP4430_ICECRUSHER_SEQ1_RST1ST_MASK                            (1 << 5)
-
-/* Used by RM_IVAHD_RSTST */
-#define OMAP4430_ICECRUSHER_SEQ2_RST2ST_SHIFT                           6
-#define OMAP4430_ICECRUSHER_SEQ2_RST2ST_MASK                            (1 << 6)
-
-/* Used by PRM_RSTST */
 #define OMAP4430_ICEPICK_RST_SHIFT                                      9
-#define OMAP4430_ICEPICK_RST_MASK                                       (1 << 9)
-
-/* Used by PRM_VP_CORE_CONFIG, PRM_VP_IVA_CONFIG, PRM_VP_MPU_CONFIG */
-#define OMAP4430_INITVDD_SHIFT                                          2
 #define OMAP4430_INITVDD_MASK                                           (1 << 2)
-
-/* Used by PRM_VP_CORE_CONFIG, PRM_VP_IVA_CONFIG, PRM_VP_MPU_CONFIG */
-#define OMAP4430_INITVOLTAGE_SHIFT                                      8
 #define OMAP4430_INITVOLTAGE_MASK                                       (0xff << 8)
-
-/*
- * Used by PM_ABE_PWRSTST, PM_CAM_PWRSTST, PM_CEFUSE_PWRSTST, PM_CORE_PWRSTST,
- * PM_DSS_PWRSTST, PM_EMU_PWRSTST, PM_GFX_PWRSTST, PM_IVAHD_PWRSTST,
- * PM_L3INIT_PWRSTST, PM_L4PER_PWRSTST, PM_MPU_PWRSTST, PM_TESLA_PWRSTST
- */
-#define OMAP4430_INTRANSITION_SHIFT                                     20
-#define OMAP4430_INTRANSITION_MASK                                      (1 << 20)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_IO_EN_SHIFT                                            9
-#define OMAP4430_IO_EN_MASK                                             (1 << 9)
-
-/* Used by PRM_IO_PMCTRL */
-#define OMAP4430_IO_ON_STATUS_SHIFT                                     5
-#define OMAP4430_IO_ON_STATUS_MASK                                      (1 << 5)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_IO_ST_SHIFT                                            9
-#define OMAP4430_IO_ST_MASK                                             (1 << 9)
-
-/* Used by PRM_IO_PMCTRL */
-#define OMAP4430_ISOCLK_OVERRIDE_SHIFT                                  0
-#define OMAP4430_ISOCLK_OVERRIDE_MASK                                   (1 << 0)
-
-/* Used by PRM_IO_PMCTRL */
-#define OMAP4430_ISOCLK_STATUS_SHIFT                                    1
-#define OMAP4430_ISOCLK_STATUS_MASK                                     (1 << 1)
-
-/* Used by PRM_IO_PMCTRL */
-#define OMAP4430_ISOOVR_EXTEND_SHIFT                                    4
-#define OMAP4430_ISOOVR_EXTEND_MASK                                     (1 << 4)
-
-/* Used by PRM_IO_COUNT */
-#define OMAP4430_ISO_2_ON_TIME_SHIFT                                    0
-#define OMAP4430_ISO_2_ON_TIME_MASK                                     (0xff << 0)
-
-/* Used by PM_L3INIT_PWRSTCTRL */
-#define OMAP4430_L3INIT_BANK1_ONSTATE_SHIFT                             16
-#define OMAP4430_L3INIT_BANK1_ONSTATE_MASK                              (0x3 << 16)
-
-/* Used by PM_L3INIT_PWRSTCTRL */
-#define OMAP4430_L3INIT_BANK1_RETSTATE_SHIFT                            8
-#define OMAP4430_L3INIT_BANK1_RETSTATE_MASK                             (1 << 8)
-
-/* Used by PM_L3INIT_PWRSTST */
-#define OMAP4430_L3INIT_BANK1_STATEST_SHIFT                             4
-#define OMAP4430_L3INIT_BANK1_STATEST_MASK                              (0x3 << 4)
-
-/*
- * Used by PM_ABE_PWRSTST, PM_CORE_PWRSTST, PM_IVAHD_PWRSTST,
- * PM_L3INIT_PWRSTST, PM_L4PER_PWRSTST, PM_MPU_PWRSTST, PM_TESLA_PWRSTST
- */
 #define OMAP4430_LASTPOWERSTATEENTERED_SHIFT                            24
 #define OMAP4430_LASTPOWERSTATEENTERED_MASK                             (0x3 << 24)
-
-/*
- * Used by PM_ABE_PWRSTCTRL, PM_CORE_PWRSTCTRL, PM_DSS_PWRSTCTRL,
- * PM_IVAHD_PWRSTCTRL, PM_L3INIT_PWRSTCTRL, PM_L4PER_PWRSTCTRL,
- * PM_MPU_PWRSTCTRL, PM_TESLA_PWRSTCTRL
- */
 #define OMAP4430_LOGICRETSTATE_SHIFT                                    2
 #define OMAP4430_LOGICRETSTATE_MASK                                     (1 << 2)
-
-/*
- * Used by PM_ABE_PWRSTST, PM_CAM_PWRSTST, PM_CEFUSE_PWRSTST, PM_CORE_PWRSTST,
- * PM_DSS_PWRSTST, PM_EMU_PWRSTST, PM_GFX_PWRSTST, PM_IVAHD_PWRSTST,
- * PM_L3INIT_PWRSTST, PM_L4PER_PWRSTST, PM_MPU_PWRSTST, PM_TESLA_PWRSTST
- */
 #define OMAP4430_LOGICSTATEST_SHIFT                                     2
 #define OMAP4430_LOGICSTATEST_MASK                                      (1 << 2)
-
-/*
- * Used by RM_ABE_AESS_CONTEXT, RM_ABE_DMIC_CONTEXT, RM_ABE_MCASP_CONTEXT,
- * RM_ABE_MCBSP1_CONTEXT, RM_ABE_MCBSP2_CONTEXT, RM_ABE_MCBSP3_CONTEXT,
- * RM_ABE_PDM_CONTEXT, RM_ABE_SLIMBUS_CONTEXT, RM_ABE_TIMER5_CONTEXT,
- * RM_ABE_TIMER6_CONTEXT, RM_ABE_TIMER7_CONTEXT, RM_ABE_TIMER8_CONTEXT,
- * RM_ABE_WDT3_CONTEXT, RM_ALWON_MDMINTC_CONTEXT, RM_ALWON_SR_CORE_CONTEXT,
- * RM_ALWON_SR_IVA_CONTEXT, RM_ALWON_SR_MPU_CONTEXT, RM_CAM_FDIF_CONTEXT,
- * RM_CAM_ISS_CONTEXT, RM_CEFUSE_CEFUSE_CONTEXT, RM_D2D_SAD2D_CONTEXT,
- * RM_D2D_SAD2D_FW_CONTEXT, RM_DSS_DEISS_CONTEXT, RM_DSS_DSS_CONTEXT,
- * RM_DUCATI_DUCATI_CONTEXT, RM_EMU_DEBUGSS_CONTEXT, RM_GFX_GFX_CONTEXT,
- * RM_IVAHD_IVAHD_CONTEXT, RM_IVAHD_SL2_CONTEXT, RM_L3INIT_CCPTX_CONTEXT,
- * RM_L3INIT_EMAC_CONTEXT, RM_L3INIT_P1500_CONTEXT, RM_L3INIT_PCIESS_CONTEXT,
- * RM_L3INIT_SATA_CONTEXT, RM_L3INIT_TPPSS_CONTEXT, RM_L3INIT_UNIPRO1_CONTEXT,
- * RM_L3INIT_USBPHYOCP2SCP_CONTEXT, RM_L3INIT_XHPI_CONTEXT,
- * RM_L3INSTR_L3_3_CONTEXT, RM_L3INSTR_L3_INSTR_CONTEXT,
- * RM_L3INSTR_OCP_WP1_CONTEXT, RM_L3_1_L3_1_CONTEXT, RM_L3_2_L3_2_CONTEXT,
- * RM_L3_2_OCMC_RAM_CONTEXT, RM_L4CFG_L4_CFG_CONTEXT, RM_L4CFG_SAR_ROM_CONTEXT,
- * RM_L4PER_ADC_CONTEXT, RM_L4PER_DMTIMER10_CONTEXT,
- * RM_L4PER_DMTIMER11_CONTEXT, RM_L4PER_DMTIMER2_CONTEXT,
- * RM_L4PER_DMTIMER3_CONTEXT, RM_L4PER_DMTIMER4_CONTEXT,
- * RM_L4PER_DMTIMER9_CONTEXT, RM_L4PER_ELM_CONTEXT, RM_L4PER_HDQ1W_CONTEXT,
- * RM_L4PER_HECC1_CONTEXT, RM_L4PER_HECC2_CONTEXT, RM_L4PER_I2C2_CONTEXT,
- * RM_L4PER_I2C3_CONTEXT, RM_L4PER_I2C4_CONTEXT, RM_L4PER_I2C5_CONTEXT,
- * RM_L4PER_L4_PER_CONTEXT, RM_L4PER_MCASP2_CONTEXT, RM_L4PER_MCASP3_CONTEXT,
- * RM_L4PER_MCBSP4_CONTEXT, RM_L4PER_MCSPI1_CONTEXT, RM_L4PER_MCSPI2_CONTEXT,
- * RM_L4PER_MCSPI3_CONTEXT, RM_L4PER_MCSPI4_CONTEXT, RM_L4PER_MGATE_CONTEXT,
- * RM_L4PER_MMCSD3_CONTEXT, RM_L4PER_MMCSD4_CONTEXT, RM_L4PER_MMCSD5_CONTEXT,
- * RM_L4PER_MSPROHG_CONTEXT, RM_L4PER_SLIMBUS2_CONTEXT,
- * RM_L4SEC_PKAEIP29_CONTEXT, RM_MEMIF_DLL_CONTEXT, RM_MEMIF_DLL_H_CONTEXT,
- * RM_MEMIF_DMM_CONTEXT, RM_MEMIF_EMIF_1_CONTEXT, RM_MEMIF_EMIF_2_CONTEXT,
- * RM_MEMIF_EMIF_FW_CONTEXT, RM_MPU_MPU_CONTEXT, RM_TESLA_TESLA_CONTEXT,
- * RM_WKUP_GPIO1_CONTEXT, RM_WKUP_KEYBOARD_CONTEXT, RM_WKUP_L4WKUP_CONTEXT,
- * RM_WKUP_RTC_CONTEXT, RM_WKUP_SARRAM_CONTEXT, RM_WKUP_SYNCTIMER_CONTEXT,
- * RM_WKUP_TIMER12_CONTEXT, RM_WKUP_TIMER1_CONTEXT, RM_WKUP_USIM_CONTEXT,
- * RM_WKUP_WDT1_CONTEXT, RM_WKUP_WDT2_CONTEXT
- */
-#define OMAP4430_LOSTCONTEXT_DFF_SHIFT                                  0
 #define OMAP4430_LOSTCONTEXT_DFF_MASK                                   (1 << 0)
-
-/*
- * Used by RM_D2D_MODEM_ICR_CONTEXT, RM_D2D_SAD2D_CONTEXT,
- * RM_D2D_SAD2D_FW_CONTEXT, RM_DSS_DSS_CONTEXT, RM_DUCATI_DUCATI_CONTEXT,
- * RM_L3INIT_HSI_CONTEXT, RM_L3INIT_MMC1_CONTEXT, RM_L3INIT_MMC2_CONTEXT,
- * RM_L3INIT_MMC6_CONTEXT, RM_L3INIT_USB_HOST_CONTEXT,
- * RM_L3INIT_USB_HOST_FS_CONTEXT, RM_L3INIT_USB_OTG_CONTEXT,
- * RM_L3INIT_USB_TLL_CONTEXT, RM_L3INSTR_L3_3_CONTEXT,
- * RM_L3INSTR_OCP_WP1_CONTEXT, RM_L3_1_L3_1_CONTEXT, RM_L3_2_GPMC_CONTEXT,
- * RM_L3_2_L3_2_CONTEXT, RM_L4CFG_HW_SEM_CONTEXT, RM_L4CFG_L4_CFG_CONTEXT,
- * RM_L4CFG_MAILBOX_CONTEXT, RM_L4PER_GPIO2_CONTEXT, RM_L4PER_GPIO3_CONTEXT,
- * RM_L4PER_GPIO4_CONTEXT, RM_L4PER_GPIO5_CONTEXT, RM_L4PER_GPIO6_CONTEXT,
- * RM_L4PER_I2C1_CONTEXT, RM_L4PER_L4_PER_CONTEXT, RM_L4PER_UART1_CONTEXT,
- * RM_L4PER_UART2_CONTEXT, RM_L4PER_UART3_CONTEXT, RM_L4PER_UART4_CONTEXT,
- * RM_L4SEC_AES1_CONTEXT, RM_L4SEC_AES2_CONTEXT, RM_L4SEC_CRYPTODMA_CONTEXT,
- * RM_L4SEC_DES3DES_CONTEXT, RM_L4SEC_RNG_CONTEXT, RM_L4SEC_SHA2MD51_CONTEXT,
- * RM_MEMIF_DMM_CONTEXT, RM_MEMIF_EMIF_1_CONTEXT, RM_MEMIF_EMIF_2_CONTEXT,
- * RM_MEMIF_EMIF_FW_CONTEXT, RM_MEMIF_EMIF_H1_CONTEXT,
- * RM_MEMIF_EMIF_H2_CONTEXT, RM_SDMA_SDMA_CONTEXT, RM_TESLA_TESLA_CONTEXT
- */
-#define OMAP4430_LOSTCONTEXT_RFF_SHIFT                                  1
-#define OMAP4430_LOSTCONTEXT_RFF_MASK                                   (1 << 1)
-
-/* Used by RM_ABE_AESS_CONTEXT */
-#define OMAP4430_LOSTMEM_AESSMEM_SHIFT                                  8
 #define OMAP4430_LOSTMEM_AESSMEM_MASK                                   (1 << 8)
-
-/* Used by RM_CAM_FDIF_CONTEXT, RM_CAM_ISS_CONTEXT */
-#define OMAP4430_LOSTMEM_CAM_MEM_SHIFT                                  8
-#define OMAP4430_LOSTMEM_CAM_MEM_MASK                                   (1 << 8)
-
-/* Used by RM_L3INSTR_OCP_WP1_CONTEXT */
-#define OMAP4430_LOSTMEM_CORE_NRET_BANK_SHIFT                           8
-#define OMAP4430_LOSTMEM_CORE_NRET_BANK_MASK                            (1 << 8)
-
-/* Renamed from LOSTMEM_CORE_NRET_BANK Used by RM_MEMIF_DMM_CONTEXT */
-#define OMAP4430_LOSTMEM_CORE_NRET_BANK_9_9_SHIFT                       9
-#define OMAP4430_LOSTMEM_CORE_NRET_BANK_9_9_MASK                        (1 << 9)
-
-/* Used by RM_L3_2_OCMC_RAM_CONTEXT */
-#define OMAP4430_LOSTMEM_CORE_OCMRAM_SHIFT                              8
-#define OMAP4430_LOSTMEM_CORE_OCMRAM_MASK                               (1 << 8)
-
-/*
- * Used by RM_D2D_MODEM_ICR_CONTEXT, RM_MEMIF_DMM_CONTEXT,
- * RM_SDMA_SDMA_CONTEXT
- */
-#define OMAP4430_LOSTMEM_CORE_OTHER_BANK_SHIFT                          8
-#define OMAP4430_LOSTMEM_CORE_OTHER_BANK_MASK                           (1 << 8)
-
-/* Used by RM_DSS_DEISS_CONTEXT, RM_DSS_DSS_CONTEXT */
-#define OMAP4430_LOSTMEM_DSS_MEM_SHIFT                                  8
-#define OMAP4430_LOSTMEM_DSS_MEM_MASK                                   (1 << 8)
-
-/* Used by RM_DUCATI_DUCATI_CONTEXT */
-#define OMAP4430_LOSTMEM_DUCATI_L2RAM_SHIFT                             9
-#define OMAP4430_LOSTMEM_DUCATI_L2RAM_MASK                              (1 << 9)
-
-/* Used by RM_DUCATI_DUCATI_CONTEXT */
-#define OMAP4430_LOSTMEM_DUCATI_UNICACHE_SHIFT                          8
-#define OMAP4430_LOSTMEM_DUCATI_UNICACHE_MASK                           (1 << 8)
-
-/* Used by RM_EMU_DEBUGSS_CONTEXT */
-#define OMAP4430_LOSTMEM_EMU_BANK_SHIFT                                 8
-#define OMAP4430_LOSTMEM_EMU_BANK_MASK                                  (1 << 8)
-
-/* Used by RM_GFX_GFX_CONTEXT */
-#define OMAP4430_LOSTMEM_GFX_MEM_SHIFT                                  8
-#define OMAP4430_LOSTMEM_GFX_MEM_MASK                                   (1 << 8)
-
-/* Used by RM_IVAHD_IVAHD_CONTEXT */
-#define OMAP4430_LOSTMEM_HWA_MEM_SHIFT                                  10
-#define OMAP4430_LOSTMEM_HWA_MEM_MASK                                   (1 << 10)
-
-/*
- * Used by RM_L3INIT_CCPTX_CONTEXT, RM_L3INIT_EMAC_CONTEXT,
- * RM_L3INIT_HSI_CONTEXT, RM_L3INIT_MMC1_CONTEXT, RM_L3INIT_MMC2_CONTEXT,
- * RM_L3INIT_MMC6_CONTEXT, RM_L3INIT_PCIESS_CONTEXT, RM_L3INIT_SATA_CONTEXT,
- * RM_L3INIT_TPPSS_CONTEXT, RM_L3INIT_UNIPRO1_CONTEXT,
- * RM_L3INIT_USB_OTG_CONTEXT, RM_L3INIT_XHPI_CONTEXT
- */
-#define OMAP4430_LOSTMEM_L3INIT_BANK1_SHIFT                             8
-#define OMAP4430_LOSTMEM_L3INIT_BANK1_MASK                              (1 << 8)
-
-/* Used by RM_MPU_MPU_CONTEXT */
-#define OMAP4430_LOSTMEM_MPU_L1_SHIFT                                   8
-#define OMAP4430_LOSTMEM_MPU_L1_MASK                                    (1 << 8)
-
-/* Used by RM_MPU_MPU_CONTEXT */
-#define OMAP4430_LOSTMEM_MPU_L2_SHIFT                                   9
-#define OMAP4430_LOSTMEM_MPU_L2_MASK                                    (1 << 9)
-
-/* Used by RM_MPU_MPU_CONTEXT */
-#define OMAP4430_LOSTMEM_MPU_RAM_SHIFT                                  10
-#define OMAP4430_LOSTMEM_MPU_RAM_MASK                                   (1 << 10)
-
-/*
- * Used by RM_L4PER_HECC1_CONTEXT, RM_L4PER_HECC2_CONTEXT,
- * RM_L4PER_MCBSP4_CONTEXT, RM_L4PER_MMCSD3_CONTEXT, RM_L4PER_MMCSD4_CONTEXT,
- * RM_L4PER_MMCSD5_CONTEXT, RM_L4PER_SLIMBUS2_CONTEXT, RM_L4SEC_PKAEIP29_CONTEXT
- */
-#define OMAP4430_LOSTMEM_NONRETAINED_BANK_SHIFT                         8
-#define OMAP4430_LOSTMEM_NONRETAINED_BANK_MASK                          (1 << 8)
-
-/*
- * Used by RM_ABE_DMIC_CONTEXT, RM_ABE_MCBSP1_CONTEXT, RM_ABE_MCBSP2_CONTEXT,
- * RM_ABE_MCBSP3_CONTEXT, RM_ABE_PDM_CONTEXT, RM_ABE_SLIMBUS_CONTEXT
- */
-#define OMAP4430_LOSTMEM_PERIHPMEM_SHIFT                                8
-#define OMAP4430_LOSTMEM_PERIHPMEM_MASK                                 (1 << 8)
-
-/*
- * Used by RM_L4PER_MSPROHG_CONTEXT, RM_L4PER_UART1_CONTEXT,
- * RM_L4PER_UART2_CONTEXT, RM_L4PER_UART3_CONTEXT, RM_L4PER_UART4_CONTEXT,
- * RM_L4SEC_CRYPTODMA_CONTEXT
- */
-#define OMAP4430_LOSTMEM_RETAINED_BANK_SHIFT                            8
-#define OMAP4430_LOSTMEM_RETAINED_BANK_MASK                             (1 << 8)
-
-/* Used by RM_IVAHD_SL2_CONTEXT */
-#define OMAP4430_LOSTMEM_SL2_MEM_SHIFT                                  8
-#define OMAP4430_LOSTMEM_SL2_MEM_MASK                                   (1 << 8)
-
-/* Used by RM_IVAHD_IVAHD_CONTEXT */
-#define OMAP4430_LOSTMEM_TCM1_MEM_SHIFT                                 8
-#define OMAP4430_LOSTMEM_TCM1_MEM_MASK                                  (1 << 8)
-
-/* Used by RM_IVAHD_IVAHD_CONTEXT */
-#define OMAP4430_LOSTMEM_TCM2_MEM_SHIFT                                 9
-#define OMAP4430_LOSTMEM_TCM2_MEM_MASK                                  (1 << 9)
-
-/* Used by RM_TESLA_TESLA_CONTEXT */
-#define OMAP4430_LOSTMEM_TESLA_EDMA_SHIFT                               10
-#define OMAP4430_LOSTMEM_TESLA_EDMA_MASK                                (1 << 10)
-
-/* Used by RM_TESLA_TESLA_CONTEXT */
-#define OMAP4430_LOSTMEM_TESLA_L1_SHIFT                                 8
-#define OMAP4430_LOSTMEM_TESLA_L1_MASK                                  (1 << 8)
-
-/* Used by RM_TESLA_TESLA_CONTEXT */
-#define OMAP4430_LOSTMEM_TESLA_L2_SHIFT                                 9
-#define OMAP4430_LOSTMEM_TESLA_L2_MASK                                  (1 << 9)
-
-/* Used by RM_WKUP_SARRAM_CONTEXT */
-#define OMAP4430_LOSTMEM_WKUP_BANK_SHIFT                                8
-#define OMAP4430_LOSTMEM_WKUP_BANK_MASK                                 (1 << 8)
-
-/*
- * Used by PM_ABE_PWRSTCTRL, PM_CAM_PWRSTCTRL, PM_CEFUSE_PWRSTCTRL,
- * PM_CORE_PWRSTCTRL, PM_DSS_PWRSTCTRL, PM_GFX_PWRSTCTRL, PM_IVAHD_PWRSTCTRL,
- * PM_L3INIT_PWRSTCTRL, PM_L4PER_PWRSTCTRL, PM_MPU_PWRSTCTRL, PM_TESLA_PWRSTCTRL
- */
 #define OMAP4430_LOWPOWERSTATECHANGE_SHIFT                              4
 #define OMAP4430_LOWPOWERSTATECHANGE_MASK                               (1 << 4)
-
-/* Used by PRM_MODEM_IF_CTRL */
-#define OMAP4430_MODEM_READY_SHIFT                                      1
-#define OMAP4430_MODEM_READY_MASK                                       (1 << 1)
-
-/* Used by PRM_MODEM_IF_CTRL */
-#define OMAP4430_MODEM_SHUTDOWN_IRQ_SHIFT                               9
-#define OMAP4430_MODEM_SHUTDOWN_IRQ_MASK                                (1 << 9)
-
-/* Used by PRM_MODEM_IF_CTRL */
-#define OMAP4430_MODEM_SLEEP_ST_SHIFT                                   16
-#define OMAP4430_MODEM_SLEEP_ST_MASK                                    (1 << 16)
-
-/* Used by PRM_MODEM_IF_CTRL */
-#define OMAP4430_MODEM_WAKE_IRQ_SHIFT                                   8
-#define OMAP4430_MODEM_WAKE_IRQ_MASK                                    (1 << 8)
-
-/* Used by PM_MPU_PWRSTCTRL */
-#define OMAP4430_MPU_L1_ONSTATE_SHIFT                                   16
-#define OMAP4430_MPU_L1_ONSTATE_MASK                                    (0x3 << 16)
-
-/* Used by PM_MPU_PWRSTCTRL */
-#define OMAP4430_MPU_L1_RETSTATE_SHIFT                                  8
-#define OMAP4430_MPU_L1_RETSTATE_MASK                                   (1 << 8)
-
-/* Used by PM_MPU_PWRSTST */
-#define OMAP4430_MPU_L1_STATEST_SHIFT                                   4
-#define OMAP4430_MPU_L1_STATEST_MASK                                    (0x3 << 4)
-
-/* Used by PM_MPU_PWRSTCTRL */
-#define OMAP4430_MPU_L2_ONSTATE_SHIFT                                   18
-#define OMAP4430_MPU_L2_ONSTATE_MASK                                    (0x3 << 18)
-
-/* Used by PM_MPU_PWRSTCTRL */
-#define OMAP4430_MPU_L2_RETSTATE_SHIFT                                  9
-#define OMAP4430_MPU_L2_RETSTATE_MASK                                   (1 << 9)
-
-/* Used by PM_MPU_PWRSTST */
-#define OMAP4430_MPU_L2_STATEST_SHIFT                                   6
-#define OMAP4430_MPU_L2_STATEST_MASK                                    (0x3 << 6)
-
-/* Used by PM_MPU_PWRSTCTRL */
-#define OMAP4430_MPU_RAM_ONSTATE_SHIFT                                  20
-#define OMAP4430_MPU_RAM_ONSTATE_MASK                                   (0x3 << 20)
-
-/* Used by PM_MPU_PWRSTCTRL */
-#define OMAP4430_MPU_RAM_RETSTATE_SHIFT                                 10
-#define OMAP4430_MPU_RAM_RETSTATE_MASK                                  (1 << 10)
-
-/* Used by PM_MPU_PWRSTST */
-#define OMAP4430_MPU_RAM_STATEST_SHIFT                                  8
-#define OMAP4430_MPU_RAM_STATEST_MASK                                   (0x3 << 8)
-
-/* Used by PRM_RSTST */
 #define OMAP4430_MPU_SECURITY_VIOL_RST_SHIFT                            2
-#define OMAP4430_MPU_SECURITY_VIOL_RST_MASK                             (1 << 2)
-
-/* Used by PRM_RSTST */
 #define OMAP4430_MPU_WDT_RST_SHIFT                                      3
-#define OMAP4430_MPU_WDT_RST_MASK                                       (1 << 3)
-
-/* Used by PM_L4PER_PWRSTCTRL */
-#define OMAP4430_NONRETAINED_BANK_ONSTATE_SHIFT                         18
-#define OMAP4430_NONRETAINED_BANK_ONSTATE_MASK                          (0x3 << 18)
-
-/* Used by PM_L4PER_PWRSTCTRL */
-#define OMAP4430_NONRETAINED_BANK_RETSTATE_SHIFT                        9
-#define OMAP4430_NONRETAINED_BANK_RETSTATE_MASK                         (1 << 9)
-
-/* Used by PM_L4PER_PWRSTST */
-#define OMAP4430_NONRETAINED_BANK_STATEST_SHIFT                         6
-#define OMAP4430_NONRETAINED_BANK_STATEST_MASK                          (0x3 << 6)
-
-/* Used by PM_CORE_PWRSTCTRL */
-#define OMAP4430_OCP_NRET_BANK_ONSTATE_SHIFT                            24
 #define OMAP4430_OCP_NRET_BANK_ONSTATE_MASK                             (0x3 << 24)
-
-/* Used by PM_CORE_PWRSTCTRL */
-#define OMAP4430_OCP_NRET_BANK_RETSTATE_SHIFT                           12
 #define OMAP4430_OCP_NRET_BANK_RETSTATE_MASK                            (1 << 12)
-
-/* Used by PM_CORE_PWRSTST */
-#define OMAP4430_OCP_NRET_BANK_STATEST_SHIFT                            12
 #define OMAP4430_OCP_NRET_BANK_STATEST_MASK                             (0x3 << 12)
-
-/*
- * Used by PRM_VC_VAL_CMD_VDD_CORE_L, PRM_VC_VAL_CMD_VDD_IVA_L,
- * PRM_VC_VAL_CMD_VDD_MPU_L
- */
 #define OMAP4430_OFF_SHIFT                                              0
-#define OMAP4430_OFF_MASK                                               (0xff << 0)
-
-/*
- * Used by PRM_VC_VAL_CMD_VDD_CORE_L, PRM_VC_VAL_CMD_VDD_IVA_L,
- * PRM_VC_VAL_CMD_VDD_MPU_L
- */
 #define OMAP4430_ON_SHIFT                                               24
 #define OMAP4430_ON_MASK                                                (0xff << 24)
-
-/*
- * Used by PRM_VC_VAL_CMD_VDD_CORE_L, PRM_VC_VAL_CMD_VDD_IVA_L,
- * PRM_VC_VAL_CMD_VDD_MPU_L
- */
 #define OMAP4430_ONLP_SHIFT                                             16
-#define OMAP4430_ONLP_MASK                                              (0xff << 16)
-
-/* Used by PRM_LDO_ABB_IVA_CTRL, PRM_LDO_ABB_MPU_CTRL */
-#define OMAP4430_OPP_CHANGE_SHIFT                                       2
-#define OMAP4430_OPP_CHANGE_MASK                                        (1 << 2)
-
-/* Used by PRM_LDO_ABB_IVA_CTRL, PRM_LDO_ABB_MPU_CTRL */
-#define OMAP4430_OPP_SEL_SHIFT                                          0
-#define OMAP4430_OPP_SEL_MASK                                           (0x3 << 0)
-
-/* Used by PRM_SRAM_COUNT */
-#define OMAP4430_PCHARGECNT_VALUE_SHIFT                                 0
-#define OMAP4430_PCHARGECNT_VALUE_MASK                                  (0x3f << 0)
-
-/* Used by PRM_PSCON_COUNT */
-#define OMAP4430_PCHARGE_TIME_SHIFT                                     0
-#define OMAP4430_PCHARGE_TIME_MASK                                      (0xff << 0)
-
-/* Used by PM_ABE_PWRSTCTRL */
-#define OMAP4430_PERIPHMEM_ONSTATE_SHIFT                                20
-#define OMAP4430_PERIPHMEM_ONSTATE_MASK                                 (0x3 << 20)
-
-/* Used by PM_ABE_PWRSTCTRL */
-#define OMAP4430_PERIPHMEM_RETSTATE_SHIFT                               10
-#define OMAP4430_PERIPHMEM_RETSTATE_MASK                                (1 << 10)
-
-/* Used by PM_ABE_PWRSTST */
-#define OMAP4430_PERIPHMEM_STATEST_SHIFT                                8
-#define OMAP4430_PERIPHMEM_STATEST_MASK                                 (0x3 << 8)
-
-/* Used by PRM_PHASE1_CNDP */
-#define OMAP4430_PHASE1_CNDP_SHIFT                                      0
-#define OMAP4430_PHASE1_CNDP_MASK                                       (0xffffffff << 0)
-
-/* Used by PRM_PHASE2A_CNDP */
-#define OMAP4430_PHASE2A_CNDP_SHIFT                                     0
-#define OMAP4430_PHASE2A_CNDP_MASK                                      (0xffffffff << 0)
-
-/* Used by PRM_PHASE2B_CNDP */
-#define OMAP4430_PHASE2B_CNDP_SHIFT                                     0
-#define OMAP4430_PHASE2B_CNDP_MASK                                      (0xffffffff << 0)
-
-/* Used by PRM_PSCON_COUNT */
-#define OMAP4430_PONOUT_2_PGOODIN_TIME_SHIFT                            8
-#define OMAP4430_PONOUT_2_PGOODIN_TIME_MASK                             (0xff << 8)
-
-/*
- * Used by PM_ABE_PWRSTCTRL, PM_CAM_PWRSTCTRL, PM_CEFUSE_PWRSTCTRL,
- * PM_CORE_PWRSTCTRL, PM_DSS_PWRSTCTRL, PM_EMU_PWRSTCTRL, PM_GFX_PWRSTCTRL,
- * PM_IVAHD_PWRSTCTRL, PM_L3INIT_PWRSTCTRL, PM_L4PER_PWRSTCTRL,
- * PM_MPU_PWRSTCTRL, PM_TESLA_PWRSTCTRL
- */
-#define OMAP4430_POWERSTATE_SHIFT                                       0
-#define OMAP4430_POWERSTATE_MASK                                        (0x3 << 0)
-
-/*
- * Used by PM_ABE_PWRSTST, PM_CAM_PWRSTST, PM_CEFUSE_PWRSTST, PM_CORE_PWRSTST,
- * PM_DSS_PWRSTST, PM_EMU_PWRSTST, PM_GFX_PWRSTST, PM_IVAHD_PWRSTST,
- * PM_L3INIT_PWRSTST, PM_L4PER_PWRSTST, PM_MPU_PWRSTST, PM_TESLA_PWRSTST
- */
-#define OMAP4430_POWERSTATEST_SHIFT                                     0
-#define OMAP4430_POWERSTATEST_MASK                                      (0x3 << 0)
-
-/* Used by PRM_PWRREQCTRL */
-#define OMAP4430_PWRREQ_COND_SHIFT                                      0
-#define OMAP4430_PWRREQ_COND_MASK                                       (0x3 << 0)
-
-/* Used by PRM_VC_CFG_CHANNEL */
-#define OMAP4430_RACEN_VDD_CORE_L_SHIFT                                 3
-#define OMAP4430_RACEN_VDD_CORE_L_MASK                                  (1 << 3)
-
-/* Used by PRM_VC_CFG_CHANNEL */
-#define OMAP4430_RACEN_VDD_IVA_L_SHIFT                                  11
-#define OMAP4430_RACEN_VDD_IVA_L_MASK                                   (1 << 11)
-
-/* Used by PRM_VC_CFG_CHANNEL */
-#define OMAP4430_RACEN_VDD_MPU_L_SHIFT                                  20
-#define OMAP4430_RACEN_VDD_MPU_L_MASK                                   (1 << 20)
-
-/* Used by PRM_VC_CFG_CHANNEL */
-#define OMAP4430_RAC_VDD_CORE_L_SHIFT                                   2
-#define OMAP4430_RAC_VDD_CORE_L_MASK                                    (1 << 2)
-
-/* Used by PRM_VC_CFG_CHANNEL */
-#define OMAP4430_RAC_VDD_IVA_L_SHIFT                                    10
-#define OMAP4430_RAC_VDD_IVA_L_MASK                                     (1 << 10)
-
-/* Used by PRM_VC_CFG_CHANNEL */
-#define OMAP4430_RAC_VDD_MPU_L_SHIFT                                    19
-#define OMAP4430_RAC_VDD_MPU_L_MASK                                     (1 << 19)
-
-/*
- * Used by PRM_VOLTSETUP_CORE_OFF, PRM_VOLTSETUP_CORE_RET_SLEEP,
- * PRM_VOLTSETUP_IVA_OFF, PRM_VOLTSETUP_IVA_RET_SLEEP, PRM_VOLTSETUP_MPU_OFF,
- * PRM_VOLTSETUP_MPU_RET_SLEEP
- */
 #define OMAP4430_RAMP_DOWN_COUNT_SHIFT                                  16
-#define OMAP4430_RAMP_DOWN_COUNT_MASK                                   (0x3f << 16)
-
-/*
- * Used by PRM_VOLTSETUP_CORE_OFF, PRM_VOLTSETUP_CORE_RET_SLEEP,
- * PRM_VOLTSETUP_IVA_OFF, PRM_VOLTSETUP_IVA_RET_SLEEP, PRM_VOLTSETUP_MPU_OFF,
- * PRM_VOLTSETUP_MPU_RET_SLEEP
- */
-#define OMAP4430_RAMP_DOWN_PRESCAL_SHIFT                                24
-#define OMAP4430_RAMP_DOWN_PRESCAL_MASK                                 (0x3 << 24)
-
-/*
- * Used by PRM_VOLTSETUP_CORE_OFF, PRM_VOLTSETUP_CORE_RET_SLEEP,
- * PRM_VOLTSETUP_IVA_OFF, PRM_VOLTSETUP_IVA_RET_SLEEP, PRM_VOLTSETUP_MPU_OFF,
- * PRM_VOLTSETUP_MPU_RET_SLEEP
- */
 #define OMAP4430_RAMP_UP_COUNT_SHIFT                                    0
-#define OMAP4430_RAMP_UP_COUNT_MASK                                     (0x3f << 0)
-
-/*
- * Used by PRM_VOLTSETUP_CORE_OFF, PRM_VOLTSETUP_CORE_RET_SLEEP,
- * PRM_VOLTSETUP_IVA_OFF, PRM_VOLTSETUP_IVA_RET_SLEEP, PRM_VOLTSETUP_MPU_OFF,
- * PRM_VOLTSETUP_MPU_RET_SLEEP
- */
 #define OMAP4430_RAMP_UP_PRESCAL_SHIFT                                  8
-#define OMAP4430_RAMP_UP_PRESCAL_MASK                                   (0x3 << 8)
-
-/* Used by PRM_VC_CFG_CHANNEL */
-#define OMAP4430_RAV_VDD_CORE_L_SHIFT                                   1
-#define OMAP4430_RAV_VDD_CORE_L_MASK                                    (1 << 1)
-
-/* Used by PRM_VC_CFG_CHANNEL */
-#define OMAP4430_RAV_VDD_IVA_L_SHIFT                                    9
-#define OMAP4430_RAV_VDD_IVA_L_MASK                                     (1 << 9)
-
-/* Used by PRM_VC_CFG_CHANNEL */
-#define OMAP4430_RAV_VDD_MPU_L_SHIFT                                    18
-#define OMAP4430_RAV_VDD_MPU_L_MASK                                     (1 << 18)
-
-/* Used by PRM_VC_VAL_BYPASS */
 #define OMAP4430_REGADDR_SHIFT                                          8
-#define OMAP4430_REGADDR_MASK                                           (0xff << 8)
-
-/*
- * Used by PRM_VC_VAL_CMD_VDD_CORE_L, PRM_VC_VAL_CMD_VDD_IVA_L,
- * PRM_VC_VAL_CMD_VDD_MPU_L
- */
 #define OMAP4430_RET_SHIFT                                              8
-#define OMAP4430_RET_MASK                                               (0xff << 8)
-
-/* Used by PM_L4PER_PWRSTCTRL */
-#define OMAP4430_RETAINED_BANK_ONSTATE_SHIFT                            16
-#define OMAP4430_RETAINED_BANK_ONSTATE_MASK                             (0x3 << 16)
-
-/* Used by PM_L4PER_PWRSTCTRL */
-#define OMAP4430_RETAINED_BANK_RETSTATE_SHIFT                           8
-#define OMAP4430_RETAINED_BANK_RETSTATE_MASK                            (1 << 8)
-
-/* Used by PM_L4PER_PWRSTST */
-#define OMAP4430_RETAINED_BANK_STATEST_SHIFT                            4
-#define OMAP4430_RETAINED_BANK_STATEST_MASK                             (0x3 << 4)
-
-/*
- * Used by PRM_LDO_SRAM_CORE_CTRL, PRM_LDO_SRAM_IVA_CTRL,
- * PRM_LDO_SRAM_MPU_CTRL
- */
-#define OMAP4430_RETMODE_ENABLE_SHIFT                                   0
-#define OMAP4430_RETMODE_ENABLE_MASK                                    (1 << 0)
-
-/* Used by RM_DUCATI_RSTCTRL, RM_IVAHD_RSTCTRL, RM_TESLA_RSTCTRL */
-#define OMAP4430_RST1_SHIFT                                             0
-#define OMAP4430_RST1_MASK                                              (1 << 0)
-
-/* Used by RM_DUCATI_RSTST, RM_IVAHD_RSTST, RM_TESLA_RSTST */
-#define OMAP4430_RST1ST_SHIFT                                           0
-#define OMAP4430_RST1ST_MASK                                            (1 << 0)
-
-/* Used by RM_DUCATI_RSTCTRL, RM_IVAHD_RSTCTRL, RM_TESLA_RSTCTRL */
-#define OMAP4430_RST2_SHIFT                                             1
-#define OMAP4430_RST2_MASK                                              (1 << 1)
-
-/* Used by RM_DUCATI_RSTST, RM_IVAHD_RSTST, RM_TESLA_RSTST */
-#define OMAP4430_RST2ST_SHIFT                                           1
-#define OMAP4430_RST2ST_MASK                                            (1 << 1)
-
-/* Used by RM_DUCATI_RSTCTRL, RM_IVAHD_RSTCTRL */
-#define OMAP4430_RST3_SHIFT                                             2
-#define OMAP4430_RST3_MASK                                              (1 << 2)
-
-/* Used by RM_DUCATI_RSTST, RM_IVAHD_RSTST */
-#define OMAP4430_RST3ST_SHIFT                                           2
-#define OMAP4430_RST3ST_MASK                                            (1 << 2)
-
-/* Used by PRM_RSTTIME */
-#define OMAP4430_RSTTIME1_SHIFT                                         0
-#define OMAP4430_RSTTIME1_MASK                                          (0x3ff << 0)
-
-/* Used by PRM_RSTTIME */
-#define OMAP4430_RSTTIME2_SHIFT                                         10
-#define OMAP4430_RSTTIME2_MASK                                          (0x1f << 10)
-
-/* Used by PRM_RSTCTRL */
-#define OMAP4430_RST_GLOBAL_COLD_SW_SHIFT                               1
-#define OMAP4430_RST_GLOBAL_COLD_SW_MASK                                (1 << 1)
-
-/* Used by PRM_RSTCTRL */
-#define OMAP4430_RST_GLOBAL_WARM_SW_SHIFT                               0
 #define OMAP4430_RST_GLOBAL_WARM_SW_MASK                                (1 << 0)
-
-/* Used by REVISION_PRM */
-#define OMAP4430_R_RTL_SHIFT                                            11
-#define OMAP4430_R_RTL_MASK                                             (0x1f << 11)
-
-/* Used by PRM_VC_CFG_CHANNEL */
 #define OMAP4430_SA_VDD_CORE_L_SHIFT                                    0
-#define OMAP4430_SA_VDD_CORE_L_MASK                                     (1 << 0)
-
-/* Renamed from SA_VDD_CORE_L Used by PRM_VC_SMPS_SA */
-#define OMAP4430_SA_VDD_CORE_L_0_6_SHIFT                                0
 #define OMAP4430_SA_VDD_CORE_L_0_6_MASK                                 (0x7f << 0)
-
-/* Used by PRM_VC_CFG_CHANNEL */
 #define OMAP4430_SA_VDD_IVA_L_SHIFT                                     8
-#define OMAP4430_SA_VDD_IVA_L_MASK                                      (1 << 8)
-
-/* Renamed from SA_VDD_IVA_L Used by PRM_VC_SMPS_SA */
-#define OMAP4430_SA_VDD_IVA_L_PRM_VC_SMPS_SA_SHIFT                      8
 #define OMAP4430_SA_VDD_IVA_L_PRM_VC_SMPS_SA_MASK                       (0x7f << 8)
-
-/* Used by PRM_VC_CFG_CHANNEL */
 #define OMAP4430_SA_VDD_MPU_L_SHIFT                                     16
-#define OMAP4430_SA_VDD_MPU_L_MASK                                      (1 << 16)
-
-/* Renamed from SA_VDD_MPU_L Used by PRM_VC_SMPS_SA */
-#define OMAP4430_SA_VDD_MPU_L_PRM_VC_SMPS_SA_SHIFT                      16
 #define OMAP4430_SA_VDD_MPU_L_PRM_VC_SMPS_SA_MASK                       (0x7f << 16)
-
-/* Used by REVISION_PRM */
-#define OMAP4430_SCHEME_SHIFT                                           30
-#define OMAP4430_SCHEME_MASK                                            (0x3 << 30)
-
-/* Used by PRM_VC_CFG_I2C_CLK */
 #define OMAP4430_SCLH_SHIFT                                             0
-#define OMAP4430_SCLH_MASK                                              (0xff << 0)
-
-/* Used by PRM_VC_CFG_I2C_CLK */
 #define OMAP4430_SCLL_SHIFT                                             8
-#define OMAP4430_SCLL_MASK                                              (0xff << 8)
-
-/* Used by PRM_RSTST */
 #define OMAP4430_SECURE_WDT_RST_SHIFT                                   4
-#define OMAP4430_SECURE_WDT_RST_MASK                                    (1 << 4)
-
-/* Used by PM_IVAHD_PWRSTCTRL */
-#define OMAP4430_SL2_MEM_ONSTATE_SHIFT                                  18
-#define OMAP4430_SL2_MEM_ONSTATE_MASK                                   (0x3 << 18)
-
-/* Used by PM_IVAHD_PWRSTCTRL */
-#define OMAP4430_SL2_MEM_RETSTATE_SHIFT                                 9
-#define OMAP4430_SL2_MEM_RETSTATE_MASK                                  (1 << 9)
-
-/* Used by PM_IVAHD_PWRSTST */
-#define OMAP4430_SL2_MEM_STATEST_SHIFT                                  6
-#define OMAP4430_SL2_MEM_STATEST_MASK                                   (0x3 << 6)
-
-/* Used by PRM_VC_VAL_BYPASS */
 #define OMAP4430_SLAVEADDR_SHIFT                                        0
-#define OMAP4430_SLAVEADDR_MASK                                         (0x7f << 0)
-
-/* Used by PRM_LDO_ABB_IVA_SETUP, PRM_LDO_ABB_MPU_SETUP */
-#define OMAP4430_SLEEP_RBB_SEL_SHIFT                                    3
-#define OMAP4430_SLEEP_RBB_SEL_MASK                                     (1 << 3)
-
-/* Used by PRM_SRAM_COUNT */
-#define OMAP4430_SLPCNT_VALUE_SHIFT                                     16
-#define OMAP4430_SLPCNT_VALUE_MASK                                      (0xff << 16)
-
-/* Used by PRM_VP_CORE_VSTEPMAX, PRM_VP_IVA_VSTEPMAX, PRM_VP_MPU_VSTEPMAX */
 #define OMAP4430_SMPSWAITTIMEMAX_SHIFT                                  8
-#define OMAP4430_SMPSWAITTIMEMAX_MASK                                   (0xffff << 8)
-
-/* Used by PRM_VP_CORE_VSTEPMIN, PRM_VP_IVA_VSTEPMIN, PRM_VP_MPU_VSTEPMIN */
 #define OMAP4430_SMPSWAITTIMEMIN_SHIFT                                  8
-#define OMAP4430_SMPSWAITTIMEMIN_MASK                                   (0xffff << 8)
-
-/* Used by PRM_VC_ERRST */
-#define OMAP4430_SMPS_RA_ERR_CORE_SHIFT                                 1
-#define OMAP4430_SMPS_RA_ERR_CORE_MASK                                  (1 << 1)
-
-/* Used by PRM_VC_ERRST */
-#define OMAP4430_SMPS_RA_ERR_IVA_SHIFT                                  9
-#define OMAP4430_SMPS_RA_ERR_IVA_MASK                                   (1 << 9)
-
-/* Used by PRM_VC_ERRST */
-#define OMAP4430_SMPS_RA_ERR_MPU_SHIFT                                  17
-#define OMAP4430_SMPS_RA_ERR_MPU_MASK                                   (1 << 17)
-
-/* Used by PRM_VC_ERRST */
-#define OMAP4430_SMPS_SA_ERR_CORE_SHIFT                                 0
-#define OMAP4430_SMPS_SA_ERR_CORE_MASK                                  (1 << 0)
-
-/* Used by PRM_VC_ERRST */
-#define OMAP4430_SMPS_SA_ERR_IVA_SHIFT                                  8
-#define OMAP4430_SMPS_SA_ERR_IVA_MASK                                   (1 << 8)
-
-/* Used by PRM_VC_ERRST */
-#define OMAP4430_SMPS_SA_ERR_MPU_SHIFT                                  16
-#define OMAP4430_SMPS_SA_ERR_MPU_MASK                                   (1 << 16)
-
-/* Used by PRM_VC_ERRST */
-#define OMAP4430_SMPS_TIMEOUT_ERR_CORE_SHIFT                            2
-#define OMAP4430_SMPS_TIMEOUT_ERR_CORE_MASK                             (1 << 2)
-
-/* Used by PRM_VC_ERRST */
-#define OMAP4430_SMPS_TIMEOUT_ERR_IVA_SHIFT                             10
-#define OMAP4430_SMPS_TIMEOUT_ERR_IVA_MASK                              (1 << 10)
-
-/* Used by PRM_VC_ERRST */
-#define OMAP4430_SMPS_TIMEOUT_ERR_MPU_SHIFT                             18
-#define OMAP4430_SMPS_TIMEOUT_ERR_MPU_MASK                              (1 << 18)
-
-/* Used by PRM_LDO_ABB_IVA_SETUP, PRM_LDO_ABB_MPU_SETUP */
-#define OMAP4430_SR2EN_SHIFT                                            0
-#define OMAP4430_SR2EN_MASK                                             (1 << 0)
-
-/* Used by PRM_LDO_ABB_IVA_CTRL, PRM_LDO_ABB_MPU_CTRL */
-#define OMAP4430_SR2_IN_TRANSITION_SHIFT                                6
-#define OMAP4430_SR2_IN_TRANSITION_MASK                                 (1 << 6)
-
-/* Used by PRM_LDO_ABB_IVA_CTRL, PRM_LDO_ABB_MPU_CTRL */
-#define OMAP4430_SR2_STATUS_SHIFT                                       3
-#define OMAP4430_SR2_STATUS_MASK                                        (0x3 << 3)
-
-/* Used by PRM_LDO_ABB_IVA_SETUP, PRM_LDO_ABB_MPU_SETUP */
-#define OMAP4430_SR2_WTCNT_VALUE_SHIFT                                  8
-#define OMAP4430_SR2_WTCNT_VALUE_MASK                                   (0xff << 8)
-
-/*
- * Used by PRM_LDO_SRAM_CORE_CTRL, PRM_LDO_SRAM_IVA_CTRL,
- * PRM_LDO_SRAM_MPU_CTRL
- */
-#define OMAP4430_SRAMLDO_STATUS_SHIFT                                   8
-#define OMAP4430_SRAMLDO_STATUS_MASK                                    (1 << 8)
-
-/*
- * Used by PRM_LDO_SRAM_CORE_CTRL, PRM_LDO_SRAM_IVA_CTRL,
- * PRM_LDO_SRAM_MPU_CTRL
- */
-#define OMAP4430_SRAM_IN_TRANSITION_SHIFT                               9
-#define OMAP4430_SRAM_IN_TRANSITION_MASK                                (1 << 9)
-
-/* Used by PRM_VC_CFG_I2C_MODE */
-#define OMAP4430_SRMODEEN_SHIFT                                         4
-#define OMAP4430_SRMODEEN_MASK                                          (1 << 4)
-
-/* Used by PRM_VOLTSETUP_WARMRESET */
-#define OMAP4430_STABLE_COUNT_SHIFT                                     0
-#define OMAP4430_STABLE_COUNT_MASK                                      (0x3f << 0)
-
-/* Used by PRM_VOLTSETUP_WARMRESET */
-#define OMAP4430_STABLE_PRESCAL_SHIFT                                   8
-#define OMAP4430_STABLE_PRESCAL_MASK                                    (0x3 << 8)
-
-/* Used by PRM_LDO_BANDGAP_SETUP */
-#define OMAP4430_STARTUP_COUNT_SHIFT                                    0
-#define OMAP4430_STARTUP_COUNT_MASK                                     (0xff << 0)
-
-/* Renamed from STARTUP_COUNT Used by PRM_SRAM_COUNT */
-#define OMAP4430_STARTUP_COUNT_24_31_SHIFT                              24
-#define OMAP4430_STARTUP_COUNT_24_31_MASK                               (0xff << 24)
-
-/* Used by PM_IVAHD_PWRSTCTRL */
-#define OMAP4430_TCM1_MEM_ONSTATE_SHIFT                                 20
-#define OMAP4430_TCM1_MEM_ONSTATE_MASK                                  (0x3 << 20)
-
-/* Used by PM_IVAHD_PWRSTCTRL */
-#define OMAP4430_TCM1_MEM_RETSTATE_SHIFT                                10
-#define OMAP4430_TCM1_MEM_RETSTATE_MASK                                 (1 << 10)
-
-/* Used by PM_IVAHD_PWRSTST */
-#define OMAP4430_TCM1_MEM_STATEST_SHIFT                                 8
-#define OMAP4430_TCM1_MEM_STATEST_MASK                                  (0x3 << 8)
-
-/* Used by PM_IVAHD_PWRSTCTRL */
-#define OMAP4430_TCM2_MEM_ONSTATE_SHIFT                                 22
-#define OMAP4430_TCM2_MEM_ONSTATE_MASK                                  (0x3 << 22)
-
-/* Used by PM_IVAHD_PWRSTCTRL */
-#define OMAP4430_TCM2_MEM_RETSTATE_SHIFT                                11
-#define OMAP4430_TCM2_MEM_RETSTATE_MASK                                 (1 << 11)
-
-/* Used by PM_IVAHD_PWRSTST */
-#define OMAP4430_TCM2_MEM_STATEST_SHIFT                                 10
-#define OMAP4430_TCM2_MEM_STATEST_MASK                                  (0x3 << 10)
-
-/* Used by RM_TESLA_RSTST */
-#define OMAP4430_TESLASS_EMU_RSTST_SHIFT                                2
-#define OMAP4430_TESLASS_EMU_RSTST_MASK                                 (1 << 2)
-
-/* Used by RM_TESLA_RSTST */
-#define OMAP4430_TESLA_DSP_EMU_REQ_RSTST_SHIFT                          3
-#define OMAP4430_TESLA_DSP_EMU_REQ_RSTST_MASK                           (1 << 3)
-
-/* Used by PM_TESLA_PWRSTCTRL */
-#define OMAP4430_TESLA_EDMA_ONSTATE_SHIFT                               20
-#define OMAP4430_TESLA_EDMA_ONSTATE_MASK                                (0x3 << 20)
-
-/* Used by PM_TESLA_PWRSTCTRL */
-#define OMAP4430_TESLA_EDMA_RETSTATE_SHIFT                              10
-#define OMAP4430_TESLA_EDMA_RETSTATE_MASK                               (1 << 10)
-
-/* Used by PM_TESLA_PWRSTST */
-#define OMAP4430_TESLA_EDMA_STATEST_SHIFT                               8
-#define OMAP4430_TESLA_EDMA_STATEST_MASK                                (0x3 << 8)
-
-/* Used by PM_TESLA_PWRSTCTRL */
-#define OMAP4430_TESLA_L1_ONSTATE_SHIFT                                 16
-#define OMAP4430_TESLA_L1_ONSTATE_MASK                                  (0x3 << 16)
-
-/* Used by PM_TESLA_PWRSTCTRL */
-#define OMAP4430_TESLA_L1_RETSTATE_SHIFT                                8
-#define OMAP4430_TESLA_L1_RETSTATE_MASK                                 (1 << 8)
-
-/* Used by PM_TESLA_PWRSTST */
-#define OMAP4430_TESLA_L1_STATEST_SHIFT                                 4
-#define OMAP4430_TESLA_L1_STATEST_MASK                                  (0x3 << 4)
-
-/* Used by PM_TESLA_PWRSTCTRL */
-#define OMAP4430_TESLA_L2_ONSTATE_SHIFT                                 18
-#define OMAP4430_TESLA_L2_ONSTATE_MASK                                  (0x3 << 18)
-
-/* Used by PM_TESLA_PWRSTCTRL */
-#define OMAP4430_TESLA_L2_RETSTATE_SHIFT                                9
-#define OMAP4430_TESLA_L2_RETSTATE_MASK                                 (1 << 9)
-
-/* Used by PM_TESLA_PWRSTST */
-#define OMAP4430_TESLA_L2_STATEST_SHIFT                                 6
-#define OMAP4430_TESLA_L2_STATEST_MASK                                  (0x3 << 6)
-
-/* Used by PRM_VP_CORE_VLIMITTO, PRM_VP_IVA_VLIMITTO, PRM_VP_MPU_VLIMITTO */
 #define OMAP4430_TIMEOUT_SHIFT                                          0
-#define OMAP4430_TIMEOUT_MASK                                           (0xffff << 0)
-
-/* Used by PRM_VP_CORE_CONFIG, PRM_VP_IVA_CONFIG, PRM_VP_MPU_CONFIG */
-#define OMAP4430_TIMEOUTEN_SHIFT                                        3
 #define OMAP4430_TIMEOUTEN_MASK                                         (1 << 3)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_TRANSITION_EN_SHIFT                                    8
-#define OMAP4430_TRANSITION_EN_MASK                                     (1 << 8)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_TRANSITION_ST_SHIFT                                    8
-#define OMAP4430_TRANSITION_ST_MASK                                     (1 << 8)
-
-/* Used by PRM_VC_VAL_BYPASS */
-#define OMAP4430_VALID_SHIFT                                            24
 #define OMAP4430_VALID_MASK                                             (1 << 24)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_VC_BYPASSACK_EN_SHIFT                                  14
-#define OMAP4430_VC_BYPASSACK_EN_MASK                                   (1 << 14)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_VC_BYPASSACK_ST_SHIFT                                  14
-#define OMAP4430_VC_BYPASSACK_ST_MASK                                   (1 << 14)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_VC_CORE_VPACK_EN_SHIFT                                 22
-#define OMAP4430_VC_CORE_VPACK_EN_MASK                                  (1 << 22)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_VC_CORE_VPACK_ST_SHIFT                                 22
-#define OMAP4430_VC_CORE_VPACK_ST_MASK                                  (1 << 22)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_VC_IVA_VPACK_EN_SHIFT                                  30
-#define OMAP4430_VC_IVA_VPACK_EN_MASK                                   (1 << 30)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_VC_IVA_VPACK_ST_SHIFT                                  30
-#define OMAP4430_VC_IVA_VPACK_ST_MASK                                   (1 << 30)
-
-/* Used by PRM_IRQENABLE_MPU_2 */
-#define OMAP4430_VC_MPU_VPACK_EN_SHIFT                                  6
-#define OMAP4430_VC_MPU_VPACK_EN_MASK                                   (1 << 6)
-
-/* Used by PRM_IRQSTATUS_MPU_2 */
-#define OMAP4430_VC_MPU_VPACK_ST_SHIFT                                  6
-#define OMAP4430_VC_MPU_VPACK_ST_MASK                                   (1 << 6)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_VC_RAERR_EN_SHIFT                                      12
-#define OMAP4430_VC_RAERR_EN_MASK                                       (1 << 12)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_VC_RAERR_ST_SHIFT                                      12
-#define OMAP4430_VC_RAERR_ST_MASK                                       (1 << 12)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_VC_SAERR_EN_SHIFT                                      11
-#define OMAP4430_VC_SAERR_EN_MASK                                       (1 << 11)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_VC_SAERR_ST_SHIFT                                      11
-#define OMAP4430_VC_SAERR_ST_MASK                                       (1 << 11)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_VC_TOERR_EN_SHIFT                                      13
-#define OMAP4430_VC_TOERR_EN_MASK                                       (1 << 13)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_VC_TOERR_ST_SHIFT                                      13
-#define OMAP4430_VC_TOERR_ST_MASK                                       (1 << 13)
-
-/* Used by PRM_VP_CORE_VLIMITTO, PRM_VP_IVA_VLIMITTO, PRM_VP_MPU_VLIMITTO */
 #define OMAP4430_VDDMAX_SHIFT                                           24
-#define OMAP4430_VDDMAX_MASK                                            (0xff << 24)
-
-/* Used by PRM_VP_CORE_VLIMITTO, PRM_VP_IVA_VLIMITTO, PRM_VP_MPU_VLIMITTO */
 #define OMAP4430_VDDMIN_SHIFT                                           16
-#define OMAP4430_VDDMIN_MASK                                            (0xff << 16)
-
-/* Used by PRM_VOLTCTRL */
-#define OMAP4430_VDD_CORE_I2C_DISABLE_SHIFT                             12
-#define OMAP4430_VDD_CORE_I2C_DISABLE_MASK                              (1 << 12)
-
-/* Used by PRM_RSTST */
 #define OMAP4430_VDD_CORE_VOLT_MGR_RST_SHIFT                            8
-#define OMAP4430_VDD_CORE_VOLT_MGR_RST_MASK                             (1 << 8)
-
-/* Used by PRM_VOLTCTRL */
-#define OMAP4430_VDD_IVA_I2C_DISABLE_SHIFT                              14
-#define OMAP4430_VDD_IVA_I2C_DISABLE_MASK                               (1 << 14)
-
-/* Used by PRM_VOLTCTRL */
-#define OMAP4430_VDD_IVA_PRESENCE_SHIFT                                 9
-#define OMAP4430_VDD_IVA_PRESENCE_MASK                                  (1 << 9)
-
-/* Used by PRM_RSTST */
 #define OMAP4430_VDD_IVA_VOLT_MGR_RST_SHIFT                             7
-#define OMAP4430_VDD_IVA_VOLT_MGR_RST_MASK                              (1 << 7)
-
-/* Used by PRM_VOLTCTRL */
-#define OMAP4430_VDD_MPU_I2C_DISABLE_SHIFT                              13
-#define OMAP4430_VDD_MPU_I2C_DISABLE_MASK                               (1 << 13)
-
-/* Used by PRM_VOLTCTRL */
-#define OMAP4430_VDD_MPU_PRESENCE_SHIFT                                 8
-#define OMAP4430_VDD_MPU_PRESENCE_MASK                                  (1 << 8)
-
-/* Used by PRM_RSTST */
 #define OMAP4430_VDD_MPU_VOLT_MGR_RST_SHIFT                             6
-#define OMAP4430_VDD_MPU_VOLT_MGR_RST_MASK                              (1 << 6)
-
-/* Used by PRM_VC_ERRST */
-#define OMAP4430_VFSM_RA_ERR_CORE_SHIFT                                 4
-#define OMAP4430_VFSM_RA_ERR_CORE_MASK                                  (1 << 4)
-
-/* Used by PRM_VC_ERRST */
-#define OMAP4430_VFSM_RA_ERR_IVA_SHIFT                                  12
-#define OMAP4430_VFSM_RA_ERR_IVA_MASK                                   (1 << 12)
-
-/* Used by PRM_VC_ERRST */
-#define OMAP4430_VFSM_RA_ERR_MPU_SHIFT                                  20
-#define OMAP4430_VFSM_RA_ERR_MPU_MASK                                   (1 << 20)
-
-/* Used by PRM_VC_ERRST */
-#define OMAP4430_VFSM_SA_ERR_CORE_SHIFT                                 3
-#define OMAP4430_VFSM_SA_ERR_CORE_MASK                                  (1 << 3)
-
-/* Used by PRM_VC_ERRST */
-#define OMAP4430_VFSM_SA_ERR_IVA_SHIFT                                  11
-#define OMAP4430_VFSM_SA_ERR_IVA_MASK                                   (1 << 11)
-
-/* Used by PRM_VC_ERRST */
-#define OMAP4430_VFSM_SA_ERR_MPU_SHIFT                                  19
-#define OMAP4430_VFSM_SA_ERR_MPU_MASK                                   (1 << 19)
-
-/* Used by PRM_VC_ERRST */
-#define OMAP4430_VFSM_TIMEOUT_ERR_CORE_SHIFT                            5
-#define OMAP4430_VFSM_TIMEOUT_ERR_CORE_MASK                             (1 << 5)
-
-/* Used by PRM_VC_ERRST */
-#define OMAP4430_VFSM_TIMEOUT_ERR_IVA_SHIFT                             13
-#define OMAP4430_VFSM_TIMEOUT_ERR_IVA_MASK                              (1 << 13)
-
-/* Used by PRM_VC_ERRST */
-#define OMAP4430_VFSM_TIMEOUT_ERR_MPU_SHIFT                             21
-#define OMAP4430_VFSM_TIMEOUT_ERR_MPU_MASK                              (1 << 21)
-
-/* Used by PRM_VC_VAL_SMPS_RA_VOL */
-#define OMAP4430_VOLRA_VDD_CORE_L_SHIFT                                 0
 #define OMAP4430_VOLRA_VDD_CORE_L_MASK                                  (0xff << 0)
-
-/* Used by PRM_VC_VAL_SMPS_RA_VOL */
-#define OMAP4430_VOLRA_VDD_IVA_L_SHIFT                                  8
 #define OMAP4430_VOLRA_VDD_IVA_L_MASK                                   (0xff << 8)
-
-/* Used by PRM_VC_VAL_SMPS_RA_VOL */
-#define OMAP4430_VOLRA_VDD_MPU_L_SHIFT                                  16
 #define OMAP4430_VOLRA_VDD_MPU_L_MASK                                   (0xff << 16)
-
-/* Used by PRM_VP_CORE_CONFIG, PRM_VP_IVA_CONFIG, PRM_VP_MPU_CONFIG */
-#define OMAP4430_VPENABLE_SHIFT                                         0
 #define OMAP4430_VPENABLE_MASK                                          (1 << 0)
-
-/* Used by PRM_VP_CORE_STATUS, PRM_VP_IVA_STATUS, PRM_VP_MPU_STATUS */
-#define OMAP4430_VPINIDLE_SHIFT                                         0
-#define OMAP4430_VPINIDLE_MASK                                          (1 << 0)
-
-/* Used by PRM_VP_CORE_VOLTAGE, PRM_VP_IVA_VOLTAGE, PRM_VP_MPU_VOLTAGE */
-#define OMAP4430_VPVOLTAGE_SHIFT                                        0
 #define OMAP4430_VPVOLTAGE_MASK                                         (0xff << 0)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_VP_CORE_EQVALUE_EN_SHIFT                               20
-#define OMAP4430_VP_CORE_EQVALUE_EN_MASK                                (1 << 20)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_VP_CORE_EQVALUE_ST_SHIFT                               20
-#define OMAP4430_VP_CORE_EQVALUE_ST_MASK                                (1 << 20)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_VP_CORE_MAXVDD_EN_SHIFT                                18
-#define OMAP4430_VP_CORE_MAXVDD_EN_MASK                                 (1 << 18)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_VP_CORE_MAXVDD_ST_SHIFT                                18
-#define OMAP4430_VP_CORE_MAXVDD_ST_MASK                                 (1 << 18)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_VP_CORE_MINVDD_EN_SHIFT                                17
-#define OMAP4430_VP_CORE_MINVDD_EN_MASK                                 (1 << 17)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_VP_CORE_MINVDD_ST_SHIFT                                17
-#define OMAP4430_VP_CORE_MINVDD_ST_MASK                                 (1 << 17)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_VP_CORE_NOSMPSACK_EN_SHIFT                             19
-#define OMAP4430_VP_CORE_NOSMPSACK_EN_MASK                              (1 << 19)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_VP_CORE_NOSMPSACK_ST_SHIFT                             19
-#define OMAP4430_VP_CORE_NOSMPSACK_ST_MASK                              (1 << 19)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_VP_CORE_OPPCHANGEDONE_EN_SHIFT                         16
-#define OMAP4430_VP_CORE_OPPCHANGEDONE_EN_MASK                          (1 << 16)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_VP_CORE_OPPCHANGEDONE_ST_SHIFT                         16
-#define OMAP4430_VP_CORE_OPPCHANGEDONE_ST_MASK                          (1 << 16)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_VP_CORE_TRANXDONE_EN_SHIFT                             21
-#define OMAP4430_VP_CORE_TRANXDONE_EN_MASK                              (1 << 21)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_VP_CORE_TRANXDONE_ST_SHIFT                             21
 #define OMAP4430_VP_CORE_TRANXDONE_ST_MASK                              (1 << 21)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_VP_IVA_EQVALUE_EN_SHIFT                                28
-#define OMAP4430_VP_IVA_EQVALUE_EN_MASK                                 (1 << 28)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_VP_IVA_EQVALUE_ST_SHIFT                                28
-#define OMAP4430_VP_IVA_EQVALUE_ST_MASK                                 (1 << 28)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_VP_IVA_MAXVDD_EN_SHIFT                                 26
-#define OMAP4430_VP_IVA_MAXVDD_EN_MASK                                  (1 << 26)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_VP_IVA_MAXVDD_ST_SHIFT                                 26
-#define OMAP4430_VP_IVA_MAXVDD_ST_MASK                                  (1 << 26)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_VP_IVA_MINVDD_EN_SHIFT                                 25
-#define OMAP4430_VP_IVA_MINVDD_EN_MASK                                  (1 << 25)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_VP_IVA_MINVDD_ST_SHIFT                                 25
-#define OMAP4430_VP_IVA_MINVDD_ST_MASK                                  (1 << 25)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_VP_IVA_NOSMPSACK_EN_SHIFT                              27
-#define OMAP4430_VP_IVA_NOSMPSACK_EN_MASK                               (1 << 27)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_VP_IVA_NOSMPSACK_ST_SHIFT                              27
-#define OMAP4430_VP_IVA_NOSMPSACK_ST_MASK                               (1 << 27)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_VP_IVA_OPPCHANGEDONE_EN_SHIFT                          24
-#define OMAP4430_VP_IVA_OPPCHANGEDONE_EN_MASK                           (1 << 24)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_VP_IVA_OPPCHANGEDONE_ST_SHIFT                          24
-#define OMAP4430_VP_IVA_OPPCHANGEDONE_ST_MASK                           (1 << 24)
-
-/* Used by PRM_IRQENABLE_DUCATI, PRM_IRQENABLE_MPU */
-#define OMAP4430_VP_IVA_TRANXDONE_EN_SHIFT                              29
-#define OMAP4430_VP_IVA_TRANXDONE_EN_MASK                               (1 << 29)
-
-/* Used by PRM_IRQSTATUS_DUCATI, PRM_IRQSTATUS_MPU */
-#define OMAP4430_VP_IVA_TRANXDONE_ST_SHIFT                              29
 #define OMAP4430_VP_IVA_TRANXDONE_ST_MASK                               (1 << 29)
-
-/* Used by PRM_IRQENABLE_MPU_2 */
-#define OMAP4430_VP_MPU_EQVALUE_EN_SHIFT                                4
-#define OMAP4430_VP_MPU_EQVALUE_EN_MASK                                 (1 << 4)
-
-/* Used by PRM_IRQSTATUS_MPU_2 */
-#define OMAP4430_VP_MPU_EQVALUE_ST_SHIFT                                4
-#define OMAP4430_VP_MPU_EQVALUE_ST_MASK                                 (1 << 4)
-
-/* Used by PRM_IRQENABLE_MPU_2 */
-#define OMAP4430_VP_MPU_MAXVDD_EN_SHIFT                                 2
-#define OMAP4430_VP_MPU_MAXVDD_EN_MASK                                  (1 << 2)
-
-/* Used by PRM_IRQSTATUS_MPU_2 */
-#define OMAP4430_VP_MPU_MAXVDD_ST_SHIFT                                 2
-#define OMAP4430_VP_MPU_MAXVDD_ST_MASK                                  (1 << 2)
-
-/* Used by PRM_IRQENABLE_MPU_2 */
-#define OMAP4430_VP_MPU_MINVDD_EN_SHIFT                                 1
-#define OMAP4430_VP_MPU_MINVDD_EN_MASK                                  (1 << 1)
-
-/* Used by PRM_IRQSTATUS_MPU_2 */
-#define OMAP4430_VP_MPU_MINVDD_ST_SHIFT                                 1
-#define OMAP4430_VP_MPU_MINVDD_ST_MASK                                  (1 << 1)
-
-/* Used by PRM_IRQENABLE_MPU_2 */
-#define OMAP4430_VP_MPU_NOSMPSACK_EN_SHIFT                              3
-#define OMAP4430_VP_MPU_NOSMPSACK_EN_MASK                               (1 << 3)
-
-/* Used by PRM_IRQSTATUS_MPU_2 */
-#define OMAP4430_VP_MPU_NOSMPSACK_ST_SHIFT                              3
-#define OMAP4430_VP_MPU_NOSMPSACK_ST_MASK                               (1 << 3)
-
-/* Used by PRM_IRQENABLE_MPU_2 */
-#define OMAP4430_VP_MPU_OPPCHANGEDONE_EN_SHIFT                          0
-#define OMAP4430_VP_MPU_OPPCHANGEDONE_EN_MASK                           (1 << 0)
-
-/* Used by PRM_IRQSTATUS_MPU_2 */
-#define OMAP4430_VP_MPU_OPPCHANGEDONE_ST_SHIFT                          0
-#define OMAP4430_VP_MPU_OPPCHANGEDONE_ST_MASK                           (1 << 0)
-
-/* Used by PRM_IRQENABLE_MPU_2 */
-#define OMAP4430_VP_MPU_TRANXDONE_EN_SHIFT                              5
-#define OMAP4430_VP_MPU_TRANXDONE_EN_MASK                               (1 << 5)
-
-/* Used by PRM_IRQSTATUS_MPU_2 */
-#define OMAP4430_VP_MPU_TRANXDONE_ST_SHIFT                              5
 #define OMAP4430_VP_MPU_TRANXDONE_ST_MASK                               (1 << 5)
-
-/* Used by PRM_SRAM_COUNT */
-#define OMAP4430_VSETUPCNT_VALUE_SHIFT                                  8
-#define OMAP4430_VSETUPCNT_VALUE_MASK                                   (0xff << 8)
-
-/* Used by PRM_VP_CORE_VSTEPMAX, PRM_VP_IVA_VSTEPMAX, PRM_VP_MPU_VSTEPMAX */
 #define OMAP4430_VSTEPMAX_SHIFT                                         0
-#define OMAP4430_VSTEPMAX_MASK                                          (0xff << 0)
-
-/* Used by PRM_VP_CORE_VSTEPMIN, PRM_VP_IVA_VSTEPMIN, PRM_VP_MPU_VSTEPMIN */
 #define OMAP4430_VSTEPMIN_SHIFT                                         0
-#define OMAP4430_VSTEPMIN_MASK                                          (0xff << 0)
-
-/* Used by PRM_MODEM_IF_CTRL */
-#define OMAP4430_WAKE_MODEM_SHIFT                                       0
-#define OMAP4430_WAKE_MODEM_MASK                                        (1 << 0)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP4430_WKUPDEP_DISPC_DUCATI_SHIFT                             1
-#define OMAP4430_WKUPDEP_DISPC_DUCATI_MASK                              (1 << 1)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP4430_WKUPDEP_DISPC_MPU_SHIFT                                0
-#define OMAP4430_WKUPDEP_DISPC_MPU_MASK                                 (1 << 0)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP4430_WKUPDEP_DISPC_SDMA_SHIFT                               3
-#define OMAP4430_WKUPDEP_DISPC_SDMA_MASK                                (1 << 3)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP4430_WKUPDEP_DISPC_TESLA_SHIFT                              2
-#define OMAP4430_WKUPDEP_DISPC_TESLA_MASK                               (1 << 2)
-
-/* Used by PM_ABE_DMIC_WKDEP */
-#define OMAP4430_WKUPDEP_DMIC_DMA_SDMA_SHIFT                            7
-#define OMAP4430_WKUPDEP_DMIC_DMA_SDMA_MASK                             (1 << 7)
-
-/* Used by PM_ABE_DMIC_WKDEP */
-#define OMAP4430_WKUPDEP_DMIC_DMA_TESLA_SHIFT                           6
-#define OMAP4430_WKUPDEP_DMIC_DMA_TESLA_MASK                            (1 << 6)
-
-/* Used by PM_ABE_DMIC_WKDEP */
-#define OMAP4430_WKUPDEP_DMIC_IRQ_MPU_SHIFT                             0
-#define OMAP4430_WKUPDEP_DMIC_IRQ_MPU_MASK                              (1 << 0)
-
-/* Used by PM_ABE_DMIC_WKDEP */
-#define OMAP4430_WKUPDEP_DMIC_IRQ_TESLA_SHIFT                           2
-#define OMAP4430_WKUPDEP_DMIC_IRQ_TESLA_MASK                            (1 << 2)
-
-/* Used by PM_L4PER_DMTIMER10_WKDEP */
-#define OMAP4430_WKUPDEP_DMTIMER10_MPU_SHIFT                            0
-#define OMAP4430_WKUPDEP_DMTIMER10_MPU_MASK                             (1 << 0)
-
-/* Used by PM_L4PER_DMTIMER11_WKDEP */
-#define OMAP4430_WKUPDEP_DMTIMER11_DUCATI_SHIFT                         1
-#define OMAP4430_WKUPDEP_DMTIMER11_DUCATI_MASK                          (1 << 1)
-
-/* Used by PM_L4PER_DMTIMER11_WKDEP */
-#define OMAP4430_WKUPDEP_DMTIMER11_MPU_SHIFT                            0
-#define OMAP4430_WKUPDEP_DMTIMER11_MPU_MASK                             (1 << 0)
-
-/* Used by PM_L4PER_DMTIMER2_WKDEP */
-#define OMAP4430_WKUPDEP_DMTIMER2_MPU_SHIFT                             0
-#define OMAP4430_WKUPDEP_DMTIMER2_MPU_MASK                              (1 << 0)
-
-/* Used by PM_L4PER_DMTIMER3_WKDEP */
-#define OMAP4430_WKUPDEP_DMTIMER3_DUCATI_SHIFT                          1
-#define OMAP4430_WKUPDEP_DMTIMER3_DUCATI_MASK                           (1 << 1)
-
-/* Used by PM_L4PER_DMTIMER3_WKDEP */
-#define OMAP4430_WKUPDEP_DMTIMER3_MPU_SHIFT                             0
-#define OMAP4430_WKUPDEP_DMTIMER3_MPU_MASK                              (1 << 0)
-
-/* Used by PM_L4PER_DMTIMER4_WKDEP */
-#define OMAP4430_WKUPDEP_DMTIMER4_DUCATI_SHIFT                          1
-#define OMAP4430_WKUPDEP_DMTIMER4_DUCATI_MASK                           (1 << 1)
-
-/* Used by PM_L4PER_DMTIMER4_WKDEP */
-#define OMAP4430_WKUPDEP_DMTIMER4_MPU_SHIFT                             0
-#define OMAP4430_WKUPDEP_DMTIMER4_MPU_MASK                              (1 << 0)
-
-/* Used by PM_L4PER_DMTIMER9_WKDEP */
-#define OMAP4430_WKUPDEP_DMTIMER9_DUCATI_SHIFT                          1
-#define OMAP4430_WKUPDEP_DMTIMER9_DUCATI_MASK                           (1 << 1)
-
-/* Used by PM_L4PER_DMTIMER9_WKDEP */
-#define OMAP4430_WKUPDEP_DMTIMER9_MPU_SHIFT                             0
-#define OMAP4430_WKUPDEP_DMTIMER9_MPU_MASK                              (1 << 0)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP4430_WKUPDEP_DSI1_DUCATI_SHIFT                              5
-#define OMAP4430_WKUPDEP_DSI1_DUCATI_MASK                               (1 << 5)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP4430_WKUPDEP_DSI1_MPU_SHIFT                                 4
-#define OMAP4430_WKUPDEP_DSI1_MPU_MASK                                  (1 << 4)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP4430_WKUPDEP_DSI1_SDMA_SHIFT                                7
-#define OMAP4430_WKUPDEP_DSI1_SDMA_MASK                                 (1 << 7)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP4430_WKUPDEP_DSI1_TESLA_SHIFT                               6
-#define OMAP4430_WKUPDEP_DSI1_TESLA_MASK                                (1 << 6)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP4430_WKUPDEP_DSI2_DUCATI_SHIFT                              9
-#define OMAP4430_WKUPDEP_DSI2_DUCATI_MASK                               (1 << 9)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP4430_WKUPDEP_DSI2_MPU_SHIFT                                 8
-#define OMAP4430_WKUPDEP_DSI2_MPU_MASK                                  (1 << 8)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP4430_WKUPDEP_DSI2_SDMA_SHIFT                                11
-#define OMAP4430_WKUPDEP_DSI2_SDMA_MASK                                 (1 << 11)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP4430_WKUPDEP_DSI2_TESLA_SHIFT                               10
-#define OMAP4430_WKUPDEP_DSI2_TESLA_MASK                                (1 << 10)
-
-/* Used by PM_WKUP_GPIO1_WKDEP */
-#define OMAP4430_WKUPDEP_GPIO1_IRQ1_DUCATI_SHIFT                        1
-#define OMAP4430_WKUPDEP_GPIO1_IRQ1_DUCATI_MASK                         (1 << 1)
-
-/* Used by PM_WKUP_GPIO1_WKDEP */
-#define OMAP4430_WKUPDEP_GPIO1_IRQ1_MPU_SHIFT                           0
-#define OMAP4430_WKUPDEP_GPIO1_IRQ1_MPU_MASK                            (1 << 0)
-
-/* Used by PM_WKUP_GPIO1_WKDEP */
-#define OMAP4430_WKUPDEP_GPIO1_IRQ2_TESLA_SHIFT                         6
-#define OMAP4430_WKUPDEP_GPIO1_IRQ2_TESLA_MASK                          (1 << 6)
-
-/* Used by PM_L4PER_GPIO2_WKDEP */
-#define OMAP4430_WKUPDEP_GPIO2_IRQ1_DUCATI_SHIFT                        1
-#define OMAP4430_WKUPDEP_GPIO2_IRQ1_DUCATI_MASK                         (1 << 1)
-
-/* Used by PM_L4PER_GPIO2_WKDEP */
-#define OMAP4430_WKUPDEP_GPIO2_IRQ1_MPU_SHIFT                           0
-#define OMAP4430_WKUPDEP_GPIO2_IRQ1_MPU_MASK                            (1 << 0)
-
-/* Used by PM_L4PER_GPIO2_WKDEP */
-#define OMAP4430_WKUPDEP_GPIO2_IRQ2_TESLA_SHIFT                         6
-#define OMAP4430_WKUPDEP_GPIO2_IRQ2_TESLA_MASK                          (1 << 6)
-
-/* Used by PM_L4PER_GPIO3_WKDEP */
-#define OMAP4430_WKUPDEP_GPIO3_IRQ1_MPU_SHIFT                           0
-#define OMAP4430_WKUPDEP_GPIO3_IRQ1_MPU_MASK                            (1 << 0)
-
-/* Used by PM_L4PER_GPIO3_WKDEP */
-#define OMAP4430_WKUPDEP_GPIO3_IRQ2_TESLA_SHIFT                         6
-#define OMAP4430_WKUPDEP_GPIO3_IRQ2_TESLA_MASK                          (1 << 6)
-
-/* Used by PM_L4PER_GPIO4_WKDEP */
-#define OMAP4430_WKUPDEP_GPIO4_IRQ1_MPU_SHIFT                           0
-#define OMAP4430_WKUPDEP_GPIO4_IRQ1_MPU_MASK                            (1 << 0)
-
-/* Used by PM_L4PER_GPIO4_WKDEP */
-#define OMAP4430_WKUPDEP_GPIO4_IRQ2_TESLA_SHIFT                         6
-#define OMAP4430_WKUPDEP_GPIO4_IRQ2_TESLA_MASK                          (1 << 6)
-
-/* Used by PM_L4PER_GPIO5_WKDEP */
-#define OMAP4430_WKUPDEP_GPIO5_IRQ1_MPU_SHIFT                           0
-#define OMAP4430_WKUPDEP_GPIO5_IRQ1_MPU_MASK                            (1 << 0)
-
-/* Used by PM_L4PER_GPIO5_WKDEP */
-#define OMAP4430_WKUPDEP_GPIO5_IRQ2_TESLA_SHIFT                         6
-#define OMAP4430_WKUPDEP_GPIO5_IRQ2_TESLA_MASK                          (1 << 6)
-
-/* Used by PM_L4PER_GPIO6_WKDEP */
-#define OMAP4430_WKUPDEP_GPIO6_IRQ1_MPU_SHIFT                           0
-#define OMAP4430_WKUPDEP_GPIO6_IRQ1_MPU_MASK                            (1 << 0)
-
-/* Used by PM_L4PER_GPIO6_WKDEP */
-#define OMAP4430_WKUPDEP_GPIO6_IRQ2_TESLA_SHIFT                         6
-#define OMAP4430_WKUPDEP_GPIO6_IRQ2_TESLA_MASK                          (1 << 6)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP4430_WKUPDEP_HDMIDMA_SDMA_SHIFT                             19
-#define OMAP4430_WKUPDEP_HDMIDMA_SDMA_MASK                              (1 << 19)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP4430_WKUPDEP_HDMIIRQ_DUCATI_SHIFT                           13
-#define OMAP4430_WKUPDEP_HDMIIRQ_DUCATI_MASK                            (1 << 13)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP4430_WKUPDEP_HDMIIRQ_MPU_SHIFT                              12
-#define OMAP4430_WKUPDEP_HDMIIRQ_MPU_MASK                               (1 << 12)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP4430_WKUPDEP_HDMIIRQ_TESLA_SHIFT                            14
-#define OMAP4430_WKUPDEP_HDMIIRQ_TESLA_MASK                             (1 << 14)
-
-/* Used by PM_L4PER_HECC1_WKDEP */
-#define OMAP4430_WKUPDEP_HECC1_MPU_SHIFT                                0
-#define OMAP4430_WKUPDEP_HECC1_MPU_MASK                                 (1 << 0)
-
-/* Used by PM_L4PER_HECC2_WKDEP */
-#define OMAP4430_WKUPDEP_HECC2_MPU_SHIFT                                0
-#define OMAP4430_WKUPDEP_HECC2_MPU_MASK                                 (1 << 0)
-
-/* Used by PM_L3INIT_HSI_WKDEP */
-#define OMAP4430_WKUPDEP_HSI_DSP_TESLA_SHIFT                            6
-#define OMAP4430_WKUPDEP_HSI_DSP_TESLA_MASK                             (1 << 6)
-
-/* Used by PM_L3INIT_HSI_WKDEP */
-#define OMAP4430_WKUPDEP_HSI_MCU_DUCATI_SHIFT                           1
-#define OMAP4430_WKUPDEP_HSI_MCU_DUCATI_MASK                            (1 << 1)
-
-/* Used by PM_L3INIT_HSI_WKDEP */
-#define OMAP4430_WKUPDEP_HSI_MCU_MPU_SHIFT                              0
-#define OMAP4430_WKUPDEP_HSI_MCU_MPU_MASK                               (1 << 0)
-
-/* Used by PM_L4PER_I2C1_WKDEP */
-#define OMAP4430_WKUPDEP_I2C1_DMA_SDMA_SHIFT                            7
-#define OMAP4430_WKUPDEP_I2C1_DMA_SDMA_MASK                             (1 << 7)
-
-/* Used by PM_L4PER_I2C1_WKDEP */
-#define OMAP4430_WKUPDEP_I2C1_IRQ_DUCATI_SHIFT                          1
-#define OMAP4430_WKUPDEP_I2C1_IRQ_DUCATI_MASK                           (1 << 1)
-
-/* Used by PM_L4PER_I2C1_WKDEP */
-#define OMAP4430_WKUPDEP_I2C1_IRQ_MPU_SHIFT                             0
-#define OMAP4430_WKUPDEP_I2C1_IRQ_MPU_MASK                              (1 << 0)
-
-/* Used by PM_L4PER_I2C2_WKDEP */
-#define OMAP4430_WKUPDEP_I2C2_DMA_SDMA_SHIFT                            7
-#define OMAP4430_WKUPDEP_I2C2_DMA_SDMA_MASK                             (1 << 7)
-
-/* Used by PM_L4PER_I2C2_WKDEP */
-#define OMAP4430_WKUPDEP_I2C2_IRQ_DUCATI_SHIFT                          1
-#define OMAP4430_WKUPDEP_I2C2_IRQ_DUCATI_MASK                           (1 << 1)
-
-/* Used by PM_L4PER_I2C2_WKDEP */
-#define OMAP4430_WKUPDEP_I2C2_IRQ_MPU_SHIFT                             0
-#define OMAP4430_WKUPDEP_I2C2_IRQ_MPU_MASK                              (1 << 0)
-
-/* Used by PM_L4PER_I2C3_WKDEP */
-#define OMAP4430_WKUPDEP_I2C3_DMA_SDMA_SHIFT                            7
-#define OMAP4430_WKUPDEP_I2C3_DMA_SDMA_MASK                             (1 << 7)
-
-/* Used by PM_L4PER_I2C3_WKDEP */
-#define OMAP4430_WKUPDEP_I2C3_IRQ_DUCATI_SHIFT                          1
-#define OMAP4430_WKUPDEP_I2C3_IRQ_DUCATI_MASK                           (1 << 1)
-
-/* Used by PM_L4PER_I2C3_WKDEP */
-#define OMAP4430_WKUPDEP_I2C3_IRQ_MPU_SHIFT                             0
-#define OMAP4430_WKUPDEP_I2C3_IRQ_MPU_MASK                              (1 << 0)
-
-/* Used by PM_L4PER_I2C4_WKDEP */
-#define OMAP4430_WKUPDEP_I2C4_DMA_SDMA_SHIFT                            7
-#define OMAP4430_WKUPDEP_I2C4_DMA_SDMA_MASK                             (1 << 7)
-
-/* Used by PM_L4PER_I2C4_WKDEP */
-#define OMAP4430_WKUPDEP_I2C4_IRQ_DUCATI_SHIFT                          1
-#define OMAP4430_WKUPDEP_I2C4_IRQ_DUCATI_MASK                           (1 << 1)
-
-/* Used by PM_L4PER_I2C4_WKDEP */
-#define OMAP4430_WKUPDEP_I2C4_IRQ_MPU_SHIFT                             0
-#define OMAP4430_WKUPDEP_I2C4_IRQ_MPU_MASK                              (1 << 0)
-
-/* Used by PM_L4PER_I2C5_WKDEP */
-#define OMAP4430_WKUPDEP_I2C5_DMA_SDMA_SHIFT                            7
-#define OMAP4430_WKUPDEP_I2C5_DMA_SDMA_MASK                             (1 << 7)
-
-/* Used by PM_L4PER_I2C5_WKDEP */
-#define OMAP4430_WKUPDEP_I2C5_IRQ_MPU_SHIFT                             0
-#define OMAP4430_WKUPDEP_I2C5_IRQ_MPU_MASK                              (1 << 0)
-
-/* Used by PM_WKUP_KEYBOARD_WKDEP */
-#define OMAP4430_WKUPDEP_KEYBOARD_MPU_SHIFT                             0
-#define OMAP4430_WKUPDEP_KEYBOARD_MPU_MASK                              (1 << 0)
-
-/* Used by PM_ABE_MCASP_WKDEP */
-#define OMAP4430_WKUPDEP_MCASP1_DMA_SDMA_SHIFT                          7
-#define OMAP4430_WKUPDEP_MCASP1_DMA_SDMA_MASK                           (1 << 7)
-
-/* Used by PM_ABE_MCASP_WKDEP */
-#define OMAP4430_WKUPDEP_MCASP1_DMA_TESLA_SHIFT                         6
-#define OMAP4430_WKUPDEP_MCASP1_DMA_TESLA_MASK                          (1 << 6)
-
-/* Used by PM_ABE_MCASP_WKDEP */
-#define OMAP4430_WKUPDEP_MCASP1_IRQ_MPU_SHIFT                           0
-#define OMAP4430_WKUPDEP_MCASP1_IRQ_MPU_MASK                            (1 << 0)
-
-/* Used by PM_ABE_MCASP_WKDEP */
-#define OMAP4430_WKUPDEP_MCASP1_IRQ_TESLA_SHIFT                         2
-#define OMAP4430_WKUPDEP_MCASP1_IRQ_TESLA_MASK                          (1 << 2)
-
-/* Used by PM_L4PER_MCASP2_WKDEP */
-#define OMAP4430_WKUPDEP_MCASP2_DMA_SDMA_SHIFT                          7
-#define OMAP4430_WKUPDEP_MCASP2_DMA_SDMA_MASK                           (1 << 7)
-
-/* Used by PM_L4PER_MCASP2_WKDEP */
-#define OMAP4430_WKUPDEP_MCASP2_DMA_TESLA_SHIFT                         6
-#define OMAP4430_WKUPDEP_MCASP2_DMA_TESLA_MASK                          (1 << 6)
-
-/* Used by PM_L4PER_MCASP2_WKDEP */
-#define OMAP4430_WKUPDEP_MCASP2_IRQ_MPU_SHIFT                           0
-#define OMAP4430_WKUPDEP_MCASP2_IRQ_MPU_MASK                            (1 << 0)
-
-/* Used by PM_L4PER_MCASP2_WKDEP */
-#define OMAP4430_WKUPDEP_MCASP2_IRQ_TESLA_SHIFT                         2
-#define OMAP4430_WKUPDEP_MCASP2_IRQ_TESLA_MASK                          (1 << 2)
-
-/* Used by PM_L4PER_MCASP3_WKDEP */
-#define OMAP4430_WKUPDEP_MCASP3_DMA_SDMA_SHIFT                          7
-#define OMAP4430_WKUPDEP_MCASP3_DMA_SDMA_MASK                           (1 << 7)
-
-/* Used by PM_L4PER_MCASP3_WKDEP */
-#define OMAP4430_WKUPDEP_MCASP3_DMA_TESLA_SHIFT                         6
-#define OMAP4430_WKUPDEP_MCASP3_DMA_TESLA_MASK                          (1 << 6)
-
-/* Used by PM_L4PER_MCASP3_WKDEP */
-#define OMAP4430_WKUPDEP_MCASP3_IRQ_MPU_SHIFT                           0
-#define OMAP4430_WKUPDEP_MCASP3_IRQ_MPU_MASK                            (1 << 0)
-
-/* Used by PM_L4PER_MCASP3_WKDEP */
-#define OMAP4430_WKUPDEP_MCASP3_IRQ_TESLA_SHIFT                         2
-#define OMAP4430_WKUPDEP_MCASP3_IRQ_TESLA_MASK                          (1 << 2)
-
-/* Used by PM_ABE_MCBSP1_WKDEP */
-#define OMAP4430_WKUPDEP_MCBSP1_MPU_SHIFT                               0
-#define OMAP4430_WKUPDEP_MCBSP1_MPU_MASK                                (1 << 0)
-
-/* Used by PM_ABE_MCBSP1_WKDEP */
-#define OMAP4430_WKUPDEP_MCBSP1_SDMA_SHIFT                              3
-#define OMAP4430_WKUPDEP_MCBSP1_SDMA_MASK                               (1 << 3)
-
-/* Used by PM_ABE_MCBSP1_WKDEP */
-#define OMAP4430_WKUPDEP_MCBSP1_TESLA_SHIFT                             2
-#define OMAP4430_WKUPDEP_MCBSP1_TESLA_MASK                              (1 << 2)
-
-/* Used by PM_ABE_MCBSP2_WKDEP */
-#define OMAP4430_WKUPDEP_MCBSP2_MPU_SHIFT                               0
-#define OMAP4430_WKUPDEP_MCBSP2_MPU_MASK                                (1 << 0)
-
-/* Used by PM_ABE_MCBSP2_WKDEP */
-#define OMAP4430_WKUPDEP_MCBSP2_SDMA_SHIFT                              3
-#define OMAP4430_WKUPDEP_MCBSP2_SDMA_MASK                               (1 << 3)
-
-/* Used by PM_ABE_MCBSP2_WKDEP */
-#define OMAP4430_WKUPDEP_MCBSP2_TESLA_SHIFT                             2
-#define OMAP4430_WKUPDEP_MCBSP2_TESLA_MASK                              (1 << 2)
-
-/* Used by PM_ABE_MCBSP3_WKDEP */
-#define OMAP4430_WKUPDEP_MCBSP3_MPU_SHIFT                               0
-#define OMAP4430_WKUPDEP_MCBSP3_MPU_MASK                                (1 << 0)
-
-/* Used by PM_ABE_MCBSP3_WKDEP */
-#define OMAP4430_WKUPDEP_MCBSP3_SDMA_SHIFT                              3
-#define OMAP4430_WKUPDEP_MCBSP3_SDMA_MASK                               (1 << 3)
-
-/* Used by PM_ABE_MCBSP3_WKDEP */
-#define OMAP4430_WKUPDEP_MCBSP3_TESLA_SHIFT                             2
-#define OMAP4430_WKUPDEP_MCBSP3_TESLA_MASK                              (1 << 2)
-
-/* Used by PM_L4PER_MCBSP4_WKDEP */
-#define OMAP4430_WKUPDEP_MCBSP4_MPU_SHIFT                               0
-#define OMAP4430_WKUPDEP_MCBSP4_MPU_MASK                                (1 << 0)
-
-/* Used by PM_L4PER_MCBSP4_WKDEP */
-#define OMAP4430_WKUPDEP_MCBSP4_SDMA_SHIFT                              3
-#define OMAP4430_WKUPDEP_MCBSP4_SDMA_MASK                               (1 << 3)
-
-/* Used by PM_L4PER_MCBSP4_WKDEP */
-#define OMAP4430_WKUPDEP_MCBSP4_TESLA_SHIFT                             2
-#define OMAP4430_WKUPDEP_MCBSP4_TESLA_MASK                              (1 << 2)
-
-/* Used by PM_L4PER_MCSPI1_WKDEP */
-#define OMAP4430_WKUPDEP_MCSPI1_DUCATI_SHIFT                            1
-#define OMAP4430_WKUPDEP_MCSPI1_DUCATI_MASK                             (1 << 1)
-
-/* Used by PM_L4PER_MCSPI1_WKDEP */
-#define OMAP4430_WKUPDEP_MCSPI1_MPU_SHIFT                               0
-#define OMAP4430_WKUPDEP_MCSPI1_MPU_MASK                                (1 << 0)
-
-/* Used by PM_L4PER_MCSPI1_WKDEP */
-#define OMAP4430_WKUPDEP_MCSPI1_SDMA_SHIFT                              3
-#define OMAP4430_WKUPDEP_MCSPI1_SDMA_MASK                               (1 << 3)
-
-/* Used by PM_L4PER_MCSPI1_WKDEP */
-#define OMAP4430_WKUPDEP_MCSPI1_TESLA_SHIFT                             2
-#define OMAP4430_WKUPDEP_MCSPI1_TESLA_MASK                              (1 << 2)
-
-/* Used by PM_L4PER_MCSPI2_WKDEP */
-#define OMAP4430_WKUPDEP_MCSPI2_DUCATI_SHIFT                            1
-#define OMAP4430_WKUPDEP_MCSPI2_DUCATI_MASK                             (1 << 1)
-
-/* Used by PM_L4PER_MCSPI2_WKDEP */
-#define OMAP4430_WKUPDEP_MCSPI2_MPU_SHIFT                               0
-#define OMAP4430_WKUPDEP_MCSPI2_MPU_MASK                                (1 << 0)
-
-/* Used by PM_L4PER_MCSPI2_WKDEP */
-#define OMAP4430_WKUPDEP_MCSPI2_SDMA_SHIFT                              3
-#define OMAP4430_WKUPDEP_MCSPI2_SDMA_MASK                               (1 << 3)
-
-/* Used by PM_L4PER_MCSPI3_WKDEP */
-#define OMAP4430_WKUPDEP_MCSPI3_MPU_SHIFT                               0
-#define OMAP4430_WKUPDEP_MCSPI3_MPU_MASK                                (1 << 0)
-
-/* Used by PM_L4PER_MCSPI3_WKDEP */
-#define OMAP4430_WKUPDEP_MCSPI3_SDMA_SHIFT                              3
-#define OMAP4430_WKUPDEP_MCSPI3_SDMA_MASK                               (1 << 3)
-
-/* Used by PM_L4PER_MCSPI4_WKDEP */
-#define OMAP4430_WKUPDEP_MCSPI4_MPU_SHIFT                               0
-#define OMAP4430_WKUPDEP_MCSPI4_MPU_MASK                                (1 << 0)
-
-/* Used by PM_L4PER_MCSPI4_WKDEP */
-#define OMAP4430_WKUPDEP_MCSPI4_SDMA_SHIFT                              3
-#define OMAP4430_WKUPDEP_MCSPI4_SDMA_MASK                               (1 << 3)
-
-/* Used by PM_L3INIT_MMC1_WKDEP */
-#define OMAP4430_WKUPDEP_MMC1_DUCATI_SHIFT                              1
-#define OMAP4430_WKUPDEP_MMC1_DUCATI_MASK                               (1 << 1)
-
-/* Used by PM_L3INIT_MMC1_WKDEP */
-#define OMAP4430_WKUPDEP_MMC1_MPU_SHIFT                                 0
-#define OMAP4430_WKUPDEP_MMC1_MPU_MASK                                  (1 << 0)
-
-/* Used by PM_L3INIT_MMC1_WKDEP */
-#define OMAP4430_WKUPDEP_MMC1_SDMA_SHIFT                                3
-#define OMAP4430_WKUPDEP_MMC1_SDMA_MASK                                 (1 << 3)
-
-/* Used by PM_L3INIT_MMC1_WKDEP */
-#define OMAP4430_WKUPDEP_MMC1_TESLA_SHIFT                               2
-#define OMAP4430_WKUPDEP_MMC1_TESLA_MASK                                (1 << 2)
-
-/* Used by PM_L3INIT_MMC2_WKDEP */
-#define OMAP4430_WKUPDEP_MMC2_DUCATI_SHIFT                              1
-#define OMAP4430_WKUPDEP_MMC2_DUCATI_MASK                               (1 << 1)
-
-/* Used by PM_L3INIT_MMC2_WKDEP */
-#define OMAP4430_WKUPDEP_MMC2_MPU_SHIFT                                 0
-#define OMAP4430_WKUPDEP_MMC2_MPU_MASK                                  (1 << 0)
-
-/* Used by PM_L3INIT_MMC2_WKDEP */
-#define OMAP4430_WKUPDEP_MMC2_SDMA_SHIFT                                3
-#define OMAP4430_WKUPDEP_MMC2_SDMA_MASK                                 (1 << 3)
-
-/* Used by PM_L3INIT_MMC2_WKDEP */
-#define OMAP4430_WKUPDEP_MMC2_TESLA_SHIFT                               2
-#define OMAP4430_WKUPDEP_MMC2_TESLA_MASK                                (1 << 2)
-
-/* Used by PM_L3INIT_MMC6_WKDEP */
-#define OMAP4430_WKUPDEP_MMC6_DUCATI_SHIFT                              1
-#define OMAP4430_WKUPDEP_MMC6_DUCATI_MASK                               (1 << 1)
-
-/* Used by PM_L3INIT_MMC6_WKDEP */
-#define OMAP4430_WKUPDEP_MMC6_MPU_SHIFT                                 0
-#define OMAP4430_WKUPDEP_MMC6_MPU_MASK                                  (1 << 0)
-
-/* Used by PM_L3INIT_MMC6_WKDEP */
-#define OMAP4430_WKUPDEP_MMC6_TESLA_SHIFT                               2
-#define OMAP4430_WKUPDEP_MMC6_TESLA_MASK                                (1 << 2)
-
-/* Used by PM_L4PER_MMCSD3_WKDEP */
-#define OMAP4430_WKUPDEP_MMCSD3_DUCATI_SHIFT                            1
-#define OMAP4430_WKUPDEP_MMCSD3_DUCATI_MASK                             (1 << 1)
-
-/* Used by PM_L4PER_MMCSD3_WKDEP */
-#define OMAP4430_WKUPDEP_MMCSD3_MPU_SHIFT                               0
-#define OMAP4430_WKUPDEP_MMCSD3_MPU_MASK                                (1 << 0)
-
-/* Used by PM_L4PER_MMCSD3_WKDEP */
-#define OMAP4430_WKUPDEP_MMCSD3_SDMA_SHIFT                              3
-#define OMAP4430_WKUPDEP_MMCSD3_SDMA_MASK                               (1 << 3)
-
-/* Used by PM_L4PER_MMCSD4_WKDEP */
-#define OMAP4430_WKUPDEP_MMCSD4_DUCATI_SHIFT                            1
-#define OMAP4430_WKUPDEP_MMCSD4_DUCATI_MASK                             (1 << 1)
-
-/* Used by PM_L4PER_MMCSD4_WKDEP */
-#define OMAP4430_WKUPDEP_MMCSD4_MPU_SHIFT                               0
-#define OMAP4430_WKUPDEP_MMCSD4_MPU_MASK                                (1 << 0)
-
-/* Used by PM_L4PER_MMCSD4_WKDEP */
-#define OMAP4430_WKUPDEP_MMCSD4_SDMA_SHIFT                              3
-#define OMAP4430_WKUPDEP_MMCSD4_SDMA_MASK                               (1 << 3)
-
-/* Used by PM_L4PER_MMCSD5_WKDEP */
-#define OMAP4430_WKUPDEP_MMCSD5_DUCATI_SHIFT                            1
-#define OMAP4430_WKUPDEP_MMCSD5_DUCATI_MASK                             (1 << 1)
-
-/* Used by PM_L4PER_MMCSD5_WKDEP */
-#define OMAP4430_WKUPDEP_MMCSD5_MPU_SHIFT                               0
-#define OMAP4430_WKUPDEP_MMCSD5_MPU_MASK                                (1 << 0)
-
-/* Used by PM_L4PER_MMCSD5_WKDEP */
-#define OMAP4430_WKUPDEP_MMCSD5_SDMA_SHIFT                              3
-#define OMAP4430_WKUPDEP_MMCSD5_SDMA_MASK                               (1 << 3)
-
-/* Used by PM_L3INIT_PCIESS_WKDEP */
-#define OMAP4430_WKUPDEP_PCIESS_MPU_SHIFT                               0
-#define OMAP4430_WKUPDEP_PCIESS_MPU_MASK                                (1 << 0)
-
-/* Used by PM_L3INIT_PCIESS_WKDEP */
-#define OMAP4430_WKUPDEP_PCIESS_TESLA_SHIFT                             2
-#define OMAP4430_WKUPDEP_PCIESS_TESLA_MASK                              (1 << 2)
-
-/* Used by PM_ABE_PDM_WKDEP */
-#define OMAP4430_WKUPDEP_PDM_DMA_SDMA_SHIFT                             7
-#define OMAP4430_WKUPDEP_PDM_DMA_SDMA_MASK                              (1 << 7)
-
-/* Used by PM_ABE_PDM_WKDEP */
-#define OMAP4430_WKUPDEP_PDM_DMA_TESLA_SHIFT                            6
-#define OMAP4430_WKUPDEP_PDM_DMA_TESLA_MASK                             (1 << 6)
-
-/* Used by PM_ABE_PDM_WKDEP */
-#define OMAP4430_WKUPDEP_PDM_IRQ_MPU_SHIFT                              0
-#define OMAP4430_WKUPDEP_PDM_IRQ_MPU_MASK                               (1 << 0)
-
-/* Used by PM_ABE_PDM_WKDEP */
-#define OMAP4430_WKUPDEP_PDM_IRQ_TESLA_SHIFT                            2
-#define OMAP4430_WKUPDEP_PDM_IRQ_TESLA_MASK                             (1 << 2)
-
-/* Used by PM_WKUP_RTC_WKDEP */
-#define OMAP4430_WKUPDEP_RTC_MPU_SHIFT                                  0
-#define OMAP4430_WKUPDEP_RTC_MPU_MASK                                   (1 << 0)
-
-/* Used by PM_L3INIT_SATA_WKDEP */
-#define OMAP4430_WKUPDEP_SATA_MPU_SHIFT                                 0
-#define OMAP4430_WKUPDEP_SATA_MPU_MASK                                  (1 << 0)
-
-/* Used by PM_L3INIT_SATA_WKDEP */
-#define OMAP4430_WKUPDEP_SATA_TESLA_SHIFT                               2
-#define OMAP4430_WKUPDEP_SATA_TESLA_MASK                                (1 << 2)
-
-/* Used by PM_ABE_SLIMBUS_WKDEP */
-#define OMAP4430_WKUPDEP_SLIMBUS1_DMA_SDMA_SHIFT                        7
-#define OMAP4430_WKUPDEP_SLIMBUS1_DMA_SDMA_MASK                         (1 << 7)
-
-/* Used by PM_ABE_SLIMBUS_WKDEP */
-#define OMAP4430_WKUPDEP_SLIMBUS1_DMA_TESLA_SHIFT                       6
-#define OMAP4430_WKUPDEP_SLIMBUS1_DMA_TESLA_MASK                        (1 << 6)
-
-/* Used by PM_ABE_SLIMBUS_WKDEP */
-#define OMAP4430_WKUPDEP_SLIMBUS1_IRQ_MPU_SHIFT                         0
-#define OMAP4430_WKUPDEP_SLIMBUS1_IRQ_MPU_MASK                          (1 << 0)
-
-/* Used by PM_ABE_SLIMBUS_WKDEP */
-#define OMAP4430_WKUPDEP_SLIMBUS1_IRQ_TESLA_SHIFT                       2
-#define OMAP4430_WKUPDEP_SLIMBUS1_IRQ_TESLA_MASK                        (1 << 2)
-
-/* Used by PM_L4PER_SLIMBUS2_WKDEP */
-#define OMAP4430_WKUPDEP_SLIMBUS2_DMA_SDMA_SHIFT                        7
-#define OMAP4430_WKUPDEP_SLIMBUS2_DMA_SDMA_MASK                         (1 << 7)
-
-/* Used by PM_L4PER_SLIMBUS2_WKDEP */
-#define OMAP4430_WKUPDEP_SLIMBUS2_DMA_TESLA_SHIFT                       6
-#define OMAP4430_WKUPDEP_SLIMBUS2_DMA_TESLA_MASK                        (1 << 6)
-
-/* Used by PM_L4PER_SLIMBUS2_WKDEP */
-#define OMAP4430_WKUPDEP_SLIMBUS2_IRQ_MPU_SHIFT                         0
-#define OMAP4430_WKUPDEP_SLIMBUS2_IRQ_MPU_MASK                          (1 << 0)
-
-/* Used by PM_L4PER_SLIMBUS2_WKDEP */
-#define OMAP4430_WKUPDEP_SLIMBUS2_IRQ_TESLA_SHIFT                       2
-#define OMAP4430_WKUPDEP_SLIMBUS2_IRQ_TESLA_MASK                        (1 << 2)
-
-/* Used by PM_ALWON_SR_CORE_WKDEP */
-#define OMAP4430_WKUPDEP_SR_CORE_DUCATI_SHIFT                           1
-#define OMAP4430_WKUPDEP_SR_CORE_DUCATI_MASK                            (1 << 1)
-
-/* Used by PM_ALWON_SR_CORE_WKDEP */
-#define OMAP4430_WKUPDEP_SR_CORE_MPU_SHIFT                              0
-#define OMAP4430_WKUPDEP_SR_CORE_MPU_MASK                               (1 << 0)
-
-/* Used by PM_ALWON_SR_IVA_WKDEP */
-#define OMAP4430_WKUPDEP_SR_IVA_DUCATI_SHIFT                            1
-#define OMAP4430_WKUPDEP_SR_IVA_DUCATI_MASK                             (1 << 1)
-
-/* Used by PM_ALWON_SR_IVA_WKDEP */
-#define OMAP4430_WKUPDEP_SR_IVA_MPU_SHIFT                               0
-#define OMAP4430_WKUPDEP_SR_IVA_MPU_MASK                                (1 << 0)
-
-/* Used by PM_ALWON_SR_MPU_WKDEP */
-#define OMAP4430_WKUPDEP_SR_MPU_MPU_SHIFT                               0
-#define OMAP4430_WKUPDEP_SR_MPU_MPU_MASK                                (1 << 0)
-
-/* Used by PM_WKUP_TIMER12_WKDEP */
-#define OMAP4430_WKUPDEP_TIMER12_MPU_SHIFT                              0
-#define OMAP4430_WKUPDEP_TIMER12_MPU_MASK                               (1 << 0)
-
-/* Used by PM_WKUP_TIMER1_WKDEP */
-#define OMAP4430_WKUPDEP_TIMER1_MPU_SHIFT                               0
-#define OMAP4430_WKUPDEP_TIMER1_MPU_MASK                                (1 << 0)
-
-/* Used by PM_ABE_TIMER5_WKDEP */
-#define OMAP4430_WKUPDEP_TIMER5_MPU_SHIFT                               0
-#define OMAP4430_WKUPDEP_TIMER5_MPU_MASK                                (1 << 0)
-
-/* Used by PM_ABE_TIMER5_WKDEP */
-#define OMAP4430_WKUPDEP_TIMER5_TESLA_SHIFT                             2
-#define OMAP4430_WKUPDEP_TIMER5_TESLA_MASK                              (1 << 2)
-
-/* Used by PM_ABE_TIMER6_WKDEP */
-#define OMAP4430_WKUPDEP_TIMER6_MPU_SHIFT                               0
-#define OMAP4430_WKUPDEP_TIMER6_MPU_MASK                                (1 << 0)
-
-/* Used by PM_ABE_TIMER6_WKDEP */
-#define OMAP4430_WKUPDEP_TIMER6_TESLA_SHIFT                             2
-#define OMAP4430_WKUPDEP_TIMER6_TESLA_MASK                              (1 << 2)
-
-/* Used by PM_ABE_TIMER7_WKDEP */
-#define OMAP4430_WKUPDEP_TIMER7_MPU_SHIFT                               0
-#define OMAP4430_WKUPDEP_TIMER7_MPU_MASK                                (1 << 0)
-
-/* Used by PM_ABE_TIMER7_WKDEP */
-#define OMAP4430_WKUPDEP_TIMER7_TESLA_SHIFT                             2
-#define OMAP4430_WKUPDEP_TIMER7_TESLA_MASK                              (1 << 2)
-
-/* Used by PM_ABE_TIMER8_WKDEP */
-#define OMAP4430_WKUPDEP_TIMER8_MPU_SHIFT                               0
-#define OMAP4430_WKUPDEP_TIMER8_MPU_MASK                                (1 << 0)
-
-/* Used by PM_ABE_TIMER8_WKDEP */
-#define OMAP4430_WKUPDEP_TIMER8_TESLA_SHIFT                             2
-#define OMAP4430_WKUPDEP_TIMER8_TESLA_MASK                              (1 << 2)
-
-/* Used by PM_L4PER_UART1_WKDEP */
-#define OMAP4430_WKUPDEP_UART1_MPU_SHIFT                                0
-#define OMAP4430_WKUPDEP_UART1_MPU_MASK                                 (1 << 0)
-
-/* Used by PM_L4PER_UART1_WKDEP */
-#define OMAP4430_WKUPDEP_UART1_SDMA_SHIFT                               3
-#define OMAP4430_WKUPDEP_UART1_SDMA_MASK                                (1 << 3)
-
-/* Used by PM_L4PER_UART2_WKDEP */
-#define OMAP4430_WKUPDEP_UART2_MPU_SHIFT                                0
-#define OMAP4430_WKUPDEP_UART2_MPU_MASK                                 (1 << 0)
-
-/* Used by PM_L4PER_UART2_WKDEP */
-#define OMAP4430_WKUPDEP_UART2_SDMA_SHIFT                               3
-#define OMAP4430_WKUPDEP_UART2_SDMA_MASK                                (1 << 3)
-
-/* Used by PM_L4PER_UART3_WKDEP */
-#define OMAP4430_WKUPDEP_UART3_DUCATI_SHIFT                             1
-#define OMAP4430_WKUPDEP_UART3_DUCATI_MASK                              (1 << 1)
-
-/* Used by PM_L4PER_UART3_WKDEP */
-#define OMAP4430_WKUPDEP_UART3_MPU_SHIFT                                0
-#define OMAP4430_WKUPDEP_UART3_MPU_MASK                                 (1 << 0)
-
-/* Used by PM_L4PER_UART3_WKDEP */
-#define OMAP4430_WKUPDEP_UART3_SDMA_SHIFT                               3
-#define OMAP4430_WKUPDEP_UART3_SDMA_MASK                                (1 << 3)
-
-/* Used by PM_L4PER_UART3_WKDEP */
-#define OMAP4430_WKUPDEP_UART3_TESLA_SHIFT                              2
-#define OMAP4430_WKUPDEP_UART3_TESLA_MASK                               (1 << 2)
-
-/* Used by PM_L4PER_UART4_WKDEP */
-#define OMAP4430_WKUPDEP_UART4_MPU_SHIFT                                0
-#define OMAP4430_WKUPDEP_UART4_MPU_MASK                                 (1 << 0)
-
-/* Used by PM_L4PER_UART4_WKDEP */
-#define OMAP4430_WKUPDEP_UART4_SDMA_SHIFT                               3
-#define OMAP4430_WKUPDEP_UART4_SDMA_MASK                                (1 << 3)
-
-/* Used by PM_L3INIT_UNIPRO1_WKDEP */
-#define OMAP4430_WKUPDEP_UNIPRO1_DUCATI_SHIFT                           1
-#define OMAP4430_WKUPDEP_UNIPRO1_DUCATI_MASK                            (1 << 1)
-
-/* Used by PM_L3INIT_UNIPRO1_WKDEP */
-#define OMAP4430_WKUPDEP_UNIPRO1_MPU_SHIFT                              0
-#define OMAP4430_WKUPDEP_UNIPRO1_MPU_MASK                               (1 << 0)
-
-/* Used by PM_L3INIT_USB_HOST_WKDEP */
-#define OMAP4430_WKUPDEP_USB_HOST_DUCATI_SHIFT                          1
-#define OMAP4430_WKUPDEP_USB_HOST_DUCATI_MASK                           (1 << 1)
-
-/* Used by PM_L3INIT_USB_HOST_FS_WKDEP */
-#define OMAP4430_WKUPDEP_USB_HOST_FS_DUCATI_SHIFT                       1
-#define OMAP4430_WKUPDEP_USB_HOST_FS_DUCATI_MASK                        (1 << 1)
-
-/* Used by PM_L3INIT_USB_HOST_FS_WKDEP */
-#define OMAP4430_WKUPDEP_USB_HOST_FS_MPU_SHIFT                          0
-#define OMAP4430_WKUPDEP_USB_HOST_FS_MPU_MASK                           (1 << 0)
-
-/* Used by PM_L3INIT_USB_HOST_WKDEP */
-#define OMAP4430_WKUPDEP_USB_HOST_MPU_SHIFT                             0
-#define OMAP4430_WKUPDEP_USB_HOST_MPU_MASK                              (1 << 0)
-
-/* Used by PM_L3INIT_USB_OTG_WKDEP */
-#define OMAP4430_WKUPDEP_USB_OTG_DUCATI_SHIFT                           1
-#define OMAP4430_WKUPDEP_USB_OTG_DUCATI_MASK                            (1 << 1)
-
-/* Used by PM_L3INIT_USB_OTG_WKDEP */
-#define OMAP4430_WKUPDEP_USB_OTG_MPU_SHIFT                              0
-#define OMAP4430_WKUPDEP_USB_OTG_MPU_MASK                               (1 << 0)
-
-/* Used by PM_L3INIT_USB_TLL_WKDEP */
-#define OMAP4430_WKUPDEP_USB_TLL_DUCATI_SHIFT                           1
-#define OMAP4430_WKUPDEP_USB_TLL_DUCATI_MASK                            (1 << 1)
-
-/* Used by PM_L3INIT_USB_TLL_WKDEP */
-#define OMAP4430_WKUPDEP_USB_TLL_MPU_SHIFT                              0
-#define OMAP4430_WKUPDEP_USB_TLL_MPU_MASK                               (1 << 0)
-
-/* Used by PM_WKUP_USIM_WKDEP */
-#define OMAP4430_WKUPDEP_USIM_MPU_SHIFT                                 0
-#define OMAP4430_WKUPDEP_USIM_MPU_MASK                                  (1 << 0)
-
-/* Used by PM_WKUP_USIM_WKDEP */
-#define OMAP4430_WKUPDEP_USIM_SDMA_SHIFT                                3
-#define OMAP4430_WKUPDEP_USIM_SDMA_MASK                                 (1 << 3)
-
-/* Used by PM_WKUP_WDT2_WKDEP */
-#define OMAP4430_WKUPDEP_WDT2_DUCATI_SHIFT                              1
-#define OMAP4430_WKUPDEP_WDT2_DUCATI_MASK                               (1 << 1)
-
-/* Used by PM_WKUP_WDT2_WKDEP */
-#define OMAP4430_WKUPDEP_WDT2_MPU_SHIFT                                 0
-#define OMAP4430_WKUPDEP_WDT2_MPU_MASK                                  (1 << 0)
-
-/* Used by PM_ABE_WDT3_WKDEP */
-#define OMAP4430_WKUPDEP_WDT3_MPU_SHIFT                                 0
-#define OMAP4430_WKUPDEP_WDT3_MPU_MASK                                  (1 << 0)
-
-/* Used by PM_L3INIT_HSI_WKDEP */
-#define OMAP4430_WKUPDEP_WGM_HSI_WAKE_MPU_SHIFT                         8
-#define OMAP4430_WKUPDEP_WGM_HSI_WAKE_MPU_MASK                          (1 << 8)
-
-/* Used by PM_L3INIT_XHPI_WKDEP */
-#define OMAP4430_WKUPDEP_XHPI_DUCATI_SHIFT                              1
-#define OMAP4430_WKUPDEP_XHPI_DUCATI_MASK                               (1 << 1)
-
-/* Used by PRM_IO_PMCTRL */
-#define OMAP4430_WUCLK_CTRL_SHIFT                                       8
 #define OMAP4430_WUCLK_CTRL_MASK                                        (1 << 8)
-
-/* Used by PRM_IO_PMCTRL */
 #define OMAP4430_WUCLK_STATUS_SHIFT                                     9
 #define OMAP4430_WUCLK_STATUS_MASK                                      (1 << 9)
-
-/* Used by REVISION_PRM */
-#define OMAP4430_X_MAJOR_SHIFT                                          8
-#define OMAP4430_X_MAJOR_MASK                                           (0x7 << 8)
-
-/* Used by REVISION_PRM */
-#define OMAP4430_Y_MINOR_SHIFT                                          0
-#define OMAP4430_Y_MINOR_MASK                                           (0x3f << 0)
 #endif
diff --git a/arch/arm/mach-omap2/prm-regbits-54xx.h b/arch/arm/mach-omap2/prm-regbits-54xx.h
deleted file mode 100644
index be31b21aa9c6..000000000000
--- a/arch/arm/mach-omap2/prm-regbits-54xx.h
+++ /dev/null
@@ -1,2701 +0,0 @@
-/*
- * OMAP54xx Power Management register bits
- *
- * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com
- *
- * Paul Walmsley (paul@pwsan.com)
- * Rajendra Nayak (rnayak@ti.com)
- * Benoit Cousson (b-cousson@ti.com)
- *
- * This file is automatically generated from the OMAP hardware databases.
- * We respectfully ask that any modifications to this file be coordinated
- * with the public linux-omap@vger.kernel.org mailing list and the
- * authors above to ensure that the autogeneration scripts are kept
- * up-to-date with the file contents.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __ARCH_ARM_MACH_OMAP2_PRM_REGBITS_54XX_H
-#define __ARCH_ARM_MACH_OMAP2_PRM_REGBITS_54XX_H
-
-/* Used by PRM_SLDO_CORE_SETUP, PRM_SLDO_MM_SETUP, PRM_SLDO_MPU_SETUP */
-#define OMAP54XX_ABBOFF_ACT_SHIFT                                               1
-#define OMAP54XX_ABBOFF_ACT_WIDTH                                               0x1
-#define OMAP54XX_ABBOFF_ACT_MASK                                                (1 << 1)
-
-/* Used by PRM_SLDO_CORE_SETUP, PRM_SLDO_MM_SETUP, PRM_SLDO_MPU_SETUP */
-#define OMAP54XX_ABBOFF_SLEEP_SHIFT                                             2
-#define OMAP54XX_ABBOFF_SLEEP_WIDTH                                             0x1
-#define OMAP54XX_ABBOFF_SLEEP_MASK                                              (1 << 2)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_ABB_MM_DONE_EN_SHIFT                                           31
-#define OMAP54XX_ABB_MM_DONE_EN_WIDTH                                           0x1
-#define OMAP54XX_ABB_MM_DONE_EN_MASK                                            (1 << 31)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_ABB_MM_DONE_ST_SHIFT                                           31
-#define OMAP54XX_ABB_MM_DONE_ST_WIDTH                                           0x1
-#define OMAP54XX_ABB_MM_DONE_ST_MASK                                            (1 << 31)
-
-/* Used by PRM_IRQENABLE_MPU_2 */
-#define OMAP54XX_ABB_MPU_DONE_EN_SHIFT                                          7
-#define OMAP54XX_ABB_MPU_DONE_EN_WIDTH                                          0x1
-#define OMAP54XX_ABB_MPU_DONE_EN_MASK                                           (1 << 7)
-
-/* Used by PRM_IRQSTATUS_MPU_2 */
-#define OMAP54XX_ABB_MPU_DONE_ST_SHIFT                                          7
-#define OMAP54XX_ABB_MPU_DONE_ST_WIDTH                                          0x1
-#define OMAP54XX_ABB_MPU_DONE_ST_MASK                                           (1 << 7)
-
-/* Used by PRM_ABBLDO_MM_SETUP, PRM_ABBLDO_MPU_SETUP */
-#define OMAP54XX_ACTIVE_FBB_SEL_SHIFT                                           2
-#define OMAP54XX_ACTIVE_FBB_SEL_WIDTH                                           0x1
-#define OMAP54XX_ACTIVE_FBB_SEL_MASK                                            (1 << 2)
-
-/* Used by PM_ABE_PWRSTCTRL */
-#define OMAP54XX_AESSMEM_ONSTATE_SHIFT                                          16
-#define OMAP54XX_AESSMEM_ONSTATE_WIDTH                                          0x2
-#define OMAP54XX_AESSMEM_ONSTATE_MASK                                           (0x3 << 16)
-
-/* Used by PM_ABE_PWRSTCTRL */
-#define OMAP54XX_AESSMEM_RETSTATE_SHIFT                                         8
-#define OMAP54XX_AESSMEM_RETSTATE_WIDTH                                         0x1
-#define OMAP54XX_AESSMEM_RETSTATE_MASK                                          (1 << 8)
-
-/* Used by PM_ABE_PWRSTST */
-#define OMAP54XX_AESSMEM_STATEST_SHIFT                                          4
-#define OMAP54XX_AESSMEM_STATEST_WIDTH                                          0x2
-#define OMAP54XX_AESSMEM_STATEST_MASK                                           (0x3 << 4)
-
-/* Used by PRM_SLDO_CORE_SETUP, PRM_SLDO_MM_SETUP, PRM_SLDO_MPU_SETUP */
-#define OMAP54XX_AIPOFF_SHIFT                                                   8
-#define OMAP54XX_AIPOFF_WIDTH                                                   0x1
-#define OMAP54XX_AIPOFF_MASK                                                    (1 << 8)
-
-/* Used by PRM_VOLTCTRL */
-#define OMAP54XX_AUTO_CTRL_VDD_CORE_L_SHIFT                                     0
-#define OMAP54XX_AUTO_CTRL_VDD_CORE_L_WIDTH                                     0x2
-#define OMAP54XX_AUTO_CTRL_VDD_CORE_L_MASK                                      (0x3 << 0)
-
-/* Used by PRM_VOLTCTRL */
-#define OMAP54XX_AUTO_CTRL_VDD_MM_L_SHIFT                                       4
-#define OMAP54XX_AUTO_CTRL_VDD_MM_L_WIDTH                                       0x2
-#define OMAP54XX_AUTO_CTRL_VDD_MM_L_MASK                                        (0x3 << 4)
-
-/* Used by PRM_VOLTCTRL */
-#define OMAP54XX_AUTO_CTRL_VDD_MPU_L_SHIFT                                      2
-#define OMAP54XX_AUTO_CTRL_VDD_MPU_L_WIDTH                                      0x2
-#define OMAP54XX_AUTO_CTRL_VDD_MPU_L_MASK                                       (0x3 << 2)
-
-/* Used by PRM_VC_BYPASS_ERRST */
-#define OMAP54XX_BYPS_RA_ERR_SHIFT                                              1
-#define OMAP54XX_BYPS_RA_ERR_WIDTH                                              0x1
-#define OMAP54XX_BYPS_RA_ERR_MASK                                               (1 << 1)
-
-/* Used by PRM_VC_BYPASS_ERRST */
-#define OMAP54XX_BYPS_SA_ERR_SHIFT                                              0
-#define OMAP54XX_BYPS_SA_ERR_WIDTH                                              0x1
-#define OMAP54XX_BYPS_SA_ERR_MASK                                               (1 << 0)
-
-/* Used by PRM_VC_BYPASS_ERRST */
-#define OMAP54XX_BYPS_TIMEOUT_ERR_SHIFT                                         2
-#define OMAP54XX_BYPS_TIMEOUT_ERR_WIDTH                                         0x1
-#define OMAP54XX_BYPS_TIMEOUT_ERR_MASK                                          (1 << 2)
-
-/* Used by PRM_RSTST */
-#define OMAP54XX_C2C_RST_SHIFT                                                  10
-#define OMAP54XX_C2C_RST_WIDTH                                                  0x1
-#define OMAP54XX_C2C_RST_MASK                                                   (1 << 10)
-
-/* Used by PM_CAM_PWRSTCTRL */
-#define OMAP54XX_CAM_MEM_ONSTATE_SHIFT                                          16
-#define OMAP54XX_CAM_MEM_ONSTATE_WIDTH                                          0x2
-#define OMAP54XX_CAM_MEM_ONSTATE_MASK                                           (0x3 << 16)
-
-/* Used by PM_CAM_PWRSTST */
-#define OMAP54XX_CAM_MEM_STATEST_SHIFT                                          4
-#define OMAP54XX_CAM_MEM_STATEST_WIDTH                                          0x2
-#define OMAP54XX_CAM_MEM_STATEST_MASK                                           (0x3 << 4)
-
-/* Used by PRM_CLKREQCTRL */
-#define OMAP54XX_CLKREQ_COND_SHIFT                                              0
-#define OMAP54XX_CLKREQ_COND_WIDTH                                              0x3
-#define OMAP54XX_CLKREQ_COND_MASK                                               (0x7 << 0)
-
-/* Used by PRM_VC_SMPS_CORE_CONFIG */
-#define OMAP54XX_CMDRA_VDD_CORE_L_SHIFT                                         16
-#define OMAP54XX_CMDRA_VDD_CORE_L_WIDTH                                         0x8
-#define OMAP54XX_CMDRA_VDD_CORE_L_MASK                                          (0xff << 16)
-
-/* Used by PRM_VC_SMPS_MM_CONFIG */
-#define OMAP54XX_CMDRA_VDD_MM_L_SHIFT                                           16
-#define OMAP54XX_CMDRA_VDD_MM_L_WIDTH                                           0x8
-#define OMAP54XX_CMDRA_VDD_MM_L_MASK                                            (0xff << 16)
-
-/* Used by PRM_VC_SMPS_MPU_CONFIG */
-#define OMAP54XX_CMDRA_VDD_MPU_L_SHIFT                                          16
-#define OMAP54XX_CMDRA_VDD_MPU_L_WIDTH                                          0x8
-#define OMAP54XX_CMDRA_VDD_MPU_L_MASK                                           (0xff << 16)
-
-/* Used by PRM_VC_SMPS_CORE_CONFIG */
-#define OMAP54XX_CMD_VDD_CORE_L_SHIFT                                           28
-#define OMAP54XX_CMD_VDD_CORE_L_WIDTH                                           0x1
-#define OMAP54XX_CMD_VDD_CORE_L_MASK                                            (1 << 28)
-
-/* Used by PRM_VC_SMPS_MM_CONFIG */
-#define OMAP54XX_CMD_VDD_MM_L_SHIFT                                             28
-#define OMAP54XX_CMD_VDD_MM_L_WIDTH                                             0x1
-#define OMAP54XX_CMD_VDD_MM_L_MASK                                              (1 << 28)
-
-/* Used by PRM_VC_SMPS_MPU_CONFIG */
-#define OMAP54XX_CMD_VDD_MPU_L_SHIFT                                            28
-#define OMAP54XX_CMD_VDD_MPU_L_WIDTH                                            0x1
-#define OMAP54XX_CMD_VDD_MPU_L_MASK                                             (1 << 28)
-
-/* Used by PM_CORE_PWRSTCTRL */
-#define OMAP54XX_CORE_OCMRAM_ONSTATE_SHIFT                                      18
-#define OMAP54XX_CORE_OCMRAM_ONSTATE_WIDTH                                      0x2
-#define OMAP54XX_CORE_OCMRAM_ONSTATE_MASK                                       (0x3 << 18)
-
-/* Used by PM_CORE_PWRSTCTRL */
-#define OMAP54XX_CORE_OCMRAM_RETSTATE_SHIFT                                     9
-#define OMAP54XX_CORE_OCMRAM_RETSTATE_WIDTH                                     0x1
-#define OMAP54XX_CORE_OCMRAM_RETSTATE_MASK                                      (1 << 9)
-
-/* Used by PM_CORE_PWRSTST */
-#define OMAP54XX_CORE_OCMRAM_STATEST_SHIFT                                      6
-#define OMAP54XX_CORE_OCMRAM_STATEST_WIDTH                                      0x2
-#define OMAP54XX_CORE_OCMRAM_STATEST_MASK                                       (0x3 << 6)
-
-/* Used by PM_CORE_PWRSTCTRL */
-#define OMAP54XX_CORE_OTHER_BANK_ONSTATE_SHIFT                                  16
-#define OMAP54XX_CORE_OTHER_BANK_ONSTATE_WIDTH                                  0x2
-#define OMAP54XX_CORE_OTHER_BANK_ONSTATE_MASK                                   (0x3 << 16)
-
-/* Used by PM_CORE_PWRSTCTRL */
-#define OMAP54XX_CORE_OTHER_BANK_RETSTATE_SHIFT                                 8
-#define OMAP54XX_CORE_OTHER_BANK_RETSTATE_WIDTH                                 0x1
-#define OMAP54XX_CORE_OTHER_BANK_RETSTATE_MASK                                  (1 << 8)
-
-/* Used by PM_CORE_PWRSTST */
-#define OMAP54XX_CORE_OTHER_BANK_STATEST_SHIFT                                  4
-#define OMAP54XX_CORE_OTHER_BANK_STATEST_WIDTH                                  0x2
-#define OMAP54XX_CORE_OTHER_BANK_STATEST_MASK                                   (0x3 << 4)
-
-/* Used by REVISION_PRM */
-#define OMAP54XX_CUSTOM_SHIFT                                                   6
-#define OMAP54XX_CUSTOM_WIDTH                                                   0x2
-#define OMAP54XX_CUSTOM_MASK                                                    (0x3 << 6)
-
-/* Used by PRM_VC_VAL_BYPASS */
-#define OMAP54XX_DATA_SHIFT                                                     16
-#define OMAP54XX_DATA_WIDTH                                                     0x8
-#define OMAP54XX_DATA_MASK                                                      (0xff << 16)
-
-/* Used by PRM_DEBUG_CORE_RET_TRANS */
-#define OMAP54XX_PRM_DEBUG_OUT_SHIFT                                            0
-#define OMAP54XX_PRM_DEBUG_OUT_WIDTH                                            0x1c
-#define OMAP54XX_PRM_DEBUG_OUT_MASK                                             (0xfffffff << 0)
-
-/* Renamed from DEBUG_OUT Used by PRM_DEBUG_MM_RET_TRANS */
-#define OMAP54XX_DEBUG_OUT_0_9_SHIFT                                            0
-#define OMAP54XX_DEBUG_OUT_0_9_WIDTH                                            0xa
-#define OMAP54XX_DEBUG_OUT_0_9_MASK                                             (0x3ff << 0)
-
-/* Renamed from DEBUG_OUT Used by PRM_DEBUG_MPU_RET_TRANS */
-#define OMAP54XX_DEBUG_OUT_0_6_SHIFT                                            0
-#define OMAP54XX_DEBUG_OUT_0_6_WIDTH                                            0x7
-#define OMAP54XX_DEBUG_OUT_0_6_MASK                                             (0x7f << 0)
-
-/* Renamed from DEBUG_OUT Used by PRM_DEBUG_OFF_TRANS */
-#define OMAP54XX_DEBUG_OUT_0_31_SHIFT                                           0
-#define OMAP54XX_DEBUG_OUT_0_31_WIDTH                                           0x20
-#define OMAP54XX_DEBUG_OUT_0_31_MASK                                            (0xffffffff << 0)
-
-/* Renamed from DEBUG_OUT Used by PRM_DEBUG_WKUPAON_FD_TRANS */
-#define OMAP54XX_DEBUG_OUT_0_11_SHIFT                                           0
-#define OMAP54XX_DEBUG_OUT_0_11_WIDTH                                           0xc
-#define OMAP54XX_DEBUG_OUT_0_11_MASK                                            (0xfff << 0)
-
-/* Used by PRM_DEVICE_OFF_CTRL */
-#define OMAP54XX_DEVICE_OFF_ENABLE_SHIFT                                        0
-#define OMAP54XX_DEVICE_OFF_ENABLE_WIDTH                                        0x1
-#define OMAP54XX_DEVICE_OFF_ENABLE_MASK                                         (1 << 0)
-
-/* Used by PRM_VC_CFG_I2C_MODE */
-#define OMAP54XX_DFILTEREN_SHIFT                                                6
-#define OMAP54XX_DFILTEREN_WIDTH                                                0x1
-#define OMAP54XX_DFILTEREN_MASK                                                 (1 << 6)
-
-/* Used by PRM_IRQENABLE_DSP, PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_DPLL_ABE_RECAL_EN_SHIFT                                        4
-#define OMAP54XX_DPLL_ABE_RECAL_EN_WIDTH                                        0x1
-#define OMAP54XX_DPLL_ABE_RECAL_EN_MASK                                         (1 << 4)
-
-/* Used by PRM_IRQSTATUS_DSP, PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_DPLL_ABE_RECAL_ST_SHIFT                                        4
-#define OMAP54XX_DPLL_ABE_RECAL_ST_WIDTH                                        0x1
-#define OMAP54XX_DPLL_ABE_RECAL_ST_MASK                                         (1 << 4)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_DPLL_CORE_RECAL_EN_SHIFT                                       0
-#define OMAP54XX_DPLL_CORE_RECAL_EN_WIDTH                                       0x1
-#define OMAP54XX_DPLL_CORE_RECAL_EN_MASK                                        (1 << 0)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_DPLL_CORE_RECAL_ST_SHIFT                                       0
-#define OMAP54XX_DPLL_CORE_RECAL_ST_WIDTH                                       0x1
-#define OMAP54XX_DPLL_CORE_RECAL_ST_MASK                                        (1 << 0)
-
-/* Used by PRM_IRQENABLE_DSP, PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_DPLL_IVA_RECAL_EN_SHIFT                                        2
-#define OMAP54XX_DPLL_IVA_RECAL_EN_WIDTH                                        0x1
-#define OMAP54XX_DPLL_IVA_RECAL_EN_MASK                                         (1 << 2)
-
-/* Used by PRM_IRQSTATUS_DSP, PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_DPLL_IVA_RECAL_ST_SHIFT                                        2
-#define OMAP54XX_DPLL_IVA_RECAL_ST_WIDTH                                        0x1
-#define OMAP54XX_DPLL_IVA_RECAL_ST_MASK                                         (1 << 2)
-
-/* Used by PRM_IRQENABLE_MPU */
-#define OMAP54XX_DPLL_MPU_RECAL_EN_SHIFT                                        1
-#define OMAP54XX_DPLL_MPU_RECAL_EN_WIDTH                                        0x1
-#define OMAP54XX_DPLL_MPU_RECAL_EN_MASK                                         (1 << 1)
-
-/* Used by PRM_IRQSTATUS_MPU */
-#define OMAP54XX_DPLL_MPU_RECAL_ST_SHIFT                                        1
-#define OMAP54XX_DPLL_MPU_RECAL_ST_WIDTH                                        0x1
-#define OMAP54XX_DPLL_MPU_RECAL_ST_MASK                                         (1 << 1)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_DPLL_PER_RECAL_EN_SHIFT                                        3
-#define OMAP54XX_DPLL_PER_RECAL_EN_WIDTH                                        0x1
-#define OMAP54XX_DPLL_PER_RECAL_EN_MASK                                         (1 << 3)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_DPLL_PER_RECAL_ST_SHIFT                                        3
-#define OMAP54XX_DPLL_PER_RECAL_ST_WIDTH                                        0x1
-#define OMAP54XX_DPLL_PER_RECAL_ST_MASK                                         (1 << 3)
-
-/* Used by PM_DSP_PWRSTCTRL */
-#define OMAP54XX_DSP_EDMA_ONSTATE_SHIFT                                         20
-#define OMAP54XX_DSP_EDMA_ONSTATE_WIDTH                                         0x2
-#define OMAP54XX_DSP_EDMA_ONSTATE_MASK                                          (0x3 << 20)
-
-/* Used by PM_DSP_PWRSTCTRL */
-#define OMAP54XX_DSP_EDMA_RETSTATE_SHIFT                                        10
-#define OMAP54XX_DSP_EDMA_RETSTATE_WIDTH                                        0x1
-#define OMAP54XX_DSP_EDMA_RETSTATE_MASK                                         (1 << 10)
-
-/* Used by PM_DSP_PWRSTST */
-#define OMAP54XX_DSP_EDMA_STATEST_SHIFT                                         8
-#define OMAP54XX_DSP_EDMA_STATEST_WIDTH                                         0x2
-#define OMAP54XX_DSP_EDMA_STATEST_MASK                                          (0x3 << 8)
-
-/* Used by PM_DSP_PWRSTCTRL */
-#define OMAP54XX_DSP_L1_ONSTATE_SHIFT                                           16
-#define OMAP54XX_DSP_L1_ONSTATE_WIDTH                                           0x2
-#define OMAP54XX_DSP_L1_ONSTATE_MASK                                            (0x3 << 16)
-
-/* Used by PM_DSP_PWRSTCTRL */
-#define OMAP54XX_DSP_L1_RETSTATE_SHIFT                                          8
-#define OMAP54XX_DSP_L1_RETSTATE_WIDTH                                          0x1
-#define OMAP54XX_DSP_L1_RETSTATE_MASK                                           (1 << 8)
-
-/* Used by PM_DSP_PWRSTST */
-#define OMAP54XX_DSP_L1_STATEST_SHIFT                                           4
-#define OMAP54XX_DSP_L1_STATEST_WIDTH                                           0x2
-#define OMAP54XX_DSP_L1_STATEST_MASK                                            (0x3 << 4)
-
-/* Used by PM_DSP_PWRSTCTRL */
-#define OMAP54XX_DSP_L2_ONSTATE_SHIFT                                           18
-#define OMAP54XX_DSP_L2_ONSTATE_WIDTH                                           0x2
-#define OMAP54XX_DSP_L2_ONSTATE_MASK                                            (0x3 << 18)
-
-/* Used by PM_DSP_PWRSTCTRL */
-#define OMAP54XX_DSP_L2_RETSTATE_SHIFT                                          9
-#define OMAP54XX_DSP_L2_RETSTATE_WIDTH                                          0x1
-#define OMAP54XX_DSP_L2_RETSTATE_MASK                                           (1 << 9)
-
-/* Used by PM_DSP_PWRSTST */
-#define OMAP54XX_DSP_L2_STATEST_SHIFT                                           6
-#define OMAP54XX_DSP_L2_STATEST_WIDTH                                           0x2
-#define OMAP54XX_DSP_L2_STATEST_MASK                                            (0x3 << 6)
-
-/* Used by PM_DSS_PWRSTCTRL */
-#define OMAP54XX_DSS_MEM_ONSTATE_SHIFT                                          16
-#define OMAP54XX_DSS_MEM_ONSTATE_WIDTH                                          0x2
-#define OMAP54XX_DSS_MEM_ONSTATE_MASK                                           (0x3 << 16)
-
-/* Used by PM_DSS_PWRSTCTRL */
-#define OMAP54XX_DSS_MEM_RETSTATE_SHIFT                                         8
-#define OMAP54XX_DSS_MEM_RETSTATE_WIDTH                                         0x1
-#define OMAP54XX_DSS_MEM_RETSTATE_MASK                                          (1 << 8)
-
-/* Used by PM_DSS_PWRSTST */
-#define OMAP54XX_DSS_MEM_STATEST_SHIFT                                          4
-#define OMAP54XX_DSS_MEM_STATEST_WIDTH                                          0x2
-#define OMAP54XX_DSS_MEM_STATEST_MASK                                           (0x3 << 4)
-
-/* Used by PRM_DEVICE_OFF_CTRL */
-#define OMAP54XX_EMIF1_OFFWKUP_DISABLE_SHIFT                                    8
-#define OMAP54XX_EMIF1_OFFWKUP_DISABLE_WIDTH                                    0x1
-#define OMAP54XX_EMIF1_OFFWKUP_DISABLE_MASK                                     (1 << 8)
-
-/* Used by PRM_DEVICE_OFF_CTRL */
-#define OMAP54XX_EMIF2_OFFWKUP_DISABLE_SHIFT                                    9
-#define OMAP54XX_EMIF2_OFFWKUP_DISABLE_WIDTH                                    0x1
-#define OMAP54XX_EMIF2_OFFWKUP_DISABLE_MASK                                     (1 << 9)
-
-/* Used by PM_EMU_PWRSTCTRL */
-#define OMAP54XX_EMU_BANK_ONSTATE_SHIFT                                         16
-#define OMAP54XX_EMU_BANK_ONSTATE_WIDTH                                         0x2
-#define OMAP54XX_EMU_BANK_ONSTATE_MASK                                          (0x3 << 16)
-
-/* Used by PM_EMU_PWRSTST */
-#define OMAP54XX_EMU_BANK_STATEST_SHIFT                                         4
-#define OMAP54XX_EMU_BANK_STATEST_WIDTH                                         0x2
-#define OMAP54XX_EMU_BANK_STATEST_MASK                                          (0x3 << 4)
-
-/*
- * Used by PRM_SLDO_CORE_SETUP, PRM_SLDO_MM_SETUP, PRM_SLDO_MPU_SETUP,
- * PRM_SRAM_WKUP_SETUP
- */
-#define OMAP54XX_ENABLE_RTA_SHIFT                                               0
-#define OMAP54XX_ENABLE_RTA_WIDTH                                               0x1
-#define OMAP54XX_ENABLE_RTA_MASK                                                (1 << 0)
-
-/* Used by PRM_SLDO_CORE_SETUP, PRM_SLDO_MM_SETUP, PRM_SLDO_MPU_SETUP */
-#define OMAP54XX_ENFUNC1_SHIFT                                                  3
-#define OMAP54XX_ENFUNC1_WIDTH                                                  0x1
-#define OMAP54XX_ENFUNC1_MASK                                                   (1 << 3)
-
-/* Used by PRM_SLDO_CORE_SETUP, PRM_SLDO_MM_SETUP, PRM_SLDO_MPU_SETUP */
-#define OMAP54XX_ENFUNC2_SHIFT                                                  4
-#define OMAP54XX_ENFUNC2_WIDTH                                                  0x1
-#define OMAP54XX_ENFUNC2_MASK                                                   (1 << 4)
-
-/* Used by PRM_SLDO_CORE_SETUP, PRM_SLDO_MM_SETUP, PRM_SLDO_MPU_SETUP */
-#define OMAP54XX_ENFUNC3_SHIFT                                                  5
-#define OMAP54XX_ENFUNC3_WIDTH                                                  0x1
-#define OMAP54XX_ENFUNC3_MASK                                                   (1 << 5)
-
-/* Used by PRM_SLDO_CORE_SETUP, PRM_SLDO_MM_SETUP, PRM_SLDO_MPU_SETUP */
-#define OMAP54XX_ENFUNC4_SHIFT                                                  6
-#define OMAP54XX_ENFUNC4_WIDTH                                                  0x1
-#define OMAP54XX_ENFUNC4_MASK                                                   (1 << 6)
-
-/* Used by PRM_SLDO_CORE_SETUP, PRM_SLDO_MM_SETUP, PRM_SLDO_MPU_SETUP */
-#define OMAP54XX_ENFUNC5_SHIFT                                                  7
-#define OMAP54XX_ENFUNC5_WIDTH                                                  0x1
-#define OMAP54XX_ENFUNC5_MASK                                                   (1 << 7)
-
-/* Used by PRM_VP_CORE_CONFIG, PRM_VP_MM_CONFIG, PRM_VP_MPU_CONFIG */
-#define OMAP54XX_ERRORGAIN_SHIFT                                                16
-#define OMAP54XX_ERRORGAIN_WIDTH                                                0x8
-#define OMAP54XX_ERRORGAIN_MASK                                                 (0xff << 16)
-
-/* Used by PRM_VP_CORE_CONFIG, PRM_VP_MM_CONFIG, PRM_VP_MPU_CONFIG */
-#define OMAP54XX_ERROROFFSET_SHIFT                                              24
-#define OMAP54XX_ERROROFFSET_WIDTH                                              0x8
-#define OMAP54XX_ERROROFFSET_MASK                                               (0xff << 24)
-
-/* Used by PRM_RSTST */
-#define OMAP54XX_EXTERNAL_WARM_RST_SHIFT                                        5
-#define OMAP54XX_EXTERNAL_WARM_RST_WIDTH                                        0x1
-#define OMAP54XX_EXTERNAL_WARM_RST_MASK                                         (1 << 5)
-
-/* Used by PRM_VP_CORE_CONFIG, PRM_VP_MM_CONFIG, PRM_VP_MPU_CONFIG */
-#define OMAP54XX_FORCEUPDATE_SHIFT                                              1
-#define OMAP54XX_FORCEUPDATE_WIDTH                                              0x1
-#define OMAP54XX_FORCEUPDATE_MASK                                               (1 << 1)
-
-/* Used by PRM_VP_CORE_VOLTAGE, PRM_VP_MM_VOLTAGE, PRM_VP_MPU_VOLTAGE */
-#define OMAP54XX_FORCEUPDATEWAIT_SHIFT                                          8
-#define OMAP54XX_FORCEUPDATEWAIT_WIDTH                                          0x18
-#define OMAP54XX_FORCEUPDATEWAIT_MASK                                           (0xffffff << 8)
-
-/* Used by PRM_IRQENABLE_DSP, PRM_IRQENABLE_IPU */
-#define OMAP54XX_FORCEWKUP_EN_SHIFT                                             10
-#define OMAP54XX_FORCEWKUP_EN_WIDTH                                             0x1
-#define OMAP54XX_FORCEWKUP_EN_MASK                                              (1 << 10)
-
-/* Used by PRM_IRQSTATUS_DSP, PRM_IRQSTATUS_IPU */
-#define OMAP54XX_FORCEWKUP_ST_SHIFT                                             10
-#define OMAP54XX_FORCEWKUP_ST_WIDTH                                             0x1
-#define OMAP54XX_FORCEWKUP_ST_MASK                                              (1 << 10)
-
-/* Used by REVISION_PRM */
-#define OMAP54XX_FUNC_SHIFT                                                     16
-#define OMAP54XX_FUNC_WIDTH                                                     0xc
-#define OMAP54XX_FUNC_MASK                                                      (0xfff << 16)
-
-/* Used by PRM_RSTST */
-#define OMAP54XX_GLOBAL_COLD_RST_SHIFT                                          0
-#define OMAP54XX_GLOBAL_COLD_RST_WIDTH                                          0x1
-#define OMAP54XX_GLOBAL_COLD_RST_MASK                                           (1 << 0)
-
-/* Used by PRM_RSTST */
-#define OMAP54XX_GLOBAL_WARM_SW_RST_SHIFT                                       1
-#define OMAP54XX_GLOBAL_WARM_SW_RST_WIDTH                                       0x1
-#define OMAP54XX_GLOBAL_WARM_SW_RST_MASK                                        (1 << 1)
-
-/* Used by PRM_IO_PMCTRL */
-#define OMAP54XX_GLOBAL_WUEN_SHIFT                                              16
-#define OMAP54XX_GLOBAL_WUEN_WIDTH                                              0x1
-#define OMAP54XX_GLOBAL_WUEN_MASK                                               (1 << 16)
-
-/* Used by PM_GPU_PWRSTCTRL */
-#define OMAP54XX_GPU_MEM_ONSTATE_SHIFT                                          16
-#define OMAP54XX_GPU_MEM_ONSTATE_WIDTH                                          0x2
-#define OMAP54XX_GPU_MEM_ONSTATE_MASK                                           (0x3 << 16)
-
-/* Used by PM_GPU_PWRSTST */
-#define OMAP54XX_GPU_MEM_STATEST_SHIFT                                          4
-#define OMAP54XX_GPU_MEM_STATEST_WIDTH                                          0x2
-#define OMAP54XX_GPU_MEM_STATEST_MASK                                           (0x3 << 4)
-
-/* Used by PRM_VC_CFG_I2C_MODE */
-#define OMAP54XX_HSMCODE_SHIFT                                                  0
-#define OMAP54XX_HSMCODE_WIDTH                                                  0x3
-#define OMAP54XX_HSMCODE_MASK                                                   (0x7 << 0)
-
-/* Used by PRM_VC_CFG_I2C_MODE */
-#define OMAP54XX_HSMODEEN_SHIFT                                                 3
-#define OMAP54XX_HSMODEEN_WIDTH                                                 0x1
-#define OMAP54XX_HSMODEEN_MASK                                                  (1 << 3)
-
-/* Used by PRM_VC_CFG_I2C_CLK */
-#define OMAP54XX_HSSCLH_SHIFT                                                   16
-#define OMAP54XX_HSSCLH_WIDTH                                                   0x8
-#define OMAP54XX_HSSCLH_MASK                                                    (0xff << 16)
-
-/* Used by PRM_VC_CFG_I2C_CLK */
-#define OMAP54XX_HSSCLL_SHIFT                                                   24
-#define OMAP54XX_HSSCLL_WIDTH                                                   0x8
-#define OMAP54XX_HSSCLL_MASK                                                    (0xff << 24)
-
-/* Used by PM_IVA_PWRSTCTRL */
-#define OMAP54XX_HWA_MEM_ONSTATE_SHIFT                                          16
-#define OMAP54XX_HWA_MEM_ONSTATE_WIDTH                                          0x2
-#define OMAP54XX_HWA_MEM_ONSTATE_MASK                                           (0x3 << 16)
-
-/* Used by PM_IVA_PWRSTCTRL */
-#define OMAP54XX_HWA_MEM_RETSTATE_SHIFT                                         8
-#define OMAP54XX_HWA_MEM_RETSTATE_WIDTH                                         0x1
-#define OMAP54XX_HWA_MEM_RETSTATE_MASK                                          (1 << 8)
-
-/* Used by PM_IVA_PWRSTST */
-#define OMAP54XX_HWA_MEM_STATEST_SHIFT                                          4
-#define OMAP54XX_HWA_MEM_STATEST_WIDTH                                          0x2
-#define OMAP54XX_HWA_MEM_STATEST_MASK                                           (0x3 << 4)
-
-/* Used by PRM_RSTST */
-#define OMAP54XX_ICEPICK_RST_SHIFT                                              9
-#define OMAP54XX_ICEPICK_RST_WIDTH                                              0x1
-#define OMAP54XX_ICEPICK_RST_MASK                                               (1 << 9)
-
-/* Used by PRM_VP_CORE_CONFIG, PRM_VP_MM_CONFIG, PRM_VP_MPU_CONFIG */
-#define OMAP54XX_INITVDD_SHIFT                                                  2
-#define OMAP54XX_INITVDD_WIDTH                                                  0x1
-#define OMAP54XX_INITVDD_MASK                                                   (1 << 2)
-
-/* Used by PRM_VP_CORE_CONFIG, PRM_VP_MM_CONFIG, PRM_VP_MPU_CONFIG */
-#define OMAP54XX_INITVOLTAGE_SHIFT                                              8
-#define OMAP54XX_INITVOLTAGE_WIDTH                                              0x8
-#define OMAP54XX_INITVOLTAGE_MASK                                               (0xff << 8)
-
-/*
- * Used by PM_ABE_PWRSTST, PM_CAM_PWRSTST, PM_CORE_PWRSTST,
- * PM_CUSTEFUSE_PWRSTST, PM_DSP_PWRSTST, PM_DSS_PWRSTST, PM_EMU_PWRSTST,
- * PM_GPU_PWRSTST, PM_IVA_PWRSTST, PM_L3INIT_PWRSTST, PM_MPU_PWRSTST,
- * PRM_VOLTST_MM, PRM_VOLTST_MPU
- */
-#define OMAP54XX_INTRANSITION_SHIFT                                             20
-#define OMAP54XX_INTRANSITION_WIDTH                                             0x1
-#define OMAP54XX_INTRANSITION_MASK                                              (1 << 20)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_IO_EN_SHIFT                                                    9
-#define OMAP54XX_IO_EN_WIDTH                                                    0x1
-#define OMAP54XX_IO_EN_MASK                                                     (1 << 9)
-
-/* Used by PRM_IO_PMCTRL */
-#define OMAP54XX_IO_ON_STATUS_SHIFT                                             5
-#define OMAP54XX_IO_ON_STATUS_WIDTH                                             0x1
-#define OMAP54XX_IO_ON_STATUS_MASK                                              (1 << 5)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_IO_ST_SHIFT                                                    9
-#define OMAP54XX_IO_ST_WIDTH                                                    0x1
-#define OMAP54XX_IO_ST_MASK                                                     (1 << 9)
-
-/* Used by PM_CORE_PWRSTCTRL */
-#define OMAP54XX_IPU_L2RAM_ONSTATE_SHIFT                                        20
-#define OMAP54XX_IPU_L2RAM_ONSTATE_WIDTH                                        0x2
-#define OMAP54XX_IPU_L2RAM_ONSTATE_MASK                                         (0x3 << 20)
-
-/* Used by PM_CORE_PWRSTCTRL */
-#define OMAP54XX_IPU_L2RAM_RETSTATE_SHIFT                                       10
-#define OMAP54XX_IPU_L2RAM_RETSTATE_WIDTH                                       0x1
-#define OMAP54XX_IPU_L2RAM_RETSTATE_MASK                                        (1 << 10)
-
-/* Used by PM_CORE_PWRSTST */
-#define OMAP54XX_IPU_L2RAM_STATEST_SHIFT                                        8
-#define OMAP54XX_IPU_L2RAM_STATEST_WIDTH                                        0x2
-#define OMAP54XX_IPU_L2RAM_STATEST_MASK                                         (0x3 << 8)
-
-/* Used by PM_CORE_PWRSTCTRL */
-#define OMAP54XX_IPU_UNICACHE_ONSTATE_SHIFT                                     22
-#define OMAP54XX_IPU_UNICACHE_ONSTATE_WIDTH                                     0x2
-#define OMAP54XX_IPU_UNICACHE_ONSTATE_MASK                                      (0x3 << 22)
-
-/* Used by PM_CORE_PWRSTCTRL */
-#define OMAP54XX_IPU_UNICACHE_RETSTATE_SHIFT                                    11
-#define OMAP54XX_IPU_UNICACHE_RETSTATE_WIDTH                                    0x1
-#define OMAP54XX_IPU_UNICACHE_RETSTATE_MASK                                     (1 << 11)
-
-/* Used by PM_CORE_PWRSTST */
-#define OMAP54XX_IPU_UNICACHE_STATEST_SHIFT                                     10
-#define OMAP54XX_IPU_UNICACHE_STATEST_WIDTH                                     0x2
-#define OMAP54XX_IPU_UNICACHE_STATEST_MASK                                      (0x3 << 10)
-
-/* Used by PRM_IO_PMCTRL */
-#define OMAP54XX_ISOCLK_OVERRIDE_SHIFT                                          0
-#define OMAP54XX_ISOCLK_OVERRIDE_WIDTH                                          0x1
-#define OMAP54XX_ISOCLK_OVERRIDE_MASK                                           (1 << 0)
-
-/* Used by PRM_IO_PMCTRL */
-#define OMAP54XX_ISOCLK_STATUS_SHIFT                                            1
-#define OMAP54XX_ISOCLK_STATUS_WIDTH                                            0x1
-#define OMAP54XX_ISOCLK_STATUS_MASK                                             (1 << 1)
-
-/* Used by PRM_IO_PMCTRL */
-#define OMAP54XX_ISOOVR_EXTEND_SHIFT                                            4
-#define OMAP54XX_ISOOVR_EXTEND_WIDTH                                            0x1
-#define OMAP54XX_ISOOVR_EXTEND_MASK                                             (1 << 4)
-
-/* Used by PRM_IO_COUNT */
-#define OMAP54XX_ISO_2_ON_TIME_SHIFT                                            0
-#define OMAP54XX_ISO_2_ON_TIME_WIDTH                                            0x8
-#define OMAP54XX_ISO_2_ON_TIME_MASK                                             (0xff << 0)
-
-/* Used by PM_L3INIT_PWRSTCTRL */
-#define OMAP54XX_L3INIT_BANK1_ONSTATE_SHIFT                                     16
-#define OMAP54XX_L3INIT_BANK1_ONSTATE_WIDTH                                     0x2
-#define OMAP54XX_L3INIT_BANK1_ONSTATE_MASK                                      (0x3 << 16)
-
-/* Used by PM_L3INIT_PWRSTCTRL */
-#define OMAP54XX_L3INIT_BANK1_RETSTATE_SHIFT                                    8
-#define OMAP54XX_L3INIT_BANK1_RETSTATE_WIDTH                                    0x1
-#define OMAP54XX_L3INIT_BANK1_RETSTATE_MASK                                     (1 << 8)
-
-/* Used by PM_L3INIT_PWRSTST */
-#define OMAP54XX_L3INIT_BANK1_STATEST_SHIFT                                     4
-#define OMAP54XX_L3INIT_BANK1_STATEST_WIDTH                                     0x2
-#define OMAP54XX_L3INIT_BANK1_STATEST_MASK                                      (0x3 << 4)
-
-/* Used by PM_L3INIT_PWRSTCTRL */
-#define OMAP54XX_L3INIT_BANK2_ONSTATE_SHIFT                                     18
-#define OMAP54XX_L3INIT_BANK2_ONSTATE_WIDTH                                     0x2
-#define OMAP54XX_L3INIT_BANK2_ONSTATE_MASK                                      (0x3 << 18)
-
-/* Used by PM_L3INIT_PWRSTCTRL */
-#define OMAP54XX_L3INIT_BANK2_RETSTATE_SHIFT                                    9
-#define OMAP54XX_L3INIT_BANK2_RETSTATE_WIDTH                                    0x1
-#define OMAP54XX_L3INIT_BANK2_RETSTATE_MASK                                     (1 << 9)
-
-/* Used by PM_L3INIT_PWRSTST */
-#define OMAP54XX_L3INIT_BANK2_STATEST_SHIFT                                     6
-#define OMAP54XX_L3INIT_BANK2_STATEST_WIDTH                                     0x2
-#define OMAP54XX_L3INIT_BANK2_STATEST_MASK                                      (0x3 << 6)
-
-/*
- * Used by PM_ABE_PWRSTST, PM_CAM_PWRSTST, PM_CORE_PWRSTST,
- * PM_CUSTEFUSE_PWRSTST, PM_DSP_PWRSTST, PM_DSS_PWRSTST, PM_EMU_PWRSTST,
- * PM_GPU_PWRSTST, PM_IVA_PWRSTST, PM_L3INIT_PWRSTST, PM_MPU_PWRSTST
- */
-#define OMAP54XX_LASTPOWERSTATEENTERED_SHIFT                                    24
-#define OMAP54XX_LASTPOWERSTATEENTERED_WIDTH                                    0x2
-#define OMAP54XX_LASTPOWERSTATEENTERED_MASK                                     (0x3 << 24)
-
-/* Used by PRM_RSTST */
-#define OMAP54XX_LLI_RST_SHIFT                                                  14
-#define OMAP54XX_LLI_RST_WIDTH                                                  0x1
-#define OMAP54XX_LLI_RST_MASK                                                   (1 << 14)
-
-/*
- * Used by PM_ABE_PWRSTCTRL, PM_CORE_PWRSTCTRL, PM_DSP_PWRSTCTRL,
- * PM_DSS_PWRSTCTRL, PM_IVA_PWRSTCTRL, PM_L3INIT_PWRSTCTRL, PM_MPU_PWRSTCTRL
- */
-#define OMAP54XX_LOGICRETSTATE_SHIFT                                            2
-#define OMAP54XX_LOGICRETSTATE_WIDTH                                            0x1
-#define OMAP54XX_LOGICRETSTATE_MASK                                             (1 << 2)
-
-/*
- * Used by PM_ABE_PWRSTST, PM_CAM_PWRSTST, PM_CORE_PWRSTST,
- * PM_CUSTEFUSE_PWRSTST, PM_DSP_PWRSTST, PM_DSS_PWRSTST, PM_EMU_PWRSTST,
- * PM_GPU_PWRSTST, PM_IVA_PWRSTST, PM_L3INIT_PWRSTST, PM_MPU_PWRSTST
- */
-#define OMAP54XX_LOGICSTATEST_SHIFT                                             2
-#define OMAP54XX_LOGICSTATEST_WIDTH                                             0x1
-#define OMAP54XX_LOGICSTATEST_MASK                                              (1 << 2)
-
-/*
- * Used by RM_ABE_AESS_CONTEXT, RM_ABE_DMIC_CONTEXT, RM_ABE_MCASP_CONTEXT,
- * RM_ABE_MCBSP1_CONTEXT, RM_ABE_MCBSP2_CONTEXT, RM_ABE_MCBSP3_CONTEXT,
- * RM_ABE_MCPDM_CONTEXT, RM_ABE_SLIMBUS1_CONTEXT, RM_ABE_TIMER5_CONTEXT,
- * RM_ABE_TIMER6_CONTEXT, RM_ABE_TIMER7_CONTEXT, RM_ABE_TIMER8_CONTEXT,
- * RM_ABE_WD_TIMER3_CONTEXT, RM_C2C_C2C_CONTEXT, RM_C2C_C2C_OCP_FW_CONTEXT,
- * RM_CAM_CAL_CONTEXT, RM_CAM_FDIF_CONTEXT, RM_CAM_ISS_CONTEXT,
- * RM_COREAON_SMARTREFLEX_CORE_CONTEXT, RM_COREAON_SMARTREFLEX_MM_CONTEXT,
- * RM_COREAON_SMARTREFLEX_MPU_CONTEXT, RM_CUSTEFUSE_EFUSE_CTRL_CUST_CONTEXT,
- * RM_DSP_DSP_CONTEXT, RM_DSS_BB2D_CONTEXT, RM_DSS_DSS_CONTEXT,
- * RM_EMIF_DMM_CONTEXT, RM_EMIF_EMIF1_CONTEXT, RM_EMIF_EMIF2_CONTEXT,
- * RM_EMIF_EMIF_DLL_CONTEXT, RM_EMIF_EMIF_OCP_FW_CONTEXT,
- * RM_EMU_DEBUGSS_CONTEXT, RM_GPU_GPU_CONTEXT, RM_IPU_IPU_CONTEXT,
- * RM_IVA_IVA_CONTEXT, RM_IVA_SL2_CONTEXT, RM_L3INIT_IEEE1500_2_OCP_CONTEXT,
- * RM_L3INIT_OCP2SCP1_CONTEXT, RM_L3INIT_OCP2SCP3_CONTEXT,
- * RM_L3INIT_SATA_CONTEXT, RM_L3INIT_UNIPRO2_CONTEXT,
- * RM_L3INSTR_L3_INSTR_CONTEXT, RM_L3INSTR_L3_MAIN_3_CONTEXT,
- * RM_L3INSTR_OCP_WP_NOC_CONTEXT, RM_L3MAIN1_L3_MAIN_1_CONTEXT,
- * RM_L3MAIN2_L3_MAIN_2_CONTEXT, RM_L3MAIN2_OCMC_RAM_CONTEXT,
- * RM_L4CFG_L4_CFG_CONTEXT, RM_L4CFG_OCP2SCP2_CONTEXT,
- * RM_L4CFG_SAR_ROM_CONTEXT, RM_L4PER_ELM_CONTEXT, RM_L4PER_HDQ1W_CONTEXT,
- * RM_L4PER_I2C2_CONTEXT, RM_L4PER_I2C3_CONTEXT, RM_L4PER_I2C4_CONTEXT,
- * RM_L4PER_I2C5_CONTEXT, RM_L4PER_L4_PER_CONTEXT, RM_L4PER_MCSPI1_CONTEXT,
- * RM_L4PER_MCSPI2_CONTEXT, RM_L4PER_MCSPI3_CONTEXT, RM_L4PER_MCSPI4_CONTEXT,
- * RM_L4PER_MMC3_CONTEXT, RM_L4PER_MMC4_CONTEXT, RM_L4PER_MMC5_CONTEXT,
- * RM_L4PER_TIMER10_CONTEXT, RM_L4PER_TIMER11_CONTEXT, RM_L4PER_TIMER2_CONTEXT,
- * RM_L4PER_TIMER3_CONTEXT, RM_L4PER_TIMER4_CONTEXT, RM_L4PER_TIMER9_CONTEXT,
- * RM_L4SEC_FPKA_CONTEXT, RM_MIPIEXT_LLI_CONTEXT,
- * RM_MIPIEXT_LLI_OCP_FW_CONTEXT, RM_MIPIEXT_MPHY_CONTEXT, RM_MPU_MPU_CONTEXT,
- * RM_WKUPAON_COUNTER_32K_CONTEXT, RM_WKUPAON_GPIO1_CONTEXT,
- * RM_WKUPAON_KBD_CONTEXT, RM_WKUPAON_L4_WKUP_CONTEXT,
- * RM_WKUPAON_SAR_RAM_CONTEXT, RM_WKUPAON_TIMER12_CONTEXT,
- * RM_WKUPAON_TIMER1_CONTEXT, RM_WKUPAON_WD_TIMER1_CONTEXT,
- * RM_WKUPAON_WD_TIMER2_CONTEXT
- */
-#define OMAP54XX_LOSTCONTEXT_DFF_SHIFT                                          0
-#define OMAP54XX_LOSTCONTEXT_DFF_WIDTH                                          0x1
-#define OMAP54XX_LOSTCONTEXT_DFF_MASK                                           (1 << 0)
-
-/*
- * Used by RM_C2C_C2C_CONTEXT, RM_C2C_C2C_OCP_FW_CONTEXT,
- * RM_C2C_MODEM_ICR_CONTEXT, RM_DMA_DMA_SYSTEM_CONTEXT, RM_DSP_DSP_CONTEXT,
- * RM_DSS_DSS_CONTEXT, RM_EMIF_DMM_CONTEXT, RM_EMIF_EMIF1_CONTEXT,
- * RM_EMIF_EMIF2_CONTEXT, RM_EMIF_EMIF_OCP_FW_CONTEXT, RM_IPU_IPU_CONTEXT,
- * RM_L3INIT_HSI_CONTEXT, RM_L3INIT_MMC1_CONTEXT, RM_L3INIT_MMC2_CONTEXT,
- * RM_L3INIT_USB_HOST_HS_CONTEXT, RM_L3INIT_USB_OTG_SS_CONTEXT,
- * RM_L3INIT_USB_TLL_HS_CONTEXT, RM_L3INSTR_L3_MAIN_3_CONTEXT,
- * RM_L3INSTR_OCP_WP_NOC_CONTEXT, RM_L3MAIN1_L3_MAIN_1_CONTEXT,
- * RM_L3MAIN2_GPMC_CONTEXT, RM_L3MAIN2_L3_MAIN_2_CONTEXT,
- * RM_L4CFG_L4_CFG_CONTEXT, RM_L4CFG_MAILBOX_CONTEXT,
- * RM_L4CFG_SPINLOCK_CONTEXT, RM_L4PER_GPIO2_CONTEXT, RM_L4PER_GPIO3_CONTEXT,
- * RM_L4PER_GPIO4_CONTEXT, RM_L4PER_GPIO5_CONTEXT, RM_L4PER_GPIO6_CONTEXT,
- * RM_L4PER_GPIO7_CONTEXT, RM_L4PER_GPIO8_CONTEXT, RM_L4PER_I2C1_CONTEXT,
- * RM_L4PER_L4_PER_CONTEXT, RM_L4PER_UART1_CONTEXT, RM_L4PER_UART2_CONTEXT,
- * RM_L4PER_UART3_CONTEXT, RM_L4PER_UART4_CONTEXT, RM_L4PER_UART5_CONTEXT,
- * RM_L4PER_UART6_CONTEXT, RM_L4SEC_AES1_CONTEXT, RM_L4SEC_AES2_CONTEXT,
- * RM_L4SEC_DES3DES_CONTEXT, RM_L4SEC_DMA_CRYPTO_CONTEXT, RM_L4SEC_RNG_CONTEXT,
- * RM_L4SEC_SHA2MD5_CONTEXT, RM_MIPIEXT_LLI_CONTEXT,
- * RM_MIPIEXT_LLI_OCP_FW_CONTEXT, RM_MIPIEXT_MPHY_CONTEXT, RM_MPU_MPU_CONTEXT
- */
-#define OMAP54XX_LOSTCONTEXT_RFF_SHIFT                                          1
-#define OMAP54XX_LOSTCONTEXT_RFF_WIDTH                                          0x1
-#define OMAP54XX_LOSTCONTEXT_RFF_MASK                                           (1 << 1)
-
-/* Used by RM_ABE_AESS_CONTEXT */
-#define OMAP54XX_LOSTMEM_AESSMEM_SHIFT                                          8
-#define OMAP54XX_LOSTMEM_AESSMEM_WIDTH                                          0x1
-#define OMAP54XX_LOSTMEM_AESSMEM_MASK                                           (1 << 8)
-
-/* Used by RM_CAM_CAL_CONTEXT */
-#define OMAP54XX_LOSTMEM_CAL_MEM_SHIFT                                          8
-#define OMAP54XX_LOSTMEM_CAL_MEM_WIDTH                                          0x1
-#define OMAP54XX_LOSTMEM_CAL_MEM_MASK                                           (1 << 8)
-
-/* Used by RM_CAM_FDIF_CONTEXT, RM_CAM_ISS_CONTEXT */
-#define OMAP54XX_LOSTMEM_CAM_MEM_SHIFT                                          8
-#define OMAP54XX_LOSTMEM_CAM_MEM_WIDTH                                          0x1
-#define OMAP54XX_LOSTMEM_CAM_MEM_MASK                                           (1 << 8)
-
-/* Used by RM_EMIF_DMM_CONTEXT */
-#define OMAP54XX_LOSTMEM_CORE_NRET_BANK_SHIFT                                   9
-#define OMAP54XX_LOSTMEM_CORE_NRET_BANK_WIDTH                                   0x1
-#define OMAP54XX_LOSTMEM_CORE_NRET_BANK_MASK                                    (1 << 9)
-
-/* Renamed from LOSTMEM_CORE_NRET_BANK Used by RM_L3INSTR_OCP_WP_NOC_CONTEXT */
-#define OMAP54XX_LOSTMEM_CORE_NRET_BANK_8_8_SHIFT                               8
-#define OMAP54XX_LOSTMEM_CORE_NRET_BANK_8_8_WIDTH                               0x1
-#define OMAP54XX_LOSTMEM_CORE_NRET_BANK_8_8_MASK                                (1 << 8)
-
-/* Used by RM_L3MAIN2_OCMC_RAM_CONTEXT */
-#define OMAP54XX_LOSTMEM_CORE_OCMRAM_SHIFT                                      8
-#define OMAP54XX_LOSTMEM_CORE_OCMRAM_WIDTH                                      0x1
-#define OMAP54XX_LOSTMEM_CORE_OCMRAM_MASK                                       (1 << 8)
-
-/* Used by RM_DMA_DMA_SYSTEM_CONTEXT, RM_EMIF_DMM_CONTEXT */
-#define OMAP54XX_LOSTMEM_CORE_OTHER_BANK_SHIFT                                  8
-#define OMAP54XX_LOSTMEM_CORE_OTHER_BANK_WIDTH                                  0x1
-#define OMAP54XX_LOSTMEM_CORE_OTHER_BANK_MASK                                   (1 << 8)
-
-/* Used by RM_DSP_DSP_CONTEXT */
-#define OMAP54XX_LOSTMEM_DSP_EDMA_SHIFT                                         10
-#define OMAP54XX_LOSTMEM_DSP_EDMA_WIDTH                                         0x1
-#define OMAP54XX_LOSTMEM_DSP_EDMA_MASK                                          (1 << 10)
-
-/* Used by RM_DSP_DSP_CONTEXT */
-#define OMAP54XX_LOSTMEM_DSP_L1_SHIFT                                           8
-#define OMAP54XX_LOSTMEM_DSP_L1_WIDTH                                           0x1
-#define OMAP54XX_LOSTMEM_DSP_L1_MASK                                            (1 << 8)
-
-/* Used by RM_DSP_DSP_CONTEXT */
-#define OMAP54XX_LOSTMEM_DSP_L2_SHIFT                                           9
-#define OMAP54XX_LOSTMEM_DSP_L2_WIDTH                                           0x1
-#define OMAP54XX_LOSTMEM_DSP_L2_MASK                                            (1 << 9)
-
-/* Used by RM_DSS_BB2D_CONTEXT, RM_DSS_DSS_CONTEXT */
-#define OMAP54XX_LOSTMEM_DSS_MEM_SHIFT                                          8
-#define OMAP54XX_LOSTMEM_DSS_MEM_WIDTH                                          0x1
-#define OMAP54XX_LOSTMEM_DSS_MEM_MASK                                           (1 << 8)
-
-/* Used by RM_EMU_DEBUGSS_CONTEXT */
-#define OMAP54XX_LOSTMEM_EMU_BANK_SHIFT                                         8
-#define OMAP54XX_LOSTMEM_EMU_BANK_WIDTH                                         0x1
-#define OMAP54XX_LOSTMEM_EMU_BANK_MASK                                          (1 << 8)
-
-/* Used by RM_GPU_GPU_CONTEXT */
-#define OMAP54XX_LOSTMEM_GPU_MEM_SHIFT                                          8
-#define OMAP54XX_LOSTMEM_GPU_MEM_WIDTH                                          0x1
-#define OMAP54XX_LOSTMEM_GPU_MEM_MASK                                           (1 << 8)
-
-/* Used by RM_IVA_IVA_CONTEXT */
-#define OMAP54XX_LOSTMEM_HWA_MEM_SHIFT                                          10
-#define OMAP54XX_LOSTMEM_HWA_MEM_WIDTH                                          0x1
-#define OMAP54XX_LOSTMEM_HWA_MEM_MASK                                           (1 << 10)
-
-/* Used by RM_IPU_IPU_CONTEXT */
-#define OMAP54XX_LOSTMEM_IPU_L2RAM_SHIFT                                        9
-#define OMAP54XX_LOSTMEM_IPU_L2RAM_WIDTH                                        0x1
-#define OMAP54XX_LOSTMEM_IPU_L2RAM_MASK                                         (1 << 9)
-
-/* Used by RM_IPU_IPU_CONTEXT */
-#define OMAP54XX_LOSTMEM_IPU_UNICACHE_SHIFT                                     8
-#define OMAP54XX_LOSTMEM_IPU_UNICACHE_WIDTH                                     0x1
-#define OMAP54XX_LOSTMEM_IPU_UNICACHE_MASK                                      (1 << 8)
-
-/*
- * Used by RM_L3INIT_HSI_CONTEXT, RM_L3INIT_MMC1_CONTEXT,
- * RM_L3INIT_MMC2_CONTEXT, RM_L3INIT_SATA_CONTEXT, RM_L3INIT_UNIPRO2_CONTEXT,
- * RM_L3INIT_USB_OTG_SS_CONTEXT
- */
-#define OMAP54XX_LOSTMEM_L3INIT_BANK1_SHIFT                                     8
-#define OMAP54XX_LOSTMEM_L3INIT_BANK1_WIDTH                                     0x1
-#define OMAP54XX_LOSTMEM_L3INIT_BANK1_MASK                                      (1 << 8)
-
-/* Used by RM_MPU_MPU_CONTEXT */
-#define OMAP54XX_LOSTMEM_MPU_L2_SHIFT                                           9
-#define OMAP54XX_LOSTMEM_MPU_L2_WIDTH                                           0x1
-#define OMAP54XX_LOSTMEM_MPU_L2_MASK                                            (1 << 9)
-
-/* Used by RM_MPU_MPU_CONTEXT */
-#define OMAP54XX_LOSTMEM_MPU_RAM_SHIFT                                          10
-#define OMAP54XX_LOSTMEM_MPU_RAM_WIDTH                                          0x1
-#define OMAP54XX_LOSTMEM_MPU_RAM_MASK                                           (1 << 10)
-
-/*
- * Used by RM_L4PER_MMC3_CONTEXT, RM_L4PER_MMC4_CONTEXT, RM_L4PER_MMC5_CONTEXT,
- * RM_L4SEC_FPKA_CONTEXT
- */
-#define OMAP54XX_LOSTMEM_NONRETAINED_BANK_SHIFT                                 8
-#define OMAP54XX_LOSTMEM_NONRETAINED_BANK_WIDTH                                 0x1
-#define OMAP54XX_LOSTMEM_NONRETAINED_BANK_MASK                                  (1 << 8)
-
-/*
- * Used by RM_ABE_DMIC_CONTEXT, RM_ABE_MCBSP1_CONTEXT, RM_ABE_MCBSP2_CONTEXT,
- * RM_ABE_MCBSP3_CONTEXT, RM_ABE_MCPDM_CONTEXT, RM_ABE_SLIMBUS1_CONTEXT
- */
-#define OMAP54XX_LOSTMEM_PERIHPMEM_SHIFT                                        8
-#define OMAP54XX_LOSTMEM_PERIHPMEM_WIDTH                                        0x1
-#define OMAP54XX_LOSTMEM_PERIHPMEM_MASK                                         (1 << 8)
-
-/*
- * Used by RM_L4PER_UART1_CONTEXT, RM_L4PER_UART2_CONTEXT,
- * RM_L4PER_UART3_CONTEXT, RM_L4PER_UART4_CONTEXT, RM_L4PER_UART5_CONTEXT,
- * RM_L4PER_UART6_CONTEXT, RM_L4SEC_DMA_CRYPTO_CONTEXT
- */
-#define OMAP54XX_LOSTMEM_RETAINED_BANK_SHIFT                                    8
-#define OMAP54XX_LOSTMEM_RETAINED_BANK_WIDTH                                    0x1
-#define OMAP54XX_LOSTMEM_RETAINED_BANK_MASK                                     (1 << 8)
-
-/* Used by RM_IVA_SL2_CONTEXT */
-#define OMAP54XX_LOSTMEM_SL2_MEM_SHIFT                                          8
-#define OMAP54XX_LOSTMEM_SL2_MEM_WIDTH                                          0x1
-#define OMAP54XX_LOSTMEM_SL2_MEM_MASK                                           (1 << 8)
-
-/* Used by RM_IVA_IVA_CONTEXT */
-#define OMAP54XX_LOSTMEM_TCM1_MEM_SHIFT                                         8
-#define OMAP54XX_LOSTMEM_TCM1_MEM_WIDTH                                         0x1
-#define OMAP54XX_LOSTMEM_TCM1_MEM_MASK                                          (1 << 8)
-
-/* Used by RM_IVA_IVA_CONTEXT */
-#define OMAP54XX_LOSTMEM_TCM2_MEM_SHIFT                                         9
-#define OMAP54XX_LOSTMEM_TCM2_MEM_WIDTH                                         0x1
-#define OMAP54XX_LOSTMEM_TCM2_MEM_MASK                                          (1 << 9)
-
-/* Used by RM_WKUPAON_SAR_RAM_CONTEXT */
-#define OMAP54XX_LOSTMEM_WKUP_BANK_SHIFT                                        8
-#define OMAP54XX_LOSTMEM_WKUP_BANK_WIDTH                                        0x1
-#define OMAP54XX_LOSTMEM_WKUP_BANK_MASK                                         (1 << 8)
-
-/*
- * Used by PM_ABE_PWRSTCTRL, PM_CAM_PWRSTCTRL, PM_CORE_PWRSTCTRL,
- * PM_CUSTEFUSE_PWRSTCTRL, PM_DSP_PWRSTCTRL, PM_DSS_PWRSTCTRL,
- * PM_GPU_PWRSTCTRL, PM_IVA_PWRSTCTRL, PM_L3INIT_PWRSTCTRL, PM_MPU_PWRSTCTRL
- */
-#define OMAP54XX_LOWPOWERSTATECHANGE_SHIFT                                      4
-#define OMAP54XX_LOWPOWERSTATECHANGE_WIDTH                                      0x1
-#define OMAP54XX_LOWPOWERSTATECHANGE_MASK                                       (1 << 4)
-
-/* Used by PRM_DEBUG_TRANS_CFG */
-#define OMAP54XX_MODE_SHIFT                                                     0
-#define OMAP54XX_MODE_WIDTH                                                     0x2
-#define OMAP54XX_MODE_MASK                                                      (0x3 << 0)
-
-/* Used by PRM_MODEM_IF_CTRL */
-#define OMAP54XX_MODEM_SHUTDOWN_IRQ_SHIFT                                       9
-#define OMAP54XX_MODEM_SHUTDOWN_IRQ_WIDTH                                       0x1
-#define OMAP54XX_MODEM_SHUTDOWN_IRQ_MASK                                        (1 << 9)
-
-/* Used by PRM_MODEM_IF_CTRL */
-#define OMAP54XX_MODEM_WAKE_IRQ_SHIFT                                           8
-#define OMAP54XX_MODEM_WAKE_IRQ_WIDTH                                           0x1
-#define OMAP54XX_MODEM_WAKE_IRQ_MASK                                            (1 << 8)
-
-/* Used by PM_MPU_PWRSTCTRL */
-#define OMAP54XX_MPU_L2_ONSTATE_SHIFT                                           18
-#define OMAP54XX_MPU_L2_ONSTATE_WIDTH                                           0x2
-#define OMAP54XX_MPU_L2_ONSTATE_MASK                                            (0x3 << 18)
-
-/* Used by PM_MPU_PWRSTCTRL */
-#define OMAP54XX_MPU_L2_RETSTATE_SHIFT                                          9
-#define OMAP54XX_MPU_L2_RETSTATE_WIDTH                                          0x1
-#define OMAP54XX_MPU_L2_RETSTATE_MASK                                           (1 << 9)
-
-/* Used by PM_MPU_PWRSTST */
-#define OMAP54XX_MPU_L2_STATEST_SHIFT                                           6
-#define OMAP54XX_MPU_L2_STATEST_WIDTH                                           0x2
-#define OMAP54XX_MPU_L2_STATEST_MASK                                            (0x3 << 6)
-
-/* Used by PM_MPU_PWRSTCTRL */
-#define OMAP54XX_MPU_RAM_ONSTATE_SHIFT                                          20
-#define OMAP54XX_MPU_RAM_ONSTATE_WIDTH                                          0x2
-#define OMAP54XX_MPU_RAM_ONSTATE_MASK                                           (0x3 << 20)
-
-/* Used by PM_MPU_PWRSTCTRL */
-#define OMAP54XX_MPU_RAM_RETSTATE_SHIFT                                         10
-#define OMAP54XX_MPU_RAM_RETSTATE_WIDTH                                         0x1
-#define OMAP54XX_MPU_RAM_RETSTATE_MASK                                          (1 << 10)
-
-/* Used by PM_MPU_PWRSTST */
-#define OMAP54XX_MPU_RAM_STATEST_SHIFT                                          8
-#define OMAP54XX_MPU_RAM_STATEST_WIDTH                                          0x2
-#define OMAP54XX_MPU_RAM_STATEST_MASK                                           (0x3 << 8)
-
-/* Used by PRM_RSTST */
-#define OMAP54XX_MPU_SECURITY_VIOL_RST_SHIFT                                    2
-#define OMAP54XX_MPU_SECURITY_VIOL_RST_WIDTH                                    0x1
-#define OMAP54XX_MPU_SECURITY_VIOL_RST_MASK                                     (1 << 2)
-
-/* Used by PRM_RSTST */
-#define OMAP54XX_MPU_WDT_RST_SHIFT                                              3
-#define OMAP54XX_MPU_WDT_RST_WIDTH                                              0x1
-#define OMAP54XX_MPU_WDT_RST_MASK                                               (1 << 3)
-
-/* Used by PRM_ABBLDO_MM_SETUP, PRM_ABBLDO_MPU_SETUP */
-#define OMAP54XX_NOCAP_SHIFT                                                    4
-#define OMAP54XX_NOCAP_WIDTH                                                    0x1
-#define OMAP54XX_NOCAP_MASK                                                     (1 << 4)
-
-/* Used by PM_CORE_PWRSTCTRL */
-#define OMAP54XX_OCP_NRET_BANK_ONSTATE_SHIFT                                    24
-#define OMAP54XX_OCP_NRET_BANK_ONSTATE_WIDTH                                    0x2
-#define OMAP54XX_OCP_NRET_BANK_ONSTATE_MASK                                     (0x3 << 24)
-
-/* Used by PM_CORE_PWRSTCTRL */
-#define OMAP54XX_OCP_NRET_BANK_RETSTATE_SHIFT                                   12
-#define OMAP54XX_OCP_NRET_BANK_RETSTATE_WIDTH                                   0x1
-#define OMAP54XX_OCP_NRET_BANK_RETSTATE_MASK                                    (1 << 12)
-
-/* Used by PM_CORE_PWRSTST */
-#define OMAP54XX_OCP_NRET_BANK_STATEST_SHIFT                                    12
-#define OMAP54XX_OCP_NRET_BANK_STATEST_WIDTH                                    0x2
-#define OMAP54XX_OCP_NRET_BANK_STATEST_MASK                                     (0x3 << 12)
-
-/*
- * Used by PRM_VC_VAL_CMD_VDD_CORE_L, PRM_VC_VAL_CMD_VDD_MM_L,
- * PRM_VC_VAL_CMD_VDD_MPU_L
- */
-#define OMAP54XX_OFF_SHIFT                                                      0
-#define OMAP54XX_OFF_WIDTH                                                      0x8
-#define OMAP54XX_OFF_MASK                                                       (0xff << 0)
-
-/*
- * Used by PRM_VC_VAL_CMD_VDD_CORE_L, PRM_VC_VAL_CMD_VDD_MM_L,
- * PRM_VC_VAL_CMD_VDD_MPU_L
- */
-#define OMAP54XX_ON_SHIFT                                                       24
-#define OMAP54XX_ON_WIDTH                                                       0x8
-#define OMAP54XX_ON_MASK                                                        (0xff << 24)
-
-/*
- * Used by PRM_VC_VAL_CMD_VDD_CORE_L, PRM_VC_VAL_CMD_VDD_MM_L,
- * PRM_VC_VAL_CMD_VDD_MPU_L
- */
-#define OMAP54XX_ONLP_SHIFT                                                     16
-#define OMAP54XX_ONLP_WIDTH                                                     0x8
-#define OMAP54XX_ONLP_MASK                                                      (0xff << 16)
-
-/* Used by PRM_ABBLDO_MM_CTRL, PRM_ABBLDO_MPU_CTRL */
-#define OMAP54XX_OPP_CHANGE_SHIFT                                               2
-#define OMAP54XX_OPP_CHANGE_WIDTH                                               0x1
-#define OMAP54XX_OPP_CHANGE_MASK                                                (1 << 2)
-
-/* Used by PRM_VC_VAL_BYPASS */
-#define OMAP54XX_OPP_CHANGE_EMIF_LVL_SHIFT                                      25
-#define OMAP54XX_OPP_CHANGE_EMIF_LVL_WIDTH                                      0x1
-#define OMAP54XX_OPP_CHANGE_EMIF_LVL_MASK                                       (1 << 25)
-
-/* Used by PRM_ABBLDO_MM_CTRL, PRM_ABBLDO_MPU_CTRL */
-#define OMAP54XX_OPP_SEL_SHIFT                                                  0
-#define OMAP54XX_OPP_SEL_WIDTH                                                  0x2
-#define OMAP54XX_OPP_SEL_MASK                                                   (0x3 << 0)
-
-/* Used by PRM_DEBUG_OUT */
-#define OMAP54XX_OUTPUT_SHIFT                                                   0
-#define OMAP54XX_OUTPUT_WIDTH                                                   0x20
-#define OMAP54XX_OUTPUT_MASK                                                    (0xffffffff << 0)
-
-/* Used by PRM_SRAM_COUNT */
-#define OMAP54XX_PCHARGECNT_VALUE_SHIFT                                         0
-#define OMAP54XX_PCHARGECNT_VALUE_WIDTH                                         0x6
-#define OMAP54XX_PCHARGECNT_VALUE_MASK                                          (0x3f << 0)
-
-/* Used by PRM_PSCON_COUNT */
-#define OMAP54XX_PCHARGE_TIME_SHIFT                                             0
-#define OMAP54XX_PCHARGE_TIME_WIDTH                                             0x8
-#define OMAP54XX_PCHARGE_TIME_MASK                                              (0xff << 0)
-
-/* Used by PM_ABE_PWRSTCTRL */
-#define OMAP54XX_PERIPHMEM_ONSTATE_SHIFT                                        20
-#define OMAP54XX_PERIPHMEM_ONSTATE_WIDTH                                        0x2
-#define OMAP54XX_PERIPHMEM_ONSTATE_MASK                                         (0x3 << 20)
-
-/* Used by PM_ABE_PWRSTCTRL */
-#define OMAP54XX_PERIPHMEM_RETSTATE_SHIFT                                       10
-#define OMAP54XX_PERIPHMEM_RETSTATE_WIDTH                                       0x1
-#define OMAP54XX_PERIPHMEM_RETSTATE_MASK                                        (1 << 10)
-
-/* Used by PM_ABE_PWRSTST */
-#define OMAP54XX_PERIPHMEM_STATEST_SHIFT                                        8
-#define OMAP54XX_PERIPHMEM_STATEST_WIDTH                                        0x2
-#define OMAP54XX_PERIPHMEM_STATEST_MASK                                         (0x3 << 8)
-
-/* Used by PRM_PHASE1_CNDP */
-#define OMAP54XX_PHASE1_CNDP_SHIFT                                              0
-#define OMAP54XX_PHASE1_CNDP_WIDTH                                              0x20
-#define OMAP54XX_PHASE1_CNDP_MASK                                               (0xffffffff << 0)
-
-/* Used by PRM_PHASE2A_CNDP */
-#define OMAP54XX_PHASE2A_CNDP_SHIFT                                             0
-#define OMAP54XX_PHASE2A_CNDP_WIDTH                                             0x20
-#define OMAP54XX_PHASE2A_CNDP_MASK                                              (0xffffffff << 0)
-
-/* Used by PRM_PHASE2B_CNDP */
-#define OMAP54XX_PHASE2B_CNDP_SHIFT                                             0
-#define OMAP54XX_PHASE2B_CNDP_WIDTH                                             0x20
-#define OMAP54XX_PHASE2B_CNDP_MASK                                              (0xffffffff << 0)
-
-/* Used by PRM_PSCON_COUNT */
-#define OMAP54XX_PONOUT_2_PGOODIN_TIME_SHIFT                                    8
-#define OMAP54XX_PONOUT_2_PGOODIN_TIME_WIDTH                                    0x8
-#define OMAP54XX_PONOUT_2_PGOODIN_TIME_MASK                                     (0xff << 8)
-
-/*
- * Used by PM_ABE_PWRSTCTRL, PM_CAM_PWRSTCTRL, PM_CORE_PWRSTCTRL,
- * PM_CUSTEFUSE_PWRSTCTRL, PM_DSP_PWRSTCTRL, PM_DSS_PWRSTCTRL,
- * PM_EMU_PWRSTCTRL, PM_GPU_PWRSTCTRL, PM_IVA_PWRSTCTRL, PM_L3INIT_PWRSTCTRL,
- * PM_MPU_PWRSTCTRL
- */
-#define OMAP54XX_POWERSTATE_SHIFT                                               0
-#define OMAP54XX_POWERSTATE_WIDTH                                               0x2
-#define OMAP54XX_POWERSTATE_MASK                                                (0x3 << 0)
-
-/*
- * Used by PM_ABE_PWRSTST, PM_CAM_PWRSTST, PM_CORE_PWRSTST,
- * PM_CUSTEFUSE_PWRSTST, PM_DSP_PWRSTST, PM_DSS_PWRSTST, PM_EMU_PWRSTST,
- * PM_GPU_PWRSTST, PM_IVA_PWRSTST, PM_L3INIT_PWRSTST, PM_MPU_PWRSTST
- */
-#define OMAP54XX_POWERSTATEST_SHIFT                                             0
-#define OMAP54XX_POWERSTATEST_WIDTH                                             0x2
-#define OMAP54XX_POWERSTATEST_MASK                                              (0x3 << 0)
-
-/* Used by PRM_PWRREQCTRL */
-#define OMAP54XX_PWRREQ_COND_SHIFT                                              0
-#define OMAP54XX_PWRREQ_COND_WIDTH                                              0x2
-#define OMAP54XX_PWRREQ_COND_MASK                                               (0x3 << 0)
-
-/* Used by PRM_VC_SMPS_CORE_CONFIG */
-#define OMAP54XX_RACEN_VDD_CORE_L_SHIFT                                         27
-#define OMAP54XX_RACEN_VDD_CORE_L_WIDTH                                         0x1
-#define OMAP54XX_RACEN_VDD_CORE_L_MASK                                          (1 << 27)
-
-/* Used by PRM_VC_SMPS_MM_CONFIG */
-#define OMAP54XX_RACEN_VDD_MM_L_SHIFT                                           27
-#define OMAP54XX_RACEN_VDD_MM_L_WIDTH                                           0x1
-#define OMAP54XX_RACEN_VDD_MM_L_MASK                                            (1 << 27)
-
-/* Used by PRM_VC_SMPS_MPU_CONFIG */
-#define OMAP54XX_RACEN_VDD_MPU_L_SHIFT                                          27
-#define OMAP54XX_RACEN_VDD_MPU_L_WIDTH                                          0x1
-#define OMAP54XX_RACEN_VDD_MPU_L_MASK                                           (1 << 27)
-
-/* Used by PRM_VC_SMPS_CORE_CONFIG */
-#define OMAP54XX_RAC_VDD_CORE_L_SHIFT                                           26
-#define OMAP54XX_RAC_VDD_CORE_L_WIDTH                                           0x1
-#define OMAP54XX_RAC_VDD_CORE_L_MASK                                            (1 << 26)
-
-/* Used by PRM_VC_SMPS_MM_CONFIG */
-#define OMAP54XX_RAC_VDD_MM_L_SHIFT                                             26
-#define OMAP54XX_RAC_VDD_MM_L_WIDTH                                             0x1
-#define OMAP54XX_RAC_VDD_MM_L_MASK                                              (1 << 26)
-
-/* Used by PRM_VC_SMPS_MPU_CONFIG */
-#define OMAP54XX_RAC_VDD_MPU_L_SHIFT                                            26
-#define OMAP54XX_RAC_VDD_MPU_L_WIDTH                                            0x1
-#define OMAP54XX_RAC_VDD_MPU_L_MASK                                             (1 << 26)
-
-/*
- * Used by PRM_VOLTSETUP_CORE_OFF, PRM_VOLTSETUP_CORE_RET_SLEEP,
- * PRM_VOLTSETUP_MM_OFF, PRM_VOLTSETUP_MM_RET_SLEEP, PRM_VOLTSETUP_MPU_OFF,
- * PRM_VOLTSETUP_MPU_RET_SLEEP
- */
-#define OMAP54XX_RAMP_DOWN_COUNT_SHIFT                                          16
-#define OMAP54XX_RAMP_DOWN_COUNT_WIDTH                                          0x6
-#define OMAP54XX_RAMP_DOWN_COUNT_MASK                                           (0x3f << 16)
-
-/*
- * Used by PRM_VOLTSETUP_CORE_OFF, PRM_VOLTSETUP_CORE_RET_SLEEP,
- * PRM_VOLTSETUP_MM_OFF, PRM_VOLTSETUP_MM_RET_SLEEP, PRM_VOLTSETUP_MPU_OFF,
- * PRM_VOLTSETUP_MPU_RET_SLEEP
- */
-#define OMAP54XX_RAMP_DOWN_PRESCAL_SHIFT                                        24
-#define OMAP54XX_RAMP_DOWN_PRESCAL_WIDTH                                        0x2
-#define OMAP54XX_RAMP_DOWN_PRESCAL_MASK                                         (0x3 << 24)
-
-/*
- * Used by PRM_VOLTSETUP_CORE_OFF, PRM_VOLTSETUP_CORE_RET_SLEEP,
- * PRM_VOLTSETUP_MM_OFF, PRM_VOLTSETUP_MM_RET_SLEEP, PRM_VOLTSETUP_MPU_OFF,
- * PRM_VOLTSETUP_MPU_RET_SLEEP
- */
-#define OMAP54XX_RAMP_UP_COUNT_SHIFT                                            0
-#define OMAP54XX_RAMP_UP_COUNT_WIDTH                                            0x6
-#define OMAP54XX_RAMP_UP_COUNT_MASK                                             (0x3f << 0)
-
-/*
- * Used by PRM_VOLTSETUP_CORE_OFF, PRM_VOLTSETUP_CORE_RET_SLEEP,
- * PRM_VOLTSETUP_MM_OFF, PRM_VOLTSETUP_MM_RET_SLEEP, PRM_VOLTSETUP_MPU_OFF,
- * PRM_VOLTSETUP_MPU_RET_SLEEP
- */
-#define OMAP54XX_RAMP_UP_PRESCAL_SHIFT                                          8
-#define OMAP54XX_RAMP_UP_PRESCAL_WIDTH                                          0x2
-#define OMAP54XX_RAMP_UP_PRESCAL_MASK                                           (0x3 << 8)
-
-/* Used by PRM_VC_SMPS_CORE_CONFIG */
-#define OMAP54XX_RAV_VDD_CORE_L_SHIFT                                           25
-#define OMAP54XX_RAV_VDD_CORE_L_WIDTH                                           0x1
-#define OMAP54XX_RAV_VDD_CORE_L_MASK                                            (1 << 25)
-
-/* Used by PRM_VC_SMPS_MM_CONFIG */
-#define OMAP54XX_RAV_VDD_MM_L_SHIFT                                             25
-#define OMAP54XX_RAV_VDD_MM_L_WIDTH                                             0x1
-#define OMAP54XX_RAV_VDD_MM_L_MASK                                              (1 << 25)
-
-/* Used by PRM_VC_SMPS_MPU_CONFIG */
-#define OMAP54XX_RAV_VDD_MPU_L_SHIFT                                            25
-#define OMAP54XX_RAV_VDD_MPU_L_WIDTH                                            0x1
-#define OMAP54XX_RAV_VDD_MPU_L_MASK                                             (1 << 25)
-
-/* Used by PRM_VC_VAL_BYPASS */
-#define OMAP54XX_REGADDR_SHIFT                                                  8
-#define OMAP54XX_REGADDR_WIDTH                                                  0x8
-#define OMAP54XX_REGADDR_MASK                                                   (0xff << 8)
-
-/*
- * Used by PRM_VC_VAL_CMD_VDD_CORE_L, PRM_VC_VAL_CMD_VDD_MM_L,
- * PRM_VC_VAL_CMD_VDD_MPU_L
- */
-#define OMAP54XX_RET_SHIFT                                                      8
-#define OMAP54XX_RET_WIDTH                                                      0x8
-#define OMAP54XX_RET_MASK                                                       (0xff << 8)
-
-/* Used by PRM_SLDO_CORE_CTRL, PRM_SLDO_MM_CTRL, PRM_SLDO_MPU_CTRL */
-#define OMAP54XX_RETMODE_ENABLE_SHIFT                                           0
-#define OMAP54XX_RETMODE_ENABLE_WIDTH                                           0x1
-#define OMAP54XX_RETMODE_ENABLE_MASK                                            (1 << 0)
-
-/* Used by PRM_RSTTIME */
-#define OMAP54XX_RSTTIME1_SHIFT                                                 0
-#define OMAP54XX_RSTTIME1_WIDTH                                                 0xa
-#define OMAP54XX_RSTTIME1_MASK                                                  (0x3ff << 0)
-
-/* Used by PRM_RSTTIME */
-#define OMAP54XX_RSTTIME2_SHIFT                                                 10
-#define OMAP54XX_RSTTIME2_WIDTH                                                 0x5
-#define OMAP54XX_RSTTIME2_MASK                                                  (0x1f << 10)
-
-/* Used by RM_IPU_RSTCTRL, RM_IPU_RSTST */
-#define OMAP54XX_RST_CPU0_SHIFT                                                 0
-#define OMAP54XX_RST_CPU0_WIDTH                                                 0x1
-#define OMAP54XX_RST_CPU0_MASK                                                  (1 << 0)
-
-/* Used by RM_IPU_RSTCTRL, RM_IPU_RSTST */
-#define OMAP54XX_RST_CPU1_SHIFT                                                 1
-#define OMAP54XX_RST_CPU1_WIDTH                                                 0x1
-#define OMAP54XX_RST_CPU1_MASK                                                  (1 << 1)
-
-/* Used by RM_DSP_RSTCTRL, RM_DSP_RSTST */
-#define OMAP54XX_RST_DSP_SHIFT                                                  0
-#define OMAP54XX_RST_DSP_WIDTH                                                  0x1
-#define OMAP54XX_RST_DSP_MASK                                                   (1 << 0)
-
-/* Used by RM_DSP_RSTST */
-#define OMAP54XX_RST_DSP_EMU_SHIFT                                              2
-#define OMAP54XX_RST_DSP_EMU_WIDTH                                              0x1
-#define OMAP54XX_RST_DSP_EMU_MASK                                               (1 << 2)
-
-/* Used by RM_DSP_RSTST */
-#define OMAP54XX_RST_DSP_EMU_REQ_SHIFT                                          3
-#define OMAP54XX_RST_DSP_EMU_REQ_WIDTH                                          0x1
-#define OMAP54XX_RST_DSP_EMU_REQ_MASK                                           (1 << 3)
-
-/* Used by RM_DSP_RSTCTRL, RM_DSP_RSTST */
-#define OMAP54XX_RST_DSP_MMU_CACHE_SHIFT                                        1
-#define OMAP54XX_RST_DSP_MMU_CACHE_WIDTH                                        0x1
-#define OMAP54XX_RST_DSP_MMU_CACHE_MASK                                         (1 << 1)
-
-/* Used by RM_IPU_RSTST */
-#define OMAP54XX_RST_EMULATION_CPU0_SHIFT                                       3
-#define OMAP54XX_RST_EMULATION_CPU0_WIDTH                                       0x1
-#define OMAP54XX_RST_EMULATION_CPU0_MASK                                        (1 << 3)
-
-/* Used by RM_IPU_RSTST */
-#define OMAP54XX_RST_EMULATION_CPU1_SHIFT                                       4
-#define OMAP54XX_RST_EMULATION_CPU1_WIDTH                                       0x1
-#define OMAP54XX_RST_EMULATION_CPU1_MASK                                        (1 << 4)
-
-/* Used by RM_IVA_RSTST */
-#define OMAP54XX_RST_EMULATION_SEQ1_SHIFT                                       3
-#define OMAP54XX_RST_EMULATION_SEQ1_WIDTH                                       0x1
-#define OMAP54XX_RST_EMULATION_SEQ1_MASK                                        (1 << 3)
-
-/* Used by RM_IVA_RSTST */
-#define OMAP54XX_RST_EMULATION_SEQ2_SHIFT                                       4
-#define OMAP54XX_RST_EMULATION_SEQ2_WIDTH                                       0x1
-#define OMAP54XX_RST_EMULATION_SEQ2_MASK                                        (1 << 4)
-
-/* Used by PRM_RSTCTRL */
-#define OMAP54XX_RST_GLOBAL_COLD_SW_SHIFT                                       1
-#define OMAP54XX_RST_GLOBAL_COLD_SW_WIDTH                                       0x1
-#define OMAP54XX_RST_GLOBAL_COLD_SW_MASK                                        (1 << 1)
-
-/* Used by PRM_RSTCTRL */
-#define OMAP54XX_RST_GLOBAL_WARM_SW_SHIFT                                       0
-#define OMAP54XX_RST_GLOBAL_WARM_SW_WIDTH                                       0x1
-#define OMAP54XX_RST_GLOBAL_WARM_SW_MASK                                        (1 << 0)
-
-/* Used by RM_IPU_RSTST */
-#define OMAP54XX_RST_ICECRUSHER_CPU0_SHIFT                                      5
-#define OMAP54XX_RST_ICECRUSHER_CPU0_WIDTH                                      0x1
-#define OMAP54XX_RST_ICECRUSHER_CPU0_MASK                                       (1 << 5)
-
-/* Used by RM_IPU_RSTST */
-#define OMAP54XX_RST_ICECRUSHER_CPU1_SHIFT                                      6
-#define OMAP54XX_RST_ICECRUSHER_CPU1_WIDTH                                      0x1
-#define OMAP54XX_RST_ICECRUSHER_CPU1_MASK                                       (1 << 6)
-
-/* Used by RM_IVA_RSTST */
-#define OMAP54XX_RST_ICECRUSHER_SEQ1_SHIFT                                      5
-#define OMAP54XX_RST_ICECRUSHER_SEQ1_WIDTH                                      0x1
-#define OMAP54XX_RST_ICECRUSHER_SEQ1_MASK                                       (1 << 5)
-
-/* Used by RM_IVA_RSTST */
-#define OMAP54XX_RST_ICECRUSHER_SEQ2_SHIFT                                      6
-#define OMAP54XX_RST_ICECRUSHER_SEQ2_WIDTH                                      0x1
-#define OMAP54XX_RST_ICECRUSHER_SEQ2_MASK                                       (1 << 6)
-
-/* Used by RM_IPU_RSTCTRL, RM_IPU_RSTST */
-#define OMAP54XX_RST_IPU_MMU_CACHE_SHIFT                                        2
-#define OMAP54XX_RST_IPU_MMU_CACHE_WIDTH                                        0x1
-#define OMAP54XX_RST_IPU_MMU_CACHE_MASK                                         (1 << 2)
-
-/* Used by RM_IVA_RSTCTRL, RM_IVA_RSTST */
-#define OMAP54XX_RST_LOGIC_SHIFT                                                2
-#define OMAP54XX_RST_LOGIC_WIDTH                                                0x1
-#define OMAP54XX_RST_LOGIC_MASK                                                 (1 << 2)
-
-/* Used by RM_IVA_RSTCTRL, RM_IVA_RSTST */
-#define OMAP54XX_RST_SEQ1_SHIFT                                                 0
-#define OMAP54XX_RST_SEQ1_WIDTH                                                 0x1
-#define OMAP54XX_RST_SEQ1_MASK                                                  (1 << 0)
-
-/* Used by RM_IVA_RSTCTRL, RM_IVA_RSTST */
-#define OMAP54XX_RST_SEQ2_SHIFT                                                 1
-#define OMAP54XX_RST_SEQ2_WIDTH                                                 0x1
-#define OMAP54XX_RST_SEQ2_MASK                                                  (1 << 1)
-
-/* Used by REVISION_PRM */
-#define OMAP54XX_R_RTL_SHIFT                                                    11
-#define OMAP54XX_R_RTL_WIDTH                                                    0x5
-#define OMAP54XX_R_RTL_MASK                                                     (0x1f << 11)
-
-/* Used by PRM_VC_SMPS_CORE_CONFIG */
-#define OMAP54XX_SA_VDD_CORE_L_SHIFT                                            0
-#define OMAP54XX_SA_VDD_CORE_L_WIDTH                                            0x7
-#define OMAP54XX_SA_VDD_CORE_L_MASK                                             (0x7f << 0)
-
-/* Used by PRM_VC_SMPS_MM_CONFIG */
-#define OMAP54XX_SA_VDD_MM_L_SHIFT                                              0
-#define OMAP54XX_SA_VDD_MM_L_WIDTH                                              0x7
-#define OMAP54XX_SA_VDD_MM_L_MASK                                               (0x7f << 0)
-
-/* Used by PRM_VC_SMPS_MPU_CONFIG */
-#define OMAP54XX_SA_VDD_MPU_L_SHIFT                                             0
-#define OMAP54XX_SA_VDD_MPU_L_WIDTH                                             0x7
-#define OMAP54XX_SA_VDD_MPU_L_MASK                                              (0x7f << 0)
-
-/* Used by REVISION_PRM */
-#define OMAP54XX_SCHEME_SHIFT                                                   30
-#define OMAP54XX_SCHEME_WIDTH                                                   0x2
-#define OMAP54XX_SCHEME_MASK                                                    (0x3 << 30)
-
-/* Used by PRM_VC_CFG_I2C_CLK */
-#define OMAP54XX_SCLH_SHIFT                                                     0
-#define OMAP54XX_SCLH_WIDTH                                                     0x8
-#define OMAP54XX_SCLH_MASK                                                      (0xff << 0)
-
-/* Used by PRM_VC_CFG_I2C_CLK */
-#define OMAP54XX_SCLL_SHIFT                                                     8
-#define OMAP54XX_SCLL_WIDTH                                                     0x8
-#define OMAP54XX_SCLL_MASK                                                      (0xff << 8)
-
-/* Used by PRM_RSTST */
-#define OMAP54XX_SECURE_WDT_RST_SHIFT                                           4
-#define OMAP54XX_SECURE_WDT_RST_WIDTH                                           0x1
-#define OMAP54XX_SECURE_WDT_RST_MASK                                            (1 << 4)
-
-/* Used by PRM_VC_SMPS_CORE_CONFIG */
-#define OMAP54XX_SEL_SA_VDD_CORE_L_SHIFT                                        24
-#define OMAP54XX_SEL_SA_VDD_CORE_L_WIDTH                                        0x1
-#define OMAP54XX_SEL_SA_VDD_CORE_L_MASK                                         (1 << 24)
-
-/* Used by PRM_VC_SMPS_MM_CONFIG */
-#define OMAP54XX_SEL_SA_VDD_MM_L_SHIFT                                          24
-#define OMAP54XX_SEL_SA_VDD_MM_L_WIDTH                                          0x1
-#define OMAP54XX_SEL_SA_VDD_MM_L_MASK                                           (1 << 24)
-
-/* Used by PRM_VC_SMPS_MPU_CONFIG */
-#define OMAP54XX_SEL_SA_VDD_MPU_L_SHIFT                                         24
-#define OMAP54XX_SEL_SA_VDD_MPU_L_WIDTH                                         0x1
-#define OMAP54XX_SEL_SA_VDD_MPU_L_MASK                                          (1 << 24)
-
-/* Used by PM_IVA_PWRSTCTRL */
-#define OMAP54XX_SL2_MEM_ONSTATE_SHIFT                                          18
-#define OMAP54XX_SL2_MEM_ONSTATE_WIDTH                                          0x2
-#define OMAP54XX_SL2_MEM_ONSTATE_MASK                                           (0x3 << 18)
-
-/* Used by PM_IVA_PWRSTCTRL */
-#define OMAP54XX_SL2_MEM_RETSTATE_SHIFT                                         9
-#define OMAP54XX_SL2_MEM_RETSTATE_WIDTH                                         0x1
-#define OMAP54XX_SL2_MEM_RETSTATE_MASK                                          (1 << 9)
-
-/* Used by PM_IVA_PWRSTST */
-#define OMAP54XX_SL2_MEM_STATEST_SHIFT                                          6
-#define OMAP54XX_SL2_MEM_STATEST_WIDTH                                          0x2
-#define OMAP54XX_SL2_MEM_STATEST_MASK                                           (0x3 << 6)
-
-/* Used by PRM_VC_VAL_BYPASS */
-#define OMAP54XX_SLAVEADDR_SHIFT                                                0
-#define OMAP54XX_SLAVEADDR_WIDTH                                                0x7
-#define OMAP54XX_SLAVEADDR_MASK                                                 (0x7f << 0)
-
-/* Used by PRM_SRAM_COUNT */
-#define OMAP54XX_SLPCNT_VALUE_SHIFT                                             16
-#define OMAP54XX_SLPCNT_VALUE_WIDTH                                             0x8
-#define OMAP54XX_SLPCNT_VALUE_MASK                                              (0xff << 16)
-
-/* Used by PRM_VP_CORE_VSTEPMAX, PRM_VP_MM_VSTEPMAX, PRM_VP_MPU_VSTEPMAX */
-#define OMAP54XX_SMPSWAITTIMEMAX_SHIFT                                          8
-#define OMAP54XX_SMPSWAITTIMEMAX_WIDTH                                          0x10
-#define OMAP54XX_SMPSWAITTIMEMAX_MASK                                           (0xffff << 8)
-
-/* Used by PRM_VP_CORE_VSTEPMIN, PRM_VP_MM_VSTEPMIN, PRM_VP_MPU_VSTEPMIN */
-#define OMAP54XX_SMPSWAITTIMEMIN_SHIFT                                          8
-#define OMAP54XX_SMPSWAITTIMEMIN_WIDTH                                          0x10
-#define OMAP54XX_SMPSWAITTIMEMIN_MASK                                           (0xffff << 8)
-
-/* Used by PRM_VC_CORE_ERRST */
-#define OMAP54XX_SMPS_RA_ERR_CORE_SHIFT                                         1
-#define OMAP54XX_SMPS_RA_ERR_CORE_WIDTH                                         0x1
-#define OMAP54XX_SMPS_RA_ERR_CORE_MASK                                          (1 << 1)
-
-/* Used by PRM_VC_MM_ERRST */
-#define OMAP54XX_SMPS_RA_ERR_MM_SHIFT                                           1
-#define OMAP54XX_SMPS_RA_ERR_MM_WIDTH                                           0x1
-#define OMAP54XX_SMPS_RA_ERR_MM_MASK                                            (1 << 1)
-
-/* Used by PRM_VC_MPU_ERRST */
-#define OMAP54XX_SMPS_RA_ERR_MPU_SHIFT                                          1
-#define OMAP54XX_SMPS_RA_ERR_MPU_WIDTH                                          0x1
-#define OMAP54XX_SMPS_RA_ERR_MPU_MASK                                           (1 << 1)
-
-/* Used by PRM_VC_CORE_ERRST */
-#define OMAP54XX_SMPS_SA_ERR_CORE_SHIFT                                         0
-#define OMAP54XX_SMPS_SA_ERR_CORE_WIDTH                                         0x1
-#define OMAP54XX_SMPS_SA_ERR_CORE_MASK                                          (1 << 0)
-
-/* Used by PRM_VC_MM_ERRST */
-#define OMAP54XX_SMPS_SA_ERR_MM_SHIFT                                           0
-#define OMAP54XX_SMPS_SA_ERR_MM_WIDTH                                           0x1
-#define OMAP54XX_SMPS_SA_ERR_MM_MASK                                            (1 << 0)
-
-/* Used by PRM_VC_MPU_ERRST */
-#define OMAP54XX_SMPS_SA_ERR_MPU_SHIFT                                          0
-#define OMAP54XX_SMPS_SA_ERR_MPU_WIDTH                                          0x1
-#define OMAP54XX_SMPS_SA_ERR_MPU_MASK                                           (1 << 0)
-
-/* Used by PRM_VC_CORE_ERRST */
-#define OMAP54XX_SMPS_TIMEOUT_ERR_CORE_SHIFT                                    2
-#define OMAP54XX_SMPS_TIMEOUT_ERR_CORE_WIDTH                                    0x1
-#define OMAP54XX_SMPS_TIMEOUT_ERR_CORE_MASK                                     (1 << 2)
-
-/* Used by PRM_VC_MM_ERRST */
-#define OMAP54XX_SMPS_TIMEOUT_ERR_MM_SHIFT                                      2
-#define OMAP54XX_SMPS_TIMEOUT_ERR_MM_WIDTH                                      0x1
-#define OMAP54XX_SMPS_TIMEOUT_ERR_MM_MASK                                       (1 << 2)
-
-/* Used by PRM_VC_MPU_ERRST */
-#define OMAP54XX_SMPS_TIMEOUT_ERR_MPU_SHIFT                                     2
-#define OMAP54XX_SMPS_TIMEOUT_ERR_MPU_WIDTH                                     0x1
-#define OMAP54XX_SMPS_TIMEOUT_ERR_MPU_MASK                                      (1 << 2)
-
-/* Used by PRM_ABBLDO_MM_SETUP, PRM_ABBLDO_MPU_SETUP */
-#define OMAP54XX_SR2EN_SHIFT                                                    0
-#define OMAP54XX_SR2EN_WIDTH                                                    0x1
-#define OMAP54XX_SR2EN_MASK                                                     (1 << 0)
-
-/* Used by PRM_ABBLDO_MM_CTRL, PRM_ABBLDO_MPU_CTRL */
-#define OMAP54XX_SR2_IN_TRANSITION_SHIFT                                        6
-#define OMAP54XX_SR2_IN_TRANSITION_WIDTH                                        0x1
-#define OMAP54XX_SR2_IN_TRANSITION_MASK                                         (1 << 6)
-
-/* Used by PRM_ABBLDO_MM_CTRL, PRM_ABBLDO_MPU_CTRL */
-#define OMAP54XX_SR2_STATUS_SHIFT                                               3
-#define OMAP54XX_SR2_STATUS_WIDTH                                               0x2
-#define OMAP54XX_SR2_STATUS_MASK                                                (0x3 << 3)
-
-/* Used by PRM_ABBLDO_MM_SETUP, PRM_ABBLDO_MPU_SETUP */
-#define OMAP54XX_SR2_WTCNT_VALUE_SHIFT                                          8
-#define OMAP54XX_SR2_WTCNT_VALUE_WIDTH                                          0x8
-#define OMAP54XX_SR2_WTCNT_VALUE_MASK                                           (0xff << 8)
-
-/* Used by PRM_SLDO_CORE_CTRL, PRM_SLDO_MM_CTRL, PRM_SLDO_MPU_CTRL */
-#define OMAP54XX_SRAMLDO_STATUS_SHIFT                                           8
-#define OMAP54XX_SRAMLDO_STATUS_WIDTH                                           0x1
-#define OMAP54XX_SRAMLDO_STATUS_MASK                                            (1 << 8)
-
-/* Used by PRM_SLDO_CORE_CTRL, PRM_SLDO_MM_CTRL, PRM_SLDO_MPU_CTRL */
-#define OMAP54XX_SRAM_IN_TRANSITION_SHIFT                                       9
-#define OMAP54XX_SRAM_IN_TRANSITION_WIDTH                                       0x1
-#define OMAP54XX_SRAM_IN_TRANSITION_MASK                                        (1 << 9)
-
-/* Used by PRM_VC_CFG_I2C_MODE */
-#define OMAP54XX_SRMODEEN_SHIFT                                                 4
-#define OMAP54XX_SRMODEEN_WIDTH                                                 0x1
-#define OMAP54XX_SRMODEEN_MASK                                                  (1 << 4)
-
-/* Used by PRM_VOLTSETUP_WARMRESET */
-#define OMAP54XX_STABLE_COUNT_SHIFT                                             0
-#define OMAP54XX_STABLE_COUNT_WIDTH                                             0x6
-#define OMAP54XX_STABLE_COUNT_MASK                                              (0x3f << 0)
-
-/* Used by PRM_VOLTSETUP_WARMRESET */
-#define OMAP54XX_STABLE_PRESCAL_SHIFT                                           8
-#define OMAP54XX_STABLE_PRESCAL_WIDTH                                           0x2
-#define OMAP54XX_STABLE_PRESCAL_MASK                                            (0x3 << 8)
-
-/* Used by PRM_BANDGAP_SETUP */
-#define OMAP54XX_STARTUP_COUNT_SHIFT                                            0
-#define OMAP54XX_STARTUP_COUNT_WIDTH                                            0x8
-#define OMAP54XX_STARTUP_COUNT_MASK                                             (0xff << 0)
-
-/* Renamed from STARTUP_COUNT Used by PRM_SRAM_COUNT */
-#define OMAP54XX_STARTUP_COUNT_24_31_SHIFT                                      24
-#define OMAP54XX_STARTUP_COUNT_24_31_WIDTH                                      0x8
-#define OMAP54XX_STARTUP_COUNT_24_31_MASK                                       (0xff << 24)
-
-/* Used by PM_IVA_PWRSTCTRL */
-#define OMAP54XX_TCM1_MEM_ONSTATE_SHIFT                                         20
-#define OMAP54XX_TCM1_MEM_ONSTATE_WIDTH                                         0x2
-#define OMAP54XX_TCM1_MEM_ONSTATE_MASK                                          (0x3 << 20)
-
-/* Used by PM_IVA_PWRSTCTRL */
-#define OMAP54XX_TCM1_MEM_RETSTATE_SHIFT                                        10
-#define OMAP54XX_TCM1_MEM_RETSTATE_WIDTH                                        0x1
-#define OMAP54XX_TCM1_MEM_RETSTATE_MASK                                         (1 << 10)
-
-/* Used by PM_IVA_PWRSTST */
-#define OMAP54XX_TCM1_MEM_STATEST_SHIFT                                         8
-#define OMAP54XX_TCM1_MEM_STATEST_WIDTH                                         0x2
-#define OMAP54XX_TCM1_MEM_STATEST_MASK                                          (0x3 << 8)
-
-/* Used by PM_IVA_PWRSTCTRL */
-#define OMAP54XX_TCM2_MEM_ONSTATE_SHIFT                                         22
-#define OMAP54XX_TCM2_MEM_ONSTATE_WIDTH                                         0x2
-#define OMAP54XX_TCM2_MEM_ONSTATE_MASK                                          (0x3 << 22)
-
-/* Used by PM_IVA_PWRSTCTRL */
-#define OMAP54XX_TCM2_MEM_RETSTATE_SHIFT                                        11
-#define OMAP54XX_TCM2_MEM_RETSTATE_WIDTH                                        0x1
-#define OMAP54XX_TCM2_MEM_RETSTATE_MASK                                         (1 << 11)
-
-/* Used by PM_IVA_PWRSTST */
-#define OMAP54XX_TCM2_MEM_STATEST_SHIFT                                         10
-#define OMAP54XX_TCM2_MEM_STATEST_WIDTH                                         0x2
-#define OMAP54XX_TCM2_MEM_STATEST_MASK                                          (0x3 << 10)
-
-/* Used by PRM_VP_CORE_VLIMITTO, PRM_VP_MM_VLIMITTO, PRM_VP_MPU_VLIMITTO */
-#define OMAP54XX_TIMEOUT_SHIFT                                                  0
-#define OMAP54XX_TIMEOUT_WIDTH                                                  0x10
-#define OMAP54XX_TIMEOUT_MASK                                                   (0xffff << 0)
-
-/* Used by PRM_VP_CORE_CONFIG, PRM_VP_MM_CONFIG, PRM_VP_MPU_CONFIG */
-#define OMAP54XX_TIMEOUTEN_SHIFT                                                3
-#define OMAP54XX_TIMEOUTEN_WIDTH                                                0x1
-#define OMAP54XX_TIMEOUTEN_MASK                                                 (1 << 3)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_TRANSITION_EN_SHIFT                                            8
-#define OMAP54XX_TRANSITION_EN_WIDTH                                            0x1
-#define OMAP54XX_TRANSITION_EN_MASK                                             (1 << 8)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_TRANSITION_ST_SHIFT                                            8
-#define OMAP54XX_TRANSITION_ST_WIDTH                                            0x1
-#define OMAP54XX_TRANSITION_ST_MASK                                             (1 << 8)
-
-/* Used by PRM_DEBUG_TRANS_CFG */
-#define OMAP54XX_TRIGGER_CLEAR_SHIFT                                            2
-#define OMAP54XX_TRIGGER_CLEAR_WIDTH                                            0x1
-#define OMAP54XX_TRIGGER_CLEAR_MASK                                             (1 << 2)
-
-/* Used by PRM_RSTST */
-#define OMAP54XX_TSHUT_CORE_RST_SHIFT                                           13
-#define OMAP54XX_TSHUT_CORE_RST_WIDTH                                           0x1
-#define OMAP54XX_TSHUT_CORE_RST_MASK                                            (1 << 13)
-
-/* Used by PRM_RSTST */
-#define OMAP54XX_TSHUT_MM_RST_SHIFT                                             12
-#define OMAP54XX_TSHUT_MM_RST_WIDTH                                             0x1
-#define OMAP54XX_TSHUT_MM_RST_MASK                                              (1 << 12)
-
-/* Used by PRM_RSTST */
-#define OMAP54XX_TSHUT_MPU_RST_SHIFT                                            11
-#define OMAP54XX_TSHUT_MPU_RST_WIDTH                                            0x1
-#define OMAP54XX_TSHUT_MPU_RST_MASK                                             (1 << 11)
-
-/* Used by PRM_VC_VAL_BYPASS */
-#define OMAP54XX_VALID_SHIFT                                                    24
-#define OMAP54XX_VALID_WIDTH                                                    0x1
-#define OMAP54XX_VALID_MASK                                                     (1 << 24)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_VC_BYPASSACK_EN_SHIFT                                          14
-#define OMAP54XX_VC_BYPASSACK_EN_WIDTH                                          0x1
-#define OMAP54XX_VC_BYPASSACK_EN_MASK                                           (1 << 14)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_VC_BYPASSACK_ST_SHIFT                                          14
-#define OMAP54XX_VC_BYPASSACK_ST_WIDTH                                          0x1
-#define OMAP54XX_VC_BYPASSACK_ST_MASK                                           (1 << 14)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_VC_CORE_VPACK_EN_SHIFT                                         22
-#define OMAP54XX_VC_CORE_VPACK_EN_WIDTH                                         0x1
-#define OMAP54XX_VC_CORE_VPACK_EN_MASK                                          (1 << 22)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_VC_CORE_VPACK_ST_SHIFT                                         22
-#define OMAP54XX_VC_CORE_VPACK_ST_WIDTH                                         0x1
-#define OMAP54XX_VC_CORE_VPACK_ST_MASK                                          (1 << 22)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_VC_MM_VPACK_EN_SHIFT                                           30
-#define OMAP54XX_VC_MM_VPACK_EN_WIDTH                                           0x1
-#define OMAP54XX_VC_MM_VPACK_EN_MASK                                            (1 << 30)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_VC_MM_VPACK_ST_SHIFT                                           30
-#define OMAP54XX_VC_MM_VPACK_ST_WIDTH                                           0x1
-#define OMAP54XX_VC_MM_VPACK_ST_MASK                                            (1 << 30)
-
-/* Used by PRM_IRQENABLE_MPU_2 */
-#define OMAP54XX_VC_MPU_VPACK_EN_SHIFT                                          6
-#define OMAP54XX_VC_MPU_VPACK_EN_WIDTH                                          0x1
-#define OMAP54XX_VC_MPU_VPACK_EN_MASK                                           (1 << 6)
-
-/* Used by PRM_IRQSTATUS_MPU_2 */
-#define OMAP54XX_VC_MPU_VPACK_ST_SHIFT                                          6
-#define OMAP54XX_VC_MPU_VPACK_ST_WIDTH                                          0x1
-#define OMAP54XX_VC_MPU_VPACK_ST_MASK                                           (1 << 6)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_VC_RAERR_EN_SHIFT                                              12
-#define OMAP54XX_VC_RAERR_EN_WIDTH                                              0x1
-#define OMAP54XX_VC_RAERR_EN_MASK                                               (1 << 12)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_VC_RAERR_ST_SHIFT                                              12
-#define OMAP54XX_VC_RAERR_ST_WIDTH                                              0x1
-#define OMAP54XX_VC_RAERR_ST_MASK                                               (1 << 12)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_VC_SAERR_EN_SHIFT                                              11
-#define OMAP54XX_VC_SAERR_EN_WIDTH                                              0x1
-#define OMAP54XX_VC_SAERR_EN_MASK                                               (1 << 11)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_VC_SAERR_ST_SHIFT                                              11
-#define OMAP54XX_VC_SAERR_ST_WIDTH                                              0x1
-#define OMAP54XX_VC_SAERR_ST_MASK                                               (1 << 11)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_VC_TOERR_EN_SHIFT                                              13
-#define OMAP54XX_VC_TOERR_EN_WIDTH                                              0x1
-#define OMAP54XX_VC_TOERR_EN_MASK                                               (1 << 13)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_VC_TOERR_ST_SHIFT                                              13
-#define OMAP54XX_VC_TOERR_ST_WIDTH                                              0x1
-#define OMAP54XX_VC_TOERR_ST_MASK                                               (1 << 13)
-
-/* Used by PRM_VP_CORE_VLIMITTO, PRM_VP_MM_VLIMITTO, PRM_VP_MPU_VLIMITTO */
-#define OMAP54XX_VDDMAX_SHIFT                                                   24
-#define OMAP54XX_VDDMAX_WIDTH                                                   0x8
-#define OMAP54XX_VDDMAX_MASK                                                    (0xff << 24)
-
-/* Used by PRM_VP_CORE_VLIMITTO, PRM_VP_MM_VLIMITTO, PRM_VP_MPU_VLIMITTO */
-#define OMAP54XX_VDDMIN_SHIFT                                                   16
-#define OMAP54XX_VDDMIN_WIDTH                                                   0x8
-#define OMAP54XX_VDDMIN_MASK                                                    (0xff << 16)
-
-/* Used by PRM_VOLTCTRL */
-#define OMAP54XX_VDD_CORE_I2C_DISABLE_SHIFT                                     12
-#define OMAP54XX_VDD_CORE_I2C_DISABLE_WIDTH                                     0x1
-#define OMAP54XX_VDD_CORE_I2C_DISABLE_MASK                                      (1 << 12)
-
-/* Used by PRM_RSTST */
-#define OMAP54XX_VDD_CORE_VOLT_MGR_RST_SHIFT                                    8
-#define OMAP54XX_VDD_CORE_VOLT_MGR_RST_WIDTH                                    0x1
-#define OMAP54XX_VDD_CORE_VOLT_MGR_RST_MASK                                     (1 << 8)
-
-/* Used by PRM_VOLTCTRL */
-#define OMAP54XX_VDD_MM_I2C_DISABLE_SHIFT                                       14
-#define OMAP54XX_VDD_MM_I2C_DISABLE_WIDTH                                       0x1
-#define OMAP54XX_VDD_MM_I2C_DISABLE_MASK                                        (1 << 14)
-
-/* Used by PRM_VOLTCTRL */
-#define OMAP54XX_VDD_MM_PRESENCE_SHIFT                                          9
-#define OMAP54XX_VDD_MM_PRESENCE_WIDTH                                          0x1
-#define OMAP54XX_VDD_MM_PRESENCE_MASK                                           (1 << 9)
-
-/* Used by PRM_RSTST */
-#define OMAP54XX_VDD_MM_VOLT_MGR_RST_SHIFT                                      7
-#define OMAP54XX_VDD_MM_VOLT_MGR_RST_WIDTH                                      0x1
-#define OMAP54XX_VDD_MM_VOLT_MGR_RST_MASK                                       (1 << 7)
-
-/* Used by PRM_VOLTCTRL */
-#define OMAP54XX_VDD_MPU_I2C_DISABLE_SHIFT                                      13
-#define OMAP54XX_VDD_MPU_I2C_DISABLE_WIDTH                                      0x1
-#define OMAP54XX_VDD_MPU_I2C_DISABLE_MASK                                       (1 << 13)
-
-/* Used by PRM_VOLTCTRL */
-#define OMAP54XX_VDD_MPU_PRESENCE_SHIFT                                         8
-#define OMAP54XX_VDD_MPU_PRESENCE_WIDTH                                         0x1
-#define OMAP54XX_VDD_MPU_PRESENCE_MASK                                          (1 << 8)
-
-/* Used by PRM_RSTST */
-#define OMAP54XX_VDD_MPU_VOLT_MGR_RST_SHIFT                                     6
-#define OMAP54XX_VDD_MPU_VOLT_MGR_RST_WIDTH                                     0x1
-#define OMAP54XX_VDD_MPU_VOLT_MGR_RST_MASK                                      (1 << 6)
-
-/* Used by PRM_VC_CORE_ERRST */
-#define OMAP54XX_VFSM_RA_ERR_CORE_SHIFT                                         4
-#define OMAP54XX_VFSM_RA_ERR_CORE_WIDTH                                         0x1
-#define OMAP54XX_VFSM_RA_ERR_CORE_MASK                                          (1 << 4)
-
-/* Used by PRM_VC_MM_ERRST */
-#define OMAP54XX_VFSM_RA_ERR_MM_SHIFT                                           4
-#define OMAP54XX_VFSM_RA_ERR_MM_WIDTH                                           0x1
-#define OMAP54XX_VFSM_RA_ERR_MM_MASK                                            (1 << 4)
-
-/* Used by PRM_VC_MPU_ERRST */
-#define OMAP54XX_VFSM_RA_ERR_MPU_SHIFT                                          4
-#define OMAP54XX_VFSM_RA_ERR_MPU_WIDTH                                          0x1
-#define OMAP54XX_VFSM_RA_ERR_MPU_MASK                                           (1 << 4)
-
-/* Used by PRM_VC_CORE_ERRST */
-#define OMAP54XX_VFSM_SA_ERR_CORE_SHIFT                                         3
-#define OMAP54XX_VFSM_SA_ERR_CORE_WIDTH                                         0x1
-#define OMAP54XX_VFSM_SA_ERR_CORE_MASK                                          (1 << 3)
-
-/* Used by PRM_VC_MM_ERRST */
-#define OMAP54XX_VFSM_SA_ERR_MM_SHIFT                                           3
-#define OMAP54XX_VFSM_SA_ERR_MM_WIDTH                                           0x1
-#define OMAP54XX_VFSM_SA_ERR_MM_MASK                                            (1 << 3)
-
-/* Used by PRM_VC_MPU_ERRST */
-#define OMAP54XX_VFSM_SA_ERR_MPU_SHIFT                                          3
-#define OMAP54XX_VFSM_SA_ERR_MPU_WIDTH                                          0x1
-#define OMAP54XX_VFSM_SA_ERR_MPU_MASK                                           (1 << 3)
-
-/* Used by PRM_VC_CORE_ERRST */
-#define OMAP54XX_VFSM_TIMEOUT_ERR_CORE_SHIFT                                    5
-#define OMAP54XX_VFSM_TIMEOUT_ERR_CORE_WIDTH                                    0x1
-#define OMAP54XX_VFSM_TIMEOUT_ERR_CORE_MASK                                     (1 << 5)
-
-/* Used by PRM_VC_MM_ERRST */
-#define OMAP54XX_VFSM_TIMEOUT_ERR_MM_SHIFT                                      5
-#define OMAP54XX_VFSM_TIMEOUT_ERR_MM_WIDTH                                      0x1
-#define OMAP54XX_VFSM_TIMEOUT_ERR_MM_MASK                                       (1 << 5)
-
-/* Used by PRM_VC_MPU_ERRST */
-#define OMAP54XX_VFSM_TIMEOUT_ERR_MPU_SHIFT                                     5
-#define OMAP54XX_VFSM_TIMEOUT_ERR_MPU_WIDTH                                     0x1
-#define OMAP54XX_VFSM_TIMEOUT_ERR_MPU_MASK                                      (1 << 5)
-
-/* Used by PRM_VC_SMPS_CORE_CONFIG */
-#define OMAP54XX_VOLRA_VDD_CORE_L_SHIFT                                         8
-#define OMAP54XX_VOLRA_VDD_CORE_L_WIDTH                                         0x8
-#define OMAP54XX_VOLRA_VDD_CORE_L_MASK                                          (0xff << 8)
-
-/* Used by PRM_VC_SMPS_MM_CONFIG */
-#define OMAP54XX_VOLRA_VDD_MM_L_SHIFT                                           8
-#define OMAP54XX_VOLRA_VDD_MM_L_WIDTH                                           0x8
-#define OMAP54XX_VOLRA_VDD_MM_L_MASK                                            (0xff << 8)
-
-/* Used by PRM_VC_SMPS_MPU_CONFIG */
-#define OMAP54XX_VOLRA_VDD_MPU_L_SHIFT                                          8
-#define OMAP54XX_VOLRA_VDD_MPU_L_WIDTH                                          0x8
-#define OMAP54XX_VOLRA_VDD_MPU_L_MASK                                           (0xff << 8)
-
-/* Used by PRM_VOLTST_MM, PRM_VOLTST_MPU */
-#define OMAP54XX_VOLTSTATEST_SHIFT                                              0
-#define OMAP54XX_VOLTSTATEST_WIDTH                                              0x2
-#define OMAP54XX_VOLTSTATEST_MASK                                               (0x3 << 0)
-
-/* Used by PRM_VP_CORE_CONFIG, PRM_VP_MM_CONFIG, PRM_VP_MPU_CONFIG */
-#define OMAP54XX_VPENABLE_SHIFT                                                 0
-#define OMAP54XX_VPENABLE_WIDTH                                                 0x1
-#define OMAP54XX_VPENABLE_MASK                                                  (1 << 0)
-
-/* Used by PRM_VP_CORE_STATUS, PRM_VP_MM_STATUS, PRM_VP_MPU_STATUS */
-#define OMAP54XX_VPINIDLE_SHIFT                                                 0
-#define OMAP54XX_VPINIDLE_WIDTH                                                 0x1
-#define OMAP54XX_VPINIDLE_MASK                                                  (1 << 0)
-
-/* Used by PRM_VP_CORE_VOLTAGE, PRM_VP_MM_VOLTAGE, PRM_VP_MPU_VOLTAGE */
-#define OMAP54XX_VPVOLTAGE_SHIFT                                                0
-#define OMAP54XX_VPVOLTAGE_WIDTH                                                0x8
-#define OMAP54XX_VPVOLTAGE_MASK                                                 (0xff << 0)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_VP_CORE_EQVALUE_EN_SHIFT                                       20
-#define OMAP54XX_VP_CORE_EQVALUE_EN_WIDTH                                       0x1
-#define OMAP54XX_VP_CORE_EQVALUE_EN_MASK                                        (1 << 20)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_VP_CORE_EQVALUE_ST_SHIFT                                       20
-#define OMAP54XX_VP_CORE_EQVALUE_ST_WIDTH                                       0x1
-#define OMAP54XX_VP_CORE_EQVALUE_ST_MASK                                        (1 << 20)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_VP_CORE_MAXVDD_EN_SHIFT                                        18
-#define OMAP54XX_VP_CORE_MAXVDD_EN_WIDTH                                        0x1
-#define OMAP54XX_VP_CORE_MAXVDD_EN_MASK                                         (1 << 18)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_VP_CORE_MAXVDD_ST_SHIFT                                        18
-#define OMAP54XX_VP_CORE_MAXVDD_ST_WIDTH                                        0x1
-#define OMAP54XX_VP_CORE_MAXVDD_ST_MASK                                         (1 << 18)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_VP_CORE_MINVDD_EN_SHIFT                                        17
-#define OMAP54XX_VP_CORE_MINVDD_EN_WIDTH                                        0x1
-#define OMAP54XX_VP_CORE_MINVDD_EN_MASK                                         (1 << 17)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_VP_CORE_MINVDD_ST_SHIFT                                        17
-#define OMAP54XX_VP_CORE_MINVDD_ST_WIDTH                                        0x1
-#define OMAP54XX_VP_CORE_MINVDD_ST_MASK                                         (1 << 17)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_VP_CORE_NOSMPSACK_EN_SHIFT                                     19
-#define OMAP54XX_VP_CORE_NOSMPSACK_EN_WIDTH                                     0x1
-#define OMAP54XX_VP_CORE_NOSMPSACK_EN_MASK                                      (1 << 19)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_VP_CORE_NOSMPSACK_ST_SHIFT                                     19
-#define OMAP54XX_VP_CORE_NOSMPSACK_ST_WIDTH                                     0x1
-#define OMAP54XX_VP_CORE_NOSMPSACK_ST_MASK                                      (1 << 19)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_VP_CORE_OPPCHANGEDONE_EN_SHIFT                                 16
-#define OMAP54XX_VP_CORE_OPPCHANGEDONE_EN_WIDTH                                 0x1
-#define OMAP54XX_VP_CORE_OPPCHANGEDONE_EN_MASK                                  (1 << 16)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_VP_CORE_OPPCHANGEDONE_ST_SHIFT                                 16
-#define OMAP54XX_VP_CORE_OPPCHANGEDONE_ST_WIDTH                                 0x1
-#define OMAP54XX_VP_CORE_OPPCHANGEDONE_ST_MASK                                  (1 << 16)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_VP_CORE_TRANXDONE_EN_SHIFT                                     21
-#define OMAP54XX_VP_CORE_TRANXDONE_EN_WIDTH                                     0x1
-#define OMAP54XX_VP_CORE_TRANXDONE_EN_MASK                                      (1 << 21)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_VP_CORE_TRANXDONE_ST_SHIFT                                     21
-#define OMAP54XX_VP_CORE_TRANXDONE_ST_WIDTH                                     0x1
-#define OMAP54XX_VP_CORE_TRANXDONE_ST_MASK                                      (1 << 21)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_VP_MM_EQVALUE_EN_SHIFT                                         28
-#define OMAP54XX_VP_MM_EQVALUE_EN_WIDTH                                         0x1
-#define OMAP54XX_VP_MM_EQVALUE_EN_MASK                                          (1 << 28)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_VP_MM_EQVALUE_ST_SHIFT                                         28
-#define OMAP54XX_VP_MM_EQVALUE_ST_WIDTH                                         0x1
-#define OMAP54XX_VP_MM_EQVALUE_ST_MASK                                          (1 << 28)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_VP_MM_MAXVDD_EN_SHIFT                                          26
-#define OMAP54XX_VP_MM_MAXVDD_EN_WIDTH                                          0x1
-#define OMAP54XX_VP_MM_MAXVDD_EN_MASK                                           (1 << 26)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_VP_MM_MAXVDD_ST_SHIFT                                          26
-#define OMAP54XX_VP_MM_MAXVDD_ST_WIDTH                                          0x1
-#define OMAP54XX_VP_MM_MAXVDD_ST_MASK                                           (1 << 26)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_VP_MM_MINVDD_EN_SHIFT                                          25
-#define OMAP54XX_VP_MM_MINVDD_EN_WIDTH                                          0x1
-#define OMAP54XX_VP_MM_MINVDD_EN_MASK                                           (1 << 25)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_VP_MM_MINVDD_ST_SHIFT                                          25
-#define OMAP54XX_VP_MM_MINVDD_ST_WIDTH                                          0x1
-#define OMAP54XX_VP_MM_MINVDD_ST_MASK                                           (1 << 25)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_VP_MM_NOSMPSACK_EN_SHIFT                                       27
-#define OMAP54XX_VP_MM_NOSMPSACK_EN_WIDTH                                       0x1
-#define OMAP54XX_VP_MM_NOSMPSACK_EN_MASK                                        (1 << 27)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_VP_MM_NOSMPSACK_ST_SHIFT                                       27
-#define OMAP54XX_VP_MM_NOSMPSACK_ST_WIDTH                                       0x1
-#define OMAP54XX_VP_MM_NOSMPSACK_ST_MASK                                        (1 << 27)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_VP_MM_OPPCHANGEDONE_EN_SHIFT                                   24
-#define OMAP54XX_VP_MM_OPPCHANGEDONE_EN_WIDTH                                   0x1
-#define OMAP54XX_VP_MM_OPPCHANGEDONE_EN_MASK                                    (1 << 24)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_VP_MM_OPPCHANGEDONE_ST_SHIFT                                   24
-#define OMAP54XX_VP_MM_OPPCHANGEDONE_ST_WIDTH                                   0x1
-#define OMAP54XX_VP_MM_OPPCHANGEDONE_ST_MASK                                    (1 << 24)
-
-/* Used by PRM_IRQENABLE_IPU, PRM_IRQENABLE_MPU */
-#define OMAP54XX_VP_MM_TRANXDONE_EN_SHIFT                                       29
-#define OMAP54XX_VP_MM_TRANXDONE_EN_WIDTH                                       0x1
-#define OMAP54XX_VP_MM_TRANXDONE_EN_MASK                                        (1 << 29)
-
-/* Used by PRM_IRQSTATUS_IPU, PRM_IRQSTATUS_MPU */
-#define OMAP54XX_VP_MM_TRANXDONE_ST_SHIFT                                       29
-#define OMAP54XX_VP_MM_TRANXDONE_ST_WIDTH                                       0x1
-#define OMAP54XX_VP_MM_TRANXDONE_ST_MASK                                        (1 << 29)
-
-/* Used by PRM_IRQENABLE_MPU_2 */
-#define OMAP54XX_VP_MPU_EQVALUE_EN_SHIFT                                        4
-#define OMAP54XX_VP_MPU_EQVALUE_EN_WIDTH                                        0x1
-#define OMAP54XX_VP_MPU_EQVALUE_EN_MASK                                         (1 << 4)
-
-/* Used by PRM_IRQSTATUS_MPU_2 */
-#define OMAP54XX_VP_MPU_EQVALUE_ST_SHIFT                                        4
-#define OMAP54XX_VP_MPU_EQVALUE_ST_WIDTH                                        0x1
-#define OMAP54XX_VP_MPU_EQVALUE_ST_MASK                                         (1 << 4)
-
-/* Used by PRM_IRQENABLE_MPU_2 */
-#define OMAP54XX_VP_MPU_MAXVDD_EN_SHIFT                                         2
-#define OMAP54XX_VP_MPU_MAXVDD_EN_WIDTH                                         0x1
-#define OMAP54XX_VP_MPU_MAXVDD_EN_MASK                                          (1 << 2)
-
-/* Used by PRM_IRQSTATUS_MPU_2 */
-#define OMAP54XX_VP_MPU_MAXVDD_ST_SHIFT                                         2
-#define OMAP54XX_VP_MPU_MAXVDD_ST_WIDTH                                         0x1
-#define OMAP54XX_VP_MPU_MAXVDD_ST_MASK                                          (1 << 2)
-
-/* Used by PRM_IRQENABLE_MPU_2 */
-#define OMAP54XX_VP_MPU_MINVDD_EN_SHIFT                                         1
-#define OMAP54XX_VP_MPU_MINVDD_EN_WIDTH                                         0x1
-#define OMAP54XX_VP_MPU_MINVDD_EN_MASK                                          (1 << 1)
-
-/* Used by PRM_IRQSTATUS_MPU_2 */
-#define OMAP54XX_VP_MPU_MINVDD_ST_SHIFT                                         1
-#define OMAP54XX_VP_MPU_MINVDD_ST_WIDTH                                         0x1
-#define OMAP54XX_VP_MPU_MINVDD_ST_MASK                                          (1 << 1)
-
-/* Used by PRM_IRQENABLE_MPU_2 */
-#define OMAP54XX_VP_MPU_NOSMPSACK_EN_SHIFT                                      3
-#define OMAP54XX_VP_MPU_NOSMPSACK_EN_WIDTH                                      0x1
-#define OMAP54XX_VP_MPU_NOSMPSACK_EN_MASK                                       (1 << 3)
-
-/* Used by PRM_IRQSTATUS_MPU_2 */
-#define OMAP54XX_VP_MPU_NOSMPSACK_ST_SHIFT                                      3
-#define OMAP54XX_VP_MPU_NOSMPSACK_ST_WIDTH                                      0x1
-#define OMAP54XX_VP_MPU_NOSMPSACK_ST_MASK                                       (1 << 3)
-
-/* Used by PRM_IRQENABLE_MPU_2 */
-#define OMAP54XX_VP_MPU_OPPCHANGEDONE_EN_SHIFT                                  0
-#define OMAP54XX_VP_MPU_OPPCHANGEDONE_EN_WIDTH                                  0x1
-#define OMAP54XX_VP_MPU_OPPCHANGEDONE_EN_MASK                                   (1 << 0)
-
-/* Used by PRM_IRQSTATUS_MPU_2 */
-#define OMAP54XX_VP_MPU_OPPCHANGEDONE_ST_SHIFT                                  0
-#define OMAP54XX_VP_MPU_OPPCHANGEDONE_ST_WIDTH                                  0x1
-#define OMAP54XX_VP_MPU_OPPCHANGEDONE_ST_MASK                                   (1 << 0)
-
-/* Used by PRM_IRQENABLE_MPU_2 */
-#define OMAP54XX_VP_MPU_TRANXDONE_EN_SHIFT                                      5
-#define OMAP54XX_VP_MPU_TRANXDONE_EN_WIDTH                                      0x1
-#define OMAP54XX_VP_MPU_TRANXDONE_EN_MASK                                       (1 << 5)
-
-/* Used by PRM_IRQSTATUS_MPU_2 */
-#define OMAP54XX_VP_MPU_TRANXDONE_ST_SHIFT                                      5
-#define OMAP54XX_VP_MPU_TRANXDONE_ST_WIDTH                                      0x1
-#define OMAP54XX_VP_MPU_TRANXDONE_ST_MASK                                       (1 << 5)
-
-/* Used by PRM_SRAM_COUNT */
-#define OMAP54XX_VSETUPCNT_VALUE_SHIFT                                          8
-#define OMAP54XX_VSETUPCNT_VALUE_WIDTH                                          0x8
-#define OMAP54XX_VSETUPCNT_VALUE_MASK                                           (0xff << 8)
-
-/* Used by PRM_VP_CORE_VSTEPMAX, PRM_VP_MM_VSTEPMAX, PRM_VP_MPU_VSTEPMAX */
-#define OMAP54XX_VSTEPMAX_SHIFT                                                 0
-#define OMAP54XX_VSTEPMAX_WIDTH                                                 0x8
-#define OMAP54XX_VSTEPMAX_MASK                                                  (0xff << 0)
-
-/* Used by PRM_VP_CORE_VSTEPMIN, PRM_VP_MM_VSTEPMIN, PRM_VP_MPU_VSTEPMIN */
-#define OMAP54XX_VSTEPMIN_SHIFT                                                 0
-#define OMAP54XX_VSTEPMIN_WIDTH                                                 0x8
-#define OMAP54XX_VSTEPMIN_MASK                                                  (0xff << 0)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP54XX_WKUPDEP_DISPC_DSP_SHIFT                                        2
-#define OMAP54XX_WKUPDEP_DISPC_DSP_WIDTH                                        0x1
-#define OMAP54XX_WKUPDEP_DISPC_DSP_MASK                                         (1 << 2)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP54XX_WKUPDEP_DISPC_IPU_SHIFT                                        1
-#define OMAP54XX_WKUPDEP_DISPC_IPU_WIDTH                                        0x1
-#define OMAP54XX_WKUPDEP_DISPC_IPU_MASK                                         (1 << 1)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP54XX_WKUPDEP_DISPC_MPU_SHIFT                                        0
-#define OMAP54XX_WKUPDEP_DISPC_MPU_WIDTH                                        0x1
-#define OMAP54XX_WKUPDEP_DISPC_MPU_MASK                                         (1 << 0)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP54XX_WKUPDEP_DISPC_SDMA_SHIFT                                       3
-#define OMAP54XX_WKUPDEP_DISPC_SDMA_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_DISPC_SDMA_MASK                                        (1 << 3)
-
-/* Used by PM_ABE_DMIC_WKDEP */
-#define OMAP54XX_WKUPDEP_DMIC_DMA_DSP_SHIFT                                     6
-#define OMAP54XX_WKUPDEP_DMIC_DMA_DSP_WIDTH                                     0x1
-#define OMAP54XX_WKUPDEP_DMIC_DMA_DSP_MASK                                      (1 << 6)
-
-/* Used by PM_ABE_DMIC_WKDEP */
-#define OMAP54XX_WKUPDEP_DMIC_DMA_SDMA_SHIFT                                    7
-#define OMAP54XX_WKUPDEP_DMIC_DMA_SDMA_WIDTH                                    0x1
-#define OMAP54XX_WKUPDEP_DMIC_DMA_SDMA_MASK                                     (1 << 7)
-
-/* Used by PM_ABE_DMIC_WKDEP */
-#define OMAP54XX_WKUPDEP_DMIC_IRQ_DSP_SHIFT                                     2
-#define OMAP54XX_WKUPDEP_DMIC_IRQ_DSP_WIDTH                                     0x1
-#define OMAP54XX_WKUPDEP_DMIC_IRQ_DSP_MASK                                      (1 << 2)
-
-/* Used by PM_ABE_DMIC_WKDEP */
-#define OMAP54XX_WKUPDEP_DMIC_IRQ_MPU_SHIFT                                     0
-#define OMAP54XX_WKUPDEP_DMIC_IRQ_MPU_WIDTH                                     0x1
-#define OMAP54XX_WKUPDEP_DMIC_IRQ_MPU_MASK                                      (1 << 0)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP54XX_WKUPDEP_DSI1_A_DSP_SHIFT                                       6
-#define OMAP54XX_WKUPDEP_DSI1_A_DSP_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_DSI1_A_DSP_MASK                                        (1 << 6)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP54XX_WKUPDEP_DSI1_A_IPU_SHIFT                                       5
-#define OMAP54XX_WKUPDEP_DSI1_A_IPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_DSI1_A_IPU_MASK                                        (1 << 5)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP54XX_WKUPDEP_DSI1_A_MPU_SHIFT                                       4
-#define OMAP54XX_WKUPDEP_DSI1_A_MPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_DSI1_A_MPU_MASK                                        (1 << 4)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP54XX_WKUPDEP_DSI1_A_SDMA_SHIFT                                      7
-#define OMAP54XX_WKUPDEP_DSI1_A_SDMA_WIDTH                                      0x1
-#define OMAP54XX_WKUPDEP_DSI1_A_SDMA_MASK                                       (1 << 7)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP54XX_WKUPDEP_DSI1_B_DSP_SHIFT                                       10
-#define OMAP54XX_WKUPDEP_DSI1_B_DSP_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_DSI1_B_DSP_MASK                                        (1 << 10)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP54XX_WKUPDEP_DSI1_B_IPU_SHIFT                                       9
-#define OMAP54XX_WKUPDEP_DSI1_B_IPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_DSI1_B_IPU_MASK                                        (1 << 9)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP54XX_WKUPDEP_DSI1_B_MPU_SHIFT                                       8
-#define OMAP54XX_WKUPDEP_DSI1_B_MPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_DSI1_B_MPU_MASK                                        (1 << 8)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP54XX_WKUPDEP_DSI1_B_SDMA_SHIFT                                      11
-#define OMAP54XX_WKUPDEP_DSI1_B_SDMA_WIDTH                                      0x1
-#define OMAP54XX_WKUPDEP_DSI1_B_SDMA_MASK                                       (1 << 11)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP54XX_WKUPDEP_DSI1_C_DSP_SHIFT                                       17
-#define OMAP54XX_WKUPDEP_DSI1_C_DSP_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_DSI1_C_DSP_MASK                                        (1 << 17)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP54XX_WKUPDEP_DSI1_C_IPU_SHIFT                                       16
-#define OMAP54XX_WKUPDEP_DSI1_C_IPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_DSI1_C_IPU_MASK                                        (1 << 16)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP54XX_WKUPDEP_DSI1_C_MPU_SHIFT                                       15
-#define OMAP54XX_WKUPDEP_DSI1_C_MPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_DSI1_C_MPU_MASK                                        (1 << 15)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP54XX_WKUPDEP_DSI1_C_SDMA_SHIFT                                      18
-#define OMAP54XX_WKUPDEP_DSI1_C_SDMA_WIDTH                                      0x1
-#define OMAP54XX_WKUPDEP_DSI1_C_SDMA_MASK                                       (1 << 18)
-
-/* Used by PM_WKUPAON_GPIO1_WKDEP */
-#define OMAP54XX_WKUPDEP_GPIO1_IRQ1_IPU_SHIFT                                   1
-#define OMAP54XX_WKUPDEP_GPIO1_IRQ1_IPU_WIDTH                                   0x1
-#define OMAP54XX_WKUPDEP_GPIO1_IRQ1_IPU_MASK                                    (1 << 1)
-
-/* Used by PM_WKUPAON_GPIO1_WKDEP */
-#define OMAP54XX_WKUPDEP_GPIO1_IRQ1_MPU_SHIFT                                   0
-#define OMAP54XX_WKUPDEP_GPIO1_IRQ1_MPU_WIDTH                                   0x1
-#define OMAP54XX_WKUPDEP_GPIO1_IRQ1_MPU_MASK                                    (1 << 0)
-
-/* Used by PM_WKUPAON_GPIO1_WKDEP */
-#define OMAP54XX_WKUPDEP_GPIO1_IRQ2_DSP_SHIFT                                   6
-#define OMAP54XX_WKUPDEP_GPIO1_IRQ2_DSP_WIDTH                                   0x1
-#define OMAP54XX_WKUPDEP_GPIO1_IRQ2_DSP_MASK                                    (1 << 6)
-
-/* Used by PM_L4PER_GPIO2_WKDEP */
-#define OMAP54XX_WKUPDEP_GPIO2_IRQ1_IPU_SHIFT                                   1
-#define OMAP54XX_WKUPDEP_GPIO2_IRQ1_IPU_WIDTH                                   0x1
-#define OMAP54XX_WKUPDEP_GPIO2_IRQ1_IPU_MASK                                    (1 << 1)
-
-/* Used by PM_L4PER_GPIO2_WKDEP */
-#define OMAP54XX_WKUPDEP_GPIO2_IRQ1_MPU_SHIFT                                   0
-#define OMAP54XX_WKUPDEP_GPIO2_IRQ1_MPU_WIDTH                                   0x1
-#define OMAP54XX_WKUPDEP_GPIO2_IRQ1_MPU_MASK                                    (1 << 0)
-
-/* Used by PM_L4PER_GPIO2_WKDEP */
-#define OMAP54XX_WKUPDEP_GPIO2_IRQ2_DSP_SHIFT                                   6
-#define OMAP54XX_WKUPDEP_GPIO2_IRQ2_DSP_WIDTH                                   0x1
-#define OMAP54XX_WKUPDEP_GPIO2_IRQ2_DSP_MASK                                    (1 << 6)
-
-/* Used by PM_L4PER_GPIO3_WKDEP */
-#define OMAP54XX_WKUPDEP_GPIO3_IRQ1_MPU_SHIFT                                   0
-#define OMAP54XX_WKUPDEP_GPIO3_IRQ1_MPU_WIDTH                                   0x1
-#define OMAP54XX_WKUPDEP_GPIO3_IRQ1_MPU_MASK                                    (1 << 0)
-
-/* Used by PM_L4PER_GPIO3_WKDEP */
-#define OMAP54XX_WKUPDEP_GPIO3_IRQ2_DSP_SHIFT                                   6
-#define OMAP54XX_WKUPDEP_GPIO3_IRQ2_DSP_WIDTH                                   0x1
-#define OMAP54XX_WKUPDEP_GPIO3_IRQ2_DSP_MASK                                    (1 << 6)
-
-/* Used by PM_L4PER_GPIO4_WKDEP */
-#define OMAP54XX_WKUPDEP_GPIO4_IRQ1_MPU_SHIFT                                   0
-#define OMAP54XX_WKUPDEP_GPIO4_IRQ1_MPU_WIDTH                                   0x1
-#define OMAP54XX_WKUPDEP_GPIO4_IRQ1_MPU_MASK                                    (1 << 0)
-
-/* Used by PM_L4PER_GPIO4_WKDEP */
-#define OMAP54XX_WKUPDEP_GPIO4_IRQ2_DSP_SHIFT                                   6
-#define OMAP54XX_WKUPDEP_GPIO4_IRQ2_DSP_WIDTH                                   0x1
-#define OMAP54XX_WKUPDEP_GPIO4_IRQ2_DSP_MASK                                    (1 << 6)
-
-/* Used by PM_L4PER_GPIO5_WKDEP */
-#define OMAP54XX_WKUPDEP_GPIO5_IRQ1_MPU_SHIFT                                   0
-#define OMAP54XX_WKUPDEP_GPIO5_IRQ1_MPU_WIDTH                                   0x1
-#define OMAP54XX_WKUPDEP_GPIO5_IRQ1_MPU_MASK                                    (1 << 0)
-
-/* Used by PM_L4PER_GPIO5_WKDEP */
-#define OMAP54XX_WKUPDEP_GPIO5_IRQ2_DSP_SHIFT                                   6
-#define OMAP54XX_WKUPDEP_GPIO5_IRQ2_DSP_WIDTH                                   0x1
-#define OMAP54XX_WKUPDEP_GPIO5_IRQ2_DSP_MASK                                    (1 << 6)
-
-/* Used by PM_L4PER_GPIO6_WKDEP */
-#define OMAP54XX_WKUPDEP_GPIO6_IRQ1_MPU_SHIFT                                   0
-#define OMAP54XX_WKUPDEP_GPIO6_IRQ1_MPU_WIDTH                                   0x1
-#define OMAP54XX_WKUPDEP_GPIO6_IRQ1_MPU_MASK                                    (1 << 0)
-
-/* Used by PM_L4PER_GPIO6_WKDEP */
-#define OMAP54XX_WKUPDEP_GPIO6_IRQ2_DSP_SHIFT                                   6
-#define OMAP54XX_WKUPDEP_GPIO6_IRQ2_DSP_WIDTH                                   0x1
-#define OMAP54XX_WKUPDEP_GPIO6_IRQ2_DSP_MASK                                    (1 << 6)
-
-/* Used by PM_L4PER_GPIO7_WKDEP */
-#define OMAP54XX_WKUPDEP_GPIO7_IRQ1_MPU_SHIFT                                   0
-#define OMAP54XX_WKUPDEP_GPIO7_IRQ1_MPU_WIDTH                                   0x1
-#define OMAP54XX_WKUPDEP_GPIO7_IRQ1_MPU_MASK                                    (1 << 0)
-
-/* Used by PM_L4PER_GPIO8_WKDEP */
-#define OMAP54XX_WKUPDEP_GPIO8_IRQ1_MPU_SHIFT                                   0
-#define OMAP54XX_WKUPDEP_GPIO8_IRQ1_MPU_WIDTH                                   0x1
-#define OMAP54XX_WKUPDEP_GPIO8_IRQ1_MPU_MASK                                    (1 << 0)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP54XX_WKUPDEP_HDMIDMA_SDMA_SHIFT                                     19
-#define OMAP54XX_WKUPDEP_HDMIDMA_SDMA_WIDTH                                     0x1
-#define OMAP54XX_WKUPDEP_HDMIDMA_SDMA_MASK                                      (1 << 19)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP54XX_WKUPDEP_HDMIIRQ_DSP_SHIFT                                      14
-#define OMAP54XX_WKUPDEP_HDMIIRQ_DSP_WIDTH                                      0x1
-#define OMAP54XX_WKUPDEP_HDMIIRQ_DSP_MASK                                       (1 << 14)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP54XX_WKUPDEP_HDMIIRQ_IPU_SHIFT                                      13
-#define OMAP54XX_WKUPDEP_HDMIIRQ_IPU_WIDTH                                      0x1
-#define OMAP54XX_WKUPDEP_HDMIIRQ_IPU_MASK                                       (1 << 13)
-
-/* Used by PM_DSS_DSS_WKDEP */
-#define OMAP54XX_WKUPDEP_HDMIIRQ_MPU_SHIFT                                      12
-#define OMAP54XX_WKUPDEP_HDMIIRQ_MPU_WIDTH                                      0x1
-#define OMAP54XX_WKUPDEP_HDMIIRQ_MPU_MASK                                       (1 << 12)
-
-/* Used by PM_L3INIT_HSI_WKDEP */
-#define OMAP54XX_WKUPDEP_HSI_DSP_DSP_SHIFT                                      6
-#define OMAP54XX_WKUPDEP_HSI_DSP_DSP_WIDTH                                      0x1
-#define OMAP54XX_WKUPDEP_HSI_DSP_DSP_MASK                                       (1 << 6)
-
-/* Used by PM_L3INIT_HSI_WKDEP */
-#define OMAP54XX_WKUPDEP_HSI_MCU_IPU_SHIFT                                      1
-#define OMAP54XX_WKUPDEP_HSI_MCU_IPU_WIDTH                                      0x1
-#define OMAP54XX_WKUPDEP_HSI_MCU_IPU_MASK                                       (1 << 1)
-
-/* Used by PM_L3INIT_HSI_WKDEP */
-#define OMAP54XX_WKUPDEP_HSI_MCU_MPU_SHIFT                                      0
-#define OMAP54XX_WKUPDEP_HSI_MCU_MPU_WIDTH                                      0x1
-#define OMAP54XX_WKUPDEP_HSI_MCU_MPU_MASK                                       (1 << 0)
-
-/* Used by PM_L4PER_I2C1_WKDEP */
-#define OMAP54XX_WKUPDEP_I2C1_DMA_SDMA_SHIFT                                    7
-#define OMAP54XX_WKUPDEP_I2C1_DMA_SDMA_WIDTH                                    0x1
-#define OMAP54XX_WKUPDEP_I2C1_DMA_SDMA_MASK                                     (1 << 7)
-
-/* Used by PM_L4PER_I2C1_WKDEP */
-#define OMAP54XX_WKUPDEP_I2C1_IRQ_IPU_SHIFT                                     1
-#define OMAP54XX_WKUPDEP_I2C1_IRQ_IPU_WIDTH                                     0x1
-#define OMAP54XX_WKUPDEP_I2C1_IRQ_IPU_MASK                                      (1 << 1)
-
-/* Used by PM_L4PER_I2C1_WKDEP */
-#define OMAP54XX_WKUPDEP_I2C1_IRQ_MPU_SHIFT                                     0
-#define OMAP54XX_WKUPDEP_I2C1_IRQ_MPU_WIDTH                                     0x1
-#define OMAP54XX_WKUPDEP_I2C1_IRQ_MPU_MASK                                      (1 << 0)
-
-/* Used by PM_L4PER_I2C2_WKDEP */
-#define OMAP54XX_WKUPDEP_I2C2_DMA_SDMA_SHIFT                                    7
-#define OMAP54XX_WKUPDEP_I2C2_DMA_SDMA_WIDTH                                    0x1
-#define OMAP54XX_WKUPDEP_I2C2_DMA_SDMA_MASK                                     (1 << 7)
-
-/* Used by PM_L4PER_I2C2_WKDEP */
-#define OMAP54XX_WKUPDEP_I2C2_IRQ_IPU_SHIFT                                     1
-#define OMAP54XX_WKUPDEP_I2C2_IRQ_IPU_WIDTH                                     0x1
-#define OMAP54XX_WKUPDEP_I2C2_IRQ_IPU_MASK                                      (1 << 1)
-
-/* Used by PM_L4PER_I2C2_WKDEP */
-#define OMAP54XX_WKUPDEP_I2C2_IRQ_MPU_SHIFT                                     0
-#define OMAP54XX_WKUPDEP_I2C2_IRQ_MPU_WIDTH                                     0x1
-#define OMAP54XX_WKUPDEP_I2C2_IRQ_MPU_MASK                                      (1 << 0)
-
-/* Used by PM_L4PER_I2C3_WKDEP */
-#define OMAP54XX_WKUPDEP_I2C3_DMA_SDMA_SHIFT                                    7
-#define OMAP54XX_WKUPDEP_I2C3_DMA_SDMA_WIDTH                                    0x1
-#define OMAP54XX_WKUPDEP_I2C3_DMA_SDMA_MASK                                     (1 << 7)
-
-/* Used by PM_L4PER_I2C3_WKDEP */
-#define OMAP54XX_WKUPDEP_I2C3_IRQ_IPU_SHIFT                                     1
-#define OMAP54XX_WKUPDEP_I2C3_IRQ_IPU_WIDTH                                     0x1
-#define OMAP54XX_WKUPDEP_I2C3_IRQ_IPU_MASK                                      (1 << 1)
-
-/* Used by PM_L4PER_I2C3_WKDEP */
-#define OMAP54XX_WKUPDEP_I2C3_IRQ_MPU_SHIFT                                     0
-#define OMAP54XX_WKUPDEP_I2C3_IRQ_MPU_WIDTH                                     0x1
-#define OMAP54XX_WKUPDEP_I2C3_IRQ_MPU_MASK                                      (1 << 0)
-
-/* Used by PM_L4PER_I2C4_WKDEP */
-#define OMAP54XX_WKUPDEP_I2C4_DMA_SDMA_SHIFT                                    7
-#define OMAP54XX_WKUPDEP_I2C4_DMA_SDMA_WIDTH                                    0x1
-#define OMAP54XX_WKUPDEP_I2C4_DMA_SDMA_MASK                                     (1 << 7)
-
-/* Used by PM_L4PER_I2C4_WKDEP */
-#define OMAP54XX_WKUPDEP_I2C4_IRQ_IPU_SHIFT                                     1
-#define OMAP54XX_WKUPDEP_I2C4_IRQ_IPU_WIDTH                                     0x1
-#define OMAP54XX_WKUPDEP_I2C4_IRQ_IPU_MASK                                      (1 << 1)
-
-/* Used by PM_L4PER_I2C4_WKDEP */
-#define OMAP54XX_WKUPDEP_I2C4_IRQ_MPU_SHIFT                                     0
-#define OMAP54XX_WKUPDEP_I2C4_IRQ_MPU_WIDTH                                     0x1
-#define OMAP54XX_WKUPDEP_I2C4_IRQ_MPU_MASK                                      (1 << 0)
-
-/* Used by PM_L4PER_I2C5_WKDEP */
-#define OMAP54XX_WKUPDEP_I2C5_IRQ_MPU_SHIFT                                     0
-#define OMAP54XX_WKUPDEP_I2C5_IRQ_MPU_WIDTH                                     0x1
-#define OMAP54XX_WKUPDEP_I2C5_IRQ_MPU_MASK                                      (1 << 0)
-
-/* Used by PM_WKUPAON_KBD_WKDEP */
-#define OMAP54XX_WKUPDEP_KBD_MPU_SHIFT                                          0
-#define OMAP54XX_WKUPDEP_KBD_MPU_WIDTH                                          0x1
-#define OMAP54XX_WKUPDEP_KBD_MPU_MASK                                           (1 << 0)
-
-/* Used by PM_ABE_MCASP_WKDEP */
-#define OMAP54XX_WKUPDEP_MCASP_DMA_DSP_SHIFT                                    6
-#define OMAP54XX_WKUPDEP_MCASP_DMA_DSP_WIDTH                                    0x1
-#define OMAP54XX_WKUPDEP_MCASP_DMA_DSP_MASK                                     (1 << 6)
-
-/* Used by PM_ABE_MCASP_WKDEP */
-#define OMAP54XX_WKUPDEP_MCASP_DMA_SDMA_SHIFT                                   7
-#define OMAP54XX_WKUPDEP_MCASP_DMA_SDMA_WIDTH                                   0x1
-#define OMAP54XX_WKUPDEP_MCASP_DMA_SDMA_MASK                                    (1 << 7)
-
-/* Used by PM_ABE_MCASP_WKDEP */
-#define OMAP54XX_WKUPDEP_MCASP_IRQ_DSP_SHIFT                                    2
-#define OMAP54XX_WKUPDEP_MCASP_IRQ_DSP_WIDTH                                    0x1
-#define OMAP54XX_WKUPDEP_MCASP_IRQ_DSP_MASK                                     (1 << 2)
-
-/* Used by PM_ABE_MCASP_WKDEP */
-#define OMAP54XX_WKUPDEP_MCASP_IRQ_MPU_SHIFT                                    0
-#define OMAP54XX_WKUPDEP_MCASP_IRQ_MPU_WIDTH                                    0x1
-#define OMAP54XX_WKUPDEP_MCASP_IRQ_MPU_MASK                                     (1 << 0)
-
-/* Used by PM_ABE_MCBSP1_WKDEP */
-#define OMAP54XX_WKUPDEP_MCBSP1_DSP_SHIFT                                       2
-#define OMAP54XX_WKUPDEP_MCBSP1_DSP_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_MCBSP1_DSP_MASK                                        (1 << 2)
-
-/* Used by PM_ABE_MCBSP1_WKDEP */
-#define OMAP54XX_WKUPDEP_MCBSP1_MPU_SHIFT                                       0
-#define OMAP54XX_WKUPDEP_MCBSP1_MPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_MCBSP1_MPU_MASK                                        (1 << 0)
-
-/* Used by PM_ABE_MCBSP1_WKDEP */
-#define OMAP54XX_WKUPDEP_MCBSP1_SDMA_SHIFT                                      3
-#define OMAP54XX_WKUPDEP_MCBSP1_SDMA_WIDTH                                      0x1
-#define OMAP54XX_WKUPDEP_MCBSP1_SDMA_MASK                                       (1 << 3)
-
-/* Used by PM_ABE_MCBSP2_WKDEP */
-#define OMAP54XX_WKUPDEP_MCBSP2_DSP_SHIFT                                       2
-#define OMAP54XX_WKUPDEP_MCBSP2_DSP_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_MCBSP2_DSP_MASK                                        (1 << 2)
-
-/* Used by PM_ABE_MCBSP2_WKDEP */
-#define OMAP54XX_WKUPDEP_MCBSP2_MPU_SHIFT                                       0
-#define OMAP54XX_WKUPDEP_MCBSP2_MPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_MCBSP2_MPU_MASK                                        (1 << 0)
-
-/* Used by PM_ABE_MCBSP2_WKDEP */
-#define OMAP54XX_WKUPDEP_MCBSP2_SDMA_SHIFT                                      3
-#define OMAP54XX_WKUPDEP_MCBSP2_SDMA_WIDTH                                      0x1
-#define OMAP54XX_WKUPDEP_MCBSP2_SDMA_MASK                                       (1 << 3)
-
-/* Used by PM_ABE_MCBSP3_WKDEP */
-#define OMAP54XX_WKUPDEP_MCBSP3_DSP_SHIFT                                       2
-#define OMAP54XX_WKUPDEP_MCBSP3_DSP_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_MCBSP3_DSP_MASK                                        (1 << 2)
-
-/* Used by PM_ABE_MCBSP3_WKDEP */
-#define OMAP54XX_WKUPDEP_MCBSP3_MPU_SHIFT                                       0
-#define OMAP54XX_WKUPDEP_MCBSP3_MPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_MCBSP3_MPU_MASK                                        (1 << 0)
-
-/* Used by PM_ABE_MCBSP3_WKDEP */
-#define OMAP54XX_WKUPDEP_MCBSP3_SDMA_SHIFT                                      3
-#define OMAP54XX_WKUPDEP_MCBSP3_SDMA_WIDTH                                      0x1
-#define OMAP54XX_WKUPDEP_MCBSP3_SDMA_MASK                                       (1 << 3)
-
-/* Used by PM_ABE_MCPDM_WKDEP */
-#define OMAP54XX_WKUPDEP_MCPDM_DMA_DSP_SHIFT                                    6
-#define OMAP54XX_WKUPDEP_MCPDM_DMA_DSP_WIDTH                                    0x1
-#define OMAP54XX_WKUPDEP_MCPDM_DMA_DSP_MASK                                     (1 << 6)
-
-/* Used by PM_ABE_MCPDM_WKDEP */
-#define OMAP54XX_WKUPDEP_MCPDM_DMA_SDMA_SHIFT                                   7
-#define OMAP54XX_WKUPDEP_MCPDM_DMA_SDMA_WIDTH                                   0x1
-#define OMAP54XX_WKUPDEP_MCPDM_DMA_SDMA_MASK                                    (1 << 7)
-
-/* Used by PM_ABE_MCPDM_WKDEP */
-#define OMAP54XX_WKUPDEP_MCPDM_IRQ_DSP_SHIFT                                    2
-#define OMAP54XX_WKUPDEP_MCPDM_IRQ_DSP_WIDTH                                    0x1
-#define OMAP54XX_WKUPDEP_MCPDM_IRQ_DSP_MASK                                     (1 << 2)
-
-/* Used by PM_ABE_MCPDM_WKDEP */
-#define OMAP54XX_WKUPDEP_MCPDM_IRQ_MPU_SHIFT                                    0
-#define OMAP54XX_WKUPDEP_MCPDM_IRQ_MPU_WIDTH                                    0x1
-#define OMAP54XX_WKUPDEP_MCPDM_IRQ_MPU_MASK                                     (1 << 0)
-
-/* Used by PM_L4PER_MCSPI1_WKDEP */
-#define OMAP54XX_WKUPDEP_MCSPI1_DSP_SHIFT                                       2
-#define OMAP54XX_WKUPDEP_MCSPI1_DSP_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_MCSPI1_DSP_MASK                                        (1 << 2)
-
-/* Used by PM_L4PER_MCSPI1_WKDEP */
-#define OMAP54XX_WKUPDEP_MCSPI1_IPU_SHIFT                                       1
-#define OMAP54XX_WKUPDEP_MCSPI1_IPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_MCSPI1_IPU_MASK                                        (1 << 1)
-
-/* Used by PM_L4PER_MCSPI1_WKDEP */
-#define OMAP54XX_WKUPDEP_MCSPI1_MPU_SHIFT                                       0
-#define OMAP54XX_WKUPDEP_MCSPI1_MPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_MCSPI1_MPU_MASK                                        (1 << 0)
-
-/* Used by PM_L4PER_MCSPI1_WKDEP */
-#define OMAP54XX_WKUPDEP_MCSPI1_SDMA_SHIFT                                      3
-#define OMAP54XX_WKUPDEP_MCSPI1_SDMA_WIDTH                                      0x1
-#define OMAP54XX_WKUPDEP_MCSPI1_SDMA_MASK                                       (1 << 3)
-
-/* Used by PM_L4PER_MCSPI2_WKDEP */
-#define OMAP54XX_WKUPDEP_MCSPI2_IPU_SHIFT                                       1
-#define OMAP54XX_WKUPDEP_MCSPI2_IPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_MCSPI2_IPU_MASK                                        (1 << 1)
-
-/* Used by PM_L4PER_MCSPI2_WKDEP */
-#define OMAP54XX_WKUPDEP_MCSPI2_MPU_SHIFT                                       0
-#define OMAP54XX_WKUPDEP_MCSPI2_MPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_MCSPI2_MPU_MASK                                        (1 << 0)
-
-/* Used by PM_L4PER_MCSPI2_WKDEP */
-#define OMAP54XX_WKUPDEP_MCSPI2_SDMA_SHIFT                                      3
-#define OMAP54XX_WKUPDEP_MCSPI2_SDMA_WIDTH                                      0x1
-#define OMAP54XX_WKUPDEP_MCSPI2_SDMA_MASK                                       (1 << 3)
-
-/* Used by PM_L4PER_MCSPI3_WKDEP */
-#define OMAP54XX_WKUPDEP_MCSPI3_MPU_SHIFT                                       0
-#define OMAP54XX_WKUPDEP_MCSPI3_MPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_MCSPI3_MPU_MASK                                        (1 << 0)
-
-/* Used by PM_L4PER_MCSPI3_WKDEP */
-#define OMAP54XX_WKUPDEP_MCSPI3_SDMA_SHIFT                                      3
-#define OMAP54XX_WKUPDEP_MCSPI3_SDMA_WIDTH                                      0x1
-#define OMAP54XX_WKUPDEP_MCSPI3_SDMA_MASK                                       (1 << 3)
-
-/* Used by PM_L4PER_MCSPI4_WKDEP */
-#define OMAP54XX_WKUPDEP_MCSPI4_MPU_SHIFT                                       0
-#define OMAP54XX_WKUPDEP_MCSPI4_MPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_MCSPI4_MPU_MASK                                        (1 << 0)
-
-/* Used by PM_L4PER_MCSPI4_WKDEP */
-#define OMAP54XX_WKUPDEP_MCSPI4_SDMA_SHIFT                                      3
-#define OMAP54XX_WKUPDEP_MCSPI4_SDMA_WIDTH                                      0x1
-#define OMAP54XX_WKUPDEP_MCSPI4_SDMA_MASK                                       (1 << 3)
-
-/* Used by PM_L3INIT_MMC1_WKDEP */
-#define OMAP54XX_WKUPDEP_MMC1_DSP_SHIFT                                         2
-#define OMAP54XX_WKUPDEP_MMC1_DSP_WIDTH                                         0x1
-#define OMAP54XX_WKUPDEP_MMC1_DSP_MASK                                          (1 << 2)
-
-/* Used by PM_L3INIT_MMC1_WKDEP */
-#define OMAP54XX_WKUPDEP_MMC1_IPU_SHIFT                                         1
-#define OMAP54XX_WKUPDEP_MMC1_IPU_WIDTH                                         0x1
-#define OMAP54XX_WKUPDEP_MMC1_IPU_MASK                                          (1 << 1)
-
-/* Used by PM_L3INIT_MMC1_WKDEP */
-#define OMAP54XX_WKUPDEP_MMC1_MPU_SHIFT                                         0
-#define OMAP54XX_WKUPDEP_MMC1_MPU_WIDTH                                         0x1
-#define OMAP54XX_WKUPDEP_MMC1_MPU_MASK                                          (1 << 0)
-
-/* Used by PM_L3INIT_MMC1_WKDEP */
-#define OMAP54XX_WKUPDEP_MMC1_SDMA_SHIFT                                        3
-#define OMAP54XX_WKUPDEP_MMC1_SDMA_WIDTH                                        0x1
-#define OMAP54XX_WKUPDEP_MMC1_SDMA_MASK                                         (1 << 3)
-
-/* Used by PM_L3INIT_MMC2_WKDEP */
-#define OMAP54XX_WKUPDEP_MMC2_DSP_SHIFT                                         2
-#define OMAP54XX_WKUPDEP_MMC2_DSP_WIDTH                                         0x1
-#define OMAP54XX_WKUPDEP_MMC2_DSP_MASK                                          (1 << 2)
-
-/* Used by PM_L3INIT_MMC2_WKDEP */
-#define OMAP54XX_WKUPDEP_MMC2_IPU_SHIFT                                         1
-#define OMAP54XX_WKUPDEP_MMC2_IPU_WIDTH                                         0x1
-#define OMAP54XX_WKUPDEP_MMC2_IPU_MASK                                          (1 << 1)
-
-/* Used by PM_L3INIT_MMC2_WKDEP */
-#define OMAP54XX_WKUPDEP_MMC2_MPU_SHIFT                                         0
-#define OMAP54XX_WKUPDEP_MMC2_MPU_WIDTH                                         0x1
-#define OMAP54XX_WKUPDEP_MMC2_MPU_MASK                                          (1 << 0)
-
-/* Used by PM_L3INIT_MMC2_WKDEP */
-#define OMAP54XX_WKUPDEP_MMC2_SDMA_SHIFT                                        3
-#define OMAP54XX_WKUPDEP_MMC2_SDMA_WIDTH                                        0x1
-#define OMAP54XX_WKUPDEP_MMC2_SDMA_MASK                                         (1 << 3)
-
-/* Used by PM_L4PER_MMC3_WKDEP */
-#define OMAP54XX_WKUPDEP_MMC3_IPU_SHIFT                                         1
-#define OMAP54XX_WKUPDEP_MMC3_IPU_WIDTH                                         0x1
-#define OMAP54XX_WKUPDEP_MMC3_IPU_MASK                                          (1 << 1)
-
-/* Used by PM_L4PER_MMC3_WKDEP */
-#define OMAP54XX_WKUPDEP_MMC3_MPU_SHIFT                                         0
-#define OMAP54XX_WKUPDEP_MMC3_MPU_WIDTH                                         0x1
-#define OMAP54XX_WKUPDEP_MMC3_MPU_MASK                                          (1 << 0)
-
-/* Used by PM_L4PER_MMC3_WKDEP */
-#define OMAP54XX_WKUPDEP_MMC3_SDMA_SHIFT                                        3
-#define OMAP54XX_WKUPDEP_MMC3_SDMA_WIDTH                                        0x1
-#define OMAP54XX_WKUPDEP_MMC3_SDMA_MASK                                         (1 << 3)
-
-/* Used by PM_L4PER_MMC4_WKDEP */
-#define OMAP54XX_WKUPDEP_MMC4_MPU_SHIFT                                         0
-#define OMAP54XX_WKUPDEP_MMC4_MPU_WIDTH                                         0x1
-#define OMAP54XX_WKUPDEP_MMC4_MPU_MASK                                          (1 << 0)
-
-/* Used by PM_L4PER_MMC4_WKDEP */
-#define OMAP54XX_WKUPDEP_MMC4_SDMA_SHIFT                                        3
-#define OMAP54XX_WKUPDEP_MMC4_SDMA_WIDTH                                        0x1
-#define OMAP54XX_WKUPDEP_MMC4_SDMA_MASK                                         (1 << 3)
-
-/* Used by PM_L4PER_MMC5_WKDEP */
-#define OMAP54XX_WKUPDEP_MMC5_MPU_SHIFT                                         0
-#define OMAP54XX_WKUPDEP_MMC5_MPU_WIDTH                                         0x1
-#define OMAP54XX_WKUPDEP_MMC5_MPU_MASK                                          (1 << 0)
-
-/* Used by PM_L4PER_MMC5_WKDEP */
-#define OMAP54XX_WKUPDEP_MMC5_SDMA_SHIFT                                        3
-#define OMAP54XX_WKUPDEP_MMC5_SDMA_WIDTH                                        0x1
-#define OMAP54XX_WKUPDEP_MMC5_SDMA_MASK                                         (1 << 3)
-
-/* Used by PM_L3INIT_SATA_WKDEP */
-#define OMAP54XX_WKUPDEP_SATA_MPU_SHIFT                                         0
-#define OMAP54XX_WKUPDEP_SATA_MPU_WIDTH                                         0x1
-#define OMAP54XX_WKUPDEP_SATA_MPU_MASK                                          (1 << 0)
-
-/* Used by PM_ABE_SLIMBUS1_WKDEP */
-#define OMAP54XX_WKUPDEP_SLIMBUS1_DMA_DSP_SHIFT                                 6
-#define OMAP54XX_WKUPDEP_SLIMBUS1_DMA_DSP_WIDTH                                 0x1
-#define OMAP54XX_WKUPDEP_SLIMBUS1_DMA_DSP_MASK                                  (1 << 6)
-
-/* Used by PM_ABE_SLIMBUS1_WKDEP */
-#define OMAP54XX_WKUPDEP_SLIMBUS1_DMA_SDMA_SHIFT                                7
-#define OMAP54XX_WKUPDEP_SLIMBUS1_DMA_SDMA_WIDTH                                0x1
-#define OMAP54XX_WKUPDEP_SLIMBUS1_DMA_SDMA_MASK                                 (1 << 7)
-
-/* Used by PM_ABE_SLIMBUS1_WKDEP */
-#define OMAP54XX_WKUPDEP_SLIMBUS1_IRQ_DSP_SHIFT                                 2
-#define OMAP54XX_WKUPDEP_SLIMBUS1_IRQ_DSP_WIDTH                                 0x1
-#define OMAP54XX_WKUPDEP_SLIMBUS1_IRQ_DSP_MASK                                  (1 << 2)
-
-/* Used by PM_ABE_SLIMBUS1_WKDEP */
-#define OMAP54XX_WKUPDEP_SLIMBUS1_IRQ_MPU_SHIFT                                 0
-#define OMAP54XX_WKUPDEP_SLIMBUS1_IRQ_MPU_WIDTH                                 0x1
-#define OMAP54XX_WKUPDEP_SLIMBUS1_IRQ_MPU_MASK                                  (1 << 0)
-
-/* Used by PM_COREAON_SMARTREFLEX_CORE_WKDEP */
-#define OMAP54XX_WKUPDEP_SMARTREFLEX_CORE_IPU_SHIFT                             1
-#define OMAP54XX_WKUPDEP_SMARTREFLEX_CORE_IPU_WIDTH                             0x1
-#define OMAP54XX_WKUPDEP_SMARTREFLEX_CORE_IPU_MASK                              (1 << 1)
-
-/* Used by PM_COREAON_SMARTREFLEX_CORE_WKDEP */
-#define OMAP54XX_WKUPDEP_SMARTREFLEX_CORE_MPU_SHIFT                             0
-#define OMAP54XX_WKUPDEP_SMARTREFLEX_CORE_MPU_WIDTH                             0x1
-#define OMAP54XX_WKUPDEP_SMARTREFLEX_CORE_MPU_MASK                              (1 << 0)
-
-/* Used by PM_COREAON_SMARTREFLEX_MM_WKDEP */
-#define OMAP54XX_WKUPDEP_SMARTREFLEX_MM_MPU_SHIFT                               0
-#define OMAP54XX_WKUPDEP_SMARTREFLEX_MM_MPU_WIDTH                               0x1
-#define OMAP54XX_WKUPDEP_SMARTREFLEX_MM_MPU_MASK                                (1 << 0)
-
-/* Used by PM_COREAON_SMARTREFLEX_MPU_WKDEP */
-#define OMAP54XX_WKUPDEP_SMARTREFLEX_MPU_MPU_SHIFT                              0
-#define OMAP54XX_WKUPDEP_SMARTREFLEX_MPU_MPU_WIDTH                              0x1
-#define OMAP54XX_WKUPDEP_SMARTREFLEX_MPU_MPU_MASK                               (1 << 0)
-
-/* Used by PM_L4PER_TIMER10_WKDEP */
-#define OMAP54XX_WKUPDEP_TIMER10_MPU_SHIFT                                      0
-#define OMAP54XX_WKUPDEP_TIMER10_MPU_WIDTH                                      0x1
-#define OMAP54XX_WKUPDEP_TIMER10_MPU_MASK                                       (1 << 0)
-
-/* Used by PM_L4PER_TIMER11_WKDEP */
-#define OMAP54XX_WKUPDEP_TIMER11_IPU_SHIFT                                      1
-#define OMAP54XX_WKUPDEP_TIMER11_IPU_WIDTH                                      0x1
-#define OMAP54XX_WKUPDEP_TIMER11_IPU_MASK                                       (1 << 1)
-
-/* Used by PM_L4PER_TIMER11_WKDEP */
-#define OMAP54XX_WKUPDEP_TIMER11_MPU_SHIFT                                      0
-#define OMAP54XX_WKUPDEP_TIMER11_MPU_WIDTH                                      0x1
-#define OMAP54XX_WKUPDEP_TIMER11_MPU_MASK                                       (1 << 0)
-
-/* Used by PM_WKUPAON_TIMER12_WKDEP */
-#define OMAP54XX_WKUPDEP_TIMER12_MPU_SHIFT                                      0
-#define OMAP54XX_WKUPDEP_TIMER12_MPU_WIDTH                                      0x1
-#define OMAP54XX_WKUPDEP_TIMER12_MPU_MASK                                       (1 << 0)
-
-/* Used by PM_WKUPAON_TIMER1_WKDEP */
-#define OMAP54XX_WKUPDEP_TIMER1_MPU_SHIFT                                       0
-#define OMAP54XX_WKUPDEP_TIMER1_MPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_TIMER1_MPU_MASK                                        (1 << 0)
-
-/* Used by PM_L4PER_TIMER2_WKDEP */
-#define OMAP54XX_WKUPDEP_TIMER2_MPU_SHIFT                                       0
-#define OMAP54XX_WKUPDEP_TIMER2_MPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_TIMER2_MPU_MASK                                        (1 << 0)
-
-/* Used by PM_L4PER_TIMER3_WKDEP */
-#define OMAP54XX_WKUPDEP_TIMER3_IPU_SHIFT                                       1
-#define OMAP54XX_WKUPDEP_TIMER3_IPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_TIMER3_IPU_MASK                                        (1 << 1)
-
-/* Used by PM_L4PER_TIMER3_WKDEP */
-#define OMAP54XX_WKUPDEP_TIMER3_MPU_SHIFT                                       0
-#define OMAP54XX_WKUPDEP_TIMER3_MPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_TIMER3_MPU_MASK                                        (1 << 0)
-
-/* Used by PM_L4PER_TIMER4_WKDEP */
-#define OMAP54XX_WKUPDEP_TIMER4_IPU_SHIFT                                       1
-#define OMAP54XX_WKUPDEP_TIMER4_IPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_TIMER4_IPU_MASK                                        (1 << 1)
-
-/* Used by PM_L4PER_TIMER4_WKDEP */
-#define OMAP54XX_WKUPDEP_TIMER4_MPU_SHIFT                                       0
-#define OMAP54XX_WKUPDEP_TIMER4_MPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_TIMER4_MPU_MASK                                        (1 << 0)
-
-/* Used by PM_ABE_TIMER5_WKDEP */
-#define OMAP54XX_WKUPDEP_TIMER5_DSP_SHIFT                                       2
-#define OMAP54XX_WKUPDEP_TIMER5_DSP_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_TIMER5_DSP_MASK                                        (1 << 2)
-
-/* Used by PM_ABE_TIMER5_WKDEP */
-#define OMAP54XX_WKUPDEP_TIMER5_MPU_SHIFT                                       0
-#define OMAP54XX_WKUPDEP_TIMER5_MPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_TIMER5_MPU_MASK                                        (1 << 0)
-
-/* Used by PM_ABE_TIMER6_WKDEP */
-#define OMAP54XX_WKUPDEP_TIMER6_DSP_SHIFT                                       2
-#define OMAP54XX_WKUPDEP_TIMER6_DSP_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_TIMER6_DSP_MASK                                        (1 << 2)
-
-/* Used by PM_ABE_TIMER6_WKDEP */
-#define OMAP54XX_WKUPDEP_TIMER6_MPU_SHIFT                                       0
-#define OMAP54XX_WKUPDEP_TIMER6_MPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_TIMER6_MPU_MASK                                        (1 << 0)
-
-/* Used by PM_ABE_TIMER7_WKDEP */
-#define OMAP54XX_WKUPDEP_TIMER7_DSP_SHIFT                                       2
-#define OMAP54XX_WKUPDEP_TIMER7_DSP_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_TIMER7_DSP_MASK                                        (1 << 2)
-
-/* Used by PM_ABE_TIMER7_WKDEP */
-#define OMAP54XX_WKUPDEP_TIMER7_MPU_SHIFT                                       0
-#define OMAP54XX_WKUPDEP_TIMER7_MPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_TIMER7_MPU_MASK                                        (1 << 0)
-
-/* Used by PM_ABE_TIMER8_WKDEP */
-#define OMAP54XX_WKUPDEP_TIMER8_DSP_SHIFT                                       2
-#define OMAP54XX_WKUPDEP_TIMER8_DSP_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_TIMER8_DSP_MASK                                        (1 << 2)
-
-/* Used by PM_ABE_TIMER8_WKDEP */
-#define OMAP54XX_WKUPDEP_TIMER8_MPU_SHIFT                                       0
-#define OMAP54XX_WKUPDEP_TIMER8_MPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_TIMER8_MPU_MASK                                        (1 << 0)
-
-/* Used by PM_L4PER_TIMER9_WKDEP */
-#define OMAP54XX_WKUPDEP_TIMER9_IPU_SHIFT                                       1
-#define OMAP54XX_WKUPDEP_TIMER9_IPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_TIMER9_IPU_MASK                                        (1 << 1)
-
-/* Used by PM_L4PER_TIMER9_WKDEP */
-#define OMAP54XX_WKUPDEP_TIMER9_MPU_SHIFT                                       0
-#define OMAP54XX_WKUPDEP_TIMER9_MPU_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_TIMER9_MPU_MASK                                        (1 << 0)
-
-/* Used by PM_L4PER_UART1_WKDEP */
-#define OMAP54XX_WKUPDEP_UART1_MPU_SHIFT                                        0
-#define OMAP54XX_WKUPDEP_UART1_MPU_WIDTH                                        0x1
-#define OMAP54XX_WKUPDEP_UART1_MPU_MASK                                         (1 << 0)
-
-/* Used by PM_L4PER_UART1_WKDEP */
-#define OMAP54XX_WKUPDEP_UART1_SDMA_SHIFT                                       3
-#define OMAP54XX_WKUPDEP_UART1_SDMA_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_UART1_SDMA_MASK                                        (1 << 3)
-
-/* Used by PM_L4PER_UART2_WKDEP */
-#define OMAP54XX_WKUPDEP_UART2_MPU_SHIFT                                        0
-#define OMAP54XX_WKUPDEP_UART2_MPU_WIDTH                                        0x1
-#define OMAP54XX_WKUPDEP_UART2_MPU_MASK                                         (1 << 0)
-
-/* Used by PM_L4PER_UART2_WKDEP */
-#define OMAP54XX_WKUPDEP_UART2_SDMA_SHIFT                                       3
-#define OMAP54XX_WKUPDEP_UART2_SDMA_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_UART2_SDMA_MASK                                        (1 << 3)
-
-/* Used by PM_L4PER_UART3_WKDEP */
-#define OMAP54XX_WKUPDEP_UART3_DSP_SHIFT                                        2
-#define OMAP54XX_WKUPDEP_UART3_DSP_WIDTH                                        0x1
-#define OMAP54XX_WKUPDEP_UART3_DSP_MASK                                         (1 << 2)
-
-/* Used by PM_L4PER_UART3_WKDEP */
-#define OMAP54XX_WKUPDEP_UART3_IPU_SHIFT                                        1
-#define OMAP54XX_WKUPDEP_UART3_IPU_WIDTH                                        0x1
-#define OMAP54XX_WKUPDEP_UART3_IPU_MASK                                         (1 << 1)
-
-/* Used by PM_L4PER_UART3_WKDEP */
-#define OMAP54XX_WKUPDEP_UART3_MPU_SHIFT                                        0
-#define OMAP54XX_WKUPDEP_UART3_MPU_WIDTH                                        0x1
-#define OMAP54XX_WKUPDEP_UART3_MPU_MASK                                         (1 << 0)
-
-/* Used by PM_L4PER_UART3_WKDEP */
-#define OMAP54XX_WKUPDEP_UART3_SDMA_SHIFT                                       3
-#define OMAP54XX_WKUPDEP_UART3_SDMA_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_UART3_SDMA_MASK                                        (1 << 3)
-
-/* Used by PM_L4PER_UART4_WKDEP */
-#define OMAP54XX_WKUPDEP_UART4_MPU_SHIFT                                        0
-#define OMAP54XX_WKUPDEP_UART4_MPU_WIDTH                                        0x1
-#define OMAP54XX_WKUPDEP_UART4_MPU_MASK                                         (1 << 0)
-
-/* Used by PM_L4PER_UART4_WKDEP */
-#define OMAP54XX_WKUPDEP_UART4_SDMA_SHIFT                                       3
-#define OMAP54XX_WKUPDEP_UART4_SDMA_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_UART4_SDMA_MASK                                        (1 << 3)
-
-/* Used by PM_L4PER_UART5_WKDEP */
-#define OMAP54XX_WKUPDEP_UART5_MPU_SHIFT                                        0
-#define OMAP54XX_WKUPDEP_UART5_MPU_WIDTH                                        0x1
-#define OMAP54XX_WKUPDEP_UART5_MPU_MASK                                         (1 << 0)
-
-/* Used by PM_L4PER_UART5_WKDEP */
-#define OMAP54XX_WKUPDEP_UART5_SDMA_SHIFT                                       3
-#define OMAP54XX_WKUPDEP_UART5_SDMA_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_UART5_SDMA_MASK                                        (1 << 3)
-
-/* Used by PM_L4PER_UART6_WKDEP */
-#define OMAP54XX_WKUPDEP_UART6_MPU_SHIFT                                        0
-#define OMAP54XX_WKUPDEP_UART6_MPU_WIDTH                                        0x1
-#define OMAP54XX_WKUPDEP_UART6_MPU_MASK                                         (1 << 0)
-
-/* Used by PM_L4PER_UART6_WKDEP */
-#define OMAP54XX_WKUPDEP_UART6_SDMA_SHIFT                                       3
-#define OMAP54XX_WKUPDEP_UART6_SDMA_WIDTH                                       0x1
-#define OMAP54XX_WKUPDEP_UART6_SDMA_MASK                                        (1 << 3)
-
-/* Used by PM_L3INIT_UNIPRO2_WKDEP */
-#define OMAP54XX_WKUPDEP_UNIPRO2_MPU_SHIFT                                      0
-#define OMAP54XX_WKUPDEP_UNIPRO2_MPU_WIDTH                                      0x1
-#define OMAP54XX_WKUPDEP_UNIPRO2_MPU_MASK                                       (1 << 0)
-
-/* Used by PM_L3INIT_USB_HOST_HS_WKDEP */
-#define OMAP54XX_WKUPDEP_USB_HOST_HS_IPU_SHIFT                                  1
-#define OMAP54XX_WKUPDEP_USB_HOST_HS_IPU_WIDTH                                  0x1
-#define OMAP54XX_WKUPDEP_USB_HOST_HS_IPU_MASK                                   (1 << 1)
-
-/* Used by PM_L3INIT_USB_HOST_HS_WKDEP */
-#define OMAP54XX_WKUPDEP_USB_HOST_HS_MPU_SHIFT                                  0
-#define OMAP54XX_WKUPDEP_USB_HOST_HS_MPU_WIDTH                                  0x1
-#define OMAP54XX_WKUPDEP_USB_HOST_HS_MPU_MASK                                   (1 << 0)
-
-/* Used by PM_L3INIT_USB_OTG_SS_WKDEP */
-#define OMAP54XX_WKUPDEP_USB_OTG_SS_IPU_SHIFT                                   1
-#define OMAP54XX_WKUPDEP_USB_OTG_SS_IPU_WIDTH                                   0x1
-#define OMAP54XX_WKUPDEP_USB_OTG_SS_IPU_MASK                                    (1 << 1)
-
-/* Used by PM_L3INIT_USB_OTG_SS_WKDEP */
-#define OMAP54XX_WKUPDEP_USB_OTG_SS_MPU_SHIFT                                   0
-#define OMAP54XX_WKUPDEP_USB_OTG_SS_MPU_WIDTH                                   0x1
-#define OMAP54XX_WKUPDEP_USB_OTG_SS_MPU_MASK                                    (1 << 0)
-
-/* Used by PM_L3INIT_USB_TLL_HS_WKDEP */
-#define OMAP54XX_WKUPDEP_USB_TLL_HS_IPU_SHIFT                                   1
-#define OMAP54XX_WKUPDEP_USB_TLL_HS_IPU_WIDTH                                   0x1
-#define OMAP54XX_WKUPDEP_USB_TLL_HS_IPU_MASK                                    (1 << 1)
-
-/* Used by PM_L3INIT_USB_TLL_HS_WKDEP */
-#define OMAP54XX_WKUPDEP_USB_TLL_HS_MPU_SHIFT                                   0
-#define OMAP54XX_WKUPDEP_USB_TLL_HS_MPU_WIDTH                                   0x1
-#define OMAP54XX_WKUPDEP_USB_TLL_HS_MPU_MASK                                    (1 << 0)
-
-/* Used by PM_WKUPAON_WD_TIMER2_WKDEP */
-#define OMAP54XX_WKUPDEP_WD_TIMER2_MPU_SHIFT                                    0
-#define OMAP54XX_WKUPDEP_WD_TIMER2_MPU_WIDTH                                    0x1
-#define OMAP54XX_WKUPDEP_WD_TIMER2_MPU_MASK                                     (1 << 0)
-
-/* Used by PM_ABE_WD_TIMER3_WKDEP */
-#define OMAP54XX_WKUPDEP_WD_TIMER3_MPU_SHIFT                                    0
-#define OMAP54XX_WKUPDEP_WD_TIMER3_MPU_WIDTH                                    0x1
-#define OMAP54XX_WKUPDEP_WD_TIMER3_MPU_MASK                                     (1 << 0)
-
-/* Used by PRM_IO_PMCTRL */
-#define OMAP54XX_WUCLK_CTRL_SHIFT                                               8
-#define OMAP54XX_WUCLK_CTRL_WIDTH                                               0x1
-#define OMAP54XX_WUCLK_CTRL_MASK                                                (1 << 8)
-
-/* Used by PRM_IO_PMCTRL */
-#define OMAP54XX_WUCLK_STATUS_SHIFT                                             9
-#define OMAP54XX_WUCLK_STATUS_WIDTH                                             0x1
-#define OMAP54XX_WUCLK_STATUS_MASK                                              (1 << 9)
-
-/* Used by REVISION_PRM */
-#define OMAP54XX_X_MAJOR_SHIFT                                                  8
-#define OMAP54XX_X_MAJOR_WIDTH                                                  0x3
-#define OMAP54XX_X_MAJOR_MASK                                                   (0x7 << 8)
-
-/* Used by REVISION_PRM */
-#define OMAP54XX_Y_MINOR_SHIFT                                                  0
-#define OMAP54XX_Y_MINOR_WIDTH                                                  0x6
-#define OMAP54XX_Y_MINOR_MASK                                                   (0x3f << 0)
-#endif
diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c
index 415c7e0c9393..03a603476cfc 100644
--- a/arch/arm/mach-omap2/prm44xx.c
+++ b/arch/arm/mach-omap2/prm44xx.c
@@ -620,6 +620,15 @@ static int omap4_pwrdm_wait_transition(struct powerdomain *pwrdm)
         return 0;
 }
 
+static int omap4_check_vcvp(void)
+{
+        /* No VC/VP on dra7xx devices */
+        if (soc_is_dra7xx())
+                return 0;
+
+        return 1;
+}
+
 struct pwrdm_ops omap4_pwrdm_operations = {
         .pwrdm_set_next_pwrst   = omap4_pwrdm_set_next_pwrst,
         .pwrdm_read_next_pwrst  = omap4_pwrdm_read_next_pwrst,
@@ -637,6 +646,7 @@ struct pwrdm_ops omap4_pwrdm_operations = {
         .pwrdm_set_mem_onst     = omap4_pwrdm_set_mem_onst,
         .pwrdm_set_mem_retst    = omap4_pwrdm_set_mem_retst,
         .pwrdm_wait_transition  = omap4_pwrdm_wait_transition,
+        .pwrdm_has_voltdm       = omap4_check_vcvp,
 };
 
 /*
@@ -650,7 +660,7 @@ static struct prm_ll_data omap44xx_prm_ll_data = {
 
 int __init omap44xx_prm_init(void)
 {
-        if (!cpu_is_omap44xx() && !soc_is_omap54xx())
+        if (!cpu_is_omap44xx() && !soc_is_omap54xx() && !soc_is_dra7xx())
                 return 0;
 
         return prm_register(&omap44xx_prm_ll_data);
diff --git a/arch/arm/mach-omap2/prm7xx.h b/arch/arm/mach-omap2/prm7xx.h
new file mode 100644
index 000000000000..d92a8404edc7
--- /dev/null
+++ b/arch/arm/mach-omap2/prm7xx.h
@@ -0,0 +1,678 @@
+/*
+ * DRA7xx PRM instance offset macros
+ *
+ * Copyright (C) 2013 Texas Instruments Incorporated - http://www.ti.com
+ *
+ * Generated by code originally written by:
+ * Paul Walmsley (paul@pwsan.com)
+ * Rajendra Nayak (rnayak@ti.com)
+ * Benoit Cousson (b-cousson@ti.com)
+ *
+ * This file is automatically generated from the OMAP hardware databases.
+ * We respectfully ask that any modifications to this file be coordinated
+ * with the public linux-omap@vger.kernel.org mailing list and the
+ * authors above to ensure that the autogeneration scripts are kept
+ * up-to-date with the file contents.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __ARCH_ARM_MACH_OMAP2_PRM7XX_H
+#define __ARCH_ARM_MACH_OMAP2_PRM7XX_H
+
+#include "prm44xx_54xx.h"
+#include "prcm-common.h"
+#include "prm.h"
+
+#define DRA7XX_PRM_BASE         0x4ae06000
+
+#define DRA7XX_PRM_REGADDR(inst, reg)                           \
+        OMAP2_L4_IO_ADDRESS(DRA7XX_PRM_BASE + (inst) + (reg))
+
+
+/* PRM instances */
+#define DRA7XX_PRM_OCP_SOCKET_INST      0x0000
+#define DRA7XX_PRM_CKGEN_INST           0x0100
+#define DRA7XX_PRM_MPU_INST             0x0300
+#define DRA7XX_PRM_DSP1_INST            0x0400
+#define DRA7XX_PRM_IPU_INST             0x0500
+#define DRA7XX_PRM_COREAON_INST         0x0628
+#define DRA7XX_PRM_CORE_INST            0x0700
+#define DRA7XX_PRM_IVA_INST             0x0f00
+#define DRA7XX_PRM_CAM_INST             0x1000
+#define DRA7XX_PRM_DSS_INST             0x1100
+#define DRA7XX_PRM_GPU_INST             0x1200
+#define DRA7XX_PRM_L3INIT_INST          0x1300
+#define DRA7XX_PRM_L4PER_INST           0x1400
+#define DRA7XX_PRM_CUSTEFUSE_INST       0x1600
+#define DRA7XX_PRM_WKUPAON_INST         0x1724
+#define DRA7XX_PRM_WKUPAON_CM_INST      0x1800
+#define DRA7XX_PRM_EMU_INST             0x1900
+#define DRA7XX_PRM_EMU_CM_INST          0x1a00
+#define DRA7XX_PRM_DSP2_INST            0x1b00
+#define DRA7XX_PRM_EVE1_INST            0x1b40
+#define DRA7XX_PRM_EVE2_INST            0x1b80
+#define DRA7XX_PRM_EVE3_INST            0x1bc0
+#define DRA7XX_PRM_EVE4_INST            0x1c00
+#define DRA7XX_PRM_RTC_INST             0x1c60
+#define DRA7XX_PRM_VPE_INST             0x1c80
+#define DRA7XX_PRM_DEVICE_INST          0x1d00
+#define DRA7XX_PRM_INSTR_INST           0x1f00
+
+/* PRM clockdomain register offsets (from instance start) */
+#define DRA7XX_PRM_WKUPAON_CM_WKUPAON_CDOFFS    0x0000
+#define DRA7XX_PRM_EMU_CM_EMU_CDOFFS            0x0000
+
+/* PRM */
+
+/* PRM.OCP_SOCKET_PRM register offsets */
+#define DRA7XX_REVISION_PRM_OFFSET                              0x0000
+#define DRA7XX_PRM_IRQSTATUS_MPU_OFFSET                         0x0010
+#define DRA7XX_PRM_IRQSTATUS_MPU_2_OFFSET                       0x0014
+#define DRA7XX_PRM_IRQENABLE_MPU_OFFSET                         0x0018
+#define DRA7XX_PRM_IRQENABLE_MPU_2_OFFSET                       0x001c
+#define DRA7XX_PRM_IRQSTATUS_IPU2_OFFSET                        0x0020
+#define DRA7XX_PRM_IRQENABLE_IPU2_OFFSET                        0x0028
+#define DRA7XX_PRM_IRQSTATUS_DSP1_OFFSET                        0x0030
+#define DRA7XX_PRM_IRQENABLE_DSP1_OFFSET                        0x0038
+#define DRA7XX_CM_PRM_PROFILING_CLKCTRL_OFFSET                  0x0040
+#define DRA7XX_CM_PRM_PROFILING_CLKCTRL                         DRA7XX_PRM_REGADDR(DRA7XX_PRM_OCP_SOCKET_INST, 0x0040)
+#define DRA7XX_PRM_IRQENABLE_DSP2_OFFSET                        0x0044
+#define DRA7XX_PRM_IRQENABLE_EVE1_OFFSET                        0x0048
+#define DRA7XX_PRM_IRQENABLE_EVE2_OFFSET                        0x004c
+#define DRA7XX_PRM_IRQENABLE_EVE3_OFFSET                        0x0050
+#define DRA7XX_PRM_IRQENABLE_EVE4_OFFSET                        0x0054
+#define DRA7XX_PRM_IRQENABLE_IPU1_OFFSET                        0x0058
+#define DRA7XX_PRM_IRQSTATUS_DSP2_OFFSET                        0x005c
+#define DRA7XX_PRM_IRQSTATUS_EVE1_OFFSET                        0x0060
+#define DRA7XX_PRM_IRQSTATUS_EVE2_OFFSET                        0x0064
+#define DRA7XX_PRM_IRQSTATUS_EVE3_OFFSET                        0x0068
+#define DRA7XX_PRM_IRQSTATUS_EVE4_OFFSET                        0x006c
+#define DRA7XX_PRM_IRQSTATUS_IPU1_OFFSET                        0x0070
+#define DRA7XX_PRM_DEBUG_CFG1_OFFSET                            0x00e4
+#define DRA7XX_PRM_DEBUG_CFG2_OFFSET                            0x00e8
+#define DRA7XX_PRM_DEBUG_CFG3_OFFSET                            0x00ec
+#define DRA7XX_PRM_DEBUG_OUT_OFFSET                             0x00f4
+
+/* PRM.CKGEN_PRM register offsets */
+#define DRA7XX_CM_CLKSEL_SYSCLK1_OFFSET                         0x0000
+#define DRA7XX_CM_CLKSEL_SYSCLK1                                DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0000)
+#define DRA7XX_CM_CLKSEL_WKUPAON_OFFSET                         0x0008
+#define DRA7XX_CM_CLKSEL_WKUPAON                                DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0008)
+#define DRA7XX_CM_CLKSEL_ABE_PLL_REF_OFFSET                     0x000c
+#define DRA7XX_CM_CLKSEL_ABE_PLL_REF                            DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x000c)
+#define DRA7XX_CM_CLKSEL_SYS_OFFSET                             0x0010
+#define DRA7XX_CM_CLKSEL_SYS                                    DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0010)
+#define DRA7XX_CM_CLKSEL_ABE_PLL_BYPAS_OFFSET                   0x0014
+#define DRA7XX_CM_CLKSEL_ABE_PLL_BYPAS                          DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0014)
+#define DRA7XX_CM_CLKSEL_ABE_PLL_SYS_OFFSET                     0x0018
+#define DRA7XX_CM_CLKSEL_ABE_PLL_SYS                            DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0018)
+#define DRA7XX_CM_CLKSEL_ABE_24M_OFFSET                         0x001c
+#define DRA7XX_CM_CLKSEL_ABE_24M                                DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x001c)
+#define DRA7XX_CM_CLKSEL_ABE_SYS_OFFSET                         0x0020
+#define DRA7XX_CM_CLKSEL_ABE_SYS                                DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0020)
+#define DRA7XX_CM_CLKSEL_HDMI_MCASP_AUX_OFFSET                  0x0024
+#define DRA7XX_CM_CLKSEL_HDMI_MCASP_AUX                         DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0024)
+#define DRA7XX_CM_CLKSEL_HDMI_TIMER_OFFSET                      0x0028
+#define DRA7XX_CM_CLKSEL_HDMI_TIMER                             DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0028)
+#define DRA7XX_CM_CLKSEL_MCASP_SYS_OFFSET                       0x002c
+#define DRA7XX_CM_CLKSEL_MCASP_SYS                              DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x002c)
+#define DRA7XX_CM_CLKSEL_MLBP_MCASP_OFFSET                      0x0030
+#define DRA7XX_CM_CLKSEL_MLBP_MCASP                             DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0030)
+#define DRA7XX_CM_CLKSEL_MLB_MCASP_OFFSET                       0x0034
+#define DRA7XX_CM_CLKSEL_MLB_MCASP                              DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0034)
+#define DRA7XX_CM_CLKSEL_PER_ABE_X1_GFCLK_MCASP_AUX_OFFSET      0x0038
+#define DRA7XX_CM_CLKSEL_PER_ABE_X1_GFCLK_MCASP_AUX             DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0038)
+#define DRA7XX_CM_CLKSEL_SYS_CLK1_32K_OFFSET                    0x0040
+#define DRA7XX_CM_CLKSEL_SYS_CLK1_32K                           DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0040)
+#define DRA7XX_CM_CLKSEL_TIMER_SYS_OFFSET                       0x0044
+#define DRA7XX_CM_CLKSEL_TIMER_SYS                              DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0044)
+#define DRA7XX_CM_CLKSEL_VIDEO1_MCASP_AUX_OFFSET                0x0048
+#define DRA7XX_CM_CLKSEL_VIDEO1_MCASP_AUX                       DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0048)
+#define DRA7XX_CM_CLKSEL_VIDEO1_TIMER_OFFSET                    0x004c
+#define DRA7XX_CM_CLKSEL_VIDEO1_TIMER                           DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x004c)
+#define DRA7XX_CM_CLKSEL_VIDEO2_MCASP_AUX_OFFSET                0x0050
+#define DRA7XX_CM_CLKSEL_VIDEO2_MCASP_AUX                       DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0050)
+#define DRA7XX_CM_CLKSEL_VIDEO2_TIMER_OFFSET                    0x0054
+#define DRA7XX_CM_CLKSEL_VIDEO2_TIMER                           DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0054)
+#define DRA7XX_CM_CLKSEL_CLKOUTMUX0_OFFSET                      0x0058
+#define DRA7XX_CM_CLKSEL_CLKOUTMUX0                             DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0058)
+#define DRA7XX_CM_CLKSEL_CLKOUTMUX1_OFFSET                      0x005c
+#define DRA7XX_CM_CLKSEL_CLKOUTMUX1                             DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x005c)
+#define DRA7XX_CM_CLKSEL_CLKOUTMUX2_OFFSET                      0x0060
+#define DRA7XX_CM_CLKSEL_CLKOUTMUX2                             DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0060)
+#define DRA7XX_CM_CLKSEL_HDMI_PLL_SYS_OFFSET                    0x0064
+#define DRA7XX_CM_CLKSEL_HDMI_PLL_SYS                           DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0064)
+#define DRA7XX_CM_CLKSEL_VIDEO1_PLL_SYS_OFFSET                  0x0068
+#define DRA7XX_CM_CLKSEL_VIDEO1_PLL_SYS                         DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0068)
+#define DRA7XX_CM_CLKSEL_VIDEO2_PLL_SYS_OFFSET                  0x006c
+#define DRA7XX_CM_CLKSEL_VIDEO2_PLL_SYS                         DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x006c)
+#define DRA7XX_CM_CLKSEL_ABE_CLK_DIV_OFFSET                     0x0070
+#define DRA7XX_CM_CLKSEL_ABE_CLK_DIV                            DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0070)
+#define DRA7XX_CM_CLKSEL_ABE_GICLK_DIV_OFFSET                   0x0074
+#define DRA7XX_CM_CLKSEL_ABE_GICLK_DIV                          DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0074)
+#define DRA7XX_CM_CLKSEL_AESS_FCLK_DIV_OFFSET                   0x0078
+#define DRA7XX_CM_CLKSEL_AESS_FCLK_DIV                          DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0078)
+#define DRA7XX_CM_CLKSEL_EVE_CLK_OFFSET                         0x0080
+#define DRA7XX_CM_CLKSEL_EVE_CLK                                DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0080)
+#define DRA7XX_CM_CLKSEL_USB_OTG_CLK_CLKOUTMUX_OFFSET           0x0084
+#define DRA7XX_CM_CLKSEL_USB_OTG_CLK_CLKOUTMUX                  DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0084)
+#define DRA7XX_CM_CLKSEL_CORE_DPLL_OUT_CLK_CLKOUTMUX_OFFSET     0x0088
+#define DRA7XX_CM_CLKSEL_CORE_DPLL_OUT_CLK_CLKOUTMUX            DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0088)
+#define DRA7XX_CM_CLKSEL_DSP_GFCLK_CLKOUTMUX_OFFSET             0x008c
+#define DRA7XX_CM_CLKSEL_DSP_GFCLK_CLKOUTMUX                    DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x008c)
+#define DRA7XX_CM_CLKSEL_EMIF_PHY_GCLK_CLKOUTMUX_OFFSET         0x0090
+#define DRA7XX_CM_CLKSEL_EMIF_PHY_GCLK_CLKOUTMUX                DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0090)
+#define DRA7XX_CM_CLKSEL_EMU_CLK_CLKOUTMUX_OFFSET               0x0094
+#define DRA7XX_CM_CLKSEL_EMU_CLK_CLKOUTMUX                      DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0094)
+#define DRA7XX_CM_CLKSEL_FUNC_96M_AON_CLK_CLKOUTMUX_OFFSET      0x0098
+#define DRA7XX_CM_CLKSEL_FUNC_96M_AON_CLK_CLKOUTMUX             DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x0098)
+#define DRA7XX_CM_CLKSEL_GMAC_250M_CLK_CLKOUTMUX_OFFSET         0x009c
+#define DRA7XX_CM_CLKSEL_GMAC_250M_CLK_CLKOUTMUX                DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x009c)
+#define DRA7XX_CM_CLKSEL_GPU_GCLK_CLKOUTMUX_OFFSET              0x00a0
+#define DRA7XX_CM_CLKSEL_GPU_GCLK_CLKOUTMUX                     DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x00a0)
+#define DRA7XX_CM_CLKSEL_HDMI_CLK_CLKOUTMUX_OFFSET              0x00a4
+#define DRA7XX_CM_CLKSEL_HDMI_CLK_CLKOUTMUX                     DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x00a4)
+#define DRA7XX_CM_CLKSEL_IVA_GCLK_CLKOUTMUX_OFFSET              0x00a8
+#define DRA7XX_CM_CLKSEL_IVA_GCLK_CLKOUTMUX                     DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x00a8)
+#define DRA7XX_CM_CLKSEL_L3INIT_480M_GFCLK_CLKOUTMUX_OFFSET     0x00ac
+#define DRA7XX_CM_CLKSEL_L3INIT_480M_GFCLK_CLKOUTMUX            DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x00ac)
+#define DRA7XX_CM_CLKSEL_MPU_GCLK_CLKOUTMUX_OFFSET              0x00b0
+#define DRA7XX_CM_CLKSEL_MPU_GCLK_CLKOUTMUX                     DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x00b0)
+#define DRA7XX_CM_CLKSEL_PCIE1_CLK_CLKOUTMUX_OFFSET             0x00b4
+#define DRA7XX_CM_CLKSEL_PCIE1_CLK_CLKOUTMUX                    DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x00b4)
+#define DRA7XX_CM_CLKSEL_PCIE2_CLK_CLKOUTMUX_OFFSET             0x00b8
+#define DRA7XX_CM_CLKSEL_PCIE2_CLK_CLKOUTMUX                    DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x00b8)
+#define DRA7XX_CM_CLKSEL_PER_ABE_X1_CLK_CLKOUTMUX_OFFSET        0x00bc
+#define DRA7XX_CM_CLKSEL_PER_ABE_X1_CLK_CLKOUTMUX               DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x00bc)
+#define DRA7XX_CM_CLKSEL_SATA_CLK_CLKOUTMUX_OFFSET              0x00c0
+#define DRA7XX_CM_CLKSEL_SATA_CLK_CLKOUTMUX                     DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x00c0)
+#define DRA7XX_CM_CLKSEL_SECURE_32K_CLK_CLKOUTMUX_OFFSET        0x00c4
+#define DRA7XX_CM_CLKSEL_SECURE_32K_CLK_CLKOUTMUX               DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x00c4)
+#define DRA7XX_CM_CLKSEL_SYS_CLK1_CLKOUTMUX_OFFSET              0x00c8
+#define DRA7XX_CM_CLKSEL_SYS_CLK1_CLKOUTMUX                     DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x00c8)
+#define DRA7XX_CM_CLKSEL_SYS_CLK2_CLKOUTMUX_OFFSET              0x00cc
+#define DRA7XX_CM_CLKSEL_SYS_CLK2_CLKOUTMUX                     DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x00cc)
+#define DRA7XX_CM_CLKSEL_VIDEO1_CLK_CLKOUTMUX_OFFSET            0x00d0
+#define DRA7XX_CM_CLKSEL_VIDEO1_CLK_CLKOUTMUX                   DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x00d0)
+#define DRA7XX_CM_CLKSEL_VIDEO2_CLK_CLKOUTMUX_OFFSET            0x00d4
+#define DRA7XX_CM_CLKSEL_VIDEO2_CLK_CLKOUTMUX                   DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x00d4)
+#define DRA7XX_CM_CLKSEL_ABE_LP_CLK_OFFSET                      0x00d8
+#define DRA7XX_CM_CLKSEL_ABE_LP_CLK                             DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x00d8)
+#define DRA7XX_CM_CLKSEL_ADC_GFCLK_OFFSET                       0x00dc
+#define DRA7XX_CM_CLKSEL_ADC_GFCLK                              DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x00dc)
+#define DRA7XX_CM_CLKSEL_EVE_GFCLK_CLKOUTMUX_OFFSET             0x00e0
+#define DRA7XX_CM_CLKSEL_EVE_GFCLK_CLKOUTMUX                    DRA7XX_PRM_REGADDR(DRA7XX_PRM_CKGEN_INST, 0x00e0)
+
+/* PRM.MPU_PRM register offsets */
+#define DRA7XX_PM_MPU_PWRSTCTRL_OFFSET                          0x0000
+#define DRA7XX_PM_MPU_PWRSTST_OFFSET                            0x0004
+#define DRA7XX_RM_MPU_MPU_CONTEXT_OFFSET                        0x0024
+
+/* PRM.DSP1_PRM register offsets */
+#define DRA7XX_PM_DSP1_PWRSTCTRL_OFFSET                         0x0000
+#define DRA7XX_PM_DSP1_PWRSTST_OFFSET                           0x0004
+#define DRA7XX_RM_DSP1_RSTCTRL_OFFSET                           0x0010
+#define DRA7XX_RM_DSP1_RSTST_OFFSET                             0x0014
+#define DRA7XX_RM_DSP1_DSP1_CONTEXT_OFFSET                      0x0024
+
+/* PRM.IPU_PRM register offsets */
+#define DRA7XX_PM_IPU_PWRSTCTRL_OFFSET                          0x0000
+#define DRA7XX_PM_IPU_PWRSTST_OFFSET                            0x0004
+#define DRA7XX_RM_IPU1_RSTCTRL_OFFSET                           0x0010
+#define DRA7XX_RM_IPU1_RSTST_OFFSET                             0x0014
+#define DRA7XX_RM_IPU1_IPU1_CONTEXT_OFFSET                      0x0024
+#define DRA7XX_PM_IPU_MCASP1_WKDEP_OFFSET                       0x0050
+#define DRA7XX_RM_IPU_MCASP1_CONTEXT_OFFSET                     0x0054
+#define DRA7XX_PM_IPU_TIMER5_WKDEP_OFFSET                       0x0058
+#define DRA7XX_RM_IPU_TIMER5_CONTEXT_OFFSET                     0x005c
+#define DRA7XX_PM_IPU_TIMER6_WKDEP_OFFSET                       0x0060
+#define DRA7XX_RM_IPU_TIMER6_CONTEXT_OFFSET                     0x0064
+#define DRA7XX_PM_IPU_TIMER7_WKDEP_OFFSET                       0x0068
+#define DRA7XX_RM_IPU_TIMER7_CONTEXT_OFFSET                     0x006c
+#define DRA7XX_PM_IPU_TIMER8_WKDEP_OFFSET                       0x0070
+#define DRA7XX_RM_IPU_TIMER8_CONTEXT_OFFSET                     0x0074
+#define DRA7XX_PM_IPU_I2C5_WKDEP_OFFSET                         0x0078
+#define DRA7XX_RM_IPU_I2C5_CONTEXT_OFFSET                       0x007c
+#define DRA7XX_PM_IPU_UART6_WKDEP_OFFSET                        0x0080
+#define DRA7XX_RM_IPU_UART6_CONTEXT_OFFSET                      0x0084
+
+/* PRM.COREAON_PRM register offsets */
+#define DRA7XX_PM_COREAON_SMARTREFLEX_MPU_WKDEP_OFFSET          0x0000
+#define DRA7XX_RM_COREAON_SMARTREFLEX_MPU_CONTEXT_OFFSET        0x0004
+#define DRA7XX_PM_COREAON_SMARTREFLEX_CORE_WKDEP_OFFSET         0x0010
+#define DRA7XX_RM_COREAON_SMARTREFLEX_CORE_CONTEXT_OFFSET       0x0014
+#define DRA7XX_PM_COREAON_SMARTREFLEX_GPU_WKDEP_OFFSET          0x0030
+#define DRA7XX_RM_COREAON_SMARTREFLEX_GPU_CONTEXT_OFFSET        0x0034
+#define DRA7XX_PM_COREAON_SMARTREFLEX_DSPEVE_WKDEP_OFFSET       0x0040
+#define DRA7XX_RM_COREAON_SMARTREFLEX_DSPEVE_CONTEXT_OFFSET     0x0044
+#define DRA7XX_PM_COREAON_SMARTREFLEX_IVAHD_WKDEP_OFFSET        0x0050
+#define DRA7XX_RM_COREAON_SMARTREFLEX_IVAHD_CONTEXT_OFFSET      0x0054
+#define DRA7XX_RM_COREAON_DUMMY_MODULE1_CONTEXT_OFFSET          0x0084
+#define DRA7XX_RM_COREAON_DUMMY_MODULE2_CONTEXT_OFFSET          0x0094
+#define DRA7XX_RM_COREAON_DUMMY_MODULE3_CONTEXT_OFFSET          0x00a4
+#define DRA7XX_RM_COREAON_DUMMY_MODULE4_CONTEXT_OFFSET          0x00b4
+
+/* PRM.CORE_PRM register offsets */
+#define DRA7XX_PM_CORE_PWRSTCTRL_OFFSET                         0x0000
+#define DRA7XX_PM_CORE_PWRSTST_OFFSET                           0x0004
+#define DRA7XX_RM_L3MAIN1_L3_MAIN_1_CONTEXT_OFFSET              0x0024
+#define DRA7XX_RM_L3MAIN1_GPMC_CONTEXT_OFFSET                   0x002c
+#define DRA7XX_RM_L3MAIN1_MMU_EDMA_CONTEXT_OFFSET               0x0034
+#define DRA7XX_PM_L3MAIN1_OCMC_RAM1_WKDEP_OFFSET                0x0050
+#define DRA7XX_RM_L3MAIN1_OCMC_RAM1_CONTEXT_OFFSET              0x0054
+#define DRA7XX_PM_L3MAIN1_OCMC_RAM2_WKDEP_OFFSET                0x0058
+#define DRA7XX_RM_L3MAIN1_OCMC_RAM2_CONTEXT_OFFSET              0x005c
+#define DRA7XX_PM_L3MAIN1_OCMC_RAM3_WKDEP_OFFSET                0x0060
+#define DRA7XX_RM_L3MAIN1_OCMC_RAM3_CONTEXT_OFFSET              0x0064
+#define DRA7XX_RM_L3MAIN1_OCMC_ROM_CONTEXT_OFFSET               0x006c
+#define DRA7XX_PM_L3MAIN1_TPCC_WKDEP_OFFSET                     0x0070
+#define DRA7XX_RM_L3MAIN1_TPCC_CONTEXT_OFFSET                   0x0074
+#define DRA7XX_PM_L3MAIN1_TPTC1_WKDEP_OFFSET                    0x0078
+#define DRA7XX_RM_L3MAIN1_TPTC1_CONTEXT_OFFSET                  0x007c
+#define DRA7XX_PM_L3MAIN1_TPTC2_WKDEP_OFFSET                    0x0080
+#define DRA7XX_RM_L3MAIN1_TPTC2_CONTEXT_OFFSET                  0x0084
+#define DRA7XX_RM_L3MAIN1_VCP1_CONTEXT_OFFSET                   0x008c
+#define DRA7XX_RM_L3MAIN1_VCP2_CONTEXT_OFFSET                   0x0094
+#define DRA7XX_RM_L3MAIN1_SPARE_CME_CONTEXT_OFFSET              0x009c
+#define DRA7XX_RM_L3MAIN1_SPARE_HDMI_CONTEXT_OFFSET             0x00a4
+#define DRA7XX_RM_L3MAIN1_SPARE_ICM_CONTEXT_OFFSET              0x00ac
+#define DRA7XX_RM_L3MAIN1_SPARE_IVA2_CONTEXT_OFFSET             0x00b4
+#define DRA7XX_RM_L3MAIN1_SPARE_SATA2_CONTEXT_OFFSET            0x00bc
+#define DRA7XX_RM_L3MAIN1_SPARE_UNKNOWN4_CONTEXT_OFFSET         0x00c4
+#define DRA7XX_RM_L3MAIN1_SPARE_UNKNOWN5_CONTEXT_OFFSET         0x00cc
+#define DRA7XX_RM_L3MAIN1_SPARE_UNKNOWN6_CONTEXT_OFFSET         0x00d4
+#define DRA7XX_RM_L3MAIN1_SPARE_VIDEOPLL1_CONTEXT_OFFSET        0x00dc
+#define DRA7XX_RM_L3MAIN1_SPARE_VIDEOPLL2_CONTEXT_OFFSET        0x00f4
+#define DRA7XX_RM_L3MAIN1_SPARE_VIDEOPLL3_CONTEXT_OFFSET        0x00fc
+#define DRA7XX_RM_IPU2_RSTCTRL_OFFSET                           0x0210
+#define DRA7XX_RM_IPU2_RSTST_OFFSET                             0x0214
+#define DRA7XX_RM_IPU2_IPU2_CONTEXT_OFFSET                      0x0224
+#define DRA7XX_RM_DMA_DMA_SYSTEM_CONTEXT_OFFSET                 0x0324
+#define DRA7XX_RM_EMIF_DMM_CONTEXT_OFFSET                       0x0424
+#define DRA7XX_RM_EMIF_EMIF_OCP_FW_CONTEXT_OFFSET               0x042c
+#define DRA7XX_RM_EMIF_EMIF1_CONTEXT_OFFSET                     0x0434
+#define DRA7XX_RM_EMIF_EMIF2_CONTEXT_OFFSET                     0x043c
+#define DRA7XX_RM_EMIF_EMIF_DLL_CONTEXT_OFFSET                  0x0444
+#define DRA7XX_RM_ATL_ATL_CONTEXT_OFFSET                        0x0524
+#define DRA7XX_RM_L4CFG_L4_CFG_CONTEXT_OFFSET                   0x0624
+#define DRA7XX_RM_L4CFG_SPINLOCK_CONTEXT_OFFSET                 0x062c
+#define DRA7XX_RM_L4CFG_MAILBOX1_CONTEXT_OFFSET                 0x0634
+#define DRA7XX_RM_L4CFG_SAR_ROM_CONTEXT_OFFSET                  0x063c
+#define DRA7XX_RM_L4CFG_OCP2SCP2_CONTEXT_OFFSET                 0x0644
+#define DRA7XX_RM_L4CFG_MAILBOX2_CONTEXT_OFFSET                 0x064c
+#define DRA7XX_RM_L4CFG_MAILBOX3_CONTEXT_OFFSET                 0x0654
+#define DRA7XX_RM_L4CFG_MAILBOX4_CONTEXT_OFFSET                 0x065c
+#define DRA7XX_RM_L4CFG_MAILBOX5_CONTEXT_OFFSET                 0x0664
+#define DRA7XX_RM_L4CFG_MAILBOX6_CONTEXT_OFFSET                 0x066c
+#define DRA7XX_RM_L4CFG_MAILBOX7_CONTEXT_OFFSET                 0x0674
+#define DRA7XX_RM_L4CFG_MAILBOX8_CONTEXT_OFFSET                 0x067c
+#define DRA7XX_RM_L4CFG_MAILBOX9_CONTEXT_OFFSET                 0x0684
+#define DRA7XX_RM_L4CFG_MAILBOX10_CONTEXT_OFFSET                0x068c
+#define DRA7XX_RM_L4CFG_MAILBOX11_CONTEXT_OFFSET                0x0694
+#define DRA7XX_RM_L4CFG_MAILBOX12_CONTEXT_OFFSET                0x069c
+#define DRA7XX_RM_L4CFG_MAILBOX13_CONTEXT_OFFSET                0x06a4
+#define DRA7XX_RM_L4CFG_SPARE_SMARTREFLEX_RTC_CONTEXT_OFFSET    0x06ac
+#define DRA7XX_RM_L4CFG_SPARE_SMARTREFLEX_SDRAM_CONTEXT_OFFSET  0x06b4
+#define DRA7XX_RM_L4CFG_SPARE_SMARTREFLEX_WKUP_CONTEXT_OFFSET   0x06bc
+#define DRA7XX_RM_L4CFG_IO_DELAY_BLOCK_CONTEXT_OFFSET           0x06c4
+#define DRA7XX_RM_L3INSTR_L3_MAIN_2_CONTEXT_OFFSET              0x0724
+#define DRA7XX_RM_L3INSTR_L3_INSTR_CONTEXT_OFFSET               0x072c
+#define DRA7XX_RM_L3INSTR_OCP_WP_NOC_CONTEXT_OFFSET             0x0744
+
+/* PRM.IVA_PRM register offsets */
+#define DRA7XX_PM_IVA_PWRSTCTRL_OFFSET                          0x0000
+#define DRA7XX_PM_IVA_PWRSTST_OFFSET                            0x0004
+#define DRA7XX_RM_IVA_RSTCTRL_OFFSET                            0x0010
+#define DRA7XX_RM_IVA_RSTST_OFFSET                              0x0014
+#define DRA7XX_RM_IVA_IVA_CONTEXT_OFFSET                        0x0024
+#define DRA7XX_RM_IVA_SL2_CONTEXT_OFFSET                        0x002c
+
+/* PRM.CAM_PRM register offsets */
+#define DRA7XX_PM_CAM_PWRSTCTRL_OFFSET                          0x0000
+#define DRA7XX_PM_CAM_PWRSTST_OFFSET                            0x0004
+#define DRA7XX_PM_CAM_VIP1_WKDEP_OFFSET                         0x0020
+#define DRA7XX_RM_CAM_VIP1_CONTEXT_OFFSET                       0x0024
+#define DRA7XX_PM_CAM_VIP2_WKDEP_OFFSET                         0x0028
+#define DRA7XX_RM_CAM_VIP2_CONTEXT_OFFSET                       0x002c
+#define DRA7XX_PM_CAM_VIP3_WKDEP_OFFSET                         0x0030
+#define DRA7XX_RM_CAM_VIP3_CONTEXT_OFFSET                       0x0034
+#define DRA7XX_RM_CAM_LVDSRX_CONTEXT_OFFSET                     0x003c
+#define DRA7XX_RM_CAM_CSI1_CONTEXT_OFFSET                       0x0044
+#define DRA7XX_RM_CAM_CSI2_CONTEXT_OFFSET                       0x004c
+
+/* PRM.DSS_PRM register offsets */
+#define DRA7XX_PM_DSS_PWRSTCTRL_OFFSET                          0x0000
+#define DRA7XX_PM_DSS_PWRSTST_OFFSET                            0x0004
+#define DRA7XX_PM_DSS_DSS_WKDEP_OFFSET                          0x0020
+#define DRA7XX_RM_DSS_DSS_CONTEXT_OFFSET                        0x0024
+#define DRA7XX_PM_DSS_DSS2_WKDEP_OFFSET                         0x0028
+#define DRA7XX_RM_DSS_BB2D_CONTEXT_OFFSET                       0x0034
+#define DRA7XX_RM_DSS_SDVENC_CONTEXT_OFFSET                     0x003c
+
+/* PRM.GPU_PRM register offsets */
+#define DRA7XX_PM_GPU_PWRSTCTRL_OFFSET                          0x0000
+#define DRA7XX_PM_GPU_PWRSTST_OFFSET                            0x0004
+#define DRA7XX_RM_GPU_GPU_CONTEXT_OFFSET                        0x0024
+
+/* PRM.L3INIT_PRM register offsets */
+#define DRA7XX_PM_L3INIT_PWRSTCTRL_OFFSET                       0x0000
+#define DRA7XX_PM_L3INIT_PWRSTST_OFFSET                         0x0004
+#define DRA7XX_PM_L3INIT_MMC1_WKDEP_OFFSET                      0x0028
+#define DRA7XX_RM_L3INIT_MMC1_CONTEXT_OFFSET                    0x002c
+#define DRA7XX_PM_L3INIT_MMC2_WKDEP_OFFSET                      0x0030
+#define DRA7XX_RM_L3INIT_MMC2_CONTEXT_OFFSET                    0x0034
+#define DRA7XX_PM_L3INIT_USB_OTG_SS2_WKDEP_OFFSET               0x0040
+#define DRA7XX_RM_L3INIT_USB_OTG_SS2_CONTEXT_OFFSET             0x0044
+#define DRA7XX_PM_L3INIT_USB_OTG_SS3_WKDEP_OFFSET               0x0048
+#define DRA7XX_RM_L3INIT_USB_OTG_SS3_CONTEXT_OFFSET             0x004c
+#define DRA7XX_PM_L3INIT_USB_OTG_SS4_WKDEP_OFFSET               0x0050
+#define DRA7XX_RM_L3INIT_USB_OTG_SS4_CONTEXT_OFFSET             0x0054
+#define DRA7XX_RM_L3INIT_MLB_SS_CONTEXT_OFFSET                  0x005c
+#define DRA7XX_RM_L3INIT_IEEE1500_2_OCP_CONTEXT_OFFSET          0x007c
+#define DRA7XX_PM_L3INIT_SATA_WKDEP_OFFSET                      0x0088
+#define DRA7XX_RM_L3INIT_SATA_CONTEXT_OFFSET                    0x008c
+#define DRA7XX_RM_GMAC_GMAC_CONTEXT_OFFSET                      0x00d4
+#define DRA7XX_RM_L3INIT_OCP2SCP1_CONTEXT_OFFSET                0x00e4
+#define DRA7XX_RM_L3INIT_OCP2SCP3_CONTEXT_OFFSET                0x00ec
+#define DRA7XX_PM_L3INIT_USB_OTG_SS1_WKDEP_OFFSET               0x00f0
+#define DRA7XX_RM_L3INIT_USB_OTG_SS1_CONTEXT_OFFSET             0x00f4
+
+/* PRM.L4PER_PRM register offsets */
+#define DRA7XX_PM_L4PER_PWRSTCTRL_OFFSET                        0x0000
+#define DRA7XX_PM_L4PER_PWRSTST_OFFSET                          0x0004
+#define DRA7XX_RM_L4PER2_L4PER2_CONTEXT_OFFSET                  0x000c
+#define DRA7XX_RM_L4PER3_L4PER3_CONTEXT_OFFSET                  0x0014
+#define DRA7XX_RM_L4PER2_PRUSS1_CONTEXT_OFFSET                  0x001c
+#define DRA7XX_RM_L4PER2_PRUSS2_CONTEXT_OFFSET                  0x0024
+#define DRA7XX_PM_L4PER_TIMER10_WKDEP_OFFSET                    0x0028
+#define DRA7XX_RM_L4PER_TIMER10_CONTEXT_OFFSET                  0x002c
+#define DRA7XX_PM_L4PER_TIMER11_WKDEP_OFFSET                    0x0030
+#define DRA7XX_RM_L4PER_TIMER11_CONTEXT_OFFSET                  0x0034
+#define DRA7XX_PM_L4PER_TIMER2_WKDEP_OFFSET                     0x0038
+#define DRA7XX_RM_L4PER_TIMER2_CONTEXT_OFFSET                   0x003c
+#define DRA7XX_PM_L4PER_TIMER3_WKDEP_OFFSET                     0x0040
+#define DRA7XX_RM_L4PER_TIMER3_CONTEXT_OFFSET                   0x0044
+#define DRA7XX_PM_L4PER_TIMER4_WKDEP_OFFSET                     0x0048
+#define DRA7XX_RM_L4PER_TIMER4_CONTEXT_OFFSET                   0x004c
+#define DRA7XX_PM_L4PER_TIMER9_WKDEP_OFFSET                     0x0050
+#define DRA7XX_RM_L4PER_TIMER9_CONTEXT_OFFSET                   0x0054
+#define DRA7XX_RM_L4PER_ELM_CONTEXT_OFFSET                      0x005c
+#define DRA7XX_PM_L4PER_GPIO2_WKDEP_OFFSET                      0x0060
+#define DRA7XX_RM_L4PER_GPIO2_CONTEXT_OFFSET                    0x0064
+#define DRA7XX_PM_L4PER_GPIO3_WKDEP_OFFSET                      0x0068
+#define DRA7XX_RM_L4PER_GPIO3_CONTEXT_OFFSET                    0x006c
+#define DRA7XX_PM_L4PER_GPIO4_WKDEP_OFFSET                      0x0070
+#define DRA7XX_RM_L4PER_GPIO4_CONTEXT_OFFSET                    0x0074
+#define DRA7XX_PM_L4PER_GPIO5_WKDEP_OFFSET                      0x0078
+#define DRA7XX_RM_L4PER_GPIO5_CONTEXT_OFFSET                    0x007c
+#define DRA7XX_PM_L4PER_GPIO6_WKDEP_OFFSET                      0x0080
+#define DRA7XX_RM_L4PER_GPIO6_CONTEXT_OFFSET                    0x0084
+#define DRA7XX_RM_L4PER_HDQ1W_CONTEXT_OFFSET                    0x008c
+#define DRA7XX_RM_L4PER2_PWMSS2_CONTEXT_OFFSET                  0x0094
+#define DRA7XX_RM_L4PER2_PWMSS3_CONTEXT_OFFSET                  0x009c
+#define DRA7XX_PM_L4PER_I2C1_WKDEP_OFFSET                       0x00a0
+#define DRA7XX_RM_L4PER_I2C1_CONTEXT_OFFSET                     0x00a4
+#define DRA7XX_PM_L4PER_I2C2_WKDEP_OFFSET                       0x00a8
+#define DRA7XX_RM_L4PER_I2C2_CONTEXT_OFFSET                     0x00ac
+#define DRA7XX_PM_L4PER_I2C3_WKDEP_OFFSET                       0x00b0
+#define DRA7XX_RM_L4PER_I2C3_CONTEXT_OFFSET                     0x00b4
+#define DRA7XX_PM_L4PER_I2C4_WKDEP_OFFSET                       0x00b8
+#define DRA7XX_RM_L4PER_I2C4_CONTEXT_OFFSET                     0x00bc
+#define DRA7XX_RM_L4PER_L4PER1_CONTEXT_OFFSET                   0x00c0
+#define DRA7XX_RM_L4PER2_PWMSS1_CONTEXT_OFFSET                  0x00c4
+#define DRA7XX_PM_L4PER_TIMER13_WKDEP_OFFSET                    0x00c8
+#define DRA7XX_RM_L4PER3_TIMER13_CONTEXT_OFFSET                 0x00cc
+#define DRA7XX_PM_L4PER_TIMER14_WKDEP_OFFSET                    0x00d0
+#define DRA7XX_RM_L4PER3_TIMER14_CONTEXT_OFFSET                 0x00d4
+#define DRA7XX_PM_L4PER_TIMER15_WKDEP_OFFSET                    0x00d8
+#define DRA7XX_RM_L4PER3_TIMER15_CONTEXT_OFFSET                 0x00dc
+#define DRA7XX_PM_L4PER_MCSPI1_WKDEP_OFFSET                     0x00f0
+#define DRA7XX_RM_L4PER_MCSPI1_CONTEXT_OFFSET                   0x00f4
+#define DRA7XX_PM_L4PER_MCSPI2_WKDEP_OFFSET                     0x00f8
+#define DRA7XX_RM_L4PER_MCSPI2_CONTEXT_OFFSET                   0x00fc
+#define DRA7XX_PM_L4PER_MCSPI3_WKDEP_OFFSET                     0x0100
+#define DRA7XX_RM_L4PER_MCSPI3_CONTEXT_OFFSET                   0x0104
+#define DRA7XX_PM_L4PER_MCSPI4_WKDEP_OFFSET                     0x0108
+#define DRA7XX_RM_L4PER_MCSPI4_CONTEXT_OFFSET                   0x010c
+#define DRA7XX_PM_L4PER_GPIO7_WKDEP_OFFSET                      0x0110
+#define DRA7XX_RM_L4PER_GPIO7_CONTEXT_OFFSET                    0x0114
+#define DRA7XX_PM_L4PER_GPIO8_WKDEP_OFFSET                      0x0118
+#define DRA7XX_RM_L4PER_GPIO8_CONTEXT_OFFSET                    0x011c
+#define DRA7XX_PM_L4PER_MMC3_WKDEP_OFFSET                       0x0120
+#define DRA7XX_RM_L4PER_MMC3_CONTEXT_OFFSET                     0x0124
+#define DRA7XX_PM_L4PER_MMC4_WKDEP_OFFSET                       0x0128
+#define DRA7XX_RM_L4PER_MMC4_CONTEXT_OFFSET                     0x012c
+#define DRA7XX_PM_L4PER_TIMER16_WKDEP_OFFSET                    0x0130
+#define DRA7XX_RM_L4PER3_TIMER16_CONTEXT_OFFSET                 0x0134
+#define DRA7XX_PM_L4PER2_QSPI_WKDEP_OFFSET                      0x0138
+#define DRA7XX_RM_L4PER2_QSPI_CONTEXT_OFFSET                    0x013c
+#define DRA7XX_PM_L4PER_UART1_WKDEP_OFFSET                      0x0140
+#define DRA7XX_RM_L4PER_UART1_CONTEXT_OFFSET                    0x0144
+#define DRA7XX_PM_L4PER_UART2_WKDEP_OFFSET                      0x0148
+#define DRA7XX_RM_L4PER_UART2_CONTEXT_OFFSET                    0x014c
+#define DRA7XX_PM_L4PER_UART3_WKDEP_OFFSET                      0x0150
+#define DRA7XX_RM_L4PER_UART3_CONTEXT_OFFSET                    0x0154
+#define DRA7XX_PM_L4PER_UART4_WKDEP_OFFSET                      0x0158
+#define DRA7XX_RM_L4PER_UART4_CONTEXT_OFFSET                    0x015c
+#define DRA7XX_PM_L4PER2_MCASP2_WKDEP_OFFSET                    0x0160
+#define DRA7XX_RM_L4PER2_MCASP2_CONTEXT_OFFSET                  0x0164
+#define DRA7XX_PM_L4PER2_MCASP3_WKDEP_OFFSET                    0x0168
+#define DRA7XX_RM_L4PER2_MCASP3_CONTEXT_OFFSET                  0x016c
+#define DRA7XX_PM_L4PER_UART5_WKDEP_OFFSET                      0x0170
+#define DRA7XX_RM_L4PER_UART5_CONTEXT_OFFSET                    0x0174
+#define DRA7XX_PM_L4PER2_MCASP5_WKDEP_OFFSET                    0x0178
+#define DRA7XX_RM_L4PER2_MCASP5_CONTEXT_OFFSET                  0x017c
+#define DRA7XX_PM_L4PER2_MCASP6_WKDEP_OFFSET                    0x0180
+#define DRA7XX_RM_L4PER2_MCASP6_CONTEXT_OFFSET                  0x0184
+#define DRA7XX_PM_L4PER2_MCASP7_WKDEP_OFFSET                    0x0188
+#define DRA7XX_RM_L4PER2_MCASP7_CONTEXT_OFFSET                  0x018c
+#define DRA7XX_PM_L4PER2_MCASP8_WKDEP_OFFSET                    0x0190
+#define DRA7XX_RM_L4PER2_MCASP8_CONTEXT_OFFSET                  0x0194
+#define DRA7XX_PM_L4PER2_MCASP4_WKDEP_OFFSET                    0x0198
+#define DRA7XX_RM_L4PER2_MCASP4_CONTEXT_OFFSET                  0x019c
+#define DRA7XX_RM_L4SEC_AES1_CONTEXT_OFFSET                     0x01a4
+#define DRA7XX_RM_L4SEC_AES2_CONTEXT_OFFSET                     0x01ac
+#define DRA7XX_RM_L4SEC_DES3DES_CONTEXT_OFFSET                  0x01b4
+#define DRA7XX_RM_L4SEC_FPKA_CONTEXT_OFFSET                     0x01bc
+#define DRA7XX_RM_L4SEC_RNG_CONTEXT_OFFSET                      0x01c4
+#define DRA7XX_RM_L4SEC_SHA2MD51_CONTEXT_OFFSET                 0x01cc
+#define DRA7XX_PM_L4PER2_UART7_WKDEP_OFFSET                     0x01d0
+#define DRA7XX_RM_L4PER2_UART7_CONTEXT_OFFSET                   0x01d4
+#define DRA7XX_RM_L4SEC_DMA_CRYPTO_CONTEXT_OFFSET               0x01dc
+#define DRA7XX_PM_L4PER2_UART8_WKDEP_OFFSET                     0x01e0
+#define DRA7XX_RM_L4PER2_UART8_CONTEXT_OFFSET                   0x01e4
+#define DRA7XX_PM_L4PER2_UART9_WKDEP_OFFSET                     0x01e8
+#define DRA7XX_RM_L4PER2_UART9_CONTEXT_OFFSET                   0x01ec
+#define DRA7XX_PM_L4PER2_DCAN2_WKDEP_OFFSET                     0x01f0
+#define DRA7XX_RM_L4PER2_DCAN2_CONTEXT_OFFSET                   0x01f4
+#define DRA7XX_RM_L4SEC_SHA2MD52_CONTEXT_OFFSET                 0x01fc
+
+/* PRM.CUSTEFUSE_PRM register offsets */
+#define DRA7XX_PM_CUSTEFUSE_PWRSTCTRL_OFFSET                    0x0000
+#define DRA7XX_PM_CUSTEFUSE_PWRSTST_OFFSET                      0x0004
+#define DRA7XX_RM_CUSTEFUSE_EFUSE_CTRL_CUST_CONTEXT_OFFSET      0x0024
+
+/* PRM.WKUPAON_PRM register offsets */
+#define DRA7XX_RM_WKUPAON_L4_WKUP_CONTEXT_OFFSET                0x0000
+#define DRA7XX_PM_WKUPAON_WD_TIMER1_WKDEP_OFFSET                0x0004
+#define DRA7XX_RM_WKUPAON_WD_TIMER1_CONTEXT_OFFSET              0x0008
+#define DRA7XX_PM_WKUPAON_WD_TIMER2_WKDEP_OFFSET                0x000c
+#define DRA7XX_RM_WKUPAON_WD_TIMER2_CONTEXT_OFFSET              0x0010
+#define DRA7XX_PM_WKUPAON_GPIO1_WKDEP_OFFSET                    0x0014
+#define DRA7XX_RM_WKUPAON_GPIO1_CONTEXT_OFFSET                  0x0018
+#define DRA7XX_PM_WKUPAON_TIMER1_WKDEP_OFFSET                   0x001c
+#define DRA7XX_RM_WKUPAON_TIMER1_CONTEXT_OFFSET                 0x0020
+#define DRA7XX_PM_WKUPAON_TIMER12_WKDEP_OFFSET                  0x0024
+#define DRA7XX_RM_WKUPAON_TIMER12_CONTEXT_OFFSET                0x0028
+#define DRA7XX_RM_WKUPAON_COUNTER_32K_CONTEXT_OFFSET            0x0030
+#define DRA7XX_RM_WKUPAON_SAR_RAM_CONTEXT_OFFSET                0x0040
+#define DRA7XX_PM_WKUPAON_KBD_WKDEP_OFFSET                      0x0054
+#define DRA7XX_RM_WKUPAON_KBD_CONTEXT_OFFSET                    0x0058
+#define DRA7XX_PM_WKUPAON_UART10_WKDEP_OFFSET                   0x005c
+#define DRA7XX_RM_WKUPAON_UART10_CONTEXT_OFFSET                 0x0060
+#define DRA7XX_PM_WKUPAON_DCAN1_WKDEP_OFFSET                    0x0064
+#define DRA7XX_RM_WKUPAON_DCAN1_CONTEXT_OFFSET                  0x0068
+#define DRA7XX_PM_WKUPAON_ADC_WKDEP_OFFSET                              0x007c
+#define DRA7XX_RM_WKUPAON_ADC_CONTEXT_OFFSET                    0x0080
+#define DRA7XX_RM_WKUPAON_SPARE_SAFETY1_CONTEXT_OFFSET          0x0090
+#define DRA7XX_RM_WKUPAON_SPARE_SAFETY2_CONTEXT_OFFSET          0x0098
+#define DRA7XX_RM_WKUPAON_SPARE_SAFETY3_CONTEXT_OFFSET          0x00a0
+#define DRA7XX_RM_WKUPAON_SPARE_SAFETY4_CONTEXT_OFFSET          0x00a8
+#define DRA7XX_RM_WKUPAON_SPARE_UNKNOWN2_CONTEXT_OFFSET         0x00b0
+#define DRA7XX_RM_WKUPAON_SPARE_UNKNOWN3_CONTEXT_OFFSET         0x00b8
+
+/* PRM.WKUPAON_CM register offsets */
+#define DRA7XX_CM_WKUPAON_CLKSTCTRL_OFFSET                      0x0000
+#define DRA7XX_CM_WKUPAON_L4_WKUP_CLKCTRL_OFFSET                0x0020
+#define DRA7XX_CM_WKUPAON_L4_WKUP_CLKCTRL                       DRA7XX_PRM_REGADDR(DRA7XX_PRM_WKUPAON_CM_INST, 0x0020)
+#define DRA7XX_CM_WKUPAON_WD_TIMER1_CLKCTRL_OFFSET              0x0028
+#define DRA7XX_CM_WKUPAON_WD_TIMER1_CLKCTRL                     DRA7XX_PRM_REGADDR(DRA7XX_PRM_WKUPAON_CM_INST, 0x0028)
+#define DRA7XX_CM_WKUPAON_WD_TIMER2_CLKCTRL_OFFSET              0x0030
+#define DRA7XX_CM_WKUPAON_WD_TIMER2_CLKCTRL                     DRA7XX_PRM_REGADDR(DRA7XX_PRM_WKUPAON_CM_INST, 0x0030)
+#define DRA7XX_CM_WKUPAON_GPIO1_CLKCTRL_OFFSET                  0x0038
+#define DRA7XX_CM_WKUPAON_GPIO1_CLKCTRL                         DRA7XX_PRM_REGADDR(DRA7XX_PRM_WKUPAON_CM_INST, 0x0038)
+#define DRA7XX_CM_WKUPAON_TIMER1_CLKCTRL_OFFSET                 0x0040
+#define DRA7XX_CM_WKUPAON_TIMER1_CLKCTRL                        DRA7XX_PRM_REGADDR(DRA7XX_PRM_WKUPAON_CM_INST, 0x0040)
+#define DRA7XX_CM_WKUPAON_TIMER12_CLKCTRL_OFFSET                0x0048
+#define DRA7XX_CM_WKUPAON_TIMER12_CLKCTRL                       DRA7XX_PRM_REGADDR(DRA7XX_PRM_WKUPAON_CM_INST, 0x0048)
+#define DRA7XX_CM_WKUPAON_COUNTER_32K_CLKCTRL_OFFSET            0x0050
+#define DRA7XX_CM_WKUPAON_COUNTER_32K_CLKCTRL                   DRA7XX_PRM_REGADDR(DRA7XX_PRM_WKUPAON_CM_INST, 0x0050)
+#define DRA7XX_CM_WKUPAON_SAR_RAM_CLKCTRL_OFFSET                0x0060
+#define DRA7XX_CM_WKUPAON_SAR_RAM_CLKCTRL                       DRA7XX_PRM_REGADDR(DRA7XX_PRM_WKUPAON_CM_INST, 0x0060)
+#define DRA7XX_CM_WKUPAON_KBD_CLKCTRL_OFFSET                    0x0078
+#define DRA7XX_CM_WKUPAON_KBD_CLKCTRL                           DRA7XX_PRM_REGADDR(DRA7XX_PRM_WKUPAON_CM_INST, 0x0078)
+#define DRA7XX_CM_WKUPAON_UART10_CLKCTRL_OFFSET                 0x0080
+#define DRA7XX_CM_WKUPAON_UART10_CLKCTRL                        DRA7XX_PRM_REGADDR(DRA7XX_PRM_WKUPAON_CM_INST, 0x0080)
+#define DRA7XX_CM_WKUPAON_DCAN1_CLKCTRL_OFFSET                  0x0088
+#define DRA7XX_CM_WKUPAON_DCAN1_CLKCTRL                         DRA7XX_PRM_REGADDR(DRA7XX_PRM_WKUPAON_CM_INST, 0x0088)
+#define DRA7XX_CM_WKUPAON_SCRM_CLKCTRL_OFFSET                   0x0090
+#define DRA7XX_CM_WKUPAON_SCRM_CLKCTRL                          DRA7XX_PRM_REGADDR(DRA7XX_PRM_WKUPAON_CM_INST, 0x0090)
+#define DRA7XX_CM_WKUPAON_IO_SRCOMP_CLKCTRL_OFFSET              0x0098
+#define DRA7XX_CM_WKUPAON_IO_SRCOMP_CLKCTRL                     DRA7XX_PRM_REGADDR(DRA7XX_PRM_WKUPAON_CM_INST, 0x0098)
+#define DRA7XX_CM_WKUPAON_ADC_CLKCTRL_OFFSET                    0x00a0
+#define DRA7XX_CM_WKUPAON_ADC_CLKCTRL                           DRA7XX_PRM_REGADDR(DRA7XX_PRM_WKUPAON_CM_INST, 0x00a0)
+#define DRA7XX_CM_WKUPAON_SPARE_SAFETY1_CLKCTRL_OFFSET          0x00b0
+#define DRA7XX_CM_WKUPAON_SPARE_SAFETY1_CLKCTRL                 DRA7XX_PRM_REGADDR(DRA7XX_PRM_WKUPAON_CM_INST, 0x00b0)
+#define DRA7XX_CM_WKUPAON_SPARE_SAFETY2_CLKCTRL_OFFSET          0x00b8
+#define DRA7XX_CM_WKUPAON_SPARE_SAFETY2_CLKCTRL                 DRA7XX_PRM_REGADDR(DRA7XX_PRM_WKUPAON_CM_INST, 0x00b8)
+#define DRA7XX_CM_WKUPAON_SPARE_SAFETY3_CLKCTRL_OFFSET          0x00c0
+#define DRA7XX_CM_WKUPAON_SPARE_SAFETY3_CLKCTRL                 DRA7XX_PRM_REGADDR(DRA7XX_PRM_WKUPAON_CM_INST, 0x00c0)
+#define DRA7XX_CM_WKUPAON_SPARE_SAFETY4_CLKCTRL_OFFSET          0x00c8
+#define DRA7XX_CM_WKUPAON_SPARE_SAFETY4_CLKCTRL                 DRA7XX_PRM_REGADDR(DRA7XX_PRM_WKUPAON_CM_INST, 0x00c8)
+#define DRA7XX_CM_WKUPAON_SPARE_UNKNOWN2_CLKCTRL_OFFSET         0x00d0
+#define DRA7XX_CM_WKUPAON_SPARE_UNKNOWN2_CLKCTRL                DRA7XX_PRM_REGADDR(DRA7XX_PRM_WKUPAON_CM_INST, 0x00d0)
+#define DRA7XX_CM_WKUPAON_SPARE_UNKNOWN3_CLKCTRL_OFFSET         0x00d8
+#define DRA7XX_CM_WKUPAON_SPARE_UNKNOWN3_CLKCTRL                DRA7XX_PRM_REGADDR(DRA7XX_PRM_WKUPAON_CM_INST, 0x00d8)
+
+/* PRM.EMU_PRM register offsets */
+#define DRA7XX_PM_EMU_PWRSTCTRL_OFFSET                          0x0000
+#define DRA7XX_PM_EMU_PWRSTST_OFFSET                            0x0004
+#define DRA7XX_RM_EMU_DEBUGSS_CONTEXT_OFFSET                    0x0024
+
+/* PRM.EMU_CM register offsets */
+#define DRA7XX_CM_EMU_CLKSTCTRL_OFFSET                          0x0000
+#define DRA7XX_CM_EMU_DEBUGSS_CLKCTRL_OFFSET                    0x0004
+#define DRA7XX_CM_EMU_DEBUGSS_CLKCTRL                           DRA7XX_PRM_REGADDR(DRA7XX_PRM_EMU_CM_INST, 0x0004)
+#define DRA7XX_CM_EMU_DYNAMICDEP_OFFSET                         0x0008
+#define DRA7XX_CM_EMU_MPU_EMU_DBG_CLKCTRL_OFFSET                0x000c
+#define DRA7XX_CM_EMU_MPU_EMU_DBG_CLKCTRL                       DRA7XX_PRM_REGADDR(DRA7XX_PRM_EMU_CM_INST, 0x000c)
+
+/* PRM.DSP2_PRM register offsets */
+#define DRA7XX_PM_DSP2_PWRSTCTRL_OFFSET                         0x0000
+#define DRA7XX_PM_DSP2_PWRSTST_OFFSET                           0x0004
+#define DRA7XX_RM_DSP2_RSTCTRL_OFFSET                           0x0010
+#define DRA7XX_RM_DSP2_RSTST_OFFSET                             0x0014
+#define DRA7XX_RM_DSP2_DSP2_CONTEXT_OFFSET                      0x0024
+
+/* PRM.EVE1_PRM register offsets */
+#define DRA7XX_PM_EVE1_PWRSTCTRL_OFFSET                         0x0000
+#define DRA7XX_PM_EVE1_PWRSTST_OFFSET                           0x0004
+#define DRA7XX_RM_EVE1_RSTCTRL_OFFSET                           0x0010
+#define DRA7XX_RM_EVE1_RSTST_OFFSET                             0x0014
+#define DRA7XX_PM_EVE1_EVE1_WKDEP_OFFSET                        0x0020
+#define DRA7XX_RM_EVE1_EVE1_CONTEXT_OFFSET                      0x0024
+
+/* PRM.EVE2_PRM register offsets */
+#define DRA7XX_PM_EVE2_PWRSTCTRL_OFFSET                         0x0000
+#define DRA7XX_PM_EVE2_PWRSTST_OFFSET                           0x0004
+#define DRA7XX_RM_EVE2_RSTCTRL_OFFSET                           0x0010
+#define DRA7XX_RM_EVE2_RSTST_OFFSET                             0x0014
+#define DRA7XX_PM_EVE2_EVE2_WKDEP_OFFSET                        0x0020
+#define DRA7XX_RM_EVE2_EVE2_CONTEXT_OFFSET                      0x0024
+
+/* PRM.EVE3_PRM register offsets */
+#define DRA7XX_PM_EVE3_PWRSTCTRL_OFFSET                         0x0000
+#define DRA7XX_PM_EVE3_PWRSTST_OFFSET                           0x0004
+#define DRA7XX_RM_EVE3_RSTCTRL_OFFSET                           0x0010
+#define DRA7XX_RM_EVE3_RSTST_OFFSET                             0x0014
+#define DRA7XX_PM_EVE3_EVE3_WKDEP_OFFSET                        0x0020
+#define DRA7XX_RM_EVE3_EVE3_CONTEXT_OFFSET                      0x0024
+
+/* PRM.EVE4_PRM register offsets */
+#define DRA7XX_PM_EVE4_PWRSTCTRL_OFFSET                         0x0000
+#define DRA7XX_PM_EVE4_PWRSTST_OFFSET                           0x0004
+#define DRA7XX_RM_EVE4_RSTCTRL_OFFSET                           0x0010
+#define DRA7XX_RM_EVE4_RSTST_OFFSET                             0x0014
+#define DRA7XX_PM_EVE4_EVE4_WKDEP_OFFSET                        0x0020
+#define DRA7XX_RM_EVE4_EVE4_CONTEXT_OFFSET                      0x0024
+
+/* PRM.RTC_PRM register offsets */
+#define DRA7XX_PM_RTC_RTCSS_WKDEP_OFFSET                        0x0000
+#define DRA7XX_RM_RTC_RTCSS_CONTEXT_OFFSET                      0x0004
+
+/* PRM.VPE_PRM register offsets */
+#define DRA7XX_PM_VPE_PWRSTCTRL_OFFSET                          0x0000
+#define DRA7XX_PM_VPE_PWRSTST_OFFSET                            0x0004
+#define DRA7XX_PM_VPE_VPE_WKDEP_OFFSET                          0x0020
+#define DRA7XX_RM_VPE_VPE_CONTEXT_OFFSET                        0x0024
+
+/* PRM.DEVICE_PRM register offsets */
+#define DRA7XX_PRM_RSTCTRL_OFFSET                               0x0000
+#define DRA7XX_PRM_RSTST_OFFSET                                 0x0004
+#define DRA7XX_PRM_RSTTIME_OFFSET                               0x0008
+#define DRA7XX_PRM_CLKREQCTRL_OFFSET                            0x000c
+#define DRA7XX_PRM_VOLTCTRL_OFFSET                              0x0010
+#define DRA7XX_PRM_PWRREQCTRL_OFFSET                            0x0014
+#define DRA7XX_PRM_PSCON_COUNT_OFFSET                           0x0018
+#define DRA7XX_PRM_IO_COUNT_OFFSET                              0x001c
+#define DRA7XX_PRM_IO_PMCTRL_OFFSET                             0x0020
+#define DRA7XX_PRM_VOLTSETUP_WARMRESET_OFFSET                   0x0024
+#define DRA7XX_PRM_VOLTSETUP_CORE_OFF_OFFSET                    0x0028
+#define DRA7XX_PRM_VOLTSETUP_MPU_OFF_OFFSET                     0x002c
+#define DRA7XX_PRM_VOLTSETUP_MM_OFF_OFFSET                      0x0030
+#define DRA7XX_PRM_VOLTSETUP_CORE_RET_SLEEP_OFFSET              0x0034
+#define DRA7XX_PRM_VOLTSETUP_MPU_RET_SLEEP_OFFSET               0x0038
+#define DRA7XX_PRM_VOLTSETUP_MM_RET_SLEEP_OFFSET                0x003c
+#define DRA7XX_PRM_SRAM_COUNT_OFFSET                            0x00bc
+#define DRA7XX_PRM_SRAM_WKUP_SETUP_OFFSET                       0x00c0
+#define DRA7XX_PRM_SLDO_CORE_SETUP_OFFSET                       0x00c4
+#define DRA7XX_PRM_SLDO_CORE_CTRL_OFFSET                        0x00c8
+#define DRA7XX_PRM_SLDO_MPU_SETUP_OFFSET                        0x00cc
+#define DRA7XX_PRM_SLDO_MPU_CTRL_OFFSET                         0x00d0
+#define DRA7XX_PRM_SLDO_GPU_SETUP_OFFSET                        0x00d4
+#define DRA7XX_PRM_SLDO_GPU_CTRL_OFFSET                         0x00d8
+#define DRA7XX_PRM_ABBLDO_MPU_SETUP_OFFSET                      0x00dc
+#define DRA7XX_PRM_ABBLDO_MPU_CTRL_OFFSET                       0x00e0
+#define DRA7XX_PRM_ABBLDO_GPU_SETUP_OFFSET                      0x00e4
+#define DRA7XX_PRM_ABBLDO_GPU_CTRL_OFFSET                       0x00e8
+#define DRA7XX_PRM_BANDGAP_SETUP_OFFSET                         0x00ec
+#define DRA7XX_PRM_DEVICE_OFF_CTRL_OFFSET                       0x00f0
+#define DRA7XX_PRM_PHASE1_CNDP_OFFSET                           0x00f4
+#define DRA7XX_PRM_PHASE2A_CNDP_OFFSET                          0x00f8
+#define DRA7XX_PRM_PHASE2B_CNDP_OFFSET                          0x00fc
+#define DRA7XX_PRM_MODEM_IF_CTRL_OFFSET                         0x0100
+#define DRA7XX_PRM_VOLTST_MPU_OFFSET                            0x0110
+#define DRA7XX_PRM_VOLTST_MM_OFFSET                             0x0114
+#define DRA7XX_PRM_SLDO_DSPEVE_SETUP_OFFSET                     0x0118
+#define DRA7XX_PRM_SLDO_IVA_SETUP_OFFSET                        0x011c
+#define DRA7XX_PRM_ABBLDO_DSPEVE_CTRL_OFFSET                    0x0120
+#define DRA7XX_PRM_ABBLDO_IVA_CTRL_OFFSET                       0x0124
+#define DRA7XX_PRM_SLDO_DSPEVE_CTRL_OFFSET                      0x0128
+#define DRA7XX_PRM_SLDO_IVA_CTRL_OFFSET                         0x012c
+#define DRA7XX_PRM_ABBLDO_DSPEVE_SETUP_OFFSET                   0x0130
+#define DRA7XX_PRM_ABBLDO_IVA_SETUP_OFFSET                      0x0134
+
+#endif
diff --git a/arch/arm/mach-omap2/prminst44xx.c b/arch/arm/mach-omap2/prminst44xx.c
index c12320c0ae95..6334b96b4097 100644
--- a/arch/arm/mach-omap2/prminst44xx.c
+++ b/arch/arm/mach-omap2/prminst44xx.c
@@ -20,10 +20,13 @@
 #include "common.h"
 #include "prcm-common.h"
 #include "prm44xx.h"
+#include "prm54xx.h"
+#include "prm7xx.h"
 #include "prminst44xx.h"
 #include "prm-regbits-44xx.h"
 #include "prcm44xx.h"
 #include "prcm_mpu44xx.h"
+#include "soc.h"
 
 static void __iomem *_prm_bases[OMAP4_MAX_PRCM_PARTITIONS];
 
@@ -165,10 +168,19 @@ int omap4_prminst_deassert_hardreset(u8 shift, u8 part, s16 inst,
 void omap4_prminst_global_warm_sw_reset(void)
 {
         u32 v;
-
-        v = omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION,
-                                    OMAP4430_PRM_DEVICE_INST,
-                                    OMAP4_PRM_RSTCTRL_OFFSET);
+        s16 dev_inst;
+
+        if (cpu_is_omap44xx())
+                dev_inst = OMAP4430_PRM_DEVICE_INST;
+        else if (soc_is_omap54xx())
+                dev_inst = OMAP54XX_PRM_DEVICE_INST;
+        else if (soc_is_dra7xx())
+                dev_inst = DRA7XX_PRM_DEVICE_INST;
+        else
+                return;
+
+        v = omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION, dev_inst,
+                                        OMAP4_PRM_RSTCTRL_OFFSET);
         v |= OMAP4430_RST_GLOBAL_WARM_SW_MASK;
         omap4_prminst_write_inst_reg(v, OMAP4430_PRM_PARTITION,
                                  OMAP4430_PRM_DEVICE_INST,
diff --git a/arch/arm/mach-omap2/soc.h b/arch/arm/mach-omap2/soc.h
index 8c616e436bc7..4588df1447ed 100644
--- a/arch/arm/mach-omap2/soc.h
+++ b/arch/arm/mach-omap2/soc.h
@@ -8,6 +8,7 @@
  * Written by Tony Lindgren <tony.lindgren@nokia.com>
  *
  * Added OMAP4/5 specific defines - Santosh Shilimkar<santosh.shilimkar@ti.com>
+ * Added DRA7xxx specific defines - Sricharan R<r.sricharan@ti.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,6 +36,7 @@
 #ifndef __ASSEMBLY__
 
 #include <linux/bitops.h>
+#include <linux/of.h>
 
 /*
  * Test if multicore OMAP support is needed
@@ -105,6 +107,15 @@
 # endif
 #endif
 
+#ifdef CONFIG_SOC_DRA7XX
+# ifdef OMAP_NAME
+#  undef MULTI_OMAP2
+#  define MULTI_OMAP2
+# else
+#  define OMAP_NAME DRA7XX
+# endif
+#endif
+
 /*
  * Omap device type i.e. EMU/HS/TST/GP/BAD
  */
@@ -233,6 +244,7 @@ IS_AM_SUBCLASS(437x, 0x437)
 #define cpu_is_omap447x()               0
 #define soc_is_omap54xx()               0
 #define soc_is_omap543x()               0
+#define soc_is_dra7xx()                 0
 
 #if defined(MULTI_OMAP2)
 # if defined(CONFIG_ARCH_OMAP2)
@@ -379,6 +391,11 @@ IS_OMAP_TYPE(3430, 0x3430)
 # define soc_is_omap543x()              is_omap543x()
 #endif
 
+#if defined(CONFIG_SOC_DRA7XX)
+#undef soc_is_dra7xx
+#define soc_is_dra7xx() (of_machine_is_compatible("ti,dra7"))
+#endif
+
 /* Various silicon revisions for omap2 */
 #define OMAP242X_CLASS          0x24200024
 #define OMAP2420_REV_ES1_0      OMAP242X_CLASS
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c
index b37e1fcbad56..fa74a0625da1 100644
--- a/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@ -537,7 +537,7 @@ static void __init realtime_counter_init(void)
         reg |= num;
         __raw_writel(reg, base + INCREMENTER_NUMERATOR_OFFSET);
 
-        reg = __raw_readl(base + INCREMENTER_NUMERATOR_OFFSET) &
+        reg = __raw_readl(base + INCREMENTER_DENUMERATOR_RELOAD_OFFSET) &
                         NUMERATOR_DENUMERATOR_MASK;
         reg |= den;
         __raw_writel(reg, base + INCREMENTER_DENUMERATOR_RELOAD_OFFSET);
@@ -594,13 +594,14 @@ OMAP_SYS_GP_TIMER_INIT(3, 2, "timer_sys_ck", NULL,
                        1, "timer_sys_ck", "ti,timer-alwon");
 #endif
 
-#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5)
+#if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \
+        defined(CONFIG_SOC_DRA7XX)
 static OMAP_SYS_32K_TIMER_INIT(4, 1, "timer_32k_ck", "ti,timer-alwon",
                                2, "sys_clkin_ck", NULL);
 #endif
 
 #ifdef CONFIG_ARCH_OMAP4
-#ifdef CONFIG_LOCAL_TIMERS
+#ifdef CONFIG_HAVE_ARM_TWD
 static DEFINE_TWD_LOCAL_TIMER(twd_local_timer, OMAP44XX_LOCAL_TWD_BASE, 29);
 void __init omap4_local_timer_init(void)
 {
@@ -619,12 +620,12 @@ void __init omap4_local_timer_init(void)
                         pr_err("twd_local_timer_register failed %d\n", err);
         }
 }
-#else /* CONFIG_LOCAL_TIMERS */
+#else
 void __init omap4_local_timer_init(void)
 {
         omap4_sync32k_timer_init();
 }
-#endif /* CONFIG_LOCAL_TIMERS */
+#endif /* CONFIG_HAVE_ARM_TWD */
 #endif /* CONFIG_ARCH_OMAP4 */
 
 #ifdef CONFIG_SOC_OMAP5
diff --git a/arch/arm/mach-omap2/usb-host.c b/arch/arm/mach-omap2/usb-host.c
index 2eb19d4d0aa1..e83a6a4b184a 100644
--- a/arch/arm/mach-omap2/usb-host.c
+++ b/arch/arm/mach-omap2/usb-host.c
@@ -28,7 +28,7 @@
 #include <linux/io.h>
 #include <linux/gpio.h>
 #include <linux/usb/phy.h>
-#include <linux/usb/nop-usb-xceiv.h>
+#include <linux/usb/usb_phy_gen_xceiv.h>
 
 #include "soc.h"
 #include "omap_device.h"
@@ -349,7 +349,7 @@ static struct fixed_voltage_config hsusb_reg_config = {
         /* .init_data filled later */
 };
 
-static const char *nop_name = "nop_usb_xceiv"; /* NOP PHY driver */
+static const char *nop_name = "usb_phy_gen_xceiv"; /* NOP PHY driver */
 static const char *reg_name = "reg-fixed-voltage"; /* Regulator driver */
 
 /**
@@ -460,9 +460,9 @@ int usbhs_init_phys(struct usbhs_phy_data *phy, int num_phys)
                 pdevinfo.name = nop_name;
                 pdevinfo.id = phy->port;
                 pdevinfo.data = phy->platform_data;
-                pdevinfo.size_data = sizeof(struct nop_usb_xceiv_platform_data);
-
-                scnprintf(phy_id, MAX_STR, "nop_usb_xceiv.%d",
+                pdevinfo.size_data =
+                        sizeof(struct usb_phy_gen_xceiv_platform_data);
+                scnprintf(phy_id, MAX_STR, "usb_phy_gen_xceiv.%d",
                                         phy->port);
                 pdev = platform_device_register_full(&pdevinfo);
                 if (IS_ERR(pdev)) {
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index b41599f98a8e..91a5852b44f3 100644
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -174,8 +174,10 @@ void __init orion5x_xor_init(void)
  ****************************************************************************/
 static void __init orion5x_crypto_init(void)
 {
-        mvebu_mbus_add_window("sram", ORION5X_SRAM_PHYS_BASE,
-                              ORION5X_SRAM_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_SRAM_TARGET,
+                                    ORION_MBUS_SRAM_ATTR,
+                                    ORION5X_SRAM_PHYS_BASE,
+                                    ORION5X_SRAM_SIZE);
         orion_crypto_init(ORION5X_CRYPTO_PHYS_BASE, ORION5X_SRAM_PHYS_BASE,
                           SZ_8K, IRQ_ORION5X_CESA);
 }
@@ -222,22 +224,24 @@ void orion5x_setup_wins(void)
          * The PCIe windows will no longer be statically allocated
          * here once Orion5x is migrated to the pci-mvebu driver.
          */
-        mvebu_mbus_add_window_remap_flags("pcie0.0", ORION5X_PCIE_IO_PHYS_BASE,
+        mvebu_mbus_add_window_remap_by_id(ORION_MBUS_PCIE_IO_TARGET,
+                                          ORION_MBUS_PCIE_IO_ATTR,
+                                          ORION5X_PCIE_IO_PHYS_BASE,
                                           ORION5X_PCIE_IO_SIZE,
-                                          ORION5X_PCIE_IO_BUS_BASE,
-                                          MVEBU_MBUS_PCI_IO);
-        mvebu_mbus_add_window_remap_flags("pcie0.0", ORION5X_PCIE_MEM_PHYS_BASE,
-                                          ORION5X_PCIE_MEM_SIZE,
-                                          MVEBU_MBUS_NO_REMAP,
-                                          MVEBU_MBUS_PCI_MEM);
-        mvebu_mbus_add_window_remap_flags("pci0.0", ORION5X_PCI_IO_PHYS_BASE,
+                                          ORION5X_PCIE_IO_BUS_BASE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_PCIE_MEM_TARGET,
+                                    ORION_MBUS_PCIE_MEM_ATTR,
+                                    ORION5X_PCIE_MEM_PHYS_BASE,
+                                    ORION5X_PCIE_MEM_SIZE);
+        mvebu_mbus_add_window_remap_by_id(ORION_MBUS_PCI_IO_TARGET,
+                                          ORION_MBUS_PCI_IO_ATTR,
+                                          ORION5X_PCI_IO_PHYS_BASE,
                                           ORION5X_PCI_IO_SIZE,
-                                          ORION5X_PCI_IO_BUS_BASE,
-                                          MVEBU_MBUS_PCI_IO);
-        mvebu_mbus_add_window_remap_flags("pci0.0", ORION5X_PCI_MEM_PHYS_BASE,
-                                          ORION5X_PCI_MEM_SIZE,
-                                          MVEBU_MBUS_NO_REMAP,
-                                          MVEBU_MBUS_PCI_MEM);
+                                          ORION5X_PCI_IO_BUS_BASE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_PCI_MEM_TARGET,
+                                    ORION_MBUS_PCI_MEM_ATTR,
+                                    ORION5X_PCI_MEM_PHYS_BASE,
+                                    ORION5X_PCI_MEM_SIZE);
 }
 
 int orion5x_tclk;
diff --git a/arch/arm/mach-orion5x/common.h b/arch/arm/mach-orion5x/common.h
index a909afb384fb..f565f9944af2 100644
--- a/arch/arm/mach-orion5x/common.h
+++ b/arch/arm/mach-orion5x/common.h
@@ -7,6 +7,23 @@ struct dsa_platform_data;
 struct mv643xx_eth_platform_data;
 struct mv_sata_platform_data;
 
+#define ORION_MBUS_PCIE_MEM_TARGET    0x04
+#define ORION_MBUS_PCIE_MEM_ATTR      0x59
+#define ORION_MBUS_PCIE_IO_TARGET     0x04
+#define ORION_MBUS_PCIE_IO_ATTR       0x51
+#define ORION_MBUS_PCIE_WA_TARGET     0x04
+#define ORION_MBUS_PCIE_WA_ATTR       0x79
+#define ORION_MBUS_PCI_MEM_TARGET     0x03
+#define ORION_MBUS_PCI_MEM_ATTR       0x59
+#define ORION_MBUS_PCI_IO_TARGET      0x03
+#define ORION_MBUS_PCI_IO_ATTR        0x51
+#define ORION_MBUS_DEVBUS_BOOT_TARGET 0x01
+#define ORION_MBUS_DEVBUS_BOOT_ATTR   0x0f
+#define ORION_MBUS_DEVBUS_TARGET(cs)  0x01
+#define ORION_MBUS_DEVBUS_ATTR(cs)    (~(1 << cs))
+#define ORION_MBUS_SRAM_TARGET        0x00
+#define ORION_MBUS_SRAM_ATTR          0x00
+
 /*
  * Basic Orion init functions used early by machine-setup.
  */
diff --git a/arch/arm/mach-orion5x/d2net-setup.c b/arch/arm/mach-orion5x/d2net-setup.c
index 16c88bbabc98..8f68b745c1d5 100644
--- a/arch/arm/mach-orion5x/d2net-setup.c
+++ b/arch/arm/mach-orion5x/d2net-setup.c
@@ -317,8 +317,10 @@ static void __init d2net_init(void)
         d2net_sata_power_init();
         orion5x_sata_init(&d2net_sata_data);
 
-        mvebu_mbus_add_window("devbus-boot", D2NET_NOR_BOOT_BASE,
-                              D2NET_NOR_BOOT_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                    ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                    D2NET_NOR_BOOT_BASE,
+                                    D2NET_NOR_BOOT_SIZE);
         platform_device_register(&d2net_nor_flash);
 
         platform_device_register(&d2net_gpio_buttons);
diff --git a/arch/arm/mach-orion5x/db88f5281-setup.c b/arch/arm/mach-orion5x/db88f5281-setup.c
index 4e1263da38bb..4b2aefd1d961 100644
--- a/arch/arm/mach-orion5x/db88f5281-setup.c
+++ b/arch/arm/mach-orion5x/db88f5281-setup.c
@@ -340,19 +340,27 @@ static void __init db88f5281_init(void)
         orion5x_uart0_init();
         orion5x_uart1_init();
 
-        mvebu_mbus_add_window("devbus-boot", DB88F5281_NOR_BOOT_BASE,
-                              DB88F5281_NOR_BOOT_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                    ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                    DB88F5281_NOR_BOOT_BASE,
+                                    DB88F5281_NOR_BOOT_SIZE);
         platform_device_register(&db88f5281_boot_flash);
 
-        mvebu_mbus_add_window("devbus-cs0", DB88F5281_7SEG_BASE,
-                              DB88F5281_7SEG_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_TARGET(0),
+                                    ORION_MBUS_DEVBUS_ATTR(0),
+                                    DB88F5281_7SEG_BASE,
+                                    DB88F5281_7SEG_SIZE);
 
-        mvebu_mbus_add_window("devbus-cs1", DB88F5281_NOR_BASE,
-                              DB88F5281_NOR_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_TARGET(1),
+                                    ORION_MBUS_DEVBUS_ATTR(1),
+                                    DB88F5281_NOR_BASE,
+                                    DB88F5281_NOR_SIZE);
         platform_device_register(&db88f5281_nor_flash);
 
-        mvebu_mbus_add_window("devbus-cs2", DB88F5281_NAND_BASE,
-                              DB88F5281_NAND_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_TARGET(2),
+                                    ORION_MBUS_DEVBUS_ATTR(2),
+                                    DB88F5281_NAND_BASE,
+                                    DB88F5281_NAND_SIZE);
         platform_device_register(&db88f5281_nand_flash);
 
         i2c_register_board_info(0, &db88f5281_i2c_rtc, 1);
diff --git a/arch/arm/mach-orion5x/dns323-setup.c b/arch/arm/mach-orion5x/dns323-setup.c
index 9e6baf581ed3..70974732cbf0 100644
--- a/arch/arm/mach-orion5x/dns323-setup.c
+++ b/arch/arm/mach-orion5x/dns323-setup.c
@@ -611,8 +611,10 @@ static void __init dns323_init(void)
         /* setup flash mapping
          * CS3 holds a 8 MB Spansion S29GL064M90TFIR4
          */
-        mvebu_mbus_add_window("devbus-boot", DNS323_NOR_BOOT_BASE,
-                              DNS323_NOR_BOOT_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                    ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                    DNS323_NOR_BOOT_BASE,
+                                    DNS323_NOR_BOOT_SIZE);
         platform_device_register(&dns323_nor_flash);
 
         /* Sort out LEDs, Buttons and i2c devices */
diff --git a/arch/arm/mach-orion5x/edmini_v2-setup.c b/arch/arm/mach-orion5x/edmini_v2-setup.c
index 147615510dd0..f66c1b2ee8c1 100644
--- a/arch/arm/mach-orion5x/edmini_v2-setup.c
+++ b/arch/arm/mach-orion5x/edmini_v2-setup.c
@@ -23,8 +23,8 @@
 #include <linux/platform_device.h>
 #include <linux/pci.h>
 #include <linux/irq.h>
+#include <linux/mbus.h>
 #include <linux/mtd/physmap.h>
-#include <linux/mv643xx_eth.h>
 #include <linux/leds.h>
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
@@ -96,14 +96,6 @@ static struct platform_device edmini_v2_nor_flash = {
 };
 
 /*****************************************************************************
- * Ethernet
- ****************************************************************************/
-
-static struct mv643xx_eth_platform_data edmini_v2_eth_data = {
-        .phy_addr       = 8,
-};
-
-/*****************************************************************************
  * RTC 5C372a on I2C bus
  ****************************************************************************/
 
@@ -152,10 +144,11 @@ void __init edmini_v2_init(void)
          * Configure peripherals.
          */
         orion5x_ehci0_init();
-        orion5x_eth_init(&edmini_v2_eth_data);
 
-        mvebu_mbus_add_window("devbus-boot", EDMINI_V2_NOR_BOOT_BASE,
-                              EDMINI_V2_NOR_BOOT_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                    ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                    EDMINI_V2_NOR_BOOT_BASE,
+                                    EDMINI_V2_NOR_BOOT_SIZE);
         platform_device_register(&edmini_v2_nor_flash);
 
         pr_notice("edmini_v2: USB device port, flash write and power-off "
diff --git a/arch/arm/mach-orion5x/include/mach/debug-macro.S b/arch/arm/mach-orion5x/include/mach/debug-macro.S
deleted file mode 100644
index f340ed8f8dd0..000000000000
--- a/arch/arm/mach-orion5x/include/mach/debug-macro.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * arch/arm/mach-orion5x/include/mach/debug-macro.S
- *
- * Debugging macro include header
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#include <mach/orion5x.h>
-
-        .macro  addruart, rp, rv, tmp
-        ldr     \rp, =ORION5X_REGS_PHYS_BASE
-        ldr     \rv, =ORION5X_REGS_VIRT_BASE
-        orr     \rp, \rp, #0x00012000
-        orr     \rv, \rv, #0x00012000
-        .endm
-
-#define UART_SHIFT      2
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-orion5x/kurobox_pro-setup.c b/arch/arm/mach-orion5x/kurobox_pro-setup.c
index aae10e4a917c..fe6a48a325e8 100644
--- a/arch/arm/mach-orion5x/kurobox_pro-setup.c
+++ b/arch/arm/mach-orion5x/kurobox_pro-setup.c
@@ -359,13 +359,17 @@ static void __init kurobox_pro_init(void)
         orion5x_uart1_init();
         orion5x_xor_init();
 
-        mvebu_mbus_add_window("devbus-boot", KUROBOX_PRO_NOR_BOOT_BASE,
-                              KUROBOX_PRO_NOR_BOOT_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                    ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                    KUROBOX_PRO_NOR_BOOT_BASE,
+                                    KUROBOX_PRO_NOR_BOOT_SIZE);
         platform_device_register(&kurobox_pro_nor_flash);
 
         if (machine_is_kurobox_pro()) {
-                mvebu_mbus_add_window("devbus-cs0", KUROBOX_PRO_NAND_BASE,
-                                      KUROBOX_PRO_NAND_SIZE);
+                mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_TARGET(0),
+                                            ORION_MBUS_DEVBUS_ATTR(0),
+                                            KUROBOX_PRO_NAND_BASE,
+                                            KUROBOX_PRO_NAND_SIZE);
                 platform_device_register(&kurobox_pro_nand_flash);
         }
 
diff --git a/arch/arm/mach-orion5x/ls-chl-setup.c b/arch/arm/mach-orion5x/ls-chl-setup.c
index 6234977b5aea..028ea038d404 100644
--- a/arch/arm/mach-orion5x/ls-chl-setup.c
+++ b/arch/arm/mach-orion5x/ls-chl-setup.c
@@ -294,8 +294,10 @@ static void __init lschl_init(void)
         orion5x_uart0_init();
         orion5x_xor_init();
 
-        mvebu_mbus_add_window("devbus-boot", LSCHL_NOR_BOOT_BASE,
-                              LSCHL_NOR_BOOT_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                    ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                    LSCHL_NOR_BOOT_BASE,
+                                    LSCHL_NOR_BOOT_SIZE);
         platform_device_register(&lschl_nor_flash);
 
         platform_device_register(&lschl_leds);
diff --git a/arch/arm/mach-orion5x/ls_hgl-setup.c b/arch/arm/mach-orion5x/ls_hgl-setup.c
index fe04c4b64569..32b7129b767d 100644
--- a/arch/arm/mach-orion5x/ls_hgl-setup.c
+++ b/arch/arm/mach-orion5x/ls_hgl-setup.c
@@ -243,8 +243,10 @@ static void __init ls_hgl_init(void)
         orion5x_uart0_init();
         orion5x_xor_init();
 
-        mvebu_mbus_add_window("devbus-boot", LS_HGL_NOR_BOOT_BASE,
-                              LS_HGL_NOR_BOOT_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                    ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                    LS_HGL_NOR_BOOT_BASE,
+                                    LS_HGL_NOR_BOOT_SIZE);
         platform_device_register(&ls_hgl_nor_flash);
 
         platform_device_register(&ls_hgl_button_device);
diff --git a/arch/arm/mach-orion5x/lsmini-setup.c b/arch/arm/mach-orion5x/lsmini-setup.c
index ca4dbe973daf..a6493e76f96d 100644
--- a/arch/arm/mach-orion5x/lsmini-setup.c
+++ b/arch/arm/mach-orion5x/lsmini-setup.c
@@ -244,8 +244,10 @@ static void __init lsmini_init(void)
         orion5x_uart0_init();
         orion5x_xor_init();
 
-        mvebu_mbus_add_window("devbus-boot", LSMINI_NOR_BOOT_BASE,
-                              LSMINI_NOR_BOOT_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                    ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                    LSMINI_NOR_BOOT_BASE,
+                                    LSMINI_NOR_BOOT_SIZE);
         platform_device_register(&lsmini_nor_flash);
 
         platform_device_register(&lsmini_button_device);
diff --git a/arch/arm/mach-orion5x/mss2-setup.c b/arch/arm/mach-orion5x/mss2-setup.c
index 827acbafc9dc..e105130ba51c 100644
--- a/arch/arm/mach-orion5x/mss2-setup.c
+++ b/arch/arm/mach-orion5x/mss2-setup.c
@@ -241,8 +241,10 @@ static void __init mss2_init(void)
         orion5x_uart0_init();
         orion5x_xor_init();
 
-        mvebu_mbus_add_window("devbus-boot", MSS2_NOR_BOOT_BASE,
-                              MSS2_NOR_BOOT_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                    ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                    MSS2_NOR_BOOT_BASE,
+                                    MSS2_NOR_BOOT_SIZE);
         platform_device_register(&mss2_nor_flash);
 
         platform_device_register(&mss2_button_device);
diff --git a/arch/arm/mach-orion5x/mv2120-setup.c b/arch/arm/mach-orion5x/mv2120-setup.c
index 92600ae2b4b6..e032f01da49e 100644
--- a/arch/arm/mach-orion5x/mv2120-setup.c
+++ b/arch/arm/mach-orion5x/mv2120-setup.c
@@ -204,8 +204,10 @@ static void __init mv2120_init(void)
         orion5x_uart0_init();
         orion5x_xor_init();
 
-        mvebu_mbus_add_window("devbus-boot", MV2120_NOR_BOOT_BASE,
-                              MV2120_NOR_BOOT_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                    ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                    MV2120_NOR_BOOT_BASE,
+                                    MV2120_NOR_BOOT_SIZE);
         platform_device_register(&mv2120_nor_flash);
 
         platform_device_register(&mv2120_button_device);
diff --git a/arch/arm/mach-orion5x/net2big-setup.c b/arch/arm/mach-orion5x/net2big-setup.c
index dd0641a0d074..ba73dc7ffb9e 100644
--- a/arch/arm/mach-orion5x/net2big-setup.c
+++ b/arch/arm/mach-orion5x/net2big-setup.c
@@ -397,8 +397,10 @@ static void __init net2big_init(void)
         net2big_sata_power_init();
         orion5x_sata_init(&net2big_sata_data);
 
-        mvebu_mbus_add_window("devbus-boot", NET2BIG_NOR_BOOT_BASE,
-                              NET2BIG_NOR_BOOT_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                    ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                    NET2BIG_NOR_BOOT_BASE,
+                                    NET2BIG_NOR_BOOT_SIZE);
         platform_device_register(&net2big_nor_flash);
 
         platform_device_register(&net2big_gpio_buttons);
diff --git a/arch/arm/mach-orion5x/pci.c b/arch/arm/mach-orion5x/pci.c
index 503368023bb1..7fab67053030 100644
--- a/arch/arm/mach-orion5x/pci.c
+++ b/arch/arm/mach-orion5x/pci.c
@@ -157,11 +157,10 @@ static int __init pcie_setup(struct pci_sys_data *sys)
         if (dev == MV88F5181_DEV_ID || dev == MV88F5182_DEV_ID) {
                 printk(KERN_NOTICE "Applying Orion-1/Orion-NAS PCIe config "
                                    "read transaction workaround\n");
-                mvebu_mbus_add_window_remap_flags("pcie0.0",
-                                                  ORION5X_PCIE_WA_PHYS_BASE,
-                                                  ORION5X_PCIE_WA_SIZE,
-                                                  MVEBU_MBUS_NO_REMAP,
-                                                  MVEBU_MBUS_PCI_WA);
+                mvebu_mbus_add_window_by_id(ORION_MBUS_PCIE_WA_TARGET,
+                                            ORION_MBUS_PCIE_WA_ATTR,
+                                            ORION5X_PCIE_WA_PHYS_BASE,
+                                            ORION5X_PCIE_WA_SIZE);
                 pcie_ops.read = pcie_rd_conf_wa;
         }
 
diff --git a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
index 1c4498bf650a..213b3e143c57 100644
--- a/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
@@ -123,8 +123,10 @@ static void __init rd88f5181l_fxo_init(void)
         orion5x_eth_switch_init(&rd88f5181l_fxo_switch_plat_data, NO_IRQ);
         orion5x_uart0_init();
 
-        mvebu_mbus_add_window("devbus-boot", RD88F5181L_FXO_NOR_BOOT_BASE,
-                              RD88F5181L_FXO_NOR_BOOT_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                    ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                    RD88F5181L_FXO_NOR_BOOT_BASE,
+                                    RD88F5181L_FXO_NOR_BOOT_SIZE);
         platform_device_register(&rd88f5181l_fxo_nor_boot_flash);
 }
 
diff --git a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
index adabe34c4fc6..594800e1d691 100644
--- a/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
@@ -130,8 +130,10 @@ static void __init rd88f5181l_ge_init(void)
         orion5x_i2c_init();
         orion5x_uart0_init();
 
-        mvebu_mbus_add_window("devbus-boot", RD88F5181L_GE_NOR_BOOT_BASE,
-                              RD88F5181L_GE_NOR_BOOT_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                    ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                    RD88F5181L_GE_NOR_BOOT_BASE,
+                                    RD88F5181L_GE_NOR_BOOT_SIZE);
         platform_device_register(&rd88f5181l_ge_nor_boot_flash);
 
         i2c_register_board_info(0, &rd88f5181l_ge_i2c_rtc, 1);
diff --git a/arch/arm/mach-orion5x/rd88f5182-setup.c b/arch/arm/mach-orion5x/rd88f5182-setup.c
index 66e77ec91532..b1cf68493ffc 100644
--- a/arch/arm/mach-orion5x/rd88f5182-setup.c
+++ b/arch/arm/mach-orion5x/rd88f5182-setup.c
@@ -264,11 +264,14 @@ static void __init rd88f5182_init(void)
         orion5x_uart0_init();
         orion5x_xor_init();
 
-        mvebu_mbus_add_window("devbus-boot", RD88F5182_NOR_BOOT_BASE,
-                              RD88F5182_NOR_BOOT_SIZE);
-
-        mvebu_mbus_add_window("devbus-cs1", RD88F5182_NOR_BASE,
-                              RD88F5182_NOR_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                    ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                    RD88F5182_NOR_BOOT_BASE,
+                                    RD88F5182_NOR_BOOT_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_TARGET(1),
+                                    ORION_MBUS_DEVBUS_ATTR(1),
+                                    RD88F5182_NOR_BASE,
+                                    RD88F5182_NOR_SIZE);
         platform_device_register(&rd88f5182_nor_flash);
         platform_device_register(&rd88f5182_gpio_leds);
 
diff --git a/arch/arm/mach-orion5x/terastation_pro2-setup.c b/arch/arm/mach-orion5x/terastation_pro2-setup.c
index a0bfa53e7556..7e9064844698 100644
--- a/arch/arm/mach-orion5x/terastation_pro2-setup.c
+++ b/arch/arm/mach-orion5x/terastation_pro2-setup.c
@@ -329,8 +329,10 @@ static void __init tsp2_init(void)
         /*
          * Configure peripherals.
          */
-        mvebu_mbus_add_window("devbus-boot", TSP2_NOR_BOOT_BASE,
-                              TSP2_NOR_BOOT_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                    ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                    TSP2_NOR_BOOT_BASE,
+                                    TSP2_NOR_BOOT_SIZE);
         platform_device_register(&tsp2_nor_flash);
 
         orion5x_ehci0_init();
diff --git a/arch/arm/mach-orion5x/ts209-setup.c b/arch/arm/mach-orion5x/ts209-setup.c
index 80174f0f168e..e90c0618fdad 100644
--- a/arch/arm/mach-orion5x/ts209-setup.c
+++ b/arch/arm/mach-orion5x/ts209-setup.c
@@ -286,8 +286,10 @@ static void __init qnap_ts209_init(void)
         /*
          * Configure peripherals.
          */
-        mvebu_mbus_add_window("devbus-boot", QNAP_TS209_NOR_BOOT_BASE,
-                              QNAP_TS209_NOR_BOOT_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                    ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                    QNAP_TS209_NOR_BOOT_BASE,
+                                    QNAP_TS209_NOR_BOOT_SIZE);
         platform_device_register(&qnap_ts209_nor_flash);
 
         orion5x_ehci0_init();
diff --git a/arch/arm/mach-orion5x/ts409-setup.c b/arch/arm/mach-orion5x/ts409-setup.c
index 92592790d6da..5c079d312015 100644
--- a/arch/arm/mach-orion5x/ts409-setup.c
+++ b/arch/arm/mach-orion5x/ts409-setup.c
@@ -277,8 +277,10 @@ static void __init qnap_ts409_init(void)
         /*
          * Configure peripherals.
          */
-        mvebu_mbus_add_window("devbus-boot", QNAP_TS409_NOR_BOOT_BASE,
-                              QNAP_TS409_NOR_BOOT_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                    ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                    QNAP_TS409_NOR_BOOT_BASE,
+                                    QNAP_TS409_NOR_BOOT_SIZE);
         platform_device_register(&qnap_ts409_nor_flash);
 
         orion5x_ehci0_init();
diff --git a/arch/arm/mach-orion5x/wnr854t-setup.c b/arch/arm/mach-orion5x/wnr854t-setup.c
index 6b84863c018d..80a56ee245b3 100644
--- a/arch/arm/mach-orion5x/wnr854t-setup.c
+++ b/arch/arm/mach-orion5x/wnr854t-setup.c
@@ -127,8 +127,10 @@ static void __init wnr854t_init(void)
         orion5x_eth_switch_init(&wnr854t_switch_plat_data, NO_IRQ);
         orion5x_uart0_init();
 
-        mvebu_mbus_add_window("devbus-boot", WNR854T_NOR_BOOT_BASE,
-                              WNR854T_NOR_BOOT_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                    ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                    WNR854T_NOR_BOOT_BASE,
+                                    WNR854T_NOR_BOOT_SIZE);
         platform_device_register(&wnr854t_nor_flash);
 }
 
diff --git a/arch/arm/mach-orion5x/wrt350n-v2-setup.c b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
index fae684bc54f2..670e30dc0d1b 100644
--- a/arch/arm/mach-orion5x/wrt350n-v2-setup.c
+++ b/arch/arm/mach-orion5x/wrt350n-v2-setup.c
@@ -213,8 +213,10 @@ static void __init wrt350n_v2_init(void)
         orion5x_eth_switch_init(&wrt350n_v2_switch_plat_data, NO_IRQ);
         orion5x_uart0_init();
 
-        mvebu_mbus_add_window("devbus-boot", WRT350N_V2_NOR_BOOT_BASE,
-                              WRT350N_V2_NOR_BOOT_SIZE);
+        mvebu_mbus_add_window_by_id(ORION_MBUS_DEVBUS_BOOT_TARGET,
+                                    ORION_MBUS_DEVBUS_BOOT_ATTR,
+                                    WRT350N_V2_NOR_BOOT_BASE,
+                                    WRT350N_V2_NOR_BOOT_SIZE);
         platform_device_register(&wrt350n_v2_nor_flash);
         platform_device_register(&wrt350n_v2_leds);
         platform_device_register(&wrt350n_v2_button_device);
diff --git a/arch/arm/mach-prima2/common.c b/arch/arm/mach-prima2/common.c
index 2c70f74fed5d..e110b6d4ae8c 100644
--- a/arch/arm/mach-prima2/common.c
+++ b/arch/arm/mach-prima2/common.c
@@ -42,7 +42,6 @@ static const char *atlas6_dt_match[] __initdata = {
 
 DT_MACHINE_START(ATLAS6_DT, "Generic ATLAS6 (Flattened Device Tree)")
         /* Maintainer: Barry Song <baohua.song@csr.com> */
-        .nr_irqs        = 128,
         .map_io         = sirfsoc_map_io,
         .init_time      = sirfsoc_init_time,
         .init_late      = sirfsoc_init_late,
@@ -59,7 +58,6 @@ static const char *prima2_dt_match[] __initdata = {
 
 DT_MACHINE_START(PRIMA2_DT, "Generic PRIMA2 (Flattened Device Tree)")
         /* Maintainer: Barry Song <baohua.song@csr.com> */
-        .nr_irqs        = 128,
         .map_io         = sirfsoc_map_io,
         .init_time      = sirfsoc_init_time,
         .dma_zone_size  = SZ_256M,
diff --git a/arch/arm/mach-prima2/pm.c b/arch/arm/mach-prima2/pm.c
index 02cc34388b05..c4525a88e5da 100644
--- a/arch/arm/mach-prima2/pm.c
+++ b/arch/arm/mach-prima2/pm.c
@@ -34,7 +34,10 @@ static void sirfsoc_set_wakeup_source(void)
         pwr_trigger_en_reg = sirfsoc_rtc_iobrg_readl(sirfsoc_pwrc_base +
                 SIRFSOC_PWRC_TRIGGER_EN);
 #define X_ON_KEY_B (1 << 0)
-        sirfsoc_rtc_iobrg_writel(pwr_trigger_en_reg | X_ON_KEY_B,
+#define RTC_ALARM0_B (1 << 2)
+#define RTC_ALARM1_B (1 << 3)
+        sirfsoc_rtc_iobrg_writel(pwr_trigger_en_reg | X_ON_KEY_B |
+                RTC_ALARM0_B | RTC_ALARM1_B,
                 sirfsoc_pwrc_base + SIRFSOC_PWRC_TRIGGER_EN);
 }
 
@@ -85,12 +88,6 @@ static const struct platform_suspend_ops sirfsoc_pm_ops = {
         .valid = suspend_valid_only_mem,
 };
 
-int __init sirfsoc_pm_init(void)
-{
-        suspend_set_ops(&sirfsoc_pm_ops);
-        return 0;
-}
-
 static const struct of_device_id pwrc_ids[] = {
         { .compatible = "sirf,prima2-pwrc" },
         {}
@@ -118,7 +115,6 @@ static int __init sirfsoc_of_pwrc_init(void)
 
         return 0;
 }
-postcore_initcall(sirfsoc_of_pwrc_init);
 
 static const struct of_device_id memc_ids[] = {
         { .compatible = "sirf,prima2-memc" },
@@ -149,4 +145,11 @@ static int __init sirfsoc_memc_init(void)
 {
         return platform_driver_register(&sirfsoc_memc_driver);
 }
-postcore_initcall(sirfsoc_memc_init);
+
+int __init sirfsoc_pm_init(void)
+{
+        sirfsoc_of_pwrc_init();
+        sirfsoc_memc_init();
+        suspend_set_ops(&sirfsoc_pm_ops);
+        return 0;
+}
diff --git a/arch/arm/mach-pxa/cm-x300.c b/arch/arm/mach-pxa/cm-x300.c
index 8091aac89edf..f9423493ed36 100644
--- a/arch/arm/mach-pxa/cm-x300.c
+++ b/arch/arm/mach-pxa/cm-x300.c
@@ -29,7 +29,7 @@
 #include <linux/pwm_backlight.h>
 
 #include <linux/i2c.h>
-#include <linux/i2c/pca953x.h>
+#include <linux/platform_data/pca953x.h>
 #include <linux/i2c/pxa-i2c.h>
 
 #include <linux/mfd/da903x.h>
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c
index 3a3362fa793e..8eb4e23c561d 100644
--- a/arch/arm/mach-pxa/em-x270.c
+++ b/arch/arm/mach-pxa/em-x270.c
@@ -30,7 +30,7 @@
 #include <linux/power_supply.h>
 #include <linux/apm-emulation.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pca953x.h>
+#include <linux/platform_data/pca953x.h>
 #include <linux/i2c/pxa-i2c.h>
 #include <linux/regulator/userspace-consumer.h>
 
diff --git a/arch/arm/mach-pxa/icontrol.c b/arch/arm/mach-pxa/icontrol.c
index fe31bfcbb8df..c98511c5abd1 100644
--- a/arch/arm/mach-pxa/icontrol.c
+++ b/arch/arm/mach-pxa/icontrol.c
@@ -73,9 +73,6 @@ static struct pxa2xx_spi_chip mcp251x_chip_info4 = {
 
 static struct mcp251x_platform_data mcp251x_info = {
         .oscillator_frequency = 16E6,
-        .board_specific_setup = NULL,
-        .power_enable         = NULL,
-        .transceiver_enable   = NULL
 };
 
 static struct spi_board_info mcp251x_board_info[] = {
diff --git a/arch/arm/mach-pxa/pcm990-baseboard.c b/arch/arm/mach-pxa/pcm990-baseboard.c
index 13e5b00eae90..3133ba82c508 100644
--- a/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -408,7 +408,7 @@ struct pxacamera_platform_data pcm990_pxacamera_platform_data = {
         .mclk_10khz = 1000,
 };
 
-#include <linux/i2c/pca953x.h>
+#include <linux/platform_data/pca953x.h>
 
 static struct pca953x_platform_data pca9536_data = {
         .gpio_base      = PXA_NR_BUILTIN_GPIO,
diff --git a/arch/arm/mach-pxa/pxa-dt.c b/arch/arm/mach-pxa/pxa-dt.c
index 3835979a0dd3..f6a2c4b1c1dc 100644
--- a/arch/arm/mach-pxa/pxa-dt.c
+++ b/arch/arm/mach-pxa/pxa-dt.c
@@ -28,7 +28,7 @@ static const struct of_dev_auxdata pxa3xx_auxdata_lookup[] __initconst = {
         OF_DEV_AUXDATA("mrvl,pxa-uart",         0x40700000, "pxa2xx-uart.2", NULL),
         OF_DEV_AUXDATA("mrvl,pxa-uart",         0x41600000, "pxa2xx-uart.3", NULL),
         OF_DEV_AUXDATA("marvell,pxa-mmc",       0x41100000, "pxa2xx-mci.0", NULL),
-        OF_DEV_AUXDATA("mrvl,pxa-gpio",         0x40e00000, "pxa-gpio", NULL),
+        OF_DEV_AUXDATA("intel,pxa3xx-gpio",     0x40e00000, "pxa3xx-gpio", NULL),
         OF_DEV_AUXDATA("marvell,pxa-ohci",      0x4c000000, "pxa27x-ohci", NULL),
         OF_DEV_AUXDATA("mrvl,pxa-i2c",          0x40301680, "pxa2xx-i2c.0", NULL),
         OF_DEV_AUXDATA("mrvl,pwri2c",           0x40f500c0, "pxa3xx-i2c.1", NULL),
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index 4c29173026e8..0b11c1af51c4 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -20,7 +20,7 @@
 #include <linux/leds.h>
 #include <linux/i2c.h>
 #include <linux/i2c/pxa-i2c.h>
-#include <linux/i2c/pca953x.h>
+#include <linux/platform_data/pca953x.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 #include <linux/spi/corgi_lcd.h>
diff --git a/arch/arm/mach-pxa/zeus.c b/arch/arm/mach-pxa/zeus.c
index f5d436434566..b19d1c361cab 100644
--- a/arch/arm/mach-pxa/zeus.c
+++ b/arch/arm/mach-pxa/zeus.c
@@ -26,9 +26,11 @@
 #include <linux/mtd/physmap.h>
 #include <linux/i2c.h>
 #include <linux/i2c/pxa-i2c.h>
-#include <linux/i2c/pca953x.h>
+#include <linux/platform_data/pca953x.h>
 #include <linux/apm-emulation.h>
 #include <linux/can/platform/mcp251x.h>
+#include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>
 
 #include <asm/mach-types.h>
 #include <asm/suspend.h>
@@ -391,33 +393,34 @@ static struct pxa2xx_spi_master pxa2xx_spi_ssp3_master_info = {
 };
 
 /* CAN bus on SPI */
-static int zeus_mcp2515_setup(struct spi_device *sdev)
-{
-        int err;
-
-        err = gpio_request(ZEUS_CAN_SHDN_GPIO, "CAN shutdown");
-        if (err)
-                return err;
+static struct regulator_consumer_supply can_regulator_consumer =
+        REGULATOR_SUPPLY("vdd", "spi3.0");
 
-        err = gpio_direction_output(ZEUS_CAN_SHDN_GPIO, 1);
-        if (err) {
-                gpio_free(ZEUS_CAN_SHDN_GPIO);
-                return err;
-        }
+static struct regulator_init_data can_regulator_init_data = {
+        .constraints    = {
+                .valid_ops_mask = REGULATOR_CHANGE_STATUS,
+        },
+        .consumer_supplies      = &can_regulator_consumer,
+        .num_consumer_supplies  = 1,
+};
 
-        return 0;
-}
+static struct fixed_voltage_config can_regulator_pdata = {
+        .supply_name    = "CAN_SHDN",
+        .microvolts     = 3300000,
+        .gpio           = ZEUS_CAN_SHDN_GPIO,
+        .init_data      = &can_regulator_init_data,
+};
 
-static int zeus_mcp2515_transceiver_enable(int enable)
-{
-        gpio_set_value(ZEUS_CAN_SHDN_GPIO, !enable);
-        return 0;
-}
+static struct platform_device can_regulator_device = {
+        .name   = "reg-fixed-volage",
+        .id     = -1,
+        .dev    = {
+                .platform_data  = &can_regulator_pdata,
+        },
+};
 
 static struct mcp251x_platform_data zeus_mcp2515_pdata = {
         .oscillator_frequency   = 16*1000*1000,
-        .board_specific_setup   = zeus_mcp2515_setup,
-        .power_enable           = zeus_mcp2515_transceiver_enable,
 };
 
 static struct spi_board_info zeus_spi_board_info[] = {
@@ -516,6 +519,7 @@ static struct platform_device *zeus_devices[] __initdata = {
         &zeus_leds_device,
         &zeus_pcmcia_device,
         &zeus_max6369_device,
+        &can_regulator_device,
 };
 
 /* AC'97 */
diff --git a/arch/arm/mach-pxa/zylonite_pxa300.c b/arch/arm/mach-pxa/zylonite_pxa300.c
index 86e59c043de2..869bce7c3f24 100644
--- a/arch/arm/mach-pxa/zylonite_pxa300.c
+++ b/arch/arm/mach-pxa/zylonite_pxa300.c
@@ -18,7 +18,7 @@
 #include <linux/init.h>
 #include <linux/i2c.h>
 #include <linux/i2c/pxa-i2c.h>
-#include <linux/i2c/pca953x.h>
+#include <linux/platform_data/pca953x.h>
 #include <linux/gpio.h>
 
 #include <mach/pxa300.h>
diff --git a/arch/arm/mach-realview/Kconfig b/arch/arm/mach-realview/Kconfig
index d210c0f9c2c4..9db2029aa632 100644
--- a/arch/arm/mach-realview/Kconfig
+++ b/arch/arm/mach-realview/Kconfig
@@ -13,7 +13,7 @@ config REALVIEW_EB_A9MP
         depends on MACH_REALVIEW_EB
         select CPU_V7
         select HAVE_ARM_SCU if SMP
-        select HAVE_ARM_TWD if LOCAL_TIMERS
+        select HAVE_ARM_TWD if SMP
         select HAVE_SMP
         select MIGHT_HAVE_CACHE_L2X0
         help
@@ -26,7 +26,7 @@ config REALVIEW_EB_ARM11MP
         select ARCH_HAS_BARRIERS if SMP
         select CPU_V6K
         select HAVE_ARM_SCU if SMP
-        select HAVE_ARM_TWD if LOCAL_TIMERS
+        select HAVE_ARM_TWD if SMP
         select HAVE_SMP
         select MIGHT_HAVE_CACHE_L2X0
         help
@@ -48,7 +48,7 @@ config MACH_REALVIEW_PB11MP
         select ARM_GIC
         select CPU_V6K
         select HAVE_ARM_SCU if SMP
-        select HAVE_ARM_TWD if LOCAL_TIMERS
+        select HAVE_ARM_TWD if SMP
         select HAVE_PATA_PLATFORM
         select HAVE_SMP
         select MIGHT_HAVE_CACHE_L2X0
@@ -92,7 +92,7 @@ config MACH_REALVIEW_PBX
         select ARCH_SPARSEMEM_ENABLE if CPU_V7 && !REALVIEW_HIGH_PHYS_OFFSET
         select ARM_GIC
         select HAVE_ARM_SCU if SMP
-        select HAVE_ARM_TWD if LOCAL_TIMERS
+        select HAVE_ARM_TWD if SMP
         select HAVE_PATA_PLATFORM
         select HAVE_SMP
         select MIGHT_HAVE_CACHE_L2X0
diff --git a/arch/arm/mach-realview/include/mach/debug-macro.S b/arch/arm/mach-realview/include/mach/debug-macro.S
deleted file mode 100644
index 8cc372dc66a8..000000000000
--- a/arch/arm/mach-realview/include/mach/debug-macro.S
+++ /dev/null
@@ -1,29 +0,0 @@
-/* arch/arm/mach-realview/include/mach/debug-macro.S
- *
- * Debugging macro include header
- *
- *  Copyright (C) 1994-1999 Russell King
- *  Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifdef CONFIG_DEBUG_REALVIEW_STD_PORT
-#define DEBUG_LL_UART_OFFSET    0x00009000
-#elif defined(CONFIG_DEBUG_REALVIEW_PB1176_PORT)
-#define DEBUG_LL_UART_OFFSET    0x0010c000
-#endif
-
-#ifndef DEBUG_LL_UART_OFFSET
-#error "Unknown RealView platform"
-#endif
-
-                .macro  addruart, rp, rv, tmp
-                mov     \rp, #DEBUG_LL_UART_OFFSET
-                orr     \rv, \rp, #0xfb000000   @ virtual base
-                orr     \rp, \rp, #0x10000000   @ physical base
-                .endm
-
-#include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/mach-rpc/include/mach/debug-macro.S b/arch/arm/mach-rpc/include/mach/debug-macro.S
deleted file mode 100644
index 6d28cc99b124..000000000000
--- a/arch/arm/mach-rpc/include/mach/debug-macro.S
+++ /dev/null
@@ -1,23 +0,0 @@
-/* arch/arm/mach-rpc/include/mach/debug-macro.S
- *
- * Debugging macro include header
- *
- *  Copyright (C) 1994-1999 Russell King
- *  Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
-
-                .macro  addruart, rp, rv, tmp
-                mov     \rp, #0x00010000
-                orr     \rp, \rp, #0x00000fe0
-                orr     \rv, \rp, #0xe0000000   @ virtual
-                orr     \rp, \rp, #0x03000000   @ physical
-                .endm
-
-#define UART_SHIFT      2
-#define FLOW_CONTROL
-#include <asm/hardware/debug-8250.S>
diff --git a/arch/arm/mach-s3c24xx/Kconfig b/arch/arm/mach-s3c24xx/Kconfig
index 7791ac76f945..dba2173e70f3 100644
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@ -30,7 +30,6 @@ config CPU_S3C2410
         select S3C2410_CLOCK
         select ARM_S3C2410_CPUFREQ if ARM_S3C24XX_CPUFREQ
         select S3C2410_PM if PM
-        select SAMSUNG_HRT
         select SAMSUNG_WDT_RESET
         help
           Support for S3C2410 and S3C2410A family from the S3C24XX line
@@ -42,7 +41,6 @@ config CPU_S3C2412
         select CPU_LLSERIAL_S3C2440
         select S3C2412_DMA if S3C24XX_DMA
         select S3C2412_PM if PM
-        select SAMSUNG_HRT
         help
           Support for the S3C2412 and S3C2413 SoCs from the S3C24XX line
 
@@ -54,7 +52,6 @@ config CPU_S3C2416
         select S3C2443_COMMON
         select S3C2443_DMA if S3C24XX_DMA
         select SAMSUNG_CLKSRC
-        select SAMSUNG_HRT
         help
           Support for the S3C2416 SoC from the S3C24XX line
 
@@ -65,7 +62,6 @@ config CPU_S3C2440
         select S3C2410_CLOCK
         select S3C2410_PM if PM
         select S3C2440_DMA if S3C24XX_DMA
-        select SAMSUNG_HRT
         help
           Support for S3C2440 Samsung Mobile CPU based systems.
 
@@ -75,7 +71,6 @@ config CPU_S3C2442
         select CPU_LLSERIAL_S3C2440
         select S3C2410_CLOCK
         select S3C2410_PM if PM
-        select SAMSUNG_HRT
         help
           Support for S3C2442 Samsung Mobile CPU based systems.
 
@@ -91,7 +86,6 @@ config CPU_S3C2443
         select S3C2443_COMMON
         select S3C2443_DMA if S3C24XX_DMA
         select SAMSUNG_CLKSRC
-        select SAMSUNG_HRT
         help
           Support for the S3C2443 SoC from the S3C24XX line
 
diff --git a/arch/arm/mach-s3c24xx/clock-s3c2410.c b/arch/arm/mach-s3c24xx/clock-s3c2410.c
index 564553694b54..d39d3c787580 100644
--- a/arch/arm/mach-s3c24xx/clock-s3c2410.c
+++ b/arch/arm/mach-s3c24xx/clock-s3c2410.c
@@ -281,6 +281,5 @@ int __init s3c2410_baseclk_add(void)
                (clkslow & S3C2410_CLKSLOW_MPLL_OFF) ? "off" : "on",
                (clkslow & S3C2410_CLKSLOW_UCLK_OFF) ? "off" : "on");
 
-        s3c_pwmclk_init();
         return 0;
 }
diff --git a/arch/arm/mach-s3c24xx/clock-s3c2412.c b/arch/arm/mach-s3c24xx/clock-s3c2412.c
index 2cc017da88fe..d8f253f2b486 100644
--- a/arch/arm/mach-s3c24xx/clock-s3c2412.c
+++ b/arch/arm/mach-s3c24xx/clock-s3c2412.c
@@ -757,6 +757,5 @@ int __init s3c2412_baseclk_add(void)
         }
 
         clkdev_add_table(s3c2412_clk_lookup, ARRAY_SIZE(s3c2412_clk_lookup));
-        s3c_pwmclk_init();
         return 0;
 }
diff --git a/arch/arm/mach-s3c24xx/clock-s3c2416.c b/arch/arm/mach-s3c24xx/clock-s3c2416.c
index 036056cea57c..d421a72920a5 100644
--- a/arch/arm/mach-s3c24xx/clock-s3c2416.c
+++ b/arch/arm/mach-s3c24xx/clock-s3c2416.c
@@ -168,6 +168,4 @@ void __init s3c2416_init_clocks(int xtal)
         s3c24xx_register_clock(&hsmmc0_clk);
         clkdev_add_table(s3c2416_clk_lookup, ARRAY_SIZE(s3c2416_clk_lookup));
 
-        s3c_pwmclk_init();
-
 }
diff --git a/arch/arm/mach-s3c24xx/clock-s3c2443.c b/arch/arm/mach-s3c24xx/clock-s3c2443.c
index 0a53051b0787..76cd31f7804e 100644
--- a/arch/arm/mach-s3c24xx/clock-s3c2443.c
+++ b/arch/arm/mach-s3c24xx/clock-s3c2443.c
@@ -209,6 +209,4 @@ void __init s3c2443_init_clocks(int xtal)
         s3c_register_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
         s3c_disable_clocks(init_clocks_off, ARRAY_SIZE(init_clocks_off));
         clkdev_add_table(s3c2443_clk_lookup, ARRAY_SIZE(s3c2443_clk_lookup));
-
-        s3c_pwmclk_init();
 }
diff --git a/arch/arm/mach-s3c24xx/common.c b/arch/arm/mach-s3c24xx/common.c
index c157103ed8eb..457261c98433 100644
--- a/arch/arm/mach-s3c24xx/common.c
+++ b/arch/arm/mach-s3c24xx/common.c
@@ -27,6 +27,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/serial_core.h>
+#include <clocksource/samsung_pwm.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/io.h>
@@ -49,6 +50,7 @@
 #include <plat/clock.h>
 #include <plat/cpu-freq.h>
 #include <plat/pll.h>
+#include <plat/pwm-core.h>
 
 #include "common.h"
 
@@ -216,6 +218,13 @@ static void s3c24xx_default_idle(void)
                      S3C2410_CLKCON);
 }
 
+static struct samsung_pwm_variant s3c24xx_pwm_variant = {
+        .bits           = 16,
+        .div_base       = 1,
+        .has_tint_cstat = false,
+        .tclk_mask      = (1 << 4),
+};
+
 void __init s3c24xx_init_io(struct map_desc *mach_desc, int size)
 {
         arm_pm_idle = s3c24xx_default_idle;
@@ -232,6 +241,24 @@ void __init s3c24xx_init_io(struct map_desc *mach_desc, int size)
         s3c24xx_init_cpu();
 
         s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
+
+        samsung_pwm_set_platdata(&s3c24xx_pwm_variant);
+}
+
+void __init samsung_set_timer_source(unsigned int event, unsigned int source)
+{
+        s3c24xx_pwm_variant.output_mask = BIT(SAMSUNG_PWM_NUM) - 1;
+        s3c24xx_pwm_variant.output_mask &= ~(BIT(event) | BIT(source));
+}
+
+void __init samsung_timer_init(void)
+{
+        unsigned int timer_irqs[SAMSUNG_PWM_NUM] = {
+                IRQ_TIMER0, IRQ_TIMER1, IRQ_TIMER2, IRQ_TIMER3, IRQ_TIMER4,
+        };
+
+        samsung_pwm_clocksource_init(S3C_VA_TIMER,
+                                        timer_irqs, &s3c24xx_pwm_variant);
 }
 
 /* Serial port registrations */
diff --git a/arch/arm/mach-s3c24xx/include/mach/map.h b/arch/arm/mach-s3c24xx/include/mach/map.h
index 8ba381f2dbe1..444793f0f5f1 100644
--- a/arch/arm/mach-s3c24xx/include/mach/map.h
+++ b/arch/arm/mach-s3c24xx/include/mach/map.h
@@ -167,4 +167,6 @@
 #define S3C_PA_SPI0             S3C2443_PA_SPI0
 #define S3C_PA_SPI1             S3C2443_PA_SPI1
 
+#define SAMSUNG_PA_TIMER        S3C2410_PA_TIMER
+
 #endif /* __ASM_ARCH_MAP_H */
diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c b/arch/arm/mach-s3c24xx/mach-h1940.c
index af4334d6b4d5..74dd47988b41 100644
--- a/arch/arm/mach-s3c24xx/mach-h1940.c
+++ b/arch/arm/mach-s3c24xx/mach-h1940.c
@@ -512,7 +512,7 @@ static struct platform_pwm_backlight_data backlight_data = {
 static struct platform_device h1940_backlight = {
         .name = "pwm-backlight",
         .dev  = {
-                .parent = &s3c_device_timer[0].dev,
+                .parent = &samsung_device_pwm.dev,
                 .platform_data = &backlight_data,
         },
         .id   = -1,
@@ -632,7 +632,7 @@ static struct platform_device *h1940_devices[] __initdata = {
         &h1940_device_bluetooth,
         &s3c_device_sdi,
         &s3c_device_rtc,
-        &s3c_device_timer[0],
+        &samsung_device_pwm,
         &h1940_backlight,
         &h1940_lcd_powerdev,
         &s3c_device_adc,
diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c
index 44ca018e1f96..206b1f7546d1 100644
--- a/arch/arm/mach-s3c24xx/mach-rx1950.c
+++ b/arch/arm/mach-s3c24xx/mach-rx1950.c
@@ -530,7 +530,7 @@ static struct platform_pwm_backlight_data rx1950_backlight_data = {
 static struct platform_device rx1950_backlight = {
         .name = "pwm-backlight",
         .dev = {
-                .parent = &s3c_device_timer[0].dev,
+                .parent = &samsung_device_pwm.dev,
                 .platform_data = &rx1950_backlight_data,
         },
 };
@@ -717,8 +717,7 @@ static struct platform_device *rx1950_devices[] __initdata = {
         &s3c_device_sdi,
         &s3c_device_adc,
         &s3c_device_ts,
-        &s3c_device_timer[0],
-        &s3c_device_timer[1],
+        &samsung_device_pwm,
         &rx1950_backlight,
         &rx1950_device_gpiokeys,
         &power_supply,
diff --git a/arch/arm/mach-s3c64xx/Kconfig b/arch/arm/mach-s3c64xx/Kconfig
index 20578536aec7..041da5172423 100644
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
@@ -17,13 +17,11 @@ config PLAT_S3C64XX
 # Configuration options for the S3C6410 CPU
 
 config CPU_S3C6400
-        select SAMSUNG_HRT
         bool
         help
           Enable S3C6400 CPU support
 
 config CPU_S3C6410
-        select SAMSUNG_HRT
         bool
         help
           Enable S3C6410 CPU support
diff --git a/arch/arm/mach-s3c64xx/clock.c b/arch/arm/mach-s3c64xx/clock.c
index 8499415be9cd..c1bcc4a6d3a8 100644
--- a/arch/arm/mach-s3c64xx/clock.c
+++ b/arch/arm/mach-s3c64xx/clock.c
@@ -1004,6 +1004,4 @@ void __init s3c64xx_register_clocks(unsigned long xtal,
         for (cnt = 0; cnt < ARRAY_SIZE(clksrc_cdev); cnt++)
                 s3c_register_clksrc(clksrc_cdev[cnt], 1);
         clkdev_add_table(s3c64xx_clk_lookup, ARRAY_SIZE(s3c64xx_clk_lookup));
-
-        s3c_pwmclk_init();
 }
diff --git a/arch/arm/mach-s3c64xx/common.c b/arch/arm/mach-s3c64xx/common.c
index 3f62e467b129..73d79cf5e141 100644
--- a/arch/arm/mach-s3c64xx/common.c
+++ b/arch/arm/mach-s3c64xx/common.c
@@ -27,6 +27,7 @@
 #include <linux/irq.h>
 #include <linux/gpio.h>
 #include <linux/irqchip/arm-vic.h>
+#include <clocksource/samsung_pwm.h>
 
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
@@ -42,7 +43,7 @@
 #include <plat/pm.h>
 #include <plat/gpio-cfg.h>
 #include <plat/irq-uart.h>
-#include <plat/irq-vic-timer.h>
+#include <plat/pwm-core.h>
 #include <plat/regs-irqtype.h>
 #include <plat/regs-serial.h>
 #include <plat/watchdog-reset.h>
@@ -149,6 +150,30 @@ static struct device s3c64xx_dev = {
         .bus    = &s3c64xx_subsys,
 };
 
+static struct samsung_pwm_variant s3c64xx_pwm_variant = {
+        .bits           = 32,
+        .div_base       = 0,
+        .has_tint_cstat = true,
+        .tclk_mask      = (1 << 7) | (1 << 6) | (1 << 5),
+};
+
+void __init samsung_set_timer_source(unsigned int event, unsigned int source)
+{
+        s3c64xx_pwm_variant.output_mask = BIT(SAMSUNG_PWM_NUM) - 1;
+        s3c64xx_pwm_variant.output_mask &= ~(BIT(event) | BIT(source));
+}
+
+void __init samsung_timer_init(void)
+{
+        unsigned int timer_irqs[SAMSUNG_PWM_NUM] = {
+                IRQ_TIMER0_VIC, IRQ_TIMER1_VIC, IRQ_TIMER2_VIC,
+                IRQ_TIMER3_VIC, IRQ_TIMER4_VIC,
+        };
+
+        samsung_pwm_clocksource_init(S3C_VA_TIMER,
+                                        timer_irqs, &s3c64xx_pwm_variant);
+}
+
 /* read cpu identification code */
 
 void __init s3c64xx_init_io(struct map_desc *mach_desc, int size)
@@ -161,6 +186,8 @@ void __init s3c64xx_init_io(struct map_desc *mach_desc, int size)
         s3c64xx_init_cpu();
 
         s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
+
+        samsung_pwm_set_platdata(&s3c64xx_pwm_variant);
 }
 
 static __init int s3c64xx_dev_init(void)
@@ -195,9 +222,6 @@ void __init s3c64xx_init_irq(u32 vic0_valid, u32 vic1_valid)
         /* initialise the pair of VICs */
         vic_init(VA_VIC0, IRQ_VIC0_BASE, vic0_valid, IRQ_VIC0_RESUME);
         vic_init(VA_VIC1, IRQ_VIC1_BASE, vic1_valid, IRQ_VIC1_RESUME);
-
-        /* add the timer sub-irqs */
-        s3c_init_vic_timer_irq(5, IRQ_TIMER0);
 }
 
 #define eint_offset(irq)        ((irq) - IRQ_EINT(0))
diff --git a/arch/arm/mach-s3c64xx/include/mach/irqs.h b/arch/arm/mach-s3c64xx/include/mach/irqs.h
index 96d60e0d9372..67bbd1dd04c2 100644
--- a/arch/arm/mach-s3c64xx/include/mach/irqs.h
+++ b/arch/arm/mach-s3c64xx/include/mach/irqs.h
@@ -107,14 +107,6 @@
 #define IRQ_TC                  IRQ_PENDN
 #define IRQ_ADC                 S3C64XX_IRQ_VIC1(31)
 
-#define S3C64XX_TIMER_IRQ(x)    S3C_IRQ(64 + (x))
-
-#define IRQ_TIMER0              S3C64XX_TIMER_IRQ(0)
-#define IRQ_TIMER1              S3C64XX_TIMER_IRQ(1)
-#define IRQ_TIMER2              S3C64XX_TIMER_IRQ(2)
-#define IRQ_TIMER3              S3C64XX_TIMER_IRQ(3)
-#define IRQ_TIMER4              S3C64XX_TIMER_IRQ(4)
-
 /* compatibility for device defines */
 
 #define IRQ_IIC1                IRQ_S3C6410_IIC1
diff --git a/arch/arm/mach-s3c64xx/include/mach/map.h b/arch/arm/mach-s3c64xx/include/mach/map.h
index 8e2097bb208a..f55ccb1ce893 100644
--- a/arch/arm/mach-s3c64xx/include/mach/map.h
+++ b/arch/arm/mach-s3c64xx/include/mach/map.h
@@ -121,5 +121,6 @@
 #define SAMSUNG_PA_ADC          S3C64XX_PA_ADC
 #define SAMSUNG_PA_CFCON        S3C64XX_PA_CFCON
 #define SAMSUNG_PA_KEYPAD       S3C64XX_PA_KEYPAD
+#define SAMSUNG_PA_TIMER        S3C64XX_PA_TIMER
 
 #endif /* __ASM_ARCH_6400_MAP_H */
diff --git a/arch/arm/mach-s3c64xx/irq-pm.c b/arch/arm/mach-s3c64xx/irq-pm.c
index 0c7e1d960ca4..c3da1b68d03e 100644
--- a/arch/arm/mach-s3c64xx/irq-pm.c
+++ b/arch/arm/mach-s3c64xx/irq-pm.c
@@ -22,7 +22,6 @@
 #include <mach/map.h>
 
 #include <plat/regs-serial.h>
-#include <plat/regs-timer.h>
 #include <mach/regs-gpio.h>
 #include <plat/cpu.h>
 #include <plat/pm.h>
@@ -43,7 +42,6 @@ static struct sleep_save irq_save[] = {
         SAVE_ITEM(S3C64XX_EINT0FLTCON2),
         SAVE_ITEM(S3C64XX_EINT0FLTCON3),
         SAVE_ITEM(S3C64XX_EINT0MASK),
-        SAVE_ITEM(S3C64XX_TINT_CSTAT),
 };
 
 static struct irq_grp_save {
diff --git a/arch/arm/mach-s3c64xx/mach-crag6410.c b/arch/arm/mach-s3c64xx/mach-crag6410.c
index 8ad88ace795a..eb8e5a1aca42 100644
--- a/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@ -30,7 +30,7 @@
 #include <linux/basic_mmio_gpio.h>
 #include <linux/spi/spi.h>
 
-#include <linux/i2c/pca953x.h>
+#include <linux/platform_data/pca953x.h>
 #include <linux/platform_data/s3c-hsotg.h>
 
 #include <video/platform_lcd.h>
@@ -120,7 +120,7 @@ static struct platform_device crag6410_backlight_device = {
         .name           = "pwm-backlight",
         .id             = -1,
         .dev            = {
-                .parent = &s3c_device_timer[0].dev,
+                .parent = &samsung_device_pwm.dev,
                 .platform_data = &crag6410_backlight_data,
         },
 };
@@ -375,7 +375,7 @@ static struct platform_device *crag6410_devices[] __initdata = {
         &s3c_device_fb,
         &s3c_device_ohci,
         &s3c_device_usb_hsotg,
-        &s3c_device_timer[0],
+        &samsung_device_pwm,
         &s3c64xx_device_iis0,
         &s3c64xx_device_iis1,
         &samsung_device_keypad,
diff --git a/arch/arm/mach-s3c64xx/mach-hmt.c b/arch/arm/mach-s3c64xx/mach-hmt.c
index 5b7f357d8c22..f39569e0f2e6 100644
--- a/arch/arm/mach-s3c64xx/mach-hmt.c
+++ b/arch/arm/mach-s3c64xx/mach-hmt.c
@@ -123,7 +123,7 @@ static struct platform_pwm_backlight_data hmt_backlight_data = {
 static struct platform_device hmt_backlight_device = {
         .name           = "pwm-backlight",
         .dev            = {
-                .parent = &s3c_device_timer[1].dev,
+                .parent = &samsung_device_pwm.dev,
                 .platform_data = &hmt_backlight_data,
         },
 };
@@ -239,7 +239,7 @@ static struct platform_device *hmt_devices[] __initdata = {
         &s3c_device_nand,
         &s3c_device_fb,
         &s3c_device_ohci,
-        &s3c_device_timer[1],
+        &samsung_device_pwm,
         &hmt_backlight_device,
         &hmt_leds_device,
 };
diff --git a/arch/arm/mach-s3c64xx/mach-smartq.c b/arch/arm/mach-s3c64xx/mach-smartq.c
index 58ac99041274..86d980b448fd 100644
--- a/arch/arm/mach-s3c64xx/mach-smartq.c
+++ b/arch/arm/mach-s3c64xx/mach-smartq.c
@@ -157,7 +157,7 @@ static struct platform_pwm_backlight_data smartq_backlight_data = {
 static struct platform_device smartq_backlight_device = {
         .name           = "pwm-backlight",
         .dev            = {
-                .parent = &s3c_device_timer[1].dev,
+                .parent = &samsung_device_pwm.dev,
                 .platform_data = &smartq_backlight_data,
         },
 };
@@ -246,7 +246,7 @@ static struct platform_device *smartq_devices[] __initdata = {
         &s3c_device_i2c0,
         &s3c_device_ohci,
         &s3c_device_rtc,
-        &s3c_device_timer[1],
+        &samsung_device_pwm,
         &s3c_device_ts,
         &s3c_device_usb_hsotg,
         &s3c64xx_device_iis0,
diff --git a/arch/arm/mach-s3c64xx/mach-smdk6410.c b/arch/arm/mach-s3c64xx/mach-smdk6410.c
index bd3295a19ad7..d90b450c5645 100644
--- a/arch/arm/mach-s3c64xx/mach-smdk6410.c
+++ b/arch/arm/mach-s3c64xx/mach-smdk6410.c
@@ -274,6 +274,7 @@ static struct platform_device *smdk6410_devices[] __initdata = {
         &s3c_device_i2c1,
         &s3c_device_fb,
         &s3c_device_ohci,
+        &samsung_device_pwm,
         &s3c_device_usb_hsotg,
         &s3c64xx_device_iisv4,
         &samsung_device_keypad,
@@ -691,9 +692,9 @@ static void __init smdk6410_machine_init(void)
 
         s3c_ide_set_platdata(&smdk6410_ide_pdata);
 
-        samsung_bl_set(&smdk6410_bl_gpio_info, &smdk6410_bl_data);
-
         platform_add_devices(smdk6410_devices, ARRAY_SIZE(smdk6410_devices));
+
+        samsung_bl_set(&smdk6410_bl_gpio_info, &smdk6410_bl_data);
 }
 
 MACHINE_START(SMDK6410, "SMDK6410")
diff --git a/arch/arm/mach-s5p64x0/Kconfig b/arch/arm/mach-s5p64x0/Kconfig
index 5a707bdb9ea0..bb2111b3751e 100644
--- a/arch/arm/mach-s5p64x0/Kconfig
+++ b/arch/arm/mach-s5p64x0/Kconfig
@@ -11,14 +11,12 @@ config CPU_S5P6440
         bool
         select S5P_SLEEP if PM
         select SAMSUNG_DMADEV
-        select SAMSUNG_HRT
         select SAMSUNG_WAKEMASK if PM
         help
           Enable S5P6440 CPU support
 
 config CPU_S5P6450
         bool
-        select SAMSUNG_HRT
         select S5P_SLEEP if PM
         select SAMSUNG_DMADEV
         select SAMSUNG_WAKEMASK if PM
diff --git a/arch/arm/mach-s5p64x0/clock-s5p6440.c b/arch/arm/mach-s5p64x0/clock-s5p6440.c
index 3537815247f1..ae34a1d5e10a 100644
--- a/arch/arm/mach-s5p64x0/clock-s5p6440.c
+++ b/arch/arm/mach-s5p64x0/clock-s5p6440.c
@@ -629,6 +629,4 @@ void __init s5p6440_register_clocks(void)
         clkdev_add_table(s5p6440_clk_lookup, ARRAY_SIZE(s5p6440_clk_lookup));
 
         s3c24xx_register_clock(&dummy_apb_pclk);
-
-        s3c_pwmclk_init();
 }
diff --git a/arch/arm/mach-s5p64x0/clock-s5p6450.c b/arch/arm/mach-s5p64x0/clock-s5p6450.c
index af384ddd2dcf..0b3ca2ed53e9 100644
--- a/arch/arm/mach-s5p64x0/clock-s5p6450.c
+++ b/arch/arm/mach-s5p64x0/clock-s5p6450.c
@@ -698,6 +698,4 @@ void __init s5p6450_register_clocks(void)
         clkdev_add_table(s5p6450_clk_lookup, ARRAY_SIZE(s5p6450_clk_lookup));
 
         s3c24xx_register_clock(&dummy_apb_pclk);
-
-        s3c_pwmclk_init();
 }
diff --git a/arch/arm/mach-s5p64x0/common.c b/arch/arm/mach-s5p64x0/common.c
index dfdfdc320ce7..42e14f2e7ca7 100644
--- a/arch/arm/mach-s5p64x0/common.c
+++ b/arch/arm/mach-s5p64x0/common.c
@@ -19,6 +19,7 @@
 #include <linux/io.h>
 #include <linux/device.h>
 #include <linux/serial_core.h>
+#include <clocksource/samsung_pwm.h>
 #include <linux/platform_device.h>
 #include <linux/sched.h>
 #include <linux/dma-mapping.h>
@@ -47,6 +48,7 @@
 #include <plat/fb-core.h>
 #include <plat/spi-core.h>
 #include <plat/gpio-cfg.h>
+#include <plat/pwm-core.h>
 #include <plat/regs-irqtype.h>
 #include <plat/regs-serial.h>
 #include <plat/watchdog-reset.h>
@@ -157,6 +159,30 @@ static void s5p64x0_idle(void)
         cpu_do_idle();
 }
 
+static struct samsung_pwm_variant s5p64x0_pwm_variant = {
+        .bits           = 32,
+        .div_base       = 0,
+        .has_tint_cstat = true,
+        .tclk_mask      = 0,
+};
+
+void __init samsung_set_timer_source(unsigned int event, unsigned int source)
+{
+        s5p64x0_pwm_variant.output_mask = BIT(SAMSUNG_PWM_NUM) - 1;
+        s5p64x0_pwm_variant.output_mask &= ~(BIT(event) | BIT(source));
+}
+
+void __init samsung_timer_init(void)
+{
+        unsigned int timer_irqs[SAMSUNG_PWM_NUM] = {
+                IRQ_TIMER0_VIC, IRQ_TIMER1_VIC, IRQ_TIMER2_VIC,
+                IRQ_TIMER3_VIC, IRQ_TIMER4_VIC,
+        };
+
+        samsung_pwm_clocksource_init(S3C_VA_TIMER,
+                                        timer_irqs, &s5p64x0_pwm_variant);
+}
+
 /*
  * s5p64x0_map_io
  *
@@ -176,6 +202,7 @@ void __init s5p64x0_init_io(struct map_desc *mach_desc, int size)
         s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
         samsung_wdt_reset_init(S3C_VA_WATCHDOG);
 
+        samsung_pwm_set_platdata(&s5p64x0_pwm_variant);
 }
 
 void __init s5p6440_map_io(void)
diff --git a/arch/arm/mach-s5p64x0/include/mach/irqs.h b/arch/arm/mach-s5p64x0/include/mach/irqs.h
index 5b845e849b30..53982db9d259 100644
--- a/arch/arm/mach-s5p64x0/include/mach/irqs.h
+++ b/arch/arm/mach-s5p64x0/include/mach/irqs.h
@@ -141,8 +141,6 @@
 
 #define IRQ_EINT_GROUP(grp, x)  (IRQ_EINT_GROUP##grp##_BASE + (x))
 
-#define IRQ_TIMER_BASE          (11)
-
 /* Set the default NR_IRQS */
 
 #define NR_IRQS                 (IRQ_EINT_GROUP8_BASE + IRQ_EINT_GROUP8_NR + 1)
diff --git a/arch/arm/mach-s5p64x0/include/mach/map.h b/arch/arm/mach-s5p64x0/include/mach/map.h
index 0c0175dbfa34..50a6e96d6389 100644
--- a/arch/arm/mach-s5p64x0/include/mach/map.h
+++ b/arch/arm/mach-s5p64x0/include/mach/map.h
@@ -76,6 +76,7 @@
 #define S5P_PA_TIMER            S5P64X0_PA_TIMER
 
 #define SAMSUNG_PA_ADC          S5P64X0_PA_ADC
+#define SAMSUNG_PA_TIMER        S5P64X0_PA_TIMER
 
 /* UART */
 
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6440.c b/arch/arm/mach-s5p64x0/mach-smdk6440.c
index 73f71a698a34..0b00304c1e91 100644
--- a/arch/arm/mach-s5p64x0/mach-smdk6440.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6440.c
@@ -162,6 +162,7 @@ static struct platform_device *smdk6440_devices[] __initdata = {
         &s3c_device_rtc,
         &s3c_device_i2c0,
         &s3c_device_i2c1,
+        &samsung_device_pwm,
         &s3c_device_ts,
         &s3c_device_wdt,
         &s5p6440_device_iis,
@@ -254,8 +255,6 @@ static void __init smdk6440_machine_init(void)
         i2c_register_board_info(1, smdk6440_i2c_devs1,
                         ARRAY_SIZE(smdk6440_i2c_devs1));
 
-        samsung_bl_set(&smdk6440_bl_gpio_info, &smdk6440_bl_data);
-
         s5p6440_set_lcd_interface();
         s3c_fb_set_platdata(&smdk6440_lcd_pdata);
 
@@ -264,6 +263,8 @@ static void __init smdk6440_machine_init(void)
         s3c_sdhci2_set_platdata(&smdk6440_hsmmc2_pdata);
 
         platform_add_devices(smdk6440_devices, ARRAY_SIZE(smdk6440_devices));
+
+        samsung_bl_set(&smdk6440_bl_gpio_info, &smdk6440_bl_data);
 }
 
 MACHINE_START(SMDK6440, "SMDK6440")
diff --git a/arch/arm/mach-s5p64x0/mach-smdk6450.c b/arch/arm/mach-s5p64x0/mach-smdk6450.c
index 18303e12019f..5949296e88fd 100644
--- a/arch/arm/mach-s5p64x0/mach-smdk6450.c
+++ b/arch/arm/mach-s5p64x0/mach-smdk6450.c
@@ -180,6 +180,7 @@ static struct platform_device *smdk6450_devices[] __initdata = {
         &s3c_device_rtc,
         &s3c_device_i2c0,
         &s3c_device_i2c1,
+        &samsung_device_pwm,
         &s3c_device_ts,
         &s3c_device_wdt,
         &s5p6450_device_iis0,
@@ -273,8 +274,6 @@ static void __init smdk6450_machine_init(void)
         i2c_register_board_info(1, smdk6450_i2c_devs1,
                         ARRAY_SIZE(smdk6450_i2c_devs1));
 
-        samsung_bl_set(&smdk6450_bl_gpio_info, &smdk6450_bl_data);
-
         s5p6450_set_lcd_interface();
         s3c_fb_set_platdata(&smdk6450_lcd_pdata);
 
@@ -283,6 +282,8 @@ static void __init smdk6450_machine_init(void)
         s3c_sdhci2_set_platdata(&smdk6450_hsmmc2_pdata);
 
         platform_add_devices(smdk6450_devices, ARRAY_SIZE(smdk6450_devices));
+
+        samsung_bl_set(&smdk6450_bl_gpio_info, &smdk6450_bl_data);
 }
 
 MACHINE_START(SMDK6450, "SMDK6450")
diff --git a/arch/arm/mach-s5p64x0/pm.c b/arch/arm/mach-s5p64x0/pm.c
index 97c2a08ad490..861e15cea691 100644
--- a/arch/arm/mach-s5p64x0/pm.c
+++ b/arch/arm/mach-s5p64x0/pm.c
@@ -18,7 +18,6 @@
 
 #include <plat/cpu.h>
 #include <plat/pm.h>
-#include <plat/regs-timer.h>
 #include <plat/wakeup-mask.h>
 
 #include <mach/regs-clock.h>
@@ -48,8 +47,6 @@ static struct sleep_save s5p64x0_misc_save[] = {
         SAVE_ITEM(S5P64X0_MEM0CONSLP1),
         SAVE_ITEM(S5P64X0_MEM0DRVCON),
         SAVE_ITEM(S5P64X0_MEM1DRVCON),
-
-        SAVE_ITEM(S3C64XX_TINT_CSTAT),
 };
 
 /* DPLL is present only in S5P6450 */
diff --git a/arch/arm/mach-s5pc100/Kconfig b/arch/arm/mach-s5pc100/Kconfig
index 2f456a4533ba..15170be97a74 100644
--- a/arch/arm/mach-s5pc100/Kconfig
+++ b/arch/arm/mach-s5pc100/Kconfig
@@ -11,7 +11,6 @@ config CPU_S5PC100
         bool
         select S5P_EXT_INT
         select SAMSUNG_DMADEV
-        select SAMSUNG_HRT
         help
           Enable S5PC100 CPU support
 
diff --git a/arch/arm/mach-s5pc100/clock.c b/arch/arm/mach-s5pc100/clock.c
index a206dc35eff1..d0dc10ee7729 100644
--- a/arch/arm/mach-s5pc100/clock.c
+++ b/arch/arm/mach-s5pc100/clock.c
@@ -1358,6 +1358,4 @@ void __init s5pc100_register_clocks(void)
                 s3c_disable_clocks(clk_cdev[ptr], 1);
 
         s3c24xx_register_clock(&dummy_apb_pclk);
-
-        s3c_pwmclk_init();
 }
diff --git a/arch/arm/mach-s5pc100/common.c b/arch/arm/mach-s5pc100/common.c
index 4bdfecf6d024..c5a8eeacf81c 100644
--- a/arch/arm/mach-s5pc100/common.c
+++ b/arch/arm/mach-s5pc100/common.c
@@ -22,6 +22,7 @@
 #include <linux/io.h>
 #include <linux/device.h>
 #include <linux/serial_core.h>
+#include <clocksource/samsung_pwm.h>
 #include <linux/platform_device.h>
 #include <linux/sched.h>
 #include <linux/reboot.h>
@@ -46,6 +47,7 @@
 #include <plat/fb-core.h>
 #include <plat/iic-core.h>
 #include <plat/onenand-core.h>
+#include <plat/pwm-core.h>
 #include <plat/spi-core.h>
 #include <plat/regs-serial.h>
 #include <plat/watchdog-reset.h>
@@ -132,6 +134,30 @@ static struct map_desc s5pc100_iodesc[] __initdata = {
         }
 };
 
+static struct samsung_pwm_variant s5pc100_pwm_variant = {
+        .bits           = 32,
+        .div_base       = 0,
+        .has_tint_cstat = true,
+        .tclk_mask      = (1 << 5),
+};
+
+void __init samsung_set_timer_source(unsigned int event, unsigned int source)
+{
+        s5pc100_pwm_variant.output_mask = BIT(SAMSUNG_PWM_NUM) - 1;
+        s5pc100_pwm_variant.output_mask &= ~(BIT(event) | BIT(source));
+}
+
+void __init samsung_timer_init(void)
+{
+        unsigned int timer_irqs[SAMSUNG_PWM_NUM] = {
+                IRQ_TIMER0_VIC, IRQ_TIMER1_VIC, IRQ_TIMER2_VIC,
+                IRQ_TIMER3_VIC, IRQ_TIMER4_VIC,
+        };
+
+        samsung_pwm_clocksource_init(S3C_VA_TIMER,
+                                        timer_irqs, &s5pc100_pwm_variant);
+}
+
 /*
  * s5pc100_map_io
  *
@@ -149,6 +175,8 @@ void __init s5pc100_init_io(struct map_desc *mach_desc, int size)
         s5p_init_cpu(S5P_VA_CHIPID);
 
         s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
+
+        samsung_pwm_set_platdata(&s5pc100_pwm_variant);
 }
 
 void __init s5pc100_map_io(void)
diff --git a/arch/arm/mach-s5pc100/include/mach/irqs.h b/arch/arm/mach-s5pc100/include/mach/irqs.h
index 2870f12c7926..d2eb4757381f 100644
--- a/arch/arm/mach-s5pc100/include/mach/irqs.h
+++ b/arch/arm/mach-s5pc100/include/mach/irqs.h
@@ -97,8 +97,6 @@
 #define IRQ_SDMFIQ              S5P_IRQ_VIC2(31)
 #define IRQ_VIC_END             S5P_IRQ_VIC2(31)
 
-#define IRQ_TIMER_BASE          (11)
-
 #define S5P_EINT_BASE1          (S5P_IRQ_VIC0(0))
 #define S5P_EINT_BASE2          (IRQ_VIC_END + 1)
 
diff --git a/arch/arm/mach-s5pc100/include/mach/map.h b/arch/arm/mach-s5pc100/include/mach/map.h
index 54bc4f82e17a..2550b6112b82 100644
--- a/arch/arm/mach-s5pc100/include/mach/map.h
+++ b/arch/arm/mach-s5pc100/include/mach/map.h
@@ -116,6 +116,7 @@
 #define SAMSUNG_PA_ADC                  S5PC100_PA_TSADC
 #define SAMSUNG_PA_CFCON                S5PC100_PA_CFCON
 #define SAMSUNG_PA_KEYPAD               S5PC100_PA_KEYPAD
+#define SAMSUNG_PA_TIMER                S5PC100_PA_TIMER
 
 #define S5PC100_VA_OTHERS               (S3C_VA_SYS + 0x10000)
 
diff --git a/arch/arm/mach-s5pc100/mach-smdkc100.c b/arch/arm/mach-s5pc100/mach-smdkc100.c
index 8c880f76f274..7c57a221785e 100644
--- a/arch/arm/mach-s5pc100/mach-smdkc100.c
+++ b/arch/arm/mach-s5pc100/mach-smdkc100.c
@@ -194,6 +194,7 @@ static struct platform_device *smdkc100_devices[] __initdata = {
         &s3c_device_hsmmc0,
         &s3c_device_hsmmc1,
         &s3c_device_hsmmc2,
+        &samsung_device_pwm,
         &s3c_device_ts,
         &s3c_device_wdt,
         &smdkc100_lcd_powerdev,
@@ -246,9 +247,9 @@ static void __init smdkc100_machine_init(void)
         gpio_request(S5PC100_GPH0(6), "GPH0");
         smdkc100_lcd_power_set(&smdkc100_lcd_power_data, 0);
 
-        samsung_bl_set(&smdkc100_bl_gpio_info, &smdkc100_bl_data);
-
         platform_add_devices(smdkc100_devices, ARRAY_SIZE(smdkc100_devices));
+
+        samsung_bl_set(&smdkc100_bl_gpio_info, &smdkc100_bl_data);
 }
 
 MACHINE_START(SMDKC100, "SMDKC100")
diff --git a/arch/arm/mach-s5pv210/Kconfig b/arch/arm/mach-s5pv210/Kconfig
index 0963283a7c5d..caaedafbbf5f 100644
--- a/arch/arm/mach-s5pv210/Kconfig
+++ b/arch/arm/mach-s5pv210/Kconfig
@@ -15,7 +15,6 @@ config CPU_S5PV210
         select S5P_PM if PM
         select S5P_SLEEP if PM
         select SAMSUNG_DMADEV
-        select SAMSUNG_HRT
         help
           Enable S5PV210 CPU support
 
diff --git a/arch/arm/mach-s5pv210/clock.c b/arch/arm/mach-s5pv210/clock.c
index f051f53e35b7..ca463724a3df 100644
--- a/arch/arm/mach-s5pv210/clock.c
+++ b/arch/arm/mach-s5pv210/clock.c
@@ -1362,5 +1362,4 @@ void __init s5pv210_register_clocks(void)
         for (ptr = 0; ptr < ARRAY_SIZE(clk_cdev); ptr++)
                 s3c_disable_clocks(clk_cdev[ptr], 1);
 
-        s3c_pwmclk_init();
 }
diff --git a/arch/arm/mach-s5pv210/common.c b/arch/arm/mach-s5pv210/common.c
index 023f1a796a9c..26027a29b8a1 100644
--- a/arch/arm/mach-s5pv210/common.c
+++ b/arch/arm/mach-s5pv210/common.c
@@ -19,6 +19,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/device.h>
+#include <clocksource/samsung_pwm.h>
 #include <linux/platform_device.h>
 #include <linux/sched.h>
 #include <linux/dma-mapping.h>
@@ -42,6 +43,7 @@
 #include <plat/fimc-core.h>
 #include <plat/iic-core.h>
 #include <plat/keypad-core.h>
+#include <plat/pwm-core.h>
 #include <plat/tv-core.h>
 #include <plat/spi-core.h>
 #include <plat/regs-serial.h>
@@ -148,6 +150,30 @@ void s5pv210_restart(enum reboot_mode mode, const char *cmd)
         __raw_writel(0x1, S5P_SWRESET);
 }
 
+static struct samsung_pwm_variant s5pv210_pwm_variant = {
+        .bits           = 32,
+        .div_base       = 0,
+        .has_tint_cstat = true,
+        .tclk_mask      = (1 << 5),
+};
+
+void __init samsung_set_timer_source(unsigned int event, unsigned int source)
+{
+        s5pv210_pwm_variant.output_mask = BIT(SAMSUNG_PWM_NUM) - 1;
+        s5pv210_pwm_variant.output_mask &= ~(BIT(event) | BIT(source));
+}
+
+void __init samsung_timer_init(void)
+{
+        unsigned int timer_irqs[SAMSUNG_PWM_NUM] = {
+                IRQ_TIMER0_VIC, IRQ_TIMER1_VIC, IRQ_TIMER2_VIC,
+                IRQ_TIMER3_VIC, IRQ_TIMER4_VIC,
+        };
+
+        samsung_pwm_clocksource_init(S3C_VA_TIMER,
+                                        timer_irqs, &s5pv210_pwm_variant);
+}
+
 /*
  * s5pv210_map_io
  *
@@ -165,6 +191,8 @@ void __init s5pv210_init_io(struct map_desc *mach_desc, int size)
         s5p_init_cpu(S5P_VA_CHIPID);
 
         s3c_init_cpu(samsung_cpu_id, cpu_ids, ARRAY_SIZE(cpu_ids));
+
+        samsung_pwm_set_platdata(&s5pv210_pwm_variant);
 }
 
 void __init s5pv210_map_io(void)
diff --git a/arch/arm/mach-s5pv210/include/mach/irqs.h b/arch/arm/mach-s5pv210/include/mach/irqs.h
index e777e010ed2e..5e0de3a31f3d 100644
--- a/arch/arm/mach-s5pv210/include/mach/irqs.h
+++ b/arch/arm/mach-s5pv210/include/mach/irqs.h
@@ -118,8 +118,6 @@
 #define IRQ_MDNIE3              S5P_IRQ_VIC3(8)
 #define IRQ_VIC_END             S5P_IRQ_VIC3(31)
 
-#define IRQ_TIMER_BASE          (11)
-
 #define S5P_EINT_BASE1          (S5P_IRQ_VIC0(0))
 #define S5P_EINT_BASE2          (IRQ_VIC_END + 1)
 
diff --git a/arch/arm/mach-s5pv210/include/mach/map.h b/arch/arm/mach-s5pv210/include/mach/map.h
index b7c8a1917ffc..763929aca52d 100644
--- a/arch/arm/mach-s5pv210/include/mach/map.h
+++ b/arch/arm/mach-s5pv210/include/mach/map.h
@@ -139,6 +139,7 @@
 #define SAMSUNG_PA_ADC                  S5PV210_PA_ADC
 #define SAMSUNG_PA_CFCON                S5PV210_PA_CFCON
 #define SAMSUNG_PA_KEYPAD               S5PV210_PA_KEYPAD
+#define SAMSUNG_PA_TIMER                S5PV210_PA_TIMER
 
 /* UART */
 
diff --git a/arch/arm/mach-s5pv210/mach-smdkv210.c b/arch/arm/mach-s5pv210/mach-smdkv210.c
index d50b6f124465..6d72bb992e38 100644
--- a/arch/arm/mach-s5pv210/mach-smdkv210.c
+++ b/arch/arm/mach-s5pv210/mach-smdkv210.c
@@ -218,6 +218,7 @@ static struct platform_device *smdkv210_devices[] __initdata = {
         &s3c_device_i2c0,
         &s3c_device_i2c1,
         &s3c_device_i2c2,
+        &samsung_device_pwm,
         &s3c_device_rtc,
         &s3c_device_ts,
         &s3c_device_usb_hsotg,
@@ -316,11 +317,11 @@ static void __init smdkv210_machine_init(void)
 
         s3c_fb_set_platdata(&smdkv210_lcd0_pdata);
 
-        samsung_bl_set(&smdkv210_bl_gpio_info, &smdkv210_bl_data);
-
         s3c_hsotg_set_platdata(&smdkv210_hsotg_pdata);
 
         platform_add_devices(smdkv210_devices, ARRAY_SIZE(smdkv210_devices));
+
+        samsung_bl_set(&smdkv210_bl_gpio_info, &smdkv210_bl_data);
 }
 
 MACHINE_START(SMDKV210, "SMDKV210")
diff --git a/arch/arm/mach-s5pv210/pm.c b/arch/arm/mach-s5pv210/pm.c
index 2b68a67b6e95..3cf3f9c8ddd1 100644
--- a/arch/arm/mach-s5pv210/pm.c
+++ b/arch/arm/mach-s5pv210/pm.c
@@ -21,7 +21,6 @@
 
 #include <plat/cpu.h>
 #include <plat/pm.h>
-#include <plat/regs-timer.h>
 
 #include <mach/regs-irq.h>
 #include <mach/regs-clock.h>
@@ -77,15 +76,6 @@ static struct sleep_save s5pv210_core_save[] = {
         /* Clock ETC */
         SAVE_ITEM(S5P_CLK_OUT),
         SAVE_ITEM(S5P_MDNIE_SEL),
-
-        /* PWM Register */
-        SAVE_ITEM(S3C2410_TCFG0),
-        SAVE_ITEM(S3C2410_TCFG1),
-        SAVE_ITEM(S3C64XX_TINT_CSTAT),
-        SAVE_ITEM(S3C2410_TCON),
-        SAVE_ITEM(S3C2410_TCNTB(0)),
-        SAVE_ITEM(S3C2410_TCMPB(0)),
-        SAVE_ITEM(S3C2410_TCNTO(0)),
 };
 
 static int s5pv210_cpu_suspend(unsigned long arg)
diff --git a/arch/arm/mach-sa1100/collie.c b/arch/arm/mach-sa1100/collie.c
index 612a45689770..7fb96ebdc0fb 100644
--- a/arch/arm/mach-sa1100/collie.c
+++ b/arch/arm/mach-sa1100/collie.c
@@ -289,7 +289,7 @@ static void collie_flash_exit(void)
 }
 
 static struct flash_platform_data collie_flash_data = {
-        .map_name       = "cfi_probe",
+        .map_name       = "jedec_probe",
         .init           = collie_flash_init,
         .set_vpp        = collie_set_vpp,
         .exit           = collie_flash_exit,
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig
index 3912ce91fee4..1f94c310c477 100644
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
@@ -1,3 +1,41 @@
+config ARCH_SHMOBILE_MULTI
+        bool "SH-Mobile Series" if ARCH_MULTI_V7
+        depends on MMU
+        select CPU_V7
+        select GENERIC_CLOCKEVENTS
+        select HAVE_ARM_SCU if SMP
+        select HAVE_ARM_TWD if LOCAL_TIMERS
+        select HAVE_SMP
+        select ARM_GIC
+        select MIGHT_HAVE_CACHE_L2X0
+        select NO_IOPORT
+        select PINCTRL
+        select ARCH_REQUIRE_GPIOLIB
+        select CLKDEV_LOOKUP
+
+if ARCH_SHMOBILE_MULTI
+
+comment "SH-Mobile System Type"
+
+config ARCH_EMEV2
+        bool "Emma Mobile EV2"
+
+comment "SH-Mobile Board Type"
+
+config MACH_KZM9D_REFERENCE
+        bool "KZM9D board - Reference Device Tree Implementation"
+        depends on ARCH_EMEV2
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        ---help---
+           Use reference implementation of KZM9D board support
+           which makes a greater use of device tree at the expense
+           of not supporting a number of devices.
+
+           This is intended to aid developers
+
+comment "SH-Mobile System Configuration"
+endif
+
 if ARCH_SHMOBILE
 
 comment "SH-Mobile System Type"
@@ -23,9 +61,10 @@ config ARCH_R8A73A4
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select ARM_GIC
         select CPU_V7
-        select HAVE_ARM_ARCH_TIMER
         select SH_CLK_CPG
         select RENESAS_IRQC
+        select ARCH_HAS_CPUFREQ
+        select ARCH_HAS_OPP
 
 config ARCH_R8A7740
         bool "R-Mobile A1 (R8A77400)"
@@ -59,7 +98,6 @@ config ARCH_R8A7790
         select ARCH_WANT_OPTIONAL_GPIOLIB
         select ARM_GIC
         select CPU_V7
-        select HAVE_ARM_ARCH_TIMER
         select SH_CLK_CPG
         select RENESAS_IRQC
 
@@ -71,18 +109,22 @@ config ARCH_EMEV2
 
 comment "SH-Mobile Board Type"
 
-config MACH_AG5EVM
-        bool "AG5EVM board"
-        depends on ARCH_SH73A0
-        select ARCH_REQUIRE_GPIOLIB
-        select REGULATOR_FIXED_VOLTAGE if REGULATOR
-        select SH_LCD_MIPI_DSI
-
 config MACH_APE6EVM
         bool "APE6EVM board"
         depends on ARCH_R8A73A4
         select USE_OF
 
+config MACH_APE6EVM_REFERENCE
+        bool "APE6EVM board - Reference Device Tree Implementation"
+        depends on ARCH_R8A73A4
+        select USE_OF
+        ---help---
+           Use reference implementation of APE6EVM board support
+           which makes a greater use of device tree at the expense
+           of not supporting a number of devices.
+
+           This is intended to aid developers
+
 config MACH_MACKEREL
         bool "mackerel board"
         depends on ARCH_SH7372
@@ -91,12 +133,6 @@ config MACH_MACKEREL
         select SND_SOC_AK4642 if SND_SIMPLE_CARD
         select USE_OF
 
-config MACH_KOTA2
-        bool "KOTA2 board"
-        depends on ARCH_SH73A0
-        select ARCH_REQUIRE_GPIOLIB
-        select REGULATOR_FIXED_VOLTAGE if REGULATOR
-
 config MACH_ARMADILLO800EVA
         bool "Armadillo-800 EVA board"
         depends on ARCH_R8A7740
@@ -124,13 +160,29 @@ config MACH_BOCKW
         depends on ARCH_R8A7778
         select ARCH_REQUIRE_GPIOLIB
         select RENESAS_INTC_IRQPIN
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        select USE_OF
+
+config MACH_BOCKW_REFERENCE
+        bool "BOCK-W  - Reference Device Tree Implementation"
+        depends on ARCH_R8A7778
+        select ARCH_REQUIRE_GPIOLIB
+        select RENESAS_INTC_IRQPIN
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
         select USE_OF
+        ---help---
+           Use reference implementation of BockW board support
+           which makes use of device tree at the expense
+           of not supporting a number of devices.
+
+           This is intended to aid developers
 
 config MACH_MARZEN
         bool "MARZEN board"
         depends on ARCH_R8A7779
         select ARCH_REQUIRE_GPIOLIB
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        select USE_OF
 
 config MACH_MARZEN_REFERENCE
         bool "MARZEN board - Reference Device Tree Implementation"
@@ -150,12 +202,35 @@ config MACH_LAGER
         depends on ARCH_R8A7790
         select USE_OF
 
+config MACH_LAGER_REFERENCE
+        bool "Lager board - Reference Device Tree Implementation"
+        depends on ARCH_R8A7790
+        select USE_OF
+        ---help---
+           Use reference implementation of Lager board support
+           which makes use of device tree at the expense
+           of not supporting a number of devices.
+
+           This is intended to aid developers
+
 config MACH_KZM9D
         bool "KZM9D board"
         depends on ARCH_EMEV2
         select REGULATOR_FIXED_VOLTAGE if REGULATOR
         select USE_OF
 
+config MACH_KZM9D_REFERENCE
+        bool "KZM9D board - Reference Device Tree Implementation"
+        depends on ARCH_EMEV2
+        select REGULATOR_FIXED_VOLTAGE if REGULATOR
+        select USE_OF
+        ---help---
+           Use reference implementation of KZM9D board support
+           which makes a greater use of device tree at the expense
+           of not supporting a number of devices.
+
+           This is intended to aid developers
+
 config MACH_KZM9G
         bool "KZM-A9-GT board"
         depends on ARCH_SH73A0
@@ -186,6 +261,15 @@ config CPU_HAS_INTEVT
         bool
         default y
 
+config SH_CLK_CPG
+        bool
+
+source "drivers/sh/Kconfig"
+
+endif
+
+if ARCH_SHMOBILE || ARCH_SHMOBILE_MULTI
+
 menu "Timer and clock configuration"
 
 config SHMOBILE_TIMER_HZ
@@ -220,9 +304,4 @@ config EM_TIMER_STI
 
 endmenu
 
-config SH_CLK_CPG
-        bool
-
-source "drivers/sh/Kconfig"
-
 endif
diff --git a/arch/arm/mach-shmobile/Makefile b/arch/arm/mach-shmobile/Makefile
index 6165a517f580..2705bfa8c113 100644
--- a/arch/arm/mach-shmobile/Makefile
+++ b/arch/arm/mach-shmobile/Makefile
@@ -2,50 +2,65 @@
 # Makefile for the linux kernel.
 #
 
+ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/mach-shmobile/include
+
 # Common objects
-obj-y                           := timer.o console.o clock.o
+obj-y                           := timer.o console.o
 
 # CPU objects
-obj-$(CONFIG_ARCH_SH7372)       += setup-sh7372.o clock-sh7372.o intc-sh7372.o
-obj-$(CONFIG_ARCH_SH73A0)       += setup-sh73a0.o clock-sh73a0.o intc-sh73a0.o
-obj-$(CONFIG_ARCH_R8A73A4)      += setup-r8a73a4.o clock-r8a73a4.o
-obj-$(CONFIG_ARCH_R8A7740)      += setup-r8a7740.o clock-r8a7740.o intc-r8a7740.o
-obj-$(CONFIG_ARCH_R8A7778)      += setup-r8a7778.o clock-r8a7778.o
-obj-$(CONFIG_ARCH_R8A7779)      += setup-r8a7779.o clock-r8a7779.o intc-r8a7779.o
-obj-$(CONFIG_ARCH_R8A7790)      += setup-r8a7790.o clock-r8a7790.o
-obj-$(CONFIG_ARCH_EMEV2)        += setup-emev2.o clock-emev2.o
+obj-$(CONFIG_ARCH_SH7372)       += setup-sh7372.o intc-sh7372.o
+obj-$(CONFIG_ARCH_SH73A0)       += setup-sh73a0.o intc-sh73a0.o
+obj-$(CONFIG_ARCH_R8A73A4)      += setup-r8a73a4.o
+obj-$(CONFIG_ARCH_R8A7740)      += setup-r8a7740.o
+obj-$(CONFIG_ARCH_R8A7778)      += setup-r8a7778.o
+obj-$(CONFIG_ARCH_R8A7779)      += setup-r8a7779.o
+obj-$(CONFIG_ARCH_R8A7790)      += setup-r8a7790.o
+obj-$(CONFIG_ARCH_EMEV2)        += setup-emev2.o
+
+# Clock objects
+ifndef CONFIG_COMMON_CLK
+obj-y                           += clock.o
+obj-$(CONFIG_ARCH_SH7372)       += clock-sh7372.o
+obj-$(CONFIG_ARCH_SH73A0)       += clock-sh73a0.o
+obj-$(CONFIG_ARCH_R8A73A4)      += clock-r8a73a4.o
+obj-$(CONFIG_ARCH_R8A7740)      += clock-r8a7740.o
+obj-$(CONFIG_ARCH_R8A7778)      += clock-r8a7778.o
+obj-$(CONFIG_ARCH_R8A7779)      += clock-r8a7779.o
+obj-$(CONFIG_ARCH_R8A7790)      += clock-r8a7790.o
+obj-$(CONFIG_ARCH_EMEV2)        += clock-emev2.o
+endif
 
 # SMP objects
 smp-y                           := platsmp.o headsmp.o
-smp-$(CONFIG_ARCH_SH73A0)       += smp-sh73a0.o headsmp-scu.o
-smp-$(CONFIG_ARCH_R8A7779)      += smp-r8a7779.o headsmp-scu.o
-smp-$(CONFIG_ARCH_EMEV2)        += smp-emev2.o headsmp-scu.o
+smp-$(CONFIG_ARCH_SH73A0)       += smp-sh73a0.o headsmp-scu.o platsmp-scu.o
+smp-$(CONFIG_ARCH_R8A7779)      += smp-r8a7779.o headsmp-scu.o platsmp-scu.o
+smp-$(CONFIG_ARCH_EMEV2)        += smp-emev2.o headsmp-scu.o platsmp-scu.o
 
 # IRQ objects
 obj-$(CONFIG_ARCH_SH7372)       += entry-intc.o
-obj-$(CONFIG_ARCH_R8A7740)      += entry-intc.o
 
 # PM objects
 obj-$(CONFIG_SUSPEND)           += suspend.o
 obj-$(CONFIG_CPU_IDLE)          += cpuidle.o
-obj-$(CONFIG_ARCH_SHMOBILE)     += pm-rmobile.o
-obj-$(CONFIG_ARCH_SH7372)       += pm-sh7372.o sleep-sh7372.o
-obj-$(CONFIG_ARCH_R8A7740)      += pm-r8a7740.o
-obj-$(CONFIG_ARCH_R8A7779)      += pm-r8a7779.o
+obj-$(CONFIG_ARCH_SH7372)       += pm-sh7372.o sleep-sh7372.o pm-rmobile.o
 obj-$(CONFIG_ARCH_SH73A0)       += pm-sh73a0.o
+obj-$(CONFIG_ARCH_R8A7740)      += pm-r8a7740.o pm-rmobile.o
+obj-$(CONFIG_ARCH_R8A7779)      += pm-r8a7779.o
 
 # Board objects
-obj-$(CONFIG_MACH_AG5EVM)       += board-ag5evm.o
 obj-$(CONFIG_MACH_APE6EVM)      += board-ape6evm.o
+obj-$(CONFIG_MACH_APE6EVM_REFERENCE)    += board-ape6evm-reference.o
 obj-$(CONFIG_MACH_MACKEREL)     += board-mackerel.o
-obj-$(CONFIG_MACH_KOTA2)        += board-kota2.o
 obj-$(CONFIG_MACH_BOCKW)        += board-bockw.o
+obj-$(CONFIG_MACH_BOCKW_REFERENCE)      += board-bockw-reference.o
 obj-$(CONFIG_MACH_MARZEN)       += board-marzen.o
 obj-$(CONFIG_MACH_MARZEN_REFERENCE)     += board-marzen-reference.o
 obj-$(CONFIG_MACH_LAGER)        += board-lager.o
+obj-$(CONFIG_MACH_LAGER_REFERENCE)      += board-lager-reference.o
 obj-$(CONFIG_MACH_ARMADILLO800EVA)      += board-armadillo800eva.o
 obj-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE)    += board-armadillo800eva-reference.o
 obj-$(CONFIG_MACH_KZM9D)        += board-kzm9d.o
+obj-$(CONFIG_MACH_KZM9D_REFERENCE)      += board-kzm9d-reference.o
 obj-$(CONFIG_MACH_KZM9G)        += board-kzm9g.o
 obj-$(CONFIG_MACH_KZM9G_REFERENCE)      += board-kzm9g-reference.o
 
diff --git a/arch/arm/mach-shmobile/Makefile.boot b/arch/arm/mach-shmobile/Makefile.boot
index 84c6868580f0..6a504fe7d86c 100644
--- a/arch/arm/mach-shmobile/Makefile.boot
+++ b/arch/arm/mach-shmobile/Makefile.boot
@@ -1,15 +1,17 @@
 # per-board load address for uImage
 loadaddr-y      :=
-loadaddr-$(CONFIG_MACH_AG5EVM) += 0x40008000
 loadaddr-$(CONFIG_MACH_APE6EVM) += 0x40008000
+loadaddr-$(CONFIG_MACH_APE6EVM_REFERENCE) += 0x40008000
 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA) += 0x40008000
 loadaddr-$(CONFIG_MACH_ARMADILLO800EVA_REFERENCE) += 0x40008000
 loadaddr-$(CONFIG_MACH_BOCKW) += 0x60008000
-loadaddr-$(CONFIG_MACH_KOTA2) += 0x41008000
+loadaddr-$(CONFIG_MACH_BOCKW_REFERENCE) += 0x60008000
 loadaddr-$(CONFIG_MACH_KZM9D) += 0x40008000
+loadaddr-$(CONFIG_MACH_KZM9D_REFERENCE) += 0x40008000
 loadaddr-$(CONFIG_MACH_KZM9G) += 0x41008000
 loadaddr-$(CONFIG_MACH_KZM9G_REFERENCE) += 0x41008000
 loadaddr-$(CONFIG_MACH_LAGER) += 0x40008000
+loadaddr-$(CONFIG_MACH_LAGER_REFERENCE) += 0x40008000
 loadaddr-$(CONFIG_MACH_MACKEREL) += 0x40008000
 loadaddr-$(CONFIG_MACH_MARZEN) += 0x60008000
 loadaddr-$(CONFIG_MACH_MARZEN_REFERENCE) += 0x60008000
diff --git a/arch/arm/mach-shmobile/board-ag5evm.c b/arch/arm/mach-shmobile/board-ag5evm.c
deleted file mode 100644
index c7540710906f..000000000000
--- a/arch/arm/mach-shmobile/board-ag5evm.c
+++ /dev/null
@@ -1,672 +0,0 @@
-/*
- * arch/arm/mach-shmobile/board-ag5evm.c
- *
- * Copyright (C) 2010  Takashi Yoshii <yoshii.takashi.zj@renesas.com>
- * Copyright (C) 2009  Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/pinctrl/machine.h>
-#include <linux/pinctrl/pinconf-generic.h>
-#include <linux/platform_device.h>
-#include <linux/delay.h>
-#include <linux/io.h>
-#include <linux/dma-mapping.h>
-#include <linux/regulator/fixed.h>
-#include <linux/regulator/machine.h>
-#include <linux/serial_sci.h>
-#include <linux/smsc911x.h>
-#include <linux/gpio.h>
-#include <linux/videodev2.h>
-#include <linux/input.h>
-#include <linux/input/sh_keysc.h>
-#include <linux/mmc/host.h>
-#include <linux/mmc/sh_mmcif.h>
-#include <linux/mmc/sh_mobile_sdhi.h>
-#include <linux/mfd/tmio.h>
-#include <linux/sh_clk.h>
-#include <linux/irqchip/arm-gic.h>
-#include <video/sh_mobile_lcdc.h>
-#include <video/sh_mipi_dsi.h>
-#include <sound/sh_fsi.h>
-#include <mach/hardware.h>
-#include <mach/irqs.h>
-#include <mach/sh73a0.h>
-#include <mach/common.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/hardware/cache-l2x0.h>
-#include <asm/traps.h>
-
-/* Dummy supplies, where voltage doesn't matter */
-static struct regulator_consumer_supply dummy_supplies[] = {
-        REGULATOR_SUPPLY("vddvario", "smsc911x"),
-        REGULATOR_SUPPLY("vdd33a", "smsc911x"),
-};
-
-static struct resource smsc9220_resources[] = {
-        [0] = {
-                .start          = 0x14000000,
-                .end            = 0x14000000 + SZ_64K - 1,
-                .flags          = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start          = SH73A0_PINT0_IRQ(2), /* PINTA2 */
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct smsc911x_platform_config smsc9220_platdata = {
-        .flags          = SMSC911X_USE_32BIT | SMSC911X_SAVE_MAC_ADDRESS,
-        .phy_interface  = PHY_INTERFACE_MODE_MII,
-        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
-        .irq_type       = SMSC911X_IRQ_TYPE_PUSH_PULL,
-};
-
-static struct platform_device eth_device = {
-        .name           = "smsc911x",
-        .id             = 0,
-        .dev  = {
-                .platform_data = &smsc9220_platdata,
-        },
-        .resource       = smsc9220_resources,
-        .num_resources  = ARRAY_SIZE(smsc9220_resources),
-};
-
-static struct sh_keysc_info keysc_platdata = {
-        .mode           = SH_KEYSC_MODE_6,
-        .scan_timing    = 3,
-        .delay          = 100,
-        .keycodes       = {
-                KEY_A, KEY_B, KEY_C, KEY_D, KEY_E, KEY_F, KEY_G,
-                KEY_H, KEY_I, KEY_J, KEY_K, KEY_L, KEY_M, KEY_N,
-                KEY_O, KEY_P, KEY_Q, KEY_R, KEY_S, KEY_T, KEY_U,
-                KEY_V, KEY_W, KEY_X, KEY_Y, KEY_Z, KEY_HOME, KEY_SLEEP,
-                KEY_SPACE, KEY_9, KEY_6, KEY_3, KEY_WAKEUP, KEY_RIGHT, \
-                KEY_COFFEE,
-                KEY_0, KEY_8, KEY_5, KEY_2, KEY_DOWN, KEY_ENTER, KEY_UP,
-                KEY_KPASTERISK, KEY_7, KEY_4, KEY_1, KEY_STOP, KEY_LEFT, \
-                KEY_COMPUTER,
-        },
-};
-
-static struct resource keysc_resources[] = {
-        [0] = {
-                .name   = "KEYSC",
-                .start  = 0xe61b0000,
-                .end    = 0xe61b0098 - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = gic_spi(71),
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device keysc_device = {
-        .name           = "sh_keysc",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(keysc_resources),
-        .resource       = keysc_resources,
-        .dev            = {
-                .platform_data  = &keysc_platdata,
-        },
-};
-
-/* FSI A */
-static struct resource fsi_resources[] = {
-        [0] = {
-                .name   = "FSI",
-                .start  = 0xEC230000,
-                .end    = 0xEC230400 - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = gic_spi(146),
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device fsi_device = {
-        .name           = "sh_fsi2",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(fsi_resources),
-        .resource       = fsi_resources,
-};
-
-/* Fixed 1.8V regulator to be used by MMCIF */
-static struct regulator_consumer_supply fixed1v8_power_consumers[] =
-{
-        REGULATOR_SUPPLY("vmmc", "sh_mmcif.0"),
-        REGULATOR_SUPPLY("vqmmc", "sh_mmcif.0"),
-};
-
-static struct resource sh_mmcif_resources[] = {
-        [0] = {
-                .name   = "MMCIF",
-                .start  = 0xe6bd0000,
-                .end    = 0xe6bd00ff,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = gic_spi(141),
-                .flags  = IORESOURCE_IRQ,
-        },
-        [2] = {
-                .start  = gic_spi(140),
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct sh_mmcif_plat_data sh_mmcif_platdata = {
-        .sup_pclk       = 0,
-        .ocr            = MMC_VDD_165_195,
-        .caps           = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE,
-        .slave_id_tx    = SHDMA_SLAVE_MMCIF_TX,
-        .slave_id_rx    = SHDMA_SLAVE_MMCIF_RX,
-};
-
-static struct platform_device mmc_device = {
-        .name           = "sh_mmcif",
-        .id             = 0,
-        .dev            = {
-                .dma_mask               = NULL,
-                .coherent_dma_mask      = 0xffffffff,
-                .platform_data          = &sh_mmcif_platdata,
-        },
-        .num_resources  = ARRAY_SIZE(sh_mmcif_resources),
-        .resource       = sh_mmcif_resources,
-};
-
-/* IrDA */
-static struct resource irda_resources[] = {
-        [0] = {
-                .start  = 0xE6D00000,
-                .end    = 0xE6D01FD4 - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = gic_spi(95),
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device irda_device = {
-        .name           = "sh_irda",
-        .id             = 0,
-        .resource       = irda_resources,
-        .num_resources  = ARRAY_SIZE(irda_resources),
-};
-
-/* MIPI-DSI */
-static struct resource mipidsi0_resources[] = {
-        [0] = {
-                .name   = "DSI0",
-                .start  = 0xfeab0000,
-                .end    = 0xfeab3fff,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .name   = "DSI0",
-                .start  = 0xfeab4000,
-                .end    = 0xfeab7fff,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static int sh_mipi_set_dot_clock(struct platform_device *pdev,
-                                 void __iomem *base,
-                                 int enable)
-{
-        struct clk *pck, *phy;
-        int ret;
-
-        pck = clk_get(&pdev->dev, "dsip_clk");
-        if (IS_ERR(pck)) {
-                ret = PTR_ERR(pck);
-                goto sh_mipi_set_dot_clock_pck_err;
-        }
-
-        phy = clk_get(&pdev->dev, "dsiphy_clk");
-        if (IS_ERR(phy)) {
-                ret = PTR_ERR(phy);
-                goto sh_mipi_set_dot_clock_phy_err;
-        }
-
-        if (enable) {
-                clk_set_rate(pck, clk_round_rate(pck,  24000000));
-                clk_set_rate(phy, clk_round_rate(pck, 510000000));
-                clk_enable(pck);
-                clk_enable(phy);
-        } else {
-                clk_disable(pck);
-                clk_disable(phy);
-        }
-
-        ret = 0;
-
-        clk_put(phy);
-sh_mipi_set_dot_clock_phy_err:
-        clk_put(pck);
-sh_mipi_set_dot_clock_pck_err:
-        return ret;
-}
-
-static struct sh_mipi_dsi_info mipidsi0_info = {
-        .data_format    = MIPI_RGB888,
-        .channel        = LCDC_CHAN_MAINLCD,
-        .lane           = 2,
-        .vsynw_offset   = 20,
-        .clksrc         = 1,
-        .flags          = SH_MIPI_DSI_HSABM             |
-                          SH_MIPI_DSI_SYNC_PULSES_MODE  |
-                          SH_MIPI_DSI_HSbyteCLK,
-        .set_dot_clock  = sh_mipi_set_dot_clock,
-};
-
-static struct platform_device mipidsi0_device = {
-        .name           = "sh-mipi-dsi",
-        .num_resources  = ARRAY_SIZE(mipidsi0_resources),
-        .resource       = mipidsi0_resources,
-        .id             = 0,
-        .dev    = {
-                .platform_data  = &mipidsi0_info,
-        },
-};
-
-static unsigned char lcd_backlight_seq[3][2] = {
-        { 0x04, 0x07 },
-        { 0x23, 0x80 },
-        { 0x03, 0x01 },
-};
-
-static int lcd_backlight_set_brightness(int brightness)
-{
-        struct i2c_adapter *adap;
-        struct i2c_msg msg;
-        unsigned int i;
-        int ret;
-
-        if (brightness == 0) {
-                /* Reset the chip */
-                gpio_set_value(235, 0);
-                mdelay(24);
-                gpio_set_value(235, 1);
-                return 0;
-        }
-
-        adap = i2c_get_adapter(1);
-        if (adap == NULL)
-                return -ENODEV;
-
-        for (i = 0; i < ARRAY_SIZE(lcd_backlight_seq); i++) {
-                msg.addr = 0x6d;
-                msg.buf = &lcd_backlight_seq[i][0];
-                msg.len = 2;
-                msg.flags = 0;
-
-                ret = i2c_transfer(adap, &msg, 1);
-                if (ret < 0)
-                        break;
-        }
-
-        i2c_put_adapter(adap);
-        return ret < 0 ? ret : 0;
-}
-
-/* LCDC0 */
-static const struct fb_videomode lcdc0_modes[] = {
-        {
-                .name           = "R63302(QHD)",
-                .xres           = 544,
-                .yres           = 961,
-                .left_margin    = 72,
-                .right_margin   = 600,
-                .hsync_len      = 16,
-                .upper_margin   = 8,
-                .lower_margin   = 8,
-                .vsync_len      = 2,
-                .sync           = FB_SYNC_VERT_HIGH_ACT | FB_SYNC_HOR_HIGH_ACT,
-        },
-};
-
-static struct sh_mobile_lcdc_info lcdc0_info = {
-        .clock_source = LCDC_CLK_PERIPHERAL,
-        .ch[0] = {
-                .chan = LCDC_CHAN_MAINLCD,
-                .interface_type = RGB24,
-                .clock_divider = 1,
-                .flags = LCDC_FLAGS_DWPOL,
-                .fourcc = V4L2_PIX_FMT_RGB565,
-                .lcd_modes = lcdc0_modes,
-                .num_modes = ARRAY_SIZE(lcdc0_modes),
-                .panel_cfg = {
-                        .width = 44,
-                        .height = 79,
-                },
-                .bl_info = {
-                        .name = "sh_mobile_lcdc_bl",
-                        .max_brightness = 1,
-                        .set_brightness = lcd_backlight_set_brightness,
-                },
-                .tx_dev = &mipidsi0_device,
-        }
-};
-
-static struct resource lcdc0_resources[] = {
-        [0] = {
-                .name   = "LCDC0",
-                .start  = 0xfe940000, /* P4-only space */
-                .end    = 0xfe943fff,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = intcs_evt2irq(0x580),
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device lcdc0_device = {
-        .name           = "sh_mobile_lcdc_fb",
-        .num_resources  = ARRAY_SIZE(lcdc0_resources),
-        .resource       = lcdc0_resources,
-        .id             = 0,
-        .dev    = {
-                .platform_data  = &lcdc0_info,
-                .coherent_dma_mask = ~0,
-        },
-};
-
-/* Fixed 2.8V regulators to be used by SDHI0 */
-static struct regulator_consumer_supply fixed2v8_power_consumers[] =
-{
-        REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
-        REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"),
-};
-
-/* SDHI0 */
-static struct sh_mobile_sdhi_info sdhi0_info = {
-        .dma_slave_tx   = SHDMA_SLAVE_SDHI0_TX,
-        .dma_slave_rx   = SHDMA_SLAVE_SDHI0_RX,
-        .tmio_flags     = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_USE_GPIO_CD,
-        .tmio_caps      = MMC_CAP_SD_HIGHSPEED,
-        .tmio_ocr_mask  = MMC_VDD_27_28 | MMC_VDD_28_29,
-        .cd_gpio        = 251,
-};
-
-static struct resource sdhi0_resources[] = {
-        [0] = {
-                .name   = "SDHI0",
-                .start  = 0xee100000,
-                .end    = 0xee1000ff,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .name   = SH_MOBILE_SDHI_IRQ_CARD_DETECT,
-                .start  = gic_spi(83),
-                .flags  = IORESOURCE_IRQ,
-        },
-        [2] = {
-                .name   = SH_MOBILE_SDHI_IRQ_SDCARD,
-                .start  = gic_spi(84),
-                .flags  = IORESOURCE_IRQ,
-        },
-        [3] = {
-                .name   = SH_MOBILE_SDHI_IRQ_SDIO,
-                .start  = gic_spi(85),
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device sdhi0_device = {
-        .name           = "sh_mobile_sdhi",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(sdhi0_resources),
-        .resource       = sdhi0_resources,
-        .dev    = {
-                .platform_data  = &sdhi0_info,
-        },
-};
-
-/* Fixed 3.3V regulator to be used by SDHI1 */
-static struct regulator_consumer_supply cn4_power_consumers[] =
-{
-        REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.1"),
-        REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.1"),
-};
-
-static struct regulator_init_data cn4_power_init_data = {
-        .constraints = {
-                .valid_ops_mask = REGULATOR_CHANGE_STATUS,
-        },
-        .num_consumer_supplies  = ARRAY_SIZE(cn4_power_consumers),
-        .consumer_supplies      = cn4_power_consumers,
-};
-
-static struct fixed_voltage_config cn4_power_info = {
-        .supply_name = "CN4 SD/MMC Vdd",
-        .microvolts = 3300000,
-        .gpio = 114,
-        .enable_high = 1,
-        .init_data = &cn4_power_init_data,
-};
-
-static struct platform_device cn4_power = {
-        .name = "reg-fixed-voltage",
-        .id   = 2,
-        .dev  = {
-                .platform_data = &cn4_power_info,
-        },
-};
-
-static void ag5evm_sdhi1_set_pwr(struct platform_device *pdev, int state)
-{
-        static int power_gpio = -EINVAL;
-
-        if (power_gpio < 0) {
-                int ret = gpio_request_one(114, GPIOF_OUT_INIT_LOW,
-                                           "sdhi1_power");
-                if (!ret)
-                        power_gpio = 114;
-        }
-
-        /*
-         * If requesting the GPIO above failed, it means, that the regulator got
-         * probed and grabbed the GPIO, but we don't know, whether the sdhi
-         * driver already uses the regulator. If it doesn't, we have to toggle
-         * the GPIO ourselves, even though it is now owned by the fixed
-         * regulator driver. We have to live with the race in case the driver
-         * gets unloaded and the GPIO freed between these two steps.
-         */
-        gpio_set_value(114, state);
-}
-
-static struct sh_mobile_sdhi_info sh_sdhi1_info = {
-        .tmio_flags     = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_HAS_IDLE_WAIT,
-        .tmio_caps      = MMC_CAP_NONREMOVABLE | MMC_CAP_SDIO_IRQ,
-        .tmio_ocr_mask  = MMC_VDD_32_33 | MMC_VDD_33_34,
-        .set_pwr        = ag5evm_sdhi1_set_pwr,
-};
-
-static struct resource sdhi1_resources[] = {
-        [0] = {
-                .name   = "SDHI1",
-                .start  = 0xee120000,
-                .end    = 0xee1200ff,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .name   = SH_MOBILE_SDHI_IRQ_CARD_DETECT,
-                .start  = gic_spi(87),
-                .flags  = IORESOURCE_IRQ,
-        },
-        [2] = {
-                .name   = SH_MOBILE_SDHI_IRQ_SDCARD,
-                .start  = gic_spi(88),
-                .flags  = IORESOURCE_IRQ,
-        },
-        [3] = {
-                .name   = SH_MOBILE_SDHI_IRQ_SDIO,
-                .start  = gic_spi(89),
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device sdhi1_device = {
-        .name           = "sh_mobile_sdhi",
-        .id             = 1,
-        .dev            = {
-                .platform_data  = &sh_sdhi1_info,
-        },
-        .num_resources  = ARRAY_SIZE(sdhi1_resources),
-        .resource       = sdhi1_resources,
-};
-
-static struct platform_device *ag5evm_devices[] __initdata = {
-        &cn4_power,
-        &eth_device,
-        &keysc_device,
-        &fsi_device,
-        &mmc_device,
-        &irda_device,
-        &mipidsi0_device,
-        &lcdc0_device,
-        &sdhi0_device,
-        &sdhi1_device,
-};
-
-static unsigned long pin_pullup_conf[] = {
-        PIN_CONF_PACKED(PIN_CONFIG_BIAS_PULL_UP, 0),
-};
-
-static const struct pinctrl_map ag5evm_pinctrl_map[] = {
-        /* FSIA */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "pfc-sh73a0",
-                                  "fsia_mclk_in", "fsia"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "pfc-sh73a0",
-                                  "fsia_sclk_in", "fsia"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "pfc-sh73a0",
-                                  "fsia_data_in", "fsia"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_fsi2.0", "pfc-sh73a0",
-                                  "fsia_data_out", "fsia"),
-        /* I2C2 & I2C3 */
-        PIN_MAP_MUX_GROUP_DEFAULT("i2c-sh_mobile.2", "pfc-sh73a0",
-                                  "i2c2_0", "i2c2"),
-        PIN_MAP_MUX_GROUP_DEFAULT("i2c-sh_mobile.3", "pfc-sh73a0",
-                                  "i2c3_0", "i2c3"),
-        /* IrDA */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_irda.0", "pfc-sh73a0",
-                                  "irda_0", "irda"),
-        /* KEYSC */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",
-                                  "keysc_in8", "keysc"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",
-                                  "keysc_out04", "keysc"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",
-                                  "keysc_out5", "keysc"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",
-                                  "keysc_out6_0", "keysc"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",
-                                  "keysc_out7_0", "keysc"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",
-                                  "keysc_out8_0", "keysc"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",
-                                  "keysc_out9_2", "keysc"),
-        PIN_MAP_CONFIGS_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",
-                                      "keysc_in8", pin_pullup_conf),
-        /* MMCIF */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
-                                  "mmc0_data8_0", "mmc0"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
-                                  "mmc0_ctrl_0", "mmc0"),
-        PIN_MAP_CONFIGS_PIN_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
-                                    "PORT279", pin_pullup_conf),
-        PIN_MAP_CONFIGS_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
-                                      "mmc0_data8_0", pin_pullup_conf),
-        /* SCIFA2 */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.2", "pfc-sh73a0",
-                                  "scifa2_data_0", "scifa2"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.2", "pfc-sh73a0",
-                                  "scifa2_ctrl_0", "scifa2"),
-        /* SDHI0 (CN15 [SD I/F]) */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
-                                  "sdhi0_data4", "sdhi0"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
-                                  "sdhi0_ctrl", "sdhi0"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
-                                  "sdhi0_wp", "sdhi0"),
-        /* SDHI1 (CN4 [WLAN I/F]) */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.1", "pfc-sh73a0",
-                                  "sdhi1_data4", "sdhi1"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.1", "pfc-sh73a0",
-                                  "sdhi1_ctrl", "sdhi1"),
-        PIN_MAP_CONFIGS_GROUP_DEFAULT("sh_mobile_sdhi.1", "pfc-sh73a0",
-                                      "sdhi1_data4", pin_pullup_conf),
-        PIN_MAP_CONFIGS_PIN_DEFAULT("sh_mobile_sdhi.1", "pfc-sh73a0",
-                                    "PORT263", pin_pullup_conf),
-};
-
-static void __init ag5evm_init(void)
-{
-        regulator_register_always_on(0, "fixed-1.8V", fixed1v8_power_consumers,
-                                     ARRAY_SIZE(fixed1v8_power_consumers), 1800000);
-        regulator_register_always_on(1, "fixed-2.8V", fixed2v8_power_consumers,
-                                     ARRAY_SIZE(fixed2v8_power_consumers), 3300000);
-        regulator_register_fixed(3, dummy_supplies, ARRAY_SIZE(dummy_supplies));
-
-        pinctrl_register_mappings(ag5evm_pinctrl_map,
-                                  ARRAY_SIZE(ag5evm_pinctrl_map));
-        sh73a0_pinmux_init();
-
-        /* enable MMCIF */
-        gpio_request_one(208, GPIOF_OUT_INIT_HIGH, NULL); /* Reset */
-
-        /* enable SMSC911X */
-        gpio_request_one(144, GPIOF_IN, NULL); /* PINTA2 */
-        gpio_request_one(145, GPIOF_OUT_INIT_HIGH, NULL); /* RESET */
-
-        /* LCD panel */
-        gpio_request_one(217, GPIOF_OUT_INIT_LOW, NULL); /* RESET */
-        mdelay(1);
-        gpio_set_value(217, 1);
-        mdelay(100);
-
-        /* LCD backlight controller */
-        gpio_request_one(235, GPIOF_OUT_INIT_LOW, NULL); /* RESET */
-        lcd_backlight_set_brightness(0);
-
-#ifdef CONFIG_CACHE_L2X0
-        /* Shared attribute override enable, 64K*8way */
-        l2x0_init(IOMEM(0xf0100000), 0x00460000, 0xc2000fff);
-#endif
-        sh73a0_add_standard_devices();
-        platform_add_devices(ag5evm_devices, ARRAY_SIZE(ag5evm_devices));
-}
-
-MACHINE_START(AG5EVM, "ag5evm")
-        .smp            = smp_ops(sh73a0_smp_ops),
-        .map_io         = sh73a0_map_io,
-        .init_early     = sh73a0_add_early_devices,
-        .nr_irqs        = NR_IRQS_LEGACY,
-        .init_irq       = sh73a0_init_irq,
-        .init_machine   = ag5evm_init,
-        .init_late      = shmobile_init_late,
-        .init_time      = sh73a0_earlytimer_init,
-MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-ape6evm-reference.c b/arch/arm/mach-shmobile/board-ape6evm-reference.c
new file mode 100644
index 000000000000..a23fa714f7ac
--- /dev/null
+++ b/arch/arm/mach-shmobile/board-ape6evm-reference.c
@@ -0,0 +1,63 @@
+/*
+ * APE6EVM board support
+ *
+ * Copyright (C) 2013  Renesas Solutions Corp.
+ * Copyright (C) 2013  Magnus Damm
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <linux/gpio.h>
+#include <linux/kernel.h>
+#include <linux/of_platform.h>
+#include <linux/pinctrl/machine.h>
+#include <linux/platform_device.h>
+#include <linux/sh_clk.h>
+#include <mach/common.h>
+#include <mach/r8a73a4.h>
+#include <asm/mach-types.h>
+#include <asm/mach/arch.h>
+
+static void __init ape6evm_add_standard_devices(void)
+{
+
+        struct clk *parent;
+        struct clk *mp;
+
+        r8a73a4_clock_init();
+
+        /* MP clock parent = extal2 */
+        parent      = clk_get(NULL, "extal2");
+        mp          = clk_get(NULL, "mp");
+        BUG_ON(IS_ERR(parent) || IS_ERR(mp));
+
+        clk_set_parent(mp, parent);
+        clk_put(parent);
+        clk_put(mp);
+
+        r8a73a4_add_dt_devices();
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+        platform_device_register_simple("cpufreq-cpu0", -1, NULL, 0);
+}
+
+static const char *ape6evm_boards_compat_dt[] __initdata = {
+        "renesas,ape6evm-reference",
+        NULL,
+};
+
+DT_MACHINE_START(APE6EVM_DT, "ape6evm")
+        .init_early     = r8a73a4_init_delay,
+        .init_machine   = ape6evm_add_standard_devices,
+        .dt_compat      = ape6evm_boards_compat_dt,
+MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-ape6evm.c b/arch/arm/mach-shmobile/board-ape6evm.c
index 5eb0caa6a7d0..24b87eea9da3 100644
--- a/arch/arm/mach-shmobile/board-ape6evm.c
+++ b/arch/arm/mach-shmobile/board-ape6evm.c
@@ -19,9 +19,14 @@
  */
 
 #include <linux/gpio.h>
+#include <linux/gpio_keys.h>
+#include <linux/input.h>
 #include <linux/interrupt.h>
-#include <linux/irqchip.h>
 #include <linux/kernel.h>
+#include <linux/mfd/tmio.h>
+#include <linux/mmc/host.h>
+#include <linux/mmc/sh_mmcif.h>
+#include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/pinctrl/machine.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/fixed.h>
@@ -34,6 +39,58 @@
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
+/* LEDS */
+static struct gpio_led ape6evm_leds[] = {
+        {
+                .name           = "gnss-en",
+                .gpio           = 28,
+                .default_state  = LEDS_GPIO_DEFSTATE_OFF,
+        }, {
+                .name           = "nfc-nrst",
+                .gpio           = 126,
+                .default_state  = LEDS_GPIO_DEFSTATE_OFF,
+        }, {
+                .name           = "gnss-nrst",
+                .gpio           = 132,
+                .default_state  = LEDS_GPIO_DEFSTATE_OFF,
+        }, {
+                .name           = "bt-wakeup",
+                .gpio           = 232,
+                .default_state  = LEDS_GPIO_DEFSTATE_OFF,
+        }, {
+                .name           = "strobe",
+                .gpio           = 250,
+                .default_state  = LEDS_GPIO_DEFSTATE_OFF,
+        }, {
+                .name           = "bbresetout",
+                .gpio           = 288,
+                .default_state  = LEDS_GPIO_DEFSTATE_OFF,
+        },
+};
+
+static __initdata struct gpio_led_platform_data ape6evm_leds_pdata = {
+        .leds           = ape6evm_leds,
+        .num_leds       = ARRAY_SIZE(ape6evm_leds),
+};
+
+/* GPIO KEY */
+#define GPIO_KEY(c, g, d, ...) \
+        { .code = c, .gpio = g, .desc = d, .active_low = 1 }
+
+static struct gpio_keys_button gpio_buttons[] = {
+        GPIO_KEY(KEY_0,                 324,    "S16"),
+        GPIO_KEY(KEY_MENU,              325,    "S17"),
+        GPIO_KEY(KEY_HOME,              326,    "S18"),
+        GPIO_KEY(KEY_BACK,              327,    "S19"),
+        GPIO_KEY(KEY_VOLUMEUP,          328,    "S20"),
+        GPIO_KEY(KEY_VOLUMEDOWN,        329,    "S21"),
+};
+
+static struct __initdata gpio_keys_platform_data ape6evm_keys_pdata = {
+        .buttons        = gpio_buttons,
+        .nbuttons       = ARRAY_SIZE(gpio_buttons),
+};
+
 /* Dummy supplies, where voltage doesn't matter */
 static struct regulator_consumer_supply dummy_supplies[] = {
         REGULATOR_SUPPLY("vddvario", "smsc911x"),
@@ -41,7 +98,7 @@ static struct regulator_consumer_supply dummy_supplies[] = {
 };
 
 /* SMSC LAN9220 */
-static const struct resource lan9220_res[] = {
+static const struct resource lan9220_res[] __initconst = {
         DEFINE_RES_MEM(0x08000000, 0x1000),
         {
                 .start  = irq_pin(40), /* IRQ40 */
@@ -49,19 +106,83 @@ static const struct resource lan9220_res[] = {
         },
 };
 
-static const struct smsc911x_platform_config lan9220_data = {
+static const struct smsc911x_platform_config lan9220_data __initconst = {
         .flags          = SMSC911X_USE_32BIT,
         .irq_type       = SMSC911X_IRQ_TYPE_PUSH_PULL,
         .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH,
 };
 
-static const struct pinctrl_map ape6evm_pinctrl_map[] = {
+/*
+ * On APE6EVM power is supplied to MMCIF by a tps80032 regulator. For now we
+ * model a VDD supply to MMCIF, using a fixed 3.3V regulator. Also use the
+ * static power supply for SDHI0 and SDHI1, whereas SDHI0's VccQ is also
+ * supplied by the same tps80032 regulator and thus can also be adjusted
+ * dynamically.
+ */
+static struct regulator_consumer_supply fixed3v3_power_consumers[] =
+{
+        REGULATOR_SUPPLY("vmmc", "sh_mmcif.0"),
+        REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
+        REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.1"),
+};
+
+/* MMCIF */
+static const struct sh_mmcif_plat_data mmcif0_pdata __initconst = {
+        .caps           = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE,
+};
+
+static const struct resource mmcif0_resources[] __initconst = {
+        DEFINE_RES_MEM_NAMED(0xee200000, 0x100, "MMCIF0"),
+        DEFINE_RES_IRQ(gic_spi(169)),
+};
+
+/* SDHI0 */
+static const struct sh_mobile_sdhi_info sdhi0_pdata __initconst = {
+        .tmio_flags     = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE,
+        .tmio_caps      = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ,
+};
+
+static const struct resource sdhi0_resources[] __initconst = {
+        DEFINE_RES_MEM_NAMED(0xee100000, 0x100, "SDHI0"),
+        DEFINE_RES_IRQ(gic_spi(165)),
+};
+
+/* SDHI1 */
+static const struct sh_mobile_sdhi_info sdhi1_pdata __initconst = {
+        .tmio_flags     = TMIO_MMC_HAS_IDLE_WAIT | TMIO_MMC_WRPROTECT_DISABLE,
+        .tmio_caps      = MMC_CAP_SD_HIGHSPEED | MMC_CAP_SDIO_IRQ |
+                          MMC_CAP_NEEDS_POLL,
+};
+
+static const struct resource sdhi1_resources[] __initconst = {
+        DEFINE_RES_MEM_NAMED(0xee120000, 0x100, "SDHI1"),
+        DEFINE_RES_IRQ(gic_spi(166)),
+};
+
+static const struct pinctrl_map ape6evm_pinctrl_map[] __initconst = {
         /* SCIFA0 console */
         PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a73a4",
                                   "scifa0_data", "scifa0"),
         /* SMSC */
         PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-r8a73a4",
                                   "irqc_irq40", "irqc"),
+        /* MMCIF0 */
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-r8a73a4",
+                                  "mmc0_data8", "mmc0"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-r8a73a4",
+                                  "mmc0_ctrl", "mmc0"),
+        /* SDHI0: uSD: no WP */
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a73a4",
+                                  "sdhi0_data4", "sdhi0"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a73a4",
+                                  "sdhi0_ctrl", "sdhi0"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a73a4",
+                                  "sdhi0_cd", "sdhi0"),
+        /* SDHI1 */
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.1", "pfc-r8a73a4",
+                                  "sdhi1_data4", "sdhi1"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.1", "pfc-r8a73a4",
+                                  "sdhi1_ctrl", "sdhi1"),
 };
 
 static void __init ape6evm_add_standard_devices(void)
@@ -94,6 +215,23 @@ static void __init ape6evm_add_standard_devices(void)
         platform_device_register_resndata(&platform_bus, "smsc911x", -1,
                                           lan9220_res, ARRAY_SIZE(lan9220_res),
                                           &lan9220_data, sizeof(lan9220_data));
+        regulator_register_always_on(1, "fixed-3.3V", fixed3v3_power_consumers,
+                                     ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
+        platform_device_register_resndata(&platform_bus, "sh_mmcif", 0,
+                                          mmcif0_resources, ARRAY_SIZE(mmcif0_resources),
+                                          &mmcif0_pdata, sizeof(mmcif0_pdata));
+        platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 0,
+                                          sdhi0_resources, ARRAY_SIZE(sdhi0_resources),
+                                          &sdhi0_pdata, sizeof(sdhi0_pdata));
+        platform_device_register_resndata(&platform_bus, "sh_mobile_sdhi", 1,
+                                          sdhi1_resources, ARRAY_SIZE(sdhi1_resources),
+                                          &sdhi1_pdata, sizeof(sdhi1_pdata));
+        platform_device_register_data(&platform_bus, "gpio-keys", -1,
+                                      &ape6evm_keys_pdata,
+                                      sizeof(ape6evm_keys_pdata));
+        platform_device_register_data(&platform_bus, "leds-gpio", -1,
+                                      &ape6evm_leds_pdata,
+                                      sizeof(ape6evm_leds_pdata));
 }
 
 static const char *ape6evm_boards_compat_dt[] __initdata = {
@@ -102,8 +240,7 @@ static const char *ape6evm_boards_compat_dt[] __initdata = {
 };
 
 DT_MACHINE_START(APE6EVM_DT, "ape6evm")
-        .init_irq       = irqchip_init,
-        .init_time      = shmobile_timer_init,
+        .init_early     = r8a73a4_init_delay,
         .init_machine   = ape6evm_add_standard_devices,
         .dt_compat      = ape6evm_boards_compat_dt,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
index 03b85fec2ddb..57d1a78367b6 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva-reference.c
@@ -24,7 +24,6 @@
 #include <linux/kernel.h>
 #include <linux/gpio.h>
 #include <linux/io.h>
-#include <linux/pinctrl/machine.h>
 #include <mach/common.h>
 #include <mach/r8a7740.h>
 #include <asm/mach/arch.h>
@@ -119,12 +118,6 @@
  *      usbhsf_power_ctrl()
  */
 
-static const struct pinctrl_map eva_pinctrl_map[] = {
-        /* SCIFA1 */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.1", "pfc-r8a7740",
-                                  "scifa1_data", "scifa1"),
-};
-
 static void __init eva_clock_init(void)
 {
         struct clk *system      = clk_get(NULL, "system_clk");
@@ -165,35 +158,26 @@ clock_error:
  */
 static void __init eva_init(void)
 {
-
         r8a7740_clock_init(MD_CK0 | MD_CK2);
         eva_clock_init();
 
-        pinctrl_register_mappings(eva_pinctrl_map, ARRAY_SIZE(eva_pinctrl_map));
-        r8a7740_pinmux_init();
-
         r8a7740_meram_workaround();
 
-        /*
-         * Touchscreen
-         * TODO: Move reset GPIO over to .dts when we can reference it
-         */
-        gpio_request_one(166, GPIOF_OUT_INIT_HIGH, NULL); /* TP_RST_B */
-
 #ifdef CONFIG_CACHE_L2X0
         /* Early BRESP enable, Shared attribute override enable, 32K*8way */
         l2x0_init(IOMEM(0xf0002000), 0x40440000, 0x82000fff);
 #endif
 
         r8a7740_add_standard_devices_dt();
+
         r8a7740_pm_init();
 }
 
 #define RESCNT2 IOMEM(0xe6188020)
-static void eva_restart(char mode, const char *cmd)
+static void eva_restart(enum reboot_mode mode, const char *cmd)
 {
         /* Do soft power on reset */
-        writel((1 << 31), RESCNT2);
+        writel(1 << 31, RESCNT2);
 }
 
 static const char *eva_boards_compat_dt[] __initdata = {
@@ -206,7 +190,6 @@ DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva-reference")
         .init_early     = r8a7740_init_delay,
         .init_irq       = r8a7740_init_irq_of,
         .init_machine   = eva_init,
-        .init_time      = shmobile_timer_init,
         .init_late      = shmobile_init_late,
         .dt_compat      = eva_boards_compat_dt,
         .restart        = eva_restart,
diff --git a/arch/arm/mach-shmobile/board-armadillo800eva.c b/arch/arm/mach-shmobile/board-armadillo800eva.c
index c5be60d85e4b..5bd1479d3deb 100644
--- a/arch/arm/mach-shmobile/board-armadillo800eva.c
+++ b/arch/arm/mach-shmobile/board-armadillo800eva.c
@@ -31,6 +31,8 @@
 #include <linux/gpio_keys.h>
 #include <linux/regulator/driver.h>
 #include <linux/pinctrl/machine.h>
+#include <linux/platform_data/pwm-renesas-tpu.h>
+#include <linux/pwm_backlight.h>
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/gpio-regulator.h>
 #include <linux/regulator/machine.h>
@@ -358,7 +360,6 @@ static struct platform_device usbhsf_device = {
 static struct sh_eth_plat_data sh_eth_platdata = {
         .phy                    = 0x00, /* LAN8710A */
         .edmac_endian           = EDMAC_LITTLE_ENDIAN,
-        .register_type          = SH_ETH_REG_GIGABIT,
         .phy_interface          = PHY_INTERFACE_MODE_MII,
 };
 
@@ -387,7 +388,50 @@ static struct platform_device sh_eth_device = {
         .num_resources = ARRAY_SIZE(sh_eth_resources),
 };
 
-/* LCDC */
+/* PWM */
+static struct resource pwm_resources[] = {
+        [0] = {
+                .start = 0xe6600000,
+                .end = 0xe66000ff,
+                .flags = IORESOURCE_MEM,
+        },
+};
+
+static struct tpu_pwm_platform_data pwm_device_data = {
+        .channels[2] = {
+                .polarity = PWM_POLARITY_INVERSED,
+        }
+};
+
+static struct platform_device pwm_device = {
+        .name = "renesas-tpu-pwm",
+        .id = -1,
+        .dev = {
+                .platform_data = &pwm_device_data,
+        },
+        .num_resources = ARRAY_SIZE(pwm_resources),
+        .resource = pwm_resources,
+};
+
+static struct pwm_lookup pwm_lookup[] = {
+        PWM_LOOKUP("renesas-tpu-pwm", 2, "pwm-backlight.0", NULL),
+};
+
+/* LCDC and backlight */
+static struct platform_pwm_backlight_data pwm_backlight_data = {
+        .lth_brightness = 50,
+        .max_brightness = 255,
+        .dft_brightness = 255,
+        .pwm_period_ns = 33333, /* 30kHz */
+};
+
+static struct platform_device pwm_backlight_device = {
+        .name = "pwm-backlight",
+        .dev = {
+                .platform_data = &pwm_backlight_data,
+        },
+};
+
 static struct fb_videomode lcdc0_mode = {
         .name           = "AMPIER/AM-800480",
         .xres           = 800,
@@ -679,15 +723,6 @@ static struct platform_device vcc_sdhi1 = {
 };
 
 /* SDHI0 */
-/*
- * FIXME
- *
- * It use polling mode here, since
- * CD (= Card Detect) pin is not connected to SDHI0_CD.
- * We can use IRQ31 as card detect irq,
- * but it needs chattering removal operation
- */
-#define IRQ31   irq_pin(31)
 static struct sh_mobile_sdhi_info sdhi0_info = {
         .dma_slave_tx   = SHDMA_SLAVE_SDHI0_TX,
         .dma_slave_rx   = SHDMA_SLAVE_SDHI0_RX,
@@ -788,6 +823,8 @@ static struct sh_mmcif_plat_data sh_mmcif_plat = {
         .caps           = MMC_CAP_4_BIT_DATA |
                           MMC_CAP_8_BIT_DATA |
                           MMC_CAP_NONREMOVABLE,
+        .slave_id_tx    = SHDMA_SLAVE_MMCIF_TX,
+        .slave_id_rx    = SHDMA_SLAVE_MMCIF_RX,
 };
 
 static struct resource sh_mmcif_resources[] = {
@@ -1030,6 +1067,8 @@ static struct i2c_board_info i2c2_devices[] = {
  */
 static struct platform_device *eva_devices[] __initdata = {
         &lcdc0_device,
+        &pwm_device,
+        &pwm_backlight_device,
         &gpio_keys_device,
         &sh_eth_device,
         &vcc_sdhi0,
@@ -1101,6 +1140,9 @@ static const struct pinctrl_map eva_pinctrl_map[] = {
         /* ST1232 */
         PIN_MAP_MUX_GROUP_DEFAULT("0-0055", "pfc-r8a7740",
                                   "intc_irq10", "intc"),
+        /* TPU0 */
+        PIN_MAP_MUX_GROUP_DEFAULT("renesas-tpu-pwm", "pfc-r8a7740",
+                                  "tpu0_to2_1", "tpu0"),
         /* USBHS */
         PIN_MAP_MUX_GROUP_DEFAULT("renesas_usbhs", "pfc-r8a7740",
                                   "intc_irq7_1", "intc"),
@@ -1154,13 +1196,13 @@ static void __init eva_init(void)
                                      ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
 
         pinctrl_register_mappings(eva_pinctrl_map, ARRAY_SIZE(eva_pinctrl_map));
+        pwm_add_table(pwm_lookup, ARRAY_SIZE(pwm_lookup));
 
         r8a7740_pinmux_init();
         r8a7740_meram_workaround();
 
         /* LCDC0 */
         gpio_request_one(61, GPIOF_OUT_INIT_HIGH, NULL); /* LCDDON */
-        gpio_request_one(202, GPIOF_OUT_INIT_LOW, NULL); /* LCD0_LED_CONT */
 
         /* GETHER */
         gpio_request_one(18, GPIOF_OUT_INIT_HIGH, NULL); /* PHY_RST */
@@ -1271,7 +1313,7 @@ static const char *eva_boards_compat_dt[] __initdata = {
 DT_MACHINE_START(ARMADILLO800EVA_DT, "armadillo800eva")
         .map_io         = r8a7740_map_io,
         .init_early     = eva_add_early_devices,
-        .init_irq       = r8a7740_init_irq,
+        .init_irq       = r8a7740_init_irq_of,
         .init_machine   = eva_init,
         .init_late      = shmobile_init_late,
         .init_time      = eva_earlytimer_init,
diff --git a/arch/arm/mach-shmobile/board-bockw-reference.c b/arch/arm/mach-shmobile/board-bockw-reference.c
new file mode 100644
index 000000000000..1a7c893e1a52
--- /dev/null
+++ b/arch/arm/mach-shmobile/board-bockw-reference.c
@@ -0,0 +1,61 @@
+/*
+ * Bock-W board support
+ *
+ * Copyright (C) 2013  Renesas Solutions Corp.
+ * Copyright (C) 2013  Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <linux/of_platform.h>
+#include <linux/pinctrl/machine.h>
+#include <mach/common.h>
+#include <mach/r8a7778.h>
+#include <asm/mach/arch.h>
+
+/*
+ *      see board-bock.c for checking detail of dip-switch
+ */
+
+static const struct pinctrl_map bockw_pinctrl_map[] = {
+        /* SCIF0 */
+        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778",
+                                  "scif0_data_a", "scif0"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.0", "pfc-r8a7778",
+                                  "scif0_ctrl", "scif0"),
+};
+
+static void __init bockw_init(void)
+{
+        r8a7778_clock_init();
+
+        pinctrl_register_mappings(bockw_pinctrl_map,
+                                  ARRAY_SIZE(bockw_pinctrl_map));
+        r8a7778_pinmux_init();
+        r8a7778_add_dt_devices();
+
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
+
+static const char *bockw_boards_compat_dt[] __initdata = {
+        "renesas,bockw-reference",
+        NULL,
+};
+
+DT_MACHINE_START(BOCKW_DT, "bockw")
+        .init_early     = r8a7778_init_delay,
+        .init_irq       = r8a7778_init_irq_dt,
+        .init_machine   = bockw_init,
+        .dt_compat      = bockw_boards_compat_dt,
+MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-bockw.c b/arch/arm/mach-shmobile/board-bockw.c
index 3354a85c90f7..6b9faf3908f7 100644
--- a/arch/arm/mach-shmobile/board-bockw.c
+++ b/arch/arm/mach-shmobile/board-bockw.c
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2013  Renesas Solutions Corp.
  * Copyright (C) 2013  Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
+ * Copyright (C) 2013  Cogent Embedded, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,14 +21,18 @@
 
 #include <linux/mfd/tmio.h>
 #include <linux/mmc/host.h>
+#include <linux/mmc/sh_mobile_sdhi.h>
+#include <linux/mmc/sh_mmcif.h>
 #include <linux/mtd/partitions.h>
 #include <linux/pinctrl/machine.h>
+#include <linux/platform_data/usb-rcar-phy.h>
 #include <linux/platform_device.h>
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/machine.h>
 #include <linux/smsc911x.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/flash.h>
+#include <media/soc_camera.h>
 #include <mach/common.h>
 #include <mach/irqs.h>
 #include <mach/r8a7778.h>
@@ -64,32 +69,41 @@ static struct regulator_consumer_supply dummy_supplies[] = {
         REGULATOR_SUPPLY("vdd33a", "smsc911x"),
 };
 
-static struct smsc911x_platform_config smsc911x_data = {
+static struct smsc911x_platform_config smsc911x_data __initdata = {
         .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
         .irq_type       = SMSC911X_IRQ_TYPE_PUSH_PULL,
         .flags          = SMSC911X_USE_32BIT,
         .phy_interface  = PHY_INTERFACE_MODE_MII,
 };
 
-static struct resource smsc911x_resources[] = {
+static struct resource smsc911x_resources[] __initdata = {
         DEFINE_RES_MEM(0x18300000, 0x1000),
         DEFINE_RES_IRQ(irq_pin(0)), /* IRQ 0 */
 };
 
 /* USB */
+static struct resource usb_phy_resources[] __initdata = {
+        DEFINE_RES_MEM(0xffe70800, 0x100),
+        DEFINE_RES_MEM(0xffe76000, 0x100),
+};
+
 static struct rcar_phy_platform_data usb_phy_platform_data __initdata;
 
 /* SDHI */
-static struct sh_mobile_sdhi_info sdhi0_info = {
+static struct sh_mobile_sdhi_info sdhi0_info __initdata = {
         .tmio_caps      = MMC_CAP_SD_HIGHSPEED,
         .tmio_ocr_mask  = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,
         .tmio_flags     = TMIO_MMC_HAS_IDLE_WAIT,
 };
 
+static struct resource sdhi0_resources[] __initdata = {
+        DEFINE_RES_MEM(0xFFE4C000, 0x100),
+        DEFINE_RES_IRQ(gic_iid(0x77)),
+};
+
 static struct sh_eth_plat_data ether_platform_data __initdata = {
         .phy            = 0x01,
         .edmac_endian   = EDMAC_LITTLE_ENDIAN,
-        .register_type  = SH_ETH_REG_FAST_RCAR,
         .phy_interface  = PHY_INTERFACE_MODE_RMII,
         /*
          * Although the LINK signal is available on the board, it's connected to
@@ -135,7 +149,12 @@ static struct spi_board_info spi_board_info[] __initdata = {
 };
 
 /* MMC */
-static struct sh_mmcif_plat_data sh_mmcif_plat = {
+static struct resource mmc_resources[] __initdata = {
+        DEFINE_RES_MEM(0xffe4e000, 0x100),
+        DEFINE_RES_IRQ(gic_iid(0x5d)),
+};
+
+static struct sh_mmcif_plat_data sh_mmcif_plat __initdata = {
         .sup_pclk       = 0,
         .ocr            = MMC_VDD_165_195 | MMC_VDD_32_33 | MMC_VDD_33_34,
         .caps           = MMC_CAP_4_BIT_DATA |
@@ -143,6 +162,25 @@ static struct sh_mmcif_plat_data sh_mmcif_plat = {
                           MMC_CAP_NEEDS_POLL,
 };
 
+static struct rcar_vin_platform_data vin_platform_data __initdata = {
+        .flags  = RCAR_VIN_BT656,
+};
+
+/* In the default configuration both decoders reside on I2C bus 0 */
+#define BOCKW_CAMERA(idx)                                               \
+static struct i2c_board_info camera##idx##_info = {                     \
+        I2C_BOARD_INFO("ml86v7667", 0x41 + 2 * (idx)),                  \
+};                                                                      \
+                                                                        \
+static struct soc_camera_link iclink##idx##_ml86v7667 __initdata = {    \
+        .bus_id         = idx,                                          \
+        .i2c_adapter_id = 0,                                            \
+        .board_info     = &camera##idx##_info,                          \
+}
+
+BOCKW_CAMERA(0);
+BOCKW_CAMERA(1);
+
 static const struct pinctrl_map bockw_pinctrl_map[] = {
         /* Ether */
         PIN_MAP_MUX_GROUP_DEFAULT("r8a777x-ether", "pfc-r8a7778",
@@ -174,6 +212,16 @@ static const struct pinctrl_map bockw_pinctrl_map[] = {
                                   "sdhi0_cd", "sdhi0"),
         PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7778",
                                   "sdhi0_wp", "sdhi0"),
+        /* VIN0 */
+        PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.0", "pfc-r8a7778",
+                                  "vin0_clk", "vin0"),
+        PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.0", "pfc-r8a7778",
+                                  "vin0_data8", "vin0"),
+        /* VIN1 */
+        PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.1", "pfc-r8a7778",
+                                  "vin1_clk", "vin1"),
+        PIN_MAP_MUX_GROUP_DEFAULT("r8a7778-vin.1", "pfc-r8a7778",
+                                  "vin1_data8", "vin1"),
 };
 
 #define FPGA    0x18200000
@@ -187,11 +235,17 @@ static void __init bockw_init(void)
         r8a7778_clock_init();
         r8a7778_init_irq_extpin(1);
         r8a7778_add_standard_devices();
-        r8a7778_add_usb_phy_device(&usb_phy_platform_data);
         r8a7778_add_ether_device(&ether_platform_data);
-        r8a7778_add_i2c_device(0);
-        r8a7778_add_hspi_device(0);
-        r8a7778_add_mmc_device(&sh_mmcif_plat);
+        r8a7778_add_vin_device(0, &vin_platform_data);
+        /* VIN1 has a pin conflict with Ether */
+        if (!IS_ENABLED(CONFIG_SH_ETH))
+                r8a7778_add_vin_device(1, &vin_platform_data);
+        platform_device_register_data(&platform_bus, "soc-camera-pdrv", 0,
+                                      &iclink0_ml86v7667,
+                                      sizeof(iclink0_ml86v7667));
+        platform_device_register_data(&platform_bus, "soc-camera-pdrv", 1,
+                                      &iclink1_ml86v7667,
+                                      sizeof(iclink1_ml86v7667));
 
         i2c_register_board_info(0, i2c0_devices,
                                 ARRAY_SIZE(i2c0_devices));
@@ -201,6 +255,19 @@ static void __init bockw_init(void)
                                   ARRAY_SIZE(bockw_pinctrl_map));
         r8a7778_pinmux_init();
 
+        platform_device_register_resndata(
+                &platform_bus, "sh_mmcif", -1,
+                mmc_resources, ARRAY_SIZE(mmc_resources),
+                &sh_mmcif_plat, sizeof(struct sh_mmcif_plat_data));
+
+        platform_device_register_resndata(
+                &platform_bus, "rcar_usb_phy", -1,
+                usb_phy_resources,
+                ARRAY_SIZE(usb_phy_resources),
+                &usb_phy_platform_data,
+                sizeof(struct rcar_phy_platform_data));
+
+
         /* for SMSC */
         base = ioremap_nocache(FPGA, SZ_1M);
         if (base) {
@@ -236,7 +303,10 @@ static void __init bockw_init(void)
                 iowrite32(ioread32(base + PUPR4) | (3 << 26), base + PUPR4);
                 iounmap(base);
 
-                r8a7778_sdhi_init(0, &sdhi0_info);
+                platform_device_register_resndata(
+                        &platform_bus, "sh_mobile_sdhi", 0,
+                        sdhi0_resources, ARRAY_SIZE(sdhi0_resources),
+                        &sdhi0_info, sizeof(struct sh_mobile_sdhi_info));
         }
 }
 
@@ -249,7 +319,6 @@ DT_MACHINE_START(BOCKW_DT, "bockw")
         .init_early     = r8a7778_init_delay,
         .init_irq       = r8a7778_init_irq_dt,
         .init_machine   = bockw_init,
-        .init_time      = shmobile_timer_init,
         .dt_compat      = bockw_boards_compat_dt,
         .init_late      = r8a7778_init_late,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-kota2.c b/arch/arm/mach-shmobile/board-kota2.c
deleted file mode 100644
index ef5ca0ef0cb5..000000000000
--- a/arch/arm/mach-shmobile/board-kota2.c
+++ /dev/null
@@ -1,553 +0,0 @@
-/*
- * kota2 board support
- *
- * Copyright (C) 2011  Renesas Solutions Corp.
- * Copyright (C) 2011  Magnus Damm
- * Copyright (C) 2010  Takashi Yoshii <yoshii.takashi.zj@renesas.com>
- * Copyright (C) 2009  Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/pinctrl/machine.h>
-#include <linux/pinctrl/pinconf-generic.h>
-#include <linux/platform_device.h>
-#include <linux/delay.h>
-#include <linux/io.h>
-#include <linux/regulator/fixed.h>
-#include <linux/regulator/machine.h>
-#include <linux/smsc911x.h>
-#include <linux/gpio.h>
-#include <linux/input.h>
-#include <linux/input/sh_keysc.h>
-#include <linux/gpio_keys.h>
-#include <linux/leds.h>
-#include <linux/irqchip/arm-gic.h>
-#include <linux/platform_data/leds-renesas-tpu.h>
-#include <linux/mmc/host.h>
-#include <linux/mmc/sh_mmcif.h>
-#include <linux/mfd/tmio.h>
-#include <linux/mmc/sh_mobile_sdhi.h>
-#include <mach/hardware.h>
-#include <mach/irqs.h>
-#include <mach/sh73a0.h>
-#include <mach/common.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/time.h>
-#include <asm/hardware/cache-l2x0.h>
-#include <asm/traps.h>
-
-/* Dummy supplies, where voltage doesn't matter */
-static struct regulator_consumer_supply dummy_supplies[] = {
-        REGULATOR_SUPPLY("vddvario", "smsc911x"),
-        REGULATOR_SUPPLY("vdd33a", "smsc911x"),
-};
-
-/* SMSC 9220 */
-static struct resource smsc9220_resources[] = {
-        [0] = {
-                .start          = 0x14000000, /* CS5A */
-                .end            = 0x140000ff, /* A1->A7 */
-                .flags          = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start          = SH73A0_PINT0_IRQ(2), /* PINTA2 */
-                .flags          = IORESOURCE_IRQ,
-        },
-};
-
-static struct smsc911x_platform_config smsc9220_platdata = {
-        .flags          = SMSC911X_USE_32BIT, /* 32-bit SW on 16-bit HW bus */
-        .phy_interface  = PHY_INTERFACE_MODE_MII,
-        .irq_polarity   = SMSC911X_IRQ_POLARITY_ACTIVE_LOW,
-        .irq_type       = SMSC911X_IRQ_TYPE_PUSH_PULL,
-};
-
-static struct platform_device eth_device = {
-        .name           = "smsc911x",
-        .id             = 0,
-        .dev  = {
-                .platform_data = &smsc9220_platdata,
-        },
-        .resource       = smsc9220_resources,
-        .num_resources  = ARRAY_SIZE(smsc9220_resources),
-};
-
-/* KEYSC */
-static struct sh_keysc_info keysc_platdata = {
-        .mode           = SH_KEYSC_MODE_6,
-        .scan_timing    = 3,
-        .delay          = 100,
-        .keycodes       = {
-                KEY_NUMERIC_STAR, KEY_NUMERIC_0, KEY_NUMERIC_POUND,
-                0, 0, 0, 0, 0,
-                KEY_NUMERIC_7, KEY_NUMERIC_8, KEY_NUMERIC_9,
-                0, KEY_DOWN, 0, 0, 0,
-                KEY_NUMERIC_4, KEY_NUMERIC_5, KEY_NUMERIC_6,
-                KEY_LEFT, KEY_ENTER, KEY_RIGHT, 0, 0,
-                KEY_NUMERIC_1, KEY_NUMERIC_2, KEY_NUMERIC_3,
-                0, KEY_UP, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0,
-                0, 0, 0, 0, 0, 0, 0, 0,
-        },
-};
-
-static struct resource keysc_resources[] = {
-        [0] = {
-                .name   = "KEYSC",
-                .start  = 0xe61b0000,
-                .end    = 0xe61b0098 - 1,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = gic_spi(71),
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device keysc_device = {
-        .name           = "sh_keysc",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(keysc_resources),
-        .resource       = keysc_resources,
-        .dev            = {
-                .platform_data  = &keysc_platdata,
-        },
-};
-
-/* GPIO KEY */
-#define GPIO_KEY(c, g, d) { .code = c, .gpio = g, .desc = d, .active_low = 1 }
-
-static struct gpio_keys_button gpio_buttons[] = {
-        GPIO_KEY(KEY_VOLUMEUP, 56, "+"), /* S2: VOL+ [IRQ9] */
-        GPIO_KEY(KEY_VOLUMEDOWN, 54, "-"), /* S3: VOL- [IRQ10] */
-        GPIO_KEY(KEY_MENU, 27, "Menu"), /* S4: MENU [IRQ30] */
-        GPIO_KEY(KEY_HOMEPAGE, 26, "Home"), /* S5: HOME [IRQ31] */
-        GPIO_KEY(KEY_BACK, 11, "Back"), /* S6: BACK [IRQ0] */
-        GPIO_KEY(KEY_PHONE, 238, "Tel"), /* S7: TEL [IRQ11] */
-        GPIO_KEY(KEY_POWER, 239, "C1"), /* S8: CAM [IRQ13] */
-        GPIO_KEY(KEY_MAIL, 224, "Mail"), /* S9: MAIL [IRQ3] */
-        /* Omitted button "C3?": 223 - S10: CUST [IRQ8] */
-        GPIO_KEY(KEY_CAMERA, 164, "C2"), /* S11: CAM_HALF [IRQ25] */
-        /* Omitted button "?": 152 - S12: CAM_FULL [No IRQ] */
-};
-
-static struct gpio_keys_platform_data gpio_key_info = {
-        .buttons        = gpio_buttons,
-        .nbuttons       = ARRAY_SIZE(gpio_buttons),
-};
-
-static struct platform_device gpio_keys_device = {
-        .name   = "gpio-keys",
-        .id     = -1,
-        .dev    = {
-                .platform_data  = &gpio_key_info,
-        },
-};
-
-/* GPIO LED */
-#define GPIO_LED(n, g) { .name = n, .gpio = g }
-
-static struct gpio_led gpio_leds[] = {
-        GPIO_LED("G", 20), /* PORT20 [GPO0] -> LED7 -> "G" */
-        GPIO_LED("H", 21), /* PORT21 [GPO1] -> LED8 -> "H" */
-        GPIO_LED("J", 22), /* PORT22 [GPO2] -> LED9 -> "J" */
-};
-
-static struct gpio_led_platform_data gpio_leds_info = {
-        .leds           = gpio_leds,
-        .num_leds       = ARRAY_SIZE(gpio_leds),
-};
-
-static struct platform_device gpio_leds_device = {
-        .name   = "leds-gpio",
-        .id     = -1,
-        .dev    = {
-                .platform_data  = &gpio_leds_info,
-        },
-};
-
-/* TPU LED */
-static struct led_renesas_tpu_config led_renesas_tpu12_pdata = {
-        .name           = "V2513",
-        .pin_gpio_fn    = GPIO_FN_TPU1TO2,
-        .pin_gpio       = 153,
-        .channel_offset = 0x90,
-        .timer_bit = 2,
-        .max_brightness = 1000,
-};
-
-static struct resource tpu12_resources[] = {
-        [0] = {
-                .name   = "TPU12",
-                .start  = 0xe6610090,
-                .end    = 0xe66100b5,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device leds_tpu12_device = {
-        .name = "leds-renesas-tpu",
-        .id = 12,
-        .dev = {
-                .platform_data  = &led_renesas_tpu12_pdata,
-        },
-        .num_resources  = ARRAY_SIZE(tpu12_resources),
-        .resource       = tpu12_resources,
-};
-
-static struct led_renesas_tpu_config led_renesas_tpu41_pdata = {
-        .name           = "V2514",
-        .pin_gpio_fn    = GPIO_FN_TPU4TO1,
-        .pin_gpio       = 199,
-        .channel_offset = 0x50,
-        .timer_bit = 1,
-        .max_brightness = 1000,
-};
-
-static struct resource tpu41_resources[] = {
-        [0] = {
-                .name   = "TPU41",
-                .start  = 0xe6640050,
-                .end    = 0xe6640075,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device leds_tpu41_device = {
-        .name = "leds-renesas-tpu",
-        .id = 41,
-        .dev = {
-                .platform_data  = &led_renesas_tpu41_pdata,
-        },
-        .num_resources  = ARRAY_SIZE(tpu41_resources),
-        .resource       = tpu41_resources,
-};
-
-static struct led_renesas_tpu_config led_renesas_tpu21_pdata = {
-        .name           = "V2515",
-        .pin_gpio_fn    = GPIO_FN_TPU2TO1,
-        .pin_gpio       = 197,
-        .channel_offset = 0x50,
-        .timer_bit = 1,
-        .max_brightness = 1000,
-};
-
-static struct resource tpu21_resources[] = {
-        [0] = {
-                .name   = "TPU21",
-                .start  = 0xe6620050,
-                .end    = 0xe6620075,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device leds_tpu21_device = {
-        .name = "leds-renesas-tpu",
-        .id = 21,
-        .dev = {
-                .platform_data  = &led_renesas_tpu21_pdata,
-        },
-        .num_resources  = ARRAY_SIZE(tpu21_resources),
-        .resource       = tpu21_resources,
-};
-
-static struct led_renesas_tpu_config led_renesas_tpu30_pdata = {
-        .name           = "KEYLED",
-        .pin_gpio_fn    = GPIO_FN_TPU3TO0,
-        .pin_gpio       = 163,
-        .channel_offset = 0x10,
-        .timer_bit = 0,
-        .max_brightness = 1000,
-};
-
-static struct resource tpu30_resources[] = {
-        [0] = {
-                .name   = "TPU30",
-                .start  = 0xe6630010,
-                .end    = 0xe6630035,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device leds_tpu30_device = {
-        .name = "leds-renesas-tpu",
-        .id = 30,
-        .dev = {
-                .platform_data  = &led_renesas_tpu30_pdata,
-        },
-        .num_resources  = ARRAY_SIZE(tpu30_resources),
-        .resource       = tpu30_resources,
-};
-
-/* Fixed 1.8V regulator to be used by MMCIF */
-static struct regulator_consumer_supply fixed1v8_power_consumers[] =
-{
-        REGULATOR_SUPPLY("vmmc", "sh_mmcif.0"),
-        REGULATOR_SUPPLY("vqmmc", "sh_mmcif.0"),
-};
-
-/* MMCIF */
-static struct resource mmcif_resources[] = {
-        [0] = {
-                .name   = "MMCIF",
-                .start  = 0xe6bd0000,
-                .end    = 0xe6bd00ff,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = gic_spi(140),
-                .flags  = IORESOURCE_IRQ,
-        },
-        [2] = {
-                .start  = gic_spi(141),
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct sh_mmcif_plat_data mmcif_info = {
-        .ocr            = MMC_VDD_165_195,
-        .caps           = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE,
-};
-
-static struct platform_device mmcif_device = {
-        .name           = "sh_mmcif",
-        .id             = 0,
-        .dev            = {
-                .platform_data          = &mmcif_info,
-        },
-        .num_resources  = ARRAY_SIZE(mmcif_resources),
-        .resource       = mmcif_resources,
-};
-
-/* Fixed 3.3V regulator to be used by SDHI0 and SDHI1 */
-static struct regulator_consumer_supply fixed3v3_power_consumers[] =
-{
-        REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.0"),
-        REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.0"),
-        REGULATOR_SUPPLY("vmmc", "sh_mobile_sdhi.1"),
-        REGULATOR_SUPPLY("vqmmc", "sh_mobile_sdhi.1"),
-};
-
-/* SDHI0 */
-static struct sh_mobile_sdhi_info sdhi0_info = {
-        .tmio_caps      = MMC_CAP_SD_HIGHSPEED,
-        .tmio_flags     = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_HAS_IDLE_WAIT,
-};
-
-static struct resource sdhi0_resources[] = {
-        [0] = {
-                .name   = "SDHI0",
-                .start  = 0xee100000,
-                .end    = 0xee1000ff,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = gic_spi(83),
-                .flags  = IORESOURCE_IRQ,
-        },
-        [2] = {
-                .start  = gic_spi(84),
-                .flags  = IORESOURCE_IRQ,
-        },
-        [3] = {
-                .start  = gic_spi(85),
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device sdhi0_device = {
-        .name           = "sh_mobile_sdhi",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(sdhi0_resources),
-        .resource       = sdhi0_resources,
-        .dev    = {
-                .platform_data  = &sdhi0_info,
-        },
-};
-
-/* SDHI1 */
-static struct sh_mobile_sdhi_info sdhi1_info = {
-        .tmio_caps      = MMC_CAP_NONREMOVABLE | MMC_CAP_SDIO_IRQ,
-        .tmio_flags     = TMIO_MMC_WRPROTECT_DISABLE | TMIO_MMC_HAS_IDLE_WAIT,
-};
-
-static struct resource sdhi1_resources[] = {
-        [0] = {
-                .name   = "SDHI1",
-                .start  = 0xee120000,
-                .end    = 0xee1200ff,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = gic_spi(87),
-                .flags  = IORESOURCE_IRQ,
-        },
-        [2] = {
-                .start  = gic_spi(88),
-                .flags  = IORESOURCE_IRQ,
-        },
-        [3] = {
-                .start  = gic_spi(89),
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device sdhi1_device = {
-        .name           = "sh_mobile_sdhi",
-        .id             = 1,
-        .num_resources  = ARRAY_SIZE(sdhi1_resources),
-        .resource       = sdhi1_resources,
-        .dev    = {
-                .platform_data  = &sdhi1_info,
-        },
-};
-
-static struct platform_device *kota2_devices[] __initdata = {
-        &eth_device,
-        &keysc_device,
-        &gpio_keys_device,
-        &gpio_leds_device,
-        &leds_tpu12_device,
-        &leds_tpu41_device,
-        &leds_tpu21_device,
-        &leds_tpu30_device,
-        &mmcif_device,
-        &sdhi0_device,
-        &sdhi1_device,
-};
-
-static unsigned long pin_pullup_conf[] = {
-        PIN_CONF_PACKED(PIN_CONFIG_BIAS_PULL_UP, 0),
-};
-
-static const struct pinctrl_map kota2_pinctrl_map[] = {
-        /* KEYSC */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",
-                                  "keysc_in8", "keysc"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",
-                                  "keysc_out04", "keysc"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",
-                                  "keysc_out5", "keysc"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",
-                                  "keysc_out6_0", "keysc"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",
-                                  "keysc_out7_0", "keysc"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",
-                                  "keysc_out8_0", "keysc"),
-        PIN_MAP_CONFIGS_GROUP_DEFAULT("sh_keysc.0", "pfc-sh73a0",
-                                      "keysc_in8", pin_pullup_conf),
-        /* MMCIF */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
-                                  "mmc0_data8_0", "mmc0"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
-                                  "mmc0_ctrl_0", "mmc0"),
-        PIN_MAP_CONFIGS_PIN_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
-                                    "PORT279", pin_pullup_conf),
-        PIN_MAP_CONFIGS_GROUP_DEFAULT("sh_mmcif.0", "pfc-sh73a0",
-                                      "mmc0_data8_0", pin_pullup_conf),
-        /* SCIFA2 (UART2) */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.2", "pfc-sh73a0",
-                                  "scifa2_data_0", "scifa2"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.2", "pfc-sh73a0",
-                                  "scifa2_ctrl_0", "scifa2"),
-        /* SCIFA4 (UART1) */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0",
-                                  "scifa4_data", "scifa4"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0",
-                                  "scifa4_ctrl", "scifa4"),
-        /* SCIFB (BT) */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.8", "pfc-sh73a0",
-                                  "scifb_data_0", "scifb"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.8", "pfc-sh73a0",
-                                  "scifb_clk_0", "scifb"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.8", "pfc-sh73a0",
-                                  "scifb_ctrl_0", "scifb"),
-        /* SDHI0 (microSD) */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
-                                  "sdhi0_data4", "sdhi0"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
-                                  "sdhi0_ctrl", "sdhi0"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
-                                  "sdhi0_cd", "sdhi0"),
-        PIN_MAP_CONFIGS_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
-                                      "sdhi0_data4", pin_pullup_conf),
-        PIN_MAP_CONFIGS_PIN_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
-                                    "PORT256", pin_pullup_conf),
-        PIN_MAP_CONFIGS_PIN_DEFAULT("sh_mobile_sdhi.0", "pfc-sh73a0",
-                                    "PORT251", pin_pullup_conf),
-        /* SDHI1 (BCM4330) */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.1", "pfc-sh73a0",
-                                  "sdhi1_data4", "sdhi1"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.1", "pfc-sh73a0",
-                                  "sdhi1_ctrl", "sdhi1"),
-        PIN_MAP_CONFIGS_GROUP_DEFAULT("sh_mobile_sdhi.1", "pfc-sh73a0",
-                                      "sdhi1_data4", pin_pullup_conf),
-        PIN_MAP_CONFIGS_PIN_DEFAULT("sh_mobile_sdhi.1", "pfc-sh73a0",
-                                    "PORT263", pin_pullup_conf),
-        /* SMSC911X */
-        PIN_MAP_MUX_GROUP_DEFAULT("smsc911x.0", "pfc-sh73a0",
-                                  "bsc_data_0_7", "bsc"),
-        PIN_MAP_MUX_GROUP_DEFAULT("smsc911x.0", "pfc-sh73a0",
-                                  "bsc_data_8_15", "bsc"),
-        PIN_MAP_MUX_GROUP_DEFAULT("smsc911x.0", "pfc-sh73a0",
-                                  "bsc_cs5_a", "bsc"),
-        PIN_MAP_MUX_GROUP_DEFAULT("smsc911x.0", "pfc-sh73a0",
-                                  "bsc_we0", "bsc"),
-};
-
-static void __init kota2_init(void)
-{
-        regulator_register_always_on(0, "fixed-1.8V", fixed1v8_power_consumers,
-                                     ARRAY_SIZE(fixed1v8_power_consumers), 1800000);
-        regulator_register_always_on(1, "fixed-3.3V", fixed3v3_power_consumers,
-                                     ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
-        regulator_register_fixed(2, dummy_supplies, ARRAY_SIZE(dummy_supplies));
-
-        pinctrl_register_mappings(kota2_pinctrl_map,
-                                  ARRAY_SIZE(kota2_pinctrl_map));
-        sh73a0_pinmux_init();
-
-        /* SMSC911X */
-        gpio_request_one(144, GPIOF_IN, NULL); /* PINTA2 */
-        gpio_request_one(145, GPIOF_OUT_INIT_HIGH, NULL); /* RESET */
-
-        /* MMCIF */
-        gpio_request_one(208, GPIOF_OUT_INIT_HIGH, NULL); /* Reset */
-
-#ifdef CONFIG_CACHE_L2X0
-        /* Early BRESP enable, Shared attribute override enable, 64K*8way */
-        l2x0_init(IOMEM(0xf0100000), 0x40460000, 0x82000fff);
-#endif
-        sh73a0_add_standard_devices();
-        platform_add_devices(kota2_devices, ARRAY_SIZE(kota2_devices));
-}
-
-MACHINE_START(KOTA2, "kota2")
-        .smp            = smp_ops(sh73a0_smp_ops),
-        .map_io         = sh73a0_map_io,
-        .init_early     = sh73a0_add_early_devices,
-        .nr_irqs        = NR_IRQS_LEGACY,
-        .init_irq       = sh73a0_init_irq,
-        .init_machine   = kota2_init,
-        .init_late      = shmobile_init_late,
-        .init_time      = sh73a0_earlytimer_init,
-MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-kzm9d-reference.c b/arch/arm/mach-shmobile/board-kzm9d-reference.c
new file mode 100644
index 000000000000..8f8bb2fab076
--- /dev/null
+++ b/arch/arm/mach-shmobile/board-kzm9d-reference.c
@@ -0,0 +1,47 @@
+/*
+ * kzm9d board support - Reference DT implementation
+ *
+ * Copyright (C) 2013  Renesas Solutions Corp.
+ * Copyright (C) 2013  Magnus Damm
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <linux/init.h>
+#include <linux/of_platform.h>
+#include <mach/emev2.h>
+#include <mach/common.h>
+#include <asm/mach/arch.h>
+
+static void __init kzm9d_add_standard_devices(void)
+{
+        if (!IS_ENABLED(CONFIG_COMMON_CLK))
+                emev2_clock_init();
+
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
+
+static const char *kzm9d_boards_compat_dt[] __initdata = {
+        "renesas,kzm9d-reference",
+        NULL,
+};
+
+DT_MACHINE_START(KZM9D_DT, "kzm9d")
+        .smp            = smp_ops(emev2_smp_ops),
+        .map_io         = emev2_map_io,
+        .init_early     = emev2_init_delay,
+        .init_machine   = kzm9d_add_standard_devices,
+        .init_late      = shmobile_init_late,
+        .dt_compat      = kzm9d_boards_compat_dt,
+MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-kzm9d.c b/arch/arm/mach-shmobile/board-kzm9d.c
index 4368000e1127..30c2cc695b12 100644
--- a/arch/arm/mach-shmobile/board-kzm9d.c
+++ b/arch/arm/mach-shmobile/board-kzm9d.c
@@ -85,9 +85,7 @@ static const char *kzm9d_boards_compat_dt[] __initdata = {
 DT_MACHINE_START(KZM9D_DT, "kzm9d")
         .smp            = smp_ops(emev2_smp_ops),
         .map_io         = emev2_map_io,
-        .init_early     = emev2_add_early_devices,
-        .nr_irqs        = NR_IRQS_LEGACY,
-        .init_irq       = emev2_init_irq,
+        .init_early     = emev2_init_delay,
         .init_machine   = kzm9d_add_standard_devices,
         .init_late      = shmobile_init_late,
         .dt_compat      = kzm9d_boards_compat_dt,
diff --git a/arch/arm/mach-shmobile/board-kzm9g-reference.c b/arch/arm/mach-shmobile/board-kzm9g-reference.c
index 44055fe8a45c..598e32488410 100644
--- a/arch/arm/mach-shmobile/board-kzm9g-reference.c
+++ b/arch/arm/mach-shmobile/board-kzm9g-reference.c
@@ -21,67 +21,19 @@
  */
 
 #include <linux/delay.h>
-#include <linux/gpio.h>
 #include <linux/io.h>
 #include <linux/irq.h>
-#include <linux/irqchip.h>
 #include <linux/input.h>
 #include <linux/of_platform.h>
-#include <linux/pinctrl/machine.h>
-#include <linux/pinctrl/pinconf-generic.h>
 #include <mach/sh73a0.h>
 #include <mach/common.h>
 #include <asm/hardware/cache-l2x0.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 
-static unsigned long pin_pullup_conf[] = {
-        PIN_CONF_PACKED(PIN_CONFIG_BIAS_PULL_UP, 0),
-};
-
-static const struct pinctrl_map kzm_pinctrl_map[] = {
-        PIN_MAP_MUX_GROUP_DEFAULT("e6826000.i2c", "pfc-sh73a0",
-                                  "i2c3_1", "i2c3"),
-        /* MMCIF */
-        PIN_MAP_MUX_GROUP_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0",
-                                  "mmc0_data8_0", "mmc0"),
-        PIN_MAP_MUX_GROUP_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0",
-                                  "mmc0_ctrl_0", "mmc0"),
-        PIN_MAP_CONFIGS_PIN_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0",
-                                    "PORT279", pin_pullup_conf),
-        PIN_MAP_CONFIGS_GROUP_DEFAULT("e6bd0000.mmcif", "pfc-sh73a0",
-                                      "mmc0_data8_0", pin_pullup_conf),
-        /* SCIFA4 */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0",
-                                  "scifa4_data", "scifa4"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-sh73a0",
-                                  "scifa4_ctrl", "scifa4"),
-        /* SDHI0 */
-        PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0",
-                                  "sdhi0_data4", "sdhi0"),
-        PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0",
-                                  "sdhi0_ctrl", "sdhi0"),
-        PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0",
-                                  "sdhi0_cd", "sdhi0"),
-        PIN_MAP_MUX_GROUP_DEFAULT("ee100000.sdhi", "pfc-sh73a0",
-                                  "sdhi0_wp", "sdhi0"),
-        /* SDHI2 */
-        PIN_MAP_MUX_GROUP_DEFAULT("ee140000.sdhi", "pfc-sh73a0",
-                                  "sdhi2_data4", "sdhi2"),
-        PIN_MAP_MUX_GROUP_DEFAULT("ee140000.sdhi", "pfc-sh73a0",
-                                  "sdhi2_ctrl", "sdhi2"),
-};
-
 static void __init kzm_init(void)
 {
         sh73a0_add_standard_devices_dt();
-        pinctrl_register_mappings(kzm_pinctrl_map, ARRAY_SIZE(kzm_pinctrl_map));
-        sh73a0_pinmux_init();
-
-        /* enable SD */
-        gpio_request_one(15, GPIOF_OUT_INIT_HIGH, NULL); /* power */
-
-        gpio_request_one(14, GPIOF_OUT_INIT_HIGH, NULL); /* power */
 
 #ifdef CONFIG_CACHE_L2X0
         /* Early BRESP enable, Shared attribute override enable, 64K*8way */
@@ -99,8 +51,6 @@ DT_MACHINE_START(KZM9G_DT, "kzm9g-reference")
         .map_io         = sh73a0_map_io,
         .init_early     = sh73a0_init_delay,
         .nr_irqs        = NR_IRQS_LEGACY,
-        .init_irq       = irqchip_init,
         .init_machine   = kzm_init,
-        .init_time      = shmobile_timer_init,
         .dt_compat      = kzm9g_boards_compat_dt,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index 1068120d339f..f1994968d303 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -54,14 +54,14 @@
 /*
  * external GPIO
  */
-#define GPIO_PCF8575_BASE       (GPIO_NR)
-#define GPIO_PCF8575_PORT10     (GPIO_NR + 8)
-#define GPIO_PCF8575_PORT11     (GPIO_NR + 9)
-#define GPIO_PCF8575_PORT12     (GPIO_NR + 10)
-#define GPIO_PCF8575_PORT13     (GPIO_NR + 11)
-#define GPIO_PCF8575_PORT14     (GPIO_NR + 12)
-#define GPIO_PCF8575_PORT15     (GPIO_NR + 13)
-#define GPIO_PCF8575_PORT16     (GPIO_NR + 14)
+#define GPIO_PCF8575_BASE       (310)
+#define GPIO_PCF8575_PORT10     (GPIO_PCF8575_BASE + 8)
+#define GPIO_PCF8575_PORT11     (GPIO_PCF8575_BASE + 9)
+#define GPIO_PCF8575_PORT12     (GPIO_PCF8575_BASE + 10)
+#define GPIO_PCF8575_PORT13     (GPIO_PCF8575_BASE + 11)
+#define GPIO_PCF8575_PORT14     (GPIO_PCF8575_BASE + 12)
+#define GPIO_PCF8575_PORT15     (GPIO_PCF8575_BASE + 13)
+#define GPIO_PCF8575_PORT16     (GPIO_PCF8575_BASE + 14)
 
 /* Dummy supplies, where voltage doesn't matter */
 static struct regulator_consumer_supply dummy_supplies[] = {
diff --git a/arch/arm/mach-shmobile/board-lager-reference.c b/arch/arm/mach-shmobile/board-lager-reference.c
new file mode 100644
index 000000000000..9c316a1b2e32
--- /dev/null
+++ b/arch/arm/mach-shmobile/board-lager-reference.c
@@ -0,0 +1,45 @@
+/*
+ * Lager board support - Reference DT implementation
+ *
+ * Copyright (C) 2013  Renesas Solutions Corp.
+ * Copyright (C) 2013  Simon Horman
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <linux/init.h>
+#include <linux/of_platform.h>
+#include <mach/r8a7790.h>
+#include <asm/mach/arch.h>
+
+static void __init lager_add_standard_devices(void)
+{
+        /* clocks are setup late during boot in the case of DT */
+        r8a7790_clock_init();
+
+        r8a7790_add_dt_devices();
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+}
+
+static const char *lager_boards_compat_dt[] __initdata = {
+        "renesas,lager-reference",
+        NULL,
+};
+
+DT_MACHINE_START(LAGER_DT, "lager")
+        .init_early     = r8a7790_init_delay,
+        .init_machine   = lager_add_standard_devices,
+        .init_time      = r8a7790_timer_init,
+        .dt_compat      = lager_boards_compat_dt,
+MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-lager.c b/arch/arm/mach-shmobile/board-lager.c
index 8d6bd5c5efb9..ffb6f0ac7606 100644
--- a/arch/arm/mach-shmobile/board-lager.c
+++ b/arch/arm/mach-shmobile/board-lager.c
@@ -22,13 +22,18 @@
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
 #include <linux/interrupt.h>
-#include <linux/irqchip.h>
 #include <linux/kernel.h>
 #include <linux/leds.h>
+#include <linux/mmc/host.h>
+#include <linux/mmc/sh_mmcif.h>
 #include <linux/pinctrl/machine.h>
 #include <linux/platform_data/gpio-rcar.h>
 #include <linux/platform_device.h>
+#include <linux/regulator/fixed.h>
+#include <linux/regulator/machine.h>
+#include <linux/sh_eth.h>
 #include <mach/common.h>
+#include <mach/irqs.h>
 #include <mach/r8a7790.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
@@ -71,6 +76,35 @@ static __initdata struct gpio_keys_platform_data lager_keys_pdata = {
         .nbuttons       = ARRAY_SIZE(gpio_buttons),
 };
 
+/* Fixed 3.3V regulator to be used by MMCIF */
+static struct regulator_consumer_supply fixed3v3_power_consumers[] =
+{
+        REGULATOR_SUPPLY("vmmc", "sh_mmcif.1"),
+};
+
+/* MMCIF */
+static struct sh_mmcif_plat_data mmcif1_pdata __initdata = {
+        .caps           = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE,
+};
+
+static struct resource mmcif1_resources[] __initdata = {
+        DEFINE_RES_MEM_NAMED(0xee220000, 0x80, "MMCIF1"),
+        DEFINE_RES_IRQ(gic_spi(170)),
+};
+
+/* Ether */
+static struct sh_eth_plat_data ether_pdata __initdata = {
+        .phy                    = 0x1,
+        .edmac_endian           = EDMAC_LITTLE_ENDIAN,
+        .phy_interface          = PHY_INTERFACE_MODE_RMII,
+        .ether_link_active_low  = 1,
+};
+
+static struct resource ether_resources[] __initdata = {
+        DEFINE_RES_MEM(0xee700000, 0x400),
+        DEFINE_RES_IRQ(gic_spi(162)),
+};
+
 static const struct pinctrl_map lager_pinctrl_map[] = {
         /* SCIF0 (CN19: DEBUG SERIAL0) */
         PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.6", "pfc-r8a7790",
@@ -78,6 +112,20 @@ static const struct pinctrl_map lager_pinctrl_map[] = {
         /* SCIF1 (CN20: DEBUG SERIAL1) */
         PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.7", "pfc-r8a7790",
                                   "scif1_data", "scif1"),
+        /* MMCIF1 */
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.1", "pfc-r8a7790",
+                                  "mmc1_data8", "mmc1"),
+        PIN_MAP_MUX_GROUP_DEFAULT("sh_mmcif.1", "pfc-r8a7790",
+                                  "mmc1_ctrl", "mmc1"),
+        /* Ether */
+        PIN_MAP_MUX_GROUP_DEFAULT("r8a7790-ether", "pfc-r8a7790",
+                                  "eth_link", "eth"),
+        PIN_MAP_MUX_GROUP_DEFAULT("r8a7790-ether", "pfc-r8a7790",
+                                  "eth_mdio", "eth"),
+        PIN_MAP_MUX_GROUP_DEFAULT("r8a7790-ether", "pfc-r8a7790",
+                                  "eth_rmii", "eth"),
+        PIN_MAP_MUX_GROUP_DEFAULT("r8a7790-ether", "pfc-r8a7790",
+                                  "intc_irq0", "intc"),
 };
 
 static void __init lager_add_standard_devices(void)
@@ -95,6 +143,16 @@ static void __init lager_add_standard_devices(void)
         platform_device_register_data(&platform_bus, "gpio-keys", -1,
                                       &lager_keys_pdata,
                                       sizeof(lager_keys_pdata));
+        regulator_register_always_on(0, "fixed-3.3V", fixed3v3_power_consumers,
+                                     ARRAY_SIZE(fixed3v3_power_consumers), 3300000);
+        platform_device_register_resndata(&platform_bus, "sh_mmcif", 1,
+                                          mmcif1_resources, ARRAY_SIZE(mmcif1_resources),
+                                          &mmcif1_pdata, sizeof(mmcif1_pdata));
+
+        platform_device_register_resndata(&platform_bus, "r8a7790-ether", -1,
+                                          ether_resources,
+                                          ARRAY_SIZE(ether_resources),
+                                          &ether_pdata, sizeof(ether_pdata));
 }
 
 static const char *lager_boards_compat_dt[] __initdata = {
@@ -103,7 +161,7 @@ static const char *lager_boards_compat_dt[] __initdata = {
 };
 
 DT_MACHINE_START(LAGER_DT, "lager")
-        .init_irq       = irqchip_init,
+        .init_early     = r8a7790_init_delay,
         .init_time      = r8a7790_timer_init,
         .init_machine   = lager_add_standard_devices,
         .dt_compat      = lager_boards_compat_dt,
diff --git a/arch/arm/mach-shmobile/board-mackerel.c b/arch/arm/mach-shmobile/board-mackerel.c
index 85f51a849a50..af06753eb809 100644
--- a/arch/arm/mach-shmobile/board-mackerel.c
+++ b/arch/arm/mach-shmobile/board-mackerel.c
@@ -41,6 +41,7 @@
 #include <linux/mtd/physmap.h>
 #include <linux/mtd/sh_flctl.h>
 #include <linux/pinctrl/machine.h>
+#include <linux/platform_data/gpio_backlight.h>
 #include <linux/pm_clock.h>
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/machine.h>
@@ -49,7 +50,6 @@
 #include <linux/tca6416_keypad.h>
 #include <linux/usb/renesas_usbhs.h>
 #include <linux/dma-mapping.h>
-
 #include <video/sh_mobile_hdmi.h>
 #include <video/sh_mobile_lcdc.h>
 #include <media/sh_mobile_ceu.h>
@@ -346,7 +346,7 @@ static struct platform_device meram_device = {
         },
 };
 
-/* LCDC */
+/* LCDC and backlight */
 static struct fb_videomode mackerel_lcdc_modes[] = {
         {
                 .name           = "WVGA Panel",
@@ -362,13 +362,6 @@ static struct fb_videomode mackerel_lcdc_modes[] = {
         },
 };
 
-static int mackerel_set_brightness(int brightness)
-{
-        gpio_set_value(31, brightness);
-
-        return 0;
-}
-
 static const struct sh_mobile_meram_cfg lcd_meram_cfg = {
         .icb[0] = {
                 .meram_size     = 0x40,
@@ -393,11 +386,6 @@ static struct sh_mobile_lcdc_info lcdc_info = {
                         .width          = 152,
                         .height         = 91,
                 },
-                .bl_info = {
-                        .name = "sh_mobile_lcdc_bl",
-                        .max_brightness = 1,
-                        .set_brightness = mackerel_set_brightness,
-                },
                 .meram_cfg = &lcd_meram_cfg,
         }
 };
@@ -425,6 +413,20 @@ static struct platform_device lcdc_device = {
         },
 };
 
+static struct gpio_backlight_platform_data gpio_backlight_data = {
+        .fbdev = &lcdc_device.dev,
+        .gpio = 31,
+        .def_value = 1,
+        .name = "backlight",
+};
+
+static struct platform_device gpio_backlight_device = {
+        .name = "gpio-backlight",
+        .dev = {
+                .platform_data = &gpio_backlight_data,
+        },
+};
+
 /* HDMI */
 static struct sh_mobile_hdmi_info hdmi_info = {
         .flags          = HDMI_SND_SRC_SPDIF,
@@ -1231,6 +1233,7 @@ static struct platform_device *mackerel_devices[] __initdata = {
         &nor_flash_device,
         &smc911x_device,
         &lcdc_device,
+        &gpio_backlight_device,
         &usbhs0_device,
         &usbhs1_device,
         &leds_device,
@@ -1441,9 +1444,6 @@ static void __init mackerel_init(void)
                                   ARRAY_SIZE(mackerel_pinctrl_map));
         sh7372_pinmux_init();
 
-        /* backlight, off by default */
-        gpio_request_one(31, GPIOF_OUT_INIT_LOW, NULL);
-
         gpio_request_one(151, GPIOF_OUT_INIT_HIGH, NULL); /* LCDDON */
 
         /* USBHS0 */
diff --git a/arch/arm/mach-shmobile/board-marzen-reference.c b/arch/arm/mach-shmobile/board-marzen-reference.c
index 480d882e42c7..3f4250a2d4eb 100644
--- a/arch/arm/mach-shmobile/board-marzen-reference.c
+++ b/arch/arm/mach-shmobile/board-marzen-reference.c
@@ -19,42 +19,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include <linux/pinctrl/machine.h>
 #include <mach/r8a7779.h>
 #include <mach/common.h>
 #include <mach/irqs.h>
 #include <asm/irq.h>
 #include <asm/mach/arch.h>
 
-static const struct pinctrl_map marzen_pinctrl_map[] = {
-        /* SCIF2 (CN18: DEBUG0) */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.2", "pfc-r8a7779",
-                                  "scif2_data_c", "scif2"),
-        /* SCIF4 (CN19: DEBUG1) */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh-sci.4", "pfc-r8a7779",
-                                  "scif4_data", "scif4"),
-        /* SDHI0 */
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",
-                                  "sdhi0_data4", "sdhi0"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",
-                                  "sdhi0_ctrl", "sdhi0"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",
-                                  "sdhi0_cd", "sdhi0"),
-        PIN_MAP_MUX_GROUP_DEFAULT("sh_mobile_sdhi.0", "pfc-r8a7779",
-                                  "sdhi0_wp", "sdhi0"),
-        /* SMSC */
-        PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-r8a7779",
-                                  "intc_irq1_b", "intc"),
-        PIN_MAP_MUX_GROUP_DEFAULT("smsc911x", "pfc-r8a7779",
-                                  "lbsc_ex_cs0", "lbsc"),
-};
-
 static void __init marzen_init(void)
 {
-        pinctrl_register_mappings(marzen_pinctrl_map,
-                                  ARRAY_SIZE(marzen_pinctrl_map));
-        r8a7779_pinmux_init();
-
         r8a7779_add_standard_devices_dt();
 }
 
@@ -70,6 +42,5 @@ DT_MACHINE_START(MARZEN, "marzen")
         .nr_irqs        = NR_IRQS_LEGACY,
         .init_irq       = r8a7779_init_irq_dt,
         .init_machine   = marzen_init,
-        .init_time      = shmobile_timer_init,
         .dt_compat      = marzen_boards_compat_dt,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/board-marzen.c b/arch/arm/mach-shmobile/board-marzen.c
index a7d1010505bf..3f5044fda4e3 100644
--- a/arch/arm/mach-shmobile/board-marzen.c
+++ b/arch/arm/mach-shmobile/board-marzen.c
@@ -1,8 +1,9 @@
 /*
  * marzen board support
  *
- * Copyright (C) 2011  Renesas Solutions Corp.
+ * Copyright (C) 2011, 2013  Renesas Solutions Corp.
  * Copyright (C) 2011  Magnus Damm
+ * Copyright (C) 2013  Cogent Embedded, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -29,6 +30,7 @@
 #include <linux/dma-mapping.h>
 #include <linux/pinctrl/machine.h>
 #include <linux/platform_data/gpio-rcar.h>
+#include <linux/platform_data/usb-rcar-phy.h>
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/machine.h>
 #include <linux/smsc911x.h>
@@ -37,7 +39,7 @@
 #include <linux/mmc/host.h>
 #include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/mfd/tmio.h>
-#include <mach/hardware.h>
+#include <media/soc_camera.h>
 #include <mach/r8a7779.h>
 #include <mach/common.h>
 #include <mach/irqs.h>
@@ -57,7 +59,26 @@ static struct regulator_consumer_supply dummy_supplies[] = {
         REGULATOR_SUPPLY("vdd33a", "smsc911x"),
 };
 
-static struct rcar_phy_platform_data usb_phy_platform_data __initdata;
+/* USB PHY */
+static struct resource usb_phy_resources[] = {
+        [0] = {
+                .start          = 0xffe70800,
+                .end            = 0xffe70900 - 1,
+                .flags          = IORESOURCE_MEM,
+        },
+};
+
+static struct rcar_phy_platform_data usb_phy_platform_data;
+
+static struct platform_device usb_phy = {
+        .name           = "rcar_usb_phy",
+        .id             = -1,
+        .dev  = {
+                .platform_data = &usb_phy_platform_data,
+        },
+        .resource       = usb_phy_resources,
+        .num_resources  = ARRAY_SIZE(usb_phy_resources),
+};
 
 /* SMSC LAN89218 */
 static struct resource smsc911x_resources[] = {
@@ -178,12 +199,41 @@ static struct platform_device leds_device = {
         },
 };
 
+static struct rcar_vin_platform_data vin_platform_data __initdata = {
+        .flags  = RCAR_VIN_BT656,
+};
+
+#define MARZEN_CAMERA(idx)                                      \
+static struct i2c_board_info camera##idx##_info = {             \
+        I2C_BOARD_INFO("adv7180", 0x20 + (idx)),                \
+};                                                              \
+                                                                \
+static struct soc_camera_link iclink##idx##_adv7180 = {         \
+        .bus_id         = 1 + 2 * (idx),                        \
+        .i2c_adapter_id = 0,                                    \
+        .board_info     = &camera##idx##_info,                  \
+};                                                              \
+                                                                \
+static struct platform_device camera##idx##_device = {          \
+        .name   = "soc-camera-pdrv",                            \
+        .id     = idx,                                          \
+        .dev    = {                                             \
+                .platform_data  = &iclink##idx##_adv7180,       \
+        },                                                      \
+};
+
+MARZEN_CAMERA(0);
+MARZEN_CAMERA(1);
+
 static struct platform_device *marzen_devices[] __initdata = {
         &eth_device,
         &sdhi0_device,
         &thermal_device,
         &hspi_device,
         &leds_device,
+        &usb_phy,
+        &camera0_device,
+        &camera1_device,
 };
 
 static const struct pinctrl_map marzen_pinctrl_map[] = {
@@ -219,6 +269,16 @@ static const struct pinctrl_map marzen_pinctrl_map[] = {
         /* USB2 */
         PIN_MAP_MUX_GROUP_DEFAULT("ehci-platform.1", "pfc-r8a7779",
                                   "usb2", "usb2"),
+        /* VIN1 */
+        PIN_MAP_MUX_GROUP_DEFAULT("r8a7779-vin.1", "pfc-r8a7779",
+                                  "vin1_clk", "vin1"),
+        PIN_MAP_MUX_GROUP_DEFAULT("r8a7779-vin.1", "pfc-r8a7779",
+                                  "vin1_data8", "vin1"),
+        /* VIN3 */
+        PIN_MAP_MUX_GROUP_DEFAULT("r8a7779-vin.3", "pfc-r8a7779",
+                                  "vin3_clk", "vin3"),
+        PIN_MAP_MUX_GROUP_DEFAULT("r8a7779-vin.3", "pfc-r8a7779",
+                                  "vin3_data8", "vin3"),
 };
 
 static void __init marzen_init(void)
@@ -234,17 +294,23 @@ static void __init marzen_init(void)
         r8a7779_init_irq_extpin(1); /* IRQ1 as individual interrupt */
 
         r8a7779_add_standard_devices();
-        r8a7779_add_usb_phy_device(&usb_phy_platform_data);
+        r8a7779_add_vin_device(1, &vin_platform_data);
+        r8a7779_add_vin_device(3, &vin_platform_data);
         platform_add_devices(marzen_devices, ARRAY_SIZE(marzen_devices));
 }
 
-MACHINE_START(MARZEN, "marzen")
+static const char *marzen_boards_compat_dt[] __initdata = {
+        "renesas,marzen",
+        NULL,
+};
+
+DT_MACHINE_START(MARZEN, "marzen")
         .smp            = smp_ops(r8a7779_smp_ops),
         .map_io         = r8a7779_map_io,
         .init_early     = r8a7779_add_early_devices,
-        .nr_irqs        = NR_IRQS_LEGACY,
-        .init_irq       = r8a7779_init_irq,
+        .init_irq       = r8a7779_init_irq_dt,
         .init_machine   = marzen_init,
         .init_late      = r8a7779_init_late,
+        .dt_compat      = marzen_boards_compat_dt,
         .init_time      = r8a7779_earlytimer_init,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/clock-emev2.c b/arch/arm/mach-shmobile/clock-emev2.c
index 4710f1847bb7..5ac13ba71d54 100644
--- a/arch/arm/mach-shmobile/clock-emev2.c
+++ b/arch/arm/mach-shmobile/clock-emev2.c
@@ -40,7 +40,6 @@
 #define USIB2SCLKDIV 0x65c
 #define USIB3SCLKDIV 0x660
 #define STI_CLKSEL 0x688
-#define SMU_GENERAL_REG0 0x7c0
 
 /* not pretty, but hey */
 static void __iomem *smu_base;
@@ -51,11 +50,6 @@ static void emev2_smu_write(unsigned long value, int offs)
         iowrite32(value, smu_base + offs);
 }
 
-void emev2_set_boot_vector(unsigned long value)
-{
-        emev2_smu_write(value, SMU_GENERAL_REG0);
-}
-
 static struct clk_mapping smu_mapping = {
         .phys   = EMEV2_SMU_BASE,
         .len    = PAGE_SIZE,
@@ -205,23 +199,11 @@ static struct clk_lookup lookups[] = {
 void __init emev2_clock_init(void)
 {
         int k, ret = 0;
-        static int is_setup;
-
-        /* yuck, this is ugly as hell, but the non-smp case of clocks
-         * code is now designed to rely on ioremap() instead of static
-         * entity maps. in the case of smp we need access to the SMU
-         * register earlier than ioremap() is actually working without
-         * any static maps. to enable SMP in ugly but with dynamic
-         * mappings we have to call emev2_clock_init() from different
-         * places depending on UP and SMP...
-         */
-        if (is_setup++)
-                return;
 
         smu_base = ioremap(EMEV2_SMU_BASE, PAGE_SIZE);
         BUG_ON(!smu_base);
 
-        /* setup STI timer to run on 37.768 kHz and deassert reset */
+        /* setup STI timer to run on 32.768 kHz and deassert reset */
         emev2_smu_write(0, STI_CLKSEL);
         emev2_smu_write(1, STI_RSTCTRL);
 
diff --git a/arch/arm/mach-shmobile/clock-r8a73a4.c b/arch/arm/mach-shmobile/clock-r8a73a4.c
index 5f7fe628b8a1..5bd2e851e3c7 100644
--- a/arch/arm/mach-shmobile/clock-r8a73a4.c
+++ b/arch/arm/mach-shmobile/clock-r8a73a4.c
@@ -30,10 +30,12 @@
 
 #define SMSTPCR2 0xe6150138
 #define SMSTPCR3 0xe615013c
+#define SMSTPCR4 0xe6150140
 #define SMSTPCR5 0xe6150144
 
 #define FRQCRA          0xE6150000
 #define FRQCRB          0xE6150004
+#define FRQCRC          0xE61500E0
 #define VCLKCR1         0xE6150008
 #define VCLKCR2         0xE615000C
 #define VCLKCR3         0xE615001C
@@ -52,6 +54,7 @@
 #define HSICKCR         0xE615026C
 #define M4CKCR          0xE6150098
 #define PLLECR          0xE61500D0
+#define PLL0CR          0xE61500D8
 #define PLL1CR          0xE6150028
 #define PLL2CR          0xE615002C
 #define PLL2SCR         0xE61501F4
@@ -177,6 +180,7 @@ static struct sh_clk_ops pll_clk_ops = {
                 .mapping        = &cpg_mapping,         \
         }
 
+PLL_CLOCK(pll0_clk,  &main_clk,      pll_parent_main,      1, 20, PLL0CR,  0);
 PLL_CLOCK(pll1_clk,  &main_clk,      pll_parent_main,       1, 7, PLL1CR,  1);
 PLL_CLOCK(pll2_clk,  &main_div2_clk, pll_parent_main_extal, 3, 5, PLL2CR,  2);
 PLL_CLOCK(pll2s_clk, &main_div2_clk, pll_parent_main_extal, 3, 5, PLL2SCR, 4);
@@ -184,6 +188,157 @@ PLL_CLOCK(pll2h_clk, &main_div2_clk, pll_parent_main_extal, 3, 5, PLL2HCR, 5);
 
 SH_FIXED_RATIO_CLK(pll1_div2_clk,       pll1_clk,       div2);
 
+static atomic_t frqcr_lock;
+
+/* Several clocks need to access FRQCRB, have to lock */
+static bool frqcr_kick_check(struct clk *clk)
+{
+        return !(ioread32(CPG_MAP(FRQCRB)) & BIT(31));
+}
+
+static int frqcr_kick_do(struct clk *clk)
+{
+        int i;
+
+        /* set KICK bit in FRQCRB to update hardware setting, check success */
+        iowrite32(ioread32(CPG_MAP(FRQCRB)) | BIT(31), CPG_MAP(FRQCRB));
+        for (i = 1000; i; i--)
+                if (ioread32(CPG_MAP(FRQCRB)) & BIT(31))
+                        cpu_relax();
+                else
+                        return 0;
+
+        return -ETIMEDOUT;
+}
+
+static int zclk_set_rate(struct clk *clk, unsigned long rate)
+{
+        void __iomem *frqcrc;
+        int ret;
+        unsigned long step, p_rate;
+        u32 val;
+
+        if (!clk->parent || !__clk_get(clk->parent))
+                return -ENODEV;
+
+        if (!atomic_inc_and_test(&frqcr_lock) || !frqcr_kick_check(clk)) {
+                ret = -EBUSY;
+                goto done;
+        }
+
+        /*
+         * Users are supposed to first call clk_set_rate() only with
+         * clk_round_rate() results. So, we don't fix wrong rates here, but
+         * guard against them anyway
+         */
+
+        p_rate = clk_get_rate(clk->parent);
+        if (rate == p_rate) {
+                val = 0;
+        } else {
+                step = DIV_ROUND_CLOSEST(p_rate, 32);
+
+                if (rate > p_rate || rate < step) {
+                        ret = -EINVAL;
+                        goto done;
+                }
+
+                val = 32 - rate / step;
+        }
+
+        frqcrc = clk->mapped_reg + (FRQCRC - (u32)clk->enable_reg);
+
+        iowrite32((ioread32(frqcrc) & ~(clk->div_mask << clk->enable_bit)) |
+                  (val << clk->enable_bit), frqcrc);
+
+        ret = frqcr_kick_do(clk);
+
+done:
+        atomic_dec(&frqcr_lock);
+        __clk_put(clk->parent);
+        return ret;
+}
+
+static long zclk_round_rate(struct clk *clk, unsigned long rate)
+{
+        /*
+         * theoretical rate = parent rate * multiplier / 32,
+         * where 1 <= multiplier <= 32. Therefore we should do
+         * multiplier = rate * 32 / parent rate
+         * rounded rate = parent rate * multiplier / 32.
+         * However, multiplication before division won't fit in 32 bits, so
+         * we sacrifice some precision by first dividing and then multiplying.
+         * To find the nearest divisor we calculate both and pick up the best
+         * one. This avoids 64-bit arithmetics.
+         */
+        unsigned long step, mul_min, mul_max, rate_min, rate_max;
+
+        rate_max = clk_get_rate(clk->parent);
+
+        /* output freq <= parent */
+        if (rate >= rate_max)
+                return rate_max;
+
+        step = DIV_ROUND_CLOSEST(rate_max, 32);
+        /* output freq >= parent / 32 */
+        if (step >= rate)
+                return step;
+
+        mul_min = rate / step;
+        mul_max = DIV_ROUND_UP(rate, step);
+        rate_min = step * mul_min;
+        if (mul_max == mul_min)
+                return rate_min;
+
+        rate_max = step * mul_max;
+
+        if (rate_max - rate <  rate - rate_min)
+                return rate_max;
+
+        return rate_min;
+}
+
+static unsigned long zclk_recalc(struct clk *clk)
+{
+        void __iomem *frqcrc = FRQCRC - (u32)clk->enable_reg + clk->mapped_reg;
+        unsigned int max = clk->div_mask + 1;
+        unsigned long val = ((ioread32(frqcrc) >> clk->enable_bit) &
+                             clk->div_mask);
+
+        return DIV_ROUND_CLOSEST(clk_get_rate(clk->parent), max) *
+                (max - val);
+}
+
+static struct sh_clk_ops zclk_ops = {
+        .recalc = zclk_recalc,
+        .set_rate = zclk_set_rate,
+        .round_rate = zclk_round_rate,
+};
+
+static struct clk z_clk = {
+        .parent = &pll0_clk,
+        .div_mask = 0x1f,
+        .enable_bit = 8,
+        /* We'll need to access FRQCRB and FRQCRC */
+        .enable_reg = (void __iomem *)FRQCRB,
+        .ops = &zclk_ops,
+};
+
+/*
+ * It seems only 1/2 divider is usable in manual mode. 1/2 / 2/3
+ * switching is only available in auto-DVFS mode
+ */
+SH_FIXED_RATIO_CLK(pll0_div2_clk,       pll0_clk,               div2);
+
+static struct clk z2_clk = {
+        .parent = &pll0_div2_clk,
+        .div_mask = 0x1f,
+        .enable_bit = 0,
+        /* We'll need to access FRQCRB and FRQCRC */
+        .enable_reg = (void __iomem *)FRQCRB,
+        .ops = &zclk_ops,
+};
+
 static struct clk *main_clks[] = {
         &extalr_clk,
         &extal1_clk,
@@ -195,22 +350,23 @@ static struct clk *main_clks[] = {
         &main_div2_clk,
         &fsiack_clk,
         &fsibck_clk,
+        &pll0_clk,
         &pll1_clk,
         &pll1_div2_clk,
         &pll2_clk,
         &pll2s_clk,
         &pll2h_clk,
+        &z_clk,
+        &pll0_div2_clk,
+        &z2_clk,
 };
 
 /* DIV4 */
 static void div4_kick(struct clk *clk)
 {
-        unsigned long value;
-
-        /* set KICK bit in FRQCRB to update hardware setting */
-        value = ioread32(CPG_MAP(FRQCRB));
-        value |= (1 << 31);
-        iowrite32(value, CPG_MAP(FRQCRB));
+        if (!WARN(!atomic_inc_and_test(&frqcr_lock), "FRQCR* lock broken!\n"))
+                frqcr_kick_do(clk);
+        atomic_dec(&frqcr_lock);
 }
 
 static int divisors[] = { 2, 3, 4, 6, 8, 12, 16, 18, 24, 0, 36, 48, 10};
@@ -349,8 +505,10 @@ static struct clk div6_clks[DIV6_NR] = {
 /* MSTP */
 enum {
         MSTP217, MSTP216, MSTP207, MSTP206, MSTP204, MSTP203,
-        MSTP315, MSTP314, MSTP313, MSTP312, MSTP305,
-        MSTP522,
+        MSTP329, MSTP323, MSTP318, MSTP317, MSTP316,
+        MSTP315, MSTP314, MSTP313, MSTP312, MSTP305, MSTP300,
+        MSTP411, MSTP410, MSTP409,
+        MSTP522, MSTP515,
         MSTP_NR
 };
 
@@ -361,12 +519,22 @@ static struct clk mstp_clks[MSTP_NR] = {
         [MSTP207] = SH_CLK_MSTP32(&div6_clks[DIV6_MP],  SMSTPCR2, 7, 0), /* SCIFB1 */
         [MSTP216] = SH_CLK_MSTP32(&div6_clks[DIV6_MP],  SMSTPCR2, 16, 0), /* SCIFB2 */
         [MSTP217] = SH_CLK_MSTP32(&div6_clks[DIV6_MP],  SMSTPCR2, 17, 0), /* SCIFB3 */
+        [MSTP300] = SH_CLK_MSTP32(&div4_clks[DIV4_HP],  SMSTPCR3, 0, 0), /* IIC2 */
         [MSTP305] = SH_CLK_MSTP32(&div6_clks[DIV6_MMC1],SMSTPCR3, 5, 0), /* MMCIF1 */
         [MSTP312] = SH_CLK_MSTP32(&div6_clks[DIV6_SDHI2],SMSTPCR3, 12, 0), /* SDHI2 */
         [MSTP313] = SH_CLK_MSTP32(&div6_clks[DIV6_SDHI1],SMSTPCR3, 13, 0), /* SDHI1 */
         [MSTP314] = SH_CLK_MSTP32(&div6_clks[DIV6_SDHI0],SMSTPCR3, 14, 0), /* SDHI0 */
         [MSTP315] = SH_CLK_MSTP32(&div6_clks[DIV6_MMC0],SMSTPCR3, 15, 0), /* MMCIF0 */
+        [MSTP316] = SH_CLK_MSTP32(&div4_clks[DIV4_HP],  SMSTPCR3, 16, 0), /* IIC6 */
+        [MSTP317] = SH_CLK_MSTP32(&div4_clks[DIV4_HP],  SMSTPCR3, 17, 0), /* IIC7 */
+        [MSTP318] = SH_CLK_MSTP32(&div4_clks[DIV4_HP],  SMSTPCR3, 18, 0), /* IIC0 */
+        [MSTP323] = SH_CLK_MSTP32(&div4_clks[DIV4_HP],  SMSTPCR3, 23, 0), /* IIC1 */
+        [MSTP329] = SH_CLK_MSTP32(&extalr_clk, SMSTPCR3, 29, 0), /* CMT10 */
+        [MSTP409] = SH_CLK_MSTP32(&main_div2_clk,       SMSTPCR4, 9, 0), /* IIC5 */
+        [MSTP410] = SH_CLK_MSTP32(&div4_clks[DIV4_HP],  SMSTPCR4, 10, 0), /* IIC4 */
+        [MSTP411] = SH_CLK_MSTP32(&div4_clks[DIV4_HP],  SMSTPCR4, 11, 0), /* IIC3 */
         [MSTP522] = SH_CLK_MSTP32(&extal2_clk, SMSTPCR5, 22, 0), /* Thermal */
+        [MSTP515] = SH_CLK_MSTP32(&div4_clks[DIV4_HP],  SMSTPCR5, 15, 0), /* IIC8 */
 };
 
 static struct clk_lookup lookups[] = {
@@ -386,6 +554,9 @@ static struct clk_lookup lookups[] = {
         CLKDEV_CON_ID("pll2s",                  &pll2s_clk),
         CLKDEV_CON_ID("pll2h",                  &pll2h_clk),
 
+        /* CPU clock */
+        CLKDEV_DEV_ID("cpu0",                   &z_clk),
+
         /* DIV6 */
         CLKDEV_CON_ID("zb",                     &div6_clks[DIV6_ZB]),
         CLKDEV_CON_ID("vck1",                   &div6_clks[DIV6_VCK1]),
@@ -408,6 +579,7 @@ static struct clk_lookup lookups[] = {
         CLKDEV_DEV_ID("sh-sci.4", &mstp_clks[MSTP216]),
         CLKDEV_DEV_ID("sh-sci.5", &mstp_clks[MSTP217]),
         CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),
+        CLKDEV_DEV_ID("e6520000.i2c", &mstp_clks[MSTP300]),
         CLKDEV_DEV_ID("sh_mmcif.1", &mstp_clks[MSTP305]),
         CLKDEV_DEV_ID("ee220000.mmcif", &mstp_clks[MSTP305]),
         CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP312]),
@@ -418,6 +590,15 @@ static struct clk_lookup lookups[] = {
         CLKDEV_DEV_ID("ee100000.sdhi", &mstp_clks[MSTP314]),
         CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP315]),
         CLKDEV_DEV_ID("ee200000.mmcif", &mstp_clks[MSTP315]),
+        CLKDEV_DEV_ID("e6550000.i2c", &mstp_clks[MSTP316]),
+        CLKDEV_DEV_ID("e6560000.i2c", &mstp_clks[MSTP317]),
+        CLKDEV_DEV_ID("e6500000.i2c", &mstp_clks[MSTP318]),
+        CLKDEV_DEV_ID("e6510000.i2c", &mstp_clks[MSTP323]),
+        CLKDEV_DEV_ID("sh_cmt.10", &mstp_clks[MSTP329]),
+        CLKDEV_DEV_ID("e60b0000.i2c", &mstp_clks[MSTP409]),
+        CLKDEV_DEV_ID("e6540000.i2c", &mstp_clks[MSTP410]),
+        CLKDEV_DEV_ID("e6530000.i2c", &mstp_clks[MSTP411]),
+        CLKDEV_DEV_ID("e6570000.i2c", &mstp_clks[MSTP515]),
 
         /* for DT */
         CLKDEV_DEV_ID("e61f0000.thermal", &mstp_clks[MSTP522]),
@@ -429,6 +610,8 @@ void __init r8a73a4_clock_init(void)
         int k, ret = 0;
         u32 ckscr;
 
+        atomic_set(&frqcr_lock, -1);
+
         reg = ioremap_nocache(CKSCR, PAGE_SIZE);
         BUG_ON(!reg);
         ckscr = ioread32(reg);
diff --git a/arch/arm/mach-shmobile/clock-r8a7740.c b/arch/arm/mach-shmobile/clock-r8a7740.c
index de10fd78bf2b..c826bca4024e 100644
--- a/arch/arm/mach-shmobile/clock-r8a7740.c
+++ b/arch/arm/mach-shmobile/clock-r8a7740.c
@@ -596,7 +596,8 @@ static struct clk_lookup lookups[] = {
         CLKDEV_DEV_ID("e6bd0000.mmcif",         &mstp_clks[MSTP312]),
         CLKDEV_DEV_ID("r8a7740-gether",         &mstp_clks[MSTP309]),
         CLKDEV_DEV_ID("e9a00000.sh-eth",        &mstp_clks[MSTP309]),
-        CLKDEV_DEV_ID("renesas_tpu_pwm",        &mstp_clks[MSTP304]),
+        CLKDEV_DEV_ID("renesas-tpu-pwm",        &mstp_clks[MSTP304]),
+        CLKDEV_DEV_ID("e6600000.pwm",           &mstp_clks[MSTP304]),
 
         CLKDEV_DEV_ID("sh_mobile_sdhi.2",       &mstp_clks[MSTP415]),
         CLKDEV_DEV_ID("e6870000.sdhi",          &mstp_clks[MSTP415]),
diff --git a/arch/arm/mach-shmobile/clock-r8a7778.c b/arch/arm/mach-shmobile/clock-r8a7778.c
index a0e9eb72e46d..c4bf2d8fb111 100644
--- a/arch/arm/mach-shmobile/clock-r8a7778.c
+++ b/arch/arm/mach-shmobile/clock-r8a7778.c
@@ -106,6 +106,7 @@ enum {
         MSTP331,
         MSTP323, MSTP322, MSTP321,
         MSTP114,
+        MSTP110, MSTP109,
         MSTP100,
         MSTP030,
         MSTP029, MSTP028, MSTP027, MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021,
@@ -119,6 +120,8 @@ static struct clk mstp_clks[MSTP_NR] = {
         [MSTP322] = SH_CLK_MSTP32(&p_clk, MSTPCR3, 22, 0), /* SDHI1 */
         [MSTP321] = SH_CLK_MSTP32(&p_clk, MSTPCR3, 21, 0), /* SDHI2 */
         [MSTP114] = SH_CLK_MSTP32(&p_clk, MSTPCR1, 14, 0), /* Ether */
+        [MSTP110] = SH_CLK_MSTP32(&s_clk, MSTPCR1, 10, 0), /* VIN0 */
+        [MSTP109] = SH_CLK_MSTP32(&s_clk, MSTPCR1,  9, 0), /* VIN1 */
         [MSTP100] = SH_CLK_MSTP32(&p_clk, MSTPCR1,  0, 0), /* USB0/1 */
         [MSTP030] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 30, 0), /* I2C0 */
         [MSTP029] = SH_CLK_MSTP32(&p_clk, MSTPCR0, 29, 0), /* I2C1 */
@@ -146,6 +149,8 @@ static struct clk_lookup lookups[] = {
         CLKDEV_DEV_ID("sh_mobile_sdhi.1", &mstp_clks[MSTP322]), /* SDHI1 */
         CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP321]), /* SDHI2 */
         CLKDEV_DEV_ID("r8a777x-ether", &mstp_clks[MSTP114]), /* Ether */
+        CLKDEV_DEV_ID("r8a7778-vin.0", &mstp_clks[MSTP110]), /* VIN0 */
+        CLKDEV_DEV_ID("r8a7778-vin.1", &mstp_clks[MSTP109]), /* VIN1 */
         CLKDEV_DEV_ID("ehci-platform", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */
         CLKDEV_DEV_ID("ohci-platform", &mstp_clks[MSTP100]), /* USB OHCI port0/1 */
         CLKDEV_DEV_ID("i2c-rcar.0", &mstp_clks[MSTP030]), /* I2C0 */
diff --git a/arch/arm/mach-shmobile/clock-r8a7779.c b/arch/arm/mach-shmobile/clock-r8a7779.c
index 10340f5becbb..bd6ad922eb7e 100644
--- a/arch/arm/mach-shmobile/clock-r8a7779.c
+++ b/arch/arm/mach-shmobile/clock-r8a7779.c
@@ -112,7 +112,9 @@ static struct clk *main_clks[] = {
 };
 
 enum { MSTP323, MSTP322, MSTP321, MSTP320,
+        MSTP120,
         MSTP116, MSTP115, MSTP114,
+        MSTP110, MSTP109, MSTP108,
         MSTP103, MSTP101, MSTP100,
         MSTP030,
         MSTP029, MSTP028, MSTP027, MSTP026, MSTP025, MSTP024, MSTP023, MSTP022, MSTP021,
@@ -125,9 +127,13 @@ static struct clk mstp_clks[MSTP_NR] = {
         [MSTP322] = SH_CLK_MSTP32(&clkp_clk, MSTPCR3, 22, 0), /* SDHI1 */
         [MSTP321] = SH_CLK_MSTP32(&clkp_clk, MSTPCR3, 21, 0), /* SDHI2 */
         [MSTP320] = SH_CLK_MSTP32(&clkp_clk, MSTPCR3, 20, 0), /* SDHI3 */
+        [MSTP120] = SH_CLK_MSTP32(&clks_clk, MSTPCR1, 20, 0), /* VIN3 */
         [MSTP116] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1, 16, 0), /* PCIe */
         [MSTP115] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1, 15, 0), /* SATA */
         [MSTP114] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1, 14, 0), /* Ether */
+        [MSTP110] = SH_CLK_MSTP32(&clks_clk, MSTPCR1, 10, 0), /* VIN0 */
+        [MSTP109] = SH_CLK_MSTP32(&clks_clk, MSTPCR1,  9, 0), /* VIN1 */
+        [MSTP108] = SH_CLK_MSTP32(&clks_clk, MSTPCR1,  8, 0), /* VIN2 */
         [MSTP103] = SH_CLK_MSTP32(&clks_clk, MSTPCR1,  3, 0), /* DU */
         [MSTP101] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1,  1, 0), /* USB2 */
         [MSTP100] = SH_CLK_MSTP32(&clkp_clk, MSTPCR1,  0, 0), /* USB0/1 */
@@ -162,10 +168,14 @@ static struct clk_lookup lookups[] = {
         CLKDEV_CON_ID("peripheral_clk", &clkp_clk),
 
         /* MSTP32 clocks */
+        CLKDEV_DEV_ID("r8a7779-vin.3", &mstp_clks[MSTP120]), /* VIN3 */
         CLKDEV_DEV_ID("rcar-pcie", &mstp_clks[MSTP116]), /* PCIe */
         CLKDEV_DEV_ID("sata_rcar", &mstp_clks[MSTP115]), /* SATA */
         CLKDEV_DEV_ID("fc600000.sata", &mstp_clks[MSTP115]), /* SATA w/DT */
         CLKDEV_DEV_ID("r8a777x-ether", &mstp_clks[MSTP114]), /* Ether */
+        CLKDEV_DEV_ID("r8a7779-vin.0", &mstp_clks[MSTP110]), /* VIN0 */
+        CLKDEV_DEV_ID("r8a7779-vin.1", &mstp_clks[MSTP109]), /* VIN1 */
+        CLKDEV_DEV_ID("r8a7779-vin.2", &mstp_clks[MSTP108]), /* VIN2 */
         CLKDEV_DEV_ID("ehci-platform.1", &mstp_clks[MSTP101]), /* USB EHCI port2 */
         CLKDEV_DEV_ID("ohci-platform.1", &mstp_clks[MSTP101]), /* USB OHCI port2 */
         CLKDEV_DEV_ID("ehci-platform.0", &mstp_clks[MSTP100]), /* USB EHCI port0/1 */
diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index 5d71313df52d..fc36d3db0b4d 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -24,6 +24,7 @@
 #include <linux/clkdev.h>
 #include <mach/clock.h>
 #include <mach/common.h>
+#include <mach/r8a7790.h>
 
 /*
  *   MD         EXTAL           PLL0    PLL1    PLL3
@@ -42,16 +43,16 @@
  *      see "p1 / 2" on R8A7790_CLOCK_ROOT() below
  */
 
-#define MD(nr)  (1 << nr)
-
 #define CPG_BASE 0xe6150000
 #define CPG_LEN 0x1000
 
+#define SMSTPCR1 0xe6150134
 #define SMSTPCR2 0xe6150138
 #define SMSTPCR3 0xe615013c
+#define SMSTPCR5 0xe6150144
 #define SMSTPCR7 0xe615014c
+#define SMSTPCR8 0xe6150990
 
-#define MODEMR          0xE6160060
 #define SDCKCR          0xE6150074
 #define SD2CKCR         0xE6150078
 #define SD3CKCR         0xE615007C
@@ -180,16 +181,23 @@ static struct clk div6_clks[DIV6_NR] = {
 
 /* MSTP */
 enum {
+        MSTP813,
         MSTP721, MSTP720,
         MSTP717, MSTP716,
+        MSTP522,
         MSTP315, MSTP314, MSTP313, MSTP312, MSTP311, MSTP305, MSTP304,
         MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202,
+        MSTP124,
         MSTP_NR
 };
 
 static struct clk mstp_clks[MSTP_NR] = {
+        [MSTP813] = SH_CLK_MSTP32(&p_clk, SMSTPCR8, 13, 0), /* Ether */
         [MSTP721] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 21, 0), /* SCIF0 */
         [MSTP720] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 20, 0), /* SCIF1 */
+        [MSTP717] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 17, 0), /* HSCIF0 */
+        [MSTP716] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 16, 0), /* HSCIF1 */
+        [MSTP522] = SH_CLK_MSTP32(&extal_clk, SMSTPCR5, 22, 0), /* Thermal */
         [MSTP315] = SH_CLK_MSTP32(&div6_clks[DIV6_MMC0], SMSTPCR3, 15, 0), /* MMC0 */
         [MSTP314] = SH_CLK_MSTP32(&div4_clks[DIV4_SD0], SMSTPCR3, 14, 0), /* SDHI0 */
         [MSTP313] = SH_CLK_MSTP32(&div4_clks[DIV4_SD1], SMSTPCR3, 13, 0), /* SDHI1 */
@@ -203,8 +211,7 @@ static struct clk mstp_clks[MSTP_NR] = {
         [MSTP204] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 4, 0), /* SCIFA0 */
         [MSTP203] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 3, 0), /* SCIFA1 */
         [MSTP202] = SH_CLK_MSTP32(&mp_clk, SMSTPCR2, 2, 0), /* SCIFA2 */
-        [MSTP717] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 17, 0), /* HSCIF0 */
-        [MSTP716] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 16, 0), /* HSCIF1 */
+        [MSTP124] = SH_CLK_MSTP32(&rclk_clk, SMSTPCR1, 24, 0), /* CMT0 */
 };
 
 static struct clk_lookup lookups[] = {
@@ -254,6 +261,8 @@ static struct clk_lookup lookups[] = {
         CLKDEV_DEV_ID("sh-sci.7", &mstp_clks[MSTP720]),
         CLKDEV_DEV_ID("sh-sci.8", &mstp_clks[MSTP717]),
         CLKDEV_DEV_ID("sh-sci.9", &mstp_clks[MSTP716]),
+        CLKDEV_DEV_ID("r8a7790-ether", &mstp_clks[MSTP813]),
+        CLKDEV_DEV_ID("rcar_thermal", &mstp_clks[MSTP522]),
         CLKDEV_DEV_ID("ee200000.mmcif", &mstp_clks[MSTP315]),
         CLKDEV_DEV_ID("sh_mmcif.0", &mstp_clks[MSTP315]),
         CLKDEV_DEV_ID("ee100000.sdhi", &mstp_clks[MSTP314]),
@@ -266,6 +275,7 @@ static struct clk_lookup lookups[] = {
         CLKDEV_DEV_ID("sh_mobile_sdhi.3", &mstp_clks[MSTP311]),
         CLKDEV_DEV_ID("ee220000.mmcif", &mstp_clks[MSTP305]),
         CLKDEV_DEV_ID("sh_mmcif.1", &mstp_clks[MSTP305]),
+        CLKDEV_DEV_ID("sh_cmt.0", &mstp_clks[MSTP124]),
 };
 
 #define R8A7790_CLOCK_ROOT(e, m, p0, p1, p30, p31)              \
@@ -280,14 +290,9 @@ static struct clk_lookup lookups[] = {
 
 void __init r8a7790_clock_init(void)
 {
-        void __iomem *modemr = ioremap_nocache(MODEMR, PAGE_SIZE);
-        u32 mode;
+        u32 mode = r8a7790_read_mode_pins();
         int k, ret = 0;
 
-        BUG_ON(!modemr);
-        mode = ioread32(modemr);
-        iounmap(modemr);
-
         switch (mode & (MD(14) | MD(13))) {
         case 0:
                 R8A7790_CLOCK_ROOT(15, &extal_clk, 172, 208, 106, 88);
diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c
index d9fd0336b910..c92c023f0d27 100644
--- a/arch/arm/mach-shmobile/clock-sh73a0.c
+++ b/arch/arm/mach-shmobile/clock-sh73a0.c
@@ -555,7 +555,7 @@ enum { MSTP001,
         MSTP207, MSTP206, MSTP204, MSTP203, MSTP202, MSTP201, MSTP200,
         MSTP331, MSTP329, MSTP328, MSTP325, MSTP323, MSTP322,
         MSTP314, MSTP313, MSTP312, MSTP311,
-        MSTP303, MSTP302, MSTP301, MSTP300,
+        MSTP304, MSTP303, MSTP302, MSTP301, MSTP300,
         MSTP411, MSTP410, MSTP403,
         MSTP_NR };
 
@@ -593,6 +593,7 @@ static struct clk mstp_clks[MSTP_NR] = {
         [MSTP313] = MSTP(&div6_clks[DIV6_SDHI1], SMSTPCR3, 13, 0), /* SDHI1 */
         [MSTP312] = MSTP(&div4_clks[DIV4_HP], SMSTPCR3, 12, 0), /* MMCIF0 */
         [MSTP311] = MSTP(&div6_clks[DIV6_SDHI2], SMSTPCR3, 11, 0), /* SDHI2 */
+        [MSTP304] = MSTP(&main_div2_clk, SMSTPCR3, 4, 0), /* TPU0 */
         [MSTP303] = MSTP(&main_div2_clk, SMSTPCR3, 3, 0), /* TPU1 */
         [MSTP302] = MSTP(&main_div2_clk, SMSTPCR3, 2, 0), /* TPU2 */
         [MSTP301] = MSTP(&main_div2_clk, SMSTPCR3, 1, 0), /* TPU3 */
@@ -615,7 +616,7 @@ static struct clk_lookup lookups[] = {
         CLKDEV_DEV_ID("smp_twd", &twd_clk), /* smp_twd */
 
         /* DIV4 clocks */
-        CLKDEV_DEV_ID("cpufreq-cpu0", &div4_clks[DIV4_Z]),
+        CLKDEV_DEV_ID("cpu0", &div4_clks[DIV4_Z]),
 
         /* DIV6 clocks */
         CLKDEV_CON_ID("vck1_clk", &div6_clks[DIV6_VCK1]),
@@ -669,10 +670,11 @@ static struct clk_lookup lookups[] = {
         CLKDEV_DEV_ID("e6bd0000.mmcif", &mstp_clks[MSTP312]), /* MMCIF0 */
         CLKDEV_DEV_ID("sh_mobile_sdhi.2", &mstp_clks[MSTP311]), /* SDHI2 */
         CLKDEV_DEV_ID("ee140000.sdhi", &mstp_clks[MSTP311]), /* SDHI2 */
-        CLKDEV_DEV_ID("leds-renesas-tpu.12", &mstp_clks[MSTP303]), /* TPU1 */
-        CLKDEV_DEV_ID("leds-renesas-tpu.21", &mstp_clks[MSTP302]), /* TPU2 */
-        CLKDEV_DEV_ID("leds-renesas-tpu.30", &mstp_clks[MSTP301]), /* TPU3 */
-        CLKDEV_DEV_ID("leds-renesas-tpu.41", &mstp_clks[MSTP300]), /* TPU4 */
+        CLKDEV_DEV_ID("renesas-tpu-pwm.0", &mstp_clks[MSTP304]), /* TPU0 */
+        CLKDEV_DEV_ID("renesas-tpu-pwm.1", &mstp_clks[MSTP303]), /* TPU1 */
+        CLKDEV_DEV_ID("renesas-tpu-pwm.2", &mstp_clks[MSTP302]), /* TPU2 */
+        CLKDEV_DEV_ID("renesas-tpu-pwm.3", &mstp_clks[MSTP301]), /* TPU3 */
+        CLKDEV_DEV_ID("renesas-tpu-pwm.4", &mstp_clks[MSTP300]), /* TPU4 */
         CLKDEV_DEV_ID("i2c-sh_mobile.3", &mstp_clks[MSTP411]), /* I2C3 */
         CLKDEV_DEV_ID("e6826000.i2c", &mstp_clks[MSTP411]), /* I2C3 */
         CLKDEV_DEV_ID("i2c-sh_mobile.4", &mstp_clks[MSTP410]), /* I2C4 */
diff --git a/arch/arm/mach-shmobile/headsmp-scu.S b/arch/arm/mach-shmobile/headsmp-scu.S
index bfd920083a3b..f45dde701d7b 100644
--- a/arch/arm/mach-shmobile/headsmp-scu.S
+++ b/arch/arm/mach-shmobile/headsmp-scu.S
@@ -37,13 +37,15 @@ ENTRY(shmobile_boot_scu)
         lsl     r1, r1, #3              @ we will shift by cpu_id * 8 bits
         ldr     r2, [r0, #8]            @ SCU Power Status Register
         mov     r3, #3
-        bic     r2, r2, r3, lsl r1      @ Clear bits of our CPU (Run Mode)
+        lsl     r3, r3, r1
+        bic     r2, r2, r3              @ Clear bits of our CPU (Run Mode)
         str     r2, [r0, #8]            @ write back
 
         b       shmobile_invalidate_start
 ENDPROC(shmobile_boot_scu)
 
         .text
+        .align  2
         .globl  shmobile_scu_base
 shmobile_scu_base:
         .space  4
diff --git a/arch/arm/mach-shmobile/headsmp.S b/arch/arm/mach-shmobile/headsmp.S
index a9d212498987..f93751caf5cb 100644
--- a/arch/arm/mach-shmobile/headsmp.S
+++ b/arch/arm/mach-shmobile/headsmp.S
@@ -24,15 +24,68 @@ ENDPROC(shmobile_invalidate_start)
  * This will be mapped at address 0 by SBAR register.
  * We need _long_ jump to the physical address.
  */
+        .arm
         .align  12
 ENTRY(shmobile_boot_vector)
         ldr     r0, 2f
-        ldr     pc, 1f
+        ldr     r1, 1f
+        bx      r1
+
 ENDPROC(shmobile_boot_vector)
 
+        .align  2
         .globl  shmobile_boot_fn
 shmobile_boot_fn:
 1:      .space  4
         .globl  shmobile_boot_arg
 shmobile_boot_arg:
 2:      .space  4
+
+/*
+ * Per-CPU SMP boot function/argument selection code based on MPIDR
+ */
+
+ENTRY(shmobile_smp_boot)
+                                                @ r0 = MPIDR_HWID_BITMASK
+        mrc     p15, 0, r1, c0, c0, 5           @ r1 = MPIDR
+        and     r0, r1, r0                      @ r0 = cpu_logical_map() value
+        mov     r1, #0                          @ r1 = CPU index
+        adr     r5, 1f                          @ array of per-cpu mpidr values
+        adr     r6, 2f                          @ array of per-cpu functions
+        adr     r7, 3f                          @ array of per-cpu arguments
+
+shmobile_smp_boot_find_mpidr:
+        ldr     r8, [r5, r1, lsl #2]
+        cmp     r8, r0
+        bne     shmobile_smp_boot_next
+
+        ldr     r9, [r6, r1, lsl #2]
+        cmp     r9, #0
+        bne     shmobile_smp_boot_found
+
+shmobile_smp_boot_next:
+        add     r1, r1, #1
+        cmp     r1, #CONFIG_NR_CPUS
+        blo     shmobile_smp_boot_find_mpidr
+
+        b       shmobile_smp_sleep
+
+shmobile_smp_boot_found:
+        ldr     r0, [r7, r1, lsl #2]
+        mov     pc, r9
+ENDPROC(shmobile_smp_boot)
+
+ENTRY(shmobile_smp_sleep)
+        wfi
+        b       shmobile_smp_boot
+ENDPROC(shmobile_smp_sleep)
+
+        .globl  shmobile_smp_mpidr
+shmobile_smp_mpidr:
+1:      .space  CONFIG_NR_CPUS * 4
+        .globl  shmobile_smp_fn
+shmobile_smp_fn:
+2:      .space  CONFIG_NR_CPUS * 4
+        .globl  shmobile_smp_arg
+shmobile_smp_arg:
+3:      .space  CONFIG_NR_CPUS * 4
diff --git a/arch/arm/mach-shmobile/include/mach/common.h b/arch/arm/mach-shmobile/include/mach/common.h
index e818f029d8e3..7b938681e756 100644
--- a/arch/arm/mach-shmobile/include/mach/common.h
+++ b/arch/arm/mach-shmobile/include/mach/common.h
@@ -2,7 +2,6 @@
 #define __ARCH_MACH_COMMON_H
 
 extern void shmobile_earlytimer_init(void);
-extern void shmobile_timer_init(void);
 extern void shmobile_setup_delay(unsigned int max_cpu_core_mhz,
                          unsigned int mult, unsigned int div);
 struct twd_local_timer;
@@ -10,7 +9,16 @@ extern void shmobile_setup_console(void);
 extern void shmobile_boot_vector(void);
 extern unsigned long shmobile_boot_fn;
 extern unsigned long shmobile_boot_arg;
+extern void shmobile_smp_boot(void);
+extern void shmobile_smp_sleep(void);
+extern void shmobile_smp_hook(unsigned int cpu, unsigned long fn,
+                              unsigned long arg);
 extern void shmobile_boot_scu(void);
+extern void shmobile_smp_scu_prepare_cpus(unsigned int max_cpus);
+extern int shmobile_smp_scu_boot_secondary(unsigned int cpu,
+                                           struct task_struct *idle);
+extern void shmobile_smp_scu_cpu_die(unsigned int cpu);
+extern int shmobile_smp_scu_cpu_kill(unsigned int cpu);
 struct clk;
 extern int shmobile_clk_init(void);
 extern void shmobile_handle_irq_intc(struct pt_regs *);
diff --git a/arch/arm/mach-shmobile/include/mach/dma.h b/arch/arm/mach-shmobile/include/mach/dma.h
deleted file mode 100644
index 40a8c178f10d..000000000000
--- a/arch/arm/mach-shmobile/include/mach/dma.h
+++ /dev/null
@@ -1 +0,0 @@
-/* empty */
diff --git a/arch/arm/mach-shmobile/include/mach/emev2.h b/arch/arm/mach-shmobile/include/mach/emev2.h
index ac3751705cab..c2eb7568d9be 100644
--- a/arch/arm/mach-shmobile/include/mach/emev2.h
+++ b/arch/arm/mach-shmobile/include/mach/emev2.h
@@ -2,11 +2,9 @@
 #define __ASM_EMEV2_H__
 
 extern void emev2_map_io(void);
-extern void emev2_init_irq(void);
-extern void emev2_add_early_devices(void);
+extern void emev2_init_delay(void);
 extern void emev2_add_standard_devices(void);
 extern void emev2_clock_init(void);
-extern void emev2_set_boot_vector(unsigned long value);
 
 #define EMEV2_GPIO_BASE 200
 #define EMEV2_GPIO_IRQ(n) (EMEV2_GPIO_BASE + (n))
diff --git a/arch/arm/mach-shmobile/include/mach/hardware.h b/arch/arm/mach-shmobile/include/mach/hardware.h
deleted file mode 100644
index 99264a5ce5e4..000000000000
--- a/arch/arm/mach-shmobile/include/mach/hardware.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef __ASM_MACH_HARDWARE_H
-#define __ASM_MACH_HARDWARE_H
-
-#endif /* __ASM_MACH_HARDWARE_H */
diff --git a/arch/arm/mach-shmobile/include/mach/r8a73a4.h b/arch/arm/mach-shmobile/include/mach/r8a73a4.h
index f043103e32c9..f3a9b702da56 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a73a4.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a73a4.h
@@ -2,7 +2,9 @@
 #define __ASM_R8A73A4_H__
 
 void r8a73a4_add_standard_devices(void);
+void r8a73a4_add_dt_devices(void);
 void r8a73a4_clock_init(void);
 void r8a73a4_pinmux_init(void);
+void r8a73a4_init_delay(void);
 
 #endif /* __ASM_R8A73A4_H__ */
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7740.h b/arch/arm/mach-shmobile/include/mach/r8a7740.h
index b34d19b5ca5c..d07932f872b6 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7740.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7740.h
@@ -42,11 +42,12 @@ enum {
         SHDMA_SLAVE_FSIB_TX,
         SHDMA_SLAVE_USBHS_TX,
         SHDMA_SLAVE_USBHS_RX,
+        SHDMA_SLAVE_MMCIF_TX,
+        SHDMA_SLAVE_MMCIF_RX,
 };
 
 extern void r8a7740_meram_workaround(void);
 extern void r8a7740_init_delay(void);
-extern void r8a7740_init_irq(void);
 extern void r8a7740_init_irq_of(void);
 extern void r8a7740_map_io(void);
 extern void r8a7740_add_early_devices(void);
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7778.h b/arch/arm/mach-shmobile/include/mach/r8a7778.h
index 851d027a2f06..adfcf51b163d 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7778.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7778.h
@@ -18,26 +18,21 @@
 #ifndef __ASM_R8A7778_H__
 #define __ASM_R8A7778_H__
 
-#include <linux/mmc/sh_mmcif.h>
-#include <linux/mmc/sh_mobile_sdhi.h>
 #include <linux/sh_eth.h>
-#include <linux/platform_data/usb-rcar-phy.h>
+#include <linux/platform_data/camera-rcar.h>
 
 extern void r8a7778_add_standard_devices(void);
 extern void r8a7778_add_standard_devices_dt(void);
 extern void r8a7778_add_ether_device(struct sh_eth_plat_data *pdata);
-extern void r8a7778_add_usb_phy_device(struct rcar_phy_platform_data *pdata);
-extern void r8a7778_add_i2c_device(int id);
-extern void r8a7778_add_hspi_device(int id);
-extern void r8a7778_add_mmc_device(struct sh_mmcif_plat_data *info);
+extern void r8a7778_add_vin_device(int id,
+                                   struct rcar_vin_platform_data *pdata);
+extern void r8a7778_add_dt_devices(void);
 
 extern void r8a7778_init_late(void);
 extern void r8a7778_init_delay(void);
-extern void r8a7778_init_irq(void);
 extern void r8a7778_init_irq_dt(void);
 extern void r8a7778_clock_init(void);
 extern void r8a7778_init_irq_extpin(int irlm);
 extern void r8a7778_pinmux_init(void);
-extern void r8a7778_sdhi_init(int id, struct sh_mobile_sdhi_info *info);
 
 #endif /* __ASM_R8A7778_H__ */
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7779.h b/arch/arm/mach-shmobile/include/mach/r8a7779.h
index fc47073c7ba9..11c740047e14 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7779.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7779.h
@@ -4,7 +4,7 @@
 #include <linux/sh_clk.h>
 #include <linux/pm_domain.h>
 #include <linux/sh_eth.h>
-#include <linux/platform_data/usb-rcar-phy.h>
+#include <linux/platform_data/camera-rcar.h>
 
 struct platform_device;
 
@@ -25,7 +25,6 @@ static inline struct r8a7779_pm_ch *to_r8a7779_ch(struct generic_pm_domain *d)
 }
 
 extern void r8a7779_init_delay(void);
-extern void r8a7779_init_irq(void);
 extern void r8a7779_init_irq_extpin(int irlm);
 extern void r8a7779_init_irq_dt(void);
 extern void r8a7779_map_io(void);
@@ -34,7 +33,8 @@ extern void r8a7779_add_early_devices(void);
 extern void r8a7779_add_standard_devices(void);
 extern void r8a7779_add_standard_devices_dt(void);
 extern void r8a7779_add_ether_device(struct sh_eth_plat_data *pdata);
-extern void r8a7779_add_usb_phy_device(struct rcar_phy_platform_data *pdata);
+extern void r8a7779_add_vin_device(int idx,
+                                   struct rcar_vin_platform_data *pdata);
 extern void r8a7779_init_late(void);
 extern void r8a7779_clock_init(void);
 extern void r8a7779_pinmux_init(void);
diff --git a/arch/arm/mach-shmobile/include/mach/r8a7790.h b/arch/arm/mach-shmobile/include/mach/r8a7790.h
index 2e919e61fa0d..788d55952091 100644
--- a/arch/arm/mach-shmobile/include/mach/r8a7790.h
+++ b/arch/arm/mach-shmobile/include/mach/r8a7790.h
@@ -2,8 +2,13 @@
 #define __ASM_R8A7790_H__
 
 void r8a7790_add_standard_devices(void);
+void r8a7790_add_dt_devices(void);
 void r8a7790_clock_init(void);
 void r8a7790_pinmux_init(void);
+void r8a7790_init_delay(void);
 void r8a7790_timer_init(void);
 
+#define MD(nr) BIT(nr)
+u32 r8a7790_read_mode_pins(void);
+
 #endif /* __ASM_R8A7790_H__ */
diff --git a/arch/arm/mach-shmobile/include/mach/sh73a0.h b/arch/arm/mach-shmobile/include/mach/sh73a0.h
index eb7a4320d487..359b582dc270 100644
--- a/arch/arm/mach-shmobile/include/mach/sh73a0.h
+++ b/arch/arm/mach-shmobile/include/mach/sh73a0.h
@@ -1,379 +1,6 @@
 #ifndef __ASM_SH73A0_H__
 #define __ASM_SH73A0_H__
 
-/* Pin Function Controller:
- * GPIO_FN_xx - GPIO used to select pin function and MSEL switch
- * GPIO_PORTxx - GPIO mapped to real I/O pin on CPU
- */
-enum {
-        /* Hardware manual Table 25-1 (GPIO) */
-        GPIO_PORT0, GPIO_PORT1, GPIO_PORT2, GPIO_PORT3, GPIO_PORT4,
-        GPIO_PORT5, GPIO_PORT6, GPIO_PORT7, GPIO_PORT8, GPIO_PORT9,
-
-        GPIO_PORT10, GPIO_PORT11, GPIO_PORT12, GPIO_PORT13, GPIO_PORT14,
-        GPIO_PORT15, GPIO_PORT16, GPIO_PORT17, GPIO_PORT18, GPIO_PORT19,
-
-        GPIO_PORT20, GPIO_PORT21, GPIO_PORT22, GPIO_PORT23, GPIO_PORT24,
-        GPIO_PORT25, GPIO_PORT26, GPIO_PORT27, GPIO_PORT28, GPIO_PORT29,
-
-        GPIO_PORT30, GPIO_PORT31, GPIO_PORT32, GPIO_PORT33, GPIO_PORT34,
-        GPIO_PORT35, GPIO_PORT36, GPIO_PORT37, GPIO_PORT38, GPIO_PORT39,
-
-        GPIO_PORT40, GPIO_PORT41, GPIO_PORT42, GPIO_PORT43, GPIO_PORT44,
-        GPIO_PORT45, GPIO_PORT46, GPIO_PORT47, GPIO_PORT48, GPIO_PORT49,
-
-        GPIO_PORT50, GPIO_PORT51, GPIO_PORT52, GPIO_PORT53, GPIO_PORT54,
-        GPIO_PORT55, GPIO_PORT56, GPIO_PORT57, GPIO_PORT58, GPIO_PORT59,
-
-        GPIO_PORT60, GPIO_PORT61, GPIO_PORT62, GPIO_PORT63, GPIO_PORT64,
-        GPIO_PORT65, GPIO_PORT66, GPIO_PORT67, GPIO_PORT68, GPIO_PORT69,
-
-        GPIO_PORT70, GPIO_PORT71, GPIO_PORT72, GPIO_PORT73, GPIO_PORT74,
-        GPIO_PORT75, GPIO_PORT76, GPIO_PORT77, GPIO_PORT78, GPIO_PORT79,
-
-        GPIO_PORT80, GPIO_PORT81, GPIO_PORT82, GPIO_PORT83, GPIO_PORT84,
-        GPIO_PORT85, GPIO_PORT86, GPIO_PORT87, GPIO_PORT88, GPIO_PORT89,
-
-        GPIO_PORT90, GPIO_PORT91, GPIO_PORT92, GPIO_PORT93, GPIO_PORT94,
-        GPIO_PORT95, GPIO_PORT96, GPIO_PORT97, GPIO_PORT98, GPIO_PORT99,
-
-        GPIO_PORT100, GPIO_PORT101, GPIO_PORT102, GPIO_PORT103, GPIO_PORT104,
-        GPIO_PORT105, GPIO_PORT106, GPIO_PORT107, GPIO_PORT108, GPIO_PORT109,
-
-        GPIO_PORT110, GPIO_PORT111, GPIO_PORT112, GPIO_PORT113, GPIO_PORT114,
-        GPIO_PORT115, GPIO_PORT116, GPIO_PORT117, GPIO_PORT118,
-
-        GPIO_PORT128, GPIO_PORT129,
-
-        GPIO_PORT130, GPIO_PORT131, GPIO_PORT132, GPIO_PORT133, GPIO_PORT134,
-        GPIO_PORT135, GPIO_PORT136, GPIO_PORT137, GPIO_PORT138, GPIO_PORT139,
-
-        GPIO_PORT140, GPIO_PORT141, GPIO_PORT142, GPIO_PORT143, GPIO_PORT144,
-        GPIO_PORT145, GPIO_PORT146, GPIO_PORT147, GPIO_PORT148, GPIO_PORT149,
-
-        GPIO_PORT150, GPIO_PORT151, GPIO_PORT152, GPIO_PORT153, GPIO_PORT154,
-        GPIO_PORT155, GPIO_PORT156, GPIO_PORT157, GPIO_PORT158, GPIO_PORT159,
-
-        GPIO_PORT160, GPIO_PORT161, GPIO_PORT162, GPIO_PORT163, GPIO_PORT164,
-
-        GPIO_PORT192, GPIO_PORT193, GPIO_PORT194,
-        GPIO_PORT195, GPIO_PORT196, GPIO_PORT197, GPIO_PORT198, GPIO_PORT199,
-
-        GPIO_PORT200, GPIO_PORT201, GPIO_PORT202, GPIO_PORT203, GPIO_PORT204,
-        GPIO_PORT205, GPIO_PORT206, GPIO_PORT207, GPIO_PORT208, GPIO_PORT209,
-
-        GPIO_PORT210, GPIO_PORT211, GPIO_PORT212, GPIO_PORT213, GPIO_PORT214,
-        GPIO_PORT215, GPIO_PORT216, GPIO_PORT217, GPIO_PORT218, GPIO_PORT219,
-
-        GPIO_PORT220, GPIO_PORT221, GPIO_PORT222, GPIO_PORT223, GPIO_PORT224,
-        GPIO_PORT225, GPIO_PORT226, GPIO_PORT227, GPIO_PORT228, GPIO_PORT229,
-
-        GPIO_PORT230, GPIO_PORT231, GPIO_PORT232, GPIO_PORT233, GPIO_PORT234,
-        GPIO_PORT235, GPIO_PORT236, GPIO_PORT237, GPIO_PORT238, GPIO_PORT239,
-
-        GPIO_PORT240, GPIO_PORT241, GPIO_PORT242, GPIO_PORT243, GPIO_PORT244,
-        GPIO_PORT245, GPIO_PORT246, GPIO_PORT247, GPIO_PORT248, GPIO_PORT249,
-
-        GPIO_PORT250, GPIO_PORT251, GPIO_PORT252, GPIO_PORT253, GPIO_PORT254,
-        GPIO_PORT255, GPIO_PORT256, GPIO_PORT257, GPIO_PORT258, GPIO_PORT259,
-
-        GPIO_PORT260, GPIO_PORT261, GPIO_PORT262, GPIO_PORT263, GPIO_PORT264,
-        GPIO_PORT265, GPIO_PORT266, GPIO_PORT267, GPIO_PORT268, GPIO_PORT269,
-
-        GPIO_PORT270, GPIO_PORT271, GPIO_PORT272, GPIO_PORT273, GPIO_PORT274,
-        GPIO_PORT275, GPIO_PORT276, GPIO_PORT277, GPIO_PORT278, GPIO_PORT279,
-
-        GPIO_PORT280, GPIO_PORT281, GPIO_PORT282,
-
-        GPIO_PORT288, GPIO_PORT289,
-
-        GPIO_PORT290, GPIO_PORT291, GPIO_PORT292, GPIO_PORT293, GPIO_PORT294,
-        GPIO_PORT295, GPIO_PORT296, GPIO_PORT297, GPIO_PORT298, GPIO_PORT299,
-
-        GPIO_PORT300, GPIO_PORT301, GPIO_PORT302, GPIO_PORT303, GPIO_PORT304,
-        GPIO_PORT305, GPIO_PORT306, GPIO_PORT307, GPIO_PORT308, GPIO_PORT309,
-
-        /* Table 25-1 (Function 0-7) */
-        GPIO_FN_GPI0 = 310,
-        GPIO_FN_GPI1,
-        GPIO_FN_GPI2,
-        GPIO_FN_GPI3,
-        GPIO_FN_GPI4,
-        GPIO_FN_GPI5,
-        GPIO_FN_GPI6,
-        GPIO_FN_GPI7,
-        GPIO_FN_GPO7, GPIO_FN_MFG0_OUT2,
-        GPIO_FN_GPO6, GPIO_FN_MFG1_OUT2,
-        GPIO_FN_GPO5,
-        GPIO_FN_PORT16_VIO_CKOR,
-        GPIO_FN_PORT19_VIO_CKO2,
-        GPIO_FN_GPO0,
-        GPIO_FN_GPO1,
-        GPIO_FN_GPO2, GPIO_FN_STATUS0,
-        GPIO_FN_GPO3, GPIO_FN_STATUS1,
-        GPIO_FN_GPO4, GPIO_FN_STATUS2,
-        GPIO_FN_VINT,
-        GPIO_FN_TCKON,
-        GPIO_FN_XDVFS1,
-        GPIO_FN_MFG0_OUT1, GPIO_FN_PORT27_IROUT,
-        GPIO_FN_XDVFS2,
-        GPIO_FN_PORT28_TPU1TO1,
-        GPIO_FN_SIM_RST, GPIO_FN_PORT29_TPU1TO1,
-        GPIO_FN_SIM_CLK, GPIO_FN_PORT30_VIO_CKOR,
-        GPIO_FN_SIM_D, GPIO_FN_PORT31_IROUT,
-        GPIO_FN_XWUP,
-        GPIO_FN_VACK,
-        GPIO_FN_XTAL1L,
-        GPIO_FN_PORT49_IROUT,
-        GPIO_FN_BBIF2_TSYNC2, GPIO_FN_TPU2TO2,
-
-        GPIO_FN_BBIF2_TSCK2, GPIO_FN_TPU2TO3,
-        GPIO_FN_BBIF2_TXD2,
-        GPIO_FN_TPU3TO3,
-        GPIO_FN_TPU3TO2,
-        GPIO_FN_TPU0TO0,
-        GPIO_FN_A0, GPIO_FN_BS_,
-        GPIO_FN_A12, GPIO_FN_TPU4TO2,
-        GPIO_FN_A13, GPIO_FN_TPU0TO1,
-        GPIO_FN_A14,
-        GPIO_FN_A15,
-        GPIO_FN_A16, GPIO_FN_MSIOF0_SS1,
-        GPIO_FN_A17, GPIO_FN_MSIOF0_TSYNC,
-        GPIO_FN_A18, GPIO_FN_MSIOF0_TSCK,
-        GPIO_FN_A19, GPIO_FN_MSIOF0_TXD,
-        GPIO_FN_A20, GPIO_FN_MSIOF0_RSCK,
-        GPIO_FN_A21, GPIO_FN_MSIOF0_RSYNC,
-        GPIO_FN_A22, GPIO_FN_MSIOF0_MCK0,
-        GPIO_FN_A23, GPIO_FN_MSIOF0_MCK1,
-        GPIO_FN_A24, GPIO_FN_MSIOF0_RXD,
-        GPIO_FN_A25, GPIO_FN_MSIOF0_SS2,
-        GPIO_FN_A26,
-        GPIO_FN_FCE1_,
-        GPIO_FN_DACK0,
-        GPIO_FN_FCE0_,
-        GPIO_FN_WAIT_, GPIO_FN_DREQ0,
-        GPIO_FN_FRB,
-        GPIO_FN_CKO,
-        GPIO_FN_NBRSTOUT_,
-        GPIO_FN_NBRST_,
-        GPIO_FN_BBIF2_TXD,
-        GPIO_FN_BBIF2_RXD,
-        GPIO_FN_BBIF2_SYNC,
-        GPIO_FN_BBIF2_SCK,
-        GPIO_FN_MFG3_IN2,
-        GPIO_FN_MFG3_IN1,
-        GPIO_FN_BBIF1_SS2, GPIO_FN_MFG3_OUT1,
-        GPIO_FN_HSI_RX_DATA, GPIO_FN_BBIF1_RXD,
-        GPIO_FN_HSI_TX_WAKE, GPIO_FN_BBIF1_TSCK,
-        GPIO_FN_HSI_TX_DATA, GPIO_FN_BBIF1_TSYNC,
-        GPIO_FN_HSI_TX_READY, GPIO_FN_BBIF1_TXD,
-        GPIO_FN_HSI_RX_READY, GPIO_FN_BBIF1_RSCK,
-        GPIO_FN_HSI_RX_WAKE, GPIO_FN_BBIF1_RSYNC,
-        GPIO_FN_HSI_RX_FLAG, GPIO_FN_BBIF1_SS1, GPIO_FN_BBIF1_FLOW,
-        GPIO_FN_HSI_TX_FLAG,
-        GPIO_FN_VIO_VD, GPIO_FN_VIO2_VD,
-
-        GPIO_FN_VIO_HD,
-        GPIO_FN_VIO2_HD,
-        GPIO_FN_VIO_D0, GPIO_FN_PORT130_MSIOF2_RXD,
-        GPIO_FN_VIO_D1, GPIO_FN_PORT131_MSIOF2_SS1,
-        GPIO_FN_VIO_D2, GPIO_FN_PORT132_MSIOF2_SS2,
-        GPIO_FN_VIO_D3, GPIO_FN_MSIOF2_TSYNC,
-        GPIO_FN_VIO_D4, GPIO_FN_MSIOF2_TXD,
-        GPIO_FN_VIO_D5, GPIO_FN_MSIOF2_TSCK,
-        GPIO_FN_VIO_D6,
-        GPIO_FN_VIO_D7,
-        GPIO_FN_VIO_D8, GPIO_FN_VIO2_D0,
-        GPIO_FN_VIO_D9, GPIO_FN_VIO2_D1,
-        GPIO_FN_VIO_D10, GPIO_FN_TPU0TO2, GPIO_FN_VIO2_D2,
-        GPIO_FN_VIO_D11, GPIO_FN_TPU0TO3, GPIO_FN_VIO2_D3,
-        GPIO_FN_VIO_D12, GPIO_FN_VIO2_D4,
-        GPIO_FN_VIO_D13,
-        GPIO_FN_VIO2_D5,
-        GPIO_FN_VIO_D14, GPIO_FN_VIO2_D6,
-        GPIO_FN_VIO_D15, GPIO_FN_TPU1TO3,
-        GPIO_FN_VIO2_D7,
-        GPIO_FN_VIO_CLK,
-        GPIO_FN_VIO2_CLK,
-        GPIO_FN_VIO_FIELD, GPIO_FN_VIO2_FIELD,
-        GPIO_FN_VIO_CKO,
-        GPIO_FN_A27, GPIO_FN_MFG0_IN1,
-        GPIO_FN_MFG0_IN2,
-        GPIO_FN_TS_SPSYNC3, GPIO_FN_MSIOF2_RSCK,
-        GPIO_FN_TS_SDAT3, GPIO_FN_MSIOF2_RSYNC,
-        GPIO_FN_TPU1TO2, GPIO_FN_TS_SDEN3, GPIO_FN_PORT153_MSIOF2_SS1,
-        GPIO_FN_MSIOF2_MCK0,
-        GPIO_FN_MSIOF2_MCK1,
-        GPIO_FN_PORT156_MSIOF2_SS2,
-        GPIO_FN_PORT157_MSIOF2_RXD,
-        GPIO_FN_DINT_, GPIO_FN_TS_SCK3,
-        GPIO_FN_NMI,
-        GPIO_FN_TPU3TO0,
-        GPIO_FN_BBIF2_TSYNC1,
-        GPIO_FN_BBIF2_TSCK1,
-        GPIO_FN_BBIF2_TXD1,
-        GPIO_FN_MFG2_OUT2,
-        GPIO_FN_TPU2TO1,
-        GPIO_FN_TPU4TO1, GPIO_FN_MFG4_OUT2,
-        GPIO_FN_D16,
-        GPIO_FN_D17,
-        GPIO_FN_D18,
-        GPIO_FN_D19,
-        GPIO_FN_D20,
-        GPIO_FN_D21,
-        GPIO_FN_D22,
-        GPIO_FN_PORT207_MSIOF0L_SS1, GPIO_FN_D23,
-        GPIO_FN_PORT208_MSIOF0L_SS2, GPIO_FN_D24,
-        GPIO_FN_D25,
-        GPIO_FN_DREQ2, GPIO_FN_PORT210_MSIOF0L_SS1, GPIO_FN_D26,
-        GPIO_FN_PORT211_MSIOF0L_SS2, GPIO_FN_D27,
-        GPIO_FN_TS_SPSYNC1, GPIO_FN_MSIOF0L_MCK0, GPIO_FN_D28,
-        GPIO_FN_TS_SDAT1, GPIO_FN_MSIOF0L_MCK1, GPIO_FN_D29,
-        GPIO_FN_TS_SDEN1, GPIO_FN_MSIOF0L_RSCK, GPIO_FN_D30,
-        GPIO_FN_TS_SCK1, GPIO_FN_MSIOF0L_RSYNC, GPIO_FN_D31,
-        GPIO_FN_DACK2,
-        GPIO_FN_MSIOF0L_TSYNC, GPIO_FN_VIO2_FIELD3,
-        GPIO_FN_DACK3,
-        GPIO_FN_PORT218_VIO_CKOR,
-        GPIO_FN_DREQ3, GPIO_FN_MSIOF0L_TSCK, GPIO_FN_VIO2_CLK3, \
-        GPIO_FN_DREQ1,
-        GPIO_FN_PWEN, GPIO_FN_MSIOF0L_RXD, GPIO_FN_VIO2_HD3, \
-        GPIO_FN_DACK1, GPIO_FN_OVCN,
-        GPIO_FN_MSIOF0L_TXD, GPIO_FN_VIO2_VD3,
-
-        GPIO_FN_OVCN2,
-        GPIO_FN_EXTLP, GPIO_FN_PORT226_VIO_CKO2,
-        GPIO_FN_IDIN,
-        GPIO_FN_MFG1_IN1,
-        GPIO_FN_MSIOF1_TXD,
-        GPIO_FN_MSIOF1_TSYNC,
-        GPIO_FN_MSIOF1_TSCK,
-        GPIO_FN_MSIOF1_RXD,
-        GPIO_FN_MSIOF1_RSCK, GPIO_FN_VIO2_CLK2,
-        GPIO_FN_MSIOF1_RSYNC, GPIO_FN_MFG1_IN2, GPIO_FN_VIO2_VD2, \
-        GPIO_FN_MSIOF1_MCK0,
-        GPIO_FN_MSIOF1_MCK1,
-        GPIO_FN_MSIOF1_SS1, GPIO_FN_VIO2_FIELD2,
-        GPIO_FN_MSIOF1_SS2, GPIO_FN_VIO2_HD2,
-        GPIO_FN_PORT241_IROUT, GPIO_FN_MFG4_OUT1, \
-        GPIO_FN_TPU4TO0,
-        GPIO_FN_MFG4_IN2,
-        GPIO_FN_PORT243_VIO_CKO2,
-        GPIO_FN_MFG2_IN1,
-        GPIO_FN_MSIOF2R_RXD,
-        GPIO_FN_MFG2_IN2,
-        GPIO_FN_MSIOF2R_TXD,
-        GPIO_FN_MFG1_OUT1,
-        GPIO_FN_TPU1TO0,
-        GPIO_FN_MFG3_OUT2,
-        GPIO_FN_TPU3TO1,
-        GPIO_FN_MFG2_OUT1,
-        GPIO_FN_TPU2TO0,
-        GPIO_FN_MSIOF2R_TSCK,
-        GPIO_FN_PORT249_IROUT, GPIO_FN_MFG4_IN1, \
-        GPIO_FN_MSIOF2R_TSYNC,
-        GPIO_FN_SDHICLK0,
-        GPIO_FN_SDHICD0,
-        GPIO_FN_SDHID0_0,
-        GPIO_FN_SDHID0_1,
-        GPIO_FN_SDHID0_2,
-        GPIO_FN_SDHID0_3,
-        GPIO_FN_SDHICMD0,
-        GPIO_FN_SDHIWP0,
-        GPIO_FN_SDHICLK1,
-        GPIO_FN_SDHID1_0, GPIO_FN_TS_SPSYNC2,
-        GPIO_FN_SDHID1_1, GPIO_FN_TS_SDAT2,
-        GPIO_FN_SDHID1_2, GPIO_FN_TS_SDEN2,
-        GPIO_FN_SDHID1_3, GPIO_FN_TS_SCK2,
-        GPIO_FN_SDHICMD1,
-        GPIO_FN_SDHICLK2,
-        GPIO_FN_SDHID2_0, GPIO_FN_TS_SPSYNC4,
-        GPIO_FN_SDHID2_1, GPIO_FN_TS_SDAT4,
-        GPIO_FN_SDHID2_2, GPIO_FN_TS_SDEN4,
-        GPIO_FN_SDHID2_3, GPIO_FN_TS_SCK4,
-        GPIO_FN_SDHICMD2,
-        GPIO_FN_MMCCLK0,
-        GPIO_FN_MMCD0_0,
-        GPIO_FN_MMCD0_1,
-        GPIO_FN_MMCD0_2,
-        GPIO_FN_MMCD0_3,
-        GPIO_FN_MMCD0_4, GPIO_FN_TS_SPSYNC5,
-        GPIO_FN_MMCD0_5, GPIO_FN_TS_SDAT5,
-        GPIO_FN_MMCD0_6, GPIO_FN_TS_SDEN5,
-        GPIO_FN_MMCD0_7, GPIO_FN_TS_SCK5,
-        GPIO_FN_MMCCMD0,
-        GPIO_FN_RESETOUTS_, GPIO_FN_EXTAL2OUT,
-        GPIO_FN_MCP_WAIT__MCP_FRB,
-        GPIO_FN_MCP_CKO, GPIO_FN_MMCCLK1,
-        GPIO_FN_MCP_D15_MCP_NAF15,
-        GPIO_FN_MCP_D14_MCP_NAF14,
-        GPIO_FN_MCP_D13_MCP_NAF13,
-        GPIO_FN_MCP_D12_MCP_NAF12,
-        GPIO_FN_MCP_D11_MCP_NAF11,
-        GPIO_FN_MCP_D10_MCP_NAF10,
-        GPIO_FN_MCP_D9_MCP_NAF9,
-        GPIO_FN_MCP_D8_MCP_NAF8, GPIO_FN_MMCCMD1,
-        GPIO_FN_MCP_D7_MCP_NAF7, GPIO_FN_MMCD1_7,
-
-        GPIO_FN_MCP_D6_MCP_NAF6, GPIO_FN_MMCD1_6,
-        GPIO_FN_MCP_D5_MCP_NAF5, GPIO_FN_MMCD1_5,
-        GPIO_FN_MCP_D4_MCP_NAF4, GPIO_FN_MMCD1_4,
-        GPIO_FN_MCP_D3_MCP_NAF3, GPIO_FN_MMCD1_3,
-        GPIO_FN_MCP_D2_MCP_NAF2, GPIO_FN_MMCD1_2,
-        GPIO_FN_MCP_D1_MCP_NAF1, GPIO_FN_MMCD1_1,
-        GPIO_FN_MCP_D0_MCP_NAF0, GPIO_FN_MMCD1_0,
-        GPIO_FN_MCP_NBRSTOUT_,
-        GPIO_FN_MCP_WE0__MCP_FWE, GPIO_FN_MCP_RDWR_MCP_FWE,
-
-        /* MSEL2 special case */
-        GPIO_FN_TSIF2_TS_XX1,
-        GPIO_FN_TSIF2_TS_XX2,
-        GPIO_FN_TSIF2_TS_XX3,
-        GPIO_FN_TSIF2_TS_XX4,
-        GPIO_FN_TSIF2_TS_XX5,
-        GPIO_FN_TSIF1_TS_XX1,
-        GPIO_FN_TSIF1_TS_XX2,
-        GPIO_FN_TSIF1_TS_XX3,
-        GPIO_FN_TSIF1_TS_XX4,
-        GPIO_FN_TSIF1_TS_XX5,
-        GPIO_FN_TSIF0_TS_XX1,
-        GPIO_FN_TSIF0_TS_XX2,
-        GPIO_FN_TSIF0_TS_XX3,
-        GPIO_FN_TSIF0_TS_XX4,
-        GPIO_FN_TSIF0_TS_XX5,
-        GPIO_FN_MST1_TS_XX1,
-        GPIO_FN_MST1_TS_XX2,
-        GPIO_FN_MST1_TS_XX3,
-        GPIO_FN_MST1_TS_XX4,
-        GPIO_FN_MST1_TS_XX5,
-        GPIO_FN_MST0_TS_XX1,
-        GPIO_FN_MST0_TS_XX2,
-        GPIO_FN_MST0_TS_XX3,
-        GPIO_FN_MST0_TS_XX4,
-        GPIO_FN_MST0_TS_XX5,
-
-        /* MSEL3 special cases */
-        GPIO_FN_SDHI0_VCCQ_MC0_ON,
-        GPIO_FN_SDHI0_VCCQ_MC0_OFF,
-        GPIO_FN_DEBUG_MON_VIO,
-        GPIO_FN_DEBUG_MON_LCDD,
-        GPIO_FN_LCDC_LCDC0,
-        GPIO_FN_LCDC_LCDC1,
-
-        /* MSEL4 special cases */
-        GPIO_FN_IRQ9_MEM_INT,
-        GPIO_FN_IRQ9_MCP_INT,
-        GPIO_FN_A11,
-        GPIO_FN_TPU4TO3,
-        GPIO_FN_RESETA_N_PU_ON,
-        GPIO_FN_RESETA_N_PU_OFF,
-        GPIO_FN_EDBGREQ_PD,
-        GPIO_FN_EDBGREQ_PU,
-
-        /* end of GPIO */
-        GPIO_NR,
-};
-
 /* DMA slave IDs */
 enum {
         SHDMA_SLAVE_INVALID,
diff --git a/arch/arm/mach-shmobile/include/mach/zboot.h b/arch/arm/mach-shmobile/include/mach/zboot.h
index f2d8744c1f14..c3c4669a2d72 100644
--- a/arch/arm/mach-shmobile/include/mach/zboot.h
+++ b/arch/arm/mach-shmobile/include/mach/zboot.h
@@ -1,7 +1,6 @@
 #ifndef ZBOOT_H
 #define ZBOOT_H
 
-#include <asm/mach-types.h>
 #include <mach/zboot_macros.h>
 
 /**************************************************
@@ -11,7 +10,6 @@
  **************************************************/
 
 #ifdef CONFIG_MACH_MACKEREL
-#define MACH_TYPE       MACH_TYPE_MACKEREL
 #define MEMORY_START    0x40000000
 #include "mach/head-mackerel.txt"
 #else
diff --git a/arch/arm/mach-shmobile/intc-r8a7740.c b/arch/arm/mach-shmobile/intc-r8a7740.c
deleted file mode 100644
index 8871f7717dc8..000000000000
--- a/arch/arm/mach-shmobile/intc-r8a7740.c
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * R8A7740 processor support
- *
- * Copyright (C) 2011  Renesas Solutions Corp.
- * Copyright (C) 2011  Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-
-#include <linux/init.h>
-#include <linux/io.h>
-#include <linux/irqchip.h>
-#include <linux/irqchip/arm-gic.h>
-
-static void __init r8a7740_init_irq_common(void)
-{
-        void __iomem *intc_prio_base = ioremap_nocache(0xe6900010, 0x10);
-        void __iomem *intc_msk_base = ioremap_nocache(0xe6900040, 0x10);
-        void __iomem *pfc_inta_ctrl = ioremap_nocache(0xe605807c, 0x4);
-
-        /* route signals to GIC */
-        iowrite32(0x0, pfc_inta_ctrl);
-
-        /*
-         * To mask the shared interrupt to SPI 149 we must ensure to set
-         * PRIO *and* MASK. Else we run into IRQ floods when registering
-         * the intc_irqpin devices
-         */
-        iowrite32(0x0, intc_prio_base + 0x0);
-        iowrite32(0x0, intc_prio_base + 0x4);
-        iowrite32(0x0, intc_prio_base + 0x8);
-        iowrite32(0x0, intc_prio_base + 0xc);
-        iowrite8(0xff, intc_msk_base + 0x0);
-        iowrite8(0xff, intc_msk_base + 0x4);
-        iowrite8(0xff, intc_msk_base + 0x8);
-        iowrite8(0xff, intc_msk_base + 0xc);
-
-        iounmap(intc_prio_base);
-        iounmap(intc_msk_base);
-        iounmap(pfc_inta_ctrl);
-}
-
-void __init r8a7740_init_irq_of(void)
-{
-        irqchip_init();
-        r8a7740_init_irq_common();
-}
-
-void __init r8a7740_init_irq(void)
-{
-        void __iomem *gic_dist_base = ioremap_nocache(0xc2800000, 0x1000);
-        void __iomem *gic_cpu_base = ioremap_nocache(0xc2000000, 0x1000);
-
-        /* initialize the Generic Interrupt Controller PL390 r0p0 */
-        gic_init(0, 29, gic_dist_base, gic_cpu_base);
-        r8a7740_init_irq_common();
-}
diff --git a/arch/arm/mach-shmobile/intc-r8a7779.c b/arch/arm/mach-shmobile/intc-r8a7779.c
deleted file mode 100644
index b86dc8908724..000000000000
--- a/arch/arm/mach-shmobile/intc-r8a7779.c
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * r8a7779 processor support - INTC hardware block
- *
- * Copyright (C) 2011  Renesas Solutions Corp.
- * Copyright (C) 2011  Magnus Damm
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
- */
-#include <linux/kernel.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/io.h>
-#include <linux/irqchip/arm-gic.h>
-#include <linux/platform_data/irq-renesas-intc-irqpin.h>
-#include <linux/irqchip.h>
-#include <mach/common.h>
-#include <mach/intc.h>
-#include <mach/irqs.h>
-#include <mach/r8a7779.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-
-#define INT2SMSKCR0 IOMEM(0xfe7822a0)
-#define INT2SMSKCR1 IOMEM(0xfe7822a4)
-#define INT2SMSKCR2 IOMEM(0xfe7822a8)
-#define INT2SMSKCR3 IOMEM(0xfe7822ac)
-#define INT2SMSKCR4 IOMEM(0xfe7822b0)
-
-#define INT2NTSR0 IOMEM(0xfe700060)
-#define INT2NTSR1 IOMEM(0xfe700064)
-
-static struct renesas_intc_irqpin_config irqpin0_platform_data = {
-        .irq_base = irq_pin(0), /* IRQ0 -> IRQ3 */
-        .sense_bitfield_width = 2,
-};
-
-static struct resource irqpin0_resources[] = {
-        DEFINE_RES_MEM(0xfe78001c, 4), /* ICR1 */
-        DEFINE_RES_MEM(0xfe780010, 4), /* INTPRI */
-        DEFINE_RES_MEM(0xfe780024, 4), /* INTREQ */
-        DEFINE_RES_MEM(0xfe780044, 4), /* INTMSK0 */
-        DEFINE_RES_MEM(0xfe780064, 4), /* INTMSKCLR0 */
-        DEFINE_RES_IRQ(gic_spi(27)), /* IRQ0 */
-        DEFINE_RES_IRQ(gic_spi(28)), /* IRQ1 */
-        DEFINE_RES_IRQ(gic_spi(29)), /* IRQ2 */
-        DEFINE_RES_IRQ(gic_spi(30)), /* IRQ3 */
-};
-
-static struct platform_device irqpin0_device = {
-        .name           = "renesas_intc_irqpin",
-        .id             = 0,
-        .resource       = irqpin0_resources,
-        .num_resources  = ARRAY_SIZE(irqpin0_resources),
-        .dev            = {
-                .platform_data  = &irqpin0_platform_data,
-        },
-};
-
-void __init r8a7779_init_irq_extpin(int irlm)
-{
-        void __iomem *icr0 = ioremap_nocache(0xfe780000, PAGE_SIZE);
-        unsigned long tmp;
-
-        if (icr0) {
-                tmp = ioread32(icr0);
-                if (irlm)
-                        tmp |= 1 << 23; /* IRQ0 -> IRQ3 as individual pins */
-                else
-                        tmp &= ~(1 << 23); /* IRL mode - not supported */
-                tmp |= (1 << 21); /* LVLMODE = 1 */
-                iowrite32(tmp, icr0);
-                iounmap(icr0);
-
-                if (irlm)
-                        platform_device_register(&irqpin0_device);
-        } else
-                pr_warn("r8a7779: unable to setup external irq pin mode\n");
-}
-
-static int r8a7779_set_wake(struct irq_data *data, unsigned int on)
-{
-        return 0; /* always allow wakeup */
-}
-
-static void __init r8a7779_init_irq_common(void)
-{
-        gic_arch_extn.irq_set_wake = r8a7779_set_wake;
-
-        /* route all interrupts to ARM */
-        __raw_writel(0xffffffff, INT2NTSR0);
-        __raw_writel(0x3fffffff, INT2NTSR1);
-
-        /* unmask all known interrupts in INTCS2 */
-        __raw_writel(0xfffffff0, INT2SMSKCR0);
-        __raw_writel(0xfff7ffff, INT2SMSKCR1);
-        __raw_writel(0xfffbffdf, INT2SMSKCR2);
-        __raw_writel(0xbffffffc, INT2SMSKCR3);
-        __raw_writel(0x003fee3f, INT2SMSKCR4);
-}
-
-void __init r8a7779_init_irq(void)
-{
-        void __iomem *gic_dist_base = IOMEM(0xf0001000);
-        void __iomem *gic_cpu_base = IOMEM(0xf0000100);
-
-        /* use GIC to handle interrupts */
-        gic_init(0, 29, gic_dist_base, gic_cpu_base);
-
-        r8a7779_init_irq_common();
-}
-
-#ifdef CONFIG_OF
-void __init r8a7779_init_irq_dt(void)
-{
-        irqchip_init();
-        r8a7779_init_irq_common();
-}
-#endif
diff --git a/arch/arm/mach-shmobile/platsmp-scu.c b/arch/arm/mach-shmobile/platsmp-scu.c
new file mode 100644
index 000000000000..c96f50160be6
--- /dev/null
+++ b/arch/arm/mach-shmobile/platsmp-scu.c
@@ -0,0 +1,81 @@
+/*
+ * SMP support for SoCs with SCU covered by mach-shmobile
+ *
+ * Copyright (C) 2013  Magnus Damm
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/smp.h>
+#include <asm/cacheflush.h>
+#include <asm/smp_plat.h>
+#include <asm/smp_scu.h>
+#include <mach/common.h>
+
+void __init shmobile_smp_scu_prepare_cpus(unsigned int max_cpus)
+{
+        /* install boot code shared by all CPUs */
+        shmobile_boot_fn = virt_to_phys(shmobile_smp_boot);
+        shmobile_boot_arg = MPIDR_HWID_BITMASK;
+
+        /* enable SCU and cache coherency on booting CPU */
+        scu_enable(shmobile_scu_base);
+        scu_power_mode(shmobile_scu_base, SCU_PM_NORMAL);
+}
+
+int shmobile_smp_scu_boot_secondary(unsigned int cpu, struct task_struct *idle)
+{
+        /* For this particular CPU register SCU boot vector */
+        shmobile_smp_hook(cpu, virt_to_phys(shmobile_boot_scu),
+                          (unsigned long)shmobile_scu_base);
+        return 0;
+}
+
+#ifdef CONFIG_HOTPLUG_CPU
+void shmobile_smp_scu_cpu_die(unsigned int cpu)
+{
+        /* For this particular CPU deregister boot vector */
+        shmobile_smp_hook(cpu, 0, 0);
+
+        dsb();
+        flush_cache_all();
+
+        /* disable cache coherency */
+        scu_power_mode(shmobile_scu_base, SCU_PM_POWEROFF);
+
+        /* jump to shared mach-shmobile sleep / reset code */
+        shmobile_smp_sleep();
+}
+
+static int shmobile_smp_scu_psr_core_disabled(int cpu)
+{
+        unsigned long mask = SCU_PM_POWEROFF << (cpu * 8);
+
+        if ((__raw_readl(shmobile_scu_base + 8) & mask) == mask)
+                return 1;
+
+        return 0;
+}
+
+int shmobile_smp_scu_cpu_kill(unsigned int cpu)
+{
+        int k;
+
+        /* this function is running on another CPU than the offline target,
+         * here we need wait for shutdown code in platform_cpu_die() to
+         * finish before asking SoC-specific code to power off the CPU core.
+         */
+        for (k = 0; k < 1000; k++) {
+                if (shmobile_smp_scu_psr_core_disabled(cpu))
+                        return 1;
+
+                mdelay(1);
+        }
+
+        return 0;
+}
+#endif
diff --git a/arch/arm/mach-shmobile/platsmp.c b/arch/arm/mach-shmobile/platsmp.c
index 1f958d7b0bac..d4ae616bcedb 100644
--- a/arch/arm/mach-shmobile/platsmp.c
+++ b/arch/arm/mach-shmobile/platsmp.c
@@ -12,6 +12,9 @@
  */
 #include <linux/init.h>
 #include <linux/smp.h>
+#include <asm/cacheflush.h>
+#include <asm/smp_plat.h>
+#include <mach/common.h>
 
 void __init shmobile_smp_init_cpus(unsigned int ncores)
 {
@@ -26,3 +29,18 @@ void __init shmobile_smp_init_cpus(unsigned int ncores)
         for (i = 0; i < ncores; i++)
                 set_cpu_possible(i, true);
 }
+
+extern unsigned long shmobile_smp_fn[];
+extern unsigned long shmobile_smp_arg[];
+extern unsigned long shmobile_smp_mpidr[];
+
+void shmobile_smp_hook(unsigned int cpu, unsigned long fn, unsigned long arg)
+{
+        shmobile_smp_fn[cpu] = 0;
+        flush_cache_all();
+
+        shmobile_smp_mpidr[cpu] = cpu_logical_map(cpu);
+        shmobile_smp_fn[cpu] = fn;
+        shmobile_smp_arg[cpu] = arg;
+        flush_cache_all();
+}
diff --git a/arch/arm/mach-shmobile/setup-emev2.c b/arch/arm/mach-shmobile/setup-emev2.c
index 1ccddd228112..3ad531caf4f0 100644
--- a/arch/arm/mach-shmobile/setup-emev2.c
+++ b/arch/arm/mach-shmobile/setup-emev2.c
@@ -20,7 +20,6 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/irqchip.h>
 #include <linux/platform_device.h>
 #include <linux/platform_data/gpio-em.h>
 #include <linux/of_platform.h>
@@ -28,7 +27,6 @@
 #include <linux/input.h>
 #include <linux/io.h>
 #include <linux/irqchip/arm-gic.h>
-#include <mach/hardware.h>
 #include <mach/common.h>
 #include <mach/emev2.h>
 #include <mach/irqs.h>
@@ -39,13 +37,6 @@
 
 static struct map_desc emev2_io_desc[] __initdata = {
 #ifdef CONFIG_SMP
-        /* 128K entity map for 0xe0100000 (SMU) */
-        {
-                .virtual        = 0xe0100000,
-                .pfn            = __phys_to_pfn(0xe0100000),
-                .length         = SZ_128K,
-                .type           = MT_DEVICE
-        },
         /* 2M mapping for SCU + L2 controller */
         {
                 .virtual        = 0xf0000000,
@@ -63,102 +54,40 @@ void __init emev2_map_io(void)
 
 /* UART */
 static struct resource uart0_resources[] = {
-        [0]     = {
-                .start  = 0xe1020000,
-                .end    = 0xe1020037,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1]     = {
-                .start  = 40,
-                .flags  = IORESOURCE_IRQ,
-        }
-};
-
-static struct platform_device uart0_device = {
-        .name           = "serial8250-em",
-        .id             = 0,
-        .num_resources  = ARRAY_SIZE(uart0_resources),
-        .resource       = uart0_resources,
+        DEFINE_RES_MEM(0xe1020000, 0x38),
+        DEFINE_RES_IRQ(40),
 };
 
 static struct resource uart1_resources[] = {
-        [0]     = {
-                .start  = 0xe1030000,
-                .end    = 0xe1030037,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1]     = {
-                .start  = 41,
-                .flags  = IORESOURCE_IRQ,
-        }
-};
-
-static struct platform_device uart1_device = {
-        .name           = "serial8250-em",
-        .id             = 1,
-        .num_resources  = ARRAY_SIZE(uart1_resources),
-        .resource       = uart1_resources,
+        DEFINE_RES_MEM(0xe1030000, 0x38),
+        DEFINE_RES_IRQ(41),
 };
 
 static struct resource uart2_resources[] = {
-        [0]     = {
-                .start  = 0xe1040000,
-                .end    = 0xe1040037,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1]     = {
-                .start  = 42,
-                .flags  = IORESOURCE_IRQ,
-        }
-};
-
-static struct platform_device uart2_device = {
-        .name           = "serial8250-em",
-        .id             = 2,
-        .num_resources  = ARRAY_SIZE(uart2_resources),
-        .resource       = uart2_resources,
+        DEFINE_RES_MEM(0xe1040000, 0x38),
+        DEFINE_RES_IRQ(42),
 };
 
 static struct resource uart3_resources[] = {
-        [0]     = {
-                .start  = 0xe1050000,
-                .end    = 0xe1050037,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1]     = {
-                .start  = 43,
-                .flags  = IORESOURCE_IRQ,
-        }
+        DEFINE_RES_MEM(0xe1050000, 0x38),
+        DEFINE_RES_IRQ(43),
 };
 
-static struct platform_device uart3_device = {
-        .name           = "serial8250-em",
-        .id             = 3,
-        .num_resources  = ARRAY_SIZE(uart3_resources),
-        .resource       = uart3_resources,
-};
+#define emev2_register_uart(idx)                                        \
+        platform_device_register_simple("serial8250-em", idx,           \
+                                        uart##idx##_resources,          \
+                                        ARRAY_SIZE(uart##idx##_resources))
 
 /* STI */
 static struct resource sti_resources[] = {
-        [0] = {
-                .name   = "STI",
-                .start  = 0xe0180000,
-                .end    = 0xe0180053,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = 157,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device sti_device = {
-        .name           = "em_sti",
-        .id             = 0,
-        .resource       = sti_resources,
-        .num_resources  = ARRAY_SIZE(sti_resources),
+        DEFINE_RES_MEM(0xe0180000, 0x54),
+        DEFINE_RES_IRQ(157),
 };
 
+#define emev2_register_sti()                                    \
+        platform_device_register_simple("em_sti", 0,            \
+                                        sti_resources,          \
+                                        ARRAY_SIZE(sti_resources))
 
 /* GIO */
 static struct gpio_em_config gio0_config = {
@@ -168,36 +97,10 @@ static struct gpio_em_config gio0_config = {
 };
 
 static struct resource gio0_resources[] = {
-        [0] = {
-                .name   = "GIO_000",
-                .start  = 0xe0050000,
-                .end    = 0xe005002b,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .name   = "GIO_000",
-                .start  = 0xe0050040,
-                .end    = 0xe005005f,
-                .flags  = IORESOURCE_MEM,
-        },
-        [2] = {
-                .start  = 99,
-                .flags  = IORESOURCE_IRQ,
-        },
-        [3] = {
-                .start  = 100,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device gio0_device = {
-        .name           = "em_gio",
-        .id             = 0,
-        .resource       = gio0_resources,
-        .num_resources  = ARRAY_SIZE(gio0_resources),
-        .dev            = {
-                .platform_data  = &gio0_config,
-        },
+        DEFINE_RES_MEM(0xe0050000, 0x2c),
+        DEFINE_RES_MEM(0xe0050040, 0x20),
+        DEFINE_RES_IRQ(99),
+        DEFINE_RES_IRQ(100),
 };
 
 static struct gpio_em_config gio1_config = {
@@ -207,36 +110,10 @@ static struct gpio_em_config gio1_config = {
 };
 
 static struct resource gio1_resources[] = {
-        [0] = {
-                .name   = "GIO_032",
-                .start  = 0xe0050080,
-                .end    = 0xe00500ab,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .name   = "GIO_032",
-                .start  = 0xe00500c0,
-                .end    = 0xe00500df,
-                .flags  = IORESOURCE_MEM,
-        },
-        [2] = {
-                .start  = 101,
-                .flags  = IORESOURCE_IRQ,
-        },
-        [3] = {
-                .start  = 102,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device gio1_device = {
-        .name           = "em_gio",
-        .id             = 1,
-        .resource       = gio1_resources,
-        .num_resources  = ARRAY_SIZE(gio1_resources),
-        .dev            = {
-                .platform_data  = &gio1_config,
-        },
+        DEFINE_RES_MEM(0xe0050080, 0x2c),
+        DEFINE_RES_MEM(0xe00500c0, 0x20),
+        DEFINE_RES_IRQ(101),
+        DEFINE_RES_IRQ(102),
 };
 
 static struct gpio_em_config gio2_config = {
@@ -246,36 +123,10 @@ static struct gpio_em_config gio2_config = {
 };
 
 static struct resource gio2_resources[] = {
-        [0] = {
-                .name   = "GIO_064",
-                .start  = 0xe0050100,
-                .end    = 0xe005012b,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .name   = "GIO_064",
-                .start  = 0xe0050140,
-                .end    = 0xe005015f,
-                .flags  = IORESOURCE_MEM,
-        },
-        [2] = {
-                .start  = 103,
-                .flags  = IORESOURCE_IRQ,
-        },
-        [3] = {
-                .start  = 104,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device gio2_device = {
-        .name           = "em_gio",
-        .id             = 2,
-        .resource       = gio2_resources,
-        .num_resources  = ARRAY_SIZE(gio2_resources),
-        .dev            = {
-                .platform_data  = &gio2_config,
-        },
+        DEFINE_RES_MEM(0xe0050100, 0x2c),
+        DEFINE_RES_MEM(0xe0050140, 0x20),
+        DEFINE_RES_IRQ(103),
+        DEFINE_RES_IRQ(104),
 };
 
 static struct gpio_em_config gio3_config = {
@@ -285,36 +136,10 @@ static struct gpio_em_config gio3_config = {
 };
 
 static struct resource gio3_resources[] = {
-        [0] = {
-                .name   = "GIO_096",
-                .start  = 0xe0050180,
-                .end    = 0xe00501ab,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .name   = "GIO_096",
-                .start  = 0xe00501c0,
-                .end    = 0xe00501df,
-                .flags  = IORESOURCE_MEM,
-        },
-        [2] = {
-                .start  = 105,
-                .flags  = IORESOURCE_IRQ,
-        },
-        [3] = {
-                .start  = 106,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device gio3_device = {
-        .name           = "em_gio",
-        .id             = 3,
-        .resource       = gio3_resources,
-        .num_resources  = ARRAY_SIZE(gio3_resources),
-        .dev            = {
-                .platform_data  = &gio3_config,
-        },
+        DEFINE_RES_MEM(0xe0050180, 0x2c),
+        DEFINE_RES_MEM(0xe00501c0, 0x20),
+        DEFINE_RES_IRQ(105),
+        DEFINE_RES_IRQ(106),
 };
 
 static struct gpio_em_config gio4_config = {
@@ -324,126 +149,53 @@ static struct gpio_em_config gio4_config = {
 };
 
 static struct resource gio4_resources[] = {
-        [0] = {
-                .name   = "GIO_128",
-                .start  = 0xe0050200,
-                .end    = 0xe005022b,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .name   = "GIO_128",
-                .start  = 0xe0050240,
-                .end    = 0xe005025f,
-                .flags  = IORESOURCE_MEM,
-        },
-        [2] = {
-                .start  = 107,
-                .flags  = IORESOURCE_IRQ,
-        },
-        [3] = {
-                .start  = 108,
-                .flags  = IORESOURCE_IRQ,
-        },
+        DEFINE_RES_MEM(0xe0050200, 0x2c),
+        DEFINE_RES_MEM(0xe0050240, 0x20),
+        DEFINE_RES_IRQ(107),
+        DEFINE_RES_IRQ(108),
 };
 
-static struct platform_device gio4_device = {
-        .name           = "em_gio",
-        .id             = 4,
-        .resource       = gio4_resources,
-        .num_resources  = ARRAY_SIZE(gio4_resources),
-        .dev            = {
-                .platform_data  = &gio4_config,
-        },
-};
+#define emev2_register_gio(idx)                                         \
+        platform_device_register_resndata(&platform_bus, "em_gio",      \
+                                          idx, gio##idx##_resources,    \
+                                          ARRAY_SIZE(gio##idx##_resources), \
+                                          &gio##idx##_config,           \
+                                          sizeof(struct gpio_em_config))
 
 static struct resource pmu_resources[] = {
-        [0] = {
-                .start  = 152,
-                .end    = 152,
-                .flags  = IORESOURCE_IRQ,
-        },
-        [1] = {
-                .start  = 153,
-                .end    = 153,
-                .flags  = IORESOURCE_IRQ,
-        },
-};
-
-static struct platform_device pmu_device = {
-        .name           = "arm-pmu",
-        .id             = -1,
-        .num_resources  = ARRAY_SIZE(pmu_resources),
-        .resource       = pmu_resources,
+        DEFINE_RES_IRQ(152),
+        DEFINE_RES_IRQ(153),
 };
 
-static struct platform_device *emev2_early_devices[] __initdata = {
-        &uart0_device,
-        &uart1_device,
-        &uart2_device,
-        &uart3_device,
-};
-
-static struct platform_device *emev2_late_devices[] __initdata = {
-        &sti_device,
-        &gio0_device,
-        &gio1_device,
-        &gio2_device,
-        &gio3_device,
-        &gio4_device,
-        &pmu_device,
-};
+#define emev2_register_pmu()                                    \
+        platform_device_register_simple("arm-pmu", -1,          \
+                                        pmu_resources,          \
+                                        ARRAY_SIZE(pmu_resources))
 
 void __init emev2_add_standard_devices(void)
 {
-        emev2_clock_init();
-
-        platform_add_devices(emev2_early_devices,
-                             ARRAY_SIZE(emev2_early_devices));
-
-        platform_add_devices(emev2_late_devices,
-                             ARRAY_SIZE(emev2_late_devices));
+        if (!IS_ENABLED(CONFIG_COMMON_CLK))
+                emev2_clock_init();
+
+        emev2_register_uart(0);
+        emev2_register_uart(1);
+        emev2_register_uart(2);
+        emev2_register_uart(3);
+        emev2_register_sti();
+        emev2_register_gio(0);
+        emev2_register_gio(1);
+        emev2_register_gio(2);
+        emev2_register_gio(3);
+        emev2_register_gio(4);
+        emev2_register_pmu();
 }
 
-static void __init emev2_init_delay(void)
+void __init emev2_init_delay(void)
 {
         shmobile_setup_delay(533, 1, 3); /* Cortex-A9 @ 533MHz */
 }
 
-void __init emev2_add_early_devices(void)
-{
-        emev2_init_delay();
-
-        early_platform_add_devices(emev2_early_devices,
-                                   ARRAY_SIZE(emev2_early_devices));
-
-        /* setup early console here as well */
-        shmobile_setup_console();
-}
-
-void __init emev2_init_irq(void)
-{
-        void __iomem *gic_dist_base;
-        void __iomem *gic_cpu_base;
-
-        /* Static mappings, never released */
-        gic_dist_base = ioremap(0xe0028000, PAGE_SIZE);
-        gic_cpu_base = ioremap(0xe0020000, PAGE_SIZE);
-        BUG_ON(!gic_dist_base || !gic_cpu_base);
-
-        /* Use GIC to handle interrupts */
-        gic_init(0, 29, gic_dist_base, gic_cpu_base);
-}
-
 #ifdef CONFIG_USE_OF
-static const struct of_dev_auxdata emev2_auxdata_lookup[] __initconst = {
-        { }
-};
-
-static void __init emev2_add_standard_devices_dt(void)
-{
-        of_platform_populate(NULL, of_default_bus_match_table,
-                             emev2_auxdata_lookup, NULL);
-}
 
 static const char *emev2_boards_compat_dt[] __initdata = {
         "renesas,emev2",
@@ -452,10 +204,8 @@ static const char *emev2_boards_compat_dt[] __initdata = {
 
 DT_MACHINE_START(EMEV2_DT, "Generic Emma Mobile EV2 (Flattened Device Tree)")
         .smp            = smp_ops(emev2_smp_ops),
+        .map_io         = emev2_map_io,
         .init_early     = emev2_init_delay,
-        .nr_irqs        = NR_IRQS_LEGACY,
-        .init_irq       = irqchip_init,
-        .init_machine   = emev2_add_standard_devices_dt,
         .dt_compat      = emev2_boards_compat_dt,
 MACHINE_END
 
diff --git a/arch/arm/mach-shmobile/setup-r8a73a4.c b/arch/arm/mach-shmobile/setup-r8a73a4.c
index 7f45c2edbca9..89491700afb7 100644
--- a/arch/arm/mach-shmobile/setup-r8a73a4.c
+++ b/arch/arm/mach-shmobile/setup-r8a73a4.c
@@ -18,11 +18,11 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 #include <linux/irq.h>
-#include <linux/irqchip.h>
 #include <linux/kernel.h>
 #include <linux/of_platform.h>
 #include <linux/platform_data/irq-renesas-irqc.h>
 #include <linux/serial_sci.h>
+#include <linux/sh_timer.h>
 #include <mach/common.h>
 #include <mach/irqs.h>
 #include <mach/r8a73a4.h>
@@ -169,7 +169,26 @@ static const struct resource thermal0_resources[] = {
                                         thermal0_resources,             \
                                         ARRAY_SIZE(thermal0_resources))
 
-void __init r8a73a4_add_standard_devices(void)
+static struct sh_timer_config cmt10_platform_data = {
+        .name = "CMT10",
+        .timer_bit = 0,
+        .clockevent_rating = 80,
+};
+
+static struct resource cmt10_resources[] = {
+        DEFINE_RES_MEM(0xe6130010, 0x0c),
+        DEFINE_RES_MEM(0xe6130000, 0x04),
+        DEFINE_RES_IRQ(gic_spi(120)), /* CMT1_0 */
+};
+
+#define r8a7790_register_cmt(idx)                                       \
+        platform_device_register_resndata(&platform_bus, "sh_cmt",      \
+                                          idx, cmt##idx##_resources,    \
+                                          ARRAY_SIZE(cmt##idx##_resources), \
+                                          &cmt##idx##_platform_data,    \
+                                          sizeof(struct sh_timer_config))
+
+void __init r8a73a4_add_dt_devices(void)
 {
         r8a73a4_register_scif(SCIFA0);
         r8a73a4_register_scif(SCIFA1);
@@ -177,26 +196,33 @@ void __init r8a73a4_add_standard_devices(void)
         r8a73a4_register_scif(SCIFB1);
         r8a73a4_register_scif(SCIFB2);
         r8a73a4_register_scif(SCIFB3);
+        r8a7790_register_cmt(10);
+}
+
+void __init r8a73a4_add_standard_devices(void)
+{
+        r8a73a4_add_dt_devices();
         r8a73a4_register_irqc(0);
         r8a73a4_register_irqc(1);
         r8a73a4_register_thermal();
 }
 
-#ifdef CONFIG_USE_OF
-void __init r8a73a4_add_standard_devices_dt(void)
+void __init r8a73a4_init_delay(void)
 {
-        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+#ifndef CONFIG_ARM_ARCH_TIMER
+        shmobile_setup_delay(1500, 2, 4); /* Cortex-A15 @ 1500MHz */
+#endif
 }
 
+#ifdef CONFIG_USE_OF
+
 static const char *r8a73a4_boards_compat_dt[] __initdata = {
         "renesas,r8a73a4",
         NULL,
 };
 
 DT_MACHINE_START(R8A73A4_DT, "Generic R8A73A4 (Flattened Device Tree)")
-        .init_irq       = irqchip_init,
-        .init_machine   = r8a73a4_add_standard_devices_dt,
-        .init_time      = shmobile_timer_init,
+        .init_early     = r8a73a4_init_delay,
         .dt_compat      = r8a73a4_boards_compat_dt,
 MACHINE_END
 #endif /* CONFIG_USE_OF */
diff --git a/arch/arm/mach-shmobile/setup-r8a7740.c b/arch/arm/mach-shmobile/setup-r8a7740.c
index 00c5a707238b..b7d4b2c3bc29 100644
--- a/arch/arm/mach-shmobile/setup-r8a7740.c
+++ b/arch/arm/mach-shmobile/setup-r8a7740.c
@@ -22,6 +22,8 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/io.h>
+#include <linux/irqchip.h>
+#include <linux/irqchip/arm-gic.h>
 #include <linux/platform_data/irq-renesas-intc-irqpin.h>
 #include <linux/platform_device.h>
 #include <linux/of_platform.h>
@@ -588,6 +590,16 @@ static const struct sh_dmae_slave_config r8a7740_dmae_slaves[] = {
                 .addr           = 0xfe1f0064,
                 .chcr           = CHCR_TX(XMIT_SZ_32BIT),
                 .mid_rid        = 0xb5,
+        }, {
+                .slave_id       = SHDMA_SLAVE_MMCIF_TX,
+                .addr           = 0xe6bd0034,
+                .chcr           = CHCR_TX(XMIT_SZ_32BIT),
+                .mid_rid        = 0xd1,
+        }, {
+                .slave_id       = SHDMA_SLAVE_MMCIF_RX,
+                .addr           = 0xe6bd0034,
+                .chcr           = CHCR_RX(XMIT_SZ_32BIT),
+                .mid_rid        = 0xd2,
         },
 };
 
@@ -986,16 +998,22 @@ void __init r8a7740_add_early_devices(void)
 
 #ifdef CONFIG_USE_OF
 
-static const struct of_dev_auxdata r8a7740_auxdata_lookup[] __initconst = {
-        { }
-};
+void __init r8a7740_add_early_devices_dt(void)
+{
+        shmobile_setup_delay(800, 1, 3); /* Cortex-A9 @ 800MHz */
+
+        early_platform_add_devices(r8a7740_early_devices,
+                                   ARRAY_SIZE(r8a7740_early_devices));
+
+        /* setup early console here as well */
+        shmobile_setup_console();
+}
 
 void __init r8a7740_add_standard_devices_dt(void)
 {
         platform_add_devices(r8a7740_devices_dt,
                             ARRAY_SIZE(r8a7740_devices_dt));
-        of_platform_populate(NULL, of_default_bus_match_table,
-                             r8a7740_auxdata_lookup, NULL);
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
 void __init r8a7740_init_delay(void)
@@ -1003,6 +1021,36 @@ void __init r8a7740_init_delay(void)
         shmobile_setup_delay(800, 1, 3); /* Cortex-A9 @ 800MHz */
 };
 
+void __init r8a7740_init_irq_of(void)
+{
+        void __iomem *intc_prio_base = ioremap_nocache(0xe6900010, 0x10);
+        void __iomem *intc_msk_base = ioremap_nocache(0xe6900040, 0x10);
+        void __iomem *pfc_inta_ctrl = ioremap_nocache(0xe605807c, 0x4);
+
+        irqchip_init();
+
+        /* route signals to GIC */
+        iowrite32(0x0, pfc_inta_ctrl);
+
+        /*
+         * To mask the shared interrupt to SPI 149 we must ensure to set
+         * PRIO *and* MASK. Else we run into IRQ floods when registering
+         * the intc_irqpin devices
+         */
+        iowrite32(0x0, intc_prio_base + 0x0);
+        iowrite32(0x0, intc_prio_base + 0x4);
+        iowrite32(0x0, intc_prio_base + 0x8);
+        iowrite32(0x0, intc_prio_base + 0xc);
+        iowrite8(0xff, intc_msk_base + 0x0);
+        iowrite8(0xff, intc_msk_base + 0x4);
+        iowrite8(0xff, intc_msk_base + 0x8);
+        iowrite8(0xff, intc_msk_base + 0xc);
+
+        iounmap(intc_prio_base);
+        iounmap(intc_msk_base);
+        iounmap(pfc_inta_ctrl);
+}
+
 static void __init r8a7740_generic_init(void)
 {
         r8a7740_clock_init(0);
@@ -1019,7 +1067,6 @@ DT_MACHINE_START(R8A7740_DT, "Generic R8A7740 (Flattened Device Tree)")
         .init_early     = r8a7740_init_delay,
         .init_irq       = r8a7740_init_irq_of,
         .init_machine   = r8a7740_generic_init,
-        .init_time      = shmobile_timer_init,
         .dt_compat      = r8a7740_boards_compat_dt,
 MACHINE_END
 
diff --git a/arch/arm/mach-shmobile/setup-r8a7778.c b/arch/arm/mach-shmobile/setup-r8a7778.c
index 80c20392ad7c..6a2657ebd197 100644
--- a/arch/arm/mach-shmobile/setup-r8a7778.c
+++ b/arch/arm/mach-shmobile/setup-r8a7778.c
@@ -53,7 +53,7 @@
         .irqs           = SCIx_IRQ_MUXED(irq),                  \
 }
 
-static struct plat_sci_port scif_platform_data[] = {
+static struct plat_sci_port scif_platform_data[] __initdata = {
         SCIF_INFO(0xffe40000, gic_iid(0x66)),
         SCIF_INFO(0xffe41000, gic_iid(0x67)),
         SCIF_INFO(0xffe42000, gic_iid(0x68)),
@@ -63,24 +63,24 @@ static struct plat_sci_port scif_platform_data[] = {
 };
 
 /* TMU */
-static struct resource sh_tmu0_resources[] = {
+static struct resource sh_tmu0_resources[] __initdata = {
         DEFINE_RES_MEM(0xffd80008, 12),
         DEFINE_RES_IRQ(gic_iid(0x40)),
 };
 
-static struct sh_timer_config sh_tmu0_platform_data = {
+static struct sh_timer_config sh_tmu0_platform_data __initdata = {
         .name                   = "TMU00",
         .channel_offset         = 0x4,
         .timer_bit              = 0,
         .clockevent_rating      = 200,
 };
 
-static struct resource sh_tmu1_resources[] = {
+static struct resource sh_tmu1_resources[] __initdata = {
         DEFINE_RES_MEM(0xffd80014, 12),
         DEFINE_RES_IRQ(gic_iid(0x41)),
 };
 
-static struct sh_timer_config sh_tmu1_platform_data = {
+static struct sh_timer_config sh_tmu1_platform_data __initdata = {
         .name                   = "TMU01",
         .channel_offset         = 0x10,
         .timer_bit              = 1,
@@ -95,20 +95,6 @@ static struct sh_timer_config sh_tmu1_platform_data = {
                 &sh_tmu##idx##_platform_data,           \
                 sizeof(sh_tmu##idx##_platform_data))
 
-/* USB PHY */
-static struct resource usb_phy_resources[] __initdata = {
-        DEFINE_RES_MEM(0xffe70800, 0x100),
-        DEFINE_RES_MEM(0xffe76000, 0x100),
-};
-
-void __init r8a7778_add_usb_phy_device(struct rcar_phy_platform_data *pdata)
-{
-        platform_device_register_resndata(&platform_bus, "rcar_usb_phy", -1,
-                                          usb_phy_resources,
-                                          ARRAY_SIZE(usb_phy_resources),
-                                          pdata, sizeof(*pdata));
-}
-
 /* USB */
 static struct usb_phy *phy;
 
@@ -189,7 +175,7 @@ USB_PLATFORM_INFO(ehci);
 USB_PLATFORM_INFO(ohci);
 
 /* Ether */
-static struct resource ether_resources[] = {
+static struct resource ether_resources[] __initdata = {
         DEFINE_RES_MEM(0xfde00000, 0x400),
         DEFINE_RES_IRQ(gic_iid(0x89)),
 };
@@ -203,17 +189,17 @@ void __init r8a7778_add_ether_device(struct sh_eth_plat_data *pdata)
 }
 
 /* PFC/GPIO */
-static struct resource pfc_resources[] = {
+static struct resource pfc_resources[] __initdata = {
         DEFINE_RES_MEM(0xfffc0000, 0x118),
 };
 
 #define R8A7778_GPIO(idx)                                               \
-static struct resource r8a7778_gpio##idx##_resources[] = {              \
+static struct resource r8a7778_gpio##idx##_resources[] __initdata = {   \
         DEFINE_RES_MEM(0xffc40000 + 0x1000 * (idx), 0x30),              \
         DEFINE_RES_IRQ(gic_iid(0x87)),                                  \
 };                                                                      \
                                                                         \
-static struct gpio_rcar_config r8a7778_gpio##idx##_platform_data = {    \
+static struct gpio_rcar_config r8a7778_gpio##idx##_platform_data __initdata = { \
         .gpio_base      = 32 * (idx),                                   \
         .irq_base       = GPIO_IRQ_BASE(idx),                           \
         .number_of_pins = 32,                                           \
@@ -248,30 +234,6 @@ void __init r8a7778_pinmux_init(void)
         r8a7778_register_gpio(4);
 };
 
-/* SDHI */
-static struct resource sdhi_resources[] = {
-        /* SDHI0 */
-        DEFINE_RES_MEM(0xFFE4C000, 0x100),
-        DEFINE_RES_IRQ(gic_iid(0x77)),
-        /* SDHI1 */
-        DEFINE_RES_MEM(0xFFE4D000, 0x100),
-        DEFINE_RES_IRQ(gic_iid(0x78)),
-        /* SDHI2 */
-        DEFINE_RES_MEM(0xFFE4F000, 0x100),
-        DEFINE_RES_IRQ(gic_iid(0x76)),
-};
-
-void __init r8a7778_sdhi_init(int id,
-                              struct sh_mobile_sdhi_info *info)
-{
-        BUG_ON(id < 0 || id > 2);
-
-        platform_device_register_resndata(
-                &platform_bus, "sh_mobile_sdhi", id,
-                sdhi_resources + (2 * id), 2,
-                info, sizeof(*info));
-}
-
 /* I2C */
 static struct resource i2c_resources[] __initdata = {
         /* I2C0 */
@@ -288,7 +250,7 @@ static struct resource i2c_resources[] __initdata = {
         DEFINE_RES_IRQ(gic_iid(0x6d)),
 };
 
-void __init r8a7778_add_i2c_device(int id)
+static void __init r8a7778_register_i2c(int id)
 {
         BUG_ON(id < 0 || id > 3);
 
@@ -310,7 +272,7 @@ static struct resource hspi_resources[] __initdata = {
         DEFINE_RES_IRQ(gic_iid(0x75)),
 };
 
-void __init r8a7778_add_hspi_device(int id)
+void __init r8a7778_register_hspi(int id)
 {
         BUG_ON(id < 0 || id > 2);
 
@@ -319,21 +281,41 @@ void __init r8a7778_add_hspi_device(int id)
                 hspi_resources + (2 * id), 2);
 }
 
-/* MMC */
-static struct resource mmc_resources[] __initdata = {
-        DEFINE_RES_MEM(0xffe4e000, 0x100),
-        DEFINE_RES_IRQ(gic_iid(0x5d)),
+/* VIN */
+#define R8A7778_VIN(idx)                                                \
+static struct resource vin##idx##_resources[] __initdata = {            \
+        DEFINE_RES_MEM(0xffc50000 + 0x1000 * (idx), 0x1000),            \
+        DEFINE_RES_IRQ(gic_iid(0x5a)),                                  \
+};                                                                      \
+                                                                        \
+static struct platform_device_info vin##idx##_info __initdata = {       \
+        .parent         = &platform_bus,                                \
+        .name           = "r8a7778-vin",                                \
+        .id             = idx,                                          \
+        .res            = vin##idx##_resources,                         \
+        .num_res        = ARRAY_SIZE(vin##idx##_resources),             \
+        .dma_mask       = DMA_BIT_MASK(32),                             \
+}
+
+R8A7778_VIN(0);
+R8A7778_VIN(1);
+
+static struct platform_device_info *vin_info_table[] __initdata = {
+        &vin0_info,
+        &vin1_info,
 };
 
-void __init r8a7778_add_mmc_device(struct sh_mmcif_plat_data *info)
+void __init r8a7778_add_vin_device(int id, struct rcar_vin_platform_data *pdata)
 {
-        platform_device_register_resndata(
-                &platform_bus, "sh_mmcif", -1,
-                mmc_resources, ARRAY_SIZE(mmc_resources),
-                info, sizeof(*info));
+        BUG_ON(id < 0 || id > 1);
+
+        vin_info_table[id]->data = pdata;
+        vin_info_table[id]->size_data = sizeof(*pdata);
+
+        platform_device_register_full(vin_info_table[id]);
 }
 
-void __init r8a7778_add_standard_devices(void)
+void __init r8a7778_add_dt_devices(void)
 {
         int i;
 
@@ -357,6 +339,18 @@ void __init r8a7778_add_standard_devices(void)
         r8a7778_register_tmu(1);
 }
 
+void __init r8a7778_add_standard_devices(void)
+{
+        r8a7778_add_dt_devices();
+        r8a7778_register_i2c(0);
+        r8a7778_register_i2c(1);
+        r8a7778_register_i2c(2);
+        r8a7778_register_i2c(3);
+        r8a7778_register_hspi(0);
+        r8a7778_register_hspi(1);
+        r8a7778_register_hspi(2);
+}
+
 void __init r8a7778_init_late(void)
 {
         phy = usb_get_phy(USB_PHY_TYPE_USB2);
@@ -365,12 +359,12 @@ void __init r8a7778_init_late(void)
         platform_device_register_full(&ohci_info);
 }
 
-static struct renesas_intc_irqpin_config irqpin_platform_data = {
+static struct renesas_intc_irqpin_config irqpin_platform_data __initdata = {
         .irq_base = irq_pin(0), /* IRQ0 -> IRQ3 */
         .sense_bitfield_width = 2,
 };
 
-static struct resource irqpin_resources[] = {
+static struct resource irqpin_resources[] __initdata = {
         DEFINE_RES_MEM(0xfe78001c, 4), /* ICR1 */
         DEFINE_RES_MEM(0xfe780010, 4), /* INTPRI */
         DEFINE_RES_MEM(0xfe780024, 4), /* INTREQ */
@@ -408,17 +402,25 @@ void __init r8a7778_init_irq_extpin(int irlm)
                         &irqpin_platform_data, sizeof(irqpin_platform_data));
 }
 
+void __init r8a7778_init_delay(void)
+{
+        shmobile_setup_delay(800, 1, 3); /* Cortex-A9 @ 800MHz */
+}
+
+#ifdef CONFIG_USE_OF
 #define INT2SMSKCR0     0x82288 /* 0xfe782288 */
 #define INT2SMSKCR1     0x8228c /* 0xfe78228c */
 
 #define INT2NTSR0       0x00018 /* 0xfe700018 */
 #define INT2NTSR1       0x0002c /* 0xfe70002c */
-static void __init r8a7778_init_irq_common(void)
+void __init r8a7778_init_irq_dt(void)
 {
         void __iomem *base = ioremap_nocache(0xfe700000, 0x00100000);
 
         BUG_ON(!base);
 
+        irqchip_init();
+
         /* route all interrupts to ARM */
         __raw_writel(0x73ffffff, base + INT2NTSR0);
         __raw_writel(0xffffffff, base + INT2NTSR1);
@@ -430,43 +432,6 @@ static void __init r8a7778_init_irq_common(void)
         iounmap(base);
 }
 
-void __init r8a7778_init_irq(void)
-{
-        void __iomem *gic_dist_base;
-        void __iomem *gic_cpu_base;
-
-        gic_dist_base = ioremap_nocache(0xfe438000, PAGE_SIZE);
-        gic_cpu_base  = ioremap_nocache(0xfe430000, PAGE_SIZE);
-        BUG_ON(!gic_dist_base || !gic_cpu_base);
-
-        /* use GIC to handle interrupts */
-        gic_init(0, 29, gic_dist_base, gic_cpu_base);
-
-        r8a7778_init_irq_common();
-}
-
-void __init r8a7778_init_delay(void)
-{
-        shmobile_setup_delay(800, 1, 3); /* Cortex-A9 @ 800MHz */
-}
-
-#ifdef CONFIG_USE_OF
-void __init r8a7778_init_irq_dt(void)
-{
-        irqchip_init();
-        r8a7778_init_irq_common();
-}
-
-static const struct of_dev_auxdata r8a7778_auxdata_lookup[] __initconst = {
-        {},
-};
-
-void __init r8a7778_add_standard_devices_dt(void)
-{
-        of_platform_populate(NULL, of_default_bus_match_table,
-                             r8a7778_auxdata_lookup, NULL);
-}
-
 static const char *r8a7778_compat_dt[] __initdata = {
         "renesas,r8a7778",
         NULL,
@@ -475,8 +440,6 @@ static const char *r8a7778_compat_dt[] __initdata = {
 DT_MACHINE_START(R8A7778_DT, "Generic R8A7778 (Flattened Device Tree)")
         .init_early     = r8a7778_init_delay,
         .init_irq       = r8a7778_init_irq_dt,
-        .init_machine   = r8a7778_add_standard_devices_dt,
-        .init_time      = shmobile_timer_init,
         .dt_compat      = r8a7778_compat_dt,
         .init_late      = r8a7778_init_late,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/setup-r8a7779.c b/arch/arm/mach-shmobile/setup-r8a7779.c
index 398687761f50..ecd0148ee1e1 100644
--- a/arch/arm/mach-shmobile/setup-r8a7779.c
+++ b/arch/arm/mach-shmobile/setup-r8a7779.c
@@ -22,14 +22,16 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
+#include <linux/irqchip.h>
+#include <linux/irqchip/arm-gic.h>
 #include <linux/of_platform.h>
 #include <linux/platform_data/gpio-rcar.h>
+#include <linux/platform_data/irq-renesas-intc-irqpin.h>
 #include <linux/platform_device.h>
 #include <linux/delay.h>
 #include <linux/input.h>
 #include <linux/io.h>
 #include <linux/serial_sci.h>
-#include <linux/sh_intc.h>
 #include <linux/sh_timer.h>
 #include <linux/dma-mapping.h>
 #include <linux/usb/otg.h>
@@ -37,7 +39,6 @@
 #include <linux/usb/ehci_pdriver.h>
 #include <linux/usb/ohci_pdriver.h>
 #include <linux/pm_runtime.h>
-#include <mach/hardware.h>
 #include <mach/irqs.h>
 #include <mach/r8a7779.h>
 #include <mach/common.h>
@@ -69,6 +70,60 @@ void __init r8a7779_map_io(void)
         iotable_init(r8a7779_io_desc, ARRAY_SIZE(r8a7779_io_desc));
 }
 
+/* IRQ */
+#define INT2SMSKCR0 IOMEM(0xfe7822a0)
+#define INT2SMSKCR1 IOMEM(0xfe7822a4)
+#define INT2SMSKCR2 IOMEM(0xfe7822a8)
+#define INT2SMSKCR3 IOMEM(0xfe7822ac)
+#define INT2SMSKCR4 IOMEM(0xfe7822b0)
+
+#define INT2NTSR0 IOMEM(0xfe700060)
+#define INT2NTSR1 IOMEM(0xfe700064)
+
+static struct renesas_intc_irqpin_config irqpin0_platform_data __initdata = {
+        .irq_base = irq_pin(0), /* IRQ0 -> IRQ3 */
+        .sense_bitfield_width = 2,
+};
+
+static struct resource irqpin0_resources[] __initdata = {
+        DEFINE_RES_MEM(0xfe78001c, 4), /* ICR1 */
+        DEFINE_RES_MEM(0xfe780010, 4), /* INTPRI */
+        DEFINE_RES_MEM(0xfe780024, 4), /* INTREQ */
+        DEFINE_RES_MEM(0xfe780044, 4), /* INTMSK0 */
+        DEFINE_RES_MEM(0xfe780064, 4), /* INTMSKCLR0 */
+        DEFINE_RES_IRQ(gic_spi(27)), /* IRQ0 */
+        DEFINE_RES_IRQ(gic_spi(28)), /* IRQ1 */
+        DEFINE_RES_IRQ(gic_spi(29)), /* IRQ2 */
+        DEFINE_RES_IRQ(gic_spi(30)), /* IRQ3 */
+};
+
+void __init r8a7779_init_irq_extpin(int irlm)
+{
+        void __iomem *icr0 = ioremap_nocache(0xfe780000, PAGE_SIZE);
+        u32 tmp;
+
+        if (!icr0) {
+                pr_warn("r8a7779: unable to setup external irq pin mode\n");
+                return;
+        }
+
+        tmp = ioread32(icr0);
+        if (irlm)
+                tmp |= 1 << 23; /* IRQ0 -> IRQ3 as individual pins */
+        else
+                tmp &= ~(1 << 23); /* IRL mode - not supported */
+        tmp |= (1 << 21); /* LVLMODE = 1 */
+        iowrite32(tmp, icr0);
+        iounmap(icr0);
+
+        if (irlm)
+                platform_device_register_resndata(
+                        &platform_bus, "renesas_intc_irqpin", -1,
+                        irqpin0_resources, ARRAY_SIZE(irqpin0_resources),
+                        &irqpin0_platform_data, sizeof(irqpin0_platform_data));
+}
+
+/* PFC/GPIO */
 static struct resource r8a7779_pfc_resources[] = {
         DEFINE_RES_MEM(0xfffc0000, 0x023c),
 };
@@ -388,15 +443,6 @@ static struct platform_device sata_device = {
         },
 };
 
-/* USB PHY */
-static struct resource usb_phy_resources[] __initdata = {
-        [0] = {
-                .start          = 0xffe70800,
-                .end            = 0xffe70900 - 1,
-                .flags          = IORESOURCE_MEM,
-        },
-};
-
 /* USB */
 static struct usb_phy *phy;
 
@@ -548,7 +594,7 @@ static struct platform_device ohci1_device = {
 };
 
 /* Ether */
-static struct resource ether_resources[] = {
+static struct resource ether_resources[] __initdata = {
         {
                 .start  = 0xfde00000,
                 .end    = 0xfde003ff,
@@ -559,6 +605,33 @@ static struct resource ether_resources[] = {
         },
 };
 
+#define R8A7779_VIN(idx) \
+static struct resource vin##idx##_resources[] __initdata = {            \
+        DEFINE_RES_MEM(0xffc50000 + 0x1000 * (idx), 0x1000),            \
+        DEFINE_RES_IRQ(gic_iid(0x5f + (idx))),                          \
+};                                                                      \
+                                                                        \
+static struct platform_device_info vin##idx##_info __initdata = {       \
+        .parent         = &platform_bus,                                \
+        .name           = "r8a7779-vin",                                \
+        .id             = idx,                                          \
+        .res            = vin##idx##_resources,                         \
+        .num_res        = ARRAY_SIZE(vin##idx##_resources),             \
+        .dma_mask       = DMA_BIT_MASK(32),                             \
+}
+
+R8A7779_VIN(0);
+R8A7779_VIN(1);
+R8A7779_VIN(2);
+R8A7779_VIN(3);
+
+static struct platform_device_info *vin_info_table[] __initdata = {
+        &vin0_info,
+        &vin1_info,
+        &vin2_info,
+        &vin3_info,
+};
+
 static struct platform_device *r8a7779_devices_dt[] __initdata = {
         &scif0_device,
         &scif1_device,
@@ -602,12 +675,14 @@ void __init r8a7779_add_ether_device(struct sh_eth_plat_data *pdata)
                                           pdata, sizeof(*pdata));
 }
 
-void __init r8a7779_add_usb_phy_device(struct rcar_phy_platform_data *pdata)
+void __init r8a7779_add_vin_device(int id, struct rcar_vin_platform_data *pdata)
 {
-        platform_device_register_resndata(&platform_bus, "rcar_usb_phy", -1,
-                                          usb_phy_resources,
-                                          ARRAY_SIZE(usb_phy_resources),
-                                          pdata, sizeof(*pdata));
+        BUG_ON(id < 0 || id > 3);
+
+        vin_info_table[id]->data = pdata;
+        vin_info_table[id]->size_data = sizeof(*pdata);
+
+        platform_device_register_full(vin_info_table[id]);
 }
 
 /* do nothing for !CONFIG_SMP or !CONFIG_HAVE_TWD */
@@ -616,8 +691,8 @@ void __init __weak r8a7779_register_twd(void) { }
 void __init r8a7779_earlytimer_init(void)
 {
         r8a7779_clock_init();
-        shmobile_earlytimer_init();
         r8a7779_register_twd();
+        shmobile_earlytimer_init();
 }
 
 void __init r8a7779_add_early_devices(void)
@@ -660,15 +735,34 @@ void __init r8a7779_init_late(void)
 }
 
 #ifdef CONFIG_USE_OF
+static int r8a7779_set_wake(struct irq_data *data, unsigned int on)
+{
+        return 0; /* always allow wakeup */
+}
+
+void __init r8a7779_init_irq_dt(void)
+{
+        gic_arch_extn.irq_set_wake = r8a7779_set_wake;
+
+        irqchip_init();
+
+        /* route all interrupts to ARM */
+        __raw_writel(0xffffffff, INT2NTSR0);
+        __raw_writel(0x3fffffff, INT2NTSR1);
+
+        /* unmask all known interrupts in INTCS2 */
+        __raw_writel(0xfffffff0, INT2SMSKCR0);
+        __raw_writel(0xfff7ffff, INT2SMSKCR1);
+        __raw_writel(0xfffbffdf, INT2SMSKCR2);
+        __raw_writel(0xbffffffc, INT2SMSKCR3);
+        __raw_writel(0x003fee3f, INT2SMSKCR4);
+}
+
 void __init r8a7779_init_delay(void)
 {
         shmobile_setup_delay(1000, 2, 4); /* Cortex-A9 @ 1000MHz */
 }
 
-static const struct of_dev_auxdata r8a7779_auxdata_lookup[] __initconst = {
-        {},
-};
-
 void __init r8a7779_add_standard_devices_dt(void)
 {
         /* clocks are setup late during boot in the case of DT */
@@ -676,8 +770,7 @@ void __init r8a7779_add_standard_devices_dt(void)
 
         platform_add_devices(r8a7779_devices_dt,
                              ARRAY_SIZE(r8a7779_devices_dt));
-        of_platform_populate(NULL, of_default_bus_match_table,
-                             r8a7779_auxdata_lookup, NULL);
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
 static const char *r8a7779_compat_dt[] __initdata = {
@@ -691,7 +784,6 @@ DT_MACHINE_START(R8A7779_DT, "Generic R8A7779 (Flattened Device Tree)")
         .nr_irqs        = NR_IRQS_LEGACY,
         .init_irq       = r8a7779_init_irq_dt,
         .init_machine   = r8a7779_add_standard_devices_dt,
-        .init_time      = shmobile_timer_init,
         .init_late      = r8a7779_init_late,
         .dt_compat      = r8a7779_compat_dt,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/setup-r8a7790.c b/arch/arm/mach-shmobile/setup-r8a7790.c
index 28f94752b8ff..d0f5c9f9349a 100644
--- a/arch/arm/mach-shmobile/setup-r8a7790.c
+++ b/arch/arm/mach-shmobile/setup-r8a7790.c
@@ -18,13 +18,14 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <linux/clocksource.h>
 #include <linux/irq.h>
-#include <linux/irqchip.h>
 #include <linux/kernel.h>
 #include <linux/of_platform.h>
-#include <linux/serial_sci.h>
 #include <linux/platform_data/gpio-rcar.h>
 #include <linux/platform_data/irq-renesas-irqc.h>
+#include <linux/serial_sci.h>
+#include <linux/sh_timer.h>
 #include <mach/common.h>
 #include <mach/irqs.h>
 #include <mach/r8a7790.h>
@@ -149,7 +150,37 @@ static struct resource irqc0_resources[] __initdata = {
                                           &irqc##idx##_data,            \
                                           sizeof(struct renesas_irqc_config))
 
-void __init r8a7790_add_standard_devices(void)
+static struct resource thermal_resources[] __initdata = {
+        DEFINE_RES_MEM(0xe61f0000, 0x14),
+        DEFINE_RES_MEM(0xe61f0100, 0x38),
+        DEFINE_RES_IRQ(gic_spi(69)),
+};
+
+#define r8a7790_register_thermal()                                      \
+        platform_device_register_simple("rcar_thermal", -1,             \
+                                        thermal_resources,              \
+                                        ARRAY_SIZE(thermal_resources))
+
+static struct sh_timer_config cmt00_platform_data __initdata = {
+        .name = "CMT00",
+        .timer_bit = 0,
+        .clockevent_rating = 80,
+};
+
+static struct resource cmt00_resources[] __initdata = {
+        DEFINE_RES_MEM(0xffca0510, 0x0c),
+        DEFINE_RES_MEM(0xffca0500, 0x04),
+        DEFINE_RES_IRQ(gic_spi(142)), /* CMT0_0 */
+};
+
+#define r8a7790_register_cmt(idx)                                       \
+        platform_device_register_resndata(&platform_bus, "sh_cmt",      \
+                                          idx, cmt##idx##_resources,    \
+                                          ARRAY_SIZE(cmt##idx##_resources), \
+                                          &cmt##idx##_platform_data,    \
+                                          sizeof(struct sh_timer_config))
+
+void __init r8a7790_add_dt_devices(void)
 {
         r8a7790_register_scif(SCIFA0);
         r8a7790_register_scif(SCIFA1);
@@ -161,35 +192,97 @@ void __init r8a7790_add_standard_devices(void)
         r8a7790_register_scif(SCIF1);
         r8a7790_register_scif(HSCIF0);
         r8a7790_register_scif(HSCIF1);
+        r8a7790_register_cmt(00);
+}
+
+void __init r8a7790_add_standard_devices(void)
+{
+        r8a7790_add_dt_devices();
         r8a7790_register_irqc(0);
+        r8a7790_register_thermal();
 }
 
+#define MODEMR 0xe6160060
+
+u32 __init r8a7790_read_mode_pins(void)
+{
+        void __iomem *modemr = ioremap_nocache(MODEMR, 4);
+        u32 mode;
+
+        BUG_ON(!modemr);
+        mode = ioread32(modemr);
+        iounmap(modemr);
+
+        return mode;
+}
+
+#define CNTCR 0
+#define CNTFID0 0x20
+
 void __init r8a7790_timer_init(void)
 {
-        void __iomem *cntcr;
+#ifdef CONFIG_ARM_ARCH_TIMER
+        u32 mode = r8a7790_read_mode_pins();
+        void __iomem *base;
+        int extal_mhz = 0;
+        u32 freq;
+
+        /* At Linux boot time the r8a7790 arch timer comes up
+         * with the counter disabled. Moreover, it may also report
+         * a potentially incorrect fixed 13 MHz frequency. To be
+         * correct these registers need to be updated to use the
+         * frequency EXTAL / 2 which can be determined by the MD pins.
+         */
 
-        /* make sure arch timer is started by setting bit 0 of CNTCT */
-        cntcr = ioremap(0xe6080000, PAGE_SIZE);
-        iowrite32(1, cntcr);
-        iounmap(cntcr);
+        switch (mode & (MD(14) | MD(13))) {
+        case 0:
+                extal_mhz = 15;
+                break;
+        case MD(13):
+                extal_mhz = 20;
+                break;
+        case MD(14):
+                extal_mhz = 26;
+                break;
+        case MD(13) | MD(14):
+                extal_mhz = 30;
+                break;
+        }
 
-        shmobile_timer_init();
+        /* The arch timer frequency equals EXTAL / 2 */
+        freq = extal_mhz * (1000000 / 2);
+
+        /* Remap "armgcnt address map" space */
+        base = ioremap(0xe6080000, PAGE_SIZE);
+
+        /* Update registers with correct frequency */
+        iowrite32(freq, base + CNTFID0);
+        asm volatile("mcr p15, 0, %0, c14, c0, 0" : : "r" (freq));
+
+        /* make sure arch timer is started by setting bit 0 of CNTCR */
+        iowrite32(1, base + CNTCR);
+        iounmap(base);
+#endif /* CONFIG_ARM_ARCH_TIMER */
+
+        clocksource_of_init();
 }
 
-#ifdef CONFIG_USE_OF
-void __init r8a7790_add_standard_devices_dt(void)
+void __init r8a7790_init_delay(void)
 {
-        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
+#ifndef CONFIG_ARM_ARCH_TIMER
+        shmobile_setup_delay(1300, 2, 4); /* Cortex-A15 @ 1300MHz */
+#endif
 }
 
+#ifdef CONFIG_USE_OF
+
 static const char *r8a7790_boards_compat_dt[] __initdata = {
         "renesas,r8a7790",
         NULL,
 };
 
 DT_MACHINE_START(R8A7790_DT, "Generic R8A7790 (Flattened Device Tree)")
-        .init_irq       = irqchip_init,
-        .init_machine   = r8a7790_add_standard_devices_dt,
+        .init_early     = r8a7790_init_delay,
         .init_time      = r8a7790_timer_init,
         .dt_compat      = r8a7790_boards_compat_dt,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/setup-sh7372.c b/arch/arm/mach-shmobile/setup-sh7372.c
index 5502d624aca6..311878391e18 100644
--- a/arch/arm/mach-shmobile/setup-sh7372.c
+++ b/arch/arm/mach-shmobile/setup-sh7372.c
@@ -35,7 +35,6 @@
 #include <linux/dma-mapping.h>
 #include <linux/platform_data/sh_ipmmu.h>
 #include <mach/dma-register.h>
-#include <mach/hardware.h>
 #include <mach/irqs.h>
 #include <mach/sh7372.h>
 #include <mach/common.h>
@@ -1147,10 +1146,6 @@ void __init sh7372_add_early_devices_dt(void)
         shmobile_setup_console();
 }
 
-static const struct of_dev_auxdata sh7372_auxdata_lookup[] __initconst = {
-        { }
-};
-
 void __init sh7372_add_standard_devices_dt(void)
 {
         /* clocks are setup late during boot in the case of DT */
@@ -1159,8 +1154,7 @@ void __init sh7372_add_standard_devices_dt(void)
         platform_add_devices(sh7372_early_devices,
                             ARRAY_SIZE(sh7372_early_devices));
 
-        of_platform_populate(NULL, of_default_bus_match_table,
-                             sh7372_auxdata_lookup, NULL);
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
 static const char *sh7372_boards_compat_dt[] __initdata = {
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index 96e7ca1e4e11..22de17417fd7 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -22,7 +22,6 @@
 #include <linux/init.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
-#include <linux/irqchip.h>
 #include <linux/platform_device.h>
 #include <linux/of_platform.h>
 #include <linux/delay.h>
@@ -35,7 +34,6 @@
 #include <linux/platform_data/sh_ipmmu.h>
 #include <linux/platform_data/irq-renesas-intc-irqpin.h>
 #include <mach/dma-register.h>
-#include <mach/hardware.h>
 #include <mach/irqs.h>
 #include <mach/sh73a0.h>
 #include <mach/common.h>
@@ -61,29 +59,16 @@ void __init sh73a0_map_io(void)
         iotable_init(sh73a0_io_desc, ARRAY_SIZE(sh73a0_io_desc));
 }
 
-static struct resource sh73a0_pfc_resources[] = {
-        [0] = {
-                .start  = 0xe6050000,
-                .end    = 0xe6057fff,
-                .flags  = IORESOURCE_MEM,
-        },
-        [1] = {
-                .start  = 0xe605801c,
-                .end    = 0xe6058027,
-                .flags  = IORESOURCE_MEM,
-        }
-};
-
-static struct platform_device sh73a0_pfc_device = {
-        .name           = "pfc-sh73a0",
-        .id             = -1,
-        .resource       = sh73a0_pfc_resources,
-        .num_resources  = ARRAY_SIZE(sh73a0_pfc_resources),
+/* PFC */
+static struct resource pfc_resources[] __initdata = {
+        DEFINE_RES_MEM(0xe6050000, 0x8000),
+        DEFINE_RES_MEM(0xe605801c, 0x000c),
 };
 
 void __init sh73a0_pinmux_init(void)
 {
-        platform_device_register(&sh73a0_pfc_device);
+        platform_device_register_simple("pfc-sh73a0", -1, pfc_resources,
+                                        ARRAY_SIZE(pfc_resources));
 }
 
 static struct plat_sci_port scif0_platform_data = {
@@ -958,10 +943,6 @@ void __init sh73a0_add_early_devices(void)
 
 #ifdef CONFIG_USE_OF
 
-static const struct of_dev_auxdata sh73a0_auxdata_lookup[] __initconst = {
-        {},
-};
-
 void __init sh73a0_add_standard_devices_dt(void)
 {
         struct platform_device_info devinfo = { .name = "cpufreq-cpu0", .id = -1, };
@@ -971,8 +952,7 @@ void __init sh73a0_add_standard_devices_dt(void)
 
         platform_add_devices(sh73a0_devices_dt,
                              ARRAY_SIZE(sh73a0_devices_dt));
-        of_platform_populate(NULL, of_default_bus_match_table,
-                             sh73a0_auxdata_lookup, NULL);
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 
         /* Instantiate cpufreq-cpu0 */
         platform_device_register_full(&devinfo);
@@ -988,7 +968,6 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
         .map_io         = sh73a0_map_io,
         .init_early     = sh73a0_init_delay,
         .nr_irqs        = NR_IRQS_LEGACY,
-        .init_irq       = irqchip_init,
         .init_machine   = sh73a0_add_standard_devices_dt,
         .dt_compat      = sh73a0_boards_compat_dt,
 MACHINE_END
diff --git a/arch/arm/mach-shmobile/sleep-sh7372.S b/arch/arm/mach-shmobile/sleep-sh7372.S
index 53f4840e4949..9782862899e8 100644
--- a/arch/arm/mach-shmobile/sleep-sh7372.S
+++ b/arch/arm/mach-shmobile/sleep-sh7372.S
@@ -41,6 +41,7 @@
 sh7372_resume_core_standby_sysc:
         ldr     pc, 1f
 
+        .align  2
         .globl  sh7372_cpu_resume
 sh7372_cpu_resume:
 1:      .space  4
@@ -96,6 +97,7 @@ sh7372_do_idle_sysc:
 1:
         b      1b
 
+        .align  2
 kernel_flush:
         .word v7_flush_dcache_all
 #endif
diff --git a/arch/arm/mach-shmobile/smp-emev2.c b/arch/arm/mach-shmobile/smp-emev2.c
index 22a05a869d25..522de5ebb55f 100644
--- a/arch/arm/mach-shmobile/smp-emev2.c
+++ b/arch/arm/mach-shmobile/smp-emev2.c
@@ -29,41 +29,38 @@
 #include <asm/smp_scu.h>
 
 #define EMEV2_SCU_BASE 0x1e000000
+#define EMEV2_SMU_BASE 0xe0110000
+#define SMU_GENERAL_REG0 0x7c0
 
 static int emev2_boot_secondary(unsigned int cpu, struct task_struct *idle)
 {
+        int ret;
+
+        ret = shmobile_smp_scu_boot_secondary(cpu, idle);
+        if (ret)
+                return ret;
+
         arch_send_wakeup_ipi_mask(cpumask_of(cpu_logical_map(cpu)));
         return 0;
 }
 
 static void __init emev2_smp_prepare_cpus(unsigned int max_cpus)
 {
-        scu_enable(shmobile_scu_base);
-
-        /* Tell ROM loader about our vector (in headsmp-scu.S, headsmp.S) */
-        emev2_set_boot_vector(__pa(shmobile_boot_vector));
-        shmobile_boot_fn = virt_to_phys(shmobile_boot_scu);
-        shmobile_boot_arg = (unsigned long)shmobile_scu_base;
-
-        /* enable cache coherency on booting CPU */
-        scu_power_mode(shmobile_scu_base, SCU_PM_NORMAL);
-}
+        void __iomem *smu;
 
-static void __init emev2_smp_init_cpus(void)
-{
-        unsigned int ncores;
+        /* Tell ROM loader about our vector (in headsmp.S) */
+        smu = ioremap(EMEV2_SMU_BASE, PAGE_SIZE);
+        if (smu) {
+                iowrite32(__pa(shmobile_boot_vector), smu + SMU_GENERAL_REG0);
+                iounmap(smu);
+        }
 
-        /* setup EMEV2 specific SCU base */
+        /* setup EMEV2 specific SCU bits */
         shmobile_scu_base = ioremap(EMEV2_SCU_BASE, PAGE_SIZE);
-        emev2_clock_init(); /* need ioremapped SMU */
-
-        ncores = shmobile_scu_base ? scu_get_core_count(shmobile_scu_base) : 1;
-
-        shmobile_smp_init_cpus(ncores);
+        shmobile_smp_scu_prepare_cpus(max_cpus);
 }
 
 struct smp_operations emev2_smp_ops __initdata = {
-        .smp_init_cpus          = emev2_smp_init_cpus,
         .smp_prepare_cpus       = emev2_smp_prepare_cpus,
         .smp_boot_secondary     = emev2_boot_secondary,
 };
diff --git a/arch/arm/mach-shmobile/smp-r8a7779.c b/arch/arm/mach-shmobile/smp-r8a7779.c
index 9bdf810f2a87..0f05e9fb722f 100644
--- a/arch/arm/mach-shmobile/smp-r8a7779.c
+++ b/arch/arm/mach-shmobile/smp-r8a7779.c
@@ -84,30 +84,34 @@ static int r8a7779_platform_cpu_kill(unsigned int cpu)
 static int r8a7779_boot_secondary(unsigned int cpu, struct task_struct *idle)
 {
         struct r8a7779_pm_ch *ch = NULL;
-        int ret = -EIO;
+        unsigned int lcpu = cpu_logical_map(cpu);
+        int ret;
 
-        cpu = cpu_logical_map(cpu);
+        ret = shmobile_smp_scu_boot_secondary(cpu, idle);
+        if (ret)
+                return ret;
 
-        if (cpu < ARRAY_SIZE(r8a7779_ch_cpu))
-                ch = r8a7779_ch_cpu[cpu];
+        if (lcpu < ARRAY_SIZE(r8a7779_ch_cpu))
+                ch = r8a7779_ch_cpu[lcpu];
 
         if (ch)
                 ret = r8a7779_sysc_power_up(ch);
+        else
+                ret = -EIO;
 
         return ret;
 }
 
 static void __init r8a7779_smp_prepare_cpus(unsigned int max_cpus)
 {
-        scu_enable(shmobile_scu_base);
-
         /* Map the reset vector (in headsmp-scu.S, headsmp.S) */
         __raw_writel(__pa(shmobile_boot_vector), AVECR);
         shmobile_boot_fn = virt_to_phys(shmobile_boot_scu);
         shmobile_boot_arg = (unsigned long)shmobile_scu_base;
 
-        /* enable cache coherency on booting CPU */
-        scu_power_mode(shmobile_scu_base, SCU_PM_NORMAL);
+        /* setup r8a7779 specific SCU bits */
+        shmobile_scu_base = IOMEM(R8A7779_SCU_BASE);
+        shmobile_smp_scu_prepare_cpus(max_cpus);
 
         r8a7779_pm_init();
 
@@ -117,56 +121,15 @@ static void __init r8a7779_smp_prepare_cpus(unsigned int max_cpus)
         r8a7779_platform_cpu_kill(3);
 }
 
-static void __init r8a7779_smp_init_cpus(void)
-{
-        /* setup r8a7779 specific SCU base */
-        shmobile_scu_base = IOMEM(R8A7779_SCU_BASE);
-
-        shmobile_smp_init_cpus(scu_get_core_count(shmobile_scu_base));
-}
-
 #ifdef CONFIG_HOTPLUG_CPU
-static int r8a7779_scu_psr_core_disabled(int cpu)
-{
-        unsigned long mask = 3 << (cpu * 8);
-
-        if ((__raw_readl(shmobile_scu_base + 8) & mask) == mask)
-                return 1;
-
-        return 0;
-}
-
 static int r8a7779_cpu_kill(unsigned int cpu)
 {
-        int k;
-
-        /* this function is running on another CPU than the offline target,
-         * here we need wait for shutdown code in platform_cpu_die() to
-         * finish before asking SoC-specific code to power off the CPU core.
-         */
-        for (k = 0; k < 1000; k++) {
-                if (r8a7779_scu_psr_core_disabled(cpu))
-                        return r8a7779_platform_cpu_kill(cpu);
-
-                mdelay(1);
-        }
+        if (shmobile_smp_scu_cpu_kill(cpu))
+                return r8a7779_platform_cpu_kill(cpu);
 
         return 0;
 }
 
-static void r8a7779_cpu_die(unsigned int cpu)
-{
-        dsb();
-        flush_cache_all();
-
-        /* disable cache coherency */
-        scu_power_mode(shmobile_scu_base, SCU_PM_POWEROFF);
-
-        /* Endless loop until power off from r8a7779_cpu_kill() */
-        while (1)
-                cpu_do_idle();
-}
-
 static int r8a7779_cpu_disable(unsigned int cpu)
 {
         /* only CPU1->3 have power domains, do not allow hotplug of CPU0 */
@@ -175,12 +138,11 @@ static int r8a7779_cpu_disable(unsigned int cpu)
 #endif /* CONFIG_HOTPLUG_CPU */
 
 struct smp_operations r8a7779_smp_ops  __initdata = {
-        .smp_init_cpus          = r8a7779_smp_init_cpus,
         .smp_prepare_cpus       = r8a7779_smp_prepare_cpus,
         .smp_boot_secondary     = r8a7779_boot_secondary,
 #ifdef CONFIG_HOTPLUG_CPU
-        .cpu_kill               = r8a7779_cpu_kill,
-        .cpu_die                = r8a7779_cpu_die,
         .cpu_disable            = r8a7779_cpu_disable,
+        .cpu_die                = shmobile_smp_scu_cpu_die,
+        .cpu_kill               = r8a7779_cpu_kill,
 #endif
 };
diff --git a/arch/arm/mach-shmobile/smp-sh73a0.c b/arch/arm/mach-shmobile/smp-sh73a0.c
index d5fc3ed4e315..0baa24443793 100644
--- a/arch/arm/mach-shmobile/smp-sh73a0.c
+++ b/arch/arm/mach-shmobile/smp-sh73a0.c
@@ -20,14 +20,11 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/smp.h>
-#include <linux/spinlock.h>
 #include <linux/io.h>
 #include <linux/delay.h>
 #include <mach/common.h>
-#include <asm/cacheflush.h>
-#include <asm/smp_plat.h>
 #include <mach/sh73a0.h>
-#include <asm/smp_scu.h>
+#include <asm/smp_plat.h>
 #include <asm/smp_twd.h>
 
 #define WUPCR           IOMEM(0xe6151010)
@@ -36,8 +33,6 @@
 #define SBAR            IOMEM(0xe6180020)
 #define APARMBAREA      IOMEM(0xe6f10020)
 
-#define PSTR_SHUTDOWN_MODE      3
-
 #define SH73A0_SCU_BASE 0xf0000000
 
 #ifdef CONFIG_HAVE_ARM_TWD
@@ -50,69 +45,33 @@ void __init sh73a0_register_twd(void)
 
 static int sh73a0_boot_secondary(unsigned int cpu, struct task_struct *idle)
 {
-        cpu = cpu_logical_map(cpu);
+        unsigned int lcpu = cpu_logical_map(cpu);
+        int ret;
 
-        if (((__raw_readl(PSTR) >> (4 * cpu)) & 3) == 3)
-                __raw_writel(1 << cpu, WUPCR);  /* wake up */
+        ret = shmobile_smp_scu_boot_secondary(cpu, idle);
+        if (ret)
+                return ret;
+
+        if (((__raw_readl(PSTR) >> (4 * lcpu)) & 3) == 3)
+                __raw_writel(1 << lcpu, WUPCR); /* wake up */
         else
-                __raw_writel(1 << cpu, SRESCR); /* reset */
+                __raw_writel(1 << lcpu, SRESCR);        /* reset */
 
         return 0;
 }
 
 static void __init sh73a0_smp_prepare_cpus(unsigned int max_cpus)
 {
-        scu_enable(shmobile_scu_base);
-
-        /* Map the reset vector (in headsmp-scu.S, headsmp.S) */
+        /* Map the reset vector (in headsmp.S) */
         __raw_writel(0, APARMBAREA);      /* 4k */
         __raw_writel(__pa(shmobile_boot_vector), SBAR);
-        shmobile_boot_fn = virt_to_phys(shmobile_boot_scu);
-        shmobile_boot_arg = (unsigned long)shmobile_scu_base;
 
-        /* enable cache coherency on booting CPU */
-        scu_power_mode(shmobile_scu_base, SCU_PM_NORMAL);
-}
-
-static void __init sh73a0_smp_init_cpus(void)
-{
-        /* setup sh73a0 specific SCU base */
+        /* setup sh73a0 specific SCU bits */
         shmobile_scu_base = IOMEM(SH73A0_SCU_BASE);
-
-        shmobile_smp_init_cpus(scu_get_core_count(shmobile_scu_base));
+        shmobile_smp_scu_prepare_cpus(max_cpus);
 }
 
 #ifdef CONFIG_HOTPLUG_CPU
-static int sh73a0_cpu_kill(unsigned int cpu)
-{
-
-        int k;
-        u32 pstr;
-
-        /*
-         * wait until the power status register confirms the shutdown of the
-         * offline target
-         */
-        for (k = 0; k < 1000; k++) {
-                pstr = (__raw_readl(PSTR) >> (4 * cpu)) & 3;
-                if (pstr == PSTR_SHUTDOWN_MODE)
-                        return 1;
-
-                mdelay(1);
-        }
-
-        return 0;
-}
-
-static void sh73a0_cpu_die(unsigned int cpu)
-{
-        /* Set power off mode. This takes the CPU out of the MP cluster */
-        scu_power_mode(shmobile_scu_base, SCU_PM_POWEROFF);
-
-        /* Enter shutdown mode */
-        cpu_do_idle();
-}
-
 static int sh73a0_cpu_disable(unsigned int cpu)
 {
         return 0; /* CPU0 and CPU1 supported */
@@ -120,12 +79,11 @@ static int sh73a0_cpu_disable(unsigned int cpu)
 #endif /* CONFIG_HOTPLUG_CPU */
 
 struct smp_operations sh73a0_smp_ops __initdata = {
-        .smp_init_cpus          = sh73a0_smp_init_cpus,
         .smp_prepare_cpus       = sh73a0_smp_prepare_cpus,
         .smp_boot_secondary     = sh73a0_boot_secondary,
 #ifdef CONFIG_HOTPLUG_CPU
-        .cpu_kill               = sh73a0_cpu_kill,
-        .cpu_die                = sh73a0_cpu_die,
         .cpu_disable            = sh73a0_cpu_disable,
+        .cpu_die                = shmobile_smp_scu_cpu_die,
+        .cpu_kill               = shmobile_smp_scu_cpu_kill,
 #endif
 };
diff --git a/arch/arm/mach-shmobile/timer.c b/arch/arm/mach-shmobile/timer.c
index f321dbeb2379..62d7052d6f21 100644
--- a/arch/arm/mach-shmobile/timer.c
+++ b/arch/arm/mach-shmobile/timer.c
@@ -59,7 +59,3 @@ void __init shmobile_earlytimer_init(void)
         late_time_init = shmobile_late_time_init;
 }
 
-void __init shmobile_timer_init(void)
-{
-        clocksource_of_init();
-}
diff --git a/arch/arm/mach-spear/Kconfig b/arch/arm/mach-spear/Kconfig
index 442917eedff3..df0d59afeb40 100644
--- a/arch/arm/mach-spear/Kconfig
+++ b/arch/arm/mach-spear/Kconfig
@@ -23,7 +23,7 @@ config ARCH_SPEAR13XX
         select CPU_V7
         select GPIO_SPEAR_SPICS
         select HAVE_ARM_SCU if SMP
-        select HAVE_ARM_TWD if LOCAL_TIMERS
+        select HAVE_ARM_TWD if SMP
         select HAVE_SMP
         select MIGHT_HAVE_CACHE_L2X0
         select PINCTRL
diff --git a/arch/arm/mach-spear/include/mach/debug-macro.S b/arch/arm/mach-spear/include/mach/debug-macro.S
deleted file mode 100644
index 75b05ad0fbad..000000000000
--- a/arch/arm/mach-spear/include/mach/debug-macro.S
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * arch/arm/plat-spear/include/plat/debug-macro.S
- *
- * Debugging macro include header for spear platform
- *
- * Copyright (C) 2009 ST Microelectronics
- * Viresh Kumar <viresh.linux@gmail.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#include <linux/amba/serial.h>
-#include <mach/spear.h>
-
-                .macro  addruart, rp, rv, tmp
-                mov     \rp, #SPEAR_DBG_UART_BASE               @ Physical base
-                mov     \rv, #VA_SPEAR_DBG_UART_BASE            @ Virtual base
-                .endm
-
-                .macro  senduart, rd, rx
-                strb    \rd, [\rx, #UART01x_DR]                 @ ASC_TX_BUFFER
-                .endm
-
-                .macro  waituart, rd, rx
-1001:           ldr     \rd, [\rx, #UART01x_FR]                 @ FLAG REGISTER
-                tst     \rd, #UART01x_FR_TXFF                   @ TX_FULL
-                bne     1001b
-                .endm
-
-                .macro  busyuart, rd, rx
-1002:           ldr     \rd, [\rx, #UART01x_FR]                 @ FLAG REGISTER
-                tst     \rd, #UART011_FR_TXFE                   @ TX_EMPTY
-                beq     1002b
-                .endm
diff --git a/arch/arm/mach-spear/include/mach/spear.h b/arch/arm/mach-spear/include/mach/spear.h
index cf3a5369eeca..5cdc53d9b653 100644
--- a/arch/arm/mach-spear/include/mach/spear.h
+++ b/arch/arm/mach-spear/include/mach/spear.h
@@ -39,7 +39,6 @@
 
 /* Debug uart for linux, will be used for debug and uncompress messages */
 #define SPEAR_DBG_UART_BASE             SPEAR_ICM1_UART_BASE
-#define VA_SPEAR_DBG_UART_BASE          VA_SPEAR_ICM1_UART_BASE
 
 /* Sysctl base for spear platform */
 #define SPEAR_SYS_CTRL_BASE             SPEAR_ICM3_SYS_CTRL_BASE
@@ -86,7 +85,6 @@
 
 /* Debug uart for linux, will be used for debug and uncompress messages */
 #define SPEAR_DBG_UART_BASE                     UART_BASE
-#define VA_SPEAR_DBG_UART_BASE                  VA_UART_BASE
 
 #endif /* SPEAR13XX */
 
diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
index 5b045e302b43..3ab2f65f8a50 100644
--- a/arch/arm/mach-sunxi/Kconfig
+++ b/arch/arm/mach-sunxi/Kconfig
@@ -10,3 +10,5 @@ config ARCH_SUNXI
         select SPARSE_IRQ
         select SUN4I_TIMER
         select PINCTRL_SUNXI
+        select ARM_GIC
+        select HAVE_SMP
diff --git a/arch/arm/mach-sunxi/Makefile.boot b/arch/arm/mach-sunxi/Makefile.boot
deleted file mode 100644
index 46d4cf0841c0..000000000000
--- a/arch/arm/mach-sunxi/Makefile.boot
+++ /dev/null
@@ -1 +0,0 @@
-zreladdr-$(CONFIG_ARCH_SUNXI)   += 0x40008000
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index 38a3c55527c8..e79fb3469341 100644
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -27,10 +27,19 @@
 #include <asm/system_misc.h>
 
 #define SUN4I_WATCHDOG_CTRL_REG         0x00
-#define SUN4I_WATCHDOG_CTRL_RESTART             (1 << 0)
+#define SUN4I_WATCHDOG_CTRL_RESTART             BIT(0)
 #define SUN4I_WATCHDOG_MODE_REG         0x04
-#define SUN4I_WATCHDOG_MODE_ENABLE              (1 << 0)
-#define SUN4I_WATCHDOG_MODE_RESET_ENABLE        (1 << 1)
+#define SUN4I_WATCHDOG_MODE_ENABLE              BIT(0)
+#define SUN4I_WATCHDOG_MODE_RESET_ENABLE        BIT(1)
+
+#define SUN6I_WATCHDOG1_IRQ_REG         0x00
+#define SUN6I_WATCHDOG1_CTRL_REG        0x10
+#define SUN6I_WATCHDOG1_CTRL_RESTART            BIT(0)
+#define SUN6I_WATCHDOG1_CONFIG_REG      0x14
+#define SUN6I_WATCHDOG1_CONFIG_RESTART          BIT(0)
+#define SUN6I_WATCHDOG1_CONFIG_IRQ              BIT(1)
+#define SUN6I_WATCHDOG1_MODE_REG        0x18
+#define SUN6I_WATCHDOG1_MODE_ENABLE             BIT(0)
 
 static void __iomem *wdt_base;
 
@@ -56,8 +65,36 @@ static void sun4i_restart(enum reboot_mode mode, const char *cmd)
         }
 }
 
+static void sun6i_restart(enum reboot_mode mode, const char *cmd)
+{
+        if (!wdt_base)
+                return;
+
+        /* Disable interrupts */
+        writel(0, wdt_base + SUN6I_WATCHDOG1_IRQ_REG);
+
+        /* We want to disable the IRQ and just reset the whole system */
+        writel(SUN6I_WATCHDOG1_CONFIG_RESTART,
+                wdt_base + SUN6I_WATCHDOG1_CONFIG_REG);
+
+        /* Enable timer. The default and lowest interval value is 0.5s */
+        writel(SUN6I_WATCHDOG1_MODE_ENABLE,
+                wdt_base + SUN6I_WATCHDOG1_MODE_REG);
+
+        /* Restart the watchdog. */
+        writel(SUN6I_WATCHDOG1_CTRL_RESTART,
+                wdt_base + SUN6I_WATCHDOG1_CTRL_REG);
+
+        while (1) {
+                mdelay(5);
+                writel(SUN6I_WATCHDOG1_MODE_ENABLE,
+                        wdt_base + SUN6I_WATCHDOG1_MODE_REG);
+        }
+}
+
 static struct of_device_id sunxi_restart_ids[] = {
         { .compatible = "allwinner,sun4i-wdt", .data = sun4i_restart },
+        { .compatible = "allwinner,sun6i-wdt", .data = sun6i_restart },
         { /*sentinel*/ }
 };
 
@@ -96,6 +133,8 @@ static const char * const sunxi_board_dt_compat[] = {
         "allwinner,sun4i-a10",
         "allwinner,sun5i-a10s",
         "allwinner,sun5i-a13",
+        "allwinner,sun6i-a31",
+        "allwinner,sun7i-a20",
         NULL,
 };
 
diff --git a/arch/arm/mach-tegra/Kconfig b/arch/arm/mach-tegra/Kconfig
index ef3a8da49b2d..67a76f2dfb9f 100644
--- a/arch/arm/mach-tegra/Kconfig
+++ b/arch/arm/mach-tegra/Kconfig
@@ -2,18 +2,25 @@ config ARCH_TEGRA
         bool "NVIDIA Tegra" if ARCH_MULTI_V7
         select ARCH_HAS_CPUFREQ
         select ARCH_REQUIRE_GPIOLIB
+        select ARM_GIC
         select CLKDEV_LOOKUP
         select CLKSRC_MMIO
         select CLKSRC_OF
         select COMMON_CLK
+        select CPU_V7
         select GENERIC_CLOCKEVENTS
         select HAVE_ARM_SCU if SMP
-        select HAVE_ARM_TWD if LOCAL_TIMERS
+        select HAVE_ARM_TWD if SMP
         select HAVE_CLK
         select HAVE_SMP
         select MIGHT_HAVE_CACHE_L2X0
+        select MIGHT_HAVE_PCI
+        select PINCTRL
         select SOC_BUS
         select SPARSE_IRQ
+        select USB_ARCH_HAS_EHCI if USB_SUPPORT
+        select USB_ULPI if USB_PHY
+        select USB_ULPI_VIEWPORT if USB_PHY
         select USE_OF
         help
           This enables support for NVIDIA Tegra based systems.
@@ -27,15 +34,9 @@ config ARCH_TEGRA_2x_SOC
         select ARM_ERRATA_720789
         select ARM_ERRATA_754327 if SMP
         select ARM_ERRATA_764369 if SMP
-        select ARM_GIC
-        select CPU_V7
-        select PINCTRL
         select PINCTRL_TEGRA20
         select PL310_ERRATA_727915 if CACHE_L2X0
         select PL310_ERRATA_769419 if CACHE_L2X0
-        select USB_ARCH_HAS_EHCI if USB_SUPPORT
-        select USB_ULPI if USB_PHY
-        select USB_ULPI_VIEWPORT if USB_PHY
         help
           Support for NVIDIA Tegra AP20 and T20 processors, based on the
           ARM CortexA9MP CPU and the ARM PL310 L2 cache controller
@@ -44,14 +45,8 @@ config ARCH_TEGRA_3x_SOC
         bool "Enable support for Tegra30 family"
         select ARM_ERRATA_754322
         select ARM_ERRATA_764369 if SMP
-        select ARM_GIC
-        select CPU_V7
-        select PINCTRL
         select PINCTRL_TEGRA30
         select PL310_ERRATA_769419 if CACHE_L2X0
-        select USB_ARCH_HAS_EHCI if USB_SUPPORT
-        select USB_ULPI if USB_PHY
-        select USB_ULPI_VIEWPORT if USB_PHY
         help
           Support for NVIDIA Tegra T30 processor family, based on the
           ARM CortexA9MP CPU and the ARM PL310 L2 cache controller
@@ -59,20 +54,13 @@ config ARCH_TEGRA_3x_SOC
 config ARCH_TEGRA_114_SOC
         bool "Enable support for Tegra114 family"
         select HAVE_ARM_ARCH_TIMER
-        select ARM_GIC
+        select ARM_ERRATA_798181
         select ARM_L1_CACHE_SHIFT_6
-        select CPU_V7
-        select PINCTRL
         select PINCTRL_TEGRA114
         help
           Support for NVIDIA Tegra T114 processor family, based on the
           ARM CortexA15MP CPU
 
-config TEGRA_PCI
-        bool "PCI Express support"
-        depends on ARCH_TEGRA_2x_SOC
-        select PCI
-
 config TEGRA_AHB
         bool "Enable AHB driver for NVIDIA Tegra SoCs"
         default y
diff --git a/arch/arm/mach-tegra/Makefile b/arch/arm/mach-tegra/Makefile
index 98b184efc110..e7e5f45c6558 100644
--- a/arch/arm/mach-tegra/Makefile
+++ b/arch/arm/mach-tegra/Makefile
@@ -17,24 +17,24 @@ obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra20_speedo.o
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += tegra2_emc.o
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += sleep-tegra20.o
+obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += pm-tegra20.o
 ifeq ($(CONFIG_CPU_IDLE),y)
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += cpuidle-tegra20.o
 endif
 obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += tegra30_speedo.o
 obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += sleep-tegra30.o
+obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += pm-tegra30.o
 ifeq ($(CONFIG_CPU_IDLE),y)
 obj-$(CONFIG_ARCH_TEGRA_3x_SOC)         += cpuidle-tegra30.o
 endif
 obj-$(CONFIG_SMP)                       += platsmp.o headsmp.o
 obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o
-obj-$(CONFIG_TEGRA_PCI)                 += pcie.o
 
 obj-$(CONFIG_ARCH_TEGRA_114_SOC)        += tegra114_speedo.o
 obj-$(CONFIG_ARCH_TEGRA_114_SOC)        += sleep-tegra30.o
+obj-$(CONFIG_ARCH_TEGRA_114_SOC)        += pm-tegra30.o
 ifeq ($(CONFIG_CPU_IDLE),y)
 obj-$(CONFIG_ARCH_TEGRA_114_SOC)        += cpuidle-tegra114.o
 endif
 
-obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += board-harmony-pcie.o
-
 obj-$(CONFIG_ARCH_TEGRA_2x_SOC)         += board-paz00.o
diff --git a/arch/arm/mach-tegra/board-harmony-pcie.c b/arch/arm/mach-tegra/board-harmony-pcie.c
deleted file mode 100644
index 035b240b9e15..000000000000
--- a/arch/arm/mach-tegra/board-harmony-pcie.c
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * arch/arm/mach-tegra/board-harmony-pcie.c
- *
- * Copyright (C) 2010 CompuLab, Ltd.
- * Mike Rapoport <mike@compulab.co.il>
- *
- * 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/kernel.h>
-#include <linux/gpio.h>
-#include <linux/err.h>
-#include <linux/of_gpio.h>
-#include <linux/regulator/consumer.h>
-
-#include <asm/mach-types.h>
-
-#include "board.h"
-
-#ifdef CONFIG_TEGRA_PCI
-
-int __init harmony_pcie_init(void)
-{
-        struct device_node *np;
-        int en_vdd_1v05;
-        struct regulator *regulator = NULL;
-        int err;
-
-        np = of_find_node_by_path("/regulators/regulator@3");
-        if (!np) {
-                pr_err("%s: of_find_node_by_path failed\n", __func__);
-                return -ENODEV;
-        }
-
-        en_vdd_1v05 = of_get_named_gpio(np, "gpio", 0);
-        if (en_vdd_1v05 < 0) {
-                pr_err("%s: of_get_named_gpio failed: %d\n", __func__,
-                       en_vdd_1v05);
-                return en_vdd_1v05;
-        }
-
-        err = gpio_request(en_vdd_1v05, "EN_VDD_1V05");
-        if (err) {
-                pr_err("%s: gpio_request failed: %d\n", __func__, err);
-                return err;
-        }
-
-        gpio_direction_output(en_vdd_1v05, 1);
-
-        regulator = regulator_get(NULL, "vdd_ldo0,vddio_pex_clk");
-        if (IS_ERR(regulator)) {
-                err = PTR_ERR(regulator);
-                pr_err("%s: regulator_get failed: %d\n", __func__, err);
-                goto err_reg;
-        }
-
-        err = regulator_enable(regulator);
-        if (err) {
-                pr_err("%s: regulator_enable failed: %d\n", __func__, err);
-                goto err_en;
-        }
-
-        err = tegra_pcie_init(true, true);
-        if (err) {
-                pr_err("%s: tegra_pcie_init failed: %d\n", __func__, err);
-                goto err_pcie;
-        }
-
-        return 0;
-
-err_pcie:
-        regulator_disable(regulator);
-err_en:
-        regulator_put(regulator);
-err_reg:
-        gpio_free(en_vdd_1v05);
-
-        return err;
-}
-
-#endif
diff --git a/arch/arm/mach-tegra/board.h b/arch/arm/mach-tegra/board.h
index 9a6659fe2dc2..db6810dc0b3d 100644
--- a/arch/arm/mach-tegra/board.h
+++ b/arch/arm/mach-tegra/board.h
@@ -31,7 +31,6 @@ void __init tegra_init_early(void);
 void __init tegra_map_common_io(void);
 void __init tegra_init_irq(void);
 void __init tegra_dt_init_irq(void);
-int __init tegra_pcie_init(bool init_port0, bool init_port1);
 
 void tegra_init_late(void);
 
@@ -48,13 +47,6 @@ int __init tegra_powergate_debugfs_init(void);
 static inline int tegra_powergate_debugfs_init(void) { return 0; }
 #endif
 
-int __init harmony_regulator_init(void);
-#ifdef CONFIG_TEGRA_PCI
-int __init harmony_pcie_init(void);
-#else
-static inline int harmony_pcie_init(void) { return 0; }
-#endif
-
 void __init tegra_paz00_wifikill_init(void);
 
 #endif
diff --git a/arch/arm/mach-tegra/common.h b/arch/arm/mach-tegra/common.h
index 32f8eb3fe344..5900cc44f780 100644
--- a/arch/arm/mach-tegra/common.h
+++ b/arch/arm/mach-tegra/common.h
@@ -2,4 +2,3 @@ extern struct smp_operations tegra_smp_ops;
 
 extern int tegra_cpu_kill(unsigned int cpu);
 extern void tegra_cpu_die(unsigned int cpu);
-extern int tegra_cpu_disable(unsigned int cpu);
diff --git a/arch/arm/mach-tegra/cpuidle-tegra114.c b/arch/arm/mach-tegra/cpuidle-tegra114.c
index 1d1c6023f4a2..e0b87300243d 100644
--- a/arch/arm/mach-tegra/cpuidle-tegra114.c
+++ b/arch/arm/mach-tegra/cpuidle-tegra114.c
@@ -17,15 +17,64 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/cpuidle.h>
+#include <linux/cpu_pm.h>
+#include <linux/clockchips.h>
 
 #include <asm/cpuidle.h>
+#include <asm/suspend.h>
+#include <asm/smp_plat.h>
+
+#include "pm.h"
+#include "sleep.h"
+
+#ifdef CONFIG_PM_SLEEP
+#define TEGRA114_MAX_STATES 2
+#else
+#define TEGRA114_MAX_STATES 1
+#endif
+
+#ifdef CONFIG_PM_SLEEP
+static int tegra114_idle_power_down(struct cpuidle_device *dev,
+                                    struct cpuidle_driver *drv,
+                                    int index)
+{
+        local_fiq_disable();
+
+        tegra_set_cpu_in_lp2();
+        cpu_pm_enter();
+
+        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_ENTER, &dev->cpu);
+
+        cpu_suspend(0, tegra30_sleep_cpu_secondary_finish);
+
+        clockevents_notify(CLOCK_EVT_NOTIFY_BROADCAST_EXIT, &dev->cpu);
+
+        cpu_pm_exit();
+        tegra_clear_cpu_in_lp2();
+
+        local_fiq_enable();
+
+        return index;
+}
+#endif
 
 static struct cpuidle_driver tegra_idle_driver = {
         .name = "tegra_idle",
         .owner = THIS_MODULE,
-        .state_count = 1,
+        .state_count = TEGRA114_MAX_STATES,
         .states = {
                 [0] = ARM_CPUIDLE_WFI_STATE_PWR(600),
+#ifdef CONFIG_PM_SLEEP
+                [1] = {
+                        .enter                  = tegra114_idle_power_down,
+                        .exit_latency           = 500,
+                        .target_residency       = 1000,
+                        .power_usage            = 0,
+                        .flags                  = CPUIDLE_FLAG_TIME_VALID,
+                        .name                   = "powered-down",
+                        .desc                   = "CPU power gated",
+                },
+#endif
         },
 };
 
diff --git a/arch/arm/mach-tegra/cpuidle-tegra20.c b/arch/arm/mach-tegra/cpuidle-tegra20.c
index 706aa4215c36..b82dcaee2ef4 100644
--- a/arch/arm/mach-tegra/cpuidle-tegra20.c
+++ b/arch/arm/mach-tegra/cpuidle-tegra20.c
@@ -211,6 +211,18 @@ static int tegra20_idle_lp2_coupled(struct cpuidle_device *dev,
 }
 #endif
 
+/*
+ * Tegra20 HW appears to have a bug such that PCIe device interrupts, whether
+ * they are legacy IRQs or MSI, are lost when LP2 is enabled. To work around
+ * this, simply disable LP2 if the PCI driver and DT node are both enabled.
+ */
+void tegra20_cpuidle_pcie_irqs_in_use(void)
+{
+        pr_info_once(
+                "Disabling cpuidle LP2 state, since PCIe IRQs are in use\n");
+        tegra_idle_driver.states[1].disabled = true;
+}
+
 int __init tegra20_cpuidle_init(void)
 {
         return cpuidle_register(&tegra_idle_driver, cpu_possible_mask);
diff --git a/arch/arm/mach-tegra/cpuidle.c b/arch/arm/mach-tegra/cpuidle.c
index e85973cef037..0961dfcf83a4 100644
--- a/arch/arm/mach-tegra/cpuidle.c
+++ b/arch/arm/mach-tegra/cpuidle.c
@@ -44,3 +44,13 @@ void __init tegra_cpuidle_init(void)
                 break;
         }
 }
+
+void tegra_cpuidle_pcie_irqs_in_use(void)
+{
+        switch (tegra_chip_id) {
+        case TEGRA20:
+                if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC))
+                        tegra20_cpuidle_pcie_irqs_in_use();
+                break;
+        }
+}
diff --git a/arch/arm/mach-tegra/cpuidle.h b/arch/arm/mach-tegra/cpuidle.h
index 9ec2c1ab0fa4..c017dab60ffa 100644
--- a/arch/arm/mach-tegra/cpuidle.h
+++ b/arch/arm/mach-tegra/cpuidle.h
@@ -19,6 +19,7 @@
 
 #ifdef CONFIG_CPU_IDLE
 int tegra20_cpuidle_init(void);
+void tegra20_cpuidle_pcie_irqs_in_use(void);
 int tegra30_cpuidle_init(void);
 int tegra114_cpuidle_init(void);
 void tegra_cpuidle_init(void);
diff --git a/arch/arm/mach-tegra/flowctrl.c b/arch/arm/mach-tegra/flowctrl.c
index b477ef310dcd..5348543382bf 100644
--- a/arch/arm/mach-tegra/flowctrl.c
+++ b/arch/arm/mach-tegra/flowctrl.c
@@ -86,6 +86,7 @@ void flowctrl_cpu_suspend_enter(unsigned int cpuid)
                 reg |= TEGRA20_FLOW_CTRL_CSR_WFE_CPU0 << cpuid;
                 break;
         case TEGRA30:
+        case TEGRA114:
                 /* clear wfe bitmap */
                 reg &= ~TEGRA30_FLOW_CTRL_CSR_WFE_BITMAP;
                 /* clear wfi bitmap */
@@ -123,6 +124,7 @@ void flowctrl_cpu_suspend_exit(unsigned int cpuid)
                 reg &= ~TEGRA20_FLOW_CTRL_CSR_WFI_BITMAP;
                 break;
         case TEGRA30:
+        case TEGRA114:
                 /* clear wfe bitmap */
                 reg &= ~TEGRA30_FLOW_CTRL_CSR_WFE_BITMAP;
                 /* clear wfi bitmap */
diff --git a/arch/arm/mach-tegra/flowctrl.h b/arch/arm/mach-tegra/flowctrl.h
index 7a29bae799a7..c89aac60a143 100644
--- a/arch/arm/mach-tegra/flowctrl.h
+++ b/arch/arm/mach-tegra/flowctrl.h
@@ -28,9 +28,18 @@
 #define FLOW_CTRL_SCLK_RESUME           (1 << 27)
 #define FLOW_CTRL_HALT_CPU_IRQ          (1 << 10)
 #define FLOW_CTRL_HALT_CPU_FIQ          (1 << 8)
+#define FLOW_CTRL_HALT_LIC_IRQ          (1 << 11)
+#define FLOW_CTRL_HALT_LIC_FIQ          (1 << 10)
+#define FLOW_CTRL_HALT_GIC_IRQ          (1 << 9)
+#define FLOW_CTRL_HALT_GIC_FIQ          (1 << 8)
 #define FLOW_CTRL_CPU0_CSR              0x8
 #define FLOW_CTRL_CSR_INTR_FLAG         (1 << 15)
 #define FLOW_CTRL_CSR_EVENT_FLAG        (1 << 14)
+#define FLOW_CTRL_CSR_ENABLE_EXT_CRAIL  (1 << 13)
+#define FLOW_CTRL_CSR_ENABLE_EXT_NCPU   (1 << 12)
+#define FLOW_CTRL_CSR_ENABLE_EXT_MASK ( \
+                FLOW_CTRL_CSR_ENABLE_EXT_NCPU | \
+                FLOW_CTRL_CSR_ENABLE_EXT_CRAIL)
 #define FLOW_CTRL_CSR_ENABLE            (1 << 0)
 #define FLOW_CTRL_HALT_CPU1_EVENTS      0x14
 #define FLOW_CTRL_CPU1_CSR              0x18
diff --git a/arch/arm/mach-tegra/headsmp.S b/arch/arm/mach-tegra/headsmp.S
index 045c16f2dd51..2072e7322c39 100644
--- a/arch/arm/mach-tegra/headsmp.S
+++ b/arch/arm/mach-tegra/headsmp.S
@@ -6,6 +6,7 @@
         .section ".text.head", "ax"
 
 ENTRY(tegra_secondary_startup)
-        bl      v7_invalidate_l1
+        check_cpu_part_num 0xc09, r8, r9
+        bleq    v7_invalidate_l1
         b       secondary_startup
 ENDPROC(tegra_secondary_startup)
diff --git a/arch/arm/mach-tegra/hotplug.c b/arch/arm/mach-tegra/hotplug.c
index a52c10e0a857..04de2e860923 100644
--- a/arch/arm/mach-tegra/hotplug.c
+++ b/arch/arm/mach-tegra/hotplug.c
@@ -37,7 +37,7 @@ int tegra_cpu_kill(unsigned cpu)
 void __ref tegra_cpu_die(unsigned int cpu)
 {
         /* Clean L1 data cache */
-        tegra_disable_clean_inv_dcache();
+        tegra_disable_clean_inv_dcache(TEGRA_FLUSH_CACHE_LOUIS);
 
         /* Shut down the current CPU. */
         tegra_hotplug_shutdown();
@@ -46,17 +46,6 @@ void __ref tegra_cpu_die(unsigned int cpu)
         BUG();
 }
 
-int tegra_cpu_disable(unsigned int cpu)
-{
-        switch (tegra_chip_id) {
-        case TEGRA20:
-        case TEGRA30:
-                return cpu == 0 ? -EPERM : 0;
-        default:
-                return 0;
-        }
-}
-
 void __init tegra_hotplug_init(void)
 {
         if (!IS_ENABLED(CONFIG_HOTPLUG_CPU))
diff --git a/arch/arm/mach-tegra/iomap.h b/arch/arm/mach-tegra/iomap.h
index 399fbca27102..3f5fa0749bde 100644
--- a/arch/arm/mach-tegra/iomap.h
+++ b/arch/arm/mach-tegra/iomap.h
@@ -24,6 +24,8 @@
 #define TEGRA_IRAM_BASE                 0x40000000
 #define TEGRA_IRAM_SIZE                 SZ_256K
 
+#define TEGRA_IRAM_CODE_AREA            (TEGRA_IRAM_BASE + SZ_4K)
+
 #define TEGRA_HOST1X_BASE               0x50000000
 #define TEGRA_HOST1X_SIZE               0x24000
 
@@ -237,6 +239,12 @@
 #define TEGRA_KFUSE_BASE                0x7000FC00
 #define TEGRA_KFUSE_SIZE                SZ_1K
 
+#define TEGRA_EMC0_BASE                 0x7001A000
+#define TEGRA_EMC0_SIZE                 SZ_2K
+
+#define TEGRA_EMC1_BASE                 0x7001A800
+#define TEGRA_EMC1_SIZE                 SZ_2K
+
 #define TEGRA_CSITE_BASE                0x70040000
 #define TEGRA_CSITE_SIZE                SZ_256K
 
@@ -278,9 +286,6 @@
 #define IO_APB_VIRT     IOMEM(0xFE300000)
 #define IO_APB_SIZE     SZ_1M
 
-#define TEGRA_PCIE_BASE         0x80000000
-#define TEGRA_PCIE_IO_BASE      (TEGRA_PCIE_BASE + SZ_4M)
-
 #define IO_TO_VIRT_BETWEEN(p, st, sz)   ((p) >= (st) && (p) < ((st) + (sz)))
 #define IO_TO_VIRT_XLATE(p, pst, vst)   (((p) - (pst) + (vst)))
 
diff --git a/arch/arm/mach-tegra/irq.c b/arch/arm/mach-tegra/irq.c
index 0de4eed1493d..1a74d562dca1 100644
--- a/arch/arm/mach-tegra/irq.c
+++ b/arch/arm/mach-tegra/irq.c
@@ -18,10 +18,12 @@
  */
 
 #include <linux/kernel.h>
+#include <linux/cpu_pm.h>
 #include <linux/interrupt.h>
 #include <linux/irq.h>
 #include <linux/io.h>
 #include <linux/of.h>
+#include <linux/of_address.h>
 #include <linux/irqchip/arm-gic.h>
 #include <linux/syscore_ops.h>
 
@@ -65,6 +67,7 @@ static u32 cpu_ier[TEGRA_MAX_NUM_ICTLRS];
 static u32 cpu_iep[TEGRA_MAX_NUM_ICTLRS];
 
 static u32 ictlr_wake_mask[TEGRA_MAX_NUM_ICTLRS];
+static void __iomem *tegra_gic_cpu_base;
 #endif
 
 bool tegra_pending_sgi(void)
@@ -213,8 +216,43 @@ int tegra_legacy_irq_syscore_init(void)
 
         return 0;
 }
+
+static int tegra_gic_notifier(struct notifier_block *self,
+                              unsigned long cmd, void *v)
+{
+        switch (cmd) {
+        case CPU_PM_ENTER:
+                writel_relaxed(0x1E0, tegra_gic_cpu_base + GIC_CPU_CTRL);
+                break;
+        }
+
+        return NOTIFY_OK;
+}
+
+static struct notifier_block tegra_gic_notifier_block = {
+        .notifier_call = tegra_gic_notifier,
+};
+
+static const struct of_device_id tegra114_dt_gic_match[] __initconst = {
+        { .compatible = "arm,cortex-a15-gic" },
+        { }
+};
+
+static void tegra114_gic_cpu_pm_registration(void)
+{
+        struct device_node *dn;
+
+        dn = of_find_matching_node(NULL, tegra114_dt_gic_match);
+        if (!dn)
+                return;
+
+        tegra_gic_cpu_base = of_iomap(dn, 1);
+
+        cpu_pm_register_notifier(&tegra_gic_notifier_block);
+}
 #else
 #define tegra_set_wake NULL
+static void tegra114_gic_cpu_pm_registration(void) { }
 #endif
 
 void __init tegra_init_irq(void)
@@ -252,4 +290,6 @@ void __init tegra_init_irq(void)
         if (!of_have_populated_dt())
                 gic_init(0, 29, distbase,
                         IO_ADDRESS(TEGRA_ARM_PERIF_BASE + 0x100));
+
+        tegra114_gic_cpu_pm_registration();
 }
diff --git a/arch/arm/mach-tegra/pcie.c b/arch/arm/mach-tegra/pcie.c
deleted file mode 100644
index 46144a19a7e7..000000000000
--- a/arch/arm/mach-tegra/pcie.c
+++ /dev/null
@@ -1,886 +0,0 @@
-/*
- * arch/arm/mach-tegra/pci.c
- *
- * PCIe host controller driver for TEGRA(2) SOCs
- *
- * Copyright (c) 2010, CompuLab, Ltd.
- * Author: Mike Rapoport <mike@compulab.co.il>
- *
- * Based on NVIDIA PCIe driver
- * Copyright (c) 2008-2009, NVIDIA Corporation.
- *
- * Bits taken from arch/arm/mach-dove/pcie.c
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * 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.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
- */
-
-#include <linux/kernel.h>
-#include <linux/pci.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/clk.h>
-#include <linux/delay.h>
-#include <linux/export.h>
-#include <linux/clk/tegra.h>
-#include <linux/tegra-powergate.h>
-
-#include <asm/sizes.h>
-#include <asm/mach/pci.h>
-
-#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
-#define RP0_OFFSET      0x0000
-#define RP1_OFFSET      0x1000
-
-#define AFI_AXI_BAR0_SZ 0x00
-#define AFI_AXI_BAR1_SZ 0x04
-#define AFI_AXI_BAR2_SZ 0x08
-#define AFI_AXI_BAR3_SZ 0x0c
-#define AFI_AXI_BAR4_SZ 0x10
-#define AFI_AXI_BAR5_SZ 0x14
-
-#define AFI_AXI_BAR0_START      0x18
-#define AFI_AXI_BAR1_START      0x1c
-#define AFI_AXI_BAR2_START      0x20
-#define AFI_AXI_BAR3_START      0x24
-#define AFI_AXI_BAR4_START      0x28
-#define AFI_AXI_BAR5_START      0x2c
-
-#define AFI_FPCI_BAR0   0x30
-#define AFI_FPCI_BAR1   0x34
-#define AFI_FPCI_BAR2   0x38
-#define AFI_FPCI_BAR3   0x3c
-#define AFI_FPCI_BAR4   0x40
-#define AFI_FPCI_BAR5   0x44
-
-#define AFI_CACHE_BAR0_SZ       0x48
-#define AFI_CACHE_BAR0_ST       0x4c
-#define AFI_CACHE_BAR1_SZ       0x50
-#define AFI_CACHE_BAR1_ST       0x54
-
-#define AFI_MSI_BAR_SZ          0x60
-#define AFI_MSI_FPCI_BAR_ST     0x64
-#define AFI_MSI_AXI_BAR_ST      0x68
-
-#define AFI_CONFIGURATION               0xac
-#define  AFI_CONFIGURATION_EN_FPCI      (1 << 0)
-
-#define AFI_FPCI_ERROR_MASKS    0xb0
-
-#define AFI_INTR_MASK           0xb4
-#define  AFI_INTR_MASK_INT_MASK (1 << 0)
-#define  AFI_INTR_MASK_MSI_MASK (1 << 8)
-
-#define AFI_INTR_CODE           0xb8
-#define  AFI_INTR_CODE_MASK     0xf
-#define  AFI_INTR_MASTER_ABORT  4
-#define  AFI_INTR_LEGACY        6
-
-#define AFI_INTR_SIGNATURE      0xbc
-#define AFI_SM_INTR_ENABLE      0xc4
-
-#define AFI_AFI_INTR_ENABLE             0xc8
-#define  AFI_INTR_EN_INI_SLVERR         (1 << 0)
-#define  AFI_INTR_EN_INI_DECERR         (1 << 1)
-#define  AFI_INTR_EN_TGT_SLVERR         (1 << 2)
-#define  AFI_INTR_EN_TGT_DECERR         (1 << 3)
-#define  AFI_INTR_EN_TGT_WRERR          (1 << 4)
-#define  AFI_INTR_EN_DFPCI_DECERR       (1 << 5)
-#define  AFI_INTR_EN_AXI_DECERR         (1 << 6)
-#define  AFI_INTR_EN_FPCI_TIMEOUT       (1 << 7)
-
-#define AFI_PCIE_CONFIG                                 0x0f8
-#define  AFI_PCIE_CONFIG_PCIEC0_DISABLE_DEVICE          (1 << 1)
-#define  AFI_PCIE_CONFIG_PCIEC1_DISABLE_DEVICE          (1 << 2)
-#define  AFI_PCIE_CONFIG_SM2TMS0_XBAR_CONFIG_MASK       (0xf << 20)
-#define  AFI_PCIE_CONFIG_SM2TMS0_XBAR_CONFIG_SINGLE     (0x0 << 20)
-#define  AFI_PCIE_CONFIG_SM2TMS0_XBAR_CONFIG_DUAL       (0x1 << 20)
-
-#define AFI_FUSE                        0x104
-#define  AFI_FUSE_PCIE_T0_GEN2_DIS      (1 << 2)
-
-#define AFI_PEX0_CTRL                   0x110
-#define AFI_PEX1_CTRL                   0x118
-#define  AFI_PEX_CTRL_RST               (1 << 0)
-#define  AFI_PEX_CTRL_REFCLK_EN         (1 << 3)
-
-#define RP_VEND_XP      0x00000F00
-#define  RP_VEND_XP_DL_UP       (1 << 30)
-
-#define RP_LINK_CONTROL_STATUS                  0x00000090
-#define  RP_LINK_CONTROL_STATUS_LINKSTAT_MASK   0x3fff0000
-
-#define PADS_CTL_SEL            0x0000009C
-
-#define PADS_CTL                0x000000A0
-#define  PADS_CTL_IDDQ_1L       (1 << 0)
-#define  PADS_CTL_TX_DATA_EN_1L (1 << 6)
-#define  PADS_CTL_RX_DATA_EN_1L (1 << 10)
-
-#define PADS_PLL_CTL                            0x000000B8
-#define  PADS_PLL_CTL_RST_B4SM                  (1 << 1)
-#define  PADS_PLL_CTL_LOCKDET                   (1 << 8)
-#define  PADS_PLL_CTL_REFCLK_MASK               (0x3 << 16)
-#define  PADS_PLL_CTL_REFCLK_INTERNAL_CML       (0 << 16)
-#define  PADS_PLL_CTL_REFCLK_INTERNAL_CMOS      (1 << 16)
-#define  PADS_PLL_CTL_REFCLK_EXTERNAL           (2 << 16)
-#define  PADS_PLL_CTL_TXCLKREF_MASK             (0x1 << 20)
-#define  PADS_PLL_CTL_TXCLKREF_DIV10            (0 << 20)
-#define  PADS_PLL_CTL_TXCLKREF_DIV5             (1 << 20)
-
-/* PMC access is required for PCIE xclk (un)clamping */
-#define PMC_SCRATCH42           0x144
-#define PMC_SCRATCH42_PCX_CLAMP (1 << 0)
-
-static void __iomem *reg_pmc_base = IO_ADDRESS(TEGRA_PMC_BASE);
-
-#define pmc_writel(value, reg) \
-        __raw_writel(value, reg_pmc_base + (reg))
-#define pmc_readl(reg) \
-        __raw_readl(reg_pmc_base + (reg))
-
-/*
- * Tegra2 defines 1GB in the AXI address map for PCIe.
- *
- * That address space is split into different regions, with sizes and
- * offsets as follows:
- *
- * 0x80000000 - 0x80003fff - PCI controller registers
- * 0x80004000 - 0x80103fff - PCI configuration space
- * 0x80104000 - 0x80203fff - PCI extended configuration space
- * 0x80203fff - 0x803fffff - unused
- * 0x80400000 - 0x8040ffff - downstream IO
- * 0x80410000 - 0x8fffffff - unused
- * 0x90000000 - 0x9fffffff - non-prefetchable memory
- * 0xa0000000 - 0xbfffffff - prefetchable memory
- */
-#define PCIE_REGS_SZ            SZ_16K
-#define PCIE_CFG_OFF            PCIE_REGS_SZ
-#define PCIE_CFG_SZ             SZ_1M
-#define PCIE_EXT_CFG_OFF        (PCIE_CFG_SZ + PCIE_CFG_OFF)
-#define PCIE_EXT_CFG_SZ         SZ_1M
-#define PCIE_IOMAP_SZ           (PCIE_REGS_SZ + PCIE_CFG_SZ + PCIE_EXT_CFG_SZ)
-
-#define MEM_BASE_0              (TEGRA_PCIE_BASE + SZ_256M)
-#define MEM_SIZE_0              SZ_128M
-#define MEM_BASE_1              (MEM_BASE_0 + MEM_SIZE_0)
-#define MEM_SIZE_1              SZ_128M
-#define PREFETCH_MEM_BASE_0     (MEM_BASE_1 + MEM_SIZE_1)
-#define PREFETCH_MEM_SIZE_0     SZ_128M
-#define PREFETCH_MEM_BASE_1     (PREFETCH_MEM_BASE_0 + PREFETCH_MEM_SIZE_0)
-#define PREFETCH_MEM_SIZE_1     SZ_128M
-
-#define  PCIE_CONF_BUS(b)       ((b) << 16)
-#define  PCIE_CONF_DEV(d)       ((d) << 11)
-#define  PCIE_CONF_FUNC(f)      ((f) << 8)
-#define  PCIE_CONF_REG(r)       \
-        (((r) & ~0x3) | (((r) < 256) ? PCIE_CFG_OFF : PCIE_EXT_CFG_OFF))
-
-struct tegra_pcie_port {
-        int                     index;
-        u8                      root_bus_nr;
-        void __iomem            *base;
-
-        bool                    link_up;
-
-        char                    mem_space_name[16];
-        char                    prefetch_space_name[20];
-        struct resource         res[2];
-};
-
-struct tegra_pcie_info {
-        struct tegra_pcie_port  port[2];
-        int                     num_ports;
-
-        void __iomem            *regs;
-        struct resource         res_mmio;
-
-        struct clk              *pex_clk;
-        struct clk              *afi_clk;
-        struct clk              *pcie_xclk;
-        struct clk              *pll_e;
-};
-
-static struct tegra_pcie_info tegra_pcie;
-
-static inline void afi_writel(u32 value, unsigned long offset)
-{
-        writel(value, offset + AFI_OFFSET + tegra_pcie.regs);
-}
-
-static inline u32 afi_readl(unsigned long offset)
-{
-        return readl(offset + AFI_OFFSET + tegra_pcie.regs);
-}
-
-static inline void pads_writel(u32 value, unsigned long offset)
-{
-        writel(value, offset + PADS_OFFSET + tegra_pcie.regs);
-}
-
-static inline u32 pads_readl(unsigned long offset)
-{
-        return readl(offset + PADS_OFFSET + tegra_pcie.regs);
-}
-
-static struct tegra_pcie_port *bus_to_port(int bus)
-{
-        int i;
-
-        for (i = tegra_pcie.num_ports - 1; i >= 0; i--) {
-                int rbus = tegra_pcie.port[i].root_bus_nr;
-                if (rbus != -1 && rbus == bus)
-                        break;
-        }
-
-        return i >= 0 ? tegra_pcie.port + i : NULL;
-}
-
-static int tegra_pcie_read_conf(struct pci_bus *bus, unsigned int devfn,
-                                int where, int size, u32 *val)
-{
-        struct tegra_pcie_port *pp = bus_to_port(bus->number);
-        void __iomem *addr;
-
-        if (pp) {
-                if (devfn != 0) {
-                        *val = 0xffffffff;
-                        return PCIBIOS_DEVICE_NOT_FOUND;
-                }
-
-                addr = pp->base + (where & ~0x3);
-        } else {
-                addr = tegra_pcie.regs + (PCIE_CONF_BUS(bus->number) +
-                                          PCIE_CONF_DEV(PCI_SLOT(devfn)) +
-                                          PCIE_CONF_FUNC(PCI_FUNC(devfn)) +
-                                          PCIE_CONF_REG(where));
-        }
-
-        *val = readl(addr);
-
-        if (size == 1)
-                *val = (*val >> (8 * (where & 3))) & 0xff;
-        else if (size == 2)
-                *val = (*val >> (8 * (where & 3))) & 0xffff;
-
-        return PCIBIOS_SUCCESSFUL;
-}
-
-static int tegra_pcie_write_conf(struct pci_bus *bus, unsigned int devfn,
-                                 int where, int size, u32 val)
-{
-        struct tegra_pcie_port *pp = bus_to_port(bus->number);
-        void __iomem *addr;
-
-        u32 mask;
-        u32 tmp;
-
-        if (pp) {
-                if (devfn != 0)
-                        return PCIBIOS_DEVICE_NOT_FOUND;
-
-                addr = pp->base + (where & ~0x3);
-        } else {
-                addr = tegra_pcie.regs + (PCIE_CONF_BUS(bus->number) +
-                                          PCIE_CONF_DEV(PCI_SLOT(devfn)) +
-                                          PCIE_CONF_FUNC(PCI_FUNC(devfn)) +
-                                          PCIE_CONF_REG(where));
-        }
-
-        if (size == 4) {
-                writel(val, addr);
-                return PCIBIOS_SUCCESSFUL;
-        }
-
-        if (size == 2)
-                mask = ~(0xffff << ((where & 0x3) * 8));
-        else if (size == 1)
-                mask = ~(0xff << ((where & 0x3) * 8));
-        else
-                return PCIBIOS_BAD_REGISTER_NUMBER;
-
-        tmp = readl(addr) & mask;
-        tmp |= val << ((where & 0x3) * 8);
-        writel(tmp, addr);
-
-        return PCIBIOS_SUCCESSFUL;
-}
-
-static struct pci_ops tegra_pcie_ops = {
-        .read   = tegra_pcie_read_conf,
-        .write  = tegra_pcie_write_conf,
-};
-
-static void tegra_pcie_fixup_bridge(struct pci_dev *dev)
-{
-        u16 reg;
-
-        if ((dev->class >> 16) == PCI_BASE_CLASS_BRIDGE) {
-                pci_read_config_word(dev, PCI_COMMAND, &reg);
-                reg |= (PCI_COMMAND_IO | PCI_COMMAND_MEMORY |
-                        PCI_COMMAND_MASTER | PCI_COMMAND_SERR);
-                pci_write_config_word(dev, PCI_COMMAND, reg);
-        }
-}
-DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, tegra_pcie_fixup_bridge);
-
-/* Tegra PCIE root complex wrongly reports device class */
-static void tegra_pcie_fixup_class(struct pci_dev *dev)
-{
-        dev->class = PCI_CLASS_BRIDGE_PCI << 8;
-}
-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_NVIDIA, 0x0bf0, tegra_pcie_fixup_class);
-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_NVIDIA, 0x0bf1, tegra_pcie_fixup_class);
-
-/* Tegra PCIE requires relaxed ordering */
-static void tegra_pcie_relax_enable(struct pci_dev *dev)
-{
-        pcie_capability_set_word(dev, PCI_EXP_DEVCTL, PCI_EXP_DEVCTL_RELAX_EN);
-}
-DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, tegra_pcie_relax_enable);
-
-static int tegra_pcie_setup(int nr, struct pci_sys_data *sys)
-{
-        struct tegra_pcie_port *pp;
-
-        if (nr >= tegra_pcie.num_ports)
-                return 0;
-
-        pp = tegra_pcie.port + nr;
-        pp->root_bus_nr = sys->busnr;
-
-        pci_ioremap_io(nr * SZ_64K, TEGRA_PCIE_IO_BASE);
-
-        /*
-         * IORESOURCE_MEM
-         */
-        snprintf(pp->mem_space_name, sizeof(pp->mem_space_name),
-                 "PCIe %d MEM", pp->index);
-        pp->mem_space_name[sizeof(pp->mem_space_name) - 1] = 0;
-        pp->res[0].name = pp->mem_space_name;
-        if (pp->index == 0) {
-                pp->res[0].start = MEM_BASE_0;
-                pp->res[0].end = pp->res[0].start + MEM_SIZE_0 - 1;
-        } else {
-                pp->res[0].start = MEM_BASE_1;
-                pp->res[0].end = pp->res[0].start + MEM_SIZE_1 - 1;
-        }
-        pp->res[0].flags = IORESOURCE_MEM;
-        if (request_resource(&iomem_resource, &pp->res[0]))
-                panic("Request PCIe Memory resource failed\n");
-        pci_add_resource_offset(&sys->resources, &pp->res[0], sys->mem_offset);
-
-        /*
-         * IORESOURCE_MEM | IORESOURCE_PREFETCH
-         */
-        snprintf(pp->prefetch_space_name, sizeof(pp->prefetch_space_name),
-                 "PCIe %d PREFETCH MEM", pp->index);
-        pp->prefetch_space_name[sizeof(pp->prefetch_space_name) - 1] = 0;
-        pp->res[1].name = pp->prefetch_space_name;
-        if (pp->index == 0) {
-                pp->res[1].start = PREFETCH_MEM_BASE_0;
-                pp->res[1].end = pp->res[1].start + PREFETCH_MEM_SIZE_0 - 1;
-        } else {
-                pp->res[1].start = PREFETCH_MEM_BASE_1;
-                pp->res[1].end = pp->res[1].start + PREFETCH_MEM_SIZE_1 - 1;
-        }
-        pp->res[1].flags = IORESOURCE_MEM | IORESOURCE_PREFETCH;
-        if (request_resource(&iomem_resource, &pp->res[1]))
-                panic("Request PCIe Prefetch Memory resource failed\n");
-        pci_add_resource_offset(&sys->resources, &pp->res[1], sys->mem_offset);
-
-        return 1;
-}
-
-static int tegra_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
-{
-        return INT_PCIE_INTR;
-}
-
-static struct pci_bus __init *tegra_pcie_scan_bus(int nr,
-                                                  struct pci_sys_data *sys)
-{
-        struct tegra_pcie_port *pp;
-
-        if (nr >= tegra_pcie.num_ports)
-                return NULL;
-
-        pp = tegra_pcie.port + nr;
-        pp->root_bus_nr = sys->busnr;
-
-        return pci_scan_root_bus(NULL, sys->busnr, &tegra_pcie_ops, sys,
-                                 &sys->resources);
-}
-
-static struct hw_pci tegra_pcie_hw __initdata = {
-        .nr_controllers = 2,
-        .setup          = tegra_pcie_setup,
-        .scan           = tegra_pcie_scan_bus,
-        .map_irq        = tegra_pcie_map_irq,
-};
-
-
-static irqreturn_t tegra_pcie_isr(int irq, void *arg)
-{
-        const char *err_msg[] = {
-                "Unknown",
-                "AXI slave error",
-                "AXI decode error",
-                "Target abort",
-                "Master abort",
-                "Invalid write",
-                "Response decoding error",
-                "AXI response decoding error",
-                "Transcation timeout",
-        };
-
-        u32 code, signature;
-
-        code = afi_readl(AFI_INTR_CODE) & AFI_INTR_CODE_MASK;
-        signature = afi_readl(AFI_INTR_SIGNATURE);
-        afi_writel(0, AFI_INTR_CODE);
-
-        if (code == AFI_INTR_LEGACY)
-                return IRQ_NONE;
-
-        if (code >= ARRAY_SIZE(err_msg))
-                code = 0;
-
-        /*
-         * do not pollute kernel log with master abort reports since they
-         * happen a lot during enumeration
-         */
-        if (code == AFI_INTR_MASTER_ABORT)
-                pr_debug("PCIE: %s, signature: %08x\n", err_msg[code], signature);
-        else
-                pr_err("PCIE: %s, signature: %08x\n", err_msg[code], signature);
-
-        return IRQ_HANDLED;
-}
-
-static void tegra_pcie_setup_translations(void)
-{
-        u32 fpci_bar;
-        u32 size;
-        u32 axi_address;
-
-        /* Bar 0: config Bar */
-        fpci_bar = ((u32)0xfdff << 16);
-        size = PCIE_CFG_SZ;
-        axi_address = TEGRA_PCIE_BASE + PCIE_CFG_OFF;
-        afi_writel(axi_address, AFI_AXI_BAR0_START);
-        afi_writel(size >> 12, AFI_AXI_BAR0_SZ);
-        afi_writel(fpci_bar, AFI_FPCI_BAR0);
-
-        /* Bar 1: extended config Bar */
-        fpci_bar = ((u32)0xfe1 << 20);
-        size = PCIE_EXT_CFG_SZ;
-        axi_address = TEGRA_PCIE_BASE + PCIE_EXT_CFG_OFF;
-        afi_writel(axi_address, AFI_AXI_BAR1_START);
-        afi_writel(size >> 12, AFI_AXI_BAR1_SZ);
-        afi_writel(fpci_bar, AFI_FPCI_BAR1);
-
-        /* Bar 2: downstream IO bar */
-        fpci_bar = ((__u32)0xfdfc << 16);
-        size = SZ_128K;
-        axi_address = TEGRA_PCIE_IO_BASE;
-        afi_writel(axi_address, AFI_AXI_BAR2_START);
-        afi_writel(size >> 12, AFI_AXI_BAR2_SZ);
-        afi_writel(fpci_bar, AFI_FPCI_BAR2);
-
-        /* Bar 3: prefetchable memory BAR */
-        fpci_bar = (((PREFETCH_MEM_BASE_0 >> 12) & 0x0fffffff) << 4) | 0x1;
-        size =  PREFETCH_MEM_SIZE_0 +  PREFETCH_MEM_SIZE_1;
-        axi_address = PREFETCH_MEM_BASE_0;
-        afi_writel(axi_address, AFI_AXI_BAR3_START);
-        afi_writel(size >> 12, AFI_AXI_BAR3_SZ);
-        afi_writel(fpci_bar, AFI_FPCI_BAR3);
-
-        /* Bar 4: non prefetchable memory BAR */
-        fpci_bar = (((MEM_BASE_0 >> 12) & 0x0FFFFFFF) << 4) | 0x1;
-        size = MEM_SIZE_0 + MEM_SIZE_1;
-        axi_address = MEM_BASE_0;
-        afi_writel(axi_address, AFI_AXI_BAR4_START);
-        afi_writel(size >> 12, AFI_AXI_BAR4_SZ);
-        afi_writel(fpci_bar, AFI_FPCI_BAR4);
-
-        /* Bar 5: NULL out the remaining BAR as it is not used */
-        fpci_bar = 0;
-        size = 0;
-        axi_address = 0;
-        afi_writel(axi_address, AFI_AXI_BAR5_START);
-        afi_writel(size >> 12, AFI_AXI_BAR5_SZ);
-        afi_writel(fpci_bar, AFI_FPCI_BAR5);
-
-        /* map all upstream transactions as uncached */
-        afi_writel(PHYS_OFFSET, AFI_CACHE_BAR0_ST);
-        afi_writel(0, AFI_CACHE_BAR0_SZ);
-        afi_writel(0, AFI_CACHE_BAR1_ST);
-        afi_writel(0, AFI_CACHE_BAR1_SZ);
-
-        /* No MSI */
-        afi_writel(0, AFI_MSI_FPCI_BAR_ST);
-        afi_writel(0, AFI_MSI_BAR_SZ);
-        afi_writel(0, AFI_MSI_AXI_BAR_ST);
-        afi_writel(0, AFI_MSI_BAR_SZ);
-}
-
-static int tegra_pcie_enable_controller(void)
-{
-        u32 val, reg;
-        int i, timeout;
-
-        /* Enable slot clock and pulse the reset signals */
-        for (i = 0, reg = AFI_PEX0_CTRL; i < 2; i++, reg += 0x8) {
-                val = afi_readl(reg) |  AFI_PEX_CTRL_REFCLK_EN;
-                afi_writel(val, reg);
-                val &= ~AFI_PEX_CTRL_RST;
-                afi_writel(val, reg);
-
-                val = afi_readl(reg) | AFI_PEX_CTRL_RST;
-                afi_writel(val, reg);
-        }
-
-        /* Enable dual controller and both ports */
-        val = afi_readl(AFI_PCIE_CONFIG);
-        val &= ~(AFI_PCIE_CONFIG_PCIEC0_DISABLE_DEVICE |
-                 AFI_PCIE_CONFIG_PCIEC1_DISABLE_DEVICE |
-                 AFI_PCIE_CONFIG_SM2TMS0_XBAR_CONFIG_MASK);
-        val |= AFI_PCIE_CONFIG_SM2TMS0_XBAR_CONFIG_DUAL;
-        afi_writel(val, AFI_PCIE_CONFIG);
-
-        val = afi_readl(AFI_FUSE) & ~AFI_FUSE_PCIE_T0_GEN2_DIS;
-        afi_writel(val, AFI_FUSE);
-
-        /* Initialze internal PHY, enable up to 16 PCIE lanes */
-        pads_writel(0x0, PADS_CTL_SEL);
-
-        /* override IDDQ to 1 on all 4 lanes */
-        val = pads_readl(PADS_CTL) | PADS_CTL_IDDQ_1L;
-        pads_writel(val, PADS_CTL);
-
-        /*
-         * set up PHY PLL inputs select PLLE output as refclock,
-         * set TX ref sel to div10 (not div5)
-         */
-        val = pads_readl(PADS_PLL_CTL);
-        val &= ~(PADS_PLL_CTL_REFCLK_MASK | PADS_PLL_CTL_TXCLKREF_MASK);
-        val |= (PADS_PLL_CTL_REFCLK_INTERNAL_CML | PADS_PLL_CTL_TXCLKREF_DIV10);
-        pads_writel(val, PADS_PLL_CTL);
-
-        /* take PLL out of reset  */
-        val = pads_readl(PADS_PLL_CTL) | PADS_PLL_CTL_RST_B4SM;
-        pads_writel(val, PADS_PLL_CTL);
-
-        /*
-         * Hack, set the clock voltage to the DEFAULT provided by hw folks.
-         * This doesn't exist in the documentation
-         */
-        pads_writel(0xfa5cfa5c, 0xc8);
-
-        /* Wait for the PLL to lock */
-        timeout = 300;
-        do {
-                val = pads_readl(PADS_PLL_CTL);
-                usleep_range(1000, 1000);
-                if (--timeout == 0) {
-                        pr_err("Tegra PCIe error: timeout waiting for PLL\n");
-                        return -EBUSY;
-                }
-        } while (!(val & PADS_PLL_CTL_LOCKDET));
-
-        /* turn off IDDQ override */
-        val = pads_readl(PADS_CTL) & ~PADS_CTL_IDDQ_1L;
-        pads_writel(val, PADS_CTL);
-
-        /* enable TX/RX data */
-        val = pads_readl(PADS_CTL);
-        val |= (PADS_CTL_TX_DATA_EN_1L | PADS_CTL_RX_DATA_EN_1L);
-        pads_writel(val, PADS_CTL);
-
-        /* Take the PCIe interface module out of reset */
-        tegra_periph_reset_deassert(tegra_pcie.pcie_xclk);
-
-        /* Finally enable PCIe */
-        val = afi_readl(AFI_CONFIGURATION) | AFI_CONFIGURATION_EN_FPCI;
-        afi_writel(val, AFI_CONFIGURATION);
-
-        val = (AFI_INTR_EN_INI_SLVERR | AFI_INTR_EN_INI_DECERR |
-               AFI_INTR_EN_TGT_SLVERR | AFI_INTR_EN_TGT_DECERR |
-               AFI_INTR_EN_TGT_WRERR | AFI_INTR_EN_DFPCI_DECERR);
-        afi_writel(val, AFI_AFI_INTR_ENABLE);
-        afi_writel(0xffffffff, AFI_SM_INTR_ENABLE);
-
-        /* FIXME: No MSI for now, only INT */
-        afi_writel(AFI_INTR_MASK_INT_MASK, AFI_INTR_MASK);
-
-        /* Disable all execptions */
-        afi_writel(0, AFI_FPCI_ERROR_MASKS);
-
-        return 0;
-}
-
-static void tegra_pcie_xclk_clamp(bool clamp)
-{
-        u32 reg;
-
-        reg = pmc_readl(PMC_SCRATCH42) & ~PMC_SCRATCH42_PCX_CLAMP;
-
-        if (clamp)
-                reg |= PMC_SCRATCH42_PCX_CLAMP;
-
-        pmc_writel(reg, PMC_SCRATCH42);
-}
-
-static void tegra_pcie_power_off(void)
-{
-        tegra_periph_reset_assert(tegra_pcie.pcie_xclk);
-        tegra_periph_reset_assert(tegra_pcie.afi_clk);
-        tegra_periph_reset_assert(tegra_pcie.pex_clk);
-
-        tegra_powergate_power_off(TEGRA_POWERGATE_PCIE);
-        tegra_pcie_xclk_clamp(true);
-}
-
-static int tegra_pcie_power_regate(void)
-{
-        int err;
-
-        tegra_pcie_power_off();
-
-        tegra_pcie_xclk_clamp(true);
-
-        tegra_periph_reset_assert(tegra_pcie.pcie_xclk);
-        tegra_periph_reset_assert(tegra_pcie.afi_clk);
-
-        err = tegra_powergate_sequence_power_up(TEGRA_POWERGATE_PCIE,
-                                                tegra_pcie.pex_clk);
-        if (err) {
-                pr_err("PCIE: powerup sequence failed: %d\n", err);
-                return err;
-        }
-
-        tegra_periph_reset_deassert(tegra_pcie.afi_clk);
-
-        tegra_pcie_xclk_clamp(false);
-
-        clk_prepare_enable(tegra_pcie.afi_clk);
-        clk_prepare_enable(tegra_pcie.pex_clk);
-        return clk_prepare_enable(tegra_pcie.pll_e);
-}
-
-static int tegra_pcie_clocks_get(void)
-{
-        int err;
-
-        tegra_pcie.pex_clk = clk_get(NULL, "pex");
-        if (IS_ERR(tegra_pcie.pex_clk))
-                return PTR_ERR(tegra_pcie.pex_clk);
-
-        tegra_pcie.afi_clk = clk_get(NULL, "afi");
-        if (IS_ERR(tegra_pcie.afi_clk)) {
-                err = PTR_ERR(tegra_pcie.afi_clk);
-                goto err_afi_clk;
-        }
-
-        tegra_pcie.pcie_xclk = clk_get(NULL, "pcie_xclk");
-        if (IS_ERR(tegra_pcie.pcie_xclk)) {
-                err =  PTR_ERR(tegra_pcie.pcie_xclk);
-                goto err_pcie_xclk;
-        }
-
-        tegra_pcie.pll_e = clk_get_sys(NULL, "pll_e");
-        if (IS_ERR(tegra_pcie.pll_e)) {
-                err = PTR_ERR(tegra_pcie.pll_e);
-                goto err_pll_e;
-        }
-
-        return 0;
-
-err_pll_e:
-        clk_put(tegra_pcie.pcie_xclk);
-err_pcie_xclk:
-        clk_put(tegra_pcie.afi_clk);
-err_afi_clk:
-        clk_put(tegra_pcie.pex_clk);
-
-        return err;
-}
-
-static void tegra_pcie_clocks_put(void)
-{
-        clk_put(tegra_pcie.pll_e);
-        clk_put(tegra_pcie.pcie_xclk);
-        clk_put(tegra_pcie.afi_clk);
-        clk_put(tegra_pcie.pex_clk);
-}
-
-static int __init tegra_pcie_get_resources(void)
-{
-        int err;
-
-        err = tegra_pcie_clocks_get();
-        if (err) {
-                pr_err("PCIE: failed to get clocks: %d\n", err);
-                return err;
-        }
-
-        err = tegra_pcie_power_regate();
-        if (err) {
-                pr_err("PCIE: failed to power up: %d\n", err);
-                goto err_pwr_on;
-        }
-
-        tegra_pcie.regs = ioremap_nocache(TEGRA_PCIE_BASE, PCIE_IOMAP_SZ);
-        if (tegra_pcie.regs == NULL) {
-                pr_err("PCIE: Failed to map PCI/AFI registers\n");
-                err = -ENOMEM;
-                goto err_map_reg;
-        }
-
-        err = request_irq(INT_PCIE_INTR, tegra_pcie_isr,
-                          IRQF_SHARED, "PCIE", &tegra_pcie);
-        if (err) {
-                pr_err("PCIE: Failed to register IRQ: %d\n", err);
-                goto err_req_io;
-        }
-        set_irq_flags(INT_PCIE_INTR, IRQF_VALID);
-
-        return 0;
-
-err_req_io:
-        iounmap(tegra_pcie.regs);
-err_map_reg:
-        tegra_pcie_power_off();
-err_pwr_on:
-        tegra_pcie_clocks_put();
-
-        return err;
-}
-
-/*
- * FIXME: If there are no PCIe cards attached, then calling this function
- * can result in the increase of the bootup time as there are big timeout
- * loops.
- */
-#define TEGRA_PCIE_LINKUP_TIMEOUT       200     /* up to 1.2 seconds */
-static bool tegra_pcie_check_link(struct tegra_pcie_port *pp, int idx,
-                                  u32 reset_reg)
-{
-        u32 reg;
-        int retries = 3;
-        int timeout;
-
-        do {
-                timeout = TEGRA_PCIE_LINKUP_TIMEOUT;
-                while (timeout) {
-                        reg = readl(pp->base + RP_VEND_XP);
-
-                        if (reg & RP_VEND_XP_DL_UP)
-                                break;
-
-                        mdelay(1);
-                        timeout--;
-                }
-
-                if (!timeout)  {
-                        pr_err("PCIE: port %d: link down, retrying\n", idx);
-                        goto retry;
-                }
-
-                timeout = TEGRA_PCIE_LINKUP_TIMEOUT;
-                while (timeout) {
-                        reg = readl(pp->base + RP_LINK_CONTROL_STATUS);
-
-                        if (reg & 0x20000000)
-                                return true;
-
-                        mdelay(1);
-                        timeout--;
-                }
-
-retry:
-                /* Pulse the PEX reset */
-                reg = afi_readl(reset_reg) | AFI_PEX_CTRL_RST;
-                afi_writel(reg, reset_reg);
-                mdelay(1);
-                reg = afi_readl(reset_reg) & ~AFI_PEX_CTRL_RST;
-                afi_writel(reg, reset_reg);
-
-                retries--;
-        } while (retries);
-
-        return false;
-}
-
-static void __init tegra_pcie_add_port(int index, u32 offset, u32 reset_reg)
-{
-        struct tegra_pcie_port *pp;
-
-        pp = tegra_pcie.port + tegra_pcie.num_ports;
-
-        pp->index = -1;
-        pp->base = tegra_pcie.regs + offset;
-        pp->link_up = tegra_pcie_check_link(pp, index, reset_reg);
-
-        if (!pp->link_up) {
-                pp->base = NULL;
-                printk(KERN_INFO "PCIE: port %d: link down, ignoring\n", index);
-                return;
-        }
-
-        tegra_pcie.num_ports++;
-        pp->index = index;
-        pp->root_bus_nr = -1;
-        memset(pp->res, 0, sizeof(pp->res));
-}
-
-int __init tegra_pcie_init(bool init_port0, bool init_port1)
-{
-        int err;
-
-        if (!(init_port0 || init_port1))
-                return -ENODEV;
-
-        pcibios_min_mem = 0;
-
-        err = tegra_pcie_get_resources();
-        if (err)
-                return err;
-
-        err = tegra_pcie_enable_controller();
-        if (err)
-                return err;
-
-        /* setup the AFI address translations */
-        tegra_pcie_setup_translations();
-
-        if (init_port0)
-                tegra_pcie_add_port(0, RP0_OFFSET, AFI_PEX0_CTRL);
-
-        if (init_port1)
-                tegra_pcie_add_port(1, RP1_OFFSET, AFI_PEX1_CTRL);
-
-        pci_common_init(&tegra_pcie_hw);
-
-        return 0;
-}
diff --git a/arch/arm/mach-tegra/platsmp.c b/arch/arm/mach-tegra/platsmp.c
index 97b33a2a2d75..2d0203627fbb 100644
--- a/arch/arm/mach-tegra/platsmp.c
+++ b/arch/arm/mach-tegra/platsmp.c
@@ -196,6 +196,5 @@ struct smp_operations tegra_smp_ops __initdata = {
 #ifdef CONFIG_HOTPLUG_CPU
         .cpu_kill               = tegra_cpu_kill,
         .cpu_die                = tegra_cpu_die,
-        .cpu_disable            = tegra_cpu_disable,
 #endif
 };
diff --git a/arch/arm/mach-tegra/pm-tegra20.c b/arch/arm/mach-tegra/pm-tegra20.c
new file mode 100644
index 000000000000..d65e1d786400
--- /dev/null
+++ b/arch/arm/mach-tegra/pm-tegra20.c
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013, NVIDIA Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <linux/kernel.h>
+
+#include "pm.h"
+
+#ifdef CONFIG_PM_SLEEP
+extern u32 tegra20_iram_start, tegra20_iram_end;
+extern void tegra20_sleep_core_finish(unsigned long);
+
+void tegra20_lp1_iram_hook(void)
+{
+        tegra_lp1_iram.start_addr = &tegra20_iram_start;
+        tegra_lp1_iram.end_addr = &tegra20_iram_end;
+}
+
+void tegra20_sleep_core_init(void)
+{
+        tegra_sleep_core_finish = tegra20_sleep_core_finish;
+}
+#endif
diff --git a/arch/arm/mach-tegra/pm-tegra30.c b/arch/arm/mach-tegra/pm-tegra30.c
new file mode 100644
index 000000000000..8fa326d6ff1a
--- /dev/null
+++ b/arch/arm/mach-tegra/pm-tegra30.c
@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2013, NVIDIA Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include <linux/kernel.h>
+
+#include "pm.h"
+
+#ifdef CONFIG_PM_SLEEP
+extern u32 tegra30_iram_start, tegra30_iram_end;
+extern void tegra30_sleep_core_finish(unsigned long);
+
+void tegra30_lp1_iram_hook(void)
+{
+        tegra_lp1_iram.start_addr = &tegra30_iram_start;
+        tegra_lp1_iram.end_addr = &tegra30_iram_end;
+}
+
+void tegra30_sleep_core_init(void)
+{
+        tegra_sleep_core_finish = tegra30_sleep_core_finish;
+}
+#endif
diff --git a/arch/arm/mach-tegra/pm.c b/arch/arm/mach-tegra/pm.c
index 261fec140c06..ed294a04e1d3 100644
--- a/arch/arm/mach-tegra/pm.c
+++ b/arch/arm/mach-tegra/pm.c
@@ -37,12 +37,18 @@
 #include "reset.h"
 #include "flowctrl.h"
 #include "fuse.h"
+#include "pm.h"
 #include "pmc.h"
 #include "sleep.h"
 
 #ifdef CONFIG_PM_SLEEP
 static DEFINE_SPINLOCK(tegra_lp2_lock);
+static u32 iram_save_size;
+static void *iram_save_addr;
+struct tegra_lp1_iram tegra_lp1_iram;
 void (*tegra_tear_down_cpu)(void);
+void (*tegra_sleep_core_finish)(unsigned long v2p);
+static int (*tegra_sleep_func)(unsigned long v2p);
 
 static void tegra_tear_down_cpu_init(void)
 {
@@ -52,7 +58,9 @@ static void tegra_tear_down_cpu_init(void)
                         tegra_tear_down_cpu = tegra20_tear_down_cpu;
                 break;
         case TEGRA30:
-                if (IS_ENABLED(CONFIG_ARCH_TEGRA_3x_SOC))
+        case TEGRA114:
+                if (IS_ENABLED(CONFIG_ARCH_TEGRA_3x_SOC) ||
+                    IS_ENABLED(CONFIG_ARCH_TEGRA_114_SOC))
                         tegra_tear_down_cpu = tegra30_tear_down_cpu;
                 break;
         }
@@ -171,19 +179,109 @@ void tegra_idle_lp2_last(void)
 enum tegra_suspend_mode tegra_pm_validate_suspend_mode(
                                 enum tegra_suspend_mode mode)
 {
-        /* Tegra114 didn't support any suspending mode yet. */
-        if (tegra_chip_id == TEGRA114)
-                return TEGRA_SUSPEND_NONE;
-
         /*
-         * The Tegra devices only support suspending to LP2 currently.
+         * The Tegra devices support suspending to LP1 or lower currently.
          */
-        if (mode > TEGRA_SUSPEND_LP2)
-                return TEGRA_SUSPEND_LP2;
+        if (mode > TEGRA_SUSPEND_LP1)
+                return TEGRA_SUSPEND_LP1;
 
         return mode;
 }
 
+static int tegra_sleep_core(unsigned long v2p)
+{
+        setup_mm_for_reboot();
+        tegra_sleep_core_finish(v2p);
+
+        /* should never here */
+        BUG();
+
+        return 0;
+}
+
+/*
+ * tegra_lp1_iram_hook
+ *
+ * Hooking the address of LP1 reset vector and SDRAM self-refresh code in
+ * SDRAM. These codes not be copied to IRAM in this fuction. We need to
+ * copy these code to IRAM before LP0/LP1 suspend and restore the content
+ * of IRAM after resume.
+ */
+static bool tegra_lp1_iram_hook(void)
+{
+        switch (tegra_chip_id) {
+        case TEGRA20:
+                if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC))
+                        tegra20_lp1_iram_hook();
+                break;
+        case TEGRA30:
+        case TEGRA114:
+                if (IS_ENABLED(CONFIG_ARCH_TEGRA_3x_SOC) ||
+                    IS_ENABLED(CONFIG_ARCH_TEGRA_114_SOC))
+                        tegra30_lp1_iram_hook();
+                break;
+        default:
+                break;
+        }
+
+        if (!tegra_lp1_iram.start_addr || !tegra_lp1_iram.end_addr)
+                return false;
+
+        iram_save_size = tegra_lp1_iram.end_addr - tegra_lp1_iram.start_addr;
+        iram_save_addr = kmalloc(iram_save_size, GFP_KERNEL);
+        if (!iram_save_addr)
+                return false;
+
+        return true;
+}
+
+static bool tegra_sleep_core_init(void)
+{
+        switch (tegra_chip_id) {
+        case TEGRA20:
+                if (IS_ENABLED(CONFIG_ARCH_TEGRA_2x_SOC))
+                        tegra20_sleep_core_init();
+                break;
+        case TEGRA30:
+        case TEGRA114:
+                if (IS_ENABLED(CONFIG_ARCH_TEGRA_3x_SOC) ||
+                    IS_ENABLED(CONFIG_ARCH_TEGRA_114_SOC))
+                        tegra30_sleep_core_init();
+                break;
+        default:
+                break;
+        }
+
+        if (!tegra_sleep_core_finish)
+                return false;
+
+        return true;
+}
+
+static void tegra_suspend_enter_lp1(void)
+{
+        tegra_pmc_suspend();
+
+        /* copy the reset vector & SDRAM shutdown code into IRAM */
+        memcpy(iram_save_addr, IO_ADDRESS(TEGRA_IRAM_CODE_AREA),
+                iram_save_size);
+        memcpy(IO_ADDRESS(TEGRA_IRAM_CODE_AREA), tegra_lp1_iram.start_addr,
+                iram_save_size);
+
+        *((u32 *)tegra_cpu_lp1_mask) = 1;
+}
+
+static void tegra_suspend_exit_lp1(void)
+{
+        tegra_pmc_resume();
+
+        /* restore IRAM */
+        memcpy(IO_ADDRESS(TEGRA_IRAM_CODE_AREA), iram_save_addr,
+                iram_save_size);
+
+        *(u32 *)tegra_cpu_lp1_mask = 0;
+}
+
 static const char *lp_state[TEGRA_MAX_SUSPEND_MODE] = {
         [TEGRA_SUSPEND_NONE] = "none",
         [TEGRA_SUSPEND_LP2] = "LP2",
@@ -207,6 +305,9 @@ static int tegra_suspend_enter(suspend_state_t state)
 
         suspend_cpu_complex();
         switch (mode) {
+        case TEGRA_SUSPEND_LP1:
+                tegra_suspend_enter_lp1();
+                break;
         case TEGRA_SUSPEND_LP2:
                 tegra_set_cpu_in_lp2();
                 break;
@@ -214,9 +315,12 @@ static int tegra_suspend_enter(suspend_state_t state)
                 break;
         }
 
-        cpu_suspend(PHYS_OFFSET - PAGE_OFFSET, &tegra_sleep_cpu);
+        cpu_suspend(PHYS_OFFSET - PAGE_OFFSET, tegra_sleep_func);
 
         switch (mode) {
+        case TEGRA_SUSPEND_LP1:
+                tegra_suspend_exit_lp1();
+                break;
         case TEGRA_SUSPEND_LP2:
                 tegra_clear_cpu_in_lp2();
                 break;
@@ -237,12 +341,36 @@ static const struct platform_suspend_ops tegra_suspend_ops = {
 
 void __init tegra_init_suspend(void)
 {
-        if (tegra_pmc_get_suspend_mode() == TEGRA_SUSPEND_NONE)
+        enum tegra_suspend_mode mode = tegra_pmc_get_suspend_mode();
+
+        if (mode == TEGRA_SUSPEND_NONE)
                 return;
 
         tegra_tear_down_cpu_init();
         tegra_pmc_suspend_init();
 
+        if (mode >= TEGRA_SUSPEND_LP1) {
+                if (!tegra_lp1_iram_hook() || !tegra_sleep_core_init()) {
+                        pr_err("%s: unable to allocate memory for SDRAM"
+                               "self-refresh -- LP0/LP1 unavailable\n",
+                               __func__);
+                        tegra_pmc_set_suspend_mode(TEGRA_SUSPEND_LP2);
+                        mode = TEGRA_SUSPEND_LP2;
+                }
+        }
+
+        /* set up sleep function for cpu_suspend */
+        switch (mode) {
+        case TEGRA_SUSPEND_LP1:
+                tegra_sleep_func = tegra_sleep_core;
+                break;
+        case TEGRA_SUSPEND_LP2:
+                tegra_sleep_func = tegra_sleep_cpu;
+                break;
+        default:
+                break;
+        }
+
         suspend_set_ops(&tegra_suspend_ops);
 }
 #endif
diff --git a/arch/arm/mach-tegra/pm.h b/arch/arm/mach-tegra/pm.h
index 94c4b9d9077c..fe204e5256e7 100644
--- a/arch/arm/mach-tegra/pm.h
+++ b/arch/arm/mach-tegra/pm.h
@@ -23,6 +23,18 @@
 
 #include "pmc.h"
 
+struct tegra_lp1_iram {
+        void    *start_addr;
+        void    *end_addr;
+};
+extern struct tegra_lp1_iram tegra_lp1_iram;
+extern void (*tegra_sleep_core_finish)(unsigned long v2p);
+
+void tegra20_lp1_iram_hook(void);
+void tegra20_sleep_core_init(void);
+void tegra30_lp1_iram_hook(void);
+void tegra30_sleep_core_init(void);
+
 extern unsigned long l2x0_saved_regs_addr;
 
 void save_cpu_arch_register(void);
diff --git a/arch/arm/mach-tegra/pmc.c b/arch/arm/mach-tegra/pmc.c
index eb3fa4aee0e4..8acb881f7cfe 100644
--- a/arch/arm/mach-tegra/pmc.c
+++ b/arch/arm/mach-tegra/pmc.c
@@ -21,11 +21,14 @@
 #include <linux/of.h>
 #include <linux/of_address.h>
 
+#include "flowctrl.h"
 #include "fuse.h"
 #include "pm.h"
 #include "pmc.h"
 #include "sleep.h"
 
+#define TEGRA_POWER_SYSCLK_POLARITY     (1 << 10)  /* sys clk polarity */
+#define TEGRA_POWER_SYSCLK_OE           (1 << 11)  /* system clock enable */
 #define TEGRA_POWER_EFFECT_LP0          (1 << 14)  /* LP0 when CPU pwr gated */
 #define TEGRA_POWER_CPU_PWRREQ_POLARITY (1 << 15)  /* CPU pwr req polarity */
 #define TEGRA_POWER_CPU_PWRREQ_OE       (1 << 16)  /* CPU pwr req enable */
@@ -193,16 +196,50 @@ enum tegra_suspend_mode tegra_pmc_get_suspend_mode(void)
         return pmc_pm_data.suspend_mode;
 }
 
+void tegra_pmc_set_suspend_mode(enum tegra_suspend_mode mode)
+{
+        if (mode < TEGRA_SUSPEND_NONE || mode >= TEGRA_MAX_SUSPEND_MODE)
+                return;
+
+        pmc_pm_data.suspend_mode = mode;
+}
+
+void tegra_pmc_suspend(void)
+{
+        tegra_pmc_writel(virt_to_phys(tegra_resume), PMC_SCRATCH41);
+}
+
+void tegra_pmc_resume(void)
+{
+        tegra_pmc_writel(0x0, PMC_SCRATCH41);
+}
+
 void tegra_pmc_pm_set(enum tegra_suspend_mode mode)
 {
-        u32 reg;
+        u32 reg, csr_reg;
         unsigned long rate = 0;
 
         reg = tegra_pmc_readl(PMC_CTRL);
         reg |= TEGRA_POWER_CPU_PWRREQ_OE;
         reg &= ~TEGRA_POWER_EFFECT_LP0;
 
+        switch (tegra_chip_id) {
+        case TEGRA20:
+        case TEGRA30:
+                break;
+        default:
+                /* Turn off CRAIL */
+                csr_reg = flowctrl_read_cpu_csr(0);
+                csr_reg &= ~FLOW_CTRL_CSR_ENABLE_EXT_MASK;
+                csr_reg |= FLOW_CTRL_CSR_ENABLE_EXT_CRAIL;
+                flowctrl_write_cpu_csr(0, csr_reg);
+                break;
+        }
+
         switch (mode) {
+        case TEGRA_SUSPEND_LP1:
+                rate = 32768;
+                break;
         case TEGRA_SUSPEND_LP2:
                 rate = clk_get_rate(tegra_pclk);
                 break;
@@ -224,6 +261,20 @@ void tegra_pmc_suspend_init(void)
         reg = tegra_pmc_readl(PMC_CTRL);
         reg |= TEGRA_POWER_CPU_PWRREQ_OE;
         tegra_pmc_writel(reg, PMC_CTRL);
+
+        reg = tegra_pmc_readl(PMC_CTRL);
+
+        if (!pmc_pm_data.sysclkreq_high)
+                reg |= TEGRA_POWER_SYSCLK_POLARITY;
+        else
+                reg &= ~TEGRA_POWER_SYSCLK_POLARITY;
+
+        /* configure the output polarity while the request is tristated */
+        tegra_pmc_writel(reg, PMC_CTRL);
+
+        /* now enable the request */
+        reg |= TEGRA_POWER_SYSCLK_OE;
+        tegra_pmc_writel(reg, PMC_CTRL);
 }
 #endif
 
diff --git a/arch/arm/mach-tegra/pmc.h b/arch/arm/mach-tegra/pmc.h
index e1c2df272f7d..549f8c7b762c 100644
--- a/arch/arm/mach-tegra/pmc.h
+++ b/arch/arm/mach-tegra/pmc.h
@@ -28,6 +28,9 @@ enum tegra_suspend_mode {
 
 #ifdef CONFIG_PM_SLEEP
 enum tegra_suspend_mode tegra_pmc_get_suspend_mode(void);
+void tegra_pmc_set_suspend_mode(enum tegra_suspend_mode mode);
+void tegra_pmc_suspend(void);
+void tegra_pmc_resume(void);
 void tegra_pmc_pm_set(enum tegra_suspend_mode mode);
 void tegra_pmc_suspend_init(void);
 #endif
diff --git a/arch/arm/mach-tegra/reset-handler.S b/arch/arm/mach-tegra/reset-handler.S
index 39dc9e7834f3..f527b2c2dea7 100644
--- a/arch/arm/mach-tegra/reset-handler.S
+++ b/arch/arm/mach-tegra/reset-handler.S
@@ -40,9 +40,12 @@
  *        re-enabling sdram.
  *
  *      r6: SoC ID
+ *      r8: CPU part number
  */
 ENTRY(tegra_resume)
-        bl      v7_invalidate_l1
+        check_cpu_part_num 0xc09, r8, r9
+        bleq    v7_invalidate_l1
+        blne    tegra_init_l2_for_a15
 
         cpu_id  r0
         tegra_get_soc_id TEGRA_APB_MISC_BASE, r6
@@ -70,7 +73,8 @@ no_cpu0_chk:
         str     r1, [r2]
 1:
 
-        check_cpu_part_num 0xc09, r8, r9
+        mov32   r9, 0xc09
+        cmp     r8, r9
         bne     not_ca9
 #ifdef CONFIG_HAVE_ARM_SCU
         /* enable SCU */
@@ -178,6 +182,19 @@ after_errata:
 1:
 #endif
 
+        /* Waking up from LP1? */
+        ldr     r8, [r12, #RESET_DATA(MASK_LP1)]
+        tst     r8, r11                         @ if in_lp1
+        beq     __is_not_lp1
+        cmp     r10, #0
+        bne     __die                           @ only CPU0 can be here
+        ldr     lr, [r12, #RESET_DATA(STARTUP_LP1)]
+        cmp     lr, #0
+        bleq    __die                           @ no LP1 startup handler
+ THUMB( add     lr, lr, #1 )                    @ switch to Thumb mode
+        bx      lr
+__is_not_lp1:
+
         /* Waking up from LP2? */
         ldr     r9, [r12, #RESET_DATA(MASK_LP2)]
         tst     r9, r11                         @ if in_lp2
diff --git a/arch/arm/mach-tegra/reset.c b/arch/arm/mach-tegra/reset.c
index 1ac434e0068f..fd0bbf8a6c94 100644
--- a/arch/arm/mach-tegra/reset.c
+++ b/arch/arm/mach-tegra/reset.c
@@ -81,6 +81,8 @@ void __init tegra_cpu_reset_handler_init(void)
 #endif
 
 #ifdef CONFIG_PM_SLEEP
+        __tegra_cpu_reset_handler_data[TEGRA_RESET_STARTUP_LP1] =
+                TEGRA_IRAM_CODE_AREA;
         __tegra_cpu_reset_handler_data[TEGRA_RESET_STARTUP_LP2] =
                 virt_to_phys((void *)tegra_resume);
 #endif
diff --git a/arch/arm/mach-tegra/reset.h b/arch/arm/mach-tegra/reset.h
index c90d8e9c4ad2..76a93434c6ee 100644
--- a/arch/arm/mach-tegra/reset.h
+++ b/arch/arm/mach-tegra/reset.h
@@ -39,6 +39,10 @@ void __tegra_cpu_reset_handler_end(void);
 void tegra_secondary_startup(void);
 
 #ifdef CONFIG_PM_SLEEP
+#define tegra_cpu_lp1_mask \
+        (IO_ADDRESS(TEGRA_IRAM_BASE + TEGRA_IRAM_RESET_HANDLER_OFFSET + \
+        ((u32)&__tegra_cpu_reset_handler_data[TEGRA_RESET_MASK_LP1] - \
+         (u32)__tegra_cpu_reset_handler_start)))
 #define tegra_cpu_lp2_mask \
         (IO_ADDRESS(TEGRA_IRAM_BASE + TEGRA_IRAM_RESET_HANDLER_OFFSET + \
         ((u32)&__tegra_cpu_reset_handler_data[TEGRA_RESET_MASK_LP2] - \
diff --git a/arch/arm/mach-tegra/sleep-tegra20.S b/arch/arm/mach-tegra/sleep-tegra20.S
index e3f2417c420e..5c3bd11c9838 100644
--- a/arch/arm/mach-tegra/sleep-tegra20.S
+++ b/arch/arm/mach-tegra/sleep-tegra20.S
@@ -23,10 +23,49 @@
 #include <asm/assembler.h>
 #include <asm/proc-fns.h>
 #include <asm/cp15.h>
+#include <asm/cache.h>
 
 #include "sleep.h"
 #include "flowctrl.h"
 
+#define EMC_CFG                         0xc
+#define EMC_ADR_CFG                     0x10
+#define EMC_REFRESH                     0x70
+#define EMC_NOP                         0xdc
+#define EMC_SELF_REF                    0xe0
+#define EMC_REQ_CTRL                    0x2b0
+#define EMC_EMC_STATUS                  0x2b4
+
+#define CLK_RESET_CCLK_BURST            0x20
+#define CLK_RESET_CCLK_DIVIDER          0x24
+#define CLK_RESET_SCLK_BURST            0x28
+#define CLK_RESET_SCLK_DIVIDER          0x2c
+#define CLK_RESET_PLLC_BASE             0x80
+#define CLK_RESET_PLLM_BASE             0x90
+#define CLK_RESET_PLLP_BASE             0xa0
+
+#define APB_MISC_XM2CFGCPADCTRL         0x8c8
+#define APB_MISC_XM2CFGDPADCTRL         0x8cc
+#define APB_MISC_XM2CLKCFGPADCTRL       0x8d0
+#define APB_MISC_XM2COMPPADCTRL         0x8d4
+#define APB_MISC_XM2VTTGENPADCTRL       0x8d8
+#define APB_MISC_XM2CFGCPADCTRL2        0x8e4
+#define APB_MISC_XM2CFGDPADCTRL2        0x8e8
+
+.macro pll_enable, rd, r_car_base, pll_base
+        ldr     \rd, [\r_car_base, #\pll_base]
+        tst     \rd, #(1 << 30)
+        orreq   \rd, \rd, #(1 << 30)
+        streq   \rd, [\r_car_base, #\pll_base]
+.endm
+
+.macro emc_device_mask, rd, base
+        ldr     \rd, [\base, #EMC_ADR_CFG]
+        tst     \rd, #(0x3 << 24)
+        moveq   \rd, #(0x1 << 8)                @ just 1 device
+        movne   \rd, #(0x3 << 8)                @ 2 devices
+.endm
+
 #if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_PM_SLEEP)
 /*
  * tegra20_hotplug_shutdown(void)
@@ -181,6 +220,28 @@ ENTRY(tegra20_cpu_is_resettable_soon)
 ENDPROC(tegra20_cpu_is_resettable_soon)
 
 /*
+ * tegra20_sleep_core_finish(unsigned long v2p)
+ *
+ * Enters suspend in LP0 or LP1 by turning off the mmu and jumping to
+ * tegra20_tear_down_core in IRAM
+ */
+ENTRY(tegra20_sleep_core_finish)
+        /* Flush, disable the L1 data cache and exit SMP */
+        bl      tegra_disable_clean_inv_dcache
+
+        mov32   r3, tegra_shut_off_mmu
+        add     r3, r3, r0
+
+        mov32   r0, tegra20_tear_down_core
+        mov32   r1, tegra20_iram_start
+        sub     r0, r0, r1
+        mov32   r1, TEGRA_IRAM_CODE_AREA
+        add     r0, r0, r1
+
+        mov     pc, r3
+ENDPROC(tegra20_sleep_core_finish)
+
+/*
  * tegra20_sleep_cpu_secondary_finish(unsigned long v2p)
  *
  * Enters WFI on secondary CPU by exiting coherency.
@@ -191,6 +252,7 @@ ENTRY(tegra20_sleep_cpu_secondary_finish)
         mrc     p15, 0, r11, c1, c0, 1  @ save actlr before exiting coherency
 
         /* Flush and disable the L1 data cache */
+        mov     r0, #TEGRA_FLUSH_CACHE_LOUIS
         bl      tegra_disable_clean_inv_dcache
 
         mov32   r0, TEGRA_PMC_VIRT + PMC_SCRATCH41
@@ -250,6 +312,150 @@ ENTRY(tegra20_tear_down_cpu)
         b       tegra20_enter_sleep
 ENDPROC(tegra20_tear_down_cpu)
 
+/* START OF ROUTINES COPIED TO IRAM */
+        .align L1_CACHE_SHIFT
+        .globl tegra20_iram_start
+tegra20_iram_start:
+
+/*
+ * tegra20_lp1_reset
+ *
+ * reset vector for LP1 restore; copied into IRAM during suspend.
+ * Brings the system back up to a safe staring point (SDRAM out of
+ * self-refresh, PLLC, PLLM and PLLP reenabled, CPU running on PLLP,
+ * system clock running on the same PLL that it suspended at), and
+ * jumps to tegra_resume to restore virtual addressing and PLLX.
+ * The physical address of tegra_resume expected to be stored in
+ * PMC_SCRATCH41.
+ *
+ * NOTE: THIS *MUST* BE RELOCATED TO TEGRA_IRAM_CODE_AREA.
+ */
+ENTRY(tegra20_lp1_reset)
+        /*
+         * The CPU and system bus are running at 32KHz and executing from
+         * IRAM when this code is executed; immediately switch to CLKM and
+         * enable PLLM, PLLP, PLLC.
+         */
+        mov32   r0, TEGRA_CLK_RESET_BASE
+
+        mov     r1, #(1 << 28)
+        str     r1, [r0, #CLK_RESET_SCLK_BURST]
+        str     r1, [r0, #CLK_RESET_CCLK_BURST]
+        mov     r1, #0
+        str     r1, [r0, #CLK_RESET_CCLK_DIVIDER]
+        str     r1, [r0, #CLK_RESET_SCLK_DIVIDER]
+
+        pll_enable r1, r0, CLK_RESET_PLLM_BASE
+        pll_enable r1, r0, CLK_RESET_PLLP_BASE
+        pll_enable r1, r0, CLK_RESET_PLLC_BASE
+
+        adr     r2, tegra20_sdram_pad_address
+        adr     r4, tegra20_sdram_pad_save
+        mov     r5, #0
+
+        ldr     r6, tegra20_sdram_pad_size
+padload:
+        ldr     r7, [r2, r5]            @ r7 is the addr in the pad_address
+
+        ldr     r1, [r4, r5]
+        str     r1, [r7]                @ restore the value in pad_save
+
+        add     r5, r5, #4
+        cmp     r6, r5
+        bne     padload
+
+padload_done:
+        /* 255uS delay for PLL stabilization */
+        mov32   r7, TEGRA_TMRUS_BASE
+        ldr     r1, [r7]
+        add     r1, r1, #0xff
+        wait_until r1, r7, r9
+
+        adr     r4, tegra20_sclk_save
+        ldr     r4, [r4]
+        str     r4, [r0, #CLK_RESET_SCLK_BURST]
+        mov32   r4, ((1 << 28) | (4))   @ burst policy is PLLP
+        str     r4, [r0, #CLK_RESET_CCLK_BURST]
+
+        mov32   r0, TEGRA_EMC_BASE
+        ldr     r1, [r0, #EMC_CFG]
+        bic     r1, r1, #(1 << 31)      @ disable DRAM_CLK_STOP
+        str     r1, [r0, #EMC_CFG]
+
+        mov     r1, #0
+        str     r1, [r0, #EMC_SELF_REF] @ take DRAM out of self refresh
+        mov     r1, #1
+        str     r1, [r0, #EMC_NOP]
+        str     r1, [r0, #EMC_NOP]
+        str     r1, [r0, #EMC_REFRESH]
+
+        emc_device_mask r1, r0
+
+exit_selfrefresh_loop:
+        ldr     r2, [r0, #EMC_EMC_STATUS]
+        ands    r2, r2, r1
+        bne     exit_selfrefresh_loop
+
+        mov     r1, #0                  @ unstall all transactions
+        str     r1, [r0, #EMC_REQ_CTRL]
+
+        mov32   r0, TEGRA_PMC_BASE
+        ldr     r0, [r0, #PMC_SCRATCH41]
+        mov     pc, r0                  @ jump to tegra_resume
+ENDPROC(tegra20_lp1_reset)
+
+/*
+ * tegra20_tear_down_core
+ *
+ * copied into and executed from IRAM
+ * puts memory in self-refresh for LP0 and LP1
+ */
+tegra20_tear_down_core:
+        bl      tegra20_sdram_self_refresh
+        bl      tegra20_switch_cpu_to_clk32k
+        b       tegra20_enter_sleep
+
+/*
+ * tegra20_switch_cpu_to_clk32k
+ *
+ * In LP0 and LP1 all PLLs will be turned off. Switch the CPU and system clock
+ * to the 32KHz clock.
+ */
+tegra20_switch_cpu_to_clk32k:
+        /*
+         * start by switching to CLKM to safely disable PLLs, then switch to
+         * CLKS.
+         */
+        mov     r0, #(1 << 28)
+        str     r0, [r5, #CLK_RESET_SCLK_BURST]
+        str     r0, [r5, #CLK_RESET_CCLK_BURST]
+        mov     r0, #0
+        str     r0, [r5, #CLK_RESET_CCLK_DIVIDER]
+        str     r0, [r5, #CLK_RESET_SCLK_DIVIDER]
+
+        /* 2uS delay delay between changing SCLK and disabling PLLs */
+        mov32   r7, TEGRA_TMRUS_BASE
+        ldr     r1, [r7]
+        add     r1, r1, #2
+        wait_until r1, r7, r9
+
+        /* disable PLLM, PLLP and PLLC */
+        ldr     r0, [r5, #CLK_RESET_PLLM_BASE]
+        bic     r0, r0, #(1 << 30)
+        str     r0, [r5, #CLK_RESET_PLLM_BASE]
+        ldr     r0, [r5, #CLK_RESET_PLLP_BASE]
+        bic     r0, r0, #(1 << 30)
+        str     r0, [r5, #CLK_RESET_PLLP_BASE]
+        ldr     r0, [r5, #CLK_RESET_PLLC_BASE]
+        bic     r0, r0, #(1 << 30)
+        str     r0, [r5, #CLK_RESET_PLLC_BASE]
+
+        /* switch to CLKS */
+        mov     r0, #0  /* brust policy = 32KHz */
+        str     r0, [r5, #CLK_RESET_SCLK_BURST]
+
+        mov     pc, lr
+
 /*
  * tegra20_enter_sleep
  *
@@ -274,4 +480,95 @@ halted:
         isb
         b       halted
 
+/*
+ * tegra20_sdram_self_refresh
+ *
+ * called with MMU off and caches disabled
+ * puts sdram in self refresh
+ * must be executed from IRAM
+ */
+tegra20_sdram_self_refresh:
+        mov32   r1, TEGRA_EMC_BASE      @ r1 reserved for emc base addr
+
+        mov     r2, #3
+        str     r2, [r1, #EMC_REQ_CTRL] @ stall incoming DRAM requests
+
+emcidle:
+        ldr     r2, [r1, #EMC_EMC_STATUS]
+        tst     r2, #4
+        beq     emcidle
+
+        mov     r2, #1
+        str     r2, [r1, #EMC_SELF_REF]
+
+        emc_device_mask r2, r1
+
+emcself:
+        ldr     r3, [r1, #EMC_EMC_STATUS]
+        and     r3, r3, r2
+        cmp     r3, r2
+        bne     emcself                 @ loop until DDR in self-refresh
+
+        adr     r2, tegra20_sdram_pad_address
+        adr     r3, tegra20_sdram_pad_safe
+        adr     r4, tegra20_sdram_pad_save
+        mov     r5, #0
+
+        ldr     r6, tegra20_sdram_pad_size
+padsave:
+        ldr     r0, [r2, r5]            @ r0 is the addr in the pad_address
+
+        ldr     r1, [r0]
+        str     r1, [r4, r5]            @ save the content of the addr
+
+        ldr     r1, [r3, r5]
+        str     r1, [r0]                @ set the save val to the addr
+
+        add     r5, r5, #4
+        cmp     r6, r5
+        bne     padsave
+padsave_done:
+
+        mov32   r5, TEGRA_CLK_RESET_BASE
+        ldr     r0, [r5, #CLK_RESET_SCLK_BURST]
+        adr     r2, tegra20_sclk_save
+        str     r0, [r2]
+        dsb
+        mov     pc, lr
+
+tegra20_sdram_pad_address:
+        .word   TEGRA_APB_MISC_BASE + APB_MISC_XM2CFGCPADCTRL
+        .word   TEGRA_APB_MISC_BASE + APB_MISC_XM2CFGDPADCTRL
+        .word   TEGRA_APB_MISC_BASE + APB_MISC_XM2CLKCFGPADCTRL
+        .word   TEGRA_APB_MISC_BASE + APB_MISC_XM2COMPPADCTRL
+        .word   TEGRA_APB_MISC_BASE + APB_MISC_XM2VTTGENPADCTRL
+        .word   TEGRA_APB_MISC_BASE + APB_MISC_XM2CFGCPADCTRL2
+        .word   TEGRA_APB_MISC_BASE + APB_MISC_XM2CFGDPADCTRL2
+
+tegra20_sdram_pad_size:
+        .word   tegra20_sdram_pad_size - tegra20_sdram_pad_address
+
+tegra20_sdram_pad_safe:
+        .word   0x8
+        .word   0x8
+        .word   0x0
+        .word   0x8
+        .word   0x5500
+        .word   0x08080040
+        .word   0x0
+
+tegra20_sclk_save:
+        .word   0x0
+
+tegra20_sdram_pad_save:
+        .rept (tegra20_sdram_pad_size - tegra20_sdram_pad_address) / 4
+        .long   0
+        .endr
+
+        .ltorg
+/* dummy symbol for end of IRAM */
+        .align L1_CACHE_SHIFT
+        .globl tegra20_iram_end
+tegra20_iram_end:
+        b       .
 #endif
diff --git a/arch/arm/mach-tegra/sleep-tegra30.S b/arch/arm/mach-tegra/sleep-tegra30.S
index ada8821b48be..63fa91b5fafb 100644
--- a/arch/arm/mach-tegra/sleep-tegra30.S
+++ b/arch/arm/mach-tegra/sleep-tegra30.S
@@ -18,13 +18,118 @@
 
 #include <asm/assembler.h>
 #include <asm/asm-offsets.h>
+#include <asm/cache.h>
 
 #include "fuse.h"
 #include "sleep.h"
 #include "flowctrl.h"
 
+#define EMC_CFG                         0xc
+#define EMC_ADR_CFG                     0x10
+#define EMC_TIMING_CONTROL              0x28
+#define EMC_REFRESH                     0x70
+#define EMC_NOP                         0xdc
+#define EMC_SELF_REF                    0xe0
+#define EMC_MRW                         0xe8
+#define EMC_FBIO_CFG5                   0x104
+#define EMC_AUTO_CAL_CONFIG             0x2a4
+#define EMC_AUTO_CAL_INTERVAL           0x2a8
+#define EMC_AUTO_CAL_STATUS             0x2ac
+#define EMC_REQ_CTRL                    0x2b0
+#define EMC_CFG_DIG_DLL                 0x2bc
+#define EMC_EMC_STATUS                  0x2b4
+#define EMC_ZCAL_INTERVAL               0x2e0
+#define EMC_ZQ_CAL                      0x2ec
+#define EMC_XM2VTTGENPADCTRL            0x310
+#define EMC_XM2VTTGENPADCTRL2           0x314
+
+#define PMC_CTRL                        0x0
+#define PMC_CTRL_SIDE_EFFECT_LP0 (1 << 14) /* enter LP0 when CPU pwr gated */
+
+#define PMC_PLLP_WB0_OVERRIDE           0xf8
+#define PMC_IO_DPD_REQ                  0x1b8
+#define PMC_IO_DPD_STATUS               0x1bc
+
+#define CLK_RESET_CCLK_BURST            0x20
+#define CLK_RESET_CCLK_DIVIDER          0x24
+#define CLK_RESET_SCLK_BURST            0x28
+#define CLK_RESET_SCLK_DIVIDER          0x2c
+
+#define CLK_RESET_PLLC_BASE             0x80
+#define CLK_RESET_PLLC_MISC             0x8c
+#define CLK_RESET_PLLM_BASE             0x90
+#define CLK_RESET_PLLM_MISC             0x9c
+#define CLK_RESET_PLLP_BASE             0xa0
+#define CLK_RESET_PLLP_MISC             0xac
+#define CLK_RESET_PLLA_BASE             0xb0
+#define CLK_RESET_PLLA_MISC             0xbc
+#define CLK_RESET_PLLX_BASE             0xe0
+#define CLK_RESET_PLLX_MISC             0xe4
+#define CLK_RESET_PLLX_MISC3            0x518
+#define CLK_RESET_PLLX_MISC3_IDDQ       3
+#define CLK_RESET_PLLM_MISC_IDDQ        5
+#define CLK_RESET_PLLC_MISC_IDDQ        26
+
+#define CLK_RESET_CLK_SOURCE_MSELECT    0x3b4
+
+#define MSELECT_CLKM                    (0x3 << 30)
+
+#define LOCK_DELAY 50 /* safety delay after lock is detected */
+
 #define TEGRA30_POWER_HOTPLUG_SHUTDOWN  (1 << 27) /* Hotplug shutdown */
 
+.macro emc_device_mask, rd, base
+        ldr     \rd, [\base, #EMC_ADR_CFG]
+        tst     \rd, #0x1
+        moveq   \rd, #(0x1 << 8)                @ just 1 device
+        movne   \rd, #(0x3 << 8)                @ 2 devices
+.endm
+
+.macro emc_timing_update, rd, base
+        mov     \rd, #1
+        str     \rd, [\base, #EMC_TIMING_CONTROL]
+1001:
+        ldr     \rd, [\base, #EMC_EMC_STATUS]
+        tst     \rd, #(0x1<<23) @ wait EMC_STATUS_TIMING_UPDATE_STALLED is clear
+        bne     1001b
+.endm
+
+.macro pll_enable, rd, r_car_base, pll_base, pll_misc
+        ldr     \rd, [\r_car_base, #\pll_base]
+        tst     \rd, #(1 << 30)
+        orreq   \rd, \rd, #(1 << 30)
+        streq   \rd, [\r_car_base, #\pll_base]
+        /* Enable lock detector */
+        .if     \pll_misc
+        ldr     \rd, [\r_car_base, #\pll_misc]
+        bic     \rd, \rd, #(1 << 18)
+        str     \rd, [\r_car_base, #\pll_misc]
+        ldr     \rd, [\r_car_base, #\pll_misc]
+        ldr     \rd, [\r_car_base, #\pll_misc]
+        orr     \rd, \rd, #(1 << 18)
+        str     \rd, [\r_car_base, #\pll_misc]
+        .endif
+.endm
+
+.macro pll_locked, rd, r_car_base, pll_base
+1:
+        ldr     \rd, [\r_car_base, #\pll_base]
+        tst     \rd, #(1 << 27)
+        beq     1b
+.endm
+
+.macro pll_iddq_exit, rd, car, iddq, iddq_bit
+        ldr     \rd, [\car, #\iddq]
+        bic     \rd, \rd, #(1<<\iddq_bit)
+        str     \rd, [\car, #\iddq]
+.endm
+
+.macro pll_iddq_entry, rd, car, iddq, iddq_bit
+        ldr     \rd, [\car, #\iddq]
+        orr     \rd, \rd, #(1<<\iddq_bit)
+        str     \rd, [\car, #\iddq]
+.endm
+
 #if defined(CONFIG_HOTPLUG_CPU) || defined(CONFIG_PM_SLEEP)
 /*
  * tegra30_hotplug_shutdown(void)
@@ -99,6 +204,8 @@ flow_ctrl_setting_for_lp2:
         cmp     r10, #TEGRA30
         moveq   r3, #FLOW_CTRL_WAIT_FOR_INTERRUPT       @ For LP2
         movne   r3, #FLOW_CTRL_WAITEVENT
+        orrne   r3, r3, #FLOW_CTRL_HALT_GIC_IRQ
+        orrne   r3, r3, #FLOW_CTRL_HALT_GIC_FIQ
 flow_ctrl_done:
         cmp     r10, #TEGRA30
         str     r3, [r2]
@@ -127,6 +234,41 @@ ENDPROC(tegra30_cpu_shutdown)
 
 #ifdef CONFIG_PM_SLEEP
 /*
+ * tegra30_sleep_core_finish(unsigned long v2p)
+ *
+ * Enters suspend in LP0 or LP1 by turning off the MMU and jumping to
+ * tegra30_tear_down_core in IRAM
+ */
+ENTRY(tegra30_sleep_core_finish)
+        /* Flush, disable the L1 data cache and exit SMP */
+        bl      tegra_disable_clean_inv_dcache
+
+        /*
+         * Preload all the address literals that are needed for the
+         * CPU power-gating process, to avoid loading from SDRAM which
+         * are not supported once SDRAM is put into self-refresh.
+         * LP0 / LP1 use physical address, since the MMU needs to be
+         * disabled before putting SDRAM into self-refresh to avoid
+         * memory access due to page table walks.
+         */
+        mov32   r4, TEGRA_PMC_BASE
+        mov32   r5, TEGRA_CLK_RESET_BASE
+        mov32   r6, TEGRA_FLOW_CTRL_BASE
+        mov32   r7, TEGRA_TMRUS_BASE
+
+        mov32   r3, tegra_shut_off_mmu
+        add     r3, r3, r0
+
+        mov32   r0, tegra30_tear_down_core
+        mov32   r1, tegra30_iram_start
+        sub     r0, r0, r1
+        mov32   r1, TEGRA_IRAM_CODE_AREA
+        add     r0, r0, r1
+
+        mov     pc, r3
+ENDPROC(tegra30_sleep_core_finish)
+
+/*
  * tegra30_sleep_cpu_secondary_finish(unsigned long v2p)
  *
  * Enters LP2 on secondary CPU by exiting coherency and powergating the CPU.
@@ -135,6 +277,7 @@ ENTRY(tegra30_sleep_cpu_secondary_finish)
         mov     r7, lr
 
         /* Flush and disable the L1 data cache */
+        mov     r0, #TEGRA_FLUSH_CACHE_LOUIS
         bl      tegra_disable_clean_inv_dcache
 
         /* Powergate this CPU. */
@@ -155,6 +298,351 @@ ENTRY(tegra30_tear_down_cpu)
         b       tegra30_enter_sleep
 ENDPROC(tegra30_tear_down_cpu)
 
+/* START OF ROUTINES COPIED TO IRAM */
+        .align L1_CACHE_SHIFT
+        .globl tegra30_iram_start
+tegra30_iram_start:
+
+/*
+ * tegra30_lp1_reset
+ *
+ * reset vector for LP1 restore; copied into IRAM during suspend.
+ * Brings the system back up to a safe staring point (SDRAM out of
+ * self-refresh, PLLC, PLLM and PLLP reenabled, CPU running on PLLX,
+ * system clock running on the same PLL that it suspended at), and
+ * jumps to tegra_resume to restore virtual addressing.
+ * The physical address of tegra_resume expected to be stored in
+ * PMC_SCRATCH41.
+ *
+ * NOTE: THIS *MUST* BE RELOCATED TO TEGRA_IRAM_CODE_AREA.
+ */
+ENTRY(tegra30_lp1_reset)
+        /*
+         * The CPU and system bus are running at 32KHz and executing from
+         * IRAM when this code is executed; immediately switch to CLKM and
+         * enable PLLP, PLLM, PLLC, PLLA and PLLX.
+         */
+        mov32   r0, TEGRA_CLK_RESET_BASE
+
+        mov     r1, #(1 << 28)
+        str     r1, [r0, #CLK_RESET_SCLK_BURST]
+        str     r1, [r0, #CLK_RESET_CCLK_BURST]
+        mov     r1, #0
+        str     r1, [r0, #CLK_RESET_CCLK_DIVIDER]
+        str     r1, [r0, #CLK_RESET_SCLK_DIVIDER]
+
+        tegra_get_soc_id TEGRA_APB_MISC_BASE, r10
+        cmp     r10, #TEGRA30
+        beq     _no_pll_iddq_exit
+
+        pll_iddq_exit r1, r0, CLK_RESET_PLLM_MISC, CLK_RESET_PLLM_MISC_IDDQ
+        pll_iddq_exit r1, r0, CLK_RESET_PLLC_MISC, CLK_RESET_PLLC_MISC_IDDQ
+        pll_iddq_exit r1, r0, CLK_RESET_PLLX_MISC3, CLK_RESET_PLLX_MISC3_IDDQ
+
+        mov32   r7, TEGRA_TMRUS_BASE
+        ldr     r1, [r7]
+        add     r1, r1, #2
+        wait_until r1, r7, r3
+
+        /* enable PLLM via PMC */
+        mov32   r2, TEGRA_PMC_BASE
+        ldr     r1, [r2, #PMC_PLLP_WB0_OVERRIDE]
+        orr     r1, r1, #(1 << 12)
+        str     r1, [r2, #PMC_PLLP_WB0_OVERRIDE]
+
+        pll_enable r1, r0, CLK_RESET_PLLM_BASE, 0
+        pll_enable r1, r0, CLK_RESET_PLLC_BASE, 0
+        pll_enable r1, r0, CLK_RESET_PLLX_BASE, 0
+
+        b       _pll_m_c_x_done
+
+_no_pll_iddq_exit:
+        /* enable PLLM via PMC */
+        mov32   r2, TEGRA_PMC_BASE
+        ldr     r1, [r2, #PMC_PLLP_WB0_OVERRIDE]
+        orr     r1, r1, #(1 << 12)
+        str     r1, [r2, #PMC_PLLP_WB0_OVERRIDE]
+
+        pll_enable r1, r0, CLK_RESET_PLLM_BASE, CLK_RESET_PLLM_MISC
+        pll_enable r1, r0, CLK_RESET_PLLC_BASE, CLK_RESET_PLLC_MISC
+        pll_enable r1, r0, CLK_RESET_PLLX_BASE, CLK_RESET_PLLX_MISC
+
+_pll_m_c_x_done:
+        pll_enable r1, r0, CLK_RESET_PLLP_BASE, CLK_RESET_PLLP_MISC
+        pll_enable r1, r0, CLK_RESET_PLLA_BASE, CLK_RESET_PLLA_MISC
+
+        pll_locked r1, r0, CLK_RESET_PLLM_BASE
+        pll_locked r1, r0, CLK_RESET_PLLP_BASE
+        pll_locked r1, r0, CLK_RESET_PLLA_BASE
+        pll_locked r1, r0, CLK_RESET_PLLC_BASE
+        pll_locked r1, r0, CLK_RESET_PLLX_BASE
+
+        mov32   r7, TEGRA_TMRUS_BASE
+        ldr     r1, [r7]
+        add     r1, r1, #LOCK_DELAY
+        wait_until r1, r7, r3
+
+        adr     r5, tegra30_sdram_pad_save
+
+        ldr     r4, [r5, #0x18]         @ restore CLK_SOURCE_MSELECT
+        str     r4, [r0, #CLK_RESET_CLK_SOURCE_MSELECT]
+
+        ldr     r4, [r5, #0x1C]         @ restore SCLK_BURST
+        str     r4, [r0, #CLK_RESET_SCLK_BURST]
+
+        cmp     r10, #TEGRA30
+        movweq  r4, #:lower16:((1 << 28) | (0x8))       @ burst policy is PLLX
+        movteq  r4, #:upper16:((1 << 28) | (0x8))
+        movwne  r4, #:lower16:((1 << 28) | (0xe))
+        movtne  r4, #:upper16:((1 << 28) | (0xe))
+        str     r4, [r0, #CLK_RESET_CCLK_BURST]
+
+        /* Restore pad power state to normal */
+        ldr     r1, [r5, #0x14]         @ PMC_IO_DPD_STATUS
+        mvn     r1, r1
+        bic     r1, r1, #(1 << 31)
+        orr     r1, r1, #(1 << 30)
+        str     r1, [r2, #PMC_IO_DPD_REQ]       @ DPD_OFF
+
+        cmp     r10, #TEGRA30
+        movweq  r0, #:lower16:TEGRA_EMC_BASE    @ r0 reserved for emc base
+        movteq  r0, #:upper16:TEGRA_EMC_BASE
+        movwne  r0, #:lower16:TEGRA_EMC0_BASE
+        movtne  r0, #:upper16:TEGRA_EMC0_BASE
+
+exit_self_refresh:
+        ldr     r1, [r5, #0xC]          @ restore EMC_XM2VTTGENPADCTRL
+        str     r1, [r0, #EMC_XM2VTTGENPADCTRL]
+        ldr     r1, [r5, #0x10]         @ restore EMC_XM2VTTGENPADCTRL2
+        str     r1, [r0, #EMC_XM2VTTGENPADCTRL2]
+        ldr     r1, [r5, #0x8]          @ restore EMC_AUTO_CAL_INTERVAL
+        str     r1, [r0, #EMC_AUTO_CAL_INTERVAL]
+
+        /* Relock DLL */
+        ldr     r1, [r0, #EMC_CFG_DIG_DLL]
+        orr     r1, r1, #(1 << 30)      @ set DLL_RESET
+        str     r1, [r0, #EMC_CFG_DIG_DLL]
+
+        emc_timing_update r1, r0
+
+        cmp     r10, #TEGRA114
+        movweq  r1, #:lower16:TEGRA_EMC1_BASE
+        movteq  r1, #:upper16:TEGRA_EMC1_BASE
+        cmpeq   r0, r1
+
+        ldr     r1, [r0, #EMC_AUTO_CAL_CONFIG]
+        orr     r1, r1, #(1 << 31)      @ set AUTO_CAL_ACTIVE
+        orreq   r1, r1, #(1 << 27)      @ set slave mode for channel 1
+        str     r1, [r0, #EMC_AUTO_CAL_CONFIG]
+
+emc_wait_auto_cal_onetime:
+        ldr     r1, [r0, #EMC_AUTO_CAL_STATUS]
+        tst     r1, #(1 << 31)          @ wait until AUTO_CAL_ACTIVE is cleared
+        bne     emc_wait_auto_cal_onetime
+
+        ldr     r1, [r0, #EMC_CFG]
+        bic     r1, r1, #(1 << 31)      @ disable DRAM_CLK_STOP_PD
+        str     r1, [r0, #EMC_CFG]
+
+        mov     r1, #0
+        str     r1, [r0, #EMC_SELF_REF] @ take DRAM out of self refresh
+        mov     r1, #1
+        cmp     r10, #TEGRA30
+        streq   r1, [r0, #EMC_NOP]
+        streq   r1, [r0, #EMC_NOP]
+        streq   r1, [r0, #EMC_REFRESH]
+
+        emc_device_mask r1, r0
+
+exit_selfrefresh_loop:
+        ldr     r2, [r0, #EMC_EMC_STATUS]
+        ands    r2, r2, r1
+        bne     exit_selfrefresh_loop
+
+        lsr     r1, r1, #8              @ devSel, bit0:dev0, bit1:dev1
+
+        mov32   r7, TEGRA_TMRUS_BASE
+        ldr     r2, [r0, #EMC_FBIO_CFG5]
+
+        and     r2, r2, #3              @ check DRAM_TYPE
+        cmp     r2, #2
+        beq     emc_lpddr2
+
+        /* Issue a ZQ_CAL for dev0 - DDR3 */
+        mov32   r2, 0x80000011          @ DEV_SELECTION=2, LENGTH=LONG, CMD=1
+        str     r2, [r0, #EMC_ZQ_CAL]
+        ldr     r2, [r7]
+        add     r2, r2, #10
+        wait_until r2, r7, r3
+
+        tst     r1, #2
+        beq     zcal_done
+
+        /* Issue a ZQ_CAL for dev1 - DDR3 */
+        mov32   r2, 0x40000011          @ DEV_SELECTION=1, LENGTH=LONG, CMD=1
+        str     r2, [r0, #EMC_ZQ_CAL]
+        ldr     r2, [r7]
+        add     r2, r2, #10
+        wait_until r2, r7, r3
+        b       zcal_done
+
+emc_lpddr2:
+        /* Issue a ZQ_CAL for dev0 - LPDDR2 */
+        mov32   r2, 0x800A00AB          @ DEV_SELECTION=2, MA=10, OP=0xAB
+        str     r2, [r0, #EMC_MRW]
+        ldr     r2, [r7]
+        add     r2, r2, #1
+        wait_until r2, r7, r3
+
+        tst     r1, #2
+        beq     zcal_done
+
+        /* Issue a ZQ_CAL for dev0 - LPDDR2 */
+        mov32   r2, 0x400A00AB          @ DEV_SELECTION=1, MA=10, OP=0xAB
+        str     r2, [r0, #EMC_MRW]
+        ldr     r2, [r7]
+        add     r2, r2, #1
+        wait_until r2, r7, r3
+
+zcal_done:
+        mov     r1, #0                  @ unstall all transactions
+        str     r1, [r0, #EMC_REQ_CTRL]
+        ldr     r1, [r5, #0x4]          @ restore EMC_ZCAL_INTERVAL
+        str     r1, [r0, #EMC_ZCAL_INTERVAL]
+        ldr     r1, [r5, #0x0]          @ restore EMC_CFG
+        str     r1, [r0, #EMC_CFG]
+
+        /* Tegra114 had dual EMC channel, now config the other one */
+        cmp     r10, #TEGRA114
+        bne     __no_dual_emc_chanl
+        mov32   r1, TEGRA_EMC1_BASE
+        cmp     r0, r1
+        movne   r0, r1
+        addne   r5, r5, #0x20
+        bne     exit_self_refresh
+__no_dual_emc_chanl:
+
+        mov32   r0, TEGRA_PMC_BASE
+        ldr     r0, [r0, #PMC_SCRATCH41]
+        mov     pc, r0                  @ jump to tegra_resume
+ENDPROC(tegra30_lp1_reset)
+
+        .align  L1_CACHE_SHIFT
+tegra30_sdram_pad_address:
+        .word   TEGRA_EMC_BASE + EMC_CFG                                @0x0
+        .word   TEGRA_EMC_BASE + EMC_ZCAL_INTERVAL                      @0x4
+        .word   TEGRA_EMC_BASE + EMC_AUTO_CAL_INTERVAL                  @0x8
+        .word   TEGRA_EMC_BASE + EMC_XM2VTTGENPADCTRL                   @0xc
+        .word   TEGRA_EMC_BASE + EMC_XM2VTTGENPADCTRL2                  @0x10
+        .word   TEGRA_PMC_BASE + PMC_IO_DPD_STATUS                      @0x14
+        .word   TEGRA_CLK_RESET_BASE + CLK_RESET_CLK_SOURCE_MSELECT     @0x18
+        .word   TEGRA_CLK_RESET_BASE + CLK_RESET_SCLK_BURST             @0x1c
+
+tegra114_sdram_pad_address:
+        .word   TEGRA_EMC0_BASE + EMC_CFG                               @0x0
+        .word   TEGRA_EMC0_BASE + EMC_ZCAL_INTERVAL                     @0x4
+        .word   TEGRA_EMC0_BASE + EMC_AUTO_CAL_INTERVAL                 @0x8
+        .word   TEGRA_EMC0_BASE + EMC_XM2VTTGENPADCTRL                  @0xc
+        .word   TEGRA_EMC0_BASE + EMC_XM2VTTGENPADCTRL2                 @0x10
+        .word   TEGRA_PMC_BASE + PMC_IO_DPD_STATUS                      @0x14
+        .word   TEGRA_CLK_RESET_BASE + CLK_RESET_CLK_SOURCE_MSELECT     @0x18
+        .word   TEGRA_CLK_RESET_BASE + CLK_RESET_SCLK_BURST             @0x1c
+        .word   TEGRA_EMC1_BASE + EMC_CFG                               @0x20
+        .word   TEGRA_EMC1_BASE + EMC_ZCAL_INTERVAL                     @0x24
+        .word   TEGRA_EMC1_BASE + EMC_AUTO_CAL_INTERVAL                 @0x28
+        .word   TEGRA_EMC1_BASE + EMC_XM2VTTGENPADCTRL                  @0x2c
+        .word   TEGRA_EMC1_BASE + EMC_XM2VTTGENPADCTRL2                 @0x30
+
+tegra30_sdram_pad_size:
+        .word   tegra114_sdram_pad_address - tegra30_sdram_pad_address
+
+tegra114_sdram_pad_size:
+        .word   tegra30_sdram_pad_size - tegra114_sdram_pad_address
+
+        .type   tegra30_sdram_pad_save, %object
+tegra30_sdram_pad_save:
+        .rept (tegra30_sdram_pad_size - tegra114_sdram_pad_address) / 4
+        .long   0
+        .endr
+
+/*
+ * tegra30_tear_down_core
+ *
+ * copied into and executed from IRAM
+ * puts memory in self-refresh for LP0 and LP1
+ */
+tegra30_tear_down_core:
+        bl      tegra30_sdram_self_refresh
+        bl      tegra30_switch_cpu_to_clk32k
+        b       tegra30_enter_sleep
+
+/*
+ * tegra30_switch_cpu_to_clk32k
+ *
+ * In LP0 and LP1 all PLLs will be turned off. Switching the CPU and System CLK
+ * to the 32KHz clock.
+ * r4 = TEGRA_PMC_BASE
+ * r5 = TEGRA_CLK_RESET_BASE
+ * r6 = TEGRA_FLOW_CTRL_BASE
+ * r7 = TEGRA_TMRUS_BASE
+ * r10= SoC ID
+ */
+tegra30_switch_cpu_to_clk32k:
+        /*
+         * start by jumping to CLKM to safely disable PLLs, then jump to
+         * CLKS.
+         */
+        mov     r0, #(1 << 28)
+        str     r0, [r5, #CLK_RESET_SCLK_BURST]
+        /* 2uS delay delay between changing SCLK and CCLK */
+        ldr     r1, [r7]
+        add     r1, r1, #2
+        wait_until r1, r7, r9
+        str     r0, [r5, #CLK_RESET_CCLK_BURST]
+        mov     r0, #0
+        str     r0, [r5, #CLK_RESET_CCLK_DIVIDER]
+        str     r0, [r5, #CLK_RESET_SCLK_DIVIDER]
+
+        /* switch the clock source of mselect to be CLK_M */
+        ldr     r0, [r5, #CLK_RESET_CLK_SOURCE_MSELECT]
+        orr     r0, r0, #MSELECT_CLKM
+        str     r0, [r5, #CLK_RESET_CLK_SOURCE_MSELECT]
+
+        /* 2uS delay delay between changing SCLK and disabling PLLs */
+        ldr     r1, [r7]
+        add     r1, r1, #2
+        wait_until r1, r7, r9
+
+        /* disable PLLM via PMC in LP1 */
+        ldr     r0, [r4, #PMC_PLLP_WB0_OVERRIDE]
+        bic     r0, r0, #(1 << 12)
+        str     r0, [r4, #PMC_PLLP_WB0_OVERRIDE]
+
+        /* disable PLLP, PLLA, PLLC and PLLX */
+        ldr     r0, [r5, #CLK_RESET_PLLP_BASE]
+        bic     r0, r0, #(1 << 30)
+        str     r0, [r5, #CLK_RESET_PLLP_BASE]
+        ldr     r0, [r5, #CLK_RESET_PLLA_BASE]
+        bic     r0, r0, #(1 << 30)
+        str     r0, [r5, #CLK_RESET_PLLA_BASE]
+        ldr     r0, [r5, #CLK_RESET_PLLC_BASE]
+        bic     r0, r0, #(1 << 30)
+        str     r0, [r5, #CLK_RESET_PLLC_BASE]
+        ldr     r0, [r5, #CLK_RESET_PLLX_BASE]
+        bic     r0, r0, #(1 << 30)
+        str     r0, [r5, #CLK_RESET_PLLX_BASE]
+
+        cmp     r10, #TEGRA30
+        beq     _no_pll_in_iddq
+        pll_iddq_entry r1, r5, CLK_RESET_PLLX_MISC3, CLK_RESET_PLLX_MISC3_IDDQ
+_no_pll_in_iddq:
+
+        /* switch to CLKS */
+        mov     r0, #0  /* brust policy = 32KHz */
+        str     r0, [r5, #CLK_RESET_SCLK_BURST]
+
+        mov     pc, lr
+
 /*
  * tegra30_enter_sleep
  *
@@ -172,8 +660,12 @@ tegra30_enter_sleep:
         orr     r0, r0, #FLOW_CTRL_CSR_ENABLE
         str     r0, [r6, r2]
 
+        tegra_get_soc_id TEGRA_APB_MISC_BASE, r10
+        cmp     r10, #TEGRA30
         mov     r0, #FLOW_CTRL_WAIT_FOR_INTERRUPT
-        orr     r0, r0, #FLOW_CTRL_HALT_CPU_IRQ | FLOW_CTRL_HALT_CPU_FIQ
+        orreq   r0, r0, #FLOW_CTRL_HALT_CPU_IRQ | FLOW_CTRL_HALT_CPU_FIQ
+        orrne   r0, r0, #FLOW_CTRL_HALT_LIC_IRQ | FLOW_CTRL_HALT_LIC_FIQ
+
         cpu_to_halt_reg r2, r1
         str     r0, [r6, r2]
         dsb
@@ -187,4 +679,126 @@ halted:
         /* !!!FIXME!!! Implement halt failure handler */
         b       halted
 
+/*
+ * tegra30_sdram_self_refresh
+ *
+ * called with MMU off and caches disabled
+ * must be executed from IRAM
+ * r4 = TEGRA_PMC_BASE
+ * r5 = TEGRA_CLK_RESET_BASE
+ * r6 = TEGRA_FLOW_CTRL_BASE
+ * r7 = TEGRA_TMRUS_BASE
+ * r10= SoC ID
+ */
+tegra30_sdram_self_refresh:
+
+        adr     r8, tegra30_sdram_pad_save
+        tegra_get_soc_id TEGRA_APB_MISC_BASE, r10
+        cmp     r10, #TEGRA30
+        adreq   r2, tegra30_sdram_pad_address
+        ldreq   r3, tegra30_sdram_pad_size
+        adrne   r2, tegra114_sdram_pad_address
+        ldrne   r3, tegra114_sdram_pad_size
+        mov     r9, #0
+
+padsave:
+        ldr     r0, [r2, r9]            @ r0 is the addr in the pad_address
+
+        ldr     r1, [r0]
+        str     r1, [r8, r9]            @ save the content of the addr
+
+        add     r9, r9, #4
+        cmp     r3, r9
+        bne     padsave
+padsave_done:
+
+        dsb
+
+        cmp     r10, #TEGRA30
+        ldreq   r0, =TEGRA_EMC_BASE     @ r0 reserved for emc base addr
+        ldrne   r0, =TEGRA_EMC0_BASE
+
+enter_self_refresh:
+        cmp     r10, #TEGRA30
+        mov     r1, #0
+        str     r1, [r0, #EMC_ZCAL_INTERVAL]
+        str     r1, [r0, #EMC_AUTO_CAL_INTERVAL]
+        ldr     r1, [r0, #EMC_CFG]
+        bic     r1, r1, #(1 << 28)
+        bicne   r1, r1, #(1 << 29)
+        str     r1, [r0, #EMC_CFG]      @ disable DYN_SELF_REF
+
+        emc_timing_update r1, r0
+
+        ldr     r1, [r7]
+        add     r1, r1, #5
+        wait_until r1, r7, r2
+
+emc_wait_auto_cal:
+        ldr     r1, [r0, #EMC_AUTO_CAL_STATUS]
+        tst     r1, #(1 << 31)          @ wait until AUTO_CAL_ACTIVE is cleared
+        bne     emc_wait_auto_cal
+
+        mov     r1, #3
+        str     r1, [r0, #EMC_REQ_CTRL] @ stall incoming DRAM requests
+
+emcidle:
+        ldr     r1, [r0, #EMC_EMC_STATUS]
+        tst     r1, #4
+        beq     emcidle
+
+        mov     r1, #1
+        str     r1, [r0, #EMC_SELF_REF]
+
+        emc_device_mask r1, r0
+
+emcself:
+        ldr     r2, [r0, #EMC_EMC_STATUS]
+        and     r2, r2, r1
+        cmp     r2, r1
+        bne     emcself                 @ loop until DDR in self-refresh
+
+        /* Put VTTGEN in the lowest power mode */
+        ldr     r1, [r0, #EMC_XM2VTTGENPADCTRL]
+        mov32   r2, 0xF8F8FFFF  @ clear XM2VTTGEN_DRVUP and XM2VTTGEN_DRVDN
+        and     r1, r1, r2
+        str     r1, [r0, #EMC_XM2VTTGENPADCTRL]
+        ldr     r1, [r0, #EMC_XM2VTTGENPADCTRL2]
+        cmp     r10, #TEGRA30
+        orreq   r1, r1, #7              @ set E_NO_VTTGEN
+        orrne   r1, r1, #0x3f
+        str     r1, [r0, #EMC_XM2VTTGENPADCTRL2]
+
+        emc_timing_update r1, r0
+
+        /* Tegra114 had dual EMC channel, now config the other one */
+        cmp     r10, #TEGRA114
+        bne     no_dual_emc_chanl
+        mov32   r1, TEGRA_EMC1_BASE
+        cmp     r0, r1
+        movne   r0, r1
+        bne     enter_self_refresh
+no_dual_emc_chanl:
+
+        ldr     r1, [r4, #PMC_CTRL]
+        tst     r1, #PMC_CTRL_SIDE_EFFECT_LP0
+        bne     pmc_io_dpd_skip
+        /*
+         * Put DDR_DATA, DISC_ADDR_CMD, DDR_ADDR_CMD, POP_ADDR_CMD, POP_CLK
+         * and COMP in the lowest power mode when LP1.
+         */
+        mov32   r1, 0x8EC00000
+        str     r1, [r4, #PMC_IO_DPD_REQ]
+pmc_io_dpd_skip:
+
+        dsb
+
+        mov     pc, lr
+
+        .ltorg
+/* dummy symbol for end of IRAM */
+        .align L1_CACHE_SHIFT
+        .global tegra30_iram_end
+tegra30_iram_end:
+        b       .
 #endif
diff --git a/arch/arm/mach-tegra/sleep.S b/arch/arm/mach-tegra/sleep.S
index 9daaef26b0f6..8d06213fbc47 100644
--- a/arch/arm/mach-tegra/sleep.S
+++ b/arch/arm/mach-tegra/sleep.S
@@ -56,7 +56,9 @@ ENTRY(tegra_disable_clean_inv_dcache)
         isb
 
         /* Flush the D-cache */
-        bl      v7_flush_dcache_louis
+        cmp     r0, #TEGRA_FLUSH_CACHE_ALL
+        blne    v7_flush_dcache_louis
+        bleq    v7_flush_dcache_all
 
         /* Trun off coherency */
         exit_smp r4, r5
@@ -67,15 +69,40 @@ ENDPROC(tegra_disable_clean_inv_dcache)
 
 #ifdef CONFIG_PM_SLEEP
 /*
+ * tegra_init_l2_for_a15
+ *
+ * set up the correct L2 cache data RAM latency
+ */
+ENTRY(tegra_init_l2_for_a15)
+        mrc     p15, 0, r0, c0, c0, 5
+        ubfx    r0, r0, #8, #4
+        tst     r0, #1                          @ only need for cluster 0
+        bne     _exit_init_l2_a15
+
+        mrc     p15, 0x1, r0, c9, c0, 2
+        and     r0, r0, #7
+        cmp     r0, #2
+        bicne   r0, r0, #7
+        orrne   r0, r0, #2
+        mcrne   p15, 0x1, r0, c9, c0, 2
+_exit_init_l2_a15:
+
+        mov     pc, lr
+ENDPROC(tegra_init_l2_for_a15)
+
+/*
  * tegra_sleep_cpu_finish(unsigned long v2p)
  *
  * enters suspend in LP2 by turning off the mmu and jumping to
  * tegra?_tear_down_cpu
  */
 ENTRY(tegra_sleep_cpu_finish)
+        mov     r4, r0
         /* Flush and disable the L1 data cache */
+        mov     r0, #TEGRA_FLUSH_CACHE_ALL
         bl      tegra_disable_clean_inv_dcache
 
+        mov     r0, r4
         mov32   r6, tegra_tear_down_cpu
         ldr     r1, [r6]
         add     r1, r1, r0
@@ -107,10 +134,10 @@ ENTRY(tegra_shut_off_mmu)
 #ifdef CONFIG_CACHE_L2X0
         /* Disable L2 cache */
         check_cpu_part_num 0xc09, r9, r10
-        movweq  r4, #:lower16:(TEGRA_ARM_PERIF_BASE + 0x3000)
-        movteq  r4, #:upper16:(TEGRA_ARM_PERIF_BASE + 0x3000)
-        moveq   r5, #0
-        streq   r5, [r4, #L2X0_CTRL]
+        movweq  r2, #:lower16:(TEGRA_ARM_PERIF_BASE + 0x3000)
+        movteq  r2, #:upper16:(TEGRA_ARM_PERIF_BASE + 0x3000)
+        moveq   r3, #0
+        streq   r3, [r2, #L2X0_CTRL]
 #endif
         mov     pc, r0
 ENDPROC(tegra_shut_off_mmu)
diff --git a/arch/arm/mach-tegra/sleep.h b/arch/arm/mach-tegra/sleep.h
index 98b7da698f2b..a4edbb3abd3d 100644
--- a/arch/arm/mach-tegra/sleep.h
+++ b/arch/arm/mach-tegra/sleep.h
@@ -41,7 +41,19 @@
 #define CPU_NOT_RESETTABLE      0
 #endif
 
+/* flag of tegra_disable_clean_inv_dcache to do LoUIS or all */
+#define TEGRA_FLUSH_CACHE_LOUIS 0
+#define TEGRA_FLUSH_CACHE_ALL   1
+
 #ifdef __ASSEMBLY__
+/* waits until the microsecond counter (base) is > rn */
+.macro wait_until, rn, base, tmp
+        add     \rn, \rn, #1
+1001:   ldr     \tmp, [\base]
+        cmp     \tmp, \rn
+        bmi     1001b
+.endm
+
 /* returns the offset of the flow controller halt register for a cpu */
 .macro cpu_to_halt_reg rd, rcpu
         cmp     \rcpu, #0
@@ -144,7 +156,7 @@ void tegra_pen_lock(void);
 void tegra_pen_unlock(void);
 void tegra_resume(void);
 int tegra_sleep_cpu_finish(unsigned long);
-void tegra_disable_clean_inv_dcache(void);
+void tegra_disable_clean_inv_dcache(u32 flag);
 
 #ifdef CONFIG_HOTPLUG_CPU
 void tegra20_hotplug_shutdown(void);
diff --git a/arch/arm/mach-tegra/tegra.c b/arch/arm/mach-tegra/tegra.c
index 0d1e4128d460..5b8605547a09 100644
--- a/arch/arm/mach-tegra/tegra.c
+++ b/arch/arm/mach-tegra/tegra.c
@@ -29,7 +29,6 @@
 #include <linux/of_fdt.h>
 #include <linux/of_platform.h>
 #include <linux/pda_power.h>
-#include <linux/platform_data/tegra_usb.h>
 #include <linux/io.h>
 #include <linux/slab.h>
 #include <linux/sys_soc.h>
@@ -46,40 +45,6 @@
 #include "fuse.h"
 #include "iomap.h"
 
-static struct tegra_ehci_platform_data tegra_ehci1_pdata = {
-        .operating_mode = TEGRA_USB_OTG,
-        .power_down_on_bus_suspend = 1,
-        .vbus_gpio = -1,
-};
-
-static struct tegra_ulpi_config tegra_ehci2_ulpi_phy_config = {
-        .reset_gpio = -1,
-        .clk = "cdev2",
-};
-
-static struct tegra_ehci_platform_data tegra_ehci2_pdata = {
-        .phy_config = &tegra_ehci2_ulpi_phy_config,
-        .operating_mode = TEGRA_USB_HOST,
-        .power_down_on_bus_suspend = 1,
-        .vbus_gpio = -1,
-};
-
-static struct tegra_ehci_platform_data tegra_ehci3_pdata = {
-        .operating_mode = TEGRA_USB_HOST,
-        .power_down_on_bus_suspend = 1,
-        .vbus_gpio = -1,
-};
-
-static struct of_dev_auxdata tegra20_auxdata_lookup[] __initdata = {
-        OF_DEV_AUXDATA("nvidia,tegra20-ehci", 0xC5000000, "tegra-ehci.0",
-                       &tegra_ehci1_pdata),
-        OF_DEV_AUXDATA("nvidia,tegra20-ehci", 0xC5004000, "tegra-ehci.1",
-                       &tegra_ehci2_pdata),
-        OF_DEV_AUXDATA("nvidia,tegra20-ehci", 0xC5008000, "tegra-ehci.2",
-                       &tegra_ehci3_pdata),
-        {}
-};
-
 static void __init tegra_dt_init(void)
 {
         struct soc_device_attribute *soc_dev_attr;
@@ -112,30 +77,7 @@ static void __init tegra_dt_init(void)
          * devices
          */
 out:
-        of_platform_populate(NULL, of_default_bus_match_table,
-                                tegra20_auxdata_lookup, parent);
-}
-
-static void __init trimslice_init(void)
-{
-#ifdef CONFIG_TEGRA_PCI
-        int ret;
-
-        ret = tegra_pcie_init(true, true);
-        if (ret)
-                pr_err("tegra_pci_init() failed: %d\n", ret);
-#endif
-}
-
-static void __init harmony_init(void)
-{
-#ifdef CONFIG_TEGRA_PCI
-        int ret;
-
-        ret = harmony_pcie_init();
-        if (ret)
-                pr_err("harmony_pcie_init() failed: %d\n", ret);
-#endif
+        of_platform_populate(NULL, of_default_bus_match_table, NULL, parent);
 }
 
 static void __init paz00_init(void)
@@ -148,8 +90,6 @@ static struct {
         char *machine;
         void (*init)(void);
 } board_init_funcs[] = {
-        { "compulab,trimslice", trimslice_init },
-        { "nvidia,harmony", harmony_init },
         { "compal,paz00", paz00_init },
 };
 
diff --git a/arch/arm/mach-u300/Kconfig b/arch/arm/mach-u300/Kconfig
index a85adcd00882..a1659863bfd5 100644
--- a/arch/arm/mach-u300/Kconfig
+++ b/arch/arm/mach-u300/Kconfig
@@ -1,7 +1,3 @@
-menu "ST-Ericsson AB U300/U335 Platform"
-
-comment "ST-Ericsson Mobile Platform Products"
-
 config ARCH_U300
         bool "ST-Ericsson U300 Series" if ARCH_MULTI_V5
         depends on MMU
@@ -25,7 +21,9 @@ config ARCH_U300
         help
           Support for ST-Ericsson U300 series mobile platforms.
 
-comment "ST-Ericsson U300/U335 Feature Selections"
+if ARCH_U300
+
+menu "ST-Ericsson AB U300/U335 Platform"
 
 config MACH_U300
         depends on ARCH_U300
@@ -53,3 +51,5 @@ config MACH_U300_SPIDUMMY
                 SPI framework and ARM PL022 support.
 
 endmenu
+
+endif
diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index b19b07204aaf..99a28d628297 100644
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -8,7 +8,7 @@ config ARCH_U8500
         select CPU_V7
         select GENERIC_CLOCKEVENTS
         select HAVE_ARM_SCU if SMP
-        select HAVE_ARM_TWD if LOCAL_TIMERS
+        select HAVE_ARM_TWD if SMP
         select HAVE_SMP
         select MIGHT_HAVE_CACHE_L2X0
         help
diff --git a/arch/arm/mach-ux500/Makefile b/arch/arm/mach-ux500/Makefile
index bf9b6be5b180..fe1f3e26b88b 100644
--- a/arch/arm/mach-ux500/Makefile
+++ b/arch/arm/mach-ux500/Makefile
@@ -4,7 +4,6 @@
 
 obj-y                           := cpu.o devices.o devices-common.o \
                                    id.o usb.o timer.o pm.o
-obj-$(CONFIG_CPU_IDLE)          += cpuidle.o
 obj-$(CONFIG_CACHE_L2X0)        += cache-l2x0.o
 obj-$(CONFIG_UX500_SOC_DB8500)  += cpu-db8500.o devices-db8500.o
 obj-$(CONFIG_MACH_MOP500)       += board-mop500.o board-mop500-sdi.o \
diff --git a/arch/arm/mach-ux500/board-mop500-audio.c b/arch/arm/mach-ux500/board-mop500-audio.c
index bfe443daf4b0..ec0807247e60 100644
--- a/arch/arm/mach-ux500/board-mop500-audio.c
+++ b/arch/arm/mach-ux500/board-mop500-audio.c
@@ -17,7 +17,6 @@
 #include "ste-dma40-db8500.h"
 #include "board-mop500.h"
 #include "devices-db8500.h"
-#include "pins-db8500.h"
 
 static struct stedma40_chan_cfg msp0_dma_rx = {
         .high_priority = true,
diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c
index 7936d40a5c37..0efb1560fc35 100644
--- a/arch/arm/mach-ux500/board-mop500-pins.c
+++ b/arch/arm/mach-ux500/board-mop500-pins.c
@@ -14,7 +14,6 @@
 
 #include <asm/mach-types.h>
 
-#include "pins-db8500.h"
 #include "board-mop500.h"
 
 enum custom_pin_cfg_t {
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index df5d27a532e9..ad0806eff762 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -42,7 +42,6 @@
 #include <linux/platform_data/dma-ste-dma40.h>
 
 #include <asm/mach-types.h>
-#include <asm/mach/arch.h>
 
 #include "setup.h"
 #include "devices.h"
@@ -325,21 +324,19 @@ static struct lp55xx_platform_data __initdata lp5521_sec_data = {
        .clock_mode     = LP55XX_CLOCK_EXT,
 };
 
+/* I2C0 devices only available on the first HREF/MOP500 */
 static struct i2c_board_info __initdata mop500_i2c0_devices[] = {
         {
                 I2C_BOARD_INFO("tc3589x", 0x42),
                 .irq            = NOMADIK_GPIO_TO_IRQ(217),
                 .platform_data  = &mop500_tc35892_data,
         },
-        /* I2C0 devices only available prior to HREFv60 */
         {
                 I2C_BOARD_INFO("tps61052", 0x33),
                 .platform_data  = &mop500_tps61052_data,
         },
 };
 
-#define NUM_PRE_V60_I2C0_DEVICES 1
-
 static struct i2c_board_info __initdata mop500_i2c2_devices[] = {
         {
                 /* lp5521 LED driver, 1st device */
@@ -357,6 +354,17 @@ static struct i2c_board_info __initdata mop500_i2c2_devices[] = {
         },
 };
 
+static int __init mop500_i2c_board_init(void)
+{
+        if (machine_is_u8500())
+                mop500_uib_i2c_add(0, mop500_i2c0_devices,
+                                   ARRAY_SIZE(mop500_i2c0_devices));
+        mop500_uib_i2c_add(2, mop500_i2c2_devices,
+                           ARRAY_SIZE(mop500_i2c2_devices));
+        return 0;
+}
+device_initcall(mop500_i2c_board_init);
+
 static void __init mop500_i2c_init(struct device *parent)
 {
         db8500_add_i2c0(parent, NULL);
@@ -565,7 +573,6 @@ static struct platform_device *snowball_platform_devs[] __initdata = {
 static void __init mop500_init_machine(void)
 {
         struct device *parent = NULL;
-        int i2c0_devs;
         int i;
 
         platform_device_register(&db8500_prcmu_device);
@@ -588,19 +595,13 @@ static void __init mop500_init_machine(void)
         mop500_spi_init(parent);
         mop500_audio_init(parent);
         mop500_uart_init(parent);
-
         u8500_cryp1_hash1_init(parent);
 
-        i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);
-
-        i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs);
-        i2c_register_board_info(2, mop500_i2c2_devices,
-                                ARRAY_SIZE(mop500_i2c2_devices));
-
         /* This board has full regulator constraints */
         regulator_has_full_constraints();
 }
 
+
 static void __init snowball_init_machine(void)
 {
         struct device *parent = NULL;
@@ -635,7 +636,6 @@ static void __init snowball_init_machine(void)
 static void __init hrefv60_init_machine(void)
 {
         struct device *parent = NULL;
-        int i2c0_devs;
         int i;
 
         platform_device_register(&db8500_prcmu_device);
@@ -664,14 +664,6 @@ static void __init hrefv60_init_machine(void)
         mop500_audio_init(parent);
         mop500_uart_init(parent);
 
-        i2c0_devs = ARRAY_SIZE(mop500_i2c0_devices);
-
-        i2c0_devs -= NUM_PRE_V60_I2C0_DEVICES;
-
-        i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs);
-        i2c_register_board_info(2, mop500_i2c2_devices,
-                                ARRAY_SIZE(mop500_i2c2_devices));
-
         /* This board has full regulator constraints */
         regulator_has_full_constraints();
 }
@@ -686,6 +678,7 @@ MACHINE_START(U8500, "ST-Ericsson MOP500 platform")
         .init_time      = ux500_timer_init,
         .init_machine   = mop500_init_machine,
         .init_late      = ux500_init_late,
+        .restart        = ux500_restart,
 MACHINE_END
 
 MACHINE_START(U8520, "ST-Ericsson U8520 Platform HREFP520")
@@ -695,6 +688,7 @@ MACHINE_START(U8520, "ST-Ericsson U8520 Platform HREFP520")
         .init_time      = ux500_timer_init,
         .init_machine   = mop500_init_machine,
         .init_late      = ux500_init_late,
+        .restart        = ux500_restart,
 MACHINE_END
 
 MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+")
@@ -705,6 +699,7 @@ MACHINE_START(HREFV60, "ST-Ericsson U8500 Platform HREFv60+")
         .init_time      = ux500_timer_init,
         .init_machine   = hrefv60_init_machine,
         .init_late      = ux500_init_late,
+        .restart        = ux500_restart,
 MACHINE_END
 
 MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")
@@ -716,4 +711,5 @@ MACHINE_START(SNOWBALL, "Calao Systems Snowball platform")
         .init_time      = ux500_timer_init,
         .init_machine   = snowball_init_machine,
         .init_late      = NULL,
+        .restart        = ux500_restart,
 MACHINE_END
diff --git a/arch/arm/mach-ux500/cache-l2x0.c b/arch/arm/mach-ux500/cache-l2x0.c
index 82ccf1d98735..264f894c0e3d 100644
--- a/arch/arm/mach-ux500/cache-l2x0.c
+++ b/arch/arm/mach-ux500/cache-l2x0.c
@@ -69,6 +69,7 @@ static int __init ux500_l2x0_init(void)
          * some SMI service available.
          */
         outer_cache.disable = NULL;
+        outer_cache.set_debug = NULL;
 
         return 0;
 }
diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c
index 12eee8167525..301c3460d96a 100644
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@ -26,7 +26,6 @@
 
 #include <asm/pmu.h>
 #include <asm/mach/map.h>
-#include <asm/mach/arch.h>
 
 #include "setup.h"
 #include "devices.h"
@@ -157,7 +156,8 @@ static void __init db8500_add_gpios(struct device *parent)
                 .supports_sleepmode = true,
         };
 
-        dbx500_add_gpios(parent, ARRAY_AND_SIZE(db8500_gpio_base),
+        dbx500_add_gpios(parent, db8500_gpio_base,
+                         ARRAY_SIZE(db8500_gpio_base),
                          IRQ_DB8500_GPIO0, &pdata);
         dbx500_add_pinctrl(parent, "pinctrl-db8500", U8500_PRCMU_BASE);
 }
@@ -223,10 +223,10 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
         OF_DEV_AUXDATA("arm,pl011", 0x80121000, "uart1", NULL),
         OF_DEV_AUXDATA("arm,pl011", 0x80007000, "uart2", NULL),
         OF_DEV_AUXDATA("arm,pl022", 0x80002000, "ssp0",  &ssp0_plat),
-        OF_DEV_AUXDATA("arm,pl18x", 0x80126000, "sdi0",  &mop500_sdi0_data),
-        OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1",  &mop500_sdi1_data),
-        OF_DEV_AUXDATA("arm,pl18x", 0x80005000, "sdi2",  &mop500_sdi2_data),
-        OF_DEV_AUXDATA("arm,pl18x", 0x80114000, "sdi4",  &mop500_sdi4_data),
+        OF_DEV_AUXDATA("arm,pl18x", 0x80126000, "sdi0",  NULL),
+        OF_DEV_AUXDATA("arm,pl18x", 0x80118000, "sdi1",  NULL),
+        OF_DEV_AUXDATA("arm,pl18x", 0x80005000, "sdi2",  NULL),
+        OF_DEV_AUXDATA("arm,pl18x", 0x80114000, "sdi4",  NULL),
         /* Requires clock name bindings. */
         OF_DEV_AUXDATA("st,nomadik-gpio", 0x8012e000, "gpio.0", NULL),
         OF_DEV_AUXDATA("st,nomadik-gpio", 0x8012e080, "gpio.1", NULL),
@@ -325,6 +325,7 @@ DT_MACHINE_START(U8500_DT, "ST-Ericsson Ux5x0 platform (Device Tree Support)")
         .init_machine   = u8500_init_machine,
         .init_late      = NULL,
         .dt_compat      = stericsson_dt_platform_compat,
+        .restart        = ux500_restart,
 MACHINE_END
 
 #endif
diff --git a/arch/arm/mach-ux500/cpu.c b/arch/arm/mach-ux500/cpu.c
index e6fb0239151b..5d7eebcabc63 100644
--- a/arch/arm/mach-ux500/cpu.c
+++ b/arch/arm/mach-ux500/cpu.c
@@ -31,6 +31,14 @@
 #include "db8500-regs.h"
 #include "id.h"
 
+void ux500_restart(enum reboot_mode mode, const char *cmd)
+{
+        local_irq_disable();
+        local_fiq_disable();
+
+        prcmu_system_reset(0);
+}
+
 /*
  * FIXME: Should we set up the GPIO domain here?
  *
diff --git a/arch/arm/mach-ux500/cpuidle.c b/arch/arm/mach-ux500/cpuidle.c
deleted file mode 100644
index a45dd09daed9..000000000000
--- a/arch/arm/mach-ux500/cpuidle.c
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright (c) 2012 Linaro : Daniel Lezcano <daniel.lezcano@linaro.org> (IBM)
- *
- * Based on the work of Rickard Andersson <rickard.andersson@stericsson.com>
- * and Jonas Aaberg <jonas.aberg@stericsson.com>.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/module.h>
-#include <linux/cpuidle.h>
-#include <linux/spinlock.h>
-#include <linux/atomic.h>
-#include <linux/smp.h>
-#include <linux/mfd/dbx500-prcmu.h>
-#include <linux/platform_data/arm-ux500-pm.h>
-
-#include <asm/cpuidle.h>
-#include <asm/proc-fns.h>
-
-#include "db8500-regs.h"
-#include "id.h"
-
-static atomic_t master = ATOMIC_INIT(0);
-static DEFINE_SPINLOCK(master_lock);
-
-static inline int ux500_enter_idle(struct cpuidle_device *dev,
-                                   struct cpuidle_driver *drv, int index)
-{
-        int this_cpu = smp_processor_id();
-        bool recouple = false;
-
-        if (atomic_inc_return(&master) == num_online_cpus()) {
-
-                /* With this lock, we prevent the other cpu to exit and enter
-                 * this function again and become the master */
-                if (!spin_trylock(&master_lock))
-                        goto wfi;
-
-                /* decouple the gic from the A9 cores */
-                if (prcmu_gic_decouple()) {
-                        spin_unlock(&master_lock);
-                        goto out;
-                }
-
-                /* If an error occur, we will have to recouple the gic
-                 * manually */
-                recouple = true;
-
-                /* At this state, as the gic is decoupled, if the other
-                 * cpu is in WFI, we have the guarantee it won't be wake
-                 * up, so we can safely go to retention */
-                if (!prcmu_is_cpu_in_wfi(this_cpu ? 0 : 1))
-                        goto out;
-
-                /* The prcmu will be in charge of watching the interrupts
-                 * and wake up the cpus */
-                if (prcmu_copy_gic_settings())
-                        goto out;
-
-                /* Check in the meantime an interrupt did
-                 * not occur on the gic ... */
-                if (prcmu_gic_pending_irq())
-                        goto out;
-
-                /* ... and the prcmu */
-                if (prcmu_pending_irq())
-                        goto out;
-
-                /* Go to the retention state, the prcmu will wait for the
-                 * cpu to go WFI and this is what happens after exiting this
-                 * 'master' critical section */
-                if (prcmu_set_power_state(PRCMU_AP_IDLE, true, true))
-                        goto out;
-
-                /* When we switch to retention, the prcmu is in charge
-                 * of recoupling the gic automatically */
-                recouple = false;
-
-                spin_unlock(&master_lock);
-        }
-wfi:
-        cpu_do_idle();
-out:
-        atomic_dec(&master);
-
-        if (recouple) {
-                prcmu_gic_recouple();
-                spin_unlock(&master_lock);
-        }
-
-        return index;
-}
-
-static struct cpuidle_driver ux500_idle_driver = {
-        .name = "ux500_idle",
-        .owner = THIS_MODULE,
-        .states = {
-                ARM_CPUIDLE_WFI_STATE,
-                {
-                        .enter            = ux500_enter_idle,
-                        .exit_latency     = 70,
-                        .target_residency = 260,
-                        .flags            = CPUIDLE_FLAG_TIME_VALID |
-                                            CPUIDLE_FLAG_TIMER_STOP,
-                        .name             = "ApIdle",
-                        .desc             = "ARM Retention",
-                },
-        },
-        .safe_state_index = 0,
-        .state_count = 2,
-};
-
-int __init ux500_idle_init(void)
-{
-        if (!(cpu_is_u8500_family() || cpu_is_ux540_family()))
-                return -ENODEV;
-
-        /* Configure wake up reasons */
-        prcmu_enable_wakeups(PRCMU_WAKEUP(ARM) | PRCMU_WAKEUP(RTC) |
-                             PRCMU_WAKEUP(ABB));
-
-        return cpuidle_register(&ux500_idle_driver, NULL);
-}
-
-device_initcall(ux500_idle_init);
diff --git a/arch/arm/mach-ux500/devices-db8500.c b/arch/arm/mach-ux500/devices-db8500.c
index 516a6f57d159..bc316062e0c2 100644
--- a/arch/arm/mach-ux500/devices-db8500.c
+++ b/arch/arm/mach-ux500/devices-db8500.c
@@ -49,6 +49,7 @@ struct stedma40_platform_data dma40_plat_data = {
 struct platform_device u8500_dma40_device = {
         .dev = {
                 .platform_data = &dma40_plat_data,
+                .coherent_dma_mask = DMA_BIT_MASK(32),
         },
         .name = "dma40",
         .id = 0,
diff --git a/arch/arm/mach-ux500/headsmp.S b/arch/arm/mach-ux500/headsmp.S
index 08da5589bcd8..9cdea049485d 100644
--- a/arch/arm/mach-ux500/headsmp.S
+++ b/arch/arm/mach-ux500/headsmp.S
@@ -11,8 +11,6 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 
-        __INIT
-
 /*
  * U8500 specific entry point for secondary CPUs.
  */
diff --git a/arch/arm/mach-ux500/pins-db8500.h b/arch/arm/mach-ux500/pins-db8500.h
deleted file mode 100644
index 062c7acf4576..000000000000
--- a/arch/arm/mach-ux500/pins-db8500.h
+++ /dev/null
@@ -1,746 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * License terms: GNU General Public License, version 2
- * Author: Rabin Vincent <rabin.vincent@stericsson.com>
- */
-
-#ifndef __MACH_PINS_DB8500_H
-#define __MACH_PINS_DB8500_H
-
-/*
- * TODO: Eventually encode all non-board specific pull up/down configuration
- * here.
- */
-
-#define GPIO0_GPIO              PIN_CFG(0, GPIO)
-#define GPIO0_U0_CTSn           PIN_CFG(0, ALT_A)
-#define GPIO0_TRIG_OUT          PIN_CFG(0, ALT_B)
-#define GPIO0_IP_TDO            PIN_CFG(0, ALT_C)
-
-#define GPIO1_GPIO              PIN_CFG(1, GPIO)
-#define GPIO1_U0_RTSn           PIN_CFG(1, ALT_A)
-#define GPIO1_TRIG_IN           PIN_CFG(1, ALT_B)
-#define GPIO1_IP_TDI            PIN_CFG(1, ALT_C)
-
-#define GPIO2_GPIO              PIN_CFG(2, GPIO)
-#define GPIO2_U0_RXD            PIN_CFG(2, ALT_A)
-#define GPIO2_NONE              PIN_CFG(2, ALT_B)
-#define GPIO2_IP_TMS            PIN_CFG(2, ALT_C)
-
-#define GPIO3_GPIO              PIN_CFG(3, GPIO)
-#define GPIO3_U0_TXD            PIN_CFG(3, ALT_A)
-#define GPIO3_NONE              PIN_CFG(3, ALT_B)
-#define GPIO3_IP_TCK            PIN_CFG(3, ALT_C)
-
-#define GPIO4_GPIO              PIN_CFG(4, GPIO)
-#define GPIO4_U1_RXD            PIN_CFG(4, ALT_A)
-#define GPIO4_I2C4_SCL          PIN_CFG(4, ALT_B)
-#define GPIO4_IP_TRSTn          PIN_CFG(4, ALT_C)
-
-#define GPIO5_GPIO              PIN_CFG(5, GPIO)
-#define GPIO5_U1_TXD            PIN_CFG(5, ALT_A)
-#define GPIO5_I2C4_SDA          PIN_CFG(5, ALT_B)
-#define GPIO5_IP_GPIO6          PIN_CFG(5, ALT_C)
-
-#define GPIO6_GPIO              PIN_CFG(6, GPIO)
-#define GPIO6_U1_CTSn           PIN_CFG(6, ALT_A)
-#define GPIO6_I2C1_SCL          PIN_CFG(6, ALT_B)
-#define GPIO6_IP_GPIO0          PIN_CFG(6, ALT_C)
-
-#define GPIO7_GPIO              PIN_CFG(7, GPIO)
-#define GPIO7_U1_RTSn           PIN_CFG(7, ALT_A)
-#define GPIO7_I2C1_SDA          PIN_CFG(7, ALT_B)
-#define GPIO7_IP_GPIO1          PIN_CFG(7, ALT_C)
-
-#define GPIO8_GPIO              PIN_CFG(8, GPIO)
-#define GPIO8_IPI2C_SDA         PIN_CFG(8, ALT_A)
-#define GPIO8_I2C2_SDA          PIN_CFG(8, ALT_B)
-
-#define GPIO9_GPIO              PIN_CFG(9, GPIO)
-#define GPIO9_IPI2C_SCL         PIN_CFG(9, ALT_A)
-#define GPIO9_I2C2_SCL          PIN_CFG(9, ALT_B)
-
-#define GPIO10_GPIO             PIN_CFG(10, GPIO)
-#define GPIO10_IPI2C_SDA        PIN_CFG(10, ALT_A)
-#define GPIO10_I2C2_SDA         PIN_CFG(10, ALT_B)
-#define GPIO10_IP_GPIO3         PIN_CFG(10, ALT_C)
-
-#define GPIO11_GPIO             PIN_CFG(11, GPIO)
-#define GPIO11_IPI2C_SCL        PIN_CFG(11, ALT_A)
-#define GPIO11_I2C2_SCL         PIN_CFG(11, ALT_B)
-#define GPIO11_IP_GPIO2         PIN_CFG(11, ALT_C)
-
-#define GPIO12_GPIO             PIN_CFG(12, GPIO)
-#define GPIO12_MSP0_TXD         PIN_CFG(12, ALT_A)
-#define GPIO12_MSP0_RXD         PIN_CFG(12, ALT_B)
-
-#define GPIO13_GPIO             PIN_CFG(13, GPIO)
-#define GPIO13_MSP0_TFS         PIN_CFG(13, ALT_A)
-
-#define GPIO14_GPIO             PIN_CFG(14, GPIO)
-#define GPIO14_MSP0_TCK         PIN_CFG(14, ALT_A)
-
-#define GPIO15_GPIO             PIN_CFG(15, GPIO)
-#define GPIO15_MSP0_RXD         PIN_CFG(15, ALT_A)
-#define GPIO15_MSP0_TXD         PIN_CFG(15, ALT_B)
-
-#define GPIO16_GPIO             PIN_CFG(16, GPIO)
-#define GPIO16_MSP0_RFS         PIN_CFG(16, ALT_A)
-#define GPIO16_I2C1_SCL         PIN_CFG(16, ALT_B)
-#define GPIO16_SLIM0_DAT        PIN_CFG(16, ALT_C)
-
-#define GPIO17_GPIO             PIN_CFG(17, GPIO)
-#define GPIO17_MSP0_RCK         PIN_CFG(17, ALT_A)
-#define GPIO17_I2C1_SDA         PIN_CFG(17, ALT_B)
-#define GPIO17_SLIM0_CLK        PIN_CFG(17, ALT_C)
-
-#define GPIO18_GPIO             PIN_CFG(18, GPIO)
-#define GPIO18_MC0_CMDDIR       PIN_CFG_INPUT(18, ALT_A, PULLUP)
-#define GPIO18_U2_RXD           PIN_CFG(18, ALT_B)
-#define GPIO18_MS_IEP           PIN_CFG(18, ALT_C)
-
-#define GPIO19_GPIO             PIN_CFG(19, GPIO)
-#define GPIO19_MC0_DAT0DIR      PIN_CFG_INPUT(19, ALT_A, PULLUP)
-#define GPIO19_U2_TXD           PIN_CFG(19, ALT_B)
-#define GPIO19_MS_DAT0DIR       PIN_CFG(19, ALT_C)
-
-#define GPIO20_GPIO             PIN_CFG(20, GPIO)
-#define GPIO20_MC0_DAT2DIR      PIN_CFG_INPUT(20, ALT_A, PULLUP)
-#define GPIO20_UARTMOD_TXD      PIN_CFG(20, ALT_B)
-#define GPIO20_IP_TRIGOUT       PIN_CFG(20, ALT_C)
-
-#define GPIO21_GPIO             PIN_CFG(21, GPIO)
-#define GPIO21_MC0_DAT31DIR     PIN_CFG_INPUT(21, ALT_A, PULLUP)
-#define GPIO21_MSP0_SCK         PIN_CFG(21, ALT_B)
-#define GPIO21_MS_DAT31DIR      PIN_CFG(21, ALT_C)
-
-#define GPIO22_GPIO             PIN_CFG(22, GPIO)
-#define GPIO22_MC0_FBCLK        PIN_CFG_INPUT(22, ALT_A, PULLUP)
-#define GPIO22_UARTMOD_RXD      PIN_CFG(22, ALT_B)
-#define GPIO22_MS_FBCLK         PIN_CFG(22, ALT_C)
-
-#define GPIO23_GPIO             PIN_CFG(23, GPIO)
-#define GPIO23_MC0_CLK          PIN_CFG_INPUT(23, ALT_A, PULLUP)
-#define GPIO23_STMMOD_CLK       PIN_CFG(23, ALT_B)
-#define GPIO23_MS_CLK           PIN_CFG(23, ALT_C)
-
-#define GPIO24_GPIO             PIN_CFG(24, GPIO)
-#define GPIO24_MC0_CMD          PIN_CFG_INPUT(24, ALT_A, PULLUP)
-#define GPIO24_UARTMOD_RXD      PIN_CFG(24, ALT_B)
-#define GPIO24_MS_BS            PIN_CFG(24, ALT_C)
-
-#define GPIO25_GPIO             PIN_CFG(25, GPIO)
-#define GPIO25_MC0_DAT0         PIN_CFG_INPUT(25, ALT_A, PULLUP)
-#define GPIO25_STMMOD_DAT0      PIN_CFG(25, ALT_B)
-#define GPIO25_MS_DAT0          PIN_CFG(25, ALT_C)
-
-#define GPIO26_GPIO             PIN_CFG(26, GPIO)
-#define GPIO26_MC0_DAT1         PIN_CFG_INPUT(26, ALT_A, PULLUP)
-#define GPIO26_STMMOD_DAT1      PIN_CFG(26, ALT_B)
-#define GPIO26_MS_DAT1          PIN_CFG(26, ALT_C)
-
-#define GPIO27_GPIO             PIN_CFG(27, GPIO)
-#define GPIO27_MC0_DAT2         PIN_CFG_INPUT(27, ALT_A, PULLUP)
-#define GPIO27_STMMOD_DAT2      PIN_CFG(27, ALT_B)
-#define GPIO27_MS_DAT2          PIN_CFG(27, ALT_C)
-
-#define GPIO28_GPIO             PIN_CFG(28, GPIO)
-#define GPIO28_MC0_DAT3         PIN_CFG_INPUT(28, ALT_A, PULLUP)
-#define GPIO28_STMMOD_DAT3      PIN_CFG(28, ALT_B)
-#define GPIO28_MS_DAT3          PIN_CFG(28, ALT_C)
-
-#define GPIO29_GPIO             PIN_CFG(29, GPIO)
-#define GPIO29_MC0_DAT4         PIN_CFG(29, ALT_A)
-#define GPIO29_SPI3_CLK         PIN_CFG(29, ALT_B)
-#define GPIO29_U2_RXD           PIN_CFG(29, ALT_C)
-
-#define GPIO30_GPIO             PIN_CFG(30, GPIO)
-#define GPIO30_MC0_DAT5         PIN_CFG(30, ALT_A)
-#define GPIO30_SPI3_RXD         PIN_CFG(30, ALT_B)
-#define GPIO30_U2_TXD           PIN_CFG(30, ALT_C)
-
-#define GPIO31_GPIO             PIN_CFG(31, GPIO)
-#define GPIO31_MC0_DAT6         PIN_CFG(31, ALT_A)
-#define GPIO31_SPI3_FRM         PIN_CFG(31, ALT_B)
-#define GPIO31_U2_CTSn          PIN_CFG(31, ALT_C)
-
-#define GPIO32_GPIO             PIN_CFG(32, GPIO)
-#define GPIO32_MC0_DAT7         PIN_CFG(32, ALT_A)
-#define GPIO32_SPI3_TXD         PIN_CFG(32, ALT_B)
-#define GPIO32_U2_RTSn          PIN_CFG(32, ALT_C)
-
-#define GPIO33_GPIO             PIN_CFG(33, GPIO)
-#define GPIO33_MSP1_TXD         PIN_CFG(33, ALT_A)
-#define GPIO33_MSP1_RXD         PIN_CFG(33, ALT_B)
-#define GPIO33_U0_DTRn          PIN_CFG(33, ALT_C)
-
-#define GPIO34_GPIO             PIN_CFG(34, GPIO)
-#define GPIO34_MSP1_TFS         PIN_CFG(34, ALT_A)
-#define GPIO34_NONE             PIN_CFG(34, ALT_B)
-#define GPIO34_U0_DCDn          PIN_CFG(34, ALT_C)
-
-#define GPIO35_GPIO             PIN_CFG(35, GPIO)
-#define GPIO35_MSP1_TCK         PIN_CFG(35, ALT_A)
-#define GPIO35_NONE             PIN_CFG(35, ALT_B)
-#define GPIO35_U0_DSRn          PIN_CFG(35, ALT_C)
-
-#define GPIO36_GPIO             PIN_CFG(36, GPIO)
-#define GPIO36_MSP1_RXD         PIN_CFG(36, ALT_A)
-#define GPIO36_MSP1_TXD         PIN_CFG(36, ALT_B)
-#define GPIO36_U0_RIn           PIN_CFG(36, ALT_C)
-
-#define GPIO64_GPIO             PIN_CFG(64, GPIO)
-#define GPIO64_LCDB_DE          PIN_CFG(64, ALT_A)
-#define GPIO64_KP_O1            PIN_CFG(64, ALT_B)
-#define GPIO64_IP_GPIO4         PIN_CFG(64, ALT_C)
-
-#define GPIO65_GPIO             PIN_CFG(65, GPIO)
-#define GPIO65_LCDB_HSO         PIN_CFG(65, ALT_A)
-#define GPIO65_KP_O0            PIN_CFG(65, ALT_B)
-#define GPIO65_IP_GPIO5         PIN_CFG(65, ALT_C)
-
-#define GPIO66_GPIO             PIN_CFG(66, GPIO)
-#define GPIO66_LCDB_VSO         PIN_CFG(66, ALT_A)
-#define GPIO66_KP_I1            PIN_CFG(66, ALT_B)
-#define GPIO66_IP_GPIO6         PIN_CFG(66, ALT_C)
-
-#define GPIO67_GPIO             PIN_CFG(67, GPIO)
-#define GPIO67_LCDB_CLK         PIN_CFG(67, ALT_A)
-#define GPIO67_KP_I0            PIN_CFG(67, ALT_B)
-#define GPIO67_IP_GPIO7         PIN_CFG(67, ALT_C)
-
-#define GPIO68_GPIO             PIN_CFG(68, GPIO)
-#define GPIO68_LCD_VSI0         PIN_CFG(68, ALT_A)
-#define GPIO68_KP_O7            PIN_CFG(68, ALT_B)
-#define GPIO68_SM_CLE           PIN_CFG(68, ALT_C)
-
-#define GPIO69_GPIO             PIN_CFG(69, GPIO)
-#define GPIO69_LCD_VSI1         PIN_CFG(69, ALT_A)
-#define GPIO69_KP_I7            PIN_CFG(69, ALT_B)
-#define GPIO69_SM_ALE           PIN_CFG(69, ALT_C)
-
-#define GPIO70_GPIO             PIN_CFG(70, GPIO)
-#define GPIO70_LCD_D0           PIN_CFG(70, ALT_A)
-#define GPIO70_KP_O5            PIN_CFG(70, ALT_B)
-#define GPIO70_STMAPE_CLK       PIN_CFG(70, ALT_C)
-
-#define GPIO71_GPIO             PIN_CFG(71, GPIO)
-#define GPIO71_LCD_D1           PIN_CFG(71, ALT_A)
-#define GPIO71_KP_O4            PIN_CFG(71, ALT_B)
-#define GPIO71_STMAPE_DAT3      PIN_CFG(71, ALT_C)
-
-#define GPIO72_GPIO             PIN_CFG(72, GPIO)
-#define GPIO72_LCD_D2           PIN_CFG(72, ALT_A)
-#define GPIO72_KP_O3            PIN_CFG(72, ALT_B)
-#define GPIO72_STMAPE_DAT2      PIN_CFG(72, ALT_C)
-
-#define GPIO73_GPIO             PIN_CFG(73, GPIO)
-#define GPIO73_LCD_D3           PIN_CFG(73, ALT_A)
-#define GPIO73_KP_O2            PIN_CFG(73, ALT_B)
-#define GPIO73_STMAPE_DAT1      PIN_CFG(73, ALT_C)
-
-#define GPIO74_GPIO             PIN_CFG(74, GPIO)
-#define GPIO74_LCD_D4           PIN_CFG(74, ALT_A)
-#define GPIO74_KP_I5            PIN_CFG(74, ALT_B)
-#define GPIO74_STMAPE_DAT0      PIN_CFG(74, ALT_C)
-
-#define GPIO75_GPIO             PIN_CFG(75, GPIO)
-#define GPIO75_LCD_D5           PIN_CFG(75, ALT_A)
-#define GPIO75_KP_I4            PIN_CFG(75, ALT_B)
-#define GPIO75_U2_RXD           PIN_CFG(75, ALT_C)
-
-#define GPIO76_GPIO             PIN_CFG(76, GPIO)
-#define GPIO76_LCD_D6           PIN_CFG(76, ALT_A)
-#define GPIO76_KP_I3            PIN_CFG(76, ALT_B)
-#define GPIO76_U2_TXD           PIN_CFG(76, ALT_C)
-
-#define GPIO77_GPIO             PIN_CFG(77, GPIO)
-#define GPIO77_LCD_D7           PIN_CFG(77, ALT_A)
-#define GPIO77_KP_I2            PIN_CFG(77, ALT_B)
-#define GPIO77_NONE             PIN_CFG(77, ALT_C)
-
-#define GPIO78_GPIO             PIN_CFG(78, GPIO)
-#define GPIO78_LCD_D8           PIN_CFG(78, ALT_A)
-#define GPIO78_KP_O6            PIN_CFG(78, ALT_B)
-#define GPIO78_IP_GPIO2         PIN_CFG(78, ALT_C)
-
-#define GPIO79_GPIO             PIN_CFG(79, GPIO)
-#define GPIO79_LCD_D9           PIN_CFG(79, ALT_A)
-#define GPIO79_KP_I6            PIN_CFG(79, ALT_B)
-#define GPIO79_IP_GPIO3         PIN_CFG(79, ALT_C)
-
-#define GPIO80_GPIO             PIN_CFG(80, GPIO)
-#define GPIO80_LCD_D10          PIN_CFG(80, ALT_A)
-#define GPIO80_KP_SKA0          PIN_CFG(80, ALT_B)
-#define GPIO80_IP_GPIO4         PIN_CFG(80, ALT_C)
-
-#define GPIO81_GPIO             PIN_CFG(81, GPIO)
-#define GPIO81_LCD_D11          PIN_CFG(81, ALT_A)
-#define GPIO81_KP_SKB0          PIN_CFG(81, ALT_B)
-#define GPIO81_IP_GPIO5         PIN_CFG(81, ALT_C)
-
-#define GPIO82_GPIO             PIN_CFG(82, GPIO)
-#define GPIO82_LCD_D12          PIN_CFG(82, ALT_A)
-#define GPIO82_KP_O5            PIN_CFG(82, ALT_B)
-
-#define GPIO83_GPIO             PIN_CFG(83, GPIO)
-#define GPIO83_LCD_D13          PIN_CFG(83, ALT_A)
-#define GPIO83_KP_O4            PIN_CFG(83, ALT_B)
-
-#define GPIO84_GPIO             PIN_CFG(84, GPIO)
-#define GPIO84_LCD_D14          PIN_CFG(84, ALT_A)
-#define GPIO84_KP_I5            PIN_CFG(84, ALT_B)
-
-#define GPIO85_GPIO             PIN_CFG(85, GPIO)
-#define GPIO85_LCD_D15          PIN_CFG(85, ALT_A)
-#define GPIO85_KP_I4            PIN_CFG(85, ALT_B)
-
-#define GPIO86_GPIO             PIN_CFG(86, GPIO)
-#define GPIO86_LCD_D16          PIN_CFG(86, ALT_A)
-#define GPIO86_SM_ADQ0          PIN_CFG(86, ALT_B)
-#define GPIO86_MC5_DAT0         PIN_CFG(86, ALT_C)
-
-#define GPIO87_GPIO             PIN_CFG(87, GPIO)
-#define GPIO87_LCD_D17          PIN_CFG(87, ALT_A)
-#define GPIO87_SM_ADQ1          PIN_CFG(87, ALT_B)
-#define GPIO87_MC5_DAT1         PIN_CFG(87, ALT_C)
-
-#define GPIO88_GPIO             PIN_CFG(88, GPIO)
-#define GPIO88_LCD_D18          PIN_CFG(88, ALT_A)
-#define GPIO88_SM_ADQ2          PIN_CFG(88, ALT_B)
-#define GPIO88_MC5_DAT2         PIN_CFG(88, ALT_C)
-
-#define GPIO89_GPIO             PIN_CFG(89, GPIO)
-#define GPIO89_LCD_D19          PIN_CFG(89, ALT_A)
-#define GPIO89_SM_ADQ3          PIN_CFG(89, ALT_B)
-#define GPIO89_MC5_DAT3         PIN_CFG(89, ALT_C)
-
-#define GPIO90_GPIO             PIN_CFG(90, GPIO)
-#define GPIO90_LCD_D20          PIN_CFG(90, ALT_A)
-#define GPIO90_SM_ADQ4          PIN_CFG(90, ALT_B)
-#define GPIO90_MC5_CMD          PIN_CFG(90, ALT_C)
-
-#define GPIO91_GPIO             PIN_CFG(91, GPIO)
-#define GPIO91_LCD_D21          PIN_CFG(91, ALT_A)
-#define GPIO91_SM_ADQ5          PIN_CFG(91, ALT_B)
-#define GPIO91_MC5_FBCLK        PIN_CFG(91, ALT_C)
-
-#define GPIO92_GPIO             PIN_CFG(92, GPIO)
-#define GPIO92_LCD_D22          PIN_CFG(92, ALT_A)
-#define GPIO92_SM_ADQ6          PIN_CFG(92, ALT_B)
-#define GPIO92_MC5_CLK          PIN_CFG(92, ALT_C)
-
-#define GPIO93_GPIO             PIN_CFG(93, GPIO)
-#define GPIO93_LCD_D23          PIN_CFG(93, ALT_A)
-#define GPIO93_SM_ADQ7          PIN_CFG(93, ALT_B)
-#define GPIO93_MC5_DAT4         PIN_CFG(93, ALT_C)
-
-#define GPIO94_GPIO             PIN_CFG(94, GPIO)
-#define GPIO94_KP_O7            PIN_CFG(94, ALT_A)
-#define GPIO94_SM_ADVn          PIN_CFG(94, ALT_B)
-#define GPIO94_MC5_DAT5         PIN_CFG(94, ALT_C)
-
-#define GPIO95_GPIO             PIN_CFG(95, GPIO)
-#define GPIO95_KP_I7            PIN_CFG(95, ALT_A)
-#define GPIO95_SM_CS0n          PIN_CFG(95, ALT_B)
-#define GPIO95_SM_PS0n          PIN_CFG(95, ALT_C)
-
-#define GPIO96_GPIO             PIN_CFG(96, GPIO)
-#define GPIO96_KP_O6            PIN_CFG(96, ALT_A)
-#define GPIO96_SM_OEn           PIN_CFG(96, ALT_B)
-#define GPIO96_MC5_DAT6         PIN_CFG(96, ALT_C)
-
-#define GPIO97_GPIO             PIN_CFG(97, GPIO)
-#define GPIO97_KP_I6            PIN_CFG(97, ALT_A)
-#define GPIO97_SM_WEn           PIN_CFG(97, ALT_B)
-#define GPIO97_MC5_DAT7         PIN_CFG(97, ALT_C)
-
-#define GPIO128_GPIO            PIN_CFG(128, GPIO)
-#define GPIO128_MC2_CLK         PIN_CFG_INPUT(128, ALT_A, PULLUP)
-#define GPIO128_SM_CKO          PIN_CFG(128, ALT_B)
-
-#define GPIO129_GPIO            PIN_CFG(129, GPIO)
-#define GPIO129_MC2_CMD         PIN_CFG_INPUT(129, ALT_A, PULLUP)
-#define GPIO129_SM_WAIT0n       PIN_CFG(129, ALT_B)
-
-#define GPIO130_GPIO            PIN_CFG(130, GPIO)
-#define GPIO130_MC2_FBCLK       PIN_CFG_INPUT(130, ALT_A, PULLUP)
-#define GPIO130_SM_FBCLK        PIN_CFG(130, ALT_B)
-#define GPIO130_MC2_RSTN        PIN_CFG(130, ALT_C)
-
-#define GPIO131_GPIO            PIN_CFG(131, GPIO)
-#define GPIO131_MC2_DAT0        PIN_CFG_INPUT(131, ALT_A, PULLUP)
-#define GPIO131_SM_ADQ8         PIN_CFG(131, ALT_B)
-
-#define GPIO132_GPIO            PIN_CFG(132, GPIO)
-#define GPIO132_MC2_DAT1        PIN_CFG_INPUT(132, ALT_A, PULLUP)
-#define GPIO132_SM_ADQ9         PIN_CFG(132, ALT_B)
-
-#define GPIO133_GPIO            PIN_CFG(133, GPIO)
-#define GPIO133_MC2_DAT2        PIN_CFG_INPUT(133, ALT_A, PULLUP)
-#define GPIO133_SM_ADQ10        PIN_CFG(133, ALT_B)
-
-#define GPIO134_GPIO            PIN_CFG(134, GPIO)
-#define GPIO134_MC2_DAT3        PIN_CFG_INPUT(134, ALT_A, PULLUP)
-#define GPIO134_SM_ADQ11        PIN_CFG(134, ALT_B)
-
-#define GPIO135_GPIO            PIN_CFG(135, GPIO)
-#define GPIO135_MC2_DAT4        PIN_CFG_INPUT(135, ALT_A, PULLUP)
-#define GPIO135_SM_ADQ12        PIN_CFG(135, ALT_B)
-
-#define GPIO136_GPIO            PIN_CFG(136, GPIO)
-#define GPIO136_MC2_DAT5        PIN_CFG_INPUT(136, ALT_A, PULLUP)
-#define GPIO136_SM_ADQ13        PIN_CFG(136, ALT_B)
-
-#define GPIO137_GPIO            PIN_CFG(137, GPIO)
-#define GPIO137_MC2_DAT6        PIN_CFG_INPUT(137, ALT_A, PULLUP)
-#define GPIO137_SM_ADQ14        PIN_CFG(137, ALT_B)
-
-#define GPIO138_GPIO            PIN_CFG(138, GPIO)
-#define GPIO138_MC2_DAT7        PIN_CFG_INPUT(138, ALT_A, PULLUP)
-#define GPIO138_SM_ADQ15        PIN_CFG(138, ALT_B)
-
-#define GPIO139_GPIO            PIN_CFG(139, GPIO)
-#define GPIO139_SSP1_RXD        PIN_CFG(139, ALT_A)
-#define GPIO139_SM_WAIT1n       PIN_CFG(139, ALT_B)
-#define GPIO139_KP_O8           PIN_CFG(139, ALT_C)
-
-#define GPIO140_GPIO            PIN_CFG(140, GPIO)
-#define GPIO140_SSP1_TXD        PIN_CFG(140, ALT_A)
-#define GPIO140_IP_GPIO7        PIN_CFG(140, ALT_B)
-#define GPIO140_KP_SKA1         PIN_CFG(140, ALT_C)
-
-#define GPIO141_GPIO            PIN_CFG(141, GPIO)
-#define GPIO141_SSP1_CLK        PIN_CFG(141, ALT_A)
-#define GPIO141_IP_GPIO2        PIN_CFG(141, ALT_B)
-#define GPIO141_KP_O9           PIN_CFG(141, ALT_C)
-
-#define GPIO142_GPIO            PIN_CFG(142, GPIO)
-#define GPIO142_SSP1_FRM        PIN_CFG(142, ALT_A)
-#define GPIO142_IP_GPIO3        PIN_CFG(142, ALT_B)
-#define GPIO142_KP_SKB1         PIN_CFG(142, ALT_C)
-
-#define GPIO143_GPIO            PIN_CFG(143, GPIO)
-#define GPIO143_SSP0_CLK        PIN_CFG(143, ALT_A)
-
-#define GPIO144_GPIO            PIN_CFG(144, GPIO)
-#define GPIO144_SSP0_FRM        PIN_CFG(144, ALT_A)
-
-#define GPIO145_GPIO            PIN_CFG(145, GPIO)
-#define GPIO145_SSP0_RXD        PIN_CFG(145, ALT_A)
-
-#define GPIO146_GPIO            PIN_CFG(146, GPIO)
-#define GPIO146_SSP0_TXD        PIN_CFG(146, ALT_A)
-
-#define GPIO147_GPIO            PIN_CFG(147, GPIO)
-#define GPIO147_I2C0_SCL        PIN_CFG(147, ALT_A)
-
-#define GPIO148_GPIO            PIN_CFG(148, GPIO)
-#define GPIO148_I2C0_SDA        PIN_CFG(148, ALT_A)
-
-#define GPIO149_GPIO            PIN_CFG(149, GPIO)
-#define GPIO149_IP_GPIO0        PIN_CFG(149, ALT_A)
-#define GPIO149_SM_CS1n         PIN_CFG(149, ALT_B)
-#define GPIO149_SM_PS1n         PIN_CFG(149, ALT_C)
-
-#define GPIO150_GPIO            PIN_CFG(150, GPIO)
-#define GPIO150_IP_GPIO1        PIN_CFG(150, ALT_A)
-#define GPIO150_LCDA_CLK        PIN_CFG(150, ALT_B)
-
-#define GPIO151_GPIO            PIN_CFG(151, GPIO)
-#define GPIO151_KP_SKA0         PIN_CFG(151, ALT_A)
-#define GPIO151_LCD_VSI0        PIN_CFG(151, ALT_B)
-#define GPIO151_KP_O8           PIN_CFG(151, ALT_C)
-
-#define GPIO152_GPIO            PIN_CFG(152, GPIO)
-#define GPIO152_KP_SKB0         PIN_CFG(152, ALT_A)
-#define GPIO152_LCD_VSI1        PIN_CFG(152, ALT_B)
-#define GPIO152_KP_O9           PIN_CFG(152, ALT_C)
-
-#define GPIO153_GPIO            PIN_CFG(153, GPIO)
-#define GPIO153_KP_I7           PIN_CFG(153, ALT_A)
-#define GPIO153_LCD_D24         PIN_CFG(153, ALT_B)
-#define GPIO153_U2_RXD          PIN_CFG(153, ALT_C)
-
-#define GPIO154_GPIO            PIN_CFG(154, GPIO)
-#define GPIO154_KP_I6           PIN_CFG(154, ALT_A)
-#define GPIO154_LCD_D25         PIN_CFG(154, ALT_B)
-#define GPIO154_U2_TXD          PIN_CFG(154, ALT_C)
-
-#define GPIO155_GPIO            PIN_CFG(155, GPIO)
-#define GPIO155_KP_I5           PIN_CFG(155, ALT_A)
-#define GPIO155_LCD_D26         PIN_CFG(155, ALT_B)
-#define GPIO155_STMAPE_CLK      PIN_CFG(155, ALT_C)
-
-#define GPIO156_GPIO            PIN_CFG(156, GPIO)
-#define GPIO156_KP_I4           PIN_CFG(156, ALT_A)
-#define GPIO156_LCD_D27         PIN_CFG(156, ALT_B)
-#define GPIO156_STMAPE_DAT3     PIN_CFG(156, ALT_C)
-
-#define GPIO157_GPIO            PIN_CFG(157, GPIO)
-#define GPIO157_KP_O7           PIN_CFG(157, ALT_A)
-#define GPIO157_LCD_D28         PIN_CFG(157, ALT_B)
-#define GPIO157_STMAPE_DAT2     PIN_CFG(157, ALT_C)
-
-#define GPIO158_GPIO            PIN_CFG(158, GPIO)
-#define GPIO158_KP_O6           PIN_CFG(158, ALT_A)
-#define GPIO158_LCD_D29         PIN_CFG(158, ALT_B)
-#define GPIO158_STMAPE_DAT1     PIN_CFG(158, ALT_C)
-
-#define GPIO159_GPIO            PIN_CFG(159, GPIO)
-#define GPIO159_KP_O5           PIN_CFG(159, ALT_A)
-#define GPIO159_LCD_D30         PIN_CFG(159, ALT_B)
-#define GPIO159_STMAPE_DAT0     PIN_CFG(159, ALT_C)
-
-#define GPIO160_GPIO            PIN_CFG(160, GPIO)
-#define GPIO160_KP_O4           PIN_CFG(160, ALT_A)
-#define GPIO160_LCD_D31         PIN_CFG(160, ALT_B)
-#define GPIO160_NONE            PIN_CFG(160, ALT_C)
-
-#define GPIO161_GPIO            PIN_CFG(161, GPIO)
-#define GPIO161_KP_I3           PIN_CFG(161, ALT_A)
-#define GPIO161_LCD_D32         PIN_CFG(161, ALT_B)
-#define GPIO161_UARTMOD_RXD     PIN_CFG(161, ALT_C)
-
-#define GPIO162_GPIO            PIN_CFG(162, GPIO)
-#define GPIO162_KP_I2           PIN_CFG(162, ALT_A)
-#define GPIO162_LCD_D33         PIN_CFG(162, ALT_B)
-#define GPIO162_UARTMOD_TXD     PIN_CFG(162, ALT_C)
-
-#define GPIO163_GPIO            PIN_CFG(163, GPIO)
-#define GPIO163_KP_I1           PIN_CFG(163, ALT_A)
-#define GPIO163_LCD_D34         PIN_CFG(163, ALT_B)
-#define GPIO163_STMMOD_CLK      PIN_CFG(163, ALT_C)
-
-#define GPIO164_GPIO            PIN_CFG(164, GPIO)
-#define GPIO164_KP_I0           PIN_CFG(164, ALT_A)
-#define GPIO164_LCD_D35         PIN_CFG(164, ALT_B)
-#define GPIO164_STMMOD_DAT3     PIN_CFG(164, ALT_C)
-
-#define GPIO165_GPIO            PIN_CFG(165, GPIO)
-#define GPIO165_KP_O3           PIN_CFG(165, ALT_A)
-#define GPIO165_LCD_D36         PIN_CFG(165, ALT_B)
-#define GPIO165_STMMOD_DAT2     PIN_CFG(165, ALT_C)
-
-#define GPIO166_GPIO            PIN_CFG(166, GPIO)
-#define GPIO166_KP_O2           PIN_CFG(166, ALT_A)
-#define GPIO166_LCD_D37         PIN_CFG(166, ALT_B)
-#define GPIO166_STMMOD_DAT1     PIN_CFG(166, ALT_C)
-
-#define GPIO167_GPIO            PIN_CFG(167, GPIO)
-#define GPIO167_KP_O1           PIN_CFG(167, ALT_A)
-#define GPIO167_LCD_D38         PIN_CFG(167, ALT_B)
-#define GPIO167_STMMOD_DAT0     PIN_CFG(167, ALT_C)
-
-#define GPIO168_GPIO            PIN_CFG(168, GPIO)
-#define GPIO168_KP_O0           PIN_CFG(168, ALT_A)
-#define GPIO168_LCD_D39         PIN_CFG(168, ALT_B)
-#define GPIO168_NONE            PIN_CFG(168, ALT_C)
-
-#define GPIO169_GPIO            PIN_CFG(169, GPIO)
-#define GPIO169_RF_PURn         PIN_CFG(169, ALT_A)
-#define GPIO169_LCDA_DE         PIN_CFG(169, ALT_B)
-#define GPIO169_USBSIM_PDC      PIN_CFG(169, ALT_C)
-
-#define GPIO170_GPIO            PIN_CFG(170, GPIO)
-#define GPIO170_MODEM_STATE     PIN_CFG(170, ALT_A)
-#define GPIO170_LCDA_VSO        PIN_CFG(170, ALT_B)
-#define GPIO170_KP_SKA1         PIN_CFG(170, ALT_C)
-
-#define GPIO171_GPIO            PIN_CFG(171, GPIO)
-#define GPIO171_MODEM_PWREN     PIN_CFG(171, ALT_A)
-#define GPIO171_LCDA_HSO        PIN_CFG(171, ALT_B)
-#define GPIO171_KP_SKB1         PIN_CFG(171, ALT_C)
-
-#define GPIO192_GPIO            PIN_CFG(192, GPIO)
-#define GPIO192_MSP2_SCK        PIN_CFG(192, ALT_A)
-
-#define GPIO193_GPIO            PIN_CFG(193, GPIO)
-#define GPIO193_MSP2_TXD        PIN_CFG(193, ALT_A)
-
-#define GPIO194_GPIO            PIN_CFG(194, GPIO)
-#define GPIO194_MSP2_TCK        PIN_CFG(194, ALT_A)
-
-#define GPIO195_GPIO            PIN_CFG(195, GPIO)
-#define GPIO195_MSP2_TFS        PIN_CFG(195, ALT_A)
-
-#define GPIO196_GPIO            PIN_CFG(196, GPIO)
-#define GPIO196_MSP2_RXD        PIN_CFG(196, ALT_A)
-
-#define GPIO197_GPIO            PIN_CFG(197, GPIO)
-#define GPIO197_MC4_DAT3        PIN_CFG_INPUT(197, ALT_A, PULLUP)
-
-#define GPIO198_GPIO            PIN_CFG(198, GPIO)
-#define GPIO198_MC4_DAT2        PIN_CFG_INPUT(198, ALT_A, PULLUP)
-
-#define GPIO199_GPIO            PIN_CFG(199, GPIO)
-#define GPIO199_MC4_DAT1        PIN_CFG_INPUT(199, ALT_A, PULLUP)
-
-#define GPIO200_GPIO            PIN_CFG(200, GPIO)
-#define GPIO200_MC4_DAT0        PIN_CFG_INPUT(200, ALT_A, PULLUP)
-
-#define GPIO201_GPIO            PIN_CFG(201, GPIO)
-#define GPIO201_MC4_CMD         PIN_CFG_INPUT(201, ALT_A, PULLUP)
-
-#define GPIO202_GPIO            PIN_CFG(202, GPIO)
-#define GPIO202_MC4_FBCLK       PIN_CFG_INPUT(202, ALT_A, PULLUP)
-#define GPIO202_PWL             PIN_CFG(202, ALT_B)
-#define GPIO202_MC4_RSTN        PIN_CFG(202, ALT_C)
-
-#define GPIO203_GPIO            PIN_CFG(203, GPIO)
-#define GPIO203_MC4_CLK         PIN_CFG_INPUT(203, ALT_A, PULLUP)
-
-#define GPIO204_GPIO            PIN_CFG(204, GPIO)
-#define GPIO204_MC4_DAT7        PIN_CFG_INPUT(204, ALT_A, PULLUP)
-
-#define GPIO205_GPIO            PIN_CFG(205, GPIO)
-#define GPIO205_MC4_DAT6        PIN_CFG_INPUT(205, ALT_A, PULLUP)
-
-#define GPIO206_GPIO            PIN_CFG(206, GPIO)
-#define GPIO206_MC4_DAT5        PIN_CFG_INPUT(206, ALT_A, PULLUP)
-
-#define GPIO207_GPIO            PIN_CFG(207, GPIO)
-#define GPIO207_MC4_DAT4        PIN_CFG_INPUT(207, ALT_A, PULLUP)
-
-#define GPIO208_GPIO            PIN_CFG(208, GPIO)
-#define GPIO208_MC1_CLK         PIN_CFG(208, ALT_A)
-
-#define GPIO209_GPIO            PIN_CFG(209, GPIO)
-#define GPIO209_MC1_FBCLK       PIN_CFG(209, ALT_A)
-#define GPIO209_SPI1_CLK        PIN_CFG(209, ALT_B)
-
-#define GPIO210_GPIO            PIN_CFG(210, GPIO)
-#define GPIO210_MC1_CMD         PIN_CFG(210, ALT_A)
-
-#define GPIO211_GPIO            PIN_CFG(211, GPIO)
-#define GPIO211_MC1_DAT0        PIN_CFG(211, ALT_A)
-
-#define GPIO212_GPIO            PIN_CFG(212, GPIO)
-#define GPIO212_MC1_DAT1        PIN_CFG(212, ALT_A)
-#define GPIO212_SPI1_FRM        PIN_CFG(212, ALT_B)
-
-#define GPIO213_GPIO            PIN_CFG(213, GPIO)
-#define GPIO213_MC1_DAT2        PIN_CFG(213, ALT_A)
-#define GPIO213_SPI1_TXD        PIN_CFG(213, ALT_B)
-
-#define GPIO214_GPIO            PIN_CFG(214, GPIO)
-#define GPIO214_MC1_DAT3        PIN_CFG(214, ALT_A)
-#define GPIO214_SPI1_RXD        PIN_CFG(214, ALT_B)
-
-#define GPIO215_GPIO            PIN_CFG(215, GPIO)
-#define GPIO215_MC1_CMDDIR      PIN_CFG(215, ALT_A)
-#define GPIO215_MC3_DAT2DIR     PIN_CFG(215, ALT_B)
-#define GPIO215_CLKOUT1         PIN_CFG(215, ALT_C)
-#define GPIO215_SPI2_TXD        PIN_CFG(215, ALT_C)
-
-#define GPIO216_GPIO            PIN_CFG(216, GPIO)
-#define GPIO216_MC1_DAT2DIR     PIN_CFG(216, ALT_A)
-#define GPIO216_MC3_CMDDIR      PIN_CFG(216, ALT_B)
-#define GPIO216_I2C3_SDA        PIN_CFG(216, ALT_C)
-#define GPIO216_SPI2_FRM        PIN_CFG(216, ALT_C)
-
-#define GPIO217_GPIO            PIN_CFG(217, GPIO)
-#define GPIO217_MC1_DAT0DIR     PIN_CFG(217, ALT_A)
-#define GPIO217_MC3_DAT31DIR    PIN_CFG(217, ALT_B)
-#define GPIO217_CLKOUT2         PIN_CFG(217, ALT_C)
-#define GPIO217_SPI2_CLK        PIN_CFG(217, ALT_C)
-
-#define GPIO218_GPIO            PIN_CFG(218, GPIO)
-#define GPIO218_MC1_DAT31DIR    PIN_CFG(218, ALT_A)
-#define GPIO218_MC3_DAT0DIR     PIN_CFG(218, ALT_B)
-#define GPIO218_I2C3_SCL        PIN_CFG(218, ALT_C)
-#define GPIO218_SPI2_RXD        PIN_CFG(218, ALT_C)
-
-#define GPIO219_GPIO            PIN_CFG(219, GPIO)
-#define GPIO219_HSIR_FLA0       PIN_CFG(219, ALT_A)
-#define GPIO219_MC3_CLK         PIN_CFG(219, ALT_B)
-
-#define GPIO220_GPIO            PIN_CFG(220, GPIO)
-#define GPIO220_HSIR_DAT0       PIN_CFG(220, ALT_A)
-#define GPIO220_MC3_FBCLK       PIN_CFG(220, ALT_B)
-#define GPIO220_SPI0_CLK        PIN_CFG(220, ALT_C)
-
-#define GPIO221_GPIO            PIN_CFG(221, GPIO)
-#define GPIO221_HSIR_RDY0       PIN_CFG(221, ALT_A)
-#define GPIO221_MC3_CMD         PIN_CFG(221, ALT_B)
-
-#define GPIO222_GPIO            PIN_CFG(222, GPIO)
-#define GPIO222_HSIT_FLA0       PIN_CFG(222, ALT_A)
-#define GPIO222_MC3_DAT0        PIN_CFG(222, ALT_B)
-
-#define GPIO223_GPIO            PIN_CFG(223, GPIO)
-#define GPIO223_HSIT_DAT0       PIN_CFG(223, ALT_A)
-#define GPIO223_MC3_DAT1        PIN_CFG(223, ALT_B)
-#define GPIO223_SPI0_FRM        PIN_CFG(223, ALT_C)
-
-#define GPIO224_GPIO            PIN_CFG(224, GPIO)
-#define GPIO224_HSIT_RDY0       PIN_CFG(224, ALT_A)
-#define GPIO224_MC3_DAT2        PIN_CFG(224, ALT_B)
-#define GPIO224_SPI0_TXD        PIN_CFG(224, ALT_C)
-
-#define GPIO225_GPIO            PIN_CFG(225, GPIO)
-#define GPIO225_HSIT_CAWAKE0    PIN_CFG(225, ALT_A)
-#define GPIO225_MC3_DAT3        PIN_CFG(225, ALT_B)
-#define GPIO225_SPI0_RXD        PIN_CFG(225, ALT_C)
-
-#define GPIO226_GPIO            PIN_CFG(226, GPIO)
-#define GPIO226_HSIT_ACWAKE0    PIN_CFG(226, ALT_A)
-#define GPIO226_PWL             PIN_CFG(226, ALT_B)
-#define GPIO226_USBSIM_PDC      PIN_CFG(226, ALT_C)
-
-#define GPIO227_GPIO            PIN_CFG(227, GPIO)
-#define GPIO227_CLKOUT1         PIN_CFG(227, ALT_A)
-
-#define GPIO228_GPIO            PIN_CFG(228, GPIO)
-#define GPIO228_CLKOUT2         PIN_CFG(228, ALT_A)
-
-#define GPIO229_GPIO            PIN_CFG(229, GPIO)
-#define GPIO229_CLKOUT1         PIN_CFG(229, ALT_A)
-#define GPIO229_PWL             PIN_CFG(229, ALT_B)
-#define GPIO229_I2C3_SDA        PIN_CFG(229, ALT_C)
-
-#define GPIO230_GPIO            PIN_CFG(230, GPIO)
-#define GPIO230_CLKOUT2         PIN_CFG(230, ALT_A)
-#define GPIO230_PWL             PIN_CFG(230, ALT_B)
-#define GPIO230_I2C3_SCL        PIN_CFG(230, ALT_C)
-
-#define GPIO256_GPIO            PIN_CFG(256, GPIO)
-#define GPIO256_USB_NXT         PIN_CFG(256, ALT_A)
-
-#define GPIO257_GPIO            PIN_CFG(257, GPIO)
-#define GPIO257_USB_STP         PIN_CFG(257, ALT_A)
-
-#define GPIO258_GPIO            PIN_CFG(258, GPIO)
-#define GPIO258_USB_XCLK        PIN_CFG(258, ALT_A)
-#define GPIO258_NONE            PIN_CFG(258, ALT_B)
-#define GPIO258_DDR_TRIG        PIN_CFG(258, ALT_C)
-
-#define GPIO259_GPIO            PIN_CFG(259, GPIO)
-#define GPIO259_USB_DIR         PIN_CFG(259, ALT_A)
-
-#define GPIO260_GPIO            PIN_CFG(260, GPIO)
-#define GPIO260_USB_DAT7        PIN_CFG(260, ALT_A)
-
-#define GPIO261_GPIO            PIN_CFG(261, GPIO)
-#define GPIO261_USB_DAT6        PIN_CFG(261, ALT_A)
-
-#define GPIO262_GPIO            PIN_CFG(262, GPIO)
-#define GPIO262_USB_DAT5        PIN_CFG(262, ALT_A)
-
-#define GPIO263_GPIO            PIN_CFG(263, GPIO)
-#define GPIO263_USB_DAT4        PIN_CFG(263, ALT_A)
-
-#define GPIO264_GPIO            PIN_CFG(264, GPIO)
-#define GPIO264_USB_DAT3        PIN_CFG(264, ALT_A)
-
-#define GPIO265_GPIO            PIN_CFG(265, GPIO)
-#define GPIO265_USB_DAT2        PIN_CFG(265, ALT_A)
-
-#define GPIO266_GPIO            PIN_CFG(266, GPIO)
-#define GPIO266_USB_DAT1        PIN_CFG(266, ALT_A)
-
-#define GPIO267_GPIO            PIN_CFG(267, GPIO)
-#define GPIO267_USB_DAT0        PIN_CFG(267, ALT_A)
-
-#endif
diff --git a/arch/arm/mach-ux500/setup.h b/arch/arm/mach-ux500/setup.h
index cad3ca86c540..656324aad18e 100644
--- a/arch/arm/mach-ux500/setup.h
+++ b/arch/arm/mach-ux500/setup.h
@@ -11,10 +11,13 @@
 #ifndef __ASM_ARCH_SETUP_H
 #define __ASM_ARCH_SETUP_H
 
+#include <asm/mach/arch.h>
 #include <asm/mach/time.h>
 #include <linux/init.h>
 #include <linux/mfd/abx500/ab8500.h>
 
+void ux500_restart(enum reboot_mode mode, const char *cmd);
+
 void __init ux500_map_io(void);
 extern void __init u8500_map_io(void);
 
diff --git a/arch/arm/mach-versatile/include/mach/debug-macro.S b/arch/arm/mach-versatile/include/mach/debug-macro.S
deleted file mode 100644
index d0fbd7f1cb00..000000000000
--- a/arch/arm/mach-versatile/include/mach/debug-macro.S
+++ /dev/null
@@ -1,21 +0,0 @@
-/* arch/arm/mach-versatile/include/mach/debug-macro.S
- *
- * Debugging macro include header
- *
- *  Copyright (C) 1994-1999 Russell King
- *  Moved from linux/arch/arm/kernel/debug.S by Ben Dooks
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
-*/
-
-                .macro  addruart, rp, rv, tmp
-                mov     \rp,      #0x001F0000
-                orr     \rp, \rp, #0x00001000
-                orr     \rv, \rp, #0xf1000000   @ virtual base
-                orr     \rp, \rp,  #0x10000000  @ physical base
-                .endm
-
-#include <asm/hardware/debug-pl01x.S>
diff --git a/arch/arm/mach-versatile/include/mach/platform.h b/arch/arm/mach-versatile/include/mach/platform.h
index ec087407b163..6f938ccb0c54 100644
--- a/arch/arm/mach-versatile/include/mach/platform.h
+++ b/arch/arm/mach-versatile/include/mach/platform.h
@@ -231,12 +231,14 @@
 /* PCI space */
 #define VERSATILE_PCI_BASE             0x41000000       /* PCI Interface */
 #define VERSATILE_PCI_CFG_BASE         0x42000000
+#define VERSATILE_PCI_IO_BASE          0x43000000
 #define VERSATILE_PCI_MEM_BASE0        0x44000000
 #define VERSATILE_PCI_MEM_BASE1        0x50000000
 #define VERSATILE_PCI_MEM_BASE2        0x60000000
 /* Sizes of above maps */
 #define VERSATILE_PCI_BASE_SIZE        0x01000000
 #define VERSATILE_PCI_CFG_BASE_SIZE    0x02000000
+#define VERSATILE_PCI_IO_BASE_SIZE     0x01000000
 #define VERSATILE_PCI_MEM_BASE0_SIZE   0x0c000000       /* 32Mb */
 #define VERSATILE_PCI_MEM_BASE1_SIZE   0x10000000       /* 256Mb */
 #define VERSATILE_PCI_MEM_BASE2_SIZE   0x10000000       /* 256Mb */
diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c
index e92e5e0705bc..c97be4ea76d2 100644
--- a/arch/arm/mach-versatile/pci.c
+++ b/arch/arm/mach-versatile/pci.c
@@ -43,9 +43,9 @@
 #define PCI_IMAP0               __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x0)
 #define PCI_IMAP1               __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x4)
 #define PCI_IMAP2               __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x8)
-#define PCI_SMAP0               __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x10)
-#define PCI_SMAP1               __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x14)
-#define PCI_SMAP2               __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x18)
+#define PCI_SMAP0               __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x14)
+#define PCI_SMAP1               __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x18)
+#define PCI_SMAP2               __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0x1c)
 #define PCI_SELFID              __IO_ADDRESS(VERSATILE_PCI_CORE_BASE+0xc)
 
 #define DEVICE_ID_OFFSET                0x00
@@ -170,8 +170,8 @@ static struct pci_ops pci_versatile_ops = {
         .write  = versatile_write_config,
 };
 
-static struct resource io_mem = {
-        .name   = "PCI I/O space",
+static struct resource unused_mem = {
+        .name   = "PCI unused",
         .start  = VERSATILE_PCI_MEM_BASE0,
         .end    = VERSATILE_PCI_MEM_BASE0+VERSATILE_PCI_MEM_BASE0_SIZE-1,
         .flags  = IORESOURCE_MEM,
@@ -195,9 +195,9 @@ static int __init pci_versatile_setup_resources(struct pci_sys_data *sys)
 {
         int ret = 0;
 
-        ret = request_resource(&iomem_resource, &io_mem);
+        ret = request_resource(&iomem_resource, &unused_mem);
         if (ret) {
-                printk(KERN_ERR "PCI: unable to allocate I/O "
+                printk(KERN_ERR "PCI: unable to allocate unused "
                        "memory region (%d)\n", ret);
                 goto out;
         }
@@ -205,7 +205,7 @@ static int __init pci_versatile_setup_resources(struct pci_sys_data *sys)
         if (ret) {
                 printk(KERN_ERR "PCI: unable to allocate non-prefetchable "
                        "memory region (%d)\n", ret);
-                goto release_io_mem;
+                goto release_unused_mem;
         }
         ret = request_resource(&iomem_resource, &pre_mem);
         if (ret) {
@@ -225,8 +225,8 @@ static int __init pci_versatile_setup_resources(struct pci_sys_data *sys)
 
  release_non_mem:
         release_resource(&non_mem);
- release_io_mem:
-        release_resource(&io_mem);
+ release_unused_mem:
+        release_resource(&unused_mem);
  out:
         return ret;
 }
@@ -246,7 +246,7 @@ int __init pci_versatile_setup(int nr, struct pci_sys_data *sys)
                 goto out;
         }
 
-        ret = pci_ioremap_io(0, VERSATILE_PCI_MEM_BASE0);
+        ret = pci_ioremap_io(0, VERSATILE_PCI_IO_BASE);
         if (ret)
                 goto out;
 
@@ -295,6 +295,19 @@ int __init pci_versatile_setup(int nr, struct pci_sys_data *sys)
         __raw_writel(PHYS_OFFSET, local_pci_cfg_base + PCI_BASE_ADDRESS_2);
 
         /*
+         * For many years the kernel and QEMU were symbiotically buggy
+         * in that they both assumed the same broken IRQ mapping.
+         * QEMU therefore attempts to auto-detect old broken kernels
+         * so that they still work on newer QEMU as they did on old
+         * QEMU. Since we now use the correct (ie matching-hardware)
+         * IRQ mapping we write a definitely different value to a
+         * PCI_INTERRUPT_LINE register to tell QEMU that we expect
+         * real hardware behaviour and it need not be backwards
+         * compatible for us. This write is harmless on real hardware.
+         */
+        __raw_writel(0, VERSATILE_PCI_VIRT_BASE+PCI_INTERRUPT_LINE);
+
+        /*
          * Do not to map Versatile FPGA PCI device into memory space
          */
         pci_slot_ignore |= (1 << myslot);
@@ -327,13 +340,13 @@ static int __init versatile_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
 {
         int irq;
 
-        /* slot,  pin,  irq
-         *  24     1     IRQ_SIC_PCI0
-         *  25     1     IRQ_SIC_PCI1
-         *  26     1     IRQ_SIC_PCI2
-         *  27     1     IRQ_SIC_PCI3
+        /*
+         * Slot INTA    INTB    INTC    INTD
+         * 31   PCI1    PCI2    PCI3    PCI0
+         * 30   PCI0    PCI1    PCI2    PCI3
+         * 29   PCI3    PCI0    PCI1    PCI2
          */
-        irq = IRQ_SIC_PCI0 + ((slot - 24 + pin - 1) & 3);
+        irq = IRQ_SIC_PCI0 + ((slot + 2 + pin - 1) & 3);
 
         return irq;
 }
diff --git a/arch/arm/mach-vexpress/Kconfig b/arch/arm/mach-vexpress/Kconfig
index b8bbabec6310..365795447804 100644
--- a/arch/arm/mach-vexpress/Kconfig
+++ b/arch/arm/mach-vexpress/Kconfig
@@ -10,7 +10,7 @@ config ARCH_VEXPRESS
         select CPU_V7
         select GENERIC_CLOCKEVENTS
         select HAVE_ARM_SCU if SMP
-        select HAVE_ARM_TWD if LOCAL_TIMERS
+        select HAVE_ARM_TWD if SMP
         select HAVE_CLK
         select HAVE_PATA_PLATFORM
         select HAVE_SMP
@@ -66,4 +66,12 @@ config ARCH_VEXPRESS_DCSCB
           This is needed to provide CPU and cluster power management
           on RTSM implementing big.LITTLE.
 
+config ARCH_VEXPRESS_TC2_PM
+        bool "Versatile Express TC2 power management"
+        depends on MCPM
+        select ARM_CCI
+        help
+          Support for CPU and cluster power management on Versatile Express
+          with a TC2 (A15x2 A7x3) big.LITTLE core tile.
+
 endmenu
diff --git a/arch/arm/mach-vexpress/Makefile b/arch/arm/mach-vexpress/Makefile
index 48ba89a8149f..505e64ab3eae 100644
--- a/arch/arm/mach-vexpress/Makefile
+++ b/arch/arm/mach-vexpress/Makefile
@@ -7,5 +7,8 @@ ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/$(src)/include \
 obj-y                                   := v2m.o
 obj-$(CONFIG_ARCH_VEXPRESS_CA9X4)       += ct-ca9x4.o
 obj-$(CONFIG_ARCH_VEXPRESS_DCSCB)       += dcscb.o      dcscb_setup.o
+CFLAGS_dcscb.o                          += -march=armv7-a
+obj-$(CONFIG_ARCH_VEXPRESS_TC2_PM)      += tc2_pm.o spc.o
+CFLAGS_tc2_pm.o                         += -march=armv7-a
 obj-$(CONFIG_SMP)                       += platsmp.o
 obj-$(CONFIG_HOTPLUG_CPU)               += hotplug.o
diff --git a/arch/arm/mach-vexpress/dcscb.c b/arch/arm/mach-vexpress/dcscb.c
index 16d57a8a9d5a..3a6384c6c435 100644
--- a/arch/arm/mach-vexpress/dcscb.c
+++ b/arch/arm/mach-vexpress/dcscb.c
@@ -136,14 +136,35 @@ static void dcscb_power_down(void)
                 /*
                  * Flush all cache levels for this cluster.
                  *
-                 * A15/A7 can hit in the cache with SCTLR.C=0, so we don't need
-                 * a preliminary flush here for those CPUs.  At least, that's
-                 * the theory -- without the extra flush, Linux explodes on
-                 * RTSM (to be investigated).
+                 * To do so we do:
+                 * - Clear the SCTLR.C bit to prevent further cache allocations
+                 * - Flush the whole cache
+                 * - Clear the ACTLR "SMP" bit to disable local coherency
+                 *
+                 * Let's do it in the safest possible way i.e. with
+                 * no memory access within the following sequence
+                 * including to the stack.
+                 *
+                 * Note: fp is preserved to the stack explicitly prior doing
+                 * this since adding it to the clobber list is incompatible
+                 * with having CONFIG_FRAME_POINTER=y.
                  */
-                flush_cache_all();
-                set_cr(get_cr() & ~CR_C);
-                flush_cache_all();
+                asm volatile(
+                "str    fp, [sp, #-4]! \n\t"
+                "mrc    p15, 0, r0, c1, c0, 0   @ get CR \n\t"
+                "bic    r0, r0, #"__stringify(CR_C)" \n\t"
+                "mcr    p15, 0, r0, c1, c0, 0   @ set CR \n\t"
+                "isb    \n\t"
+                "bl     v7_flush_dcache_all \n\t"
+                "clrex  \n\t"
+                "mrc    p15, 0, r0, c1, c0, 1   @ get AUXCR \n\t"
+                "bic    r0, r0, #(1 << 6)       @ disable local coherency \n\t"
+                "mcr    p15, 0, r0, c1, c0, 1   @ set AUXCR \n\t"
+                "isb    \n\t"
+                "dsb    \n\t"
+                "ldr    fp, [sp], #4"
+                : : : "r0","r1","r2","r3","r4","r5","r6","r7",
+                      "r9","r10","lr","memory");
 
                 /*
                  * This is a harmless no-op.  On platforms with a real
@@ -152,9 +173,6 @@ static void dcscb_power_down(void)
                  */
                 outer_flush_all();
 
-                /* Disable local coherency by clearing the ACTLR "SMP" bit: */
-                set_auxcr(get_auxcr() & ~(1 << 6));
-
                 /*
                  * Disable cluster-level coherency by masking
                  * incoming snoops and DVM messages:
@@ -167,18 +185,24 @@ static void dcscb_power_down(void)
 
                 /*
                  * Flush the local CPU cache.
-                 *
-                 * A15/A7 can hit in the cache with SCTLR.C=0, so we don't need
-                 * a preliminary flush here for those CPUs.  At least, that's
-                 * the theory -- without the extra flush, Linux explodes on
-                 * RTSM (to be investigated).
+                 * Let's do it in the safest possible way as above.
                  */
-                flush_cache_louis();
-                set_cr(get_cr() & ~CR_C);
-                flush_cache_louis();
-
-                /* Disable local coherency by clearing the ACTLR "SMP" bit: */
-                set_auxcr(get_auxcr() & ~(1 << 6));
+                asm volatile(
+                "str    fp, [sp, #-4]! \n\t"
+                "mrc    p15, 0, r0, c1, c0, 0   @ get CR \n\t"
+                "bic    r0, r0, #"__stringify(CR_C)" \n\t"
+                "mcr    p15, 0, r0, c1, c0, 0   @ set CR \n\t"
+                "isb    \n\t"
+                "bl     v7_flush_dcache_louis \n\t"
+                "clrex  \n\t"
+                "mrc    p15, 0, r0, c1, c0, 1   @ get AUXCR \n\t"
+                "bic    r0, r0, #(1 << 6)       @ disable local coherency \n\t"
+                "mcr    p15, 0, r0, c1, c0, 1   @ set AUXCR \n\t"
+                "isb    \n\t"
+                "dsb    \n\t"
+                "ldr    fp, [sp], #4"
+                : : : "r0","r1","r2","r3","r4","r5","r6","r7",
+                      "r9","r10","lr","memory");
         }
 
         __mcpm_cpu_down(cpu, cluster);
diff --git a/arch/arm/mach-vexpress/spc.c b/arch/arm/mach-vexpress/spc.c
new file mode 100644
index 000000000000..eefb029197ca
--- /dev/null
+++ b/arch/arm/mach-vexpress/spc.c
@@ -0,0 +1,180 @@
+/*
+ * Versatile Express Serial Power Controller (SPC) support
+ *
+ * Copyright (C) 2013 ARM Ltd.
+ *
+ * Authors: Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
+ *          Achin Gupta           <achin.gupta@arm.com>
+ *          Lorenzo Pieralisi     <lorenzo.pieralisi@arm.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed "as is" WITHOUT ANY WARRANTY of any
+ * kind, whether express or implied; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#include <linux/err.h>
+#include <linux/io.h>
+#include <linux/slab.h>
+
+#include <asm/cacheflush.h>
+
+#define SPCLOG "vexpress-spc: "
+
+/* SPC wake-up IRQs status and mask */
+#define WAKE_INT_MASK           0x24
+#define WAKE_INT_RAW            0x28
+#define WAKE_INT_STAT           0x2c
+/* SPC power down registers */
+#define A15_PWRDN_EN            0x30
+#define A7_PWRDN_EN             0x34
+/* SPC per-CPU mailboxes */
+#define A15_BX_ADDR0            0x68
+#define A7_BX_ADDR0             0x78
+
+/* wake-up interrupt masks */
+#define GBL_WAKEUP_INT_MSK      (0x3 << 10)
+
+/* TC2 static dual-cluster configuration */
+#define MAX_CLUSTERS            2
+
+struct ve_spc_drvdata {
+        void __iomem *baseaddr;
+        /*
+         * A15s cluster identifier
+         * It corresponds to A15 processors MPIDR[15:8] bitfield
+         */
+        u32 a15_clusid;
+};
+
+static struct ve_spc_drvdata *info;
+
+static inline bool cluster_is_a15(u32 cluster)
+{
+        return cluster == info->a15_clusid;
+}
+
+/**
+ * ve_spc_global_wakeup_irq()
+ *
+ * Function to set/clear global wakeup IRQs. Not protected by locking since
+ * it might be used in code paths where normal cacheable locks are not
+ * working. Locking must be provided by the caller to ensure atomicity.
+ *
+ * @set: if true, global wake-up IRQs are set, if false they are cleared
+ */
+void ve_spc_global_wakeup_irq(bool set)
+{
+        u32 reg;
+
+        reg = readl_relaxed(info->baseaddr + WAKE_INT_MASK);
+
+        if (set)
+                reg |= GBL_WAKEUP_INT_MSK;
+        else
+                reg &= ~GBL_WAKEUP_INT_MSK;
+
+        writel_relaxed(reg, info->baseaddr + WAKE_INT_MASK);
+}
+
+/**
+ * ve_spc_cpu_wakeup_irq()
+ *
+ * Function to set/clear per-CPU wake-up IRQs. Not protected by locking since
+ * it might be used in code paths where normal cacheable locks are not
+ * working. Locking must be provided by the caller to ensure atomicity.
+ *
+ * @cluster: mpidr[15:8] bitfield describing cluster affinity level
+ * @cpu: mpidr[7:0] bitfield describing cpu affinity level
+ * @set: if true, wake-up IRQs are set, if false they are cleared
+ */
+void ve_spc_cpu_wakeup_irq(u32 cluster, u32 cpu, bool set)
+{
+        u32 mask, reg;
+
+        if (cluster >= MAX_CLUSTERS)
+                return;
+
+        mask = 1 << cpu;
+
+        if (!cluster_is_a15(cluster))
+                mask <<= 4;
+
+        reg = readl_relaxed(info->baseaddr + WAKE_INT_MASK);
+
+        if (set)
+                reg |= mask;
+        else
+                reg &= ~mask;
+
+        writel_relaxed(reg, info->baseaddr + WAKE_INT_MASK);
+}
+
+/**
+ * ve_spc_set_resume_addr() - set the jump address used for warm boot
+ *
+ * @cluster: mpidr[15:8] bitfield describing cluster affinity level
+ * @cpu: mpidr[7:0] bitfield describing cpu affinity level
+ * @addr: physical resume address
+ */
+void ve_spc_set_resume_addr(u32 cluster, u32 cpu, u32 addr)
+{
+        void __iomem *baseaddr;
+
+        if (cluster >= MAX_CLUSTERS)
+                return;
+
+        if (cluster_is_a15(cluster))
+                baseaddr = info->baseaddr + A15_BX_ADDR0 + (cpu << 2);
+        else
+                baseaddr = info->baseaddr + A7_BX_ADDR0 + (cpu << 2);
+
+        writel_relaxed(addr, baseaddr);
+}
+
+/**
+ * ve_spc_powerdown()
+ *
+ * Function to enable/disable cluster powerdown. Not protected by locking
+ * since it might be used in code paths where normal cacheable locks are not
+ * working. Locking must be provided by the caller to ensure atomicity.
+ *
+ * @cluster: mpidr[15:8] bitfield describing cluster affinity level
+ * @enable: if true enables powerdown, if false disables it
+ */
+void ve_spc_powerdown(u32 cluster, bool enable)
+{
+        u32 pwdrn_reg;
+
+        if (cluster >= MAX_CLUSTERS)
+                return;
+
+        pwdrn_reg = cluster_is_a15(cluster) ? A15_PWRDN_EN : A7_PWRDN_EN;
+        writel_relaxed(enable, info->baseaddr + pwdrn_reg);
+}
+
+int __init ve_spc_init(void __iomem *baseaddr, u32 a15_clusid)
+{
+        info = kzalloc(sizeof(*info), GFP_KERNEL);
+        if (!info) {
+                pr_err(SPCLOG "unable to allocate mem\n");
+                return -ENOMEM;
+        }
+
+        info->baseaddr = baseaddr;
+        info->a15_clusid = a15_clusid;
+
+        /*
+         * Multi-cluster systems may need this data when non-coherent, during
+         * cluster power-up/power-down. Make sure driver info reaches main
+         * memory.
+         */
+        sync_cache_w(info);
+        sync_cache_w(&info);
+
+        return 0;
+}
diff --git a/arch/arm/mach-vexpress/spc.h b/arch/arm/mach-vexpress/spc.h
new file mode 100644
index 000000000000..5f7e4a446a17
--- /dev/null
+++ b/arch/arm/mach-vexpress/spc.h
@@ -0,0 +1,24 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * 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.
+ *
+ * Copyright (C) 2012 ARM Limited
+ */
+
+
+#ifndef __SPC_H_
+#define __SPC_H_
+
+int __init ve_spc_init(void __iomem *base, u32 a15_clusid);
+void ve_spc_global_wakeup_irq(bool set);
+void ve_spc_cpu_wakeup_irq(u32 cluster, u32 cpu, bool set);
+void ve_spc_set_resume_addr(u32 cluster, u32 cpu, u32 addr);
+void ve_spc_powerdown(u32 cluster, bool enable);
+
+#endif
diff --git a/arch/arm/mach-vexpress/tc2_pm.c b/arch/arm/mach-vexpress/tc2_pm.c
new file mode 100644
index 000000000000..7aeb5d60e484
--- /dev/null
+++ b/arch/arm/mach-vexpress/tc2_pm.c
@@ -0,0 +1,354 @@
+/*
+ * arch/arm/mach-vexpress/tc2_pm.c - TC2 power management support
+ *
+ * Created by:  Nicolas Pitre, October 2012
+ * Copyright:   (C) 2012-2013  Linaro Limited
+ *
+ * Some portions of this file were originally written by Achin Gupta
+ * Copyright:   (C) 2012  ARM Limited
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/kernel.h>
+#include <linux/of_address.h>
+#include <linux/spinlock.h>
+#include <linux/errno.h>
+#include <linux/irqchip/arm-gic.h>
+
+#include <asm/mcpm.h>
+#include <asm/proc-fns.h>
+#include <asm/cacheflush.h>
+#include <asm/cputype.h>
+#include <asm/cp15.h>
+
+#include <linux/arm-cci.h>
+
+#include "spc.h"
+
+/* SCC conf registers */
+#define A15_CONF                0x400
+#define A7_CONF                 0x500
+#define SYS_INFO                0x700
+#define SPC_BASE                0xb00
+
+/*
+ * We can't use regular spinlocks. In the switcher case, it is possible
+ * for an outbound CPU to call power_down() after its inbound counterpart
+ * is already live using the same logical CPU number which trips lockdep
+ * debugging.
+ */
+static arch_spinlock_t tc2_pm_lock = __ARCH_SPIN_LOCK_UNLOCKED;
+
+#define TC2_CLUSTERS                    2
+#define TC2_MAX_CPUS_PER_CLUSTER        3
+
+static unsigned int tc2_nr_cpus[TC2_CLUSTERS];
+
+/* Keep per-cpu usage count to cope with unordered up/down requests */
+static int tc2_pm_use_count[TC2_MAX_CPUS_PER_CLUSTER][TC2_CLUSTERS];
+
+#define tc2_cluster_unused(cluster) \
+        (!tc2_pm_use_count[0][cluster] && \
+         !tc2_pm_use_count[1][cluster] && \
+         !tc2_pm_use_count[2][cluster])
+
+static int tc2_pm_power_up(unsigned int cpu, unsigned int cluster)
+{
+        pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster);
+        if (cluster >= TC2_CLUSTERS || cpu >= tc2_nr_cpus[cluster])
+                return -EINVAL;
+
+        /*
+         * Since this is called with IRQs enabled, and no arch_spin_lock_irq
+         * variant exists, we need to disable IRQs manually here.
+         */
+        local_irq_disable();
+        arch_spin_lock(&tc2_pm_lock);
+
+        if (tc2_cluster_unused(cluster))
+                ve_spc_powerdown(cluster, false);
+
+        tc2_pm_use_count[cpu][cluster]++;
+        if (tc2_pm_use_count[cpu][cluster] == 1) {
+                ve_spc_set_resume_addr(cluster, cpu,
+                                       virt_to_phys(mcpm_entry_point));
+                ve_spc_cpu_wakeup_irq(cluster, cpu, true);
+        } else if (tc2_pm_use_count[cpu][cluster] != 2) {
+                /*
+                 * The only possible values are:
+                 * 0 = CPU down
+                 * 1 = CPU (still) up
+                 * 2 = CPU requested to be up before it had a chance
+                 *     to actually make itself down.
+                 * Any other value is a bug.
+                 */
+                BUG();
+        }
+
+        arch_spin_unlock(&tc2_pm_lock);
+        local_irq_enable();
+
+        return 0;
+}
+
+static void tc2_pm_down(u64 residency)
+{
+        unsigned int mpidr, cpu, cluster;
+        bool last_man = false, skip_wfi = false;
+
+        mpidr = read_cpuid_mpidr();
+        cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
+        cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
+
+        pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster);
+        BUG_ON(cluster >= TC2_CLUSTERS || cpu >= TC2_MAX_CPUS_PER_CLUSTER);
+
+        __mcpm_cpu_going_down(cpu, cluster);
+
+        arch_spin_lock(&tc2_pm_lock);
+        BUG_ON(__mcpm_cluster_state(cluster) != CLUSTER_UP);
+        tc2_pm_use_count[cpu][cluster]--;
+        if (tc2_pm_use_count[cpu][cluster] == 0) {
+                ve_spc_cpu_wakeup_irq(cluster, cpu, true);
+                if (tc2_cluster_unused(cluster)) {
+                        ve_spc_powerdown(cluster, true);
+                        ve_spc_global_wakeup_irq(true);
+                        last_man = true;
+                }
+        } else if (tc2_pm_use_count[cpu][cluster] == 1) {
+                /*
+                 * A power_up request went ahead of us.
+                 * Even if we do not want to shut this CPU down,
+                 * the caller expects a certain state as if the WFI
+                 * was aborted.  So let's continue with cache cleaning.
+                 */
+                skip_wfi = true;
+        } else
+                BUG();
+
+        if (last_man && __mcpm_outbound_enter_critical(cpu, cluster)) {
+                arch_spin_unlock(&tc2_pm_lock);
+
+                if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A15) {
+                        /*
+                         * On the Cortex-A15 we need to disable
+                         * L2 prefetching before flushing the cache.
+                         */
+                        asm volatile(
+                        "mcr    p15, 1, %0, c15, c0, 3 \n\t"
+                        "isb    \n\t"
+                        "dsb    "
+                        : : "r" (0x400) );
+                }
+
+                /*
+                 * We need to disable and flush the whole (L1 and L2) cache.
+                 * Let's do it in the safest possible way i.e. with
+                 * no memory access within the following sequence
+                 * including the stack.
+                 *
+                 * Note: fp is preserved to the stack explicitly prior doing
+                 * this since adding it to the clobber list is incompatible
+                 * with having CONFIG_FRAME_POINTER=y.
+                 */
+                asm volatile(
+                "str    fp, [sp, #-4]! \n\t"
+                "mrc    p15, 0, r0, c1, c0, 0   @ get CR \n\t"
+                "bic    r0, r0, #"__stringify(CR_C)" \n\t"
+                "mcr    p15, 0, r0, c1, c0, 0   @ set CR \n\t"
+                "isb    \n\t"
+                "bl     v7_flush_dcache_all \n\t"
+                "clrex  \n\t"
+                "mrc    p15, 0, r0, c1, c0, 1   @ get AUXCR \n\t"
+                "bic    r0, r0, #(1 << 6)       @ disable local coherency \n\t"
+                "mcr    p15, 0, r0, c1, c0, 1   @ set AUXCR \n\t"
+                "isb    \n\t"
+                "dsb    \n\t"
+                "ldr    fp, [sp], #4"
+                : : : "r0","r1","r2","r3","r4","r5","r6","r7",
+                      "r9","r10","lr","memory");
+
+                cci_disable_port_by_cpu(mpidr);
+
+                __mcpm_outbound_leave_critical(cluster, CLUSTER_DOWN);
+        } else {
+                /*
+                 * If last man then undo any setup done previously.
+                 */
+                if (last_man) {
+                        ve_spc_powerdown(cluster, false);
+                        ve_spc_global_wakeup_irq(false);
+                }
+
+                arch_spin_unlock(&tc2_pm_lock);
+
+                /*
+                 * We need to disable and flush only the L1 cache.
+                 * Let's do it in the safest possible way as above.
+                 */
+                asm volatile(
+                "str    fp, [sp, #-4]! \n\t"
+                "mrc    p15, 0, r0, c1, c0, 0   @ get CR \n\t"
+                "bic    r0, r0, #"__stringify(CR_C)" \n\t"
+                "mcr    p15, 0, r0, c1, c0, 0   @ set CR \n\t"
+                "isb    \n\t"
+                "bl     v7_flush_dcache_louis \n\t"
+                "clrex  \n\t"
+                "mrc    p15, 0, r0, c1, c0, 1   @ get AUXCR \n\t"
+                "bic    r0, r0, #(1 << 6)       @ disable local coherency \n\t"
+                "mcr    p15, 0, r0, c1, c0, 1   @ set AUXCR \n\t"
+                "isb    \n\t"
+                "dsb    \n\t"
+                "ldr    fp, [sp], #4"
+                : : : "r0","r1","r2","r3","r4","r5","r6","r7",
+                      "r9","r10","lr","memory");
+        }
+
+        __mcpm_cpu_down(cpu, cluster);
+
+        /* Now we are prepared for power-down, do it: */
+        if (!skip_wfi)
+                wfi();
+
+        /* Not dead at this point?  Let our caller cope. */
+}
+
+static void tc2_pm_power_down(void)
+{
+        tc2_pm_down(0);
+}
+
+static void tc2_pm_suspend(u64 residency)
+{
+        unsigned int mpidr, cpu, cluster;
+
+        mpidr = read_cpuid_mpidr();
+        cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
+        cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
+        ve_spc_set_resume_addr(cluster, cpu, virt_to_phys(mcpm_entry_point));
+        gic_cpu_if_down();
+        tc2_pm_down(residency);
+}
+
+static void tc2_pm_powered_up(void)
+{
+        unsigned int mpidr, cpu, cluster;
+        unsigned long flags;
+
+        mpidr = read_cpuid_mpidr();
+        cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
+        cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
+
+        pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster);
+        BUG_ON(cluster >= TC2_CLUSTERS || cpu >= TC2_MAX_CPUS_PER_CLUSTER);
+
+        local_irq_save(flags);
+        arch_spin_lock(&tc2_pm_lock);
+
+        if (tc2_cluster_unused(cluster)) {
+                ve_spc_powerdown(cluster, false);
+                ve_spc_global_wakeup_irq(false);
+        }
+
+        if (!tc2_pm_use_count[cpu][cluster])
+                tc2_pm_use_count[cpu][cluster] = 1;
+
+        ve_spc_cpu_wakeup_irq(cluster, cpu, false);
+        ve_spc_set_resume_addr(cluster, cpu, 0);
+
+        arch_spin_unlock(&tc2_pm_lock);
+        local_irq_restore(flags);
+}
+
+static const struct mcpm_platform_ops tc2_pm_power_ops = {
+        .power_up       = tc2_pm_power_up,
+        .power_down     = tc2_pm_power_down,
+        .suspend        = tc2_pm_suspend,
+        .powered_up     = tc2_pm_powered_up,
+};
+
+static bool __init tc2_pm_usage_count_init(void)
+{
+        unsigned int mpidr, cpu, cluster;
+
+        mpidr = read_cpuid_mpidr();
+        cpu = MPIDR_AFFINITY_LEVEL(mpidr, 0);
+        cluster = MPIDR_AFFINITY_LEVEL(mpidr, 1);
+
+        pr_debug("%s: cpu %u cluster %u\n", __func__, cpu, cluster);
+        if (cluster >= TC2_CLUSTERS || cpu >= tc2_nr_cpus[cluster]) {
+                pr_err("%s: boot CPU is out of bound!\n", __func__);
+                return false;
+        }
+        tc2_pm_use_count[cpu][cluster] = 1;
+        return true;
+}
+
+/*
+ * Enable cluster-level coherency, in preparation for turning on the MMU.
+ */
+static void __naked tc2_pm_power_up_setup(unsigned int affinity_level)
+{
+        asm volatile (" \n"
+"       cmp     r0, #1 \n"
+"       bxne    lr \n"
+"       b       cci_enable_port_for_self ");
+}
+
+static int __init tc2_pm_init(void)
+{
+        int ret;
+        void __iomem *scc;
+        u32 a15_cluster_id, a7_cluster_id, sys_info;
+        struct device_node *np;
+
+        /*
+         * The power management-related features are hidden behind
+         * SCC registers. We need to extract runtime information like
+         * cluster ids and number of CPUs really available in clusters.
+         */
+        np = of_find_compatible_node(NULL, NULL,
+                        "arm,vexpress-scc,v2p-ca15_a7");
+        scc = of_iomap(np, 0);
+        if (!scc)
+                return -ENODEV;
+
+        a15_cluster_id = readl_relaxed(scc + A15_CONF) & 0xf;
+        a7_cluster_id = readl_relaxed(scc + A7_CONF) & 0xf;
+        if (a15_cluster_id >= TC2_CLUSTERS || a7_cluster_id >= TC2_CLUSTERS)
+                return -EINVAL;
+
+        sys_info = readl_relaxed(scc + SYS_INFO);
+        tc2_nr_cpus[a15_cluster_id] = (sys_info >> 16) & 0xf;
+        tc2_nr_cpus[a7_cluster_id] = (sys_info >> 20) & 0xf;
+
+        /*
+         * A subset of the SCC registers is also used to communicate
+         * with the SPC (power controller). We need to be able to
+         * drive it very early in the boot process to power up
+         * processors, so we initialize the SPC driver here.
+         */
+        ret = ve_spc_init(scc + SPC_BASE, a15_cluster_id);
+        if (ret)
+                return ret;
+
+        if (!cci_probed())
+                return -ENODEV;
+
+        if (!tc2_pm_usage_count_init())
+                return -EINVAL;
+
+        ret = mcpm_platform_register(&tc2_pm_power_ops);
+        if (!ret) {
+                mcpm_sync_init(tc2_pm_power_up_setup);
+                pr_info("TC2 power management initialized\n");
+        }
+        return ret;
+}
+
+early_initcall(tc2_pm_init);
diff --git a/arch/arm/mach-zynq/Kconfig b/arch/arm/mach-zynq/Kconfig
index c1d61f281e68..04f8a4a6e755 100644
--- a/arch/arm/mach-zynq/Kconfig
+++ b/arch/arm/mach-zynq/Kconfig
@@ -6,7 +6,7 @@ config ARCH_ZYNQ
         select CPU_V7
         select GENERIC_CLOCKEVENTS
         select HAVE_ARM_SCU if SMP
-        select HAVE_ARM_TWD if LOCAL_TIMERS
+        select HAVE_ARM_TWD if SMP
         select ICST
         select MIGHT_HAVE_CACHE_L2X0
         select USE_OF
diff --git a/arch/arm/mach-zynq/hotplug.c b/arch/arm/mach-zynq/hotplug.c
index c89672bd1de2..5052c70326e4 100644
--- a/arch/arm/mach-zynq/hotplug.c
+++ b/arch/arm/mach-zynq/hotplug.c
@@ -40,44 +40,6 @@ static inline void zynq_cpu_enter_lowpower(void)
           : "cc");
 }
 
-static inline void zynq_cpu_leave_lowpower(void)
-{
-        unsigned int v;
-
-        asm volatile(
-        "       mrc     p15, 0, %0, c1, c0, 0\n"
-        "       orr     %0, %0, %1\n"
-        "       mcr     p15, 0, %0, c1, c0, 0\n"
-        "       mrc     p15, 0, %0, c1, c0, 1\n"
-        "       orr     %0, %0, #0x40\n"
-        "       mcr     p15, 0, %0, c1, c0, 1\n"
-          : "=&r" (v)
-          : "Ir" (CR_C)
-          : "cc");
-}
-
-static inline void zynq_platform_do_lowpower(unsigned int cpu, int *spurious)
-{
-        /*
-         * there is no power-control hardware on this platform, so all
-         * we can do is put the core into WFI; this is safe as the calling
-         * code will have already disabled interrupts
-         */
-        for (;;) {
-                dsb();
-                wfi();
-
-                /*
-                 * Getting here, means that we have come out of WFI without
-                 * having been woken up - this shouldn't happen
-                 *
-                 * Just note it happening - when we're woken, we can report
-                 * its occurrence.
-                 */
-                (*spurious)++;
-        }
-}
-
 /*
  * platform-specific code to shutdown a CPU
  *
@@ -85,20 +47,13 @@ static inline void zynq_platform_do_lowpower(unsigned int cpu, int *spurious)
  */
 void zynq_platform_cpu_die(unsigned int cpu)
 {
-        int spurious = 0;
-
-        /*
-         * we're ready for shutdown now, so do it
-         */
         zynq_cpu_enter_lowpower();
-        zynq_platform_do_lowpower(cpu, &spurious);
 
         /*
-         * bring this CPU back into the world of cache
-         * coherency, and then restore interrupts
+         * there is no power-control hardware on this platform, so all
+         * we can do is put the core into WFI; this is safe as the calling
+         * code will have already disabled interrupts
          */
-        zynq_cpu_leave_lowpower();
-
-        if (spurious)
-                pr_warn("CPU%u: %u spurious wakeup calls\n", cpu, spurious);
+        for (;;)
+                cpu_do_idle();
 }
diff --git a/arch/arm/mach-zynq/slcr.c b/arch/arm/mach-zynq/slcr.c
index 50d008d8f87f..1836d5a34606 100644
--- a/arch/arm/mach-zynq/slcr.c
+++ b/arch/arm/mach-zynq/slcr.c
@@ -14,32 +14,21 @@
  * 02139, USA.
  */
 
-#include <linux/export.h>
 #include <linux/io.h>
-#include <linux/fs.h>
-#include <linux/interrupt.h>
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/of_address.h>
-#include <linux/uaccess.h>
-#include <linux/platform_device.h>
-#include <linux/slab.h>
-#include <linux/string.h>
 #include <linux/clk/zynq.h>
 #include "common.h"
 
-#define SLCR_UNLOCK_MAGIC               0xDF0D
-#define SLCR_UNLOCK                     0x8   /* SCLR unlock register */
-
+/* register offsets */
+#define SLCR_UNLOCK_OFFSET              0x8   /* SCLR unlock register */
 #define SLCR_PS_RST_CTRL_OFFSET         0x200 /* PS Software Reset Control */
+#define SLCR_A9_CPU_RST_CTRL_OFFSET     0x244 /* CPU Software Reset Control */
+#define SLCR_REBOOT_STATUS_OFFSET       0x258 /* PS Reboot Status */
 
+#define SLCR_UNLOCK_MAGIC               0xDF0D
 #define SLCR_A9_CPU_CLKSTOP             0x10
 #define SLCR_A9_CPU_RST                 0x1
 
-#define SLCR_A9_CPU_RST_CTRL            0x244 /* CPU Software Reset Control */
-#define SLCR_REBOOT_STATUS              0x258 /* PS Reboot Status */
-
 void __iomem *zynq_slcr_base;
 
 /**
@@ -54,15 +43,15 @@ void zynq_slcr_system_reset(void)
          * Note that this seems to require raw i/o
          * functions or there's a lockup?
          */
-        writel(SLCR_UNLOCK_MAGIC, zynq_slcr_base + SLCR_UNLOCK);
+        writel(SLCR_UNLOCK_MAGIC, zynq_slcr_base + SLCR_UNLOCK_OFFSET);
 
         /*
          * Clear 0x0F000000 bits of reboot status register to workaround
          * the FSBL not loading the bitstream after soft-reboot
          * This is a temporary solution until we know more.
          */
-        reboot = readl(zynq_slcr_base + SLCR_REBOOT_STATUS);
-        writel(reboot & 0xF0FFFFFF, zynq_slcr_base + SLCR_REBOOT_STATUS);
+        reboot = readl(zynq_slcr_base + SLCR_REBOOT_STATUS_OFFSET);
+        writel(reboot & 0xF0FFFFFF, zynq_slcr_base + SLCR_REBOOT_STATUS_OFFSET);
         writel(1, zynq_slcr_base + SLCR_PS_RST_CTRL_OFFSET);
 }
 
@@ -72,11 +61,11 @@ void zynq_slcr_system_reset(void)
  */
 void zynq_slcr_cpu_start(int cpu)
 {
-        /* enable CPUn */
-        writel(SLCR_A9_CPU_CLKSTOP << cpu,
-               zynq_slcr_base + SLCR_A9_CPU_RST_CTRL);
-        /* enable CLK for CPUn */
-        writel(0x0 << cpu, zynq_slcr_base + SLCR_A9_CPU_RST_CTRL);
+        u32 reg = readl(zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
+        reg &= ~(SLCR_A9_CPU_RST << cpu);
+        writel(reg, zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
+        reg &= ~(SLCR_A9_CPU_CLKSTOP << cpu);
+        writel(reg, zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
 }
 
 /**
@@ -85,9 +74,9 @@ void zynq_slcr_cpu_start(int cpu)
  */
 void zynq_slcr_cpu_stop(int cpu)
 {
-        /* stop CLK and reset CPUn */
-        writel((SLCR_A9_CPU_CLKSTOP | SLCR_A9_CPU_RST) << cpu,
-               zynq_slcr_base + SLCR_A9_CPU_RST_CTRL);
+        u32 reg = readl(zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
+        reg |= (SLCR_A9_CPU_CLKSTOP | SLCR_A9_CPU_RST) << cpu;
+        writel(reg, zynq_slcr_base + SLCR_A9_CPU_RST_CTRL_OFFSET);
 }
 
 /**
@@ -113,7 +102,7 @@ int __init zynq_slcr_init(void)
         }
 
         /* unlock the SLCR so that registers can be changed */
-        writel(SLCR_UNLOCK_MAGIC, zynq_slcr_base + SLCR_UNLOCK);
+        writel(SLCR_UNLOCK_MAGIC, zynq_slcr_base + SLCR_UNLOCK_OFFSET);
 
         pr_info("%s mapped to %p\n", np->name, zynq_slcr_base);
 
diff --git a/arch/arm/mm/cache-l2x0.c b/arch/arm/mm/cache-l2x0.c
index d70e0aba0c9d..447da6ffadd5 100644
--- a/arch/arm/mm/cache-l2x0.c
+++ b/arch/arm/mm/cache-l2x0.c
@@ -290,7 +290,7 @@ static void l2x0_disable(void)
         raw_spin_lock_irqsave(&l2x0_lock, flags);
         __l2x0_flush_all();
         writel_relaxed(0, l2x0_base + L2X0_CTRL);
-        dsb();
+        dsb(st);
         raw_spin_unlock_irqrestore(&l2x0_lock, flags);
 }
 
@@ -417,9 +417,9 @@ void __init l2x0_init(void __iomem *base, u32 aux_val, u32 aux_mask)
                 outer_cache.disable = l2x0_disable;
         }
 
-        printk(KERN_INFO "%s cache controller enabled\n", type);
-        printk(KERN_INFO "l2x0: %d ways, CACHE_ID 0x%08x, AUX_CTRL 0x%08x, Cache size: %d B\n",
-                        ways, cache_id, aux, l2x0_size);
+        pr_info("%s cache controller enabled\n", type);
+        pr_info("l2x0: %d ways, CACHE_ID 0x%08x, AUX_CTRL 0x%08x, Cache size: %d kB\n",
+                ways, cache_id, aux, l2x0_size >> 10);
 }
 
 #ifdef CONFIG_OF
@@ -929,7 +929,9 @@ static const struct of_device_id l2x0_ids[] __initconst = {
           .data = (void *)&aurora_no_outer_data},
         { .compatible = "marvell,aurora-outer-cache",
           .data = (void *)&aurora_with_outer_data},
-        { .compatible = "bcm,bcm11351-a2-pl310-cache",
+        { .compatible = "brcm,bcm11351-a2-pl310-cache",
+          .data = (void *)&bcm_l2x0_data},
+        { .compatible = "bcm,bcm11351-a2-pl310-cache", /* deprecated name */
           .data = (void *)&bcm_l2x0_data},
         {}
 };
diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S
index 515b00064da8..b5c467a65c27 100644
--- a/arch/arm/mm/cache-v7.S
+++ b/arch/arm/mm/cache-v7.S
@@ -282,7 +282,7 @@ ENTRY(v7_coherent_user_range)
         add     r12, r12, r2
         cmp     r12, r1
         blo     1b
-        dsb
+        dsb     ishst
         icache_line_size r2, r3
         sub     r3, r2, #1
         bic     r12, r0, r3
@@ -294,7 +294,7 @@ ENTRY(v7_coherent_user_range)
         mov     r0, #0
         ALT_SMP(mcr     p15, 0, r0, c7, c1, 6)  @ invalidate BTB Inner Shareable
         ALT_UP(mcr      p15, 0, r0, c7, c5, 6)  @ invalidate BTB
-        dsb
+        dsb     ishst
         isb
         mov     pc, lr
 
diff --git a/arch/arm/mm/context.c b/arch/arm/mm/context.c
index 4a0544492f10..84e6f772e204 100644
--- a/arch/arm/mm/context.c
+++ b/arch/arm/mm/context.c
@@ -162,10 +162,7 @@ static void flush_context(unsigned int cpu)
         }
 
         /* Queue a TLB invalidate and flush the I-cache if necessary. */
-        if (!tlb_ops_need_broadcast())
-                cpumask_set_cpu(cpu, &tlb_flush_pending);
-        else
-                cpumask_setall(&tlb_flush_pending);
+        cpumask_setall(&tlb_flush_pending);
 
         if (icache_is_vivt_asid_tagged())
                 __flush_icache_all();
@@ -245,8 +242,6 @@ void check_and_switch_context(struct mm_struct *mm, struct task_struct *tsk)
         if (cpumask_test_and_clear_cpu(cpu, &tlb_flush_pending)) {
                 local_flush_bp_all();
                 local_flush_tlb_all();
-                if (erratum_a15_798181())
-                        dummy_flush_tlb_a15_erratum();
         }
 
         atomic64_set(&per_cpu(active_asids, cpu), asid);
diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 7f9b1798c6cf..f5e1a8471714 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -358,7 +358,7 @@ static int __init atomic_pool_init(void)
         if (!pages)
                 goto no_pages;
 
-        if (IS_ENABLED(CONFIG_CMA))
+        if (IS_ENABLED(CONFIG_DMA_CMA))
                 ptr = __alloc_from_contiguous(NULL, pool->size, prot, &page,
                                               atomic_pool_init);
         else
@@ -455,7 +455,6 @@ static void __dma_remap(struct page *page, size_t size, pgprot_t prot)
         unsigned end = start + size;
 
         apply_to_page_range(&init_mm, start, size, __dma_update_pte, &prot);
-        dsb();
         flush_tlb_kernel_range(start, end);
 }
 
@@ -670,7 +669,7 @@ static void *__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
                 addr = __alloc_simple_buffer(dev, size, gfp, &page);
         else if (!(gfp & __GFP_WAIT))
                 addr = __alloc_from_pool(size, &page);
-        else if (!IS_ENABLED(CONFIG_CMA))
+        else if (!IS_ENABLED(CONFIG_DMA_CMA))
                 addr = __alloc_remap_buffer(dev, size, gfp, prot, &page, caller);
         else
                 addr = __alloc_from_contiguous(dev, size, prot, &page, caller);
@@ -759,7 +758,7 @@ static void __arm_dma_free(struct device *dev, size_t size, void *cpu_addr,
                 __dma_free_buffer(page, size);
         } else if (__free_from_pool(cpu_addr, size)) {
                 return;
-        } else if (!IS_ENABLED(CONFIG_CMA)) {
+        } else if (!IS_ENABLED(CONFIG_DMA_CMA)) {
                 __dma_free_remap(cpu_addr, size);
                 __dma_free_buffer(page, size);
         } else {
diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
index c97f7940cb95..eb8830a4c5ed 100644
--- a/arch/arm/mm/fault.c
+++ b/arch/arm/mm/fault.c
@@ -261,9 +261,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
         struct task_struct *tsk;
         struct mm_struct *mm;
         int fault, sig, code;
-        int write = fsr & FSR_WRITE;
-        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
-                                (write ? FAULT_FLAG_WRITE : 0);
+        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
 
         if (notify_page_fault(regs, fsr))
                 return 0;
@@ -282,6 +280,11 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
         if (in_atomic() || !mm)
                 goto no_context;
 
+        if (user_mode(regs))
+                flags |= FAULT_FLAG_USER;
+        if (fsr & FSR_WRITE)
+                flags |= FAULT_FLAG_WRITE;
+
         /*
          * As per x86, we may deadlock here.  However, since the kernel only
          * validly references user space from well defined areas of the code,
@@ -349,6 +352,13 @@ retry:
         if (likely(!(fault & (VM_FAULT_ERROR | VM_FAULT_BADMAP | VM_FAULT_BADACCESS))))
                 return 0;
 
+        /*
+         * If we are in kernel mode at this point, we
+         * have no context to handle this fault with.
+         */
+        if (!user_mode(regs))
+                goto no_context;
+
         if (fault & VM_FAULT_OOM) {
                 /*
                  * We ran out of memory, call the OOM killer, and return to
@@ -359,13 +369,6 @@ retry:
                 return 0;
         }
 
-        /*
-         * If we are in kernel mode at this point, we
-         * have no context to handle this fault with.
-         */
-        if (!user_mode(regs))
-                goto no_context;
-
         if (fault & VM_FAULT_SIGBUS) {
                 /*
                  * We had some memory, but were unable to
diff --git a/arch/arm/mm/hugetlbpage.c b/arch/arm/mm/hugetlbpage.c
index 3d1e4a205b0b..54ee6163c181 100644
--- a/arch/arm/mm/hugetlbpage.c
+++ b/arch/arm/mm/hugetlbpage.c
@@ -36,22 +36,6 @@
  * of type casting from pmd_t * to pte_t *.
  */
 
-pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)
-{
-        pgd_t *pgd;
-        pud_t *pud;
-        pmd_t *pmd = NULL;
-
-        pgd = pgd_offset(mm, addr);
-        if (pgd_present(*pgd)) {
-                pud = pud_offset(pgd, addr);
-                if (pud_present(*pud))
-                        pmd = pmd_offset(pud, addr);
-        }
-
-        return (pte_t *)pmd;
-}
-
 struct page *follow_huge_addr(struct mm_struct *mm, unsigned long address,
                               int write)
 {
@@ -68,34 +52,12 @@ int huge_pmd_unshare(struct mm_struct *mm, unsigned long *addr, pte_t *ptep)
         return 0;
 }
 
-pte_t *huge_pte_alloc(struct mm_struct *mm,
-                        unsigned long addr, unsigned long sz)
-{
-        pgd_t *pgd;
-        pud_t *pud;
-        pte_t *pte = NULL;
-
-        pgd = pgd_offset(mm, addr);
-        pud = pud_alloc(mm, pgd, addr);
-        if (pud)
-                pte = (pte_t *)pmd_alloc(mm, pud, addr);
-
-        return pte;
-}
-
-struct page *
-follow_huge_pmd(struct mm_struct *mm, unsigned long address,
-                pmd_t *pmd, int write)
+int pmd_huge(pmd_t pmd)
 {
-        struct page *page;
-
-        page = pte_page(*(pte_t *)pmd);
-        if (page)
-                page += ((address & ~PMD_MASK) >> PAGE_SHIFT);
-        return page;
+        return pmd_val(pmd) && !(pmd_val(pmd) & PMD_TABLE_BIT);
 }
 
-int pmd_huge(pmd_t pmd)
+int pmd_huge_support(void)
 {
-        return pmd_val(pmd) && !(pmd_val(pmd) & PMD_TABLE_BIT);
+        return 1;
 }
diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
index 15225d829d71..febaee7ca57b 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
@@ -17,6 +17,7 @@
 #include <linux/nodemask.h>
 #include <linux/initrd.h>
 #include <linux/of_fdt.h>
+#include <linux/of_reserved_mem.h>
 #include <linux/highmem.h>
 #include <linux/gfp.h>
 #include <linux/memblock.h>
@@ -77,7 +78,7 @@ static int __init parse_tag_initrd2(const struct tag *tag)
 __tagtable(ATAG_INITRD2, parse_tag_initrd2);
 
 #ifdef CONFIG_OF_FLATTREE
-void __init early_init_dt_setup_initrd_arch(unsigned long start, unsigned long end)
+void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
 {
         phys_initrd_start = start;
         phys_initrd_size = end - start;
@@ -207,7 +208,7 @@ static void __init arm_bootmem_init(unsigned long start_pfn,
 
 #ifdef CONFIG_ZONE_DMA
 
-unsigned long arm_dma_zone_size __read_mostly;
+phys_addr_t arm_dma_zone_size __read_mostly;
 EXPORT_SYMBOL(arm_dma_zone_size);
 
 /*
@@ -231,7 +232,7 @@ static void __init arm_adjust_dma_zone(unsigned long *size, unsigned long *hole,
 }
 #endif
 
-void __init setup_dma_zone(struct machine_desc *mdesc)
+void __init setup_dma_zone(const struct machine_desc *mdesc)
 {
 #ifdef CONFIG_ZONE_DMA
         if (mdesc->dma_zone_size) {
@@ -335,7 +336,8 @@ phys_addr_t __init arm_memblock_steal(phys_addr_t size, phys_addr_t align)
         return phys;
 }
 
-void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc)
+void __init arm_memblock_init(struct meminfo *mi,
+        const struct machine_desc *mdesc)
 {
         int i;
 
@@ -377,6 +379,8 @@ void __init arm_memblock_init(struct meminfo *mi, struct machine_desc *mdesc)
         if (mdesc->reserve)
                 mdesc->reserve();
 
+        early_init_dt_scan_reserved_mem();
+
         /*
          * reserve memory for DMA contigouos allocations,
          * must come from DMA area inside low memory
diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 53cdbd39ec8e..b1d17eeb59b8 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -1186,7 +1186,7 @@ void __init arm_mm_memblock_reserve(void)
  * called function.  This means you can't use any function or debugging
  * method which may touch any device, otherwise the kernel _will_ crash.
  */
-static void __init devicemaps_init(struct machine_desc *mdesc)
+static void __init devicemaps_init(const struct machine_desc *mdesc)
 {
         struct map_desc map;
         unsigned long addr;
@@ -1319,7 +1319,7 @@ static void __init map_lowmem(void)
  * paging_init() sets up the page tables, initialises the zone memory
  * maps, and sets up the zero page, bad page and bad page tables.
  */
-void __init paging_init(struct machine_desc *mdesc)
+void __init paging_init(const struct machine_desc *mdesc)
 {
         void *zero_page;
 
diff --git a/arch/arm/mm/nommu.c b/arch/arm/mm/nommu.c
index 1fa50100ab6a..34d4ab217bab 100644
--- a/arch/arm/mm/nommu.c
+++ b/arch/arm/mm/nommu.c
@@ -299,7 +299,7 @@ void __init sanity_check_meminfo(void)
  * paging_init() sets up the page tables, initialises the zone memory
  * maps, and sets up the zero page, bad page and bad page tables.
  */
-void __init paging_init(struct machine_desc *mdesc)
+void __init paging_init(const struct machine_desc *mdesc)
 {
         early_trap_init((void *)CONFIG_VECTORS_BASE);
         mpu_setup();
diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S
index d5146b98c8d1..db79b62c92fb 100644
--- a/arch/arm/mm/proc-feroceon.S
+++ b/arch/arm/mm/proc-feroceon.S
@@ -514,6 +514,32 @@ ENTRY(cpu_feroceon_set_pte_ext)
 #endif
         mov     pc, lr
 
+/* Suspend/resume support: taken from arch/arm/mm/proc-arm926.S */
+.globl  cpu_feroceon_suspend_size
+.equ    cpu_feroceon_suspend_size, 4 * 3
+#ifdef CONFIG_ARM_CPU_SUSPEND
+ENTRY(cpu_feroceon_do_suspend)
+        stmfd   sp!, {r4 - r6, lr}
+        mrc     p15, 0, r4, c13, c0, 0  @ PID
+        mrc     p15, 0, r5, c3, c0, 0   @ Domain ID
+        mrc     p15, 0, r6, c1, c0, 0   @ Control register
+        stmia   r0, {r4 - r6}
+        ldmfd   sp!, {r4 - r6, pc}
+ENDPROC(cpu_feroceon_do_suspend)
+
+ENTRY(cpu_feroceon_do_resume)
+        mov     ip, #0
+        mcr     p15, 0, ip, c8, c7, 0   @ invalidate I+D TLBs
+        mcr     p15, 0, ip, c7, c7, 0   @ invalidate I+D caches
+        ldmia   r0, {r4 - r6}
+        mcr     p15, 0, r4, c13, c0, 0  @ PID
+        mcr     p15, 0, r5, c3, c0, 0   @ Domain ID
+        mcr     p15, 0, r1, c2, c0, 0   @ TTB address
+        mov     r0, r6                  @ control register
+        b       cpu_resume_mmu
+ENDPROC(cpu_feroceon_do_resume)
+#endif
+
         .type   __feroceon_setup, #function
 __feroceon_setup:
         mov     r0, #0
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index 73398bcf9bd8..c63d9bdee51e 100644
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -83,7 +83,7 @@ ENTRY(cpu_v7_dcache_clean_area)
         add     r0, r0, r2
         subs    r1, r1, r2
         bhi     2b
-        dsb
+        dsb     ishst
         mov     pc, lr
 ENDPROC(cpu_v7_dcache_clean_area)
 
@@ -330,7 +330,19 @@ __v7_setup:
 1:
 #endif
 
-3:      mov     r10, #0
+        /* Cortex-A15 Errata */
+3:      ldr     r10, =0x00000c0f                @ Cortex-A15 primary part number
+        teq     r0, r10
+        bne     4f
+
+#ifdef CONFIG_ARM_ERRATA_773022
+        cmp     r6, #0x4                        @ only present up to r0p4
+        mrcle   p15, 0, r10, c1, c0, 1          @ read aux control register
+        orrle   r10, r10, #1 << 1               @ disable loop buffer
+        mcrle   p15, 0, r10, c1, c0, 1          @ write aux control register
+#endif
+
+4:      mov     r10, #0
         mcr     p15, 0, r10, c7, c5, 0          @ I+BTB cache invalidate
         dsb
 #ifdef CONFIG_MMU
diff --git a/arch/arm/mm/tlb-v7.S b/arch/arm/mm/tlb-v7.S
index ea94765acf9a..355308767bae 100644
--- a/arch/arm/mm/tlb-v7.S
+++ b/arch/arm/mm/tlb-v7.S
@@ -35,7 +35,7 @@
 ENTRY(v7wbi_flush_user_tlb_range)
         vma_vm_mm r3, r2                        @ get vma->vm_mm
         mmid    r3, r3                          @ get vm_mm->context.id
-        dsb
+        dsb     ish
         mov     r0, r0, lsr #PAGE_SHIFT         @ align address
         mov     r1, r1, lsr #PAGE_SHIFT
         asid    r3, r3                          @ mask ASID
@@ -56,7 +56,7 @@ ENTRY(v7wbi_flush_user_tlb_range)
         add     r0, r0, #PAGE_SZ
         cmp     r0, r1
         blo     1b
-        dsb
+        dsb     ish
         mov     pc, lr
 ENDPROC(v7wbi_flush_user_tlb_range)
 
@@ -69,7 +69,7 @@ ENDPROC(v7wbi_flush_user_tlb_range)
  *      - end   - end address (exclusive, may not be aligned)
  */
 ENTRY(v7wbi_flush_kern_tlb_range)
-        dsb
+        dsb     ish
         mov     r0, r0, lsr #PAGE_SHIFT         @ align address
         mov     r1, r1, lsr #PAGE_SHIFT
         mov     r0, r0, lsl #PAGE_SHIFT
@@ -84,7 +84,7 @@ ENTRY(v7wbi_flush_kern_tlb_range)
         add     r0, r0, #PAGE_SZ
         cmp     r0, r1
         blo     1b
-        dsb
+        dsb     ish
         isb
         mov     pc, lr
 ENDPROC(v7wbi_flush_kern_tlb_range)
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index f82bae2171eb..436ea97074cd 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -106,7 +106,7 @@ config OMAP_32K_TIMER
           This timer saves power compared to the OMAP_MPU_TIMER, and has
           support for no tick during idle. The 32KHz timer provides less
           intra-tick resolution than OMAP_MPU_TIMER. The 32KHz timer is
-          currently only available for OMAP16XX, 24XX, 34XX and OMAP4/5.
+          currently only available for OMAP16XX, 24XX, 34XX, OMAP4/5 and DRA7XX.
 
           On OMAP2PLUS this value is only used for CONFIG_HZ and
           CLOCK_TICK_RATE compile time calculation.
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index 4d463ca6821f..037660633fa4 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -2083,6 +2083,7 @@ static int omap_system_dma_probe(struct platform_device *pdev)
                 dma_irq = platform_get_irq_byname(pdev, irq_name);
                 if (dma_irq < 0) {
                         dev_err(&pdev->dev, "failed: request IRQ %d", dma_irq);
+                        ret = dma_irq;
                         goto exit_dma_lch_fail;
                 }
                 ret = setup_irq(dma_irq, &omap24xx_dma_irq);
diff --git a/arch/arm/plat-orion/irq.c b/arch/arm/plat-orion/irq.c
index 8db0b981ca64..c492e1b3dfdb 100644
--- a/arch/arm/plat-orion/irq.c
+++ b/arch/arm/plat-orion/irq.c
@@ -47,7 +47,7 @@ static int __init orion_add_irq_domain(struct device_node *np,
         do {
                 base = of_iomap(np, i);
                 if (base) {
-                        orion_irq_init(i * 32, base);
+                        orion_irq_init(i * 32, base + 0x04);
                         i++;
                 }
         } while (base);
diff --git a/arch/arm/plat-pxa/ssp.c b/arch/arm/plat-pxa/ssp.c
index 8e11e96eab5e..3ea02903d75a 100644
--- a/arch/arm/plat-pxa/ssp.c
+++ b/arch/arm/plat-pxa/ssp.c
@@ -30,6 +30,8 @@
 #include <linux/platform_device.h>
 #include <linux/spi/pxa2xx_spi.h>
 #include <linux/io.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
 
 #include <asm/irq.h>
 #include <mach/hardware.h>
@@ -60,6 +62,30 @@ struct ssp_device *pxa_ssp_request(int port, const char *label)
 }
 EXPORT_SYMBOL(pxa_ssp_request);
 
+struct ssp_device *pxa_ssp_request_of(const struct device_node *of_node,
+                                      const char *label)
+{
+        struct ssp_device *ssp = NULL;
+
+        mutex_lock(&ssp_lock);
+
+        list_for_each_entry(ssp, &ssp_list, node) {
+                if (ssp->of_node == of_node && ssp->use_count == 0) {
+                        ssp->use_count++;
+                        ssp->label = label;
+                        break;
+                }
+        }
+
+        mutex_unlock(&ssp_lock);
+
+        if (&ssp->node == &ssp_list)
+                return NULL;
+
+        return ssp;
+}
+EXPORT_SYMBOL(pxa_ssp_request_of);
+
 void pxa_ssp_free(struct ssp_device *ssp)
 {
         mutex_lock(&ssp_lock);
@@ -72,96 +98,136 @@ void pxa_ssp_free(struct ssp_device *ssp)
 }
 EXPORT_SYMBOL(pxa_ssp_free);
 
+#ifdef CONFIG_OF
+static const struct of_device_id pxa_ssp_of_ids[] = {
+        { .compatible = "mrvl,pxa25x-ssp",      .data = (void *) PXA25x_SSP },
+        { .compatible = "mvrl,pxa25x-nssp",     .data = (void *) PXA25x_NSSP },
+        { .compatible = "mrvl,pxa27x-ssp",      .data = (void *) PXA27x_SSP },
+        { .compatible = "mrvl,pxa3xx-ssp",      .data = (void *) PXA3xx_SSP },
+        { .compatible = "mvrl,pxa168-ssp",      .data = (void *) PXA168_SSP },
+        { .compatible = "mrvl,pxa910-ssp",      .data = (void *) PXA910_SSP },
+        { .compatible = "mrvl,ce4100-ssp",      .data = (void *) CE4100_SSP },
+        { .compatible = "mrvl,lpss-ssp",        .data = (void *) LPSS_SSP },
+        { },
+};
+MODULE_DEVICE_TABLE(of, pxa_ssp_of_ids);
+#endif
+
 static int pxa_ssp_probe(struct platform_device *pdev)
 {
-        const struct platform_device_id *id = platform_get_device_id(pdev);
         struct resource *res;
         struct ssp_device *ssp;
-        int ret = 0;
+        struct device *dev = &pdev->dev;
 
-        ssp = kzalloc(sizeof(struct ssp_device), GFP_KERNEL);
-        if (ssp == NULL) {
-                dev_err(&pdev->dev, "failed to allocate memory");
+        ssp = devm_kzalloc(dev, sizeof(struct ssp_device), GFP_KERNEL);
+        if (ssp == NULL)
                 return -ENOMEM;
-        }
+
         ssp->pdev = pdev;
 
-        ssp->clk = clk_get(&pdev->dev, NULL);
-        if (IS_ERR(ssp->clk)) {
-                ret = PTR_ERR(ssp->clk);
-                goto err_free;
-        }
+        ssp->clk = devm_clk_get(dev, NULL);
+        if (IS_ERR(ssp->clk))
+                return PTR_ERR(ssp->clk);
 
-        res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
-        if (res == NULL) {
-                dev_err(&pdev->dev, "no SSP RX DRCMR defined\n");
-                ret = -ENODEV;
-                goto err_free_clk;
-        }
-        ssp->drcmr_rx = res->start;
+        if (dev->of_node) {
+                struct of_phandle_args dma_spec;
+                struct device_node *np = dev->of_node;
+                int ret;
 
-        res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
-        if (res == NULL) {
-                dev_err(&pdev->dev, "no SSP TX DRCMR defined\n");
-                ret = -ENODEV;
-                goto err_free_clk;
+                /*
+                 * FIXME: we should allocate the DMA channel from this
+                 * context and pass the channel down to the ssp users.
+                 * For now, we lookup the rx and tx indices manually
+                 */
+
+                /* rx */
+                ret = of_parse_phandle_with_args(np, "dmas", "#dma-cells",
+                                                 0, &dma_spec);
+
+                if (ret) {
+                        dev_err(dev, "Can't parse dmas property\n");
+                        return -ENODEV;
+                }
+                ssp->drcmr_rx = dma_spec.args[0];
+                of_node_put(dma_spec.np);
+
+                /* tx */
+                ret = of_parse_phandle_with_args(np, "dmas", "#dma-cells",
+                                                 1, &dma_spec);
+                if (ret) {
+                        dev_err(dev, "Can't parse dmas property\n");
+                        return -ENODEV;
+                }
+                ssp->drcmr_tx = dma_spec.args[0];
+                of_node_put(dma_spec.np);
+        } else {
+                res = platform_get_resource(pdev, IORESOURCE_DMA, 0);
+                if (res == NULL) {
+                        dev_err(dev, "no SSP RX DRCMR defined\n");
+                        return -ENODEV;
+                }
+                ssp->drcmr_rx = res->start;
+
+                res = platform_get_resource(pdev, IORESOURCE_DMA, 1);
+                if (res == NULL) {
+                        dev_err(dev, "no SSP TX DRCMR defined\n");
+                        return -ENODEV;
+                }
+                ssp->drcmr_tx = res->start;
         }
-        ssp->drcmr_tx = res->start;
 
         res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
         if (res == NULL) {
-                dev_err(&pdev->dev, "no memory resource defined\n");
-                ret = -ENODEV;
-                goto err_free_clk;
+                dev_err(dev, "no memory resource defined\n");
+                return -ENODEV;
         }
 
-        res = request_mem_region(res->start, resource_size(res),
-                        pdev->name);
+        res = devm_request_mem_region(dev, res->start, resource_size(res),
+                                      pdev->name);
         if (res == NULL) {
-                dev_err(&pdev->dev, "failed to request memory resource\n");
-                ret = -EBUSY;
-                goto err_free_clk;
+                dev_err(dev, "failed to request memory resource\n");
+                return -EBUSY;
         }
 
         ssp->phys_base = res->start;
 
-        ssp->mmio_base = ioremap(res->start, resource_size(res));
+        ssp->mmio_base = devm_ioremap(dev, res->start, resource_size(res));
         if (ssp->mmio_base == NULL) {
-                dev_err(&pdev->dev, "failed to ioremap() registers\n");
-                ret = -ENODEV;
-                goto err_free_mem;
+                dev_err(dev, "failed to ioremap() registers\n");
+                return -ENODEV;
         }
 
         ssp->irq = platform_get_irq(pdev, 0);
         if (ssp->irq < 0) {
-                dev_err(&pdev->dev, "no IRQ resource defined\n");
-                ret = -ENODEV;
-                goto err_free_io;
+                dev_err(dev, "no IRQ resource defined\n");
+                return -ENODEV;
+        }
+
+        if (dev->of_node) {
+                const struct of_device_id *id =
+                        of_match_device(of_match_ptr(pxa_ssp_of_ids), dev);
+                ssp->type = (int) id->data;
+        } else {
+                const struct platform_device_id *id =
+                        platform_get_device_id(pdev);
+                ssp->type = (int) id->driver_data;
+
+                /* PXA2xx/3xx SSP ports starts from 1 and the internal pdev->id
+                 * starts from 0, do a translation here
+                 */
+                ssp->port_id = pdev->id + 1;
         }
 
-        /* PXA2xx/3xx SSP ports starts from 1 and the internal pdev->id
-         * starts from 0, do a translation here
-         */
-        ssp->port_id = pdev->id + 1;
         ssp->use_count = 0;
-        ssp->type = (int)id->driver_data;
+        ssp->of_node = dev->of_node;
 
         mutex_lock(&ssp_lock);
         list_add(&ssp->node, &ssp_list);
         mutex_unlock(&ssp_lock);
 
         platform_set_drvdata(pdev, ssp);
-        return 0;
 
-err_free_io:
-        iounmap(ssp->mmio_base);
-err_free_mem:
-        release_mem_region(res->start, resource_size(res));
-err_free_clk:
-        clk_put(ssp->clk);
-err_free:
-        kfree(ssp);
-        return ret;
+        return 0;
 }
 
 static int pxa_ssp_remove(struct platform_device *pdev)
@@ -201,8 +267,9 @@ static struct platform_driver pxa_ssp_driver = {
         .probe          = pxa_ssp_probe,
         .remove         = pxa_ssp_remove,
         .driver         = {
-                .owner  = THIS_MODULE,
-                .name   = "pxa2xx-ssp",
+                .owner          = THIS_MODULE,
+                .name           = "pxa2xx-ssp",
+                .of_match_table = of_match_ptr(pxa_ssp_of_ids),
         },
         .id_table       = ssp_id_table,
 };
diff --git a/arch/arm/plat-samsung/Kconfig b/arch/arm/plat-samsung/Kconfig
index a5b5ff6e68d2..7dfba937d8fc 100644
--- a/arch/arm/plat-samsung/Kconfig
+++ b/arch/arm/plat-samsung/Kconfig
@@ -25,7 +25,6 @@ config PLAT_S5P
         select S5P_GPIO_DRVSTR
         select SAMSUNG_CLKSRC if !COMMON_CLK
         select SAMSUNG_GPIOLIB_4BIT
-        select SAMSUNG_IRQ_VIC_TIMER
         help
           Base platform code for Samsung's S5P series SoC.
 
@@ -79,14 +78,6 @@ config SAMSUNG_ATAGS
 
 if SAMSUNG_ATAGS
 
-# timer options
-
-config SAMSUNG_HRT
-        bool
-        select SAMSUNG_DEV_PWM
-        help
-          Use the High Resolution timer support
-
 # clock options
 
 config SAMSUNG_CLOCK
@@ -106,11 +97,6 @@ config S5P_CLOCK
 
 # options for IRQ support
 
-config SAMSUNG_IRQ_VIC_TIMER
-       bool
-       help
-         Internal configuration to build the VIC timer interrupt code.
-
 config S5P_IRQ
         def_bool (ARCH_S5P64X0 || ARCH_S5PC100 || ARCH_S5PV210)
         help
diff --git a/arch/arm/plat-samsung/Makefile b/arch/arm/plat-samsung/Makefile
index 199bbe304d02..498c7c23e9f4 100644
--- a/arch/arm/plat-samsung/Makefile
+++ b/arch/arm/plat-samsung/Makefile
@@ -12,15 +12,12 @@ obj-				:=
 # Objects we always build independent of SoC choice
 
 obj-y                           += init.o cpu.o
-obj-$(CONFIG_SAMSUNG_HRT)       += samsung-time.o
 
 obj-$(CONFIG_SAMSUNG_CLOCK)     += clock.o
-obj-$(CONFIG_SAMSUNG_CLOCK)     += pwm-clock.o
 
 obj-$(CONFIG_SAMSUNG_CLKSRC)    += clock-clksrc.o
 obj-$(CONFIG_S5P_CLOCK)         += s5p-clock.o
 
-obj-$(CONFIG_SAMSUNG_IRQ_VIC_TIMER) += irq-vic-timer.o
 obj-$(CONFIG_S5P_IRQ)           += s5p-irq.o
 obj-$(CONFIG_S5P_EXT_INT)       += s5p-irq-eint.o
 obj-$(CONFIG_S5P_GPIO_INT)      += s5p-irq-gpioint.o
diff --git a/arch/arm/plat-samsung/dev-backlight.c b/arch/arm/plat-samsung/dev-backlight.c
index 5f197dcaf10c..d51f9565567c 100644
--- a/arch/arm/plat-samsung/dev-backlight.c
+++ b/arch/arm/plat-samsung/dev-backlight.c
@@ -20,13 +20,18 @@
 #include <plat/gpio-cfg.h>
 #include <plat/backlight.h>
 
+struct samsung_bl_drvdata {
+        struct platform_pwm_backlight_data plat_data;
+        struct samsung_bl_gpio_info *gpio_info;
+};
+
 static int samsung_bl_init(struct device *dev)
 {
         int ret = 0;
-        struct platform_device *timer_dev =
-                        container_of(dev->parent, struct platform_device, dev);
-        struct samsung_bl_gpio_info *bl_gpio_info =
-                        timer_dev->dev.platform_data;
+        struct platform_pwm_backlight_data *pdata = dev->platform_data;
+        struct samsung_bl_drvdata *drvdata = container_of(pdata,
+                                        struct samsung_bl_drvdata, plat_data);
+        struct samsung_bl_gpio_info *bl_gpio_info = drvdata->gpio_info;
 
         ret = gpio_request(bl_gpio_info->no, "Backlight");
         if (ret) {
@@ -42,10 +47,10 @@ static int samsung_bl_init(struct device *dev)
 
 static void samsung_bl_exit(struct device *dev)
 {
-        struct platform_device *timer_dev =
-                        container_of(dev->parent, struct platform_device, dev);
-        struct samsung_bl_gpio_info *bl_gpio_info =
-                        timer_dev->dev.platform_data;
+        struct platform_pwm_backlight_data *pdata = dev->platform_data;
+        struct samsung_bl_drvdata *drvdata = container_of(pdata,
+                                        struct samsung_bl_drvdata, plat_data);
+        struct samsung_bl_gpio_info *bl_gpio_info = drvdata->gpio_info;
 
         s3c_gpio_cfgpin(bl_gpio_info->no, S3C_GPIO_OUTPUT);
         gpio_free(bl_gpio_info->no);
@@ -60,12 +65,14 @@ static void samsung_bl_exit(struct device *dev)
  * for their specific boards
  */
 
-static struct platform_pwm_backlight_data samsung_dfl_bl_data __initdata = {
-        .max_brightness = 255,
-        .dft_brightness = 255,
-        .pwm_period_ns  = 78770,
-        .init           = samsung_bl_init,
-        .exit           = samsung_bl_exit,
+static struct samsung_bl_drvdata samsung_dfl_bl_data __initdata = {
+        .plat_data = {
+                .max_brightness = 255,
+                .dft_brightness = 255,
+                .pwm_period_ns  = 78770,
+                .init           = samsung_bl_init,
+                .exit           = samsung_bl_exit,
+        },
 };
 
 static struct platform_device samsung_dfl_bl_device __initdata = {
@@ -82,6 +89,7 @@ void __init samsung_bl_set(struct samsung_bl_gpio_info *gpio_info,
 {
         int ret = 0;
         struct platform_device *samsung_bl_device;
+        struct samsung_bl_drvdata *samsung_bl_drvdata;
         struct platform_pwm_backlight_data *samsung_bl_data;
 
         samsung_bl_device = kmemdup(&samsung_dfl_bl_device,
@@ -91,17 +99,19 @@ void __init samsung_bl_set(struct samsung_bl_gpio_info *gpio_info,
                 return;
         }
 
-        samsung_bl_data = s3c_set_platdata(&samsung_dfl_bl_data,
-                sizeof(struct platform_pwm_backlight_data), samsung_bl_device);
-        if (!samsung_bl_data) {
+        samsung_bl_drvdata = kmemdup(&samsung_dfl_bl_data,
+                                sizeof(samsung_dfl_bl_data), GFP_KERNEL);
+        if (!samsung_bl_drvdata) {
                 printk(KERN_ERR "%s: no memory for platform dev\n", __func__);
                 goto err_data;
         }
+        samsung_bl_device->dev.platform_data = &samsung_bl_drvdata->plat_data;
+        samsung_bl_drvdata->gpio_info = gpio_info;
+        samsung_bl_data = &samsung_bl_drvdata->plat_data;
 
         /* Copy board specific data provided by user */
         samsung_bl_data->pwm_id = bl_data->pwm_id;
-        samsung_bl_device->dev.parent =
-                        &s3c_device_timer[samsung_bl_data->pwm_id].dev;
+        samsung_bl_device->dev.parent = &samsung_device_pwm.dev;
 
         if (bl_data->max_brightness)
                 samsung_bl_data->max_brightness = bl_data->max_brightness;
@@ -122,17 +132,6 @@ void __init samsung_bl_set(struct samsung_bl_gpio_info *gpio_info,
         if (bl_data->check_fb)
                 samsung_bl_data->check_fb = bl_data->check_fb;
 
-        /* Keep the GPIO info for future use */
-        s3c_device_timer[samsung_bl_data->pwm_id].dev.platform_data = gpio_info;
-
-        /* Register the specific PWM timer dev for Backlight control */
-        ret = platform_device_register(
-                        &s3c_device_timer[samsung_bl_data->pwm_id]);
-        if (ret) {
-                printk(KERN_ERR "failed to register pwm timer for backlight: %d\n", ret);
-                goto err_plat_reg1;
-        }
-
         /* Register the Backlight dev */
         ret = platform_device_register(samsung_bl_device);
         if (ret) {
@@ -143,8 +142,6 @@ void __init samsung_bl_set(struct samsung_bl_gpio_info *gpio_info,
         return;
 
 err_plat_reg2:
-        platform_device_unregister(&s3c_device_timer[samsung_bl_data->pwm_id]);
-err_plat_reg1:
         kfree(samsung_bl_data);
 err_data:
         kfree(samsung_bl_device);
diff --git a/arch/arm/plat-samsung/devs.c b/arch/arm/plat-samsung/devs.c
index 0f9c3f431a5f..8ce0ac007eb9 100644
--- a/arch/arm/plat-samsung/devs.c
+++ b/arch/arm/plat-samsung/devs.c
@@ -58,6 +58,7 @@
 #include <plat/keypad.h>
 #include <linux/platform_data/mmc-s3cmci.h>
 #include <linux/platform_data/mtd-nand-s3c2410.h>
+#include <plat/pwm-core.h>
 #include <plat/sdhci.h>
 #include <linux/platform_data/touchscreen-s3c2410.h>
 #include <linux/platform_data/usb-s3c2410_udc.h>
@@ -1097,36 +1098,21 @@ arch_initcall(s5p_pmu_init);
 /* PWM Timer */
 
 #ifdef CONFIG_SAMSUNG_DEV_PWM
+static struct resource samsung_pwm_resource[] = {
+        DEFINE_RES_MEM(SAMSUNG_PA_TIMER, SZ_4K),
+};
 
-#define TIMER_RESOURCE_SIZE (1)
-
-#define TIMER_RESOURCE(_tmr, _irq)                      \
-        (struct resource [TIMER_RESOURCE_SIZE]) {       \
-                [0] = {                                 \
-                        .start  = _irq,                 \
-                        .end    = _irq,                 \
-                        .flags  = IORESOURCE_IRQ        \
-                }                                       \
-        }
-
-#define DEFINE_S3C_TIMER(_tmr_no, _irq)                 \
-        .name           = "s3c24xx-pwm",                \
-        .id             = _tmr_no,                      \
-        .num_resources  = TIMER_RESOURCE_SIZE,          \
-        .resource       = TIMER_RESOURCE(_tmr_no, _irq),        \
-
-/*
- * since we already have an static mapping for the timer,
- * we do not bother setting any IO resource for the base.
- */
-
-struct platform_device s3c_device_timer[] = {
-        [0] = { DEFINE_S3C_TIMER(0, IRQ_TIMER0) },
-        [1] = { DEFINE_S3C_TIMER(1, IRQ_TIMER1) },
-        [2] = { DEFINE_S3C_TIMER(2, IRQ_TIMER2) },
-        [3] = { DEFINE_S3C_TIMER(3, IRQ_TIMER3) },
-        [4] = { DEFINE_S3C_TIMER(4, IRQ_TIMER4) },
+struct platform_device samsung_device_pwm = {
+        .name           = "samsung-pwm",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(samsung_pwm_resource),
+        .resource       = samsung_pwm_resource,
 };
+
+void __init samsung_pwm_set_platdata(struct samsung_pwm_variant *pd)
+{
+        samsung_device_pwm.dev.platform_data = pd;
+}
 #endif /* CONFIG_SAMSUNG_DEV_PWM */
 
 /* RTC */
diff --git a/arch/arm/plat-samsung/include/plat/clock.h b/arch/arm/plat-samsung/include/plat/clock.h
index df45d6edc98d..63239f409807 100644
--- a/arch/arm/plat-samsung/include/plat/clock.h
+++ b/arch/arm/plat-samsung/include/plat/clock.h
@@ -145,10 +145,6 @@ extern int s3c2443_clkcon_enable_s(struct clk *clk, int enable);
 
 extern int s3c64xx_sclk_ctrl(struct clk *clk, int enable);
 
-/* Init for pwm clock code */
-
-extern void s3c_pwmclk_init(void);
-
 /* Global watchdog clock used by arch_wtd_reset() callback */
 
 extern struct clk *s3c2410_wdtclk;
diff --git a/arch/arm/plat-samsung/include/plat/devs.h b/arch/arm/plat-samsung/include/plat/devs.h
index 87d501ff3328..0dc4ac4909b0 100644
--- a/arch/arm/plat-samsung/include/plat/devs.h
+++ b/arch/arm/plat-samsung/include/plat/devs.h
@@ -134,6 +134,7 @@ extern struct platform_device exynos4_device_spdif;
 
 extern struct platform_device samsung_asoc_idma;
 extern struct platform_device samsung_device_keypad;
+extern struct platform_device samsung_device_pwm;
 
 /* s3c2440 specific devices */
 
diff --git a/arch/arm/plat-samsung/include/plat/irq-vic-timer.h b/arch/arm/plat-samsung/include/plat/irq-vic-timer.h
deleted file mode 100644
index 5b9c42fd32d7..000000000000
--- a/arch/arm/plat-samsung/include/plat/irq-vic-timer.h
+++ /dev/null
@@ -1,13 +0,0 @@
-/* arch/arm/plat-samsung/include/plat/irq-vic-timer.h
- *
- * Copyright (c) 2010 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *
- * Header file for Samsung SoC IRQ VIC timer
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-extern void s3c_init_vic_timer_irq(unsigned int num, unsigned int timer_irq);
diff --git a/arch/arm/plat-samsung/include/plat/irqs.h b/arch/arm/plat-samsung/include/plat/irqs.h
index df46b776976a..039001c0ef05 100644
--- a/arch/arm/plat-samsung/include/plat/irqs.h
+++ b/arch/arm/plat-samsung/include/plat/irqs.h
@@ -44,15 +44,6 @@
 #define S5P_IRQ_VIC2(x)         (S5P_VIC2_BASE + (x))
 #define S5P_IRQ_VIC3(x)         (S5P_VIC3_BASE + (x))
 
-#define S5P_TIMER_IRQ(x)        (IRQ_TIMER_BASE + (x))
-
-#define IRQ_TIMER0              S5P_TIMER_IRQ(0)
-#define IRQ_TIMER1              S5P_TIMER_IRQ(1)
-#define IRQ_TIMER2              S5P_TIMER_IRQ(2)
-#define IRQ_TIMER3              S5P_TIMER_IRQ(3)
-#define IRQ_TIMER4              S5P_TIMER_IRQ(4)
-#define IRQ_TIMER_COUNT         (5)
-
 #define IRQ_EINT(x)             ((x) < 16 ? ((x) + S5P_EINT_BASE1) \
                                         : ((x) - 16 + S5P_EINT_BASE2))
 
diff --git a/arch/arm/plat-samsung/include/plat/pwm-clock.h b/arch/arm/plat-samsung/include/plat/pwm-clock.h
deleted file mode 100644
index bf6a60eb6237..000000000000
--- a/arch/arm/plat-samsung/include/plat/pwm-clock.h
+++ /dev/null
@@ -1,81 +0,0 @@
-/* linux/arch/arm/plat-samsung/include/plat/pwm-clock.h
- *
- * Copyright (c) 2010-2011 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * SAMSUNG - pwm clock and timer support
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#ifndef __ASM_PLAT_PWM_CLOCK_H
-#define __ASM_PLAT_PWM_CLOCK_H __FILE__
-
-/**
- * pwm_cfg_src_is_tclk() - return whether the given mux config is a tclk
- * @tcfg: The timer TCFG1 register bits shifted down to 0.
- *
- * Return true if the given configuration from TCFG1 is a TCLK instead
- * any of the TDIV clocks.
- */
-static inline int pwm_cfg_src_is_tclk(unsigned long tcfg)
-{
-        if (soc_is_s3c24xx())
-                return tcfg == S3C2410_TCFG1_MUX_TCLK;
-        else if (soc_is_s3c64xx() || soc_is_s5pc100())
-                return tcfg >= S3C64XX_TCFG1_MUX_TCLK;
-        else if (soc_is_s5p6440() || soc_is_s5p6450())
-                return 0;
-        else
-                return tcfg == S3C64XX_TCFG1_MUX_TCLK;
-}
-
-/**
- * tcfg_to_divisor() - convert tcfg1 setting to a divisor
- * @tcfg1: The tcfg1 setting, shifted down.
- *
- * Get the divisor value for the given tcfg1 setting. We assume the
- * caller has already checked to see if this is not a TCLK source.
- */
-static inline unsigned long tcfg_to_divisor(unsigned long tcfg1)
-{
-        if (soc_is_s3c24xx())
-                return 1 << (tcfg1 + 1);
-        else
-                return 1 << tcfg1;
-}
-
-/**
- * pwm_tdiv_has_div1() - does the tdiv setting have a /1
- *
- * Return true if we have a /1 in the tdiv setting.
- */
-static inline unsigned int pwm_tdiv_has_div1(void)
-{
-        if (soc_is_s3c24xx())
-                return 0;
-        else
-                return 1;
-}
-
-/**
- * pwm_tdiv_div_bits() - calculate TCFG1 divisor value.
- * @div: The divisor to calculate the bit information for.
- *
- * Turn a divisor into the necessary bit field for TCFG1.
- */
-static inline unsigned long pwm_tdiv_div_bits(unsigned int div)
-{
-        if (soc_is_s3c24xx())
-                return ilog2(div) - 1;
-        else
-                return ilog2(div);
-}
-#endif /* __ASM_PLAT_PWM_CLOCK_H */
diff --git a/arch/arm/plat-samsung/include/plat/pwm-core.h b/arch/arm/plat-samsung/include/plat/pwm-core.h
new file mode 100644
index 000000000000..5bff1facb672
--- /dev/null
+++ b/arch/arm/plat-samsung/include/plat/pwm-core.h
@@ -0,0 +1,22 @@
+/*
+ * Copyright 2013 Tomasz Figa <tomasz.figa@gmail.com>
+ *
+ * Samsung PWM controller platform data helpers.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __ASM_ARCH_PWM_CORE_H
+#define __ASM_ARCH_PWM_CORE_H __FILE__
+
+#include <clocksource/samsung_pwm.h>
+
+#ifdef CONFIG_SAMSUNG_DEV_PWM
+extern void samsung_pwm_set_platdata(struct samsung_pwm_variant *pd);
+#else
+static inline void samsung_pwm_set_platdata(struct samsung_pwm_variant *pd) { }
+#endif
+
+#endif /* __ASM_ARCH_PWM_CORE_H */
diff --git a/arch/arm/plat-samsung/include/plat/regs-timer.h b/arch/arm/plat-samsung/include/plat/regs-timer.h
deleted file mode 100644
index d097d92f8cc7..000000000000
--- a/arch/arm/plat-samsung/include/plat/regs-timer.h
+++ /dev/null
@@ -1,124 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/regs-timer.h
- *
- * Copyright (c) 2003 Simtec Electronics <linux@simtec.co.uk>
- *                    http://www.simtec.co.uk/products/SWLINUX/
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * S3C2410 Timer configuration
-*/
-
-#ifndef __ASM_ARCH_REGS_TIMER_H
-#define __ASM_ARCH_REGS_TIMER_H
-
-#define S3C_TIMERREG(x) (S3C_VA_TIMER + (x))
-#define S3C_TIMERREG2(tmr,reg) S3C_TIMERREG((reg)+0x0c+((tmr)*0x0c))
-
-#define S3C2410_TCFG0         S3C_TIMERREG(0x00)
-#define S3C2410_TCFG1         S3C_TIMERREG(0x04)
-#define S3C2410_TCON          S3C_TIMERREG(0x08)
-
-#define S3C64XX_TINT_CSTAT    S3C_TIMERREG(0x44)
-
-#define S3C2410_TCFG_PRESCALER0_MASK (255<<0)
-#define S3C2410_TCFG_PRESCALER1_MASK (255<<8)
-#define S3C2410_TCFG_PRESCALER1_SHIFT (8)
-#define S3C2410_TCFG_DEADZONE_MASK   (255<<16)
-#define S3C2410_TCFG_DEADZONE_SHIFT  (16)
-
-#define S3C2410_TCFG1_MUX4_DIV2   (0<<16)
-#define S3C2410_TCFG1_MUX4_DIV4   (1<<16)
-#define S3C2410_TCFG1_MUX4_DIV8   (2<<16)
-#define S3C2410_TCFG1_MUX4_DIV16  (3<<16)
-#define S3C2410_TCFG1_MUX4_TCLK1  (4<<16)
-#define S3C2410_TCFG1_MUX4_MASK   (15<<16)
-#define S3C2410_TCFG1_MUX4_SHIFT  (16)
-
-#define S3C2410_TCFG1_MUX3_DIV2   (0<<12)
-#define S3C2410_TCFG1_MUX3_DIV4   (1<<12)
-#define S3C2410_TCFG1_MUX3_DIV8   (2<<12)
-#define S3C2410_TCFG1_MUX3_DIV16  (3<<12)
-#define S3C2410_TCFG1_MUX3_TCLK1  (4<<12)
-#define S3C2410_TCFG1_MUX3_MASK   (15<<12)
-
-
-#define S3C2410_TCFG1_MUX2_DIV2   (0<<8)
-#define S3C2410_TCFG1_MUX2_DIV4   (1<<8)
-#define S3C2410_TCFG1_MUX2_DIV8   (2<<8)
-#define S3C2410_TCFG1_MUX2_DIV16  (3<<8)
-#define S3C2410_TCFG1_MUX2_TCLK1  (4<<8)
-#define S3C2410_TCFG1_MUX2_MASK   (15<<8)
-
-
-#define S3C2410_TCFG1_MUX1_DIV2   (0<<4)
-#define S3C2410_TCFG1_MUX1_DIV4   (1<<4)
-#define S3C2410_TCFG1_MUX1_DIV8   (2<<4)
-#define S3C2410_TCFG1_MUX1_DIV16  (3<<4)
-#define S3C2410_TCFG1_MUX1_TCLK0  (4<<4)
-#define S3C2410_TCFG1_MUX1_MASK   (15<<4)
-
-#define S3C2410_TCFG1_MUX0_DIV2   (0<<0)
-#define S3C2410_TCFG1_MUX0_DIV4   (1<<0)
-#define S3C2410_TCFG1_MUX0_DIV8   (2<<0)
-#define S3C2410_TCFG1_MUX0_DIV16  (3<<0)
-#define S3C2410_TCFG1_MUX0_TCLK0  (4<<0)
-#define S3C2410_TCFG1_MUX0_MASK   (15<<0)
-
-#define S3C2410_TCFG1_MUX_DIV2    (0<<0)
-#define S3C2410_TCFG1_MUX_DIV4    (1<<0)
-#define S3C2410_TCFG1_MUX_DIV8    (2<<0)
-#define S3C2410_TCFG1_MUX_DIV16   (3<<0)
-#define S3C2410_TCFG1_MUX_TCLK    (4<<0)
-#define S3C2410_TCFG1_MUX_MASK    (15<<0)
-
-#define S3C64XX_TCFG1_MUX_DIV1    (0<<0)
-#define S3C64XX_TCFG1_MUX_DIV2    (1<<0)
-#define S3C64XX_TCFG1_MUX_DIV4    (2<<0)
-#define S3C64XX_TCFG1_MUX_DIV8    (3<<0)
-#define S3C64XX_TCFG1_MUX_DIV16   (4<<0)
-#define S3C64XX_TCFG1_MUX_TCLK    (5<<0)  /* 3 sets of TCLK */
-#define S3C64XX_TCFG1_MUX_MASK    (15<<0)
-
-#define S3C2410_TCFG1_SHIFT(x)    ((x) * 4)
-
-/* for each timer, we have an count buffer, an compare buffer and
- * an observation buffer
-*/
-
-/* WARNING - timer 4 has no buffer reg, and it's observation is at +4 */
-
-#define S3C2410_TCNTB(tmr)    S3C_TIMERREG2(tmr, 0x00)
-#define S3C2410_TCMPB(tmr)    S3C_TIMERREG2(tmr, 0x04)
-#define S3C2410_TCNTO(tmr)    S3C_TIMERREG2(tmr, (((tmr) == 4) ? 0x04 : 0x08))
-
-#define S3C2410_TCON_T4RELOAD     (1<<22)
-#define S3C2410_TCON_T4MANUALUPD  (1<<21)
-#define S3C2410_TCON_T4START      (1<<20)
-
-#define S3C2410_TCON_T3RELOAD     (1<<19)
-#define S3C2410_TCON_T3INVERT     (1<<18)
-#define S3C2410_TCON_T3MANUALUPD  (1<<17)
-#define S3C2410_TCON_T3START      (1<<16)
-
-#define S3C2410_TCON_T2RELOAD     (1<<15)
-#define S3C2410_TCON_T2INVERT     (1<<14)
-#define S3C2410_TCON_T2MANUALUPD  (1<<13)
-#define S3C2410_TCON_T2START      (1<<12)
-
-#define S3C2410_TCON_T1RELOAD     (1<<11)
-#define S3C2410_TCON_T1INVERT     (1<<10)
-#define S3C2410_TCON_T1MANUALUPD  (1<<9)
-#define S3C2410_TCON_T1START      (1<<8)
-
-#define S3C2410_TCON_T0DEADZONE   (1<<4)
-#define S3C2410_TCON_T0RELOAD     (1<<3)
-#define S3C2410_TCON_T0INVERT     (1<<2)
-#define S3C2410_TCON_T0MANUALUPD  (1<<1)
-#define S3C2410_TCON_T0START      (1<<0)
-
-#endif /*  __ASM_ARCH_REGS_TIMER_H */
-
-
-
diff --git a/arch/arm/plat-samsung/include/plat/samsung-time.h b/arch/arm/plat-samsung/include/plat/samsung-time.h
index 4cc99bb1f176..209464adef97 100644
--- a/arch/arm/plat-samsung/include/plat/samsung-time.h
+++ b/arch/arm/plat-samsung/include/plat/samsung-time.h
@@ -22,29 +22,6 @@ enum samsung_timer_mode {
         SAMSUNG_PWM4,
 };
 
-struct samsung_timer_source {
-        unsigned int event_id;
-        unsigned int source_id;
-};
-
-/* Be able to sleep for atleast 4 seconds (usually more) */
-#define SAMSUNG_TIMER_MIN_RANGE 4
-
-#if defined(CONFIG_ARCH_S3C24XX) || defined(CONFIG_ARCH_S5PC100)
-#define TCNT_MAX                0xffff
-#define TSCALER_DIV             25
-#define TDIV                    50
-#define TSIZE                   16
-#else
-#define TCNT_MAX                0xffffffff
-#define TSCALER_DIV             2
-#define TDIV                    2
-#define TSIZE                   32
-#endif
-
-#define NON_PERIODIC            0
-#define PERIODIC                1
-
 extern void __init samsung_set_timer_source(enum samsung_timer_mode event,
                                         enum samsung_timer_mode source);
 
diff --git a/arch/arm/plat-samsung/include/plat/sdhci.h b/arch/arm/plat-samsung/include/plat/sdhci.h
index ce1d0f785efd..bf650218b40e 100644
--- a/arch/arm/plat-samsung/include/plat/sdhci.h
+++ b/arch/arm/plat-samsung/include/plat/sdhci.h
@@ -260,44 +260,6 @@ static inline void s5pv210_default_sdhci3(void) { }
 
 #endif /* CONFIG_S5PV210_SETUP_SDHCI */
 
-/* EXYNOS4 SDHCI setup */
-#ifdef CONFIG_EXYNOS4_SETUP_SDHCI
-static inline void exynos4_default_sdhci0(void)
-{
-#ifdef CONFIG_S3C_DEV_HSMMC
-        s3c_hsmmc0_def_platdata.cfg_gpio = exynos4_setup_sdhci0_cfg_gpio;
-#endif
-}
-
-static inline void exynos4_default_sdhci1(void)
-{
-#ifdef CONFIG_S3C_DEV_HSMMC1
-        s3c_hsmmc1_def_platdata.cfg_gpio = exynos4_setup_sdhci1_cfg_gpio;
-#endif
-}
-
-static inline void exynos4_default_sdhci2(void)
-{
-#ifdef CONFIG_S3C_DEV_HSMMC2
-        s3c_hsmmc2_def_platdata.cfg_gpio = exynos4_setup_sdhci2_cfg_gpio;
-#endif
-}
-
-static inline void exynos4_default_sdhci3(void)
-{
-#ifdef CONFIG_S3C_DEV_HSMMC3
-        s3c_hsmmc3_def_platdata.cfg_gpio = exynos4_setup_sdhci3_cfg_gpio;
-#endif
-}
-
-#else
-static inline void exynos4_default_sdhci0(void) { }
-static inline void exynos4_default_sdhci1(void) { }
-static inline void exynos4_default_sdhci2(void) { }
-static inline void exynos4_default_sdhci3(void) { }
-
-#endif /* CONFIG_EXYNOS4_SETUP_SDHCI */
-
 static inline void s3c_sdhci_setname(int id, char *name)
 {
         switch (id) {
diff --git a/arch/arm/plat-samsung/irq-vic-timer.c b/arch/arm/plat-samsung/irq-vic-timer.c
deleted file mode 100644
index 0fceb4273824..000000000000
--- a/arch/arm/plat-samsung/irq-vic-timer.c
+++ /dev/null
@@ -1,98 +0,0 @@
-/* arch/arm/plat-samsung/irq-vic-timer.c
- *      originally part of arch/arm/plat-s3c64xx/irq.c
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * S3C64XX - Interrupt handling
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/kernel.h>
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/irqchip/chained_irq.h>
-#include <linux/io.h>
-
-#include <mach/map.h>
-#include <mach/irqs.h>
-#include <plat/cpu.h>
-#include <plat/irq-vic-timer.h>
-#include <plat/regs-timer.h>
-
-static void s3c_irq_demux_vic_timer(unsigned int irq, struct irq_desc *desc)
-{
-        struct irq_chip *chip = irq_get_chip(irq);
-        chained_irq_enter(chip, desc);
-        generic_handle_irq((int)desc->irq_data.handler_data);
-        chained_irq_exit(chip, desc);
-}
-
-/* We assume the IRQ_TIMER0..IRQ_TIMER4 range is continuous. */
-static void s3c_irq_timer_ack(struct irq_data *d)
-{
-        struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
-        u32 mask = (1 << 5) << (d->irq - gc->irq_base);
-
-        irq_reg_writel(mask | gc->mask_cache, gc->reg_base);
-}
-
-/**
- * s3c_init_vic_timer_irq() - initialise timer irq chanined off VIC.\
- * @num: Number of timers to initialize
- * @timer_irq: Base IRQ number to be used for the timers.
- *
- * Register the necessary IRQ chaining and support for the timer IRQs
- * chained of the VIC.
- */
-void __init s3c_init_vic_timer_irq(unsigned int num, unsigned int timer_irq)
-{
-        unsigned int pirq[5] = { IRQ_TIMER0_VIC, IRQ_TIMER1_VIC, IRQ_TIMER2_VIC,
-                                 IRQ_TIMER3_VIC, IRQ_TIMER4_VIC };
-        struct irq_chip_generic *s3c_tgc;
-        struct irq_chip_type *ct;
-        unsigned int i;
-
-#ifdef CONFIG_ARCH_EXYNOS
-        if (soc_is_exynos5250()) {
-                pirq[0] = EXYNOS5_IRQ_TIMER0_VIC;
-                pirq[1] = EXYNOS5_IRQ_TIMER1_VIC;
-                pirq[2] = EXYNOS5_IRQ_TIMER2_VIC;
-                pirq[3] = EXYNOS5_IRQ_TIMER3_VIC;
-                pirq[4] = EXYNOS5_IRQ_TIMER4_VIC;
-        } else {
-                pirq[0] = EXYNOS4_IRQ_TIMER0_VIC;
-                pirq[1] = EXYNOS4_IRQ_TIMER1_VIC;
-                pirq[2] = EXYNOS4_IRQ_TIMER2_VIC;
-                pirq[3] = EXYNOS4_IRQ_TIMER3_VIC;
-                pirq[4] = EXYNOS4_IRQ_TIMER4_VIC;
-        }
-#endif
-        s3c_tgc = irq_alloc_generic_chip("s3c-timer", 1, timer_irq,
-                                         S3C64XX_TINT_CSTAT, handle_level_irq);
-
-        if (!s3c_tgc) {
-                pr_err("%s: irq_alloc_generic_chip for IRQ %d failed\n",
-                       __func__, timer_irq);
-                return;
-        }
-
-        ct = s3c_tgc->chip_types;
-        ct->chip.irq_mask = irq_gc_mask_clr_bit;
-        ct->chip.irq_unmask = irq_gc_mask_set_bit;
-        ct->chip.irq_ack = s3c_irq_timer_ack;
-        irq_setup_generic_chip(s3c_tgc, IRQ_MSK(num), IRQ_GC_INIT_MASK_CACHE,
-                               IRQ_NOREQUEST | IRQ_NOPROBE, 0);
-        /* Clear the upper bits of the mask_cache*/
-        s3c_tgc->mask_cache &= 0x1f;
-
-        for (i = 0; i < num; i++, timer_irq++) {
-                irq_set_chained_handler(pirq[i], s3c_irq_demux_vic_timer);
-                irq_set_handler_data(pirq[i], (void *)timer_irq);
-        }
-}
diff --git a/arch/arm/plat-samsung/pwm-clock.c b/arch/arm/plat-samsung/pwm-clock.c
deleted file mode 100644
index a35ff3bcffe4..000000000000
--- a/arch/arm/plat-samsung/pwm-clock.c
+++ /dev/null
@@ -1,474 +0,0 @@
-/* linux/arch/arm/plat-s3c24xx/pwm-clock.c
- *
- * Copyright (c) 2007 Simtec Electronics
- * Copyright (c) 2007, 2008 Ben Dooks
- *      Ben Dooks <ben-linux@fluff.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License.
-*/
-
-#include <linux/init.h>
-#include <linux/module.h>
-#include <linux/kernel.h>
-#include <linux/list.h>
-#include <linux/errno.h>
-#include <linux/log2.h>
-#include <linux/clk.h>
-#include <linux/err.h>
-#include <linux/io.h>
-
-#include <mach/hardware.h>
-#include <mach/map.h>
-#include <asm/irq.h>
-
-#include <plat/clock.h>
-#include <plat/cpu.h>
-
-#include <plat/regs-timer.h>
-#include <plat/pwm-clock.h>
-
-/* Each of the timers 0 through 5 go through the following
- * clock tree, with the inputs depending on the timers.
- *
- * pclk ---- [ prescaler 0 ] -+---> timer 0
- *                            +---> timer 1
- *
- * pclk ---- [ prescaler 1 ] -+---> timer 2
- *                            +---> timer 3
- *                            \---> timer 4
- *
- * Which are fed into the timers as so:
- *
- * prescaled 0 ---- [ div 2,4,8,16 ] ---\
- *                                     [mux] -> timer 0
- * tclk 0 ------------------------------/
- *
- * prescaled 0 ---- [ div 2,4,8,16 ] ---\
- *                                     [mux] -> timer 1
- * tclk 0 ------------------------------/
- *
- *
- * prescaled 1 ---- [ div 2,4,8,16 ] ---\
- *                                     [mux] -> timer 2
- * tclk 1 ------------------------------/
- *
- * prescaled 1 ---- [ div 2,4,8,16 ] ---\
- *                                     [mux] -> timer 3
- * tclk 1 ------------------------------/
- *
- * prescaled 1 ---- [ div 2,4,8, 16 ] --\
- *                                     [mux] -> timer 4
- * tclk 1 ------------------------------/
- *
- * Since the mux and the divider are tied together in the
- * same register space, it is impossible to set the parent
- * and the rate at the same time. To avoid this, we add an
- * intermediate 'prescaled-and-divided' clock to select
- * as the parent for the timer input clock called tdiv.
- *
- * prescaled clk --> pwm-tdiv ---\
- *                             [ mux ] --> timer X
- * tclk -------------------------/
-*/
-
-static struct clk clk_timer_scaler[];
-
-static unsigned long clk_pwm_scaler_get_rate(struct clk *clk)
-{
-        unsigned long tcfg0 = __raw_readl(S3C2410_TCFG0);
-
-        if (clk == &clk_timer_scaler[1]) {
-                tcfg0 &= S3C2410_TCFG_PRESCALER1_MASK;
-                tcfg0 >>= S3C2410_TCFG_PRESCALER1_SHIFT;
-        } else {
-                tcfg0 &= S3C2410_TCFG_PRESCALER0_MASK;
-        }
-
-        return clk_get_rate(clk->parent) / (tcfg0 + 1);
-}
-
-static unsigned long clk_pwm_scaler_round_rate(struct clk *clk,
-                                               unsigned long rate)
-{
-        unsigned long parent_rate = clk_get_rate(clk->parent);
-        unsigned long divisor = parent_rate / rate;
-
-        if (divisor > 256)
-                divisor = 256;
-        else if (divisor < 2)
-                divisor = 2;
-
-        return parent_rate / divisor;
-}
-
-static int clk_pwm_scaler_set_rate(struct clk *clk, unsigned long rate)
-{
-        unsigned long round = clk_pwm_scaler_round_rate(clk, rate);
-        unsigned long tcfg0;
-        unsigned long divisor;
-        unsigned long flags;
-
-        divisor = clk_get_rate(clk->parent) / round;
-        divisor--;
-
-        local_irq_save(flags);
-        tcfg0 = __raw_readl(S3C2410_TCFG0);
-
-        if (clk == &clk_timer_scaler[1]) {
-                tcfg0 &= ~S3C2410_TCFG_PRESCALER1_MASK;
-                tcfg0 |= divisor << S3C2410_TCFG_PRESCALER1_SHIFT;
-        } else {
-                tcfg0 &= ~S3C2410_TCFG_PRESCALER0_MASK;
-                tcfg0 |= divisor;
-        }
-
-        __raw_writel(tcfg0, S3C2410_TCFG0);
-        local_irq_restore(flags);
-
-        return 0;
-}
-
-static struct clk_ops clk_pwm_scaler_ops = {
-        .get_rate       = clk_pwm_scaler_get_rate,
-        .set_rate       = clk_pwm_scaler_set_rate,
-        .round_rate     = clk_pwm_scaler_round_rate,
-};
-
-static struct clk clk_timer_scaler[] = {
-        [0]     = {
-                .name           = "pwm-scaler0",
-                .id             = -1,
-                .ops            = &clk_pwm_scaler_ops,
-        },
-        [1]     = {
-                .name           = "pwm-scaler1",
-                .id             = -1,
-                .ops            = &clk_pwm_scaler_ops,
-        },
-};
-
-static struct clk clk_timer_tclk[] = {
-        [0]     = {
-                .name           = "pwm-tclk0",
-                .id             = -1,
-        },
-        [1]     = {
-                .name           = "pwm-tclk1",
-                .id             = -1,
-        },
-};
-
-struct pwm_tdiv_clk {
-        struct clk      clk;
-        unsigned int    divisor;
-};
-
-static inline struct pwm_tdiv_clk *to_tdiv(struct clk *clk)
-{
-        return container_of(clk, struct pwm_tdiv_clk, clk);
-}
-
-static unsigned long clk_pwm_tdiv_get_rate(struct clk *clk)
-{
-        unsigned long tcfg1 = __raw_readl(S3C2410_TCFG1);
-        unsigned int divisor;
-
-        tcfg1 >>= S3C2410_TCFG1_SHIFT(clk->id);
-        tcfg1 &= S3C2410_TCFG1_MUX_MASK;
-
-        if (pwm_cfg_src_is_tclk(tcfg1))
-                divisor = to_tdiv(clk)->divisor;
-        else
-                divisor = tcfg_to_divisor(tcfg1);
-
-        return clk_get_rate(clk->parent) / divisor;
-}
-
-static unsigned long clk_pwm_tdiv_round_rate(struct clk *clk,
-                                             unsigned long rate)
-{
-        unsigned long parent_rate;
-        unsigned long divisor;
-
-        parent_rate = clk_get_rate(clk->parent);
-        divisor = parent_rate / rate;
-
-        if (divisor <= 1 && pwm_tdiv_has_div1())
-                divisor = 1;
-        else if (divisor <= 2)
-                divisor = 2;
-        else if (divisor <= 4)
-                divisor = 4;
-        else if (divisor <= 8)
-                divisor = 8;
-        else
-                divisor = 16;
-
-        return parent_rate / divisor;
-}
-
-static unsigned long clk_pwm_tdiv_bits(struct pwm_tdiv_clk *divclk)
-{
-        return pwm_tdiv_div_bits(divclk->divisor);
-}
-
-static void clk_pwm_tdiv_update(struct pwm_tdiv_clk *divclk)
-{
-        unsigned long tcfg1 = __raw_readl(S3C2410_TCFG1);
-        unsigned long bits = clk_pwm_tdiv_bits(divclk);
-        unsigned long flags;
-        unsigned long shift =  S3C2410_TCFG1_SHIFT(divclk->clk.id);
-
-        local_irq_save(flags);
-
-        tcfg1 = __raw_readl(S3C2410_TCFG1);
-        tcfg1 &= ~(S3C2410_TCFG1_MUX_MASK << shift);
-        tcfg1 |= bits << shift;
-        __raw_writel(tcfg1, S3C2410_TCFG1);
-
-        local_irq_restore(flags);
-}
-
-static int clk_pwm_tdiv_set_rate(struct clk *clk, unsigned long rate)
-{
-        struct pwm_tdiv_clk *divclk = to_tdiv(clk);
-        unsigned long tcfg1 = __raw_readl(S3C2410_TCFG1);
-        unsigned long parent_rate = clk_get_rate(clk->parent);
-        unsigned long divisor;
-
-        tcfg1 >>= S3C2410_TCFG1_SHIFT(clk->id);
-        tcfg1 &= S3C2410_TCFG1_MUX_MASK;
-
-        rate = clk_round_rate(clk, rate);
-        divisor = parent_rate / rate;
-
-        if (divisor > 16)
-                return -EINVAL;
-
-        divclk->divisor = divisor;
-
-        /* Update the current MUX settings if we are currently
-         * selected as the clock source for this clock. */
-
-        if (!pwm_cfg_src_is_tclk(tcfg1))
-                clk_pwm_tdiv_update(divclk);
-
-        return 0;
-}
-
-static struct clk_ops clk_tdiv_ops = {
-        .get_rate       = clk_pwm_tdiv_get_rate,
-        .set_rate       = clk_pwm_tdiv_set_rate,
-        .round_rate     = clk_pwm_tdiv_round_rate,
-};
-
-static struct pwm_tdiv_clk clk_timer_tdiv[] = {
-        [0]     = {
-                .clk    = {
-                        .name   = "pwm-tdiv",
-                        .devname        = "s3c24xx-pwm.0",
-                        .ops    = &clk_tdiv_ops,
-                        .parent = &clk_timer_scaler[0],
-                },
-        },
-        [1]     = {
-                .clk    = {
-                        .name   = "pwm-tdiv",
-                        .devname        = "s3c24xx-pwm.1",
-                        .ops    = &clk_tdiv_ops,
-                        .parent = &clk_timer_scaler[0],
-                }
-        },
-        [2]     = {
-                .clk    = {
-                        .name   = "pwm-tdiv",
-                        .devname        = "s3c24xx-pwm.2",
-                        .ops    = &clk_tdiv_ops,
-                        .parent = &clk_timer_scaler[1],
-                },
-        },
-        [3]     = {
-                .clk    = {
-                        .name   = "pwm-tdiv",
-                        .devname        = "s3c24xx-pwm.3",
-                        .ops    = &clk_tdiv_ops,
-                        .parent = &clk_timer_scaler[1],
-                },
-        },
-        [4]     = {
-                .clk    = {
-                        .name   = "pwm-tdiv",
-                        .devname        = "s3c24xx-pwm.4",
-                        .ops    = &clk_tdiv_ops,
-                        .parent = &clk_timer_scaler[1],
-                },
-        },
-};
-
-static int __init clk_pwm_tdiv_register(unsigned int id)
-{
-        struct pwm_tdiv_clk *divclk = &clk_timer_tdiv[id];
-        unsigned long tcfg1 = __raw_readl(S3C2410_TCFG1);
-
-        tcfg1 >>= S3C2410_TCFG1_SHIFT(id);
-        tcfg1 &= S3C2410_TCFG1_MUX_MASK;
-
-        divclk->clk.id = id;
-        divclk->divisor = tcfg_to_divisor(tcfg1);
-
-        return s3c24xx_register_clock(&divclk->clk);
-}
-
-static inline struct clk *s3c24xx_pwmclk_tclk(unsigned int id)
-{
-        return (id >= 2) ? &clk_timer_tclk[1] : &clk_timer_tclk[0];
-}
-
-static inline struct clk *s3c24xx_pwmclk_tdiv(unsigned int id)
-{
-        return &clk_timer_tdiv[id].clk;
-}
-
-static int clk_pwm_tin_set_parent(struct clk *clk, struct clk *parent)
-{
-        unsigned int id = clk->id;
-        unsigned long tcfg1;
-        unsigned long flags;
-        unsigned long bits;
-        unsigned long shift = S3C2410_TCFG1_SHIFT(id);
-
-        unsigned long mux_tclk;
-
-        if (soc_is_s3c24xx())
-                mux_tclk = S3C2410_TCFG1_MUX_TCLK;
-        else if (soc_is_s5p6440() || soc_is_s5p6450())
-                mux_tclk = 0;
-        else
-                mux_tclk = S3C64XX_TCFG1_MUX_TCLK;
-
-        if (parent == s3c24xx_pwmclk_tclk(id))
-                bits = mux_tclk << shift;
-        else if (parent == s3c24xx_pwmclk_tdiv(id))
-                bits = clk_pwm_tdiv_bits(to_tdiv(parent)) << shift;
-        else
-                return -EINVAL;
-
-        clk->parent = parent;
-
-        local_irq_save(flags);
-
-        tcfg1 = __raw_readl(S3C2410_TCFG1);
-        tcfg1 &= ~(S3C2410_TCFG1_MUX_MASK << shift);
-        __raw_writel(tcfg1 | bits, S3C2410_TCFG1);
-
-        local_irq_restore(flags);
-
-        return 0;
-}
-
-static struct clk_ops clk_tin_ops = {
-        .set_parent     = clk_pwm_tin_set_parent,
-};
-
-static struct clk clk_tin[] = {
-        [0]     = {
-                .name   = "pwm-tin",
-                .devname        = "s3c24xx-pwm.0",
-                .id     = 0,
-                .ops    = &clk_tin_ops,
-        },
-        [1]     = {
-                .name   = "pwm-tin",
-                .devname        = "s3c24xx-pwm.1",
-                .id     = 1,
-                .ops    = &clk_tin_ops,
-        },
-        [2]     = {
-                .name   = "pwm-tin",
-                .devname        = "s3c24xx-pwm.2",
-                .id     = 2,
-                .ops    = &clk_tin_ops,
-        },
-        [3]     = {
-                .name   = "pwm-tin",
-                .devname        = "s3c24xx-pwm.3",
-                .id     = 3,
-                .ops    = &clk_tin_ops,
-        },
-        [4]     = {
-                .name   = "pwm-tin",
-                .devname        = "s3c24xx-pwm.4",
-                .id     = 4,
-                .ops    = &clk_tin_ops,
-        },
-};
-
-static __init int clk_pwm_tin_register(struct clk *pwm)
-{
-        unsigned long tcfg1 = __raw_readl(S3C2410_TCFG1);
-        unsigned int id = pwm->id;
-
-        struct clk *parent;
-        int ret;
-
-        ret = s3c24xx_register_clock(pwm);
-        if (ret < 0)
-                return ret;
-
-        tcfg1 >>= S3C2410_TCFG1_SHIFT(id);
-        tcfg1 &= S3C2410_TCFG1_MUX_MASK;
-
-        if (pwm_cfg_src_is_tclk(tcfg1))
-                parent = s3c24xx_pwmclk_tclk(id);
-        else
-                parent = s3c24xx_pwmclk_tdiv(id);
-
-        return clk_set_parent(pwm, parent);
-}
-
-/**
- * s3c_pwmclk_init() - initialise pwm clocks
- *
- * Initialise and register the clocks which provide the inputs for the
- * pwm timer blocks.
- *
- * Note, this call is required by the time core, so must be called after
- * the base clocks are added and before any of the initcalls are run.
- */
-__init void s3c_pwmclk_init(void)
-{
-        struct clk *clk_timers;
-        unsigned int clk;
-        int ret;
-
-        clk_timers = clk_get(NULL, "timers");
-        if (IS_ERR(clk_timers)) {
-                printk(KERN_ERR "%s: no parent clock\n", __func__);
-                return;
-        }
-
-        for (clk = 0; clk < ARRAY_SIZE(clk_timer_scaler); clk++)
-                clk_timer_scaler[clk].parent = clk_timers;
-
-        s3c_register_clocks(clk_timer_scaler, ARRAY_SIZE(clk_timer_scaler));
-        s3c_register_clocks(clk_timer_tclk, ARRAY_SIZE(clk_timer_tclk));
-
-        for (clk = 0; clk < ARRAY_SIZE(clk_timer_tdiv); clk++) {
-                ret = clk_pwm_tdiv_register(clk);
-
-                if (ret < 0) {
-                        printk(KERN_ERR "error adding pwm%d tdiv clock\n", clk);
-                        return;
-                }
-        }
-
-        for (clk = 0; clk < ARRAY_SIZE(clk_tin); clk++) {
-                ret = clk_pwm_tin_register(&clk_tin[clk]);
-                if (ret < 0) {
-                        printk(KERN_ERR "error adding pwm%d tin clock\n", clk);
-                        return;
-                }
-        }
-}
diff --git a/arch/arm/plat-samsung/s3c-dma-ops.c b/arch/arm/plat-samsung/s3c-dma-ops.c
index 0cc40aea3f5a..98b10ba67dc7 100644
--- a/arch/arm/plat-samsung/s3c-dma-ops.c
+++ b/arch/arm/plat-samsung/s3c-dma-ops.c
@@ -82,7 +82,8 @@ static int s3c_dma_config(unsigned ch, struct samsung_dma_config *param)
 static int s3c_dma_prepare(unsigned ch, struct samsung_dma_prep *param)
 {
         struct cb_data *data;
-        int len = (param->cap == DMA_CYCLIC) ? param->period : param->len;
+        dma_addr_t pos = param->buf;
+        dma_addr_t end = param->buf + param->len;
 
         list_for_each_entry(data, &dma_list, node)
                 if (data->ch == ch)
@@ -94,7 +95,15 @@ static int s3c_dma_prepare(unsigned ch, struct samsung_dma_prep *param)
                 data->fp_param = param->fp_param;
         }
 
-        s3c2410_dma_enqueue(ch, (void *)data, param->buf, len);
+        if (param->cap != DMA_CYCLIC) {
+                s3c2410_dma_enqueue(ch, (void *)data, param->buf, param->len);
+                return 0;
+        }
+
+        while (pos < end) {
+                s3c2410_dma_enqueue(ch, (void *)data, pos, param->period);
+                pos += param->period;
+        }
 
         return 0;
 }
diff --git a/arch/arm/plat-samsung/s5p-irq.c b/arch/arm/plat-samsung/s5p-irq.c
index ff1a76011b1e..ddfaca9c79d8 100644
--- a/arch/arm/plat-samsung/s5p-irq.c
+++ b/arch/arm/plat-samsung/s5p-irq.c
@@ -17,9 +17,7 @@
 
 #include <mach/irqs.h>
 #include <mach/map.h>
-#include <plat/regs-timer.h>
 #include <plat/cpu.h>
-#include <plat/irq-vic-timer.h>
 
 void __init s5p_init_irq(u32 *vic, u32 num_vic)
 {
@@ -30,6 +28,4 @@ void __init s5p_init_irq(u32 *vic, u32 num_vic)
         for (irq = 0; irq < num_vic; irq++)
                 vic_init(VA_VIC(irq), VIC_BASE(irq), vic[irq], 0);
 #endif
-
-        s3c_init_vic_timer_irq(5, IRQ_TIMER0);
 }
diff --git a/arch/arm/plat-samsung/samsung-time.c b/arch/arm/plat-samsung/samsung-time.c
deleted file mode 100644
index 2957075ca836..000000000000
--- a/arch/arm/plat-samsung/samsung-time.c
+++ /dev/null
@@ -1,394 +0,0 @@
-/*
- * Copyright (c) 2011 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * samsung - Common hr-timer support (s3c and s5p)
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#include <linux/interrupt.h>
-#include <linux/irq.h>
-#include <linux/err.h>
-#include <linux/clk.h>
-#include <linux/clockchips.h>
-#include <linux/platform_device.h>
-#include <linux/sched_clock.h>
-
-#include <asm/smp_twd.h>
-#include <asm/mach/time.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/map.h>
-
-#include <mach/map.h>
-#include <plat/devs.h>
-#include <plat/regs-timer.h>
-#include <plat/samsung-time.h>
-
-static struct clk *tin_event;
-static struct clk *tin_source;
-static struct clk *tdiv_event;
-static struct clk *tdiv_source;
-static struct clk *timerclk;
-static struct samsung_timer_source timer_source;
-static unsigned long clock_count_per_tick;
-static void samsung_timer_resume(void);
-
-static void samsung_time_stop(enum samsung_timer_mode mode)
-{
-        unsigned long tcon;
-
-        tcon = __raw_readl(S3C2410_TCON);
-
-        switch (mode) {
-        case SAMSUNG_PWM0:
-                tcon &= ~S3C2410_TCON_T0START;
-                break;
-
-        case SAMSUNG_PWM1:
-                tcon &= ~S3C2410_TCON_T1START;
-                break;
-
-        case SAMSUNG_PWM2:
-                tcon &= ~S3C2410_TCON_T2START;
-                break;
-
-        case SAMSUNG_PWM3:
-                tcon &= ~S3C2410_TCON_T3START;
-                break;
-
-        case SAMSUNG_PWM4:
-                tcon &= ~S3C2410_TCON_T4START;
-                break;
-
-        default:
-                printk(KERN_ERR "Invalid Timer %d\n", mode);
-                break;
-        }
-        __raw_writel(tcon, S3C2410_TCON);
-}
-
-static void samsung_time_setup(enum samsung_timer_mode mode, unsigned long tcnt)
-{
-        unsigned long tcon;
-
-        tcon = __raw_readl(S3C2410_TCON);
-
-        tcnt--;
-
-        switch (mode) {
-        case SAMSUNG_PWM0:
-                tcon &= ~(0x0f << 0);
-                tcon |= S3C2410_TCON_T0MANUALUPD;
-                break;
-
-        case SAMSUNG_PWM1:
-                tcon &= ~(0x0f << 8);
-                tcon |= S3C2410_TCON_T1MANUALUPD;
-                break;
-
-        case SAMSUNG_PWM2:
-                tcon &= ~(0x0f << 12);
-                tcon |= S3C2410_TCON_T2MANUALUPD;
-                break;
-
-        case SAMSUNG_PWM3:
-                tcon &= ~(0x0f << 16);
-                tcon |= S3C2410_TCON_T3MANUALUPD;
-                break;
-
-        case SAMSUNG_PWM4:
-                tcon &= ~(0x07 << 20);
-                tcon |= S3C2410_TCON_T4MANUALUPD;
-                break;
-
-        default:
-                printk(KERN_ERR "Invalid Timer %d\n", mode);
-                break;
-        }
-
-        __raw_writel(tcnt, S3C2410_TCNTB(mode));
-        __raw_writel(tcnt, S3C2410_TCMPB(mode));
-        __raw_writel(tcon, S3C2410_TCON);
-}
-
-static void samsung_time_start(enum samsung_timer_mode mode, bool periodic)
-{
-        unsigned long tcon;
-
-        tcon  = __raw_readl(S3C2410_TCON);
-
-        switch (mode) {
-        case SAMSUNG_PWM0:
-                tcon |= S3C2410_TCON_T0START;
-                tcon &= ~S3C2410_TCON_T0MANUALUPD;
-
-                if (periodic)
-                        tcon |= S3C2410_TCON_T0RELOAD;
-                else
-                        tcon &= ~S3C2410_TCON_T0RELOAD;
-                break;
-
-        case SAMSUNG_PWM1:
-                tcon |= S3C2410_TCON_T1START;
-                tcon &= ~S3C2410_TCON_T1MANUALUPD;
-
-                if (periodic)
-                        tcon |= S3C2410_TCON_T1RELOAD;
-                else
-                        tcon &= ~S3C2410_TCON_T1RELOAD;
-                break;
-
-        case SAMSUNG_PWM2:
-                tcon |= S3C2410_TCON_T2START;
-                tcon &= ~S3C2410_TCON_T2MANUALUPD;
-
-                if (periodic)
-                        tcon |= S3C2410_TCON_T2RELOAD;
-                else
-                        tcon &= ~S3C2410_TCON_T2RELOAD;
-                break;
-
-        case SAMSUNG_PWM3:
-                tcon |= S3C2410_TCON_T3START;
-                tcon &= ~S3C2410_TCON_T3MANUALUPD;
-
-                if (periodic)
-                        tcon |= S3C2410_TCON_T3RELOAD;
-                else
-                        tcon &= ~S3C2410_TCON_T3RELOAD;
-                break;
-
-        case SAMSUNG_PWM4:
-                tcon |= S3C2410_TCON_T4START;
-                tcon &= ~S3C2410_TCON_T4MANUALUPD;
-
-                if (periodic)
-                        tcon |= S3C2410_TCON_T4RELOAD;
-                else
-                        tcon &= ~S3C2410_TCON_T4RELOAD;
-                break;
-
-        default:
-                printk(KERN_ERR "Invalid Timer %d\n", mode);
-                break;
-        }
-        __raw_writel(tcon, S3C2410_TCON);
-}
-
-static int samsung_set_next_event(unsigned long cycles,
-                                struct clock_event_device *evt)
-{
-        samsung_time_setup(timer_source.event_id, cycles);
-        samsung_time_start(timer_source.event_id, NON_PERIODIC);
-
-        return 0;
-}
-
-static void samsung_set_mode(enum clock_event_mode mode,
-                                struct clock_event_device *evt)
-{
-        samsung_time_stop(timer_source.event_id);
-
-        switch (mode) {
-        case CLOCK_EVT_MODE_PERIODIC:
-                samsung_time_setup(timer_source.event_id, clock_count_per_tick);
-                samsung_time_start(timer_source.event_id, PERIODIC);
-                break;
-
-        case CLOCK_EVT_MODE_ONESHOT:
-                break;
-
-        case CLOCK_EVT_MODE_UNUSED:
-        case CLOCK_EVT_MODE_SHUTDOWN:
-                break;
-
-        case CLOCK_EVT_MODE_RESUME:
-                samsung_timer_resume();
-                break;
-        }
-}
-
-static void samsung_timer_resume(void)
-{
-        /* event timer restart */
-        samsung_time_setup(timer_source.event_id, clock_count_per_tick);
-        samsung_time_start(timer_source.event_id, PERIODIC);
-
-        /* source timer restart */
-        samsung_time_setup(timer_source.source_id, TCNT_MAX);
-        samsung_time_start(timer_source.source_id, PERIODIC);
-}
-
-void __init samsung_set_timer_source(enum samsung_timer_mode event,
-                                 enum samsung_timer_mode source)
-{
-        s3c_device_timer[event].dev.bus = &platform_bus_type;
-        s3c_device_timer[source].dev.bus = &platform_bus_type;
-
-        timer_source.event_id = event;
-        timer_source.source_id = source;
-}
-
-static struct clock_event_device time_event_device = {
-        .name           = "samsung_event_timer",
-        .features       = CLOCK_EVT_FEAT_PERIODIC | CLOCK_EVT_FEAT_ONESHOT,
-        .rating         = 200,
-        .set_next_event = samsung_set_next_event,
-        .set_mode       = samsung_set_mode,
-};
-
-static irqreturn_t samsung_clock_event_isr(int irq, void *dev_id)
-{
-        struct clock_event_device *evt = dev_id;
-
-        evt->event_handler(evt);
-
-        return IRQ_HANDLED;
-}
-
-static struct irqaction samsung_clock_event_irq = {
-        .name           = "samsung_time_irq",
-        .flags          = IRQF_DISABLED | IRQF_TIMER | IRQF_IRQPOLL,
-        .handler        = samsung_clock_event_isr,
-        .dev_id         = &time_event_device,
-};
-
-static void __init samsung_clockevent_init(void)
-{
-        unsigned long pclk;
-        unsigned long clock_rate;
-        unsigned int irq_number;
-        struct clk *tscaler;
-
-        pclk = clk_get_rate(timerclk);
-
-        tscaler = clk_get_parent(tdiv_event);
-
-        clk_set_rate(tscaler, pclk / TSCALER_DIV);
-        clk_set_rate(tdiv_event, pclk / TDIV);
-        clk_set_parent(tin_event, tdiv_event);
-
-        clock_rate = clk_get_rate(tin_event);
-        clock_count_per_tick = clock_rate / HZ;
-
-        time_event_device.cpumask = cpumask_of(0);
-        clockevents_config_and_register(&time_event_device, clock_rate, 1, -1);
-
-        irq_number = timer_source.event_id + IRQ_TIMER0;
-        setup_irq(irq_number, &samsung_clock_event_irq);
-}
-
-static void __iomem *samsung_timer_reg(void)
-{
-        unsigned long offset = 0;
-
-        switch (timer_source.source_id) {
-        case SAMSUNG_PWM0:
-        case SAMSUNG_PWM1:
-        case SAMSUNG_PWM2:
-        case SAMSUNG_PWM3:
-                offset = (timer_source.source_id * 0x0c) + 0x14;
-                break;
-
-        case SAMSUNG_PWM4:
-                offset = 0x40;
-                break;
-
-        default:
-                printk(KERN_ERR "Invalid Timer %d\n", timer_source.source_id);
-                return NULL;
-        }
-
-        return S3C_TIMERREG(offset);
-}
-
-/*
- * Override the global weak sched_clock symbol with this
- * local implementation which uses the clocksource to get some
- * better resolution when scheduling the kernel. We accept that
- * this wraps around for now, since it is just a relative time
- * stamp. (Inspired by U300 implementation.)
- */
-static u32 notrace samsung_read_sched_clock(void)
-{
-        void __iomem *reg = samsung_timer_reg();
-
-        if (!reg)
-                return 0;
-
-        return ~__raw_readl(reg);
-}
-
-static void __init samsung_clocksource_init(void)
-{
-        unsigned long pclk;
-        unsigned long clock_rate;
-
-        pclk = clk_get_rate(timerclk);
-
-        clk_set_rate(tdiv_source, pclk / TDIV);
-        clk_set_parent(tin_source, tdiv_source);
-
-        clock_rate = clk_get_rate(tin_source);
-
-        samsung_time_setup(timer_source.source_id, TCNT_MAX);
-        samsung_time_start(timer_source.source_id, PERIODIC);
-
-        setup_sched_clock(samsung_read_sched_clock, TSIZE, clock_rate);
-
-        if (clocksource_mmio_init(samsung_timer_reg(), "samsung_clocksource_timer",
-                        clock_rate, 250, TSIZE, clocksource_mmio_readl_down))
-                panic("samsung_clocksource_timer: can't register clocksource\n");
-}
-
-static void __init samsung_timer_resources(void)
-{
-
-        unsigned long event_id = timer_source.event_id;
-        unsigned long source_id = timer_source.source_id;
-        char devname[15];
-
-        timerclk = clk_get(NULL, "timers");
-        if (IS_ERR(timerclk))
-                panic("failed to get timers clock for timer");
-
-        clk_enable(timerclk);
-
-        sprintf(devname, "s3c24xx-pwm.%lu", event_id);
-        s3c_device_timer[event_id].id = event_id;
-        s3c_device_timer[event_id].dev.init_name = devname;
-
-        tin_event = clk_get(&s3c_device_timer[event_id].dev, "pwm-tin");
-        if (IS_ERR(tin_event))
-                panic("failed to get pwm-tin clock for event timer");
-
-        tdiv_event = clk_get(&s3c_device_timer[event_id].dev, "pwm-tdiv");
-        if (IS_ERR(tdiv_event))
-                panic("failed to get pwm-tdiv clock for event timer");
-
-        clk_enable(tin_event);
-
-        sprintf(devname, "s3c24xx-pwm.%lu", source_id);
-        s3c_device_timer[source_id].id = source_id;
-        s3c_device_timer[source_id].dev.init_name = devname;
-
-        tin_source = clk_get(&s3c_device_timer[source_id].dev, "pwm-tin");
-        if (IS_ERR(tin_source))
-                panic("failed to get pwm-tin clock for source timer");
-
-        tdiv_source = clk_get(&s3c_device_timer[source_id].dev, "pwm-tdiv");
-        if (IS_ERR(tdiv_source))
-                panic("failed to get pwm-tdiv clock for source timer");
-
-        clk_enable(tin_source);
-}
-
-void __init samsung_timer_init(void)
-{
-        samsung_timer_resources();
-        samsung_clockevent_init();
-        samsung_clocksource_init();
-}
diff --git a/arch/arm/vfp/vfphw.S b/arch/arm/vfp/vfphw.S
index 8d10dc8a1e17..3e5d3115a2a6 100644
--- a/arch/arm/vfp/vfphw.S
+++ b/arch/arm/vfp/vfphw.S
@@ -78,6 +78,11 @@
 ENTRY(vfp_support_entry)
         DBGSTR3 "instr %08x pc %08x state %p", r0, r2, r10
 
+        ldr     r3, [sp, #S_PSR]        @ Neither lazy restore nor FP exceptions
+        and     r3, r3, #MODE_MASK      @ are supported in kernel mode
+        teq     r3, #USR_MODE
+        bne     vfp_kmode_exception     @ Returns through lr
+
         VFPFMRX r1, FPEXC               @ Is the VFP enabled?
         DBGSTR1 "fpexc %08x", r1
         tst     r1, #FPEXC_EN
diff --git a/arch/arm/vfp/vfpmodule.c b/arch/arm/vfp/vfpmodule.c
index 5dfbb0b8e7f4..52b8f40b1c73 100644
--- a/arch/arm/vfp/vfpmodule.c
+++ b/arch/arm/vfp/vfpmodule.c
@@ -20,6 +20,7 @@
 #include <linux/init.h>
 #include <linux/uaccess.h>
 #include <linux/user.h>
+#include <linux/export.h>
 
 #include <asm/cp15.h>
 #include <asm/cputype.h>
@@ -648,6 +649,72 @@ static int vfp_hotplug(struct notifier_block *b, unsigned long action,
         return NOTIFY_OK;
 }
 
+void vfp_kmode_exception(void)
+{
+        /*
+         * If we reach this point, a floating point exception has been raised
+         * while running in kernel mode. If the NEON/VFP unit was enabled at the
+         * time, it means a VFP instruction has been issued that requires
+         * software assistance to complete, something which is not currently
+         * supported in kernel mode.
+         * If the NEON/VFP unit was disabled, and the location pointed to below
+         * is properly preceded by a call to kernel_neon_begin(), something has
+         * caused the task to be scheduled out and back in again. In this case,
+         * rebuilding and running with CONFIG_DEBUG_ATOMIC_SLEEP enabled should
+         * be helpful in localizing the problem.
+         */
+        if (fmrx(FPEXC) & FPEXC_EN)
+                pr_crit("BUG: unsupported FP instruction in kernel mode\n");
+        else
+                pr_crit("BUG: FP instruction issued in kernel mode with FP unit disabled\n");
+}
+
+#ifdef CONFIG_KERNEL_MODE_NEON
+
+/*
+ * Kernel-side NEON support functions
+ */
+void kernel_neon_begin(void)
+{
+        struct thread_info *thread = current_thread_info();
+        unsigned int cpu;
+        u32 fpexc;
+
+        /*
+         * Kernel mode NEON is only allowed outside of interrupt context
+         * with preemption disabled. This will make sure that the kernel
+         * mode NEON register contents never need to be preserved.
+         */
+        BUG_ON(in_interrupt());
+        cpu = get_cpu();
+
+        fpexc = fmrx(FPEXC) | FPEXC_EN;
+        fmxr(FPEXC, fpexc);
+
+        /*
+         * Save the userland NEON/VFP state. Under UP,
+         * the owner could be a task other than 'current'
+         */
+        if (vfp_state_in_hw(cpu, thread))
+                vfp_save_state(&thread->vfpstate, fpexc);
+#ifndef CONFIG_SMP
+        else if (vfp_current_hw_state[cpu] != NULL)
+                vfp_save_state(vfp_current_hw_state[cpu], fpexc);
+#endif
+        vfp_current_hw_state[cpu] = NULL;
+}
+EXPORT_SYMBOL(kernel_neon_begin);
+
+void kernel_neon_end(void)
+{
+        /* Disable the NEON/VFP unit. */
+        fmxr(FPEXC, fmrx(FPEXC) & ~FPEXC_EN);
+        put_cpu();
+}
+EXPORT_SYMBOL(kernel_neon_end);
+
+#endif /* CONFIG_KERNEL_MODE_NEON */
+
 /*
  * VFP support code initialisation.
  */
@@ -731,4 +798,4 @@ static int __init vfp_init(void)
         return 0;
 }
 
-late_initcall(vfp_init);
+core_initcall(vfp_init);
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 9737e97f9f38..c04454876bcb 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -23,7 +23,6 @@ config ARM64
         select HAVE_DMA_API_DEBUG
         select HAVE_DMA_ATTRS
         select HAVE_GENERIC_DMA_COHERENT
-        select HAVE_GENERIC_HARDIRQS
         select HAVE_HW_BREAKPOINT if PERF_EVENTS
         select HAVE_MEMBLOCK
         select HAVE_PERF_EVENTS
@@ -96,6 +95,9 @@ config SWIOTLB
 config IOMMU_HELPER
         def_bool SWIOTLB
 
+config KERNEL_MODE_NEON
+        def_bool y
+
 source "init/Kconfig"
 
 source "kernel/Kconfig.freezer"
diff --git a/arch/arm64/include/asm/arch_timer.h b/arch/arm64/include/asm/arch_timer.h
index 98abd476992d..c9f1d2816c2b 100644
--- a/arch/arm64/include/asm/arch_timer.h
+++ b/arch/arm64/include/asm/arch_timer.h
@@ -26,7 +26,13 @@
 
 #include <clocksource/arm_arch_timer.h>
 
-static inline void arch_timer_reg_write(int access, int reg, u32 val)
+/*
+ * These register accessors are marked inline so the compiler can
+ * nicely work out which register we want, and chuck away the rest of
+ * the code.
+ */
+static __always_inline
+void arch_timer_reg_write_cp15(int access, enum arch_timer_reg reg, u32 val)
 {
         if (access == ARCH_TIMER_PHYS_ACCESS) {
                 switch (reg) {
@@ -36,8 +42,6 @@ static inline void arch_timer_reg_write(int access, int reg, u32 val)
                 case ARCH_TIMER_REG_TVAL:
                         asm volatile("msr cntp_tval_el0, %0" : : "r" (val));
                         break;
-                default:
-                        BUILD_BUG();
                 }
         } else if (access == ARCH_TIMER_VIRT_ACCESS) {
                 switch (reg) {
@@ -47,17 +51,14 @@ static inline void arch_timer_reg_write(int access, int reg, u32 val)
                 case ARCH_TIMER_REG_TVAL:
                         asm volatile("msr cntv_tval_el0, %0" : : "r" (val));
                         break;
-                default:
-                        BUILD_BUG();
                 }
-        } else {
-                BUILD_BUG();
         }
 
         isb();
 }
 
-static inline u32 arch_timer_reg_read(int access, int reg)
+static __always_inline
+u32 arch_timer_reg_read_cp15(int access, enum arch_timer_reg reg)
 {
         u32 val;
 
@@ -69,8 +70,6 @@ static inline u32 arch_timer_reg_read(int access, int reg)
                 case ARCH_TIMER_REG_TVAL:
                         asm volatile("mrs %0, cntp_tval_el0" : "=r" (val));
                         break;
-                default:
-                        BUILD_BUG();
                 }
         } else if (access == ARCH_TIMER_VIRT_ACCESS) {
                 switch (reg) {
@@ -80,11 +79,7 @@ static inline u32 arch_timer_reg_read(int access, int reg)
                 case ARCH_TIMER_REG_TVAL:
                         asm volatile("mrs %0, cntv_tval_el0" : "=r" (val));
                         break;
-                default:
-                        BUILD_BUG();
                 }
-        } else {
-                BUILD_BUG();
         }
 
         return val;
diff --git a/arch/arm64/include/asm/elf.h b/arch/arm64/include/asm/elf.h
index fe32c0e4ac01..e7fa87f9201b 100644
--- a/arch/arm64/include/asm/elf.h
+++ b/arch/arm64/include/asm/elf.h
@@ -33,8 +33,6 @@ typedef unsigned long elf_greg_t;
 typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 typedef struct user_fpsimd_state elf_fpregset_t;
 
-#define EM_AARCH64              183
-
 /*
  * AArch64 static relocation types.
  */
@@ -151,7 +149,6 @@ extern unsigned long arch_randomize_brk(struct mm_struct *mm);
 #define arch_randomize_brk arch_randomize_brk
 
 #ifdef CONFIG_COMPAT
-#define EM_ARM                          40
 #define COMPAT_ELF_PLATFORM             ("v8l")
 
 #define COMPAT_ELF_ET_DYN_BASE          (randomize_et_dyn(2 * TASK_SIZE_32 / 3))
diff --git a/arch/arm64/include/asm/hwcap.h b/arch/arm64/include/asm/hwcap.h
index 6d4482fa35bc..e2950b098e76 100644
--- a/arch/arm64/include/asm/hwcap.h
+++ b/arch/arm64/include/asm/hwcap.h
@@ -43,6 +43,6 @@
                                  COMPAT_HWCAP_VFPv3|COMPAT_HWCAP_VFPv4|\
                                  COMPAT_HWCAP_NEON|COMPAT_HWCAP_IDIV)
 
-extern unsigned int elf_hwcap;
+extern unsigned long elf_hwcap;
 #endif
 #endif
diff --git a/arch/arm64/include/asm/neon.h b/arch/arm64/include/asm/neon.h
new file mode 100644
index 000000000000..b0cc58a97780
--- /dev/null
+++ b/arch/arm64/include/asm/neon.h
@@ -0,0 +1,14 @@
+/*
+ * linux/arch/arm64/include/asm/neon.h
+ *
+ * Copyright (C) 2013 Linaro Ltd <ard.biesheuvel@linaro.org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#define cpu_has_neon()          (1)
+
+void kernel_neon_begin(void);
+void kernel_neon_end(void);
diff --git a/arch/arm64/include/asm/pgtable-2level-types.h b/arch/arm64/include/asm/pgtable-2level-types.h
index 3c3ca7d361e4..5f101e63dfc1 100644
--- a/arch/arm64/include/asm/pgtable-2level-types.h
+++ b/arch/arm64/include/asm/pgtable-2level-types.h
@@ -16,6 +16,8 @@
 #ifndef __ASM_PGTABLE_2LEVEL_TYPES_H
 #define __ASM_PGTABLE_2LEVEL_TYPES_H
 
+#include <asm/types.h>
+
 typedef u64 pteval_t;
 typedef u64 pgdval_t;
 typedef pgdval_t pmdval_t;
diff --git a/arch/arm64/include/asm/pgtable-3level-types.h b/arch/arm64/include/asm/pgtable-3level-types.h
index 4489615f14a9..4e94424938a4 100644
--- a/arch/arm64/include/asm/pgtable-3level-types.h
+++ b/arch/arm64/include/asm/pgtable-3level-types.h
@@ -16,6 +16,8 @@
 #ifndef __ASM_PGTABLE_3LEVEL_TYPES_H
 #define __ASM_PGTABLE_3LEVEL_TYPES_H
 
+#include <asm/types.h>
+
 typedef u64 pteval_t;
 typedef u64 pmdval_t;
 typedef u64 pgdval_t;
diff --git a/arch/arm64/include/asm/pgtable-hwdef.h b/arch/arm64/include/asm/pgtable-hwdef.h
index e182a356c979..d57e66845c86 100644
--- a/arch/arm64/include/asm/pgtable-hwdef.h
+++ b/arch/arm64/include/asm/pgtable-hwdef.h
@@ -122,5 +122,6 @@
 #define TCR_TG1_64K             (UL(1) << 30)
 #define TCR_IPS_40BIT           (UL(2) << 32)
 #define TCR_ASID16              (UL(1) << 36)
+#define TCR_TBI0                (UL(1) << 37)
 
 #endif
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index 6ad781b21c08..3881fd115ebb 100644
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -423,6 +423,7 @@ el0_da:
          * Data abort handling
          */
         mrs     x0, far_el1
+        bic     x0, x0, #(0xff << 56)
         disable_step x1
         isb
         enable_dbg
@@ -476,6 +477,8 @@ el0_undef:
          * Undefined instruction
          */
         mov     x0, sp
+        // enable interrupts before calling the main handler
+        enable_irq
         b       do_undefinstr
 el0_dbg:
         /*
diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c
index e8b8357aedb4..1f2e4d5a5c0f 100644
--- a/arch/arm64/kernel/fpsimd.c
+++ b/arch/arm64/kernel/fpsimd.c
@@ -21,6 +21,7 @@
 #include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/signal.h>
+#include <linux/hardirq.h>
 
 #include <asm/fpsimd.h>
 #include <asm/cputype.h>
@@ -83,6 +84,33 @@ void fpsimd_flush_thread(void)
         fpsimd_load_state(&current->thread.fpsimd_state);
 }
 
+#ifdef CONFIG_KERNEL_MODE_NEON
+
+/*
+ * Kernel-side NEON support functions
+ */
+void kernel_neon_begin(void)
+{
+        /* Avoid using the NEON in interrupt context */
+        BUG_ON(in_interrupt());
+        preempt_disable();
+
+        if (current->mm)
+                fpsimd_save_state(&current->thread.fpsimd_state);
+}
+EXPORT_SYMBOL(kernel_neon_begin);
+
+void kernel_neon_end(void)
+{
+        if (current->mm)
+                fpsimd_load_state(&current->thread.fpsimd_state);
+
+        preempt_enable();
+}
+EXPORT_SYMBOL(kernel_neon_end);
+
+#endif /* CONFIG_KERNEL_MODE_NEON */
+
 /*
  * FP/SIMD support code initialisation.
  */
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S
index 53dcae49e729..7090c126797c 100644
--- a/arch/arm64/kernel/head.S
+++ b/arch/arm64/kernel/head.S
@@ -112,6 +112,14 @@
         .quad   TEXT_OFFSET                     // Image load offset from start of RAM
         .quad   0                               // reserved
         .quad   0                               // reserved
+        .quad   0                               // reserved
+        .quad   0                               // reserved
+        .quad   0                               // reserved
+        .byte   0x41                            // Magic number, "ARM\x64"
+        .byte   0x52
+        .byte   0x4d
+        .byte   0x64
+        .word   0                               // reserved
 
 ENTRY(stext)
         mov     x21, x0                         // x21=FDT
diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c
index 12e6ccb88691..cea1594ff933 100644
--- a/arch/arm64/kernel/perf_event.c
+++ b/arch/arm64/kernel/perf_event.c
@@ -325,7 +325,10 @@ validate_event(struct pmu_hw_events *hw_events,
         if (is_software_event(event))
                 return 1;
 
-        if (event->pmu != leader_pmu || event->state <= PERF_EVENT_STATE_OFF)
+        if (event->pmu != leader_pmu || event->state < PERF_EVENT_STATE_OFF)
+                return 1;
+
+        if (event->state == PERF_EVENT_STATE_OFF && !event->attr.enable_on_exec)
                 return 1;
 
         return armpmu->get_event_idx(hw_events, &fake_event) >= 0;
@@ -781,7 +784,7 @@ static const unsigned armv8_pmuv3_perf_cache_map[PERF_COUNT_HW_CACHE_MAX]
 /*
  * PMXEVTYPER: Event selection reg
  */
-#define ARMV8_EVTYPE_MASK       0xc00000ff      /* Mask for writable bits */
+#define ARMV8_EVTYPE_MASK       0xc80000ff      /* Mask for writable bits */
 #define ARMV8_EVTYPE_EVENT      0xff            /* Mask for EVENT bits */
 
 /*
diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c
index 57fb55c44c90..7ae8a1f00c3c 100644
--- a/arch/arm64/kernel/process.c
+++ b/arch/arm64/kernel/process.c
@@ -143,15 +143,26 @@ void machine_restart(char *cmd)
 
 void __show_regs(struct pt_regs *regs)
 {
-        int i;
+        int i, top_reg;
+        u64 lr, sp;
+
+        if (compat_user_mode(regs)) {
+                lr = regs->compat_lr;
+                sp = regs->compat_sp;
+                top_reg = 12;
+        } else {
+                lr = regs->regs[30];
+                sp = regs->sp;
+                top_reg = 29;
+        }
 
         show_regs_print_info(KERN_DEFAULT);
         print_symbol("PC is at %s\n", instruction_pointer(regs));
-        print_symbol("LR is at %s\n", regs->regs[30]);
+        print_symbol("LR is at %s\n", lr);
         printk("pc : [<%016llx>] lr : [<%016llx>] pstate: %08llx\n",
-               regs->pc, regs->regs[30], regs->pstate);
-        printk("sp : %016llx\n", regs->sp);
-        for (i = 29; i >= 0; i--) {
+               regs->pc, lr, regs->pstate);
+        printk("sp : %016llx\n", sp);
+        for (i = top_reg; i >= 0; i--) {
                 printk("x%-2d: %016llx ", i, regs->regs[i]);
                 if (i % 2 == 0)
                         printk("\n");
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
index add6ea616843..055cfb80e05c 100644
--- a/arch/arm64/kernel/setup.c
+++ b/arch/arm64/kernel/setup.c
@@ -57,7 +57,7 @@
 unsigned int processor_id;
 EXPORT_SYMBOL(processor_id);
 
-unsigned int elf_hwcap __read_mostly;
+unsigned long elf_hwcap __read_mostly;
 EXPORT_SYMBOL_GPL(elf_hwcap);
 
 static const char *cpu_name;
@@ -190,11 +190,6 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
         memblock_add(base, size);
 }
 
-void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
-{
-        return __va(memblock_alloc(size, align));
-}
-
 /*
  * Limit the memory size that was specified via FDT.
  */
@@ -328,9 +323,6 @@ static int c_show(struct seq_file *m, void *v)
 #ifdef CONFIG_SMP
                 seq_printf(m, "processor\t: %d\n", i);
 #endif
-                seq_printf(m, "BogoMIPS\t: %lu.%02lu\n\n",
-                           loops_per_jiffy / (500000UL/HZ),
-                           loops_per_jiffy / (5000UL/HZ) % 100);
         }
 
         /* dump out the processor features */
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index fee5cce83450..78db90dcc910 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -223,11 +223,7 @@ asmlinkage void secondary_start_kernel(void)
 
 void __init smp_cpus_done(unsigned int max_cpus)
 {
-        unsigned long bogosum = loops_per_jiffy * num_online_cpus();
-
-        pr_info("SMP: Total of %d processors activated (%lu.%02lu BogoMIPS).\n",
-                num_online_cpus(), bogosum / (500000/HZ),
-                (bogosum / (5000/HZ)) % 100);
+        pr_info("SMP: Total of %d processors activated.\n", num_online_cpus());
 }
 
 void __init smp_prepare_boot_cpu(void)
diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S
index f5e55747242f..f8ab9d8e2ea3 100644
--- a/arch/arm64/kernel/vmlinux.lds.S
+++ b/arch/arm64/kernel/vmlinux.lds.S
@@ -71,6 +71,7 @@ SECTIONS
 
         RO_DATA(PAGE_SIZE)
         EXCEPTION_TABLE(8)
+        NOTES
         _etext = .;                     /* End of text and rodata section */
 
         . = ALIGN(PAGE_SIZE);
@@ -122,8 +123,6 @@ SECTIONS
         }
         _edata_loc = __data_loc + SIZEOF(.data);
 
-        NOTES
-
         BSS_SECTION(0, 0, 0)
         _end = .;
 
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index 6c8ba25bf6bb..c23751b06120 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -130,7 +130,7 @@ static void __do_user_fault(struct task_struct *tsk, unsigned long addr,
         force_sig_info(sig, &si, tsk);
 }
 
-void do_bad_area(unsigned long addr, unsigned int esr, struct pt_regs *regs)
+static void do_bad_area(unsigned long addr, unsigned int esr, struct pt_regs *regs)
 {
         struct task_struct *tsk = current;
         struct mm_struct *mm = tsk->active_mm;
@@ -199,13 +199,6 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr,
         unsigned long vm_flags = VM_READ | VM_WRITE | VM_EXEC;
         unsigned int mm_flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
 
-        if (esr & ESR_LNX_EXEC) {
-                vm_flags = VM_EXEC;
-        } else if ((esr & ESR_WRITE) && !(esr & ESR_CM)) {
-                vm_flags = VM_WRITE;
-                mm_flags |= FAULT_FLAG_WRITE;
-        }
-
         tsk = current;
         mm  = tsk->mm;
 
@@ -220,6 +213,16 @@ static int __kprobes do_page_fault(unsigned long addr, unsigned int esr,
         if (in_atomic() || !mm)
                 goto no_context;
 
+        if (user_mode(regs))
+                mm_flags |= FAULT_FLAG_USER;
+
+        if (esr & ESR_LNX_EXEC) {
+                vm_flags = VM_EXEC;
+        } else if ((esr & ESR_WRITE) && !(esr & ESR_CM)) {
+                vm_flags = VM_WRITE;
+                mm_flags |= FAULT_FLAG_WRITE;
+        }
+
         /*
          * As per x86, we may deadlock here. However, since the kernel only
          * validly references user space from well defined areas of the code,
@@ -288,6 +291,13 @@ retry:
                               VM_FAULT_BADACCESS))))
                 return 0;
 
+        /*
+         * If we are in kernel mode at this point, we have no context to
+         * handle this fault with.
+         */
+        if (!user_mode(regs))
+                goto no_context;
+
         if (fault & VM_FAULT_OOM) {
                 /*
                  * We ran out of memory, call the OOM killer, and return to
@@ -298,13 +308,6 @@ retry:
                 return 0;
         }
 
-        /*
-         * If we are in kernel mode at this point, we have no context to
-         * handle this fault with.
-         */
-        if (!user_mode(regs))
-                goto no_context;
-
         if (fault & VM_FAULT_SIGBUS) {
                 /*
                  * We had some memory, but were unable to successfully fix up
diff --git a/arch/arm64/mm/hugetlbpage.c b/arch/arm64/mm/hugetlbpage.c
index 2fc8258bab2d..5e9aec358306 100644
--- a/arch/arm64/mm/hugetlbpage.c
+++ b/arch/arm64/mm/hugetlbpage.c
@@ -54,6 +54,11 @@ int pud_huge(pud_t pud)
         return !(pud_val(pud) & PUD_TABLE_BIT);
 }
 
+int pmd_huge_support(void)
+{
+        return 1;
+}
+
 static __init int setup_hugepagesz(char *opt)
 {
         unsigned long ps = memparse(opt, &opt);
diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
index 67e8d7ce3fe7..de2de5db628d 100644
--- a/arch/arm64/mm/init.c
+++ b/arch/arm64/mm/init.c
@@ -44,8 +44,7 @@ static unsigned long phys_initrd_size __initdata = 0;
 
 phys_addr_t memstart_addr __read_mostly = 0;
 
-void __init early_init_dt_setup_initrd_arch(unsigned long start,
-                                            unsigned long end)
+void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
 {
         phys_initrd_start = start;
         phys_initrd_size = end - start;
diff --git a/arch/arm64/mm/mmu.c b/arch/arm64/mm/mmu.c
index a8d1059b91b2..f557ebbe7013 100644
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
@@ -296,6 +296,7 @@ void __iomem * __init early_io_map(phys_addr_t phys, unsigned long virt)
 static void __init map_mem(void)
 {
         struct memblock_region *reg;
+        phys_addr_t limit;
 
         /*
          * Temporarily limit the memblock range. We need to do this as
@@ -303,9 +304,11 @@ static void __init map_mem(void)
          * memory addressable from the initial direct kernel mapping.
          *
          * The initial direct kernel mapping, located at swapper_pg_dir,
-         * gives us PGDIR_SIZE memory starting from PHYS_OFFSET (aligned).
+         * gives us PGDIR_SIZE memory starting from PHYS_OFFSET (which must be
+         * aligned to 2MB as per Documentation/arm64/booting.txt).
          */
-        memblock_set_current_limit((PHYS_OFFSET & PGDIR_MASK) + PGDIR_SIZE);
+        limit = PHYS_OFFSET + PGDIR_SIZE;
+        memblock_set_current_limit(limit);
 
         /* map all the memory banks */
         for_each_memblock(memory, reg) {
@@ -315,6 +318,22 @@ static void __init map_mem(void)
                 if (start >= end)
                         break;
 
+#ifndef CONFIG_ARM64_64K_PAGES
+                /*
+                 * For the first memory bank align the start address and
+                 * current memblock limit to prevent create_mapping() from
+                 * allocating pte page tables from unmapped memory.
+                 * When 64K pages are enabled, the pte page table for the
+                 * first PGDIR_SIZE is already present in swapper_pg_dir.
+                 */
+                if (start < limit)
+                        start = ALIGN(start, PMD_SIZE);
+                if (end < limit) {
+                        limit = end & PMD_MASK;
+                        memblock_set_current_limit(limit);
+                }
+#endif
+
                 create_mapping(start, __phys_to_virt(start), end - start);
         }
 
diff --git a/arch/arm64/mm/proc.S b/arch/arm64/mm/proc.S
index a82ae8868077..b1b31bbc967b 100644
--- a/arch/arm64/mm/proc.S
+++ b/arch/arm64/mm/proc.S
@@ -95,10 +95,6 @@ ENTRY(cpu_do_switch_mm)
         ret
 ENDPROC(cpu_do_switch_mm)
 
-cpu_name:
-        .ascii  "AArch64 Processor"
-        .align
-
         .section ".text.init", #alloc, #execinstr
 
 /*
@@ -151,7 +147,7 @@ ENTRY(__cpu_setup)
          * both user and kernel.
          */
         ldr     x10, =TCR_TxSZ(VA_BITS) | TCR_FLAGS | TCR_IPS_40BIT | \
-                      TCR_ASID16 | (1 << 31)
+                      TCR_ASID16 | TCR_TBI0 | (1 << 31)
 #ifdef CONFIG_ARM64_64K_PAGES
         orr     x10, x10, TCR_TG0_64K
         orr     x10, x10, TCR_TG1_64K
diff --git a/arch/avr32/Kconfig b/arch/avr32/Kconfig
index 549903cfc2cb..b6878eb64884 100644
--- a/arch/avr32/Kconfig
+++ b/arch/avr32/Kconfig
@@ -6,7 +6,6 @@ config AVR32
         select HAVE_CLK
         select HAVE_OPROFILE
         select HAVE_KPROBES
-        select HAVE_GENERIC_HARDIRQS
         select VIRT_TO_BUS
         select GENERIC_IRQ_PROBE
         select GENERIC_ATOMIC64
diff --git a/arch/avr32/mach-at32ap/at32ap700x.c b/arch/avr32/mach-at32ap/at32ap700x.c
index 7f8759a8a92a..a68f3cf7c3c1 100644
--- a/arch/avr32/mach-at32ap/at32ap700x.c
+++ b/arch/avr32/mach-at32ap/at32ap700x.c
@@ -1983,6 +1983,9 @@ at32_add_device_nand(unsigned int id, struct atmel_nand_data *data)
                                 ARRAY_SIZE(smc_cs3_resource)))
                 goto fail;
 
+        /* For at32ap7000, we use the reset workaround for nand driver */
+        data->need_reset_workaround = true;
+
         if (platform_device_add_data(pdev, data,
                                 sizeof(struct atmel_nand_data)))
                 goto fail;
diff --git a/arch/avr32/mm/fault.c b/arch/avr32/mm/fault.c
index b2f2d2d66849..0eca93327195 100644
--- a/arch/avr32/mm/fault.c
+++ b/arch/avr32/mm/fault.c
@@ -86,6 +86,8 @@ asmlinkage void do_page_fault(unsigned long ecr, struct pt_regs *regs)
 
         local_irq_enable();
 
+        if (user_mode(regs))
+                flags |= FAULT_FLAG_USER;
 retry:
         down_read(&mm->mmap_sem);
 
@@ -228,9 +230,9 @@ no_context:
          */
 out_of_memory:
         up_read(&mm->mmap_sem);
-        pagefault_out_of_memory();
         if (!user_mode(regs))
                 goto no_context;
+        pagefault_out_of_memory();
         return;
 
 do_sigbus:
diff --git a/arch/avr32/oprofile/op_model_avr32.c b/arch/avr32/oprofile/op_model_avr32.c
index f74b7809e089..08308be2c02c 100644
--- a/arch/avr32/oprofile/op_model_avr32.c
+++ b/arch/avr32/oprofile/op_model_avr32.c
@@ -97,8 +97,7 @@ static irqreturn_t avr32_perf_counter_interrupt(int irq, void *dev_id)
         return IRQ_HANDLED;
 }
 
-static int avr32_perf_counter_create_files(struct super_block *sb,
-                struct dentry *root)
+static int avr32_perf_counter_create_files(struct dentry *root)
 {
         struct dentry *dir;
         unsigned int i;
@@ -106,21 +105,21 @@ static int avr32_perf_counter_create_files(struct super_block *sb,
 
         for (i = 0; i < NR_counter; i++) {
                 snprintf(filename, sizeof(filename), "%u", i);
-                dir = oprofilefs_mkdir(sb, root, filename);
+                dir = oprofilefs_mkdir(root, filename);
 
-                oprofilefs_create_ulong(sb, dir, "enabled",
+                oprofilefs_create_ulong(dir, "enabled",
                                 &counter[i].enabled);
-                oprofilefs_create_ulong(sb, dir, "event",
+                oprofilefs_create_ulong(dir, "event",
                                 &counter[i].event);
-                oprofilefs_create_ulong(sb, dir, "count",
+                oprofilefs_create_ulong(dir, "count",
                                 &counter[i].count);
 
                 /* Dummy entries */
-                oprofilefs_create_ulong(sb, dir, "kernel",
+                oprofilefs_create_ulong(dir, "kernel",
                                 &counter[i].kernel);
-                oprofilefs_create_ulong(sb, dir, "user",
+                oprofilefs_create_ulong(dir, "user",
                                 &counter[i].user);
-                oprofilefs_create_ulong(sb, dir, "unit_mask",
+                oprofilefs_create_ulong(dir, "unit_mask",
                                 &counter[i].unit_mask);
         }
 
diff --git a/arch/blackfin/Kconfig b/arch/blackfin/Kconfig
index 3b6abc54b015..f78c9a2c7e28 100644
--- a/arch/blackfin/Kconfig
+++ b/arch/blackfin/Kconfig
@@ -32,7 +32,6 @@ config BLACKFIN
         select HAVE_UNDERSCORE_SYMBOL_PREFIX
         select VIRT_TO_BUS
         select ARCH_WANT_IPC_PARSE_VERSION
-        select HAVE_GENERIC_HARDIRQS
         select GENERIC_ATOMIC64
         select GENERIC_IRQ_PROBE
         select USE_GENERIC_SMP_HELPERS if SMP
diff --git a/arch/blackfin/boot/.gitignore b/arch/blackfin/boot/.gitignore
index 229e50808677..1287a5487e7d 100644
--- a/arch/blackfin/boot/.gitignore
+++ b/arch/blackfin/boot/.gitignore
@@ -1,2 +1,3 @@
 vmImage*
 vmlinux*
+uImage*
diff --git a/arch/blackfin/include/asm/scb.h b/arch/blackfin/include/asm/scb.h
new file mode 100644
index 000000000000..a294cc0d1a4a
--- /dev/null
+++ b/arch/blackfin/include/asm/scb.h
@@ -0,0 +1,21 @@
+/*
+ * arch/blackfin/mach-common/scb-init.c - reprogram system cross bar priority
+ *
+ * Copyright 2012 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#define SCB_SLOT_OFFSET 24
+#define SCB_MI_MAX_SLOT 32
+
+struct scb_mi_prio {
+        unsigned long scb_mi_arbr;
+        unsigned long scb_mi_arbw;
+        unsigned char scb_mi_slots;
+        unsigned char scb_mi_prio[SCB_MI_MAX_SLOT];
+};
+
+extern struct scb_mi_prio scb_data[];
+
+extern void init_scb(void);
diff --git a/arch/blackfin/kernel/setup.c b/arch/blackfin/kernel/setup.c
index 19ad0637e8ff..396193042127 100644
--- a/arch/blackfin/kernel/setup.c
+++ b/arch/blackfin/kernel/setup.c
@@ -35,6 +35,9 @@
 #ifdef CONFIG_BF60x
 #include <mach/pm.h>
 #endif
+#ifdef CONFIG_SCB_PRIORITY
+#include <asm/scb.h>
+#endif
 
 u16 _bfin_swrst;
 EXPORT_SYMBOL(_bfin_swrst);
@@ -1101,6 +1104,9 @@ void __init setup_arch(char **cmdline_p)
 #endif
         init_exception_vectors();
         bfin_cache_init();      /* Initialize caches for the boot CPU */
+#ifdef CONFIG_SCB_PRIORITY
+        init_scb();
+#endif
 }
 
 static int __init topology_init(void)
diff --git a/arch/blackfin/mach-bf609/Kconfig b/arch/blackfin/mach-bf609/Kconfig
index 95a4f1b676ce..2bcbf94b1edf 100644
--- a/arch/blackfin/mach-bf609/Kconfig
+++ b/arch/blackfin/mach-bf609/Kconfig
@@ -59,6 +59,1661 @@ config SEC_IRQ_PRIORITY_LEVELS
           Divide the total number of interrupt priority levels into sub-levels.
           There is 2 ^ (SEC_IRQ_PRIORITY_LEVELS + 1) different levels.
 
+
+comment "System Cross Bar Priority Assignment"
+
+config SCB_PRIORITY
+        bool "Init System Cross Bar Priority"
+        default n
+
+menuconfig      SCB0_MI0
+        bool "SCB0 Master Interface 0 (DDR)"
+        default n
+        depends on SCB_PRIORITY
+        help
+        The slave interface id of each slot should be set according following table.
+        Core 0  -- 0
+        Core 1  -- 2
+        SCB1    -- 9
+        SCB2    -- 10
+        SCB3    -- 11
+        SCB4    -- 12
+        SCB5    -- 5
+        SCB6    -- 6
+        SCB7    -- 8
+        SCB8    -- 7
+        SCB9    -- 4
+        USB     -- 13
+
+if SCB0_MI0
+
+config SCB0_MI0_SLOT0
+        int "Slot 0 slave interface id"
+        default 0
+        range 0 13
+
+config SCB0_MI0_SLOT1
+        int "Slot 1 slave interface id"
+        default 2
+        range 0 13
+
+config SCB0_MI0_SLOT2
+        int "Slot 2 slave interface id"
+        default 4
+        range 0 13
+
+config SCB0_MI0_SLOT3
+        int "Slot 3 slave interface id"
+        default 5
+        range 0 13
+
+config SCB0_MI0_SLOT4
+        int "Slot 4 slave interface id"
+        default 6
+        range 0 13
+
+config SCB0_MI0_SLOT5
+        int "Slot 5 slave interface id"
+        default 7
+        range 0 13
+
+config SCB0_MI0_SLOT6
+        int "Slot 6 slave interface id"
+        default 8
+        range 0 13
+
+config SCB0_MI0_SLOT7
+        int "Slot 7 slave interface id"
+        default 9
+        range 0 13
+
+config SCB0_MI0_SLOT8
+        int "Slot 8 slave interface id"
+        default 10
+        range 0 13
+
+config SCB0_MI0_SLOT9
+        int "Slot 9 slave interface id"
+        default 11
+        range 0 13
+
+config SCB0_MI0_SLOT10
+        int "Slot 10 slave interface id"
+        default 13
+        range 0 13
+
+config SCB0_MI0_SLOT11
+        int "Slot 11 slave interface id"
+        default 12
+        range 0 13
+
+config SCB0_MI0_SLOT12
+        int "Slot 12 slave interface id"
+        default 0
+        range 0 13
+
+config SCB0_MI0_SLOT13
+        int "Slot 13 slave interface id"
+        default 2
+        range 0 13
+
+config SCB0_MI0_SLOT14
+        int "Slot 14 slave interface id"
+        default 4
+        range 0 13
+
+config SCB0_MI0_SLOT15
+        int "Slot 15 slave interface id"
+        default 5
+        range 0 13
+
+config SCB0_MI0_SLOT16
+        int "Slot 16 slave interface id"
+        default 6
+        range 0 13
+
+config SCB0_MI0_SLOT17
+        int "Slot 17 slave interface id"
+        default 7
+        range 0 13
+
+config SCB0_MI0_SLOT18
+        int "Slot 18 slave interface id"
+        default 8
+        range 0 13
+
+config SCB0_MI0_SLOT19
+        int "Slot 19 slave interface id"
+        default 9
+        range 0 13
+
+config SCB0_MI0_SLOT20
+        int "Slot 20 slave interface id"
+        default 10
+        range 0 13
+
+config SCB0_MI0_SLOT21
+        int "Slot 21 slave interface id"
+        default 11
+        range 0 13
+
+config SCB0_MI0_SLOT22
+        int "Slot 22 slave interface id"
+        default 13
+        range 0 13
+
+config SCB0_MI0_SLOT23
+        int "Slot 23 slave interface id"
+        default 12
+        range 0 13
+
+config SCB0_MI0_SLOT24
+        int "Slot 24 slave interface id"
+        default 0
+        range 0 13
+
+config SCB0_MI0_SLOT25
+        int "Slot 25 slave interface id"
+        default 2
+        range 0 13
+
+config SCB0_MI0_SLOT26
+        int "Slot 26 slave interface id"
+        default 4
+        range 0 13
+
+config SCB0_MI0_SLOT27
+        int "Slot 27 slave interface id"
+        default 5
+        range 0 13
+
+config SCB0_MI0_SLOT28
+        int "Slot 28 slave interface id"
+        default 6
+        range 0 13
+
+config SCB0_MI0_SLOT29
+        int "Slot 29 slave interface id"
+        default 7
+        range 0 13
+
+config SCB0_MI0_SLOT30
+        int "Slot 30 slave interface id"
+        default 8
+        range 0 13
+
+config SCB0_MI0_SLOT31
+        int "Slot 31 slave interface id"
+        default 13
+        range 0 13
+
+endif # SCB0_MI0
+
+menuconfig      SCB0_MI1
+        bool "SCB0 Master Interface 1 (SMC)"
+        default n
+        depends on SCB_PRIORITY
+        help
+        The slave interface id of each slot should be set according following table.
+        Core 0  -- 0
+        Core 1  -- 2
+        SCB1    -- 9
+        SCB2    -- 10
+        SCB3    -- 11
+        SCB4    -- 12
+        SCB5    -- 5
+        SCB6    -- 6
+        SCB7    -- 8
+        SCB8    -- 7
+        SCB9    -- 4
+        USB     -- 13
+
+if SCB0_MI1
+
+config SCB0_MI1_SLOT0
+        int "Slot 0 slave interface id"
+        default 0
+        range 0 13
+
+config SCB0_MI1_SLOT1
+        int "Slot 1 slave interface id"
+        default 2
+        range 0 13
+
+config SCB0_MI1_SLOT2
+        int "Slot 2 slave interface id"
+        default 4
+        range 0 13
+
+config SCB0_MI1_SLOT3
+        int "Slot 3 slave interface id"
+        default 5
+        range 0 13
+
+config SCB0_MI1_SLOT4
+        int "Slot 4 slave interface id"
+        default 6
+        range 0 13
+
+config SCB0_MI1_SLOT5
+        int "Slot 5 slave interface id"
+        default 7
+        range 0 13
+
+config SCB0_MI1_SLOT6
+        int "Slot 6 slave interface id"
+        default 8
+        range 0 13
+
+config SCB0_MI1_SLOT7
+        int "Slot 7 slave interface id"
+        default 9
+        range 0 13
+
+config SCB0_MI1_SLOT8
+        int "Slot 8 slave interface id"
+        default 10
+        range 0 13
+
+config SCB0_MI1_SLOT9
+        int "Slot 9 slave interface id"
+        default 11
+        range 0 13
+
+config SCB0_MI1_SLOT10
+        int "Slot 10 slave interface id"
+        default 13
+        range 0 13
+
+config SCB0_MI1_SLOT11
+        int "Slot 11 slave interface id"
+        default 12
+        range 0 13
+
+config SCB0_MI1_SLOT12
+        int "Slot 12 slave interface id"
+        default 0
+        range 0 13
+
+config SCB0_MI1_SLOT13
+        int "Slot 13 slave interface id"
+        default 2
+        range 0 13
+
+config SCB0_MI1_SLOT14
+        int "Slot 14 slave interface id"
+        default 4
+        range 0 13
+
+config SCB0_MI1_SLOT15
+        int "Slot 15 slave interface id"
+        default 5
+        range 0 13
+
+config SCB0_MI1_SLOT16
+        int "Slot 16 slave interface id"
+        default 6
+        range 0 13
+
+config SCB0_MI1_SLOT17
+        int "Slot 17 slave interface id"
+        default 7
+        range 0 13
+
+config SCB0_MI1_SLOT18
+        int "Slot 18 slave interface id"
+        default 8
+        range 0 13
+
+config SCB0_MI1_SLOT19
+        int "Slot 19 slave interface id"
+        default 9
+        range 0 13
+
+config SCB0_MI1_SLOT20
+        int "Slot 20 slave interface id"
+        default 10
+        range 0 13
+
+config SCB0_MI1_SLOT21
+        int "Slot 21 slave interface id"
+        default 11
+        range 0 13
+
+config SCB0_MI1_SLOT22
+        int "Slot 22 slave interface id"
+        default 13
+        range 0 13
+
+config SCB0_MI1_SLOT23
+        int "Slot 23 slave interface id"
+        default 12
+        range 0 13
+
+config SCB0_MI1_SLOT24
+        int "Slot 24 slave interface id"
+        default 0
+        range 0 13
+
+config SCB0_MI1_SLOT25
+        int "Slot 25 slave interface id"
+        default 2
+        range 0 13
+
+config SCB0_MI1_SLOT26
+        int "Slot 26 slave interface id"
+        default 4
+        range 0 13
+
+config SCB0_MI1_SLOT27
+        int "Slot 27 slave interface id"
+        default 5
+        range 0 13
+
+config SCB0_MI1_SLOT28
+        int "Slot 28 slave interface id"
+        default 6
+        range 0 13
+
+config SCB0_MI1_SLOT29
+        int "Slot 29 slave interface id"
+        default 7
+        range 0 13
+
+config SCB0_MI1_SLOT30
+        int "Slot 30 slave interface id"
+        default 8
+        range 0 13
+
+config SCB0_MI1_SLOT31
+        int "Slot 31 slave interface id"
+        default 13
+        range 0 13
+
+endif # SCB0_MI1
+
+menuconfig      SCB0_MI2
+        bool "SCB0 Master Interface 2 (Data L2)"
+        default n
+        depends on SCB_PRIORITY
+        help
+        The slave interface id of each slot should be set according following table.
+        Core 0  -- 0
+        Core 1  -- 2
+        SCB1    -- 9
+        SCB2    -- 10
+        SCB3    -- 11
+        SCB4    -- 12
+        SCB5    -- 5
+        SCB6    -- 6
+        SCB7    -- 8
+        SCB8    -- 7
+        SCB9    -- 4
+        USB     -- 13
+
+if SCB0_MI2
+
+config SCB0_MI2_SLOT0
+        int "Slot 0 slave interface id"
+        default 4
+        range 0 13
+
+config SCB0_MI2_SLOT1
+        int "Slot 1 slave interface id"
+        default 5
+        range 0 13
+
+config SCB0_MI2_SLOT2
+        int "Slot 2 slave interface id"
+        default 6
+        range 0 13
+
+config SCB0_MI2_SLOT3
+        int "Slot 3 slave interface id"
+        default 7
+        range 0 13
+
+config SCB0_MI2_SLOT4
+        int "Slot 4 slave interface id"
+        default 8
+        range 0 13
+
+config SCB0_MI2_SLOT5
+        int "Slot 5 slave interface id"
+        default 9
+        range 0 13
+
+config SCB0_MI2_SLOT6
+        int "Slot 6 slave interface id"
+        default 10
+        range 0 13
+
+config SCB0_MI2_SLOT7
+        int "Slot 7 slave interface id"
+        default 11
+        range 0 13
+
+config SCB0_MI2_SLOT8
+        int "Slot 8 slave interface id"
+        default 13
+        range 0 13
+
+config SCB0_MI2_SLOT9
+        int "Slot 9 slave interface id"
+        default 12
+        range 0 13
+
+config SCB0_MI2_SLOT10
+        int "Slot 10 slave interface id"
+        default 4
+        range 0 13
+
+config SCB0_MI2_SLOT11
+        int "Slot 11 slave interface id"
+        default 5
+        range 0 13
+
+config SCB0_MI2_SLOT12
+        int "Slot 12 slave interface id"
+        default 6
+        range 0 13
+
+config SCB0_MI2_SLOT13
+        int "Slot 13 slave interface id"
+        default 7
+        range 0 13
+
+config SCB0_MI2_SLOT14
+        int "Slot 14 slave interface id"
+        default 8
+        range 0 13
+
+config SCB0_MI2_SLOT15
+        int "Slot 15 slave interface id"
+        default 9
+        range 0 13
+
+config SCB0_MI2_SLOT16
+        int "Slot 16 slave interface id"
+        default 10
+        range 0 13
+
+config SCB0_MI2_SLOT17
+        int "Slot 17 slave interface id"
+        default 11
+        range 0 13
+
+config SCB0_MI2_SLOT18
+        int "Slot 18 slave interface id"
+        default 13
+        range 0 13
+
+config SCB0_MI2_SLOT19
+        int "Slot 19 slave interface id"
+        default 12
+        range 0 13
+
+config SCB0_MI2_SLOT20
+        int "Slot 20 slave interface id"
+        default 4
+        range 0 13
+
+config SCB0_MI2_SLOT21
+        int "Slot 21 slave interface id"
+        default 5
+        range 0 13
+
+config SCB0_MI2_SLOT22
+        int "Slot 22 slave interface id"
+        default 6
+        range 0 13
+
+config SCB0_MI2_SLOT23
+        int "Slot 23 slave interface id"
+        default 7
+        range 0 13
+
+config SCB0_MI2_SLOT24
+        int "Slot 24 slave interface id"
+        default 8
+        range 0 13
+
+config SCB0_MI2_SLOT25
+        int "Slot 25 slave interface id"
+        default 9
+        range 0 13
+
+config SCB0_MI2_SLOT26
+        int "Slot 26 slave interface id"
+        default 10
+        range 0 13
+
+config SCB0_MI2_SLOT27
+        int "Slot 27 slave interface id"
+        default 11
+        range 0 13
+
+config SCB0_MI2_SLOT28
+        int "Slot 28 slave interface id"
+        default 13
+        range 0 13
+
+config SCB0_MI2_SLOT29
+        int "Slot 29 slave interface id"
+        default 12
+        range 0 13
+
+config SCB0_MI2_SLOT30
+        int "Slot 30 slave interface id"
+        default 4
+        range 0 13
+
+config SCB0_MI2_SLOT31
+        int "Slot 31 slave interface id"
+        default 7
+        range 0 13
+
+endif # SCB0_MI2
+
+menuconfig      SCB0_MI3
+        bool "SCB0 Master Interface 3 (L1A)"
+        default n
+        depends on SCB_PRIORITY
+        help
+        The slave interface id of each slot should be set according following table.
+        Core 0  -- 0
+        Core 1  -- 2
+        SCB1    -- 9
+        SCB2    -- 10
+        SCB3    -- 11
+        SCB4    -- 12
+        SCB5    -- 5
+        SCB6    -- 6
+        SCB7    -- 8
+        SCB8    -- 7
+        SCB9    -- 4
+        USB     -- 13
+
+if SCB0_MI3
+
+config SCB0_MI3_SLOT0
+        int "Slot 0 slave interface id"
+        default 4
+        range 0 13
+
+config SCB0_MI3_SLOT1
+        int "Slot 1 slave interface id"
+        default 5
+        range 0 13
+
+config SCB0_MI3_SLOT2
+        int "Slot 2 slave interface id"
+        default 6
+        range 0 13
+
+config SCB0_MI3_SLOT3
+        int "Slot 3 slave interface id"
+        default 7
+        range 0 13
+
+config SCB0_MI3_SLOT4
+        int "Slot 4 slave interface id"
+        default 8
+        range 0 13
+
+config SCB0_MI3_SLOT5
+        int "Slot 5 slave interface id"
+        default 9
+        range 0 13
+
+config SCB0_MI3_SLOT6
+        int "Slot 6 slave interface id"
+        default 10
+        range 0 13
+
+config SCB0_MI3_SLOT7
+        int "Slot 7 slave interface id"
+        default 11
+        range 0 13
+
+config SCB0_MI3_SLOT8
+        int "Slot 8 slave interface id"
+        default 13
+        range 0 13
+
+config SCB0_MI3_SLOT9
+        int "Slot 9 slave interface id"
+        default 12
+        range 0 13
+
+config SCB0_MI3_SLOT10
+        int "Slot 10 slave interface id"
+        default 4
+        range 0 13
+
+config SCB0_MI3_SLOT11
+        int "Slot 11 slave interface id"
+        default 5
+        range 0 13
+
+config SCB0_MI3_SLOT12
+        int "Slot 12 slave interface id"
+        default 6
+        range 0 13
+
+config SCB0_MI3_SLOT13
+        int "Slot 13 slave interface id"
+        default 7
+        range 0 13
+
+config SCB0_MI3_SLOT14
+        int "Slot 14 slave interface id"
+        default 8
+        range 0 13
+
+config SCB0_MI3_SLOT15
+        int "Slot 15 slave interface id"
+        default 9
+        range 0 13
+
+config SCB0_MI3_SLOT16
+        int "Slot 16 slave interface id"
+        default 10
+        range 0 13
+
+config SCB0_MI3_SLOT17
+        int "Slot 17 slave interface id"
+        default 11
+        range 0 13
+
+config SCB0_MI3_SLOT18
+        int "Slot 18 slave interface id"
+        default 13
+        range 0 13
+
+config SCB0_MI3_SLOT19
+        int "Slot 19 slave interface id"
+        default 12
+        range 0 13
+
+config SCB0_MI3_SLOT20
+        int "Slot 20 slave interface id"
+        default 4
+        range 0 13
+
+config SCB0_MI3_SLOT21
+        int "Slot 21 slave interface id"
+        default 5
+        range 0 13
+
+config SCB0_MI3_SLOT22
+        int "Slot 22 slave interface id"
+        default 6
+        range 0 13
+
+config SCB0_MI3_SLOT23
+        int "Slot 23 slave interface id"
+        default 7
+        range 0 13
+
+config SCB0_MI3_SLOT24
+        int "Slot 24 slave interface id"
+        default 8
+        range 0 13
+
+config SCB0_MI3_SLOT25
+        int "Slot 25 slave interface id"
+        default 9
+        range 0 13
+
+config SCB0_MI3_SLOT26
+        int "Slot 26 slave interface id"
+        default 10
+        range 0 13
+
+config SCB0_MI3_SLOT27
+        int "Slot 27 slave interface id"
+        default 11
+        range 0 13
+
+config SCB0_MI3_SLOT28
+        int "Slot 28 slave interface id"
+        default 13
+        range 0 13
+
+config SCB0_MI3_SLOT29
+        int "Slot 29 slave interface id"
+        default 12
+        range 0 13
+
+config SCB0_MI3_SLOT30
+        int "Slot 30 slave interface id"
+        default 4
+        range 0 13
+
+config SCB0_MI3_SLOT31
+        int "Slot 31 slave interface id"
+        default 7
+        range 0 13
+
+endif # SCB0_MI3
+
+menuconfig      SCB0_MI4
+        bool "SCB0 Master Interface 4 (L1B)"
+        default n
+        depends on SCB_PRIORITY
+        help
+        The slave interface id of each slot should be set according following table.
+        Core 0  -- 0
+        Core 1  -- 2
+        SCB1    -- 9
+        SCB2    -- 10
+        SCB3    -- 11
+        SCB4    -- 12
+        SCB5    -- 5
+        SCB6    -- 6
+        SCB7    -- 8
+        SCB8    -- 7
+        SCB9    -- 4
+        USB     -- 13
+
+if SCB0_MI4
+
+config SCB0_MI4_SLOT0
+        int "Slot 0 slave interface id"
+        default 4
+        range 0 13
+
+config SCB0_MI4_SLOT1
+        int "Slot 1 slave interface id"
+        default 5
+        range 0 13
+
+config SCB0_MI4_SLOT2
+        int "Slot 2 slave interface id"
+        default 6
+        range 0 13
+
+config SCB0_MI4_SLOT3
+        int "Slot 3 slave interface id"
+        default 7
+        range 0 13
+
+config SCB0_MI4_SLOT4
+        int "Slot 4 slave interface id"
+        default 8
+        range 0 13
+
+config SCB0_MI4_SLOT5
+        int "Slot 5 slave interface id"
+        default 9
+        range 0 13
+
+config SCB0_MI4_SLOT6
+        int "Slot 6 slave interface id"
+        default 10
+        range 0 13
+
+config SCB0_MI4_SLOT7
+        int "Slot 7 slave interface id"
+        default 11
+        range 0 13
+
+config SCB0_MI4_SLOT8
+        int "Slot 8 slave interface id"
+        default 13
+        range 0 13
+
+config SCB0_MI4_SLOT9
+        int "Slot 9 slave interface id"
+        default 12
+        range 0 13
+
+config SCB0_MI4_SLOT10
+        int "Slot 10 slave interface id"
+        default 4
+        range 0 13
+
+config SCB0_MI4_SLOT11
+        int "Slot 11 slave interface id"
+        default 5
+        range 0 13
+
+config SCB0_MI4_SLOT12
+        int "Slot 12 slave interface id"
+        default 6
+        range 0 13
+
+config SCB0_MI4_SLOT13
+        int "Slot 13 slave interface id"
+        default 7
+        range 0 13
+
+config SCB0_MI4_SLOT14
+        int "Slot 14 slave interface id"
+        default 8
+        range 0 13
+
+config SCB0_MI4_SLOT15
+        int "Slot 15 slave interface id"
+        default 9
+        range 0 13
+
+config SCB0_MI4_SLOT16
+        int "Slot 16 slave interface id"
+        default 10
+        range 0 13
+
+config SCB0_MI4_SLOT17
+        int "Slot 17 slave interface id"
+        default 11
+        range 0 13
+
+config SCB0_MI4_SLOT18
+        int "Slot 18 slave interface id"
+        default 13
+        range 0 13
+
+config SCB0_MI4_SLOT19
+        int "Slot 19 slave interface id"
+        default 12
+        range 0 13
+
+config SCB0_MI4_SLOT20
+        int "Slot 20 slave interface id"
+        default 4
+        range 0 13
+
+config SCB0_MI4_SLOT21
+        int "Slot 21 slave interface id"
+        default 5
+        range 0 13
+
+config SCB0_MI4_SLOT22
+        int "Slot 22 slave interface id"
+        default 6
+        range 0 13
+
+config SCB0_MI4_SLOT23
+        int "Slot 23 slave interface id"
+        default 7
+        range 0 13
+
+config SCB0_MI4_SLOT24
+        int "Slot 24 slave interface id"
+        default 8
+        range 0 13
+
+config SCB0_MI4_SLOT25
+        int "Slot 25 slave interface id"
+        default 9
+        range 0 13
+
+config SCB0_MI4_SLOT26
+        int "Slot 26 slave interface id"
+        default 10
+        range 0 13
+
+config SCB0_MI4_SLOT27
+        int "Slot 27 slave interface id"
+        default 11
+        range 0 13
+
+config SCB0_MI4_SLOT28
+        int "Slot 28 slave interface id"
+        default 13
+        range 0 13
+
+config SCB0_MI4_SLOT29
+        int "Slot 29 slave interface id"
+        default 12
+        range 0 13
+
+config SCB0_MI4_SLOT30
+        int "Slot 30 slave interface id"
+        default 4
+        range 0 13
+
+config SCB0_MI4_SLOT31
+        int "Slot 31 slave interface id"
+        default 7
+        range 0 13
+
+endif # SCB0_MI4
+
+menuconfig      SCB0_MI5
+        bool "SCB0 Master Interface 5 (SMMR)"
+        default n
+        depends on SCB_PRIORITY
+        help
+        The slave interface id of each slot should be set according following table.
+        MMR0    -- 1
+        MMR1    -- 3
+        SCB2    -- 10
+        SCB4    -- 12
+
+if SCB0_MI5
+
+config SCB0_MI5_SLOT0
+        int "Slot 0 slave interface id"
+        default 1
+        range 0 13
+
+config SCB0_MI5_SLOT1
+        int "Slot 1 slave interface id"
+        default 3
+        range 0 13
+
+config SCB0_MI5_SLOT2
+        int "Slot 2 slave interface id"
+        default 10
+        range 0 13
+
+config SCB0_MI5_SLOT3
+        int "Slot 3 slave interface id"
+        default 12
+        range 0 13
+
+config SCB0_MI5_SLOT4
+        int "Slot 4 slave interface id"
+        default 1
+        range 0 13
+
+config SCB0_MI5_SLOT5
+        int "Slot 5 slave interface id"
+        default 3
+        range 0 13
+
+config SCB0_MI5_SLOT6
+        int "Slot 6 slave interface id"
+        default 10
+        range 0 13
+
+config SCB0_MI5_SLOT7
+        int "Slot 7 slave interface id"
+        default 12
+        range 0 13
+
+config SCB0_MI5_SLOT8
+        int "Slot 8 slave interface id"
+        default 1
+        range 0 13
+
+config SCB0_MI5_SLOT9
+        int "Slot 9 slave interface id"
+        default 3
+        range 0 13
+
+config SCB0_MI5_SLOT10
+        int "Slot 10 slave interface id"
+        default 10
+        range 0 13
+
+config SCB0_MI5_SLOT11
+        int "Slot 11 slave interface id"
+        default 12
+        range 0 13
+
+config SCB0_MI5_SLOT12
+        int "Slot 12 slave interface id"
+        default 1
+        range 0 13
+
+config SCB0_MI5_SLOT13
+        int "Slot 13 slave interface id"
+        default 3
+        range 0 13
+
+config SCB0_MI5_SLOT14
+        int "Slot 14 slave interface id"
+        default 10
+        range 0 13
+
+config SCB0_MI5_SLOT15
+        int "Slot 15 slave interface id"
+        default 12
+        range 0 13
+
+endif # SCB0_MI5
+
+menuconfig      SCB1_MI0
+        bool "SCB1 Master Interface 0"
+        default n
+        depends on SCB_PRIORITY
+        help
+        The slave interface id of each slot should be set according following table.
+        SPORT0A -- 0
+        SPORT0B -- 1
+        SPORT1A -- 2
+        SPORT1B -- 3
+        SPORT2A -- 4
+        SPORT2B -- 5
+        SPI0TX  -- 6
+        SPI0RX  -- 7
+        SPI1TX  -- 8
+        SPI1RX  -- 9
+
+if SCB1_MI0
+
+config SCB1_MI0_SLOT0
+        int "Slot 0 slave interface id"
+        default 0
+        range 0 9
+
+config SCB1_MI0_SLOT1
+        int "Slot 1 slave interface id"
+        default 1
+        range 0 9
+
+config SCB1_MI0_SLOT2
+        int "Slot 2 slave interface id"
+        default 2
+        range 0 9
+
+config SCB1_MI0_SLOT3
+        int "Slot 3 slave interface id"
+        default 3
+        range 0 9
+
+config SCB1_MI0_SLOT4
+        int "Slot 4 slave interface id"
+        default 4
+        range 0 9
+
+config SCB1_MI0_SLOT5
+        int "Slot 5 slave interface id"
+        default 5
+        range 0 9
+
+config SCB1_MI0_SLOT6
+        int "Slot 6 slave interface id"
+        default 6
+        range 0 9
+
+config SCB1_MI0_SLOT7
+        int "Slot 7 slave interface id"
+        default 7
+        range 0 9
+
+config SCB1_MI0_SLOT8
+        int "Slot 8 slave interface id"
+        default 8
+        range 0 9
+
+config SCB1_MI0_SLOT9
+        int "Slot 9 slave interface id"
+        default 9
+        range 0 9
+
+config SCB1_MI0_SLOT10
+        int "Slot 10 slave interface id"
+        default 0
+        range 0 9
+
+config SCB1_MI0_SLOT11
+        int "Slot 11 slave interface id"
+        default 1
+        range 0 9
+
+config SCB1_MI0_SLOT12
+        int "Slot 12 slave interface id"
+        default 2
+        range 0 9
+
+config SCB1_MI0_SLOT13
+        int "Slot 13 slave interface id"
+        default 3
+        range 0 9
+
+config SCB1_MI0_SLOT14
+        int "Slot 14 slave interface id"
+        default 4
+        range 0 9
+
+config SCB1_MI0_SLOT15
+        int "Slot 15 slave interface id"
+        default 5
+        range 0 9
+
+config SCB1_MI0_SLOT16
+        int "Slot 16 slave interface id"
+        default 6
+        range 0 13
+
+config SCB1_MI0_SLOT17
+        int "Slot 17 slave interface id"
+        default 7
+        range 0 13
+
+config SCB1_MI0_SLOT18
+        int "Slot 18 slave interface id"
+        default 8
+        range 0 13
+
+config SCB1_MI0_SLOT19
+        int "Slot 19 slave interface id"
+        default 9
+        range 0 13
+
+endif # SCB1_MI0
+
+menuconfig      SCB2_MI0
+        bool "SCB2 Master Interface 0"
+        default n
+        depends on SCB_PRIORITY
+        help
+        The slave interface id of each slot should be set according following table.
+        RSI     -- 0
+        SDU DMA -- 1
+        SDU     -- 2
+        EMAC0   -- 3
+        EMAC1   -- 4
+
+if SCB2_MI0
+
+config SCB2_MI0_SLOT0
+        int "Slot 0 slave interface id"
+        default 0
+        range 0 4
+
+config SCB2_MI0_SLOT1
+        int "Slot 1 slave interface id"
+        default 1
+        range 0 4
+
+config SCB2_MI0_SLOT2
+        int "Slot 2 slave interface id"
+        default 2
+        range 0 4
+
+config SCB2_MI0_SLOT3
+        int "Slot 3 slave interface id"
+        default 3
+        range 0 4
+
+config SCB2_MI0_SLOT4
+        int "Slot 4 slave interface id"
+        default 4
+        range 0 4
+
+config SCB2_MI0_SLOT5
+        int "Slot 5 slave interface id"
+        default 0
+        range 0 4
+
+config SCB2_MI0_SLOT6
+        int "Slot 6 slave interface id"
+        default 1
+        range 0 4
+
+config SCB2_MI0_SLOT7
+        int "Slot 7 slave interface id"
+        default 2
+        range 0 4
+
+config SCB2_MI0_SLOT8
+        int "Slot 8 slave interface id"
+        default 3
+        range 0 4
+
+config SCB2_MI0_SLOT9
+        int "Slot 9 slave interface id"
+        default 4
+        range 0 4
+
+endif # SCB2_MI0
+
+menuconfig      SCB3_MI0
+        bool "SCB3 Master Interface 0"
+        default n
+        depends on SCB_PRIORITY
+        help
+        The slave interface id of each slot should be set according following table.
+        LP0     -- 0
+        LP1     -- 1
+        LP2     -- 2
+        LP3     -- 3
+        UART0TX -- 4
+        UART0RX -- 5
+        UART1TX -- 4
+        UART1RX -- 5
+
+if SCB3_MI0
+
+config SCB3_MI0_SLOT0
+        int "Slot 0 slave interface id"
+        default 0
+        range 0 7
+
+config SCB3_MI0_SLOT1
+        int "Slot 1 slave interface id"
+        default 1
+        range 0 7
+
+config SCB3_MI0_SLOT2
+        int "Slot 2 slave interface id"
+        default 2
+        range 0 7
+
+config SCB3_MI0_SLOT3
+        int "Slot 3 slave interface id"
+        default 3
+        range 0 7
+
+config SCB3_MI0_SLOT4
+        int "Slot 4 slave interface id"
+        default 4
+        range 0 7
+
+config SCB3_MI0_SLOT5
+        int "Slot 5 slave interface id"
+        default 5
+        range 0 7
+
+config SCB3_MI0_SLOT6
+        int "Slot 6 slave interface id"
+        default 6
+        range 0 7
+
+config SCB3_MI0_SLOT7
+        int "Slot 7 slave interface id"
+        default 7
+        range 0 7
+
+config SCB3_MI0_SLOT8
+        int "Slot 8 slave interface id"
+        default 0
+        range 0 7
+
+config SCB3_MI0_SLOT9
+        int "Slot 9 slave interface id"
+        default 1
+        range 0 7
+
+config SCB3_MI0_SLOT10
+        int "Slot 10 slave interface id"
+        default 2
+        range 0 7
+
+config SCB3_MI0_SLOT11
+        int "Slot 11 slave interface id"
+        default 3
+        range 0 7
+
+config SCB3_MI0_SLOT12
+        int "Slot 12 slave interface id"
+        default 4
+        range 0 7
+
+config SCB3_MI0_SLOT13
+        int "Slot 13 slave interface id"
+        default 5
+        range 0 7
+
+config SCB3_MI0_SLOT14
+        int "Slot 14 slave interface id"
+        default 6
+        range 0 7
+
+config SCB3_MI0_SLOT15
+        int "Slot 15 slave interface id"
+        default 7
+        range 0 7
+
+endif # SCB3_MI0
+
+menuconfig      SCB4_MI0
+        bool "SCB4 Master Interface 0"
+        default n
+        depends on SCB_PRIORITY
+        help
+        The slave interface id of each slot should be set according following table.
+        MDA21   -- 0
+        MDA22   -- 1
+        MDA23   -- 2
+        MDA24   -- 3
+        MDA25   -- 4
+        MDA26   -- 5
+        MDA27   -- 6
+        MDA28   -- 7
+
+if SCB4_MI0
+
+config SCB4_MI0_SLOT0
+        int "Slot 0 slave interface id"
+        default 0
+        range 0 7
+
+config SCB4_MI0_SLOT1
+        int "Slot 1 slave interface id"
+        default 1
+        range 0 7
+
+config SCB4_MI0_SLOT2
+        int "Slot 2 slave interface id"
+        default 2
+        range 0 7
+
+config SCB4_MI0_SLOT3
+        int "Slot 3 slave interface id"
+        default 3
+        range 0 7
+
+config SCB4_MI0_SLOT4
+        int "Slot 4 slave interface id"
+        default 4
+        range 0 7
+
+config SCB4_MI0_SLOT5
+        int "Slot 5 slave interface id"
+        default 5
+        range 0 7
+
+config SCB4_MI0_SLOT6
+        int "Slot 6 slave interface id"
+        default 6
+        range 0 7
+
+config SCB4_MI0_SLOT7
+        int "Slot 7 slave interface id"
+        default 7
+        range 0 7
+
+config SCB4_MI0_SLOT8
+        int "Slot 8 slave interface id"
+        default 0
+        range 0 7
+
+config SCB4_MI0_SLOT9
+        int "Slot 9 slave interface id"
+        default 1
+        range 0 7
+
+config SCB4_MI0_SLOT10
+        int "Slot 10 slave interface id"
+        default 2
+        range 0 7
+
+config SCB4_MI0_SLOT11
+        int "Slot 11 slave interface id"
+        default 3
+        range 0 7
+
+config SCB4_MI0_SLOT12
+        int "Slot 12 slave interface id"
+        default 4
+        range 0 7
+
+config SCB4_MI0_SLOT13
+        int "Slot 13 slave interface id"
+        default 5
+        range 0 7
+
+config SCB4_MI0_SLOT14
+        int "Slot 14 slave interface id"
+        default 6
+        range 0 7
+
+config SCB4_MI0_SLOT15
+        int "Slot 15 slave interface id"
+        default 7
+        range 0 7
+
+endif # SCB4_MI0
+
+menuconfig      SCB5_MI0
+        bool "SCB5 Master Interface 0"
+        default n
+        depends on SCB_PRIORITY
+        help
+        The slave interface id of each slot should be set according following table.
+        PPI0 MDA29      -- 0
+        PPI0 MDA30      -- 1
+        PPI2 MDA31      -- 2
+        PPI2 MDA32      -- 3
+
+if SCB5_MI0
+
+config SCB5_MI0_SLOT0
+        int "Slot 0 slave interface id"
+        default 0
+        range 0 3
+
+config SCB5_MI0_SLOT1
+        int "Slot 1 slave interface id"
+        default 1
+        range 0 3
+
+config SCB5_MI0_SLOT2
+        int "Slot 2 slave interface id"
+        default 2
+        range 0 3
+
+config SCB5_MI0_SLOT3
+        int "Slot 3 slave interface id"
+        default 3
+        range 0 3
+
+config SCB5_MI0_SLOT4
+        int "Slot 4 slave interface id"
+        default 0
+        range 0 3
+
+config SCB5_MI0_SLOT5
+        int "Slot 5 slave interface id"
+        default 1
+        range 0 3
+
+config SCB5_MI0_SLOT6
+        int "Slot 6 slave interface id"
+        default 2
+        range 0 3
+
+config SCB5_MI0_SLOT7
+        int "Slot 7 slave interface id"
+        default 3
+        range 0 3
+
+endif # SCB5_MI0
+
+menuconfig      SCB6_MI0
+        bool "SCB6 Master Interface 0"
+        default n
+        depends on SCB_PRIORITY
+        help
+        The slave interface id of each slot should be set according following table.
+        PPI1 MDA33      -- 0
+        PPI1 MDA34      -- 1
+
+if SCB6_MI0
+
+config SCB6_MI0_SLOT0
+        int "Slot 0 slave interface id"
+        default 0
+        range 0 1
+
+config SCB6_MI0_SLOT1
+        int "Slot 1 slave interface id"
+        default 1
+        range 0 1
+
+config SCB6_MI0_SLOT2
+        int "Slot 2 slave interface id"
+        default 0
+        range 0 1
+
+config SCB6_MI0_SLOT3
+        int "Slot 3 slave interface id"
+        default 1
+        range 0 1
+
+endif # SCB6_MI0
+
+menuconfig      SCB7_MI0
+        bool "SCB7 Master Interface 0"
+        default n
+        depends on SCB_PRIORITY
+        help
+        The slave interface id of each slot should be set according following table.
+        PIXC0   -- 0
+        PIXC1   -- 1
+        PIXC2   -- 2
+
+if SCB7_MI0
+
+config SCB7_MI0_SLOT0
+        int "Slot 0 slave interface id"
+        default 0
+        range 0 2
+
+config SCB7_MI0_SLOT1
+        int "Slot 1 slave interface id"
+        default 1
+        range 0 2
+
+config SCB7_MI0_SLOT2
+        int "Slot 2 slave interface id"
+        default 2
+        range 0 2
+
+config SCB7_MI0_SLOT3
+        int "Slot 3 slave interface id"
+        default 0
+        range 0 2
+
+config SCB7_MI0_SLOT4
+        int "Slot 4 slave interface id"
+        default 1
+        range 0 2
+
+config SCB7_MI0_SLOT5
+        int "Slot 5 slave interface id"
+        default 2
+        range 0 2
+
+endif # SCB7_MI0
+
+menuconfig      SCB8_MI0
+        bool "SCB8 Master Interface 0"
+        default n
+        depends on SCB_PRIORITY
+        help
+        The slave interface id of each slot should be set according following table.
+        PVP CPDOB       -- 0
+        PVP CPDOC       -- 1
+        PVP CPCO        -- 2
+        PVP CPCI        -- 3
+
+if SCB8_MI0
+
+config SCB8_MI0_SLOT0
+        int "Slot 0 slave interface id"
+        default 0
+        range 0 3
+
+config SCB8_MI0_SLOT1
+        int "Slot 1 slave interface id"
+        default 1
+        range 0 3
+
+config SCB8_MI0_SLOT2
+        int "Slot 2 slave interface id"
+        default 2
+        range 0 3
+
+config SCB8_MI0_SLOT3
+        int "Slot 3 slave interface id"
+        default 3
+        range 0 3
+
+config SCB8_MI0_SLOT4
+        int "Slot 4 slave interface id"
+        default 0
+        range 0 3
+
+config SCB8_MI0_SLOT5
+        int "Slot 5 slave interface id"
+        default 1
+        range 0 3
+
+config SCB8_MI0_SLOT6
+        int "Slot 6 slave interface id"
+        default 2
+        range 0 3
+
+config SCB8_MI0_SLOT7
+        int "Slot 7 slave interface id"
+        default 3
+        range 0 3
+
+endif # SCB8_MI0
+
+menuconfig      SCB9_MI0
+        bool "SCB9 Master Interface 0"
+        default n
+        depends on SCB_PRIORITY
+        help
+        The slave interface id of each slot should be set according following table.
+        PVP MPDO        -- 0
+        PVP MPDI        -- 1
+        PVP MPCO        -- 2
+        PVP MPCI        -- 3
+        PVP CPDOA       -- 4
+
+if SCB9_MI0
+
+config SCB9_MI0_SLOT0
+        int "Slot 0 slave interface id"
+        default 0
+        range 0 4
+
+config SCB9_MI0_SLOT1
+        int "Slot 1 slave interface id"
+        default 1
+        range 0 4
+
+config SCB9_MI0_SLOT2
+        int "Slot 2 slave interface id"
+        default 2
+        range 0 4
+
+config SCB9_MI0_SLOT3
+        int "Slot 3 slave interface id"
+        default 3
+        range 0 4
+
+config SCB9_MI0_SLOT4
+        int "Slot 4 slave interface id"
+        default 4
+        range 0 4
+
+config SCB9_MI0_SLOT5
+        int "Slot 5 slave interface id"
+        default 0
+        range 0 4
+
+config SCB9_MI0_SLOT6
+        int "Slot 6 slave interface id"
+        default 1
+        range 0 4
+
+config SCB9_MI0_SLOT7
+        int "Slot 7 slave interface id"
+        default 2
+        range 0 4
+
+config SCB9_MI0_SLOT8
+        int "Slot 8 slave interface id"
+        default 3
+        range 0 4
+
+config SCB9_MI0_SLOT9
+        int "Slot 9 slave interface id"
+        default 4
+        range 0 4
+
+endif # SCB9_MI0
+
 endmenu
 
 endif
diff --git a/arch/blackfin/mach-bf609/Makefile b/arch/blackfin/mach-bf609/Makefile
index 234fe1b4bb0e..60ffaf85d303 100644
--- a/arch/blackfin/mach-bf609/Makefile
+++ b/arch/blackfin/mach-bf609/Makefile
@@ -4,3 +4,4 @@
 
 obj-y := dma.o clock.o ints-priority.o
 obj-$(CONFIG_PM) += pm.o dpm.o
+obj-$(CONFIG_SCB_PRIORITY) += scb.o
diff --git a/arch/blackfin/mach-bf609/boards/ezkit.c b/arch/blackfin/mach-bf609/boards/ezkit.c
index 0bc47231540b..d56a55ad83a7 100644
--- a/arch/blackfin/mach-bf609/boards/ezkit.c
+++ b/arch/blackfin/mach-bf609/boards/ezkit.c
@@ -104,6 +104,7 @@ static struct platform_device bfin_rotary_device = {
 
 #if defined(CONFIG_STMMAC_ETH) || defined(CONFIG_STMMAC_ETH_MODULE)
 #include <linux/stmmac.h>
+#include <linux/phy.h>
 
 static unsigned short pins[] = P_RMII0;
 
@@ -111,11 +112,26 @@ static struct stmmac_mdio_bus_data phy_private_data = {
         .phy_mask = 1,
 };
 
+static struct stmmac_dma_cfg eth_dma_cfg = {
+        .pbl    = 2,
+};
+
+int stmmac_ptp_clk_init(struct platform_device *pdev)
+{
+        bfin_write32(PADS0_EMAC_PTP_CLKSEL, 0);
+        return 0;
+}
+
 static struct plat_stmmacenet_data eth_private_data = {
+        .has_gmac = 1,
         .bus_id   = 0,
         .enh_desc = 1,
         .phy_addr = 1,
         .mdio_bus_data = &phy_private_data,
+        .dma_cfg  = &eth_dma_cfg,
+        .force_thresh_dma_mode = 1,
+        .interface = PHY_INTERFACE_MODE_RMII,
+        .init = stmmac_ptp_clk_init,
 };
 
 static struct platform_device bfin_eth_device = {
@@ -1107,6 +1123,81 @@ static struct bfin_display_config bfin_display_data = {
 };
 #endif
 
+#if IS_ENABLED(CONFIG_VIDEO_ADV7343)
+#include <media/adv7343.h>
+
+static struct v4l2_output adv7343_outputs[] = {
+        {
+                .index = 0,
+                .name = "Composite",
+                .type = V4L2_OUTPUT_TYPE_ANALOG,
+                .std = V4L2_STD_ALL,
+                .capabilities = V4L2_OUT_CAP_STD,
+        },
+        {
+                .index = 1,
+                .name = "S-Video",
+                .type = V4L2_OUTPUT_TYPE_ANALOG,
+                .std = V4L2_STD_ALL,
+                .capabilities = V4L2_OUT_CAP_STD,
+        },
+        {
+                .index = 2,
+                .name = "Component",
+                .type = V4L2_OUTPUT_TYPE_ANALOG,
+                .std = V4L2_STD_ALL,
+                .capabilities = V4L2_OUT_CAP_STD,
+        },
+
+};
+
+static struct disp_route adv7343_routes[] = {
+        {
+                .output = ADV7343_COMPOSITE_ID,
+        },
+        {
+                .output = ADV7343_SVIDEO_ID,
+        },
+        {
+                .output = ADV7343_COMPONENT_ID,
+        },
+};
+
+static struct adv7343_platform_data adv7343_data = {
+        .mode_config = {
+                .sleep_mode = false,
+                .pll_control = false,
+                .dac_1 = true,
+                .dac_2 = true,
+                .dac_3 = true,
+                .dac_4 = true,
+                .dac_5 = true,
+                .dac_6 = true,
+        },
+        .sd_config = {
+                .sd_dac_out1 = false,
+                .sd_dac_out2 = false,
+        },
+};
+
+static struct bfin_display_config bfin_display_data = {
+        .card_name = "BF609",
+        .outputs = adv7343_outputs,
+        .num_outputs = ARRAY_SIZE(adv7343_outputs),
+        .routes = adv7343_routes,
+        .i2c_adapter_id = 0,
+        .board_info = {
+                .type = "adv7343",
+                .addr = 0x2b,
+                .platform_data = (void *)&adv7343_data,
+        },
+        .ppi_info = &ppi_info_disp,
+        .ppi_control = (PACK_EN | DLEN_8 | EPPI_CTL_FS1LO_FS2LO
+                        | EPPI_CTL_POLC3 | EPPI_CTL_BLANKGEN | EPPI_CTL_SYNC2
+                        | EPPI_CTL_NON656 | EPPI_CTL_DIR),
+};
+#endif
+
 static struct platform_device bfin_display_device = {
         .name = "bfin_display",
         .dev = {
diff --git a/arch/blackfin/mach-bf609/clock.c b/arch/blackfin/mach-bf609/clock.c
index 437d56c82281..dab8849af884 100644
--- a/arch/blackfin/mach-bf609/clock.c
+++ b/arch/blackfin/mach-bf609/clock.c
@@ -220,6 +220,12 @@ unsigned long sys_clk_get_rate(struct clk *clk)
         }
 }
 
+unsigned long dummy_get_rate(struct clk *clk)
+{
+        clk->parent->rate = clk_get_rate(clk->parent);
+        return clk->parent->rate;
+}
+
 unsigned long sys_clk_round_rate(struct clk *clk, unsigned long rate)
 {
         unsigned long max_rate;
@@ -283,6 +289,10 @@ static struct clk_ops sys_clk_ops = {
         .round_rate = sys_clk_round_rate,
 };
 
+static struct clk_ops dummy_clk_ops = {
+        .get_rate = dummy_get_rate,
+};
+
 static struct clk sys_clkin = {
         .name       = "SYS_CLKIN",
         .rate       = CONFIG_CLKIN_HZ,
@@ -364,6 +374,12 @@ static struct clk oclk = {
         .parent     = &pll_clk,
 };
 
+static struct clk ethclk = {
+        .name       = "stmmaceth",
+        .parent     = &sclk0,
+        .ops        = &dummy_clk_ops,
+};
+
 static struct clk_lookup bf609_clks[] = {
         CLK(sys_clkin, NULL, "SYS_CLKIN"),
         CLK(pll_clk, NULL, "PLLCLK"),
@@ -375,6 +391,7 @@ static struct clk_lookup bf609_clks[] = {
         CLK(sclk1, NULL, "SCLK1"),
         CLK(dclk, NULL, "DCLK"),
         CLK(oclk, NULL, "OCLK"),
+        CLK(ethclk, NULL, "stmmaceth"),
 };
 
 int __init clk_init(void)
diff --git a/arch/blackfin/mach-bf609/include/mach/defBF60x_base.h b/arch/blackfin/mach-bf609/include/mach/defBF60x_base.h
index f1a6afae1a71..35caa7bc192c 100644
--- a/arch/blackfin/mach-bf609/include/mach/defBF60x_base.h
+++ b/arch/blackfin/mach-bf609/include/mach/defBF60x_base.h
@@ -839,6 +839,16 @@
 #define PORTG_LOCK                  0xFFC03344         /* PORTG Port x GPIO Lock Register */
 #define PORTG_REVID                 0xFFC0337C         /* PORTG Port x GPIO Revision ID */
 
+/* ==================================================
+        Pads Controller Registers
+   ================================================== */
+
+/* =========================
+        PADS0
+   ========================= */
+#define PADS0_EMAC_PTP_CLKSEL       0xFFC03404         /* PADS0 Clock Selection for EMAC and PTP */
+#define PADS0_TWI_VSEL              0xFFC03408         /* PADS0 TWI Voltage Selection */
+#define PADS0_PORTS_HYST            0xFFC03440         /* PADS0 Hysteresis Enable Register */
 
 /* =========================
         PINT Registers
diff --git a/arch/blackfin/mach-bf609/scb.c b/arch/blackfin/mach-bf609/scb.c
new file mode 100644
index 000000000000..ac1f07c33594
--- /dev/null
+++ b/arch/blackfin/mach-bf609/scb.c
@@ -0,0 +1,363 @@
+/*
+ * arch/blackfin/mach-common/scb-init.c - reprogram system cross bar priority
+ *
+ * Copyright 2012 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <asm/blackfin.h>
+#include <asm/scb.h>
+
+struct scb_mi_prio scb_data[] = {
+#ifdef CONFIG_SCB0_MI0
+        { REG_SCB0_ARBR0, REG_SCB0_ARBW0, 32, {
+                CONFIG_SCB0_MI0_SLOT0,
+                CONFIG_SCB0_MI0_SLOT1,
+                CONFIG_SCB0_MI0_SLOT2,
+                CONFIG_SCB0_MI0_SLOT3,
+                CONFIG_SCB0_MI0_SLOT4,
+                CONFIG_SCB0_MI0_SLOT5,
+                CONFIG_SCB0_MI0_SLOT6,
+                CONFIG_SCB0_MI0_SLOT7,
+                CONFIG_SCB0_MI0_SLOT8,
+                CONFIG_SCB0_MI0_SLOT9,
+                CONFIG_SCB0_MI0_SLOT10,
+                CONFIG_SCB0_MI0_SLOT11,
+                CONFIG_SCB0_MI0_SLOT12,
+                CONFIG_SCB0_MI0_SLOT13,
+                CONFIG_SCB0_MI0_SLOT14,
+                CONFIG_SCB0_MI0_SLOT15,
+                CONFIG_SCB0_MI0_SLOT16,
+                CONFIG_SCB0_MI0_SLOT17,
+                CONFIG_SCB0_MI0_SLOT18,
+                CONFIG_SCB0_MI0_SLOT19,
+                CONFIG_SCB0_MI0_SLOT20,
+                CONFIG_SCB0_MI0_SLOT21,
+                CONFIG_SCB0_MI0_SLOT22,
+                CONFIG_SCB0_MI0_SLOT23,
+                CONFIG_SCB0_MI0_SLOT24,
+                CONFIG_SCB0_MI0_SLOT25,
+                CONFIG_SCB0_MI0_SLOT26,
+                CONFIG_SCB0_MI0_SLOT27,
+                CONFIG_SCB0_MI0_SLOT28,
+                CONFIG_SCB0_MI0_SLOT29,
+                CONFIG_SCB0_MI0_SLOT30,
+                CONFIG_SCB0_MI0_SLOT31
+                },
+        },
+#endif
+#ifdef CONFIG_SCB0_MI1
+        { REG_SCB0_ARBR1, REG_SCB0_ARBW1, 32, {
+                CONFIG_SCB0_MI1_SLOT0,
+                CONFIG_SCB0_MI1_SLOT1,
+                CONFIG_SCB0_MI1_SLOT2,
+                CONFIG_SCB0_MI1_SLOT3,
+                CONFIG_SCB0_MI1_SLOT4,
+                CONFIG_SCB0_MI1_SLOT5,
+                CONFIG_SCB0_MI1_SLOT6,
+                CONFIG_SCB0_MI1_SLOT7,
+                CONFIG_SCB0_MI1_SLOT8,
+                CONFIG_SCB0_MI1_SLOT9,
+                CONFIG_SCB0_MI1_SLOT10,
+                CONFIG_SCB0_MI1_SLOT11,
+                CONFIG_SCB0_MI1_SLOT12,
+                CONFIG_SCB0_MI1_SLOT13,
+                CONFIG_SCB0_MI1_SLOT14,
+                CONFIG_SCB0_MI1_SLOT15,
+                CONFIG_SCB0_MI1_SLOT16,
+                CONFIG_SCB0_MI1_SLOT17,
+                CONFIG_SCB0_MI1_SLOT18,
+                CONFIG_SCB0_MI1_SLOT19,
+                CONFIG_SCB0_MI1_SLOT20,
+                CONFIG_SCB0_MI1_SLOT21,
+                CONFIG_SCB0_MI1_SLOT22,
+                CONFIG_SCB0_MI1_SLOT23,
+                CONFIG_SCB0_MI1_SLOT24,
+                CONFIG_SCB0_MI1_SLOT25,
+                CONFIG_SCB0_MI1_SLOT26,
+                CONFIG_SCB0_MI1_SLOT27,
+                CONFIG_SCB0_MI1_SLOT28,
+                CONFIG_SCB0_MI1_SLOT29,
+                CONFIG_SCB0_MI1_SLOT30,
+                CONFIG_SCB0_MI1_SLOT31
+                },
+        },
+#endif
+#ifdef CONFIG_SCB0_MI2
+        { REG_SCB0_ARBR2, REG_SCB0_ARBW2, 32, {
+                CONFIG_SCB0_MI2_SLOT0,
+                CONFIG_SCB0_MI2_SLOT1,
+                CONFIG_SCB0_MI2_SLOT2,
+                CONFIG_SCB0_MI2_SLOT3,
+                CONFIG_SCB0_MI2_SLOT4,
+                CONFIG_SCB0_MI2_SLOT5,
+                CONFIG_SCB0_MI2_SLOT6,
+                CONFIG_SCB0_MI2_SLOT7,
+                CONFIG_SCB0_MI2_SLOT8,
+                CONFIG_SCB0_MI2_SLOT9,
+                CONFIG_SCB0_MI2_SLOT10,
+                CONFIG_SCB0_MI2_SLOT11,
+                CONFIG_SCB0_MI2_SLOT12,
+                CONFIG_SCB0_MI2_SLOT13,
+                CONFIG_SCB0_MI2_SLOT14,
+                CONFIG_SCB0_MI2_SLOT15,
+                CONFIG_SCB0_MI2_SLOT16,
+                CONFIG_SCB0_MI2_SLOT17,
+                CONFIG_SCB0_MI2_SLOT18,
+                CONFIG_SCB0_MI2_SLOT19,
+                CONFIG_SCB0_MI2_SLOT20,
+                CONFIG_SCB0_MI2_SLOT21,
+                CONFIG_SCB0_MI2_SLOT22,
+                CONFIG_SCB0_MI2_SLOT23,
+                CONFIG_SCB0_MI2_SLOT24,
+                CONFIG_SCB0_MI2_SLOT25,
+                CONFIG_SCB0_MI2_SLOT26,
+                CONFIG_SCB0_MI2_SLOT27,
+                CONFIG_SCB0_MI2_SLOT28,
+                CONFIG_SCB0_MI2_SLOT29,
+                CONFIG_SCB0_MI2_SLOT30,
+                CONFIG_SCB0_MI2_SLOT31
+                },
+        },
+#endif
+#ifdef CONFIG_SCB0_MI3
+        { REG_SCB0_ARBR3, REG_SCB0_ARBW3, 32, {
+                CONFIG_SCB0_MI3_SLOT0,
+                CONFIG_SCB0_MI3_SLOT1,
+                CONFIG_SCB0_MI3_SLOT2,
+                CONFIG_SCB0_MI3_SLOT3,
+                CONFIG_SCB0_MI3_SLOT4,
+                CONFIG_SCB0_MI3_SLOT5,
+                CONFIG_SCB0_MI3_SLOT6,
+                CONFIG_SCB0_MI3_SLOT7,
+                CONFIG_SCB0_MI3_SLOT8,
+                CONFIG_SCB0_MI3_SLOT9,
+                CONFIG_SCB0_MI3_SLOT10,
+                CONFIG_SCB0_MI3_SLOT11,
+                CONFIG_SCB0_MI3_SLOT12,
+                CONFIG_SCB0_MI3_SLOT13,
+                CONFIG_SCB0_MI3_SLOT14,
+                CONFIG_SCB0_MI3_SLOT15,
+                CONFIG_SCB0_MI3_SLOT16,
+                CONFIG_SCB0_MI3_SLOT17,
+                CONFIG_SCB0_MI3_SLOT18,
+                CONFIG_SCB0_MI3_SLOT19,
+                CONFIG_SCB0_MI3_SLOT20,
+                CONFIG_SCB0_MI3_SLOT21,
+                CONFIG_SCB0_MI3_SLOT22,
+                CONFIG_SCB0_MI3_SLOT23,
+                CONFIG_SCB0_MI3_SLOT24,
+                CONFIG_SCB0_MI3_SLOT25,
+                CONFIG_SCB0_MI3_SLOT26,
+                CONFIG_SCB0_MI3_SLOT27,
+                CONFIG_SCB0_MI3_SLOT28,
+                CONFIG_SCB0_MI3_SLOT29,
+                CONFIG_SCB0_MI3_SLOT30,
+                CONFIG_SCB0_MI3_SLOT31
+                },
+        },
+#endif
+#ifdef CONFIG_SCB0_MI4
+        { REG_SCB0_ARBR4, REG_SCB4_ARBW0, 32, {
+                CONFIG_SCB0_MI4_SLOT0,
+                CONFIG_SCB0_MI4_SLOT1,
+                CONFIG_SCB0_MI4_SLOT2,
+                CONFIG_SCB0_MI4_SLOT3,
+                CONFIG_SCB0_MI4_SLOT4,
+                CONFIG_SCB0_MI4_SLOT5,
+                CONFIG_SCB0_MI4_SLOT6,
+                CONFIG_SCB0_MI4_SLOT7,
+                CONFIG_SCB0_MI4_SLOT8,
+                CONFIG_SCB0_MI4_SLOT9,
+                CONFIG_SCB0_MI4_SLOT10,
+                CONFIG_SCB0_MI4_SLOT11,
+                CONFIG_SCB0_MI4_SLOT12,
+                CONFIG_SCB0_MI4_SLOT13,
+                CONFIG_SCB0_MI4_SLOT14,
+                CONFIG_SCB0_MI4_SLOT15,
+                CONFIG_SCB0_MI4_SLOT16,
+                CONFIG_SCB0_MI4_SLOT17,
+                CONFIG_SCB0_MI4_SLOT18,
+                CONFIG_SCB0_MI4_SLOT19,
+                CONFIG_SCB0_MI4_SLOT20,
+                CONFIG_SCB0_MI4_SLOT21,
+                CONFIG_SCB0_MI4_SLOT22,
+                CONFIG_SCB0_MI4_SLOT23,
+                CONFIG_SCB0_MI4_SLOT24,
+                CONFIG_SCB0_MI4_SLOT25,
+                CONFIG_SCB0_MI4_SLOT26,
+                CONFIG_SCB0_MI4_SLOT27,
+                CONFIG_SCB0_MI4_SLOT28,
+                CONFIG_SCB0_MI4_SLOT29,
+                CONFIG_SCB0_MI4_SLOT30,
+                CONFIG_SCB0_MI4_SLOT31
+                },
+        },
+#endif
+#ifdef CONFIG_SCB0_MI5
+        { REG_SCB0_ARBR5, REG_SCB0_ARBW5, 16, {
+                CONFIG_SCB0_MI5_SLOT0,
+                CONFIG_SCB0_MI5_SLOT1,
+                CONFIG_SCB0_MI5_SLOT2,
+                CONFIG_SCB0_MI5_SLOT3,
+                CONFIG_SCB0_MI5_SLOT4,
+                CONFIG_SCB0_MI5_SLOT5,
+                CONFIG_SCB0_MI5_SLOT6,
+                CONFIG_SCB0_MI5_SLOT7,
+                CONFIG_SCB0_MI5_SLOT8,
+                CONFIG_SCB0_MI5_SLOT9,
+                CONFIG_SCB0_MI5_SLOT10,
+                CONFIG_SCB0_MI5_SLOT11,
+                CONFIG_SCB0_MI5_SLOT12,
+                CONFIG_SCB0_MI5_SLOT13,
+                CONFIG_SCB0_MI5_SLOT14,
+                CONFIG_SCB0_MI5_SLOT15
+                },
+        },
+#endif
+#ifdef CONFIG_SCB1_MI0
+        { REG_SCB1_ARBR0, REG_SCB1_ARBW0, 20, {
+                CONFIG_SCB1_MI0_SLOT0,
+                CONFIG_SCB1_MI0_SLOT1,
+                CONFIG_SCB1_MI0_SLOT2,
+                CONFIG_SCB1_MI0_SLOT3,
+                CONFIG_SCB1_MI0_SLOT4,
+                CONFIG_SCB1_MI0_SLOT5,
+                CONFIG_SCB1_MI0_SLOT6,
+                CONFIG_SCB1_MI0_SLOT7,
+                CONFIG_SCB1_MI0_SLOT8,
+                CONFIG_SCB1_MI0_SLOT9,
+                CONFIG_SCB1_MI0_SLOT10,
+                CONFIG_SCB1_MI0_SLOT11,
+                CONFIG_SCB1_MI0_SLOT12,
+                CONFIG_SCB1_MI0_SLOT13,
+                CONFIG_SCB1_MI0_SLOT14,
+                CONFIG_SCB1_MI0_SLOT15,
+                CONFIG_SCB1_MI0_SLOT16,
+                CONFIG_SCB1_MI0_SLOT17,
+                CONFIG_SCB1_MI0_SLOT18,
+                CONFIG_SCB1_MI0_SLOT19
+                },
+        },
+#endif
+#ifdef CONFIG_SCB2_MI0
+        { REG_SCB2_ARBR0, REG_SCB2_ARBW0, 10, {
+                CONFIG_SCB2_MI0_SLOT0,
+                CONFIG_SCB2_MI0_SLOT1,
+                CONFIG_SCB2_MI0_SLOT2,
+                CONFIG_SCB2_MI0_SLOT3,
+                CONFIG_SCB2_MI0_SLOT4,
+                CONFIG_SCB2_MI0_SLOT5,
+                CONFIG_SCB2_MI0_SLOT6,
+                CONFIG_SCB2_MI0_SLOT7,
+                CONFIG_SCB2_MI0_SLOT8,
+                CONFIG_SCB2_MI0_SLOT9
+                },
+        },
+#endif
+#ifdef CONFIG_SCB3_MI0
+        { REG_SCB3_ARBR0, REG_SCB3_ARBW0, 16, {
+                CONFIG_SCB3_MI0_SLOT0,
+                CONFIG_SCB3_MI0_SLOT1,
+                CONFIG_SCB3_MI0_SLOT2,
+                CONFIG_SCB3_MI0_SLOT3,
+                CONFIG_SCB3_MI0_SLOT4,
+                CONFIG_SCB3_MI0_SLOT5,
+                CONFIG_SCB3_MI0_SLOT6,
+                CONFIG_SCB3_MI0_SLOT7,
+                CONFIG_SCB3_MI0_SLOT8,
+                CONFIG_SCB3_MI0_SLOT9,
+                CONFIG_SCB3_MI0_SLOT10,
+                CONFIG_SCB3_MI0_SLOT11,
+                CONFIG_SCB3_MI0_SLOT12,
+                CONFIG_SCB3_MI0_SLOT13,
+                CONFIG_SCB3_MI0_SLOT14,
+                CONFIG_SCB3_MI0_SLOT15
+                },
+        },
+#endif
+#ifdef CONFIG_SCB4_MI0
+        { REG_SCB4_ARBR0, REG_SCB4_ARBW0, 16, {
+                CONFIG_SCB4_MI0_SLOT0,
+                CONFIG_SCB4_MI0_SLOT1,
+                CONFIG_SCB4_MI0_SLOT2,
+                CONFIG_SCB4_MI0_SLOT3,
+                CONFIG_SCB4_MI0_SLOT4,
+                CONFIG_SCB4_MI0_SLOT5,
+                CONFIG_SCB4_MI0_SLOT6,
+                CONFIG_SCB4_MI0_SLOT7,
+                CONFIG_SCB4_MI0_SLOT8,
+                CONFIG_SCB4_MI0_SLOT9,
+                CONFIG_SCB4_MI0_SLOT10,
+                CONFIG_SCB4_MI0_SLOT11,
+                CONFIG_SCB4_MI0_SLOT12,
+                CONFIG_SCB4_MI0_SLOT13,
+                CONFIG_SCB4_MI0_SLOT14,
+                CONFIG_SCB4_MI0_SLOT15
+                },
+        },
+#endif
+#ifdef CONFIG_SCB5_MI0
+        { REG_SCB5_ARBR0, REG_SCB5_ARBW0, 8, {
+                CONFIG_SCB5_MI0_SLOT0,
+                CONFIG_SCB5_MI0_SLOT1,
+                CONFIG_SCB5_MI0_SLOT2,
+                CONFIG_SCB5_MI0_SLOT3,
+                CONFIG_SCB5_MI0_SLOT4,
+                CONFIG_SCB5_MI0_SLOT5,
+                CONFIG_SCB5_MI0_SLOT6,
+                CONFIG_SCB5_MI0_SLOT7
+                },
+        },
+#endif
+#ifdef CONFIG_SCB6_MI0
+        { REG_SCB6_ARBR0, REG_SCB6_ARBW0, 4, {
+                CONFIG_SCB6_MI0_SLOT0,
+                CONFIG_SCB6_MI0_SLOT1,
+                CONFIG_SCB6_MI0_SLOT2,
+                CONFIG_SCB6_MI0_SLOT3
+                },
+        },
+#endif
+#ifdef CONFIG_SCB7_MI0
+        { REG_SCB7_ARBR0, REG_SCB7_ARBW0, 6, {
+                CONFIG_SCB7_MI0_SLOT0,
+                CONFIG_SCB7_MI0_SLOT1,
+                CONFIG_SCB7_MI0_SLOT2,
+                CONFIG_SCB7_MI0_SLOT3,
+                CONFIG_SCB7_MI0_SLOT4,
+                CONFIG_SCB7_MI0_SLOT5
+                },
+        },
+#endif
+#ifdef CONFIG_SCB8_MI0
+        { REG_SCB8_ARBR0, REG_SCB8_ARBW0, 8, {
+                CONFIG_SCB8_MI0_SLOT0,
+                CONFIG_SCB8_MI0_SLOT1,
+                CONFIG_SCB8_MI0_SLOT2,
+                CONFIG_SCB8_MI0_SLOT3,
+                CONFIG_SCB8_MI0_SLOT4,
+                CONFIG_SCB8_MI0_SLOT5,
+                CONFIG_SCB8_MI0_SLOT6,
+                CONFIG_SCB8_MI0_SLOT7
+                },
+        },
+#endif
+#ifdef CONFIG_SCB9_MI0
+        { REG_SCB9_ARBR0, REG_SCB9_ARBW0, 10, {
+                CONFIG_SCB9_MI0_SLOT0,
+                CONFIG_SCB9_MI0_SLOT1,
+                CONFIG_SCB9_MI0_SLOT2,
+                CONFIG_SCB9_MI0_SLOT3,
+                CONFIG_SCB9_MI0_SLOT4,
+                CONFIG_SCB9_MI0_SLOT5,
+                CONFIG_SCB9_MI0_SLOT6,
+                CONFIG_SCB9_MI0_SLOT7,
+                CONFIG_SCB9_MI0_SLOT8,
+                CONFIG_SCB9_MI0_SLOT9
+                },
+        },
+#endif
+        { 0, }
+};
diff --git a/arch/blackfin/mach-common/Makefile b/arch/blackfin/mach-common/Makefile
index 675466d490d4..f09979204040 100644
--- a/arch/blackfin/mach-common/Makefile
+++ b/arch/blackfin/mach-common/Makefile
@@ -10,6 +10,7 @@ obj-$(CONFIG_PM)          += pm.o
 ifneq ($(CONFIG_BF60x),y)
 obj-$(CONFIG_PM)          += dpmc_modes.o
 endif
+obj-$(CONFIG_SCB_PRIORITY)      += scb-init.o
 obj-$(CONFIG_CPU_VOLTAGE) += dpmc.o
 obj-$(CONFIG_SMP)         += smp.o
 obj-$(CONFIG_BFIN_KERNEL_CLOCK) += clocks-init.o
diff --git a/arch/blackfin/mach-common/scb-init.c b/arch/blackfin/mach-common/scb-init.c
new file mode 100644
index 000000000000..2cbfb0b5679e
--- /dev/null
+++ b/arch/blackfin/mach-common/scb-init.c
@@ -0,0 +1,53 @@
+/*
+ * arch/blackfin/mach-common/scb-init.c - reprogram system cross bar priority
+ *
+ * Copyright 2012 Analog Devices Inc.
+ *
+ * Licensed under the GPL-2 or later.
+ */
+
+#include <linux/init.h>
+#include <linux/errno.h>
+#include <linux/kernel.h>
+#include <asm/scb.h>
+
+__attribute__((l1_text))
+inline void scb_mi_write(unsigned long scb_mi_arbw, unsigned int slots,
+                unsigned char *scb_mi_prio)
+{
+        unsigned int i;
+
+        for (i = 0; i < slots; ++i)
+                bfin_write32(scb_mi_arbw, (i << SCB_SLOT_OFFSET) | scb_mi_prio[i]);
+}
+
+__attribute__((l1_text))
+inline void scb_mi_read(unsigned long scb_mi_arbw, unsigned int slots,
+                unsigned char *scb_mi_prio)
+{
+        unsigned int i;
+
+        for (i = 0; i < slots; ++i) {
+                bfin_write32(scb_mi_arbw, (0xFF << SCB_SLOT_OFFSET) | i);
+                scb_mi_prio[i] = bfin_read32(scb_mi_arbw);
+        }
+}
+
+__attribute__((l1_text))
+void init_scb(void)
+{
+        unsigned int i, j;
+        unsigned char scb_tmp_prio[32];
+
+        pr_info("Init System Crossbar\n");
+        for (i = 0; scb_data[i].scb_mi_arbr > 0; ++i) {
+
+                scb_mi_write(scb_data[i].scb_mi_arbw, scb_data[i].scb_mi_slots, scb_data[i].scb_mi_prio);
+
+                pr_debug("scb priority at 0x%lx:\n", scb_data[i].scb_mi_arbr);
+                scb_mi_read(scb_data[i].scb_mi_arbw, scb_data[i].scb_mi_slots, scb_tmp_prio);
+                for (j = 0; j < scb_data[i].scb_mi_slots; ++j)
+                        pr_debug("slot %d = %d\n", j, scb_tmp_prio[j]);
+        }
+
+}
diff --git a/arch/c6x/Kconfig b/arch/c6x/Kconfig
index f6a3648f5ec3..957dd00ea561 100644
--- a/arch/c6x/Kconfig
+++ b/arch/c6x/Kconfig
@@ -10,7 +10,6 @@ config C6X
         select GENERIC_IRQ_SHOW
         select HAVE_ARCH_TRACEHOOK
         select HAVE_DMA_API_DEBUG
-        select HAVE_GENERIC_HARDIRQS
         select HAVE_MEMBLOCK
         select SPARSE_IRQ
         select IRQ_DOMAIN
diff --git a/arch/c6x/kernel/devicetree.c b/arch/c6x/kernel/devicetree.c
index bdb56f09d0ac..9e15ab9199b2 100644
--- a/arch/c6x/kernel/devicetree.c
+++ b/arch/c6x/kernel/devicetree.c
@@ -33,8 +33,7 @@ void __init early_init_devtree(void *params)
 
 
 #ifdef CONFIG_BLK_DEV_INITRD
-void __init early_init_dt_setup_initrd_arch(unsigned long start,
-                unsigned long end)
+void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
 {
         initrd_start = (unsigned long)__va(start);
         initrd_end = (unsigned long)__va(end);
@@ -46,8 +45,3 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
 {
         c6x_add_memory(base, size);
 }
-
-void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
-{
-        return __va(memblock_alloc(size, align));
-}
diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 3201ddb8da6a..02380bed189c 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -41,7 +41,6 @@ config CRIS
         default y
         select HAVE_IDE
         select GENERIC_ATOMIC64
-        select HAVE_GENERIC_HARDIRQS
         select HAVE_UID16
         select VIRT_TO_BUS
         select ARCH_WANT_IPC_PARSE_VERSION
@@ -99,9 +98,6 @@ config ETRAX_KMALLOCED_MODULES
         help
           Enable module allocation with kmalloc instead of vmalloc.
 
-config OOM_REBOOT
-       bool "Enable reboot at out of memory"
-
 source "kernel/Kconfig.preempt"
 
 source mm/Kconfig
@@ -175,12 +171,6 @@ config ETRAX_FLASH_BUSWIDTH
         help
           Width in bytes of the NOR Flash bus (1, 2 or 4). Is usually 2.
 
-config ETRAX_NANDFLASH_BUSWIDTH
-        int "Buswidth of NAND flash in bytes"
-        default "1"
-        help
-          Width in bytes of the NAND flash (1 or 2).
-
 config ETRAX_FLASH1_SIZE
        int "FLASH1 size (dec, in MB. 0 = Unknown)"
        default "0"
@@ -272,38 +262,6 @@ config ETRAX_AXISFLASHMAP
           This option enables MTD mapping of flash devices.  Needed to use
           flash memories.  If unsure, say Y.
 
-config ETRAX_RTC
-        bool "Real Time Clock support"
-        depends on ETRAX_I2C
-        help
-          Enables drivers for the Real-Time Clock battery-backed chips on
-          some products. The kernel reads the time when booting, and
-          the date can be set using ioctl(fd, RTC_SET_TIME, &rt) with rt a
-          rtc_time struct (see <file:arch/cris/include/asm/rtc.h>) on the
-          /dev/rtc device.  You can check the time with cat /proc/rtc, but
-          normal time reading should be done using libc function time and
-          friends.
-
-choice
-        prompt "RTC chip"
-        depends on ETRAX_RTC
-        default ETRAX_DS1302
-
-config ETRAX_DS1302
-        depends on ETRAX_ARCH_V10
-        bool "DS1302"
-        help
-          Enables the driver for the DS1302 Real-Time Clock battery-backed
-          chip on some products.
-
-config ETRAX_PCF8563
-        bool "PCF8563"
-        help
-          Enables the driver for the PCF8563 Real-Time Clock battery-backed
-          chip on some products.
-
-endchoice
-
 config ETRAX_SYNCHRONOUS_SERIAL
         bool "Synchronous serial-port support"
         help
@@ -578,26 +536,6 @@ config ETRAX_SERIAL_PORT3_DMA5_IN
         depends on ETRAX_ARCH_V10
         bool "DMA 5"
 
-config ETRAX_SERIAL_PORT3_DMA9_IN
-        bool "Ser3 uses DMA9 for input"
-        depends on ETRAXFS
-        help
-          Enables the DMA9 input channel for ser3 (ttyS3).
-          If you do not enable DMA, an interrupt for each character will be
-          used when receiving data.
-          Normally you want to use DMA, unless you use the DMA channel for
-          something else.
-
-config ETRAX_SERIAL_PORT3_DMA3_IN
-        bool "Ser3 uses DMA3 for input"
-        depends on CRIS_MACH_ARTPEC3
-        help
-          Enables the DMA3 input channel for ser3 (ttyS3).
-          If you do not enable DMA, an interrupt for each character will be
-          used when receiving data.
-          Normally you want to use DMA, unless you use the DMA channel for
-          something else.
-
 endchoice
 
 choice
@@ -615,26 +553,6 @@ config ETRAX_SERIAL_PORT3_DMA4_OUT
         depends on ETRAX_ARCH_V10
         bool "DMA 4"
 
-config ETRAX_SERIAL_PORT3_DMA8_OUT
-        bool "Ser3 uses DMA8 for output"
-        depends on ETRAXFS
-        help
-          Enables the DMA8 output channel for ser3 (ttyS3).
-          If you do not enable DMA, an interrupt for each character will be
-          used when transmitting data.
-          Normally you want to use DMA, unless you use the DMA channel for
-          something else.
-
-config ETRAX_SERIAL_PORT3_DMA2_OUT
-        bool "Ser3 uses DMA2 for output"
-        depends on CRIS_MACH_ARTPEC3
-        help
-          Enables the DMA2 output channel for ser3 (ttyS3).
-          If you do not enable DMA, an interrupt for each character will be
-          used when transmitting data.
-          Normally you want to use DMA, unless you use the DMA channel for
-          something else.
-
 endchoice
 
 endmenu
diff --git a/arch/cris/arch-v10/drivers/Kconfig b/arch/cris/arch-v10/drivers/Kconfig
index daf5f19b61a1..239dab0b95c1 100644
--- a/arch/cris/arch-v10/drivers/Kconfig
+++ b/arch/cris/arch-v10/drivers/Kconfig
@@ -417,16 +417,6 @@ config ETRAX_USB_HOST
            for CTRL and BULK traffic only, INTR traffic may work as well
            however (depending on the requirements of timeliness).
 
-config ETRAX_USB_HOST_PORT1
-        bool "USB port 1 enabled"
-        depends on ETRAX_USB_HOST
-        default n
-
-config ETRAX_USB_HOST_PORT2
-        bool "USB port 2 enabled"
-        depends on ETRAX_USB_HOST
-        default n
-
 config ETRAX_PTABLE_SECTOR
         int "Byte-offset of partition table sector"
         depends on ETRAX_AXISFLASHMAP
@@ -527,19 +517,6 @@ config ETRAX_GPIO
           Remember that you need to setup the port directions appropriately in
           the General configuration.
 
-config ETRAX_PA_BUTTON_BITMASK
-        hex "PA-buttons bitmask"
-        depends on ETRAX_GPIO
-        default "02"
-        help
-          This is a bitmask with information about what bits on PA that
-          are used for buttons.
-          Most products has a so called TEST button on PA1, if that's true
-          use 02 here.
-          Use 00 if there are no buttons on PA.
-          If the bitmask is <> 00 a button driver will be included in the gpio
-          driver. ETRAX general I/O support must be enabled.
-
 config ETRAX_PA_CHANGEABLE_DIR
         hex "PA user changeable dir mask"
         depends on ETRAX_GPIO
@@ -580,51 +557,4 @@ config ETRAX_PB_CHANGEABLE_BITS
           Bit set = changeable.
           You probably want 00 here.
 
-config ETRAX_DS1302_RST_ON_GENERIC_PORT
-        bool "DS1302 RST on Generic Port"
-        depends on ETRAX_DS1302
-        help
-          If your product has the RST signal line for the DS1302 RTC on the
-          Generic Port then say Y here, otherwise leave it as N in which
-          case the RST signal line is assumed to be connected to Port PB
-          (just like the SCL and SDA lines).
-
-config ETRAX_DS1302_RSTBIT
-        int "DS1302 RST bit number"
-        depends on ETRAX_DS1302
-        default "2"
-        help
-          This is the bit number for the RST signal line of the DS1302 RTC on
-          the selected port. If you have selected the generic port then it
-          should be bit 27, otherwise your best bet is bit 5.
-
-config ETRAX_DS1302_SCLBIT
-        int "DS1302 SCL bit number"
-        depends on ETRAX_DS1302
-        default "1"
-        help
-          This is the bit number for the SCL signal line of the DS1302 RTC on
-          Port PB. This is probably best left at 3.
-
-config ETRAX_DS1302_SDABIT
-        int "DS1302 SDA bit number"
-        depends on ETRAX_DS1302
-        default "0"
-        help
-          This is the bit number for the SDA signal line of the DS1302 RTC on
-          Port PB. This is probably best left at 2.
-
-config ETRAX_DS1302_TRICKLE_CHARGE
-        int "DS1302 Trickle charger value"
-        depends on ETRAX_DS1302
-        default "0"
-        help
-          This controls the initial value of the trickle charge register.
-          0 = disabled (use this if you are unsure or have a non rechargeable battery)
-          Otherwise the following values can be OR:ed together to control the
-          charge current:
-          1 = 2kohm, 2 = 4kohm, 3 = 4kohm
-          4 = 1 diode, 8 = 2 diodes
-          Allowed values are (increasing current): 0, 11, 10, 9, 7, 6, 5
-
 endif
diff --git a/arch/cris/arch-v10/drivers/Makefile b/arch/cris/arch-v10/drivers/Makefile
index 44bf2e88c26e..e5c13183b97c 100644
--- a/arch/cris/arch-v10/drivers/Makefile
+++ b/arch/cris/arch-v10/drivers/Makefile
@@ -6,7 +6,5 @@ obj-$(CONFIG_ETRAX_AXISFLASHMAP)	+= axisflashmap.o
 obj-$(CONFIG_ETRAX_I2C)                 += i2c.o
 obj-$(CONFIG_ETRAX_I2C_EEPROM)          += eeprom.o
 obj-$(CONFIG_ETRAX_GPIO)                += gpio.o
-obj-$(CONFIG_ETRAX_DS1302)              += ds1302.o
-obj-$(CONFIG_ETRAX_PCF8563)             += pcf8563.o
 obj-$(CONFIG_ETRAX_SYNCHRONOUS_SERIAL)  += sync_serial.o
 
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig
index 1d866d3ee2f8..6792503aaf79 100644
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@ -19,64 +19,6 @@ config ETRAX_NO_PHY
           switch. This option should normally be disabled. If enabled,
           speed and duplex will be locked to 100 Mbit and full duplex.
 
-config ETRAX_ETHERNET_IFACE0
-        depends on ETRAX_ETHERNET
-        bool "Enable network interface 0"
-
-config ETRAX_ETHERNET_IFACE1
-        depends on (ETRAX_ETHERNET && ETRAXFS)
-        bool "Enable network interface 1 (uses DMA6 and DMA7)"
-
-config ETRAX_ETHERNET_GBIT
-        depends on (ETRAX_ETHERNET && CRIS_MACH_ARTPEC3)
-        bool "Enable gigabit Ethernet support"
-
-choice
-        prompt "Eth0 led group"
-        depends on ETRAX_ETHERNET_IFACE0
-        default ETRAX_ETH0_USE_LEDGRP0
-
-config ETRAX_ETH0_USE_LEDGRP0
-        bool "Use LED grp 0"
-        depends on ETRAX_NBR_LED_GRP_ONE || ETRAX_NBR_LED_GRP_TWO
-        help
-          Use LED grp 0 for eth0
-
-config ETRAX_ETH0_USE_LEDGRP1
-        bool "Use LED grp 1"
-        depends on ETRAX_NBR_LED_GRP_TWO
-        help
-          Use LED grp 1 for eth0
-
-config ETRAX_ETH0_USE_LEDGRPNULL
-        bool "Use no LEDs for eth0"
-        help
-          Use no LEDs for eth0
-endchoice
-
-choice
-        prompt "Eth1 led group"
-        depends on ETRAX_ETHERNET_IFACE1
-        default ETRAX_ETH1_USE_LEDGRP1
-
-config ETRAX_ETH1_USE_LEDGRP0
-        bool "Use LED grp 0"
-        depends on ETRAX_NBR_LED_GRP_ONE || ETRAX_NBR_LED_GRP_TWO
-        help
-          Use LED grp 0 for eth1
-
-config ETRAX_ETH1_USE_LEDGRP1
-        bool "Use LED grp 1"
-        depends on ETRAX_NBR_LED_GRP_TWO
-        help
-          Use LED grp 1 for eth1
-
-config ETRAX_ETH1_USE_LEDGRPNULL
-        bool "Use no LEDs for eth1"
-        help
-          Use no LEDs for eth1
-endchoice
-
 config ETRAXFS_SERIAL
         bool "Serial-port support"
         depends on ETRAX_ARCH_V32
@@ -108,261 +50,24 @@ config ETRAX_SERIAL_PORT0
           if you do not need DMA to something else.
           ser0 can use dma4 or dma6 for output and dma5 or dma7 for input.
 
-choice
-        prompt "Ser0 default port type "
-        depends on ETRAX_SERIAL_PORT0
-        default ETRAX_SERIAL_PORT0_TYPE_232
-        help
-          Type of serial port.
-
-config ETRAX_SERIAL_PORT0_TYPE_232
-        bool "Ser0 is a RS-232 port"
-        help
-          Configure serial port 0 to be a RS-232 port.
-
-config ETRAX_SERIAL_PORT0_TYPE_485HD
-        bool "Ser0 is a half duplex RS-485 port"
-        depends on ETRAX_RS485
-        help
-          Configure serial port 0 to be a half duplex (two wires) RS-485 port.
-
-config ETRAX_SERIAL_PORT0_TYPE_485FD
-        bool "Ser0 is a full duplex RS-485 port"
-        depends on ETRAX_RS485
-        help
-          Configure serial port 0 to be a full duplex (four wires) RS-485 port.
-endchoice
-
-config ETRAX_SER0_DTR_BIT
-        string "Ser 0 DTR bit (empty = not used)"
-        depends on ETRAX_SERIAL_PORT0
-
-config ETRAX_SER0_RI_BIT
-        string "Ser 0 RI bit (empty = not used)"
-        depends on ETRAX_SERIAL_PORT0
-
-config ETRAX_SER0_DSR_BIT
-        string "Ser 0 DSR bit (empty = not used)"
-        depends on ETRAX_SERIAL_PORT0
-
-config ETRAX_SER0_CD_BIT
-        string "Ser 0 CD bit (empty = not used)"
-        depends on ETRAX_SERIAL_PORT0
-
 config ETRAX_SERIAL_PORT1
         bool "Serial port 1 enabled"
         depends on ETRAXFS_SERIAL
         help
           Enables the ETRAX FS serial driver for ser1 (ttyS1).
 
-choice
-        prompt "Ser1 default port type"
-        depends on ETRAX_SERIAL_PORT1
-        default ETRAX_SERIAL_PORT1_TYPE_232
-        help
-          Type of serial port.
-
-config ETRAX_SERIAL_PORT1_TYPE_232
-        bool "Ser1 is a RS-232 port"
-        help
-          Configure serial port 1 to be a RS-232 port.
-
-config ETRAX_SERIAL_PORT1_TYPE_485HD
-        bool "Ser1 is a half duplex RS-485 port"
-        depends on ETRAX_RS485
-        help
-          Configure serial port 1 to be a half duplex (two wires) RS-485 port.
-
-config ETRAX_SERIAL_PORT1_TYPE_485FD
-        bool "Ser1 is a full duplex RS-485 port"
-        depends on ETRAX_RS485
-        help
-          Configure serial port 1 to be a full duplex (four wires) RS-485 port.
-endchoice
-
-config ETRAX_SER1_DTR_BIT
-        string "Ser 1 DTR bit (empty = not used)"
-        depends on ETRAX_SERIAL_PORT1
-
-config ETRAX_SER1_RI_BIT
-        string "Ser 1 RI bit (empty = not used)"
-        depends on ETRAX_SERIAL_PORT1
-
-config ETRAX_SER1_DSR_BIT
-        string "Ser 1 DSR bit (empty = not used)"
-        depends on ETRAX_SERIAL_PORT1
-
-config ETRAX_SER1_CD_BIT
-        string "Ser 1 CD bit (empty = not used)"
-        depends on ETRAX_SERIAL_PORT1
-
 config ETRAX_SERIAL_PORT2
         bool "Serial port 2 enabled"
         depends on ETRAXFS_SERIAL
         help
           Enables the ETRAX FS serial driver for ser2 (ttyS2).
 
-choice
-        prompt "Ser2 default port type"
-        depends on ETRAX_SERIAL_PORT2
-        default ETRAX_SERIAL_PORT2_TYPE_232
-        help
-          What DMA channel to use for ser2
-
-config ETRAX_SERIAL_PORT2_TYPE_232
-        bool "Ser2 is a RS-232 port"
-        help
-          Configure serial port 2 to be a RS-232 port.
-
-config ETRAX_SERIAL_PORT2_TYPE_485HD
-        bool "Ser2 is a half duplex RS-485 port"
-        depends on ETRAX_RS485
-        help
-          Configure serial port 2 to be a half duplex (two wires) RS-485 port.
-
-config ETRAX_SERIAL_PORT2_TYPE_485FD
-        bool "Ser2 is a full duplex RS-485 port"
-        depends on ETRAX_RS485
-        help
-          Configure serial port 2 to be a full duplex (four wires) RS-485 port.
-endchoice
-
-
-config ETRAX_SER2_DTR_BIT
-        string "Ser 2 DTR bit (empty = not used)"
-        depends on ETRAX_SERIAL_PORT2
-
-config ETRAX_SER2_RI_BIT
-        string "Ser 2 RI bit (empty = not used)"
-        depends on ETRAX_SERIAL_PORT2
-
-config ETRAX_SER2_DSR_BIT
-        string "Ser 2 DSR bit (empty = not used)"
-        depends on ETRAX_SERIAL_PORT2
-
-config ETRAX_SER2_CD_BIT
-        string "Ser 2 CD bit (empty = not used)"
-        depends on ETRAX_SERIAL_PORT2
-
 config ETRAX_SERIAL_PORT3
         bool "Serial port 3 enabled"
         depends on ETRAXFS_SERIAL
         help
           Enables the ETRAX FS serial driver for ser3 (ttyS3).
 
-choice
-        prompt "Ser3 default port type"
-        depends on ETRAX_SERIAL_PORT3
-        default ETRAX_SERIAL_PORT3_TYPE_232
-        help
-          What DMA channel to use for ser3.
-
-config ETRAX_SERIAL_PORT3_TYPE_232
-        bool "Ser3 is a RS-232 port"
-        help
-          Configure serial port 3 to be a RS-232 port.
-
-config ETRAX_SERIAL_PORT3_TYPE_485HD
-        bool "Ser3 is a half duplex RS-485 port"
-        depends on ETRAX_RS485
-        help
-          Configure serial port 3 to be a half duplex (two wires) RS-485 port.
-
-config ETRAX_SERIAL_PORT3_TYPE_485FD
-        bool "Ser3 is a full duplex RS-485 port"
-        depends on ETRAX_RS485
-        help
-          Configure serial port 3 to be a full duplex (four wires) RS-485 port.
-endchoice
-
-config ETRAX_SER3_DTR_BIT
-        string "Ser 3 DTR bit (empty = not used)"
-        depends on ETRAX_SERIAL_PORT3
-
-config ETRAX_SER3_RI_BIT
-        string "Ser 3 RI bit (empty = not used)"
-        depends on ETRAX_SERIAL_PORT3
-
-config ETRAX_SER3_DSR_BIT
-        string "Ser 3 DSR bit (empty = not used)"
-        depends on ETRAX_SERIAL_PORT3
-
-config ETRAX_SER3_CD_BIT
-        string "Ser 3 CD bit (empty = not used)"
-        depends on ETRAX_SERIAL_PORT3
-
-config ETRAX_SERIAL_PORT4
-        bool "Serial port 4 enabled"
-        depends on ETRAXFS_SERIAL && CRIS_MACH_ARTPEC3
-        help
-          Enables the ETRAX FS serial driver for ser4 (ttyS4).
-
-choice
-        prompt "Ser4 default port type"
-        depends on ETRAX_SERIAL_PORT4
-        default ETRAX_SERIAL_PORT4_TYPE_232
-        help
-          What DMA channel to use for ser4.
-
-config ETRAX_SERIAL_PORT4_TYPE_232
-        bool "Ser4 is a RS-232 port"
-        help
-          Configure serial port 4 to be a RS-232 port.
-
-config ETRAX_SERIAL_PORT4_TYPE_485HD
-        bool "Ser4 is a half duplex RS-485 port"
-        depends on ETRAX_RS485
-        help
-          Configure serial port 4 to be a half duplex (two wires) RS-485 port.
-
-config ETRAX_SERIAL_PORT4_TYPE_485FD
-        bool "Ser4 is a full duplex RS-485 port"
-        depends on ETRAX_RS485
-        help
-          Configure serial port 4 to be a full duplex (four wires) RS-485 port.
-endchoice
-
-choice
-        prompt "Ser4 DMA in channel "
-        depends on ETRAX_SERIAL_PORT4
-        default ETRAX_SERIAL_PORT4_NO_DMA_IN
-        help
-          What DMA channel to use for ser4.
-
-
-config ETRAX_SERIAL_PORT4_NO_DMA_IN
-        bool "Ser4 uses no DMA for input"
-        help
-          Do not use DMA for ser4 input.
-
-config ETRAX_SERIAL_PORT4_DMA9_IN
-        bool "Ser4 uses DMA9 for input"
-        depends on ETRAX_SERIAL_PORT4
-        help
-          Enables the DMA9 input channel for ser4 (ttyS4).
-          If you do not enable DMA, an interrupt for each character will be
-          used when receiving data.
-          Normally you want to use DMA, unless you use the DMA channel for
-          something else.
-
-endchoice
-
-config ETRAX_SER4_DTR_BIT
-        string "Ser 4 DTR bit (empty = not used)"
-        depends on ETRAX_SERIAL_PORT4
-
-config ETRAX_SER4_RI_BIT
-        string "Ser 4 RI bit (empty = not used)"
-        depends on ETRAX_SERIAL_PORT4
-
-config ETRAX_SER4_DSR_BIT
-        string "Ser 4 DSR bit (empty = not used)"
-        depends on ETRAX_SERIAL_PORT4
-
-config ETRAX_SER4_CD_BIT
-        string "Ser 4 CD bit (empty = not used)"
-        depends on ETRAX_SERIAL_PORT4
-
 config ETRAX_SYNCHRONOUS_SERIAL
         bool "Synchronous serial-port support"
         depends on ETRAX_ARCH_V32
@@ -703,32 +408,6 @@ config ETRAX_SPI_SSER0
           want to build it as a module, which will be named spi_crisv32_sser.
           (You need to select MMC separately.)
 
-config ETRAX_SPI_SSER0_DMA
-        bool "DMA for SPI on sser0 enabled"
-        depends on ETRAX_SPI_SSER0
-        depends on !ETRAX_SERIAL_PORT1_DMA4_OUT && !ETRAX_SERIAL_PORT1_DMA5_IN
-        default y
-        help
-          Say Y if using DMA (dma4/dma5) for SPI on synchronous serial port 0.
-
-config ETRAX_SPI_MMC_CD_SSER0_PIN
-        string "MMC/SD card detect pin for SPI on sser0"
-        depends on ETRAX_SPI_SSER0 && MMC_SPI
-        default "pd11"
-        help
-          The pin to use for SD/MMC card detect.  This pin should be pulled up
-          and grounded when a card is present.  If defined as " " (space), no
-          pin is selected.  A card must then always be inserted for proper
-          action.
-
-config ETRAX_SPI_MMC_WP_SSER0_PIN
-        string "MMC/SD card write-protect pin for SPI on sser0"
-        depends on ETRAX_SPI_SSER0 && MMC_SPI
-        default "pd10"
-        help
-          The pin to use for the SD/MMC write-protect signal for a memory
-          card.  If defined as " " (space), the card is considered writable.
-
 config ETRAX_SPI_SSER1
         tristate "SPI using synchronous serial port 1 (sser1)"
         depends on ETRAX_SPI_MMC
@@ -742,32 +421,6 @@ config ETRAX_SPI_SSER1
           want to build it as a module, which will be named spi_crisv32_sser.
           (You need to select MMC separately.)
 
-config ETRAX_SPI_SSER1_DMA
-        bool "DMA for SPI on sser1 enabled"
-        depends on ETRAX_SPI_SSER1 && !ETRAX_ETHERNET_IFACE1
-        depends on !ETRAX_SERIAL_PORT0_DMA6_OUT && !ETRAX_SERIAL_PORT0_DMA7_IN
-        default y
-        help
-          Say Y if using DMA (dma6/dma7) for SPI on synchronous serial port 1.
-
-config ETRAX_SPI_MMC_CD_SSER1_PIN
-        string "MMC/SD card detect pin for SPI on sser1"
-        depends on ETRAX_SPI_SSER1 && MMC_SPI
-        default "pd12"
-        help
-          The pin to use for SD/MMC card detect.  This pin should be pulled up
-          and grounded when a card is present.  If defined as " " (space), no
-          pin is selected.  A card must then always be inserted for proper
-          action.
-
-config ETRAX_SPI_MMC_WP_SSER1_PIN
-        string "MMC/SD card write-protect pin for SPI on sser1"
-        depends on ETRAX_SPI_SSER1 && MMC_SPI
-        default "pd9"
-        help
-          The pin to use for the SD/MMC write-protect signal for a memory
-          card.  If defined as " " (space), the card is considered writable.
-
 config ETRAX_SPI_GPIO
         tristate "Bitbanged SPI using gpio pins"
         depends on ETRAX_SPI_MMC
@@ -782,51 +435,4 @@ config ETRAX_SPI_GPIO
           Say m to build it as a module, which will be called spi_crisv32_gpio.
           (You need to select MMC separately.)
 
-# The default match that of sser0, only because that's how it was tested.
-config ETRAX_SPI_CS_PIN
-        string "SPI chip select pin"
-        depends on ETRAX_SPI_GPIO
-        default "pc3"
-        help
-          The pin to use for SPI chip select.
-
-config ETRAX_SPI_CLK_PIN
-        string "SPI clock pin"
-        depends on ETRAX_SPI_GPIO
-        default "pc1"
-        help
-          The pin to use for the SPI clock.
-
-config ETRAX_SPI_DATAIN_PIN
-        string "SPI MISO (data in) pin"
-        depends on ETRAX_SPI_GPIO
-        default "pc16"
-        help
-          The pin to use for SPI data in from the device.
-
-config ETRAX_SPI_DATAOUT_PIN
-        string "SPI MOSI (data out) pin"
-        depends on ETRAX_SPI_GPIO
-        default "pc0"
-        help
-          The pin to use for SPI data out to the device.
-
-config ETRAX_SPI_MMC_CD_GPIO_PIN
-        string "MMC/SD card detect pin for SPI using gpio (space for none)"
-        depends on ETRAX_SPI_GPIO && MMC_SPI
-        default "pd11"
-        help
-          The pin to use for SD/MMC card detect.  This pin should be pulled up
-          and grounded when a card is present.  If defined as " " (space), no
-          pin is selected.  A card must then always be inserted for proper
-          action.
-
-config ETRAX_SPI_MMC_WP_GPIO_PIN
-        string "MMC/SD card write-protect pin for SPI using gpio (space for none)"
-        depends on ETRAX_SPI_GPIO && MMC_SPI
-        default "pd10"
-        help
-          The pin to use for the SD/MMC write-protect signal for a memory
-          card.  If defined as " " (space), the card is considered writable.
-
 endif
diff --git a/arch/cris/arch-v32/mach-a3/Kconfig b/arch/cris/arch-v32/mach-a3/Kconfig
index 7796aafc711e..87547271a595 100644
--- a/arch/cris/arch-v32/mach-a3/Kconfig
+++ b/arch/cris/arch-v32/mach-a3/Kconfig
@@ -15,10 +15,6 @@ config ETRAX_SERIAL_PORTS
        int
        default 5
 
-config ETRAX_DDR
-       bool
-       default y
-
 config ETRAX_DDR2_MRS
         hex "DDR2 MRS"
         default "0"
diff --git a/arch/cris/include/asm/processor.h b/arch/cris/include/asm/processor.h
index c0a29b96b92b..15b815df29c1 100644
--- a/arch/cris/include/asm/processor.h
+++ b/arch/cris/include/asm/processor.h
@@ -47,7 +47,6 @@ struct task_struct;
  */
 
 #define task_pt_regs(task) user_regs(task_thread_info(task))
-#define current_regs() task_pt_regs(current)
 
 unsigned long get_wchan(struct task_struct *p);
 
diff --git a/arch/cris/include/uapi/asm/kvm_para.h b/arch/cris/include/uapi/asm/kvm_para.h
new file mode 100644
index 000000000000..14fab8f0b957
--- /dev/null
+++ b/arch/cris/include/uapi/asm/kvm_para.h
@@ -0,0 +1 @@
+#include <asm-generic/kvm_para.h>
diff --git a/arch/cris/mm/fault.c b/arch/cris/mm/fault.c
index 73312ab6c696..1790f22e71a2 100644
--- a/arch/cris/mm/fault.c
+++ b/arch/cris/mm/fault.c
@@ -58,8 +58,7 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
         struct vm_area_struct * vma;
         siginfo_t info;
         int fault;
-        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
-                                ((writeaccess & 1) ? FAULT_FLAG_WRITE : 0);
+        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
 
         D(printk(KERN_DEBUG
                  "Page fault for %lX on %X at %lX, prot %d write %d\n",
@@ -117,6 +116,8 @@ do_page_fault(unsigned long address, struct pt_regs *regs,
         if (in_atomic() || !mm)
                 goto no_context;
 
+        if (user_mode(regs))
+                flags |= FAULT_FLAG_USER;
 retry:
         down_read(&mm->mmap_sem);
         vma = find_vma(mm, address);
@@ -155,6 +156,7 @@ retry:
         } else if (writeaccess == 1) {
                 if (!(vma->vm_flags & VM_WRITE))
                         goto bad_area;
+                flags |= FAULT_FLAG_WRITE;
         } else {
                 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
                         goto bad_area;
diff --git a/arch/frv/Kconfig b/arch/frv/Kconfig
index 4b6628ea381e..34aa19352dc1 100644
--- a/arch/frv/Kconfig
+++ b/arch/frv/Kconfig
@@ -5,7 +5,6 @@ config FRV
         select HAVE_ARCH_TRACEHOOK
         select HAVE_PERF_EVENTS
         select HAVE_UID16
-        select HAVE_GENERIC_HARDIRQS
         select VIRT_TO_BUS
         select GENERIC_IRQ_SHOW
         select HAVE_DEBUG_BUGVERBOSE
diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c
index 0aa35f0eb0db..deb67843693c 100644
--- a/arch/frv/mb93090-mb00/pci-vdk.c
+++ b/arch/frv/mb93090-mb00/pci-vdk.c
@@ -320,7 +320,7 @@ DECLARE_PCI_FIXUP_HEADER(PCI_ANY_ID, PCI_ANY_ID, pci_fixup_ide_bases);
  *  are examined.
  */
 
-void __init pcibios_fixup_bus(struct pci_bus *bus)
+void pcibios_fixup_bus(struct pci_bus *bus)
 {
 #if 0
         printk("### PCIBIOS_FIXUP_BUS(%d)\n",bus->number);
diff --git a/arch/frv/mm/fault.c b/arch/frv/mm/fault.c
index 331c1e2cfb67..9a66372fc7c7 100644
--- a/arch/frv/mm/fault.c
+++ b/arch/frv/mm/fault.c
@@ -34,11 +34,11 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
         struct vm_area_struct *vma;
         struct mm_struct *mm;
         unsigned long _pme, lrai, lrad, fixup;
+        unsigned long flags = 0;
         siginfo_t info;
         pgd_t *pge;
         pud_t *pue;
         pte_t *pte;
-        int write;
         int fault;
 
 #if 0
@@ -81,6 +81,9 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
         if (in_atomic() || !mm)
                 goto no_context;
 
+        if (user_mode(__frame))
+                flags |= FAULT_FLAG_USER;
+
         down_read(&mm->mmap_sem);
 
         vma = find_vma(mm, ear0);
@@ -129,7 +132,6 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
  */
  good_area:
         info.si_code = SEGV_ACCERR;
-        write = 0;
         switch (esr0 & ESR0_ATXC) {
         default:
                 /* handle write to write protected page */
@@ -140,7 +142,7 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
 #endif
                 if (!(vma->vm_flags & VM_WRITE))
                         goto bad_area;
-                write = 1;
+                flags |= FAULT_FLAG_WRITE;
                 break;
 
                  /* handle read from protected page */
@@ -162,7 +164,7 @@ asmlinkage void do_page_fault(int datammu, unsigned long esr0, unsigned long ear
          * make sure we exit gracefully rather than endlessly redo
          * the fault.
          */
-        fault = handle_mm_fault(mm, vma, ear0, write ? FAULT_FLAG_WRITE : 0);
+        fault = handle_mm_fault(mm, vma, ear0, flags);
         if (unlikely(fault & VM_FAULT_ERROR)) {
                 if (fault & VM_FAULT_OOM)
                         goto out_of_memory;
diff --git a/arch/h8300/Kconfig b/arch/h8300/Kconfig
index 3d6759ee382f..24b1dc2564f1 100644
--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -2,7 +2,6 @@ config H8300
         bool
         default y
         select HAVE_IDE
-        select HAVE_GENERIC_HARDIRQS
         select GENERIC_ATOMIC64
         select HAVE_UID16
         select VIRT_TO_BUS
diff --git a/arch/hexagon/Kconfig b/arch/hexagon/Kconfig
index 77d442ab28c8..99041b07e610 100644
--- a/arch/hexagon/Kconfig
+++ b/arch/hexagon/Kconfig
@@ -15,7 +15,6 @@ config HEXAGON
         # select GENERIC_PENDING_IRQ if SMP
         select GENERIC_ATOMIC64
         select HAVE_PERF_EVENTS
-        select HAVE_GENERIC_HARDIRQS
         # GENERIC_ALLOCATOR is used by dma_alloc_coherent()
         select GENERIC_ALLOCATOR
         select GENERIC_IRQ_SHOW
diff --git a/arch/hexagon/mm/vm_fault.c b/arch/hexagon/mm/vm_fault.c
index 1bd276dbec7d..8704c9320032 100644
--- a/arch/hexagon/mm/vm_fault.c
+++ b/arch/hexagon/mm/vm_fault.c
@@ -53,8 +53,7 @@ void do_page_fault(unsigned long address, long cause, struct pt_regs *regs)
         int si_code = SEGV_MAPERR;
         int fault;
         const struct exception_table_entry *fixup;
-        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
-                                 (cause > 0 ? FAULT_FLAG_WRITE : 0);
+        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
 
         /*
          * If we're in an interrupt or have no user context,
@@ -65,6 +64,8 @@ void do_page_fault(unsigned long address, long cause, struct pt_regs *regs)
 
         local_irq_enable();
 
+        if (user_mode(regs))
+                flags |= FAULT_FLAG_USER;
 retry:
         down_read(&mm->mmap_sem);
         vma = find_vma(mm, address);
@@ -96,6 +97,7 @@ good_area:
         case FLT_STORE:
                 if (!(vma->vm_flags & VM_WRITE))
                         goto bad_area;
+                flags |= FAULT_FLAG_WRITE;
                 break;
         }
 
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 5a768ad8e893..7740ab10a171 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -9,7 +9,6 @@ config IA64
         select PCI if (!IA64_HP_SIM)
         select ACPI if (!IA64_HP_SIM)
         select PM if (!IA64_HP_SIM)
-        select ARCH_SUPPORTS_MSI
         select HAVE_UNSTABLE_SCHED_CLOCK
         select HAVE_IDE
         select HAVE_OPROFILE
@@ -22,7 +21,6 @@ config IA64
         select HAVE_KVM
         select HAVE_ARCH_TRACEHOOK
         select HAVE_DMA_API_DEBUG
-        select HAVE_GENERIC_HARDIRQS
         select HAVE_MEMBLOCK
         select HAVE_MEMBLOCK_NODE_MAP
         select HAVE_VIRT_CPU_ACCOUNTING
@@ -43,6 +41,7 @@ config IA64
         select SYSCTL_ARCH_UNALIGN_NO_WARN
         select HAVE_MOD_ARCH_SPECIFIC
         select MODULES_USE_ELF_RELA
+        select ARCH_USE_CMPXCHG_LOCKREF
         default y
         help
           The Itanium Processor Family is Intel's 64-bit successor to
@@ -565,9 +564,9 @@ config KEXEC
 
           It is an ongoing process to be certain the hardware in a machine
           is properly shutdown, so do not be surprised if this code does not
-          initially work for you.  It may help to enable device hotplugging
-          support.  As of this writing the exact hardware interface is
-          strongly in flux, so no good recommendation can be made.
+          initially work for you.  As of this writing the exact hardware
+          interface is strongly in flux, so no good recommendation can be
+          made.
 
 config CRASH_DUMP
           bool "kernel crash dumps"
diff --git a/arch/ia64/include/asm/Kbuild b/arch/ia64/include/asm/Kbuild
index 05b03ecd7933..a3456f34f672 100644
--- a/arch/ia64/include/asm/Kbuild
+++ b/arch/ia64/include/asm/Kbuild
@@ -3,3 +3,4 @@ generic-y += clkdev.h
 generic-y += exec.h
 generic-y += kvm_para.h
 generic-y += trace_clock.h
+generic-y += vtime.h
\ No newline at end of file
diff --git a/arch/ia64/include/asm/bitops.h b/arch/ia64/include/asm/bitops.h
index 8e20bff39f79..c27eccd33349 100644
--- a/arch/ia64/include/asm/bitops.h
+++ b/arch/ia64/include/asm/bitops.h
@@ -425,13 +425,7 @@ __fls (unsigned long x)
 
 #include <asm-generic/bitops/fls64.h>
 
-/*
- * ffs: find first bit set. This is defined the same way as the libc and
- * compiler builtin ffs routines, therefore differs in spirit from the above
- * ffz (man ffs): it operates on "int" values only and the result value is the
- * bit number + 1.  ffs(0) is defined to return zero.
- */
-#define ffs(x)  __builtin_ffs(x)
+#include <asm-generic/bitops/builtin-ffs.h>
 
 /*
  * hweightN: returns the hamming weight (i.e. the number
diff --git a/arch/ia64/include/asm/dmi.h b/arch/ia64/include/asm/dmi.h
index 1ed4c8fedb83..185d3d18d0ec 100644
--- a/arch/ia64/include/asm/dmi.h
+++ b/arch/ia64/include/asm/dmi.h
@@ -7,6 +7,6 @@
 /* Use normal IO mappings for DMI */
 #define dmi_ioremap ioremap
 #define dmi_iounmap(x,l) iounmap(x)
-#define dmi_alloc(l) kmalloc(l, GFP_ATOMIC)
+#define dmi_alloc(l) kzalloc(l, GFP_ATOMIC)
 
 #endif
diff --git a/arch/ia64/include/asm/spinlock.h b/arch/ia64/include/asm/spinlock.h
index 54ff557d474e..45698cd15b7b 100644
--- a/arch/ia64/include/asm/spinlock.h
+++ b/arch/ia64/include/asm/spinlock.h
@@ -102,6 +102,11 @@ static inline int __ticket_spin_is_contended(arch_spinlock_t *lock)
         return ((tmp - (tmp >> TICKET_SHIFT)) & TICKET_MASK) > 1;
 }
 
+static __always_inline int arch_spin_value_unlocked(arch_spinlock_t lock)
+{
+        return !(((lock.lock >> TICKET_SHIFT) ^ lock.lock) & TICKET_MASK);
+}
+
 static inline int arch_spin_is_locked(arch_spinlock_t *lock)
 {
         return __ticket_spin_is_locked(lock);
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c
index 5b2dc0d10c8f..bdfd8789b376 100644
--- a/arch/ia64/kvm/kvm-ia64.c
+++ b/arch/ia64/kvm/kvm-ia64.c
@@ -1560,6 +1560,10 @@ int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages)
         return 0;
 }
 
+void kvm_arch_memslots_updated(struct kvm *kvm)
+{
+}
+
 int kvm_arch_prepare_memory_region(struct kvm *kvm,
                 struct kvm_memory_slot *memslot,
                 struct kvm_userspace_memory_region *mem,
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
index 6cf0341f978e..7225dad87094 100644
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -90,8 +90,6 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
         mask = ((((isr >> IA64_ISR_X_BIT) & 1UL) << VM_EXEC_BIT)
                 | (((isr >> IA64_ISR_W_BIT) & 1UL) << VM_WRITE_BIT));
 
-        flags |= ((mask & VM_WRITE) ? FAULT_FLAG_WRITE : 0);
-
         /* mmap_sem is performance critical.... */
         prefetchw(&mm->mmap_sem);
 
@@ -119,6 +117,10 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
         if (notify_page_fault(regs, TRAP_BRKPT))
                 return;
 
+        if (user_mode(regs))
+                flags |= FAULT_FLAG_USER;
+        if (mask & VM_WRITE)
+                flags |= FAULT_FLAG_WRITE;
 retry:
         down_read(&mm->mmap_sem);
 
diff --git a/arch/ia64/mm/hugetlbpage.c b/arch/ia64/mm/hugetlbpage.c
index 76069c18ee42..68232db98baa 100644
--- a/arch/ia64/mm/hugetlbpage.c
+++ b/arch/ia64/mm/hugetlbpage.c
@@ -114,6 +114,11 @@ int pud_huge(pud_t pud)
         return 0;
 }
 
+int pmd_huge_support(void)
+{
+        return 0;
+}
+
 struct page *
 follow_huge_pmd(struct mm_struct *mm, unsigned long address, pmd_t *pmd, int write)
 {
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 29a7ef4e448b..75661fbf4529 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -9,7 +9,6 @@ config M32R
         select HAVE_KERNEL_LZMA
         select ARCH_WANT_IPC_PARSE_VERSION
         select HAVE_DEBUG_BUGVERBOSE
-        select HAVE_GENERIC_HARDIRQS
         select VIRT_TO_BUS
         select GENERIC_IRQ_PROBE
         select GENERIC_IRQ_SHOW
diff --git a/arch/m32r/mm/fault.c b/arch/m32r/mm/fault.c
index 3cdfa9c1d091..e9c6a8014bd6 100644
--- a/arch/m32r/mm/fault.c
+++ b/arch/m32r/mm/fault.c
@@ -78,7 +78,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code,
         struct mm_struct *mm;
         struct vm_area_struct * vma;
         unsigned long page, addr;
-        int write;
+        unsigned long flags = 0;
         int fault;
         siginfo_t info;
 
@@ -117,6 +117,9 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code,
         if (in_atomic() || !mm)
                 goto bad_area_nosemaphore;
 
+        if (error_code & ACE_USERMODE)
+                flags |= FAULT_FLAG_USER;
+
         /* When running in the kernel we expect faults to occur only to
          * addresses in user space.  All other faults represent errors in the
          * kernel and should generate an OOPS.  Unfortunately, in the case of an
@@ -166,14 +169,13 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code,
  */
 good_area:
         info.si_code = SEGV_ACCERR;
-        write = 0;
         switch (error_code & (ACE_WRITE|ACE_PROTECTION)) {
                 default:        /* 3: write, present */
                         /* fall through */
                 case ACE_WRITE: /* write, not present */
                         if (!(vma->vm_flags & VM_WRITE))
                                 goto bad_area;
-                        write++;
+                        flags |= FAULT_FLAG_WRITE;
                         break;
                 case ACE_PROTECTION:    /* read, present */
                 case 0:         /* read, not present */
@@ -194,7 +196,7 @@ good_area:
          */
         addr = (address & PAGE_MASK);
         set_thread_fault_code(error_code);
-        fault = handle_mm_fault(mm, vma, addr, write ? FAULT_FLAG_WRITE : 0);
+        fault = handle_mm_fault(mm, vma, addr, flags);
         if (unlikely(fault & VM_FAULT_ERROR)) {
                 if (fault & VM_FAULT_OOM)
                         goto out_of_memory;
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 821170e5f6ed..311a300d48cc 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -4,13 +4,13 @@ config M68K
         select HAVE_IDE
         select HAVE_AOUT if MMU
         select HAVE_DEBUG_BUGVERBOSE
-        select HAVE_GENERIC_HARDIRQS
         select GENERIC_IRQ_SHOW
         select GENERIC_ATOMIC64
         select HAVE_UID16
         select VIRT_TO_BUS
         select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
         select GENERIC_CPU_DEVICES
+        select GENERIC_IOMAP
         select GENERIC_STRNCPY_FROM_USER if MMU
         select GENERIC_STRNLEN_USER if MMU
         select FPU if MMU
@@ -72,7 +72,6 @@ source "kernel/Kconfig.freezer"
 config MMU
         bool "MMU-based Paged Memory Management Support"
         default y
-        select GENERIC_IOMAP
         help
           Select if you want MMU-based virtualised addressing space
           support by paged memory management. If unsure, say 'Y'.
diff --git a/arch/m68k/Kconfig.machine b/arch/m68k/Kconfig.machine
index b9ab0a69561c..61dc643c0b05 100644
--- a/arch/m68k/Kconfig.machine
+++ b/arch/m68k/Kconfig.machine
@@ -150,18 +150,6 @@ config XCOPILOT_BUGS
         help
           Support the bugs of Xcopilot.
 
-config UC5272
-        bool "Arcturus Networks uC5272 dimm board support"
-        depends on M5272
-        help
-          Support for the Arcturus Networks uC5272 dimm board.
-
-config UC5282
-        bool "Arcturus Networks uC5282 board support"
-        depends on M528x
-        help
-          Support for the Arcturus Networks uC5282 dimm board.
-
 config UCSIMM
         bool "uCsimm module support"
         depends on M68EZ328
@@ -205,23 +193,15 @@ config UCQUICC
         help
           Support for the Lineo uCquicc board.
 
-config ARNEWSH
-        bool
-
 config ARN5206
         bool "Arnewsh 5206 board support"
         depends on M5206
-        select ARNEWSH
         help
           Support for the Arnewsh 5206 board.
 
-config FREESCALE
-        bool
-
 config M5206eC3
         bool "Motorola M5206eC3 board support"
         depends on M5206e
-        select FREESCALE
         help
           Support for the Motorola M5206eC3 board.
 
@@ -231,88 +211,24 @@ config ELITE
         help
           Support for the Motorola M5206eLITE board.
 
-config M5208EVB
-        bool "Freescale M5208EVB board support"
-        depends on M520x
-        select FREESCALE
-        help
-          Support for the Freescale Coldfire M5208EVB.
-
 config M5235EVB
         bool "Freescale M5235EVB support"
         depends on M523x
-        select FREESCALE
         help
           Support for the Freescale M5235EVB board.
 
 config M5249C3
         bool "Motorola M5249C3 board support"
         depends on M5249
-        select FREESCALE
         help
           Support for the Motorola M5249C3 board.
 
-config M5271EVB
-        bool "Freescale (Motorola) M5271EVB board support"
-        depends on M5271
-        select FREESCALE
-        help
-          Support for the Freescale (Motorola) M5271EVB board.
-
-config M5275EVB
-        bool "Freescale (Motorola) M5275EVB board support"
-        depends on M5275
-        select FREESCALE
-        help
-          Support for the Freescale (Motorola) M5275EVB board.
-
 config M5272C3
         bool "Motorola M5272C3 board support"
         depends on M5272
-        select FREESCALE
         help
           Support for the Motorola M5272C3 board.
 
-config senTec
-        bool
-
-config COBRA5272
-        bool "senTec COBRA5272 board support"
-        depends on M5272
-        select senTec
-        help
-          Support for the senTec COBRA5272 board.
-
-config AVNET
-        bool
-
-config AVNET5282
-        bool "Avnet 5282 board support"
-        depends on M528x
-        select AVNET
-        help
-          Support for the Avnet 5282 board.
-
-config M5282EVB
-        bool "Motorola M5282EVB board support"
-        depends on M528x
-        select FREESCALE
-        help
-          Support for the Motorola M5282EVB board.
-
-config COBRA5282
-        bool "senTec COBRA5282 board support"
-        depends on M528x
-        select senTec
-        help
-          Support for the senTec COBRA5282 board.
-
-config SOM5282EM
-        bool "EMAC.Inc SOM5282EM board support"
-        depends on M528x
-        help
-          Support for the EMAC.Inc SOM5282EM module.
-
 config WILDFIRE
         bool "Intec Automation Inc. WildFire board support"
         depends on M528x
@@ -328,14 +244,12 @@ config WILDFIREMOD
 config ARN5307
         bool "Arnewsh 5307 board support"
         depends on M5307
-        select ARNEWSH
         help
           Support for the Arnewsh 5307 board.
 
 config M5307C3
         bool "Motorola M5307C3 board support"
         depends on M5307
-        select FREESCALE
         help
           Support for the Motorola M5307C3 board.
 
@@ -345,30 +259,9 @@ config SECUREEDGEMP3
         help
           Support for the SnapGear SecureEdge/MP3 platform.
 
-config M5329EVB
-        bool "Freescale (Motorola) M5329EVB board support"
-        depends on M532x
-        select FREESCALE
-        help
-          Support for the Freescale (Motorola) M5329EVB board.
-
-config COBRA5329
-        bool "senTec COBRA5329 board support"
-        depends on M532x
-        help
-          Support for the senTec COBRA5329 board.
-
-config M5373EVB
-        bool "Freescale M5373EVB board support"
-        depends on M537x
-        select FREESCALE
-        help
-          Support for the Freescale M5373EVB board.
-
 config M5407C3
         bool "Motorola M5407C3 board support"
         depends on M5407
-        select FREESCALE
         help
           Support for the Motorola M5407C3 board.
 
@@ -402,39 +295,12 @@ config NETtel
         help
           Support for the SnapGear NETtel/SecureEdge/SnapGear boards.
 
-config SNAPGEAR
-        bool "SnapGear router board support"
-        depends on NETtel
-        help
-          Special additional support for SnapGear router boards.
-
-config SNEHA
-        bool
-
-config CPU16B
-        bool "Sneha Technologies S.L. Sarasvati board support"
-        depends on M5272
-        select SNEHA
-        help
-          Support for the SNEHA CPU16B board.
-
 config MOD5272
         bool "Netburner MOD-5272 board support"
         depends on M5272
         help
           Support for the Netburner MOD-5272 board.
 
-config SAVANT
-        bool
-
-config SAVANTrosie1
-        bool "Savant Rosie1 board support"
-        depends on M523x
-        select SAVANT
-        help
-          Support for the Savant Rosie1 board.
-
-
 if !MMU || COLDFIRE
 
 comment "Machine Options"
diff --git a/arch/m68k/amiga/platform.c b/arch/m68k/amiga/platform.c
index 6083088c0cca..dacd9f911f71 100644
--- a/arch/m68k/amiga/platform.c
+++ b/arch/m68k/amiga/platform.c
@@ -56,7 +56,7 @@ static int __init amiga_init_bus(void)
         n = AMIGAHW_PRESENT(ZORRO3) ? 4 : 2;
         pdev = platform_device_register_simple("amiga-zorro", -1,
                                                zorro_resources, n);
-        return PTR_RET(pdev);
+        return PTR_ERR_OR_ZERO(pdev);
 }
 
 subsys_initcall(amiga_init_bus);
diff --git a/arch/m68k/emu/natfeat.c b/arch/m68k/emu/natfeat.c
index fa277aecfb78..121a6660ad4e 100644
--- a/arch/m68k/emu/natfeat.c
+++ b/arch/m68k/emu/natfeat.c
@@ -18,11 +18,11 @@
 #include <asm/machdep.h>
 #include <asm/natfeat.h>
 
-extern long nf_get_id2(const char *feature_name);
+extern long nf_get_id_phys(unsigned long feature_name);
 
 asm("\n"
-"       .global nf_get_id2,nf_call\n"
-"nf_get_id2:\n"
+"       .global nf_get_id_phys,nf_call\n"
+"nf_get_id_phys:\n"
 "       .short  0x7300\n"
 "       rts\n"
 "nf_call:\n"
@@ -31,7 +31,7 @@ asm("\n"
 "1:     moveq.l #0,%d0\n"
 "       rts\n"
 "       .section __ex_table,\"a\"\n"
-"       .long   nf_get_id2,1b\n"
+"       .long   nf_get_id_phys,1b\n"
 "       .long   nf_call,1b\n"
 "       .previous");
 EXPORT_SYMBOL_GPL(nf_call);
@@ -46,7 +46,7 @@ long nf_get_id(const char *feature_name)
         if (n >= sizeof(name_copy))
                 return 0;
 
-        return nf_get_id2(name_copy);
+        return nf_get_id_phys(virt_to_phys(name_copy));
 }
 EXPORT_SYMBOL_GPL(nf_get_id);
 
@@ -58,7 +58,7 @@ void nfprint(const char *fmt, ...)
 
         va_start(ap, fmt);
         n = vsnprintf(buf, 256, fmt, ap);
-        nf_call(nf_get_id("NF_STDERR"), buf);
+        nf_call(nf_get_id("NF_STDERR"), virt_to_phys(buf));
         va_end(ap);
 }
 
@@ -83,7 +83,7 @@ void nf_init(void)
         id = nf_get_id("NF_NAME");
         if (!id)
                 return;
-        nf_call(id, buf, 256);
+        nf_call(id, virt_to_phys(buf), 256);
         buf[255] = 0;
 
         pr_info("NatFeats found (%s, %lu.%lu)\n", buf, version >> 16,
diff --git a/arch/m68k/emu/nfblock.c b/arch/m68k/emu/nfblock.c
index e3011338ab40..0721858fbd1e 100644
--- a/arch/m68k/emu/nfblock.c
+++ b/arch/m68k/emu/nfblock.c
@@ -41,8 +41,8 @@ static inline s32 nfhd_read_write(u32 major, u32 minor, u32 rwflag, u32 recno,
 static inline s32 nfhd_get_capacity(u32 major, u32 minor, u32 *blocks,
                                     u32 *blocksize)
 {
-        return nf_call(nfhd_id + NFHD_GET_CAPACITY, major, minor, blocks,
-                       blocksize);
+        return nf_call(nfhd_id + NFHD_GET_CAPACITY, major, minor,
+                       virt_to_phys(blocks), virt_to_phys(blocksize));
 }
 
 static LIST_HEAD(nfhd_list);
diff --git a/arch/m68k/emu/nfcon.c b/arch/m68k/emu/nfcon.c
index 6685bf45c2c3..57e8c8fb5eba 100644
--- a/arch/m68k/emu/nfcon.c
+++ b/arch/m68k/emu/nfcon.c
@@ -15,6 +15,7 @@
 #include <linux/slab.h>
 #include <linux/err.h>
 #include <linux/uaccess.h>
+#include <linux/io.h>
 
 #include <asm/natfeat.h>
 
@@ -25,17 +26,18 @@ static struct tty_driver *nfcon_tty_driver;
 static void nfputs(const char *str, unsigned int count)
 {
         char buf[68];
+        unsigned long phys = virt_to_phys(buf);
 
         buf[64] = 0;
         while (count > 64) {
                 memcpy(buf, str, 64);
-                nf_call(stderr_id, buf);
+                nf_call(stderr_id, phys);
                 str += 64;
                 count -= 64;
         }
         memcpy(buf, str, count);
         buf[count] = 0;
-        nf_call(stderr_id, buf);
+        nf_call(stderr_id, phys);
 }
 
 static void nfcon_write(struct console *con, const char *str,
@@ -79,7 +81,7 @@ static int nfcon_tty_put_char(struct tty_struct *tty, unsigned char ch)
 {
         char temp[2] = { ch, 0 };
 
-        nf_call(stderr_id, temp);
+        nf_call(stderr_id, virt_to_phys(temp));
         return 1;
 }
 
diff --git a/arch/m68k/emu/nfeth.c b/arch/m68k/emu/nfeth.c
index 695cd737a42e..a0985fd088d1 100644
--- a/arch/m68k/emu/nfeth.c
+++ b/arch/m68k/emu/nfeth.c
@@ -195,7 +195,8 @@ static struct net_device * __init nfeth_probe(int unit)
         char mac[ETH_ALEN], host_ip[32], local_ip[32];
         int err;
 
-        if (!nf_call(nfEtherID + XIF_GET_MAC, unit, mac, ETH_ALEN))
+        if (!nf_call(nfEtherID + XIF_GET_MAC, unit, virt_to_phys(mac),
+                     ETH_ALEN))
                 return NULL;
 
         dev = alloc_etherdev(sizeof(struct nfeth_private));
@@ -217,9 +218,9 @@ static struct net_device * __init nfeth_probe(int unit)
         }
 
         nf_call(nfEtherID + XIF_GET_IPHOST, unit,
-                host_ip, sizeof(host_ip));
+                virt_to_phys(host_ip), sizeof(host_ip));
         nf_call(nfEtherID + XIF_GET_IPATARI, unit,
-                local_ip, sizeof(local_ip));
+                virt_to_phys(local_ip), sizeof(local_ip));
 
         netdev_info(dev, KBUILD_MODNAME " addr:%s (%s) HWaddr:%pM\n", host_ip,
                     local_ip, mac);
diff --git a/arch/m68k/include/asm/io_no.h b/arch/m68k/include/asm/io_no.h
index 353bf754a972..e1534783e94e 100644
--- a/arch/m68k/include/asm/io_no.h
+++ b/arch/m68k/include/asm/io_no.h
@@ -4,6 +4,7 @@
 #ifdef __KERNEL__
 
 #include <asm/virtconvert.h>
+#include <asm-generic/iomap.h>
 
 /*
  * These are for ISA/PCI shared memory _only_ and should never be used
diff --git a/arch/m68k/include/asm/irqflags.h b/arch/m68k/include/asm/irqflags.h
index 7ef4115b8c4a..a823cd73dc09 100644
--- a/arch/m68k/include/asm/irqflags.h
+++ b/arch/m68k/include/asm/irqflags.h
@@ -3,7 +3,7 @@
 
 #include <linux/types.h>
 #ifdef CONFIG_MMU
-#include <linux/hardirq.h>
+#include <linux/preempt_mask.h>
 #endif
 #include <linux/preempt.h>
 #include <asm/thread_info.h>
@@ -67,6 +67,10 @@ static inline void arch_local_irq_restore(unsigned long flags)
 
 static inline bool arch_irqs_disabled_flags(unsigned long flags)
 {
+        if (MACH_IS_ATARI) {
+                /* Ignore HSYNC = ipl 2 on Atari */
+                return (flags & ~(ALLOWINT | 0x200)) != 0;
+        }
         return (flags & ~ALLOWINT) != 0;
 }
 
diff --git a/arch/m68k/include/asm/page.h b/arch/m68k/include/asm/page.h
index 7c360dac00b7..38b024a0b045 100644
--- a/arch/m68k/include/asm/page.h
+++ b/arch/m68k/include/asm/page.h
@@ -48,6 +48,9 @@ extern unsigned long _ramend;
 #include <asm/page_no.h>
 #endif
 
+#define VM_DATA_DEFAULT_FLAGS   (VM_READ | VM_WRITE | VM_EXEC | \
+                                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+
 #include <asm-generic/getorder.h>
 
 #endif /* _M68K_PAGE_H */
diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h
index 89f201434b5a..5029f73e6294 100644
--- a/arch/m68k/include/asm/page_mm.h
+++ b/arch/m68k/include/asm/page_mm.h
@@ -173,7 +173,4 @@ static inline __attribute_const__ int __virt_to_node_shift(void)
 
 #endif /* __ASSEMBLY__ */
 
-#define VM_DATA_DEFAULT_FLAGS   (VM_READ | VM_WRITE | VM_EXEC | \
-                                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
-
 #endif /* _M68K_PAGE_MM_H */
diff --git a/arch/m68k/kernel/setup_no.c b/arch/m68k/kernel/setup_no.c
index 911ba472e6c4..5b16f5d61b44 100644
--- a/arch/m68k/kernel/setup_no.c
+++ b/arch/m68k/kernel/setup_no.c
@@ -118,7 +118,7 @@ void (*mach_power_off)(void);
  *
  * Returns:
  */
-void parse_uboot_commandline(char *commandp, int size)
+static void __init parse_uboot_commandline(char *commandp, int size)
 {
         extern unsigned long _init_sp;
         unsigned long *sp;
diff --git a/arch/m68k/kernel/signal.c b/arch/m68k/kernel/signal.c
index 2a16df3d9312..57fd286e4b0b 100644
--- a/arch/m68k/kernel/signal.c
+++ b/arch/m68k/kernel/signal.c
@@ -50,6 +50,7 @@
 #include <asm/pgtable.h>
 #include <asm/traps.h>
 #include <asm/ucontext.h>
+#include <asm/cacheflush.h>
 
 #ifdef CONFIG_MMU
 
@@ -181,6 +182,13 @@ static inline void push_cache (unsigned long vaddr)
                 asm volatile ("movec %0,%%caar\n\t"
                               "movec %1,%%cacr"
                               : : "r" (vaddr + 4), "r" (temp));
+        } else {
+                /* CPU_IS_COLDFIRE */
+#if defined(CONFIG_CACHE_COPYBACK)
+                flush_cf_dcache(0, DCACHE_MAX_ADDR);
+#endif
+                /* Invalidate instruction cache for the pushed bytes */
+                clear_cf_icache(vaddr, vaddr + 8);
         }
 }
 
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c
index bea6bcf8f9b8..7eb9792009f8 100644
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
@@ -90,7 +90,7 @@ static int __init rtc_init(void)
                 return -ENODEV;
 
         pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
-        return PTR_RET(pdev);
+        return PTR_ERR_OR_ZERO(pdev);
 }
 
 module_init(rtc_init);
diff --git a/arch/m68k/mm/fault.c b/arch/m68k/mm/fault.c
index a563727806bf..eb1d61f68725 100644
--- a/arch/m68k/mm/fault.c
+++ b/arch/m68k/mm/fault.c
@@ -88,6 +88,8 @@ int do_page_fault(struct pt_regs *regs, unsigned long address,
         if (in_atomic() || !mm)
                 goto no_context;
 
+        if (user_mode(regs))
+                flags |= FAULT_FLAG_USER;
 retry:
         down_read(&mm->mmap_sem);
 
diff --git a/arch/m68k/platform/68000/m68328.c b/arch/m68k/platform/68000/m68328.c
index a86eb66835aa..e53caf4c3bfb 100644
--- a/arch/m68k/platform/68000/m68328.c
+++ b/arch/m68k/platform/68000/m68328.c
@@ -15,6 +15,7 @@
 
 /***************************************************************************/
 
+#include <linux/init.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/rtc.h>
@@ -42,7 +43,7 @@ void m68328_reset (void)
 
 /***************************************************************************/
 
-void config_BSP(char *command, int len)
+void __init config_BSP(char *command, int len)
 {
   printk(KERN_INFO "\n68328 support D. Jeff Dionne <jeff@uclinux.org>\n");
   printk(KERN_INFO "68328 support Kenneth Albanowski <kjahds@kjshds.com>\n");
diff --git a/arch/m68k/platform/68000/m68EZ328.c b/arch/m68k/platform/68000/m68EZ328.c
index a6eb72d75008..332b5e8605fc 100644
--- a/arch/m68k/platform/68000/m68EZ328.c
+++ b/arch/m68k/platform/68000/m68EZ328.c
@@ -13,6 +13,7 @@
 
 /***************************************************************************/
 
+#include <linux/init.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/rtc.h>
@@ -52,7 +53,7 @@ _bsc1(unsigned char *, gethwaddr, int, a)
 _bsc1(char *, getbenv, char *, a)
 #endif
 
-void config_BSP(char *command, int len)
+void __init config_BSP(char *command, int len)
 {
   unsigned char *p;
 
diff --git a/arch/m68k/platform/68000/m68VZ328.c b/arch/m68k/platform/68000/m68VZ328.c
index eb6964fbec09..fd6658358af1 100644
--- a/arch/m68k/platform/68000/m68VZ328.c
+++ b/arch/m68k/platform/68000/m68VZ328.c
@@ -14,6 +14,7 @@
 
 /***************************************************************************/
 
+#include <linux/init.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/kd.h>
@@ -59,7 +60,7 @@ static void m68vz328_reset(void)
         );
 }
 
-static void init_hardware(char *command, int size)
+static void __init init_hardware(char *command, int size)
 {
 #ifdef CONFIG_DIRECT_IO_ACCESS
         SCR = 0x10;                                     /* allow user access to internal registers */
@@ -145,7 +146,7 @@ _bsc0(char *, getserialnum)
 _bsc1(unsigned char *, gethwaddr, int, a)
 _bsc1(char *, getbenv, char *, a)
 
-static void init_hardware(char *command, int size)
+static void __init init_hardware(char *command, int size)
 {
         char *p;
 
@@ -167,7 +168,7 @@ static void m68vz328_reset(void)
 {
 }
 
-static void init_hardware(char *command, int size)
+static void __init init_hardware(char *command, int size)
 {
 }
 
@@ -175,7 +176,7 @@ static void init_hardware(char *command, int size)
 #endif
 /***************************************************************************/
 
-void config_BSP(char *command, int size)
+void __init config_BSP(char *command, int size)
 {
         printk(KERN_INFO "68VZ328 DragonBallVZ support (c) 2001 Lineo, Inc.\n");
 
diff --git a/arch/m68k/platform/68360/commproc.c b/arch/m68k/platform/68360/commproc.c
index 8e4e10cc0080..315727b7ff40 100644
--- a/arch/m68k/platform/68360/commproc.c
+++ b/arch/m68k/platform/68360/commproc.c
@@ -31,6 +31,7 @@
  */
 
 #include <linux/errno.h>
+#include <linux/init.h>
 #include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/param.h>
@@ -77,7 +78,7 @@ void m360_cpm_reset(void);
 
 
 
-void m360_cpm_reset()
+void __init m360_cpm_reset()
 {
 /*      pte_t              *pte; */
 
diff --git a/arch/m68k/platform/68360/config.c b/arch/m68k/platform/68360/config.c
index 9877cefad1e7..0570741e5500 100644
--- a/arch/m68k/platform/68360/config.c
+++ b/arch/m68k/platform/68360/config.c
@@ -11,6 +11,7 @@
  */
 
 #include <stdarg.h>
+#include <linux/init.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/mm.h>
@@ -140,7 +141,7 @@ _bsc1(char *, getbenv, char *, a)
 #endif
 
 
-void config_BSP(char *command, int len)
+void __init config_BSP(char *command, int len)
 {
   unsigned char *p;
 
diff --git a/arch/m68k/platform/coldfire/pci.c b/arch/m68k/platform/coldfire/pci.c
index b33f97a13e6d..df9679238b6d 100644
--- a/arch/m68k/platform/coldfire/pci.c
+++ b/arch/m68k/platform/coldfire/pci.c
@@ -319,7 +319,6 @@ static int __init mcf_pci_init(void)
         pci_fixup_irqs(pci_common_swizzle, mcf_pci_map_irq);
         pci_bus_size_bridges(rootbus);
         pci_bus_assign_resources(rootbus);
-        pci_enable_bridges(rootbus);
         return 0;
 }
 
diff --git a/arch/m68k/q40/config.c b/arch/m68k/q40/config.c
index 658542b914fc..078bb744b5fe 100644
--- a/arch/m68k/q40/config.c
+++ b/arch/m68k/q40/config.c
@@ -338,6 +338,6 @@ static __init int q40_add_kbd_device(void)
                 return -ENODEV;
 
         pdev = platform_device_register_simple("q40kbd", -1, NULL, 0);
-        return PTR_RET(pdev);
+        return PTR_ERR_OR_ZERO(pdev);
 }
 arch_initcall(q40_add_kbd_device);
diff --git a/arch/metag/Kconfig b/arch/metag/Kconfig
index cfd831c29824..36368eb07e13 100644
--- a/arch/metag/Kconfig
+++ b/arch/metag/Kconfig
@@ -13,7 +13,6 @@ config METAG
         select HAVE_FTRACE_MCOUNT_RECORD
         select HAVE_FUNCTION_TRACER
         select HAVE_FUNCTION_TRACE_MCOUNT_TEST
-        select HAVE_GENERIC_HARDIRQS
         select HAVE_KERNEL_BZIP2
         select HAVE_KERNEL_GZIP
         select HAVE_KERNEL_LZO
diff --git a/arch/metag/Kconfig.soc b/arch/metag/Kconfig.soc
index 2a3c860c7525..973640f46752 100644
--- a/arch/metag/Kconfig.soc
+++ b/arch/metag/Kconfig.soc
@@ -16,6 +16,8 @@ config META21_FPGA
 
 config SOC_TZ1090
         bool "Toumaz Xenif TZ1090 SoC (Comet)"
+        select ARCH_WANT_OPTIONAL_GPIOLIB
+        select IMGPDC_IRQ
         select METAG_LNKGET_AROUND_CACHE
         select METAG_META21
         select METAG_SMP_WRITE_REORDERING
diff --git a/arch/metag/boot/dts/tz1090.dtsi b/arch/metag/boot/dts/tz1090.dtsi
index 853744652b93..24ea7d2e9138 100644
--- a/arch/metag/boot/dts/tz1090.dtsi
+++ b/arch/metag/boot/dts/tz1090.dtsi
@@ -8,6 +8,8 @@
 
 #include "skeleton.dtsi"
 
+#include <dt-bindings/interrupt-controller/irq.h>
+
 / {
         compatible = "toumaz,tz1090", "img,meta";
 
@@ -26,6 +28,22 @@
                 #size-cells = <1>;
                 ranges;
 
+                pdc: pdc@0x02006000 {
+                        interrupt-controller;
+                        #interrupt-cells = <2>;
+
+                        reg = <0x02006000 0x1000>;
+                        compatible = "img,pdc-intc";
+
+                        num-perips = <3>;
+                        num-syswakes = <3>;
+
+                        interrupts = <18 IRQ_TYPE_LEVEL_HIGH>, /* Syswakes */
+                                     <30 IRQ_TYPE_LEVEL_HIGH>, /* Perip 0 (RTC) */
+                                     <29 IRQ_TYPE_LEVEL_HIGH>, /* Perip 1 (IR) */
+                                     <31 IRQ_TYPE_LEVEL_HIGH>; /* Perip 2 (WDT) */
+                };
+
                 pinctrl: pinctrl@02005800 {
                         #gpio-range-cells = <3>;
                         compatible = "img,tz1090-pinctrl";
@@ -37,5 +55,54 @@
                         compatible = "img,tz1090-pdc-pinctrl";
                         reg = <0x02006500 0x100>;
                 };
+
+                gpios: gpios@02005800 {
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        compatible = "img,tz1090-gpio";
+                        reg = <0x02005800 0x90>;
+
+                        gpios0: bank@0 {
+                                gpio-controller;
+                                interrupt-controller;
+                                #gpio-cells = <2>;
+                                #interrupt-cells = <2>;
+                                reg = <0>;
+                                interrupts = <13 IRQ_TYPE_LEVEL_HIGH>;
+                                gpio-ranges = <&pinctrl 0 0 30>;
+                        };
+                        gpios1: bank@1 {
+                                gpio-controller;
+                                interrupt-controller;
+                                #gpio-cells = <2>;
+                                #interrupt-cells = <2>;
+                                reg = <1>;
+                                interrupts = <14 IRQ_TYPE_LEVEL_HIGH>;
+                                gpio-ranges = <&pinctrl 0 30 30>;
+                        };
+                        gpios2: bank@2 {
+                                gpio-controller;
+                                interrupt-controller;
+                                #gpio-cells = <2>;
+                                #interrupt-cells = <2>;
+                                reg = <2>;
+                                interrupts = <15 IRQ_TYPE_LEVEL_HIGH>;
+                                gpio-ranges = <&pinctrl 0 60 30>;
+                        };
+                };
+
+                pdc_gpios: gpios@02006500 {
+                        gpio-controller;
+                        #gpio-cells = <2>;
+
+                        compatible = "img,tz1090-pdc-gpio";
+                        reg = <0x02006500 0x100>;
+
+                        interrupt-parent = <&pdc>;
+                        interrupts =    <8  IRQ_TYPE_NONE>,
+                                        <9  IRQ_TYPE_NONE>,
+                                        <10 IRQ_TYPE_NONE>;
+                        gpio-ranges = <&pdc_pinctrl 0 0 7>;
+                };
         };
 };
diff --git a/arch/metag/mm/fault.c b/arch/metag/mm/fault.c
index 8fddf46e6c62..332680e5ebf2 100644
--- a/arch/metag/mm/fault.c
+++ b/arch/metag/mm/fault.c
@@ -53,8 +53,7 @@ int do_page_fault(struct pt_regs *regs, unsigned long address,
         struct vm_area_struct *vma, *prev_vma;
         siginfo_t info;
         int fault;
-        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
-                                (write_access ? FAULT_FLAG_WRITE : 0);
+        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
 
         tsk = current;
 
@@ -109,6 +108,8 @@ int do_page_fault(struct pt_regs *regs, unsigned long address,
         if (in_atomic() || !mm)
                 goto no_context;
 
+        if (user_mode(regs))
+                flags |= FAULT_FLAG_USER;
 retry:
         down_read(&mm->mmap_sem);
 
@@ -121,6 +122,7 @@ good_area:
         if (write_access) {
                 if (!(vma->vm_flags & VM_WRITE))
                         goto bad_area;
+                flags |= FAULT_FLAG_WRITE;
         } else {
                 if (!(vma->vm_flags & (VM_READ | VM_EXEC | VM_WRITE)))
                         goto bad_area;
diff --git a/arch/metag/mm/hugetlbpage.c b/arch/metag/mm/hugetlbpage.c
index 3c52fa6d0f8e..042431509b56 100644
--- a/arch/metag/mm/hugetlbpage.c
+++ b/arch/metag/mm/hugetlbpage.c
@@ -110,6 +110,11 @@ int pud_huge(pud_t pud)
         return 0;
 }
 
+int pmd_huge_support(void)
+{
+        return 1;
+}
+
 struct page *follow_huge_pmd(struct mm_struct *mm, unsigned long address,
                              pmd_t *pmd, int write)
 {
diff --git a/arch/metag/mm/init.c b/arch/metag/mm/init.c
index 28813f164730..123919534b80 100644
--- a/arch/metag/mm/init.c
+++ b/arch/metag/mm/init.c
@@ -407,10 +407,9 @@ void free_initrd_mem(unsigned long start, unsigned long end)
 #endif
 
 #ifdef CONFIG_OF_FLATTREE
-void __init early_init_dt_setup_initrd_arch(unsigned long start,
-                                            unsigned long end)
+void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
 {
-        pr_err("%s(%lx, %lx)\n",
+        pr_err("%s(%llx, %llx)\n",
                __func__, start, end);
 }
 #endif /* CONFIG_OF_FLATTREE */
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 4fab52294d98..b82f82b74319 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -18,7 +18,6 @@ config MICROBLAZE
         select ARCH_WANT_IPC_PARSE_VERSION
         select HAVE_DEBUG_KMEMLEAK
         select IRQ_DOMAIN
-        select HAVE_GENERIC_HARDIRQS
         select VIRT_TO_BUS
         select GENERIC_IRQ_PROBE
         select GENERIC_IRQ_SHOW
@@ -29,6 +28,7 @@ config MICROBLAZE
         select GENERIC_IDLE_POLL_SETUP
         select MODULES_USE_ELF_RELA
         select CLONE_BACKWARDS3
+        select CLKSRC_OF
 
 config SWAP
         def_bool n
diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
index 0a603d3ecf24..40350a3c24e9 100644
--- a/arch/microblaze/Makefile
+++ b/arch/microblaze/Makefile
@@ -72,7 +72,7 @@ all: linux.bin
 archclean:
         $(Q)$(MAKE) $(clean)=$(boot)
 
-linux.bin linux.bin.gz: vmlinux
+linux.bin linux.bin.gz linux.bin.ub: vmlinux
         $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
 simpleImage.%: vmlinux
@@ -81,6 +81,7 @@ simpleImage.%: vmlinux
 define archhelp
   echo '* linux.bin    - Create raw binary'
   echo '  linux.bin.gz - Create compressed raw binary'
+  echo '  linux.bin.ub - Create U-Boot wrapped raw binary'
   echo '  simpleImage.<dt> - ELF image with $(arch)/boot/dts/<dt>.dts linked in'
   echo '                   - stripped elf with fdt blob'
   echo '  simpleImage.<dt>.unstrip - full ELF image with fdt blob'
diff --git a/arch/microblaze/boot/Makefile b/arch/microblaze/boot/Makefile
index 80fe54fb7ca3..8e211cc28dac 100644
--- a/arch/microblaze/boot/Makefile
+++ b/arch/microblaze/boot/Makefile
@@ -2,12 +2,15 @@
 # arch/microblaze/boot/Makefile
 #
 
-targets := linux.bin linux.bin.gz simpleImage.%
+targets := linux.bin linux.bin.gz linux.bin.ub simpleImage.%
 
 OBJCOPYFLAGS := -R .note -R .comment -R .note.gnu.build-id -O binary
 
 $(obj)/linux.bin: vmlinux FORCE
         $(call if_changed,objcopy)
+        @echo 'Kernel: $@ is ready' ' (#'`cat .version`')'
+
+$(obj)/linux.bin.ub: $(obj)/linux.bin FORCE
         $(call if_changed,uimage)
         @echo 'Kernel: $@ is ready' ' (#'`cat .version`')'
 
@@ -22,8 +25,6 @@ quiet_cmd_strip = STRIP   $@
         cmd_strip = $(STRIP) -K microblaze_start -K _end -K __log_buf \
                                 -K _fdt_start vmlinux -o $@
 
-UIMAGE_IN = $@
-UIMAGE_OUT = $@.ub
 UIMAGE_LOADADDR = $(CONFIG_KERNEL_BASE_ADDR)
 
 $(obj)/simpleImage.%: vmlinux FORCE
diff --git a/arch/microblaze/include/asm/prom.h b/arch/microblaze/include/asm/prom.h
index 20c5e8e5121b..9977816c5ad3 100644
--- a/arch/microblaze/include/asm/prom.h
+++ b/arch/microblaze/include/asm/prom.h
@@ -50,9 +50,6 @@ void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop,
 
 extern void kdump_move_device_tree(void);
 
-/* CPU OF node matching */
-struct device_node *of_get_cpu_node(int cpu, unsigned int *thread);
-
 #endif /* __ASSEMBLY__ */
 #endif /* __KERNEL__ */
 
diff --git a/arch/microblaze/include/asm/selfmod.h b/arch/microblaze/include/asm/selfmod.h
deleted file mode 100644
index c42aff2e6cd0..000000000000
--- a/arch/microblaze/include/asm/selfmod.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright (C) 2007-2008 Michal Simek <monstr@monstr.eu>
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-
-#ifndef _ASM_MICROBLAZE_SELFMOD_H
-#define _ASM_MICROBLAZE_SELFMOD_H
-
-/*
- * BARRIER_BASE_ADDR is constant address for selfmod function.
- * do not change this value - selfmod function is in
- * arch/microblaze/kernel/selfmod.c: selfmod_function()
- *
- * last 16 bits is used for storing register offset
- */
-
-#define BARRIER_BASE_ADDR       0x1234ff00
-
-void selfmod_function(const int *arr_fce, const unsigned int base);
-
-#endif /* _ASM_MICROBLAZE_SELFMOD_H */
diff --git a/arch/microblaze/kernel/Makefile b/arch/microblaze/kernel/Makefile
index 928c950fc14c..5b0e512c78e5 100644
--- a/arch/microblaze/kernel/Makefile
+++ b/arch/microblaze/kernel/Makefile
@@ -7,7 +7,6 @@ ifdef CONFIG_FUNCTION_TRACER
 CFLAGS_REMOVE_timer.o = -pg
 CFLAGS_REMOVE_intc.o = -pg
 CFLAGS_REMOVE_early_printk.o = -pg
-CFLAGS_REMOVE_selfmod.o = -pg
 CFLAGS_REMOVE_heartbeat.o = -pg
 CFLAGS_REMOVE_ftrace.o = -pg
 CFLAGS_REMOVE_process.o = -pg
@@ -23,7 +22,6 @@ obj-y += dma.o exceptions.o \
 obj-y += cpu/
 
 obj-$(CONFIG_EARLY_PRINTK)      += early_printk.o
-obj-$(CONFIG_SELFMOD)           += selfmod.o
 obj-$(CONFIG_HEART_BEAT)        += heartbeat.o
 obj-$(CONFIG_MODULES)           += microblaze_ksyms.o module.o
 obj-$(CONFIG_MMU)               += misc.o
diff --git a/arch/microblaze/kernel/cpu/cpuinfo.c b/arch/microblaze/kernel/cpu/cpuinfo.c
index 410398f6db55..c9203b1007aa 100644
--- a/arch/microblaze/kernel/cpu/cpuinfo.c
+++ b/arch/microblaze/kernel/cpu/cpuinfo.c
@@ -39,6 +39,8 @@ const struct cpu_ver_key cpu_ver_lookup[] = {
         {"8.30.a", 0x17},
         {"8.40.a", 0x18},
         {"8.40.b", 0x19},
+        {"9.0", 0x1b},
+        {"9.1", 0x1d},
         {NULL, 0},
 };
 
diff --git a/arch/microblaze/kernel/intc.c b/arch/microblaze/kernel/intc.c
index d85fa3a2b0f8..581451ad4687 100644
--- a/arch/microblaze/kernel/intc.c
+++ b/arch/microblaze/kernel/intc.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu>
+ * Copyright (C) 2007-2013 Michal Simek <monstr@monstr.eu>
+ * Copyright (C) 2012-2013 Xilinx, Inc.
  * Copyright (C) 2007-2009 PetaLogix
  * Copyright (C) 2006 Atmark Techno, Inc.
  *
@@ -8,23 +9,15 @@
  * for more details.
  */
 
-#include <linux/init.h>
 #include <linux/irqdomain.h>
 #include <linux/irq.h>
-#include <asm/page.h>
+#include <linux/of_address.h>
 #include <linux/io.h>
 #include <linux/bug.h>
 
-#include <asm/prom.h>
-#include <asm/irq.h>
+#include "../../drivers/irqchip/irqchip.h"
 
-#ifdef CONFIG_SELFMOD_INTC
-#include <asm/selfmod.h>
-#define INTC_BASE       BARRIER_BASE_ADDR
-#else
-static unsigned int intc_baseaddr;
-#define INTC_BASE       intc_baseaddr
-#endif
+static void __iomem *intc_baseaddr;
 
 /* No one else should require these constants, so define them locally here. */
 #define ISR 0x00                        /* Interrupt Status Register */
@@ -50,21 +43,21 @@ static void intc_enable_or_unmask(struct irq_data *d)
          * acks the irq before calling the interrupt handler
          */
         if (irqd_is_level_type(d))
-                out_be32(INTC_BASE + IAR, mask);
+                out_be32(intc_baseaddr + IAR, mask);
 
-        out_be32(INTC_BASE + SIE, mask);
+        out_be32(intc_baseaddr + SIE, mask);
 }
 
 static void intc_disable_or_mask(struct irq_data *d)
 {
         pr_debug("disable: %ld\n", d->hwirq);
-        out_be32(INTC_BASE + CIE, 1 << d->hwirq);
+        out_be32(intc_baseaddr + CIE, 1 << d->hwirq);
 }
 
 static void intc_ack(struct irq_data *d)
 {
         pr_debug("ack: %ld\n", d->hwirq);
-        out_be32(INTC_BASE + IAR, 1 << d->hwirq);
+        out_be32(intc_baseaddr + IAR, 1 << d->hwirq);
 }
 
 static void intc_mask_ack(struct irq_data *d)
@@ -72,8 +65,8 @@ static void intc_mask_ack(struct irq_data *d)
         unsigned long mask = 1 << d->hwirq;
 
         pr_debug("disable_and_ack: %ld\n", d->hwirq);
-        out_be32(INTC_BASE + CIE, mask);
-        out_be32(INTC_BASE + IAR, mask);
+        out_be32(intc_baseaddr + CIE, mask);
+        out_be32(intc_baseaddr + IAR, mask);
 }
 
 static struct irq_chip intc_dev = {
@@ -90,7 +83,7 @@ unsigned int get_irq(void)
 {
         unsigned int hwirq, irq = -1;
 
-        hwirq = in_be32(INTC_BASE + IVR);
+        hwirq = in_be32(intc_baseaddr + IVR);
         if (hwirq != -1U)
                 irq = irq_find_mapping(root_domain, hwirq);
 
@@ -120,40 +113,32 @@ static const struct irq_domain_ops xintc_irq_domain_ops = {
         .map = xintc_map,
 };
 
-void __init init_IRQ(void)
+static int __init xilinx_intc_of_init(struct device_node *intc,
+                                             struct device_node *parent)
 {
         u32 nr_irq, intr_mask;
-        struct device_node *intc = NULL;
-#ifdef CONFIG_SELFMOD_INTC
-        unsigned int intc_baseaddr = 0;
-        static int arr_func[] = {
-                                (int)&get_irq,
-                                (int)&intc_enable_or_unmask,
-                                (int)&intc_disable_or_mask,
-                                (int)&intc_mask_ack,
-                                (int)&intc_ack,
-                                (int)&intc_end,
-                                0
-                        };
-#endif
-        intc = of_find_compatible_node(NULL, NULL, "xlnx,xps-intc-1.00.a");
-        BUG_ON(!intc);
-
-        intc_baseaddr = be32_to_cpup(of_get_property(intc, "reg", NULL));
-        intc_baseaddr = (unsigned long) ioremap(intc_baseaddr, PAGE_SIZE);
-        nr_irq = be32_to_cpup(of_get_property(intc,
-                                                "xlnx,num-intr-inputs", NULL));
-
-        intr_mask =
-                be32_to_cpup(of_get_property(intc, "xlnx,kind-of-intr", NULL));
+        int ret;
+
+        intc_baseaddr = of_iomap(intc, 0);
+        BUG_ON(!intc_baseaddr);
+
+        ret = of_property_read_u32(intc, "xlnx,num-intr-inputs", &nr_irq);
+        if (ret < 0) {
+                pr_err("%s: unable to read xlnx,num-intr-inputs\n", __func__);
+                return -EINVAL;
+        }
+
+        ret = of_property_read_u32(intc, "xlnx,kind-of-intr", &intr_mask);
+        if (ret < 0) {
+                pr_err("%s: unable to read xlnx,kind-of-intr\n", __func__);
+                return -EINVAL;
+        }
+
         if (intr_mask > (u32)((1ULL << nr_irq) - 1))
                 pr_info(" ERROR: Mismatch in kind-of-intr param\n");
 
-#ifdef CONFIG_SELFMOD_INTC
-        selfmod_function((int *) arr_func, intc_baseaddr);
-#endif
-        pr_info("%s #0 at 0x%08x, num_irq=%d, edge=0x%x\n",
-                intc->name, intc_baseaddr, nr_irq, intr_mask);
+        pr_info("%s: num_irq=%d, edge=0x%x\n",
+                intc->full_name, nr_irq, intr_mask);
 
         /*
          * Disable all external interrupts until they are
@@ -174,4 +159,8 @@ void __init init_IRQ(void)
                                                         (void *)intr_mask);
 
         irq_set_default_host(root_domain);
+
+        return 0;
 }
+
+IRQCHIP_DECLARE(xilinx_intc, "xlnx,xps-intc-1.00.a", xilinx_intc_of_init);
diff --git a/arch/microblaze/kernel/irq.c b/arch/microblaze/kernel/irq.c
index ace700afbfdf..11e24de91aa4 100644
--- a/arch/microblaze/kernel/irq.c
+++ b/arch/microblaze/kernel/irq.c
@@ -17,10 +17,8 @@
 #include <linux/seq_file.h>
 #include <linux/kernel_stat.h>
 #include <linux/irq.h>
+#include <linux/irqchip.h>
 #include <linux/of_irq.h>
-#include <linux/export.h>
-
-#include <asm/prom.h>
 
 static u32 concurrent_irq;
 
@@ -47,3 +45,9 @@ next_irq:
         set_irq_regs(old_regs);
         trace_hardirqs_on();
 }
+
+void __init init_IRQ(void)
+{
+        /* process the entire interrupt tree in one go */
+        irqchip_init();
+}
diff --git a/arch/microblaze/kernel/prom.c b/arch/microblaze/kernel/prom.c
index 0a2c68f9f9b0..0c4453f134cb 100644
--- a/arch/microblaze/kernel/prom.c
+++ b/arch/microblaze/kernel/prom.c
@@ -46,11 +46,6 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
         memblock_add(base, size);
 }
 
-void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
-{
-        return __va(memblock_alloc(size, align));
-}
-
 #ifdef CONFIG_EARLY_PRINTK
 static char *stdout;
 
@@ -136,8 +131,7 @@ void __init early_init_devtree(void *params)
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
-void __init early_init_dt_setup_initrd_arch(unsigned long start,
-                unsigned long end)
+void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
 {
         initrd_start = (unsigned long)__va(start);
         initrd_end = (unsigned long)__va(end);
diff --git a/arch/microblaze/kernel/reset.c b/arch/microblaze/kernel/reset.c
index 2e5079ab53d2..fbe58c6554a8 100644
--- a/arch/microblaze/kernel/reset.c
+++ b/arch/microblaze/kernel/reset.c
@@ -67,7 +67,11 @@ static void gpio_system_reset(void)
                 pr_notice("Reset GPIO unavailable - halting!\n");
 }
 #else
-#define gpio_system_reset() do {} while (0)
+static void gpio_system_reset(void)
+{
+        pr_notice("No reset GPIO present - halting!\n");
+}
+
 void of_platform_reset_gpio_probe(void)
 {
         return;
diff --git a/arch/microblaze/kernel/selfmod.c b/arch/microblaze/kernel/selfmod.c
deleted file mode 100644
index 89508bdc9f3c..000000000000
--- a/arch/microblaze/kernel/selfmod.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu>
- * Copyright (C) 2009 PetaLogix
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License. See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-
-#include <linux/interrupt.h>
-#include <asm/selfmod.h>
-
-#undef DEBUG
-
-#if __GNUC__ > 3
-#error GCC 4 unsupported SELFMOD. Please disable SELFMOD from menuconfig.
-#endif
-
-#define OPCODE_IMM              0xB0000000
-#define OPCODE_LWI              0xE8000000
-#define OPCODE_LWI_MASK         0xEC000000
-#define OPCODE_RTSD             0xB60F0008 /* return from func: rtsd r15, 8 */
-#define OPCODE_ADDIK            0x30000000
-#define OPCODE_ADDIK_MASK       0xFC000000
-
-#define IMM_BASE        (OPCODE_IMM | (BARRIER_BASE_ADDR >> 16))
-#define LWI_BASE        (OPCODE_LWI | (BARRIER_BASE_ADDR & 0x0000ff00))
-#define LWI_BASE_MASK   (OPCODE_LWI_MASK | (BARRIER_BASE_ADDR & 0x0000ff00))
-#define ADDIK_BASE      (OPCODE_ADDIK | (BARRIER_BASE_ADDR & 0x0000ff00))
-#define ADDIK_BASE_MASK (OPCODE_ADDIK_MASK | (BARRIER_BASE_ADDR & 0x0000ff00))
-
-#define MODIFY_INSTR {                                          \
-        pr_debug("%s: curr instr, (%d):0x%x, next(%d):0x%x\n",          \
-                __func__, i, addr[i], i + 1, addr[i + 1]);              \
-        addr[i] = OPCODE_IMM + (base >> 16);                            \
-        /* keep instruction opcode and add only last 16bits */          \
-        addr[i + 1] = (addr[i + 1] & 0xffff00ff) + (base & 0xffff);     \
-        __invalidate_icache(addr[i]);                                   \
-        __invalidate_icache(addr[i + 1]);                               \
-        pr_debug("%s: hack instr, (%d):0x%x, next(%d):0x%x\n",          \
-                __func__, i, addr[i], i + 1, addr[i + 1]); }
-
-/* NOTE
- * self-modified part of code for improvement of interrupt controller
- * save instruction in interrupt rutine
- */
-void selfmod_function(const int *arr_fce, const unsigned int base)
-{
-        unsigned int flags, i, j, *addr = NULL;
-
-        local_irq_save(flags);
-        __disable_icache();
-
-        /* zero terminated array */
-        for (j = 0; arr_fce[j] != 0; j++) {
-                /* get start address of function */
-                addr = (unsigned int *) arr_fce[j];
-                pr_debug("%s: func(%d) at 0x%x\n",
-                                        __func__, j, (unsigned int) addr);
-                for (i = 0; ; i++) {
-                        pr_debug("%s: instruction code at %d: 0x%x\n",
-                                                __func__, i, addr[i]);
-                        if (addr[i] == IMM_BASE) {
-                                /* detecting of lwi (0xE8) or swi (0xF8) instr
-                                 * I can detect both opcode with one mask */
-                                if ((addr[i + 1] & LWI_BASE_MASK) == LWI_BASE) {
-                                        MODIFY_INSTR;
-                                } else /* detection addik for ack */
-                                if ((addr[i + 1] & ADDIK_BASE_MASK) ==
-                                                                ADDIK_BASE) {
-                                        MODIFY_INSTR;
-                                }
-                        } else if (addr[i] == OPCODE_RTSD) {
-                                /* return from function means end of function */
-                                pr_debug("%s: end of array %d\n", __func__, i);
-                                break;
-                        }
-                }
-        }
-        local_irq_restore(flags);
-} /* end of self-modified code */
diff --git a/arch/microblaze/kernel/setup.c b/arch/microblaze/kernel/setup.c
index 0263da7b83dd..0775e036c526 100644
--- a/arch/microblaze/kernel/setup.c
+++ b/arch/microblaze/kernel/setup.c
@@ -9,6 +9,7 @@
  */
 
 #include <linux/init.h>
+#include <linux/clocksource.h>
 #include <linux/string.h>
 #include <linux/seq_file.h>
 #include <linux/cpu.h>
@@ -68,10 +69,6 @@ void __init setup_arch(char **cmdline_p)
 
         xilinx_pci_init();
 
-#if defined(CONFIG_SELFMOD_INTC) || defined(CONFIG_SELFMOD_TIMER)
-        pr_notice("Self modified code enable\n");
-#endif
-
 #ifdef CONFIG_VT
 #if defined(CONFIG_XILINX_CONSOLE)
         conswitchp = &xil_con;
@@ -196,6 +193,11 @@ void __init machine_early_init(const char *cmdline, unsigned int ram,
         per_cpu(CURRENT_SAVE, 0) = (unsigned long)current;
 }
 
+void __init time_init(void)
+{
+        clocksource_of_init();
+}
+
 #ifdef CONFIG_DEBUG_FS
 struct dentry *of_debugfs_root;
 
diff --git a/arch/microblaze/kernel/timer.c b/arch/microblaze/kernel/timer.c
index aec5020a6e31..e4b3f33ef34c 100644
--- a/arch/microblaze/kernel/timer.c
+++ b/arch/microblaze/kernel/timer.c
@@ -1,5 +1,6 @@
 /*
- * Copyright (C) 2007-2009 Michal Simek <monstr@monstr.eu>
+ * Copyright (C) 2007-2013 Michal Simek <monstr@monstr.eu>
+ * Copyright (C) 2012-2013 Xilinx, Inc.
  * Copyright (C) 2007-2009 PetaLogix
  * Copyright (C) 2006 Atmark Techno, Inc.
  *
@@ -8,34 +9,16 @@
  * for more details.
  */
 
-#include <linux/init.h>
-#include <linux/kernel.h>
-#include <linux/param.h>
 #include <linux/interrupt.h>
-#include <linux/profile.h>
-#include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/sched.h>
-#include <linux/spinlock.h>
-#include <linux/err.h>
 #include <linux/clk.h>
-#include <linux/clocksource.h>
 #include <linux/clockchips.h>
-#include <linux/io.h>
-#include <linux/bug.h>
+#include <linux/of_address.h>
 #include <asm/cpuinfo.h>
-#include <asm/setup.h>
-#include <asm/prom.h>
-#include <asm/irq.h>
 #include <linux/cnt32_to_63.h>
 
-#ifdef CONFIG_SELFMOD_TIMER
-#include <asm/selfmod.h>
-#define TIMER_BASE      BARRIER_BASE_ADDR
-#else
-static unsigned int timer_baseaddr;
-#define TIMER_BASE      timer_baseaddr
-#endif
+static void __iomem *timer_baseaddr;
 
 static unsigned int freq_div_hz;
 static unsigned int timer_clock_freq;
@@ -59,19 +42,21 @@ static unsigned int timer_clock_freq;
 #define TCSR_PWMA       (1<<9)
 #define TCSR_ENALL      (1<<10)
 
-static inline void microblaze_timer0_stop(void)
+static inline void xilinx_timer0_stop(void)
 {
-        out_be32(TIMER_BASE + TCSR0, in_be32(TIMER_BASE + TCSR0) & ~TCSR_ENT);
+        out_be32(timer_baseaddr + TCSR0,
+                 in_be32(timer_baseaddr + TCSR0) & ~TCSR_ENT);
 }
 
-static inline void microblaze_timer0_start_periodic(unsigned long load_val)
+static inline void xilinx_timer0_start_periodic(unsigned long load_val)
 {
         if (!load_val)
                 load_val = 1;
-        out_be32(TIMER_BASE + TLR0, load_val); /* loading value to timer reg */
+        /* loading value to timer reg */
+        out_be32(timer_baseaddr + TLR0, load_val);
 
         /* load the initial value */
-        out_be32(TIMER_BASE + TCSR0, TCSR_LOAD);
+        out_be32(timer_baseaddr + TCSR0, TCSR_LOAD);
 
         /* see timer data sheet for detail
          * !ENALL - don't enable 'em all
@@ -86,38 +71,39 @@ static inline void microblaze_timer0_start_periodic(unsigned long load_val)
          * UDT - set the timer as down counter
          * !MDT0 - generate mode
          */
-        out_be32(TIMER_BASE + TCSR0,
+        out_be32(timer_baseaddr + TCSR0,
                         TCSR_TINT|TCSR_ENIT|TCSR_ENT|TCSR_ARHT|TCSR_UDT);
 }
 
-static inline void microblaze_timer0_start_oneshot(unsigned long load_val)
+static inline void xilinx_timer0_start_oneshot(unsigned long load_val)
 {
         if (!load_val)
                 load_val = 1;
-        out_be32(TIMER_BASE + TLR0, load_val); /* loading value to timer reg */
+        /* loading value to timer reg */
+        out_be32(timer_baseaddr + TLR0, load_val);
 
         /* load the initial value */
-        out_be32(TIMER_BASE + TCSR0, TCSR_LOAD);
+        out_be32(timer_baseaddr + TCSR0, TCSR_LOAD);
 
-        out_be32(TIMER_BASE + TCSR0,
+        out_be32(timer_baseaddr + TCSR0,
                         TCSR_TINT|TCSR_ENIT|TCSR_ENT|TCSR_ARHT|TCSR_UDT);
 }
 
-static int microblaze_timer_set_next_event(unsigned long delta,
+static int xilinx_timer_set_next_event(unsigned long delta,
                                         struct clock_event_device *dev)
 {
         pr_debug("%s: next event, delta %x\n", __func__, (u32)delta);
-        microblaze_timer0_start_oneshot(delta);
+        xilinx_timer0_start_oneshot(delta);
         return 0;
 }
 
-static void microblaze_timer_set_mode(enum clock_event_mode mode,
+static void xilinx_timer_set_mode(enum clock_event_mode mode,
                                 struct clock_event_device *evt)
 {
         switch (mode) {
         case CLOCK_EVT_MODE_PERIODIC:
                 pr_info("%s: periodic\n", __func__);
-                microblaze_timer0_start_periodic(freq_div_hz);
+                xilinx_timer0_start_periodic(freq_div_hz);
                 break;
         case CLOCK_EVT_MODE_ONESHOT:
                 pr_info("%s: oneshot\n", __func__);
@@ -127,7 +113,7 @@ static void microblaze_timer_set_mode(enum clock_event_mode mode,
                 break;
         case CLOCK_EVT_MODE_SHUTDOWN:
                 pr_info("%s: shutdown\n", __func__);
-                microblaze_timer0_stop();
+                xilinx_timer0_stop();
                 break;
         case CLOCK_EVT_MODE_RESUME:
                 pr_info("%s: resume\n", __func__);
@@ -135,23 +121,23 @@ static void microblaze_timer_set_mode(enum clock_event_mode mode,
         }
 }
 
-static struct clock_event_device clockevent_microblaze_timer = {
-        .name           = "microblaze_clockevent",
+static struct clock_event_device clockevent_xilinx_timer = {
+        .name           = "xilinx_clockevent",
         .features       = CLOCK_EVT_FEAT_ONESHOT | CLOCK_EVT_FEAT_PERIODIC,
         .shift          = 8,
         .rating         = 300,
-        .set_next_event = microblaze_timer_set_next_event,
-        .set_mode       = microblaze_timer_set_mode,
+        .set_next_event = xilinx_timer_set_next_event,
+        .set_mode       = xilinx_timer_set_mode,
 };
 
 static inline void timer_ack(void)
 {
-        out_be32(TIMER_BASE + TCSR0, in_be32(TIMER_BASE + TCSR0));
+        out_be32(timer_baseaddr + TCSR0, in_be32(timer_baseaddr + TCSR0));
 }
 
 static irqreturn_t timer_interrupt(int irq, void *dev_id)
 {
-        struct clock_event_device *evt = &clockevent_microblaze_timer;
+        struct clock_event_device *evt = &clockevent_xilinx_timer;
 #ifdef CONFIG_HEART_BEAT
         heartbeat();
 #endif
@@ -164,73 +150,74 @@ static struct irqaction timer_irqaction = {
         .handler = timer_interrupt,
         .flags = IRQF_DISABLED | IRQF_TIMER,
         .name = "timer",
-        .dev_id = &clockevent_microblaze_timer,
+        .dev_id = &clockevent_xilinx_timer,
 };
 
-static __init void microblaze_clockevent_init(void)
+static __init void xilinx_clockevent_init(void)
 {
-        clockevent_microblaze_timer.mult =
+        clockevent_xilinx_timer.mult =
                 div_sc(timer_clock_freq, NSEC_PER_SEC,
-                                clockevent_microblaze_timer.shift);
-        clockevent_microblaze_timer.max_delta_ns =
-                clockevent_delta2ns((u32)~0, &clockevent_microblaze_timer);
-        clockevent_microblaze_timer.min_delta_ns =
-                clockevent_delta2ns(1, &clockevent_microblaze_timer);
-        clockevent_microblaze_timer.cpumask = cpumask_of(0);
-        clockevents_register_device(&clockevent_microblaze_timer);
+                                clockevent_xilinx_timer.shift);
+        clockevent_xilinx_timer.max_delta_ns =
+                clockevent_delta2ns((u32)~0, &clockevent_xilinx_timer);
+        clockevent_xilinx_timer.min_delta_ns =
+                clockevent_delta2ns(1, &clockevent_xilinx_timer);
+        clockevent_xilinx_timer.cpumask = cpumask_of(0);
+        clockevents_register_device(&clockevent_xilinx_timer);
 }
 
-static cycle_t microblaze_read(struct clocksource *cs)
+static cycle_t xilinx_read(struct clocksource *cs)
 {
         /* reading actual value of timer 1 */
-        return (cycle_t) (in_be32(TIMER_BASE + TCR1));
+        return (cycle_t) (in_be32(timer_baseaddr + TCR1));
 }
 
-static struct timecounter microblaze_tc = {
+static struct timecounter xilinx_tc = {
         .cc = NULL,
 };
 
-static cycle_t microblaze_cc_read(const struct cyclecounter *cc)
+static cycle_t xilinx_cc_read(const struct cyclecounter *cc)
 {
-        return microblaze_read(NULL);
+        return xilinx_read(NULL);
 }
 
-static struct cyclecounter microblaze_cc = {
-        .read = microblaze_cc_read,
+static struct cyclecounter xilinx_cc = {
+        .read = xilinx_cc_read,
         .mask = CLOCKSOURCE_MASK(32),
         .shift = 8,
 };
 
-static int __init init_microblaze_timecounter(void)
+static int __init init_xilinx_timecounter(void)
 {
-        microblaze_cc.mult = div_sc(timer_clock_freq, NSEC_PER_SEC,
-                                microblaze_cc.shift);
+        xilinx_cc.mult = div_sc(timer_clock_freq, NSEC_PER_SEC,
+                                xilinx_cc.shift);
 
-        timecounter_init(&microblaze_tc, &microblaze_cc, sched_clock());
+        timecounter_init(&xilinx_tc, &xilinx_cc, sched_clock());
 
         return 0;
 }
 
 static struct clocksource clocksource_microblaze = {
-        .name           = "microblaze_clocksource",
+        .name           = "xilinx_clocksource",
         .rating         = 300,
-        .read           = microblaze_read,
+        .read           = xilinx_read,
         .mask           = CLOCKSOURCE_MASK(32),
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
-static int __init microblaze_clocksource_init(void)
+static int __init xilinx_clocksource_init(void)
 {
         if (clocksource_register_hz(&clocksource_microblaze, timer_clock_freq))
                 panic("failed to register clocksource");
 
         /* stop timer1 */
-        out_be32(TIMER_BASE + TCSR1, in_be32(TIMER_BASE + TCSR1) & ~TCSR_ENT);
+        out_be32(timer_baseaddr + TCSR1,
+                 in_be32(timer_baseaddr + TCSR1) & ~TCSR_ENT);
         /* start timer1 - up counting without interrupt */
-        out_be32(TIMER_BASE + TCSR1, TCSR_TINT|TCSR_ENT|TCSR_ARHT);
+        out_be32(timer_baseaddr + TCSR1, TCSR_TINT|TCSR_ENT|TCSR_ARHT);
 
         /* register timecounter - for ftrace support */
-        init_microblaze_timecounter();
+        init_xilinx_timecounter();
         return 0;
 }
 
@@ -240,55 +227,31 @@ static int __init microblaze_clocksource_init(void)
  */
 static int timer_initialized;
 
-void __init time_init(void)
+static void __init xilinx_timer_init(struct device_node *timer)
 {
         u32 irq;
         u32 timer_num = 1;
-        struct device_node *timer = NULL;
-        const void *prop;
-#ifdef CONFIG_SELFMOD_TIMER
-        unsigned int timer_baseaddr = 0;
-        int arr_func[] = {
-                                (int)&microblaze_read,
-                                (int)&timer_interrupt,
-                                (int)&microblaze_clocksource_init,
-                                (int)&microblaze_timer_set_mode,
-                                (int)&microblaze_timer_set_next_event,
-                                0
-                        };
-#endif
-        prop = of_get_property(of_chosen, "system-timer", NULL);
-        if (prop)
-                timer = of_find_node_by_phandle(be32_to_cpup(prop));
-        else
-                pr_info("No chosen timer found, using default\n");
-
-        if (!timer)
-                timer = of_find_compatible_node(NULL, NULL,
-                                                "xlnx,xps-timer-1.00.a");
-        BUG_ON(!timer);
-
-        timer_baseaddr = be32_to_cpup(of_get_property(timer, "reg", NULL));
-        timer_baseaddr = (unsigned long) ioremap(timer_baseaddr, PAGE_SIZE);
+        int ret;
+
+        timer_baseaddr = of_iomap(timer, 0);
+        if (!timer_baseaddr) {
+                pr_err("ERROR: invalid timer base address\n");
+                BUG();
+        }
+
         irq = irq_of_parse_and_map(timer, 0);
-        timer_num = be32_to_cpup(of_get_property(timer,
-                                                "xlnx,one-timer-only", NULL));
+
+        of_property_read_u32(timer, "xlnx,one-timer-only", &timer_num);
         if (timer_num) {
-                pr_emerg("Please   enable two timers in HW\n");
+                pr_emerg("Please enable two timers in HW\n");
                 BUG();
         }
 
-#ifdef CONFIG_SELFMOD_TIMER
-        selfmod_function((int *) arr_func, timer_baseaddr);
-#endif
-        pr_info("%s #0 at 0x%08x, irq=%d\n",
-                timer->name, timer_baseaddr, irq);
+        pr_info("%s: irq=%d\n", timer->full_name, irq);
 
         /* If there is clock-frequency property than use it */
-        prop = of_get_property(timer, "clock-frequency", NULL);
-        if (prop)
-                timer_clock_freq = be32_to_cpup(prop);
-        else
+        ret = of_property_read_u32(timer, "clock-frequency", &timer_clock_freq);
+        if (ret < 0)
                 timer_clock_freq = cpuinfo.cpu_clock_freq;
 
         freq_div_hz = timer_clock_freq / HZ;
@@ -297,8 +260,8 @@ void __init time_init(void)
 #ifdef CONFIG_HEART_BEAT
         setup_heartbeat();
 #endif
-        microblaze_clocksource_init();
-        microblaze_clockevent_init();
+        xilinx_clocksource_init();
+        xilinx_clockevent_init();
         timer_initialized = 1;
 }
 
@@ -312,3 +275,6 @@ unsigned long long notrace sched_clock(void)
         }
         return 0;
 }
+
+CLOCKSOURCE_OF_DECLARE(xilinx_timer, "xlnx,xps-timer-1.00.a",
+                       xilinx_timer_init);
diff --git a/arch/microblaze/mm/fault.c b/arch/microblaze/mm/fault.c
index 731f739d17a1..fa4cf52aa7a6 100644
--- a/arch/microblaze/mm/fault.c
+++ b/arch/microblaze/mm/fault.c
@@ -92,8 +92,7 @@ void do_page_fault(struct pt_regs *regs, unsigned long address,
         int code = SEGV_MAPERR;
         int is_write = error_code & ESR_S;
         int fault;
-        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
-                                         (is_write ? FAULT_FLAG_WRITE : 0);
+        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
 
         regs->ear = address;
         regs->esr = error_code;
@@ -121,6 +120,9 @@ void do_page_fault(struct pt_regs *regs, unsigned long address,
                 die("Weird page fault", regs, SIGSEGV);
         }
 
+        if (user_mode(regs))
+                flags |= FAULT_FLAG_USER;
+
         /* When running in the kernel we expect faults to occur only to
          * addresses in user space.  All other faults represent errors in the
          * kernel and should generate an OOPS.  Unfortunately, in the case of an
@@ -199,6 +201,7 @@ good_area:
         if (unlikely(is_write)) {
                 if (unlikely(!(vma->vm_flags & VM_WRITE)))
                         goto bad_area;
+                flags |= FAULT_FLAG_WRITE;
         /* a read */
         } else {
                 /* protection fault */
diff --git a/arch/microblaze/pci/pci-common.c b/arch/microblaze/pci/pci-common.c
index bdb8ea100e73..1b93bf0892a0 100644
--- a/arch/microblaze/pci/pci-common.c
+++ b/arch/microblaze/pci/pci-common.c
@@ -657,67 +657,42 @@ void pci_resource_to_user(const struct pci_dev *dev, int bar,
 void pci_process_bridge_OF_ranges(struct pci_controller *hose,
                                   struct device_node *dev, int primary)
 {
-        const u32 *ranges;
-        int rlen;
-        int pna = of_n_addr_cells(dev);
-        int np = pna + 5;
         int memno = 0, isa_hole = -1;
-        u32 pci_space;
-        unsigned long long pci_addr, cpu_addr, pci_next, cpu_next, size;
         unsigned long long isa_mb = 0;
         struct resource *res;
+        struct of_pci_range range;
+        struct of_pci_range_parser parser;
 
         pr_info("PCI host bridge %s %s ranges:\n",
                dev->full_name, primary ? "(primary)" : "");
 
-        /* Get ranges property */
-        ranges = of_get_property(dev, "ranges", &rlen);
-        if (ranges == NULL)
+        /* Check for ranges property */
+        if (of_pci_range_parser_init(&parser, dev))
                 return;
 
-        /* Parse it */
         pr_debug("Parsing ranges property...\n");
-        while ((rlen -= np * 4) >= 0) {
+        for_each_of_pci_range(&parser, &range) {
                 /* Read next ranges element */
-                pci_space = ranges[0];
-                pci_addr = of_read_number(ranges + 1, 2);
-                cpu_addr = of_translate_address(dev, ranges + 3);
-                size = of_read_number(ranges + pna + 3, 2);
-
                 pr_debug("pci_space: 0x%08x pci_addr:0x%016llx ",
-                                pci_space, pci_addr);
+                                range.pci_space, range.pci_addr);
                 pr_debug("cpu_addr:0x%016llx size:0x%016llx\n",
-                                        cpu_addr, size);
-
-                ranges += np;
+                                        range.cpu_addr, range.size);
 
                 /* If we failed translation or got a zero-sized region
                  * (some FW try to feed us with non sensical zero sized regions
                  * such as power3 which look like some kind of attempt
                  * at exposing the VGA memory hole)
                  */
-                if (cpu_addr == OF_BAD_ADDR || size == 0)
+                if (range.cpu_addr == OF_BAD_ADDR || range.size == 0)
                         continue;
 
-                /* Now consume following elements while they are contiguous */
-                for (; rlen >= np * sizeof(u32);
-                     ranges += np, rlen -= np * 4) {
-                        if (ranges[0] != pci_space)
-                                break;
-                        pci_next = of_read_number(ranges + 1, 2);
-                        cpu_next = of_translate_address(dev, ranges + 3);
-                        if (pci_next != pci_addr + size ||
-                            cpu_next != cpu_addr + size)
-                                break;
-                        size += of_read_number(ranges + pna + 3, 2);
-                }
-
                 /* Act based on address space type */
                 res = NULL;
-                switch ((pci_space >> 24) & 0x3) {
-                case 1:         /* PCI IO space */
+                switch (range.flags & IORESOURCE_TYPE_BITS) {
+                case IORESOURCE_IO:
                         pr_info("  IO 0x%016llx..0x%016llx -> 0x%016llx\n",
-                               cpu_addr, cpu_addr + size - 1, pci_addr);
+                                range.cpu_addr, range.cpu_addr + range.size - 1,
+                                range.pci_addr);
 
                         /* We support only one IO range */
                         if (hose->pci_io_size) {
@@ -725,11 +700,12 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
                                 continue;
                         }
                         /* On 32 bits, limit I/O space to 16MB */
-                        if (size > 0x01000000)
-                                size = 0x01000000;
+                        if (range.size > 0x01000000)
+                                range.size = 0x01000000;
 
                         /* 32 bits needs to map IOs here */
-                        hose->io_base_virt = ioremap(cpu_addr, size);
+                        hose->io_base_virt = ioremap(range.cpu_addr,
+                                                range.size);
 
                         /* Expect trouble if pci_addr is not 0 */
                         if (primary)
@@ -738,19 +714,20 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
                         /* pci_io_size and io_base_phys always represent IO
                          * space starting at 0 so we factor in pci_addr
                          */
-                        hose->pci_io_size = pci_addr + size;
-                        hose->io_base_phys = cpu_addr - pci_addr;
+                        hose->pci_io_size = range.pci_addr + range.size;
+                        hose->io_base_phys = range.cpu_addr - range.pci_addr;
 
                         /* Build resource */
                         res = &hose->io_resource;
-                        res->flags = IORESOURCE_IO;
-                        res->start = pci_addr;
+                        range.cpu_addr = range.pci_addr;
+
                         break;
-                case 2:         /* PCI Memory space */
-                case 3:         /* PCI 64 bits Memory space */
+                case IORESOURCE_MEM:
                         pr_info(" MEM 0x%016llx..0x%016llx -> 0x%016llx %s\n",
-                               cpu_addr, cpu_addr + size - 1, pci_addr,
-                               (pci_space & 0x40000000) ? "Prefetch" : "");
+                                range.cpu_addr, range.cpu_addr + range.size - 1,
+                                range.pci_addr,
+                                (range.pci_space & 0x40000000) ?
+                                "Prefetch" : "");
 
                         /* We support only 3 memory ranges */
                         if (memno >= 3) {
@@ -758,13 +735,13 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
                                 continue;
                         }
                         /* Handles ISA memory hole space here */
-                        if (pci_addr == 0) {
-                                isa_mb = cpu_addr;
+                        if (range.pci_addr == 0) {
+                                isa_mb = range.cpu_addr;
                                 isa_hole = memno;
                                 if (primary || isa_mem_base == 0)
-                                        isa_mem_base = cpu_addr;
-                                hose->isa_mem_phys = cpu_addr;
-                                hose->isa_mem_size = size;
+                                        isa_mem_base = range.cpu_addr;
+                                hose->isa_mem_phys = range.cpu_addr;
+                                hose->isa_mem_size = range.size;
                         }
 
                         /* We get the PCI/Mem offset from the first range or
@@ -772,30 +749,23 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
                          * hole. If they don't match, bugger.
                          */
                         if (memno == 0 ||
-                            (isa_hole >= 0 && pci_addr != 0 &&
+                            (isa_hole >= 0 && range.pci_addr != 0 &&
                              hose->pci_mem_offset == isa_mb))
-                                hose->pci_mem_offset = cpu_addr - pci_addr;
-                        else if (pci_addr != 0 &&
-                                 hose->pci_mem_offset != cpu_addr - pci_addr) {
+                                hose->pci_mem_offset = range.cpu_addr -
+                                                        range.pci_addr;
+                        else if (range.pci_addr != 0 &&
+                                 hose->pci_mem_offset != range.cpu_addr -
+                                                        range.pci_addr) {
                                 pr_info(" \\--> Skipped (offset mismatch) !\n");
                                 continue;
                         }
 
                         /* Build resource */
                         res = &hose->mem_resources[memno++];
-                        res->flags = IORESOURCE_MEM;
-                        if (pci_space & 0x40000000)
-                                res->flags |= IORESOURCE_PREFETCH;
-                        res->start = cpu_addr;
                         break;
                 }
-                if (res != NULL) {
-                        res->name = dev->full_name;
-                        res->end = res->start + size - 1;
-                        res->parent = NULL;
-                        res->sibling = NULL;
-                        res->child = NULL;
-                }
+                if (res != NULL)
+                        of_pci_range_to_resource(&range, dev, res);
         }
 
         /* If there's an ISA hole and the pci_mem_offset is -not- matching
diff --git a/arch/microblaze/platform/Kconfig.platform b/arch/microblaze/platform/Kconfig.platform
index b1747211b8b1..db1aa5c22cea 100644
--- a/arch/microblaze/platform/Kconfig.platform
+++ b/arch/microblaze/platform/Kconfig.platform
@@ -18,28 +18,6 @@ config PLATFORM_GENERIC
 
 endchoice
 
-config SELFMOD
-        bool "Use self modified code for intc/timer"
-        depends on NO_MMU
-        default n
-        help
-          This choice enables self-modified code for interrupt controller
-          and timer.
-
-config SELFMOD_INTC
-        bool "Use self modified code for intc"
-        depends on SELFMOD
-        default y
-        help
-          This choice enables self-modified code for interrupt controller.
-
-config SELFMOD_TIMER
-        bool "Use self modified code for timer"
-        depends on SELFMOD
-        default y
-        help
-          This choice enables self-modified code for timer.
-
 config OPT_LIB_FUNCTION
         bool "Optimalized lib function"
         default y
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index e12764c2a9d0..f75ab4a2f246 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -25,7 +25,6 @@ config MIPS
         select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
         select HAVE_DMA_ATTRS
         select HAVE_DMA_API_DEBUG
-        select HAVE_GENERIC_HARDIRQS
         select GENERIC_IRQ_PROBE
         select GENERIC_IRQ_SHOW
         select GENERIC_PCI_IOMAP
@@ -95,6 +94,7 @@ config ATH79
         select CSRC_R4K
         select DMA_NONCOHERENT
         select HAVE_CLK
+        select CLKDEV_LOOKUP
         select IRQ_CPU
         select MIPS_MACHINE
         select SYS_HAS_CPU_MIPS32_R2
@@ -131,7 +131,6 @@ config BCM63XX
         select IRQ_CPU
         select SYS_HAS_CPU_MIPS32_R1
         select SYS_HAS_CPU_BMIPS4350 if !BCM63XX_CPU_6338 && !BCM63XX_CPU_6345 && !BCM63XX_CPU_6348
-        select NR_CPUS_DEFAULT_2
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_BIG_ENDIAN
         select SYS_HAS_EARLY_PRINTK
@@ -445,6 +444,8 @@ config RALINK
         select SYS_HAS_EARLY_PRINTK
         select HAVE_MACH_CLKDEV
         select CLKDEV_LOOKUP
+        select ARCH_HAS_RESET_CONTROLLER
+        select RESET_CONTROLLER
 
 config SGI_IP22
         bool "SGI IP22 (Indy/Indigo2)"
@@ -609,7 +610,6 @@ config SIBYTE_SWARM
         select BOOT_ELF32
         select DMA_COHERENT
         select HAVE_PATA_PLATFORM
-        select NR_CPUS_DEFAULT_2
         select SIBYTE_SB1250
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_SB1
@@ -623,7 +623,6 @@ config SIBYTE_LITTLESUR
         select BOOT_ELF32
         select DMA_COHERENT
         select HAVE_PATA_PLATFORM
-        select NR_CPUS_DEFAULT_2
         select SIBYTE_SB1250
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_SB1
@@ -635,7 +634,6 @@ config SIBYTE_SENTOSA
         bool "Sibyte BCM91250E-Sentosa"
         select BOOT_ELF32
         select DMA_COHERENT
-        select NR_CPUS_DEFAULT_2
         select SIBYTE_SB1250
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_SB1
@@ -727,11 +725,11 @@ config CAVIUM_OCTEON_SOC
         select SYS_HAS_CPU_CAVIUM_OCTEON
         select SWAP_IO_SPACE
         select HW_HAS_PCI
-        select ARCH_SUPPORTS_MSI
         select ZONE_DMA32
         select USB_ARCH_HAS_OHCI
         select USB_ARCH_HAS_EHCI
         select HOLES_IN_ZONE
+        select ARCH_REQUIRE_GPIOLIB
         help
           This option supports all of the Octeon reference boards from Cavium
           Networks. It builds a kernel that dynamically determines the Octeon
@@ -763,7 +761,6 @@ config NLM_XLR_BOARD
         select CEVT_R4K
         select CSRC_R4K
         select IRQ_CPU
-        select ARCH_SUPPORTS_MSI
         select ZONE_DMA32 if 64BIT
         select SYNC_R4K
         select SYS_HAS_EARLY_PRINTK
@@ -1862,7 +1859,6 @@ config MIPS_MT_SMP
         select CPU_MIPSR2_IRQ_VI
         select CPU_MIPSR2_IRQ_EI
         select MIPS_MT
-        select NR_CPUS_DEFAULT_2
         select SMP
         select SYS_SUPPORTS_SCHED_SMT if SMP
         select SYS_SUPPORTS_SMP
@@ -2173,12 +2169,6 @@ config SYS_SUPPORTS_MIPS_CMP
 config SYS_SUPPORTS_SMP
         bool
 
-config NR_CPUS_DEFAULT_1
-        bool
-
-config NR_CPUS_DEFAULT_2
-        bool
-
 config NR_CPUS_DEFAULT_4
         bool
 
@@ -2196,10 +2186,8 @@ config NR_CPUS_DEFAULT_64
 
 config NR_CPUS
         int "Maximum number of CPUs (2-64)"
-        range 1 64 if NR_CPUS_DEFAULT_1
+        range 2 64
         depends on SMP
-        default "1" if NR_CPUS_DEFAULT_1
-        default "2" if NR_CPUS_DEFAULT_2
         default "4" if NR_CPUS_DEFAULT_4
         default "8" if NR_CPUS_DEFAULT_8
         default "16" if NR_CPUS_DEFAULT_16
@@ -2305,9 +2293,9 @@ config KEXEC
 
           It is an ongoing process to be certain the hardware in a machine
           is properly shutdown, so do not be surprised if this code does not
-          initially work for you.  It may help to enable device hotplugging
-          support.  As of this writing the exact hardware interface is
-          strongly in flux, so no good recommendation can be made.
+          initially work for you.  As of this writing the exact hardware
+          interface is strongly in flux, so no good recommendation can be
+          made.
 
 config CRASH_DUMP
           bool "Kernel crash dumps"
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index 37f9ef324f2f..ca8f8340d75f 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -194,6 +194,8 @@ include $(srctree)/arch/mips/Kbuild.platforms
 ifdef CONFIG_PHYSICAL_START
 load-y                                  = $(CONFIG_PHYSICAL_START)
 endif
+entry-y                         = 0x$(shell $(NM) vmlinux 2>/dev/null \
+                                        | grep "\bkernel_entry\b" | cut -f1 -d \ )
 
 cflags-y                        += -I$(srctree)/arch/mips/include/asm/mach-generic
 drivers-$(CONFIG_PCI)           += arch/mips/pci/
@@ -225,6 +227,9 @@ KBUILD_CFLAGS	+= $(cflags-y)
 KBUILD_CPPFLAGS += -DVMLINUX_LOAD_ADDRESS=$(load-y)
 KBUILD_CPPFLAGS += -DDATAOFFSET=$(if $(dataoffset-y),$(dataoffset-y),0)
 
+bootvars-y      = VMLINUX_LOAD_ADDRESS=$(load-y) \
+                  VMLINUX_ENTRY_ADDRESS=$(entry-y)
+
 LDFLAGS                 += -m $(ld-emul)
 
 ifdef CONFIG_CC_STACKPROTECTOR
@@ -254,9 +259,25 @@ drivers-$(CONFIG_OPROFILE)	+= arch/mips/oprofile/
 # suspend and hibernation support
 drivers-$(CONFIG_PM)    += arch/mips/power/
 
+# boot image targets (arch/mips/boot/)
+boot-y                  := vmlinux.bin
+boot-y                  += vmlinux.ecoff
+boot-y                  += vmlinux.srec
+ifeq ($(shell expr $(load-y) \< 0xffffffff80000000 2> /dev/null), 0)
+boot-y                  += uImage
+boot-y                  += uImage.gz
+endif
+
+# compressed boot image targets (arch/mips/boot/compressed/)
+bootz-y                 := vmlinuz
+bootz-y                 += vmlinuz.bin
+bootz-y                 += vmlinuz.ecoff
+bootz-y                 += vmlinuz.srec
+
 ifdef CONFIG_LASAT
 rom.bin rom.sw: vmlinux
-        $(Q)$(MAKE) $(build)=arch/mips/lasat/image $@
+        $(Q)$(MAKE) $(build)=arch/mips/lasat/image \
+                $(bootvars-y) $@
 endif
 
 #
@@ -267,9 +288,6 @@ endif
 vmlinux.32: vmlinux
         $(OBJCOPY) -O $(32bit-bfd) $(OBJCOPYFLAGS) $< $@
 
-
-#obj-$(CONFIG_KPROBES)          += kprobes.o
-
 #
 # The 64-bit ELF tools are pretty broken so at this time we generate 64-bit
 # ELF files from 32-bit files by conversion.
@@ -280,13 +298,14 @@ vmlinux.64: vmlinux
 all:    $(all-y)
 
 # boot
-vmlinux.bin vmlinux.ecoff vmlinux.srec: $(vmlinux-32) FORCE
-        $(Q)$(MAKE) $(build)=arch/mips/boot VMLINUX=$(vmlinux-32) arch/mips/boot/$@
+$(boot-y): $(vmlinux-32) FORCE
+        $(Q)$(MAKE) $(build)=arch/mips/boot VMLINUX=$(vmlinux-32) \
+                $(bootvars-y) arch/mips/boot/$@
 
 # boot/compressed
-vmlinuz vmlinuz.bin vmlinuz.ecoff vmlinuz.srec: $(vmlinux-32) FORCE
+$(bootz-y): $(vmlinux-32) FORCE
         $(Q)$(MAKE) $(build)=arch/mips/boot/compressed \
-           VMLINUX_LOAD_ADDRESS=$(load-y) 32bit-bfd=$(32bit-bfd) $@
+                $(bootvars-y) 32bit-bfd=$(32bit-bfd) $@
 
 
 CLEAN_FILES += vmlinux.32 vmlinux.64
@@ -323,6 +342,8 @@ define archhelp
         echo '  vmlinuz.ecoff        - ECOFF zboot image'
         echo '  vmlinuz.bin          - Raw binary zboot image'
         echo '  vmlinuz.srec         - SREC zboot image'
+        echo '  uImage               - U-Boot image'
+        echo '  uImage.gz            - U-Boot image (gzip)'
         echo
         echo '  These will be default as appropriate for a configured platform.'
 endef
diff --git a/arch/mips/alchemy/common/usb.c b/arch/mips/alchemy/common/usb.c
index fcc695626117..2adc7edda49c 100644
--- a/arch/mips/alchemy/common/usb.c
+++ b/arch/mips/alchemy/common/usb.c
@@ -14,6 +14,7 @@
 #include <linux/module.h>
 #include <linux/spinlock.h>
 #include <linux/syscore_ops.h>
+#include <asm/cpu.h>
 #include <asm/mach-au1x00/au1000.h>
 
 /* control register offsets */
@@ -358,7 +359,7 @@ static inline int au1200_coherency_bug(void)
 {
 #if defined(CONFIG_DMA_COHERENT)
         /* Au1200 AB USB does not support coherent memory */
-        if (!(read_c0_prid() & 0xff)) {
+        if (!(read_c0_prid() & PRID_REV_MASK)) {
                 printk(KERN_INFO "Au1200 USB: this is chip revision AB !!\n");
                 printk(KERN_INFO "Au1200 USB: update your board or re-configure"
                                  " the kernel\n");
diff --git a/arch/mips/ath79/clock.c b/arch/mips/ath79/clock.c
index 765ef30e3e1c..26479f437675 100644
--- a/arch/mips/ath79/clock.c
+++ b/arch/mips/ath79/clock.c
@@ -16,6 +16,7 @@
 #include <linux/init.h>
 #include <linux/err.h>
 #include <linux/clk.h>
+#include <linux/clkdev.h>
 
 #include <asm/div64.h>
 
@@ -31,92 +32,132 @@ struct clk {
         unsigned long rate;
 };
 
-static struct clk ath79_ref_clk;
-static struct clk ath79_cpu_clk;
-static struct clk ath79_ddr_clk;
-static struct clk ath79_ahb_clk;
-static struct clk ath79_wdt_clk;
-static struct clk ath79_uart_clk;
+static void __init ath79_add_sys_clkdev(const char *id, unsigned long rate)
+{
+        struct clk *clk;
+        int err;
+
+        clk = kzalloc(sizeof(*clk), GFP_KERNEL);
+        if (!clk)
+                panic("failed to allocate %s clock structure", id);
+
+        clk->rate = rate;
+
+        err = clk_register_clkdev(clk, id, NULL);
+        if (err)
+                panic("unable to register %s clock device", id);
+}
 
 static void __init ar71xx_clocks_init(void)
 {
+        unsigned long ref_rate;
+        unsigned long cpu_rate;
+        unsigned long ddr_rate;
+        unsigned long ahb_rate;
         u32 pll;
         u32 freq;
         u32 div;
 
-        ath79_ref_clk.rate = AR71XX_BASE_FREQ;
+        ref_rate = AR71XX_BASE_FREQ;
 
         pll = ath79_pll_rr(AR71XX_PLL_REG_CPU_CONFIG);
 
         div = ((pll >> AR71XX_PLL_DIV_SHIFT) & AR71XX_PLL_DIV_MASK) + 1;
-        freq = div * ath79_ref_clk.rate;
+        freq = div * ref_rate;
 
         div = ((pll >> AR71XX_CPU_DIV_SHIFT) & AR71XX_CPU_DIV_MASK) + 1;
-        ath79_cpu_clk.rate = freq / div;
+        cpu_rate = freq / div;
 
         div = ((pll >> AR71XX_DDR_DIV_SHIFT) & AR71XX_DDR_DIV_MASK) + 1;
-        ath79_ddr_clk.rate = freq / div;
+        ddr_rate = freq / div;
 
         div = (((pll >> AR71XX_AHB_DIV_SHIFT) & AR71XX_AHB_DIV_MASK) + 1) * 2;
-        ath79_ahb_clk.rate = ath79_cpu_clk.rate / div;
+        ahb_rate = cpu_rate / div;
+
+        ath79_add_sys_clkdev("ref", ref_rate);
+        ath79_add_sys_clkdev("cpu", cpu_rate);
+        ath79_add_sys_clkdev("ddr", ddr_rate);
+        ath79_add_sys_clkdev("ahb", ahb_rate);
 
-        ath79_wdt_clk.rate = ath79_ahb_clk.rate;
-        ath79_uart_clk.rate = ath79_ahb_clk.rate;
+        clk_add_alias("wdt", NULL, "ahb", NULL);
+        clk_add_alias("uart", NULL, "ahb", NULL);
 }
 
 static void __init ar724x_clocks_init(void)
 {
+        unsigned long ref_rate;
+        unsigned long cpu_rate;
+        unsigned long ddr_rate;
+        unsigned long ahb_rate;
         u32 pll;
         u32 freq;
         u32 div;
 
-        ath79_ref_clk.rate = AR724X_BASE_FREQ;
+        ref_rate = AR724X_BASE_FREQ;
         pll = ath79_pll_rr(AR724X_PLL_REG_CPU_CONFIG);
 
         div = ((pll >> AR724X_PLL_DIV_SHIFT) & AR724X_PLL_DIV_MASK);
-        freq = div * ath79_ref_clk.rate;
+        freq = div * ref_rate;
 
         div = ((pll >> AR724X_PLL_REF_DIV_SHIFT) & AR724X_PLL_REF_DIV_MASK);
         freq *= div;
 
-        ath79_cpu_clk.rate = freq;
+        cpu_rate = freq;
 
         div = ((pll >> AR724X_DDR_DIV_SHIFT) & AR724X_DDR_DIV_MASK) + 1;
-        ath79_ddr_clk.rate = freq / div;
+        ddr_rate = freq / div;
 
         div = (((pll >> AR724X_AHB_DIV_SHIFT) & AR724X_AHB_DIV_MASK) + 1) * 2;
-        ath79_ahb_clk.rate = ath79_cpu_clk.rate / div;
+        ahb_rate = cpu_rate / div;
+
+        ath79_add_sys_clkdev("ref", ref_rate);
+        ath79_add_sys_clkdev("cpu", cpu_rate);
+        ath79_add_sys_clkdev("ddr", ddr_rate);
+        ath79_add_sys_clkdev("ahb", ahb_rate);
 
-        ath79_wdt_clk.rate = ath79_ahb_clk.rate;
-        ath79_uart_clk.rate = ath79_ahb_clk.rate;
+        clk_add_alias("wdt", NULL, "ahb", NULL);
+        clk_add_alias("uart", NULL, "ahb", NULL);
 }
 
 static void __init ar913x_clocks_init(void)
 {
+        unsigned long ref_rate;
+        unsigned long cpu_rate;
+        unsigned long ddr_rate;
+        unsigned long ahb_rate;
         u32 pll;
         u32 freq;
         u32 div;
 
-        ath79_ref_clk.rate = AR913X_BASE_FREQ;
+        ref_rate = AR913X_BASE_FREQ;
         pll = ath79_pll_rr(AR913X_PLL_REG_CPU_CONFIG);
 
         div = ((pll >> AR913X_PLL_DIV_SHIFT) & AR913X_PLL_DIV_MASK);
-        freq = div * ath79_ref_clk.rate;
+        freq = div * ref_rate;
 
-        ath79_cpu_clk.rate = freq;
+        cpu_rate = freq;
 
         div = ((pll >> AR913X_DDR_DIV_SHIFT) & AR913X_DDR_DIV_MASK) + 1;
-        ath79_ddr_clk.rate = freq / div;
+        ddr_rate = freq / div;
 
         div = (((pll >> AR913X_AHB_DIV_SHIFT) & AR913X_AHB_DIV_MASK) + 1) * 2;
-        ath79_ahb_clk.rate = ath79_cpu_clk.rate / div;
+        ahb_rate = cpu_rate / div;
 
-        ath79_wdt_clk.rate = ath79_ahb_clk.rate;
-        ath79_uart_clk.rate = ath79_ahb_clk.rate;
+        ath79_add_sys_clkdev("ref", ref_rate);
+        ath79_add_sys_clkdev("cpu", cpu_rate);
+        ath79_add_sys_clkdev("ddr", ddr_rate);
+        ath79_add_sys_clkdev("ahb", ahb_rate);
+
+        clk_add_alias("wdt", NULL, "ahb", NULL);
+        clk_add_alias("uart", NULL, "ahb", NULL);
 }
 
 static void __init ar933x_clocks_init(void)
 {
+        unsigned long ref_rate;
+        unsigned long cpu_rate;
+        unsigned long ddr_rate;
+        unsigned long ahb_rate;
         u32 clock_ctrl;
         u32 cpu_config;
         u32 freq;
@@ -124,21 +165,21 @@ static void __init ar933x_clocks_init(void)
 
         t = ath79_reset_rr(AR933X_RESET_REG_BOOTSTRAP);
         if (t & AR933X_BOOTSTRAP_REF_CLK_40)
-                ath79_ref_clk.rate = (40 * 1000 * 1000);
+                ref_rate = (40 * 1000 * 1000);
         else
-                ath79_ref_clk.rate = (25 * 1000 * 1000);
+                ref_rate = (25 * 1000 * 1000);
 
         clock_ctrl = ath79_pll_rr(AR933X_PLL_CLOCK_CTRL_REG);
         if (clock_ctrl & AR933X_PLL_CLOCK_CTRL_BYPASS) {
-                ath79_cpu_clk.rate = ath79_ref_clk.rate;
-                ath79_ahb_clk.rate = ath79_ref_clk.rate;
-                ath79_ddr_clk.rate = ath79_ref_clk.rate;
+                cpu_rate = ref_rate;
+                ahb_rate = ref_rate;
+                ddr_rate = ref_rate;
         } else {
                 cpu_config = ath79_pll_rr(AR933X_PLL_CPU_CONFIG_REG);
 
                 t = (cpu_config >> AR933X_PLL_CPU_CONFIG_REFDIV_SHIFT) &
                     AR933X_PLL_CPU_CONFIG_REFDIV_MASK;
-                freq = ath79_ref_clk.rate / t;
+                freq = ref_rate / t;
 
                 t = (cpu_config >> AR933X_PLL_CPU_CONFIG_NINT_SHIFT) &
                     AR933X_PLL_CPU_CONFIG_NINT_MASK;
@@ -153,19 +194,24 @@ static void __init ar933x_clocks_init(void)
 
                 t = ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_CPU_DIV_SHIFT) &
                      AR933X_PLL_CLOCK_CTRL_CPU_DIV_MASK) + 1;
-                ath79_cpu_clk.rate = freq / t;
+                cpu_rate = freq / t;
 
                 t = ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_DDR_DIV_SHIFT) &
                       AR933X_PLL_CLOCK_CTRL_DDR_DIV_MASK) + 1;
-                ath79_ddr_clk.rate = freq / t;
+                ddr_rate = freq / t;
 
                 t = ((clock_ctrl >> AR933X_PLL_CLOCK_CTRL_AHB_DIV_SHIFT) &
                      AR933X_PLL_CLOCK_CTRL_AHB_DIV_MASK) + 1;
-                ath79_ahb_clk.rate = freq / t;
+                ahb_rate = freq / t;
         }
 
-        ath79_wdt_clk.rate = ath79_ref_clk.rate;
-        ath79_uart_clk.rate = ath79_ref_clk.rate;
+        ath79_add_sys_clkdev("ref", ref_rate);
+        ath79_add_sys_clkdev("cpu", cpu_rate);
+        ath79_add_sys_clkdev("ddr", ddr_rate);
+        ath79_add_sys_clkdev("ahb", ahb_rate);
+
+        clk_add_alias("wdt", NULL, "ahb", NULL);
+        clk_add_alias("uart", NULL, "ref", NULL);
 }
 
 static u32 __init ar934x_get_pll_freq(u32 ref, u32 ref_div, u32 nint, u32 nfrac,
@@ -174,12 +220,12 @@ static u32 __init ar934x_get_pll_freq(u32 ref, u32 ref_div, u32 nint, u32 nfrac,
         u64 t;
         u32 ret;
 
-        t = ath79_ref_clk.rate;
+        t = ref;
         t *= nint;
         do_div(t, ref_div);
         ret = t;
 
-        t = ath79_ref_clk.rate;
+        t = ref;
         t *= nfrac;
         do_div(t, ref_div * frac);
         ret += t;
@@ -190,6 +236,10 @@ static u32 __init ar934x_get_pll_freq(u32 ref, u32 ref_div, u32 nint, u32 nfrac,
 
 static void __init ar934x_clocks_init(void)
 {
+        unsigned long ref_rate;
+        unsigned long cpu_rate;
+        unsigned long ddr_rate;
+        unsigned long ahb_rate;
         u32 pll, out_div, ref_div, nint, nfrac, frac, clk_ctrl, postdiv;
         u32 cpu_pll, ddr_pll;
         u32 bootstrap;
@@ -199,9 +249,9 @@ static void __init ar934x_clocks_init(void)
 
         bootstrap = ath79_reset_rr(AR934X_RESET_REG_BOOTSTRAP);
         if (bootstrap & AR934X_BOOTSTRAP_REF_CLK_40)
-                ath79_ref_clk.rate = 40 * 1000 * 1000;
+                ref_rate = 40 * 1000 * 1000;
         else
-                ath79_ref_clk.rate = 25 * 1000 * 1000;
+                ref_rate = 25 * 1000 * 1000;
 
         pll = __raw_readl(dpll_base + AR934X_SRIF_CPU_DPLL2_REG);
         if (pll & AR934X_SRIF_DPLL2_LOCAL_PLL) {
@@ -227,7 +277,7 @@ static void __init ar934x_clocks_init(void)
                 frac = 1 << 6;
         }
 
-        cpu_pll = ar934x_get_pll_freq(ath79_ref_clk.rate, ref_div, nint,
+        cpu_pll = ar934x_get_pll_freq(ref_rate, ref_div, nint,
                                       nfrac, frac, out_div);
 
         pll = __raw_readl(dpll_base + AR934X_SRIF_DDR_DPLL2_REG);
@@ -254,7 +304,7 @@ static void __init ar934x_clocks_init(void)
                 frac = 1 << 10;
         }
 
-        ddr_pll = ar934x_get_pll_freq(ath79_ref_clk.rate, ref_div, nint,
+        ddr_pll = ar934x_get_pll_freq(ref_rate, ref_div, nint,
                                       nfrac, frac, out_div);
 
         clk_ctrl = ath79_pll_rr(AR934X_PLL_CPU_DDR_CLK_CTRL_REG);
@@ -263,49 +313,58 @@ static void __init ar934x_clocks_init(void)
                   AR934X_PLL_CPU_DDR_CLK_CTRL_CPU_POST_DIV_MASK;
 
         if (clk_ctrl & AR934X_PLL_CPU_DDR_CLK_CTRL_CPU_PLL_BYPASS)
-                ath79_cpu_clk.rate = ath79_ref_clk.rate;
+                cpu_rate = ref_rate;
         else if (clk_ctrl & AR934X_PLL_CPU_DDR_CLK_CTRL_CPUCLK_FROM_CPUPLL)
-                ath79_cpu_clk.rate = cpu_pll / (postdiv + 1);
+                cpu_rate = cpu_pll / (postdiv + 1);
         else
-                ath79_cpu_clk.rate = ddr_pll / (postdiv + 1);
+                cpu_rate = ddr_pll / (postdiv + 1);
 
         postdiv = (clk_ctrl >> AR934X_PLL_CPU_DDR_CLK_CTRL_DDR_POST_DIV_SHIFT) &
                   AR934X_PLL_CPU_DDR_CLK_CTRL_DDR_POST_DIV_MASK;
 
         if (clk_ctrl & AR934X_PLL_CPU_DDR_CLK_CTRL_DDR_PLL_BYPASS)
-                ath79_ddr_clk.rate = ath79_ref_clk.rate;
+                ddr_rate = ref_rate;
         else if (clk_ctrl & AR934X_PLL_CPU_DDR_CLK_CTRL_DDRCLK_FROM_DDRPLL)
-                ath79_ddr_clk.rate = ddr_pll / (postdiv + 1);
+                ddr_rate = ddr_pll / (postdiv + 1);
         else
-                ath79_ddr_clk.rate = cpu_pll / (postdiv + 1);
+                ddr_rate = cpu_pll / (postdiv + 1);
 
         postdiv = (clk_ctrl >> AR934X_PLL_CPU_DDR_CLK_CTRL_AHB_POST_DIV_SHIFT) &
                   AR934X_PLL_CPU_DDR_CLK_CTRL_AHB_POST_DIV_MASK;
 
         if (clk_ctrl & AR934X_PLL_CPU_DDR_CLK_CTRL_AHB_PLL_BYPASS)
-                ath79_ahb_clk.rate = ath79_ref_clk.rate;
+                ahb_rate = ref_rate;
         else if (clk_ctrl & AR934X_PLL_CPU_DDR_CLK_CTRL_AHBCLK_FROM_DDRPLL)
-                ath79_ahb_clk.rate = ddr_pll / (postdiv + 1);
+                ahb_rate = ddr_pll / (postdiv + 1);
         else
-                ath79_ahb_clk.rate = cpu_pll / (postdiv + 1);
+                ahb_rate = cpu_pll / (postdiv + 1);
+
+        ath79_add_sys_clkdev("ref", ref_rate);
+        ath79_add_sys_clkdev("cpu", cpu_rate);
+        ath79_add_sys_clkdev("ddr", ddr_rate);
+        ath79_add_sys_clkdev("ahb", ahb_rate);
 
-        ath79_wdt_clk.rate = ath79_ref_clk.rate;
-        ath79_uart_clk.rate = ath79_ref_clk.rate;
+        clk_add_alias("wdt", NULL, "ref", NULL);
+        clk_add_alias("uart", NULL, "ref", NULL);
 
         iounmap(dpll_base);
 }
 
 static void __init qca955x_clocks_init(void)
 {
+        unsigned long ref_rate;
+        unsigned long cpu_rate;
+        unsigned long ddr_rate;
+        unsigned long ahb_rate;
         u32 pll, out_div, ref_div, nint, frac, clk_ctrl, postdiv;
         u32 cpu_pll, ddr_pll;
         u32 bootstrap;
 
         bootstrap = ath79_reset_rr(QCA955X_RESET_REG_BOOTSTRAP);
         if (bootstrap & QCA955X_BOOTSTRAP_REF_CLK_40)
-                ath79_ref_clk.rate = 40 * 1000 * 1000;
+                ref_rate = 40 * 1000 * 1000;
         else
-                ath79_ref_clk.rate = 25 * 1000 * 1000;
+                ref_rate = 25 * 1000 * 1000;
 
         pll = ath79_pll_rr(QCA955X_PLL_CPU_CONFIG_REG);
         out_div = (pll >> QCA955X_PLL_CPU_CONFIG_OUTDIV_SHIFT) &
@@ -317,8 +376,8 @@ static void __init qca955x_clocks_init(void)
         frac = (pll >> QCA955X_PLL_CPU_CONFIG_NFRAC_SHIFT) &
                QCA955X_PLL_CPU_CONFIG_NFRAC_MASK;
 
-        cpu_pll = nint * ath79_ref_clk.rate / ref_div;
-        cpu_pll += frac * ath79_ref_clk.rate / (ref_div * (1 << 6));
+        cpu_pll = nint * ref_rate / ref_div;
+        cpu_pll += frac * ref_rate / (ref_div * (1 << 6));
         cpu_pll /= (1 << out_div);
 
         pll = ath79_pll_rr(QCA955X_PLL_DDR_CONFIG_REG);
@@ -331,8 +390,8 @@ static void __init qca955x_clocks_init(void)
         frac = (pll >> QCA955X_PLL_DDR_CONFIG_NFRAC_SHIFT) &
                QCA955X_PLL_DDR_CONFIG_NFRAC_MASK;
 
-        ddr_pll = nint * ath79_ref_clk.rate / ref_div;
-        ddr_pll += frac * ath79_ref_clk.rate / (ref_div * (1 << 10));
+        ddr_pll = nint * ref_rate / ref_div;
+        ddr_pll += frac * ref_rate / (ref_div * (1 << 10));
         ddr_pll /= (1 << out_div);
 
         clk_ctrl = ath79_pll_rr(QCA955X_PLL_CLK_CTRL_REG);
@@ -341,34 +400,39 @@ static void __init qca955x_clocks_init(void)
                   QCA955X_PLL_CLK_CTRL_CPU_POST_DIV_MASK;
 
         if (clk_ctrl & QCA955X_PLL_CLK_CTRL_CPU_PLL_BYPASS)
-                ath79_cpu_clk.rate = ath79_ref_clk.rate;
+                cpu_rate = ref_rate;
         else if (clk_ctrl & QCA955X_PLL_CLK_CTRL_CPUCLK_FROM_CPUPLL)
-                ath79_cpu_clk.rate = ddr_pll / (postdiv + 1);
+                cpu_rate = ddr_pll / (postdiv + 1);
         else
-                ath79_cpu_clk.rate = cpu_pll / (postdiv + 1);
+                cpu_rate = cpu_pll / (postdiv + 1);
 
         postdiv = (clk_ctrl >> QCA955X_PLL_CLK_CTRL_DDR_POST_DIV_SHIFT) &
                   QCA955X_PLL_CLK_CTRL_DDR_POST_DIV_MASK;
 
         if (clk_ctrl & QCA955X_PLL_CLK_CTRL_DDR_PLL_BYPASS)
-                ath79_ddr_clk.rate = ath79_ref_clk.rate;
+                ddr_rate = ref_rate;
         else if (clk_ctrl & QCA955X_PLL_CLK_CTRL_DDRCLK_FROM_DDRPLL)
-                ath79_ddr_clk.rate = cpu_pll / (postdiv + 1);
+                ddr_rate = cpu_pll / (postdiv + 1);
         else
-                ath79_ddr_clk.rate = ddr_pll / (postdiv + 1);
+                ddr_rate = ddr_pll / (postdiv + 1);
 
         postdiv = (clk_ctrl >> QCA955X_PLL_CLK_CTRL_AHB_POST_DIV_SHIFT) &
                   QCA955X_PLL_CLK_CTRL_AHB_POST_DIV_MASK;
 
         if (clk_ctrl & QCA955X_PLL_CLK_CTRL_AHB_PLL_BYPASS)
-                ath79_ahb_clk.rate = ath79_ref_clk.rate;
+                ahb_rate = ref_rate;
         else if (clk_ctrl & QCA955X_PLL_CLK_CTRL_AHBCLK_FROM_DDRPLL)
-                ath79_ahb_clk.rate = ddr_pll / (postdiv + 1);
+                ahb_rate = ddr_pll / (postdiv + 1);
         else
-                ath79_ahb_clk.rate = cpu_pll / (postdiv + 1);
+                ahb_rate = cpu_pll / (postdiv + 1);
 
-        ath79_wdt_clk.rate = ath79_ref_clk.rate;
-        ath79_uart_clk.rate = ath79_ref_clk.rate;
+        ath79_add_sys_clkdev("ref", ref_rate);
+        ath79_add_sys_clkdev("cpu", cpu_rate);
+        ath79_add_sys_clkdev("ddr", ddr_rate);
+        ath79_add_sys_clkdev("ahb", ahb_rate);
+
+        clk_add_alias("wdt", NULL, "ref", NULL);
+        clk_add_alias("uart", NULL, "ref", NULL);
 }
 
 void __init ath79_clocks_init(void)
@@ -387,46 +451,27 @@ void __init ath79_clocks_init(void)
                 qca955x_clocks_init();
         else
                 BUG();
-
-        pr_info("Clocks: CPU:%lu.%03luMHz, DDR:%lu.%03luMHz, AHB:%lu.%03luMHz, "
-                "Ref:%lu.%03luMHz",
-                ath79_cpu_clk.rate / 1000000,
-                (ath79_cpu_clk.rate / 1000) % 1000,
-                ath79_ddr_clk.rate / 1000000,
-                (ath79_ddr_clk.rate / 1000) % 1000,
-                ath79_ahb_clk.rate / 1000000,
-                (ath79_ahb_clk.rate / 1000) % 1000,
-                ath79_ref_clk.rate / 1000000,
-                (ath79_ref_clk.rate / 1000) % 1000);
 }
 
-/*
- * Linux clock API
- */
-struct clk *clk_get(struct device *dev, const char *id)
+unsigned long __init
+ath79_get_sys_clk_rate(const char *id)
 {
-        if (!strcmp(id, "ref"))
-                return &ath79_ref_clk;
-
-        if (!strcmp(id, "cpu"))
-                return &ath79_cpu_clk;
-
-        if (!strcmp(id, "ddr"))
-                return &ath79_ddr_clk;
-
-        if (!strcmp(id, "ahb"))
-                return &ath79_ahb_clk;
+        struct clk *clk;
+        unsigned long rate;
 
-        if (!strcmp(id, "wdt"))
-                return &ath79_wdt_clk;
+        clk = clk_get(NULL, id);
+        if (IS_ERR(clk))
+                panic("unable to get %s clock, err=%d", id, (int) PTR_ERR(clk));
 
-        if (!strcmp(id, "uart"))
-                return &ath79_uart_clk;
+        rate = clk_get_rate(clk);
+        clk_put(clk);
 
-        return ERR_PTR(-ENOENT);
+        return rate;
 }
-EXPORT_SYMBOL(clk_get);
 
+/*
+ * Linux clock API
+ */
 int clk_enable(struct clk *clk)
 {
         return 0;
@@ -443,8 +488,3 @@ unsigned long clk_get_rate(struct clk *clk)
         return clk->rate;
 }
 EXPORT_SYMBOL(clk_get_rate);
-
-void clk_put(struct clk *clk)
-{
-}
-EXPORT_SYMBOL(clk_put);
diff --git a/arch/mips/ath79/common.h b/arch/mips/ath79/common.h
index 561906c2345e..648d2dafbc56 100644
--- a/arch/mips/ath79/common.h
+++ b/arch/mips/ath79/common.h
@@ -21,6 +21,8 @@
 #define ATH79_MEM_SIZE_MAX      (128 * 1024 * 1024)
 
 void ath79_clocks_init(void);
+unsigned long ath79_get_sys_clk_rate(const char *id);
+
 void ath79_ddr_wb_flush(unsigned int reg);
 
 void ath79_gpio_function_enable(u32 mask);
diff --git a/arch/mips/ath79/dev-common.c b/arch/mips/ath79/dev-common.c
index a3a2741d0688..c3b04c929f29 100644
--- a/arch/mips/ath79/dev-common.c
+++ b/arch/mips/ath79/dev-common.c
@@ -81,21 +81,19 @@ static struct platform_device ar933x_uart_device = {
 
 void __init ath79_register_uart(void)
 {
-        struct clk *clk;
+        unsigned long uart_clk_rate;
 
-        clk = clk_get(NULL, "uart");
-        if (IS_ERR(clk))
-                panic("unable to get UART clock, err=%ld", PTR_ERR(clk));
+        uart_clk_rate = ath79_get_sys_clk_rate("uart");
 
         if (soc_is_ar71xx() ||
             soc_is_ar724x() ||
             soc_is_ar913x() ||
             soc_is_ar934x() ||
             soc_is_qca955x()) {
-                ath79_uart_data[0].uartclk = clk_get_rate(clk);
+                ath79_uart_data[0].uartclk = uart_clk_rate;
                 platform_device_register(&ath79_uart_device);
         } else if (soc_is_ar933x()) {
-                ar933x_uart_data.uartclk = clk_get_rate(clk);
+                ar933x_uart_data.uartclk = uart_clk_rate;
                 platform_device_register(&ar933x_uart_device);
         } else {
                 BUG();
diff --git a/arch/mips/ath79/setup.c b/arch/mips/ath79/setup.c
index 80f4ecd42b0d..64807a4809d0 100644
--- a/arch/mips/ath79/setup.c
+++ b/arch/mips/ath79/setup.c
@@ -200,7 +200,6 @@ void __init plat_mem_setup(void)
 
         ath79_detect_sys_type();
         detect_memory_region(0, ATH79_MEM_SIZE_MIN, ATH79_MEM_SIZE_MAX);
-        ath79_clocks_init();
 
         _machine_restart = ath79_restart;
         _machine_halt = ath79_halt;
@@ -209,13 +208,25 @@ void __init plat_mem_setup(void)
 
 void __init plat_time_init(void)
 {
-        struct clk *clk;
+        unsigned long cpu_clk_rate;
+        unsigned long ahb_clk_rate;
+        unsigned long ddr_clk_rate;
+        unsigned long ref_clk_rate;
+
+        ath79_clocks_init();
+
+        cpu_clk_rate = ath79_get_sys_clk_rate("cpu");
+        ahb_clk_rate = ath79_get_sys_clk_rate("ahb");
+        ddr_clk_rate = ath79_get_sys_clk_rate("ddr");
+        ref_clk_rate = ath79_get_sys_clk_rate("ref");
 
-        clk = clk_get(NULL, "cpu");
-        if (IS_ERR(clk))
-                panic("unable to get CPU clock, err=%ld", PTR_ERR(clk));
+        pr_info("Clocks: CPU:%lu.%03luMHz, DDR:%lu.%03luMHz, AHB:%lu.%03luMHz, Ref:%lu.%03luMHz",
+                cpu_clk_rate / 1000000, (cpu_clk_rate / 1000) % 1000,
+                ddr_clk_rate / 1000000, (ddr_clk_rate / 1000) % 1000,
+                ahb_clk_rate / 1000000, (ahb_clk_rate / 1000) % 1000,
+                ref_clk_rate / 1000000, (ref_clk_rate / 1000) % 1000);
 
-        mips_hpt_frequency = clk_get_rate(clk) / 2;
+        mips_hpt_frequency = cpu_clk_rate / 2;
 }
 
 static int __init ath79_setup(void)
diff --git a/arch/mips/bcm63xx/cpu.c b/arch/mips/bcm63xx/cpu.c
index 7e17374a9ae8..b713cd64b087 100644
--- a/arch/mips/bcm63xx/cpu.c
+++ b/arch/mips/bcm63xx/cpu.c
@@ -306,14 +306,14 @@ void __init bcm63xx_cpu_init(void)
 
         switch (c->cputype) {
         case CPU_BMIPS3300:
-                if ((read_c0_prid() & 0xff00) != PRID_IMP_BMIPS3300_ALT)
+                if ((read_c0_prid() & PRID_IMP_MASK) != PRID_IMP_BMIPS3300_ALT)
                         __cpu_name[cpu] = "Broadcom BCM6338";
                 /* fall-through */
         case CPU_BMIPS32:
                 chipid_reg = BCM_6345_PERF_BASE;
                 break;
         case CPU_BMIPS4350:
-                switch ((read_c0_prid() & 0xff)) {
+                switch ((read_c0_prid() & PRID_REV_MASK)) {
                 case 0x04:
                         chipid_reg = BCM_3368_PERF_BASE;
                         break;
diff --git a/arch/mips/bcm63xx/nvram.c b/arch/mips/bcm63xx/nvram.c
index e652e578a679..4b50d40f7451 100644
--- a/arch/mips/bcm63xx/nvram.c
+++ b/arch/mips/bcm63xx/nvram.c
@@ -35,6 +35,8 @@ struct bcm963xx_nvram {
         u32     checksum_high;
 };
 
+#define BCM63XX_DEFAULT_PSI_SIZE        64
+
 static struct bcm963xx_nvram nvram;
 static int mac_addr_used;
 
@@ -114,3 +116,12 @@ int bcm63xx_nvram_get_mac_address(u8 *mac)
         return 0;
 }
 EXPORT_SYMBOL(bcm63xx_nvram_get_mac_address);
+
+int bcm63xx_nvram_get_psi_size(void)
+{
+        if (nvram.psi_size > 0)
+                return nvram.psi_size;
+
+        return BCM63XX_DEFAULT_PSI_SIZE;
+}
+EXPORT_SYMBOL(bcm63xx_nvram_get_psi_size);
diff --git a/arch/mips/boot/.gitignore b/arch/mips/boot/.gitignore
index f210b09ececc..a73d6e2c4f64 100644
--- a/arch/mips/boot/.gitignore
+++ b/arch/mips/boot/.gitignore
@@ -4,3 +4,4 @@ vmlinux.*
 zImage
 zImage.tmp
 calc_vmlinuz_load_addr
+uImage
diff --git a/arch/mips/boot/Makefile b/arch/mips/boot/Makefile
index 851261e9fdc0..1466c0026093 100644
--- a/arch/mips/boot/Makefile
+++ b/arch/mips/boot/Makefile
@@ -40,3 +40,18 @@ quiet_cmd_srec = OBJCOPY $@
       cmd_srec = $(OBJCOPY) -S -O srec $(strip-flags) $(VMLINUX) $@
 $(obj)/vmlinux.srec: $(VMLINUX) FORCE
         $(call if_changed,srec)
+
+UIMAGE_LOADADDR  = $(VMLINUX_LOAD_ADDRESS)
+UIMAGE_ENTRYADDR = $(VMLINUX_ENTRY_ADDRESS)
+
+$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
+        $(call if_changed,gzip)
+
+targets += uImage.gz
+$(obj)/uImage.gz: $(obj)/vmlinux.bin.gz FORCE
+        $(call if_changed,uimage,gzip)
+
+targets += uImage
+$(obj)/uImage: $(obj)/uImage.gz FORCE
+        @ln -sf $(notdir $<) $@
+        @echo '  Image $@ is ready'
diff --git a/arch/mips/boot/compressed/Makefile b/arch/mips/boot/compressed/Makefile
index bb1dbf4abb9d..0048c0897896 100644
--- a/arch/mips/boot/compressed/Makefile
+++ b/arch/mips/boot/compressed/Makefile
@@ -25,7 +25,7 @@ KBUILD_CFLAGS := $(LINUXINCLUDE) $(KBUILD_CFLAGS) -D__KERNEL__ \
 
 KBUILD_AFLAGS := $(LINUXINCLUDE) $(KBUILD_AFLAGS) -D__ASSEMBLY__ \
         -DBOOT_HEAP_SIZE=$(BOOT_HEAP_SIZE) \
-        -DKERNEL_ENTRY=0x$(shell $(NM) $(objtree)/$(KBUILD_IMAGE) 2>/dev/null | grep " kernel_entry" | cut -f1 -d \ )
+        -DKERNEL_ENTRY=$(VMLINUX_ENTRY_ADDRESS)
 
 targets := head.o decompress.o dbg.o uart-16550.o uart-alchemy.o
 
diff --git a/arch/mips/boot/dts/include/dt-bindings b/arch/mips/boot/dts/include/dt-bindings
new file mode 120000
index 000000000000..08c00e4972fa
--- /dev/null
+++ b/arch/mips/boot/dts/include/dt-bindings
@@ -0,0 +1 @@
+../../../../../include/dt-bindings
\ No newline at end of file
diff --git a/arch/mips/cavium-octeon/csrc-octeon.c b/arch/mips/cavium-octeon/csrc-octeon.c
index 02193953eb9e..b752c4ed0b79 100644
--- a/arch/mips/cavium-octeon/csrc-octeon.c
+++ b/arch/mips/cavium-octeon/csrc-octeon.c
@@ -12,6 +12,7 @@
 #include <linux/smp.h>
 
 #include <asm/cpu-info.h>
+#include <asm/cpu-type.h>
 #include <asm/time.h>
 
 #include <asm/octeon/octeon.h>
diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c
index 9d36774bded1..25fbfae06c1f 100644
--- a/arch/mips/cavium-octeon/octeon-irq.c
+++ b/arch/mips/cavium-octeon/octeon-irq.c
@@ -1776,7 +1776,7 @@ asmlinkage void plat_irq_dispatch(void)
 
 #ifdef CONFIG_HOTPLUG_CPU
 
-void fixup_irqs(void)
+void octeon_fixup_irqs(void)
 {
         irq_cpu_offline();
 }
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index 48b08eb9d9e4..b212ae12e5ac 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -8,6 +8,7 @@
  *   written by Ralf Baechle <ralf@linux-mips.org>
  */
 #include <linux/compiler.h>
+#include <linux/vmalloc.h>
 #include <linux/init.h>
 #include <linux/kernel.h>
 #include <linux/console.h>
@@ -1139,3 +1140,30 @@ static int __init edac_devinit(void)
         return err;
 }
 device_initcall(edac_devinit);
+
+static void __initdata *octeon_dummy_iospace;
+
+static int __init octeon_no_pci_init(void)
+{
+        /*
+         * Initially assume there is no PCI. The PCI/PCIe platform code will
+         * later re-initialize these to correct values if they are present.
+         */
+        octeon_dummy_iospace = vzalloc(IO_SPACE_LIMIT);
+        set_io_port_base((unsigned long)octeon_dummy_iospace);
+        ioport_resource.start = MAX_RESOURCE;
+        ioport_resource.end = 0;
+        return 0;
+}
+core_initcall(octeon_no_pci_init);
+
+static int __init octeon_no_pci_release(void)
+{
+        /*
+         * Release the allocated memory if a real IO space is there.
+         */
+        if ((unsigned long)octeon_dummy_iospace != mips_io_port_base)
+                vfree(octeon_dummy_iospace);
+        return 0;
+}
+late_initcall(octeon_no_pci_release);
diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c
index 138cc80c5928..24a2167db778 100644
--- a/arch/mips/cavium-octeon/smp.c
+++ b/arch/mips/cavium-octeon/smp.c
@@ -255,8 +255,6 @@ static void octeon_cpus_done(void)
 /* State of each CPU. */
 DEFINE_PER_CPU(int, cpu_state);
 
-extern void fixup_irqs(void);
-
 static int octeon_cpu_disable(void)
 {
         unsigned int cpu = smp_processor_id();
@@ -267,7 +265,7 @@ static int octeon_cpu_disable(void)
         set_cpu_online(cpu, false);
         cpu_clear(cpu, cpu_callin_map);
         local_irq_disable();
-        fixup_irqs();
+        octeon_fixup_irqs();
         local_irq_enable();
 
         flush_cache_all();
diff --git a/arch/mips/configs/xway_defconfig b/arch/mips/configs/xway_defconfig
new file mode 100644
index 000000000000..8987846240f7
--- /dev/null
+++ b/arch/mips/configs/xway_defconfig
@@ -0,0 +1,159 @@
+CONFIG_LANTIQ=y
+CONFIG_XRX200_PHY_FW=y
+CONFIG_CPU_MIPS32_R2=y
+# CONFIG_COMPACTION is not set
+# CONFIG_CROSS_MEMORY_ATTACH is not set
+CONFIG_HZ_100=y
+# CONFIG_SECCOMP is not set
+# CONFIG_LOCALVERSION_AUTO is not set
+CONFIG_SYSVIPC=y
+CONFIG_HIGH_RES_TIMERS=y
+CONFIG_BLK_DEV_INITRD=y
+# CONFIG_RD_GZIP is not set
+CONFIG_CC_OPTIMIZE_FOR_SIZE=y
+CONFIG_KALLSYMS_ALL=y
+# CONFIG_AIO is not set
+CONFIG_EMBEDDED=y
+# CONFIG_VM_EVENT_COUNTERS is not set
+# CONFIG_SLUB_DEBUG is not set
+# CONFIG_COMPAT_BRK is not set
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_BLK_DEV_BSG is not set
+CONFIG_PARTITION_ADVANCED=y
+# CONFIG_IOSCHED_CFQ is not set
+# CONFIG_COREDUMP is not set
+# CONFIG_SUSPEND is not set
+CONFIG_NET=y
+CONFIG_PACKET=y
+CONFIG_UNIX=y
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_MROUTE=y
+CONFIG_IP_MROUTE_MULTIPLE_TABLES=y
+CONFIG_ARPD=y
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set
+# CONFIG_INET_XFRM_MODE_TUNNEL is not set
+# CONFIG_INET_XFRM_MODE_BEET is not set
+# CONFIG_INET_LRO is not set
+# CONFIG_INET_DIAG is not set
+CONFIG_TCP_CONG_ADVANCED=y
+# CONFIG_TCP_CONG_BIC is not set
+# CONFIG_TCP_CONG_WESTWOOD is not set
+# CONFIG_TCP_CONG_HTCP is not set
+# CONFIG_IPV6 is not set
+CONFIG_NETFILTER=y
+# CONFIG_BRIDGE_NETFILTER is not set
+CONFIG_NF_CONNTRACK=m
+CONFIG_NF_CONNTRACK_FTP=m
+CONFIG_NF_CONNTRACK_IRC=m
+CONFIG_NETFILTER_XT_TARGET_CT=m
+CONFIG_NETFILTER_XT_TARGET_LOG=m
+CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
+CONFIG_NETFILTER_XT_MATCH_COMMENT=m
+CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
+CONFIG_NETFILTER_XT_MATCH_LIMIT=m
+CONFIG_NETFILTER_XT_MATCH_MAC=m
+CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
+CONFIG_NETFILTER_XT_MATCH_STATE=m
+CONFIG_NF_CONNTRACK_IPV4=m
+# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
+CONFIG_IP_NF_IPTABLES=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_IP_NF_TARGET_REJECT=m
+CONFIG_IP_NF_MANGLE=m
+CONFIG_IP_NF_RAW=m
+CONFIG_BRIDGE=y
+# CONFIG_BRIDGE_IGMP_SNOOPING is not set
+CONFIG_VLAN_8021Q=y
+CONFIG_NET_SCHED=y
+CONFIG_HAMRADIO=y
+CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
+# CONFIG_FIRMWARE_IN_KERNEL is not set
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_COMPLEX_MAPPINGS=y
+CONFIG_MTD_PHYSMAP=y
+CONFIG_MTD_PHYSMAP_OF=y
+CONFIG_MTD_LANTIQ=y
+CONFIG_EEPROM_93CX6=m
+CONFIG_SCSI=y
+CONFIG_BLK_DEV_SD=y
+CONFIG_NETDEVICES=y
+CONFIG_LANTIQ_ETOP=y
+# CONFIG_NET_VENDOR_WIZNET is not set
+CONFIG_PHYLIB=y
+CONFIG_PPP=m
+CONFIG_PPP_FILTER=y
+CONFIG_PPP_MULTILINK=y
+CONFIG_PPPOE=m
+CONFIG_PPP_ASYNC=m
+CONFIG_ISDN=y
+CONFIG_INPUT=m
+CONFIG_INPUT_POLLDEV=m
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_KEYBOARD_ATKBD is not set
+# CONFIG_INPUT_MOUSE is not set
+CONFIG_INPUT_MISC=y
+# CONFIG_SERIO is not set
+# CONFIG_VT is not set
+# CONFIG_LEGACY_PTYS is not set
+# CONFIG_DEVKMEM is not set
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+CONFIG_SERIAL_OF_PLATFORM=y
+CONFIG_SPI=y
+CONFIG_GPIO_MM_LANTIQ=y
+CONFIG_GPIO_STP_XWAY=y
+# CONFIG_HWMON is not set
+CONFIG_WATCHDOG=y
+# CONFIG_HID is not set
+# CONFIG_USB_HID is not set
+CONFIG_USB=y
+CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_STORAGE_DEBUG=y
+CONFIG_NEW_LEDS=y
+CONFIG_LEDS_CLASS=y
+CONFIG_LEDS_TRIGGERS=y
+CONFIG_LEDS_TRIGGER_TIMER=y
+CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
+CONFIG_STAGING=y
+# CONFIG_IOMMU_SUPPORT is not set
+# CONFIG_DNOTIFY is not set
+# CONFIG_PROC_PAGE_MONITOR is not set
+CONFIG_TMPFS=y
+CONFIG_TMPFS_XATTR=y
+CONFIG_JFFS2_FS=y
+CONFIG_JFFS2_SUMMARY=y
+CONFIG_JFFS2_FS_XATTR=y
+# CONFIG_JFFS2_FS_POSIX_ACL is not set
+# CONFIG_JFFS2_FS_SECURITY is not set
+CONFIG_JFFS2_COMPRESSION_OPTIONS=y
+# CONFIG_JFFS2_ZLIB is not set
+CONFIG_SQUASHFS=y
+# CONFIG_SQUASHFS_ZLIB is not set
+CONFIG_SQUASHFS_XZ=y
+CONFIG_PRINTK_TIME=y
+# CONFIG_ENABLE_MUST_CHECK is not set
+CONFIG_STRIP_ASM_SYMS=y
+CONFIG_DEBUG_FS=y
+CONFIG_MAGIC_SYSRQ=y
+# CONFIG_SCHED_DEBUG is not set
+# CONFIG_FTRACE is not set
+CONFIG_CMDLINE_BOOL=y
+CONFIG_CRYPTO_MANAGER=m
+CONFIG_CRYPTO_ARC4=m
+# CONFIG_CRYPTO_ANSI_CPRNG is not set
+CONFIG_CRC_ITU_T=m
+CONFIG_CRC32_SARWATE=y
+CONFIG_AVERAGE=y
diff --git a/arch/mips/dec/ioasic-irq.c b/arch/mips/dec/ioasic-irq.c
index 824e08c73798..4b3e3a4375a6 100644
--- a/arch/mips/dec/ioasic-irq.c
+++ b/arch/mips/dec/ioasic-irq.c
@@ -51,6 +51,14 @@ static struct irq_chip ioasic_irq_type = {
         .irq_unmask = unmask_ioasic_irq,
 };
 
+void clear_ioasic_dma_irq(unsigned int irq)
+{
+        u32 sir;
+
+        sir = ~(1 << (irq - ioasic_irq_base));
+        ioasic_write(IO_REG_SIR, sir);
+}
+
 static struct irq_chip ioasic_dma_irq_type = {
         .name = "IO-ASIC-DMA",
         .irq_ack = ack_ioasic_irq,
diff --git a/arch/mips/dec/prom/init.c b/arch/mips/dec/prom/init.c
index ab169046e442..468f665de7bb 100644
--- a/arch/mips/dec/prom/init.c
+++ b/arch/mips/dec/prom/init.c
@@ -13,6 +13,7 @@
 
 #include <asm/bootinfo.h>
 #include <asm/cpu.h>
+#include <asm/cpu-type.h>
 #include <asm/processor.h>
 
 #include <asm/dec/prom.h>
diff --git a/arch/mips/dec/time.c b/arch/mips/dec/time.c
index ea57f39e6736..1914e56f0d96 100644
--- a/arch/mips/dec/time.c
+++ b/arch/mips/dec/time.c
@@ -125,13 +125,18 @@ int rtc_mips_set_mmss(unsigned long nowtime)
 
 void __init plat_time_init(void)
 {
+        int ioasic_clock = 0;
         u32 start, end;
-        int i = HZ / 10;
+        int i = HZ / 8;
 
         /* Set up the rate of periodic DS1287 interrupts. */
         ds1287_set_base_clock(HZ);
 
+        /* On some I/O ASIC systems we have the I/O ASIC's counter.  */
+        if (IOASIC)
+                ioasic_clock = dec_ioasic_clocksource_init() == 0;
         if (cpu_has_counter) {
+                ds1287_timer_state();
                 while (!ds1287_timer_state())
                         ;
 
@@ -143,12 +148,24 @@ void __init plat_time_init(void)
 
                 end = read_c0_count();
 
-                mips_hpt_frequency = (end - start) * 10;
+                mips_hpt_frequency = (end - start) * 8;
                 printk(KERN_INFO "MIPS counter frequency %dHz\n",
                         mips_hpt_frequency);
-        } else if (IOASIC)
-                /* For pre-R4k systems we use the I/O ASIC's counter.  */
-                dec_ioasic_clocksource_init();
+
+                /*
+                 * All R4k DECstations suffer from the CP0 Count erratum,
+                 * so we can't use the timer as a clock source, and a clock
+                 * event both at a time.  An accurate wall clock is more
+                 * important than a high-precision interval timer so only
+                 * use the timer as a clock source, and not a clock event
+                 * if there's no I/O ASIC counter available to serve as a
+                 * clock source.
+                 */
+                if (!ioasic_clock) {
+                        init_r4k_clocksource();
+                        mips_hpt_frequency = 0;
+                }
+        }
 
         ds1287_clockevent_init(dec_interrupt[DEC_IRQ_RTC]);
 }
diff --git a/arch/mips/include/asm/Kbuild b/arch/mips/include/asm/Kbuild
index 9b54b7a403d4..454ddf9bb76f 100644
--- a/arch/mips/include/asm/Kbuild
+++ b/arch/mips/include/asm/Kbuild
@@ -1,2 +1,15 @@
 # MIPS headers
+generic-y += cputime.h
+generic-y += current.h
+generic-y += emergency-restart.h
+generic-y += local64.h
+generic-y += mutex.h
+generic-y += parport.h
+generic-y += percpu.h
+generic-y += scatterlist.h
+generic-y += sections.h
+generic-y += segment.h
+generic-y += serial.h
 generic-y += trace_clock.h
+generic-y += ucontext.h
+generic-y += xor.h
diff --git a/arch/mips/include/asm/bmips.h b/arch/mips/include/asm/bmips.h
index 552a65a0cf2b..27bd060d716e 100644
--- a/arch/mips/include/asm/bmips.h
+++ b/arch/mips/include/asm/bmips.h
@@ -65,44 +65,33 @@ static inline unsigned long bmips_read_zscm_reg(unsigned int offset)
 {
         unsigned long ret;
 
-        __asm__ __volatile__(
-                ".set push\n"
-                ".set noreorder\n"
-                "cache %1, 0(%2)\n"
-                "sync\n"
-                "_ssnop\n"
-                "_ssnop\n"
-                "_ssnop\n"
-                "_ssnop\n"
-                "_ssnop\n"
-                "_ssnop\n"
-                "_ssnop\n"
-                "mfc0 %0, $28, 3\n"
-                "_ssnop\n"
-                ".set pop\n"
-                : "=&r" (ret)
-                : "i" (Index_Load_Tag_S), "r" (ZSCM_REG_BASE + offset)
-                : "memory");
+        barrier();
+        cache_op(Index_Load_Tag_S, ZSCM_REG_BASE + offset);
+        __sync();
+        _ssnop();
+        _ssnop();
+        _ssnop();
+        _ssnop();
+        _ssnop();
+        _ssnop();
+        _ssnop();
+        ret = read_c0_ddatalo();
+        _ssnop();
+
         return ret;
 }
 
 static inline void bmips_write_zscm_reg(unsigned int offset, unsigned long data)
 {
-        __asm__ __volatile__(
-                ".set push\n"
-                ".set noreorder\n"
-                "mtc0 %0, $28, 3\n"
-                "_ssnop\n"
-                "_ssnop\n"
-                "_ssnop\n"
-                "cache %1, 0(%2)\n"
-                "_ssnop\n"
-                "_ssnop\n"
-                "_ssnop\n"
-                : /* no outputs */
-                : "r" (data),
-                  "i" (Index_Store_Tag_S), "r" (ZSCM_REG_BASE + offset)
-                : "memory");
+        write_c0_ddatalo(data);
+        _ssnop();
+        _ssnop();
+        _ssnop();
+        cache_op(Index_Store_Tag_S, ZSCM_REG_BASE + offset);
+        _ssnop();
+        _ssnop();
+        _ssnop();
+        barrier();
 }
 
 #endif /* !defined(__ASSEMBLY__) */
diff --git a/arch/mips/include/asm/cpu-features.h b/arch/mips/include/asm/cpu-features.h
index fa44f3ec5302..d445d060e346 100644
--- a/arch/mips/include/asm/cpu-features.h
+++ b/arch/mips/include/asm/cpu-features.h
@@ -13,12 +13,6 @@
 #include <asm/cpu-info.h>
 #include <cpu-feature-overrides.h>
 
-#ifndef current_cpu_type
-#define current_cpu_type()      current_cpu_data.cputype
-#endif
-
-#define boot_cpu_type()         cpu_data[0].cputype
-
 /*
  * SMP assumption: Options of CPU 0 are a superset of all processors.
  * This is true for all known MIPS systems.
@@ -193,7 +187,7 @@
 
 /*
  * MIPS32, MIPS64, VR5500, IDT32332, IDT32334 and maybe a few other
- * pre-MIPS32/MIPS53 processors have CLO, CLZ.  The IDT RC64574 is 64-bit and
+ * pre-MIPS32/MIPS64 processors have CLO, CLZ.  The IDT RC64574 is 64-bit and
  * has CLO and CLZ but not DCLO nor DCLZ.  For 64-bit kernels
  * cpu_has_clo_clz also indicates the availability of DCLO and DCLZ.
  */
diff --git a/arch/mips/include/asm/cpu-info.h b/arch/mips/include/asm/cpu-info.h
index 41401d8eb7d1..21c8e29c8f91 100644
--- a/arch/mips/include/asm/cpu-info.h
+++ b/arch/mips/include/asm/cpu-info.h
@@ -84,6 +84,7 @@ struct cpuinfo_mips {
 extern struct cpuinfo_mips cpu_data[];
 #define current_cpu_data cpu_data[smp_processor_id()]
 #define raw_current_cpu_data cpu_data[raw_smp_processor_id()]
+#define boot_cpu_data cpu_data[0]
 
 extern void cpu_probe(void);
 extern void cpu_report(void);
diff --git a/arch/mips/include/asm/cpu-type.h b/arch/mips/include/asm/cpu-type.h
new file mode 100644
index 000000000000..4a402cc60c03
--- /dev/null
+++ b/arch/mips/include/asm/cpu-type.h
@@ -0,0 +1,203 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2003, 2004 Ralf Baechle
+ * Copyright (C) 2004  Maciej W. Rozycki
+ */
+#ifndef __ASM_CPU_TYPE_H
+#define __ASM_CPU_TYPE_H
+
+#include <linux/smp.h>
+#include <linux/compiler.h>
+
+static inline int __pure __get_cpu_type(const int cpu_type)
+{
+        switch (cpu_type) {
+#if defined(CONFIG_SYS_HAS_CPU_LOONGSON2E) || \
+    defined(CONFIG_SYS_HAS_CPU_LOONGSON2F)
+        case CPU_LOONGSON2:
+#endif
+
+#ifdef CONFIG_SYS_HAS_CPU_LOONGSON1B
+        case CPU_LOONGSON1:
+#endif
+
+#ifdef CONFIG_SYS_HAS_CPU_MIPS32_R1
+        case CPU_4KC:
+        case CPU_ALCHEMY:
+        case CPU_BMIPS3300:
+        case CPU_BMIPS4350:
+        case CPU_PR4450:
+        case CPU_BMIPS32:
+        case CPU_JZRISC:
+#endif
+
+#if defined(CONFIG_SYS_HAS_CPU_MIPS32_R1) || \
+    defined(CONFIG_SYS_HAS_CPU_MIPS32_R2)
+        case CPU_4KEC:
+#endif
+
+#ifdef CONFIG_SYS_HAS_CPU_MIPS32_R2
+        case CPU_4KSC:
+        case CPU_24K:
+        case CPU_34K:
+        case CPU_1004K:
+        case CPU_74K:
+        case CPU_M14KC:
+        case CPU_M14KEC:
+#endif
+
+#ifdef CONFIG_SYS_HAS_CPU_MIPS64_R1
+        case CPU_5KC:
+        case CPU_5KE:
+        case CPU_20KC:
+        case CPU_25KF:
+        case CPU_SB1:
+        case CPU_SB1A:
+#endif
+
+#ifdef CONFIG_SYS_HAS_CPU_MIPS64_R2
+        /*
+         * All MIPS64 R2 processors have their own special symbols.  That is,
+         * there currently is no pure R2 core
+         */
+#endif
+
+#ifdef CONFIG_SYS_HAS_CPU_R3000
+        case CPU_R2000:
+        case CPU_R3000:
+        case CPU_R3000A:
+        case CPU_R3041:
+        case CPU_R3051:
+        case CPU_R3052:
+        case CPU_R3081:
+        case CPU_R3081E:
+#endif
+
+#ifdef CONFIG_SYS_HAS_CPU_TX39XX
+        case CPU_TX3912:
+        case CPU_TX3922:
+        case CPU_TX3927:
+#endif
+
+#ifdef CONFIG_SYS_HAS_CPU_VR41XX
+        case CPU_VR41XX:
+        case CPU_VR4111:
+        case CPU_VR4121:
+        case CPU_VR4122:
+        case CPU_VR4131:
+        case CPU_VR4133:
+        case CPU_VR4181:
+        case CPU_VR4181A:
+#endif
+
+#ifdef CONFIG_SYS_HAS_CPU_R4300
+        case CPU_R4300:
+        case CPU_R4310:
+#endif
+
+#ifdef CONFIG_SYS_HAS_CPU_R4X00
+        case CPU_R4000PC:
+        case CPU_R4000SC:
+        case CPU_R4000MC:
+        case CPU_R4200:
+        case CPU_R4400PC:
+        case CPU_R4400SC:
+        case CPU_R4400MC:
+        case CPU_R4600:
+        case CPU_R4700:
+        case CPU_R4640:
+        case CPU_R4650:
+#endif
+
+#ifdef CONFIG_SYS_HAS_CPU_TX49XX
+        case CPU_TX49XX:
+#endif
+
+#ifdef CONFIG_SYS_HAS_CPU_R5000
+        case CPU_R5000:
+#endif
+
+#ifdef CONFIG_SYS_HAS_CPU_R5432
+        case CPU_R5432:
+#endif
+
+#ifdef CONFIG_SYS_HAS_CPU_R5500
+        case CPU_R5500:
+#endif
+
+#ifdef CONFIG_SYS_HAS_CPU_R6000
+        case CPU_R6000:
+        case CPU_R6000A:
+#endif
+
+#ifdef CONFIG_SYS_HAS_CPU_NEVADA
+        case CPU_NEVADA:
+#endif
+
+#ifdef CONFIG_SYS_HAS_CPU_R8000
+        case CPU_R8000:
+#endif
+
+#ifdef CONFIG_SYS_HAS_CPU_R10000
+        case CPU_R10000:
+        case CPU_R12000:
+        case CPU_R14000:
+#endif
+#ifdef CONFIG_SYS_HAS_CPU_RM7000
+        case CPU_RM7000:
+        case CPU_SR71000:
+#endif
+#ifdef CONFIG_SYS_HAS_CPU_RM9000
+        case CPU_RM9000:
+#endif
+#ifdef CONFIG_SYS_HAS_CPU_SB1
+        case CPU_SB1:
+        case CPU_SB1A:
+#endif
+#ifdef CONFIG_SYS_HAS_CPU_CAVIUM_OCTEON
+        case CPU_CAVIUM_OCTEON:
+        case CPU_CAVIUM_OCTEON_PLUS:
+        case CPU_CAVIUM_OCTEON2:
+#endif
+
+#ifdef CONFIG_SYS_HAS_CPU_BMIPS4380
+        case CPU_BMIPS4380:
+#endif
+
+#ifdef CONFIG_SYS_HAS_CPU_BMIPS5000
+        case CPU_BMIPS5000:
+#endif
+
+#ifdef CONFIG_SYS_HAS_CPU_XLP
+        case CPU_XLP:
+#endif
+
+#ifdef CONFIG_SYS_HAS_CPU_XLR
+        case CPU_XLR:
+#endif
+                break;
+        default:
+                unreachable();
+        }
+
+        return cpu_type;
+}
+
+static inline int __pure current_cpu_type(void)
+{
+        const int cpu_type = current_cpu_data.cputype;
+
+        return __get_cpu_type(cpu_type);
+}
+
+static inline int __pure boot_cpu_type(void)
+{
+        const int cpu_type = cpu_data[0].cputype;
+
+        return __get_cpu_type(cpu_type);
+}
+
+#endif /* __ASM_CPU_TYPE_H */
diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index 632bbe5a79ea..d2035e16502a 100644
--- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@ -3,15 +3,14 @@
  *        various MIPS cpu types.
  *
  * Copyright (C) 1996 David S. Miller (davem@davemloft.net)
- * Copyright (C) 2004  Maciej W. Rozycki
+ * Copyright (C) 2004, 2013  Maciej W. Rozycki
  */
 #ifndef _ASM_CPU_H
 #define _ASM_CPU_H
 
-/* Assigned Company values for bits 23:16 of the PRId Register
-   (CP0 register 15, select 0).  As of the MIPS32 and MIPS64 specs from
-   MTI, the PRId register is defined in this (backwards compatible)
-   way:
+/*
+   As of the MIPS32 and MIPS64 specs from MTI, the PRId register (CP0
+   register 15, select 0) is defined in this (backwards compatible) way:
 
   +----------------+----------------+----------------+----------------+
   | Company Options| Company ID     | Processor ID   | Revision       |
@@ -23,6 +22,14 @@
    spec.
 */
 
+#define PRID_OPT_MASK           0xff000000
+
+/*
+ * Assigned Company values for bits 23:16 of the PRId register.
+ */
+
+#define PRID_COMP_MASK          0xff0000
+
 #define PRID_COMP_LEGACY        0x000000
 #define PRID_COMP_MIPS          0x010000
 #define PRID_COMP_BROADCOM      0x020000
@@ -38,10 +45,17 @@
 #define PRID_COMP_INGENIC       0xd00000
 
 /*
- * Assigned values for the product ID register.  In order to detect a
- * certain CPU type exactly eventually additional registers may need to
- * be examined.  These are valid when 23:16 == PRID_COMP_LEGACY
+ * Assigned Processor ID (implementation) values for bits 15:8 of the PRId
+ * register.  In order to detect a certain CPU type exactly eventually
+ * additional registers may need to be examined.
  */
+
+#define PRID_IMP_MASK           0xff00
+
+/*
+ * These are valid when 23:16 == PRID_COMP_LEGACY
+ */
+
 #define PRID_IMP_R2000          0x0100
 #define PRID_IMP_AU1_REV1       0x0100
 #define PRID_IMP_AU1_REV2       0x0200
@@ -141,6 +155,9 @@
 #define PRID_IMP_CAVIUM_CN68XX 0x9100
 #define PRID_IMP_CAVIUM_CN66XX 0x9200
 #define PRID_IMP_CAVIUM_CN61XX 0x9300
+#define PRID_IMP_CAVIUM_CNF71XX 0x9400
+#define PRID_IMP_CAVIUM_CN78XX 0x9500
+#define PRID_IMP_CAVIUM_CN70XX 0x9600
 
 /*
  * These are the PRID's for when 23:16 == PRID_COMP_INGENIC
@@ -176,13 +193,18 @@
 
 #define PRID_IMP_NETLOGIC_XLP8XX        0x1000
 #define PRID_IMP_NETLOGIC_XLP3XX        0x1100
+#define PRID_IMP_NETLOGIC_XLP2XX        0x1200
 
 /*
- * Definitions for 7:0 on legacy processors
+ * Particular Revision values for bits 7:0 of the PRId register.
  */
 
 #define PRID_REV_MASK           0x00ff
 
+/*
+ * Definitions for 7:0 on legacy processors
+ */
+
 #define PRID_REV_TX4927         0x0022
 #define PRID_REV_TX4937         0x0030
 #define PRID_REV_R4400          0x0040
@@ -223,6 +245,8 @@
  *  31                             16 15             8 7              0
  */
 
+#define FPIR_IMP_MASK           0xff00
+
 #define FPIR_IMP_NONE           0x0000
 
 enum cpu_type_enum {
@@ -272,7 +296,7 @@ enum cpu_type_enum {
          */
         CPU_5KC, CPU_5KE, CPU_20KC, CPU_25KF, CPU_SB1, CPU_SB1A, CPU_LOONGSON2,
         CPU_CAVIUM_OCTEON, CPU_CAVIUM_OCTEON_PLUS, CPU_CAVIUM_OCTEON2,
-        CPU_XLR, CPU_XLP,
+        CPU_CAVIUM_OCTEON3, CPU_XLR, CPU_XLP,
 
         CPU_LAST
 };
diff --git a/arch/mips/include/asm/cputime.h b/arch/mips/include/asm/cputime.h
deleted file mode 100644
index c00eacbdd979..000000000000
--- a/arch/mips/include/asm/cputime.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __MIPS_CPUTIME_H
-#define __MIPS_CPUTIME_H
-
-#include <asm-generic/cputime.h>
-
-#endif /* __MIPS_CPUTIME_H */
diff --git a/arch/mips/include/asm/current.h b/arch/mips/include/asm/current.h
deleted file mode 100644
index 4c51401b5537..000000000000
--- a/arch/mips/include/asm/current.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/current.h>
diff --git a/arch/mips/include/asm/dec/ioasic.h b/arch/mips/include/asm/dec/ioasic.h
index 98badd6bf22d..a6e505a0e44b 100644
--- a/arch/mips/include/asm/dec/ioasic.h
+++ b/arch/mips/include/asm/dec/ioasic.h
@@ -31,8 +31,10 @@ static inline u32 ioasic_read(unsigned int reg)
         return ioasic_base[reg / 4];
 }
 
+extern void clear_ioasic_dma_irq(unsigned int irq);
+
 extern void init_ioasic_irqs(int base);
 
-extern void dec_ioasic_clocksource_init(void);
+extern int dec_ioasic_clocksource_init(void);
 
 #endif /* __ASM_DEC_IOASIC_H */
diff --git a/arch/mips/include/asm/emergency-restart.h b/arch/mips/include/asm/emergency-restart.h
deleted file mode 100644
index 108d8c48e42e..000000000000
--- a/arch/mips/include/asm/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-#include <asm-generic/emergency-restart.h>
-
-#endif /* _ASM_EMERGENCY_RESTART_H */
diff --git a/arch/mips/include/asm/local64.h b/arch/mips/include/asm/local64.h
deleted file mode 100644
index 36c93b5cc239..000000000000
--- a/arch/mips/include/asm/local64.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/local64.h>
diff --git a/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
index ddb947e9221f..0089a740e5ae 100644
--- a/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ath79/cpu-feature-overrides.h
@@ -42,8 +42,6 @@
 #define cpu_has_mips64r1        0
 #define cpu_has_mips64r2        0
 
-#define cpu_has_dsp             0
-#define cpu_has_dsp2            0
 #define cpu_has_mipsmt          0
 
 #define cpu_has_64bits          0
diff --git a/arch/mips/include/asm/mach-au1x00/au1000.h b/arch/mips/include/asm/mach-au1x00/au1000.h
index 3e11a468cdf8..54f9e84db8ac 100644
--- a/arch/mips/include/asm/mach-au1x00/au1000.h
+++ b/arch/mips/include/asm/mach-au1x00/au1000.h
@@ -43,6 +43,8 @@
 #include <linux/io.h>
 #include <linux/irq.h>
 
+#include <asm/cpu.h>
+
 /* cpu pipeline flush */
 void static inline au_sync(void)
 {
@@ -140,7 +142,7 @@ static inline int au1xxx_cpu_needs_config_od(void)
 
 static inline int alchemy_get_cputype(void)
 {
-        switch (read_c0_prid() & 0xffff0000) {
+        switch (read_c0_prid() & (PRID_OPT_MASK | PRID_COMP_MASK)) {
         case 0x00030000:
                 return ALCHEMY_CPU_AU1000;
                 break;
diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h
index 4e0b6bc1165e..348df49dcc9f 100644
--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h
+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_nvram.h
@@ -30,4 +30,6 @@ u8 *bcm63xx_nvram_get_name(void);
  */
 int bcm63xx_nvram_get_mac_address(u8 *mac);
 
+int bcm63xx_nvram_get_psi_size(void);
+
 #endif /* BCM63XX_NVRAM_H */
diff --git a/arch/mips/include/asm/mach-cavium-octeon/gpio.h b/arch/mips/include/asm/mach-cavium-octeon/gpio.h
new file mode 100644
index 000000000000..34e9f7aabab4
--- /dev/null
+++ b/arch/mips/include/asm/mach-cavium-octeon/gpio.h
@@ -0,0 +1,21 @@
+#ifndef __ASM_MACH_CAVIUM_OCTEON_GPIO_H
+#define __ASM_MACH_CAVIUM_OCTEON_GPIO_H
+
+#ifdef CONFIG_GPIOLIB
+#define gpio_get_value  __gpio_get_value
+#define gpio_set_value  __gpio_set_value
+#define gpio_cansleep   __gpio_cansleep
+#else
+int gpio_request(unsigned gpio, const char *label);
+void gpio_free(unsigned gpio);
+int gpio_direction_input(unsigned gpio);
+int gpio_direction_output(unsigned gpio, int value);
+int gpio_get_value(unsigned gpio);
+void gpio_set_value(unsigned gpio, int value);
+#endif
+
+#include <asm-generic/gpio.h>
+
+#define gpio_to_irq     __gpio_to_irq
+
+#endif /* __ASM_MACH_GENERIC_GPIO_H */
diff --git a/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h
index f4caacd25552..1bcb6421205e 100644
--- a/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ip22/cpu-feature-overrides.h
@@ -8,6 +8,8 @@
 #ifndef __ASM_MACH_IP22_CPU_FEATURE_OVERRIDES_H
 #define __ASM_MACH_IP22_CPU_FEATURE_OVERRIDES_H
 
+#include <asm/cpu.h>
+
 /*
  * IP22 with a variety of processors so we can't use defaults for everything.
  */
diff --git a/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h
index 1d2b6ff60d33..d6111aa2e886 100644
--- a/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ip27/cpu-feature-overrides.h
@@ -8,6 +8,8 @@
 #ifndef __ASM_MACH_IP27_CPU_FEATURE_OVERRIDES_H
 #define __ASM_MACH_IP27_CPU_FEATURE_OVERRIDES_H
 
+#include <asm/cpu.h>
+
 /*
  * IP27 only comes with R10000 family processors all using the same config
  */
diff --git a/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h
index 65e9c856390d..4cec06d133db 100644
--- a/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h
+++ b/arch/mips/include/asm/mach-ip28/cpu-feature-overrides.h
@@ -9,6 +9,8 @@
 #ifndef __ASM_MACH_IP28_CPU_FEATURE_OVERRIDES_H
 #define __ASM_MACH_IP28_CPU_FEATURE_OVERRIDES_H
 
+#include <asm/cpu.h>
+
 /*
  * IP28 only comes with R10000 family processors all using the same config
  */
diff --git a/arch/mips/include/asm/mach-lantiq/falcon/cpu-feature-overrides.h b/arch/mips/include/asm/mach-lantiq/falcon/cpu-feature-overrides.h
new file mode 100644
index 000000000000..096a10072430
--- /dev/null
+++ b/arch/mips/include/asm/mach-lantiq/falcon/cpu-feature-overrides.h
@@ -0,0 +1,58 @@
+/*
+ *  Lantiq FALCON specific CPU feature overrides
+ *
+ *  Copyright (C) 2013 Thomas Langer, Lantiq Deutschland
+ *
+ *  This file was derived from: include/asm-mips/cpu-features.h
+ *      Copyright (C) 2003, 2004 Ralf Baechle
+ *      Copyright (C) 2004 Maciej W. Rozycki
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ */
+#ifndef __ASM_MACH_FALCON_CPU_FEATURE_OVERRIDES_H
+#define __ASM_MACH_FALCON_CPU_FEATURE_OVERRIDES_H
+
+#define cpu_has_tlb             1
+#define cpu_has_4kex            1
+#define cpu_has_3k_cache        0
+#define cpu_has_4k_cache        1
+#define cpu_has_tx39_cache      0
+#define cpu_has_sb1_cache       0
+#define cpu_has_fpu             0
+#define cpu_has_32fpr           0
+#define cpu_has_counter         1
+#define cpu_has_watch           1
+#define cpu_has_divec           1
+
+#define cpu_has_prefetch        1
+#define cpu_has_ejtag           1
+#define cpu_has_llsc            1
+
+#define cpu_has_mips16          1
+#define cpu_has_mdmx            0
+#define cpu_has_mips3d          0
+#define cpu_has_smartmips       0
+
+#define cpu_has_mips32r1        1
+#define cpu_has_mips32r2        1
+#define cpu_has_mips64r1        0
+#define cpu_has_mips64r2        0
+
+#define cpu_has_dsp             1
+#define cpu_has_mipsmt          1
+
+#define cpu_has_vint            1
+#define cpu_has_veic            1
+
+#define cpu_has_64bits          0
+#define cpu_has_64bit_zero_reg  0
+#define cpu_has_64bit_gp_regs   0
+#define cpu_has_64bit_addresses 0
+
+#define cpu_dcache_line_size()  32
+#define cpu_icache_line_size()  32
+
+#endif /* __ASM_MACH_FALCON_CPU_FEATURE_OVERRIDES_H */
diff --git a/arch/mips/include/asm/mach-ralink/mt7620.h b/arch/mips/include/asm/mach-ralink/mt7620.h
index 9809972ea882..6f9b24f51157 100644
--- a/arch/mips/include/asm/mach-ralink/mt7620.h
+++ b/arch/mips/include/asm/mach-ralink/mt7620.h
@@ -20,6 +20,8 @@
 #define SYSC_REG_CHIP_REV               0x0c
 #define SYSC_REG_SYSTEM_CONFIG0         0x10
 #define SYSC_REG_SYSTEM_CONFIG1         0x14
+#define SYSC_REG_CLKCFG0                0x2c
+#define SYSC_REG_CPU_SYS_CLKCFG         0x3c
 #define SYSC_REG_CPLL_CONFIG0           0x54
 #define SYSC_REG_CPLL_CONFIG1           0x58
 
@@ -29,20 +31,42 @@
 #define MT7620A_CHIP_NAME0              0x3637544d
 #define MT7620A_CHIP_NAME1              0x20203032
 
+#define SYSCFG0_XTAL_FREQ_SEL           BIT(6)
+
 #define CHIP_REV_PKG_MASK               0x1
 #define CHIP_REV_PKG_SHIFT              16
 #define CHIP_REV_VER_MASK               0xf
 #define CHIP_REV_VER_SHIFT              8
 #define CHIP_REV_ECO_MASK               0xf
 
-#define CPLL_SW_CONFIG_SHIFT            31
-#define CPLL_SW_CONFIG_MASK             0x1
-#define CPLL_CPU_CLK_SHIFT              24
-#define CPLL_CPU_CLK_MASK               0x1
-#define CPLL_MULT_RATIO_SHIFT           16
-#define CPLL_MULT_RATIO                 0x7
-#define CPLL_DIV_RATIO_SHIFT            10
-#define CPLL_DIV_RATIO                  0x3
+#define CLKCFG0_PERI_CLK_SEL            BIT(4)
+
+#define CPU_SYS_CLKCFG_OCP_RATIO_SHIFT  16
+#define CPU_SYS_CLKCFG_OCP_RATIO_MASK   0xf
+#define CPU_SYS_CLKCFG_OCP_RATIO_1      0       /* 1:1   (Reserved) */
+#define CPU_SYS_CLKCFG_OCP_RATIO_1_5    1       /* 1:1.5 (Reserved) */
+#define CPU_SYS_CLKCFG_OCP_RATIO_2      2       /* 1:2   */
+#define CPU_SYS_CLKCFG_OCP_RATIO_2_5    3       /* 1:2.5 (Reserved) */
+#define CPU_SYS_CLKCFG_OCP_RATIO_3      4       /* 1:3   */
+#define CPU_SYS_CLKCFG_OCP_RATIO_3_5    5       /* 1:3.5 (Reserved) */
+#define CPU_SYS_CLKCFG_OCP_RATIO_4      6       /* 1:4   */
+#define CPU_SYS_CLKCFG_OCP_RATIO_5      7       /* 1:5   */
+#define CPU_SYS_CLKCFG_OCP_RATIO_10     8       /* 1:10  */
+#define CPU_SYS_CLKCFG_CPU_FDIV_SHIFT   8
+#define CPU_SYS_CLKCFG_CPU_FDIV_MASK    0x1f
+#define CPU_SYS_CLKCFG_CPU_FFRAC_SHIFT  0
+#define CPU_SYS_CLKCFG_CPU_FFRAC_MASK   0x1f
+
+#define CPLL_CFG0_SW_CFG                BIT(31)
+#define CPLL_CFG0_PLL_MULT_RATIO_SHIFT  16
+#define CPLL_CFG0_PLL_MULT_RATIO_MASK   0x7
+#define CPLL_CFG0_LC_CURFCK             BIT(15)
+#define CPLL_CFG0_BYPASS_REF_CLK        BIT(14)
+#define CPLL_CFG0_PLL_DIV_RATIO_SHIFT   10
+#define CPLL_CFG0_PLL_DIV_RATIO_MASK    0x3
+
+#define CPLL_CFG1_CPU_AUX1              BIT(25)
+#define CPLL_CFG1_CPU_AUX0              BIT(24)
 
 #define SYSCFG0_DRAM_TYPE_MASK          0x3
 #define SYSCFG0_DRAM_TYPE_SHIFT         4
diff --git a/arch/mips/include/asm/mach-ralink/mt7620/cpu-feature-overrides.h b/arch/mips/include/asm/mach-ralink/mt7620/cpu-feature-overrides.h
new file mode 100644
index 000000000000..f7bb8cfc5eb1
--- /dev/null
+++ b/arch/mips/include/asm/mach-ralink/mt7620/cpu-feature-overrides.h
@@ -0,0 +1,57 @@
+/*
+ * Ralink MT7620 specific CPU feature overrides
+ *
+ * Copyright (C) 2008-2009 Gabor Juhos <juhosg@openwrt.org>
+ * Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
+ *
+ * This file was derived from: include/asm-mips/cpu-features.h
+ *      Copyright (C) 2003, 2004 Ralf Baechle
+ *      Copyright (C) 2004 Maciej W. Rozycki
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ */
+#ifndef _MT7620_CPU_FEATURE_OVERRIDES_H
+#define _MT7620_CPU_FEATURE_OVERRIDES_H
+
+#define cpu_has_tlb             1
+#define cpu_has_4kex            1
+#define cpu_has_3k_cache        0
+#define cpu_has_4k_cache        1
+#define cpu_has_tx39_cache      0
+#define cpu_has_sb1_cache       0
+#define cpu_has_fpu             0
+#define cpu_has_32fpr           0
+#define cpu_has_counter         1
+#define cpu_has_watch           1
+#define cpu_has_divec           1
+
+#define cpu_has_prefetch        1
+#define cpu_has_ejtag           1
+#define cpu_has_llsc            1
+
+#define cpu_has_mips16          1
+#define cpu_has_mdmx            0
+#define cpu_has_mips3d          0
+#define cpu_has_smartmips       0
+
+#define cpu_has_mips32r1        1
+#define cpu_has_mips32r2        1
+#define cpu_has_mips64r1        0
+#define cpu_has_mips64r2        0
+
+#define cpu_has_dsp             1
+#define cpu_has_dsp2            0
+#define cpu_has_mipsmt          0
+
+#define cpu_has_64bits          0
+#define cpu_has_64bit_zero_reg  0
+#define cpu_has_64bit_gp_regs   0
+#define cpu_has_64bit_addresses 0
+
+#define cpu_dcache_line_size()  32
+#define cpu_icache_line_size()  32
+
+#endif /* _MT7620_CPU_FEATURE_OVERRIDES_H */
diff --git a/arch/mips/include/asm/mipsregs.h b/arch/mips/include/asm/mipsregs.h
index fed1c3e9b486..e0331414c7d6 100644
--- a/arch/mips/include/asm/mipsregs.h
+++ b/arch/mips/include/asm/mipsregs.h
@@ -603,6 +603,13 @@
 #define MIPS_CONF4_MMUEXTDEF    (_ULCAST_(3) << 14)
 #define MIPS_CONF4_MMUEXTDEF_MMUSIZEEXT (_ULCAST_(1) << 14)
 
+#define MIPS_CONF5_NF           (_ULCAST_(1) << 0)
+#define MIPS_CONF5_UFR          (_ULCAST_(1) << 2)
+#define MIPS_CONF5_MSAEN        (_ULCAST_(1) << 27)
+#define MIPS_CONF5_EVA          (_ULCAST_(1) << 28)
+#define MIPS_CONF5_CV           (_ULCAST_(1) << 29)
+#define MIPS_CONF5_K            (_ULCAST_(1) << 30)
+
 #define MIPS_CONF6_SYND         (_ULCAST_(1) << 13)
 
 #define MIPS_CONF7_WII          (_ULCAST_(1) << 31)
diff --git a/arch/mips/include/asm/mutex.h b/arch/mips/include/asm/mutex.h
deleted file mode 100644
index 458c1f7fbc18..000000000000
--- a/arch/mips/include/asm/mutex.h
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Pull in the generic implementation for the mutex fastpath.
- *
- * TODO: implement optimized primitives instead, or leave the generic
- * implementation in place, or pick the atomic_xchg() based generic
- * implementation. (see asm-generic/mutex-xchg.h for details)
- */
-
-#include <asm-generic/mutex-dec.h>
diff --git a/arch/mips/include/asm/netlogic/xlp-hal/bridge.h b/arch/mips/include/asm/netlogic/xlp-hal/bridge.h
index 790f0f1e55c6..4e8eacb9588a 100644
--- a/arch/mips/include/asm/netlogic/xlp-hal/bridge.h
+++ b/arch/mips/include/asm/netlogic/xlp-hal/bridge.h
@@ -88,6 +88,7 @@
 #define BRIDGE_DRAM_LIMIT6              0x22
 #define BRIDGE_DRAM_LIMIT7              0x23
 
+#define BRIDGE_DRAM_NODE_TRANSLN(i)     (0x24 + (i))
 #define BRIDGE_DRAM_NODE_TRANSLN0       0x24
 #define BRIDGE_DRAM_NODE_TRANSLN1       0x25
 #define BRIDGE_DRAM_NODE_TRANSLN2       0x26
@@ -96,6 +97,8 @@
 #define BRIDGE_DRAM_NODE_TRANSLN5       0x29
 #define BRIDGE_DRAM_NODE_TRANSLN6       0x2a
 #define BRIDGE_DRAM_NODE_TRANSLN7       0x2b
+
+#define BRIDGE_DRAM_CHNL_TRANSLN(i)     (0x2c + (i))
 #define BRIDGE_DRAM_CHNL_TRANSLN0       0x2c
 #define BRIDGE_DRAM_CHNL_TRANSLN1       0x2d
 #define BRIDGE_DRAM_CHNL_TRANSLN2       0x2e
@@ -104,6 +107,7 @@
 #define BRIDGE_DRAM_CHNL_TRANSLN5       0x31
 #define BRIDGE_DRAM_CHNL_TRANSLN6       0x32
 #define BRIDGE_DRAM_CHNL_TRANSLN7       0x33
+
 #define BRIDGE_PCIEMEM_BASE0            0x34
 #define BRIDGE_PCIEMEM_BASE1            0x35
 #define BRIDGE_PCIEMEM_BASE2            0x36
diff --git a/arch/mips/include/asm/netlogic/xlp-hal/iomap.h b/arch/mips/include/asm/netlogic/xlp-hal/iomap.h
index 9fac46fb7913..55eee77adaca 100644
--- a/arch/mips/include/asm/netlogic/xlp-hal/iomap.h
+++ b/arch/mips/include/asm/netlogic/xlp-hal/iomap.h
@@ -72,6 +72,12 @@
 #define XLP_IO_USB_OHCI2_OFFSET(node)   XLP_HDR_OFFSET(node, 0, 2, 4)
 #define XLP_IO_USB_OHCI3_OFFSET(node)   XLP_HDR_OFFSET(node, 0, 2, 5)
 
+/* XLP2xx has an updated USB block */
+#define XLP2XX_IO_USB_OFFSET(node, i)   XLP_HDR_OFFSET(node, 0, 4, i)
+#define XLP2XX_IO_USB_XHCI0_OFFSET(node)        XLP_HDR_OFFSET(node, 0, 4, 1)
+#define XLP2XX_IO_USB_XHCI1_OFFSET(node)        XLP_HDR_OFFSET(node, 0, 4, 2)
+#define XLP2XX_IO_USB_XHCI2_OFFSET(node)        XLP_HDR_OFFSET(node, 0, 4, 3)
+
 #define XLP_IO_NAE_OFFSET(node)         XLP_HDR_OFFSET(node, 0, 3, 0)
 #define XLP_IO_POE_OFFSET(node)         XLP_HDR_OFFSET(node, 0, 3, 1)
 
@@ -88,6 +94,9 @@
 #define XLP_IO_I2C0_OFFSET(node)        XLP_HDR_OFFSET(node, 0, 6, 2)
 #define XLP_IO_I2C1_OFFSET(node)        XLP_HDR_OFFSET(node, 0, 6, 3)
 #define XLP_IO_GPIO_OFFSET(node)        XLP_HDR_OFFSET(node, 0, 6, 4)
+/* on 2XX, all I2C busses are on the same block */
+#define XLP2XX_IO_I2C_OFFSET(node)      XLP_HDR_OFFSET(node, 0, 6, 7)
+
 /* system management */
 #define XLP_IO_SYS_OFFSET(node)         XLP_HDR_OFFSET(node, 0, 6, 5)
 #define XLP_IO_JTAG_OFFSET(node)        XLP_HDR_OFFSET(node, 0, 6, 6)
@@ -145,6 +154,7 @@
 #define PCI_DEVICE_ID_NLM_NOR           0x1015
 #define PCI_DEVICE_ID_NLM_NAND          0x1016
 #define PCI_DEVICE_ID_NLM_MMC           0x1018
+#define PCI_DEVICE_ID_NLM_XHCI          0x101d
 
 #ifndef __ASSEMBLY__
 
diff --git a/arch/mips/include/asm/netlogic/xlp-hal/pic.h b/arch/mips/include/asm/netlogic/xlp-hal/pic.h
index 4b5108dfaa16..105389b79f09 100644
--- a/arch/mips/include/asm/netlogic/xlp-hal/pic.h
+++ b/arch/mips/include/asm/netlogic/xlp-hal/pic.h
@@ -208,13 +208,14 @@
 #define PIC_LOCAL_SCHEDULING            1
 #define PIC_GLOBAL_SCHEDULING           0
 
-#define PIC_CLK_HZ                      133333333
-
 #define nlm_read_pic_reg(b, r)  nlm_read_reg64(b, r)
 #define nlm_write_pic_reg(b, r, v) nlm_write_reg64(b, r, v)
 #define nlm_get_pic_pcibase(node) nlm_pcicfg_base(XLP_IO_PIC_OFFSET(node))
 #define nlm_get_pic_regbase(node) (nlm_get_pic_pcibase(node) + XLP_IO_PCI_HDRSZ)
 
+/* We use PIC on node 0 as a timer */
+#define pic_timer_freq()                nlm_get_pic_frequency(0)
+
 /* IRT and h/w interrupt routines */
 static inline int
 nlm_pic_read_irt(uint64_t base, int irt_index)
diff --git a/arch/mips/include/asm/netlogic/xlp-hal/sys.h b/arch/mips/include/asm/netlogic/xlp-hal/sys.h
index 470e52bfc061..fcf2833c16ca 100644
--- a/arch/mips/include/asm/netlogic/xlp-hal/sys.h
+++ b/arch/mips/include/asm/netlogic/xlp-hal/sys.h
@@ -117,6 +117,36 @@
 #define SYS_SCRTCH2                             0x4b
 #define SYS_SCRTCH3                             0x4c
 
+/* PLL registers XLP2XX */
+#define SYS_PLL_CTRL0                           0x240
+#define SYS_PLL_CTRL1                           0x241
+#define SYS_PLL_CTRL2                           0x242
+#define SYS_PLL_CTRL3                           0x243
+#define SYS_DMC_PLL_CTRL0                       0x244
+#define SYS_DMC_PLL_CTRL1                       0x245
+#define SYS_DMC_PLL_CTRL2                       0x246
+#define SYS_DMC_PLL_CTRL3                       0x247
+
+#define SYS_PLL_CTRL0_DEVX(x)                   (0x248 + (x) * 4)
+#define SYS_PLL_CTRL1_DEVX(x)                   (0x249 + (x) * 4)
+#define SYS_PLL_CTRL2_DEVX(x)                   (0x24a + (x) * 4)
+#define SYS_PLL_CTRL3_DEVX(x)                   (0x24b + (x) * 4)
+
+#define SYS_CPU_PLL_CHG_CTRL                    0x288
+#define SYS_PLL_CHG_CTRL                        0x289
+#define SYS_CLK_DEV_DIS                         0x28a
+#define SYS_CLK_DEV_SEL                         0x28b
+#define SYS_CLK_DEV_DIV                         0x28c
+#define SYS_CLK_DEV_CHG                         0x28d
+#define SYS_CLK_DEV_SEL_REG                     0x28e
+#define SYS_CLK_DEV_DIV_REG                     0x28f
+#define SYS_CPU_PLL_LOCK                        0x29f
+#define SYS_SYS_PLL_LOCK                        0x2a0
+#define SYS_PLL_MEM_CMD                         0x2a1
+#define SYS_CPU_PLL_MEM_REQ                     0x2a2
+#define SYS_SYS_PLL_MEM_REQ                     0x2a3
+#define SYS_PLL_MEM_STAT                        0x2a4
+
 #ifndef __ASSEMBLY__
 
 #define nlm_read_sys_reg(b, r)          nlm_read_reg(b, r)
@@ -124,5 +154,6 @@
 #define nlm_get_sys_pcibase(node) nlm_pcicfg_base(XLP_IO_SYS_OFFSET(node))
 #define nlm_get_sys_regbase(node) (nlm_get_sys_pcibase(node) + XLP_IO_PCI_HDRSZ)
 
+unsigned int nlm_get_pic_frequency(int node);
 #endif
 #endif
diff --git a/arch/mips/include/asm/netlogic/xlp-hal/xlp.h b/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
index f4ea0f7f3965..17daffb280a3 100644
--- a/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
+++ b/arch/mips/include/asm/netlogic/xlp-hal/xlp.h
@@ -41,15 +41,22 @@
 #define PIC_PCIE_LINK_1_IRQ             20
 #define PIC_PCIE_LINK_2_IRQ             21
 #define PIC_PCIE_LINK_3_IRQ             22
+
 #define PIC_EHCI_0_IRQ                  23
 #define PIC_EHCI_1_IRQ                  24
 #define PIC_OHCI_0_IRQ                  25
 #define PIC_OHCI_1_IRQ                  26
 #define PIC_OHCI_2_IRQ                  27
 #define PIC_OHCI_3_IRQ                  28
+#define PIC_2XX_XHCI_0_IRQ              23
+#define PIC_2XX_XHCI_1_IRQ              24
+#define PIC_2XX_XHCI_2_IRQ              25
+
 #define PIC_MMC_IRQ                     29
 #define PIC_I2C_0_IRQ                   30
 #define PIC_I2C_1_IRQ                   31
+#define PIC_I2C_2_IRQ                   32
+#define PIC_I2C_3_IRQ                   33
 
 #ifndef __ASSEMBLY__
 
@@ -59,7 +66,17 @@ void xlp_wakeup_secondary_cpus(void);
 
 void xlp_mmu_init(void);
 void nlm_hal_init(void);
+int xlp_get_dram_map(int n, uint64_t *dram_map);
+
+/* Device tree related */
 void *xlp_dt_init(void *fdtp);
 
+static inline int cpu_is_xlpii(void)
+{
+        int chip = read_c0_prid() & 0xff00;
+
+        return chip == PRID_IMP_NETLOGIC_XLP2XX;
+}
+
 #endif /* !__ASSEMBLY__ */
 #endif /* _ASM_NLM_XLP_H */
diff --git a/arch/mips/include/asm/netlogic/xlr/pic.h b/arch/mips/include/asm/netlogic/xlr/pic.h
index 63c99176dffe..3c80a75233bd 100644
--- a/arch/mips/include/asm/netlogic/xlr/pic.h
+++ b/arch/mips/include/asm/netlogic/xlr/pic.h
@@ -36,6 +36,8 @@
 #define _ASM_NLM_XLR_PIC_H
 
 #define PIC_CLK_HZ                      66666666
+#define pic_timer_freq()                PIC_CLK_HZ
+
 /* PIC hardware interrupt numbers */
 #define PIC_IRT_WD_INDEX                0
 #define PIC_IRT_TIMER_0_INDEX           1
diff --git a/arch/mips/include/asm/octeon/octeon.h b/arch/mips/include/asm/octeon/octeon.h
index a2eed23c49a9..f5d77b91537f 100644
--- a/arch/mips/include/asm/octeon/octeon.h
+++ b/arch/mips/include/asm/octeon/octeon.h
@@ -251,4 +251,6 @@ extern void (*octeon_irq_setup_secondary)(void);
 typedef void (*octeon_irq_ip4_handler_t)(void);
 void octeon_irq_set_ip4_handler(octeon_irq_ip4_handler_t);
 
+extern void octeon_fixup_irqs(void);
+
 #endif /* __ASM_OCTEON_OCTEON_H */
diff --git a/arch/mips/include/asm/parport.h b/arch/mips/include/asm/parport.h
deleted file mode 100644
index cf252af64590..000000000000
--- a/arch/mips/include/asm/parport.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/parport.h>
diff --git a/arch/mips/include/asm/pci.h b/arch/mips/include/asm/pci.h
index fa8e0aa250ca..12d6842962be 100644
--- a/arch/mips/include/asm/pci.h
+++ b/arch/mips/include/asm/pci.h
@@ -83,6 +83,18 @@ static inline void pcibios_penalize_isa_irq(int irq, int active)
 extern int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
         enum pci_mmap_state mmap_state, int write_combine);
 
+#define HAVE_ARCH_PCI_RESOURCE_TO_USER
+
+static inline void pci_resource_to_user(const struct pci_dev *dev, int bar,
+                const struct resource *rsrc, resource_size_t *start,
+                resource_size_t *end)
+{
+        phys_t size = resource_size(rsrc);
+
+        *start = fixup_bigphys_addr(rsrc->start, size);
+        *end = rsrc->start + size;
+}
+
 /*
  * Dynamic DMA mapping stuff.
  * MIPS has everything mapped statically.
@@ -136,11 +148,6 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
         return channel ? 15 : 14;
 }
 
-#ifdef CONFIG_CPU_CAVIUM_OCTEON
-/* MSI arch hook for OCTEON */
-#define arch_setup_msi_irqs arch_setup_msi_irqs
-#endif
-
 extern char * (*pcibios_plat_setup)(char *str);
 
 #ifdef CONFIG_OF
diff --git a/arch/mips/include/asm/percpu.h b/arch/mips/include/asm/percpu.h
deleted file mode 100644
index 844e763e9332..000000000000
--- a/arch/mips/include/asm/percpu.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_PERCPU_H
-#define __ASM_PERCPU_H
-
-#include <asm-generic/percpu.h>
-
-#endif /* __ASM_PERCPU_H */
diff --git a/arch/mips/include/asm/scatterlist.h b/arch/mips/include/asm/scatterlist.h
deleted file mode 100644
index 7ee0e646d82c..000000000000
--- a/arch/mips/include/asm/scatterlist.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SCATTERLIST_H
-#define __ASM_SCATTERLIST_H
-
-#include <asm-generic/scatterlist.h>
-
-#endif /* __ASM_SCATTERLIST_H */
diff --git a/arch/mips/include/asm/sections.h b/arch/mips/include/asm/sections.h
deleted file mode 100644
index b7e37262c246..000000000000
--- a/arch/mips/include/asm/sections.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SECTIONS_H
-#define _ASM_SECTIONS_H
-
-#include <asm-generic/sections.h>
-
-#endif /* _ASM_SECTIONS_H */
diff --git a/arch/mips/include/asm/segment.h b/arch/mips/include/asm/segment.h
deleted file mode 100644
index 92ac001fc483..000000000000
--- a/arch/mips/include/asm/segment.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_SEGMENT_H
-#define _ASM_SEGMENT_H
-
-/* Only here because we have some old header files that expect it.. */
-
-#endif /* _ASM_SEGMENT_H */
diff --git a/arch/mips/include/asm/serial.h b/arch/mips/include/asm/serial.h
deleted file mode 100644
index a0cb0caff152..000000000000
--- a/arch/mips/include/asm/serial.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/serial.h>
diff --git a/arch/mips/include/asm/timex.h b/arch/mips/include/asm/timex.h
index 6529704aa73a..c5424757da65 100644
--- a/arch/mips/include/asm/timex.h
+++ b/arch/mips/include/asm/timex.h
@@ -10,7 +10,9 @@
 
 #ifdef __KERNEL__
 
+#include <asm/cpu-features.h>
 #include <asm/mipsregs.h>
+#include <asm/cpu-type.h>
 
 /*
  * This is the clock rate of the i8253 PIT.  A MIPS system may not have
@@ -33,9 +35,38 @@
 
 typedef unsigned int cycles_t;
 
+/*
+ * On R4000/R4400 before version 5.0 an erratum exists such that if the
+ * cycle counter is read in the exact moment that it is matching the
+ * compare register, no interrupt will be generated.
+ *
+ * There is a suggested workaround and also the erratum can't strike if
+ * the compare interrupt isn't being used as the clock source device.
+ * However for now the implementaton of this function doesn't get these
+ * fine details right.
+ */
 static inline cycles_t get_cycles(void)
 {
-        return 0;
+        switch (boot_cpu_type()) {
+        case CPU_R4400PC:
+        case CPU_R4400SC:
+        case CPU_R4400MC:
+                if ((read_c0_prid() & 0xff) >= 0x0050)
+                        return read_c0_count();
+                break;
+
+        case CPU_R4000PC:
+        case CPU_R4000SC:
+        case CPU_R4000MC:
+                break;
+
+        default:
+                if (cpu_has_counter)
+                        return read_c0_count();
+                break;
+        }
+
+        return 0;       /* no usable counter */
 }
 
 #endif /* __KERNEL__ */
diff --git a/arch/mips/include/asm/ucontext.h b/arch/mips/include/asm/ucontext.h
deleted file mode 100644
index 9bc07b9f30fb..000000000000
--- a/arch/mips/include/asm/ucontext.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ucontext.h>
diff --git a/arch/mips/include/asm/vga.h b/arch/mips/include/asm/vga.h
index f4cff7e4fa8a..f82c83749a08 100644
--- a/arch/mips/include/asm/vga.h
+++ b/arch/mips/include/asm/vga.h
@@ -6,6 +6,7 @@
 #ifndef _ASM_VGA_H
 #define _ASM_VGA_H
 
+#include <asm/addrspace.h>
 #include <asm/byteorder.h>
 
 /*
@@ -13,7 +14,7 @@
  *      access the videoram directly without any black magic.
  */
 
-#define VGA_MAP_MEM(x, s)       (0xb0000000L + (unsigned long)(x))
+#define VGA_MAP_MEM(x, s)       CKSEG1ADDR(0x10000000L + (unsigned long)(x))
 
 #define vga_readb(x)    (*(x))
 #define vga_writeb(x, y)        (*(y) = (x))
diff --git a/arch/mips/include/asm/xor.h b/arch/mips/include/asm/xor.h
deleted file mode 100644
index c82eb12a5b18..000000000000
--- a/arch/mips/include/asm/xor.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/xor.h>
diff --git a/arch/mips/include/uapi/asm/Kbuild b/arch/mips/include/uapi/asm/Kbuild
index 350ccccadcb9..be7196eacb88 100644
--- a/arch/mips/include/uapi/asm/Kbuild
+++ b/arch/mips/include/uapi/asm/Kbuild
@@ -1,7 +1,9 @@
 # UAPI Header export list
 include include/uapi/asm-generic/Kbuild.asm
 
-header-y += auxvec.h
+generic-y += auxvec.h
+generic-y += ipcbuf.h
+
 header-y += bitsperlong.h
 header-y += break.h
 header-y += byteorder.h
@@ -11,7 +13,6 @@ header-y += fcntl.h
 header-y += inst.h
 header-y += ioctl.h
 header-y += ioctls.h
-header-y += ipcbuf.h
 header-y += kvm_para.h
 header-y += mman.h
 header-y += msgbuf.h
diff --git a/arch/mips/include/uapi/asm/auxvec.h b/arch/mips/include/uapi/asm/auxvec.h
deleted file mode 100644
index 7cf7f2d21943..000000000000
--- a/arch/mips/include/uapi/asm/auxvec.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef _ASM_AUXVEC_H
-#define _ASM_AUXVEC_H
-
-#endif /* _ASM_AUXVEC_H */
diff --git a/arch/mips/include/uapi/asm/ipcbuf.h b/arch/mips/include/uapi/asm/ipcbuf.h
deleted file mode 100644
index 84c7e51cb6d0..000000000000
--- a/arch/mips/include/uapi/asm/ipcbuf.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ipcbuf.h>
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 4c6167a17875..5465dc183e5a 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -20,6 +20,7 @@
 
 #include <asm/bugs.h>
 #include <asm/cpu.h>
+#include <asm/cpu-type.h>
 #include <asm/fpu.h>
 #include <asm/mipsregs.h>
 #include <asm/watch.h>
@@ -55,7 +56,7 @@ static inline void check_errata(void)
 {
         struct cpuinfo_mips *c = &current_cpu_data;
 
-        switch (c->cputype) {
+        switch (current_cpu_type()) {
         case CPU_34K:
                 /*
                  * Erratum "RPS May Cause Incorrect Instruction Execution"
@@ -122,7 +123,7 @@ static inline unsigned long cpu_get_fpu_id(void)
  */
 static inline int __cpu_has_fpu(void)
 {
-        return ((cpu_get_fpu_id() & 0xff00) != FPIR_IMP_NONE);
+        return ((cpu_get_fpu_id() & FPIR_IMP_MASK) != FPIR_IMP_NONE);
 }
 
 static inline void cpu_probe_vmbits(struct cpuinfo_mips *c)
@@ -290,6 +291,17 @@ static inline unsigned int decode_config4(struct cpuinfo_mips *c)
         return config4 & MIPS_CONF_M;
 }
 
+static inline unsigned int decode_config5(struct cpuinfo_mips *c)
+{
+        unsigned int config5;
+
+        config5 = read_c0_config5();
+        config5 &= ~MIPS_CONF5_UFR;
+        write_c0_config5(config5);
+
+        return config5 & MIPS_CONF_M;
+}
+
 static void decode_configs(struct cpuinfo_mips *c)
 {
         int ok;
@@ -310,6 +322,8 @@ static void decode_configs(struct cpuinfo_mips *c)
                 ok = decode_config3(c);
         if (ok)
                 ok = decode_config4(c);
+        if (ok)
+                ok = decode_config5(c);
 
         mips_probe_watch_registers(c);
 
@@ -322,7 +336,7 @@ static void decode_configs(struct cpuinfo_mips *c)
 
 static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
 {
-        switch (c->processor_id & 0xff00) {
+        switch (c->processor_id & PRID_IMP_MASK) {
         case PRID_IMP_R2000:
                 c->cputype = CPU_R2000;
                 __cpu_name[cpu] = "R2000";
@@ -333,7 +347,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                 c->tlbsize = 64;
                 break;
         case PRID_IMP_R3000:
-                if ((c->processor_id & 0xff) == PRID_REV_R3000A) {
+                if ((c->processor_id & PRID_REV_MASK) == PRID_REV_R3000A) {
                         if (cpu_has_confreg()) {
                                 c->cputype = CPU_R3081E;
                                 __cpu_name[cpu] = "R3081";
@@ -353,7 +367,8 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                 break;
         case PRID_IMP_R4000:
                 if (read_c0_config() & CONF_SC) {
-                        if ((c->processor_id & 0xff) >= PRID_REV_R4400) {
+                        if ((c->processor_id & PRID_REV_MASK) >=
+                            PRID_REV_R4400) {
                                 c->cputype = CPU_R4400PC;
                                 __cpu_name[cpu] = "R4400PC";
                         } else {
@@ -361,7 +376,8 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                                 __cpu_name[cpu] = "R4000PC";
                         }
                 } else {
-                        if ((c->processor_id & 0xff) >= PRID_REV_R4400) {
+                        if ((c->processor_id & PRID_REV_MASK) >=
+                            PRID_REV_R4400) {
                                 c->cputype = CPU_R4400SC;
                                 __cpu_name[cpu] = "R4400SC";
                         } else {
@@ -454,7 +470,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
                         __cpu_name[cpu] = "TX3927";
                         c->tlbsize = 64;
                 } else {
-                        switch (c->processor_id & 0xff) {
+                        switch (c->processor_id & PRID_REV_MASK) {
                         case PRID_REV_TX3912:
                                 c->cputype = CPU_TX3912;
                                 __cpu_name[cpu] = "TX3912";
@@ -640,7 +656,7 @@ static inline void cpu_probe_legacy(struct cpuinfo_mips *c, unsigned int cpu)
 static inline void cpu_probe_mips(struct cpuinfo_mips *c, unsigned int cpu)
 {
         decode_configs(c);
-        switch (c->processor_id & 0xff00) {
+        switch (c->processor_id & PRID_IMP_MASK) {
         case PRID_IMP_4KC:
                 c->cputype = CPU_4KC;
                 __cpu_name[cpu] = "MIPS 4Kc";
@@ -711,7 +727,7 @@ static inline void cpu_probe_mips(struct cpuinfo_mips *c, unsigned int cpu)
 static inline void cpu_probe_alchemy(struct cpuinfo_mips *c, unsigned int cpu)
 {
         decode_configs(c);
-        switch (c->processor_id & 0xff00) {
+        switch (c->processor_id & PRID_IMP_MASK) {
         case PRID_IMP_AU1_REV1:
         case PRID_IMP_AU1_REV2:
                 c->cputype = CPU_ALCHEMY;
@@ -730,7 +746,7 @@ static inline void cpu_probe_alchemy(struct cpuinfo_mips *c, unsigned int cpu)
                         break;
                 case 4:
                         __cpu_name[cpu] = "Au1200";
-                        if ((c->processor_id & 0xff) == 2)
+                        if ((c->processor_id & PRID_REV_MASK) == 2)
                                 __cpu_name[cpu] = "Au1250";
                         break;
                 case 5:
@@ -748,12 +764,12 @@ static inline void cpu_probe_sibyte(struct cpuinfo_mips *c, unsigned int cpu)
 {
         decode_configs(c);
 
-        switch (c->processor_id & 0xff00) {
+        switch (c->processor_id & PRID_IMP_MASK) {
         case PRID_IMP_SB1:
                 c->cputype = CPU_SB1;
                 __cpu_name[cpu] = "SiByte SB1";
                 /* FPU in pass1 is known to have issues. */
-                if ((c->processor_id & 0xff) < 0x02)
+                if ((c->processor_id & PRID_REV_MASK) < 0x02)
                         c->options &= ~(MIPS_CPU_FPU | MIPS_CPU_32FPR);
                 break;
         case PRID_IMP_SB1A:
@@ -766,7 +782,7 @@ static inline void cpu_probe_sibyte(struct cpuinfo_mips *c, unsigned int cpu)
 static inline void cpu_probe_sandcraft(struct cpuinfo_mips *c, unsigned int cpu)
 {
         decode_configs(c);
-        switch (c->processor_id & 0xff00) {
+        switch (c->processor_id & PRID_IMP_MASK) {
         case PRID_IMP_SR71000:
                 c->cputype = CPU_SR71000;
                 __cpu_name[cpu] = "Sandcraft SR71000";
@@ -779,7 +795,7 @@ static inline void cpu_probe_sandcraft(struct cpuinfo_mips *c, unsigned int cpu)
 static inline void cpu_probe_nxp(struct cpuinfo_mips *c, unsigned int cpu)
 {
         decode_configs(c);
-        switch (c->processor_id & 0xff00) {
+        switch (c->processor_id & PRID_IMP_MASK) {
         case PRID_IMP_PR4450:
                 c->cputype = CPU_PR4450;
                 __cpu_name[cpu] = "Philips PR4450";
@@ -791,7 +807,7 @@ static inline void cpu_probe_nxp(struct cpuinfo_mips *c, unsigned int cpu)
 static inline void cpu_probe_broadcom(struct cpuinfo_mips *c, unsigned int cpu)
 {
         decode_configs(c);
-        switch (c->processor_id & 0xff00) {
+        switch (c->processor_id & PRID_IMP_MASK) {
         case PRID_IMP_BMIPS32_REV4:
         case PRID_IMP_BMIPS32_REV8:
                 c->cputype = CPU_BMIPS32;
@@ -806,7 +822,7 @@ static inline void cpu_probe_broadcom(struct cpuinfo_mips *c, unsigned int cpu)
                 set_elf_platform(cpu, "bmips3300");
                 break;
         case PRID_IMP_BMIPS43XX: {
-                int rev = c->processor_id & 0xff;
+                int rev = c->processor_id & PRID_REV_MASK;
 
                 if (rev >= PRID_REV_BMIPS4380_LO &&
                                 rev <= PRID_REV_BMIPS4380_HI) {
@@ -832,7 +848,7 @@ static inline void cpu_probe_broadcom(struct cpuinfo_mips *c, unsigned int cpu)
 static inline void cpu_probe_cavium(struct cpuinfo_mips *c, unsigned int cpu)
 {
         decode_configs(c);
-        switch (c->processor_id & 0xff00) {
+        switch (c->processor_id & PRID_IMP_MASK) {
         case PRID_IMP_CAVIUM_CN38XX:
         case PRID_IMP_CAVIUM_CN31XX:
         case PRID_IMP_CAVIUM_CN30XX:
@@ -852,10 +868,17 @@ platform:
         case PRID_IMP_CAVIUM_CN63XX:
         case PRID_IMP_CAVIUM_CN66XX:
         case PRID_IMP_CAVIUM_CN68XX:
+        case PRID_IMP_CAVIUM_CNF71XX:
                 c->cputype = CPU_CAVIUM_OCTEON2;
                 __cpu_name[cpu] = "Cavium Octeon II";
                 set_elf_platform(cpu, "octeon2");
                 break;
+        case PRID_IMP_CAVIUM_CN70XX:
+        case PRID_IMP_CAVIUM_CN78XX:
+                c->cputype = CPU_CAVIUM_OCTEON3;
+                __cpu_name[cpu] = "Cavium Octeon III";
+                set_elf_platform(cpu, "octeon3");
+                break;
         default:
                 printk(KERN_INFO "Unknown Octeon chip!\n");
                 c->cputype = CPU_UNKNOWN;
@@ -868,7 +891,7 @@ static inline void cpu_probe_ingenic(struct cpuinfo_mips *c, unsigned int cpu)
         decode_configs(c);
         /* JZRISC does not implement the CP0 counter. */
         c->options &= ~MIPS_CPU_COUNTER;
-        switch (c->processor_id & 0xff00) {
+        switch (c->processor_id & PRID_IMP_MASK) {
         case PRID_IMP_JZRISC:
                 c->cputype = CPU_JZRISC;
                 __cpu_name[cpu] = "Ingenic JZRISC";
@@ -883,7 +906,7 @@ static inline void cpu_probe_netlogic(struct cpuinfo_mips *c, int cpu)
 {
         decode_configs(c);
 
-        if ((c->processor_id & 0xff00) == PRID_IMP_NETLOGIC_AU13XX) {
+        if ((c->processor_id & PRID_IMP_MASK) == PRID_IMP_NETLOGIC_AU13XX) {
                 c->cputype = CPU_ALCHEMY;
                 __cpu_name[cpu] = "Au1300";
                 /* following stuff is not for Alchemy */
@@ -898,7 +921,12 @@ static inline void cpu_probe_netlogic(struct cpuinfo_mips *c, int cpu)
                         MIPS_CPU_EJTAG   |
                         MIPS_CPU_LLSC);
 
-        switch (c->processor_id & 0xff00) {
+        switch (c->processor_id & PRID_IMP_MASK) {
+        case PRID_IMP_NETLOGIC_XLP2XX:
+                c->cputype = CPU_XLP;
+                __cpu_name[cpu] = "Broadcom XLPII";
+                break;
+
         case PRID_IMP_NETLOGIC_XLP8XX:
         case PRID_IMP_NETLOGIC_XLP3XX:
                 c->cputype = CPU_XLP;
@@ -972,7 +1000,7 @@ void cpu_probe(void)
         c->cputype      = CPU_UNKNOWN;
 
         c->processor_id = read_c0_prid();
-        switch (c->processor_id & 0xff0000) {
+        switch (c->processor_id & PRID_COMP_MASK) {
         case PRID_COMP_LEGACY:
                 cpu_probe_legacy(c, cpu);
                 break;
diff --git a/arch/mips/kernel/csrc-ioasic.c b/arch/mips/kernel/csrc-ioasic.c
index 0654bff9b69c..6cbbf6e106b9 100644
--- a/arch/mips/kernel/csrc-ioasic.c
+++ b/arch/mips/kernel/csrc-ioasic.c
@@ -37,13 +37,13 @@ static struct clocksource clocksource_dec = {
         .flags          = CLOCK_SOURCE_IS_CONTINUOUS,
 };
 
-void __init dec_ioasic_clocksource_init(void)
+int __init dec_ioasic_clocksource_init(void)
 {
         unsigned int freq;
         u32 start, end;
-        int i = HZ / 10;
-
+        int i = HZ / 8;
 
+        ds1287_timer_state();
         while (!ds1287_timer_state())
                 ;
 
@@ -55,9 +55,15 @@ void __init dec_ioasic_clocksource_init(void)
 
         end = dec_ioasic_hpt_read(&clocksource_dec);
 
-        freq = (end - start) * 10;
+        freq = (end - start) * 8;
+
+        /* An early revision of the I/O ASIC didn't have the counter.  */
+        if (!freq)
+                return -ENXIO;
+
         printk(KERN_INFO "I/O ASIC clock frequency %dHz\n", freq);
 
         clocksource_dec.rating = 200 + freq / 10000000;
         clocksource_register_hz(&clocksource_dec, freq);
+        return 0;
 }
diff --git a/arch/mips/kernel/idle.c b/arch/mips/kernel/idle.c
index 0c655deeea4a..f7991d95bff9 100644
--- a/arch/mips/kernel/idle.c
+++ b/arch/mips/kernel/idle.c
@@ -18,6 +18,7 @@
 #include <linux/sched.h>
 #include <asm/cpu.h>
 #include <asm/cpu-info.h>
+#include <asm/cpu-type.h>
 #include <asm/idle.h>
 #include <asm/mipsregs.h>
 
@@ -136,7 +137,7 @@ void __init check_wait(void)
                 return;
         }
 
-        switch (c->cputype) {
+        switch (current_cpu_type()) {
         case CPU_R3081:
         case CPU_R3081E:
                 cpu_wait = r3081_wait;
@@ -166,6 +167,7 @@ void __init check_wait(void)
         case CPU_CAVIUM_OCTEON:
         case CPU_CAVIUM_OCTEON_PLUS:
         case CPU_CAVIUM_OCTEON2:
+        case CPU_CAVIUM_OCTEON3:
         case CPU_JZRISC:
         case CPU_LOONGSON1:
         case CPU_XLR:
diff --git a/arch/mips/kernel/mcount.S b/arch/mips/kernel/mcount.S
index a03e93c4a946..539b6294b613 100644
--- a/arch/mips/kernel/mcount.S
+++ b/arch/mips/kernel/mcount.S
@@ -83,7 +83,7 @@ _mcount:
         PTR_S   MCOUNT_RA_ADDRESS_REG, PT_R12(sp)
 #endif
 
-        move    a0, ra          /* arg1: self return address */
+        PTR_SUBU a0, ra, 8      /* arg1: self address */
         .globl ftrace_call
 ftrace_call:
         nop     /* a placeholder for the call to a real tracing function */
diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
index 7e954042f252..0fa0b69cdd53 100644
--- a/arch/mips/kernel/prom.c
+++ b/arch/mips/kernel/prom.c
@@ -58,8 +58,7 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
-void __init early_init_dt_setup_initrd_arch(unsigned long start,
-                                            unsigned long end)
+void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
 {
         initrd_start = (unsigned long)__va(start);
         initrd_end = (unsigned long)__va(end);
diff --git a/arch/mips/kernel/relocate_kernel.S b/arch/mips/kernel/relocate_kernel.S
index 43d2d78d3287..74bab9ddd0e1 100644
--- a/arch/mips/kernel/relocate_kernel.S
+++ b/arch/mips/kernel/relocate_kernel.S
@@ -26,6 +26,12 @@ process_entry:
         PTR_L           s2, (s0)
         PTR_ADD         s0, s0, SZREG
 
+        /*
+         * In case of a kdump/crash kernel, the indirection page is not
+         * populated as the kernel is directly copied to a reserved location
+         */
+        beqz            s2, done
+
         /* destination page */
         and             s3, s2, 0x1
         beq             s3, zero, 1f
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c
index c7f90519e58c..c538d6e01b7b 100644
--- a/arch/mips/kernel/setup.c
+++ b/arch/mips/kernel/setup.c
@@ -552,6 +552,52 @@ static void __init arch_mem_addpart(phys_t mem, phys_t end, int type)
         add_memory_region(mem, size, type);
 }
 
+#ifdef CONFIG_KEXEC
+static inline unsigned long long get_total_mem(void)
+{
+        unsigned long long total;
+
+        total = max_pfn - min_low_pfn;
+        return total << PAGE_SHIFT;
+}
+
+static void __init mips_parse_crashkernel(void)
+{
+        unsigned long long total_mem;
+        unsigned long long crash_size, crash_base;
+        int ret;
+
+        total_mem = get_total_mem();
+        ret = parse_crashkernel(boot_command_line, total_mem,
+                                &crash_size, &crash_base);
+        if (ret != 0 || crash_size <= 0)
+                return;
+
+        crashk_res.start = crash_base;
+        crashk_res.end   = crash_base + crash_size - 1;
+}
+
+static void __init request_crashkernel(struct resource *res)
+{
+        int ret;
+
+        ret = request_resource(res, &crashk_res);
+        if (!ret)
+                pr_info("Reserving %ldMB of memory at %ldMB for crashkernel\n",
+                        (unsigned long)((crashk_res.end -
+                                         crashk_res.start + 1) >> 20),
+                        (unsigned long)(crashk_res.start  >> 20));
+}
+#else /* !defined(CONFIG_KEXEC)         */
+static void __init mips_parse_crashkernel(void)
+{
+}
+
+static void __init request_crashkernel(struct resource *res)
+{
+}
+#endif /* !defined(CONFIG_KEXEC)  */
+
 static void __init arch_mem_init(char **cmdline_p)
 {
         extern void plat_mem_setup(void);
@@ -608,6 +654,8 @@ static void __init arch_mem_init(char **cmdline_p)
                                 BOOTMEM_DEFAULT);
         }
 #endif
+
+        mips_parse_crashkernel();
 #ifdef CONFIG_KEXEC
         if (crashk_res.start != crashk_res.end)
                 reserve_bootmem(crashk_res.start,
@@ -620,52 +668,6 @@ static void __init arch_mem_init(char **cmdline_p)
         paging_init();
 }
 
-#ifdef CONFIG_KEXEC
-static inline unsigned long long get_total_mem(void)
-{
-        unsigned long long total;
-
-        total = max_pfn - min_low_pfn;
-        return total << PAGE_SHIFT;
-}
-
-static void __init mips_parse_crashkernel(void)
-{
-        unsigned long long total_mem;
-        unsigned long long crash_size, crash_base;
-        int ret;
-
-        total_mem = get_total_mem();
-        ret = parse_crashkernel(boot_command_line, total_mem,
-                                &crash_size, &crash_base);
-        if (ret != 0 || crash_size <= 0)
-                return;
-
-        crashk_res.start = crash_base;
-        crashk_res.end   = crash_base + crash_size - 1;
-}
-
-static void __init request_crashkernel(struct resource *res)
-{
-        int ret;
-
-        ret = request_resource(res, &crashk_res);
-        if (!ret)
-                pr_info("Reserving %ldMB of memory at %ldMB for crashkernel\n",
-                        (unsigned long)((crashk_res.end -
-                                crashk_res.start + 1) >> 20),
-                        (unsigned long)(crashk_res.start  >> 20));
-}
-#else /* !defined(CONFIG_KEXEC)  */
-static void __init mips_parse_crashkernel(void)
-{
-}
-
-static void __init request_crashkernel(struct resource *res)
-{
-}
-#endif /* !defined(CONFIG_KEXEC)  */
-
 static void __init resource_init(void)
 {
         int i;
@@ -678,11 +680,6 @@ static void __init resource_init(void)
         data_resource.start = __pa_symbol(&_etext);
         data_resource.end = __pa_symbol(&_edata) - 1;
 
-        /*
-         * Request address space for all standard RAM.
-         */
-        mips_parse_crashkernel();
-
         for (i = 0; i < boot_mem_map.nr_map; i++) {
                 struct resource *res;
                 unsigned long start, end;
diff --git a/arch/mips/kernel/smp-cmp.c b/arch/mips/kernel/smp-cmp.c
index c2e5d74739b4..5969f1e9b62a 100644
--- a/arch/mips/kernel/smp-cmp.c
+++ b/arch/mips/kernel/smp-cmp.c
@@ -99,7 +99,9 @@ static void cmp_init_secondary(void)
 
         c->core = (read_c0_ebase() >> 1) & 0x1ff;
 #if defined(CONFIG_MIPS_MT_SMP) || defined(CONFIG_MIPS_MT_SMTC)
-        c->vpe_id = (read_c0_tcbind() >> TCBIND_CURVPE_SHIFT) & TCBIND_CURVPE;
+        if (cpu_has_mipsmt)
+                c->vpe_id = (read_c0_tcbind() >> TCBIND_CURVPE_SHIFT) &
+                        TCBIND_CURVPE;
 #endif
 #ifdef CONFIG_MIPS_MT_SMTC
         c->tc_id  = (read_c0_tcbind() & TCBIND_CURTC) >> TCBIND_CURTC_SHIFT;
@@ -177,9 +179,16 @@ void __init cmp_smp_setup(void)
         }
 
         if (cpu_has_mipsmt) {
-                unsigned int nvpe, mvpconf0 = read_c0_mvpconf0();
+                unsigned int nvpe = 1;
+#ifdef CONFIG_MIPS_MT_SMP
+                unsigned int mvpconf0 = read_c0_mvpconf0();
+
+                nvpe = ((mvpconf0 & MVPCONF0_PVPE) >> MVPCONF0_PVPE_SHIFT) + 1;
+#elif defined(CONFIG_MIPS_MT_SMTC)
+                unsigned int mvpconf0 = read_c0_mvpconf0();
 
                 nvpe = ((mvpconf0 & MVPCONF0_PTC) >> MVPCONF0_PTC_SHIFT) + 1;
+#endif
                 smp_num_siblings = nvpe;
         }
         pr_info("Detected %i available secondary CPU(s)\n", ncpu);
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index 9d686bf97b0e..dcb8e5d3bb8a 100644
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -24,6 +24,7 @@
 #include <linux/export.h>
 
 #include <asm/cpu-features.h>
+#include <asm/cpu-type.h>
 #include <asm/div64.h>
 #include <asm/smtc_ipi.h>
 #include <asm/time.h>
@@ -121,6 +122,14 @@ void __init time_init(void)
 {
         plat_time_init();
 
-        if (!mips_clockevent_init() || !cpu_has_mfc0_count_bug())
+        /*
+         * The use of the R4k timer as a clock event takes precedence;
+         * if reading the Count register might interfere with the timer
+         * interrupt, then we don't use the timer as a clock source.
+         * We may still use the timer as a clock source though if the
+         * timer interrupt isn't reliable; the interference doesn't
+         * matter then, because we don't use the interrupt.
+         */
+        if (mips_clockevent_init() != 0 || !cpu_has_mfc0_count_bug())
                 init_mips_clocksource();
 }
diff --git a/arch/mips/kernel/traps.c b/arch/mips/kernel/traps.c
index aec3408edd4b..524841f02803 100644
--- a/arch/mips/kernel/traps.c
+++ b/arch/mips/kernel/traps.c
@@ -39,6 +39,7 @@
 #include <asm/break.h>
 #include <asm/cop2.h>
 #include <asm/cpu.h>
+#include <asm/cpu-type.h>
 #include <asm/dsp.h>
 #include <asm/fpu.h>
 #include <asm/fpu_emulator.h>
@@ -622,7 +623,7 @@ static int simulate_rdhwr(struct pt_regs *regs, int rd, int rt)
                 regs->regs[rt] = read_c0_count();
                 return 0;
         case 3:         /* Count register resolution */
-                switch (current_cpu_data.cputype) {
+                switch (current_cpu_type()) {
                 case CPU_20KC:
                 case CPU_25KF:
                         regs->regs[rt] = 1;
diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S
index 05826d20a792..3b46f7ce9ca7 100644
--- a/arch/mips/kernel/vmlinux.lds.S
+++ b/arch/mips/kernel/vmlinux.lds.S
@@ -179,5 +179,6 @@ SECTIONS
                 *(.options)
                 *(.pdr)
                 *(.reginfo)
+                *(.eh_frame)
         }
 }
diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c
index 1765bab000a0..59b2b3cd7885 100644
--- a/arch/mips/kernel/vpe.c
+++ b/arch/mips/kernel/vpe.c
@@ -1335,8 +1335,9 @@ static ssize_t store_kill(struct device *dev, struct device_attribute *attr,
 
         return len;
 }
+static DEVICE_ATTR(kill, S_IWUSR, NULL, store_kill);
 
-static ssize_t show_ntcs(struct device *cd, struct device_attribute *attr,
+static ssize_t ntcs_show(struct device *cd, struct device_attribute *attr,
                          char *buf)
 {
         struct vpe *vpe = get_vpe(tclimit);
@@ -1344,7 +1345,7 @@ static ssize_t show_ntcs(struct device *cd, struct device_attribute *attr,
         return sprintf(buf, "%d\n", vpe->ntcs);
 }
 
-static ssize_t store_ntcs(struct device *dev, struct device_attribute *attr,
+static ssize_t ntcs_store(struct device *dev, struct device_attribute *attr,
                           const char *buf, size_t len)
 {
         struct vpe *vpe = get_vpe(tclimit);
@@ -1365,12 +1366,14 @@ static ssize_t store_ntcs(struct device *dev, struct device_attribute *attr,
 out_einval:
         return -EINVAL;
 }
+static DEVICE_ATTR_RW(ntcs);
 
-static struct device_attribute vpe_class_attributes[] = {
-        __ATTR(kill, S_IWUSR, NULL, store_kill),
-        __ATTR(ntcs, S_IRUGO | S_IWUSR, show_ntcs, store_ntcs),
-        {}
+static struct attribute *vpe_attrs[] = {
+        &dev_attr_kill.attr,
+        &dev_attr_ntcs.attr,
+        NULL,
 };
+ATTRIBUTE_GROUPS(vpe);
 
 static void vpe_device_release(struct device *cd)
 {
@@ -1381,7 +1384,7 @@ struct class vpe_class = {
         .name = "vpe",
         .owner = THIS_MODULE,
         .dev_release = vpe_device_release,
-        .dev_attrs = vpe_class_attributes,
+        .dev_groups = vpe_groups,
 };
 
 struct device vpe_device;
diff --git a/arch/mips/kvm/kvm_locore.S b/arch/mips/kvm/kvm_locore.S
index dca2aa665993..bbace092ad0a 100644
--- a/arch/mips/kvm/kvm_locore.S
+++ b/arch/mips/kvm/kvm_locore.S
@@ -1,13 +1,13 @@
 /*
-* This file is subject to the terms and conditions of the GNU General Public
-* License.  See the file "COPYING" in the main directory of this archive
-* for more details.
-*
-* Main entry point for the guest, exception handling.
-*
-* Copyright (C) 2012  MIPS Technologies, Inc.  All rights reserved.
-* Authors: Sanjay Lal <sanjayl@kymasys.com>
-*/
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Main entry point for the guest, exception handling.
+ *
+ * Copyright (C) 2012  MIPS Technologies, Inc.  All rights reserved.
+ * Authors: Sanjay Lal <sanjayl@kymasys.com>
+ */
 
 #include <asm/asm.h>
 #include <asm/asmmacro.h>
@@ -55,195 +55,193 @@
  * a0: run
  * a1: vcpu
  */
+        .set    noreorder
+        .set    noat
 
 FEXPORT(__kvm_mips_vcpu_run)
-    .set    push
-    .set    noreorder
-    .set    noat
-
-    /* k0/k1 not being used in host kernel context */
-        addiu           k1,sp, -PT_SIZE
-    LONG_S          $0, PT_R0(k1)
-    LONG_S      $1, PT_R1(k1)
-    LONG_S      $2, PT_R2(k1)
-    LONG_S      $3, PT_R3(k1)
-
-    LONG_S      $4, PT_R4(k1)
-    LONG_S      $5, PT_R5(k1)
-    LONG_S      $6, PT_R6(k1)
-    LONG_S      $7, PT_R7(k1)
-
-    LONG_S      $8,  PT_R8(k1)
-    LONG_S      $9,  PT_R9(k1)
-    LONG_S      $10, PT_R10(k1)
-    LONG_S      $11, PT_R11(k1)
-    LONG_S      $12, PT_R12(k1)
-    LONG_S      $13, PT_R13(k1)
-    LONG_S      $14, PT_R14(k1)
-    LONG_S      $15, PT_R15(k1)
-    LONG_S      $16, PT_R16(k1)
-    LONG_S      $17, PT_R17(k1)
-
-    LONG_S      $18, PT_R18(k1)
-    LONG_S      $19, PT_R19(k1)
-    LONG_S      $20, PT_R20(k1)
-    LONG_S      $21, PT_R21(k1)
-    LONG_S      $22, PT_R22(k1)
-    LONG_S      $23, PT_R23(k1)
-    LONG_S      $24, PT_R24(k1)
-    LONG_S      $25, PT_R25(k1)
+        /* k0/k1 not being used in host kernel context */
+        INT_ADDIU k1, sp, -PT_SIZE
+        LONG_S  $0, PT_R0(k1)
+        LONG_S  $1, PT_R1(k1)
+        LONG_S  $2, PT_R2(k1)
+        LONG_S  $3, PT_R3(k1)
+
+        LONG_S  $4, PT_R4(k1)
+        LONG_S  $5, PT_R5(k1)
+        LONG_S  $6, PT_R6(k1)
+        LONG_S  $7, PT_R7(k1)
+
+        LONG_S  $8,  PT_R8(k1)
+        LONG_S  $9,  PT_R9(k1)
+        LONG_S  $10, PT_R10(k1)
+        LONG_S  $11, PT_R11(k1)
+        LONG_S  $12, PT_R12(k1)
+        LONG_S  $13, PT_R13(k1)
+        LONG_S  $14, PT_R14(k1)
+        LONG_S  $15, PT_R15(k1)
+        LONG_S  $16, PT_R16(k1)
+        LONG_S  $17, PT_R17(k1)
+
+        LONG_S  $18, PT_R18(k1)
+        LONG_S  $19, PT_R19(k1)
+        LONG_S  $20, PT_R20(k1)
+        LONG_S  $21, PT_R21(k1)
+        LONG_S  $22, PT_R22(k1)
+        LONG_S  $23, PT_R23(k1)
+        LONG_S  $24, PT_R24(k1)
+        LONG_S  $25, PT_R25(k1)
 
         /* XXXKYMA k0/k1 not saved, not being used if we got here through an ioctl() */
 
-    LONG_S      $28, PT_R28(k1)
-    LONG_S      $29, PT_R29(k1)
-    LONG_S      $30, PT_R30(k1)
-    LONG_S      $31, PT_R31(k1)
+        LONG_S  $28, PT_R28(k1)
+        LONG_S  $29, PT_R29(k1)
+        LONG_S  $30, PT_R30(k1)
+        LONG_S  $31, PT_R31(k1)
 
-    /* Save hi/lo */
-        mflo            v0
-        LONG_S          v0, PT_LO(k1)
-        mfhi            v1
-        LONG_S          v1, PT_HI(k1)
+        /* Save hi/lo */
+        mflo    v0
+        LONG_S  v0, PT_LO(k1)
+        mfhi    v1
+        LONG_S  v1, PT_HI(k1)
 
         /* Save host status */
-        mfc0            v0, CP0_STATUS
-        LONG_S          v0, PT_STATUS(k1)
+        mfc0    v0, CP0_STATUS
+        LONG_S  v0, PT_STATUS(k1)
 
         /* Save host ASID, shove it into the BVADDR location */
-        mfc0            v1,CP0_ENTRYHI
-        andi            v1, 0xff
-        LONG_S          v1, PT_HOST_ASID(k1)
+        mfc0    v1, CP0_ENTRYHI
+        andi    v1, 0xff
+        LONG_S  v1, PT_HOST_ASID(k1)
 
-    /* Save DDATA_LO, will be used to store pointer to vcpu */
-    mfc0        v1, CP0_DDATA_LO
-    LONG_S      v1, PT_HOST_USERLOCAL(k1)
+        /* Save DDATA_LO, will be used to store pointer to vcpu */
+        mfc0    v1, CP0_DDATA_LO
+        LONG_S  v1, PT_HOST_USERLOCAL(k1)
 
-    /* DDATA_LO has pointer to vcpu */
-    mtc0        a1,CP0_DDATA_LO
+        /* DDATA_LO has pointer to vcpu */
+        mtc0    a1, CP0_DDATA_LO
 
-    /* Offset into vcpu->arch */
-        addiu           k1, a1, VCPU_HOST_ARCH
+        /* Offset into vcpu->arch */
+        INT_ADDIU k1, a1, VCPU_HOST_ARCH
 
-    /* Save the host stack to VCPU, used for exception processing when we exit from the Guest */
-    LONG_S      sp, VCPU_HOST_STACK(k1)
+        /*
+         * Save the host stack to VCPU, used for exception processing
+         * when we exit from the Guest
+         */
+        LONG_S  sp, VCPU_HOST_STACK(k1)
 
-    /* Save the kernel gp as well */
-    LONG_S      gp, VCPU_HOST_GP(k1)
+        /* Save the kernel gp as well */
+        LONG_S  gp, VCPU_HOST_GP(k1)
 
         /* Setup status register for running the guest in UM, interrupts are disabled */
-        li                      k0,(ST0_EXL | KSU_USER| ST0_BEV)
-        mtc0            k0,CP0_STATUS
-    ehb
-
-    /* load up the new EBASE */
-    LONG_L      k0, VCPU_GUEST_EBASE(k1)
-    mtc0        k0,CP0_EBASE
-
-    /* Now that the new EBASE has been loaded, unset BEV, set interrupt mask as it was
-     * but make sure that timer interrupts are enabled
-     */
-    li          k0,(ST0_EXL | KSU_USER | ST0_IE)
-    andi        v0, v0, ST0_IM
-    or          k0, k0, v0
-    mtc0        k0,CP0_STATUS
-    ehb
+        li      k0, (ST0_EXL | KSU_USER | ST0_BEV)
+        mtc0    k0, CP0_STATUS
+        ehb
+
+        /* load up the new EBASE */
+        LONG_L  k0, VCPU_GUEST_EBASE(k1)
+        mtc0    k0, CP0_EBASE
+
+        /*
+         * Now that the new EBASE has been loaded, unset BEV, set
+         * interrupt mask as it was but make sure that timer interrupts
+         * are enabled
+         */
+        li      k0, (ST0_EXL | KSU_USER | ST0_IE)
+        andi    v0, v0, ST0_IM
+        or      k0, k0, v0
+        mtc0    k0, CP0_STATUS
+        ehb
 
 
         /* Set Guest EPC */
-        LONG_L          t0, VCPU_PC(k1)
-        mtc0            t0, CP0_EPC
+        LONG_L  t0, VCPU_PC(k1)
+        mtc0    t0, CP0_EPC
 
 FEXPORT(__kvm_mips_load_asid)
-    /* Set the ASID for the Guest Kernel */
-    sll         t0, t0, 1                       /* with kseg0 @ 0x40000000, kernel */
-                                                /* addresses shift to 0x80000000 */
-    bltz        t0, 1f                          /* If kernel */
-        addiu       t1, k1, VCPU_GUEST_KERNEL_ASID  /* (BD)  */
-    addiu       t1, k1, VCPU_GUEST_USER_ASID    /* else user */
+        /* Set the ASID for the Guest Kernel */
+        INT_SLL t0, t0, 1       /* with kseg0 @ 0x40000000, kernel */
+                                /* addresses shift to 0x80000000 */
+        bltz    t0, 1f          /* If kernel */
+         INT_ADDIU t1, k1, VCPU_GUEST_KERNEL_ASID  /* (BD)  */
+        INT_ADDIU t1, k1, VCPU_GUEST_USER_ASID    /* else user */
 1:
-    /* t1: contains the base of the ASID array, need to get the cpu id  */
-    LONG_L      t2, TI_CPU($28)             /* smp_processor_id */
-    sll         t2, t2, 2                   /* x4 */
-    addu        t3, t1, t2
-    LONG_L      k0, (t3)
-    andi        k0, k0, 0xff
-        mtc0            k0,CP0_ENTRYHI
-    ehb
-
-    /* Disable RDHWR access */
-    mtc0    zero,  CP0_HWRENA
-
-    /* Now load up the Guest Context from VCPU */
-    LONG_L      $1, VCPU_R1(k1)
-    LONG_L      $2, VCPU_R2(k1)
-    LONG_L      $3, VCPU_R3(k1)
-
-    LONG_L      $4, VCPU_R4(k1)
-    LONG_L      $5, VCPU_R5(k1)
-    LONG_L      $6, VCPU_R6(k1)
-    LONG_L      $7, VCPU_R7(k1)
-
-    LONG_L      $8,  VCPU_R8(k1)
-    LONG_L      $9,  VCPU_R9(k1)
-    LONG_L      $10, VCPU_R10(k1)
-    LONG_L      $11, VCPU_R11(k1)
-    LONG_L      $12, VCPU_R12(k1)
-    LONG_L      $13, VCPU_R13(k1)
-    LONG_L      $14, VCPU_R14(k1)
-    LONG_L      $15, VCPU_R15(k1)
-    LONG_L      $16, VCPU_R16(k1)
-    LONG_L      $17, VCPU_R17(k1)
-    LONG_L      $18, VCPU_R18(k1)
-    LONG_L      $19, VCPU_R19(k1)
-    LONG_L      $20, VCPU_R20(k1)
-    LONG_L      $21, VCPU_R21(k1)
-    LONG_L      $22, VCPU_R22(k1)
-    LONG_L      $23, VCPU_R23(k1)
-    LONG_L      $24, VCPU_R24(k1)
-    LONG_L      $25, VCPU_R25(k1)
-
-    /* k0/k1 loaded up later */
-
-    LONG_L      $28, VCPU_R28(k1)
-    LONG_L      $29, VCPU_R29(k1)
-    LONG_L      $30, VCPU_R30(k1)
-    LONG_L      $31, VCPU_R31(k1)
-
-    /* Restore hi/lo */
-        LONG_L          k0, VCPU_LO(k1)
-        mtlo            k0
-
-        LONG_L          k0, VCPU_HI(k1)
-        mthi            k0
+             /* t1: contains the base of the ASID array, need to get the cpu id  */
+        LONG_L  t2, TI_CPU($28)             /* smp_processor_id */
+        INT_SLL t2, t2, 2                   /* x4 */
+        REG_ADDU t3, t1, t2
+        LONG_L  k0, (t3)
+        andi    k0, k0, 0xff
+        mtc0    k0, CP0_ENTRYHI
+        ehb
+
+        /* Disable RDHWR access */
+        mtc0    zero, CP0_HWRENA
+
+        /* Now load up the Guest Context from VCPU */
+        LONG_L  $1, VCPU_R1(k1)
+        LONG_L  $2, VCPU_R2(k1)
+        LONG_L  $3, VCPU_R3(k1)
+
+        LONG_L  $4, VCPU_R4(k1)
+        LONG_L  $5, VCPU_R5(k1)
+        LONG_L  $6, VCPU_R6(k1)
+        LONG_L  $7, VCPU_R7(k1)
+
+        LONG_L  $8, VCPU_R8(k1)
+        LONG_L  $9, VCPU_R9(k1)
+        LONG_L  $10, VCPU_R10(k1)
+        LONG_L  $11, VCPU_R11(k1)
+        LONG_L  $12, VCPU_R12(k1)
+        LONG_L  $13, VCPU_R13(k1)
+        LONG_L  $14, VCPU_R14(k1)
+        LONG_L  $15, VCPU_R15(k1)
+        LONG_L  $16, VCPU_R16(k1)
+        LONG_L  $17, VCPU_R17(k1)
+        LONG_L  $18, VCPU_R18(k1)
+        LONG_L  $19, VCPU_R19(k1)
+        LONG_L  $20, VCPU_R20(k1)
+        LONG_L  $21, VCPU_R21(k1)
+        LONG_L  $22, VCPU_R22(k1)
+        LONG_L  $23, VCPU_R23(k1)
+        LONG_L  $24, VCPU_R24(k1)
+        LONG_L  $25, VCPU_R25(k1)
+
+        /* k0/k1 loaded up later */
+
+        LONG_L  $28, VCPU_R28(k1)
+        LONG_L  $29, VCPU_R29(k1)
+        LONG_L  $30, VCPU_R30(k1)
+        LONG_L  $31, VCPU_R31(k1)
+
+        /* Restore hi/lo */
+        LONG_L  k0, VCPU_LO(k1)
+        mtlo    k0
+
+        LONG_L  k0, VCPU_HI(k1)
+        mthi    k0
 
 FEXPORT(__kvm_mips_load_k0k1)
         /* Restore the guest's k0/k1 registers */
-    LONG_L      k0, VCPU_R26(k1)
-    LONG_L      k1, VCPU_R27(k1)
+        LONG_L  k0, VCPU_R26(k1)
+        LONG_L  k1, VCPU_R27(k1)
 
-    /* Jump to guest */
+        /* Jump to guest */
         eret
-        .set    pop
 
 VECTOR(MIPSX(exception), unknown)
 /*
  * Find out what mode we came from and jump to the proper handler.
  */
-    .set    push
-        .set    noat
-    .set    noreorder
-    mtc0    k0, CP0_ERROREPC    #01: Save guest k0
-    ehb                         #02:
-
-    mfc0    k0, CP0_EBASE       #02: Get EBASE
-    srl     k0, k0, 10          #03: Get rid of CPUNum
-    sll     k0, k0, 10          #04
-    LONG_S  k1, 0x3000(k0)      #05: Save k1 @ offset 0x3000
-    addiu   k0, k0, 0x2000      #06: Exception handler is installed @ offset 0x2000
-        j       k0                                      #07: jump to the function
-        nop                                             #08: branch delay slot
-        .set    push
+        mtc0    k0, CP0_ERROREPC        #01: Save guest k0
+        ehb                             #02:
+
+        mfc0    k0, CP0_EBASE           #02: Get EBASE
+        INT_SRL k0, k0, 10              #03: Get rid of CPUNum
+        INT_SLL k0, k0, 10              #04
+        LONG_S  k1, 0x3000(k0)          #05: Save k1 @ offset 0x3000
+        INT_ADDIU k0, k0, 0x2000                #06: Exception handler is installed @ offset 0x2000
+        j       k0                      #07: jump to the function
+         nop                            #08: branch delay slot
 VECTOR_END(MIPSX(exceptionEnd))
 .end MIPSX(exception)
 
@@ -253,329 +251,327 @@ VECTOR_END(MIPSX(exceptionEnd))
  *
  */
 NESTED (MIPSX(GuestException), CALLFRAME_SIZ, ra)
-    .set    push
-    .set    noat
-    .set    noreorder
-
-    /* Get the VCPU pointer from DDTATA_LO */
-    mfc0        k1, CP0_DDATA_LO
-        addiu           k1, k1, VCPU_HOST_ARCH
-
-    /* Start saving Guest context to VCPU */
-    LONG_S  $0, VCPU_R0(k1)
-    LONG_S  $1, VCPU_R1(k1)
-    LONG_S  $2, VCPU_R2(k1)
-    LONG_S  $3, VCPU_R3(k1)
-    LONG_S  $4, VCPU_R4(k1)
-    LONG_S  $5, VCPU_R5(k1)
-    LONG_S  $6, VCPU_R6(k1)
-    LONG_S  $7, VCPU_R7(k1)
-    LONG_S  $8, VCPU_R8(k1)
-    LONG_S  $9, VCPU_R9(k1)
-    LONG_S  $10, VCPU_R10(k1)
-    LONG_S  $11, VCPU_R11(k1)
-    LONG_S  $12, VCPU_R12(k1)
-    LONG_S  $13, VCPU_R13(k1)
-    LONG_S  $14, VCPU_R14(k1)
-    LONG_S  $15, VCPU_R15(k1)
-    LONG_S  $16, VCPU_R16(k1)
-    LONG_S  $17,VCPU_R17(k1)
-    LONG_S  $18, VCPU_R18(k1)
-    LONG_S  $19, VCPU_R19(k1)
-    LONG_S  $20, VCPU_R20(k1)
-    LONG_S  $21, VCPU_R21(k1)
-    LONG_S  $22, VCPU_R22(k1)
-    LONG_S  $23, VCPU_R23(k1)
-    LONG_S  $24, VCPU_R24(k1)
-    LONG_S  $25, VCPU_R25(k1)
-
-    /* Guest k0/k1 saved later */
-
-    LONG_S  $28, VCPU_R28(k1)
-    LONG_S  $29, VCPU_R29(k1)
-    LONG_S  $30, VCPU_R30(k1)
-    LONG_S  $31, VCPU_R31(k1)
-
-    /* We need to save hi/lo and restore them on
-     * the way out
-     */
-    mfhi    t0
-    LONG_S  t0, VCPU_HI(k1)
-
-    mflo    t0
-    LONG_S  t0, VCPU_LO(k1)
-
-    /* Finally save guest k0/k1 to VCPU */
-    mfc0    t0, CP0_ERROREPC
-    LONG_S  t0, VCPU_R26(k1)
-
-    /* Get GUEST k1 and save it in VCPU */
-    la      t1, ~0x2ff
-    mfc0    t0, CP0_EBASE
-    and     t0, t0, t1
-    LONG_L  t0, 0x3000(t0)
-    LONG_S  t0, VCPU_R27(k1)
-
-    /* Now that context has been saved, we can use other registers */
-
-    /* Restore vcpu */
-    mfc0        a1, CP0_DDATA_LO
-    move        s1, a1
-
-   /* Restore run (vcpu->run) */
-    LONG_L      a0, VCPU_RUN(a1)
-    /* Save pointer to run in s0, will be saved by the compiler */
-    move        s0, a0
-
-
-    /* Save Host level EPC, BadVaddr and Cause to VCPU, useful to process the exception */
-    mfc0    k0,CP0_EPC
-    LONG_S  k0, VCPU_PC(k1)
-
-    mfc0    k0, CP0_BADVADDR
-    LONG_S  k0, VCPU_HOST_CP0_BADVADDR(k1)
-
-    mfc0    k0, CP0_CAUSE
-    LONG_S  k0, VCPU_HOST_CP0_CAUSE(k1)
-
-    mfc0    k0, CP0_ENTRYHI
-    LONG_S  k0, VCPU_HOST_ENTRYHI(k1)
-
-    /* Now restore the host state just enough to run the handlers */
-
-    /* Swtich EBASE to the one used by Linux */
-    /* load up the host EBASE */
-    mfc0        v0, CP0_STATUS
-
-    .set at
-        or          k0, v0, ST0_BEV
-    .set noat
-
-    mtc0        k0, CP0_STATUS
-    ehb
-
-    LONG_L      k0, VCPU_HOST_EBASE(k1)
-    mtc0        k0,CP0_EBASE
-
-
-    /* Now that the new EBASE has been loaded, unset BEV and KSU_USER */
-    .set at
-        and         v0, v0, ~(ST0_EXL | KSU_USER | ST0_IE)
-    or          v0, v0, ST0_CU0
-    .set noat
-    mtc0        v0, CP0_STATUS
-    ehb
-
-    /* Load up host GP */
-    LONG_L  gp, VCPU_HOST_GP(k1)
-
-    /* Need a stack before we can jump to "C" */
-    LONG_L  sp, VCPU_HOST_STACK(k1)
-
-    /* Saved host state */
-    addiu   sp,sp, -PT_SIZE
+        /* Get the VCPU pointer from DDTATA_LO */
+        mfc0    k1, CP0_DDATA_LO
+        INT_ADDIU k1, k1, VCPU_HOST_ARCH
+
+        /* Start saving Guest context to VCPU */
+        LONG_S  $0, VCPU_R0(k1)
+        LONG_S  $1, VCPU_R1(k1)
+        LONG_S  $2, VCPU_R2(k1)
+        LONG_S  $3, VCPU_R3(k1)
+        LONG_S  $4, VCPU_R4(k1)
+        LONG_S  $5, VCPU_R5(k1)
+        LONG_S  $6, VCPU_R6(k1)
+        LONG_S  $7, VCPU_R7(k1)
+        LONG_S  $8, VCPU_R8(k1)
+        LONG_S  $9, VCPU_R9(k1)
+        LONG_S  $10, VCPU_R10(k1)
+        LONG_S  $11, VCPU_R11(k1)
+        LONG_S  $12, VCPU_R12(k1)
+        LONG_S  $13, VCPU_R13(k1)
+        LONG_S  $14, VCPU_R14(k1)
+        LONG_S  $15, VCPU_R15(k1)
+        LONG_S  $16, VCPU_R16(k1)
+        LONG_S  $17, VCPU_R17(k1)
+        LONG_S  $18, VCPU_R18(k1)
+        LONG_S  $19, VCPU_R19(k1)
+        LONG_S  $20, VCPU_R20(k1)
+        LONG_S  $21, VCPU_R21(k1)
+        LONG_S  $22, VCPU_R22(k1)
+        LONG_S  $23, VCPU_R23(k1)
+        LONG_S  $24, VCPU_R24(k1)
+        LONG_S  $25, VCPU_R25(k1)
+
+        /* Guest k0/k1 saved later */
+
+        LONG_S  $28, VCPU_R28(k1)
+        LONG_S  $29, VCPU_R29(k1)
+        LONG_S  $30, VCPU_R30(k1)
+        LONG_S  $31, VCPU_R31(k1)
+
+        /* We need to save hi/lo and restore them on
+         * the way out
+         */
+        mfhi    t0
+        LONG_S  t0, VCPU_HI(k1)
+
+        mflo    t0
+        LONG_S  t0, VCPU_LO(k1)
+
+        /* Finally save guest k0/k1 to VCPU */
+        mfc0    t0, CP0_ERROREPC
+        LONG_S  t0, VCPU_R26(k1)
+
+        /* Get GUEST k1 and save it in VCPU */
+        PTR_LI  t1, ~0x2ff
+        mfc0    t0, CP0_EBASE
+        and     t0, t0, t1
+        LONG_L  t0, 0x3000(t0)
+        LONG_S  t0, VCPU_R27(k1)
+
+        /* Now that context has been saved, we can use other registers */
+
+        /* Restore vcpu */
+        mfc0    a1, CP0_DDATA_LO
+        move    s1, a1
+
+        /* Restore run (vcpu->run) */
+        LONG_L  a0, VCPU_RUN(a1)
+        /* Save pointer to run in s0, will be saved by the compiler */
+        move    s0, a0
+
+        /* Save Host level EPC, BadVaddr and Cause to VCPU, useful to
+         * process the exception */
+        mfc0    k0,CP0_EPC
+        LONG_S  k0, VCPU_PC(k1)
+
+        mfc0    k0, CP0_BADVADDR
+        LONG_S  k0, VCPU_HOST_CP0_BADVADDR(k1)
+
+        mfc0    k0, CP0_CAUSE
+        LONG_S  k0, VCPU_HOST_CP0_CAUSE(k1)
+
+        mfc0    k0, CP0_ENTRYHI
+        LONG_S  k0, VCPU_HOST_ENTRYHI(k1)
+
+        /* Now restore the host state just enough to run the handlers */
+
+        /* Swtich EBASE to the one used by Linux */
+        /* load up the host EBASE */
+        mfc0    v0, CP0_STATUS
+
+        .set    at
+        or      k0, v0, ST0_BEV
+        .set    noat
+
+        mtc0    k0, CP0_STATUS
+        ehb
+
+        LONG_L  k0, VCPU_HOST_EBASE(k1)
+        mtc0    k0,CP0_EBASE
+
 
-    /* XXXKYMA do we need to load the host ASID, maybe not because the
-     * kernel entries are marked GLOBAL, need to verify
-     */
+        /* Now that the new EBASE has been loaded, unset BEV and KSU_USER */
+        .set    at
+        and     v0, v0, ~(ST0_EXL | KSU_USER | ST0_IE)
+        or      v0, v0, ST0_CU0
+        .set    noat
+        mtc0    v0, CP0_STATUS
+        ehb
+
+        /* Load up host GP */
+        LONG_L  gp, VCPU_HOST_GP(k1)
+
+        /* Need a stack before we can jump to "C" */
+        LONG_L  sp, VCPU_HOST_STACK(k1)
+
+        /* Saved host state */
+        INT_ADDIU sp, sp, -PT_SIZE
 
-    /* Restore host DDATA_LO */
-    LONG_L      k0, PT_HOST_USERLOCAL(sp)
-    mtc0        k0, CP0_DDATA_LO
+        /* XXXKYMA do we need to load the host ASID, maybe not because the
+         * kernel entries are marked GLOBAL, need to verify
+         */
 
-    /* Restore RDHWR access */
-    la      k0, 0x2000000F
-    mtc0    k0,  CP0_HWRENA
+        /* Restore host DDATA_LO */
+        LONG_L  k0, PT_HOST_USERLOCAL(sp)
+        mtc0    k0, CP0_DDATA_LO
 
-    /* Jump to handler */
+        /* Restore RDHWR access */
+        PTR_LI  k0, 0x2000000F
+        mtc0    k0, CP0_HWRENA
+
+        /* Jump to handler */
 FEXPORT(__kvm_mips_jump_to_handler)
-    /* XXXKYMA: not sure if this is safe, how large is the stack?? */
-    /* Now jump to the kvm_mips_handle_exit() to see if we can deal with this in the kernel */
-    la          t9,kvm_mips_handle_exit
-    jalr.hb     t9
-    addiu       sp,sp, -CALLFRAME_SIZ           /* BD Slot */
-
-    /* Return from handler Make sure interrupts are disabled */
-    di
-    ehb
-
-    /* XXXKYMA: k0/k1 could have been blown away if we processed an exception
-     * while we were handling the exception from the guest, reload k1
-     */
-    move        k1, s1
-        addiu           k1, k1, VCPU_HOST_ARCH
-
-    /* Check return value, should tell us if we are returning to the host (handle I/O etc)
-     * or resuming the guest
-     */
-    andi        t0, v0, RESUME_HOST
-    bnez        t0, __kvm_mips_return_to_host
-    nop
+        /* XXXKYMA: not sure if this is safe, how large is the stack??
+         * Now jump to the kvm_mips_handle_exit() to see if we can deal
+         * with this in the kernel */
+        PTR_LA  t9, kvm_mips_handle_exit
+        jalr.hb t9
+         INT_ADDIU sp, sp, -CALLFRAME_SIZ           /* BD Slot */
+
+        /* Return from handler Make sure interrupts are disabled */
+        di
+        ehb
+
+        /* XXXKYMA: k0/k1 could have been blown away if we processed
+         * an exception while we were handling the exception from the
+         * guest, reload k1
+         */
+
+        move    k1, s1
+        INT_ADDIU k1, k1, VCPU_HOST_ARCH
+
+        /* Check return value, should tell us if we are returning to the
+         * host (handle I/O etc)or resuming the guest
+         */
+        andi    t0, v0, RESUME_HOST
+        bnez    t0, __kvm_mips_return_to_host
+         nop
 
 __kvm_mips_return_to_guest:
-    /* Put the saved pointer to vcpu (s1) back into the DDATA_LO Register */
-    mtc0        s1, CP0_DDATA_LO
-
-    /* Load up the Guest EBASE to minimize the window where BEV is set */
-    LONG_L      t0, VCPU_GUEST_EBASE(k1)
-
-    /* Switch EBASE back to the one used by KVM */
-    mfc0        v1, CP0_STATUS
-    .set at
-        or          k0, v1, ST0_BEV
-    .set noat
-    mtc0        k0, CP0_STATUS
-    ehb
-    mtc0        t0,CP0_EBASE
-
-    /* Setup status register for running guest in UM */
-    .set at
-    or     v1, v1, (ST0_EXL | KSU_USER | ST0_IE)
-    and     v1, v1, ~ST0_CU0
-    .set noat
-    mtc0    v1, CP0_STATUS
-    ehb
+        /* Put the saved pointer to vcpu (s1) back into the DDATA_LO Register */
+        mtc0    s1, CP0_DDATA_LO
 
+        /* Load up the Guest EBASE to minimize the window where BEV is set */
+        LONG_L  t0, VCPU_GUEST_EBASE(k1)
+
+        /* Switch EBASE back to the one used by KVM */
+        mfc0    v1, CP0_STATUS
+        .set    at
+        or      k0, v1, ST0_BEV
+        .set    noat
+        mtc0    k0, CP0_STATUS
+        ehb
+        mtc0    t0, CP0_EBASE
+
+        /* Setup status register for running guest in UM */
+        .set    at
+        or      v1, v1, (ST0_EXL | KSU_USER | ST0_IE)
+        and     v1, v1, ~ST0_CU0
+        .set    noat
+        mtc0    v1, CP0_STATUS
+        ehb
 
         /* Set Guest EPC */
-        LONG_L          t0, VCPU_PC(k1)
-        mtc0            t0, CP0_EPC
-
-    /* Set the ASID for the Guest Kernel */
-    sll         t0, t0, 1                       /* with kseg0 @ 0x40000000, kernel */
-                                                /* addresses shift to 0x80000000 */
-    bltz        t0, 1f                          /* If kernel */
-        addiu       t1, k1, VCPU_GUEST_KERNEL_ASID  /* (BD)  */
-    addiu       t1, k1, VCPU_GUEST_USER_ASID    /* else user */
+        LONG_L  t0, VCPU_PC(k1)
+        mtc0    t0, CP0_EPC
+
+        /* Set the ASID for the Guest Kernel */
+        INT_SLL t0, t0, 1       /* with kseg0 @ 0x40000000, kernel */
+                                /* addresses shift to 0x80000000 */
+        bltz    t0, 1f          /* If kernel */
+         INT_ADDIU t1, k1, VCPU_GUEST_KERNEL_ASID  /* (BD)  */
+        INT_ADDIU t1, k1, VCPU_GUEST_USER_ASID    /* else user */
 1:
-    /* t1: contains the base of the ASID array, need to get the cpu id  */
-    LONG_L      t2, TI_CPU($28)             /* smp_processor_id */
-    sll         t2, t2, 2                   /* x4 */
-    addu        t3, t1, t2
-    LONG_L      k0, (t3)
-    andi        k0, k0, 0xff
-        mtc0            k0,CP0_ENTRYHI
-    ehb
-
-    /* Disable RDHWR access */
-    mtc0    zero,  CP0_HWRENA
-
-    /* load the guest context from VCPU and return */
-    LONG_L  $0, VCPU_R0(k1)
-    LONG_L  $1, VCPU_R1(k1)
-    LONG_L  $2, VCPU_R2(k1)
-    LONG_L  $3, VCPU_R3(k1)
-    LONG_L  $4, VCPU_R4(k1)
-    LONG_L  $5, VCPU_R5(k1)
-    LONG_L  $6, VCPU_R6(k1)
-    LONG_L  $7, VCPU_R7(k1)
-    LONG_L  $8, VCPU_R8(k1)
-    LONG_L  $9, VCPU_R9(k1)
-    LONG_L  $10, VCPU_R10(k1)
-    LONG_L  $11, VCPU_R11(k1)
-    LONG_L  $12, VCPU_R12(k1)
-    LONG_L  $13, VCPU_R13(k1)
-    LONG_L  $14, VCPU_R14(k1)
-    LONG_L  $15, VCPU_R15(k1)
-    LONG_L  $16, VCPU_R16(k1)
-    LONG_L  $17, VCPU_R17(k1)
-    LONG_L  $18, VCPU_R18(k1)
-    LONG_L  $19, VCPU_R19(k1)
-    LONG_L  $20, VCPU_R20(k1)
-    LONG_L  $21, VCPU_R21(k1)
-    LONG_L  $22, VCPU_R22(k1)
-    LONG_L  $23, VCPU_R23(k1)
-    LONG_L  $24, VCPU_R24(k1)
-    LONG_L  $25, VCPU_R25(k1)
-
-    /* $/k1 loaded later */
-    LONG_L  $28, VCPU_R28(k1)
-    LONG_L  $29, VCPU_R29(k1)
-    LONG_L  $30, VCPU_R30(k1)
-    LONG_L  $31, VCPU_R31(k1)
+        /* t1: contains the base of the ASID array, need to get the cpu id  */
+        LONG_L  t2, TI_CPU($28)         /* smp_processor_id */
+        INT_SLL t2, t2, 2               /* x4 */
+        REG_ADDU t3, t1, t2
+        LONG_L  k0, (t3)
+        andi    k0, k0, 0xff
+        mtc0    k0,CP0_ENTRYHI
+        ehb
+
+        /* Disable RDHWR access */
+        mtc0    zero,  CP0_HWRENA
+
+        /* load the guest context from VCPU and return */
+        LONG_L  $0, VCPU_R0(k1)
+        LONG_L  $1, VCPU_R1(k1)
+        LONG_L  $2, VCPU_R2(k1)
+        LONG_L  $3, VCPU_R3(k1)
+        LONG_L  $4, VCPU_R4(k1)
+        LONG_L  $5, VCPU_R5(k1)
+        LONG_L  $6, VCPU_R6(k1)
+        LONG_L  $7, VCPU_R7(k1)
+        LONG_L  $8, VCPU_R8(k1)
+        LONG_L  $9, VCPU_R9(k1)
+        LONG_L  $10, VCPU_R10(k1)
+        LONG_L  $11, VCPU_R11(k1)
+        LONG_L  $12, VCPU_R12(k1)
+        LONG_L  $13, VCPU_R13(k1)
+        LONG_L  $14, VCPU_R14(k1)
+        LONG_L  $15, VCPU_R15(k1)
+        LONG_L  $16, VCPU_R16(k1)
+        LONG_L  $17, VCPU_R17(k1)
+        LONG_L  $18, VCPU_R18(k1)
+        LONG_L  $19, VCPU_R19(k1)
+        LONG_L  $20, VCPU_R20(k1)
+        LONG_L  $21, VCPU_R21(k1)
+        LONG_L  $22, VCPU_R22(k1)
+        LONG_L  $23, VCPU_R23(k1)
+        LONG_L  $24, VCPU_R24(k1)
+        LONG_L  $25, VCPU_R25(k1)
+
+        /* $/k1 loaded later */
+        LONG_L  $28, VCPU_R28(k1)
+        LONG_L  $29, VCPU_R29(k1)
+        LONG_L  $30, VCPU_R30(k1)
+        LONG_L  $31, VCPU_R31(k1)
 
 FEXPORT(__kvm_mips_skip_guest_restore)
-    LONG_L  k0, VCPU_HI(k1)
-    mthi    k0
+        LONG_L  k0, VCPU_HI(k1)
+        mthi    k0
 
-    LONG_L  k0, VCPU_LO(k1)
-    mtlo    k0
+        LONG_L  k0, VCPU_LO(k1)
+        mtlo    k0
 
-    LONG_L  k0, VCPU_R26(k1)
-    LONG_L  k1, VCPU_R27(k1)
+        LONG_L  k0, VCPU_R26(k1)
+        LONG_L  k1, VCPU_R27(k1)
 
-    eret
+        eret
 
 __kvm_mips_return_to_host:
-    /* EBASE is already pointing to Linux */
-    LONG_L  k1, VCPU_HOST_STACK(k1)
-        addiu   k1,k1, -PT_SIZE
-
-    /* Restore host DDATA_LO */
-    LONG_L      k0, PT_HOST_USERLOCAL(k1)
-    mtc0        k0, CP0_DDATA_LO
-
-    /* Restore host ASID */
-    LONG_L      k0, PT_HOST_ASID(sp)
-    andi        k0, 0xff
-    mtc0        k0,CP0_ENTRYHI
-    ehb
-
-    /* Load context saved on the host stack */
-    LONG_L  $0, PT_R0(k1)
-    LONG_L  $1, PT_R1(k1)
-
-    /* r2/v0 is the return code, shift it down by 2 (arithmetic) to recover the err code  */
-    sra     k0, v0, 2
-    move    $2, k0
-
-    LONG_L  $3, PT_R3(k1)
-    LONG_L  $4, PT_R4(k1)
-    LONG_L  $5, PT_R5(k1)
-    LONG_L  $6, PT_R6(k1)
-    LONG_L  $7, PT_R7(k1)
-    LONG_L  $8, PT_R8(k1)
-    LONG_L  $9, PT_R9(k1)
-    LONG_L  $10, PT_R10(k1)
-    LONG_L  $11, PT_R11(k1)
-    LONG_L  $12, PT_R12(k1)
-    LONG_L  $13, PT_R13(k1)
-    LONG_L  $14, PT_R14(k1)
-    LONG_L  $15, PT_R15(k1)
-    LONG_L  $16, PT_R16(k1)
-    LONG_L  $17, PT_R17(k1)
-    LONG_L  $18, PT_R18(k1)
-    LONG_L  $19, PT_R19(k1)
-    LONG_L  $20, PT_R20(k1)
-    LONG_L  $21, PT_R21(k1)
-    LONG_L  $22, PT_R22(k1)
-    LONG_L  $23, PT_R23(k1)
-    LONG_L  $24, PT_R24(k1)
-    LONG_L  $25, PT_R25(k1)
-
-    /* Host k0/k1 were not saved */
-
-    LONG_L  $28, PT_R28(k1)
-    LONG_L  $29, PT_R29(k1)
-    LONG_L  $30, PT_R30(k1)
-
-    LONG_L  k0, PT_HI(k1)
-    mthi    k0
-
-    LONG_L  k0, PT_LO(k1)
-    mtlo    k0
-
-    /* Restore RDHWR access */
-    la      k0, 0x2000000F
-    mtc0    k0,  CP0_HWRENA
-
-
-    /* Restore RA, which is the address we will return to */
-    LONG_L  ra, PT_R31(k1)
-    j       ra
-    nop
-
-    .set    pop
+        /* EBASE is already pointing to Linux */
+        LONG_L  k1, VCPU_HOST_STACK(k1)
+        INT_ADDIU k1,k1, -PT_SIZE
+
+        /* Restore host DDATA_LO */
+        LONG_L  k0, PT_HOST_USERLOCAL(k1)
+        mtc0    k0, CP0_DDATA_LO
+
+        /* Restore host ASID */
+        LONG_L  k0, PT_HOST_ASID(sp)
+        andi    k0, 0xff
+        mtc0    k0,CP0_ENTRYHI
+        ehb
+
+        /* Load context saved on the host stack */
+        LONG_L  $0, PT_R0(k1)
+        LONG_L  $1, PT_R1(k1)
+
+        /* r2/v0 is the return code, shift it down by 2 (arithmetic)
+         * to recover the err code  */
+        INT_SRA k0, v0, 2
+        move    $2, k0
+
+        LONG_L  $3, PT_R3(k1)
+        LONG_L  $4, PT_R4(k1)
+        LONG_L  $5, PT_R5(k1)
+        LONG_L  $6, PT_R6(k1)
+        LONG_L  $7, PT_R7(k1)
+        LONG_L  $8, PT_R8(k1)
+        LONG_L  $9, PT_R9(k1)
+        LONG_L  $10, PT_R10(k1)
+        LONG_L  $11, PT_R11(k1)
+        LONG_L  $12, PT_R12(k1)
+        LONG_L  $13, PT_R13(k1)
+        LONG_L  $14, PT_R14(k1)
+        LONG_L  $15, PT_R15(k1)
+        LONG_L  $16, PT_R16(k1)
+        LONG_L  $17, PT_R17(k1)
+        LONG_L  $18, PT_R18(k1)
+        LONG_L  $19, PT_R19(k1)
+        LONG_L  $20, PT_R20(k1)
+        LONG_L  $21, PT_R21(k1)
+        LONG_L  $22, PT_R22(k1)
+        LONG_L  $23, PT_R23(k1)
+        LONG_L  $24, PT_R24(k1)
+        LONG_L  $25, PT_R25(k1)
+
+        /* Host k0/k1 were not saved */
+
+        LONG_L  $28, PT_R28(k1)
+        LONG_L  $29, PT_R29(k1)
+        LONG_L  $30, PT_R30(k1)
+
+        LONG_L  k0, PT_HI(k1)
+        mthi    k0
+
+        LONG_L  k0, PT_LO(k1)
+        mtlo    k0
+
+        /* Restore RDHWR access */
+        PTR_LI  k0, 0x2000000F
+        mtc0    k0,  CP0_HWRENA
+
+
+        /* Restore RA, which is the address we will return to */
+        LONG_L  ra, PT_R31(k1)
+        j       ra
+         nop
+
 VECTOR_END(MIPSX(GuestExceptionEnd))
 .end MIPSX(GuestException)
 
@@ -627,24 +623,23 @@ MIPSX(exceptions):
 
 #define HW_SYNCI_Step       $1
 LEAF(MIPSX(SyncICache))
-    .set    push
+        .set    push
         .set    mips32r2
-    beq     a1, zero, 20f
-    nop
-    addu    a1, a0, a1
-    rdhwr   v0, HW_SYNCI_Step
-    beq     v0, zero, 20f
-    nop
-
+        beq     a1, zero, 20f
+         nop
+        REG_ADDU a1, a0, a1
+        rdhwr   v0, HW_SYNCI_Step
+        beq     v0, zero, 20f
+         nop
 10:
-    synci   0(a0)
-    addu    a0, a0, v0
-    sltu    v1, a0, a1
-    bne     v1, zero, 10b
-    nop
-    sync
+        synci   0(a0)
+        REG_ADDU a0, a0, v0
+        sltu    v1, a0, a1
+        bne     v1, zero, 10b
+         nop
+        sync
 20:
-    jr.hb   ra
-    nop
-    .set pop
+        jr.hb   ra
+         nop
+        .set    pop
 END(MIPSX(SyncICache))
diff --git a/arch/mips/kvm/kvm_mips.c b/arch/mips/kvm/kvm_mips.c
index dd203e59e6fd..a7b044536de4 100644
--- a/arch/mips/kvm/kvm_mips.c
+++ b/arch/mips/kvm/kvm_mips.c
@@ -208,6 +208,10 @@ int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages)
         return 0;
 }
 
+void kvm_arch_memslots_updated(struct kvm *kvm)
+{
+}
+
 int kvm_arch_prepare_memory_region(struct kvm *kvm,
                                 struct kvm_memory_slot *memslot,
                                 struct kvm_userspace_memory_region *mem,
diff --git a/arch/mips/lantiq/falcon/sysctrl.c b/arch/mips/lantiq/falcon/sysctrl.c
index ff4894a833ee..8f1866d8124d 100644
--- a/arch/mips/lantiq/falcon/sysctrl.c
+++ b/arch/mips/lantiq/falcon/sysctrl.c
@@ -48,6 +48,7 @@
 #define CPU0CC_CPUDIV           0x0001
 
 /* Activation Status Register */
+#define ACTS_ASC0_ACT   0x00001000
 #define ACTS_ASC1_ACT   0x00000800
 #define ACTS_I2C_ACT    0x00004000
 #define ACTS_P0         0x00010000
@@ -108,6 +109,7 @@ static void sysctl_deactivate(struct clk *clk)
 static int sysctl_clken(struct clk *clk)
 {
         sysctl_w32(clk->module, clk->bits, SYSCTL_CLKEN);
+        sysctl_w32(clk->module, clk->bits, SYSCTL_ACT);
         sysctl_wait(clk, clk->bits, SYSCTL_CLKS);
         return 0;
 }
@@ -256,6 +258,7 @@ void __init ltq_soc_init(void)
         clkdev_add_sys("1e800400.pad", SYSCTL_SYS1, ACTS_PADCTRL1);
         clkdev_add_sys("1e800500.pad", SYSCTL_SYS1, ACTS_PADCTRL3);
         clkdev_add_sys("1e800600.pad", SYSCTL_SYS1, ACTS_PADCTRL4);
-        clkdev_add_sys("1e100C00.serial", SYSCTL_SYS1, ACTS_ASC1_ACT);
+        clkdev_add_sys("1e100b00.serial", SYSCTL_SYS1, ACTS_ASC1_ACT);
+        clkdev_add_sys("1e100c00.serial", SYSCTL_SYS1, ACTS_ASC0_ACT);
         clkdev_add_sys("1e200000.i2c", SYSCTL_SYS1, ACTS_I2C_ACT);
 }
diff --git a/arch/mips/lantiq/xway/Makefile b/arch/mips/lantiq/xway/Makefile
index 7a13660d630d..087497d97357 100644
--- a/arch/mips/lantiq/xway/Makefile
+++ b/arch/mips/lantiq/xway/Makefile
@@ -1,3 +1,3 @@
-obj-y := prom.o sysctrl.o clk.o reset.o dma.o gptu.o
+obj-y := prom.o sysctrl.o clk.o reset.o dma.o gptu.o dcdc.o
 
 obj-$(CONFIG_XRX200_PHY_FW) += xrx200_phy_fw.o
diff --git a/arch/mips/lantiq/xway/dcdc.c b/arch/mips/lantiq/xway/dcdc.c
new file mode 100644
index 000000000000..7688ac0f06d0
--- /dev/null
+++ b/arch/mips/lantiq/xway/dcdc.c
@@ -0,0 +1,63 @@
+/*
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ *
+ *  Copyright (C) 2012 John Crispin <blogic@openwrt.org>
+ *  Copyright (C) 2010 Sameer Ahmad, Lantiq GmbH
+ */
+
+#include <linux/ioport.h>
+#include <linux/of_platform.h>
+
+#include <lantiq_soc.h>
+
+/* Bias and regulator Setup Register */
+#define DCDC_BIAS_VREG0 0xa
+/* Bias and regulator Setup Register */
+#define DCDC_BIAS_VREG1 0xb
+
+#define dcdc_w8(x, y)   ltq_w8((x), dcdc_membase + (y))
+#define dcdc_r8(x)      ltq_r8(dcdc_membase + (x))
+
+static void __iomem *dcdc_membase;
+
+static int dcdc_probe(struct platform_device *pdev)
+{
+        struct resource *res;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        dcdc_membase = devm_ioremap_resource(&pdev->dev, res);
+        if (IS_ERR(dcdc_membase))
+                return PTR_ERR(dcdc_membase);
+
+        dev_info(&pdev->dev, "Core Voltage : %d mV\n",
+                dcdc_r8(DCDC_BIAS_VREG1) * 8);
+
+        return 0;
+}
+
+static const struct of_device_id dcdc_match[] = {
+        { .compatible = "lantiq,dcdc-xrx200" },
+        {},
+};
+
+static struct platform_driver dcdc_driver = {
+        .probe = dcdc_probe,
+        .driver = {
+                .name = "dcdc-xrx200",
+                .owner = THIS_MODULE,
+                .of_match_table = dcdc_match,
+        },
+};
+
+int __init dcdc_init(void)
+{
+        int ret = platform_driver_register(&dcdc_driver);
+
+        if (ret)
+                pr_info("dcdc: Error registering platform driver\n");
+        return ret;
+}
+
+arch_initcall(dcdc_init);
diff --git a/arch/mips/lasat/image/Makefile b/arch/mips/lasat/image/Makefile
index dfb509d21d8e..fd32075679c6 100644
--- a/arch/mips/lasat/image/Makefile
+++ b/arch/mips/lasat/image/Makefile
@@ -13,13 +13,11 @@ endif
 MKLASATIMG = mklasatimg
 MKLASATIMG_ARCH = mq2,mqpro,sp100,sp200
 KERNEL_IMAGE = vmlinux
-KERNEL_START = $(shell $(NM) $(KERNEL_IMAGE) | grep " _text" | cut -f1 -d\ )
-KERNEL_ENTRY = $(shell $(NM) $(KERNEL_IMAGE) | grep kernel_entry | cut -f1 -d\ )
 
 LDSCRIPT= -L$(srctree)/$(src) -Tromscript.normal
 
-HEAD_DEFINES := -D_kernel_start=0x$(KERNEL_START) \
-                -D_kernel_entry=0x$(KERNEL_ENTRY) \
+HEAD_DEFINES := -D_kernel_start=$(VMLINUX_LOAD_ADDRESS) \
+                -D_kernel_entry=$(VMLINUX_ENTRY_ADDRESS) \
                 -D VERSION="\"$(Version)\"" \
                 -D TIMESTAMP=$(shell date +%s)
 
diff --git a/arch/mips/loongson/common/Makefile b/arch/mips/loongson/common/Makefile
index 4c57b3e5743f..9e4484ccbb03 100644
--- a/arch/mips/loongson/common/Makefile
+++ b/arch/mips/loongson/common/Makefile
@@ -3,8 +3,9 @@
 #
 
 obj-y += setup.o init.o cmdline.o env.o time.o reset.o irq.o \
-    pci.o bonito-irq.o mem.o machtype.o platform.o
+    bonito-irq.o mem.o machtype.o platform.o
 obj-$(CONFIG_GPIOLIB) += gpio.o
+obj-$(CONFIG_PCI) += pci.o
 
 #
 # Serial port support
diff --git a/arch/mips/math-emu/cp1emu.c b/arch/mips/math-emu/cp1emu.c
index 46048d24328c..efe008846ed0 100644
--- a/arch/mips/math-emu/cp1emu.c
+++ b/arch/mips/math-emu/cp1emu.c
@@ -436,7 +436,6 @@ static int microMIPS32_to_MIPS32(union mips_instruction *insn_ptr)
                                 break;
                         default:
                                 return SIGILL;
-                                break;
                         }
                         break;
                 case mm_32f_74_op:      /* c.cond.fmt */
@@ -451,12 +450,10 @@ static int microMIPS32_to_MIPS32(union mips_instruction *insn_ptr)
                         break;
                 default:
                         return SIGILL;
-                        break;
                 }
                 break;
         default:
                 return SIGILL;
-                break;
         }
 
         *insn_ptr = mips32_insn;
@@ -491,7 +488,6 @@ int mm_isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                                                 dec_insn.next_pc_inc;
                                 *contpc = regs->regs[insn.mm_i_format.rs];
                                 return 1;
-                                break;
                         }
                 }
                 break;
@@ -513,7 +509,6 @@ int mm_isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                                         dec_insn.pc_inc +
                                         dec_insn.next_pc_inc;
                         return 1;
-                        break;
                 case mm_bgezals_op:
                 case mm_bgezal_op:
                         regs->regs[31] = regs->cp0_epc +
@@ -530,7 +525,6 @@ int mm_isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                                         dec_insn.pc_inc +
                                         dec_insn.next_pc_inc;
                         return 1;
-                        break;
                 case mm_blez_op:
                         if ((long)regs->regs[insn.mm_i_format.rs] <= 0)
                                 *contpc = regs->cp0_epc +
@@ -541,7 +535,6 @@ int mm_isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                                         dec_insn.pc_inc +
                                         dec_insn.next_pc_inc;
                         return 1;
-                        break;
                 case mm_bgtz_op:
                         if ((long)regs->regs[insn.mm_i_format.rs] <= 0)
                                 *contpc = regs->cp0_epc +
@@ -552,7 +545,6 @@ int mm_isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                                         dec_insn.pc_inc +
                                         dec_insn.next_pc_inc;
                         return 1;
-                        break;
                 case mm_bc2f_op:
                 case mm_bc1f_op:
                         bc_false = 1;
@@ -580,7 +572,6 @@ int mm_isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                                 *contpc = regs->cp0_epc +
                                         dec_insn.pc_inc + dec_insn.next_pc_inc;
                         return 1;
-                        break;
                 }
                 break;
         case mm_pool16c_op:
@@ -593,7 +584,6 @@ int mm_isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                 case mm_jr16_op:
                         *contpc = regs->regs[insn.mm_i_format.rs];
                         return 1;
-                        break;
                 }
                 break;
         case mm_beqz16_op:
@@ -605,7 +595,6 @@ int mm_isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                         *contpc = regs->cp0_epc +
                                 dec_insn.pc_inc + dec_insn.next_pc_inc;
                 return 1;
-                break;
         case mm_bnez16_op:
                 if ((long)regs->regs[reg16to32map[insn.mm_b1_format.rs]] != 0)
                         *contpc = regs->cp0_epc +
@@ -615,12 +604,10 @@ int mm_isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                         *contpc = regs->cp0_epc +
                                 dec_insn.pc_inc + dec_insn.next_pc_inc;
                 return 1;
-                break;
         case mm_b16_op:
                 *contpc = regs->cp0_epc + dec_insn.pc_inc +
                          (insn.mm_b0_format.simmediate << 1);
                 return 1;
-                break;
         case mm_beq32_op:
                 if (regs->regs[insn.mm_i_format.rs] ==
                     regs->regs[insn.mm_i_format.rt])
@@ -632,7 +619,6 @@ int mm_isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                                 dec_insn.pc_inc +
                                 dec_insn.next_pc_inc;
                 return 1;
-                break;
         case mm_bne32_op:
                 if (regs->regs[insn.mm_i_format.rs] !=
                     regs->regs[insn.mm_i_format.rt])
@@ -643,7 +629,6 @@ int mm_isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                         *contpc = regs->cp0_epc +
                                 dec_insn.pc_inc + dec_insn.next_pc_inc;
                 return 1;
-                break;
         case mm_jalx32_op:
                 regs->regs[31] = regs->cp0_epc +
                         dec_insn.pc_inc + dec_insn.next_pc_inc;
@@ -652,7 +637,6 @@ int mm_isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                 *contpc <<= 28;
                 *contpc |= (insn.j_format.target << 2);
                 return 1;
-                break;
         case mm_jals32_op:
         case mm_jal32_op:
                 regs->regs[31] = regs->cp0_epc +
@@ -665,7 +649,6 @@ int mm_isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                 *contpc |= (insn.j_format.target << 1);
                 set_isa16_mode(*contpc);
                 return 1;
-                break;
         }
         return 0;
 }
@@ -694,7 +677,6 @@ static int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                 case jr_op:
                         *contpc = regs->regs[insn.r_format.rs];
                         return 1;
-                        break;
                 }
                 break;
         case bcond_op:
@@ -716,7 +698,6 @@ static int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                                         dec_insn.pc_inc +
                                         dec_insn.next_pc_inc;
                         return 1;
-                        break;
                 case bgezal_op:
                 case bgezall_op:
                         regs->regs[31] = regs->cp0_epc +
@@ -734,7 +715,6 @@ static int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                                         dec_insn.pc_inc +
                                         dec_insn.next_pc_inc;
                         return 1;
-                        break;
                 }
                 break;
         case jalx_op:
@@ -752,7 +732,6 @@ static int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                 /* Set microMIPS mode bit: XOR for jalx. */
                 *contpc ^= bit;
                 return 1;
-                break;
         case beq_op:
         case beql_op:
                 if (regs->regs[insn.i_format.rs] ==
@@ -765,7 +744,6 @@ static int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                                 dec_insn.pc_inc +
                                 dec_insn.next_pc_inc;
                 return 1;
-                break;
         case bne_op:
         case bnel_op:
                 if (regs->regs[insn.i_format.rs] !=
@@ -778,7 +756,6 @@ static int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                                 dec_insn.pc_inc +
                                 dec_insn.next_pc_inc;
                 return 1;
-                break;
         case blez_op:
         case blezl_op:
                 if ((long)regs->regs[insn.i_format.rs] <= 0)
@@ -790,7 +767,6 @@ static int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                                 dec_insn.pc_inc +
                                 dec_insn.next_pc_inc;
                 return 1;
-                break;
         case bgtz_op:
         case bgtzl_op:
                 if ((long)regs->regs[insn.i_format.rs] > 0)
@@ -802,7 +778,6 @@ static int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                                 dec_insn.pc_inc +
                                 dec_insn.next_pc_inc;
                 return 1;
-                break;
 #ifdef CONFIG_CPU_CAVIUM_OCTEON
         case lwc2_op: /* This is bbit0 on Octeon */
                 if ((regs->regs[insn.i_format.rs] & (1ull<<insn.i_format.rt)) == 0)
@@ -856,7 +831,6 @@ static int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                                                 dec_insn.pc_inc +
                                                 dec_insn.next_pc_inc;
                                 return 1;
-                                break;
                         case 1: /* bc1t */
                         case 3: /* bc1tl */
                                 if (fcr31 & (1 << bit))
@@ -868,7 +842,6 @@ static int isBranchInstr(struct pt_regs *regs, struct mm_decoded_insn dec_insn,
                                                 dec_insn.pc_inc +
                                                 dec_insn.next_pc_inc;
                                 return 1;
-                                break;
                         }
                 }
                 break;
diff --git a/arch/mips/mm/c-octeon.c b/arch/mips/mm/c-octeon.c
index a0bcdbb81d41..c8efdb5b6ee0 100644
--- a/arch/mips/mm/c-octeon.c
+++ b/arch/mips/mm/c-octeon.c
@@ -19,6 +19,7 @@
 #include <asm/bootinfo.h>
 #include <asm/cacheops.h>
 #include <asm/cpu-features.h>
+#include <asm/cpu-type.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 #include <asm/r4kcache.h>
@@ -186,9 +187,10 @@ static void probe_octeon(void)
         unsigned long dcache_size;
         unsigned int config1;
         struct cpuinfo_mips *c = &current_cpu_data;
+        int cputype = current_cpu_type();
 
         config1 = read_c0_config1();
-        switch (c->cputype) {
+        switch (cputype) {
         case CPU_CAVIUM_OCTEON:
         case CPU_CAVIUM_OCTEON_PLUS:
                 c->icache.linesz = 2 << ((config1 >> 19) & 7);
@@ -199,7 +201,7 @@ static void probe_octeon(void)
                         c->icache.sets * c->icache.ways * c->icache.linesz;
                 c->icache.waybit = ffs(icache_size / c->icache.ways) - 1;
                 c->dcache.linesz = 128;
-                if (c->cputype == CPU_CAVIUM_OCTEON_PLUS)
+                if (cputype == CPU_CAVIUM_OCTEON_PLUS)
                         c->dcache.sets = 2; /* CN5XXX has two Dcache sets */
                 else
                         c->dcache.sets = 1; /* CN3XXX has one Dcache set */
@@ -224,6 +226,20 @@ static void probe_octeon(void)
                 c->options |= MIPS_CPU_PREFETCH;
                 break;
 
+        case CPU_CAVIUM_OCTEON3:
+                c->icache.linesz = 128;
+                c->icache.sets = 16;
+                c->icache.ways = 39;
+                c->icache.flags |= MIPS_CACHE_VTAG;
+                icache_size = c->icache.sets * c->icache.ways * c->icache.linesz;
+
+                c->dcache.linesz = 128;
+                c->dcache.ways = 32;
+                c->dcache.sets = 8;
+                dcache_size = c->dcache.sets * c->dcache.ways * c->dcache.linesz;
+                c->options |= MIPS_CPU_PREFETCH;
+                break;
+
         default:
                 panic("Unsupported Cavium Networks CPU type");
                 break;
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index f749f687ee87..627883bc6d5f 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -12,6 +12,7 @@
 #include <linux/highmem.h>
 #include <linux/kernel.h>
 #include <linux/linkage.h>
+#include <linux/preempt.h>
 #include <linux/sched.h>
 #include <linux/smp.h>
 #include <linux/mm.h>
@@ -24,6 +25,7 @@
 #include <asm/cacheops.h>
 #include <asm/cpu.h>
 #include <asm/cpu-features.h>
+#include <asm/cpu-type.h>
 #include <asm/io.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
@@ -601,6 +603,7 @@ static void r4k_dma_cache_wback_inv(unsigned long addr, unsigned long size)
         /* Catch bad driver code */
         BUG_ON(size == 0);
 
+        preempt_disable();
         if (cpu_has_inclusive_pcaches) {
                 if (size >= scache_size)
                         r4k_blast_scache();
@@ -621,6 +624,7 @@ static void r4k_dma_cache_wback_inv(unsigned long addr, unsigned long size)
                 R4600_HIT_CACHEOP_WAR_IMPL;
                 blast_dcache_range(addr, addr + size);
         }
+        preempt_enable();
 
         bc_wback_inv(addr, size);
         __sync();
@@ -631,6 +635,7 @@ static void r4k_dma_cache_inv(unsigned long addr, unsigned long size)
         /* Catch bad driver code */
         BUG_ON(size == 0);
 
+        preempt_disable();
         if (cpu_has_inclusive_pcaches) {
                 if (size >= scache_size)
                         r4k_blast_scache();
@@ -655,6 +660,7 @@ static void r4k_dma_cache_inv(unsigned long addr, unsigned long size)
                 R4600_HIT_CACHEOP_WAR_IMPL;
                 blast_inv_dcache_range(addr, addr + size);
         }
+        preempt_enable();
 
         bc_inv(addr, size);
         __sync();
@@ -780,20 +786,30 @@ static inline void rm7k_erratum31(void)
 
 static inline void alias_74k_erratum(struct cpuinfo_mips *c)
 {
+        unsigned int imp = c->processor_id & PRID_IMP_MASK;
+        unsigned int rev = c->processor_id & PRID_REV_MASK;
+
         /*
          * Early versions of the 74K do not update the cache tags on a
          * vtag miss/ptag hit which can occur in the case of KSEG0/KUSEG
          * aliases. In this case it is better to treat the cache as always
          * having aliases.
          */
-        if ((c->processor_id & 0xff) <= PRID_REV_ENCODE_332(2, 4, 0))
-                c->dcache.flags |= MIPS_CACHE_VTAG;
-        if ((c->processor_id & 0xff) == PRID_REV_ENCODE_332(2, 4, 0))
-                write_c0_config6(read_c0_config6() | MIPS_CONF6_SYND);
-        if (((c->processor_id & 0xff00) == PRID_IMP_1074K) &&
-            ((c->processor_id & 0xff) <= PRID_REV_ENCODE_332(1, 1, 0))) {
-                c->dcache.flags |= MIPS_CACHE_VTAG;
-                write_c0_config6(read_c0_config6() | MIPS_CONF6_SYND);
+        switch (imp) {
+        case PRID_IMP_74K:
+                if (rev <= PRID_REV_ENCODE_332(2, 4, 0))
+                        c->dcache.flags |= MIPS_CACHE_VTAG;
+                if (rev == PRID_REV_ENCODE_332(2, 4, 0))
+                        write_c0_config6(read_c0_config6() | MIPS_CONF6_SYND);
+                break;
+        case PRID_IMP_1074K:
+                if (rev <= PRID_REV_ENCODE_332(1, 1, 0)) {
+                        c->dcache.flags |= MIPS_CACHE_VTAG;
+                        write_c0_config6(read_c0_config6() | MIPS_CONF6_SYND);
+                }
+                break;
+        default:
+                BUG();
         }
 }
 
@@ -809,7 +825,7 @@ static void probe_pcache(void)
         unsigned long config1;
         unsigned int lsize;
 
-        switch (c->cputype) {
+        switch (current_cpu_type()) {
         case CPU_R4600:                 /* QED style two way caches? */
         case CPU_R4700:
         case CPU_R5000:
@@ -1025,7 +1041,8 @@ static void probe_pcache(void)
          * presumably no vendor is shipping his hardware in the "bad"
          * configuration.
          */
-        if ((prid & 0xff00) == PRID_IMP_R4000 && (prid & 0xff) < 0x40 &&
+        if ((prid & PRID_IMP_MASK) == PRID_IMP_R4000 &&
+            (prid & PRID_REV_MASK) < PRID_REV_R4400 &&
             !(config & CONF_SC) && c->icache.linesz != 16 &&
             PAGE_SIZE <= 0x8000)
                 panic("Improper R4000SC processor configuration detected");
@@ -1045,7 +1062,7 @@ static void probe_pcache(void)
          * normally they'd suffer from aliases but magic in the hardware deals
          * with that for us so we don't need to take care ourselves.
          */
-        switch (c->cputype) {
+        switch (current_cpu_type()) {
         case CPU_20KC:
         case CPU_25KF:
         case CPU_SB1:
@@ -1065,7 +1082,7 @@ static void probe_pcache(void)
         case CPU_34K:
         case CPU_74K:
         case CPU_1004K:
-                if (c->cputype == CPU_74K)
+                if (current_cpu_type() == CPU_74K)
                         alias_74k_erratum(c);
                 if ((read_c0_config7() & (1 << 16))) {
                         /* effectively physically indexed dcache,
@@ -1078,7 +1095,7 @@ static void probe_pcache(void)
                         c->dcache.flags |= MIPS_CACHE_ALIASES;
         }
 
-        switch (c->cputype) {
+        switch (current_cpu_type()) {
         case CPU_20KC:
                 /*
                  * Some older 20Kc chips doesn't have the 'VI' bit in
@@ -1207,7 +1224,7 @@ static void setup_scache(void)
          * processors don't have a S-cache that would be relevant to the
          * Linux memory management.
          */
-        switch (c->cputype) {
+        switch (current_cpu_type()) {
         case CPU_R4000SC:
         case CPU_R4000MC:
         case CPU_R4400SC:
@@ -1384,9 +1401,8 @@ static void r4k_cache_error_setup(void)
 {
         extern char __weak except_vec2_generic;
         extern char __weak except_vec2_sb1;
-        struct cpuinfo_mips *c = &current_cpu_data;
 
-        switch (c->cputype) {
+        switch (current_cpu_type()) {
         case CPU_SB1:
         case CPU_SB1A:
                 set_uncached_handler(0x100, &except_vec2_sb1, 0x80);
diff --git a/arch/mips/mm/dma-default.c b/arch/mips/mm/dma-default.c
index aaccf1c10699..5f8b95512580 100644
--- a/arch/mips/mm/dma-default.c
+++ b/arch/mips/mm/dma-default.c
@@ -18,6 +18,7 @@
 #include <linux/highmem.h>
 
 #include <asm/cache.h>
+#include <asm/cpu-type.h>
 #include <asm/io.h>
 
 #include <dma-coherence.h>
@@ -50,16 +51,20 @@ static inline struct page *dma_addr_to_page(struct device *dev,
 }
 
 /*
+ * The affected CPUs below in 'cpu_needs_post_dma_flush()' can
+ * speculatively fill random cachelines with stale data at any time,
+ * requiring an extra flush post-DMA.
+ *
  * Warning on the terminology - Linux calls an uncached area coherent;
  * MIPS terminology calls memory areas with hardware maintained coherency
  * coherent.
  */
-
-static inline int cpu_is_noncoherent_r10000(struct device *dev)
+static inline int cpu_needs_post_dma_flush(struct device *dev)
 {
         return !plat_device_is_coherent(dev) &&
-               (current_cpu_type() == CPU_R10000 ||
-               current_cpu_type() == CPU_R12000);
+               (boot_cpu_type() == CPU_R10000 ||
+                boot_cpu_type() == CPU_R12000 ||
+                boot_cpu_type() == CPU_BMIPS5000);
 }
 
 static gfp_t massage_gfp_flags(const struct device *dev, gfp_t gfp)
@@ -230,7 +235,7 @@ static inline void __dma_sync(struct page *page,
 static void mips_dma_unmap_page(struct device *dev, dma_addr_t dma_addr,
         size_t size, enum dma_data_direction direction, struct dma_attrs *attrs)
 {
-        if (cpu_is_noncoherent_r10000(dev))
+        if (cpu_needs_post_dma_flush(dev))
                 __dma_sync(dma_addr_to_page(dev, dma_addr),
                            dma_addr & ~PAGE_MASK, size, direction);
 
@@ -284,7 +289,7 @@ static void mips_dma_unmap_sg(struct device *dev, struct scatterlist *sg,
 static void mips_dma_sync_single_for_cpu(struct device *dev,
         dma_addr_t dma_handle, size_t size, enum dma_data_direction direction)
 {
-        if (cpu_is_noncoherent_r10000(dev))
+        if (cpu_needs_post_dma_flush(dev))
                 __dma_sync(dma_addr_to_page(dev, dma_handle),
                            dma_handle & ~PAGE_MASK, size, direction);
 }
@@ -303,12 +308,10 @@ static void mips_dma_sync_sg_for_cpu(struct device *dev,
 {
         int i;
 
-        /* Make sure that gcc doesn't leave the empty loop body.  */
-        for (i = 0; i < nelems; i++, sg++) {
-                if (cpu_is_noncoherent_r10000(dev))
+        if (cpu_needs_post_dma_flush(dev))
+                for (i = 0; i < nelems; i++, sg++)
                         __dma_sync(sg_page(sg), sg->offset, sg->length,
                                    direction);
-        }
 }
 
 static void mips_dma_sync_sg_for_device(struct device *dev,
@@ -316,12 +319,10 @@ static void mips_dma_sync_sg_for_device(struct device *dev,
 {
         int i;
 
-        /* Make sure that gcc doesn't leave the empty loop body.  */
-        for (i = 0; i < nelems; i++, sg++) {
-                if (!plat_device_is_coherent(dev))
+        if (!plat_device_is_coherent(dev))
+                for (i = 0; i < nelems; i++, sg++)
                         __dma_sync(sg_page(sg), sg->offset, sg->length,
                                    direction);
-        }
 }
 
 int mips_dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
diff --git a/arch/mips/mm/fault.c b/arch/mips/mm/fault.c
index 85df1cd8d446..becc42bb1849 100644
--- a/arch/mips/mm/fault.c
+++ b/arch/mips/mm/fault.c
@@ -42,8 +42,7 @@ static void __kprobes __do_page_fault(struct pt_regs *regs, unsigned long write,
         const int field = sizeof(unsigned long) * 2;
         siginfo_t info;
         int fault;
-        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
-                                                 (write ? FAULT_FLAG_WRITE : 0);
+        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
 
 #if 0
         printk("Cpu%d[%s:%d:%0*lx:%ld:%0*lx]\n", raw_smp_processor_id(),
@@ -93,6 +92,8 @@ static void __kprobes __do_page_fault(struct pt_regs *regs, unsigned long write,
         if (in_atomic() || !mm)
                 goto bad_area_nosemaphore;
 
+        if (user_mode(regs))
+                flags |= FAULT_FLAG_USER;
 retry:
         down_read(&mm->mmap_sem);
         vma = find_vma(mm, address);
@@ -114,6 +115,7 @@ good_area:
         if (write) {
                 if (!(vma->vm_flags & VM_WRITE))
                         goto bad_area;
+                flags |= FAULT_FLAG_WRITE;
         } else {
                 if (cpu_has_rixi) {
                         if (address == regs->cp0_epc && !(vma->vm_flags & VM_EXEC)) {
@@ -241,6 +243,8 @@ out_of_memory:
          * (which will retry the fault, or kill us if we got oom-killed).
          */
         up_read(&mm->mmap_sem);
+        if (!user_mode(regs))
+                goto no_context;
         pagefault_out_of_memory();
         return;
 
diff --git a/arch/mips/mm/gup.c b/arch/mips/mm/gup.c
index d4ea5c9c4a93..06ce17c2a905 100644
--- a/arch/mips/mm/gup.c
+++ b/arch/mips/mm/gup.c
@@ -12,6 +12,7 @@
 #include <linux/swap.h>
 #include <linux/hugetlb.h>
 
+#include <asm/cpu-features.h>
 #include <asm/pgtable.h>
 
 static inline pte_t gup_get_pte(pte_t *ptep)
@@ -273,7 +274,7 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
         len = (unsigned long) nr_pages << PAGE_SHIFT;
 
         end = start + len;
-        if (end < start)
+        if (end < start || cpu_has_dc_aliases)
                 goto slow_irqon;
 
         /* XXX: batch / limit 'nr' */
diff --git a/arch/mips/mm/hugetlbpage.c b/arch/mips/mm/hugetlbpage.c
index a7fee0dfb7a9..01fda4419ed0 100644
--- a/arch/mips/mm/hugetlbpage.c
+++ b/arch/mips/mm/hugetlbpage.c
@@ -85,6 +85,11 @@ int pud_huge(pud_t pud)
         return (pud_val(pud) & _PAGE_HUGE) != 0;
 }
 
+int pmd_huge_support(void)
+{
+        return 1;
+}
+
 struct page *
 follow_huge_pmd(struct mm_struct *mm, unsigned long address,
                 pmd_t *pmd, int write)
diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 4e73f10a7519..e205ef598e97 100644
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -254,6 +254,7 @@ void copy_from_user_page(struct vm_area_struct *vma,
                         SetPageDcacheDirty(page);
         }
 }
+EXPORT_SYMBOL_GPL(copy_from_user_page);
 
 void __init fixrange_init(unsigned long start, unsigned long end,
         pgd_t *pgd_base)
diff --git a/arch/mips/mm/page.c b/arch/mips/mm/page.c
index 218c2109a55d..cbd81d17793a 100644
--- a/arch/mips/mm/page.c
+++ b/arch/mips/mm/page.c
@@ -18,6 +18,7 @@
 
 #include <asm/bugs.h>
 #include <asm/cacheops.h>
+#include <asm/cpu-type.h>
 #include <asm/inst.h>
 #include <asm/io.h>
 #include <asm/page.h>
diff --git a/arch/mips/mm/sc-mips.c b/arch/mips/mm/sc-mips.c
index 5d01392e3518..08d05aee8788 100644
--- a/arch/mips/mm/sc-mips.c
+++ b/arch/mips/mm/sc-mips.c
@@ -6,6 +6,7 @@
 #include <linux/sched.h>
 #include <linux/mm.h>
 
+#include <asm/cpu-type.h>
 #include <asm/mipsregs.h>
 #include <asm/bcache.h>
 #include <asm/cacheops.h>
@@ -71,7 +72,7 @@ static inline int mips_sc_is_activated(struct cpuinfo_mips *c)
         unsigned int tmp;
 
         /* Check the bypass bit (L2B) */
-        switch (c->cputype) {
+        switch (current_cpu_type()) {
         case CPU_34K:
         case CPU_74K:
         case CPU_1004K:
diff --git a/arch/mips/mm/tlb-funcs.S b/arch/mips/mm/tlb-funcs.S
index 30a494db99c2..79bca3130bd1 100644
--- a/arch/mips/mm/tlb-funcs.S
+++ b/arch/mips/mm/tlb-funcs.S
@@ -16,10 +16,12 @@
 
 #define FASTPATH_SIZE   128
 
+#ifdef CONFIG_MIPS_PGD_C0_CONTEXT
 LEAF(tlbmiss_handler_setup_pgd)
         .space          16 * 4
 END(tlbmiss_handler_setup_pgd)
 EXPORT(tlbmiss_handler_setup_pgd_end)
+#endif
 
 LEAF(handle_tlbm)
         .space          FASTPATH_SIZE * 4
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
index 00b26a67a06d..bb3a5f643e97 100644
--- a/arch/mips/mm/tlb-r4k.c
+++ b/arch/mips/mm/tlb-r4k.c
@@ -16,6 +16,7 @@
 #include <linux/module.h>
 
 #include <asm/cpu.h>
+#include <asm/cpu-type.h>
 #include <asm/bootinfo.h>
 #include <asm/mmu_context.h>
 #include <asm/pgtable.h>
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 556cb4815770..9bb3a9363b06 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -30,6 +30,7 @@
 #include <linux/cache.h>
 
 #include <asm/cacheflush.h>
+#include <asm/cpu-type.h>
 #include <asm/pgtable.h>
 #include <asm/war.h>
 #include <asm/uasm.h>
@@ -85,6 +86,7 @@ static int use_bbit_insns(void)
         case CPU_CAVIUM_OCTEON:
         case CPU_CAVIUM_OCTEON_PLUS:
         case CPU_CAVIUM_OCTEON2:
+        case CPU_CAVIUM_OCTEON3:
                 return 1;
         default:
                 return 0;
@@ -95,6 +97,7 @@ static int use_lwx_insns(void)
 {
         switch (current_cpu_type()) {
         case CPU_CAVIUM_OCTEON2:
+        case CPU_CAVIUM_OCTEON3:
                 return 1;
         default:
                 return 0;
diff --git a/arch/mips/mti-malta/malta-time.c b/arch/mips/mti-malta/malta-time.c
index 53aad4a35375..a18af5fce67e 100644
--- a/arch/mips/mti-malta/malta-time.c
+++ b/arch/mips/mti-malta/malta-time.c
@@ -27,6 +27,7 @@
 #include <linux/timex.h>
 #include <linux/mc146818rtc.h>
 
+#include <asm/cpu.h>
 #include <asm/mipsregs.h>
 #include <asm/mipsmtregs.h>
 #include <asm/hardirq.h>
@@ -76,7 +77,7 @@ static void __init estimate_frequencies(void)
 #endif
 
 #if defined (CONFIG_KVM_GUEST) && defined (CONFIG_KVM_HOST_FREQ)
-        unsigned int prid = read_c0_prid() & 0xffff00;
+        unsigned int prid = read_c0_prid() & (PRID_COMP_MASK | PRID_IMP_MASK);
 
         /*
          * XXXKYMA: hardwire the CPU frequency to Host Freq/4
@@ -169,7 +170,7 @@ unsigned int get_c0_compare_int(void)
 
 void __init plat_time_init(void)
 {
-        unsigned int prid = read_c0_prid() & 0xffff00;
+        unsigned int prid = read_c0_prid() & (PRID_COMP_MASK | PRID_IMP_MASK);
         unsigned int freq;
 
         estimate_frequencies();
diff --git a/arch/mips/mti-sead3/sead3-time.c b/arch/mips/mti-sead3/sead3-time.c
index a43ea3cc0a3b..552d26c34386 100644
--- a/arch/mips/mti-sead3/sead3-time.c
+++ b/arch/mips/mti-sead3/sead3-time.c
@@ -7,6 +7,7 @@
  */
 #include <linux/init.h>
 
+#include <asm/cpu.h>
 #include <asm/setup.h>
 #include <asm/time.h>
 #include <asm/irq.h>
@@ -34,7 +35,7 @@ static void __iomem *status_reg = (void __iomem *)0xbf000410;
  */
 static unsigned int __init estimate_cpu_frequency(void)
 {
-        unsigned int prid = read_c0_prid() & 0xffff00;
+        unsigned int prid = read_c0_prid() & (PRID_COMP_MASK | PRID_IMP_MASK);
         unsigned int tick = 0;
         unsigned int freq;
         unsigned int orig;
diff --git a/arch/mips/netlogic/Kconfig b/arch/mips/netlogic/Kconfig
index 2447bf97d35a..852a4ee09954 100644
--- a/arch/mips/netlogic/Kconfig
+++ b/arch/mips/netlogic/Kconfig
@@ -19,6 +19,15 @@ config DT_XLP_SVP
           pointer to the kernel.  The corresponding DTS file is at
           arch/mips/netlogic/dts/xlp_svp.dts
 
+config DT_XLP_FVP
+        bool "Built-in device tree for XLP FVP boards"
+        default y
+        help
+          Add an FDT blob for XLP FVP board into the kernel.
+          This DTB will be used if the firmware does not pass in a DTB
+          pointer to the kernel.  The corresponding DTS file is at
+          arch/mips/netlogic/dts/xlp_fvp.dts
+
 config NLM_MULTINODE
         bool "Support for multi-chip boards"
         depends on NLM_XLP_BOARD
diff --git a/arch/mips/netlogic/common/smp.c b/arch/mips/netlogic/common/smp.c
index 4e35d9c453e2..6f8feb9efcff 100644
--- a/arch/mips/netlogic/common/smp.c
+++ b/arch/mips/netlogic/common/smp.c
@@ -106,9 +106,7 @@ void nlm_early_init_secondary(int cpu)
 {
         change_c0_config(CONF_CM_CMASK, 0x3);
 #ifdef CONFIG_CPU_XLP
-        /* mmu init, once per core */
-        if (cpu % NLM_THREADS_PER_CORE == 0)
-                xlp_mmu_init();
+        xlp_mmu_init();
 #endif
         write_c0_ebase(nlm_current_node()->ebase);
 }
diff --git a/arch/mips/netlogic/common/time.c b/arch/mips/netlogic/common/time.c
index 045a396c57ce..13391b8a6031 100644
--- a/arch/mips/netlogic/common/time.c
+++ b/arch/mips/netlogic/common/time.c
@@ -45,6 +45,7 @@
 #if defined(CONFIG_CPU_XLP)
 #include <asm/netlogic/xlp-hal/iomap.h>
 #include <asm/netlogic/xlp-hal/xlp.h>
+#include <asm/netlogic/xlp-hal/sys.h>
 #include <asm/netlogic/xlp-hal/pic.h>
 #elif defined(CONFIG_CPU_XLR)
 #include <asm/netlogic/xlr/iomap.h>
@@ -91,7 +92,7 @@ static void nlm_init_pic_timer(void)
                 csrc_pic.read   = nlm_get_pic_timer;
         }
         csrc_pic.rating = 1000;
-        clocksource_register_hz(&csrc_pic, PIC_CLK_HZ);
+        clocksource_register_hz(&csrc_pic, pic_timer_freq());
 }
 
 void __init plat_time_init(void)
diff --git a/arch/mips/netlogic/dts/Makefile b/arch/mips/netlogic/dts/Makefile
index aecb6fa9a9c3..0b9be5fd2e46 100644
--- a/arch/mips/netlogic/dts/Makefile
+++ b/arch/mips/netlogic/dts/Makefile
@@ -1,2 +1,3 @@
 obj-$(CONFIG_DT_XLP_EVP) := xlp_evp.dtb.o
 obj-$(CONFIG_DT_XLP_SVP) += xlp_svp.dtb.o
+obj-$(CONFIG_DT_XLP_FVP) += xlp_fvp.dtb.o
diff --git a/arch/mips/netlogic/dts/xlp_evp.dts b/arch/mips/netlogic/dts/xlp_evp.dts
index 06407033678e..89ad04808c02 100644
--- a/arch/mips/netlogic/dts/xlp_evp.dts
+++ b/arch/mips/netlogic/dts/xlp_evp.dts
@@ -9,19 +9,12 @@
         #address-cells = <2>;
         #size-cells = <2>;
 
-        memory {
-                device_type = "memory";
-                reg =  <0 0x00100000 0 0x0FF00000       // 255M at 1M
-                        0 0x20000000 0 0xa0000000       // 2560M at 512M
-                        0 0xe0000000 1 0x00000000>;
-        };
-
         soc {
                 #address-cells = <2>;
                 #size-cells = <1>;
                 compatible = "simple-bus";
                 ranges = <0 0  0 0x18000000  0x04000000   // PCIe CFG
-                          1 0  0 0x16000000  0x01000000>; // GBU chipselects
+                          1 0  0 0x16000000  0x02000000>; // GBU chipselects
 
                 serial0: serial@30000 {
                         device_type = "serial";
diff --git a/arch/mips/netlogic/dts/xlp_fvp.dts b/arch/mips/netlogic/dts/xlp_fvp.dts
new file mode 100644
index 000000000000..63e62b7bd758
--- /dev/null
+++ b/arch/mips/netlogic/dts/xlp_fvp.dts
@@ -0,0 +1,118 @@
+/*
+ * XLP2XX Device Tree Source for FVP boards
+ */
+
+/dts-v1/;
+/ {
+        model = "netlogic,XLP-FVP";
+        compatible = "netlogic,xlp";
+        #address-cells = <2>;
+        #size-cells = <2>;
+
+        soc {
+                #address-cells = <2>;
+                #size-cells = <1>;
+                compatible = "simple-bus";
+                ranges = <0 0  0 0x18000000  0x04000000   // PCIe CFG
+                          1 0  0 0x16000000  0x02000000>; // GBU chipselects
+
+                serial0: serial@30000 {
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0 0x30100 0xa00>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clock-frequency = <133333333>;
+                        interrupt-parent = <&pic>;
+                        interrupts = <17>;
+                };
+                serial1: serial@31000 {
+                        device_type = "serial";
+                        compatible = "ns16550";
+                        reg = <0 0x31100 0xa00>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clock-frequency = <133333333>;
+                        interrupt-parent = <&pic>;
+                        interrupts = <18>;
+                };
+                i2c0: ocores@37100 {
+                        compatible = "opencores,i2c-ocores";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0 0x37100 0x20>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clock-frequency = <32000000>;
+                        interrupt-parent = <&pic>;
+                        interrupts = <30>;
+                };
+                i2c1: ocores@37120 {
+                        compatible = "opencores,i2c-ocores";
+                        #address-cells = <1>;
+                        #size-cells = <0>;
+                        reg = <0 0x37120 0x20>;
+                        reg-shift = <2>;
+                        reg-io-width = <4>;
+                        clock-frequency = <32000000>;
+                        interrupt-parent = <&pic>;
+                        interrupts = <31>;
+
+                        rtc@68 {
+                                compatible = "dallas,ds1374";
+                                reg = <0x68>;
+                        };
+
+                        dtt@4c {
+                                compatible = "national,lm90";
+                                reg = <0x4c>;
+                        };
+                };
+                pic: pic@4000 {
+                        compatible = "netlogic,xlp-pic";
+                        #address-cells = <0>;
+                        #interrupt-cells = <1>;
+                        reg = <0 0x4000 0x200>;
+                        interrupt-controller;
+                };
+
+                nor_flash@1,0 {
+                        compatible = "cfi-flash";
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        bank-width = <2>;
+                        reg = <1 0 0x1000000>;
+
+                        partition@0 {
+                                label = "x-loader";
+                                reg = <0x0 0x100000>; /* 1M */
+                                read-only;
+                        };
+
+                        partition@100000 {
+                                label = "u-boot";
+                                reg = <0x100000 0x100000>; /* 1M */
+                        };
+
+                        partition@200000 {
+                                label = "kernel";
+                                reg = <0x200000 0x500000>; /* 5M */
+                        };
+
+                        partition@700000 {
+                                label = "rootfs";
+                                reg = <0x700000 0x800000>; /* 8M */
+                        };
+
+                        partition@f00000 {
+                                label = "env";
+                                reg = <0xf00000 0x100000>; /* 1M */
+                                read-only;
+                        };
+                };
+        };
+
+        chosen {
+                bootargs = "console=ttyS0,115200 rdinit=/sbin/init";
+        };
+};
diff --git a/arch/mips/netlogic/dts/xlp_svp.dts b/arch/mips/netlogic/dts/xlp_svp.dts
index 9c5db102df53..1ebd00edaacc 100644
--- a/arch/mips/netlogic/dts/xlp_svp.dts
+++ b/arch/mips/netlogic/dts/xlp_svp.dts
@@ -9,19 +9,12 @@
         #address-cells = <2>;
         #size-cells = <2>;
 
-        memory {
-                device_type = "memory";
-                reg =  <0 0x00100000 0 0x0FF00000       // 255M at 1M
-                        0 0x20000000 0 0xa0000000       // 2560M at 512M
-                        0 0xe0000000 0 0x40000000>;
-        };
-
         soc {
                 #address-cells = <2>;
                 #size-cells = <1>;
                 compatible = "simple-bus";
                 ranges = <0 0  0 0x18000000  0x04000000   // PCIe CFG
-                          1 0  0 0x16000000  0x01000000>; // GBU chipselects
+                          1 0  0 0x16000000  0x02000000>; // GBU chipselects
 
                 serial0: serial@30000 {
                         device_type = "serial";
diff --git a/arch/mips/netlogic/xlp/Makefile b/arch/mips/netlogic/xlp/Makefile
index 85ac4a892ced..ed9a93c04650 100644
--- a/arch/mips/netlogic/xlp/Makefile
+++ b/arch/mips/netlogic/xlp/Makefile
@@ -1,3 +1,4 @@
 obj-y                           += setup.o nlm_hal.o cop2-ex.o dt.o
 obj-$(CONFIG_SMP)               += wakeup.o
 obj-$(CONFIG_USB)               += usb-init.o
+obj-$(CONFIG_USB)               += usb-init-xlp2.o
diff --git a/arch/mips/netlogic/xlp/dt.c b/arch/mips/netlogic/xlp/dt.c
index a15cdbb8d0bd..88df445dda76 100644
--- a/arch/mips/netlogic/xlp/dt.c
+++ b/arch/mips/netlogic/xlp/dt.c
@@ -39,12 +39,18 @@
 #include <linux/of_platform.h>
 #include <linux/of_device.h>
 
-extern u32 __dtb_xlp_evp_begin[], __dtb_xlp_svp_begin[], __dtb_start[];
+extern u32 __dtb_xlp_evp_begin[], __dtb_xlp_svp_begin[],
+        __dtb_xlp_fvp_begin[], __dtb_start[];
 
 void __init *xlp_dt_init(void *fdtp)
 {
         if (!fdtp) {
                 switch (current_cpu_data.processor_id & 0xff00) {
+#ifdef CONFIG_DT_XLP_FVP
+                case PRID_IMP_NETLOGIC_XLP2XX:
+                        fdtp = __dtb_xlp_fvp_begin;
+                        break;
+#endif
 #ifdef CONFIG_DT_XLP_SVP
                 case PRID_IMP_NETLOGIC_XLP3XX:
                         fdtp = __dtb_xlp_svp_begin;
diff --git a/arch/mips/netlogic/xlp/nlm_hal.c b/arch/mips/netlogic/xlp/nlm_hal.c
index 87560e4db35f..56c50ba43c9b 100644
--- a/arch/mips/netlogic/xlp/nlm_hal.c
+++ b/arch/mips/netlogic/xlp/nlm_hal.c
@@ -44,6 +44,7 @@
 #include <asm/netlogic/haldefs.h>
 #include <asm/netlogic/xlp-hal/iomap.h>
 #include <asm/netlogic/xlp-hal/xlp.h>
+#include <asm/netlogic/xlp-hal/bridge.h>
 #include <asm/netlogic/xlp-hal/pic.h>
 #include <asm/netlogic/xlp-hal/sys.h>
 
@@ -64,6 +65,7 @@ int nlm_irq_to_irt(int irq)
         uint64_t pcibase;
         int devoff, irt;
 
+        devoff = 0;
         switch (irq) {
         case PIC_UART_0_IRQ:
                 devoff = XLP_IO_UART0_OFFSET(0);
@@ -71,44 +73,68 @@ int nlm_irq_to_irt(int irq)
         case PIC_UART_1_IRQ:
                 devoff = XLP_IO_UART1_OFFSET(0);
                 break;
-        case PIC_EHCI_0_IRQ:
-                devoff = XLP_IO_USB_EHCI0_OFFSET(0);
-                break;
-        case PIC_EHCI_1_IRQ:
-                devoff = XLP_IO_USB_EHCI1_OFFSET(0);
-                break;
-        case PIC_OHCI_0_IRQ:
-                devoff = XLP_IO_USB_OHCI0_OFFSET(0);
-                break;
-        case PIC_OHCI_1_IRQ:
-                devoff = XLP_IO_USB_OHCI1_OFFSET(0);
-                break;
-        case PIC_OHCI_2_IRQ:
-                devoff = XLP_IO_USB_OHCI2_OFFSET(0);
-                break;
-        case PIC_OHCI_3_IRQ:
-                devoff = XLP_IO_USB_OHCI3_OFFSET(0);
-                break;
         case PIC_MMC_IRQ:
                 devoff = XLP_IO_SD_OFFSET(0);
                 break;
-        case PIC_I2C_0_IRQ:
-                devoff = XLP_IO_I2C0_OFFSET(0);
-                break;
+        case PIC_I2C_0_IRQ:     /* I2C will be fixed up */
         case PIC_I2C_1_IRQ:
-                devoff = XLP_IO_I2C1_OFFSET(0);
+        case PIC_I2C_2_IRQ:
+        case PIC_I2C_3_IRQ:
+                if (cpu_is_xlpii())
+                        devoff = XLP2XX_IO_I2C_OFFSET(0);
+                else
+                        devoff = XLP_IO_I2C0_OFFSET(0);
                 break;
         default:
-                devoff = 0;
-                break;
+                if (cpu_is_xlpii()) {
+                        switch (irq) {
+                                /* XLP2XX has three XHCI USB controller */
+                        case PIC_2XX_XHCI_0_IRQ:
+                                devoff = XLP2XX_IO_USB_XHCI0_OFFSET(0);
+                                break;
+                        case PIC_2XX_XHCI_1_IRQ:
+                                devoff = XLP2XX_IO_USB_XHCI1_OFFSET(0);
+                                break;
+                        case PIC_2XX_XHCI_2_IRQ:
+                                devoff = XLP2XX_IO_USB_XHCI2_OFFSET(0);
+                                break;
+                        }
+                } else {
+                        switch (irq) {
+                        case PIC_EHCI_0_IRQ:
+                                devoff = XLP_IO_USB_EHCI0_OFFSET(0);
+                                break;
+                        case PIC_EHCI_1_IRQ:
+                                devoff = XLP_IO_USB_EHCI1_OFFSET(0);
+                                break;
+                        case PIC_OHCI_0_IRQ:
+                                devoff = XLP_IO_USB_OHCI0_OFFSET(0);
+                                break;
+                        case PIC_OHCI_1_IRQ:
+                                devoff = XLP_IO_USB_OHCI1_OFFSET(0);
+                                break;
+                        case PIC_OHCI_2_IRQ:
+                                devoff = XLP_IO_USB_OHCI2_OFFSET(0);
+                                break;
+                        case PIC_OHCI_3_IRQ:
+                                devoff = XLP_IO_USB_OHCI3_OFFSET(0);
+                                break;
+                        }
+                }
         }
 
         if (devoff != 0) {
                 pcibase = nlm_pcicfg_base(devoff);
                 irt = nlm_read_reg(pcibase, XLP_PCI_IRTINFO_REG) & 0xffff;
-                /* HW bug, I2C 1 irt entry is off by one */
-                if (irq == PIC_I2C_1_IRQ)
-                        irt = irt + 1;
+                /* HW weirdness, I2C IRT entry has to be fixed up */
+                switch (irq) {
+                case PIC_I2C_1_IRQ:
+                        irt = irt + 1; break;
+                case PIC_I2C_2_IRQ:
+                        irt = irt + 2; break;
+                case PIC_I2C_3_IRQ:
+                        irt = irt + 3; break;
+                }
         } else if (irq >= PIC_PCIE_LINK_0_IRQ && irq <= PIC_PCIE_LINK_3_IRQ) {
                 /* HW bug, PCI IRT entries are bad on early silicon, fix */
                 irt = PIC_IRT_PCIE_LINK_INDEX(irq - PIC_PCIE_LINK_0_IRQ);
@@ -126,19 +152,160 @@ unsigned int nlm_get_core_frequency(int node, int core)
 
         sysbase = nlm_get_node(node)->sysbase;
         rstval = nlm_read_sys_reg(sysbase, SYS_POWER_ON_RESET_CFG);
-        dfsval = nlm_read_sys_reg(sysbase, SYS_CORE_DFS_DIV_VALUE);
-        pll_divf = ((rstval >> 10) & 0x7f) + 1;
-        pll_divr = ((rstval >> 8)  & 0x3) + 1;
-        ext_div  = ((rstval >> 30) & 0x3) + 1;
-        dfs_div  = ((dfsval >> (core * 4)) & 0xf) + 1;
-
-        num = 800000000ULL * pll_divf;
-        denom = 3 * pll_divr * ext_div * dfs_div;
+        if (cpu_is_xlpii()) {
+                num = 1000000ULL * (400 * 3 + 100 * (rstval >> 26));
+                denom = 3;
+        } else {
+                dfsval = nlm_read_sys_reg(sysbase, SYS_CORE_DFS_DIV_VALUE);
+                pll_divf = ((rstval >> 10) & 0x7f) + 1;
+                pll_divr = ((rstval >> 8)  & 0x3) + 1;
+                ext_div  = ((rstval >> 30) & 0x3) + 1;
+                dfs_div  = ((dfsval >> (core * 4)) & 0xf) + 1;
+
+                num = 800000000ULL * pll_divf;
+                denom = 3 * pll_divr * ext_div * dfs_div;
+        }
         do_div(num, denom);
         return (unsigned int)num;
 }
 
+/* Calculate Frequency to the PIC from PLL.
+ * freq_out = ( ref_freq/2 * (6 + ctrl2[7:0]) + ctrl2[20:8]/2^13 ) /
+ * ((2^ctrl0[7:5]) * Table(ctrl0[26:24]))
+ */
+static unsigned int nlm_2xx_get_pic_frequency(int node)
+{
+        u32 ctrl_val0, ctrl_val2, vco_post_div, pll_post_div;
+        u32 mdiv, fdiv, pll_out_freq_den, reg_select, ref_div, pic_div;
+        u64 ref_clk, sysbase, pll_out_freq_num, ref_clk_select;
+
+        sysbase = nlm_get_node(node)->sysbase;
+
+        /* Find ref_clk_base */
+        ref_clk_select =
+                (nlm_read_sys_reg(sysbase, SYS_POWER_ON_RESET_CFG) >> 18) & 0x3;
+        switch (ref_clk_select) {
+        case 0:
+                ref_clk = 200000000ULL;
+                ref_div = 3;
+                break;
+        case 1:
+                ref_clk = 100000000ULL;
+                ref_div = 1;
+                break;
+        case 2:
+                ref_clk = 125000000ULL;
+                ref_div = 1;
+                break;
+        case 3:
+                ref_clk = 400000000ULL;
+                ref_div = 3;
+                break;
+        }
+
+        /* Find the clock source PLL device for PIC */
+        reg_select = (nlm_read_sys_reg(sysbase, SYS_CLK_DEV_SEL) >> 22) & 0x3;
+        switch (reg_select) {
+        case 0:
+                ctrl_val0 = nlm_read_sys_reg(sysbase, SYS_PLL_CTRL0);
+                ctrl_val2 = nlm_read_sys_reg(sysbase, SYS_PLL_CTRL2);
+                break;
+        case 1:
+                ctrl_val0 = nlm_read_sys_reg(sysbase, SYS_PLL_CTRL0_DEVX(0));
+                ctrl_val2 = nlm_read_sys_reg(sysbase, SYS_PLL_CTRL2_DEVX(0));
+                break;
+        case 2:
+                ctrl_val0 = nlm_read_sys_reg(sysbase, SYS_PLL_CTRL0_DEVX(1));
+                ctrl_val2 = nlm_read_sys_reg(sysbase, SYS_PLL_CTRL2_DEVX(1));
+                break;
+        case 3:
+                ctrl_val0 = nlm_read_sys_reg(sysbase, SYS_PLL_CTRL0_DEVX(2));
+                ctrl_val2 = nlm_read_sys_reg(sysbase, SYS_PLL_CTRL2_DEVX(2));
+                break;
+        }
+
+        vco_post_div = (ctrl_val0 >> 5) & 0x7;
+        pll_post_div = (ctrl_val0 >> 24) & 0x7;
+        mdiv = ctrl_val2 & 0xff;
+        fdiv = (ctrl_val2 >> 8) & 0xfff;
+
+        /* Find PLL post divider value */
+        switch (pll_post_div) {
+        case 1:
+                pll_post_div = 2;
+                break;
+        case 3:
+                pll_post_div = 4;
+                break;
+        case 7:
+                pll_post_div = 8;
+                break;
+        case 6:
+                pll_post_div = 16;
+                break;
+        case 0:
+        default:
+                pll_post_div = 1;
+                break;
+        }
+
+        fdiv = fdiv/(1 << 13);
+        pll_out_freq_num = ((ref_clk >> 1) * (6 + mdiv)) + fdiv;
+        pll_out_freq_den = (1 << vco_post_div) * pll_post_div * 3;
+
+        if (pll_out_freq_den > 0)
+                do_div(pll_out_freq_num, pll_out_freq_den);
+
+        /* PIC post divider, which happens after PLL */
+        pic_div = (nlm_read_sys_reg(sysbase, SYS_CLK_DEV_DIV) >> 22) & 0x3;
+        do_div(pll_out_freq_num, 1 << pic_div);
+
+        return pll_out_freq_num;
+}
+
+unsigned int nlm_get_pic_frequency(int node)
+{
+        if (cpu_is_xlpii())
+                return nlm_2xx_get_pic_frequency(node);
+        else
+                return 133333333;
+}
+
 unsigned int nlm_get_cpu_frequency(void)
 {
         return nlm_get_core_frequency(0, 0);
 }
+
+/*
+ * Fills upto 8 pairs of entries containing the DRAM map of a node
+ * if n < 0, get dram map for all nodes
+ */
+int xlp_get_dram_map(int n, uint64_t *dram_map)
+{
+        uint64_t bridgebase, base, lim;
+        uint32_t val;
+        int i, node, rv;
+
+        /* Look only at mapping on Node 0, we don't handle crazy configs */
+        bridgebase = nlm_get_bridge_regbase(0);
+        rv = 0;
+        for (i = 0; i < 8; i++) {
+                val = nlm_read_bridge_reg(bridgebase,
+                                        BRIDGE_DRAM_NODE_TRANSLN(i));
+                node = (val >> 1) & 0x3;
+                if (n >= 0 && n != node)
+                        continue;
+                val = nlm_read_bridge_reg(bridgebase, BRIDGE_DRAM_BAR(i));
+                val = (val >>  12) & 0xfffff;
+                base = (uint64_t) val << 20;
+                val = nlm_read_bridge_reg(bridgebase, BRIDGE_DRAM_LIMIT(i));
+                val = (val >>  12) & 0xfffff;
+                if (val == 0)   /* BAR not used */
+                        continue;
+                lim = ((uint64_t)val + 1) << 20;
+                dram_map[rv] = base;
+                dram_map[rv + 1] = lim;
+                rv += 2;
+        }
+        return rv;
+}
diff --git a/arch/mips/netlogic/xlp/setup.c b/arch/mips/netlogic/xlp/setup.c
index 7b638f7be491..76a7131e486e 100644
--- a/arch/mips/netlogic/xlp/setup.c
+++ b/arch/mips/netlogic/xlp/setup.c
@@ -73,6 +73,23 @@ static void nlm_fixup_mem(void)
         }
 }
 
+static void __init xlp_init_mem_from_bars(void)
+{
+        uint64_t map[16];
+        int i, n;
+
+        n = xlp_get_dram_map(-1, map);  /* -1: info for all nodes */
+        for (i = 0; i < n; i += 2) {
+                /* exclude 0x1000_0000-0x2000_0000, u-boot device */
+                if (map[i] <= 0x10000000 && map[i+1] > 0x10000000)
+                        map[i+1] = 0x10000000;
+                if (map[i] > 0x10000000 && map[i] < 0x20000000)
+                        map[i] = 0x20000000;
+
+                add_memory_region(map[i], map[i+1] - map[i], BOOT_MEM_RAM);
+        }
+}
+
 void __init plat_mem_setup(void)
 {
         panic_timeout   = 5;
@@ -82,12 +99,23 @@ void __init plat_mem_setup(void)
 
         /* memory and bootargs from DT */
         early_init_devtree(initial_boot_params);
+
+        if (boot_mem_map.nr_map == 0) {
+                pr_info("Using DRAM BARs for memory map.\n");
+                xlp_init_mem_from_bars();
+        }
+        /* Calculate and setup wired entries for mapped kernel */
         nlm_fixup_mem();
 }
 
 const char *get_system_type(void)
 {
-        return "Netlogic XLP Series";
+        switch (read_c0_prid() & 0xff00) {
+        case PRID_IMP_NETLOGIC_XLP2XX:
+                return "Broadcom XLPII Series";
+        default:
+                return "Netlogic XLP Series";
+        }
 }
 
 void __init prom_free_prom_memory(void)
@@ -97,12 +125,20 @@ void __init prom_free_prom_memory(void)
 
 void xlp_mmu_init(void)
 {
-        /* enable extended TLB and Large Fixed TLB */
-        write_c0_config6(read_c0_config6() | 0x24);
-
-        /* set page mask of Fixed TLB in config7 */
-        write_c0_config7(PM_DEFAULT_MASK >>
-                (13 + (ffz(PM_DEFAULT_MASK >> 13) / 2)));
+        u32 conf4;
+
+        if (cpu_is_xlpii()) {
+                /* XLPII series has extended pagesize in config 4 */
+                conf4 = read_c0_config4() & ~0x1f00u;
+                write_c0_config4(conf4 | ((PAGE_SHIFT - 10) / 2 << 8));
+        } else {
+                /* enable extended TLB and Large Fixed TLB */
+                write_c0_config6(read_c0_config6() | 0x24);
+
+                /* set page mask of extended Fixed TLB in config7 */
+                write_c0_config7(PM_DEFAULT_MASK >>
+                        (13 + (ffz(PM_DEFAULT_MASK >> 13) / 2)));
+        }
 }
 
 void nlm_percpu_init(int hwcpuid)
diff --git a/arch/mips/netlogic/xlp/usb-init-xlp2.c b/arch/mips/netlogic/xlp/usb-init-xlp2.c
new file mode 100644
index 000000000000..36e9c22afc46
--- /dev/null
+++ b/arch/mips/netlogic/xlp/usb-init-xlp2.c
@@ -0,0 +1,218 @@
+/*
+ * Copyright (c) 2003-2013 Broadcom Corporation
+ * All Rights Reserved
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the Broadcom
+ * license below:
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY BROADCOM ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL BROADCOM OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+ * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <linux/dma-mapping.h>
+#include <linux/kernel.h>
+#include <linux/delay.h>
+#include <linux/init.h>
+#include <linux/pci.h>
+#include <linux/platform_device.h>
+#include <linux/irq.h>
+
+#include <asm/netlogic/common.h>
+#include <asm/netlogic/haldefs.h>
+#include <asm/netlogic/xlp-hal/iomap.h>
+#include <asm/netlogic/xlp-hal/xlp.h>
+
+#define XLPII_USB3_CTL_0                0xc0
+#define XLPII_VAUXRST                   BIT(0)
+#define XLPII_VCCRST                    BIT(1)
+#define XLPII_NUM2PORT                  9
+#define XLPII_NUM3PORT                  13
+#define XLPII_RTUNEREQ                  BIT(20)
+#define XLPII_MS_CSYSREQ                BIT(21)
+#define XLPII_XS_CSYSREQ                BIT(22)
+#define XLPII_RETENABLEN                BIT(23)
+#define XLPII_TX2RX                     BIT(24)
+#define XLPII_XHCIREV                   BIT(25)
+#define XLPII_ECCDIS                    BIT(26)
+
+#define XLPII_USB3_INT_REG              0xc2
+#define XLPII_USB3_INT_MASK             0xc3
+
+#define XLPII_USB_PHY_TEST              0xc6
+#define XLPII_PRESET                    BIT(0)
+#define XLPII_ATERESET                  BIT(1)
+#define XLPII_LOOPEN                    BIT(2)
+#define XLPII_TESTPDHSP                 BIT(3)
+#define XLPII_TESTPDSSP                 BIT(4)
+#define XLPII_TESTBURNIN                BIT(5)
+
+#define XLPII_USB_PHY_LOS_LV            0xc9
+#define XLPII_LOSLEV                    0
+#define XLPII_LOSBIAS                   5
+#define XLPII_SQRXTX                    8
+#define XLPII_TXBOOST                   11
+#define XLPII_RSLKSEL                   16
+#define XLPII_FSEL                      20
+
+#define XLPII_USB_RFCLK_REG             0xcc
+#define XLPII_VVLD                      30
+
+#define nlm_read_usb_reg(b, r)          nlm_read_reg(b, r)
+#define nlm_write_usb_reg(b, r, v)      nlm_write_reg(b, r, v)
+
+#define nlm_xlpii_get_usb_pcibase(node, inst)           \
+        nlm_pcicfg_base(XLP2XX_IO_USB_OFFSET(node, inst))
+#define nlm_xlpii_get_usb_regbase(node, inst)           \
+        (nlm_xlpii_get_usb_pcibase(node, inst) + XLP_IO_PCI_HDRSZ)
+
+static void xlpii_usb_ack(struct irq_data *data)
+{
+        u64 port_addr;
+
+        switch (data->irq) {
+        case PIC_2XX_XHCI_0_IRQ:
+                port_addr = nlm_xlpii_get_usb_regbase(0, 1);
+                break;
+        case PIC_2XX_XHCI_1_IRQ:
+                port_addr = nlm_xlpii_get_usb_regbase(0, 2);
+                break;
+        case PIC_2XX_XHCI_2_IRQ:
+                port_addr = nlm_xlpii_get_usb_regbase(0, 3);
+                break;
+        default:
+                pr_err("No matching USB irq!\n");
+                return;
+        }
+        nlm_write_usb_reg(port_addr, XLPII_USB3_INT_REG, 0xffffffff);
+}
+
+static void nlm_xlpii_usb_hw_reset(int node, int port)
+{
+        u64 port_addr, xhci_base, pci_base;
+        void __iomem *corebase;
+        u32 val;
+
+        port_addr = nlm_xlpii_get_usb_regbase(node, port);
+
+        /* Set frequency */
+        val = nlm_read_usb_reg(port_addr, XLPII_USB_PHY_LOS_LV);
+        val &= ~(0x3f << XLPII_FSEL);
+        val |= (0x27 << XLPII_FSEL);
+        nlm_write_usb_reg(port_addr, XLPII_USB_PHY_LOS_LV, val);
+
+        val = nlm_read_usb_reg(port_addr, XLPII_USB_RFCLK_REG);
+        val |= (1 << XLPII_VVLD);
+        nlm_write_usb_reg(port_addr, XLPII_USB_RFCLK_REG, val);
+
+        /* PHY reset */
+        val = nlm_read_usb_reg(port_addr, XLPII_USB_PHY_TEST);
+        val &= (XLPII_ATERESET | XLPII_LOOPEN | XLPII_TESTPDHSP
+                | XLPII_TESTPDSSP | XLPII_TESTBURNIN);
+        nlm_write_usb_reg(port_addr, XLPII_USB_PHY_TEST, val);
+
+        /* Setup control register */
+        val =  XLPII_VAUXRST | XLPII_VCCRST | (1 << XLPII_NUM2PORT)
+                | (1 << XLPII_NUM3PORT) | XLPII_MS_CSYSREQ | XLPII_XS_CSYSREQ
+                | XLPII_RETENABLEN | XLPII_XHCIREV;
+        nlm_write_usb_reg(port_addr, XLPII_USB3_CTL_0, val);
+
+        /* Enable interrupts */
+        nlm_write_usb_reg(port_addr, XLPII_USB3_INT_MASK, 0x00000001);
+
+        /* Clear all interrupts */
+        nlm_write_usb_reg(port_addr, XLPII_USB3_INT_REG, 0xffffffff);
+
+        udelay(2000);
+
+        /* XHCI configuration at PCI mem */
+        pci_base = nlm_xlpii_get_usb_pcibase(node, port);
+        xhci_base = nlm_read_usb_reg(pci_base, 0x4) & ~0xf;
+        corebase = ioremap(xhci_base, 0x10000);
+        if (!corebase)
+                return;
+
+        writel(0x240002, corebase + 0xc2c0);
+        /* GCTL 0xc110 */
+        val = readl(corebase + 0xc110);
+        val &= ~(0x3 << 12);
+        val |= (1 << 12);
+        writel(val, corebase + 0xc110);
+        udelay(100);
+
+        /* PHYCFG 0xc200 */
+        val = readl(corebase + 0xc200);
+        val &= ~(1 << 6);
+        writel(val, corebase + 0xc200);
+        udelay(100);
+
+        /* PIPECTL 0xc2c0 */
+        val = readl(corebase + 0xc2c0);
+        val &= ~(1 << 17);
+        writel(val, corebase + 0xc2c0);
+
+        iounmap(corebase);
+}
+
+static int __init nlm_platform_xlpii_usb_init(void)
+{
+        if (!cpu_is_xlpii())
+                return 0;
+
+        pr_info("Initializing 2XX USB Interface\n");
+        nlm_xlpii_usb_hw_reset(0, 1);
+        nlm_xlpii_usb_hw_reset(0, 2);
+        nlm_xlpii_usb_hw_reset(0, 3);
+        nlm_set_pic_extra_ack(0, PIC_2XX_XHCI_0_IRQ, xlpii_usb_ack);
+        nlm_set_pic_extra_ack(0, PIC_2XX_XHCI_1_IRQ, xlpii_usb_ack);
+        nlm_set_pic_extra_ack(0, PIC_2XX_XHCI_2_IRQ, xlpii_usb_ack);
+
+        return 0;
+}
+
+arch_initcall(nlm_platform_xlpii_usb_init);
+
+static u64 xlp_usb_dmamask = ~(u32)0;
+
+/* Fixup IRQ for USB devices on XLP the SoC PCIe bus */
+static void nlm_usb_fixup_final(struct pci_dev *dev)
+{
+        dev->dev.dma_mask               = &xlp_usb_dmamask;
+        dev->dev.coherent_dma_mask      = DMA_BIT_MASK(32);
+        switch (dev->devfn) {
+        case 0x21:
+                dev->irq = PIC_2XX_XHCI_0_IRQ;
+                break;
+        case 0x22:
+                dev->irq = PIC_2XX_XHCI_1_IRQ;
+                break;
+        case 0x23:
+                dev->irq = PIC_2XX_XHCI_2_IRQ;
+                break;
+        }
+}
+
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_NETLOGIC, PCI_DEVICE_ID_NLM_XHCI,
+                nlm_usb_fixup_final);
diff --git a/arch/mips/netlogic/xlp/usb-init.c b/arch/mips/netlogic/xlp/usb-init.c
index ef3897ef0dc7..f8117985f0f8 100644
--- a/arch/mips/netlogic/xlp/usb-init.c
+++ b/arch/mips/netlogic/xlp/usb-init.c
@@ -75,8 +75,7 @@ static void nlm_usb_intr_en(int node, int port)
         port_addr = nlm_get_usb_regbase(node, port);
         val = nlm_read_usb_reg(port_addr, USB_INT_EN);
         val = USB_CTRL_INTERRUPT_EN  | USB_OHCI_INTERRUPT_EN |
-                USB_OHCI_INTERRUPT1_EN | USB_CTRL_INTERRUPT_EN  |
-                USB_OHCI_INTERRUPT_EN | USB_OHCI_INTERRUPT2_EN;
+                USB_OHCI_INTERRUPT1_EN | USB_OHCI_INTERRUPT2_EN;
         nlm_write_usb_reg(port_addr, USB_INT_EN, val);
 }
 
@@ -100,6 +99,9 @@ static void nlm_usb_hw_reset(int node, int port)
 
 static int __init nlm_platform_usb_init(void)
 {
+        if (cpu_is_xlpii())
+                return 0;
+
         pr_info("Initializing USB Interface\n");
         nlm_usb_hw_reset(0, 0);
         nlm_usb_hw_reset(0, 3);
diff --git a/arch/mips/netlogic/xlp/wakeup.c b/arch/mips/netlogic/xlp/wakeup.c
index 0cce37cbffef..682d5638dc01 100644
--- a/arch/mips/netlogic/xlp/wakeup.c
+++ b/arch/mips/netlogic/xlp/wakeup.c
@@ -58,10 +58,12 @@ static int xlp_wakeup_core(uint64_t sysbase, int node, int core)
 
         coremask = (1 << core);
 
-        /* Enable CPU clock */
-        value = nlm_read_sys_reg(sysbase, SYS_CORE_DFS_DIS_CTRL);
-        value &= ~coremask;
-        nlm_write_sys_reg(sysbase, SYS_CORE_DFS_DIS_CTRL, value);
+        /* Enable CPU clock in case of 8xx/3xx */
+        if (!cpu_is_xlpii()) {
+                value = nlm_read_sys_reg(sysbase, SYS_CORE_DFS_DIS_CTRL);
+                value &= ~coremask;
+                nlm_write_sys_reg(sysbase, SYS_CORE_DFS_DIS_CTRL, value);
+        }
 
         /* Remove CPU Reset */
         value = nlm_read_sys_reg(sysbase, SYS_CPU_RESET);
diff --git a/arch/mips/netlogic/xlr/fmn-config.c b/arch/mips/netlogic/xlr/fmn-config.c
index ed3bf0e3f309..c7622c6e5f67 100644
--- a/arch/mips/netlogic/xlr/fmn-config.c
+++ b/arch/mips/netlogic/xlr/fmn-config.c
@@ -36,6 +36,7 @@
 #include <linux/irq.h>
 #include <linux/interrupt.h>
 
+#include <asm/cpu.h>
 #include <asm/mipsregs.h>
 #include <asm/netlogic/xlr/fmn.h>
 #include <asm/netlogic/xlr/xlr.h>
@@ -187,7 +188,7 @@ void xlr_board_info_setup(void)
         int processor_id, num_core;
 
         num_core = hweight32(nlm_current_node()->coremask);
-        processor_id = read_c0_prid() & 0xff00;
+        processor_id = read_c0_prid() & PRID_IMP_MASK;
 
         setup_cpu_fmninfo(cpu, num_core);
         switch (processor_id) {
diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c
index af763e838fdd..4d1736fc1955 100644
--- a/arch/mips/oprofile/common.c
+++ b/arch/mips/oprofile/common.c
@@ -12,6 +12,7 @@
 #include <linux/oprofile.h>
 #include <linux/smp.h>
 #include <asm/cpu-info.h>
+#include <asm/cpu-type.h>
 
 #include "op_impl.h"
 
@@ -33,7 +34,7 @@ static int op_mips_setup(void)
         return 0;
 }
 
-static int op_mips_create_files(struct super_block *sb, struct dentry *root)
+static int op_mips_create_files(struct dentry *root)
 {
         int i;
 
@@ -42,16 +43,16 @@ static int op_mips_create_files(struct super_block *sb, struct dentry *root)
                 char buf[4];
 
                 snprintf(buf, sizeof buf, "%d", i);
-                dir = oprofilefs_mkdir(sb, root, buf);
-
-                oprofilefs_create_ulong(sb, dir, "enabled", &ctr[i].enabled);
-                oprofilefs_create_ulong(sb, dir, "event", &ctr[i].event);
-                oprofilefs_create_ulong(sb, dir, "count", &ctr[i].count);
-                oprofilefs_create_ulong(sb, dir, "kernel", &ctr[i].kernel);
-                oprofilefs_create_ulong(sb, dir, "user", &ctr[i].user);
-                oprofilefs_create_ulong(sb, dir, "exl", &ctr[i].exl);
+                dir = oprofilefs_mkdir(root, buf);
+
+                oprofilefs_create_ulong(dir, "enabled", &ctr[i].enabled);
+                oprofilefs_create_ulong(dir, "event", &ctr[i].event);
+                oprofilefs_create_ulong(dir, "count", &ctr[i].count);
+                oprofilefs_create_ulong(dir, "kernel", &ctr[i].kernel);
+                oprofilefs_create_ulong(dir, "user", &ctr[i].user);
+                oprofilefs_create_ulong(dir, "exl", &ctr[i].exl);
                 /* Dummy.  */
-                oprofilefs_create_ulong(sb, dir, "unit_mask", &ctr[i].unit_mask);
+                oprofilefs_create_ulong(dir, "unit_mask", &ctr[i].unit_mask);
         }
 
         return 0;
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index c382042911dd..719e4557e22e 100644
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
@@ -41,6 +41,7 @@ obj-$(CONFIG_SIBYTE_BCM1x80)	+= pci-bcm1480.o pci-bcm1480ht.o
 obj-$(CONFIG_SNI_RM)            += fixup-sni.o ops-sni.o
 obj-$(CONFIG_LANTIQ)            += fixup-lantiq.o
 obj-$(CONFIG_PCI_LANTIQ)        += pci-lantiq.o ops-lantiq.o
+obj-$(CONFIG_SOC_RT3883)        += pci-rt3883.o
 obj-$(CONFIG_TANBAC_TB0219)     += fixup-tb0219.o
 obj-$(CONFIG_TANBAC_TB0226)     += fixup-tb0226.o
 obj-$(CONFIG_TANBAC_TB0287)     += fixup-tb0287.o
diff --git a/arch/mips/pci/pci-bcm1480.c b/arch/mips/pci/pci-bcm1480.c
index 44dd5aa2e36f..5ec2a7bae02c 100644
--- a/arch/mips/pci/pci-bcm1480.c
+++ b/arch/mips/pci/pci-bcm1480.c
@@ -39,6 +39,7 @@
 #include <linux/mm.h>
 #include <linux/console.h>
 #include <linux/tty.h>
+#include <linux/vt.h>
 
 #include <asm/sibyte/bcm1480_regs.h>
 #include <asm/sibyte/bcm1480_scd.h>
diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c
index 95c2ea815cac..59cccd95688b 100644
--- a/arch/mips/pci/pci-octeon.c
+++ b/arch/mips/pci/pci-octeon.c
@@ -586,15 +586,16 @@ static int __init octeon_pci_setup(void)
         else
                 octeon_dma_bar_type = OCTEON_DMA_BAR_TYPE_BIG;
 
-        /* PCI I/O and PCI MEM values */
-        set_io_port_base(OCTEON_PCI_IOSPACE_BASE);
-        ioport_resource.start = 0;
-        ioport_resource.end = OCTEON_PCI_IOSPACE_SIZE - 1;
         if (!octeon_is_pci_host()) {
                 pr_notice("Not in host mode, PCI Controller not initialized\n");
                 return 0;
         }
 
+        /* PCI I/O and PCI MEM values */
+        set_io_port_base(OCTEON_PCI_IOSPACE_BASE);
+        ioport_resource.start = 0;
+        ioport_resource.end = OCTEON_PCI_IOSPACE_SIZE - 1;
+
         pr_notice("%s Octeon big bar support\n",
                   (octeon_dma_bar_type ==
                   OCTEON_DMA_BAR_TYPE_BIG) ? "Enabling" : "Disabling");
diff --git a/arch/mips/pci/pci-rt3883.c b/arch/mips/pci/pci-rt3883.c
new file mode 100644
index 000000000000..95c9d41382e7
--- /dev/null
+++ b/arch/mips/pci/pci-rt3883.c
@@ -0,0 +1,636 @@
+/*
+ *  Ralink RT3662/RT3883 SoC PCI support
+ *
+ *  Copyright (C) 2011-2013 Gabor Juhos <juhosg@openwrt.org>
+ *
+ *  Parts of this file are based on Ralink's 2.6.21 BSP
+ *
+ *  This program is free software; you can redistribute it and/or modify it
+ *  under the terms of the GNU General Public License version 2 as published
+ *  by the Free Software Foundation.
+ */
+
+#include <linux/types.h>
+#include <linux/pci.h>
+#include <linux/io.h>
+#include <linux/init.h>
+#include <linux/delay.h>
+#include <linux/interrupt.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_irq.h>
+#include <linux/of_pci.h>
+#include <linux/platform_device.h>
+
+#include <asm/mach-ralink/rt3883.h>
+#include <asm/mach-ralink/ralink_regs.h>
+
+#define RT3883_MEMORY_BASE              0x00000000
+#define RT3883_MEMORY_SIZE              0x02000000
+
+#define RT3883_PCI_REG_PCICFG           0x00
+#define   RT3883_PCICFG_P2P_BR_DEVNUM_M 0xf
+#define   RT3883_PCICFG_P2P_BR_DEVNUM_S 16
+#define   RT3883_PCICFG_PCIRST          BIT(1)
+#define RT3883_PCI_REG_PCIRAW           0x04
+#define RT3883_PCI_REG_PCIINT           0x08
+#define RT3883_PCI_REG_PCIENA           0x0c
+
+#define RT3883_PCI_REG_CFGADDR          0x20
+#define RT3883_PCI_REG_CFGDATA          0x24
+#define RT3883_PCI_REG_MEMBASE          0x28
+#define RT3883_PCI_REG_IOBASE           0x2c
+#define RT3883_PCI_REG_ARBCTL           0x80
+
+#define RT3883_PCI_REG_BASE(_x)         (0x1000 + (_x) * 0x1000)
+#define RT3883_PCI_REG_BAR0SETUP(_x)    (RT3883_PCI_REG_BASE((_x)) + 0x10)
+#define RT3883_PCI_REG_IMBASEBAR0(_x)   (RT3883_PCI_REG_BASE((_x)) + 0x18)
+#define RT3883_PCI_REG_ID(_x)           (RT3883_PCI_REG_BASE((_x)) + 0x30)
+#define RT3883_PCI_REG_CLASS(_x)        (RT3883_PCI_REG_BASE((_x)) + 0x34)
+#define RT3883_PCI_REG_SUBID(_x)        (RT3883_PCI_REG_BASE((_x)) + 0x38)
+#define RT3883_PCI_REG_STATUS(_x)       (RT3883_PCI_REG_BASE((_x)) + 0x50)
+
+#define RT3883_PCI_MODE_NONE    0
+#define RT3883_PCI_MODE_PCI     BIT(0)
+#define RT3883_PCI_MODE_PCIE    BIT(1)
+#define RT3883_PCI_MODE_BOTH    (RT3883_PCI_MODE_PCI | RT3883_PCI_MODE_PCIE)
+
+#define RT3883_PCI_IRQ_COUNT    32
+
+#define RT3883_P2P_BR_DEVNUM    1
+
+struct rt3883_pci_controller {
+        void __iomem *base;
+        spinlock_t lock;
+
+        struct device_node *intc_of_node;
+        struct irq_domain *irq_domain;
+
+        struct pci_controller pci_controller;
+        struct resource io_res;
+        struct resource mem_res;
+
+        bool pcie_ready;
+};
+
+static inline struct rt3883_pci_controller *
+pci_bus_to_rt3883_controller(struct pci_bus *bus)
+{
+        struct pci_controller *hose;
+
+        hose = (struct pci_controller *) bus->sysdata;
+        return container_of(hose, struct rt3883_pci_controller, pci_controller);
+}
+
+static inline u32 rt3883_pci_r32(struct rt3883_pci_controller *rpc,
+                                 unsigned reg)
+{
+        return ioread32(rpc->base + reg);
+}
+
+static inline void rt3883_pci_w32(struct rt3883_pci_controller *rpc,
+                                  u32 val, unsigned reg)
+{
+        iowrite32(val, rpc->base + reg);
+}
+
+static inline u32 rt3883_pci_get_cfgaddr(unsigned int bus, unsigned int slot,
+                                         unsigned int func, unsigned int where)
+{
+        return (bus << 16) | (slot << 11) | (func << 8) | (where & 0xfc) |
+               0x80000000;
+}
+
+static u32 rt3883_pci_read_cfg32(struct rt3883_pci_controller *rpc,
+                               unsigned bus, unsigned slot,
+                               unsigned func, unsigned reg)
+{
+        unsigned long flags;
+        u32 address;
+        u32 ret;
+
+        address = rt3883_pci_get_cfgaddr(bus, slot, func, reg);
+
+        spin_lock_irqsave(&rpc->lock, flags);
+        rt3883_pci_w32(rpc, address, RT3883_PCI_REG_CFGADDR);
+        ret = rt3883_pci_r32(rpc, RT3883_PCI_REG_CFGDATA);
+        spin_unlock_irqrestore(&rpc->lock, flags);
+
+        return ret;
+}
+
+static void rt3883_pci_write_cfg32(struct rt3883_pci_controller *rpc,
+                                 unsigned bus, unsigned slot,
+                                 unsigned func, unsigned reg, u32 val)
+{
+        unsigned long flags;
+        u32 address;
+
+        address = rt3883_pci_get_cfgaddr(bus, slot, func, reg);
+
+        spin_lock_irqsave(&rpc->lock, flags);
+        rt3883_pci_w32(rpc, address, RT3883_PCI_REG_CFGADDR);
+        rt3883_pci_w32(rpc, val, RT3883_PCI_REG_CFGDATA);
+        spin_unlock_irqrestore(&rpc->lock, flags);
+}
+
+static void rt3883_pci_irq_handler(unsigned int irq, struct irq_desc *desc)
+{
+        struct rt3883_pci_controller *rpc;
+        u32 pending;
+
+        rpc = irq_get_handler_data(irq);
+
+        pending = rt3883_pci_r32(rpc, RT3883_PCI_REG_PCIINT) &
+                  rt3883_pci_r32(rpc, RT3883_PCI_REG_PCIENA);
+
+        if (!pending) {
+                spurious_interrupt();
+                return;
+        }
+
+        while (pending) {
+                unsigned bit = __ffs(pending);
+
+                irq = irq_find_mapping(rpc->irq_domain, bit);
+                generic_handle_irq(irq);
+
+                pending &= ~BIT(bit);
+        }
+}
+
+static void rt3883_pci_irq_unmask(struct irq_data *d)
+{
+        struct rt3883_pci_controller *rpc;
+        u32 t;
+
+        rpc = irq_data_get_irq_chip_data(d);
+
+        t = rt3883_pci_r32(rpc, RT3883_PCI_REG_PCIENA);
+        rt3883_pci_w32(rpc, t | BIT(d->hwirq), RT3883_PCI_REG_PCIENA);
+        /* flush write */
+        rt3883_pci_r32(rpc, RT3883_PCI_REG_PCIENA);
+}
+
+static void rt3883_pci_irq_mask(struct irq_data *d)
+{
+        struct rt3883_pci_controller *rpc;
+        u32 t;
+
+        rpc = irq_data_get_irq_chip_data(d);
+
+        t = rt3883_pci_r32(rpc, RT3883_PCI_REG_PCIENA);
+        rt3883_pci_w32(rpc, t & ~BIT(d->hwirq), RT3883_PCI_REG_PCIENA);
+        /* flush write */
+        rt3883_pci_r32(rpc, RT3883_PCI_REG_PCIENA);
+}
+
+static struct irq_chip rt3883_pci_irq_chip = {
+        .name           = "RT3883 PCI",
+        .irq_mask       = rt3883_pci_irq_mask,
+        .irq_unmask     = rt3883_pci_irq_unmask,
+        .irq_mask_ack   = rt3883_pci_irq_mask,
+};
+
+static int rt3883_pci_irq_map(struct irq_domain *d, unsigned int irq,
+                              irq_hw_number_t hw)
+{
+        irq_set_chip_and_handler(irq, &rt3883_pci_irq_chip, handle_level_irq);
+        irq_set_chip_data(irq, d->host_data);
+
+        return 0;
+}
+
+static const struct irq_domain_ops rt3883_pci_irq_domain_ops = {
+        .map = rt3883_pci_irq_map,
+        .xlate = irq_domain_xlate_onecell,
+};
+
+static int rt3883_pci_irq_init(struct device *dev,
+                               struct rt3883_pci_controller *rpc)
+{
+        int irq;
+
+        irq = irq_of_parse_and_map(rpc->intc_of_node, 0);
+        if (irq == 0) {
+                dev_err(dev, "%s has no IRQ",
+                        of_node_full_name(rpc->intc_of_node));
+                return -EINVAL;
+        }
+
+        /* disable all interrupts */
+        rt3883_pci_w32(rpc, 0, RT3883_PCI_REG_PCIENA);
+
+        rpc->irq_domain =
+                irq_domain_add_linear(rpc->intc_of_node, RT3883_PCI_IRQ_COUNT,
+                                      &rt3883_pci_irq_domain_ops,
+                                      rpc);
+        if (!rpc->irq_domain) {
+                dev_err(dev, "unable to add IRQ domain\n");
+                return -ENODEV;
+        }
+
+        irq_set_handler_data(irq, rpc);
+        irq_set_chained_handler(irq, rt3883_pci_irq_handler);
+
+        return 0;
+}
+
+static int rt3883_pci_config_read(struct pci_bus *bus, unsigned int devfn,
+                                  int where, int size, u32 *val)
+{
+        struct rt3883_pci_controller *rpc;
+        unsigned long flags;
+        u32 address;
+        u32 data;
+
+        rpc = pci_bus_to_rt3883_controller(bus);
+
+        if (!rpc->pcie_ready && bus->number == 1)
+                return PCIBIOS_DEVICE_NOT_FOUND;
+
+        address = rt3883_pci_get_cfgaddr(bus->number, PCI_SLOT(devfn),
+                                         PCI_FUNC(devfn), where);
+
+        spin_lock_irqsave(&rpc->lock, flags);
+        rt3883_pci_w32(rpc, address, RT3883_PCI_REG_CFGADDR);
+        data = rt3883_pci_r32(rpc, RT3883_PCI_REG_CFGDATA);
+        spin_unlock_irqrestore(&rpc->lock, flags);
+
+        switch (size) {
+        case 1:
+                *val = (data >> ((where & 3) << 3)) & 0xff;
+                break;
+        case 2:
+                *val = (data >> ((where & 3) << 3)) & 0xffff;
+                break;
+        case 4:
+                *val = data;
+                break;
+        }
+
+        return PCIBIOS_SUCCESSFUL;
+}
+
+static int rt3883_pci_config_write(struct pci_bus *bus, unsigned int devfn,
+                                   int where, int size, u32 val)
+{
+        struct rt3883_pci_controller *rpc;
+        unsigned long flags;
+        u32 address;
+        u32 data;
+
+        rpc = pci_bus_to_rt3883_controller(bus);
+
+        if (!rpc->pcie_ready && bus->number == 1)
+                return PCIBIOS_DEVICE_NOT_FOUND;
+
+        address = rt3883_pci_get_cfgaddr(bus->number, PCI_SLOT(devfn),
+                                         PCI_FUNC(devfn), where);
+
+        spin_lock_irqsave(&rpc->lock, flags);
+        rt3883_pci_w32(rpc, address, RT3883_PCI_REG_CFGADDR);
+        data = rt3883_pci_r32(rpc, RT3883_PCI_REG_CFGDATA);
+
+        switch (size) {
+        case 1:
+                data = (data & ~(0xff << ((where & 3) << 3))) |
+                       (val << ((where & 3) << 3));
+                break;
+        case 2:
+                data = (data & ~(0xffff << ((where & 3) << 3))) |
+                       (val << ((where & 3) << 3));
+                break;
+        case 4:
+                data = val;
+                break;
+        }
+
+        rt3883_pci_w32(rpc, data, RT3883_PCI_REG_CFGDATA);
+        spin_unlock_irqrestore(&rpc->lock, flags);
+
+        return PCIBIOS_SUCCESSFUL;
+}
+
+static struct pci_ops rt3883_pci_ops = {
+        .read   = rt3883_pci_config_read,
+        .write  = rt3883_pci_config_write,
+};
+
+static void rt3883_pci_preinit(struct rt3883_pci_controller *rpc, unsigned mode)
+{
+        u32 syscfg1;
+        u32 rstctrl;
+        u32 clkcfg1;
+        u32 t;
+
+        rstctrl = rt_sysc_r32(RT3883_SYSC_REG_RSTCTRL);
+        syscfg1 = rt_sysc_r32(RT3883_SYSC_REG_SYSCFG1);
+        clkcfg1 = rt_sysc_r32(RT3883_SYSC_REG_CLKCFG1);
+
+        if (mode & RT3883_PCI_MODE_PCIE) {
+                rstctrl |= RT3883_RSTCTRL_PCIE;
+                rt_sysc_w32(rstctrl, RT3883_SYSC_REG_RSTCTRL);
+
+                /* setup PCI PAD drive mode */
+                syscfg1 &= ~(0x30);
+                syscfg1 |= (2 << 4);
+                rt_sysc_w32(syscfg1, RT3883_SYSC_REG_SYSCFG1);
+
+                t = rt_sysc_r32(RT3883_SYSC_REG_PCIE_CLK_GEN0);
+                t &= ~BIT(31);
+                rt_sysc_w32(t, RT3883_SYSC_REG_PCIE_CLK_GEN0);
+
+                t = rt_sysc_r32(RT3883_SYSC_REG_PCIE_CLK_GEN1);
+                t &= 0x80ffffff;
+                rt_sysc_w32(t, RT3883_SYSC_REG_PCIE_CLK_GEN1);
+
+                t = rt_sysc_r32(RT3883_SYSC_REG_PCIE_CLK_GEN1);
+                t |= 0xa << 24;
+                rt_sysc_w32(t, RT3883_SYSC_REG_PCIE_CLK_GEN1);
+
+                t = rt_sysc_r32(RT3883_SYSC_REG_PCIE_CLK_GEN0);
+                t |= BIT(31);
+                rt_sysc_w32(t, RT3883_SYSC_REG_PCIE_CLK_GEN0);
+
+                msleep(50);
+
+                rstctrl &= ~RT3883_RSTCTRL_PCIE;
+                rt_sysc_w32(rstctrl, RT3883_SYSC_REG_RSTCTRL);
+        }
+
+        syscfg1 |= (RT3883_SYSCFG1_PCIE_RC_MODE | RT3883_SYSCFG1_PCI_HOST_MODE);
+
+        clkcfg1 &= ~(RT3883_CLKCFG1_PCI_CLK_EN | RT3883_CLKCFG1_PCIE_CLK_EN);
+
+        if (mode & RT3883_PCI_MODE_PCI) {
+                clkcfg1 |= RT3883_CLKCFG1_PCI_CLK_EN;
+                rstctrl &= ~RT3883_RSTCTRL_PCI;
+        }
+
+        if (mode & RT3883_PCI_MODE_PCIE) {
+                clkcfg1 |= RT3883_CLKCFG1_PCIE_CLK_EN;
+                rstctrl &= ~RT3883_RSTCTRL_PCIE;
+        }
+
+        rt_sysc_w32(syscfg1, RT3883_SYSC_REG_SYSCFG1);
+        rt_sysc_w32(rstctrl, RT3883_SYSC_REG_RSTCTRL);
+        rt_sysc_w32(clkcfg1, RT3883_SYSC_REG_CLKCFG1);
+
+        msleep(500);
+
+        /*
+         * setup the device number of the P2P bridge
+         * and de-assert the reset line
+         */
+        t = (RT3883_P2P_BR_DEVNUM << RT3883_PCICFG_P2P_BR_DEVNUM_S);
+        rt3883_pci_w32(rpc, t, RT3883_PCI_REG_PCICFG);
+
+        /* flush write */
+        rt3883_pci_r32(rpc, RT3883_PCI_REG_PCICFG);
+        msleep(500);
+
+        if (mode & RT3883_PCI_MODE_PCIE) {
+                msleep(500);
+
+                t = rt3883_pci_r32(rpc, RT3883_PCI_REG_STATUS(1));
+
+                rpc->pcie_ready = t & BIT(0);
+
+                if (!rpc->pcie_ready) {
+                        /* reset the PCIe block */
+                        t = rt_sysc_r32(RT3883_SYSC_REG_RSTCTRL);
+                        t |= RT3883_RSTCTRL_PCIE;
+                        rt_sysc_w32(t, RT3883_SYSC_REG_RSTCTRL);
+                        t &= ~RT3883_RSTCTRL_PCIE;
+                        rt_sysc_w32(t, RT3883_SYSC_REG_RSTCTRL);
+
+                        /* turn off PCIe clock */
+                        t = rt_sysc_r32(RT3883_SYSC_REG_CLKCFG1);
+                        t &= ~RT3883_CLKCFG1_PCIE_CLK_EN;
+                        rt_sysc_w32(t, RT3883_SYSC_REG_CLKCFG1);
+
+                        t = rt_sysc_r32(RT3883_SYSC_REG_PCIE_CLK_GEN0);
+                        t &= ~0xf000c080;
+                        rt_sysc_w32(t, RT3883_SYSC_REG_PCIE_CLK_GEN0);
+                }
+        }
+
+        /* enable PCI arbiter */
+        rt3883_pci_w32(rpc, 0x79, RT3883_PCI_REG_ARBCTL);
+}
+
+static int rt3883_pci_probe(struct platform_device *pdev)
+{
+        struct rt3883_pci_controller *rpc;
+        struct device *dev = &pdev->dev;
+        struct device_node *np = dev->of_node;
+        struct resource *res;
+        struct device_node *child;
+        u32 val;
+        int err;
+        int mode;
+
+        rpc = devm_kzalloc(dev, sizeof(*rpc), GFP_KERNEL);
+        if (!rpc)
+                return -ENOMEM;
+
+        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        if (!res)
+                return -EINVAL;
+
+        rpc->base = devm_ioremap_resource(dev, res);
+        if (IS_ERR(rpc->base))
+                return PTR_ERR(rpc->base);
+
+        /* find the interrupt controller child node */
+        for_each_child_of_node(np, child) {
+                if (of_get_property(child, "interrupt-controller", NULL) &&
+                    of_node_get(child)) {
+                        rpc->intc_of_node = child;
+                        break;
+                }
+        }
+
+        if (!rpc->intc_of_node) {
+                dev_err(dev, "%s has no %s child node",
+                        of_node_full_name(rpc->intc_of_node),
+                        "interrupt controller");
+                return -EINVAL;
+        }
+
+        /* find the PCI host bridge child node */
+        for_each_child_of_node(np, child) {
+                if (child->type &&
+                    of_node_cmp(child->type, "pci") == 0 &&
+                    of_node_get(child)) {
+                        rpc->pci_controller.of_node = child;
+                        break;
+                }
+        }
+
+        if (!rpc->pci_controller.of_node) {
+                dev_err(dev, "%s has no %s child node",
+                        of_node_full_name(rpc->intc_of_node),
+                        "PCI host bridge");
+                err = -EINVAL;
+                goto err_put_intc_node;
+        }
+
+        mode = RT3883_PCI_MODE_NONE;
+        for_each_available_child_of_node(rpc->pci_controller.of_node, child) {
+                int devfn;
+
+                if (!child->type ||
+                    of_node_cmp(child->type, "pci") != 0)
+                        continue;
+
+                devfn = of_pci_get_devfn(child);
+                if (devfn < 0)
+                        continue;
+
+                switch (PCI_SLOT(devfn)) {
+                case 1:
+                        mode |= RT3883_PCI_MODE_PCIE;
+                        break;
+
+                case 17:
+                case 18:
+                        mode |= RT3883_PCI_MODE_PCI;
+                        break;
+                }
+        }
+
+        if (mode == RT3883_PCI_MODE_NONE) {
+                dev_err(dev, "unable to determine PCI mode\n");
+                err = -EINVAL;
+                goto err_put_hb_node;
+        }
+
+        dev_info(dev, "mode:%s%s\n",
+                 (mode & RT3883_PCI_MODE_PCI) ? " PCI" : "",
+                 (mode & RT3883_PCI_MODE_PCIE) ? " PCIe" : "");
+
+        rt3883_pci_preinit(rpc, mode);
+
+        rpc->pci_controller.pci_ops = &rt3883_pci_ops;
+        rpc->pci_controller.io_resource = &rpc->io_res;
+        rpc->pci_controller.mem_resource = &rpc->mem_res;
+
+        /* Load PCI I/O and memory resources from DT */
+        pci_load_of_ranges(&rpc->pci_controller,
+                           rpc->pci_controller.of_node);
+
+        rt3883_pci_w32(rpc, rpc->mem_res.start, RT3883_PCI_REG_MEMBASE);
+        rt3883_pci_w32(rpc, rpc->io_res.start, RT3883_PCI_REG_IOBASE);
+
+        ioport_resource.start = rpc->io_res.start;
+        ioport_resource.end = rpc->io_res.end;
+
+        /* PCI */
+        rt3883_pci_w32(rpc, 0x03ff0000, RT3883_PCI_REG_BAR0SETUP(0));
+        rt3883_pci_w32(rpc, RT3883_MEMORY_BASE, RT3883_PCI_REG_IMBASEBAR0(0));
+        rt3883_pci_w32(rpc, 0x08021814, RT3883_PCI_REG_ID(0));
+        rt3883_pci_w32(rpc, 0x00800001, RT3883_PCI_REG_CLASS(0));
+        rt3883_pci_w32(rpc, 0x28801814, RT3883_PCI_REG_SUBID(0));
+
+        /* PCIe */
+        rt3883_pci_w32(rpc, 0x03ff0000, RT3883_PCI_REG_BAR0SETUP(1));
+        rt3883_pci_w32(rpc, RT3883_MEMORY_BASE, RT3883_PCI_REG_IMBASEBAR0(1));
+        rt3883_pci_w32(rpc, 0x08021814, RT3883_PCI_REG_ID(1));
+        rt3883_pci_w32(rpc, 0x06040001, RT3883_PCI_REG_CLASS(1));
+        rt3883_pci_w32(rpc, 0x28801814, RT3883_PCI_REG_SUBID(1));
+
+        err = rt3883_pci_irq_init(dev, rpc);
+        if (err)
+                goto err_put_hb_node;
+
+        /* PCIe */
+        val = rt3883_pci_read_cfg32(rpc, 0, 0x01, 0, PCI_COMMAND);
+        val |= PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
+        rt3883_pci_write_cfg32(rpc, 0, 0x01, 0, PCI_COMMAND, val);
+
+        /* PCI */
+        val = rt3883_pci_read_cfg32(rpc, 0, 0x00, 0, PCI_COMMAND);
+        val |= PCI_COMMAND_IO | PCI_COMMAND_MEMORY | PCI_COMMAND_MASTER;
+        rt3883_pci_write_cfg32(rpc, 0, 0x00, 0, PCI_COMMAND, val);
+
+        if (mode == RT3883_PCI_MODE_PCIE) {
+                rt3883_pci_w32(rpc, 0x03ff0001, RT3883_PCI_REG_BAR0SETUP(0));
+                rt3883_pci_w32(rpc, 0x03ff0001, RT3883_PCI_REG_BAR0SETUP(1));
+
+                rt3883_pci_write_cfg32(rpc, 0, RT3883_P2P_BR_DEVNUM, 0,
+                                       PCI_BASE_ADDRESS_0,
+                                       RT3883_MEMORY_BASE);
+                /* flush write */
+                rt3883_pci_read_cfg32(rpc, 0, RT3883_P2P_BR_DEVNUM, 0,
+                                      PCI_BASE_ADDRESS_0);
+        } else {
+                rt3883_pci_write_cfg32(rpc, 0, RT3883_P2P_BR_DEVNUM, 0,
+                                       PCI_IO_BASE, 0x00000101);
+        }
+
+        register_pci_controller(&rpc->pci_controller);
+
+        return 0;
+
+err_put_hb_node:
+        of_node_put(rpc->pci_controller.of_node);
+err_put_intc_node:
+        of_node_put(rpc->intc_of_node);
+        return err;
+}
+
+int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
+{
+        struct of_irq dev_irq;
+        int err;
+        int irq;
+
+        err = of_irq_map_pci(dev, &dev_irq);
+        if (err) {
+                pr_err("pci %s: unable to get irq map, err=%d\n",
+                       pci_name((struct pci_dev *) dev), err);
+                return 0;
+        }
+
+        irq = irq_create_of_mapping(dev_irq.controller,
+                                    dev_irq.specifier,
+                                    dev_irq.size);
+
+        if (irq == 0)
+                pr_crit("pci %s: no irq found for pin %u\n",
+                        pci_name((struct pci_dev *) dev), pin);
+        else
+                pr_info("pci %s: using irq %d for pin %u\n",
+                        pci_name((struct pci_dev *) dev), irq, pin);
+
+        return irq;
+}
+
+int pcibios_plat_dev_init(struct pci_dev *dev)
+{
+        return 0;
+}
+
+static const struct of_device_id rt3883_pci_ids[] = {
+        { .compatible = "ralink,rt3883-pci" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, rt3883_pci_ids);
+
+static struct platform_driver rt3883_pci_driver = {
+        .probe = rt3883_pci_probe,
+        .driver = {
+                .name = "rt3883-pci",
+                .owner = THIS_MODULE,
+                .of_match_table = of_match_ptr(rt3883_pci_ids),
+        },
+};
+
+static int __init rt3883_pci_init(void)
+{
+        return platform_driver_register(&rt3883_pci_driver);
+}
+
+postcore_initcall(rt3883_pci_init);
diff --git a/arch/mips/pci/pci.c b/arch/mips/pci/pci.c
index 594e60d6a43b..33e7aa52d9c4 100644
--- a/arch/mips/pci/pci.c
+++ b/arch/mips/pci/pci.c
@@ -113,7 +113,6 @@ static void pcibios_scanbus(struct pci_controller *hose)
                 if (!pci_has_flag(PCI_PROBE_ONLY)) {
                         pci_bus_size_bridges(bus);
                         pci_bus_assign_resources(bus);
-                        pci_enable_bridges(bus);
                 }
         }
 }
diff --git a/arch/mips/powertv/Kconfig b/arch/mips/powertv/Kconfig
index 1a1b03ea6398..dd91fbacbcba 100644
--- a/arch/mips/powertv/Kconfig
+++ b/arch/mips/powertv/Kconfig
@@ -1,14 +1,7 @@
-config BOOTLOADER_DRIVER
-        bool "PowerTV Bootloader Driver Support"
-        default n
-        depends on POWERTV
-        help
-          Use this option if you want to load bootloader driver.
-
 config BOOTLOADER_FAMILY
         string "POWERTV Bootloader Family string"
         default "85"
-        depends on POWERTV && !BOOTLOADER_DRIVER
+        depends on POWERTV
         help
           This value should be specified when the bootloader driver is disabled
           and must be exactly two characters long. Families supported are:
diff --git a/arch/mips/powertv/asic/asic_devices.c b/arch/mips/powertv/asic/asic_devices.c
index 0238af1ba503..8380605d597d 100644
--- a/arch/mips/powertv/asic/asic_devices.c
+++ b/arch/mips/powertv/asic/asic_devices.c
@@ -147,20 +147,10 @@ static __init noinline void platform_set_family(void)
         if (check_forcefamily(forced_family) == 0)
                 bootldr_family = BOOTLDRFAMILY(forced_family[0],
                         forced_family[1]);
-        else {
-
-#ifdef CONFIG_BOOTLOADER_DRIVER
-                bootldr_family = (unsigned short) kbldr_GetSWFamily();
-#else
-#if defined(CONFIG_BOOTLOADER_FAMILY)
+        else
                 bootldr_family = (unsigned short) BOOTLDRFAMILY(
                         CONFIG_BOOTLOADER_FAMILY[0],
                         CONFIG_BOOTLOADER_FAMILY[1]);
-#else
-#error "Unknown Bootloader Family"
-#endif
-#endif
-        }
 
         pr_info("Bootloader Family = 0x%04X\n", bootldr_family);
 
diff --git a/arch/mips/powertv/init.c b/arch/mips/powertv/init.c
index a01baff52cae..498926377e51 100644
--- a/arch/mips/powertv/init.c
+++ b/arch/mips/powertv/init.c
@@ -87,8 +87,4 @@ void __init prom_init(void)
 
         configure_platform();
         prom_meminit();
-
-#ifndef CONFIG_BOOTLOADER_DRIVER
-        pr_info("\nBootloader driver isn't loaded...\n");
-#endif
 }
diff --git a/arch/mips/powertv/reset.c b/arch/mips/powertv/reset.c
index 0007652cb774..11c32fbf2784 100644
--- a/arch/mips/powertv/reset.c
+++ b/arch/mips/powertv/reset.c
@@ -21,24 +21,12 @@
 #include <linux/io.h>
 #include <asm/reboot.h>                 /* Not included by linux/reboot.h */
 
-#ifdef CONFIG_BOOTLOADER_DRIVER
-#include <asm/mach-powertv/kbldr.h>
-#endif
-
 #include <asm/mach-powertv/asic_regs.h>
 #include "reset.h"
 
 static void mips_machine_restart(char *command)
 {
-#ifdef CONFIG_BOOTLOADER_DRIVER
-        /*
-         * Call the bootloader's reset function to ensure
-         * that persistent data is flushed before hard reset
-         */
-        kbldr_SetCauseAndReset();
-#else
         writel(0x1, asic_reg_addr(watchdog));
-#endif
 }
 
 void mips_reboot_setup(void)
diff --git a/arch/mips/ralink/Kconfig b/arch/mips/ralink/Kconfig
index 026e823d871d..424f03496d14 100644
--- a/arch/mips/ralink/Kconfig
+++ b/arch/mips/ralink/Kconfig
@@ -1,5 +1,12 @@
 if RALINK
 
+config CLKEVT_RT3352
+        bool
+        depends on SOC_RT305X || SOC_MT7620
+        default y
+        select CLKSRC_OF
+        select CLKSRC_MMIO
+
 choice
         prompt "Ralink SoC selection"
         default SOC_RT305X
@@ -19,9 +26,12 @@ choice
                 bool "RT3883"
                 select USB_ARCH_HAS_OHCI
                 select USB_ARCH_HAS_EHCI
+                select HW_HAS_PCI
 
         config SOC_MT7620
                 bool "MT7620"
+                select USB_ARCH_HAS_OHCI
+                select USB_ARCH_HAS_EHCI
 
 endchoice
 
diff --git a/arch/mips/ralink/Makefile b/arch/mips/ralink/Makefile
index 38cf1a880aaa..98ae349827be 100644
--- a/arch/mips/ralink/Makefile
+++ b/arch/mips/ralink/Makefile
@@ -6,7 +6,9 @@
 # Copyright (C) 2009-2011 Gabor Juhos <juhosg@openwrt.org>
 # Copyright (C) 2013 John Crispin <blogic@openwrt.org>
 
-obj-y := prom.o of.o reset.o clk.o irq.o
+obj-y := prom.o of.o reset.o clk.o irq.o timer.o
+
+obj-$(CONFIG_CLKEVT_RT3352) += cevt-rt3352.o
 
 obj-$(CONFIG_SOC_RT288X) += rt288x.o
 obj-$(CONFIG_SOC_RT305X) += rt305x.o
diff --git a/arch/mips/ralink/Platform b/arch/mips/ralink/Platform
index cda4b6645c50..6d9c8c499f98 100644
--- a/arch/mips/ralink/Platform
+++ b/arch/mips/ralink/Platform
@@ -26,3 +26,4 @@ cflags-$(CONFIG_SOC_RT3883)	+= -I$(srctree)/arch/mips/include/asm/mach-ralink/rt
 # Ralink MT7620
 #
 load-$(CONFIG_SOC_MT7620)       += 0xffffffff80000000
+cflags-$(CONFIG_SOC_MT7620)     += -I$(srctree)/arch/mips/include/asm/mach-ralink/mt7620
diff --git a/arch/mips/ralink/cevt-rt3352.c b/arch/mips/ralink/cevt-rt3352.c
new file mode 100644
index 000000000000..cc17566d1934
--- /dev/null
+++ b/arch/mips/ralink/cevt-rt3352.c
@@ -0,0 +1,145 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2013 by John Crispin <blogic@openwrt.org>
+ */
+
+#include <linux/clockchips.h>
+#include <linux/clocksource.h>
+#include <linux/interrupt.h>
+#include <linux/reset.h>
+#include <linux/init.h>
+#include <linux/time.h>
+#include <linux/of.h>
+#include <linux/of_irq.h>
+#include <linux/of_address.h>
+
+#include <asm/mach-ralink/ralink_regs.h>
+
+#define SYSTICK_FREQ            (50 * 1000)
+
+#define SYSTICK_CONFIG          0x00
+#define SYSTICK_COMPARE         0x04
+#define SYSTICK_COUNT           0x08
+
+/* route systick irq to mips irq 7 instead of the r4k-timer */
+#define CFG_EXT_STK_EN          0x2
+/* enable the counter */
+#define CFG_CNT_EN              0x1
+
+struct systick_device {
+        void __iomem *membase;
+        struct clock_event_device dev;
+        int irq_requested;
+        int freq_scale;
+};
+
+static void systick_set_clock_mode(enum clock_event_mode mode,
+                                struct clock_event_device *evt);
+
+static int systick_next_event(unsigned long delta,
+                                struct clock_event_device *evt)
+{
+        struct systick_device *sdev;
+        u32 count;
+
+        sdev = container_of(evt, struct systick_device, dev);
+        count = ioread32(sdev->membase + SYSTICK_COUNT);
+        count = (count + delta) % SYSTICK_FREQ;
+        iowrite32(count + delta, sdev->membase + SYSTICK_COMPARE);
+
+        return 0;
+}
+
+static void systick_event_handler(struct clock_event_device *dev)
+{
+        /* noting to do here */
+}
+
+static irqreturn_t systick_interrupt(int irq, void *dev_id)
+{
+        struct clock_event_device *dev = (struct clock_event_device *) dev_id;
+
+        dev->event_handler(dev);
+
+        return IRQ_HANDLED;
+}
+
+static struct systick_device systick = {
+        .dev = {
+                /*
+                 * cevt-r4k uses 300, make sure systick
+                 * gets used if available
+                 */
+                .rating         = 310,
+                .features       = CLOCK_EVT_FEAT_ONESHOT,
+                .set_next_event = systick_next_event,
+                .set_mode       = systick_set_clock_mode,
+                .event_handler  = systick_event_handler,
+        },
+};
+
+static struct irqaction systick_irqaction = {
+        .handler = systick_interrupt,
+        .flags = IRQF_PERCPU | IRQF_TIMER,
+        .dev_id = &systick.dev,
+};
+
+static void systick_set_clock_mode(enum clock_event_mode mode,
+                                struct clock_event_device *evt)
+{
+        struct systick_device *sdev;
+
+        sdev = container_of(evt, struct systick_device, dev);
+
+        switch (mode) {
+        case CLOCK_EVT_MODE_ONESHOT:
+                if (!sdev->irq_requested)
+                        setup_irq(systick.dev.irq, &systick_irqaction);
+                sdev->irq_requested = 1;
+                iowrite32(CFG_EXT_STK_EN | CFG_CNT_EN,
+                                systick.membase + SYSTICK_CONFIG);
+                break;
+
+        case CLOCK_EVT_MODE_SHUTDOWN:
+                if (sdev->irq_requested)
+                        free_irq(systick.dev.irq, &systick_irqaction);
+                sdev->irq_requested = 0;
+                iowrite32(0, systick.membase + SYSTICK_CONFIG);
+                break;
+
+        default:
+                pr_err("%s: Unhandeled mips clock_mode\n", systick.dev.name);
+                break;
+        }
+}
+
+static void __init ralink_systick_init(struct device_node *np)
+{
+        systick.membase = of_iomap(np, 0);
+        if (!systick.membase)
+                return;
+
+        systick_irqaction.name = np->name;
+        systick.dev.name = np->name;
+        clockevents_calc_mult_shift(&systick.dev, SYSTICK_FREQ, 60);
+        systick.dev.max_delta_ns = clockevent_delta2ns(0x7fff, &systick.dev);
+        systick.dev.min_delta_ns = clockevent_delta2ns(0x3, &systick.dev);
+        systick.dev.irq = irq_of_parse_and_map(np, 0);
+        if (!systick.dev.irq) {
+                pr_err("%s: request_irq failed", np->name);
+                return;
+        }
+
+        clocksource_mmio_init(systick.membase + SYSTICK_COUNT, np->name,
+                        SYSTICK_FREQ, 301, 16, clocksource_mmio_readl_up);
+
+        clockevents_register_device(&systick.dev);
+
+        pr_info("%s: runing - mult: %d, shift: %d\n",
+                        np->name, systick.dev.mult, systick.dev.shift);
+}
+
+CLOCKSOURCE_OF_DECLARE(systick, "ralink,cevt-systick", ralink_systick_init);
diff --git a/arch/mips/ralink/clk.c b/arch/mips/ralink/clk.c
index 8dfa22ff300b..bba0cdfd83bc 100644
--- a/arch/mips/ralink/clk.c
+++ b/arch/mips/ralink/clk.c
@@ -69,4 +69,5 @@ void __init plat_time_init(void)
         pr_info("CPU Clock: %ldMHz\n", clk_get_rate(clk) / 1000000);
         mips_hpt_frequency = clk_get_rate(clk) / 2;
         clk_put(clk);
+        clocksource_of_init();
 }
diff --git a/arch/mips/ralink/common.h b/arch/mips/ralink/common.h
index 83144c3fc5ac..42dfd6100a2d 100644
--- a/arch/mips/ralink/common.h
+++ b/arch/mips/ralink/common.h
@@ -46,6 +46,8 @@ extern void ralink_of_remap(void);
 extern void ralink_clk_init(void);
 extern void ralink_clk_add(const char *dev, unsigned long rate);
 
+extern void ralink_rst_init(void);
+
 extern void prom_soc_init(struct ralink_soc_info *soc_info);
 
 __iomem void *plat_of_remap_node(const char *node);
diff --git a/arch/mips/ralink/mt7620.c b/arch/mips/ralink/mt7620.c
index 0018b1a661f6..d217509e5300 100644
--- a/arch/mips/ralink/mt7620.c
+++ b/arch/mips/ralink/mt7620.c
@@ -23,9 +23,6 @@
 /* does the board have sdram or ddram */
 static int dram_type;
 
-/* the pll dividers */
-static u32 mt7620_clk_divider[] = { 2, 3, 4, 8 };
-
 static struct ralink_pinmux_grp mode_mux[] = {
         {
                 .name = "i2c",
@@ -140,34 +137,189 @@ struct ralink_pinmux rt_gpio_pinmux = {
         .uart_mask = MT7620_GPIO_MODE_UART0_MASK,
 };
 
-void __init ralink_clk_init(void)
+static __init u32
+mt7620_calc_rate(u32 ref_rate, u32 mul, u32 div)
 {
-        unsigned long cpu_rate, sys_rate;
-        u32 c0 = rt_sysc_r32(SYSC_REG_CPLL_CONFIG0);
-        u32 c1 = rt_sysc_r32(SYSC_REG_CPLL_CONFIG1);
-        u32 swconfig = (c0 >> CPLL_SW_CONFIG_SHIFT) & CPLL_SW_CONFIG_MASK;
-        u32 cpu_clk = (c1 >> CPLL_CPU_CLK_SHIFT) & CPLL_CPU_CLK_MASK;
-
-        if (cpu_clk) {
-                cpu_rate = 480000000;
-        } else if (!swconfig) {
-                cpu_rate = 600000000;
-        } else {
-                u32 m = (c0 >> CPLL_MULT_RATIO_SHIFT) & CPLL_MULT_RATIO;
-                u32 d = (c0 >> CPLL_DIV_RATIO_SHIFT) & CPLL_DIV_RATIO;
+        u64 t;
 
-                cpu_rate = ((40 * (m + 24)) / mt7620_clk_divider[d]) * 1000000;
-        }
+        t = ref_rate;
+        t *= mul;
+        do_div(t, div);
+
+        return t;
+}
+
+#define MHZ(x)          ((x) * 1000 * 1000)
+
+static __init unsigned long
+mt7620_get_xtal_rate(void)
+{
+        u32 reg;
+
+        reg = rt_sysc_r32(SYSC_REG_SYSTEM_CONFIG0);
+        if (reg & SYSCFG0_XTAL_FREQ_SEL)
+                return MHZ(40);
+
+        return MHZ(20);
+}
+
+static __init unsigned long
+mt7620_get_periph_rate(unsigned long xtal_rate)
+{
+        u32 reg;
+
+        reg = rt_sysc_r32(SYSC_REG_CLKCFG0);
+        if (reg & CLKCFG0_PERI_CLK_SEL)
+                return xtal_rate;
+
+        return MHZ(40);
+}
+
+static const u32 mt7620_clk_divider[] __initconst = { 2, 3, 4, 8 };
+
+static __init unsigned long
+mt7620_get_cpu_pll_rate(unsigned long xtal_rate)
+{
+        u32 reg;
+        u32 mul;
+        u32 div;
+
+        reg = rt_sysc_r32(SYSC_REG_CPLL_CONFIG0);
+        if (reg & CPLL_CFG0_BYPASS_REF_CLK)
+                return xtal_rate;
+
+        if ((reg & CPLL_CFG0_SW_CFG) == 0)
+                return MHZ(600);
+
+        mul = (reg >> CPLL_CFG0_PLL_MULT_RATIO_SHIFT) &
+              CPLL_CFG0_PLL_MULT_RATIO_MASK;
+        mul += 24;
+        if (reg & CPLL_CFG0_LC_CURFCK)
+                mul *= 2;
+
+        div = (reg >> CPLL_CFG0_PLL_DIV_RATIO_SHIFT) &
+              CPLL_CFG0_PLL_DIV_RATIO_MASK;
+
+        WARN_ON(div >= ARRAY_SIZE(mt7620_clk_divider));
+
+        return mt7620_calc_rate(xtal_rate, mul, mt7620_clk_divider[div]);
+}
+
+static __init unsigned long
+mt7620_get_pll_rate(unsigned long xtal_rate, unsigned long cpu_pll_rate)
+{
+        u32 reg;
+
+        reg = rt_sysc_r32(SYSC_REG_CPLL_CONFIG1);
+        if (reg & CPLL_CFG1_CPU_AUX1)
+                return xtal_rate;
+
+        if (reg & CPLL_CFG1_CPU_AUX0)
+                return MHZ(480);
 
+        return cpu_pll_rate;
+}
+
+static __init unsigned long
+mt7620_get_cpu_rate(unsigned long pll_rate)
+{
+        u32 reg;
+        u32 mul;
+        u32 div;
+
+        reg = rt_sysc_r32(SYSC_REG_CPU_SYS_CLKCFG);
+
+        mul = reg & CPU_SYS_CLKCFG_CPU_FFRAC_MASK;
+        div = (reg >> CPU_SYS_CLKCFG_CPU_FDIV_SHIFT) &
+              CPU_SYS_CLKCFG_CPU_FDIV_MASK;
+
+        return mt7620_calc_rate(pll_rate, mul, div);
+}
+
+static const u32 mt7620_ocp_dividers[16] __initconst = {
+        [CPU_SYS_CLKCFG_OCP_RATIO_2] = 2,
+        [CPU_SYS_CLKCFG_OCP_RATIO_3] = 3,
+        [CPU_SYS_CLKCFG_OCP_RATIO_4] = 4,
+        [CPU_SYS_CLKCFG_OCP_RATIO_5] = 5,
+        [CPU_SYS_CLKCFG_OCP_RATIO_10] = 10,
+};
+
+static __init unsigned long
+mt7620_get_dram_rate(unsigned long pll_rate)
+{
         if (dram_type == SYSCFG0_DRAM_TYPE_SDRAM)
-                sys_rate = cpu_rate / 4;
-        else
-                sys_rate = cpu_rate / 3;
+                return pll_rate / 4;
+
+        return pll_rate / 3;
+}
+
+static __init unsigned long
+mt7620_get_sys_rate(unsigned long cpu_rate)
+{
+        u32 reg;
+        u32 ocp_ratio;
+        u32 div;
+
+        reg = rt_sysc_r32(SYSC_REG_CPU_SYS_CLKCFG);
+
+        ocp_ratio = (reg >> CPU_SYS_CLKCFG_OCP_RATIO_SHIFT) &
+                    CPU_SYS_CLKCFG_OCP_RATIO_MASK;
+
+        if (WARN_ON(ocp_ratio >= ARRAY_SIZE(mt7620_ocp_dividers)))
+                return cpu_rate;
+
+        div = mt7620_ocp_dividers[ocp_ratio];
+        if (WARN(!div, "invalid divider for OCP ratio %u", ocp_ratio))
+                return cpu_rate;
+
+        return cpu_rate / div;
+}
+
+void __init ralink_clk_init(void)
+{
+        unsigned long xtal_rate;
+        unsigned long cpu_pll_rate;
+        unsigned long pll_rate;
+        unsigned long cpu_rate;
+        unsigned long sys_rate;
+        unsigned long dram_rate;
+        unsigned long periph_rate;
+
+        xtal_rate = mt7620_get_xtal_rate();
+
+        cpu_pll_rate = mt7620_get_cpu_pll_rate(xtal_rate);
+        pll_rate = mt7620_get_pll_rate(xtal_rate, cpu_pll_rate);
+
+        cpu_rate = mt7620_get_cpu_rate(pll_rate);
+        dram_rate = mt7620_get_dram_rate(pll_rate);
+        sys_rate = mt7620_get_sys_rate(cpu_rate);
+        periph_rate = mt7620_get_periph_rate(xtal_rate);
+
+#define RFMT(label)     label ":%lu.%03luMHz "
+#define RINT(x)         ((x) / 1000000)
+#define RFRAC(x)        (((x) / 1000) % 1000)
+
+        pr_debug(RFMT("XTAL") RFMT("CPU_PLL") RFMT("PLL"),
+                 RINT(xtal_rate), RFRAC(xtal_rate),
+                 RINT(cpu_pll_rate), RFRAC(cpu_pll_rate),
+                 RINT(pll_rate), RFRAC(pll_rate));
+
+        pr_debug(RFMT("CPU") RFMT("DRAM") RFMT("SYS") RFMT("PERIPH"),
+                 RINT(cpu_rate), RFRAC(cpu_rate),
+                 RINT(dram_rate), RFRAC(dram_rate),
+                 RINT(sys_rate), RFRAC(sys_rate),
+                 RINT(periph_rate), RFRAC(periph_rate));
+
+#undef RFRAC
+#undef RINT
+#undef RFMT
 
         ralink_clk_add("cpu", cpu_rate);
-        ralink_clk_add("10000100.timer", 40000000);
-        ralink_clk_add("10000500.uart", 40000000);
-        ralink_clk_add("10000c00.uartlite", 40000000);
+        ralink_clk_add("10000100.timer", periph_rate);
+        ralink_clk_add("10000120.watchdog", periph_rate);
+        ralink_clk_add("10000500.uart", periph_rate);
+        ralink_clk_add("10000b00.spi", sys_rate);
+        ralink_clk_add("10000c00.uartlite", periph_rate);
 }
 
 void __init ralink_of_remap(void)
@@ -214,16 +366,19 @@ void prom_soc_init(struct ralink_soc_info *soc_info)
 
         switch (dram_type) {
         case SYSCFG0_DRAM_TYPE_SDRAM:
+                pr_info("Board has SDRAM\n");
                 soc_info->mem_size_min = MT7620_SDRAM_SIZE_MIN;
                 soc_info->mem_size_max = MT7620_SDRAM_SIZE_MAX;
                 break;
 
         case SYSCFG0_DRAM_TYPE_DDR1:
+                pr_info("Board has DDR1\n");
                 soc_info->mem_size_min = MT7620_DDR1_SIZE_MIN;
                 soc_info->mem_size_max = MT7620_DDR1_SIZE_MAX;
                 break;
 
         case SYSCFG0_DRAM_TYPE_DDR2:
+                pr_info("Board has DDR2\n");
                 soc_info->mem_size_min = MT7620_DDR2_SIZE_MIN;
                 soc_info->mem_size_max = MT7620_DDR2_SIZE_MAX;
                 break;
diff --git a/arch/mips/ralink/of.c b/arch/mips/ralink/of.c
index f25ea5b45051..ce38d11f9da5 100644
--- a/arch/mips/ralink/of.c
+++ b/arch/mips/ralink/of.c
@@ -110,6 +110,9 @@ static int __init plat_of_setup(void)
         if (of_platform_populate(NULL, of_ids, NULL, NULL))
                 panic("failed to populate DT\n");
 
+        /* make sure ithat the reset controller is setup early */
+        ralink_rst_init();
+
         return 0;
 }
 
diff --git a/arch/mips/ralink/reset.c b/arch/mips/ralink/reset.c
index 22120e512e7e..55c7ec59df3c 100644
--- a/arch/mips/ralink/reset.c
+++ b/arch/mips/ralink/reset.c
@@ -10,6 +10,8 @@
 
 #include <linux/pm.h>
 #include <linux/io.h>
+#include <linux/of.h>
+#include <linux/reset-controller.h>
 
 #include <asm/reboot.h>
 
@@ -19,6 +21,66 @@
 #define SYSC_REG_RESET_CTRL     0x034
 #define RSTCTL_RESET_SYSTEM     BIT(0)
 
+static int ralink_assert_device(struct reset_controller_dev *rcdev,
+                                unsigned long id)
+{
+        u32 val;
+
+        if (id < 8)
+                return -1;
+
+        val = rt_sysc_r32(SYSC_REG_RESET_CTRL);
+        val |= BIT(id);
+        rt_sysc_w32(val, SYSC_REG_RESET_CTRL);
+
+        return 0;
+}
+
+static int ralink_deassert_device(struct reset_controller_dev *rcdev,
+                                  unsigned long id)
+{
+        u32 val;
+
+        if (id < 8)
+                return -1;
+
+        val = rt_sysc_r32(SYSC_REG_RESET_CTRL);
+        val &= ~BIT(id);
+        rt_sysc_w32(val, SYSC_REG_RESET_CTRL);
+
+        return 0;
+}
+
+static int ralink_reset_device(struct reset_controller_dev *rcdev,
+                               unsigned long id)
+{
+        ralink_assert_device(rcdev, id);
+        return ralink_deassert_device(rcdev, id);
+}
+
+static struct reset_control_ops reset_ops = {
+        .reset = ralink_reset_device,
+        .assert = ralink_assert_device,
+        .deassert = ralink_deassert_device,
+};
+
+static struct reset_controller_dev reset_dev = {
+        .ops                    = &reset_ops,
+        .owner                  = THIS_MODULE,
+        .nr_resets              = 32,
+        .of_reset_n_cells       = 1,
+};
+
+void ralink_rst_init(void)
+{
+        reset_dev.of_node = of_find_compatible_node(NULL, NULL,
+                                                "ralink,rt2880-reset");
+        if (!reset_dev.of_node)
+                pr_err("Failed to find reset controller node");
+        else
+                reset_controller_register(&reset_dev);
+}
+
 static void ralink_restart(char *command)
 {
         local_irq_disable();
diff --git a/arch/mips/ralink/timer.c b/arch/mips/ralink/timer.c
new file mode 100644
index 000000000000..e49241a2c39a
--- /dev/null
+++ b/arch/mips/ralink/timer.c
@@ -0,0 +1,185 @@
+/*
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 as published
+ * by the Free Software Foundation.
+ *
+ * Copyright (C) 2013 John Crispin <blogic@openwrt.org>
+*/
+
+#include <linux/module.h>
+#include <linux/platform_device.h>
+#include <linux/interrupt.h>
+#include <linux/timer.h>
+#include <linux/of_gpio.h>
+#include <linux/clk.h>
+
+#include <asm/mach-ralink/ralink_regs.h>
+
+#define TIMER_REG_TMRSTAT               0x00
+#define TIMER_REG_TMR0LOAD              0x10
+#define TIMER_REG_TMR0CTL               0x18
+
+#define TMRSTAT_TMR0INT                 BIT(0)
+
+#define TMR0CTL_ENABLE                  BIT(7)
+#define TMR0CTL_MODE_PERIODIC           BIT(4)
+#define TMR0CTL_PRESCALER               1
+#define TMR0CTL_PRESCALE_VAL            (0xf - TMR0CTL_PRESCALER)
+#define TMR0CTL_PRESCALE_DIV            (65536 / BIT(TMR0CTL_PRESCALER))
+
+struct rt_timer {
+        struct device   *dev;
+        void __iomem    *membase;
+        int             irq;
+        unsigned long   timer_freq;
+        unsigned long   timer_div;
+};
+
+static inline void rt_timer_w32(struct rt_timer *rt, u8 reg, u32 val)
+{
+        __raw_writel(val, rt->membase + reg);
+}
+
+static inline u32 rt_timer_r32(struct rt_timer *rt, u8 reg)
+{
+        return __raw_readl(rt->membase + reg);
+}
+
+static irqreturn_t rt_timer_irq(int irq, void *_rt)
+{
+        struct rt_timer *rt =  (struct rt_timer *) _rt;
+
+        rt_timer_w32(rt, TIMER_REG_TMR0LOAD, rt->timer_freq / rt->timer_div);
+        rt_timer_w32(rt, TIMER_REG_TMRSTAT, TMRSTAT_TMR0INT);
+
+        return IRQ_HANDLED;
+}
+
+
+static int rt_timer_request(struct rt_timer *rt)
+{
+        int err = request_irq(rt->irq, rt_timer_irq, IRQF_DISABLED,
+                                                dev_name(rt->dev), rt);
+        if (err) {
+                dev_err(rt->dev, "failed to request irq\n");
+        } else {
+                u32 t = TMR0CTL_MODE_PERIODIC | TMR0CTL_PRESCALE_VAL;
+                rt_timer_w32(rt, TIMER_REG_TMR0CTL, t);
+        }
+        return err;
+}
+
+static void rt_timer_free(struct rt_timer *rt)
+{
+        free_irq(rt->irq, rt);
+}
+
+static int rt_timer_config(struct rt_timer *rt, unsigned long divisor)
+{
+        if (rt->timer_freq < divisor)
+                rt->timer_div = rt->timer_freq;
+        else
+                rt->timer_div = divisor;
+
+        rt_timer_w32(rt, TIMER_REG_TMR0LOAD, rt->timer_freq / rt->timer_div);
+
+        return 0;
+}
+
+static int rt_timer_enable(struct rt_timer *rt)
+{
+        u32 t;
+
+        rt_timer_w32(rt, TIMER_REG_TMR0LOAD, rt->timer_freq / rt->timer_div);
+
+        t = rt_timer_r32(rt, TIMER_REG_TMR0CTL);
+        t |= TMR0CTL_ENABLE;
+        rt_timer_w32(rt, TIMER_REG_TMR0CTL, t);
+
+        return 0;
+}
+
+static void rt_timer_disable(struct rt_timer *rt)
+{
+        u32 t;
+
+        t = rt_timer_r32(rt, TIMER_REG_TMR0CTL);
+        t &= ~TMR0CTL_ENABLE;
+        rt_timer_w32(rt, TIMER_REG_TMR0CTL, t);
+}
+
+static int rt_timer_probe(struct platform_device *pdev)
+{
+        struct resource *res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+        struct rt_timer *rt;
+        struct clk *clk;
+
+        rt = devm_kzalloc(&pdev->dev, sizeof(*rt), GFP_KERNEL);
+        if (!rt) {
+                dev_err(&pdev->dev, "failed to allocate memory\n");
+                return -ENOMEM;
+        }
+
+        rt->irq = platform_get_irq(pdev, 0);
+        if (!rt->irq) {
+                dev_err(&pdev->dev, "failed to load irq\n");
+                return -ENOENT;
+        }
+
+        rt->membase = devm_request_and_ioremap(&pdev->dev, res);
+        if (IS_ERR(rt->membase))
+                return PTR_ERR(rt->membase);
+
+        clk = devm_clk_get(&pdev->dev, NULL);
+        if (IS_ERR(clk)) {
+                dev_err(&pdev->dev, "failed get clock rate\n");
+                return PTR_ERR(clk);
+        }
+
+        rt->timer_freq = clk_get_rate(clk) / TMR0CTL_PRESCALE_DIV;
+        if (!rt->timer_freq)
+                return -EINVAL;
+
+        rt->dev = &pdev->dev;
+        platform_set_drvdata(pdev, rt);
+
+        rt_timer_request(rt);
+        rt_timer_config(rt, 2);
+        rt_timer_enable(rt);
+
+        dev_info(&pdev->dev, "maximum frequncy is %luHz\n", rt->timer_freq);
+
+        return 0;
+}
+
+static int rt_timer_remove(struct platform_device *pdev)
+{
+        struct rt_timer *rt = platform_get_drvdata(pdev);
+
+        rt_timer_disable(rt);
+        rt_timer_free(rt);
+
+        return 0;
+}
+
+static const struct of_device_id rt_timer_match[] = {
+        { .compatible = "ralink,rt2880-timer" },
+        {},
+};
+MODULE_DEVICE_TABLE(of, rt_timer_match);
+
+static struct platform_driver rt_timer_driver = {
+        .probe = rt_timer_probe,
+        .remove = rt_timer_remove,
+        .driver = {
+                .name           = "rt-timer",
+                .owner          = THIS_MODULE,
+                .of_match_table = rt_timer_match
+        },
+};
+
+module_platform_driver(rt_timer_driver);
+
+MODULE_DESCRIPTION("Ralink RT2880 timer");
+MODULE_AUTHOR("John Crispin <blogic@openwrt.org");
+MODULE_LICENSE("GPL");
diff --git a/arch/mips/sibyte/bcm1480/setup.c b/arch/mips/sibyte/bcm1480/setup.c
index 05ed92c92b69..8e2e04f77870 100644
--- a/arch/mips/sibyte/bcm1480/setup.c
+++ b/arch/mips/sibyte/bcm1480/setup.c
@@ -22,6 +22,7 @@
 #include <linux/string.h>
 
 #include <asm/bootinfo.h>
+#include <asm/cpu.h>
 #include <asm/mipsregs.h>
 #include <asm/io.h>
 #include <asm/sibyte/sb1250.h>
@@ -119,7 +120,7 @@ void __init bcm1480_setup(void)
         uint64_t sys_rev;
         int plldiv;
 
-        sb1_pass = read_c0_prid() & 0xff;
+        sb1_pass = read_c0_prid() & PRID_REV_MASK;
         sys_rev = __raw_readq(IOADDR(A_SCD_SYSTEM_REVISION));
         soc_type = SYS_SOC_TYPE(sys_rev);
         part_type = G_SYS_PART(sys_rev);
diff --git a/arch/mips/sibyte/sb1250/setup.c b/arch/mips/sibyte/sb1250/setup.c
index a14bd4cb0bc0..3c02b2a77ae9 100644
--- a/arch/mips/sibyte/sb1250/setup.c
+++ b/arch/mips/sibyte/sb1250/setup.c
@@ -22,6 +22,7 @@
 #include <linux/string.h>
 
 #include <asm/bootinfo.h>
+#include <asm/cpu.h>
 #include <asm/mipsregs.h>
 #include <asm/io.h>
 #include <asm/sibyte/sb1250.h>
@@ -182,7 +183,7 @@ void __init sb1250_setup(void)
         int plldiv;
         int bad_config = 0;
 
-        sb1_pass = read_c0_prid() & 0xff;
+        sb1_pass = read_c0_prid() & PRID_REV_MASK;
         sys_rev = __raw_readq(IOADDR(A_SCD_SYSTEM_REVISION));
         soc_type = SYS_SOC_TYPE(sys_rev);
         soc_pass = G_SYS_REVISION(sys_rev);
diff --git a/arch/mips/sni/a20r.c b/arch/mips/sni/a20r.c
index dd0ab982d77e..f9407e170476 100644
--- a/arch/mips/sni/a20r.c
+++ b/arch/mips/sni/a20r.c
@@ -122,7 +122,6 @@ static struct resource sc26xx_rsrc[] = {
 
 static struct sccnxp_pdata sccnxp_data = {
         .reg_shift      = 2,
-        .frequency      = 3686400,
         .mctrl_cfg[0]   = MCTRL_SIG(DTR_OP, LINE_OP7) |
                           MCTRL_SIG(RTS_OP, LINE_OP3) |
                           MCTRL_SIG(DSR_IP, LINE_IP5) |
diff --git a/arch/mips/sni/setup.c b/arch/mips/sni/setup.c
index 5b09b3544edd..efad85c8c823 100644
--- a/arch/mips/sni/setup.c
+++ b/arch/mips/sni/setup.c
@@ -25,6 +25,7 @@
 #endif
 
 #include <asm/bootinfo.h>
+#include <asm/cpu.h>
 #include <asm/io.h>
 #include <asm/reboot.h>
 #include <asm/sni.h>
@@ -173,7 +174,7 @@ void __init plat_mem_setup(void)
                 system_type = "RM300-Cxx";
                 break;
         case SNI_BRD_PCI_DESKTOP:
-                switch (read_c0_prid() & 0xff00) {
+                switch (read_c0_prid() & PRID_IMP_MASK) {
                 case PRID_IMP_R4600:
                 case PRID_IMP_R4700:
                         system_type = "RM200-C20";
diff --git a/arch/mips/txx9/generic/setup.c b/arch/mips/txx9/generic/setup.c
index 681e7f86c080..2b0b83c171e0 100644
--- a/arch/mips/txx9/generic/setup.c
+++ b/arch/mips/txx9/generic/setup.c
@@ -350,7 +350,7 @@ static void __init select_board(void)
         }
 
         /* select "default" board */
-#ifdef CONFIG_CPU_TX39XX
+#ifdef CONFIG_TOSHIBA_JMR3927
         txx9_board_vec = &jmr3927_vec;
 #endif
 #ifdef CONFIG_CPU_TX49XX
diff --git a/arch/mn10300/Kconfig b/arch/mn10300/Kconfig
index 70e4f663ebd2..6aaa1607001a 100644
--- a/arch/mn10300/Kconfig
+++ b/arch/mn10300/Kconfig
@@ -1,7 +1,6 @@
 config MN10300
         def_bool y
         select HAVE_OPROFILE
-        select HAVE_GENERIC_HARDIRQS
         select GENERIC_IRQ_SHOW
         select ARCH_WANT_IPC_PARSE_VERSION
         select HAVE_ARCH_TRACEHOOK
diff --git a/arch/mn10300/kernel/entry.S b/arch/mn10300/kernel/entry.S
index 222152a3f751..177d61de51c9 100644
--- a/arch/mn10300/kernel/entry.S
+++ b/arch/mn10300/kernel/entry.S
@@ -171,10 +171,10 @@ ret_from_intr:
         mov     (REG_EPSW,fp),d0        # need to deliver signals before
                                         # returning to userspace
         and     EPSW_nSL,d0
-        beq     resume_kernel           # returning to supervisor mode
+        bne     resume_userspace        # returning to userspace
 
 #ifdef CONFIG_PREEMPT
-ENTRY(resume_kernel)
+resume_kernel:
         LOCAL_IRQ_DISABLE
         mov     (TI_preempt_count,a2),d0        # non-zero preempt_count ?
         cmp     0,d0
@@ -189,6 +189,8 @@ need_resched:
         bne     restore_all
         call    preempt_schedule_irq[],0
         jmp     need_resched
+#else
+        jmp     resume_kernel
 #endif
 
 
diff --git a/arch/mn10300/mm/fault.c b/arch/mn10300/mm/fault.c
index 8a2e6ded9a44..3516cbdf1ee9 100644
--- a/arch/mn10300/mm/fault.c
+++ b/arch/mn10300/mm/fault.c
@@ -171,6 +171,8 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long fault_code,
         if (in_atomic() || !mm)
                 goto no_context;
 
+        if ((fault_code & MMUFCR_xFC_ACCESS) == MMUFCR_xFC_ACCESS_USR)
+                flags |= FAULT_FLAG_USER;
 retry:
         down_read(&mm->mmap_sem);
 
diff --git a/arch/openrisc/Kconfig b/arch/openrisc/Kconfig
index d60bf98fa5cf..9488209a5253 100644
--- a/arch/openrisc/Kconfig
+++ b/arch/openrisc/Kconfig
@@ -11,7 +11,6 @@ config OPENRISC
         select HAVE_MEMBLOCK
         select ARCH_REQUIRE_GPIOLIB
         select HAVE_ARCH_TRACEHOOK
-        select HAVE_GENERIC_HARDIRQS
         select GENERIC_IRQ_CHIP
         select GENERIC_IRQ_PROBE
         select GENERIC_IRQ_SHOW
diff --git a/arch/openrisc/include/asm/prom.h b/arch/openrisc/include/asm/prom.h
index bbb34e5343a2..eb59bfe23e85 100644
--- a/arch/openrisc/include/asm/prom.h
+++ b/arch/openrisc/include/asm/prom.h
@@ -44,9 +44,6 @@ void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop,
 
 extern void kdump_move_device_tree(void);
 
-/* CPU OF node matching */
-struct device_node *of_get_cpu_node(int cpu, unsigned int *thread);
-
 /* Get the MAC address */
 extern const void *of_get_mac_address(struct device_node *np);
 
diff --git a/arch/openrisc/kernel/prom.c b/arch/openrisc/kernel/prom.c
index 5869e3fa5dd3..a63e76872f84 100644
--- a/arch/openrisc/kernel/prom.c
+++ b/arch/openrisc/kernel/prom.c
@@ -55,11 +55,6 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
         memblock_add(base, size);
 }
 
-void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
-{
-        return __va(memblock_alloc(size, align));
-}
-
 void __init early_init_devtree(void *params)
 {
         void *alloc;
@@ -96,8 +91,7 @@ void __init early_init_devtree(void *params)
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
-void __init early_init_dt_setup_initrd_arch(unsigned long start,
-                unsigned long end)
+void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
 {
         initrd_start = (unsigned long)__va(start);
         initrd_end = (unsigned long)__va(end);
diff --git a/arch/openrisc/mm/fault.c b/arch/openrisc/mm/fault.c
index 4a41f8493ab0..0703acf7d327 100644
--- a/arch/openrisc/mm/fault.c
+++ b/arch/openrisc/mm/fault.c
@@ -86,6 +86,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long address,
         if (user_mode(regs)) {
                 /* Exception was in userspace: reenable interrupts */
                 local_irq_enable();
+                flags |= FAULT_FLAG_USER;
         } else {
                 /* If exception was in a syscall, then IRQ's may have
                  * been enabled or disabled.  If they were enabled,
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index aa399a5259b6..ad2ce8dab996 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -14,7 +14,6 @@ config PARISC
         select HAVE_PERF_EVENTS
         select GENERIC_ATOMIC64 if !64BIT
         select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
-        select HAVE_GENERIC_HARDIRQS
         select BROKEN_RODATA
         select GENERIC_IRQ_PROBE
         select GENERIC_PCI_IOMAP
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c
index 07349b002687..1cba8f29bb49 100644
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
@@ -78,7 +78,7 @@ restore_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs)
         err |= __copy_from_user(regs->iaoq, sc->sc_iaoq, sizeof(regs->iaoq));
         err |= __copy_from_user(regs->iasq, sc->sc_iasq, sizeof(regs->iasq));
         err |= __get_user(regs->sar, &sc->sc_sar);
-        DBG(2,"restore_sigcontext: iaoq is 0x%#lx / 0x%#lx\n", 
+        DBG(2,"restore_sigcontext: iaoq is %#lx / %#lx\n",
                         regs->iaoq[0],regs->iaoq[1]);
         DBG(2,"restore_sigcontext: r28 is %ld\n", regs->gr[28]);
         return err;
diff --git a/arch/parisc/mm/fault.c b/arch/parisc/mm/fault.c
index f247a3480e8e..d10d27a720c0 100644
--- a/arch/parisc/mm/fault.c
+++ b/arch/parisc/mm/fault.c
@@ -180,6 +180,10 @@ void do_page_fault(struct pt_regs *regs, unsigned long code,
         if (in_atomic() || !mm)
                 goto no_context;
 
+        if (user_mode(regs))
+                flags |= FAULT_FLAG_USER;
+        if (acc_type & VM_WRITE)
+                flags |= FAULT_FLAG_WRITE;
 retry:
         down_read(&mm->mmap_sem);
         vma = find_vma_prev(mm, address, &prev_vma);
@@ -203,8 +207,7 @@ good_area:
          * fault.
          */
 
-        fault = handle_mm_fault(mm, vma, address,
-                        flags | ((acc_type & VM_WRITE) ? FAULT_FLAG_WRITE : 0));
+        fault = handle_mm_fault(mm, vma, address, flags);
 
         if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current))
                 return;
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index dbd9d3c991e8..38f3b7e47ec5 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -114,7 +114,6 @@ config PPC
         select HAVE_PERF_EVENTS
         select HAVE_REGS_AND_STACK_ACCESS_API
         select HAVE_HW_BREAKPOINT if PERF_EVENTS && PPC_BOOK3S_64
-        select HAVE_GENERIC_HARDIRQS
         select ARCH_WANT_IPC_PARSE_VERSION
         select SPARSE_IRQ
         select IRQ_DOMAIN
@@ -312,6 +311,26 @@ config MATH_EMULATION
           such as fsqrt on cores that do have an FPU but do not implement
           them (such as Freescale BookE).
 
+choice
+        prompt "Math emulation options"
+        default MATH_EMULATION_FULL
+        depends on MATH_EMULATION
+
+config  MATH_EMULATION_FULL
+        bool "Emulate all the floating point instructions"
+        ---help---
+          Select this option will enable the kernel to support to emulate
+          all the floating point instructions. If your SoC doesn't have
+          a FPU, you should select this.
+
+config MATH_EMULATION_HW_UNIMPLEMENTED
+        bool "Just emulate the FPU unimplemented instructions"
+        ---help---
+          Select this if you know there does have a hardware FPU on your
+          SoC, but some floating point instructions are not implemented by that.
+
+endchoice
+
 config PPC_TRANSACTIONAL_MEM
        bool "Transactional Memory support for POWERPC"
        depends on PPC_BOOK3S_64
@@ -369,9 +388,9 @@ config KEXEC
 
           It is an ongoing process to be certain the hardware in a machine
           is properly shutdown, so do not be surprised if this code does not
-          initially work for you.  It may help to enable device hotplugging
-          support.  As of this writing the exact hardware interface is
-          strongly in flux, so no good recommendation can be made.
+          initially work for you.  As of this writing the exact hardware
+          interface is strongly in flux, so no good recommendation can be
+          made.
 
 config CRASH_DUMP
         bool "Build a kdump crash kernel"
@@ -727,7 +746,6 @@ config PCI
         default y if !40x && !CPM2 && !8xx && !PPC_83xx \
                 && !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON
         default PCI_QSPAN if !4xx && !CPM2 && 8xx
-        select ARCH_SUPPORTS_MSI
         select GENERIC_PCI_IOMAP
         help
           Find out whether your system includes a PCI bus. PCI is the name of
@@ -979,6 +997,7 @@ config RELOCATABLE
           must live at a different physical address than the primary
           kernel.
 
+# This value must have zeroes in the bottom 60 bits otherwise lots will break
 config PAGE_OFFSET
         hex
         default "0xc000000000000000"
diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile
index 967fd23ace78..51cfb78d4061 100644
--- a/arch/powerpc/Makefile
+++ b/arch/powerpc/Makefile
@@ -88,13 +88,30 @@ CFLAGS-$(CONFIG_PPC64)	+= $(call cc-option,-mcmodel=medium,-mminimal-toc)
 CFLAGS-$(CONFIG_PPC64)  += $(call cc-option,-mno-pointers-to-nested-functions)
 CFLAGS-$(CONFIG_PPC32)  := -ffixed-r2 -mmultiple
 
+ifeq ($(CONFIG_PPC_BOOK3S_64),y)
 CFLAGS-$(CONFIG_GENERIC_CPU) += $(call cc-option,-mtune=power7,-mtune=power4)
+else
+CFLAGS-$(CONFIG_GENERIC_CPU) += -mcpu=powerpc64
+endif
+
 CFLAGS-$(CONFIG_CELL_CPU) += $(call cc-option,-mcpu=cell)
 CFLAGS-$(CONFIG_POWER4_CPU) += $(call cc-option,-mcpu=power4)
 CFLAGS-$(CONFIG_POWER5_CPU) += $(call cc-option,-mcpu=power5)
 CFLAGS-$(CONFIG_POWER6_CPU) += $(call cc-option,-mcpu=power6)
 CFLAGS-$(CONFIG_POWER7_CPU) += $(call cc-option,-mcpu=power7)
 
+E5500_CPU := $(call cc-option,-mcpu=e500mc64,-mcpu=powerpc64)
+CFLAGS-$(CONFIG_E5500_CPU) += $(E5500_CPU)
+CFLAGS-$(CONFIG_E6500_CPU) += $(call cc-option,-mcpu=e6500,$(E5500_CPU))
+
+ifeq ($(CONFIG_PPC32),y)
+ifeq ($(CONFIG_PPC_E500MC),y)
+CFLAGS-y += $(call cc-option,-mcpu=e500mc,-mcpu=powerpc)
+else
+CFLAGS-$(CONFIG_E500) += $(call cc-option,-mcpu=8540 -msoft-float,-mcpu=powerpc)
+endif
+endif
+
 CFLAGS-$(CONFIG_TUNE_CELL) += $(call cc-option,-mtune=cell)
 
 KBUILD_CPPFLAGS += -Iarch/$(ARCH)
@@ -139,7 +156,6 @@ endif
 
 cpu-as-$(CONFIG_4xx)            += -Wa,-m405
 cpu-as-$(CONFIG_ALTIVEC)        += -Wa,-maltivec
-cpu-as-$(CONFIG_E500)           += -Wa,-me500
 cpu-as-$(CONFIG_E200)           += -Wa,-me200
 
 KBUILD_AFLAGS += $(cpu-as-y)
diff --git a/arch/powerpc/boot/.gitignore b/arch/powerpc/boot/.gitignore
index c32ae5ce9fff..554734ff302e 100644
--- a/arch/powerpc/boot/.gitignore
+++ b/arch/powerpc/boot/.gitignore
@@ -22,6 +22,7 @@ zImage.initrd
 zImage.bin.*
 zImage.chrp
 zImage.coff
+zImage.epapr
 zImage.holly
 zImage.*lds
 zImage.miboot
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 6a15c968d214..15ca2255f438 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -74,7 +74,7 @@ src-wlib-$(CONFIG_8xx) += mpc8xx.c planetcore.c
 src-wlib-$(CONFIG_PPC_82xx) += pq2.c fsl-soc.c planetcore.c
 src-wlib-$(CONFIG_EMBEDDED6xx) += mv64x60.c mv64x60_i2c.c ugecon.c
 
-src-plat-y := of.c
+src-plat-y := of.c epapr.c
 src-plat-$(CONFIG_40x) += fixed-head.S ep405.c cuboot-hotfoot.c \
                                 treeboot-walnut.c cuboot-acadia.c \
                                 cuboot-kilauea.c simpleboot.c \
@@ -97,7 +97,7 @@ src-plat-$(CONFIG_EMBEDDED6xx) += cuboot-pq2.c cuboot-mpc7448hpc2.c \
                                         prpmc2800.c
 src-plat-$(CONFIG_AMIGAONE) += cuboot-amigaone.c
 src-plat-$(CONFIG_PPC_PS3) += ps3-head.S ps3-hvcall.S ps3.c
-src-plat-$(CONFIG_EPAPR_BOOT) += epapr.c
+src-plat-$(CONFIG_EPAPR_BOOT) += epapr.c epapr-wrapper.c
 
 src-wlib := $(sort $(src-wlib-y))
 src-plat := $(sort $(src-plat-y))
diff --git a/arch/powerpc/boot/dts/ac14xx.dts b/arch/powerpc/boot/dts/ac14xx.dts
index a27a4609bb42..a543c4088cba 100644
--- a/arch/powerpc/boot/dts/ac14xx.dts
+++ b/arch/powerpc/boot/dts/ac14xx.dts
@@ -10,7 +10,7 @@
  */
 
 
-/include/ "mpc5121.dtsi"
+#include <mpc5121.dtsi>
 
 / {
         model = "ac14xx";
diff --git a/arch/powerpc/boot/dts/b4420qds.dts b/arch/powerpc/boot/dts/b4420qds.dts
index 923156d03b30..508dbdf33c81 100644
--- a/arch/powerpc/boot/dts/b4420qds.dts
+++ b/arch/powerpc/boot/dts/b4420qds.dts
@@ -33,7 +33,7 @@
  */
 
 /include/ "fsl/b4420si-pre.dtsi"
-/include/ "b4qds.dts"
+/include/ "b4qds.dtsi"
 
 / {
         model = "fsl,B4420QDS";
diff --git a/arch/powerpc/boot/dts/b4860qds.dts b/arch/powerpc/boot/dts/b4860qds.dts
index 78907f38bb77..6bb3707ffe3d 100644
--- a/arch/powerpc/boot/dts/b4860qds.dts
+++ b/arch/powerpc/boot/dts/b4860qds.dts
@@ -33,7 +33,7 @@
  */
 
 /include/ "fsl/b4860si-pre.dtsi"
-/include/ "b4qds.dts"
+/include/ "b4qds.dtsi"
 
 / {
         model = "fsl,B4860QDS";
diff --git a/arch/powerpc/boot/dts/b4qds.dts b/arch/powerpc/boot/dts/b4qds.dtsi
index e6d2f8f90544..e6d2f8f90544 100644
--- a/arch/powerpc/boot/dts/b4qds.dts
+++ b/arch/powerpc/boot/dts/b4qds.dtsi
diff --git a/arch/powerpc/boot/dts/c293pcie.dts b/arch/powerpc/boot/dts/c293pcie.dts
new file mode 100644
index 000000000000..1238bda8901f
--- /dev/null
+++ b/arch/powerpc/boot/dts/c293pcie.dts
@@ -0,0 +1,223 @@
+/*
+ * C293 PCIE Device Tree Source
+ *
+ * Copyright 2013 Freescale Semiconductor Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Freescale Semiconductor nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") as published by the Free Software
+ * Foundation, either version 2 of that License or (at your option) any
+ * later version.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor "AS IS" AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/include/ "fsl/c293si-pre.dtsi"
+
+/ {
+        model = "fsl,C293PCIE";
+        compatible = "fsl,C293PCIE";
+
+        memory {
+                device_type = "memory";
+        };
+
+        ifc: ifc@fffe1e000 {
+                reg = <0xf 0xffe1e000 0 0x2000>;
+                ranges = <0x0 0x0 0xf 0xec000000 0x04000000
+                          0x2 0x0 0xf 0xffdf0000 0x00010000>;
+
+        };
+
+        soc: soc@fffe00000 {
+                ranges = <0x0 0xf 0xffe00000 0x100000>;
+        };
+
+        pci0: pcie@fffe0a000 {
+                reg = <0xf 0xffe0a000 0 0x1000>;
+                ranges = <0x2000000 0x0 0x80000000 0xc 0x00000000 0x0 0x20000000
+                          0x1000000 0x0 0x00000000 0xf 0xffc00000 0x0 0x10000>;
+                pcie@0 {
+                        ranges = <0x2000000 0x0 0x80000000
+                                  0x2000000 0x0 0x80000000
+                                  0x0 0x20000000
+
+                                  0x1000000 0x0 0x0
+                                  0x1000000 0x0 0x0
+                                  0x0 0x100000>;
+                };
+        };
+};
+
+&ifc {
+        nor@0,0 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "cfi-flash";
+                reg = <0x0 0x0 0x4000000>;
+                bank-width = <2>;
+                device-width = <1>;
+
+                partition@0 {
+                        /* 1MB for DTB Image */
+                        reg = <0x0 0x00100000>;
+                        label = "NOR DTB Image";
+                };
+
+                partition@100000 {
+                        /* 8 MB for Linux Kernel Image */
+                        reg = <0x00100000 0x00800000>;
+                        label = "NOR Linux Kernel Image";
+                };
+
+                partition@900000 {
+                        /* 53MB for rootfs */
+                        reg = <0x00900000 0x03500000>;
+                        label = "NOR Rootfs Image";
+                };
+
+                partition@3e00000 {
+                        /* 1MB for blob encrypted key */
+                        reg = <0x03e00000 0x00100000>;
+                        label = "NOR blob encrypted key";
+                };
+
+                partition@3f00000 {
+                        /* 512KB for u-boot Bootloader Image and evn */
+                        reg = <0x03f00000 0x00100000>;
+                        label = "NOR U-Boot Image";
+                        read-only;
+                };
+        };
+
+        nand@1,0 {
+                #address-cells = <1>;
+                #size-cells = <1>;
+                compatible = "fsl,ifc-nand";
+                reg = <0x1 0x0 0x10000>;
+
+                partition@0 {
+                        /* This location must not be altered  */
+                        /* 1MB for u-boot Bootloader Image */
+                        reg = <0x0 0x00100000>;
+                        label = "NAND U-Boot Image";
+                        read-only;
+                };
+
+                partition@100000 {
+                        /* 1MB for DTB Image */
+                        reg = <0x00100000 0x00100000>;
+                        label = "NAND DTB Image";
+                };
+
+                partition@200000 {
+                        /* 16MB for Linux Kernel Image */
+                        reg = <0x00200000 0x01000000>;
+                        label = "NAND Linux Kernel Image";
+                };
+
+                partition@1200000 {
+                        /* 4078MB for Root file System Image */
+                        reg = <0x00600000 0xfee00000>;
+                        label = "NAND RFS Image";
+                };
+        };
+
+        cpld@2,0 {
+                compatible = "fsl,c293pcie-cpld";
+                reg = <0x2 0x0 0x20>;
+        };
+};
+
+&soc {
+        i2c@3000 {
+                eeprom@50 {
+                        compatible = "st,24c1024";
+                        reg = <0x50>;
+                };
+
+                adt7461@4c {
+                        compatible = "adi,adt7461";
+                        reg = <0x4c>;
+                };
+        };
+
+        spi@7000 {
+                flash@0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "spansion,s25sl12801";
+                        reg = <0>;
+                        spi-max-frequency = <50000000>;
+
+                        partition@0 {
+                                /* 1MB for u-boot Bootloader Image */
+                                /* 1MB for Environment */
+                                reg = <0x0 0x00100000>;
+                                label = "SPI Flash U-Boot Image";
+                                read-only;
+                        };
+
+                        partition@100000 {
+                                /* 512KB for DTB Image */
+                                reg = <0x00100000 0x00080000>;
+                                label = "SPI Flash DTB Image";
+                        };
+
+                        partition@180000 {
+                                /* 4MB for Linux Kernel Image */
+                                reg = <0x00180000 0x00400000>;
+                                label = "SPI Flash Linux Kernel Image";
+                        };
+
+                        partition@580000 {
+                                /* 10.5MB for RFS Image */
+                                reg = <0x00580000 0x00a80000>;
+                                label = "SPI Flash RFS Image";
+                        };
+                };
+        };
+
+        mdio@24000 {
+                phy0: ethernet-phy@0 {
+                        interrupts = <2 1 0 0>;
+                        reg = <0x0>;
+                };
+
+                phy1: ethernet-phy@1 {
+                        interrupts = <2 1 0 0>;
+                        reg = <0x2>;
+                };
+        };
+
+        enet0: ethernet@b0000 {
+                phy-handle = <&phy0>;
+                phy-connection-type = "rgmii-id";
+        };
+
+        enet1: ethernet@b1000 {
+                phy-handle = <&phy1>;
+                phy-connection-type = "rgmii-id";
+        };
+};
+/include/ "fsl/c293si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/fsl/b4si-post.dtsi b/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
index 73991547c69b..4c617bf8cdb2 100644
--- a/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/b4si-post.dtsi
@@ -204,7 +204,7 @@
                 };
         };
 
-/include/ "qoriq-mpic.dtsi"
+/include/ "qoriq-mpic4.3.dtsi"
 
         guts: global-utilities@e0000 {
                 compatible = "fsl,b4-device-config";
diff --git a/arch/powerpc/boot/dts/fsl/c293si-post.dtsi b/arch/powerpc/boot/dts/fsl/c293si-post.dtsi
new file mode 100644
index 000000000000..bd208320bff5
--- /dev/null
+++ b/arch/powerpc/boot/dts/fsl/c293si-post.dtsi
@@ -0,0 +1,193 @@
+/*
+ * C293 Silicon/SoC Device Tree Source (post include)
+ *
+ * Copyright 2012 Freescale Semiconductor Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Freescale Semiconductor nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") as published by the Free Software
+ * Foundation, either version 2 of that License or (at your option) any
+ * later version.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+&ifc {
+        #address-cells = <2>;
+        #size-cells = <1>;
+        compatible = "fsl,ifc", "simple-bus";
+        interrupts = <19 2 0 0>;
+};
+
+/* controller at 0xa000 */
+&pci0 {
+        compatible = "fsl,qoriq-pcie-v2.2", "fsl,qoriq-pcie";
+        device_type = "pci";
+        #size-cells = <2>;
+        #address-cells = <3>;
+        bus-range = <0 255>;
+        clock-frequency = <33333333>;
+        interrupts = <16 2 0 0>;
+
+        pcie@0 {
+                reg = <0 0 0 0 0>;
+                #interrupt-cells = <1>;
+                #size-cells = <2>;
+                #address-cells = <3>;
+                device_type = "pci";
+                interrupts = <16 2 0 0>;
+                interrupt-map-mask = <0xf800 0 0 7>;
+                interrupt-map = <
+                        /* IDSEL 0x0 */
+                        0000 0x0 0x0 0x1 &mpic 0x0 0x1 0x0 0x0
+                        0000 0x0 0x0 0x2 &mpic 0x1 0x1 0x0 0x0
+                        0000 0x0 0x0 0x3 &mpic 0x2 0x1 0x0 0x0
+                        0000 0x0 0x0 0x4 &mpic 0x3 0x1 0x0 0x0
+                        >;
+        };
+};
+
+&soc {
+        #address-cells = <1>;
+        #size-cells = <1>;
+        device_type = "soc";
+        compatible = "simple-bus";
+        bus-frequency = <0>;            // Filled out by uboot.
+
+        ecm-law@0 {
+                compatible = "fsl,ecm-law";
+                reg = <0x0 0x1000>;
+                fsl,num-laws = <12>;
+        };
+
+        ecm@1000 {
+                compatible = "fsl,c293-ecm", "fsl,ecm";
+                reg = <0x1000 0x1000>;
+                interrupts = <16 2 0 0>;
+        };
+
+        memory-controller@2000 {
+                compatible = "fsl,c293-memory-controller";
+                reg = <0x2000 0x1000>;
+                interrupts = <16 2 0 0>;
+        };
+
+/include/ "pq3-i2c-0.dtsi"
+/include/ "pq3-i2c-1.dtsi"
+/include/ "pq3-duart-0.dtsi"
+/include/ "pq3-espi-0.dtsi"
+        spi0: spi@7000 {
+                fsl,espi-num-chipselects = <1>;
+        };
+
+/include/ "pq3-gpio-0.dtsi"
+        L2: l2-cache-controller@20000 {
+                compatible = "fsl,c293-l2-cache-controller";
+                reg = <0x20000 0x1000>;
+                cache-line-size = <32>; // 32 bytes
+                cache-size = <0x80000>; // L2,512K
+                interrupts = <16 2 0 0>;
+        };
+
+/include/ "pq3-dma-0.dtsi"
+/include/ "pq3-esdhc-0.dtsi"
+        sdhc@2e000 {
+                compatible = "fsl,c293-esdhc", "fsl,esdhc";
+                sdhci,auto-cmd12;
+        };
+
+        crypto@80000 {
+/include/ "qoriq-sec6.0-0.dtsi"
+        };
+
+        crypto@80000 {
+                reg = <0x80000 0x20000>;
+                ranges = <0x0 0x80000 0x20000>;
+
+                jr@1000{
+                        interrupts = <45 2 0 0>;
+                };
+                jr@2000{
+                        interrupts = <57 2 0 0>;
+                };
+        };
+
+        crypto@a0000 {
+/include/ "qoriq-sec6.0-0.dtsi"
+        };
+
+        crypto@a0000 {
+                reg = <0xa0000 0x20000>;
+                ranges = <0x0 0xa0000 0x20000>;
+
+                jr@1000{
+                        interrupts = <49 2 0 0>;
+                };
+                jr@2000{
+                        interrupts = <50 2 0 0>;
+                };
+        };
+
+        crypto@c0000 {
+/include/ "qoriq-sec6.0-0.dtsi"
+        };
+
+        crypto@c0000 {
+                reg = <0xc0000 0x20000>;
+                ranges = <0x0 0xc0000 0x20000>;
+
+                jr@1000{
+                        interrupts = <55 2 0 0>;
+                };
+                jr@2000{
+                        interrupts = <56 2 0 0>;
+                };
+        };
+
+/include/ "pq3-mpic.dtsi"
+/include/ "pq3-mpic-timer-B.dtsi"
+
+/include/ "pq3-etsec2-0.dtsi"
+        enet0: ethernet@b0000 {
+                queue-group@b0000 {
+                        reg = <0x10000 0x1000>;
+                        fsl,rx-bit-map = <0xff>;
+                        fsl,tx-bit-map = <0xff>;
+                };
+        };
+
+/include/ "pq3-etsec2-1.dtsi"
+        enet1: ethernet@b1000 {
+                queue-group@b1000 {
+                        reg = <0x11000 0x1000>;
+                        fsl,rx-bit-map = <0xff>;
+                        fsl,tx-bit-map = <0xff>;
+                };
+        };
+
+        global-utilities@e0000 {
+                compatible = "fsl,c293-guts";
+                reg = <0xe0000 0x1000>;
+                fsl,has-rstcr;
+        };
+};
diff --git a/arch/powerpc/boot/dts/fsl/c293si-pre.dtsi b/arch/powerpc/boot/dts/fsl/c293si-pre.dtsi
new file mode 100644
index 000000000000..065049d76245
--- /dev/null
+++ b/arch/powerpc/boot/dts/fsl/c293si-pre.dtsi
@@ -0,0 +1,63 @@
+/*
+ * C293 Silicon/SoC Device Tree Source (pre include)
+ *
+ * Copyright 2012 Freescale Semiconductor Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Freescale Semiconductor nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") as published by the Free Software
+ * Foundation, either version 2 of that License or (at your option) any
+ * later version.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/dts-v1/;
+
+/include/ "e500v2_power_isa.dtsi"
+
+/ {
+        compatible = "fsl,C293";
+        #address-cells = <2>;
+        #size-cells = <2>;
+        interrupt-parent = <&mpic>;
+
+        aliases {
+                serial0 = &serial0;
+                serial1 = &serial1;
+                ethernet0 = &enet0;
+                ethernet1 = &enet1;
+                pci0 = &pci0;
+        };
+
+        cpus {
+                #address-cells = <1>;
+                #size-cells = <0>;
+
+                PowerPC,e500v2@0 {
+                        device_type = "cpu";
+                        reg = <0x0>;
+                        next-level-cache = <&L2>;
+                };
+        };
+};
diff --git a/arch/powerpc/boot/dts/fsl/qoriq-mpic4.3.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-mpic4.3.dtsi
new file mode 100644
index 000000000000..64f713c24825
--- /dev/null
+++ b/arch/powerpc/boot/dts/fsl/qoriq-mpic4.3.dtsi
@@ -0,0 +1,149 @@
+/*
+ * QorIQ MPIC device tree stub [ controller @ offset 0x40000 ]
+ *
+ * Copyright 2013 Freescale Semiconductor Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Freescale Semiconductor nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") as published by the Free Software
+ * Foundation, either version 2 of that License or (at your option) any
+ * later version.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+mpic: pic@40000 {
+        interrupt-controller;
+        #address-cells = <0>;
+        #interrupt-cells = <4>;
+        reg = <0x40000 0x40000>;
+        compatible = "fsl,mpic";
+        device_type = "open-pic";
+        clock-frequency = <0x0>;
+};
+
+timer@41100 {
+        compatible = "fsl,mpic-global-timer";
+        reg = <0x41100 0x100 0x41300 4>;
+        interrupts = <0 0 3 0
+                      1 0 3 0
+                      2 0 3 0
+                      3 0 3 0>;
+};
+
+msi0: msi@41600 {
+        compatible = "fsl,mpic-msi-v4.3";
+        reg = <0x41600 0x200 0x44148 4>;
+        interrupts = <
+                0xe0 0 0 0
+                0xe1 0 0 0
+                0xe2 0 0 0
+                0xe3 0 0 0
+                0xe4 0 0 0
+                0xe5 0 0 0
+                0xe6 0 0 0
+                0xe7 0 0 0
+                0x100 0 0 0
+                0x101 0 0 0
+                0x102 0 0 0
+                0x103 0 0 0
+                0x104 0 0 0
+                0x105 0 0 0
+                0x106 0 0 0
+                0x107 0 0 0>;
+};
+
+msi1: msi@41800 {
+        compatible = "fsl,mpic-msi-v4.3";
+        reg = <0x41800 0x200 0x45148 4>;
+        interrupts = <
+                0xe8 0 0 0
+                0xe9 0 0 0
+                0xea 0 0 0
+                0xeb 0 0 0
+                0xec 0 0 0
+                0xed 0 0 0
+                0xee 0 0 0
+                0xef 0 0 0
+                0x108 0 0 0
+                0x109 0 0 0
+                0x10a 0 0 0
+                0x10b 0 0 0
+                0x10c 0 0 0
+                0x10d 0 0 0
+                0x10e 0 0 0
+                0x10f 0 0 0>;
+};
+
+msi2: msi@41a00 {
+        compatible = "fsl,mpic-msi-v4.3";
+        reg = <0x41a00 0x200 0x46148 4>;
+        interrupts = <
+                0xf0 0 0 0
+                0xf1 0 0 0
+                0xf2 0 0 0
+                0xf3 0 0 0
+                0xf4 0 0 0
+                0xf5 0 0 0
+                0xf6 0 0 0
+                0xf7 0 0 0
+                0x110 0 0 0
+                0x111 0 0 0
+                0x112 0 0 0
+                0x113 0 0 0
+                0x114 0 0 0
+                0x115 0 0 0
+                0x116 0 0 0
+                0x117 0 0 0>;
+};
+
+msi3: msi@41c00 {
+        compatible = "fsl,mpic-msi-v4.3";
+        reg = <0x41c00 0x200 0x47148 4>;
+        interrupts = <
+                0xf8 0 0 0
+                0xf9 0 0 0
+                0xfa 0 0 0
+                0xfb 0 0 0
+                0xfc 0 0 0
+                0xfd 0 0 0
+                0xfe 0 0 0
+                0xff 0 0 0
+                0x118 0 0 0
+                0x119 0 0 0
+                0x11a 0 0 0
+                0x11b 0 0 0
+                0x11c 0 0 0
+                0x11d 0 0 0
+                0x11e 0 0 0
+                0x11f 0 0 0>;
+};
+
+timer@42100 {
+        compatible = "fsl,mpic-global-timer";
+        reg = <0x42100 0x100 0x42300 4>;
+        interrupts = <4 0 3 0
+                      5 0 3 0
+                      6 0 3 0
+                      7 0 3 0>;
+};
diff --git a/arch/powerpc/boot/dts/fsl/qoriq-sec6.0-0.dtsi b/arch/powerpc/boot/dts/fsl/qoriq-sec6.0-0.dtsi
new file mode 100644
index 000000000000..f75b4f820c3c
--- /dev/null
+++ b/arch/powerpc/boot/dts/fsl/qoriq-sec6.0-0.dtsi
@@ -0,0 +1,56 @@
+/*
+ * QorIQ Sec/Crypto 6.0 device tree stub
+ *
+ * Copyright 2013 Freescale Semiconductor Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Freescale Semiconductor nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") as published by the Free Software
+ * Foundation, either version 2 of that License or (at your option) any
+ * later version.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+        compatible = "fsl,sec-v6.0";
+        fsl,sec-era = <6>;
+        #address-cells = <1>;
+        #size-cells = <1>;
+
+        jr@1000 {
+                compatible = "fsl,sec-v6.0-job-ring",
+                             "fsl,sec-v5.2-job-ring",
+                             "fsl,sec-v5.0-job-ring",
+                             "fsl,sec-v4.4-job-ring",
+                             "fsl,sec-v4.0-job-ring";
+                reg        = <0x1000 0x1000>;
+        };
+
+        jr@2000 {
+                compatible = "fsl,sec-v6.0-job-ring",
+                             "fsl,sec-v5.2-job-ring",
+                             "fsl,sec-v5.0-job-ring",
+                             "fsl,sec-v4.4-job-ring",
+                             "fsl,sec-v4.0-job-ring";
+                reg        = <0x2000 0x1000>;
+        };
diff --git a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
index bd611a9cad32..510afa362de1 100644
--- a/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
+++ b/arch/powerpc/boot/dts/fsl/t4240si-post.dtsi
@@ -358,7 +358,7 @@
                         16 2 1 30>;
         };
 
-/include/ "qoriq-mpic.dtsi"
+/include/ "qoriq-mpic4.3.dtsi"
 
         guts: global-utilities@e0000 {
                 compatible = "fsl,t4240-device-config", "fsl,qoriq-device-config-2.0";
diff --git a/arch/powerpc/boot/dts/include/dt-bindings b/arch/powerpc/boot/dts/include/dt-bindings
new file mode 120000
index 000000000000..08c00e4972fa
--- /dev/null
+++ b/arch/powerpc/boot/dts/include/dt-bindings
@@ -0,0 +1 @@
+../../../../../include/dt-bindings
\ No newline at end of file
diff --git a/arch/powerpc/boot/dts/mpc5121ads.dts b/arch/powerpc/boot/dts/mpc5121ads.dts
index 7d3cb79185cb..c228a0a232a6 100644
--- a/arch/powerpc/boot/dts/mpc5121ads.dts
+++ b/arch/powerpc/boot/dts/mpc5121ads.dts
@@ -9,7 +9,7 @@
  * option) any later version.
  */
 
-/include/ "mpc5121.dtsi"
+#include <mpc5121.dtsi>
 
 / {
         model = "mpc5121ads";
diff --git a/arch/powerpc/boot/dts/p1020rdb-pd.dts b/arch/powerpc/boot/dts/p1020rdb-pd.dts
new file mode 100644
index 000000000000..987017ea36b6
--- /dev/null
+++ b/arch/powerpc/boot/dts/p1020rdb-pd.dts
@@ -0,0 +1,280 @@
+/*
+ * P1020 RDB-PD Device Tree Source (32-bit address map)
+ *
+ * Copyright 2013 Freescale Semiconductor Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Freescale Semiconductor nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") as published by the Free Software
+ * Foundation, either version 2 of that License or (at your option) any
+ * later version.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/include/ "fsl/p1020si-pre.dtsi"
+/ {
+        model = "fsl,P1020RDB-PD";
+        compatible = "fsl,P1020RDB-PD";
+
+        memory {
+                device_type = "memory";
+        };
+
+        lbc: localbus@ffe05000 {
+                reg = <0x0 0xffe05000 0x0 0x1000>;
+
+                /* NOR, NAND flash, L2 switch and CPLD */
+                ranges = <0x0 0x0 0x0 0xec000000 0x04000000
+                          0x1 0x0 0x0 0xff800000 0x00040000
+                          0x2 0x0 0x0 0xffa00000 0x00020000
+                          0x3 0x0 0x0 0xffb00000 0x00020000>;
+
+                nor@0,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "cfi-flash";
+                        reg = <0x0 0x0 0x4000000>;
+                        bank-width = <2>;
+                        device-width = <1>;
+
+                        partition@0 {
+                                /* 128KB for DTB Image */
+                                reg = <0x0 0x00020000>;
+                                label = "NOR DTB Image";
+                        };
+
+                        partition@20000 {
+                                /* 3.875 MB for Linux Kernel Image */
+                                reg = <0x00020000 0x003e0000>;
+                                label = "NOR Linux Kernel Image";
+                        };
+
+                        partition@400000 {
+                                /* 58MB for Root file System */
+                                reg = <0x00400000 0x03a00000>;
+                                label = "NOR Root File System";
+                        };
+
+                        partition@3e00000 {
+                                /* This location must not be altered  */
+                                /* 1M for Vitesse 7385 Switch firmware */
+                                reg = <0x3e00000 0x00100000>;
+                                label = "NOR Vitesse-7385 Firmware";
+                                read-only;
+                        };
+
+                        partition@3f00000 {
+                                /* This location must not be altered  */
+                                /* 512KB for u-boot Bootloader Image */
+                                /* 512KB for u-boot Environment Variables */
+                                reg = <0x03f00000 0x00100000>;
+                                label = "NOR U-Boot Image";
+                                read-only;
+                        };
+                };
+
+                nand@1,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,p1020-fcm-nand",
+                                     "fsl,elbc-fcm-nand";
+                        reg = <0x1 0x0 0x40000>;
+
+                        partition@0 {
+                                /* This location must not be altered  */
+                                /* 1MB for u-boot Bootloader Image */
+                                reg = <0x0 0x00100000>;
+                                label = "NAND U-Boot Image";
+                                read-only;
+                        };
+
+                        partition@100000 {
+                                /* 1MB for DTB Image */
+                                reg = <0x00100000 0x00100000>;
+                                label = "NAND DTB Image";
+                        };
+
+                        partition@200000 {
+                                /* 4MB for Linux Kernel Image */
+                                reg = <0x00200000 0x00400000>;
+                                label = "NAND Linux Kernel Image";
+                        };
+
+                        partition@600000 {
+                                /* 122MB for File System Image */
+                                reg = <0x00600000 0x07a00000>;
+                                label = "NAND File System Image";
+                        };
+                };
+
+                cpld@2,0 {
+                        compatible = "fsl,p1020rdb-pd-cpld";
+                        reg = <0x2 0x0 0x20000>;
+                };
+
+                L2switch@3,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "vitesse-7385";
+                        reg = <0x3 0x0 0x20000>;
+                };
+        };
+
+        soc: soc@ffe00000 {
+                ranges = <0x0 0x0 0xffe00000 0x100000>;
+
+                i2c@3000 {
+                        rtc@68 {
+                                compatible = "dallas,ds1339";
+                                reg = <0x68>;
+                        };
+                };
+
+                spi@7000 {
+                        flash@0 {
+                                #address-cells = <1>;
+                                #size-cells = <1>;
+                                compatible = "spansion,s25sl12801";
+                                reg = <0>;
+                                /* input clock */
+                                spi-max-frequency = <40000000>;
+
+                                partition@0 {
+                                        /* 512KB for u-boot Bootloader Image */
+                                        reg = <0x0 0x00080000>;
+                                        label = "SPI U-Boot Image";
+                                        read-only;
+                                };
+
+                                partition@80000 {
+                                        /* 512KB for DTB Image*/
+                                        reg = <0x00080000 0x00080000>;
+                                        label = "SPI DTB Image";
+                                };
+
+                                partition@100000 {
+                                        /* 4MB for Linux Kernel Image */
+                                        reg = <0x00100000 0x00400000>;
+                                        label = "SPI Linux Kernel Image";
+                                };
+
+                                partition@500000 {
+                                        /* 11MB for FS System Image */
+                                        reg = <0x00500000 0x00b00000>;
+                                        label = "SPI File System Image";
+                                };
+                        };
+
+                        slic@0 {
+                                compatible = "zarlink,le88266";
+                                reg = <1>;
+                                spi-max-frequency = <8000000>;
+                        };
+
+                        slic@1 {
+                                compatible = "zarlink,le88266";
+                                reg = <2>;
+                                spi-max-frequency = <8000000>;
+                        };
+                };
+
+                mdio@24000 {
+                        phy0: ethernet-phy@0 {
+                                interrupts = <3 1 0 0>;
+                                reg = <0x0>;
+                        };
+
+                        phy1: ethernet-phy@1 {
+                                interrupts = <2 1 0 0>;
+                                reg = <0x1>;
+                        };
+                };
+
+                mdio@25000 {
+                        tbi1: tbi-phy@11 {
+                                reg = <0x11>;
+                                device_type = "tbi-phy";
+                        };
+                };
+
+                mdio@26000 {
+                        tbi2: tbi-phy@11 {
+                                reg = <0x11>;
+                                device_type = "tbi-phy";
+                        };
+                };
+
+                enet0: ethernet@b0000 {
+                        fixed-link = <1 1 1000 0 0>;
+                        phy-connection-type = "rgmii-id";
+                };
+
+                enet1: ethernet@b1000 {
+                        phy-handle = <&phy0>;
+                        tbi-handle = <&tbi1>;
+                        phy-connection-type = "sgmii";
+                };
+
+                enet2: ethernet@b2000 {
+                        phy-handle = <&phy1>;
+                        phy-connection-type = "rgmii-id";
+                };
+
+                usb@22000 {
+                        phy_type = "ulpi";
+                };
+        };
+
+        pci0: pcie@ffe09000 {
+                reg = <0x0 0xffe09000 0x0 0x1000>;
+                ranges = <0x2000000 0x0 0xa0000000 0x0 0xa0000000 0x0 0x20000000
+                          0x1000000 0x0 0x00000000 0x0 0xffc10000 0x0 0x10000>;
+                pcie@0 {
+                        ranges = <0x2000000 0x0 0xa0000000
+                                  0x2000000 0x0 0xa0000000
+                                  0x0 0x20000000
+
+                                  0x1000000 0x0 0x0
+                                  0x1000000 0x0 0x0
+                                  0x0 0x100000>;
+                };
+        };
+
+        pci1: pcie@ffe0a000 {
+                reg = <0x0 0xffe0a000 0x0 0x1000>;
+                ranges = <0x2000000 0x0 0x80000000 0x0 0x80000000 0x0 0x20000000
+                          0x1000000 0x0 0x00000000 0x0 0xffc00000 0x0 0x10000>;
+                pcie@0 {
+                        ranges = <0x2000000 0x0 0x80000000
+                                  0x2000000 0x0 0x80000000
+                                  0x0 0x20000000
+
+                                  0x1000000 0x0 0x0
+                                  0x1000000 0x0 0x0
+                                  0x0 0x100000>;
+                };
+        };
+};
+
+/include/ "fsl/p1020si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/p1023rdb.dts b/arch/powerpc/boot/dts/p1023rdb.dts
new file mode 100644
index 000000000000..0a06a88ddbd5
--- /dev/null
+++ b/arch/powerpc/boot/dts/p1023rdb.dts
@@ -0,0 +1,234 @@
+/*
+ * P1023 RDB Device Tree Source
+ *
+ *    Copyright 2013 Freescale Semiconductor Inc.
+ *
+ * Author: Chunhe Lan <Chunhe.Lan@freescale.com>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Freescale Semiconductor nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ *
+ * ALTERNATIVELY, this software may be distributed under the terms of the
+ * GNU General Public License ("GPL") as published by the Free Software
+ * Foundation, either version 2 of that License or (at your option) any
+ * later version.
+ *
+ * THIS SOFTWARE IS PROVIDED BY Freescale Semiconductor ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL Freescale Semiconductor BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/include/ "fsl/p1023si-pre.dtsi"
+
+/ {
+        model = "fsl,P1023";
+        compatible = "fsl,P1023RDB";
+        #address-cells = <2>;
+        #size-cells = <2>;
+        interrupt-parent = <&mpic>;
+
+        memory {
+                device_type = "memory";
+        };
+
+        soc: soc@ff600000 {
+                ranges = <0x0 0x0 0xff600000 0x200000>;
+
+                i2c@3000 {
+                        eeprom@53 {
+                                compatible = "at24,24c04";
+                                reg = <0x53>;
+                        };
+
+                        rtc@6f {
+                                compatible = "microchip,mcp7941x";
+                                reg = <0x6f>;
+                        };
+                };
+
+                usb@22000 {
+                        dr_mode = "host";
+                        phy_type = "ulpi";
+                };
+        };
+
+        lbc: localbus@ff605000 {
+                reg = <0 0xff605000 0 0x1000>;
+
+                /* NOR, NAND Flashes */
+                ranges = <0x0 0x0 0x0 0xec000000 0x04000000
+                          0x1 0x0 0x0 0xffa00000 0x08000000>;
+
+                nor@0,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "cfi-flash";
+                        reg = <0x0 0x0 0x04000000>;
+                        bank-width = <2>;
+                        device-width = <1>;
+
+                        partition@0 {
+                                /* 48MB for Root File System */
+                                reg = <0x00000000 0x03000000>;
+                                label = "NOR Root File System";
+                        };
+
+                        partition@3000000 {
+                                /* 1MB for DTB Image */
+                                reg = <0x03000000 0x00100000>;
+                                label = "NOR DTB Image";
+                        };
+
+                        partition@3100000 {
+                                /* 14MB for Linux Kernel Image */
+                                reg = <0x03100000 0x00e00000>;
+                                label = "NOR Linux Kernel Image";
+                        };
+
+                        partition@3f00000 {
+                                /* This location must not be altered  */
+                                /* 512KB for u-boot Bootloader Image */
+                                /* 512KB for u-boot Environment Variables */
+                                reg = <0x03f00000 0x00100000>;
+                                label = "NOR U-Boot Image";
+                                read-only;
+                        };
+                };
+
+                nand@1,0 {
+                        #address-cells = <1>;
+                        #size-cells = <1>;
+                        compatible = "fsl,elbc-fcm-nand";
+                        reg = <0x1 0x0 0x40000>;
+
+                        partition@0 {
+                                /* This location must not be altered  */
+                                /* 1MB for u-boot Bootloader Image */
+                                reg = <0x0 0x00100000>;
+                                label = "NAND U-Boot Image";
+                                read-only;
+                        };
+
+                        partition@100000 {
+                                /* 1MB for DTB Image */
+                                reg = <0x00100000 0x00100000>;
+                                label = "NAND DTB Image";
+                        };
+
+                        partition@200000 {
+                                /* 14MB for Linux Kernel Image */
+                                reg = <0x00200000 0x00e00000>;
+                                label = "NAND Linux Kernel Image";
+                        };
+
+                        partition@1000000 {
+                                /* 96MB for Root File System Image */
+                                reg = <0x01000000 0x06000000>;
+                                label = "NAND Root File System";
+                        };
+
+                        partition@7000000 {
+                                /* 16MB for User Writable Area */
+                                reg = <0x07000000 0x01000000>;
+                                label = "NAND Writable User area";
+                        };
+                };
+        };
+
+        pci0: pcie@ff60a000 {
+                reg = <0 0xff60a000 0 0x1000>;
+                ranges = <0x2000000 0x0 0xc0000000 0 0xc0000000 0x0 0x20000000
+                          0x1000000 0x0 0x00000000 0 0xffc20000 0x0 0x10000>;
+                pcie@0 {
+                        /* IRQ[0:3] are pulled up on board, set to active-low */
+                        interrupt-map-mask = <0xf800 0 0 7>;
+                        interrupt-map = <
+                                /* IDSEL 0x0 */
+                                0000 0 0 1 &mpic 0 1 0 0
+                                0000 0 0 2 &mpic 1 1 0 0
+                                0000 0 0 3 &mpic 2 1 0 0
+                                0000 0 0 4 &mpic 3 1 0 0
+                                >;
+                        ranges = <0x2000000 0x0 0xc0000000
+                                  0x2000000 0x0 0xc0000000
+                                  0x0 0x20000000
+
+                                  0x1000000 0x0 0x0
+                                  0x1000000 0x0 0x0
+                                  0x0 0x100000>;
+                };
+        };
+
+        board_pci1: pci1: pcie@ff609000 {
+                reg = <0 0xff609000 0 0x1000>;
+                ranges = <0x2000000 0x0 0xa0000000 0 0xa0000000 0x0 0x20000000
+                          0x1000000 0x0 0x00000000 0 0xffc10000 0x0 0x10000>;
+                pcie@0 {
+                        /*
+                         * IRQ[4:6] only for PCIe, set to active-high,
+                         * IRQ[7] is pulled up on board, set to active-low
+                         */
+                        interrupt-map-mask = <0xf800 0 0 7>;
+                        interrupt-map = <
+                                /* IDSEL 0x0 */
+                                0000 0 0 1 &mpic 4 2 0 0
+                                0000 0 0 2 &mpic 5 2 0 0
+                                0000 0 0 3 &mpic 6 2 0 0
+                                0000 0 0 4 &mpic 7 1 0 0
+                                >;
+                        ranges = <0x2000000 0x0 0xa0000000
+                                  0x2000000 0x0 0xa0000000
+                                  0x0 0x20000000
+
+                                  0x1000000 0x0 0x0
+                                  0x1000000 0x0 0x0
+                                  0x0 0x100000>;
+                };
+        };
+
+        pci2: pcie@ff60b000 {
+                reg = <0 0xff60b000 0 0x1000>;
+                ranges = <0x2000000 0x0 0x80000000 0 0x80000000 0x0 0x20000000
+                          0x1000000 0x0 0x00000000 0 0xffc00000 0x0 0x10000>;
+                pcie@0 {
+                        /*
+                         * IRQ[8:10] are pulled up on board, set to active-low
+                         * IRQ[11] only for PCIe, set to active-high,
+                         */
+                        interrupt-map-mask = <0xf800 0 0 7>;
+                        interrupt-map = <
+                                /* IDSEL 0x0 */
+                                0000 0 0 1 &mpic 8 1 0 0
+                                0000 0 0 2 &mpic 9 1 0 0
+                                0000 0 0 3 &mpic 10 1 0 0
+                                0000 0 0 4 &mpic 11 2 0 0
+                                >;
+                        ranges = <0x2000000 0x0 0x80000000
+                                  0x2000000 0x0 0x80000000
+                                  0x0 0x20000000
+
+                                  0x1000000 0x0 0x0
+                                  0x1000000 0x0 0x0
+                                  0x0 0x100000>;
+                };
+        };
+
+};
+
+/include/ "fsl/p1023si-post.dtsi"
diff --git a/arch/powerpc/boot/dts/pdm360ng.dts b/arch/powerpc/boot/dts/pdm360ng.dts
index 74337403faee..871c16d1ad5e 100644
--- a/arch/powerpc/boot/dts/pdm360ng.dts
+++ b/arch/powerpc/boot/dts/pdm360ng.dts
@@ -13,7 +13,7 @@
  * option) any later version.
  */
 
-/include/ "mpc5121.dtsi"
+#include <mpc5121.dtsi>
 
 / {
         model = "pdm360ng";
diff --git a/arch/powerpc/boot/epapr-wrapper.c b/arch/powerpc/boot/epapr-wrapper.c
new file mode 100644
index 000000000000..c10191006673
--- /dev/null
+++ b/arch/powerpc/boot/epapr-wrapper.c
@@ -0,0 +1,9 @@
+extern void epapr_platform_init(unsigned long r3, unsigned long r4,
+                                unsigned long r5, unsigned long r6,
+                                unsigned long r7);
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                   unsigned long r6, unsigned long r7)
+{
+        epapr_platform_init(r3, r4, r5, r6, r7);
+}
diff --git a/arch/powerpc/boot/epapr.c b/arch/powerpc/boot/epapr.c
index 06c1961bd124..02e91aa2194a 100644
--- a/arch/powerpc/boot/epapr.c
+++ b/arch/powerpc/boot/epapr.c
@@ -48,8 +48,8 @@ static void platform_fixups(void)
                        fdt_addr, fdt_totalsize((void *)fdt_addr), ima_size);
 }
 
-void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
-                   unsigned long r6, unsigned long r7)
+void epapr_platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                         unsigned long r6, unsigned long r7)
 {
         epapr_magic = r6;
         ima_size = r7;
diff --git a/arch/powerpc/boot/of.c b/arch/powerpc/boot/of.c
index 61d9899aa0d0..62e2f43ec1df 100644
--- a/arch/powerpc/boot/of.c
+++ b/arch/powerpc/boot/of.c
@@ -26,6 +26,9 @@
 
 static unsigned long claim_base;
 
+void epapr_platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                         unsigned long r6, unsigned long r7);
+
 static void *of_try_claim(unsigned long size)
 {
         unsigned long addr = 0;
@@ -61,7 +64,7 @@ static void of_image_hdr(const void *hdr)
         }
 }
 
-void platform_init(unsigned long a1, unsigned long a2, void *promptr)
+static void of_platform_init(unsigned long a1, unsigned long a2, void *promptr)
 {
         platform_ops.image_hdr = of_image_hdr;
         platform_ops.malloc = of_try_claim;
@@ -81,3 +84,14 @@ void platform_init(unsigned long a1, unsigned long a2, void *promptr)
                 loader_info.initrd_size = a2;
         }
 }
+
+void platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
+                   unsigned long r6, unsigned long r7)
+{
+        /* Detect OF vs. ePAPR boot */
+        if (r5)
+                of_platform_init(r3, r4, (void *)r5);
+        else
+                epapr_platform_init(r3, r4, r5, r6, r7);
+}
+
diff --git a/arch/powerpc/boot/ppc_asm.h b/arch/powerpc/boot/ppc_asm.h
index 1c2c2817f9b7..eb0e98be69e0 100644
--- a/arch/powerpc/boot/ppc_asm.h
+++ b/arch/powerpc/boot/ppc_asm.h
@@ -59,4 +59,7 @@
 #define r30     30
 #define r31     31
 
+#define SPRN_TBRL       268
+#define SPRN_TBRU       269
+
 #endif /* _PPC64_PPC_ASM_H */
diff --git a/arch/powerpc/boot/util.S b/arch/powerpc/boot/util.S
index 427ddfc11991..5143228e3e5f 100644
--- a/arch/powerpc/boot/util.S
+++ b/arch/powerpc/boot/util.S
@@ -71,18 +71,18 @@ udelay:
         add     r4,r4,r5
         addi    r4,r4,-1
         divw    r4,r4,r5        /* BUS ticks */
-1:      mftbu   r5
-        mftb    r6
-        mftbu   r7
+1:      mfspr   r5, SPRN_TBRU
+        mfspr   r6, SPRN_TBRL
+        mfspr   r7, SPRN_TBRU
         cmpw    0,r5,r7
         bne     1b              /* Get [synced] base time */
         addc    r9,r6,r4        /* Compute end time */
         addze   r8,r5
-2:      mftbu   r5
+2:      mfspr   r5, SPRN_TBRU
         cmpw    0,r5,r8
         blt     2b
         bgt     3f
-        mftb    r6
+        mfspr   r6, SPRN_TBRL
         cmpw    0,r6,r9
         blt     2b
 3:      blr
diff --git a/arch/powerpc/boot/wrapper b/arch/powerpc/boot/wrapper
index 6761c746048d..cd7af841ba05 100755
--- a/arch/powerpc/boot/wrapper
+++ b/arch/powerpc/boot/wrapper
@@ -148,18 +148,18 @@ make_space=y
 
 case "$platform" in
 pseries)
-    platformo=$object/of.o
+    platformo="$object/of.o $object/epapr.o"
     link_address='0x4000000'
     ;;
 maple)
-    platformo=$object/of.o
+    platformo="$object/of.o $object/epapr.o"
     link_address='0x400000'
     ;;
 pmac|chrp)
-    platformo=$object/of.o
+    platformo="$object/of.o $object/epapr.o"
     ;;
 coff)
-    platformo="$object/crt0.o $object/of.o"
+    platformo="$object/crt0.o $object/of.o $object/epapr.o"
     lds=$object/zImage.coff.lds
     link_address='0x500000'
     pie=
@@ -253,6 +253,7 @@ treeboot-iss4xx-mpic)
     platformo="$object/treeboot-iss4xx.o"
     ;;
 epapr)
+    platformo="$object/epapr.o $object/epapr-wrapper.o"
     link_address='0x20000000'
     pie=-pie
     ;;
diff --git a/arch/powerpc/configs/85xx/p1023rds_defconfig b/arch/powerpc/configs/85xx/p1023_defconfig
index b80bcc69d1f7..b06d37da44f4 100644
--- a/arch/powerpc/configs/85xx/p1023rds_defconfig
+++ b/arch/powerpc/configs/85xx/p1023_defconfig
@@ -1,14 +1,13 @@
 CONFIG_PPC_85xx=y
 CONFIG_SMP=y
 CONFIG_NR_CPUS=2
-CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_AUDIT=y
-CONFIG_IRQ_DOMAIN_DEBUG=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
+CONFIG_RCU_FANOUT=32
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
@@ -22,6 +21,8 @@ CONFIG_MODVERSIONS=y
 # CONFIG_BLK_DEV_BSG is not set
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_MAC_PARTITION=y
+CONFIG_PHYSICAL_START=0x00000000
+CONFIG_P1023_RDB=y
 CONFIG_P1023_RDS=y
 CONFIG_QUICC_ENGINE=y
 CONFIG_QE_GPIO=y
@@ -63,10 +64,21 @@ CONFIG_IPV6=y
 CONFIG_IP_SCTP=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
+CONFIG_MTD=y
+CONFIG_MTD_CMDLINE_PARTS=y
+CONFIG_MTD_CHAR=y
+CONFIG_MTD_BLOCK=y
+CONFIG_MTD_CFI=y
+CONFIG_MTD_CFI_AMDSTD=y
+CONFIG_MTD_PHYSMAP_OF=y
+CONFIG_MTD_NAND=y
+CONFIG_MTD_NAND_FSL_ELBC=y
 CONFIG_PROC_DEVICETREE=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_SIZE=131072
+CONFIG_EEPROM_AT24=y
 CONFIG_EEPROM_LEGACY=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_CHR_DEV_ST=y
@@ -82,6 +94,8 @@ CONFIG_DUMMY=y
 CONFIG_FS_ENET=y
 CONFIG_FSL_PQ_MDIO=y
 CONFIG_E1000E=y
+CONFIG_PHYLIB=y
+CONFIG_AT803X_PHY=y
 CONFIG_MARVELL_PHY=y
 CONFIG_DAVICOM_PHY=y
 CONFIG_CICADA_PHY=y
@@ -96,12 +110,15 @@ CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_SERIAL_8250_NR_UARTS=2
 CONFIG_SERIAL_8250_RUNTIME_UARTS=2
+CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
+CONFIG_SERIAL_8250_SHARE_IRQ=y
 CONFIG_SERIAL_8250_DETECT_IRQ=y
 CONFIG_SERIAL_8250_RSA=y
-CONFIG_SERIAL_QE=m
+CONFIG_HW_RANDOM=y
 CONFIG_NVRAM=y
 CONFIG_I2C=y
+CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_CPM=m
 CONFIG_I2C_MPC=y
 CONFIG_GPIO_MPC8XXX=y
@@ -121,6 +138,7 @@ CONFIG_USB_STORAGE=y
 CONFIG_EDAC=y
 CONFIG_EDAC_MM_EDAC=y
 CONFIG_RTC_CLASS=y
+CONFIG_RTC_DRV_DS1307=y
 CONFIG_RTC_DRV_CMOS=y
 CONFIG_DMADEVICES=y
 CONFIG_FSL_DMA=y
@@ -161,6 +179,7 @@ CONFIG_DEBUG_FS=y
 CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_DEBUG_BUGVERBOSE is not set
 CONFIG_DEBUG_INFO=y
+CONFIG_STRICT_DEVMEM=y
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_SHA256=y
 CONFIG_CRYPTO_SHA512=y
diff --git a/arch/powerpc/configs/corenet32_smp_defconfig b/arch/powerpc/configs/corenet32_smp_defconfig
index 60027c2a7034..3dfab4c40c76 100644
--- a/arch/powerpc/configs/corenet32_smp_defconfig
+++ b/arch/powerpc/configs/corenet32_smp_defconfig
@@ -70,6 +70,7 @@ CONFIG_IPV6=y
 CONFIG_IP_SCTP=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_MTD=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_CHAR=y
diff --git a/arch/powerpc/configs/corenet64_smp_defconfig b/arch/powerpc/configs/corenet64_smp_defconfig
index 6c8b020806ff..fa94fb3bb44d 100644
--- a/arch/powerpc/configs/corenet64_smp_defconfig
+++ b/arch/powerpc/configs/corenet64_smp_defconfig
@@ -27,6 +27,8 @@ CONFIG_P5040_DS=y
 CONFIG_T4240_QDS=y
 # CONFIG_PPC_OF_BOOT_TRAMPOLINE is not set
 CONFIG_BINFMT_MISC=m
+CONFIG_MATH_EMULATION=y
+CONFIG_MATH_EMULATION_HW_UNIMPLEMENTED=y
 CONFIG_FSL_IFC=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCI_MSI=y
@@ -59,6 +61,7 @@ CONFIG_IPV6=y
 CONFIG_IP_SCTP=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_MTD=y
 CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_OF_PARTS=y
diff --git a/arch/powerpc/configs/mpc83xx_defconfig b/arch/powerpc/configs/mpc83xx_defconfig
index 09116c6a6719..23fec79964cf 100644
--- a/arch/powerpc/configs/mpc83xx_defconfig
+++ b/arch/powerpc/configs/mpc83xx_defconfig
@@ -42,6 +42,7 @@ CONFIG_INET_ESP=y
 # CONFIG_IPV6 is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 # CONFIG_FW_LOADER is not set
 CONFIG_MTD=y
 CONFIG_MTD_CHAR=y
diff --git a/arch/powerpc/configs/mpc85xx_defconfig b/arch/powerpc/configs/mpc85xx_defconfig
index 5a58882e351e..dc098d988211 100644
--- a/arch/powerpc/configs/mpc85xx_defconfig
+++ b/arch/powerpc/configs/mpc85xx_defconfig
@@ -27,6 +27,7 @@ CONFIG_MPC85xx_MDS=y
 CONFIG_MPC8536_DS=y
 CONFIG_MPC85xx_DS=y
 CONFIG_MPC85xx_RDB=y
+CONFIG_C293_PCIE=y
 CONFIG_P1010_RDB=y
 CONFIG_P1022_DS=y
 CONFIG_P1022_RDK=y
@@ -78,6 +79,7 @@ CONFIG_IPV6=y
 CONFIG_IP_SCTP=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_MTD=y
 CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_OF_PARTS=y
diff --git a/arch/powerpc/configs/mpc85xx_smp_defconfig b/arch/powerpc/configs/mpc85xx_smp_defconfig
index 152fa05b15e4..5bca60161bb3 100644
--- a/arch/powerpc/configs/mpc85xx_smp_defconfig
+++ b/arch/powerpc/configs/mpc85xx_smp_defconfig
@@ -30,6 +30,7 @@ CONFIG_MPC85xx_MDS=y
 CONFIG_MPC8536_DS=y
 CONFIG_MPC85xx_DS=y
 CONFIG_MPC85xx_RDB=y
+CONFIG_C293_PCIE=y
 CONFIG_P1010_RDB=y
 CONFIG_P1022_DS=y
 CONFIG_P1022_RDK=y
@@ -81,6 +82,7 @@ CONFIG_IPV6=y
 CONFIG_IP_SCTP=m
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
+CONFIG_DEVTMPFS_MOUNT=y
 CONFIG_MTD=y
 CONFIG_MTD_PARTITIONS=y
 CONFIG_MTD_OF_PARTS=y
diff --git a/arch/powerpc/include/asm/Kbuild b/arch/powerpc/include/asm/Kbuild
index 650757c300db..704e6f10ae80 100644
--- a/arch/powerpc/include/asm/Kbuild
+++ b/arch/powerpc/include/asm/Kbuild
@@ -2,3 +2,4 @@
 generic-y += clkdev.h
 generic-y += rwsem.h
 generic-y += trace_clock.h
+generic-y += vtime.h
\ No newline at end of file
diff --git a/arch/powerpc/include/asm/asm-compat.h b/arch/powerpc/include/asm/asm-compat.h
index 6e82f5f9a6fd..4b237aa35660 100644
--- a/arch/powerpc/include/asm/asm-compat.h
+++ b/arch/powerpc/include/asm/asm-compat.h
@@ -32,6 +32,15 @@
 #define PPC_MTOCRF(FXM, RS) MTOCRF((FXM), RS)
 #define PPC_LR_STKOFF   16
 #define PPC_MIN_STKFRM  112
+
+#ifdef __BIG_ENDIAN__
+#define LDX_BE  stringify_in_c(ldx)
+#define STDX_BE stringify_in_c(stdx)
+#else
+#define LDX_BE  stringify_in_c(ldbrx)
+#define STDX_BE stringify_in_c(stdbrx)
+#endif
+
 #else /* 32-bit */
 
 /* operations for longs and pointers */
diff --git a/arch/powerpc/include/asm/btext.h b/arch/powerpc/include/asm/btext.h
index 906f46e31006..89fc382648bc 100644
--- a/arch/powerpc/include/asm/btext.h
+++ b/arch/powerpc/include/asm/btext.h
@@ -13,6 +13,7 @@ extern void btext_update_display(unsigned long phys, int width, int height,
 extern void btext_setup_display(int width, int height, int depth, int pitch,
                                 unsigned long address);
 extern void btext_prepare_BAT(void);
+extern void btext_map(void);
 extern void btext_unmap(void);
 
 extern void btext_drawchar(char c);
diff --git a/arch/powerpc/include/asm/cacheflush.h b/arch/powerpc/include/asm/cacheflush.h
index b843e35122e8..5b9312220e84 100644
--- a/arch/powerpc/include/asm/cacheflush.h
+++ b/arch/powerpc/include/asm/cacheflush.h
@@ -32,13 +32,7 @@ extern void flush_dcache_page(struct page *page);
 
 extern void __flush_disable_L1(void);
 
-extern void __flush_icache_range(unsigned long, unsigned long);
-static inline void flush_icache_range(unsigned long start, unsigned long stop)
-{
-        if (!cpu_has_feature(CPU_FTR_COHERENT_ICACHE))
-                __flush_icache_range(start, stop);
-}
-
+extern void flush_icache_range(unsigned long, unsigned long);
 extern void flush_icache_user_range(struct vm_area_struct *vma,
                                     struct page *page, unsigned long addr,
                                     int len);
diff --git a/arch/powerpc/include/asm/cputable.h b/arch/powerpc/include/asm/cputable.h
index 6f3887d884d2..0d4939ba48e7 100644
--- a/arch/powerpc/include/asm/cputable.h
+++ b/arch/powerpc/include/asm/cputable.h
@@ -371,14 +371,19 @@ extern const char *powerpc_base_platform;
 #define CPU_FTRS_E500MC (CPU_FTR_USE_TB | CPU_FTR_NODSISRALIGN | \
             CPU_FTR_L2CSR | CPU_FTR_LWSYNC | CPU_FTR_NOEXECUTE | \
             CPU_FTR_DBELL | CPU_FTR_DEBUG_LVL_EXC | CPU_FTR_EMB_HV)
+/*
+ * e5500/e6500 erratum A-006958 is a timebase bug that can use the
+ * same workaround as CPU_FTR_CELL_TB_BUG.
+ */
 #define CPU_FTRS_E5500  (CPU_FTR_USE_TB | CPU_FTR_NODSISRALIGN | \
             CPU_FTR_L2CSR | CPU_FTR_LWSYNC | CPU_FTR_NOEXECUTE | \
             CPU_FTR_DBELL | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \
-            CPU_FTR_DEBUG_LVL_EXC | CPU_FTR_EMB_HV)
+            CPU_FTR_DEBUG_LVL_EXC | CPU_FTR_EMB_HV | CPU_FTR_CELL_TB_BUG)
 #define CPU_FTRS_E6500  (CPU_FTR_USE_TB | CPU_FTR_NODSISRALIGN | \
             CPU_FTR_L2CSR | CPU_FTR_LWSYNC | CPU_FTR_NOEXECUTE | \
             CPU_FTR_DBELL | CPU_FTR_POPCNTB | CPU_FTR_POPCNTD | \
-            CPU_FTR_DEBUG_LVL_EXC | CPU_FTR_EMB_HV | CPU_FTR_ALTIVEC_COMP)
+            CPU_FTR_DEBUG_LVL_EXC | CPU_FTR_EMB_HV | CPU_FTR_ALTIVEC_COMP | \
+            CPU_FTR_CELL_TB_BUG)
 #define CPU_FTRS_GENERIC_32     (CPU_FTR_COMMON | CPU_FTR_NODSISRALIGN)
 
 /* 64-bit CPUs */
diff --git a/arch/powerpc/include/asm/device.h b/arch/powerpc/include/asm/device.h
index 77e97dd0c15d..38faeded7d59 100644
--- a/arch/powerpc/include/asm/device.h
+++ b/arch/powerpc/include/asm/device.h
@@ -28,6 +28,9 @@ struct dev_archdata {
                 void            *iommu_table_base;
         } dma_data;
 
+#ifdef CONFIG_IOMMU_API
+        void                    *iommu_domain;
+#endif
 #ifdef CONFIG_SWIOTLB
         dma_addr_t              max_direct_dma_addr;
 #endif
diff --git a/arch/powerpc/include/asm/emulated_ops.h b/arch/powerpc/include/asm/emulated_ops.h
index 63f2a22e9954..5a8b82aa7241 100644
--- a/arch/powerpc/include/asm/emulated_ops.h
+++ b/arch/powerpc/include/asm/emulated_ops.h
@@ -46,8 +46,6 @@ extern struct ppc_emulated {
         struct ppc_emulated_entry unaligned;
 #ifdef CONFIG_MATH_EMULATION
         struct ppc_emulated_entry math;
-#elif defined(CONFIG_8XX_MINIMAL_FPEMU)
-        struct ppc_emulated_entry 8xx;
 #endif
 #ifdef CONFIG_VSX
         struct ppc_emulated_entry vsx;
diff --git a/arch/powerpc/include/asm/epapr_hcalls.h b/arch/powerpc/include/asm/epapr_hcalls.h
index d3d634274d2c..86b0ac79990c 100644
--- a/arch/powerpc/include/asm/epapr_hcalls.h
+++ b/arch/powerpc/include/asm/epapr_hcalls.h
@@ -105,6 +105,12 @@
 extern bool epapr_paravirt_enabled;
 extern u32 epapr_hypercall_start[];
 
+#ifdef CONFIG_EPAPR_PARAVIRT
+int __init epapr_paravirt_early_init(void);
+#else
+static inline int epapr_paravirt_early_init(void) { return 0; }
+#endif
+
 /*
  * We use "uintptr_t" to define a register because it's guaranteed to be a
  * 32-bit integer on a 32-bit platform, and a 64-bit integer on a 64-bit
diff --git a/arch/powerpc/include/asm/exception-64s.h b/arch/powerpc/include/asm/exception-64s.h
index 07ca627e52c0..cca12f084842 100644
--- a/arch/powerpc/include/asm/exception-64s.h
+++ b/arch/powerpc/include/asm/exception-64s.h
@@ -48,17 +48,18 @@
 #define EX_LR           72
 #define EX_CFAR         80
 #define EX_PPR          88      /* SMT thread status register (priority) */
+#define EX_CTR          96
 
 #ifdef CONFIG_RELOCATABLE
 #define __EXCEPTION_RELON_PROLOG_PSERIES_1(label, h)                    \
         ld      r12,PACAKBASE(r13);     /* get high part of &label */   \
         mfspr   r11,SPRN_##h##SRR0;     /* save SRR0 */                 \
         LOAD_HANDLER(r12,label);                                        \
-        mtlr    r12;                                                    \
+        mtctr   r12;                                                    \
         mfspr   r12,SPRN_##h##SRR1;     /* and SRR1 */                  \
         li      r10,MSR_RI;                                             \
         mtmsrd  r10,1;                  /* Set RI (EE=0) */             \
-        blr;
+        bctr;
 #else
 /* If not relocatable, we can jump directly -- and save messing with LR */
 #define __EXCEPTION_RELON_PROLOG_PSERIES_1(label, h)                    \
@@ -97,18 +98,18 @@
 
 #if defined(CONFIG_RELOCATABLE)
 /*
- * If we support interrupts with relocation on AND we're a relocatable
- * kernel, we need to use LR to get to the 2nd level handler.  So, save/restore
- * it when required.
+ * If we support interrupts with relocation on AND we're a relocatable kernel,
+ * we need to use CTR to get to the 2nd level handler.  So, save/restore it
+ * when required.
  */
-#define SAVE_LR(reg, area)      mflr    reg ;   std     reg,area+EX_LR(r13)
-#define GET_LR(reg, area)                       ld      reg,area+EX_LR(r13)
-#define RESTORE_LR(reg, area)   ld      reg,area+EX_LR(r13) ; mtlr reg
+#define SAVE_CTR(reg, area)     mfctr   reg ;   std     reg,area+EX_CTR(r13)
+#define GET_CTR(reg, area)                      ld      reg,area+EX_CTR(r13)
+#define RESTORE_CTR(reg, area)  ld      reg,area+EX_CTR(r13) ; mtctr reg
 #else
-/* ...else LR is unused and in register. */
-#define SAVE_LR(reg, area)
-#define GET_LR(reg, area)       mflr    reg
-#define RESTORE_LR(reg, area)
+/* ...else CTR is unused and in register. */
+#define SAVE_CTR(reg, area)
+#define GET_CTR(reg, area)      mfctr   reg
+#define RESTORE_CTR(reg, area)
 #endif
 
 /*
@@ -164,7 +165,7 @@ END_FTR_SECTION_NESTED(ftr,ftr,943)
 #define __EXCEPTION_PROLOG_1(area, extra, vec)                          \
         OPT_SAVE_REG_TO_PACA(area+EX_PPR, r9, CPU_FTR_HAS_PPR);         \
         OPT_SAVE_REG_TO_PACA(area+EX_CFAR, r10, CPU_FTR_CFAR);          \
-        SAVE_LR(r10, area);                                             \
+        SAVE_CTR(r10, area);                                            \
         mfcr    r9;                                                     \
         extra(vec);                                                     \
         std     r11,area+EX_R11(r13);                                   \
@@ -270,7 +271,7 @@ do_kvm_##n:								\
         sth     r1,PACA_TRAP_SAVE(r13);                                    \
         std     r3,area+EX_R3(r13);                                        \
         addi    r3,r13,area;            /* r3 -> where regs are saved*/    \
-        RESTORE_LR(r1, area);                                              \
+        RESTORE_CTR(r1, area);                                             \
         b       bad_stack;                                                 \
 3:      std     r9,_CCR(r1);            /* save CR in stackframe        */ \
         std     r11,_NIP(r1);           /* save SRR0 in stackframe      */ \
@@ -298,10 +299,10 @@ do_kvm_##n:								\
         ld      r10,area+EX_CFAR(r13);                                     \
         std     r10,ORIG_GPR3(r1);                                         \
         END_FTR_SECTION_NESTED(CPU_FTR_CFAR, CPU_FTR_CFAR, 66);            \
-        GET_LR(r9,area);                /* Get LR, later save to stack  */ \
+        mflr    r9;                     /* Get LR, later save to stack  */ \
         ld      r2,PACATOC(r13);        /* get kernel TOC into r2       */ \
         std     r9,_LINK(r1);                                              \
-        mfctr   r10;                    /* save CTR in stackframe       */ \
+        GET_CTR(r10, area);                                                \
         std     r10,_CTR(r1);                                              \
         lbz     r10,PACASOFTIRQEN(r13);                            \
         mfspr   r11,SPRN_XER;           /* save XER in stackframe       */ \
@@ -479,7 +480,7 @@ label##_relon_hv:							\
  */
 
 /* Exception addition: Hard disable interrupts */
-#define DISABLE_INTS    SOFT_DISABLE_INTS(r10,r11)
+#define DISABLE_INTS    RECONCILE_IRQ_STATE(r10,r11)
 
 #define ADD_NVGPRS                              \
         bl      .save_nvgprs
diff --git a/arch/powerpc/include/asm/fsl_pamu_stash.h b/arch/powerpc/include/asm/fsl_pamu_stash.h
new file mode 100644
index 000000000000..caa1b21c25cd
--- /dev/null
+++ b/arch/powerpc/include/asm/fsl_pamu_stash.h
@@ -0,0 +1,39 @@
+/*
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2, as
+ * published by the Free Software Foundation.
+ *
+ * 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.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ *
+ * Copyright (C) 2013 Freescale Semiconductor, Inc.
+ *
+ */
+
+#ifndef __FSL_PAMU_STASH_H
+#define __FSL_PAMU_STASH_H
+
+/* cache stash targets */
+enum pamu_stash_target {
+        PAMU_ATTR_CACHE_L1 = 1,
+        PAMU_ATTR_CACHE_L2,
+        PAMU_ATTR_CACHE_L3,
+};
+
+/*
+ * This attribute allows configuring stashig specific parameters
+ * in the PAMU hardware.
+ */
+
+struct pamu_stash_attribute {
+        u32     cpu;    /* cpu number */
+        u32     cache;  /* cache to stash to: L1,L2,L3 */
+};
+
+#endif  /* __FSL_PAMU_STASH_H */
diff --git a/arch/powerpc/include/asm/io.h b/arch/powerpc/include/asm/io.h
index dd15e5e37d6d..5a64757dc0d1 100644
--- a/arch/powerpc/include/asm/io.h
+++ b/arch/powerpc/include/asm/io.h
@@ -69,8 +69,18 @@ extern unsigned long pci_dram_offset;
 
 extern resource_size_t isa_mem_base;
 
-#if defined(CONFIG_PPC32) && defined(CONFIG_PPC_INDIRECT_IO)
-#error CONFIG_PPC_INDIRECT_IO is not yet supported on 32 bits
+/* Boolean set by platform if PIO accesses are suppored while _IO_BASE
+ * is not set or addresses cannot be translated to MMIO. This is typically
+ * set when the platform supports "special" PIO accesses via a non memory
+ * mapped mechanism, and allows things like the early udbg UART code to
+ * function.
+ */
+extern bool isa_io_special;
+
+#ifdef CONFIG_PPC32
+#if defined(CONFIG_PPC_INDIRECT_PIO) || defined(CONFIG_PPC_INDIRECT_MMIO)
+#error CONFIG_PPC_INDIRECT_{PIO,MMIO} are not yet supported on 32 bits
+#endif
 #endif
 
 /*
@@ -222,9 +232,9 @@ extern void _memcpy_toio(volatile void __iomem *dest, const void *src,
  * for PowerPC is as close as possible to the x86 version of these, and thus
  * provides fairly heavy weight barriers for the non-raw versions
  *
- * In addition, they support a hook mechanism when CONFIG_PPC_INDIRECT_IO
- * allowing the platform to provide its own implementation of some or all
- * of the accessors.
+ * In addition, they support a hook mechanism when CONFIG_PPC_INDIRECT_MMIO
+ * or CONFIG_PPC_INDIRECT_PIO are set allowing the platform to provide its
+ * own implementation of some or all of the accessors.
  */
 
 /*
@@ -240,8 +250,8 @@ extern void _memcpy_toio(volatile void __iomem *dest, const void *src,
 
 /* Indirect IO address tokens:
  *
- * When CONFIG_PPC_INDIRECT_IO is set, the platform can provide hooks
- * on all IOs. (Note that this is all 64 bits only for now)
+ * When CONFIG_PPC_INDIRECT_MMIO is set, the platform can provide hooks
+ * on all MMIOs. (Note that this is all 64 bits only for now)
  *
  * To help platforms who may need to differenciate MMIO addresses in
  * their hooks, a bitfield is reserved for use by the platform near the
@@ -263,11 +273,14 @@ extern void _memcpy_toio(volatile void __iomem *dest, const void *src,
  *
  * The direct IO mapping operations will then mask off those bits
  * before doing the actual access, though that only happen when
- * CONFIG_PPC_INDIRECT_IO is set, thus be careful when you use that
+ * CONFIG_PPC_INDIRECT_MMIO is set, thus be careful when you use that
  * mechanism
+ *
+ * For PIO, there is a separate CONFIG_PPC_INDIRECT_PIO which makes
+ * all PIO functions call through a hook.
  */
 
-#ifdef CONFIG_PPC_INDIRECT_IO
+#ifdef CONFIG_PPC_INDIRECT_MMIO
 #define PCI_IO_IND_TOKEN_MASK   0x0fff000000000000ul
 #define PCI_IO_IND_TOKEN_SHIFT  48
 #define PCI_FIX_ADDR(addr)                                              \
@@ -672,7 +685,7 @@ extern void __iomem * __ioremap_at(phys_addr_t pa, void *ea,
 extern void __iounmap_at(void *ea, unsigned long size);
 
 /*
- * When CONFIG_PPC_INDIRECT_IO is set, we use the generic iomap implementation
+ * When CONFIG_PPC_INDIRECT_PIO is set, we use the generic iomap implementation
  * which needs some additional definitions here. They basically allow PIO
  * space overall to be 1GB. This will work as long as we never try to use
  * iomap to map MMIO below 1GB which should be fine on ppc64
diff --git a/arch/powerpc/include/asm/irq.h b/arch/powerpc/include/asm/irq.h
index 0e40843a1c6e..41f13cec8a8f 100644
--- a/arch/powerpc/include/asm/irq.h
+++ b/arch/powerpc/include/asm/irq.h
@@ -69,9 +69,9 @@ extern struct thread_info *softirq_ctx[NR_CPUS];
 
 extern void irq_ctx_init(void);
 extern void call_do_softirq(struct thread_info *tp);
-extern int call_handle_irq(int irq, void *p1,
-                           struct thread_info *tp, void *func);
+extern void call_do_irq(struct pt_regs *regs, struct thread_info *tp);
 extern void do_IRQ(struct pt_regs *regs);
+extern void __do_irq(struct pt_regs *regs);
 
 int irq_choose_cpu(const struct cpumask *mask);
 
diff --git a/arch/powerpc/include/asm/irqflags.h b/arch/powerpc/include/asm/irqflags.h
index 6f9b6e23dc5a..f51a5580bfd0 100644
--- a/arch/powerpc/include/asm/irqflags.h
+++ b/arch/powerpc/include/asm/irqflags.h
@@ -40,9 +40,10 @@
 #define TRACE_DISABLE_INTS      TRACE_WITH_FRAME_BUFFER(.trace_hardirqs_off)
 
 /*
- * This is used by assembly code to soft-disable interrupts
+ * This is used by assembly code to soft-disable interrupts first and
+ * reconcile irq state.
  */
-#define SOFT_DISABLE_INTS(__rA, __rB)           \
+#define RECONCILE_IRQ_STATE(__rA, __rB)         \
         lbz     __rA,PACASOFTIRQEN(r13);        \
         lbz     __rB,PACAIRQHAPPENED(r13);      \
         cmpwi   cr0,__rA,0;                     \
@@ -58,7 +59,7 @@
 #define TRACE_ENABLE_INTS
 #define TRACE_DISABLE_INTS
 
-#define SOFT_DISABLE_INTS(__rA, __rB)           \
+#define RECONCILE_IRQ_STATE(__rA, __rB)         \
         lbz     __rA,PACAIRQHAPPENED(r13);      \
         li      __rB,0;                         \
         ori     __rA,__rA,PACA_IRQ_HARD_DIS;    \
diff --git a/arch/powerpc/include/asm/kvm_book3s.h b/arch/powerpc/include/asm/kvm_book3s.h
index 08891d07aeb6..fa19e2f1a874 100644
--- a/arch/powerpc/include/asm/kvm_book3s.h
+++ b/arch/powerpc/include/asm/kvm_book3s.h
@@ -334,6 +334,27 @@ static inline u32 kvmppc_get_last_inst(struct kvm_vcpu *vcpu)
         return r;
 }
 
+/*
+ * Like kvmppc_get_last_inst(), but for fetching a sc instruction.
+ * Because the sc instruction sets SRR0 to point to the following
+ * instruction, we have to fetch from pc - 4.
+ */
+static inline u32 kvmppc_get_last_sc(struct kvm_vcpu *vcpu)
+{
+        ulong pc = kvmppc_get_pc(vcpu) - 4;
+        struct kvmppc_book3s_shadow_vcpu *svcpu = svcpu_get(vcpu);
+        u32 r;
+
+        /* Load the instruction manually if it failed to do so in the
+         * exit path */
+        if (svcpu->last_inst == KVM_INST_FETCH_FAILED)
+                kvmppc_ld(vcpu, &pc, sizeof(u32), &svcpu->last_inst, false);
+
+        r = svcpu->last_inst;
+        svcpu_put(svcpu);
+        return r;
+}
+
 static inline ulong kvmppc_get_fault_dar(struct kvm_vcpu *vcpu)
 {
         struct kvmppc_book3s_shadow_vcpu *svcpu = svcpu_get(vcpu);
@@ -446,6 +467,23 @@ static inline u32 kvmppc_get_last_inst(struct kvm_vcpu *vcpu)
         return vcpu->arch.last_inst;
 }
 
+/*
+ * Like kvmppc_get_last_inst(), but for fetching a sc instruction.
+ * Because the sc instruction sets SRR0 to point to the following
+ * instruction, we have to fetch from pc - 4.
+ */
+static inline u32 kvmppc_get_last_sc(struct kvm_vcpu *vcpu)
+{
+        ulong pc = kvmppc_get_pc(vcpu) - 4;
+
+        /* Load the instruction manually if it failed to do so in the
+         * exit path */
+        if (vcpu->arch.last_inst == KVM_INST_FETCH_FAILED)
+                kvmppc_ld(vcpu, &pc, sizeof(u32), &vcpu->arch.last_inst, false);
+
+        return vcpu->arch.last_inst;
+}
+
 static inline ulong kvmppc_get_fault_dar(struct kvm_vcpu *vcpu)
 {
         return vcpu->arch.fault_dar;
diff --git a/arch/powerpc/include/asm/kvm_book3s_64.h b/arch/powerpc/include/asm/kvm_book3s_64.h
index a1ecb14e4442..86d638a3b359 100644
--- a/arch/powerpc/include/asm/kvm_book3s_64.h
+++ b/arch/powerpc/include/asm/kvm_book3s_64.h
@@ -37,7 +37,7 @@ static inline void svcpu_put(struct kvmppc_book3s_shadow_vcpu *svcpu)
 
 #ifdef CONFIG_KVM_BOOK3S_64_HV
 #define KVM_DEFAULT_HPT_ORDER   24      /* 16MB HPT by default */
-extern int kvm_hpt_order;               /* order of preallocated HPTs */
+extern unsigned long kvm_rma_pages;
 #endif
 
 #define VRMA_VSID       0x1ffffffUL     /* 1TB VSID reserved for VRMA */
@@ -100,7 +100,7 @@ static inline unsigned long compute_tlbie_rb(unsigned long v, unsigned long r,
                         /* (masks depend on page size) */
                         rb |= 0x1000;           /* page encoding in LP field */
                         rb |= (va_low & 0x7f) << 16; /* 7b of VA in AVA/LP field */
-                        rb |= (va_low & 0xfe);  /* AVAL field (P7 doesn't seem to care) */
+                        rb |= ((va_low << 4) & 0xf0);   /* AVAL field (P7 doesn't seem to care) */
                 }
         } else {
                 /* 4kB page */
diff --git a/arch/powerpc/include/asm/kvm_host.h b/arch/powerpc/include/asm/kvm_host.h
index af326cde7cb6..33283532e9d8 100644
--- a/arch/powerpc/include/asm/kvm_host.h
+++ b/arch/powerpc/include/asm/kvm_host.h
@@ -183,13 +183,9 @@ struct kvmppc_spapr_tce_table {
         struct page *pages[0];
 };
 
-struct kvmppc_linear_info {
-        void            *base_virt;
-        unsigned long    base_pfn;
-        unsigned long    npages;
-        struct list_head list;
-        atomic_t         use_count;
-        int              type;
+struct kvm_rma_info {
+        atomic_t use_count;
+        unsigned long base_pfn;
 };
 
 /* XICS components, defined in book3s_xics.c */
@@ -246,7 +242,7 @@ struct kvm_arch {
         int tlbie_lock;
         unsigned long lpcr;
         unsigned long rmor;
-        struct kvmppc_linear_info *rma;
+        struct kvm_rma_info *rma;
         unsigned long vrma_slb_v;
         int rma_setup_done;
         int using_mmu_notifiers;
@@ -259,7 +255,7 @@ struct kvm_arch {
         spinlock_t slot_phys_lock;
         cpumask_t need_tlb_flush;
         struct kvmppc_vcore *vcores[KVM_MAX_VCORES];
-        struct kvmppc_linear_info *hpt_li;
+        int hpt_cma_alloc;
 #endif /* CONFIG_KVM_BOOK3S_64_HV */
 #ifdef CONFIG_PPC_BOOK3S_64
         struct list_head spapr_tce_tables;
diff --git a/arch/powerpc/include/asm/kvm_ppc.h b/arch/powerpc/include/asm/kvm_ppc.h
index a5287fe03d77..b15554a26c20 100644
--- a/arch/powerpc/include/asm/kvm_ppc.h
+++ b/arch/powerpc/include/asm/kvm_ppc.h
@@ -137,10 +137,10 @@ extern long kvmppc_h_put_tce(struct kvm_vcpu *vcpu, unsigned long liobn,
                              unsigned long ioba, unsigned long tce);
 extern long kvm_vm_ioctl_allocate_rma(struct kvm *kvm,
                                 struct kvm_allocate_rma *rma);
-extern struct kvmppc_linear_info *kvm_alloc_rma(void);
-extern void kvm_release_rma(struct kvmppc_linear_info *ri);
-extern struct kvmppc_linear_info *kvm_alloc_hpt(void);
-extern void kvm_release_hpt(struct kvmppc_linear_info *li);
+extern struct kvm_rma_info *kvm_alloc_rma(void);
+extern void kvm_release_rma(struct kvm_rma_info *ri);
+extern struct page *kvm_alloc_hpt(unsigned long nr_pages);
+extern void kvm_release_hpt(struct page *page, unsigned long nr_pages);
 extern int kvmppc_core_init_vm(struct kvm *kvm);
 extern void kvmppc_core_destroy_vm(struct kvm *kvm);
 extern void kvmppc_core_free_memslot(struct kvm_memory_slot *free,
@@ -261,6 +261,7 @@ void kvmppc_set_pid(struct kvm_vcpu *vcpu, u32 pid);
 struct openpic;
 
 #ifdef CONFIG_KVM_BOOK3S_64_HV
+extern void kvm_cma_reserve(void) __init;
 static inline void kvmppc_set_xics_phys(int cpu, unsigned long addr)
 {
         paca[cpu].kvm_hstate.xics_phys = addr;
@@ -281,13 +282,12 @@ static inline void kvmppc_set_host_ipi(int cpu, u8 host_ipi)
 }
 
 extern void kvmppc_fast_vcpu_kick(struct kvm_vcpu *vcpu);
-extern void kvm_linear_init(void);
 
 #else
-static inline void kvmppc_set_xics_phys(int cpu, unsigned long addr)
+static inline void __init kvm_cma_reserve(void)
 {}
 
-static inline void kvm_linear_init(void)
+static inline void kvmppc_set_xics_phys(int cpu, unsigned long addr)
 {}
 
 static inline u32 kvmppc_get_xics_latch(void)
@@ -394,10 +394,15 @@ static inline void kvmppc_mmu_flush_icache(pfn_t pfn)
         }
 }
 
-/* Please call after prepare_to_enter. This function puts the lazy ee state
-   back to normal mode, without actually enabling interrupts. */
-static inline void kvmppc_lazy_ee_enable(void)
+/*
+ * Please call after prepare_to_enter. This function puts the lazy ee and irq
+ * disabled tracking state back to normal mode, without actually enabling
+ * interrupts.
+ */
+static inline void kvmppc_fix_ee_before_entry(void)
 {
+        trace_hardirqs_on();
+
 #ifdef CONFIG_PPC64
         /* Only need to enable IRQs by hard enabling them after this */
         local_paca->irq_happened = 0;
diff --git a/arch/powerpc/include/asm/lppaca.h b/arch/powerpc/include/asm/lppaca.h
index 9b12f88d4adb..4470d1e34d23 100644
--- a/arch/powerpc/include/asm/lppaca.h
+++ b/arch/powerpc/include/asm/lppaca.h
@@ -48,15 +48,13 @@
 struct lppaca {
         /* cacheline 1 contains read-only data */
 
-        u32     desc;                   /* Eye catcher 0xD397D781 */
-        u16     size;                   /* Size of this struct */
-        u16     reserved1;
-        u16     reserved2:14;
-        u8      shared_proc:1;          /* Shared processor indicator */
-        u8      secondary_thread:1;     /* Secondary thread indicator */
+        __be32  desc;                   /* Eye catcher 0xD397D781 */
+        __be16  size;                   /* Size of this struct */
+        u8      reserved1[3];
+        u8      __old_status;           /* Old status, including shared proc */
         u8      reserved3[14];
-        volatile u32 dyn_hw_node_id;    /* Dynamic hardware node id */
-        volatile u32 dyn_hw_proc_id;    /* Dynamic hardware proc id */
+        volatile __be32 dyn_hw_node_id; /* Dynamic hardware node id */
+        volatile __be32 dyn_hw_proc_id; /* Dynamic hardware proc id */
         u8      reserved4[56];
         volatile u8 vphn_assoc_counts[8]; /* Virtual processor home node */
                                           /* associativity change counters */
@@ -73,9 +71,9 @@ struct lppaca {
         u8      fpregs_in_use;
         u8      pmcregs_in_use;
         u8      reserved8[28];
-        u64     wait_state_cycles;      /* Wait cycles for this proc */
+        __be64  wait_state_cycles;      /* Wait cycles for this proc */
         u8      reserved9[28];
-        u16     slb_count;              /* # of SLBs to maintain */
+        __be16  slb_count;              /* # of SLBs to maintain */
         u8      idle;                   /* Indicate OS is idle */
         u8      vmxregs_in_use;
 
@@ -89,17 +87,17 @@ struct lppaca {
          * NOTE: This value will ALWAYS be zero for dedicated processors and
          * will NEVER be zero for shared processors (ie, initialized to a 1).
          */
-        volatile u32 yield_count;
-        volatile u32 dispersion_count;  /* dispatch changed physical cpu */
-        volatile u64 cmo_faults;        /* CMO page fault count */
-        volatile u64 cmo_fault_time;    /* CMO page fault time */
+        volatile __be32 yield_count;
+        volatile __be32 dispersion_count; /* dispatch changed physical cpu */
+        volatile __be64 cmo_faults;     /* CMO page fault count */
+        volatile __be64 cmo_fault_time; /* CMO page fault time */
         u8      reserved10[104];
 
         /* cacheline 4-5 */
 
-        u32     page_ins;               /* CMO Hint - # page ins by OS */
+        __be32  page_ins;               /* CMO Hint - # page ins by OS */
         u8      reserved11[148];
-        volatile u64 dtl_idx;           /* Dispatch Trace Log head index */
+        volatile __be64 dtl_idx;                /* Dispatch Trace Log head index */
         u8      reserved12[96];
 } __attribute__((__aligned__(0x400)));
 
@@ -108,17 +106,29 @@ extern struct lppaca lppaca[];
 #define lppaca_of(cpu)  (*paca[cpu].lppaca_ptr)
 
 /*
+ * Old kernels used a reserved bit in the VPA to determine if it was running
+ * in shared processor mode. New kernels look for a non zero yield count
+ * but KVM still needs to set the bit to keep the old stuff happy.
+ */
+#define LPPACA_OLD_SHARED_PROC          2
+
+static inline bool lppaca_shared_proc(struct lppaca *l)
+{
+        return l->yield_count != 0;
+}
+
+/*
  * SLB shadow buffer structure as defined in the PAPR.  The save_area
  * contains adjacent ESID and VSID pairs for each shadowed SLB.  The
  * ESID is stored in the lower 64bits, then the VSID.
  */
 struct slb_shadow {
-        u32     persistent;             /* Number of persistent SLBs */
-        u32     buffer_length;          /* Total shadow buffer length */
-        u64     reserved;
+        __be32  persistent;             /* Number of persistent SLBs */
+        __be32  buffer_length;          /* Total shadow buffer length */
+        __be64  reserved;
         struct  {
-                u64     esid;
-                u64     vsid;
+                __be64     esid;
+                __be64  vsid;
         } save_area[SLB_NUM_BOLTED];
 } ____cacheline_aligned;
 
@@ -130,14 +140,14 @@ extern struct slb_shadow slb_shadow[];
 struct dtl_entry {
         u8      dispatch_reason;
         u8      preempt_reason;
-        u16     processor_id;
-        u32     enqueue_to_dispatch_time;
-        u32     ready_to_enqueue_time;
-        u32     waiting_to_ready_time;
-        u64     timebase;
-        u64     fault_addr;
-        u64     srr0;
-        u64     srr1;
+        __be16  processor_id;
+        __be32  enqueue_to_dispatch_time;
+        __be32  ready_to_enqueue_time;
+        __be32  waiting_to_ready_time;
+        __be64  timebase;
+        __be64  fault_addr;
+        __be64  srr0;
+        __be64  srr1;
 };
 
 #define DISPATCH_LOG_BYTES      4096    /* bytes per cpu */
diff --git a/arch/powerpc/include/asm/mpc5121.h b/arch/powerpc/include/asm/mpc5121.h
index 8ae133eaf9fa..887d3d6133e3 100644
--- a/arch/powerpc/include/asm/mpc5121.h
+++ b/arch/powerpc/include/asm/mpc5121.h
@@ -32,25 +32,11 @@ struct mpc512x_ccm {
         u32     scfr2;  /* System Clock Frequency Register 2 */
         u32     scfr2s; /* System Clock Frequency Shadow Register 2 */
         u32     bcr;    /* Bread Crumb Register */
-        u32     p0ccr;  /* PSC0 Clock Control Register */
-        u32     p1ccr;  /* PSC1 CCR */
-        u32     p2ccr;  /* PSC2 CCR */
-        u32     p3ccr;  /* PSC3 CCR */
-        u32     p4ccr;  /* PSC4 CCR */
-        u32     p5ccr;  /* PSC5 CCR */
-        u32     p6ccr;  /* PSC6 CCR */
-        u32     p7ccr;  /* PSC7 CCR */
-        u32     p8ccr;  /* PSC8 CCR */
-        u32     p9ccr;  /* PSC9 CCR */
-        u32     p10ccr; /* PSC10 CCR */
-        u32     p11ccr; /* PSC11 CCR */
+        u32     psc_ccr[12];    /* PSC Clock Control Registers */
         u32     spccr;  /* SPDIF Clock Control Register */
         u32     cccr;   /* CFM Clock Control Register */
         u32     dccr;   /* DIU Clock Control Register */
-        u32     m1ccr;  /* MSCAN1 CCR */
-        u32     m2ccr;  /* MSCAN2 CCR */
-        u32     m3ccr;  /* MSCAN3 CCR */
-        u32     m4ccr;  /* MSCAN4 CCR */
+        u32     mscan_ccr[4];   /* MSCAN Clock Control Registers */
         u8      res[0x98]; /* Reserved */
 };
 
diff --git a/arch/powerpc/include/asm/mpc85xx.h b/arch/powerpc/include/asm/mpc85xx.h
new file mode 100644
index 000000000000..736d4acc05a8
--- /dev/null
+++ b/arch/powerpc/include/asm/mpc85xx.h
@@ -0,0 +1,92 @@
+/*
+ * MPC85xx cpu type detection
+ *
+ * Copyright 2011-2012 Freescale Semiconductor, Inc.
+ *
+ * This is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ */
+
+#ifndef __ASM_PPC_MPC85XX_H
+#define __ASM_PPC_MPC85XX_H
+
+#define SVR_REV(svr)    ((svr) & 0xFF)          /* SOC design resision */
+#define SVR_MAJ(svr)    (((svr) >>  4) & 0xF)   /* Major revision field*/
+#define SVR_MIN(svr)    (((svr) >>  0) & 0xF)   /* Minor revision field*/
+
+/* Some parts define SVR[0:23] as the SOC version */
+#define SVR_SOC_VER(svr) (((svr) >> 8) & 0xFFF7FF)      /* SOC Version fields */
+
+#define SVR_8533        0x803400
+#define SVR_8535        0x803701
+#define SVR_8536        0x803700
+#define SVR_8540        0x803000
+#define SVR_8541        0x807200
+#define SVR_8543        0x803200
+#define SVR_8544        0x803401
+#define SVR_8545        0x803102
+#define SVR_8547        0x803101
+#define SVR_8548        0x803100
+#define SVR_8555        0x807100
+#define SVR_8560        0x807000
+#define SVR_8567        0x807501
+#define SVR_8568        0x807500
+#define SVR_8569        0x808000
+#define SVR_8572        0x80E000
+#define SVR_P1010       0x80F100
+#define SVR_P1011       0x80E500
+#define SVR_P1012       0x80E501
+#define SVR_P1013       0x80E700
+#define SVR_P1014       0x80F101
+#define SVR_P1017       0x80F700
+#define SVR_P1020       0x80E400
+#define SVR_P1021       0x80E401
+#define SVR_P1022       0x80E600
+#define SVR_P1023       0x80F600
+#define SVR_P1024       0x80E402
+#define SVR_P1025       0x80E403
+#define SVR_P2010       0x80E300
+#define SVR_P2020       0x80E200
+#define SVR_P2040       0x821000
+#define SVR_P2041       0x821001
+#define SVR_P3041       0x821103
+#define SVR_P4040       0x820100
+#define SVR_P4080       0x820000
+#define SVR_P5010       0x822100
+#define SVR_P5020       0x822000
+#define SVR_P5021       0X820500
+#define SVR_P5040       0x820400
+#define SVR_T4240       0x824000
+#define SVR_T4120       0x824001
+#define SVR_T4160       0x824100
+#define SVR_C291        0x850000
+#define SVR_C292        0x850020
+#define SVR_C293        0x850030
+#define SVR_B4860       0X868000
+#define SVR_G4860       0x868001
+#define SVR_G4060       0x868003
+#define SVR_B4440       0x868100
+#define SVR_G4440       0x868101
+#define SVR_B4420       0x868102
+#define SVR_B4220       0x868103
+#define SVR_T1040       0x852000
+#define SVR_T1041       0x852001
+#define SVR_T1042       0x852002
+#define SVR_T1020       0x852100
+#define SVR_T1021       0x852101
+#define SVR_T1022       0x852102
+
+#define SVR_8610        0x80A000
+#define SVR_8641        0x809000
+#define SVR_8641D       0x809001
+
+#define SVR_9130        0x860001
+#define SVR_9131        0x860000
+#define SVR_9132        0x861000
+#define SVR_9232        0x861400
+
+#define SVR_Unknown     0xFFFFFF
+
+#endif
diff --git a/arch/powerpc/include/asm/mpic.h b/arch/powerpc/include/asm/mpic.h
index 4a1ac9fbf186..754f93d208fa 100644
--- a/arch/powerpc/include/asm/mpic.h
+++ b/arch/powerpc/include/asm/mpic.h
@@ -396,7 +396,14 @@ extern struct bus_type mpic_subsys;
 #define MPIC_REGSET_TSI108              MPIC_REGSET(1)  /* Tsi108/109 PIC */
 
 /* Get the version of primary MPIC */
+#ifdef CONFIG_MPIC
 extern u32 fsl_mpic_primary_get_version(void);
+#else
+static inline u32 fsl_mpic_primary_get_version(void)
+{
+        return 0;
+}
+#endif
 
 /* Allocate the controller structure and setup the linux irq descs
  * for the range if interrupts passed in. No HW initialization is
diff --git a/arch/powerpc/include/asm/opal.h b/arch/powerpc/include/asm/opal.h
index 029fe85722aa..c5cd72833d6e 100644
--- a/arch/powerpc/include/asm/opal.h
+++ b/arch/powerpc/include/asm/opal.h
@@ -124,6 +124,11 @@ extern int opal_enter_rtas(struct rtas_args *args,
 #define OPAL_PCI_POLL                           62
 #define OPAL_PCI_MSI_EOI                        63
 #define OPAL_PCI_GET_PHB_DIAG_DATA2             64
+#define OPAL_XSCOM_READ                         65
+#define OPAL_XSCOM_WRITE                        66
+#define OPAL_LPC_READ                           67
+#define OPAL_LPC_WRITE                          68
+#define OPAL_RETURN_CPU                         69
 
 #ifndef __ASSEMBLY__
 
@@ -337,6 +342,17 @@ enum OpalEpowStatus {
         OPAL_EPOW_OVER_INTERNAL_TEMP = 3
 };
 
+/*
+ * Address cycle types for LPC accesses. These also correspond
+ * to the content of the first cell of the "reg" property for
+ * device nodes on the LPC bus
+ */
+enum OpalLPCAddressType {
+        OPAL_LPC_MEM    = 0,
+        OPAL_LPC_IO     = 1,
+        OPAL_LPC_FW     = 2,
+};
+
 struct opal_machine_check_event {
         enum OpalMCE_Version    version:8;      /* 0x00 */
         uint8_t                 in_use;         /* 0x01 */
@@ -631,6 +647,15 @@ int64_t opal_set_system_attention_led(uint8_t led_action);
 int64_t opal_pci_next_error(uint64_t phb_id, uint64_t *first_frozen_pe,
                             uint16_t *pci_error_type, uint16_t *severity);
 int64_t opal_pci_poll(uint64_t phb_id);
+int64_t opal_return_cpu(void);
+
+int64_t opal_xscom_read(uint32_t gcid, uint32_t pcb_addr, uint64_t *val);
+int64_t opal_xscom_write(uint32_t gcid, uint32_t pcb_addr, uint64_t val);
+
+int64_t opal_lpc_write(uint32_t chip_id, enum OpalLPCAddressType addr_type,
+                       uint32_t addr, uint32_t data, uint32_t sz);
+int64_t opal_lpc_read(uint32_t chip_id, enum OpalLPCAddressType addr_type,
+                      uint32_t addr, uint32_t *data, uint32_t sz);
 
 /* Internal functions */
 extern int early_init_dt_scan_opal(unsigned long node, const char *uname, int depth, void *data);
@@ -664,6 +689,8 @@ extern int opal_machine_check(struct pt_regs *regs);
 
 extern void opal_shutdown(void);
 
+extern void opal_lpc_init(void);
+
 #endif /* __ASSEMBLY__ */
 
 #endif /* __OPAL_H */
diff --git a/arch/powerpc/include/asm/paca.h b/arch/powerpc/include/asm/paca.h
index 77c91e74b612..a5954cebbc55 100644
--- a/arch/powerpc/include/asm/paca.h
+++ b/arch/powerpc/include/asm/paca.h
@@ -68,8 +68,13 @@ struct paca_struct {
          * instruction.  They must travel together and be properly
          * aligned.
          */
+#ifdef __BIG_ENDIAN__
         u16 lock_token;                 /* Constant 0x8000, used in locks */
         u16 paca_index;                 /* Logical processor number */
+#else
+        u16 paca_index;                 /* Logical processor number */
+        u16 lock_token;                 /* Constant 0x8000, used in locks */
+#endif
 
         u64 kernel_toc;                 /* Kernel TOC address */
         u64 kernelbase;                 /* Base address of kernel */
@@ -93,9 +98,9 @@ struct paca_struct {
          * Now, starting in cacheline 2, the exception save areas
          */
         /* used for most interrupts/exceptions */
-        u64 exgen[12] __attribute__((aligned(0x80)));
-        u64 exmc[12];           /* used for machine checks */
-        u64 exslb[12];          /* used for SLB/segment table misses
+        u64 exgen[13] __attribute__((aligned(0x80)));
+        u64 exmc[13];           /* used for machine checks */
+        u64 exslb[13];          /* used for SLB/segment table misses
                                  * on the linear mapping */
         /* SLB related definitions */
         u16 vmalloc_sllp;
diff --git a/arch/powerpc/include/asm/page.h b/arch/powerpc/include/asm/page.h
index 988c812aab5b..b9f426212d3a 100644
--- a/arch/powerpc/include/asm/page.h
+++ b/arch/powerpc/include/asm/page.h
@@ -211,9 +211,19 @@ extern long long virt_phys_offset;
 #define __va(x) ((void *)(unsigned long)((phys_addr_t)(x) + VIRT_PHYS_OFFSET))
 #define __pa(x) ((unsigned long)(x) - VIRT_PHYS_OFFSET)
 #else
+#ifdef CONFIG_PPC64
+/*
+ * gcc miscompiles (unsigned long)(&static_var) - PAGE_OFFSET
+ * with -mcmodel=medium, so we use & and | instead of - and + on 64-bit.
+ */
+#define __va(x) ((void *)(unsigned long)((phys_addr_t)(x) | PAGE_OFFSET))
+#define __pa(x) ((unsigned long)(x) & 0x0fffffffffffffffUL)
+
+#else /* 32-bit, non book E */
 #define __va(x) ((void *)(unsigned long)((phys_addr_t)(x) + PAGE_OFFSET - MEMORY_START))
 #define __pa(x) ((unsigned long)(x) - PAGE_OFFSET + MEMORY_START)
 #endif
+#endif
 
 /*
  * Unfortunately the PLT is in the BSS in the PPC32 ELF ABI,
diff --git a/arch/powerpc/include/asm/pci-bridge.h b/arch/powerpc/include/asm/pci-bridge.h
index 32d0d2018faf..4ca90a39d6d0 100644
--- a/arch/powerpc/include/asm/pci-bridge.h
+++ b/arch/powerpc/include/asm/pci-bridge.h
@@ -159,7 +159,7 @@ struct pci_dn {
 
         int     pci_ext_config_space;   /* for pci devices */
 
-        int     force_32bit_msi:1;
+        bool    force_32bit_msi;
 
         struct  pci_dev *pcidev;        /* back-pointer to the pci device */
 #ifdef CONFIG_EEH
diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h
index 6653f2743c4e..95145a15c708 100644
--- a/arch/powerpc/include/asm/pci.h
+++ b/arch/powerpc/include/asm/pci.h
@@ -113,11 +113,6 @@ extern int pci_domain_nr(struct pci_bus *bus);
 /* Decide whether to display the domain number in /proc */
 extern int pci_proc_domain(struct pci_bus *bus);
 
-/* MSI arch hooks */
-#define arch_setup_msi_irqs arch_setup_msi_irqs
-#define arch_teardown_msi_irqs arch_teardown_msi_irqs
-#define arch_msi_check_device arch_msi_check_device
-
 struct vm_area_struct;
 /* Map a range of PCI memory or I/O space for a device into user space */
 int pci_mmap_page_range(struct pci_dev *pdev, struct vm_area_struct *vma,
diff --git a/arch/powerpc/include/asm/perf_event_fsl_emb.h b/arch/powerpc/include/asm/perf_event_fsl_emb.h
index 718a9fa94e68..a58165450f6f 100644
--- a/arch/powerpc/include/asm/perf_event_fsl_emb.h
+++ b/arch/powerpc/include/asm/perf_event_fsl_emb.h
@@ -13,7 +13,7 @@
 #include <linux/types.h>
 #include <asm/hw_irq.h>
 
-#define MAX_HWEVENTS 4
+#define MAX_HWEVENTS 6
 
 /* event flags */
 #define FSL_EMB_EVENT_VALID      1
diff --git a/arch/powerpc/include/asm/perf_event_server.h b/arch/powerpc/include/asm/perf_event_server.h
index 8b2492644754..3fd2f1b6f906 100644
--- a/arch/powerpc/include/asm/perf_event_server.h
+++ b/arch/powerpc/include/asm/perf_event_server.h
@@ -138,11 +138,11 @@ extern ssize_t power_events_sysfs_show(struct device *dev,
 #define EVENT_PTR(_id, _suffix)         &EVENT_VAR(_id, _suffix).attr.attr
 
 #define EVENT_ATTR(_name, _id, _suffix)                                 \
-        PMU_EVENT_ATTR(_name, EVENT_VAR(_id, _suffix), PME_PM_##_id,    \
+        PMU_EVENT_ATTR(_name, EVENT_VAR(_id, _suffix), PME_##_id,       \
                         power_events_sysfs_show)
 
 #define GENERIC_EVENT_ATTR(_name, _id)  EVENT_ATTR(_name, _id, _g)
 #define GENERIC_EVENT_PTR(_id)          EVENT_PTR(_id, _g)
 
-#define POWER_EVENT_ATTR(_name, _id)    EVENT_ATTR(PM_##_name, _id, _p)
+#define POWER_EVENT_ATTR(_name, _id)    EVENT_ATTR(_name, _id, _p)
 #define POWER_EVENT_PTR(_id)            EVENT_PTR(_id, _p)
diff --git a/arch/powerpc/platforms/pseries/plpar_wrappers.h b/arch/powerpc/include/asm/plpar_wrappers.h
index f35787b6a5e0..a63b045e707c 100644
--- a/arch/powerpc/platforms/pseries/plpar_wrappers.h
+++ b/arch/powerpc/include/asm/plpar_wrappers.h
@@ -1,5 +1,5 @@
-#ifndef _PSERIES_PLPAR_WRAPPERS_H
-#define _PSERIES_PLPAR_WRAPPERS_H
+#ifndef _ASM_POWERPC_PLPAR_WRAPPERS_H
+#define _ASM_POWERPC_PLPAR_WRAPPERS_H
 
 #include <linux/string.h>
 #include <linux/irqflags.h>
@@ -256,30 +256,6 @@ static inline long plpar_tce_stuff(unsigned long liobn, unsigned long ioba,
         return plpar_hcall_norets(H_STUFF_TCE, liobn, ioba, tceval, count);
 }
 
-static inline long plpar_get_term_char(unsigned long termno,
-                unsigned long *len_ret, char *buf_ret)
-{
-        long rc;
-        unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
-        unsigned long *lbuf = (unsigned long *)buf_ret; /* TODO: alignment? */
-
-        rc = plpar_hcall(H_GET_TERM_CHAR, retbuf, termno);
-
-        *len_ret = retbuf[0];
-        lbuf[0] = retbuf[1];
-        lbuf[1] = retbuf[2];
-
-        return rc;
-}
-
-static inline long plpar_put_term_char(unsigned long termno, unsigned long len,
-                const char *buffer)
-{
-        unsigned long *lbuf = (unsigned long *)buffer;  /* TODO: alignment? */
-        return plpar_hcall_norets(H_PUT_TERM_CHAR, termno, len, lbuf[0],
-                        lbuf[1]);
-}
-
 /* Set various resource mode parameters */
 static inline long plpar_set_mode(unsigned long mflags, unsigned long resource,
                 unsigned long value1, unsigned long value2)
@@ -321,4 +297,4 @@ static inline long plapr_set_watchpoint0(unsigned long dawr0, unsigned long dawr
         return plpar_set_mode(0, 2, dawr0, dawrx0);
 }
 
-#endif /* _PSERIES_PLPAR_WRAPPERS_H */
+#endif /* _ASM_POWERPC_PLPAR_WRAPPERS_H */
diff --git a/arch/powerpc/include/asm/ppc-opcode.h b/arch/powerpc/include/asm/ppc-opcode.h
index eccfc161e58e..d7fe9f5b46d4 100644
--- a/arch/powerpc/include/asm/ppc-opcode.h
+++ b/arch/powerpc/include/asm/ppc-opcode.h
@@ -81,6 +81,53 @@
 #define __REGA0_R30     30
 #define __REGA0_R31     31
 
+/* opcode and xopcode for instructions */
+#define OP_TRAP 3
+#define OP_TRAP_64 2
+
+#define OP_31_XOP_TRAP      4
+#define OP_31_XOP_LWZX      23
+#define OP_31_XOP_DCBST     54
+#define OP_31_XOP_LWZUX     55
+#define OP_31_XOP_TRAP_64   68
+#define OP_31_XOP_DCBF      86
+#define OP_31_XOP_LBZX      87
+#define OP_31_XOP_STWX      151
+#define OP_31_XOP_STBX      215
+#define OP_31_XOP_LBZUX     119
+#define OP_31_XOP_STBUX     247
+#define OP_31_XOP_LHZX      279
+#define OP_31_XOP_LHZUX     311
+#define OP_31_XOP_MFSPR     339
+#define OP_31_XOP_LHAX      343
+#define OP_31_XOP_LHAUX     375
+#define OP_31_XOP_STHX      407
+#define OP_31_XOP_STHUX     439
+#define OP_31_XOP_MTSPR     467
+#define OP_31_XOP_DCBI      470
+#define OP_31_XOP_LWBRX     534
+#define OP_31_XOP_TLBSYNC   566
+#define OP_31_XOP_STWBRX    662
+#define OP_31_XOP_LHBRX     790
+#define OP_31_XOP_STHBRX    918
+
+#define OP_LWZ  32
+#define OP_LD   58
+#define OP_LWZU 33
+#define OP_LBZ  34
+#define OP_LBZU 35
+#define OP_STW  36
+#define OP_STWU 37
+#define OP_STD  62
+#define OP_STB  38
+#define OP_STBU 39
+#define OP_LHZ  40
+#define OP_LHZU 41
+#define OP_LHA  42
+#define OP_LHAU 43
+#define OP_STH  44
+#define OP_STHU 45
+
 /* sorted alphabetically */
 #define PPC_INST_BHRBE                  0x7c00025c
 #define PPC_INST_CLRBHRB                0x7c00035c
diff --git a/arch/powerpc/include/asm/ppc_asm.h b/arch/powerpc/include/asm/ppc_asm.h
index 2f1b6c5f8174..599545738af3 100644
--- a/arch/powerpc/include/asm/ppc_asm.h
+++ b/arch/powerpc/include/asm/ppc_asm.h
@@ -54,7 +54,8 @@ BEGIN_FW_FTR_SECTION;							\
         /* from user - see if there are any DTL entries to process */   \
         ld      r10,PACALPPACAPTR(r13); /* get ptr to VPA */            \
         ld      r11,PACA_DTL_RIDX(r13); /* get log read index */        \
-        ld      r10,LPPACA_DTLIDX(r10); /* get log write index */       \
+        addi    r10,r10,LPPACA_DTLIDX;                                  \
+        LDX_BE  r10,0,r10;              /* get log write index */       \
         cmpd    cr1,r11,r10;                                            \
         beq+    cr1,33f;                                                \
         bl      .accumulate_stolen_time;                                \
@@ -219,19 +220,6 @@ END_FW_FTR_SECTION_IFSET(FW_FEATURE_SPLPAR)
 #define REST_8VSRS(n,b,base)    REST_4VSRS(n,b,base); REST_4VSRS(n+4,b,base)
 #define REST_16VSRS(n,b,base)   REST_8VSRS(n,b,base); REST_8VSRS(n+8,b,base)
 #define REST_32VSRS(n,b,base)   REST_16VSRS(n,b,base); REST_16VSRS(n+16,b,base)
-/* Save the upper 32 VSRs (32-63) in the thread VSX region (0-31) */
-#define SAVE_VSRU(n,b,base)     li b,THREAD_VR0+(16*(n));  STXVD2X(n+32,R##base,R##b)
-#define SAVE_2VSRSU(n,b,base)   SAVE_VSRU(n,b,base); SAVE_VSRU(n+1,b,base)
-#define SAVE_4VSRSU(n,b,base)   SAVE_2VSRSU(n,b,base); SAVE_2VSRSU(n+2,b,base)
-#define SAVE_8VSRSU(n,b,base)   SAVE_4VSRSU(n,b,base); SAVE_4VSRSU(n+4,b,base)
-#define SAVE_16VSRSU(n,b,base)  SAVE_8VSRSU(n,b,base); SAVE_8VSRSU(n+8,b,base)
-#define SAVE_32VSRSU(n,b,base)  SAVE_16VSRSU(n,b,base); SAVE_16VSRSU(n+16,b,base)
-#define REST_VSRU(n,b,base)     li b,THREAD_VR0+(16*(n)); LXVD2X(n+32,R##base,R##b)
-#define REST_2VSRSU(n,b,base)   REST_VSRU(n,b,base); REST_VSRU(n+1,b,base)
-#define REST_4VSRSU(n,b,base)   REST_2VSRSU(n,b,base); REST_2VSRSU(n+2,b,base)
-#define REST_8VSRSU(n,b,base)   REST_4VSRSU(n,b,base); REST_4VSRSU(n+4,b,base)
-#define REST_16VSRSU(n,b,base)  REST_8VSRSU(n,b,base); REST_8VSRSU(n+8,b,base)
-#define REST_32VSRSU(n,b,base)  REST_16VSRSU(n,b,base); REST_16VSRSU(n+16,b,base)
 
 /*
  * b = base register for addressing, o = base offset from register of 1st EVR
@@ -443,15 +431,15 @@ END_FTR_SECTION_IFSET(CPU_FTR_601)
 #define ISYNC_601
 #endif
 
-#ifdef CONFIG_PPC_CELL
+#if defined(CONFIG_PPC_CELL) || defined(CONFIG_PPC_FSL_BOOK3E)
 #define MFTB(dest)                      \
-90:     mftb  dest;                     \
+90:     mfspr dest, SPRN_TBRL;          \
 BEGIN_FTR_SECTION_NESTED(96);           \
         cmpwi dest,0;                   \
         beq-  90b;                      \
 END_FTR_SECTION_NESTED(CPU_FTR_CELL_TB_BUG, CPU_FTR_CELL_TB_BUG, 96)
 #else
-#define MFTB(dest)                      mftb dest
+#define MFTB(dest)                      mfspr dest, SPRN_TBRL
 #endif
 
 #ifndef CONFIG_SMP
diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
index e378cccfca55..ce4de5aed7b5 100644
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -149,8 +149,6 @@ typedef struct {
 
 struct thread_struct {
         unsigned long   ksp;            /* Kernel stack pointer */
-        unsigned long   ksp_limit;      /* if ksp <= ksp_limit stack overflow */
-
 #ifdef CONFIG_PPC64
         unsigned long   ksp_vsid;
 #endif
@@ -162,6 +160,7 @@ struct thread_struct {
 #endif
 #ifdef CONFIG_PPC32
         void            *pgdir;         /* root of page-table tree */
+        unsigned long   ksp_limit;      /* if ksp <= ksp_limit stack overflow */
 #endif
 #ifdef CONFIG_PPC_ADV_DEBUG_REGS
         /*
@@ -321,7 +320,6 @@ struct thread_struct {
 #else
 #define INIT_THREAD  { \
         .ksp = INIT_SP, \
-        .ksp_limit = INIT_SP_LIMIT, \
         .regs = (struct pt_regs *)INIT_SP - 1, /* XXX bogus, I think */ \
         .fs = KERNEL_DS, \
         .fpr = {{0}}, \
diff --git a/arch/powerpc/include/asm/prom.h b/arch/powerpc/include/asm/prom.h
index bc2da154f68b..7d0c7f3a7171 100644
--- a/arch/powerpc/include/asm/prom.h
+++ b/arch/powerpc/include/asm/prom.h
@@ -38,14 +38,12 @@ extern unsigned long pci_address_to_pio(phys_addr_t address);
 /* Parse the ibm,dma-window property of an OF node into the busno, phys and
  * size parameters.
  */
-void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop,
-                unsigned long *busno, unsigned long *phys, unsigned long *size);
+void of_parse_dma_window(struct device_node *dn, const __be32 *dma_window,
+                         unsigned long *busno, unsigned long *phys,
+                         unsigned long *size);
 
 extern void kdump_move_device_tree(void);
 
-/* CPU OF node matching */
-struct device_node *of_get_cpu_node(int cpu, unsigned int *thread);
-
 /* cache lookup */
 struct device_node *of_find_next_cache_node(struct device_node *np);
 
@@ -58,6 +56,8 @@ static inline int of_node_to_nid(struct device_node *device) { return 0; }
 
 extern void of_instantiate_rtc(void);
 
+extern int of_get_ibm_chip_id(struct device_node *np);
+
 /* The of_drconf_cell struct defines the layout of the LMB array
  * specified in the device tree property
  * ibm,dynamic-reconfiguration-memory/ibm,dynamic-memory
diff --git a/arch/powerpc/include/asm/reg.h b/arch/powerpc/include/asm/reg.h
index 99222e27f173..10d1ef016bf1 100644
--- a/arch/powerpc/include/asm/reg.h
+++ b/arch/powerpc/include/asm/reg.h
@@ -115,10 +115,10 @@
 #define MSR_64BIT       MSR_SF
 
 /* Server variant */
-#define MSR_            MSR_ME | MSR_RI | MSR_IR | MSR_DR | MSR_ISF |MSR_HV
-#define MSR_KERNEL      MSR_ | MSR_64BIT
-#define MSR_USER32      MSR_ | MSR_PR | MSR_EE
-#define MSR_USER64      MSR_USER32 | MSR_64BIT
+#define MSR_            (MSR_ME | MSR_RI | MSR_IR | MSR_DR | MSR_ISF |MSR_HV)
+#define MSR_KERNEL      (MSR_ | MSR_64BIT)
+#define MSR_USER32      (MSR_ | MSR_PR | MSR_EE)
+#define MSR_USER64      (MSR_USER32 | MSR_64BIT)
 #elif defined(CONFIG_PPC_BOOK3S_32) || defined(CONFIG_8xx)
 /* Default MSR for kernel mode. */
 #define MSR_KERNEL      (MSR_ME|MSR_RI|MSR_IR|MSR_DR)
@@ -258,8 +258,8 @@
 #define FSCR_TAR_LG     8       /* Enable Target Address Register */
 #define FSCR_EBB_LG     7       /* Enable Event Based Branching */
 #define FSCR_TM_LG      5       /* Enable Transactional Memory */
-#define FSCR_PM_LG      4       /* Enable prob/priv access to PMU SPRs */
-#define FSCR_BHRB_LG    3       /* Enable Branch History Rolling Buffer*/
+#define FSCR_BHRB_LG    4       /* Enable Branch History Rolling Buffer*/
+#define FSCR_PM_LG      3       /* Enable prob/priv access to PMU SPRs */
 #define FSCR_DSCR_LG    2       /* Enable Data Stream Control Register */
 #define FSCR_VECVSX_LG  1       /* Enable VMX/VSX  */
 #define FSCR_FP_LG      0       /* Enable Floating Point */
@@ -1126,10 +1126,10 @@
                                      : "memory")
 
 #ifdef __powerpc64__
-#ifdef CONFIG_PPC_CELL
+#if defined(CONFIG_PPC_CELL) || defined(CONFIG_PPC_FSL_BOOK3E)
 #define mftb()          ({unsigned long rval;                           \
                         asm volatile(                                   \
-                                "90:    mftb %0;\n"                     \
+                                "90:    mfspr %0, %2;\n"                \
                                 "97:    cmpwi %0,0;\n"                  \
                                 "       beq- 90b;\n"                    \
                                 "99:\n"                                 \
@@ -1143,18 +1143,23 @@
                                 "       .llong 0\n"                     \
                                 "       .llong 0\n"                     \
                                 ".previous"                             \
-                        : "=r" (rval) : "i" (CPU_FTR_CELL_TB_BUG)); rval;})
+                        : "=r" (rval) \
+                        : "i" (CPU_FTR_CELL_TB_BUG), "i" (SPRN_TBRL)); \
+                        rval;})
 #else
 #define mftb()          ({unsigned long rval;   \
-                        asm volatile("mftb %0" : "=r" (rval)); rval;})
+                        asm volatile("mfspr %0, %1" : \
+                                     "=r" (rval) : "i" (SPRN_TBRL)); rval;})
 #endif /* !CONFIG_PPC_CELL */
 
 #else /* __powerpc64__ */
 
 #define mftbl()         ({unsigned long rval;   \
-                        asm volatile("mftbl %0" : "=r" (rval)); rval;})
+                        asm volatile("mfspr %0, %1" : "=r" (rval) : \
+                                "i" (SPRN_TBRL)); rval;})
 #define mftbu()         ({unsigned long rval;   \
-                        asm volatile("mftbu %0" : "=r" (rval)); rval;})
+                        asm volatile("mfspr %0, %1" : "=r" (rval) : \
+                                "i" (SPRN_TBRU)); rval;})
 #endif /* !__powerpc64__ */
 
 #define mttbl(v)        asm volatile("mttbl %0":: "r"(v))
diff --git a/arch/powerpc/include/asm/reg_booke.h b/arch/powerpc/include/asm/reg_booke.h
index b417de3cc2c4..ed8f836da094 100644
--- a/arch/powerpc/include/asm/reg_booke.h
+++ b/arch/powerpc/include/asm/reg_booke.h
@@ -29,10 +29,10 @@
 #if defined(CONFIG_PPC_BOOK3E_64)
 #define MSR_64BIT       MSR_CM
 
-#define MSR_            MSR_ME | MSR_CE
-#define MSR_KERNEL      MSR_ | MSR_64BIT
-#define MSR_USER32      MSR_ | MSR_PR | MSR_EE
-#define MSR_USER64      MSR_USER32 | MSR_64BIT
+#define MSR_            (MSR_ME | MSR_CE)
+#define MSR_KERNEL      (MSR_ | MSR_64BIT)
+#define MSR_USER32      (MSR_ | MSR_PR | MSR_EE)
+#define MSR_USER64      (MSR_USER32 | MSR_64BIT)
 #elif defined (CONFIG_40x)
 #define MSR_KERNEL      (MSR_ME|MSR_RI|MSR_IR|MSR_DR|MSR_CE)
 #define MSR_USER        (MSR_KERNEL|MSR_PR|MSR_EE)
diff --git a/arch/powerpc/include/asm/reg_fsl_emb.h b/arch/powerpc/include/asm/reg_fsl_emb.h
index 77bb71cfd991..0e3ddf5177f6 100644
--- a/arch/powerpc/include/asm/reg_fsl_emb.h
+++ b/arch/powerpc/include/asm/reg_fsl_emb.h
@@ -17,12 +17,16 @@
 /* Freescale Book E Performance Monitor APU Registers */
 #define PMRN_PMC0       0x010   /* Performance Monitor Counter 0 */
 #define PMRN_PMC1       0x011   /* Performance Monitor Counter 1 */
-#define PMRN_PMC2       0x012   /* Performance Monitor Counter 1 */
-#define PMRN_PMC3       0x013   /* Performance Monitor Counter 1 */
+#define PMRN_PMC2       0x012   /* Performance Monitor Counter 2 */
+#define PMRN_PMC3       0x013   /* Performance Monitor Counter 3 */
+#define PMRN_PMC4       0x014   /* Performance Monitor Counter 4 */
+#define PMRN_PMC5       0x015   /* Performance Monitor Counter 5 */
 #define PMRN_PMLCA0     0x090   /* PM Local Control A0 */
 #define PMRN_PMLCA1     0x091   /* PM Local Control A1 */
 #define PMRN_PMLCA2     0x092   /* PM Local Control A2 */
 #define PMRN_PMLCA3     0x093   /* PM Local Control A3 */
+#define PMRN_PMLCA4     0x094   /* PM Local Control A4 */
+#define PMRN_PMLCA5     0x095   /* PM Local Control A5 */
 
 #define PMLCA_FC        0x80000000      /* Freeze Counter */
 #define PMLCA_FCS       0x40000000      /* Freeze in Supervisor */
@@ -30,14 +34,18 @@
 #define PMLCA_FCM1      0x10000000      /* Freeze when PMM==1 */
 #define PMLCA_FCM0      0x08000000      /* Freeze when PMM==0 */
 #define PMLCA_CE        0x04000000      /* Condition Enable */
+#define PMLCA_FGCS1     0x00000002      /* Freeze in guest state */
+#define PMLCA_FGCS0     0x00000001      /* Freeze in hypervisor state */
 
-#define PMLCA_EVENT_MASK 0x00ff0000     /* Event field */
+#define PMLCA_EVENT_MASK 0x01ff0000     /* Event field */
 #define PMLCA_EVENT_SHIFT       16
 
 #define PMRN_PMLCB0     0x110   /* PM Local Control B0 */
 #define PMRN_PMLCB1     0x111   /* PM Local Control B1 */
 #define PMRN_PMLCB2     0x112   /* PM Local Control B2 */
 #define PMRN_PMLCB3     0x113   /* PM Local Control B3 */
+#define PMRN_PMLCB4     0x114   /* PM Local Control B4 */
+#define PMRN_PMLCB5     0x115   /* PM Local Control B5 */
 
 #define PMLCB_THRESHMUL_MASK    0x0700  /* Threshold Multiple Field */
 #define PMLCB_THRESHMUL_SHIFT   8
@@ -55,16 +63,22 @@
 
 #define PMRN_UPMC0      0x000   /* User Performance Monitor Counter 0 */
 #define PMRN_UPMC1      0x001   /* User Performance Monitor Counter 1 */
-#define PMRN_UPMC2      0x002   /* User Performance Monitor Counter 1 */
-#define PMRN_UPMC3      0x003   /* User Performance Monitor Counter 1 */
+#define PMRN_UPMC2      0x002   /* User Performance Monitor Counter 2 */
+#define PMRN_UPMC3      0x003   /* User Performance Monitor Counter 3 */
+#define PMRN_UPMC4      0x004   /* User Performance Monitor Counter 4 */
+#define PMRN_UPMC5      0x005   /* User Performance Monitor Counter 5 */
 #define PMRN_UPMLCA0    0x080   /* User PM Local Control A0 */
 #define PMRN_UPMLCA1    0x081   /* User PM Local Control A1 */
 #define PMRN_UPMLCA2    0x082   /* User PM Local Control A2 */
 #define PMRN_UPMLCA3    0x083   /* User PM Local Control A3 */
+#define PMRN_UPMLCA4    0x084   /* User PM Local Control A4 */
+#define PMRN_UPMLCA5    0x085   /* User PM Local Control A5 */
 #define PMRN_UPMLCB0    0x100   /* User PM Local Control B0 */
 #define PMRN_UPMLCB1    0x101   /* User PM Local Control B1 */
 #define PMRN_UPMLCB2    0x102   /* User PM Local Control B2 */
 #define PMRN_UPMLCB3    0x103   /* User PM Local Control B3 */
+#define PMRN_UPMLCB4    0x104   /* User PM Local Control B4 */
+#define PMRN_UPMLCB5    0x105   /* User PM Local Control B5 */
 #define PMRN_UPMGC0     0x180   /* User PM Global Control 0 */
 
 
diff --git a/arch/powerpc/include/asm/rtas.h b/arch/powerpc/include/asm/rtas.h
index c7a8bfc9f6f5..9bd52c65e66f 100644
--- a/arch/powerpc/include/asm/rtas.h
+++ b/arch/powerpc/include/asm/rtas.h
@@ -44,12 +44,12 @@
  *
  */
 
-typedef u32 rtas_arg_t;
+typedef __be32 rtas_arg_t;
 
 struct rtas_args {
-        u32 token;
-        u32 nargs;
-        u32 nret; 
+        __be32 token;
+        __be32 nargs;
+        __be32 nret; 
         rtas_arg_t args[16];
         rtas_arg_t *rets;     /* Pointer to return values in args[]. */
 };  
diff --git a/arch/powerpc/include/asm/smp.h b/arch/powerpc/include/asm/smp.h
index 48cfc858abd6..98da78e0c2c0 100644
--- a/arch/powerpc/include/asm/smp.h
+++ b/arch/powerpc/include/asm/smp.h
@@ -112,6 +112,7 @@ static inline struct cpumask *cpu_core_mask(int cpu)
 }
 
 extern int cpu_to_core_id(int cpu);
+extern int cpu_to_chip_id(int cpu);
 
 /* Since OpenPIC has only 4 IPIs, we use slightly different message numbers.
  *
@@ -186,6 +187,8 @@ extern int smt_enabled_at_boot;
 extern int smp_mpic_probe(void);
 extern void smp_mpic_setup_cpu(int cpu);
 extern int smp_generic_kick_cpu(int nr);
+extern int smp_generic_cpu_bootable(unsigned int nr);
+
 
 extern void smp_generic_give_timebase(void);
 extern void smp_generic_take_timebase(void);
diff --git a/arch/powerpc/include/asm/spinlock.h b/arch/powerpc/include/asm/spinlock.h
index 5b23f910ee57..5f54a744dcc5 100644
--- a/arch/powerpc/include/asm/spinlock.h
+++ b/arch/powerpc/include/asm/spinlock.h
@@ -32,8 +32,12 @@
 
 #ifdef CONFIG_PPC64
 /* use 0x800000yy when locked, where yy == CPU number */
+#ifdef __BIG_ENDIAN__
 #define LOCK_TOKEN      (*(u32 *)(&get_paca()->lock_token))
 #else
+#define LOCK_TOKEN      (*(u32 *)(&get_paca()->paca_index))
+#endif
+#else
 #define LOCK_TOKEN      1
 #endif
 
@@ -96,7 +100,7 @@ static inline int arch_spin_trylock(arch_spinlock_t *lock)
 
 #if defined(CONFIG_PPC_SPLPAR)
 /* We only yield to the hypervisor if we are in shared processor mode */
-#define SHARED_PROCESSOR (local_paca->lppaca_ptr->shared_proc)
+#define SHARED_PROCESSOR (lppaca_shared_proc(local_paca->lppaca_ptr))
 extern void __spin_yield(arch_spinlock_t *lock);
 extern void __rw_yield(arch_rwlock_t *lock);
 #else /* SPLPAR */
diff --git a/arch/powerpc/include/asm/switch_to.h b/arch/powerpc/include/asm/switch_to.h
index 294c2cedcf7a..2be5618cdec6 100644
--- a/arch/powerpc/include/asm/switch_to.h
+++ b/arch/powerpc/include/asm/switch_to.h
@@ -25,11 +25,8 @@ static inline void save_tar(struct thread_struct *prev)
 static inline void save_tar(struct thread_struct *prev) {}
 #endif
 
-extern void giveup_fpu(struct task_struct *);
 extern void load_up_fpu(void);
-extern void disable_kernel_fp(void);
 extern void enable_kernel_fp(void);
-extern void flush_fp_to_thread(struct task_struct *);
 extern void enable_kernel_altivec(void);
 extern void load_up_altivec(struct task_struct *);
 extern int emulate_altivec(struct pt_regs *);
@@ -47,6 +44,14 @@ static inline void discard_lazy_cpu_state(void)
 }
 #endif
 
+#ifdef CONFIG_PPC_FPU
+extern void flush_fp_to_thread(struct task_struct *);
+extern void giveup_fpu(struct task_struct *);
+#else
+static inline void flush_fp_to_thread(struct task_struct *t) { }
+static inline void giveup_fpu(struct task_struct *t) { }
+#endif
+
 #ifdef CONFIG_ALTIVEC
 extern void flush_altivec_to_thread(struct task_struct *);
 extern void giveup_altivec(struct task_struct *);
diff --git a/arch/powerpc/include/asm/timex.h b/arch/powerpc/include/asm/timex.h
index c55e14f7ef44..18908caa1f3b 100644
--- a/arch/powerpc/include/asm/timex.h
+++ b/arch/powerpc/include/asm/timex.h
@@ -29,7 +29,7 @@ static inline cycles_t get_cycles(void)
         ret = 0;
 
         __asm__ __volatile__(
-                "97:    mftb %0\n"
+                "97:    mfspr %0, %2\n"
                 "99:\n"
                 ".section __ftr_fixup,\"a\"\n"
                 ".align 2\n"
@@ -41,7 +41,7 @@ static inline cycles_t get_cycles(void)
                 "       .long 0\n"
                 "       .long 0\n"
                 ".previous"
-                : "=r" (ret) : "i" (CPU_FTR_601));
+                : "=r" (ret) : "i" (CPU_FTR_601), "i" (SPRN_TBRL));
         return ret;
 #endif
 }
diff --git a/arch/powerpc/include/asm/topology.h b/arch/powerpc/include/asm/topology.h
index 161ab662843b..89e3ef2496ac 100644
--- a/arch/powerpc/include/asm/topology.h
+++ b/arch/powerpc/include/asm/topology.h
@@ -96,6 +96,7 @@ static inline int prrn_is_enabled(void)
 #ifdef CONFIG_PPC64
 #include <asm/smp.h>
 
+#define topology_physical_package_id(cpu)       (cpu_to_chip_id(cpu))
 #define topology_thread_cpumask(cpu)    (per_cpu(cpu_sibling_map, cpu))
 #define topology_core_cpumask(cpu)      (per_cpu(cpu_core_map, cpu))
 #define topology_core_id(cpu)           (cpu_to_core_id(cpu))
diff --git a/arch/powerpc/include/asm/udbg.h b/arch/powerpc/include/asm/udbg.h
index dc590919f8eb..b51fba10e733 100644
--- a/arch/powerpc/include/asm/udbg.h
+++ b/arch/powerpc/include/asm/udbg.h
@@ -27,10 +27,11 @@ extern void udbg_printf(const char *fmt, ...)
         __attribute__ ((format (printf, 1, 2)));
 extern void udbg_progress(char *s, unsigned short hex);
 
-extern void udbg_init_uart(void __iomem *comport, unsigned int speed,
-                           unsigned int clock);
-extern unsigned int udbg_probe_uart_speed(void __iomem *comport,
-                                          unsigned int clock);
+extern void udbg_uart_init_mmio(void __iomem *addr, unsigned int stride);
+extern void udbg_uart_init_pio(unsigned long port, unsigned int stride);
+
+extern void udbg_uart_setup(unsigned int speed, unsigned int clock);
+extern unsigned int udbg_probe_uart_speed(unsigned int clock);
 
 struct device_node;
 extern void udbg_scc_init(int force_scc);
diff --git a/arch/powerpc/include/uapi/asm/elf.h b/arch/powerpc/include/uapi/asm/elf.h
index 05b8d560cfba..7e39c9146a71 100644
--- a/arch/powerpc/include/uapi/asm/elf.h
+++ b/arch/powerpc/include/uapi/asm/elf.h
@@ -107,26 +107,25 @@ typedef elf_gregset_t32 compat_elf_gregset_t;
 # define ELF_NVRREG     34      /* includes vscr & vrsave in split vectors */
 # define ELF_NVSRHALFREG 32     /* Half the vsx registers */
 # define ELF_GREG_TYPE  elf_greg_t64
+# define ELF_ARCH       EM_PPC64
+# define ELF_CLASS      ELFCLASS64
+typedef elf_greg_t64 elf_greg_t;
+typedef elf_gregset_t64 elf_gregset_t;
 #else
 # define ELF_NEVRREG    34      /* includes acc (as 2) */
 # define ELF_NVRREG     33      /* includes vscr */
 # define ELF_GREG_TYPE  elf_greg_t32
 # define ELF_ARCH       EM_PPC
 # define ELF_CLASS      ELFCLASS32
-# define ELF_DATA       ELFDATA2MSB
+typedef elf_greg_t32 elf_greg_t;
+typedef elf_gregset_t32 elf_gregset_t;
 #endif /* __powerpc64__ */
 
-#ifndef ELF_ARCH
-# define ELF_ARCH       EM_PPC64
-# define ELF_CLASS      ELFCLASS64
-# define ELF_DATA       ELFDATA2MSB
-  typedef elf_greg_t64 elf_greg_t;
-  typedef elf_gregset_t64 elf_gregset_t;
+#ifdef __BIG_ENDIAN__
+#define ELF_DATA        ELFDATA2MSB
 #else
-  /* Assumption: ELF_ARCH == EM_PPC and ELF_CLASS == ELFCLASS32 */
-  typedef elf_greg_t32 elf_greg_t;
-  typedef elf_gregset_t32 elf_gregset_t;
-#endif /* ELF_ARCH */
+#define ELF_DATA        ELFDATA2LSB
+#endif
 
 /* Floating point registers */
 typedef double elf_fpreg_t;
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile
index a8619bfe879e..445cb6e39d5b 100644
--- a/arch/powerpc/kernel/Makefile
+++ b/arch/powerpc/kernel/Makefile
@@ -55,7 +55,6 @@ obj-$(CONFIG_PPC_RTAS)		+= rtas.o rtas-rtc.o $(rtaspci-y-y)
 obj-$(CONFIG_PPC_RTAS_DAEMON)   += rtasd.o
 obj-$(CONFIG_RTAS_FLASH)        += rtas_flash.o
 obj-$(CONFIG_RTAS_PROC)         += rtas-proc.o
-obj-$(CONFIG_LPARCFG)           += lparcfg.o
 obj-$(CONFIG_IBMVIO)            += vio.o
 obj-$(CONFIG_IBMEBUS)           += ibmebus.o
 obj-$(CONFIG_EEH)              += eeh.o eeh_pe.o eeh_dev.o eeh_cache.o \
@@ -117,9 +116,7 @@ obj-$(CONFIG_DYNAMIC_FTRACE)	+= ftrace.o
 obj-$(CONFIG_FUNCTION_GRAPH_TRACER)     += ftrace.o
 obj-$(CONFIG_FTRACE_SYSCALLS)   += ftrace.o
 
-obj-$(CONFIG_8XX_MINIMAL_FPEMU) += softemu8xx.o
-
-ifneq ($(CONFIG_PPC_INDIRECT_IO),y)
+ifneq ($(CONFIG_PPC_INDIRECT_PIO),y)
 obj-y                           += iomap.o
 endif
 
diff --git a/arch/powerpc/kernel/align.c b/arch/powerpc/kernel/align.c
index ee5b690a0bed..a27ccd5dc6b9 100644
--- a/arch/powerpc/kernel/align.c
+++ b/arch/powerpc/kernel/align.c
@@ -651,6 +651,10 @@ static int emulate_vsx(unsigned char __user *addr, unsigned int reg,
         int sw = 0;
         int i, j;
 
+        /* userland only */
+        if (unlikely(!user_mode(regs)))
+                return 0;
+
         flush_vsx_to_thread(current);
 
         if (reg < 32)
@@ -764,6 +768,16 @@ int fix_alignment(struct pt_regs *regs)
         nb = aligninfo[instr].len;
         flags = aligninfo[instr].flags;
 
+        /* ldbrx/stdbrx overlap lfs/stfs in the DSISR unfortunately */
+        if (IS_XFORM(instruction) && ((instruction >> 1) & 0x3ff) == 532) {
+                nb = 8;
+                flags = LD+SW;
+        } else if (IS_XFORM(instruction) &&
+                   ((instruction >> 1) & 0x3ff) == 660) {
+                nb = 8;
+                flags = ST+SW;
+        }
+
         /* Byteswap little endian loads and stores */
         swiz = 0;
         if (regs->msr & MSR_LE) {
diff --git a/arch/powerpc/kernel/asm-offsets.c b/arch/powerpc/kernel/asm-offsets.c
index 8207459efe56..502c7a4e73f7 100644
--- a/arch/powerpc/kernel/asm-offsets.c
+++ b/arch/powerpc/kernel/asm-offsets.c
@@ -80,10 +80,11 @@ int main(void)
         DEFINE(TASKTHREADPPR, offsetof(struct task_struct, thread.ppr));
 #else
         DEFINE(THREAD_INFO, offsetof(struct task_struct, stack));
+        DEFINE(THREAD_INFO_GAP, _ALIGN_UP(sizeof(struct thread_info), 16));
+        DEFINE(KSP_LIMIT, offsetof(struct thread_struct, ksp_limit));
 #endif /* CONFIG_PPC64 */
 
         DEFINE(KSP, offsetof(struct thread_struct, ksp));
-        DEFINE(KSP_LIMIT, offsetof(struct thread_struct, ksp_limit));
         DEFINE(PT_REGS, offsetof(struct thread_struct, regs));
 #ifdef CONFIG_BOOKE
         DEFINE(THREAD_NORMSAVES, offsetof(struct thread_struct, normsave[0]));
@@ -454,6 +455,7 @@ int main(void)
         DEFINE(VCPU_SPRG2, offsetof(struct kvm_vcpu, arch.shregs.sprg2));
         DEFINE(VCPU_SPRG3, offsetof(struct kvm_vcpu, arch.shregs.sprg3));
 #endif
+        DEFINE(VCPU_SHARED_SPRG3, offsetof(struct kvm_vcpu_arch_shared, sprg3));
         DEFINE(VCPU_SHARED_SPRG4, offsetof(struct kvm_vcpu_arch_shared, sprg4));
         DEFINE(VCPU_SHARED_SPRG5, offsetof(struct kvm_vcpu_arch_shared, sprg5));
         DEFINE(VCPU_SHARED_SPRG6, offsetof(struct kvm_vcpu_arch_shared, sprg6));
diff --git a/arch/powerpc/kernel/btext.c b/arch/powerpc/kernel/btext.c
index ac8f52732fde..41c011cb6070 100644
--- a/arch/powerpc/kernel/btext.c
+++ b/arch/powerpc/kernel/btext.c
@@ -25,11 +25,6 @@
 static void scrollscreen(void);
 #endif
 
-static void draw_byte(unsigned char c, long locX, long locY);
-static void draw_byte_32(unsigned char *bits, unsigned int *base, int rb);
-static void draw_byte_16(unsigned char *bits, unsigned int *base, int rb);
-static void draw_byte_8(unsigned char *bits, unsigned int *base, int rb);
-
 #define __force_data __attribute__((__section__(".data")))
 
 static int g_loc_X __force_data;
@@ -52,6 +47,26 @@ static unsigned char vga_font[cmapsz];
 int boot_text_mapped __force_data = 0;
 int force_printk_to_btext = 0;
 
+extern void rmci_on(void);
+extern void rmci_off(void);
+
+static inline void rmci_maybe_on(void)
+{
+#if defined(CONFIG_PPC_EARLY_DEBUG_BOOTX) && defined(CONFIG_PPC64)
+        if (!(mfmsr() & MSR_DR))
+                rmci_on();
+#endif
+}
+
+static inline void rmci_maybe_off(void)
+{
+#if defined(CONFIG_PPC_EARLY_DEBUG_BOOTX) && defined(CONFIG_PPC64)
+        if (!(mfmsr() & MSR_DR))
+                rmci_off();
+#endif
+}
+
+
 #ifdef CONFIG_PPC32
 /* Calc BAT values for mapping the display and store them
  * in disp_BAT.  Those values are then used from head.S to map
@@ -134,7 +149,7 @@ void __init btext_unmap(void)
  *    changes.
  */
 
-static void map_boot_text(void)
+void btext_map(void)
 {
         unsigned long base, offset, size;
         unsigned char *vbase;
@@ -209,7 +224,7 @@ int btext_initialize(struct device_node *np)
         dispDeviceRect[2] = width;
         dispDeviceRect[3] = height;
 
-        map_boot_text();
+        btext_map();
 
         return 0;
 }
@@ -283,7 +298,7 @@ void btext_update_display(unsigned long phys, int width, int height,
                 iounmap(logicalDisplayBase);
                 boot_text_mapped = 0;
         }
-        map_boot_text();
+        btext_map();
         g_loc_X = 0;
         g_loc_Y = 0;
         g_max_loc_X = width / 8;
@@ -298,6 +313,7 @@ void btext_clearscreen(void)
                                         (dispDeviceDepth >> 3)) >> 2;
         int i,j;
 
+        rmci_maybe_on();
         for (i=0; i<(dispDeviceRect[3] - dispDeviceRect[1]); i++)
         {
                 unsigned int *ptr = base;
@@ -305,6 +321,7 @@ void btext_clearscreen(void)
                         *(ptr++) = 0;
                 base += (dispDeviceRowBytes >> 2);
         }
+        rmci_maybe_off();
 }
 
 void btext_flushscreen(void)
@@ -355,6 +372,8 @@ static void scrollscreen(void)
                                    (dispDeviceDepth >> 3)) >> 2;
         int i,j;
 
+        rmci_maybe_on();
+
         for (i=0; i<(dispDeviceRect[3] - dispDeviceRect[1] - 16); i++)
         {
                 unsigned int *src_ptr = src;
@@ -371,9 +390,116 @@ static void scrollscreen(void)
                         *(dst_ptr++) = 0;
                 dst += (dispDeviceRowBytes >> 2);
         }
+
+        rmci_maybe_off();
 }
 #endif /* ndef NO_SCROLL */
 
+static unsigned int expand_bits_8[16] = {
+        0x00000000,
+        0x000000ff,
+        0x0000ff00,
+        0x0000ffff,
+        0x00ff0000,
+        0x00ff00ff,
+        0x00ffff00,
+        0x00ffffff,
+        0xff000000,
+        0xff0000ff,
+        0xff00ff00,
+        0xff00ffff,
+        0xffff0000,
+        0xffff00ff,
+        0xffffff00,
+        0xffffffff
+};
+
+static unsigned int expand_bits_16[4] = {
+        0x00000000,
+        0x0000ffff,
+        0xffff0000,
+        0xffffffff
+};
+
+
+static void draw_byte_32(unsigned char *font, unsigned int *base, int rb)
+{
+        int l, bits;
+        int fg = 0xFFFFFFFFUL;
+        int bg = 0x00000000UL;
+
+        for (l = 0; l < 16; ++l)
+        {
+                bits = *font++;
+                base[0] = (-(bits >> 7) & fg) ^ bg;
+                base[1] = (-((bits >> 6) & 1) & fg) ^ bg;
+                base[2] = (-((bits >> 5) & 1) & fg) ^ bg;
+                base[3] = (-((bits >> 4) & 1) & fg) ^ bg;
+                base[4] = (-((bits >> 3) & 1) & fg) ^ bg;
+                base[5] = (-((bits >> 2) & 1) & fg) ^ bg;
+                base[6] = (-((bits >> 1) & 1) & fg) ^ bg;
+                base[7] = (-(bits & 1) & fg) ^ bg;
+                base = (unsigned int *) ((char *)base + rb);
+        }
+}
+
+static inline void draw_byte_16(unsigned char *font, unsigned int *base, int rb)
+{
+        int l, bits;
+        int fg = 0xFFFFFFFFUL;
+        int bg = 0x00000000UL;
+        unsigned int *eb = (int *)expand_bits_16;
+
+        for (l = 0; l < 16; ++l)
+        {
+                bits = *font++;
+                base[0] = (eb[bits >> 6] & fg) ^ bg;
+                base[1] = (eb[(bits >> 4) & 3] & fg) ^ bg;
+                base[2] = (eb[(bits >> 2) & 3] & fg) ^ bg;
+                base[3] = (eb[bits & 3] & fg) ^ bg;
+                base = (unsigned int *) ((char *)base + rb);
+        }
+}
+
+static inline void draw_byte_8(unsigned char *font, unsigned int *base, int rb)
+{
+        int l, bits;
+        int fg = 0x0F0F0F0FUL;
+        int bg = 0x00000000UL;
+        unsigned int *eb = (int *)expand_bits_8;
+
+        for (l = 0; l < 16; ++l)
+        {
+                bits = *font++;
+                base[0] = (eb[bits >> 4] & fg) ^ bg;
+                base[1] = (eb[bits & 0xf] & fg) ^ bg;
+                base = (unsigned int *) ((char *)base + rb);
+        }
+}
+
+static noinline void draw_byte(unsigned char c, long locX, long locY)
+{
+        unsigned char *base     = calc_base(locX << 3, locY << 4);
+        unsigned char *font     = &vga_font[((unsigned int)c) * 16];
+        int rb                  = dispDeviceRowBytes;
+
+        rmci_maybe_on();
+        switch(dispDeviceDepth) {
+        case 24:
+        case 32:
+                draw_byte_32(font, (unsigned int *)base, rb);
+                break;
+        case 15:
+        case 16:
+                draw_byte_16(font, (unsigned int *)base, rb);
+                break;
+        case 8:
+                draw_byte_8(font, (unsigned int *)base, rb);
+                break;
+        }
+        rmci_maybe_off();
+}
+
 void btext_drawchar(char c)
 {
         int cline = 0;
@@ -465,107 +591,12 @@ void btext_drawhex(unsigned long v)
         btext_drawchar(' ');
 }
 
-static void draw_byte(unsigned char c, long locX, long locY)
-{
-        unsigned char *base     = calc_base(locX << 3, locY << 4);
-        unsigned char *font     = &vga_font[((unsigned int)c) * 16];
-        int rb                  = dispDeviceRowBytes;
-
-        switch(dispDeviceDepth) {
-        case 24:
-        case 32:
-                draw_byte_32(font, (unsigned int *)base, rb);
-                break;
-        case 15:
-        case 16:
-                draw_byte_16(font, (unsigned int *)base, rb);
-                break;
-        case 8:
-                draw_byte_8(font, (unsigned int *)base, rb);
-                break;
-        }
-}
-
-static unsigned int expand_bits_8[16] = {
-        0x00000000,
-        0x000000ff,
-        0x0000ff00,
-        0x0000ffff,
-        0x00ff0000,
-        0x00ff00ff,
-        0x00ffff00,
-        0x00ffffff,
-        0xff000000,
-        0xff0000ff,
-        0xff00ff00,
-        0xff00ffff,
-        0xffff0000,
-        0xffff00ff,
-        0xffffff00,
-        0xffffffff
-};
-
-static unsigned int expand_bits_16[4] = {
-        0x00000000,
-        0x0000ffff,
-        0xffff0000,
-        0xffffffff
-};
-
-
-static void draw_byte_32(unsigned char *font, unsigned int *base, int rb)
-{
-        int l, bits;
-        int fg = 0xFFFFFFFFUL;
-        int bg = 0x00000000UL;
-
-        for (l = 0; l < 16; ++l)
-        {
-                bits = *font++;
-                base[0] = (-(bits >> 7) & fg) ^ bg;
-                base[1] = (-((bits >> 6) & 1) & fg) ^ bg;
-                base[2] = (-((bits >> 5) & 1) & fg) ^ bg;
-                base[3] = (-((bits >> 4) & 1) & fg) ^ bg;
-                base[4] = (-((bits >> 3) & 1) & fg) ^ bg;
-                base[5] = (-((bits >> 2) & 1) & fg) ^ bg;
-                base[6] = (-((bits >> 1) & 1) & fg) ^ bg;
-                base[7] = (-(bits & 1) & fg) ^ bg;
-                base = (unsigned int *) ((char *)base + rb);
-        }
-}
-
-static void draw_byte_16(unsigned char *font, unsigned int *base, int rb)
-{
-        int l, bits;
-        int fg = 0xFFFFFFFFUL;
-        int bg = 0x00000000UL;
-        unsigned int *eb = (int *)expand_bits_16;
-
-        for (l = 0; l < 16; ++l)
-        {
-                bits = *font++;
-                base[0] = (eb[bits >> 6] & fg) ^ bg;
-                base[1] = (eb[(bits >> 4) & 3] & fg) ^ bg;
-                base[2] = (eb[(bits >> 2) & 3] & fg) ^ bg;
-                base[3] = (eb[bits & 3] & fg) ^ bg;
-                base = (unsigned int *) ((char *)base + rb);
-        }
-}
-
-static void draw_byte_8(unsigned char *font, unsigned int *base, int rb)
+void __init udbg_init_btext(void)
 {
-        int l, bits;
-        int fg = 0x0F0F0F0FUL;
-        int bg = 0x00000000UL;
-        unsigned int *eb = (int *)expand_bits_8;
-
-        for (l = 0; l < 16; ++l)
-        {
-                bits = *font++;
-                base[0] = (eb[bits >> 4] & fg) ^ bg;
-                base[1] = (eb[bits & 0xf] & fg) ^ bg;
-                base = (unsigned int *) ((char *)base + rb);
-        }
+        /* If btext is enabled, we might have a BAT setup for early display,
+         * thus we do enable some very basic udbg output
+         */
+        udbg_putc = btext_drawchar;
 }
 
 static unsigned char vga_font[cmapsz] = {
@@ -913,10 +944,3 @@ static unsigned char vga_font[cmapsz] = {
 0x00, 0x00, 0x00, 0x00,
 };
 
-void __init udbg_init_btext(void)
-{
-        /* If btext is enabled, we might have a BAT setup for early display,
-         * thus we do enable some very basic udbg output
-         */
-        udbg_putc = btext_drawchar;
-}
diff --git a/arch/powerpc/kernel/cacheinfo.c b/arch/powerpc/kernel/cacheinfo.c
index 9262cf2bec4b..654932727873 100644
--- a/arch/powerpc/kernel/cacheinfo.c
+++ b/arch/powerpc/kernel/cacheinfo.c
@@ -196,7 +196,7 @@ static void cache_cpu_set(struct cache *cache, int cpu)
 static int cache_size(const struct cache *cache, unsigned int *ret)
 {
         const char *propname;
-        const u32 *cache_size;
+        const __be32 *cache_size;
 
         propname = cache_type_info[cache->type].size_prop;
 
@@ -204,7 +204,7 @@ static int cache_size(const struct cache *cache, unsigned int *ret)
         if (!cache_size)
                 return -ENODEV;
 
-        *ret = *cache_size;
+        *ret = of_read_number(cache_size, 1);
         return 0;
 }
 
@@ -222,7 +222,7 @@ static int cache_size_kb(const struct cache *cache, unsigned int *ret)
 /* not cache_line_size() because that's a macro in include/linux/cache.h */
 static int cache_get_line_size(const struct cache *cache, unsigned int *ret)
 {
-        const u32 *line_size;
+        const __be32 *line_size;
         int i, lim;
 
         lim = ARRAY_SIZE(cache_type_info[cache->type].line_size_props);
@@ -239,14 +239,14 @@ static int cache_get_line_size(const struct cache *cache, unsigned int *ret)
         if (!line_size)
                 return -ENODEV;
 
-        *ret = *line_size;
+        *ret = of_read_number(line_size, 1);
         return 0;
 }
 
 static int cache_nr_sets(const struct cache *cache, unsigned int *ret)
 {
         const char *propname;
-        const u32 *nr_sets;
+        const __be32 *nr_sets;
 
         propname = cache_type_info[cache->type].nr_sets_prop;
 
@@ -254,7 +254,7 @@ static int cache_nr_sets(const struct cache *cache, unsigned int *ret)
         if (!nr_sets)
                 return -ENODEV;
 
-        *ret = *nr_sets;
+        *ret = of_read_number(nr_sets, 1);
         return 0;
 }
 
diff --git a/arch/powerpc/kernel/cpu_setup_fsl_booke.S b/arch/powerpc/kernel/cpu_setup_fsl_booke.S
index 0b9af015bedc..bfb18c7290b7 100644
--- a/arch/powerpc/kernel/cpu_setup_fsl_booke.S
+++ b/arch/powerpc/kernel/cpu_setup_fsl_booke.S
@@ -75,7 +75,7 @@ _GLOBAL(__setup_cpu_e500v2)
         bl      __e500_icache_setup
         bl      __e500_dcache_setup
         bl      __setup_e500_ivors
-#ifdef CONFIG_FSL_RIO
+#if defined(CONFIG_FSL_RIO) || defined(CONFIG_FSL_PCI)
         /* Ensure that RFXE is set */
         mfspr   r3,SPRN_HID1
         oris    r3,r3,HID1_RFXE@h
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 22973a74df73..597d954e5860 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -2105,7 +2105,7 @@ static struct cpu_spec __initdata cpu_specs[] = {
                         MMU_FTR_USE_TLBILX,
                 .icache_bsize           = 64,
                 .dcache_bsize           = 64,
-                .num_pmcs               = 4,
+                .num_pmcs               = 6,
                 .oprofile_cpu_type      = "ppc/e6500",
                 .oprofile_type          = PPC_OPROFILE_FSL_EMB,
                 .cpu_setup              = __setup_cpu_e6500,
diff --git a/arch/powerpc/kernel/entry_64.S b/arch/powerpc/kernel/entry_64.S
index 2bd0b885b0fe..c04cdf70d487 100644
--- a/arch/powerpc/kernel/entry_64.S
+++ b/arch/powerpc/kernel/entry_64.S
@@ -102,7 +102,8 @@ BEGIN_FW_FTR_SECTION
         /* if from user, see if there are any DTL entries to process */
         ld      r10,PACALPPACAPTR(r13)  /* get ptr to VPA */
         ld      r11,PACA_DTL_RIDX(r13)  /* get log read index */
-        ld      r10,LPPACA_DTLIDX(r10)  /* get log write index */
+        addi    r10,r10,LPPACA_DTLIDX
+        LDX_BE  r10,0,r10               /* get log write index */
         cmpd    cr1,r11,r10
         beq+    cr1,33f
         bl      .accumulate_stolen_time
@@ -522,9 +523,11 @@ END_MMU_FTR_SECTION_IFSET(MMU_FTR_1T_SEGMENT)
          */
         ld      r9,PACA_SLBSHADOWPTR(r13)
         li      r12,0
-        std     r12,SLBSHADOW_STACKESID(r9) /* Clear ESID */
-        std     r7,SLBSHADOW_STACKVSID(r9)  /* Save VSID */
-        std     r0,SLBSHADOW_STACKESID(r9)  /* Save ESID */
+        std     r12,SLBSHADOW_STACKESID(r9)     /* Clear ESID */
+        li      r12,SLBSHADOW_STACKVSID
+        STDX_BE r7,r12,r9                       /* Save VSID */
+        li      r12,SLBSHADOW_STACKESID
+        STDX_BE r0,r12,r9                       /* Save ESID */
 
         /* No need to check for MMU_FTR_NO_SLBIE_B here, since when
          * we have 1TB segments, the only CPUs known to have the errata
@@ -575,34 +578,15 @@ BEGIN_FTR_SECTION
         ld      r7,DSCR_DEFAULT@toc(2)
         ld      r0,THREAD_DSCR(r4)
         cmpwi   r6,0
-        li      r8, FSCR_DSCR
         bne     1f
         ld      r0,0(r7)
-        b       3f
 1:
-  BEGIN_FTR_SECTION_NESTED(70)
-        mfspr   r6, SPRN_FSCR
-        or      r6, r6, r8
-        mtspr   SPRN_FSCR, r6
-    BEGIN_FTR_SECTION_NESTED(69)
-        mfspr   r6, SPRN_HFSCR
-        or      r6, r6, r8
-        mtspr   SPRN_HFSCR, r6
-    END_FTR_SECTION_NESTED(CPU_FTR_HVMODE, CPU_FTR_HVMODE, 69)
-        b       4f
-  END_FTR_SECTION_NESTED(CPU_FTR_ARCH_207S, CPU_FTR_ARCH_207S, 70)
-3:
-  BEGIN_FTR_SECTION_NESTED(70)
-        mfspr   r6, SPRN_FSCR
-        andc    r6, r6, r8
-        mtspr   SPRN_FSCR, r6
-    BEGIN_FTR_SECTION_NESTED(69)
-        mfspr   r6, SPRN_HFSCR
-        andc    r6, r6, r8
-        mtspr   SPRN_HFSCR, r6
-    END_FTR_SECTION_NESTED(CPU_FTR_HVMODE, CPU_FTR_HVMODE, 69)
-  END_FTR_SECTION_NESTED(CPU_FTR_ARCH_207S, CPU_FTR_ARCH_207S, 70)
-4:      cmpd    r0,r25
+BEGIN_FTR_SECTION_NESTED(70)
+        mfspr   r8, SPRN_FSCR
+        rldimi  r8, r6, FSCR_DSCR_LG, (63 - FSCR_DSCR_LG)
+        mtspr   SPRN_FSCR, r8
+END_FTR_SECTION_NESTED(CPU_FTR_ARCH_207S, CPU_FTR_ARCH_207S, 70)
+        cmpd    r0,r25
         beq     2f
         mtspr   SPRN_DSCR,r0
 2:
@@ -737,9 +721,9 @@ resume_kernel:
 
         /*
          * Here we are preempting the current task. We want to make
-         * sure we are soft-disabled first
+         * sure we are soft-disabled first and reconcile irq state.
          */
-        SOFT_DISABLE_INTS(r3,r4)
+        RECONCILE_IRQ_STATE(r3,r4)
 1:      bl      .preempt_schedule_irq
 
         /* Re-test flags and eventually loop */
diff --git a/arch/powerpc/kernel/epapr_paravirt.c b/arch/powerpc/kernel/epapr_paravirt.c
index d44a571e45a7..6300c13bbde4 100644
--- a/arch/powerpc/kernel/epapr_paravirt.c
+++ b/arch/powerpc/kernel/epapr_paravirt.c
@@ -30,22 +30,20 @@ extern u32 epapr_ev_idle_start[];
 
 bool epapr_paravirt_enabled;
 
-static int __init epapr_paravirt_init(void)
+static int __init early_init_dt_scan_epapr(unsigned long node,
+                                           const char *uname,
+                                           int depth, void *data)
 {
-        struct device_node *hyper_node;
         const u32 *insts;
-        int len, i;
+        unsigned long len;
+        int i;
 
-        hyper_node = of_find_node_by_path("/hypervisor");
-        if (!hyper_node)
-                return -ENODEV;
-
-        insts = of_get_property(hyper_node, "hcall-instructions", &len);
+        insts = of_get_flat_dt_prop(node, "hcall-instructions", &len);
         if (!insts)
-                return -ENODEV;
+                return 0;
 
         if (len % 4 || len > (4 * 4))
-                return -ENODEV;
+                return -1;
 
         for (i = 0; i < (len / 4); i++) {
                 patch_instruction(epapr_hypercall_start + i, insts[i]);
@@ -55,13 +53,19 @@ static int __init epapr_paravirt_init(void)
         }
 
 #if !defined(CONFIG_64BIT) || defined(CONFIG_PPC_BOOK3E_64)
-        if (of_get_property(hyper_node, "has-idle", NULL))
+        if (of_get_flat_dt_prop(node, "has-idle", NULL))
                 ppc_md.power_save = epapr_ev_idle;
 #endif
 
         epapr_paravirt_enabled = true;
 
+        return 1;
+}
+
+int __init epapr_paravirt_early_init(void)
+{
+        of_scan_flat_dt(early_init_dt_scan_epapr, NULL);
+
         return 0;
 }
 
-early_initcall(epapr_paravirt_init);
diff --git a/arch/powerpc/kernel/exceptions-64e.S b/arch/powerpc/kernel/exceptions-64e.S
index 645170a07ada..2d067049db27 100644
--- a/arch/powerpc/kernel/exceptions-64e.S
+++ b/arch/powerpc/kernel/exceptions-64e.S
@@ -198,9 +198,9 @@ exc_##n##_common:							    \
 /* This second version is meant for exceptions that don't immediately
  * hard-enable. We set a bit in paca->irq_happened to ensure that
  * a subsequent call to arch_local_irq_restore() will properly
- * hard-enable and avoid the fast-path
+ * hard-enable and avoid the fast-path, and then reconcile irq state.
  */
-#define INTS_DISABLE    SOFT_DISABLE_INTS(r3,r4)
+#define INTS_DISABLE    RECONCILE_IRQ_STATE(r3,r4)
 
 /* This is called by exceptions that used INTS_KEEP (that did not touch
  * irq indicators in the PACA). This will restore MSR:EE to it's previous
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 902ca3c6b4b6..3a9ed6ac224b 100644
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -293,27 +293,31 @@ system_call_pSeries:
          * out of line to handle them
          */
         . = 0xe00
-hv_exception_trampoline:
+hv_data_storage_trampoline:
         SET_SCRATCH0(r13)
         EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       h_data_storage_hv
 
         . = 0xe20
+hv_instr_storage_trampoline:
         SET_SCRATCH0(r13)
         EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       h_instr_storage_hv
 
         . = 0xe40
+emulation_assist_trampoline:
         SET_SCRATCH0(r13)
         EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       emulation_assist_hv
 
         . = 0xe60
+hv_exception_trampoline:
         SET_SCRATCH0(r13)
         EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       hmi_exception_hv
 
         . = 0xe80
+hv_doorbell_trampoline:
         SET_SCRATCH0(r13)
         EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       h_doorbell_hv
@@ -323,32 +327,32 @@ hv_exception_trampoline:
          * prolog code of the PerformanceMonitor one. A little
          * trickery is thus necessary
          */
-performance_monitor_pSeries_1:
         . = 0xf00
+performance_monitor_pseries_trampoline:
         SET_SCRATCH0(r13)
         EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       performance_monitor_pSeries
 
-altivec_unavailable_pSeries_1:
         . = 0xf20
+altivec_unavailable_pseries_trampoline:
         SET_SCRATCH0(r13)
         EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       altivec_unavailable_pSeries
 
-vsx_unavailable_pSeries_1:
         . = 0xf40
+vsx_unavailable_pseries_trampoline:
         SET_SCRATCH0(r13)
         EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       vsx_unavailable_pSeries
 
-facility_unavailable_trampoline:
         . = 0xf60
+facility_unavailable_trampoline:
         SET_SCRATCH0(r13)
         EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       facility_unavailable_pSeries
 
-hv_facility_unavailable_trampoline:
         . = 0xf80
+hv_facility_unavailable_trampoline:
         SET_SCRATCH0(r13)
         EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       facility_unavailable_hv
@@ -367,11 +371,7 @@ denorm_exception_hv:
         HMT_MEDIUM_PPR_DISCARD
         mtspr   SPRN_SPRG_HSCRATCH0,r13
         EXCEPTION_PROLOG_0(PACA_EXGEN)
-        std     r11,PACA_EXGEN+EX_R11(r13)
-        std     r12,PACA_EXGEN+EX_R12(r13)
-        mfspr   r9,SPRN_SPRG_HSCRATCH0
-        std     r9,PACA_EXGEN+EX_R13(r13)
-        mfcr    r9
+        EXCEPTION_PROLOG_1(PACA_EXGEN, NOTEST, 0x1500)
 
 #ifdef CONFIG_PPC_DENORMALISATION
         mfspr   r10,SPRN_HSRR1
@@ -381,6 +381,7 @@ denorm_exception_hv:
         bne+    denorm_assist
 #endif
 
+        KVMTEST(0x1500)
         EXCEPTION_PROLOG_PSERIES_1(denorm_common, EXC_HV)
         KVM_HANDLER_SKIP(PACA_EXGEN, EXC_STD, 0x1500)
 
@@ -501,6 +502,10 @@ denorm_done:
         mtcrf   0x80,r9
         ld      r9,PACA_EXGEN+EX_R9(r13)
         RESTORE_PPR_PACA(PACA_EXGEN, r10)
+BEGIN_FTR_SECTION
+        ld      r10,PACA_EXGEN+EX_CFAR(r13)
+        mtspr   SPRN_CFAR,r10
+END_FTR_SECTION_IFSET(CPU_FTR_CFAR)
         ld      r10,PACA_EXGEN+EX_R10(r13)
         ld      r11,PACA_EXGEN+EX_R11(r13)
         ld      r12,PACA_EXGEN+EX_R12(r13)
@@ -808,6 +813,7 @@ system_call_relon_pSeries:
         b       .       /* Can't happen, see v2.07 Book III-S section 6.5 */
 
         . = 0x4e40
+emulation_assist_relon_trampoline:
         SET_SCRATCH0(r13)
         EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       emulation_assist_relon_hv
@@ -816,36 +822,37 @@ system_call_relon_pSeries:
         b       .       /* Can't happen, see v2.07 Book III-S section 6.5 */
 
         . = 0x4e80
+h_doorbell_relon_trampoline:
         SET_SCRATCH0(r13)
         EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       h_doorbell_relon_hv
 
-performance_monitor_relon_pSeries_1:
         . = 0x4f00
+performance_monitor_relon_pseries_trampoline:
         SET_SCRATCH0(r13)
         EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       performance_monitor_relon_pSeries
 
-altivec_unavailable_relon_pSeries_1:
         . = 0x4f20
+altivec_unavailable_relon_pseries_trampoline:
         SET_SCRATCH0(r13)
         EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       altivec_unavailable_relon_pSeries
 
-vsx_unavailable_relon_pSeries_1:
         . = 0x4f40
+vsx_unavailable_relon_pseries_trampoline:
         SET_SCRATCH0(r13)
         EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       vsx_unavailable_relon_pSeries
 
-facility_unavailable_relon_trampoline:
         . = 0x4f60
+facility_unavailable_relon_trampoline:
         SET_SCRATCH0(r13)
         EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       facility_unavailable_relon_pSeries
 
-hv_facility_unavailable_relon_trampoline:
         . = 0x4f80
+hv_facility_unavailable_relon_trampoline:
         SET_SCRATCH0(r13)
         EXCEPTION_PROLOG_0(PACA_EXGEN)
         b       hv_facility_unavailable_relon_hv
diff --git a/arch/powerpc/kernel/head_40x.S b/arch/powerpc/kernel/head_40x.S
index 8a9b6f59822d..67ee0d6c1070 100644
--- a/arch/powerpc/kernel/head_40x.S
+++ b/arch/powerpc/kernel/head_40x.S
@@ -822,14 +822,6 @@ finish_tlb_load:
         rfi                     /* Should sync shadow TLBs */
         b       .               /* prevent prefetch past rfi */
 
-/* extern void giveup_fpu(struct task_struct *prev)
- *
- * The PowerPC 4xx family of processors do not have an FPU, so this just
- * returns.
- */
-_ENTRY(giveup_fpu)
-        blr
-
 /* This is where the main kernel code starts.
  */
 start_here:
diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S
index 97e2671cde7f..c334f53453f7 100644
--- a/arch/powerpc/kernel/head_44x.S
+++ b/arch/powerpc/kernel/head_44x.S
@@ -784,16 +784,6 @@ _GLOBAL(__fixup_440A_mcheck)
         sync
         blr
 
-/*
- * extern void giveup_fpu(struct task_struct *prev)
- *
- * The 44x core does not have an FPU.
- */
-#ifndef CONFIG_PPC_FPU
-_GLOBAL(giveup_fpu)
-        blr
-#endif
-
 _GLOBAL(set_context)
 
 #ifdef CONFIG_BDI_SWITCH
diff --git a/arch/powerpc/kernel/head_64.S b/arch/powerpc/kernel/head_64.S
index b61363d557b5..3d11d8038dee 100644
--- a/arch/powerpc/kernel/head_64.S
+++ b/arch/powerpc/kernel/head_64.S
@@ -703,6 +703,7 @@ _GLOBAL(relative_toc)
         mtlr    r0
         blr
 
+.balign 8
 p_toc:  .llong  __toc_start + 0x8000 - 0b
 
 /*
diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S
index b2a5860accfb..1b92a97b1b04 100644
--- a/arch/powerpc/kernel/head_8xx.S
+++ b/arch/powerpc/kernel/head_8xx.S
@@ -691,10 +691,6 @@ modified_instr:
         b       151b
 #endif
 
-        .globl  giveup_fpu
-giveup_fpu:
-        blr
-
 /*
  * This is where the main kernel code starts.
  */
diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
index d10a7cacccd2..289afaffbbb5 100644
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -948,16 +948,6 @@ _GLOBAL(giveup_spe)
 #endif /* CONFIG_SPE */
 
 /*
- * extern void giveup_fpu(struct task_struct *prev)
- *
- * Not all FSL Book-E cores have an FPU
- */
-#ifndef CONFIG_PPC_FPU
-_GLOBAL(giveup_fpu)
-        blr
-#endif
-
-/*
  * extern void abort(void)
  *
  * At present, this routine just applies a system reset.
diff --git a/arch/powerpc/kernel/io-workarounds.c b/arch/powerpc/kernel/io-workarounds.c
index fa0b54b2a362..24b968f8e4d8 100644
--- a/arch/powerpc/kernel/io-workarounds.c
+++ b/arch/powerpc/kernel/io-workarounds.c
@@ -53,6 +53,7 @@ static struct iowa_bus *iowa_pci_find(unsigned long vaddr, unsigned long paddr)
         return NULL;
 }
 
+#ifdef CONFIG_PPC_INDIRECT_MMIO
 struct iowa_bus *iowa_mem_find_bus(const PCI_IO_ADDR addr)
 {
         unsigned hugepage_shift;
@@ -90,13 +91,25 @@ struct iowa_bus *iowa_mem_find_bus(const PCI_IO_ADDR addr)
 
         return bus;
 }
+#else /* CONFIG_PPC_INDIRECT_MMIO */
+struct iowa_bus *iowa_mem_find_bus(const PCI_IO_ADDR addr)
+{
+        return NULL;
+}
+#endif /* !CONFIG_PPC_INDIRECT_MMIO */
 
+#ifdef CONFIG_PPC_INDIRECT_PIO
 struct iowa_bus *iowa_pio_find_bus(unsigned long port)
 {
         unsigned long vaddr = (unsigned long)pci_io_base + port;
         return iowa_pci_find(vaddr, 0);
 }
-
+#else
+struct iowa_bus *iowa_pio_find_bus(unsigned long port)
+{
+        return NULL;
+}
+#endif
 
 #define DEF_PCI_AC_RET(name, ret, at, al, space, aa)            \
 static ret iowa_##name at                                       \
@@ -137,6 +150,7 @@ static const struct ppc_pci_io iowa_pci_io = {
 
 };
 
+#ifdef CONFIG_PPC_INDIRECT_MMIO
 static void __iomem *iowa_ioremap(phys_addr_t addr, unsigned long size,
                                   unsigned long flags, void *caller)
 {
@@ -151,6 +165,9 @@ static void __iomem *iowa_ioremap(phys_addr_t addr, unsigned long size,
         }
         return res;
 }
+#else /* CONFIG_PPC_INDIRECT_MMIO */
+#define iowa_ioremap NULL
+#endif /* !CONFIG_PPC_INDIRECT_MMIO */
 
 /* Enable IO workaround */
 static void io_workaround_init(void)
diff --git a/arch/powerpc/kernel/io.c b/arch/powerpc/kernel/io.c
index 886381f32c3d..2a2b4aeab80f 100644
--- a/arch/powerpc/kernel/io.c
+++ b/arch/powerpc/kernel/io.c
@@ -25,6 +25,9 @@
 #include <asm/firmware.h>
 #include <asm/bug.h>
 
+/* See definition in io.h */
+bool isa_io_special;
+
 void _insb(const volatile u8 __iomem *port, void *buf, long count)
 {
         u8 *tbuf = buf;
diff --git a/arch/powerpc/kernel/iommu.c b/arch/powerpc/kernel/iommu.c
index b20ff173a671..0adab06ce5c0 100644
--- a/arch/powerpc/kernel/iommu.c
+++ b/arch/powerpc/kernel/iommu.c
@@ -105,7 +105,7 @@ static int __init fail_iommu_debugfs(void)
         struct dentry *dir = fault_create_debugfs_attr("fail_iommu",
                                                        NULL, &fail_iommu);
 
-        return PTR_RET(dir);
+        return PTR_ERR_OR_ZERO(dir);
 }
 late_initcall(fail_iommu_debugfs);
 
diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index c69440cef7af..57d286a78f86 100644
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -441,50 +441,6 @@ void migrate_irqs(void)
 }
 #endif
 
-static inline void handle_one_irq(unsigned int irq)
-{
-        struct thread_info *curtp, *irqtp;
-        unsigned long saved_sp_limit;
-        struct irq_desc *desc;
-
-        desc = irq_to_desc(irq);
-        if (!desc)
-                return;
-
-        /* Switch to the irq stack to handle this */
-        curtp = current_thread_info();
-        irqtp = hardirq_ctx[smp_processor_id()];
-
-        if (curtp == irqtp) {
-                /* We're already on the irq stack, just handle it */
-                desc->handle_irq(irq, desc);
-                return;
-        }
-
-        saved_sp_limit = current->thread.ksp_limit;
-
-        irqtp->task = curtp->task;
-        irqtp->flags = 0;
-
-        /* Copy the softirq bits in preempt_count so that the
-         * softirq checks work in the hardirq context. */
-        irqtp->preempt_count = (irqtp->preempt_count & ~SOFTIRQ_MASK) |
-                               (curtp->preempt_count & SOFTIRQ_MASK);
-
-        current->thread.ksp_limit = (unsigned long)irqtp +
-                _ALIGN_UP(sizeof(struct thread_info), 16);
-
-        call_handle_irq(irq, desc, irqtp, desc->handle_irq);
-        current->thread.ksp_limit = saved_sp_limit;
-        irqtp->task = NULL;
-
-        /* Set any flag that may have been set on the
-         * alternate stack
-         */
-        if (irqtp->flags)
-                set_bits(irqtp->flags, &curtp->flags);
-}
-
 static inline void check_stack_overflow(void)
 {
 #ifdef CONFIG_DEBUG_STACKOVERFLOW
@@ -501,9 +457,9 @@ static inline void check_stack_overflow(void)
 #endif
 }
 
-void do_IRQ(struct pt_regs *regs)
+void __do_irq(struct pt_regs *regs)
 {
-        struct pt_regs *old_regs = set_irq_regs(regs);
+        struct irq_desc *desc;
         unsigned int irq;
 
         irq_enter();
@@ -519,18 +475,56 @@ void do_IRQ(struct pt_regs *regs)
          */
         irq = ppc_md.get_irq();
 
-        /* We can hard enable interrupts now */
+        /* We can hard enable interrupts now to allow perf interrupts */
         may_hard_irq_enable();
 
         /* And finally process it */
-        if (irq != NO_IRQ)
-                handle_one_irq(irq);
-        else
+        if (unlikely(irq == NO_IRQ))
                 __get_cpu_var(irq_stat).spurious_irqs++;
+        else {
+                desc = irq_to_desc(irq);
+                if (likely(desc))
+                        desc->handle_irq(irq, desc);
+        }
 
         trace_irq_exit(regs);
 
         irq_exit();
+}
+
+void do_IRQ(struct pt_regs *regs)
+{
+        struct pt_regs *old_regs = set_irq_regs(regs);
+        struct thread_info *curtp, *irqtp;
+
+        /* Switch to the irq stack to handle this */
+        curtp = current_thread_info();
+        irqtp = hardirq_ctx[raw_smp_processor_id()];
+
+        /* Already there ? */
+        if (unlikely(curtp == irqtp)) {
+                __do_irq(regs);
+                set_irq_regs(old_regs);
+                return;
+        }
+
+        /* Prepare the thread_info in the irq stack */
+        irqtp->task = curtp->task;
+        irqtp->flags = 0;
+
+        /* Copy the preempt_count so that the [soft]irq checks work. */
+        irqtp->preempt_count = curtp->preempt_count;
+
+        /* Switch stack and call */
+        call_do_irq(regs, irqtp);
+
+        /* Restore stack limit */
+        irqtp->task = NULL;
+
+        /* Copy back updates to the thread_info */
+        if (irqtp->flags)
+                set_bits(irqtp->flags, &curtp->flags);
+
         set_irq_regs(old_regs);
 }
 
@@ -592,28 +586,22 @@ void irq_ctx_init(void)
                 memset((void *)softirq_ctx[i], 0, THREAD_SIZE);
                 tp = softirq_ctx[i];
                 tp->cpu = i;
-                tp->preempt_count = 0;
 
                 memset((void *)hardirq_ctx[i], 0, THREAD_SIZE);
                 tp = hardirq_ctx[i];
                 tp->cpu = i;
-                tp->preempt_count = HARDIRQ_OFFSET;
         }
 }
 
 static inline void do_softirq_onstack(void)
 {
         struct thread_info *curtp, *irqtp;
-        unsigned long saved_sp_limit = current->thread.ksp_limit;
 
         curtp = current_thread_info();
         irqtp = softirq_ctx[smp_processor_id()];
         irqtp->task = curtp->task;
         irqtp->flags = 0;
-        current->thread.ksp_limit = (unsigned long)irqtp +
-                                    _ALIGN_UP(sizeof(struct thread_info), 16);
         call_do_softirq(irqtp);
-        current->thread.ksp_limit = saved_sp_limit;
         irqtp->task = NULL;
 
         /* Set any flag that may have been set on the
diff --git a/arch/powerpc/kernel/legacy_serial.c b/arch/powerpc/kernel/legacy_serial.c
index 0733b05eb856..22e88dd2f34a 100644
--- a/arch/powerpc/kernel/legacy_serial.c
+++ b/arch/powerpc/kernel/legacy_serial.c
@@ -99,7 +99,7 @@ static int __init add_legacy_port(struct device_node *np, int want_index,
                 legacy_serial_count = index + 1;
 
         /* Check if there is a port who already claimed our slot */
-        if (legacy_serial_infos[index].np != 0) {
+        if (legacy_serial_infos[index].np != NULL) {
                 /* if we still have some room, move it, else override */
                 if (legacy_serial_count < MAX_LEGACY_SERIAL_PORTS) {
                         printk(KERN_DEBUG "Moved legacy port %d -> %d\n",
@@ -152,7 +152,7 @@ static int __init add_legacy_soc_port(struct device_node *np,
                                       struct device_node *soc_dev)
 {
         u64 addr;
-        const u32 *addrp;
+        const __be32 *addrp;
         upf_t flags = UPF_BOOT_AUTOCONF | UPF_SKIP_TEST | UPF_SHARE_IRQ
                 | UPF_FIXED_PORT;
         struct device_node *tsi = of_get_parent(np);
@@ -221,14 +221,19 @@ static int __init add_legacy_isa_port(struct device_node *np,
         /* Translate ISA address. If it fails, we still register the port
          * with no translated address so that it can be picked up as an IO
          * port later by the serial driver
+         *
+         * Note: Don't even try on P8 lpc, we know it's not directly mapped
          */
-        taddr = of_translate_address(np, reg);
-        if (taddr == OF_BAD_ADDR)
+        if (!of_device_is_compatible(isa_brg, "ibm,power8-lpc")) {
+                taddr = of_translate_address(np, reg);
+                if (taddr == OF_BAD_ADDR)
+                        taddr = 0;
+        } else
                 taddr = 0;
 
         /* Add port, irq will be dealt with later */
-        return add_legacy_port(np, index, UPIO_PORT, be32_to_cpu(reg[1]), taddr,
-                               NO_IRQ, UPF_BOOT_AUTOCONF, 0);
+        return add_legacy_port(np, index, UPIO_PORT, be32_to_cpu(reg[1]),
+                               taddr, NO_IRQ, UPF_BOOT_AUTOCONF, 0);
 
 }
 
@@ -237,7 +242,7 @@ static int __init add_legacy_pci_port(struct device_node *np,
                                       struct device_node *pci_dev)
 {
         u64 addr, base;
-        const u32 *addrp;
+        const __be32 *addrp;
         unsigned int flags;
         int iotype, index = -1, lindex = 0;
 
@@ -270,7 +275,7 @@ static int __init add_legacy_pci_port(struct device_node *np,
         if (iotype == UPIO_MEM)
                 base = addr;
         else
-                base = addrp[2];
+                base = of_read_number(&addrp[2], 1);
 
         /* Try to guess an index... If we have subdevices of the pci dev,
          * we get to their "reg" property
@@ -307,19 +312,31 @@ static int __init add_legacy_pci_port(struct device_node *np,
 
 static void __init setup_legacy_serial_console(int console)
 {
-        struct legacy_serial_info *info =
-                &legacy_serial_infos[console];
+        struct legacy_serial_info *info = &legacy_serial_infos[console];
+        struct plat_serial8250_port *port = &legacy_serial_ports[console];
         void __iomem *addr;
 
-        if (info->taddr == 0)
-                return;
-        addr = ioremap(info->taddr, 0x1000);
-        if (addr == NULL)
-                return;
+        /* Check if a translated MMIO address has been found */
+        if (info->taddr) {
+                addr = ioremap(info->taddr, 0x1000);
+                if (addr == NULL)
+                        return;
+                udbg_uart_init_mmio(addr, 1);
+        } else {
+                /* Check if it's PIO and we support untranslated PIO */
+                if (port->iotype == UPIO_PORT && isa_io_special)
+                        udbg_uart_init_pio(port->iobase, 1);
+                else
+                        return;
+        }
+
+        /* Try to query the current speed */
         if (info->speed == 0)
-                info->speed = udbg_probe_uart_speed(addr, info->clock);
+                info->speed = udbg_probe_uart_speed(info->clock);
+
+        /* Set it up */
         DBG("default console speed = %d\n", info->speed);
-        udbg_init_uart(addr, info->speed, info->clock);
+        udbg_uart_setup(info->speed, info->clock);
 }
 
 /*
@@ -367,10 +384,13 @@ void __init find_legacy_serial_ports(void)
         /* Next, fill our array with ISA ports */
         for_each_node_by_type(np, "serial") {
                 struct device_node *isa = of_get_parent(np);
-                if (isa && !strcmp(isa->name, "isa")) {
-                        index = add_legacy_isa_port(np, isa);
-                        if (index >= 0 && np == stdout)
-                                legacy_serial_console = index;
+                if (isa && (!strcmp(isa->name, "isa") ||
+                            !strcmp(isa->name, "lpc"))) {
+                        if (of_device_is_available(np)) {
+                                index = add_legacy_isa_port(np, isa);
+                                if (index >= 0 && np == stdout)
+                                        legacy_serial_console = index;
+                        }
                 }
                 of_node_put(isa);
         }
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
index e469f30e6eeb..2b0ad9845363 100644
--- a/arch/powerpc/kernel/misc_32.S
+++ b/arch/powerpc/kernel/misc_32.S
@@ -36,26 +36,41 @@
 
         .text
 
+/*
+ * We store the saved ksp_limit in the unused part
+ * of the STACK_FRAME_OVERHEAD
+ */
 _GLOBAL(call_do_softirq)
         mflr    r0
         stw     r0,4(r1)
+        lwz     r10,THREAD+KSP_LIMIT(r2)
+        addi    r11,r3,THREAD_INFO_GAP
         stwu    r1,THREAD_SIZE-STACK_FRAME_OVERHEAD(r3)
         mr      r1,r3
+        stw     r10,8(r1)
+        stw     r11,THREAD+KSP_LIMIT(r2)
         bl      __do_softirq
+        lwz     r10,8(r1)
         lwz     r1,0(r1)
         lwz     r0,4(r1)
+        stw     r10,THREAD+KSP_LIMIT(r2)
         mtlr    r0
         blr
 
-_GLOBAL(call_handle_irq)
+_GLOBAL(call_do_irq)
         mflr    r0
         stw     r0,4(r1)
-        mtctr   r6
-        stwu    r1,THREAD_SIZE-STACK_FRAME_OVERHEAD(r5)
-        mr      r1,r5
-        bctrl
+        lwz     r10,THREAD+KSP_LIMIT(r2)
+        addi    r11,r3,THREAD_INFO_GAP
+        stwu    r1,THREAD_SIZE-STACK_FRAME_OVERHEAD(r4)
+        mr      r1,r4
+        stw     r10,8(r1)
+        stw     r11,THREAD+KSP_LIMIT(r2)
+        bl      __do_irq
+        lwz     r10,8(r1)
         lwz     r1,0(r1)
         lwz     r0,4(r1)
+        stw     r10,THREAD+KSP_LIMIT(r2)
         mtlr    r0
         blr
 
@@ -327,8 +342,9 @@ END_FTR_SECTION_IFSET(CPU_FTR_UNIFIED_ID_CACHE)
  *
  * flush_icache_range(unsigned long start, unsigned long stop)
  */
-_KPROBE(__flush_icache_range)
+_KPROBE(flush_icache_range)
 BEGIN_FTR_SECTION
+        isync
         blr                             /* for 601, do nothing */
 END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE)
         li      r5,L1_CACHE_BYTES-1
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
index 6820e45f557b..e59caf874d05 100644
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@ -40,14 +40,12 @@ _GLOBAL(call_do_softirq)
         mtlr    r0
         blr
 
-_GLOBAL(call_handle_irq)
-        ld      r8,0(r6)
+_GLOBAL(call_do_irq)
         mflr    r0
         std     r0,16(r1)
-        mtctr   r8
-        stdu    r1,THREAD_SIZE-STACK_FRAME_OVERHEAD(r5)
-        mr      r1,r5
-        bctrl
+        stdu    r1,THREAD_SIZE-STACK_FRAME_OVERHEAD(r4)
+        mr      r1,r4
+        bl      .__do_irq
         ld      r1,0(r1)
         ld      r0,16(r1)
         mtlr    r0
@@ -67,8 +65,10 @@ PPC64_CACHES:
  *   flush all bytes from start through stop-1 inclusive
  */
 
-_KPROBE(__flush_icache_range)
-
+_KPROBE(flush_icache_range)
+BEGIN_FTR_SECTION
+        blr
+END_FTR_SECTION_IFSET(CPU_FTR_COHERENT_ICACHE)
 /*
  * Flush the data cache to memory 
  * 
@@ -247,6 +247,37 @@ _GLOBAL(__bswapdi2)
         blr
 
 #if defined(CONFIG_PPC_PMAC) || defined(CONFIG_PPC_MAPLE)
+
+_GLOBAL(rmci_on)
+        sync
+        isync
+        li      r3,0x100
+        rldicl  r3,r3,32,0
+        mfspr   r5,SPRN_HID4
+        or      r5,r5,r3
+        sync
+        mtspr   SPRN_HID4,r5
+        isync
+        slbia
+        isync
+        sync
+        blr
+
+_GLOBAL(rmci_off)
+        sync
+        isync
+        li      r3,0x100
+        rldicl  r3,r3,32,0
+        mfspr   r5,SPRN_HID4
+        andc    r5,r5,r3
+        sync
+        mtspr   SPRN_HID4,r5
+        isync
+        slbia
+        isync
+        sync
+        blr
+
 /*
  * Do an IO access in real mode
  */
@@ -416,19 +447,6 @@ _GLOBAL(scom970_write)
         blr
 #endif /* CONFIG_CPU_FREQ_PMAC64 || CONFIG_CPU_FREQ_MAPLE */
 
-
-/*
- * disable_kernel_fp()
- * Disable the FPU.
- */
-_GLOBAL(disable_kernel_fp)
-        mfmsr   r3
-        rldicl  r0,r3,(63-MSR_FP_LG),1
-        rldicl  r3,r0,(MSR_FP_LG+1),0
-        mtmsrd  r3                      /* disable use of fpu now */
-        isync
-        blr
-
 /* kexec_wait(phys_cpu)
  *
  * wait for the flag to change, indicating this kernel is going away but
diff --git a/arch/powerpc/kernel/paca.c b/arch/powerpc/kernel/paca.c
index f8f24685f10a..3fc16e3beb9f 100644
--- a/arch/powerpc/kernel/paca.c
+++ b/arch/powerpc/kernel/paca.c
@@ -34,10 +34,10 @@ extern unsigned long __toc_start;
  */
 struct lppaca lppaca[] = {
         [0 ... (NR_LPPACAS-1)] = {
-                .desc = 0xd397d781,     /* "LpPa" */
-                .size = sizeof(struct lppaca),
+                .desc = cpu_to_be32(0xd397d781),        /* "LpPa" */
+                .size = cpu_to_be16(sizeof(struct lppaca)),
                 .fpregs_in_use = 1,
-                .slb_count = 64,
+                .slb_count = cpu_to_be16(64),
                 .vmxregs_in_use = 0,
                 .page_ins = 0,
         },
@@ -101,8 +101,8 @@ static inline void free_lppacas(void) { }
  */
 struct slb_shadow slb_shadow[] __cacheline_aligned = {
         [0 ... (NR_CPUS-1)] = {
-                .persistent = SLB_NUM_BOLTED,
-                .buffer_length = sizeof(struct slb_shadow),
+                .persistent = cpu_to_be32(SLB_NUM_BOLTED),
+                .buffer_length = cpu_to_be32(sizeof(struct slb_shadow)),
         },
 };
 
diff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c
index 7d22a675fe1a..905a24bb7acc 100644
--- a/arch/powerpc/kernel/pci-common.c
+++ b/arch/powerpc/kernel/pci-common.c
@@ -306,7 +306,7 @@ static struct resource *__pci_mmap_make_offset(struct pci_dev *dev,
         unsigned long io_offset = 0;
         int i, res_bit;
 
-        if (hose == 0)
+        if (hose == NULL)
                 return NULL;            /* should never happen */
 
         /* If memory, add on the PCI bridge address offset */
@@ -667,7 +667,7 @@ void pci_resource_to_user(const struct pci_dev *dev, int bar,
 void pci_process_bridge_OF_ranges(struct pci_controller *hose,
                                   struct device_node *dev, int primary)
 {
-        const u32 *ranges;
+        const __be32 *ranges;
         int rlen;
         int pna = of_n_addr_cells(dev);
         int np = pna + 5;
@@ -687,7 +687,7 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
         /* Parse it */
         while ((rlen -= np * 4) >= 0) {
                 /* Read next ranges element */
-                pci_space = ranges[0];
+                pci_space = of_read_number(ranges, 1);
                 pci_addr = of_read_number(ranges + 1, 2);
                 cpu_addr = of_translate_address(dev, ranges + 3);
                 size = of_read_number(ranges + pna + 3, 2);
@@ -704,7 +704,7 @@ void pci_process_bridge_OF_ranges(struct pci_controller *hose,
                 /* Now consume following elements while they are contiguous */
                 for (; rlen >= np * sizeof(u32);
                      ranges += np, rlen -= np * 4) {
-                        if (ranges[0] != pci_space)
+                        if (of_read_number(ranges, 1) != pci_space)
                                 break;
                         pci_next = of_read_number(ranges + 1, 2);
                         cpu_next = of_translate_address(dev, ranges + 3);
@@ -1055,8 +1055,7 @@ void pcibios_fixup_bus(struct pci_bus *bus)
          * bases. This is -not- called when generating the PCI tree from
          * the OF device-tree.
          */
-        if (bus->self != NULL)
-                pci_read_bridge_bases(bus);
+        pci_read_bridge_bases(bus);
 
         /* Now fixup the bus bus */
         pcibios_setup_bus_self(bus);
@@ -1578,7 +1577,7 @@ fake_pci_bus(struct pci_controller *hose, int busnr)
 {
         static struct pci_bus bus;
 
-        if (hose == 0) {
+        if (hose == NULL) {
                 printk(KERN_ERR "Can't find hose for PCI bus %d!\n", busnr);
         }
         bus.number = busnr;
@@ -1674,12 +1673,8 @@ void pcibios_scan_phb(struct pci_controller *hose)
         /* Configure PCI Express settings */
         if (bus && !pci_has_flag(PCI_PROBE_ONLY)) {
                 struct pci_bus *child;
-                list_for_each_entry(child, &bus->children, node) {
-                        struct pci_dev *self = child->self;
-                        if (!self)
-                                continue;
-                        pcie_bus_configure_settings(child, self->pcie_mpss);
-                }
+                list_for_each_entry(child, &bus->children, node)
+                        pcie_bus_configure_settings(child);
         }
 }
 
diff --git a/arch/powerpc/kernel/pci_64.c b/arch/powerpc/kernel/pci_64.c
index 2e8629654ca8..a9e311f7a9dd 100644
--- a/arch/powerpc/kernel/pci_64.c
+++ b/arch/powerpc/kernel/pci_64.c
@@ -109,7 +109,7 @@ int pcibios_unmap_io_space(struct pci_bus *bus)
         hose = pci_bus_to_host(bus);
 
         /* Check if we have IOs allocated */
-        if (hose->io_base_alloc == 0)
+        if (hose->io_base_alloc == NULL)
                 return 0;
 
         pr_debug("IO unmapping for PHB %s\n", hose->dn->full_name);
@@ -272,7 +272,7 @@ static void quirk_radeon_32bit_msi(struct pci_dev *dev)
         struct pci_dn *pdn = pci_get_pdn(dev);
 
         if (pdn)
-                pdn->force_32bit_msi = 1;
+                pdn->force_32bit_msi = true;
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0x68f2, quirk_radeon_32bit_msi);
 DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_ATI, 0xaa68, quirk_radeon_32bit_msi);
diff --git a/arch/powerpc/kernel/pci_dn.c b/arch/powerpc/kernel/pci_dn.c
index df038442548a..1f61fab59d9b 100644
--- a/arch/powerpc/kernel/pci_dn.c
+++ b/arch/powerpc/kernel/pci_dn.c
@@ -47,9 +47,8 @@ struct pci_dn *pci_get_pdn(struct pci_dev *pdev)
 void *update_dn_pci_info(struct device_node *dn, void *data)
 {
         struct pci_controller *phb = data;
-        const int *type =
-                of_get_property(dn, "ibm,pci-config-space-type", NULL);
-        const u32 *regs;
+        const __be32 *type = of_get_property(dn, "ibm,pci-config-space-type", NULL);
+        const __be32 *regs;
         struct pci_dn *pdn;
 
         pdn = zalloc_maybe_bootmem(sizeof(*pdn), GFP_KERNEL);
@@ -63,12 +62,14 @@ void *update_dn_pci_info(struct device_node *dn, void *data)
 #endif
         regs = of_get_property(dn, "reg", NULL);
         if (regs) {
+                u32 addr = of_read_number(regs, 1);
+
                 /* First register entry is addr (00BBSS00)  */
-                pdn->busno = (regs[0] >> 16) & 0xff;
-                pdn->devfn = (regs[0] >> 8) & 0xff;
+                pdn->busno = (addr >> 16) & 0xff;
+                pdn->devfn = (addr >> 8) & 0xff;
         }
 
-        pdn->pci_ext_config_space = (type && *type == 1);
+        pdn->pci_ext_config_space = (type && of_read_number(type, 1) == 1);
         return NULL;
 }
 
@@ -98,12 +99,13 @@ void *traverse_pci_devices(struct device_node *start, traverse_func pre,
 
         /* We started with a phb, iterate all childs */
         for (dn = start->child; dn; dn = nextdn) {
-                const u32 *classp;
-                u32 class;
+                const __be32 *classp;
+                u32 class = 0;
 
                 nextdn = NULL;
                 classp = of_get_property(dn, "class-code", NULL);
-                class = classp ? *classp : 0;
+                if (classp)
+                        class = of_read_number(classp, 1);
 
                 if (pre && ((ret = pre(dn, data)) != NULL))
                         return ret;
diff --git a/arch/powerpc/kernel/pci_of_scan.c b/arch/powerpc/kernel/pci_of_scan.c
index 15d9105323bf..4368ec6fdc8c 100644
--- a/arch/powerpc/kernel/pci_of_scan.c
+++ b/arch/powerpc/kernel/pci_of_scan.c
@@ -24,12 +24,12 @@
  */
 static u32 get_int_prop(struct device_node *np, const char *name, u32 def)
 {
-        const u32 *prop;
+        const __be32 *prop;
         int len;
 
         prop = of_get_property(np, name, &len);
         if (prop && len >= 4)
-                return *prop;
+                return of_read_number(prop, 1);
         return def;
 }
 
@@ -77,7 +77,7 @@ static void of_pci_parse_addrs(struct device_node *node, struct pci_dev *dev)
         unsigned int flags;
         struct pci_bus_region region;
         struct resource *res;
-        const u32 *addrs;
+        const __be32 *addrs;
         u32 i;
         int proplen;
 
@@ -86,14 +86,14 @@ static void of_pci_parse_addrs(struct device_node *node, struct pci_dev *dev)
                 return;
         pr_debug("    parse addresses (%d bytes) @ %p\n", proplen, addrs);
         for (; proplen >= 20; proplen -= 20, addrs += 5) {
-                flags = pci_parse_of_flags(addrs[0], 0);
+                flags = pci_parse_of_flags(of_read_number(addrs, 1), 0);
                 if (!flags)
                         continue;
                 base = of_read_number(&addrs[1], 2);
                 size = of_read_number(&addrs[3], 2);
                 if (!size)
                         continue;
-                i = addrs[0] & 0xff;
+                i = of_read_number(addrs, 1) & 0xff;
                 pr_debug("  base: %llx, size: %llx, i: %x\n",
                          (unsigned long long)base,
                          (unsigned long long)size, i);
@@ -207,7 +207,7 @@ void of_scan_pci_bridge(struct pci_dev *dev)
 {
         struct device_node *node = dev->dev.of_node;
         struct pci_bus *bus;
-        const u32 *busrange, *ranges;
+        const __be32 *busrange, *ranges;
         int len, i, mode;
         struct pci_bus_region region;
         struct resource *res;
@@ -230,9 +230,11 @@ void of_scan_pci_bridge(struct pci_dev *dev)
                 return;
         }
 
-        bus = pci_find_bus(pci_domain_nr(dev->bus), busrange[0]);
+        bus = pci_find_bus(pci_domain_nr(dev->bus),
+                           of_read_number(busrange, 1));
         if (!bus) {
-                bus = pci_add_new_bus(dev->bus, dev, busrange[0]);
+                bus = pci_add_new_bus(dev->bus, dev,
+                                      of_read_number(busrange, 1));
                 if (!bus) {
                         printk(KERN_ERR "Failed to create pci bus for %s\n",
                                node->full_name);
@@ -241,7 +243,8 @@ void of_scan_pci_bridge(struct pci_dev *dev)
         }
 
         bus->primary = dev->bus->number;
-        pci_bus_insert_busn_res(bus, busrange[0], busrange[1]);
+        pci_bus_insert_busn_res(bus, of_read_number(busrange, 1),
+                                of_read_number(busrange+1, 1));
         bus->bridge_ctl = 0;
 
         /* parse ranges property */
@@ -254,7 +257,7 @@ void of_scan_pci_bridge(struct pci_dev *dev)
         }
         i = 1;
         for (; len >= 32; len -= 32, ranges += 8) {
-                flags = pci_parse_of_flags(ranges[0], 1);
+                flags = pci_parse_of_flags(of_read_number(ranges, 1), 1);
                 size = of_read_number(&ranges[6], 2);
                 if (flags == 0 || size == 0)
                         continue;
diff --git a/arch/powerpc/kernel/ppc_ksyms.c b/arch/powerpc/kernel/ppc_ksyms.c
index c29666586998..21646dbe1bb3 100644
--- a/arch/powerpc/kernel/ppc_ksyms.c
+++ b/arch/powerpc/kernel/ppc_ksyms.c
@@ -96,7 +96,9 @@ EXPORT_SYMBOL(pci_dram_offset);
 
 EXPORT_SYMBOL(start_thread);
 
+#ifdef CONFIG_PPC_FPU
 EXPORT_SYMBOL(giveup_fpu);
+#endif
 #ifdef CONFIG_ALTIVEC
 EXPORT_SYMBOL(giveup_altivec);
 #endif /* CONFIG_ALTIVEC */
@@ -111,7 +113,6 @@ EXPORT_SYMBOL(giveup_spe);
 #ifndef CONFIG_PPC64
 EXPORT_SYMBOL(flush_instruction_cache);
 #endif
-EXPORT_SYMBOL(__flush_icache_range);
 EXPORT_SYMBOL(flush_dcache_range);
 
 #ifdef CONFIG_SMP
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 8083be20fe5e..96d2fdf3aa9e 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -74,6 +74,7 @@ struct task_struct *last_task_used_vsx = NULL;
 struct task_struct *last_task_used_spe = NULL;
 #endif
 
+#ifdef CONFIG_PPC_FPU
 /*
  * Make sure the floating-point register state in the
  * the thread_struct is up to date for task tsk.
@@ -107,6 +108,7 @@ void flush_fp_to_thread(struct task_struct *tsk)
         }
 }
 EXPORT_SYMBOL_GPL(flush_fp_to_thread);
+#endif
 
 void enable_kernel_fp(void)
 {
@@ -998,9 +1000,10 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
         kregs = (struct pt_regs *) sp;
         sp -= STACK_FRAME_OVERHEAD;
         p->thread.ksp = sp;
+#ifdef CONFIG_PPC32
         p->thread.ksp_limit = (unsigned long)task_stack_page(p) +
                                 _ALIGN_UP(sizeof(struct thread_info), 16);
-
+#endif
 #ifdef CONFIG_HAVE_HW_BREAKPOINT
         p->thread.ptrace_bps[0] = NULL;
 #endif
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index eb23ac92abb9..b7634ce41dbc 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -215,16 +215,16 @@ static void __init check_cpu_pa_features(unsigned long node)
 #ifdef CONFIG_PPC_STD_MMU_64
 static void __init check_cpu_slb_size(unsigned long node)
 {
-        u32 *slb_size_ptr;
+        __be32 *slb_size_ptr;
 
         slb_size_ptr = of_get_flat_dt_prop(node, "slb-size", NULL);
         if (slb_size_ptr != NULL) {
-                mmu_slb_size = *slb_size_ptr;
+                mmu_slb_size = be32_to_cpup(slb_size_ptr);
                 return;
         }
         slb_size_ptr = of_get_flat_dt_prop(node, "ibm,slb-size", NULL);
         if (slb_size_ptr != NULL) {
-                mmu_slb_size = *slb_size_ptr;
+                mmu_slb_size = be32_to_cpup(slb_size_ptr);
         }
 }
 #else
@@ -279,11 +279,11 @@ static void __init check_cpu_feature_properties(unsigned long node)
 {
         unsigned long i;
         struct feature_property *fp = feature_properties;
-        const u32 *prop;
+        const __be32 *prop;
 
         for (i = 0; i < ARRAY_SIZE(feature_properties); ++i, ++fp) {
                 prop = of_get_flat_dt_prop(node, fp->name, NULL);
-                if (prop && *prop >= fp->min_value) {
+                if (prop && be32_to_cpup(prop) >= fp->min_value) {
                         cur_cpu_spec->cpu_features |= fp->cpu_feature;
                         cur_cpu_spec->cpu_user_features |= fp->cpu_user_ftr;
                 }
@@ -295,8 +295,8 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
                                           void *data)
 {
         char *type = of_get_flat_dt_prop(node, "device_type", NULL);
-        const u32 *prop;
-        const u32 *intserv;
+        const __be32 *prop;
+        const __be32 *intserv;
         int i, nthreads;
         unsigned long len;
         int found = -1;
@@ -324,8 +324,9 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
                  * version 2 of the kexec param format adds the phys cpuid of
                  * booted proc.
                  */
-                if (initial_boot_params->version >= 2) {
-                        if (intserv[i] == initial_boot_params->boot_cpuid_phys) {
+                if (be32_to_cpu(initial_boot_params->version) >= 2) {
+                        if (be32_to_cpu(intserv[i]) ==
+                            be32_to_cpu(initial_boot_params->boot_cpuid_phys)) {
                                 found = boot_cpu_count;
                                 found_thread = i;
                         }
@@ -347,9 +348,10 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
 
         if (found >= 0) {
                 DBG("boot cpu: logical %d physical %d\n", found,
-                        intserv[found_thread]);
+                        be32_to_cpu(intserv[found_thread]));
                 boot_cpuid = found;
-                set_hard_smp_processor_id(found, intserv[found_thread]);
+                set_hard_smp_processor_id(found,
+                        be32_to_cpu(intserv[found_thread]));
 
                 /*
                  * PAPR defines "logical" PVR values for cpus that
@@ -366,8 +368,8 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
                  * it uses 0x0f000001.
                  */
                 prop = of_get_flat_dt_prop(node, "cpu-version", NULL);
-                if (prop && (*prop & 0xff000000) == 0x0f000000)
-                        identify_cpu(0, *prop);
+                if (prop && (be32_to_cpup(prop) & 0xff000000) == 0x0f000000)
+                        identify_cpu(0, be32_to_cpup(prop));
 
                 identical_pvr_fixup(node);
         }
@@ -389,7 +391,7 @@ static int __init early_init_dt_scan_cpus(unsigned long node,
 int __init early_init_dt_scan_chosen_ppc(unsigned long node, const char *uname,
                                          int depth, void *data)
 {
-        unsigned long *lprop;
+        unsigned long *lprop; /* All these set by kernel, so no need to convert endian */
 
         /* Use common scan routine to determine if this is the chosen node */
         if (early_init_dt_scan_chosen(node, uname, depth, data) == 0)
@@ -454,7 +456,7 @@ static int __init early_init_dt_scan_drconf_memory(unsigned long node)
         if (dm == NULL || l < sizeof(__be32))
                 return 0;
 
-        n = *dm++;      /* number of entries */
+        n = of_read_number(dm++, 1);    /* number of entries */
         if (l < (n * (dt_root_addr_cells + 4) + 1) * sizeof(__be32))
                 return 0;
 
@@ -466,7 +468,7 @@ static int __init early_init_dt_scan_drconf_memory(unsigned long node)
 
         for (; n != 0; --n) {
                 base = dt_mem_next_cell(dt_root_addr_cells, &dm);
-                flags = dm[3];
+                flags = of_read_number(&dm[3], 1);
                 /* skip DRC index, pad, assoc. list index, flags */
                 dm += 4;
                 /* skip this block if the reserved bit is set in flags (0x80)
@@ -544,14 +546,8 @@ void __init early_init_dt_add_memory_arch(u64 base, u64 size)
         memblock_add(base, size);
 }
 
-void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
-{
-        return __va(memblock_alloc(size, align));
-}
-
 #ifdef CONFIG_BLK_DEV_INITRD
-void __init early_init_dt_setup_initrd_arch(unsigned long start,
-                unsigned long end)
+void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
 {
         initrd_start = (unsigned long)__va(start);
         initrd_end = (unsigned long)__va(end);
@@ -591,16 +587,16 @@ static void __init early_reserve_mem_dt(void)
 static void __init early_reserve_mem(void)
 {
         u64 base, size;
-        u64 *reserve_map;
+        __be64 *reserve_map;
         unsigned long self_base;
         unsigned long self_size;
 
-        reserve_map = (u64 *)(((unsigned long)initial_boot_params) +
-                                        initial_boot_params->off_mem_rsvmap);
+        reserve_map = (__be64 *)(((unsigned long)initial_boot_params) +
+                        be32_to_cpu(initial_boot_params->off_mem_rsvmap));
 
         /* before we do anything, lets reserve the dt blob */
         self_base = __pa((unsigned long)initial_boot_params);
-        self_size = initial_boot_params->totalsize;
+        self_size = be32_to_cpu(initial_boot_params->totalsize);
         memblock_reserve(self_base, self_size);
 
         /* Look for the new "reserved-regions" property in the DT */
@@ -620,15 +616,15 @@ static void __init early_reserve_mem(void)
          * Handle the case where we might be booting from an old kexec
          * image that setup the mem_rsvmap as pairs of 32-bit values
          */
-        if (*reserve_map > 0xffffffffull) {
+        if (be64_to_cpup(reserve_map) > 0xffffffffull) {
                 u32 base_32, size_32;
-                u32 *reserve_map_32 = (u32 *)reserve_map;
+                __be32 *reserve_map_32 = (__be32 *)reserve_map;
 
                 DBG("Found old 32-bit reserve map\n");
 
                 while (1) {
-                        base_32 = *(reserve_map_32++);
-                        size_32 = *(reserve_map_32++);
+                        base_32 = be32_to_cpup(reserve_map_32++);
+                        size_32 = be32_to_cpup(reserve_map_32++);
                         if (size_32 == 0)
                                 break;
                         /* skip if the reservation is for the blob */
@@ -644,8 +640,8 @@ static void __init early_reserve_mem(void)
 
         /* Handle the reserve map in the fdt blob if it exists */
         while (1) {
-                base = *(reserve_map++);
-                size = *(reserve_map++);
+                base = be64_to_cpup(reserve_map++);
+                size = be64_to_cpup(reserve_map++);
                 if (size == 0)
                         break;
                 DBG("reserving: %llx -> %llx\n", base, size);
@@ -795,6 +791,32 @@ struct device_node *of_find_next_cache_node(struct device_node *np)
         return NULL;
 }
 
+/**
+ * of_get_ibm_chip_id - Returns the IBM "chip-id" of a device
+ * @np: device node of the device
+ *
+ * This looks for a property "ibm,chip-id" in the node or any
+ * of its parents and returns its content, or -1 if it cannot
+ * be found.
+ */
+int of_get_ibm_chip_id(struct device_node *np)
+{
+        of_node_get(np);
+        while(np) {
+                struct device_node *old = np;
+                const __be32 *prop;
+
+                prop = of_get_property(np, "ibm,chip-id", NULL);
+                if (prop) {
+                        of_node_put(np);
+                        return be32_to_cpup(prop);
+                }
+                np = of_get_parent(np);
+                of_node_put(old);
+        }
+        return -1;
+}
+
 #ifdef CONFIG_PPC_PSERIES
 /*
  * Fix up the uninitialized fields in a new device node:
@@ -865,49 +887,10 @@ static int __init prom_reconfig_setup(void)
 __initcall(prom_reconfig_setup);
 #endif
 
-/* Find the device node for a given logical cpu number, also returns the cpu
- * local thread number (index in ibm,interrupt-server#s) if relevant and
- * asked for (non NULL)
- */
-struct device_node *of_get_cpu_node(int cpu, unsigned int *thread)
+bool arch_match_cpu_phys_id(int cpu, u64 phys_id)
 {
-        int hardid;
-        struct device_node *np;
-
-        hardid = get_hard_smp_processor_id(cpu);
-
-        for_each_node_by_type(np, "cpu") {
-                const u32 *intserv;
-                unsigned int plen, t;
-
-                /* Check for ibm,ppc-interrupt-server#s. If it doesn't exist
-                 * fallback to "reg" property and assume no threads
-                 */
-                intserv = of_get_property(np, "ibm,ppc-interrupt-server#s",
-                                &plen);
-                if (intserv == NULL) {
-                        const u32 *reg = of_get_property(np, "reg", NULL);
-                        if (reg == NULL)
-                                continue;
-                        if (*reg == hardid) {
-                                if (thread)
-                                        *thread = 0;
-                                return np;
-                        }
-                } else {
-                        plen /= sizeof(u32);
-                        for (t = 0; t < plen; t++) {
-                                if (hardid == intserv[t]) {
-                                        if (thread)
-                                                *thread = t;
-                                        return np;
-                                }
-                        }
-                }
-        }
-        return NULL;
+        return (int)phys_id == get_hard_smp_processor_id(cpu);
 }
-EXPORT_SYMBOL(of_get_cpu_node);
 
 #if defined(CONFIG_DEBUG_FS) && defined(DEBUG)
 static struct debugfs_blob_wrapper flat_dt_blob;
@@ -917,7 +900,7 @@ static int __init export_flat_device_tree(void)
         struct dentry *d;
 
         flat_dt_blob.data = initial_boot_params;
-        flat_dt_blob.size = initial_boot_params->totalsize;
+        flat_dt_blob.size = be32_to_cpu(initial_boot_params->totalsize);
 
         d = debugfs_create_blob("flat-device-tree", S_IFREG | S_IRUSR,
                                 powerpc_debugfs_root, &flat_dt_blob);
diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c
index 607902424e73..5fe2842e8bab 100644
--- a/arch/powerpc/kernel/prom_init.c
+++ b/arch/powerpc/kernel/prom_init.c
@@ -107,10 +107,10 @@ int of_workarounds;
 typedef u32 prom_arg_t;
 
 struct prom_args {
-        u32 service;
-        u32 nargs;
-        u32 nret;
-        prom_arg_t args[10];
+        __be32 service;
+        __be32 nargs;
+        __be32 nret;
+        __be32 args[10];
 };
 
 struct prom_t {
@@ -123,11 +123,11 @@ struct prom_t {
 };
 
 struct mem_map_entry {
-        u64     base;
-        u64     size;
+        __be64  base;
+        __be64  size;
 };
 
-typedef u32 cell_t;
+typedef __be32 cell_t;
 
 extern void __start(unsigned long r3, unsigned long r4, unsigned long r5,
                     unsigned long r6, unsigned long r7, unsigned long r8,
@@ -196,6 +196,8 @@ static int __initdata mem_reserve_cnt;
 
 static cell_t __initdata regbuf[1024];
 
+static bool rtas_has_query_cpu_stopped;
+
 
 /*
  * Error results ... some OF calls will return "-1" on error, some
@@ -219,13 +221,13 @@ static int __init call_prom(const char *service, int nargs, int nret, ...)
         struct prom_args args;
         va_list list;
 
-        args.service = ADDR(service);
-        args.nargs = nargs;
-        args.nret = nret;
+        args.service = cpu_to_be32(ADDR(service));
+        args.nargs = cpu_to_be32(nargs);
+        args.nret = cpu_to_be32(nret);
 
         va_start(list, nret);
         for (i = 0; i < nargs; i++)
-                args.args[i] = va_arg(list, prom_arg_t);
+                args.args[i] = cpu_to_be32(va_arg(list, prom_arg_t));
         va_end(list);
 
         for (i = 0; i < nret; i++)
@@ -234,7 +236,7 @@ static int __init call_prom(const char *service, int nargs, int nret, ...)
         if (enter_prom(&args, prom_entry) < 0)
                 return PROM_ERROR;
 
-        return (nret > 0) ? args.args[nargs] : 0;
+        return (nret > 0) ? be32_to_cpu(args.args[nargs]) : 0;
 }
 
 static int __init call_prom_ret(const char *service, int nargs, int nret,
@@ -244,13 +246,13 @@ static int __init call_prom_ret(const char *service, int nargs, int nret,
         struct prom_args args;
         va_list list;
 
-        args.service = ADDR(service);
-        args.nargs = nargs;
-        args.nret = nret;
+        args.service = cpu_to_be32(ADDR(service));
+        args.nargs = cpu_to_be32(nargs);
+        args.nret = cpu_to_be32(nret);
 
         va_start(list, rets);
         for (i = 0; i < nargs; i++)
-                args.args[i] = va_arg(list, prom_arg_t);
+                args.args[i] = cpu_to_be32(va_arg(list, prom_arg_t));
         va_end(list);
 
         for (i = 0; i < nret; i++)
@@ -261,9 +263,9 @@ static int __init call_prom_ret(const char *service, int nargs, int nret,
 
         if (rets != NULL)
                 for (i = 1; i < nret; ++i)
-                        rets[i-1] = args.args[nargs+i];
+                        rets[i-1] = be32_to_cpu(args.args[nargs+i]);
 
-        return (nret > 0) ? args.args[nargs] : 0;
+        return (nret > 0) ? be32_to_cpu(args.args[nargs]) : 0;
 }
 
 
@@ -527,7 +529,7 @@ static int __init prom_setprop(phandle node, const char *nodename,
 #define islower(c)      ('a' <= (c) && (c) <= 'z')
 #define toupper(c)      (islower(c) ? ((c) - 'a' + 'A') : (c))
 
-unsigned long prom_strtoul(const char *cp, const char **endp)
+static unsigned long prom_strtoul(const char *cp, const char **endp)
 {
         unsigned long result = 0, base = 10, value;
 
@@ -552,7 +554,7 @@ unsigned long prom_strtoul(const char *cp, const char **endp)
         return result;
 }
 
-unsigned long prom_memparse(const char *ptr, const char **retptr)
+static unsigned long prom_memparse(const char *ptr, const char **retptr)
 {
         unsigned long ret = prom_strtoul(ptr, retptr);
         int shift = 0;
@@ -724,7 +726,8 @@ unsigned char ibm_architecture_vec[] = {
 
 };
 
-/* Old method - ELF header with PT_NOTE sections */
+/* Old method - ELF header with PT_NOTE sections only works on BE */
+#ifdef __BIG_ENDIAN__
 static struct fake_elf {
         Elf32_Ehdr      elfhdr;
         Elf32_Phdr      phdr[2];
@@ -810,6 +813,7 @@ static struct fake_elf {
                 }
         }
 };
+#endif /* __BIG_ENDIAN__ */
 
 static int __init prom_count_smt_threads(void)
 {
@@ -852,9 +856,9 @@ static int __init prom_count_smt_threads(void)
 
 static void __init prom_send_capabilities(void)
 {
-        ihandle elfloader, root;
+        ihandle root;
         prom_arg_t ret;
-        u32 *cores;
+        __be32 *cores;
 
         root = call_prom("open", 1, 1, ADDR("/"));
         if (root != 0) {
@@ -864,15 +868,15 @@ static void __init prom_send_capabilities(void)
                  * (we assume this is the same for all cores) and use it to
                  * divide NR_CPUS.
                  */
-                cores = (u32 *)&ibm_architecture_vec[IBM_ARCH_VEC_NRCORES_OFFSET];
-                if (*cores != NR_CPUS) {
+                cores = (__be32 *)&ibm_architecture_vec[IBM_ARCH_VEC_NRCORES_OFFSET];
+                if (be32_to_cpup(cores) != NR_CPUS) {
                         prom_printf("WARNING ! "
                                     "ibm_architecture_vec structure inconsistent: %lu!\n",
-                                    *cores);
+                                    be32_to_cpup(cores));
                 } else {
-                        *cores = DIV_ROUND_UP(NR_CPUS, prom_count_smt_threads());
+                        *cores = cpu_to_be32(DIV_ROUND_UP(NR_CPUS, prom_count_smt_threads()));
                         prom_printf("Max number of cores passed to firmware: %lu (NR_CPUS = %lu)\n",
-                                    *cores, NR_CPUS);
+                                    be32_to_cpup(cores), NR_CPUS);
                 }
 
                 /* try calling the ibm,client-architecture-support method */
@@ -893,17 +897,24 @@ static void __init prom_send_capabilities(void)
                 prom_printf(" not implemented\n");
         }
 
-        /* no ibm,client-architecture-support call, try the old way */
-        elfloader = call_prom("open", 1, 1, ADDR("/packages/elf-loader"));
-        if (elfloader == 0) {
-                prom_printf("couldn't open /packages/elf-loader\n");
-                return;
+#ifdef __BIG_ENDIAN__
+        {
+                ihandle elfloader;
+
+                /* no ibm,client-architecture-support call, try the old way */
+                elfloader = call_prom("open", 1, 1,
+                                      ADDR("/packages/elf-loader"));
+                if (elfloader == 0) {
+                        prom_printf("couldn't open /packages/elf-loader\n");
+                        return;
+                }
+                call_prom("call-method", 3, 1, ADDR("process-elf-header"),
+                          elfloader, ADDR(&fake_elf));
+                call_prom("close", 1, 0, elfloader);
         }
-        call_prom("call-method", 3, 1, ADDR("process-elf-header"),
-                        elfloader, ADDR(&fake_elf));
-        call_prom("close", 1, 0, elfloader);
+#endif /* __BIG_ENDIAN__ */
 }
-#endif
+#endif /* #if defined(CONFIG_PPC_PSERIES) || defined(CONFIG_PPC_POWERNV) */
 
 /*
  * Memory allocation strategy... our layout is normally:
@@ -1050,11 +1061,11 @@ static unsigned long __init prom_next_cell(int s, cell_t **cellp)
                 p++;
                 s--;
         }
-        r = *p++;
+        r = be32_to_cpu(*p++);
 #ifdef CONFIG_PPC64
         if (s > 1) {
                 r <<= 32;
-                r |= *(p++);
+                r |= be32_to_cpu(*(p++));
         }
 #endif
         *cellp = p;
@@ -1087,8 +1098,8 @@ static void __init reserve_mem(u64 base, u64 size)
 
         if (cnt >= (MEM_RESERVE_MAP_SIZE - 1))
                 prom_panic("Memory reserve map exhausted !\n");
-        mem_reserve_map[cnt].base = base;
-        mem_reserve_map[cnt].size = size;
+        mem_reserve_map[cnt].base = cpu_to_be64(base);
+        mem_reserve_map[cnt].size = cpu_to_be64(size);
         mem_reserve_cnt = cnt + 1;
 }
 
@@ -1102,6 +1113,7 @@ static void __init prom_init_mem(void)
         char *path, type[64];
         unsigned int plen;
         cell_t *p, *endp;
+        __be32 val;
         u32 rac, rsc;
 
         /*
@@ -1109,12 +1121,14 @@ static void __init prom_init_mem(void)
          * 1) top of RMO (first node)
          * 2) top of memory
          */
-        rac = 2;
-        prom_getprop(prom.root, "#address-cells", &rac, sizeof(rac));
-        rsc = 1;
-        prom_getprop(prom.root, "#size-cells", &rsc, sizeof(rsc));
-        prom_debug("root_addr_cells: %x\n", (unsigned long) rac);
-        prom_debug("root_size_cells: %x\n", (unsigned long) rsc);
+        val = cpu_to_be32(2);
+        prom_getprop(prom.root, "#address-cells", &val, sizeof(val));
+        rac = be32_to_cpu(val);
+        val = cpu_to_be32(1);
+        prom_getprop(prom.root, "#size-cells", &val, sizeof(rsc));
+        rsc = be32_to_cpu(val);
+        prom_debug("root_addr_cells: %x\n", rac);
+        prom_debug("root_size_cells: %x\n", rsc);
 
         prom_debug("scanning memory:\n");
         path = prom_scratch;
@@ -1222,25 +1236,23 @@ static void __init prom_init_mem(void)
 
 static void __init prom_close_stdin(void)
 {
-        ihandle val;
+        __be32 val;
+        ihandle stdin;
 
-        if (prom_getprop(prom.chosen, "stdin", &val, sizeof(val)) > 0)
-                call_prom("close", 1, 0, val);
+        if (prom_getprop(prom.chosen, "stdin", &val, sizeof(val)) > 0) {
+                stdin = be32_to_cpu(val);
+                call_prom("close", 1, 0, stdin);
+        }
 }
 
 #ifdef CONFIG_PPC_POWERNV
 
-static u64 __initdata prom_opal_size;
-static u64 __initdata prom_opal_align;
-static int __initdata prom_rtas_start_cpu;
-static u64 __initdata prom_rtas_data;
-static u64 __initdata prom_rtas_entry;
-
 #ifdef CONFIG_PPC_EARLY_DEBUG_OPAL
 static u64 __initdata prom_opal_base;
 static u64 __initdata prom_opal_entry;
 #endif
 
+#ifdef __BIG_ENDIAN__
 /* XXX Don't change this structure without updating opal-takeover.S */
 static struct opal_secondary_data {
         s64                             ack;    /*  0 */
@@ -1248,6 +1260,12 @@ static struct opal_secondary_data {
         struct opal_takeover_args       args;   /* 16 */
 } opal_secondary_data;
 
+static u64 __initdata prom_opal_align;
+static u64 __initdata prom_opal_size;
+static int __initdata prom_rtas_start_cpu;
+static u64 __initdata prom_rtas_data;
+static u64 __initdata prom_rtas_entry;
+
 extern char opal_secondary_entry;
 
 static void __init prom_query_opal(void)
@@ -1265,6 +1283,7 @@ static void __init prom_query_opal(void)
         }
 
         prom_printf("Querying for OPAL presence... ");
+
         rc = opal_query_takeover(&prom_opal_size,
                                  &prom_opal_align);
         prom_debug("(rc = %ld) ", rc);
@@ -1280,7 +1299,8 @@ static void __init prom_query_opal(void)
                 prom_opal_align = 0x10000;
 }
 
-static int prom_rtas_call(int token, int nargs, int nret, int *outputs, ...)
+static int __init prom_rtas_call(int token, int nargs, int nret,
+                                 int *outputs, ...)
 {
         struct rtas_args rtas_args;
         va_list list;
@@ -1425,6 +1445,7 @@ static void __init prom_opal_takeover(void)
         for (;;)
                 opal_do_takeover(args);
 }
+#endif /* __BIG_ENDIAN__ */
 
 /*
  * Allocate room for and instantiate OPAL
@@ -1435,6 +1456,7 @@ static void __init prom_instantiate_opal(void)
         ihandle opal_inst;
         u64 base, entry;
         u64 size = 0, align = 0x10000;
+        __be64 val64;
         u32 rets[2];
 
         prom_debug("prom_instantiate_opal: start...\n");
@@ -1444,11 +1466,14 @@ static void __init prom_instantiate_opal(void)
         if (!PHANDLE_VALID(opal_node))
                 return;
 
-        prom_getprop(opal_node, "opal-runtime-size", &size, sizeof(size));
+        val64 = 0;
+        prom_getprop(opal_node, "opal-runtime-size", &val64, sizeof(val64));
+        size = be64_to_cpu(val64);
         if (size == 0)
                 return;
-        prom_getprop(opal_node, "opal-runtime-alignment", &align,
-                     sizeof(align));
+        val64 = 0;
+        prom_getprop(opal_node, "opal-runtime-alignment", &val64,sizeof(val64));
+        align = be64_to_cpu(val64);
 
         base = alloc_down(size, align, 0);
         if (base == 0) {
@@ -1505,6 +1530,7 @@ static void __init prom_instantiate_rtas(void)
         phandle rtas_node;
         ihandle rtas_inst;
         u32 base, entry = 0;
+        __be32 val;
         u32 size = 0;
 
         prom_debug("prom_instantiate_rtas: start...\n");
@@ -1514,7 +1540,9 @@ static void __init prom_instantiate_rtas(void)
         if (!PHANDLE_VALID(rtas_node))
                 return;
 
-        prom_getprop(rtas_node, "rtas-size", &size, sizeof(size));
+        val = 0;
+        prom_getprop(rtas_node, "rtas-size", &val, sizeof(size));
+        size = be32_to_cpu(val);
         if (size == 0)
                 return;
 
@@ -1541,12 +1569,19 @@ static void __init prom_instantiate_rtas(void)
 
         reserve_mem(base, size);
 
+        val = cpu_to_be32(base);
         prom_setprop(rtas_node, "/rtas", "linux,rtas-base",
-                     &base, sizeof(base));
+                     &val, sizeof(val));
+        val = cpu_to_be32(entry);
         prom_setprop(rtas_node, "/rtas", "linux,rtas-entry",
-                     &entry, sizeof(entry));
+                     &val, sizeof(val));
 
-#ifdef CONFIG_PPC_POWERNV
+        /* Check if it supports "query-cpu-stopped-state" */
+        if (prom_getprop(rtas_node, "query-cpu-stopped-state",
+                         &val, sizeof(val)) != PROM_ERROR)
+                rtas_has_query_cpu_stopped = true;
+
+#if defined(CONFIG_PPC_POWERNV) && defined(__BIG_ENDIAN__)
         /* PowerVN takeover hack */
         prom_rtas_data = base;
         prom_rtas_entry = entry;
@@ -1620,6 +1655,7 @@ static void __init prom_instantiate_sml(void)
 /*
  * Allocate room for and initialize TCE tables
  */
+#ifdef __BIG_ENDIAN__
 static void __init prom_initialize_tce_table(void)
 {
         phandle node;
@@ -1748,7 +1784,8 @@ static void __init prom_initialize_tce_table(void)
         /* Flag the first invalid entry */
         prom_debug("ending prom_initialize_tce_table\n");
 }
-#endif
+#endif /* __BIG_ENDIAN__ */
+#endif /* CONFIG_PPC64 */
 
 /*
  * With CHRP SMP we need to use the OF to start the other processors.
@@ -1777,7 +1814,6 @@ static void __init prom_initialize_tce_table(void)
 static void __init prom_hold_cpus(void)
 {
         unsigned long i;
-        unsigned int reg;
         phandle node;
         char type[64];
         unsigned long *spinloop
@@ -1786,6 +1822,18 @@ static void __init prom_hold_cpus(void)
                 = (void *) LOW_ADDR(__secondary_hold_acknowledge);
         unsigned long secondary_hold = LOW_ADDR(__secondary_hold);
 
+        /*
+         * On pseries, if RTAS supports "query-cpu-stopped-state",
+         * we skip this stage, the CPUs will be started by the
+         * kernel using RTAS.
+         */
+        if ((of_platform == PLATFORM_PSERIES ||
+             of_platform == PLATFORM_PSERIES_LPAR) &&
+            rtas_has_query_cpu_stopped) {
+                prom_printf("prom_hold_cpus: skipped\n");
+                return;
+        }
+
         prom_debug("prom_hold_cpus: start...\n");
         prom_debug("    1) spinloop       = 0x%x\n", (unsigned long)spinloop);
         prom_debug("    1) *spinloop      = 0x%x\n", *spinloop);
@@ -1803,6 +1851,9 @@ static void __init prom_hold_cpus(void)
 
         /* look for cpus */
         for (node = 0; prom_next_node(&node); ) {
+                unsigned int cpu_no;
+                __be32 reg;
+
                 type[0] = 0;
                 prom_getprop(node, "device_type", type, sizeof(type));
                 if (strcmp(type, "cpu") != 0)
@@ -1813,10 +1864,11 @@ static void __init prom_hold_cpus(void)
                         if (strcmp(type, "okay") != 0)
                                 continue;
 
-                reg = -1;
+                reg = cpu_to_be32(-1); /* make sparse happy */
                 prom_getprop(node, "reg", &reg, sizeof(reg));
+                cpu_no = be32_to_cpu(reg);
 
-                prom_debug("cpu hw idx   = %lu\n", reg);
+                prom_debug("cpu hw idx   = %lu\n", cpu_no);
 
                 /* Init the acknowledge var which will be reset by
                  * the secondary cpu when it awakens from its OF
@@ -1824,24 +1876,24 @@ static void __init prom_hold_cpus(void)
                  */
                 *acknowledge = (unsigned long)-1;
 
-                if (reg != prom.cpu) {
+                if (cpu_no != prom.cpu) {
                         /* Primary Thread of non-boot cpu or any thread */
-                        prom_printf("starting cpu hw idx %lu... ", reg);
+                        prom_printf("starting cpu hw idx %lu... ", cpu_no);
                         call_prom("start-cpu", 3, 0, node,
-                                  secondary_hold, reg);
+                                  secondary_hold, cpu_no);
 
                         for (i = 0; (i < 100000000) && 
                              (*acknowledge == ((unsigned long)-1)); i++ )
                                 mb();
 
-                        if (*acknowledge == reg)
+                        if (*acknowledge == cpu_no)
                                 prom_printf("done\n");
                         else
                                 prom_printf("failed: %x\n", *acknowledge);
                 }
 #ifdef CONFIG_SMP
                 else
-                        prom_printf("boot cpu hw idx %lu\n", reg);
+                        prom_printf("boot cpu hw idx %lu\n", cpu_no);
 #endif /* CONFIG_SMP */
         }
 
@@ -1895,6 +1947,7 @@ static void __init prom_find_mmu(void)
         prom.memory = call_prom("open", 1, 1, ADDR("/memory"));
         prom_getprop(prom.chosen, "mmu", &prom.mmumap,
                      sizeof(prom.mmumap));
+        prom.mmumap = be32_to_cpu(prom.mmumap);
         if (!IHANDLE_VALID(prom.memory) || !IHANDLE_VALID(prom.mmumap))
                 of_workarounds &= ~OF_WA_CLAIM;         /* hmmm */
 }
@@ -1906,17 +1959,19 @@ static void __init prom_init_stdout(void)
 {
         char *path = of_stdout_device;
         char type[16];
-        u32 val;
+        phandle stdout_node;
+        __be32 val;
 
         if (prom_getprop(prom.chosen, "stdout", &val, sizeof(val)) <= 0)
                 prom_panic("cannot find stdout");
 
-        prom.stdout = val;
+        prom.stdout = be32_to_cpu(val);
 
         /* Get the full OF pathname of the stdout device */
         memset(path, 0, 256);
         call_prom("instance-to-path", 3, 1, prom.stdout, path, 255);
-        val = call_prom("instance-to-package", 1, 1, prom.stdout);
+        stdout_node = call_prom("instance-to-package", 1, 1, prom.stdout);
+        val = cpu_to_be32(stdout_node);
         prom_setprop(prom.chosen, "/chosen", "linux,stdout-package",
                      &val, sizeof(val));
         prom_printf("OF stdout device is: %s\n", of_stdout_device);
@@ -1925,9 +1980,9 @@ static void __init prom_init_stdout(void)
 
         /* If it's a display, note it */
         memset(type, 0, sizeof(type));
-        prom_getprop(val, "device_type", type, sizeof(type));
+        prom_getprop(stdout_node, "device_type", type, sizeof(type));
         if (strcmp(type, "display") == 0)
-                prom_setprop(val, path, "linux,boot-display", NULL, 0);
+                prom_setprop(stdout_node, path, "linux,boot-display", NULL, 0);
 }
 
 static int __init prom_find_machine_type(void)
@@ -2082,6 +2137,22 @@ static void __init prom_check_displays(void)
                                            clut[2]) != 0)
                                 break;
 #endif /* CONFIG_LOGO_LINUX_CLUT224 */
+
+#ifdef CONFIG_PPC_EARLY_DEBUG_BOOTX
+                if (prom_getprop(node, "linux,boot-display", NULL, 0) !=
+                    PROM_ERROR) {
+                        u32 width, height, pitch, addr;
+
+                        prom_printf("Setting btext !\n");
+                        prom_getprop(node, "width", &width, 4);
+                        prom_getprop(node, "height", &height, 4);
+                        prom_getprop(node, "linebytes", &pitch, 4);
+                        prom_getprop(node, "address", &addr, 4);
+                        prom_printf("W=%d H=%d LB=%d addr=0x%x\n",
+                                    width, height, pitch, addr);
+                        btext_setup_display(width, height, 8, pitch, addr);
+                }
+#endif /* CONFIG_PPC_EARLY_DEBUG_BOOTX */
         }
 }
 
@@ -2117,8 +2188,10 @@ static void __init *make_room(unsigned long *mem_start, unsigned long *mem_end,
         return ret;
 }
 
-#define dt_push_token(token, mem_start, mem_end) \
-        do { *((u32 *)make_room(mem_start, mem_end, 4, 4)) = token; } while(0)
+#define dt_push_token(token, mem_start, mem_end) do {                   \
+                void *room = make_room(mem_start, mem_end, 4, 4);       \
+                *(__be32 *)room = cpu_to_be32(token);                   \
+        } while(0)
 
 static unsigned long __init dt_find_string(char *str)
 {
@@ -2291,7 +2364,7 @@ static void __init scan_dt_build_struct(phandle node, unsigned long *mem_start,
                         dt_push_token(4, mem_start, mem_end);
                         dt_push_token(soff, mem_start, mem_end);
                         valp = make_room(mem_start, mem_end, 4, 4);
-                        *(u32 *)valp = node;
+                        *(__be32 *)valp = cpu_to_be32(node);
                 }
         }
 
@@ -2364,16 +2437,16 @@ static void __init flatten_device_tree(void)
         dt_struct_end = PAGE_ALIGN(mem_start);
 
         /* Finish header */
-        hdr->boot_cpuid_phys = prom.cpu;
-        hdr->magic = OF_DT_HEADER;
-        hdr->totalsize = dt_struct_end - dt_header_start;
-        hdr->off_dt_struct = dt_struct_start - dt_header_start;
-        hdr->off_dt_strings = dt_string_start - dt_header_start;
-        hdr->dt_strings_size = dt_string_end - dt_string_start;
-        hdr->off_mem_rsvmap = ((unsigned long)rsvmap) - dt_header_start;
-        hdr->version = OF_DT_VERSION;
+        hdr->boot_cpuid_phys = cpu_to_be32(prom.cpu);
+        hdr->magic = cpu_to_be32(OF_DT_HEADER);
+        hdr->totalsize = cpu_to_be32(dt_struct_end - dt_header_start);
+        hdr->off_dt_struct = cpu_to_be32(dt_struct_start - dt_header_start);
+        hdr->off_dt_strings = cpu_to_be32(dt_string_start - dt_header_start);
+        hdr->dt_strings_size = cpu_to_be32(dt_string_end - dt_string_start);
+        hdr->off_mem_rsvmap = cpu_to_be32(((unsigned long)rsvmap) - dt_header_start);
+        hdr->version = cpu_to_be32(OF_DT_VERSION);
         /* Version 16 is not backward compatible */
-        hdr->last_comp_version = 0x10;
+        hdr->last_comp_version = cpu_to_be32(0x10);
 
         /* Copy the reserve map in */
         memcpy(rsvmap, mem_reserve_map, sizeof(mem_reserve_map));
@@ -2384,8 +2457,8 @@ static void __init flatten_device_tree(void)
                 prom_printf("reserved memory map:\n");
                 for (i = 0; i < mem_reserve_cnt; i++)
                         prom_printf("  %x - %x\n",
-                                    mem_reserve_map[i].base,
-                                    mem_reserve_map[i].size);
+                                    be64_to_cpu(mem_reserve_map[i].base),
+                                    be64_to_cpu(mem_reserve_map[i].size));
         }
 #endif
         /* Bump mem_reserve_cnt to cause further reservations to fail
@@ -2397,7 +2470,6 @@ static void __init flatten_device_tree(void)
                     dt_string_start, dt_string_end);
         prom_printf("Device tree struct  0x%x -> 0x%x\n",
                     dt_struct_start, dt_struct_end);
-
 }
 
 #ifdef CONFIG_PPC_MAPLE
@@ -2730,18 +2802,19 @@ static void __init fixup_device_tree(void)
 
 static void __init prom_find_boot_cpu(void)
 {
-        u32 getprop_rval;
+        __be32 rval;
         ihandle prom_cpu;
         phandle cpu_pkg;
 
-        prom.cpu = 0;
-        if (prom_getprop(prom.chosen, "cpu", &prom_cpu, sizeof(prom_cpu)) <= 0)
+        rval = 0;
+        if (prom_getprop(prom.chosen, "cpu", &rval, sizeof(rval)) <= 0)
                 return;
+        prom_cpu = be32_to_cpu(rval);
 
         cpu_pkg = call_prom("instance-to-package", 1, 1, prom_cpu);
 
-        prom_getprop(cpu_pkg, "reg", &getprop_rval, sizeof(getprop_rval));
-        prom.cpu = getprop_rval;
+        prom_getprop(cpu_pkg, "reg", &rval, sizeof(rval));
+        prom.cpu = be32_to_cpu(rval);
 
         prom_debug("Booting CPU hw index = %lu\n", prom.cpu);
 }
@@ -2750,15 +2823,15 @@ static void __init prom_check_initrd(unsigned long r3, unsigned long r4)
 {
 #ifdef CONFIG_BLK_DEV_INITRD
         if (r3 && r4 && r4 != 0xdeadbeef) {
-                unsigned long val;
+                __be64 val;
 
                 prom_initrd_start = is_kernel_addr(r3) ? __pa(r3) : r3;
                 prom_initrd_end = prom_initrd_start + r4;
 
-                val = prom_initrd_start;
+                val = cpu_to_be64(prom_initrd_start);
                 prom_setprop(prom.chosen, "/chosen", "linux,initrd-start",
                              &val, sizeof(val));
-                val = prom_initrd_end;
+                val = cpu_to_be64(prom_initrd_end);
                 prom_setprop(prom.chosen, "/chosen", "linux,initrd-end",
                              &val, sizeof(val));
 
@@ -2915,7 +2988,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
          */
         prom_check_displays();
 
-#ifdef CONFIG_PPC64
+#if defined(CONFIG_PPC64) && defined(__BIG_ENDIAN__)
         /*
          * Initialize IOMMU (TCE tables) on pSeries. Do that before anything else
          * that uses the allocator, we need to make sure we get the top of memory
@@ -2934,6 +3007,7 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
                 prom_instantiate_rtas();
 
 #ifdef CONFIG_PPC_POWERNV
+#ifdef __BIG_ENDIAN__
         /* Detect HAL and try instanciating it & doing takeover */
         if (of_platform == PLATFORM_PSERIES_LPAR) {
                 prom_query_opal();
@@ -2941,9 +3015,11 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
                         prom_opal_hold_cpus();
                         prom_opal_takeover();
                 }
-        } else if (of_platform == PLATFORM_OPAL)
+        } else
+#endif /* __BIG_ENDIAN__ */
+        if (of_platform == PLATFORM_OPAL)
                 prom_instantiate_opal();
-#endif
+#endif /* CONFIG_PPC_POWERNV */
 
 #ifdef CONFIG_PPC64
         /* instantiate sml */
@@ -2954,6 +3030,8 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
          * On non-powermacs, put all CPUs in spin-loops.
          *
          * PowerMacs use a different mechanism to spin CPUs
+         *
+         * (This must be done after instanciating RTAS)
          */
         if (of_platform != PLATFORM_POWERMAC &&
             of_platform != PLATFORM_OPAL)
@@ -2962,10 +3040,11 @@ unsigned long __init prom_init(unsigned long r3, unsigned long r4,
         /*
          * Fill in some infos for use by the kernel later on
          */
-        if (prom_memory_limit)
+        if (prom_memory_limit) {
+                __be64 val = cpu_to_be64(prom_memory_limit);
                 prom_setprop(prom.chosen, "/chosen", "linux,memory-limit",
-                             &prom_memory_limit,
-                             sizeof(prom_memory_limit));
+                             &val, sizeof(val));
+        }
 #ifdef CONFIG_PPC64
         if (prom_iommu_off)
                 prom_setprop(prom.chosen, "/chosen", "linux,iommu-off",
diff --git a/arch/powerpc/kernel/prom_init_check.sh b/arch/powerpc/kernel/prom_init_check.sh
index 3765da6be4f2..b0c263da219a 100644
--- a/arch/powerpc/kernel/prom_init_check.sh
+++ b/arch/powerpc/kernel/prom_init_check.sh
@@ -22,7 +22,8 @@ __secondary_hold_acknowledge __secondary_hold_spinloop __start
 strcmp strcpy strlcpy strlen strncmp strstr logo_linux_clut224
 reloc_got2 kernstart_addr memstart_addr linux_banner _stext
 opal_query_takeover opal_do_takeover opal_enter_rtas opal_secondary_entry
-boot_command_line __prom_init_toc_start __prom_init_toc_end"
+boot_command_line __prom_init_toc_start __prom_init_toc_end
+btext_setup_display"
 
 NM="$1"
 OBJ="$2"
diff --git a/arch/powerpc/kernel/prom_parse.c b/arch/powerpc/kernel/prom_parse.c
index 4e1331b8eb33..6295e646f78c 100644
--- a/arch/powerpc/kernel/prom_parse.c
+++ b/arch/powerpc/kernel/prom_parse.c
@@ -7,28 +7,27 @@
 #include <linux/of_address.h>
 #include <asm/prom.h>
 
-void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop,
-                unsigned long *busno, unsigned long *phys, unsigned long *size)
+void of_parse_dma_window(struct device_node *dn, const __be32 *dma_window,
+                         unsigned long *busno, unsigned long *phys,
+                         unsigned long *size)
 {
-        const u32 *dma_window;
         u32 cells;
-        const unsigned char *prop;
-
-        dma_window = dma_window_prop;
+        const __be32 *prop;
 
         /* busno is always one cell */
-        *busno = *(dma_window++);
+        *busno = of_read_number(dma_window, 1);
+        dma_window++;
 
         prop = of_get_property(dn, "ibm,#dma-address-cells", NULL);
         if (!prop)
                 prop = of_get_property(dn, "#address-cells", NULL);
 
-        cells = prop ? *(u32 *)prop : of_n_addr_cells(dn);
+        cells = prop ? of_read_number(prop, 1) : of_n_addr_cells(dn);
         *phys = of_read_number(dma_window, cells);
 
         dma_window += cells;
 
         prop = of_get_property(dn, "ibm,#dma-size-cells", NULL);
-        cells = prop ? *(u32 *)prop : of_n_size_cells(dn);
+        cells = prop ? of_read_number(prop, 1) : of_n_size_cells(dn);
         *size = of_read_number(dma_window, cells);
 }
diff --git a/arch/powerpc/kernel/rtas.c b/arch/powerpc/kernel/rtas.c
index 80b5ef403f68..4cf674d7d5ae 100644
--- a/arch/powerpc/kernel/rtas.c
+++ b/arch/powerpc/kernel/rtas.c
@@ -91,7 +91,7 @@ static void unlock_rtas(unsigned long flags)
  * are designed only for very early low-level debugging, which
  * is why the token is hard-coded to 10.
  */
-static void call_rtas_display_status(char c)
+static void call_rtas_display_status(unsigned char c)
 {
         struct rtas_args *args = &rtas.args;
         unsigned long s;
@@ -100,11 +100,11 @@ static void call_rtas_display_status(char c)
                 return;
         s = lock_rtas();
 
-        args->token = 10;
-        args->nargs = 1;
-        args->nret  = 1;
-        args->rets  = (rtas_arg_t *)&(args->args[1]);
-        args->args[0] = (unsigned char)c;
+        args->token = cpu_to_be32(10);
+        args->nargs = cpu_to_be32(1);
+        args->nret  = cpu_to_be32(1);
+        args->rets  = &(args->args[1]);
+        args->args[0] = cpu_to_be32(c);
 
         enter_rtas(__pa(args));
 
@@ -204,7 +204,7 @@ void rtas_progress(char *s, unsigned short hex)
 {
         struct device_node *root;
         int width;
-        const int *p;
+        const __be32 *p;
         char *os;
         static int display_character, set_indicator;
         static int display_width, display_lines, form_feed;
@@ -221,13 +221,13 @@ void rtas_progress(char *s, unsigned short hex)
                 if ((root = of_find_node_by_path("/rtas"))) {
                         if ((p = of_get_property(root,
                                         "ibm,display-line-length", NULL)))
-                                display_width = *p;
+                                display_width = be32_to_cpu(*p);
                         if ((p = of_get_property(root,
                                         "ibm,form-feed", NULL)))
-                                form_feed = *p;
+                                form_feed = be32_to_cpu(*p);
                         if ((p = of_get_property(root,
                                         "ibm,display-number-of-lines", NULL)))
-                                display_lines = *p;
+                                display_lines = be32_to_cpu(*p);
                         row_width = of_get_property(root,
                                         "ibm,display-truncation-length", NULL);
                         of_node_put(root);
@@ -322,11 +322,11 @@ EXPORT_SYMBOL(rtas_progress);		/* needed by rtas_flash module */
 
 int rtas_token(const char *service)
 {
-        const int *tokp;
+        const __be32 *tokp;
         if (rtas.dev == NULL)
                 return RTAS_UNKNOWN_SERVICE;
         tokp = of_get_property(rtas.dev, service, NULL);
-        return tokp ? *tokp : RTAS_UNKNOWN_SERVICE;
+        return tokp ? be32_to_cpu(*tokp) : RTAS_UNKNOWN_SERVICE;
 }
 EXPORT_SYMBOL(rtas_token);
 
@@ -380,11 +380,11 @@ static char *__fetch_rtas_last_error(char *altbuf)
 
         bufsz = rtas_get_error_log_max();
 
-        err_args.token = rtas_last_error_token;
-        err_args.nargs = 2;
-        err_args.nret = 1;
-        err_args.args[0] = (rtas_arg_t)__pa(rtas_err_buf);
-        err_args.args[1] = bufsz;
+        err_args.token = cpu_to_be32(rtas_last_error_token);
+        err_args.nargs = cpu_to_be32(2);
+        err_args.nret = cpu_to_be32(1);
+        err_args.args[0] = cpu_to_be32(__pa(rtas_err_buf));
+        err_args.args[1] = cpu_to_be32(bufsz);
         err_args.args[2] = 0;
 
         save_args = rtas.args;
@@ -433,13 +433,13 @@ int rtas_call(int token, int nargs, int nret, int *outputs, ...)
         s = lock_rtas();
         rtas_args = &rtas.args;
 
-        rtas_args->token = token;
-        rtas_args->nargs = nargs;
-        rtas_args->nret  = nret;
-        rtas_args->rets  = (rtas_arg_t *)&(rtas_args->args[nargs]);
+        rtas_args->token = cpu_to_be32(token);
+        rtas_args->nargs = cpu_to_be32(nargs);
+        rtas_args->nret  = cpu_to_be32(nret);
+        rtas_args->rets  = &(rtas_args->args[nargs]);
         va_start(list, outputs);
         for (i = 0; i < nargs; ++i)
-                rtas_args->args[i] = va_arg(list, rtas_arg_t);
+                rtas_args->args[i] = cpu_to_be32(va_arg(list, __u32));
         va_end(list);
 
         for (i = 0; i < nret; ++i)
@@ -449,13 +449,13 @@ int rtas_call(int token, int nargs, int nret, int *outputs, ...)
 
         /* A -1 return code indicates that the last command couldn't
            be completed due to a hardware error. */
-        if (rtas_args->rets[0] == -1)
+        if (be32_to_cpu(rtas_args->rets[0]) == -1)
                 buff_copy = __fetch_rtas_last_error(NULL);
 
         if (nret > 1 && outputs != NULL)
                 for (i = 0; i < nret-1; ++i)
-                        outputs[i] = rtas_args->rets[i+1];
-        ret = (nret > 0)? rtas_args->rets[0]: 0;
+                        outputs[i] = be32_to_cpu(rtas_args->rets[i+1]);
+        ret = (nret > 0)? be32_to_cpu(rtas_args->rets[0]): 0;
 
         unlock_rtas(s);
 
@@ -588,8 +588,8 @@ bool rtas_indicator_present(int token, int *maxindex)
 {
         int proplen, count, i;
         const struct indicator_elem {
-                u32 token;
-                u32 maxindex;
+                __be32 token;
+                __be32 maxindex;
         } *indicators;
 
         indicators = of_get_property(rtas.dev, "rtas-indicators", &proplen);
@@ -599,10 +599,10 @@ bool rtas_indicator_present(int token, int *maxindex)
         count = proplen / sizeof(struct indicator_elem);
 
         for (i = 0; i < count; i++) {
-                if (indicators[i].token != token)
+                if (__be32_to_cpu(indicators[i].token) != token)
                         continue;
                 if (maxindex)
-                        *maxindex = indicators[i].maxindex;
+                        *maxindex = __be32_to_cpu(indicators[i].maxindex);
                 return true;
         }
 
@@ -1097,19 +1097,19 @@ void __init rtas_initialize(void)
          */
         rtas.dev = of_find_node_by_name(NULL, "rtas");
         if (rtas.dev) {
-                const u32 *basep, *entryp, *sizep;
+                const __be32 *basep, *entryp, *sizep;
 
                 basep = of_get_property(rtas.dev, "linux,rtas-base", NULL);
                 sizep = of_get_property(rtas.dev, "rtas-size", NULL);
                 if (basep != NULL && sizep != NULL) {
-                        rtas.base = *basep;
-                        rtas.size = *sizep;
+                        rtas.base = __be32_to_cpu(*basep);
+                        rtas.size = __be32_to_cpu(*sizep);
                         entryp = of_get_property(rtas.dev,
                                         "linux,rtas-entry", NULL);
                         if (entryp == NULL) /* Ugh */
                                 rtas.entry = rtas.base;
                         else
-                                rtas.entry = *entryp;
+                                rtas.entry = __be32_to_cpu(*entryp);
                 } else
                         rtas.dev = NULL;
         }
diff --git a/arch/powerpc/kernel/setup-common.c b/arch/powerpc/kernel/setup-common.c
index 63d051f5b7a5..3d261c071fc8 100644
--- a/arch/powerpc/kernel/setup-common.c
+++ b/arch/powerpc/kernel/setup-common.c
@@ -436,7 +436,8 @@ void __init smp_setup_cpu_maps(void)
         DBG("smp_setup_cpu_maps()\n");
 
         while ((dn = of_find_node_by_type(dn, "cpu")) && cpu < nr_cpu_ids) {
-                const int *intserv;
+                const __be32 *intserv;
+                __be32 cpu_be;
                 int j, len;
 
                 DBG("  * %s...\n", dn->full_name);
@@ -450,15 +451,17 @@ void __init smp_setup_cpu_maps(void)
                 } else {
                         DBG("    no ibm,ppc-interrupt-server#s -> 1 thread\n");
                         intserv = of_get_property(dn, "reg", NULL);
-                        if (!intserv)
-                                intserv = &cpu; /* assume logical == phys */
+                        if (!intserv) {
+                                cpu_be = cpu_to_be32(cpu);
+                                intserv = &cpu_be;      /* assume logical == phys */
+                        }
                 }
 
                 for (j = 0; j < nthreads && cpu < nr_cpu_ids; j++) {
                         DBG("    thread %d -> cpu %d (hard id %d)\n",
-                            j, cpu, intserv[j]);
+                            j, cpu, be32_to_cpu(intserv[j]));
                         set_cpu_present(cpu, true);
-                        set_hard_smp_processor_id(cpu, intserv[j]);
+                        set_hard_smp_processor_id(cpu, be32_to_cpu(intserv[j]));
                         set_cpu_possible(cpu, true);
                         cpu++;
                 }
diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c
index a8f54ecb091f..a4bbcae72578 100644
--- a/arch/powerpc/kernel/setup_32.c
+++ b/arch/powerpc/kernel/setup_32.c
@@ -38,6 +38,7 @@
 #include <asm/serial.h>
 #include <asm/udbg.h>
 #include <asm/mmu_context.h>
+#include <asm/epapr_hcalls.h>
 
 #include "setup.h"
 
@@ -128,6 +129,8 @@ notrace void __init machine_init(u64 dt_ptr)
         /* Do some early initialization based on the flat device tree */
         early_init_devtree(__va(dt_ptr));
 
+        epapr_paravirt_early_init();
+
         early_init_mmu();
 
         probe_machine();
@@ -326,5 +329,4 @@ void __init setup_arch(char **cmdline_p)
 
         /* Initialize the MMU context management stuff */
         mmu_context_init();
-
 }
diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c
index 389fb8077cc9..278ca93e1f28 100644
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
@@ -10,7 +10,7 @@
  *      2 of the License, or (at your option) any later version.
  */
 
-#undef DEBUG
+#define DEBUG
 
 #include <linux/export.h>
 #include <linux/string.h>
@@ -66,6 +66,7 @@
 #include <asm/code-patching.h>
 #include <asm/kvm_ppc.h>
 #include <asm/hugetlb.h>
+#include <asm/epapr_hcalls.h>
 
 #include "setup.h"
 
@@ -215,6 +216,8 @@ void __init early_setup(unsigned long dt_ptr)
          */
         early_init_devtree(__va(dt_ptr));
 
+        epapr_paravirt_early_init();
+
         /* Now we know the logical id of our boot cpu, setup the paca. */
         setup_paca(&paca[boot_cpuid]);
         fixup_boot_paca();
@@ -229,6 +232,8 @@ void __init early_setup(unsigned long dt_ptr)
         /* Initialize the hash table or TLB handling */
         early_init_mmu();
 
+        kvm_cma_reserve();
+
         /*
          * Reserve any gigantic pages requested on the command line.
          * memblock needs to have been initialized by the time this is
@@ -237,6 +242,18 @@ void __init early_setup(unsigned long dt_ptr)
         reserve_hugetlb_gpages();
 
         DBG(" <- early_setup()\n");
+
+#ifdef CONFIG_PPC_EARLY_DEBUG_BOOTX
+        /*
+         * This needs to be done *last* (after the above DBG() even)
+         *
+         * Right after we return from this function, we turn on the MMU
+         * which means the real-mode access trick that btext does will
+         * no longer work, it needs to switch to using a real MMU
+         * mapping. This call will ensure that it does
+         */
+        btext_map();
+#endif /* CONFIG_PPC_EARLY_DEBUG_BOOTX */
 }
 
 #ifdef CONFIG_SMP
@@ -305,14 +322,14 @@ static void __init initialize_cache_info(void)
                  * d-cache and i-cache sizes... -Peter
                  */
                 if (num_cpus == 1) {
-                        const u32 *sizep, *lsizep;
+                        const __be32 *sizep, *lsizep;
                         u32 size, lsize;
 
                         size = 0;
                         lsize = cur_cpu_spec->dcache_bsize;
                         sizep = of_get_property(np, "d-cache-size", NULL);
                         if (sizep != NULL)
-                                size = *sizep;
+                                size = be32_to_cpu(*sizep);
                         lsizep = of_get_property(np, "d-cache-block-size",
                                                  NULL);
                         /* fallback if block size missing */
@@ -321,8 +338,8 @@ static void __init initialize_cache_info(void)
                                                          "d-cache-line-size",
                                                          NULL);
                         if (lsizep != NULL)
-                                lsize = *lsizep;
-                        if (sizep == 0 || lsizep == 0)
+                                lsize = be32_to_cpu(*lsizep);
+                        if (sizep == NULL || lsizep == NULL)
                                 DBG("Argh, can't find dcache properties ! "
                                     "sizep: %p, lsizep: %p\n", sizep, lsizep);
 
@@ -335,7 +352,7 @@ static void __init initialize_cache_info(void)
                         lsize = cur_cpu_spec->icache_bsize;
                         sizep = of_get_property(np, "i-cache-size", NULL);
                         if (sizep != NULL)
-                                size = *sizep;
+                                size = be32_to_cpu(*sizep);
                         lsizep = of_get_property(np, "i-cache-block-size",
                                                  NULL);
                         if (lsizep == NULL)
@@ -343,8 +360,8 @@ static void __init initialize_cache_info(void)
                                                          "i-cache-line-size",
                                                          NULL);
                         if (lsizep != NULL)
-                                lsize = *lsizep;
-                        if (sizep == 0 || lsizep == 0)
+                                lsize = be32_to_cpu(*lsizep);
+                        if (sizep == NULL || lsizep == NULL)
                                 DBG("Argh, can't find icache properties ! "
                                     "sizep: %p, lsizep: %p\n", sizep, lsizep);
 
@@ -609,8 +626,6 @@ void __init setup_arch(char **cmdline_p)
         /* Initialize the MMU context management stuff */
         mmu_context_init();
 
-        kvm_linear_init();
-
         /* Interrupt code needs to be 64K-aligned */
         if ((unsigned long)_stext & 0xffff)
                 panic("Kernelbase not 64K-aligned (0x%lx)!\n",
@@ -701,8 +716,7 @@ void __init setup_per_cpu_areas(void)
 #endif
 
 
-#ifdef CONFIG_PPC_INDIRECT_IO
+#if defined(CONFIG_PPC_INDIRECT_PIO) || defined(CONFIG_PPC_INDIRECT_MMIO)
 struct ppc_pci_io ppc_pci_io;
 EXPORT_SYMBOL(ppc_pci_io);
-#endif /* CONFIG_PPC_INDIRECT_IO */
-
+#endif
diff --git a/arch/powerpc/kernel/signal_32.c b/arch/powerpc/kernel/signal_32.c
index 0f83122e6676..bebdf1a1a540 100644
--- a/arch/powerpc/kernel/signal_32.c
+++ b/arch/powerpc/kernel/signal_32.c
@@ -436,7 +436,10 @@ static int save_user_regs(struct pt_regs *regs, struct mcontext __user *frame,
          * use altivec. Since VSCR only contains 32 bits saved in the least
          * significant bits of a vector, we "cheat" and stuff VRSAVE in the
          * most significant bits of that same vector. --BenH
+         * Note that the current VRSAVE value is in the SPR at this point.
          */
+        if (cpu_has_feature(CPU_FTR_ALTIVEC))
+                current->thread.vrsave = mfspr(SPRN_VRSAVE);
         if (__put_user(current->thread.vrsave, (u32 __user *)&frame->mc_vregs[32]))
                 return 1;
 #endif /* CONFIG_ALTIVEC */
@@ -557,6 +560,8 @@ static int save_tm_user_regs(struct pt_regs *regs,
          * significant bits of a vector, we "cheat" and stuff VRSAVE in the
          * most significant bits of that same vector. --BenH
          */
+        if (cpu_has_feature(CPU_FTR_ALTIVEC))
+                current->thread.vrsave = mfspr(SPRN_VRSAVE);
         if (__put_user(current->thread.vrsave,
                        (u32 __user *)&frame->mc_vregs[32]))
                 return 1;
@@ -696,6 +701,8 @@ static long restore_user_regs(struct pt_regs *regs,
         /* Always get VRSAVE back */
         if (__get_user(current->thread.vrsave, (u32 __user *)&sr->mc_vregs[32]))
                 return 1;
+        if (cpu_has_feature(CPU_FTR_ALTIVEC))
+                mtspr(SPRN_VRSAVE, current->thread.vrsave);
 #endif /* CONFIG_ALTIVEC */
         if (copy_fpr_from_user(current, &sr->mc_fregs))
                 return 1;
@@ -809,6 +816,8 @@ static long restore_tm_user_regs(struct pt_regs *regs,
             __get_user(current->thread.transact_vrsave,
                        (u32 __user *)&tm_sr->mc_vregs[32]))
                 return 1;
+        if (cpu_has_feature(CPU_FTR_ALTIVEC))
+                mtspr(SPRN_VRSAVE, current->thread.vrsave);
 #endif /* CONFIG_ALTIVEC */
 
         regs->msr &= ~(MSR_FP | MSR_FE0 | MSR_FE1);
diff --git a/arch/powerpc/kernel/signal_64.c b/arch/powerpc/kernel/signal_64.c
index 887e99d85bc2..f93ec2835a13 100644
--- a/arch/powerpc/kernel/signal_64.c
+++ b/arch/powerpc/kernel/signal_64.c
@@ -96,8 +96,6 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
         unsigned long msr = regs->msr;
         long err = 0;
 
-        flush_fp_to_thread(current);
-
 #ifdef CONFIG_ALTIVEC
         err |= __put_user(v_regs, &sc->v_regs);
 
@@ -114,6 +112,8 @@ static long setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs,
         /* We always copy to/from vrsave, it's 0 if we don't have or don't
          * use altivec.
          */
+        if (cpu_has_feature(CPU_FTR_ALTIVEC))
+                current->thread.vrsave = mfspr(SPRN_VRSAVE);
         err |= __put_user(current->thread.vrsave, (u32 __user *)&v_regs[33]);
 #else /* CONFIG_ALTIVEC */
         err |= __put_user(0, &sc->v_regs);
@@ -217,6 +217,8 @@ static long setup_tm_sigcontexts(struct sigcontext __user *sc,
         /* We always copy to/from vrsave, it's 0 if we don't have or don't
          * use altivec.
          */
+        if (cpu_has_feature(CPU_FTR_ALTIVEC))
+                current->thread.vrsave = mfspr(SPRN_VRSAVE);
         err |= __put_user(current->thread.vrsave, (u32 __user *)&v_regs[33]);
         if (msr & MSR_VEC)
                 err |= __put_user(current->thread.transact_vrsave,
@@ -346,16 +348,18 @@ static long restore_sigcontext(struct pt_regs *regs, sigset_t *set, int sig,
         if (v_regs && !access_ok(VERIFY_READ, v_regs, 34 * sizeof(vector128)))
                 return -EFAULT;
         /* Copy 33 vec registers (vr0..31 and vscr) from the stack */
-        if (v_regs != 0 && (msr & MSR_VEC) != 0)
+        if (v_regs != NULL && (msr & MSR_VEC) != 0)
                 err |= __copy_from_user(current->thread.vr, v_regs,
                                         33 * sizeof(vector128));
         else if (current->thread.used_vr)
                 memset(current->thread.vr, 0, 33 * sizeof(vector128));
         /* Always get VRSAVE back */
-        if (v_regs != 0)
+        if (v_regs != NULL)
                 err |= __get_user(current->thread.vrsave, (u32 __user *)&v_regs[33]);
         else
                 current->thread.vrsave = 0;
+        if (cpu_has_feature(CPU_FTR_ALTIVEC))
+                mtspr(SPRN_VRSAVE, current->thread.vrsave);
 #endif /* CONFIG_ALTIVEC */
         /* restore floating point */
         err |= copy_fpr_from_user(current, &sc->fp_regs);
@@ -463,7 +467,7 @@ static long restore_tm_sigcontexts(struct pt_regs *regs,
                                     tm_v_regs, 34 * sizeof(vector128)))
                 return -EFAULT;
         /* Copy 33 vec registers (vr0..31 and vscr) from the stack */
-        if (v_regs != 0 && tm_v_regs != 0 && (msr & MSR_VEC) != 0) {
+        if (v_regs != NULL && tm_v_regs != NULL && (msr & MSR_VEC) != 0) {
                 err |= __copy_from_user(current->thread.vr, v_regs,
                                         33 * sizeof(vector128));
                 err |= __copy_from_user(current->thread.transact_vr, tm_v_regs,
@@ -474,7 +478,7 @@ static long restore_tm_sigcontexts(struct pt_regs *regs,
                 memset(current->thread.transact_vr, 0, 33 * sizeof(vector128));
         }
         /* Always get VRSAVE back */
-        if (v_regs != 0 && tm_v_regs != 0) {
+        if (v_regs != NULL && tm_v_regs != NULL) {
                 err |= __get_user(current->thread.vrsave,
                                   (u32 __user *)&v_regs[33]);
                 err |= __get_user(current->thread.transact_vrsave,
@@ -484,6 +488,8 @@ static long restore_tm_sigcontexts(struct pt_regs *regs,
                 current->thread.vrsave = 0;
                 current->thread.transact_vrsave = 0;
         }
+        if (cpu_has_feature(CPU_FTR_ALTIVEC))
+                mtspr(SPRN_VRSAVE, current->thread.vrsave);
 #endif /* CONFIG_ALTIVEC */
         /* restore floating point */
         err |= copy_fpr_from_user(current, &sc->fp_regs);
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 38b0ba65a735..8e59abc237d7 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -81,6 +81,28 @@ int smt_enabled_at_boot = 1;
 
 static void (*crash_ipi_function_ptr)(struct pt_regs *) = NULL;
 
+/*
+ * Returns 1 if the specified cpu should be brought up during boot.
+ * Used to inhibit booting threads if they've been disabled or
+ * limited on the command line
+ */
+int smp_generic_cpu_bootable(unsigned int nr)
+{
+        /* Special case - we inhibit secondary thread startup
+         * during boot if the user requests it.
+         */
+        if (system_state == SYSTEM_BOOTING && cpu_has_feature(CPU_FTR_SMT)) {
+                if (!smt_enabled_at_boot && cpu_thread_in_core(nr) != 0)
+                        return 0;
+                if (smt_enabled_at_boot
+                    && cpu_thread_in_core(nr) >= smt_enabled_at_boot)
+                        return 0;
+        }
+
+        return 1;
+}
+
+
 #ifdef CONFIG_PPC64
 int smp_generic_kick_cpu(int nr)
 {
@@ -172,7 +194,7 @@ int smp_request_message_ipi(int virq, int msg)
 #endif
         err = request_irq(virq, smp_ipi_action[msg],
                           IRQF_PERCPU | IRQF_NO_THREAD | IRQF_NO_SUSPEND,
-                          smp_ipi_name[msg], 0);
+                          smp_ipi_name[msg], NULL);
         WARN(err < 0, "unable to request_irq %d for %s (rc %d)\n",
                 virq, smp_ipi_name[msg], err);
 
@@ -210,6 +232,12 @@ void smp_muxed_ipi_message_pass(int cpu, int msg)
         smp_ops->cause_ipi(cpu, info->data);
 }
 
+#ifdef __BIG_ENDIAN__
+#define IPI_MESSAGE(A) (1 << (24 - 8 * (A)))
+#else
+#define IPI_MESSAGE(A) (1 << (8 * (A)))
+#endif
+
 irqreturn_t smp_ipi_demux(void)
 {
         struct cpu_messages *info = &__get_cpu_var(ipi_message);
@@ -219,19 +247,14 @@ irqreturn_t smp_ipi_demux(void)
 
         do {
                 all = xchg(&info->messages, 0);
-
-#ifdef __BIG_ENDIAN
-                if (all & (1 << (24 - 8 * PPC_MSG_CALL_FUNCTION)))
+                if (all & IPI_MESSAGE(PPC_MSG_CALL_FUNCTION))
                         generic_smp_call_function_interrupt();
-                if (all & (1 << (24 - 8 * PPC_MSG_RESCHEDULE)))
+                if (all & IPI_MESSAGE(PPC_MSG_RESCHEDULE))
                         scheduler_ipi();
-                if (all & (1 << (24 - 8 * PPC_MSG_CALL_FUNC_SINGLE)))
+                if (all & IPI_MESSAGE(PPC_MSG_CALL_FUNC_SINGLE))
                         generic_smp_call_function_single_interrupt();
-                if (all & (1 << (24 - 8 * PPC_MSG_DEBUGGER_BREAK)))
+                if (all & IPI_MESSAGE(PPC_MSG_DEBUGGER_BREAK))
                         debug_ipi_action(0, NULL);
-#else
-#error Unsupported ENDIAN
-#endif
         } while (info->messages);
 
         return IRQ_HANDLED;
@@ -574,6 +597,22 @@ out:
         return id;
 }
 
+/* Return the value of the chip-id property corresponding
+ * to the given logical cpu.
+ */
+int cpu_to_chip_id(int cpu)
+{
+        struct device_node *np;
+
+        np = of_get_cpu_node(cpu, NULL);
+        if (!np)
+                return -1;
+
+        of_node_put(np);
+        return of_get_ibm_chip_id(np);
+}
+EXPORT_SYMBOL(cpu_to_chip_id);
+
 /* Helper routines for cpu to core mapping */
 int cpu_core_index_of_thread(int cpu)
 {
@@ -587,6 +626,33 @@ int cpu_first_thread_of_core(int core)
 }
 EXPORT_SYMBOL_GPL(cpu_first_thread_of_core);
 
+static void traverse_siblings_chip_id(int cpu, bool add, int chipid)
+{
+        const struct cpumask *mask;
+        struct device_node *np;
+        int i, plen;
+        const __be32 *prop;
+
+        mask = add ? cpu_online_mask : cpu_present_mask;
+        for_each_cpu(i, mask) {
+                np = of_get_cpu_node(i, NULL);
+                if (!np)
+                        continue;
+                prop = of_get_property(np, "ibm,chip-id", &plen);
+                if (prop && plen == sizeof(int) &&
+                    of_read_number(prop, 1) == chipid) {
+                        if (add) {
+                                cpumask_set_cpu(cpu, cpu_core_mask(i));
+                                cpumask_set_cpu(i, cpu_core_mask(cpu));
+                        } else {
+                                cpumask_clear_cpu(cpu, cpu_core_mask(i));
+                                cpumask_clear_cpu(i, cpu_core_mask(cpu));
+                        }
+                }
+                of_node_put(np);
+        }
+}
+
 /* Must be called when no change can occur to cpu_present_mask,
  * i.e. during cpu online or offline.
  */
@@ -609,11 +675,51 @@ static struct device_node *cpu_to_l2cache(int cpu)
         return cache;
 }
 
+static void traverse_core_siblings(int cpu, bool add)
+{
+        struct device_node *l2_cache, *np;
+        const struct cpumask *mask;
+        int i, chip, plen;
+        const __be32 *prop;
+
+        /* First see if we have ibm,chip-id properties in cpu nodes */
+        np = of_get_cpu_node(cpu, NULL);
+        if (np) {
+                chip = -1;
+                prop = of_get_property(np, "ibm,chip-id", &plen);
+                if (prop && plen == sizeof(int))
+                        chip = of_read_number(prop, 1);
+                of_node_put(np);
+                if (chip >= 0) {
+                        traverse_siblings_chip_id(cpu, add, chip);
+                        return;
+                }
+        }
+
+        l2_cache = cpu_to_l2cache(cpu);
+        mask = add ? cpu_online_mask : cpu_present_mask;
+        for_each_cpu(i, mask) {
+                np = cpu_to_l2cache(i);
+                if (!np)
+                        continue;
+                if (np == l2_cache) {
+                        if (add) {
+                                cpumask_set_cpu(cpu, cpu_core_mask(i));
+                                cpumask_set_cpu(i, cpu_core_mask(cpu));
+                        } else {
+                                cpumask_clear_cpu(cpu, cpu_core_mask(i));
+                                cpumask_clear_cpu(i, cpu_core_mask(cpu));
+                        }
+                }
+                of_node_put(np);
+        }
+        of_node_put(l2_cache);
+}
+
 /* Activate a secondary processor. */
 void start_secondary(void *unused)
 {
         unsigned int cpu = smp_processor_id();
-        struct device_node *l2_cache;
         int i, base;
 
         atomic_inc(&init_mm.mm_count);
@@ -652,18 +758,7 @@ void start_secondary(void *unused)
                 cpumask_set_cpu(cpu, cpu_core_mask(base + i));
                 cpumask_set_cpu(base + i, cpu_core_mask(cpu));
         }
-        l2_cache = cpu_to_l2cache(cpu);
-        for_each_online_cpu(i) {
-                struct device_node *np = cpu_to_l2cache(i);
-                if (!np)
-                        continue;
-                if (np == l2_cache) {
-                        cpumask_set_cpu(cpu, cpu_core_mask(i));
-                        cpumask_set_cpu(i, cpu_core_mask(cpu));
-                }
-                of_node_put(np);
-        }
-        of_node_put(l2_cache);
+        traverse_core_siblings(cpu, true);
 
         smp_wmb();
         notify_cpu_starting(cpu);
@@ -719,7 +814,6 @@ int arch_sd_sibling_asym_packing(void)
 #ifdef CONFIG_HOTPLUG_CPU
 int __cpu_disable(void)
 {
-        struct device_node *l2_cache;
         int cpu = smp_processor_id();
         int base, i;
         int err;
@@ -739,20 +833,7 @@ int __cpu_disable(void)
                 cpumask_clear_cpu(cpu, cpu_core_mask(base + i));
                 cpumask_clear_cpu(base + i, cpu_core_mask(cpu));
         }
-
-        l2_cache = cpu_to_l2cache(cpu);
-        for_each_present_cpu(i) {
-                struct device_node *np = cpu_to_l2cache(i);
-                if (!np)
-                        continue;
-                if (np == l2_cache) {
-                        cpumask_clear_cpu(cpu, cpu_core_mask(i));
-                        cpumask_clear_cpu(i, cpu_core_mask(cpu));
-                }
-                of_node_put(np);
-        }
-        of_node_put(l2_cache);
-
+        traverse_core_siblings(cpu, false);
 
         return 0;
 }
diff --git a/arch/powerpc/kernel/softemu8xx.c b/arch/powerpc/kernel/softemu8xx.c
deleted file mode 100644
index 29b2f81dd709..000000000000
--- a/arch/powerpc/kernel/softemu8xx.c
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
- * Software emulation of some PPC instructions for the 8xx core.
- *
- * Copyright (C) 1998 Dan Malek (dmalek@jlc.net)
- *
- * Software floating emuation for the MPC8xx processor.  I did this mostly
- * because it was easier than trying to get the libraries compiled for
- * software floating point.  The goal is still to get the libraries done,
- * but I lost patience and needed some hacks to at least get init and
- * shells running.  The first problem is the setjmp/longjmp that save
- * and restore the floating point registers.
- *
- * For this emulation, our working registers are found on the register
- * save area.
- */
-
-#include <linux/errno.h>
-#include <linux/sched.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/stddef.h>
-#include <linux/unistd.h>
-#include <linux/ptrace.h>
-#include <linux/user.h>
-#include <linux/interrupt.h>
-
-#include <asm/pgtable.h>
-#include <asm/uaccess.h>
-#include <asm/io.h>
-
-/* Eventually we may need a look-up table, but this works for now.
-*/
-#define LFS     48
-#define LFD     50
-#define LFDU    51
-#define STFD    54
-#define STFDU   55
-#define FMR     63
-
-void print_8xx_pte(struct mm_struct *mm, unsigned long addr)
-{
-        pgd_t *pgd;
-        pmd_t *pmd;
-        pte_t *pte;
-
-        printk(" pte @ 0x%8lx: ", addr);
-        pgd = pgd_offset(mm, addr & PAGE_MASK);
-        if (pgd) {
-                pmd = pmd_offset(pud_offset(pgd, addr & PAGE_MASK),
-                                 addr & PAGE_MASK);
-                if (pmd && pmd_present(*pmd)) {
-                        pte = pte_offset_kernel(pmd, addr & PAGE_MASK);
-                        if (pte) {
-                                printk(" (0x%08lx)->(0x%08lx)->0x%08lx\n",
-                                        (long)pgd, (long)pte, (long)pte_val(*pte));
-#define pp ((long)pte_val(*pte))
-                                printk(" RPN: %05lx PP: %lx SPS: %lx SH: %lx "
-                                       "CI: %lx v: %lx\n",
-                                       pp>>12,    /* rpn */
-                                       (pp>>10)&3, /* pp */
-                                       (pp>>3)&1, /* small */
-                                       (pp>>2)&1, /* shared */
-                                       (pp>>1)&1, /* cache inhibit */
-                                       pp&1       /* valid */
-                                       );
-#undef pp
-                        }
-                        else {
-                                printk("no pte\n");
-                        }
-                }
-                else {
-                        printk("no pmd\n");
-                }
-        }
-        else {
-                printk("no pgd\n");
-        }
-}
-
-int get_8xx_pte(struct mm_struct *mm, unsigned long addr)
-{
-        pgd_t *pgd;
-        pmd_t *pmd;
-        pte_t *pte;
-        int retval = 0;
-
-        pgd = pgd_offset(mm, addr & PAGE_MASK);
-        if (pgd) {
-                pmd = pmd_offset(pud_offset(pgd, addr & PAGE_MASK),
-                                 addr & PAGE_MASK);
-                if (pmd && pmd_present(*pmd)) {
-                        pte = pte_offset_kernel(pmd, addr & PAGE_MASK);
-                        if (pte) {
-                                retval = (int)pte_val(*pte);
-                        }
-                }
-        }
-        return retval;
-}
-
-/*
- * We return 0 on success, 1 on unimplemented instruction, and EFAULT
- * if a load/store faulted.
- */
-int Soft_emulate_8xx(struct pt_regs *regs)
-{
-        u32 inst, instword;
-        u32 flreg, idxreg, disp;
-        int retval;
-        s16 sdisp;
-        u32 *ea, *ip;
-
-        retval = 0;
-
-        instword = *((u32 *)regs->nip);
-        inst = instword >> 26;
-
-        flreg = (instword >> 21) & 0x1f;
-        idxreg = (instword >> 16) & 0x1f;
-        disp = instword & 0xffff;
-
-        ea = (u32 *)(regs->gpr[idxreg] + disp);
-        ip = (u32 *)&current->thread.TS_FPR(flreg);
-
-        switch ( inst )
-        {
-        case LFD:
-                /* this is a 16 bit quantity that is sign extended
-                 * so use a signed short here -- Cort
-                 */
-                sdisp = (instword & 0xffff);
-                ea = (u32 *)(regs->gpr[idxreg] + sdisp);
-                if (copy_from_user(ip, ea, sizeof(double)))
-                        retval = -EFAULT;
-                break;
-
-        case LFDU:
-                if (copy_from_user(ip, ea, sizeof(double)))
-                        retval = -EFAULT;
-                else
-                        regs->gpr[idxreg] = (u32)ea;
-                break;
-        case LFS:
-                sdisp = (instword & 0xffff);
-                ea = (u32 *)(regs->gpr[idxreg] + sdisp);
-                if (copy_from_user(ip, ea, sizeof(float)))
-                        retval = -EFAULT;
-                break;
-        case STFD:
-                /* this is a 16 bit quantity that is sign extended
-                 * so use a signed short here -- Cort
-                 */
-                sdisp = (instword & 0xffff);
-                ea = (u32 *)(regs->gpr[idxreg] + sdisp);
-                if (copy_to_user(ea, ip, sizeof(double)))
-                        retval = -EFAULT;
-                break;
-
-        case STFDU:
-                if (copy_to_user(ea, ip, sizeof(double)))
-                        retval = -EFAULT;
-                else
-                        regs->gpr[idxreg] = (u32)ea;
-                break;
-        case FMR:
-                /* assume this is a fp move -- Cort */
-                memcpy(ip, &current->thread.TS_FPR((instword>>11)&0x1f),
-                       sizeof(double));
-                break;
-        default:
-                retval = 1;
-                printk("Bad emulation %s/%d\n"
-                       " NIP: %08lx instruction: %08x opcode: %x "
-                       "A: %x B: %x C: %x code: %x rc: %x\n",
-                       current->comm,current->pid,
-                       regs->nip,
-                       instword,inst,
-                       (instword>>16)&0x1f,
-                       (instword>>11)&0x1f,
-                       (instword>>6)&0x1f,
-                       (instword>>1)&0x3ff,
-                       instword&1);
-                {
-                        int pa;
-                        print_8xx_pte(current->mm,regs->nip);
-                        pa = get_8xx_pte(current->mm,regs->nip) & PAGE_MASK;
-                        pa |= (regs->nip & ~PAGE_MASK);
-                        pa = (unsigned long)__va(pa);
-                        printk("Kernel VA for NIP %x ", pa);
-                        print_8xx_pte(current->mm,pa);
-                }
-        }
-
-        if (retval == 0)
-                regs->nip += 4;
-
-        return retval;
-}
diff --git a/arch/powerpc/kernel/swsusp_asm64.S b/arch/powerpc/kernel/swsusp_asm64.S
index 86ac1d90d02b..22045984835f 100644
--- a/arch/powerpc/kernel/swsusp_asm64.S
+++ b/arch/powerpc/kernel/swsusp_asm64.S
@@ -46,10 +46,19 @@
 #define SL_r29          0xe8
 #define SL_r30          0xf0
 #define SL_r31          0xf8
-#define SL_SIZE         SL_r31+8
+#define SL_SPRG1        0x100
+#define SL_TCR          0x108
+#define SL_SIZE         SL_TCR+8
 
 /* these macros rely on the save area being
  * pointed to by r11 */
+
+#define SAVE_SPR(register)              \
+        mfspr   r0, SPRN_##register     ;\
+        std     r0, SL_##register(r11)
+#define RESTORE_SPR(register)           \
+        ld      r0, SL_##register(r11)  ;\
+        mtspr   SPRN_##register, r0
 #define SAVE_SPECIAL(special)           \
         mf##special     r0              ;\
         std     r0, SL_##special(r11)
@@ -103,8 +112,15 @@ _GLOBAL(swsusp_arch_suspend)
         SAVE_REGISTER(r30)
         SAVE_REGISTER(r31)
         SAVE_SPECIAL(MSR)
-        SAVE_SPECIAL(SDR1)
         SAVE_SPECIAL(XER)
+#ifdef CONFIG_PPC_BOOK3S_64
+        SAVE_SPECIAL(SDR1)
+#else
+        SAVE_SPR(TCR)
+
+        /* Save SPRG1, SPRG1 be used save paca */
+        SAVE_SPR(SPRG1)
+#endif
 
         /* we push the stack up 128 bytes but don't store the
          * stack pointer on the stack like a real stackframe */
@@ -151,6 +167,7 @@ copy_page_loop:
         bne+    copyloop
 nothing_to_copy:
 
+#ifdef CONFIG_PPC_BOOK3S_64
         /* flush caches */
         lis     r3, 0x10
         mtctr   r3
@@ -167,6 +184,7 @@ nothing_to_copy:
         sync
 
         tlbia
+#endif
 
         ld      r11,swsusp_save_area_ptr@toc(r2)
 
@@ -208,16 +226,39 @@ nothing_to_copy:
         RESTORE_REGISTER(r29)
         RESTORE_REGISTER(r30)
         RESTORE_REGISTER(r31)
+
+#ifdef CONFIG_PPC_BOOK3S_64
         /* can't use RESTORE_SPECIAL(MSR) */
         ld      r0, SL_MSR(r11)
         mtmsrd  r0, 0
         RESTORE_SPECIAL(SDR1)
+#else
+        /* Restore SPRG1, be used to save paca */
+        ld      r0, SL_SPRG1(r11)
+        mtsprg  1, r0
+
+        RESTORE_SPECIAL(MSR)
+
+        /* Restore TCR and clear any pending bits in TSR. */
+        RESTORE_SPR(TCR)
+        lis     r0, (TSR_ENW | TSR_WIS | TSR_DIS | TSR_FIS)@h
+        mtspr   SPRN_TSR, r0
+
+        /* Kick decrementer */
+        li      r0, 1
+        mtdec   r0
+
+        /* Invalidate all tlbs */
+        bl      _tlbil_all
+#endif
         RESTORE_SPECIAL(XER)
 
         sync
 
         addi    r1,r1,-128
+#ifdef CONFIG_PPC_BOOK3S_64
         bl      slb_flush_and_rebolt
+#endif
         bl      do_after_copyback
         addi    r1,r1,128
 
diff --git a/arch/powerpc/kernel/swsusp_booke.S b/arch/powerpc/kernel/swsusp_booke.S
index 11a39307dd71..0f204053e5b5 100644
--- a/arch/powerpc/kernel/swsusp_booke.S
+++ b/arch/powerpc/kernel/swsusp_booke.S
@@ -141,6 +141,14 @@ _GLOBAL(swsusp_arch_resume)
         lis     r11,swsusp_save_area@h
         ori     r11,r11,swsusp_save_area@l
 
+        /*
+         * Mappings from virtual addresses to physical addresses may be
+         * different than they were prior to restoring hibernation state. 
+         * Invalidate the TLB so that the boot CPU is using the new
+         * mappings.
+         */
+        bl      _tlbil_all
+
         lwz     r4,SL_SPRG0(r11)
         mtsprg  0,r4
         lwz     r4,SL_SPRG1(r11)
diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c
index 65ab9e909377..192b051df97e 100644
--- a/arch/powerpc/kernel/time.c
+++ b/arch/powerpc/kernel/time.c
@@ -210,18 +210,18 @@ static u64 scan_dispatch_log(u64 stop_tb)
         if (!dtl)
                 return 0;
 
-        if (i == vpa->dtl_idx)
+        if (i == be64_to_cpu(vpa->dtl_idx))
                 return 0;
-        while (i < vpa->dtl_idx) {
+        while (i < be64_to_cpu(vpa->dtl_idx)) {
                 if (dtl_consumer)
                         dtl_consumer(dtl, i);
-                dtb = dtl->timebase;
-                tb_delta = dtl->enqueue_to_dispatch_time +
-                        dtl->ready_to_enqueue_time;
+                dtb = be64_to_cpu(dtl->timebase);
+                tb_delta = be32_to_cpu(dtl->enqueue_to_dispatch_time) +
+                        be32_to_cpu(dtl->ready_to_enqueue_time);
                 barrier();
-                if (i + N_DISPATCH_LOG < vpa->dtl_idx) {
+                if (i + N_DISPATCH_LOG < be64_to_cpu(vpa->dtl_idx)) {
                         /* buffer has overflowed */
-                        i = vpa->dtl_idx - N_DISPATCH_LOG;
+                        i = be64_to_cpu(vpa->dtl_idx) - N_DISPATCH_LOG;
                         dtl = local_paca->dispatch_log + (i % N_DISPATCH_LOG);
                         continue;
                 }
@@ -269,7 +269,7 @@ static inline u64 calculate_stolen_time(u64 stop_tb)
 {
         u64 stolen = 0;
 
-        if (get_paca()->dtl_ridx != get_paca()->lppaca_ptr->dtl_idx) {
+        if (get_paca()->dtl_ridx != be64_to_cpu(get_lppaca()->dtl_idx)) {
                 stolen = scan_dispatch_log(stop_tb);
                 get_paca()->system_time -= stolen;
         }
@@ -612,7 +612,7 @@ unsigned long long sched_clock(void)
 static int __init get_freq(char *name, int cells, unsigned long *val)
 {
         struct device_node *cpu;
-        const unsigned int *fp;
+        const __be32 *fp;
         int found = 0;
 
         /* The cpu node should have timebase and clock frequency properties */
@@ -1049,7 +1049,7 @@ static int __init rtc_init(void)
 
         pdev = platform_device_register_simple("rtc-generic", -1, NULL, 0);
 
-        return PTR_RET(pdev);
+        return PTR_ERR_OR_ZERO(pdev);
 }
 
 module_init(rtc_init);
diff --git a/arch/powerpc/kernel/tm.S b/arch/powerpc/kernel/tm.S
index 0554d1f6d70d..7b60b9851469 100644
--- a/arch/powerpc/kernel/tm.S
+++ b/arch/powerpc/kernel/tm.S
@@ -155,10 +155,10 @@ _GLOBAL(tm_reclaim)
         mfvscr  vr0
         li      r6, THREAD_TRANSACT_VSCR
         stvx    vr0, r3, r6
+dont_backup_vec:
         mfspr   r0, SPRN_VRSAVE
         std     r0, THREAD_TRANSACT_VRSAVE(r3)
 
-dont_backup_vec:
         andi.   r0, r4, MSR_FP
         beq     dont_backup_fp
 
@@ -341,11 +341,11 @@ _GLOBAL(tm_recheckpoint)
         lvx     vr0, r3, r5
         mtvscr  vr0
         REST_32VRS(0, r5, r3)                   /* r5 scratch, r3 THREAD ptr */
+dont_restore_vec:
         ld      r5, THREAD_VRSAVE(r3)
         mtspr   SPRN_VRSAVE, r5
 #endif
 
-dont_restore_vec:
         andi.   r0, r4, MSR_FP
         beq     dont_restore_fp
 
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
index e435bc089ea3..f783c932faeb 100644
--- a/arch/powerpc/kernel/traps.c
+++ b/arch/powerpc/kernel/traps.c
@@ -60,6 +60,7 @@
 #include <asm/switch_to.h>
 #include <asm/tm.h>
 #include <asm/debug.h>
+#include <sysdev/fsl_pci.h>
 
 #if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)
 int (*__debugger)(struct pt_regs *regs) __read_mostly;
@@ -565,6 +566,8 @@ int machine_check_e500(struct pt_regs *regs)
         if (reason & MCSR_BUS_RBERR) {
                 if (fsl_rio_mcheck_exception(regs))
                         return 1;
+                if (fsl_pci_mcheck_exception(regs))
+                        return 1;
         }
 
         printk("Machine check in kernel mode.\n");
@@ -962,7 +965,7 @@ static int emulate_instruction(struct pt_regs *regs)
         u32 instword;
         u32 rd;
 
-        if (!user_mode(regs) || (regs->msr & MSR_LE))
+        if (!user_mode(regs))
                 return -EINVAL;
         CHECK_FULL_REGS(regs);
 
@@ -1050,11 +1053,41 @@ int is_valid_bugaddr(unsigned long addr)
         return is_kernel_addr(addr);
 }
 
+#ifdef CONFIG_MATH_EMULATION
+static int emulate_math(struct pt_regs *regs)
+{
+        int ret;
+        extern int do_mathemu(struct pt_regs *regs);
+
+        ret = do_mathemu(regs);
+        if (ret >= 0)
+                PPC_WARN_EMULATED(math, regs);
+
+        switch (ret) {
+        case 0:
+                emulate_single_step(regs);
+                return 0;
+        case 1: {
+                        int code = 0;
+                        code = __parse_fpscr(current->thread.fpscr.val);
+                        _exception(SIGFPE, regs, code, regs->nip);
+                        return 0;
+                }
+        case -EFAULT:
+                _exception(SIGSEGV, regs, SEGV_MAPERR, regs->nip);
+                return 0;
+        }
+
+        return -1;
+}
+#else
+static inline int emulate_math(struct pt_regs *regs) { return -1; }
+#endif
+
 void __kprobes program_check_exception(struct pt_regs *regs)
 {
         enum ctx_state prev_state = exception_enter();
         unsigned int reason = get_reason(regs);
-        extern int do_mathemu(struct pt_regs *regs);
 
         /* We can now get here via a FP Unavailable exception if the core
          * has no FPU, in that case the reason flags will be 0 */
@@ -1116,11 +1149,20 @@ void __kprobes program_check_exception(struct pt_regs *regs)
         }
 #endif
 
+        /*
+         * If we took the program check in the kernel skip down to sending a
+         * SIGILL. The subsequent cases all relate to emulating instructions
+         * which we should only do for userspace. We also do not want to enable
+         * interrupts for kernel faults because that might lead to further
+         * faults, and loose the context of the original exception.
+         */
+        if (!user_mode(regs))
+                goto sigill;
+
         /* We restore the interrupt state now */
         if (!arch_irq_disabled_regs(regs))
                 local_irq_enable();
 
-#ifdef CONFIG_MATH_EMULATION
         /* (reason & REASON_ILLEGAL) would be the obvious thing here,
          * but there seems to be a hardware bug on the 405GP (RevD)
          * that means ESR is sometimes set incorrectly - either to
@@ -1129,31 +1171,8 @@ void __kprobes program_check_exception(struct pt_regs *regs)
          * instruction or only on FP instructions, whether there is a
          * pattern to occurrences etc. -dgibson 31/Mar/2003
          */
-
-        /*
-         * If we support a HW FPU, we need to ensure the FP state
-         * if flushed into the thread_struct before attempting
-         * emulation
-         */
-#ifdef CONFIG_PPC_FPU
-        flush_fp_to_thread(current);
-#endif
-        switch (do_mathemu(regs)) {
-        case 0:
-                emulate_single_step(regs);
-                goto bail;
-        case 1: {
-                        int code = 0;
-                        code = __parse_fpscr(current->thread.fpscr.val);
-                        _exception(SIGFPE, regs, code, regs->nip);
-                        goto bail;
-                }
-        case -EFAULT:
-                _exception(SIGSEGV, regs, SEGV_MAPERR, regs->nip);
+        if (!emulate_math(regs))
                 goto bail;
-        }
-        /* fall through on any other errors */
-#endif /* CONFIG_MATH_EMULATION */
 
         /* Try to emulate it if we should. */
         if (reason & (REASON_ILLEGAL | REASON_PRIVILEGED)) {
@@ -1168,6 +1187,7 @@ void __kprobes program_check_exception(struct pt_regs *regs)
                 }
         }
 
+sigill:
         if (reason & REASON_PRIVILEGED)
                 _exception(SIGILL, regs, ILL_PRVOPC, regs->nip);
         else
@@ -1322,13 +1342,10 @@ void facility_unavailable_exception(struct pt_regs *regs)
         if (status == FSCR_DSCR_LG) {
                 /* User is acessing the DSCR.  Set the inherit bit and allow
                  * the user to set it directly in future by setting via the
-                 * H/FSCR DSCR bit.
+                 * FSCR DSCR bit.  We always leave HFSCR DSCR set.
                  */
                 current->thread.dscr_inherit = 1;
-                if (hv)
-                        mtspr(SPRN_HFSCR, value | HFSCR_DSCR);
-                else
-                        mtspr(SPRN_FSCR,  value | FSCR_DSCR);
+                mtspr(SPRN_FSCR, value | FSCR_DSCR);
                 return;
         }
 
@@ -1444,11 +1461,6 @@ void performance_monitor_exception(struct pt_regs *regs)
 #ifdef CONFIG_8xx
 void SoftwareEmulation(struct pt_regs *regs)
 {
-        extern int do_mathemu(struct pt_regs *);
-#if defined(CONFIG_MATH_EMULATION)
-        int errcode;
-#endif
-
         CHECK_FULL_REGS(regs);
 
         if (!user_mode(regs)) {
@@ -1456,31 +1468,10 @@ void SoftwareEmulation(struct pt_regs *regs)
                 die("Kernel Mode Software FPU Emulation", regs, SIGFPE);
         }
 
-#ifdef CONFIG_MATH_EMULATION
-        errcode = do_mathemu(regs);
-        if (errcode >= 0)
-                PPC_WARN_EMULATED(math, regs);
-
-        switch (errcode) {
-        case 0:
-                emulate_single_step(regs);
+        if (!emulate_math(regs))
                 return;
-        case 1: {
-                        int code = 0;
-                        code = __parse_fpscr(current->thread.fpscr.val);
-                        _exception(SIGFPE, regs, code, regs->nip);
-                        return;
-                }
-        case -EFAULT:
-                _exception(SIGSEGV, regs, SEGV_MAPERR, regs->nip);
-                return;
-        default:
-                _exception(SIGILL, regs, ILL_ILLOPC, regs->nip);
-                return;
-        }
-#else
+
         _exception(SIGILL, regs, ILL_ILLOPC, regs->nip);
-#endif
 }
 #endif /* CONFIG_8xx */
 
diff --git a/arch/powerpc/kernel/udbg_16550.c b/arch/powerpc/kernel/udbg_16550.c
index 6837f839ab78..75702e207b29 100644
--- a/arch/powerpc/kernel/udbg_16550.c
+++ b/arch/powerpc/kernel/udbg_16550.c
@@ -18,23 +18,19 @@ extern void real_writeb(u8 data, volatile u8 __iomem *addr);
 extern u8 real_205_readb(volatile u8 __iomem  *addr);
 extern void real_205_writeb(u8 data, volatile u8 __iomem *addr);
 
-struct NS16550 {
-        /* this struct must be packed */
-        unsigned char rbr;  /* 0 */
-        unsigned char ier;  /* 1 */
-        unsigned char fcr;  /* 2 */
-        unsigned char lcr;  /* 3 */
-        unsigned char mcr;  /* 4 */
-        unsigned char lsr;  /* 5 */
-        unsigned char msr;  /* 6 */
-        unsigned char scr;  /* 7 */
-};
-
-#define thr rbr
-#define iir fcr
-#define dll rbr
-#define dlm ier
-#define dlab lcr
+#define UART_RBR        0
+#define UART_IER        1
+#define UART_FCR        2
+#define UART_LCR        3
+#define UART_MCR        4
+#define UART_LSR        5
+#define UART_MSR        6
+#define UART_SCR        7
+#define UART_THR        UART_RBR
+#define UART_IIR        UART_FCR
+#define UART_DLL        UART_RBR
+#define UART_DLM        UART_IER
+#define UART_DLAB       UART_LCR
 
 #define LSR_DR   0x01  /* Data ready */
 #define LSR_OE   0x02  /* Overrun */
@@ -47,52 +43,62 @@ struct NS16550 {
 
 #define LCR_DLAB 0x80
 
-static struct NS16550 __iomem *udbg_comport;
+static u8 (*udbg_uart_in)(unsigned int reg);
+static void (*udbg_uart_out)(unsigned int reg, u8 data);
 
-static void udbg_550_flush(void)
+static void udbg_uart_flush(void)
 {
-        if (udbg_comport) {
-                while ((in_8(&udbg_comport->lsr) & LSR_THRE) == 0)
-                        /* wait for idle */;
-        }
+        if (!udbg_uart_in)
+                return;
+
+        /* wait for idle */
+        while ((udbg_uart_in(UART_LSR) & LSR_THRE) == 0)
+                cpu_relax();
 }
 
-static void udbg_550_putc(char c)
+static void udbg_uart_putc(char c)
 {
-        if (udbg_comport) {
-                if (c == '\n')
-                        udbg_550_putc('\r');
-                udbg_550_flush();
-                out_8(&udbg_comport->thr, c);
-        }
+        if (!udbg_uart_out)
+                return;
+
+        if (c == '\n')
+                udbg_uart_putc('\r');
+        udbg_uart_flush();
+        udbg_uart_out(UART_THR, c);
 }
 
-static int udbg_550_getc_poll(void)
+static int udbg_uart_getc_poll(void)
 {
-        if (udbg_comport) {
-                if ((in_8(&udbg_comport->lsr) & LSR_DR) != 0)
-                        return in_8(&udbg_comport->rbr);
-                else
-                        return -1;
-        }
+        if (!udbg_uart_in || !(udbg_uart_in(UART_LSR) & LSR_DR))
+                return udbg_uart_in(UART_RBR);
         return -1;
 }
 
-static int udbg_550_getc(void)
+static int udbg_uart_getc(void)
 {
-        if (udbg_comport) {
-                while ((in_8(&udbg_comport->lsr) & LSR_DR) == 0)
-                        /* wait for char */;
-                return in_8(&udbg_comport->rbr);
-        }
-        return -1;
+        if (!udbg_uart_in)
+                return -1;
+        /* wait for char */
+        while (!(udbg_uart_in(UART_LSR) & LSR_DR))
+                cpu_relax();
+        return udbg_uart_in(UART_RBR);
+}
+
+static void udbg_use_uart(void)
+{
+        udbg_putc = udbg_uart_putc;
+        udbg_flush = udbg_uart_flush;
+        udbg_getc = udbg_uart_getc;
+        udbg_getc_poll = udbg_uart_getc_poll;
 }
 
-void udbg_init_uart(void __iomem *comport, unsigned int speed,
-                    unsigned int clock)
+void udbg_uart_setup(unsigned int speed, unsigned int clock)
 {
         unsigned int dll, base_bauds;
 
+        if (!udbg_uart_out)
+                return;
+
         if (clock == 0)
                 clock = 1843200;
         if (speed == 0)
@@ -101,51 +107,43 @@ void udbg_init_uart(void __iomem *comport, unsigned int speed,
         base_bauds = clock / 16;
         dll = base_bauds / speed;
 
-        if (comport) {
-                udbg_comport = (struct NS16550 __iomem *)comport;
-                out_8(&udbg_comport->lcr, 0x00);
-                out_8(&udbg_comport->ier, 0xff);
-                out_8(&udbg_comport->ier, 0x00);
-                out_8(&udbg_comport->lcr, LCR_DLAB);
-                out_8(&udbg_comport->dll, dll & 0xff);
-                out_8(&udbg_comport->dlm, dll >> 8);
-                /* 8 data, 1 stop, no parity */
-                out_8(&udbg_comport->lcr, 0x03);
-                /* RTS/DTR */
-                out_8(&udbg_comport->mcr, 0x03);
-                /* Clear & enable FIFOs */
-                out_8(&udbg_comport->fcr ,0x07);
-                udbg_putc = udbg_550_putc;
-                udbg_flush = udbg_550_flush;
-                udbg_getc = udbg_550_getc;
-                udbg_getc_poll = udbg_550_getc_poll;
-        }
+        udbg_uart_out(UART_LCR, 0x00);
+        udbg_uart_out(UART_IER, 0xff);
+        udbg_uart_out(UART_IER, 0x00);
+        udbg_uart_out(UART_LCR, LCR_DLAB);
+        udbg_uart_out(UART_DLL, dll & 0xff);
+        udbg_uart_out(UART_DLM, dll >> 8);
+        /* 8 data, 1 stop, no parity */
+        udbg_uart_out(UART_LCR, 0x3);
+        /* RTS/DTR */
+        udbg_uart_out(UART_MCR, 0x3);
+        /* Clear & enable FIFOs */
+        udbg_uart_out(UART_FCR, 0x7);
 }
 
-unsigned int udbg_probe_uart_speed(void __iomem *comport, unsigned int clock)
+unsigned int udbg_probe_uart_speed(unsigned int clock)
 {
         unsigned int dll, dlm, divisor, prescaler, speed;
         u8 old_lcr;
-        struct NS16550 __iomem *port = comport;
 
-        old_lcr = in_8(&port->lcr);
+        old_lcr = udbg_uart_in(UART_LCR);
 
         /* select divisor latch registers.  */
-        out_8(&port->lcr, LCR_DLAB);
+        udbg_uart_out(UART_LCR, old_lcr | LCR_DLAB);
 
         /* now, read the divisor */
-        dll = in_8(&port->dll);
-        dlm = in_8(&port->dlm);
+        dll = udbg_uart_in(UART_DLL);
+        dlm = udbg_uart_in(UART_DLM);
         divisor = dlm << 8 | dll;
 
         /* check prescaling */
-        if (in_8(&port->mcr) & 0x80)
+        if (udbg_uart_in(UART_MCR) & 0x80)
                 prescaler = 4;
         else
                 prescaler = 1;
 
         /* restore the LCR */
-        out_8(&port->lcr, old_lcr);
+        udbg_uart_out(UART_LCR, old_lcr);
 
         /* calculate speed */
         speed = (clock / prescaler) / (divisor * 16);
@@ -157,195 +155,155 @@ unsigned int udbg_probe_uart_speed(void __iomem *comport, unsigned int clock)
         return speed;
 }
 
-#ifdef CONFIG_PPC_MAPLE
-void udbg_maple_real_flush(void)
+static union {
+        unsigned char __iomem *mmio_base;
+        unsigned long pio_base;
+} udbg_uart;
+
+static unsigned int udbg_uart_stride = 1;
+
+static u8 udbg_uart_in_pio(unsigned int reg)
 {
-        if (udbg_comport) {
-                while ((real_readb(&udbg_comport->lsr) & LSR_THRE) == 0)
-                        /* wait for idle */;
-        }
+        return inb(udbg_uart.pio_base + (reg * udbg_uart_stride));
 }
 
-void udbg_maple_real_putc(char c)
+static void udbg_uart_out_pio(unsigned int reg, u8 data)
 {
-        if (udbg_comport) {
-                if (c == '\n')
-                        udbg_maple_real_putc('\r');
-                udbg_maple_real_flush();
-                real_writeb(c, &udbg_comport->thr); eieio();
-        }
+        outb(data, udbg_uart.pio_base + (reg * udbg_uart_stride));
 }
 
-void __init udbg_init_maple_realmode(void)
+void udbg_uart_init_pio(unsigned long port, unsigned int stride)
 {
-        udbg_comport = (struct NS16550 __iomem *)0xf40003f8;
-
-        udbg_putc = udbg_maple_real_putc;
-        udbg_flush = udbg_maple_real_flush;
-        udbg_getc = NULL;
-        udbg_getc_poll = NULL;
+        if (!port)
+                return;
+        udbg_uart.pio_base = port;
+        udbg_uart_stride = stride;
+        udbg_uart_in = udbg_uart_in_pio;
+        udbg_uart_out = udbg_uart_out_pio;
+        udbg_use_uart();
 }
-#endif /* CONFIG_PPC_MAPLE */
 
-#ifdef CONFIG_PPC_PASEMI
-void udbg_pas_real_flush(void)
+static u8 udbg_uart_in_mmio(unsigned int reg)
 {
-        if (udbg_comport) {
-                while ((real_205_readb(&udbg_comport->lsr) & LSR_THRE) == 0)
-                        /* wait for idle */;
-        }
+        return in_8(udbg_uart.mmio_base + (reg * udbg_uart_stride));
 }
 
-void udbg_pas_real_putc(char c)
+static void udbg_uart_out_mmio(unsigned int reg, u8 data)
 {
-        if (udbg_comport) {
-                if (c == '\n')
-                        udbg_pas_real_putc('\r');
-                udbg_pas_real_flush();
-                real_205_writeb(c, &udbg_comport->thr); eieio();
-        }
+        out_8(udbg_uart.mmio_base + (reg * udbg_uart_stride), data);
 }
 
-void udbg_init_pas_realmode(void)
-{
-        udbg_comport = (struct NS16550 __iomem *)0xfcff03f8UL;
 
-        udbg_putc = udbg_pas_real_putc;
-        udbg_flush = udbg_pas_real_flush;
-        udbg_getc = NULL;
-        udbg_getc_poll = NULL;
+void udbg_uart_init_mmio(void __iomem *addr, unsigned int stride)
+{
+        if (!addr)
+                return;
+        udbg_uart.mmio_base = addr;
+        udbg_uart_stride = stride;
+        udbg_uart_in = udbg_uart_in_mmio;
+        udbg_uart_out = udbg_uart_out_mmio;
+        udbg_use_uart();
 }
-#endif /* CONFIG_PPC_MAPLE */
 
-#ifdef CONFIG_PPC_EARLY_DEBUG_44x
-#include <platforms/44x/44x.h>
+#ifdef CONFIG_PPC_MAPLE
+
+#define UDBG_UART_MAPLE_ADDR    ((void __iomem *)0xf40003f8)
 
-static void udbg_44x_as1_flush(void)
+static u8 udbg_uart_in_maple(unsigned int reg)
 {
-        if (udbg_comport) {
-                while ((as1_readb(&udbg_comport->lsr) & LSR_THRE) == 0)
-                        /* wait for idle */;
-        }
+        return real_readb(UDBG_UART_MAPLE_ADDR + reg);
 }
 
-static void udbg_44x_as1_putc(char c)
+static void udbg_uart_out_maple(unsigned int reg, u8 val)
 {
-        if (udbg_comport) {
-                if (c == '\n')
-                        udbg_44x_as1_putc('\r');
-                udbg_44x_as1_flush();
-                as1_writeb(c, &udbg_comport->thr); eieio();
-        }
+        real_writeb(val, UDBG_UART_MAPLE_ADDR + reg);
 }
 
-static int udbg_44x_as1_getc(void)
+void __init udbg_init_maple_realmode(void)
 {
-        if (udbg_comport) {
-                while ((as1_readb(&udbg_comport->lsr) & LSR_DR) == 0)
-                        ; /* wait for char */
-                return as1_readb(&udbg_comport->rbr);
-        }
-        return -1;
+        udbg_uart_in = udbg_uart_in_maple;
+        udbg_uart_out = udbg_uart_out_maple;
+        udbg_use_uart();
 }
 
-void __init udbg_init_44x_as1(void)
-{
-        udbg_comport =
-                (struct NS16550 __iomem *)PPC44x_EARLY_DEBUG_VIRTADDR;
+#endif /* CONFIG_PPC_MAPLE */
 
-        udbg_putc = udbg_44x_as1_putc;
-        udbg_flush = udbg_44x_as1_flush;
-        udbg_getc = udbg_44x_as1_getc;
-}
-#endif /* CONFIG_PPC_EARLY_DEBUG_44x */
+#ifdef CONFIG_PPC_PASEMI
 
-#ifdef CONFIG_PPC_EARLY_DEBUG_40x
-static void udbg_40x_real_flush(void)
+#define UDBG_UART_PAS_ADDR      ((void __iomem *)0xfcff03f8UL)
+
+static u8 udbg_uart_in_pas(unsigned int reg)
 {
-        if (udbg_comport) {
-                while ((real_readb(&udbg_comport->lsr) & LSR_THRE) == 0)
-                        /* wait for idle */;
-        }
+        return real_205_readb(UDBG_UART_PAS_ADDR + reg);
 }
 
-static void udbg_40x_real_putc(char c)
+static void udbg_uart_out_pas(unsigned int reg, u8 val)
 {
-        if (udbg_comport) {
-                if (c == '\n')
-                        udbg_40x_real_putc('\r');
-                udbg_40x_real_flush();
-                real_writeb(c, &udbg_comport->thr); eieio();
-        }
+        real_205_writeb(val, UDBG_UART_PAS_ADDR + reg);
 }
 
-static int udbg_40x_real_getc(void)
+void __init udbg_init_pas_realmode(void)
 {
-        if (udbg_comport) {
-                while ((real_readb(&udbg_comport->lsr) & LSR_DR) == 0)
-                        ; /* wait for char */
-                return real_readb(&udbg_comport->rbr);
-        }
-        return -1;
+        udbg_uart_in = udbg_uart_in_pas;
+        udbg_uart_out = udbg_uart_out_pas;
+        udbg_use_uart();
 }
 
-void __init udbg_init_40x_realmode(void)
-{
-        udbg_comport = (struct NS16550 __iomem *)
-                CONFIG_PPC_EARLY_DEBUG_40x_PHYSADDR;
+#endif /* CONFIG_PPC_PASEMI */
+
+#ifdef CONFIG_PPC_EARLY_DEBUG_44x
 
-        udbg_putc = udbg_40x_real_putc;
-        udbg_flush = udbg_40x_real_flush;
-        udbg_getc = udbg_40x_real_getc;
-        udbg_getc_poll = NULL;
+#include <platforms/44x/44x.h>
+
+static u8 udbg_uart_in_44x_as1(unsigned int reg)
+{
+        return as1_readb((void __iomem *)PPC44x_EARLY_DEBUG_VIRTADDR + reg);
 }
-#endif /* CONFIG_PPC_EARLY_DEBUG_40x */
 
-#ifdef CONFIG_PPC_EARLY_DEBUG_WSP
-static void udbg_wsp_flush(void)
+static void udbg_uart_out_44x_as1(unsigned int reg, u8 val)
 {
-        if (udbg_comport) {
-                while ((readb(&udbg_comport->lsr) & LSR_THRE) == 0)
-                        /* wait for idle */;
-        }
+        as1_writeb(val, (void __iomem *)PPC44x_EARLY_DEBUG_VIRTADDR + reg);
 }
 
-static void udbg_wsp_putc(char c)
+void __init udbg_init_44x_as1(void)
 {
-        if (udbg_comport) {
-                if (c == '\n')
-                        udbg_wsp_putc('\r');
-                udbg_wsp_flush();
-                writeb(c, &udbg_comport->thr); eieio();
-        }
+        udbg_uart_in = udbg_uart_in_44x_as1;
+        udbg_uart_out = udbg_uart_out_44x_as1;
+        udbg_use_uart();
 }
 
-static int udbg_wsp_getc(void)
+#endif /* CONFIG_PPC_EARLY_DEBUG_44x */
+
+#ifdef CONFIG_PPC_EARLY_DEBUG_40x
+
+static u8 udbg_uart_in_40x(unsigned int reg)
 {
-        if (udbg_comport) {
-                while ((readb(&udbg_comport->lsr) & LSR_DR) == 0)
-                        ; /* wait for char */
-                return readb(&udbg_comport->rbr);
-        }
-        return -1;
+        return real_readb((void __iomem *)CONFIG_PPC_EARLY_DEBUG_40x_PHYSADDR
+                          + reg);
 }
 
-static int udbg_wsp_getc_poll(void)
+static void udbg_uart_out_40x(unsigned int reg, u8 val)
 {
-        if (udbg_comport)
-                if (readb(&udbg_comport->lsr) & LSR_DR)
-                        return readb(&udbg_comport->rbr);
-        return -1;
+        real_writeb(val, (void __iomem *)CONFIG_PPC_EARLY_DEBUG_40x_PHYSADDR
+                    + reg);
 }
 
-void __init udbg_init_wsp(void)
+void __init udbg_init_40x_realmode(void)
 {
-        udbg_comport = (struct NS16550 __iomem *)WSP_UART_VIRT;
+        udbg_uart_in = udbg_uart_in_40x;
+        udbg_uart_out = udbg_uart_out_40x;
+        udbg_use_uart();
+}
 
-        udbg_init_uart(udbg_comport, 57600, 50000000);
+#endif /* CONFIG_PPC_EARLY_DEBUG_40x */
+
+
+#ifdef CONFIG_PPC_EARLY_DEBUG_WSP
 
-        udbg_putc = udbg_wsp_putc;
-        udbg_flush = udbg_wsp_flush;
-        udbg_getc = udbg_wsp_getc;
-        udbg_getc_poll = udbg_wsp_getc_poll;
+void __init udbg_init_wsp(void)
+{
+        udbg_uart_init_mmio((void *)WSP_UART_VIRT, 1);
+        udbg_uart_setup(57600, 50000000);
 }
+
 #endif /* CONFIG_PPC_EARLY_DEBUG_WSP */
diff --git a/arch/powerpc/kernel/vdso32/gettimeofday.S b/arch/powerpc/kernel/vdso32/gettimeofday.S
index 27e2f623210b..6b1f2a6d5517 100644
--- a/arch/powerpc/kernel/vdso32/gettimeofday.S
+++ b/arch/powerpc/kernel/vdso32/gettimeofday.S
@@ -232,9 +232,9 @@ __do_get_tspec:
         lwz     r6,(CFG_TB_ORIG_STAMP+4)(r9)
 
         /* Get a stable TB value */
-2:      mftbu   r3
-        mftbl   r4
-        mftbu   r0
+2:      mfspr   r3, SPRN_TBRU
+        mfspr   r4, SPRN_TBRL
+        mfspr   r0, SPRN_TBRU
         cmplw   cr0,r3,r0
         bne-    2b
 
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c
index 536016d792ba..78a350670de3 100644
--- a/arch/powerpc/kernel/vio.c
+++ b/arch/powerpc/kernel/vio.c
@@ -1153,7 +1153,7 @@ EXPORT_SYMBOL(vio_h_cop_sync);
 
 static struct iommu_table *vio_build_iommu_table(struct vio_dev *dev)
 {
-        const unsigned char *dma_window;
+        const __be32 *dma_window;
         struct iommu_table *tbl;
         unsigned long offset, size;
 
@@ -1312,8 +1312,7 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
 {
         struct vio_dev *viodev;
         struct device_node *parent_node;
-        const unsigned int *unit_address;
-        const unsigned int *pfo_resid = NULL;
+        const __be32 *prop;
         enum vio_dev_family family;
         const char *of_node_name = of_node->name ? of_node->name : "<unknown>";
 
@@ -1360,6 +1359,8 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
         /* we need the 'device_type' property, in order to match with drivers */
         viodev->family = family;
         if (viodev->family == VDEVICE) {
+                unsigned int unit_address;
+
                 if (of_node->type != NULL)
                         viodev->type = of_node->type;
                 else {
@@ -1368,24 +1369,24 @@ struct vio_dev *vio_register_device_node(struct device_node *of_node)
                         goto out;
                 }
 
-                unit_address = of_get_property(of_node, "reg", NULL);
-                if (unit_address == NULL) {
+                prop = of_get_property(of_node, "reg", NULL);
+                if (prop == NULL) {
                         pr_warn("%s: node %s missing 'reg'\n",
                                         __func__, of_node_name);
                         goto out;
                 }
-                dev_set_name(&viodev->dev, "%x", *unit_address);
+                unit_address = of_read_number(prop, 1);
+                dev_set_name(&viodev->dev, "%x", unit_address);
                 viodev->irq = irq_of_parse_and_map(of_node, 0);
-                viodev->unit_address = *unit_address;
+                viodev->unit_address = unit_address;
         } else {
                 /* PFO devices need their resource_id for submitting COP_OPs
                  * This is an optional field for devices, but is required when
                  * performing synchronous ops */
-                pfo_resid = of_get_property(of_node, "ibm,resource-id", NULL);
-                if (pfo_resid != NULL)
-                        viodev->resource_id = *pfo_resid;
+                prop = of_get_property(of_node, "ibm,resource-id", NULL);
+                if (prop != NULL)
+                        viodev->resource_id = of_read_number(prop, 1);
 
-                unit_address = NULL;
                 dev_set_name(&viodev->dev, "%s", of_node_name);
                 viodev->type = of_node_name;
                 viodev->irq = 0;
@@ -1622,7 +1623,6 @@ static struct vio_dev *vio_find_name(const char *name)
  */
 struct vio_dev *vio_find_node(struct device_node *vnode)
 {
-        const uint32_t *unit_address;
         char kobj_name[20];
         struct device_node *vnode_parent;
         const char *dev_type;
@@ -1638,10 +1638,13 @@ struct vio_dev *vio_find_node(struct device_node *vnode)
 
         /* construct the kobject name from the device node */
         if (!strcmp(dev_type, "vdevice")) {
-                unit_address = of_get_property(vnode, "reg", NULL);
-                if (!unit_address)
+                const __be32 *prop;
+                
+                prop = of_get_property(vnode, "reg", NULL);
+                if (!prop)
                         return NULL;
-                snprintf(kobj_name, sizeof(kobj_name), "%x", *unit_address);
+                snprintf(kobj_name, sizeof(kobj_name), "%x",
+                         (uint32_t)of_read_number(prop, 1));
         } else if (!strcmp(dev_type, "ibm,platform-facilities"))
                 snprintf(kobj_name, sizeof(kobj_name), "%s", vnode->name);
         else
diff --git a/arch/powerpc/kvm/Kconfig b/arch/powerpc/kvm/Kconfig
index eb643f862579..ffaef2cb101a 100644
--- a/arch/powerpc/kvm/Kconfig
+++ b/arch/powerpc/kvm/Kconfig
@@ -72,6 +72,7 @@ config KVM_BOOK3S_64_HV
         bool "KVM support for POWER7 and PPC970 using hypervisor mode in host"
         depends on KVM_BOOK3S_64
         select MMU_NOTIFIER
+        select CMA
         ---help---
           Support running unmodified book3s_64 guest kernels in
           virtual machines on POWER7 and PPC970 processors that have
diff --git a/arch/powerpc/kvm/Makefile b/arch/powerpc/kvm/Makefile
index 008cd856c5b5..6646c952c5e3 100644
--- a/arch/powerpc/kvm/Makefile
+++ b/arch/powerpc/kvm/Makefile
@@ -81,6 +81,7 @@ kvm-book3s_64-builtin-objs-$(CONFIG_KVM_BOOK3S_64_HV) := \
         book3s_64_vio_hv.o \
         book3s_hv_ras.o \
         book3s_hv_builtin.o \
+        book3s_hv_cma.o \
         $(kvm-book3s_64-builtin-xics-objs-y)
 
 kvm-book3s_64-objs-$(CONFIG_KVM_XICS) += \
diff --git a/arch/powerpc/kvm/book3s_64_mmu.c b/arch/powerpc/kvm/book3s_64_mmu.c
index 739bfbadb85e..7e345e00661a 100644
--- a/arch/powerpc/kvm/book3s_64_mmu.c
+++ b/arch/powerpc/kvm/book3s_64_mmu.c
@@ -182,10 +182,13 @@ static int kvmppc_mmu_book3s_64_xlate(struct kvm_vcpu *vcpu, gva_t eaddr,
         hva_t ptegp;
         u64 pteg[16];
         u64 avpn = 0;
+        u64 v, r;
+        u64 v_val, v_mask;
+        u64 eaddr_mask;
         int i;
-        u8 key = 0;
+        u8 pp, key = 0;
         bool found = false;
-        int second = 0;
+        bool second = false;
         ulong mp_ea = vcpu->arch.magic_page_ea;
 
         /* Magic page override */
@@ -208,8 +211,16 @@ static int kvmppc_mmu_book3s_64_xlate(struct kvm_vcpu *vcpu, gva_t eaddr,
                 goto no_seg_found;
 
         avpn = kvmppc_mmu_book3s_64_get_avpn(slbe, eaddr);
+        v_val = avpn & HPTE_V_AVPN;
+
         if (slbe->tb)
-                avpn |= SLB_VSID_B_1T;
+                v_val |= SLB_VSID_B_1T;
+        if (slbe->large)
+                v_val |= HPTE_V_LARGE;
+        v_val |= HPTE_V_VALID;
+
+        v_mask = SLB_VSID_B | HPTE_V_AVPN | HPTE_V_LARGE | HPTE_V_VALID |
+                HPTE_V_SECONDARY;
 
 do_second:
         ptegp = kvmppc_mmu_book3s_64_get_pteg(vcpu_book3s, slbe, eaddr, second);
@@ -227,91 +238,74 @@ do_second:
                 key = 4;
 
         for (i=0; i<16; i+=2) {
-                u64 v = pteg[i];
-                u64 r = pteg[i+1];
-
-                /* Valid check */
-                if (!(v & HPTE_V_VALID))
-                        continue;
-                /* Hash check */
-                if ((v & HPTE_V_SECONDARY) != second)
-                        continue;
-
-                /* AVPN compare */
-                if (HPTE_V_COMPARE(avpn, v)) {
-                        u8 pp = (r & HPTE_R_PP) | key;
-                        int eaddr_mask = 0xFFF;
-
-                        gpte->eaddr = eaddr;
-                        gpte->vpage = kvmppc_mmu_book3s_64_ea_to_vp(vcpu,
-                                                                    eaddr,
-                                                                    data);
-                        if (slbe->large)
-                                eaddr_mask = 0xFFFFFF;
-                        gpte->raddr = (r & HPTE_R_RPN) | (eaddr & eaddr_mask);
-                        gpte->may_execute = ((r & HPTE_R_N) ? false : true);
-                        gpte->may_read = false;
-                        gpte->may_write = false;
-
-                        switch (pp) {
-                        case 0:
-                        case 1:
-                        case 2:
-                        case 6:
-                                gpte->may_write = true;
-                                /* fall through */
-                        case 3:
-                        case 5:
-                        case 7:
-                                gpte->may_read = true;
-                                break;
-                        }
-
-                        dprintk("KVM MMU: Translated 0x%lx [0x%llx] -> 0x%llx "
-                                "-> 0x%lx\n",
-                                eaddr, avpn, gpte->vpage, gpte->raddr);
+                /* Check all relevant fields of 1st dword */
+                if ((pteg[i] & v_mask) == v_val) {
                         found = true;
                         break;
                 }
         }
 
-        /* Update PTE R and C bits, so the guest's swapper knows we used the
-         * page */
-        if (found) {
-                u32 oldr = pteg[i+1];
+        if (!found) {
+                if (second)
+                        goto no_page_found;
+                v_val |= HPTE_V_SECONDARY;
+                second = true;
+                goto do_second;
+        }
 
-                if (gpte->may_read) {
-                        /* Set the accessed flag */
-                        pteg[i+1] |= HPTE_R_R;
-                }
-                if (gpte->may_write) {
-                        /* Set the dirty flag */
-                        pteg[i+1] |= HPTE_R_C;
-                } else {
-                        dprintk("KVM: Mapping read-only page!\n");
-                }
+        v = pteg[i];
+        r = pteg[i+1];
+        pp = (r & HPTE_R_PP) | key;
+        eaddr_mask = 0xFFF;
+
+        gpte->eaddr = eaddr;
+        gpte->vpage = kvmppc_mmu_book3s_64_ea_to_vp(vcpu, eaddr, data);
+        if (slbe->large)
+                eaddr_mask = 0xFFFFFF;
+        gpte->raddr = (r & HPTE_R_RPN & ~eaddr_mask) | (eaddr & eaddr_mask);
+        gpte->may_execute = ((r & HPTE_R_N) ? false : true);
+        gpte->may_read = false;
+        gpte->may_write = false;
+
+        switch (pp) {
+        case 0:
+        case 1:
+        case 2:
+        case 6:
+                gpte->may_write = true;
+                /* fall through */
+        case 3:
+        case 5:
+        case 7:
+                gpte->may_read = true;
+                break;
+        }
 
-                /* Write back into the PTEG */
-                if (pteg[i+1] != oldr)
-                        copy_to_user((void __user *)ptegp, pteg, sizeof(pteg));
+        dprintk("KVM MMU: Translated 0x%lx [0x%llx] -> 0x%llx "
+                "-> 0x%lx\n",
+                eaddr, avpn, gpte->vpage, gpte->raddr);
 
-                if (!gpte->may_read)
-                        return -EPERM;
-                return 0;
-        } else {
-                dprintk("KVM MMU: No PTE found (ea=0x%lx sdr1=0x%llx "
-                        "ptegp=0x%lx)\n",
-                        eaddr, to_book3s(vcpu)->sdr1, ptegp);
-                for (i = 0; i < 16; i += 2)
-                        dprintk("   %02d: 0x%llx - 0x%llx (0x%llx)\n",
-                                i, pteg[i], pteg[i+1], avpn);
-
-                if (!second) {
-                        second = HPTE_V_SECONDARY;
-                        goto do_second;
-                }
+        /* Update PTE R and C bits, so the guest's swapper knows we used the
+         * page */
+        if (gpte->may_read) {
+                /* Set the accessed flag */
+                r |= HPTE_R_R;
+        }
+        if (data && gpte->may_write) {
+                /* Set the dirty flag -- XXX even if not writing */
+                r |= HPTE_R_C;
+        }
+
+        /* Write back into the PTEG */
+        if (pteg[i+1] != r) {
+                pteg[i+1] = r;
+                copy_to_user((void __user *)ptegp, pteg, sizeof(pteg));
         }
 
+        if (!gpte->may_read)
+                return -EPERM;
+        return 0;
+
 no_page_found:
         return -ENOENT;
 
diff --git a/arch/powerpc/kvm/book3s_64_mmu_hv.c b/arch/powerpc/kvm/book3s_64_mmu_hv.c
index 710d31317d81..043eec8461e7 100644
--- a/arch/powerpc/kvm/book3s_64_mmu_hv.c
+++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c
@@ -37,6 +37,8 @@
 #include <asm/ppc-opcode.h>
 #include <asm/cputable.h>
 
+#include "book3s_hv_cma.h"
+
 /* POWER7 has 10-bit LPIDs, PPC970 has 6-bit LPIDs */
 #define MAX_LPID_970    63
 
@@ -52,8 +54,8 @@ long kvmppc_alloc_hpt(struct kvm *kvm, u32 *htab_orderp)
 {
         unsigned long hpt;
         struct revmap_entry *rev;
-        struct kvmppc_linear_info *li;
-        long order = kvm_hpt_order;
+        struct page *page = NULL;
+        long order = KVM_DEFAULT_HPT_ORDER;
 
         if (htab_orderp) {
                 order = *htab_orderp;
@@ -61,26 +63,23 @@ long kvmppc_alloc_hpt(struct kvm *kvm, u32 *htab_orderp)
                         order = PPC_MIN_HPT_ORDER;
         }
 
+        kvm->arch.hpt_cma_alloc = 0;
         /*
-         * If the user wants a different size from default,
          * try first to allocate it from the kernel page allocator.
+         * We keep the CMA reserved for failed allocation.
          */
-        hpt = 0;
-        if (order != kvm_hpt_order) {
-                hpt = __get_free_pages(GFP_KERNEL|__GFP_ZERO|__GFP_REPEAT|
-                                       __GFP_NOWARN, order - PAGE_SHIFT);
-                if (!hpt)
-                        --order;
-        }
+        hpt = __get_free_pages(GFP_KERNEL | __GFP_ZERO | __GFP_REPEAT |
+                               __GFP_NOWARN, order - PAGE_SHIFT);
 
         /* Next try to allocate from the preallocated pool */
         if (!hpt) {
-                li = kvm_alloc_hpt();
-                if (li) {
-                        hpt = (ulong)li->base_virt;
-                        kvm->arch.hpt_li = li;
-                        order = kvm_hpt_order;
-                }
+                VM_BUG_ON(order < KVM_CMA_CHUNK_ORDER);
+                page = kvm_alloc_hpt(1 << (order - PAGE_SHIFT));
+                if (page) {
+                        hpt = (unsigned long)pfn_to_kaddr(page_to_pfn(page));
+                        kvm->arch.hpt_cma_alloc = 1;
+                } else
+                        --order;
         }
 
         /* Lastly try successively smaller sizes from the page allocator */
@@ -118,8 +117,8 @@ long kvmppc_alloc_hpt(struct kvm *kvm, u32 *htab_orderp)
         return 0;
 
  out_freehpt:
-        if (kvm->arch.hpt_li)
-                kvm_release_hpt(kvm->arch.hpt_li);
+        if (kvm->arch.hpt_cma_alloc)
+                kvm_release_hpt(page, 1 << (order - PAGE_SHIFT));
         else
                 free_pages(hpt, order - PAGE_SHIFT);
         return -ENOMEM;
@@ -165,8 +164,9 @@ void kvmppc_free_hpt(struct kvm *kvm)
 {
         kvmppc_free_lpid(kvm->arch.lpid);
         vfree(kvm->arch.revmap);
-        if (kvm->arch.hpt_li)
-                kvm_release_hpt(kvm->arch.hpt_li);
+        if (kvm->arch.hpt_cma_alloc)
+                kvm_release_hpt(virt_to_page(kvm->arch.hpt_virt),
+                                1 << (kvm->arch.hpt_order - PAGE_SHIFT));
         else
                 free_pages(kvm->arch.hpt_virt,
                            kvm->arch.hpt_order - PAGE_SHIFT);
@@ -1579,7 +1579,7 @@ int kvm_vm_ioctl_get_htab_fd(struct kvm *kvm, struct kvm_get_htab_fd *ghf)
         ctx->first_pass = 1;
 
         rwflag = (ghf->flags & KVM_GET_HTAB_WRITE) ? O_WRONLY : O_RDONLY;
-        ret = anon_inode_getfd("kvm-htab", &kvm_htab_fops, ctx, rwflag);
+        ret = anon_inode_getfd("kvm-htab", &kvm_htab_fops, ctx, rwflag | O_CLOEXEC);
         if (ret < 0) {
                 kvm_put_kvm(kvm);
                 return ret;
diff --git a/arch/powerpc/kvm/book3s_64_slb.S b/arch/powerpc/kvm/book3s_64_slb.S
index 4f0caecc0f9d..4f12e8f0c718 100644
--- a/arch/powerpc/kvm/book3s_64_slb.S
+++ b/arch/powerpc/kvm/book3s_64_slb.S
@@ -17,6 +17,10 @@
  * Authors: Alexander Graf <agraf@suse.de>
  */
 
+#ifdef __LITTLE_ENDIAN__
+#error Need to fix SLB shadow accesses in little endian mode
+#endif
+
 #define SHADOW_SLB_ESID(num)    (SLBSHADOW_SAVEAREA + (num * 0x10))
 #define SHADOW_SLB_VSID(num)    (SLBSHADOW_SAVEAREA + (num * 0x10) + 0x8)
 #define UNBOLT_SLB_ENTRY(num) \
diff --git a/arch/powerpc/kvm/book3s_64_vio.c b/arch/powerpc/kvm/book3s_64_vio.c
index b2d3f3b2de72..54cf9bc94dad 100644
--- a/arch/powerpc/kvm/book3s_64_vio.c
+++ b/arch/powerpc/kvm/book3s_64_vio.c
@@ -136,7 +136,7 @@ long kvm_vm_ioctl_create_spapr_tce(struct kvm *kvm,
         mutex_unlock(&kvm->lock);
 
         return anon_inode_getfd("kvm-spapr-tce", &kvm_spapr_tce_fops,
-                                stt, O_RDWR);
+                                stt, O_RDWR | O_CLOEXEC);
 
 fail:
         if (stt) {
diff --git a/arch/powerpc/kvm/book3s_emulate.c b/arch/powerpc/kvm/book3s_emulate.c
index 1f6344c4408d..360ce68c9809 100644
--- a/arch/powerpc/kvm/book3s_emulate.c
+++ b/arch/powerpc/kvm/book3s_emulate.c
@@ -458,6 +458,7 @@ int kvmppc_core_emulate_mtspr(struct kvm_vcpu *vcpu, int sprn, ulong spr_val)
         case SPRN_PMC4_GEKKO:
         case SPRN_WPAR_GEKKO:
         case SPRN_MSSSR0:
+        case SPRN_DABR:
                 break;
 unprivileged:
         default:
@@ -555,6 +556,7 @@ int kvmppc_core_emulate_mfspr(struct kvm_vcpu *vcpu, int sprn, ulong *spr_val)
         case SPRN_PMC4_GEKKO:
         case SPRN_WPAR_GEKKO:
         case SPRN_MSSSR0:
+        case SPRN_DABR:
                 *spr_val = 0;
                 break;
         default:
diff --git a/arch/powerpc/kvm/book3s_hv.c b/arch/powerpc/kvm/book3s_hv.c
index 7629cd3eb91a..62a2b5ab08ed 100644
--- a/arch/powerpc/kvm/book3s_hv.c
+++ b/arch/powerpc/kvm/book3s_hv.c
@@ -217,7 +217,7 @@ struct kvm_vcpu *kvmppc_find_vcpu(struct kvm *kvm, int id)
 
 static void init_vpa(struct kvm_vcpu *vcpu, struct lppaca *vpa)
 {
-        vpa->shared_proc = 1;
+        vpa->__old_status |= LPPACA_OLD_SHARED_PROC;
         vpa->yield_count = 1;
 }
 
@@ -680,13 +680,12 @@ static int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
 }
 
 int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,
-                                  struct kvm_sregs *sregs)
+                                  struct kvm_sregs *sregs)
 {
         int i;
 
-        sregs->pvr = vcpu->arch.pvr;
-
         memset(sregs, 0, sizeof(struct kvm_sregs));
+        sregs->pvr = vcpu->arch.pvr;
         for (i = 0; i < vcpu->arch.slb_max; i++) {
                 sregs->u.s.ppc64.slb[i].slbe = vcpu->arch.slb[i].orige;
                 sregs->u.s.ppc64.slb[i].slbv = vcpu->arch.slb[i].origv;
@@ -696,7 +695,7 @@ int kvm_arch_vcpu_ioctl_get_sregs(struct kvm_vcpu *vcpu,
 }
 
 int kvm_arch_vcpu_ioctl_set_sregs(struct kvm_vcpu *vcpu,
-                                  struct kvm_sregs *sregs)
+                                  struct kvm_sregs *sregs)
 {
         int i, j;
 
@@ -1511,10 +1510,10 @@ static inline int lpcr_rmls(unsigned long rma_size)
 
 static int kvm_rma_fault(struct vm_area_struct *vma, struct vm_fault *vmf)
 {
-        struct kvmppc_linear_info *ri = vma->vm_file->private_data;
         struct page *page;
+        struct kvm_rma_info *ri = vma->vm_file->private_data;
 
-        if (vmf->pgoff >= ri->npages)
+        if (vmf->pgoff >= kvm_rma_pages)
                 return VM_FAULT_SIGBUS;
 
         page = pfn_to_page(ri->base_pfn + vmf->pgoff);
@@ -1536,7 +1535,7 @@ static int kvm_rma_mmap(struct file *file, struct vm_area_struct *vma)
 
 static int kvm_rma_release(struct inode *inode, struct file *filp)
 {
-        struct kvmppc_linear_info *ri = filp->private_data;
+        struct kvm_rma_info *ri = filp->private_data;
 
         kvm_release_rma(ri);
         return 0;
@@ -1549,18 +1548,27 @@ static const struct file_operations kvm_rma_fops = {
 
 long kvm_vm_ioctl_allocate_rma(struct kvm *kvm, struct kvm_allocate_rma *ret)
 {
-        struct kvmppc_linear_info *ri;
         long fd;
+        struct kvm_rma_info *ri;
+        /*
+         * Only do this on PPC970 in HV mode
+         */
+        if (!cpu_has_feature(CPU_FTR_HVMODE) ||
+            !cpu_has_feature(CPU_FTR_ARCH_201))
+                return -EINVAL;
+
+        if (!kvm_rma_pages)
+                return -EINVAL;
 
         ri = kvm_alloc_rma();
         if (!ri)
                 return -ENOMEM;
 
-        fd = anon_inode_getfd("kvm-rma", &kvm_rma_fops, ri, O_RDWR);
+        fd = anon_inode_getfd("kvm-rma", &kvm_rma_fops, ri, O_RDWR | O_CLOEXEC);
         if (fd < 0)
                 kvm_release_rma(ri);
 
-        ret->rma_size = ri->npages << PAGE_SHIFT;
+        ret->rma_size = kvm_rma_pages << PAGE_SHIFT;
         return fd;
 }
 
@@ -1725,7 +1733,7 @@ static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu)
 {
         int err = 0;
         struct kvm *kvm = vcpu->kvm;
-        struct kvmppc_linear_info *ri = NULL;
+        struct kvm_rma_info *ri = NULL;
         unsigned long hva;
         struct kvm_memory_slot *memslot;
         struct vm_area_struct *vma;
@@ -1803,7 +1811,7 @@ static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu)
 
         } else {
                 /* Set up to use an RMO region */
-                rma_size = ri->npages;
+                rma_size = kvm_rma_pages;
                 if (rma_size > memslot->npages)
                         rma_size = memslot->npages;
                 rma_size <<= PAGE_SHIFT;
@@ -1831,14 +1839,14 @@ static int kvmppc_hv_setup_htab_rma(struct kvm_vcpu *vcpu)
                         /* POWER7 */
                         lpcr &= ~(LPCR_VPM0 | LPCR_VRMA_L);
                         lpcr |= rmls << LPCR_RMLS_SH;
-                        kvm->arch.rmor = kvm->arch.rma->base_pfn << PAGE_SHIFT;
+                        kvm->arch.rmor = ri->base_pfn << PAGE_SHIFT;
                 }
                 kvm->arch.lpcr = lpcr;
                 pr_info("KVM: Using RMO at %lx size %lx (LPCR = %lx)\n",
                         ri->base_pfn << PAGE_SHIFT, rma_size, lpcr);
 
                 /* Initialize phys addrs of pages in RMO */
-                npages = ri->npages;
+                npages = kvm_rma_pages;
                 porder = __ilog2(npages);
                 physp = memslot->arch.slot_phys;
                 if (physp) {
diff --git a/arch/powerpc/kvm/book3s_hv_builtin.c b/arch/powerpc/kvm/book3s_hv_builtin.c
index ec0a9e5de100..8cd0daebb82d 100644
--- a/arch/powerpc/kvm/book3s_hv_builtin.c
+++ b/arch/powerpc/kvm/book3s_hv_builtin.c
@@ -13,33 +13,34 @@
 #include <linux/spinlock.h>
 #include <linux/bootmem.h>
 #include <linux/init.h>
+#include <linux/memblock.h>
+#include <linux/sizes.h>
 
 #include <asm/cputable.h>
 #include <asm/kvm_ppc.h>
 #include <asm/kvm_book3s.h>
 
-#define KVM_LINEAR_RMA          0
-#define KVM_LINEAR_HPT          1
-
-static void __init kvm_linear_init_one(ulong size, int count, int type);
-static struct kvmppc_linear_info *kvm_alloc_linear(int type);
-static void kvm_release_linear(struct kvmppc_linear_info *ri);
-
-int kvm_hpt_order = KVM_DEFAULT_HPT_ORDER;
-EXPORT_SYMBOL_GPL(kvm_hpt_order);
-
-/*************** RMA *************/
-
+#include "book3s_hv_cma.h"
+/*
+ * Hash page table alignment on newer cpus(CPU_FTR_ARCH_206)
+ * should be power of 2.
+ */
+#define HPT_ALIGN_PAGES         ((1 << 18) >> PAGE_SHIFT) /* 256k */
+/*
+ * By default we reserve 5% of memory for hash pagetable allocation.
+ */
+static unsigned long kvm_cma_resv_ratio = 5;
 /*
- * This maintains a list of RMAs (real mode areas) for KVM guests to use.
+ * We allocate RMAs (real mode areas) for KVM guests from the KVM CMA area.
  * Each RMA has to be physically contiguous and of a size that the
  * hardware supports.  PPC970 and POWER7 support 64MB, 128MB and 256MB,
  * and other larger sizes.  Since we are unlikely to be allocate that
  * much physically contiguous memory after the system is up and running,
- * we preallocate a set of RMAs in early boot for KVM to use.
+ * we preallocate a set of RMAs in early boot using CMA.
+ * should be power of 2.
  */
-static unsigned long kvm_rma_size = 64 << 20;   /* 64MB */
-static unsigned long kvm_rma_count;
+unsigned long kvm_rma_pages = (1 << 27) >> PAGE_SHIFT;  /* 128MB */
+EXPORT_SYMBOL_GPL(kvm_rma_pages);
 
 /* Work out RMLS (real mode limit selector) field value for a given RMA size.
    Assumes POWER7 or PPC970. */
@@ -69,165 +70,114 @@ static inline int lpcr_rmls(unsigned long rma_size)
 
 static int __init early_parse_rma_size(char *p)
 {
-        if (!p)
-                return 1;
+        unsigned long kvm_rma_size;
 
+        pr_debug("%s(%s)\n", __func__, p);
+        if (!p)
+                return -EINVAL;
         kvm_rma_size = memparse(p, &p);
-
+        /*
+         * Check that the requested size is one supported in hardware
+         */
+        if (lpcr_rmls(kvm_rma_size) < 0) {
+                pr_err("RMA size of 0x%lx not supported\n", kvm_rma_size);
+                return -EINVAL;
+        }
+        kvm_rma_pages = kvm_rma_size >> PAGE_SHIFT;
         return 0;
 }
 early_param("kvm_rma_size", early_parse_rma_size);
 
-static int __init early_parse_rma_count(char *p)
+struct kvm_rma_info *kvm_alloc_rma()
 {
-        if (!p)
-                return 1;
-
-        kvm_rma_count = simple_strtoul(p, NULL, 0);
-
-        return 0;
-}
-early_param("kvm_rma_count", early_parse_rma_count);
-
-struct kvmppc_linear_info *kvm_alloc_rma(void)
-{
-        return kvm_alloc_linear(KVM_LINEAR_RMA);
+        struct page *page;
+        struct kvm_rma_info *ri;
+
+        ri = kmalloc(sizeof(struct kvm_rma_info), GFP_KERNEL);
+        if (!ri)
+                return NULL;
+        page = kvm_alloc_cma(kvm_rma_pages, kvm_rma_pages);
+        if (!page)
+                goto err_out;
+        atomic_set(&ri->use_count, 1);
+        ri->base_pfn = page_to_pfn(page);
+        return ri;
+err_out:
+        kfree(ri);
+        return NULL;
 }
 EXPORT_SYMBOL_GPL(kvm_alloc_rma);
 
-void kvm_release_rma(struct kvmppc_linear_info *ri)
+void kvm_release_rma(struct kvm_rma_info *ri)
 {
-        kvm_release_linear(ri);
+        if (atomic_dec_and_test(&ri->use_count)) {
+                kvm_release_cma(pfn_to_page(ri->base_pfn), kvm_rma_pages);
+                kfree(ri);
+        }
 }
 EXPORT_SYMBOL_GPL(kvm_release_rma);
 
-/*************** HPT *************/
-
-/*
- * This maintains a list of big linear HPT tables that contain the GVA->HPA
- * memory mappings. If we don't reserve those early on, we might not be able
- * to get a big (usually 16MB) linear memory region from the kernel anymore.
- */
-
-static unsigned long kvm_hpt_count;
-
-static int __init early_parse_hpt_count(char *p)
+static int __init early_parse_kvm_cma_resv(char *p)
 {
+        pr_debug("%s(%s)\n", __func__, p);
         if (!p)
-                return 1;
-
-        kvm_hpt_count = simple_strtoul(p, NULL, 0);
-
-        return 0;
+                return -EINVAL;
+        return kstrtoul(p, 0, &kvm_cma_resv_ratio);
 }
-early_param("kvm_hpt_count", early_parse_hpt_count);
+early_param("kvm_cma_resv_ratio", early_parse_kvm_cma_resv);
 
-struct kvmppc_linear_info *kvm_alloc_hpt(void)
+struct page *kvm_alloc_hpt(unsigned long nr_pages)
 {
-        return kvm_alloc_linear(KVM_LINEAR_HPT);
+        unsigned long align_pages = HPT_ALIGN_PAGES;
+
+        /* Old CPUs require HPT aligned on a multiple of its size */
+        if (!cpu_has_feature(CPU_FTR_ARCH_206))
+                align_pages = nr_pages;
+        return kvm_alloc_cma(nr_pages, align_pages);
 }
 EXPORT_SYMBOL_GPL(kvm_alloc_hpt);
 
-void kvm_release_hpt(struct kvmppc_linear_info *li)
+void kvm_release_hpt(struct page *page, unsigned long nr_pages)
 {
-        kvm_release_linear(li);
+        kvm_release_cma(page, nr_pages);
 }
 EXPORT_SYMBOL_GPL(kvm_release_hpt);
 
-/*************** generic *************/
-
-static LIST_HEAD(free_linears);
-static DEFINE_SPINLOCK(linear_lock);
-
-static void __init kvm_linear_init_one(ulong size, int count, int type)
-{
-        unsigned long i;
-        unsigned long j, npages;
-        void *linear;
-        struct page *pg;
-        const char *typestr;
-        struct kvmppc_linear_info *linear_info;
-
-        if (!count)
-                return;
-
-        typestr = (type == KVM_LINEAR_RMA) ? "RMA" : "HPT";
-
-        npages = size >> PAGE_SHIFT;
-        linear_info = alloc_bootmem(count * sizeof(struct kvmppc_linear_info));
-        for (i = 0; i < count; ++i) {
-                linear = alloc_bootmem_align(size, size);
-                pr_debug("Allocated KVM %s at %p (%ld MB)\n", typestr, linear,
-                         size >> 20);
-                linear_info[i].base_virt = linear;
-                linear_info[i].base_pfn = __pa(linear) >> PAGE_SHIFT;
-                linear_info[i].npages = npages;
-                linear_info[i].type = type;
-                list_add_tail(&linear_info[i].list, &free_linears);
-                atomic_set(&linear_info[i].use_count, 0);
-
-                pg = pfn_to_page(linear_info[i].base_pfn);
-                for (j = 0; j < npages; ++j) {
-                        atomic_inc(&pg->_count);
-                        ++pg;
-                }
-        }
-}
-
-static struct kvmppc_linear_info *kvm_alloc_linear(int type)
-{
-        struct kvmppc_linear_info *ri, *ret;
-
-        ret = NULL;
-        spin_lock(&linear_lock);
-        list_for_each_entry(ri, &free_linears, list) {
-                if (ri->type != type)
-                        continue;
-
-                list_del(&ri->list);
-                atomic_inc(&ri->use_count);
-                memset(ri->base_virt, 0, ri->npages << PAGE_SHIFT);
-                ret = ri;
-                break;
-        }
-        spin_unlock(&linear_lock);
-        return ret;
-}
-
-static void kvm_release_linear(struct kvmppc_linear_info *ri)
-{
-        if (atomic_dec_and_test(&ri->use_count)) {
-                spin_lock(&linear_lock);
-                list_add_tail(&ri->list, &free_linears);
-                spin_unlock(&linear_lock);
-
-        }
-}
-
-/*
- * Called at boot time while the bootmem allocator is active,
- * to allocate contiguous physical memory for the hash page
- * tables for guests.
+/**
+ * kvm_cma_reserve() - reserve area for kvm hash pagetable
+ *
+ * This function reserves memory from early allocator. It should be
+ * called by arch specific code once the early allocator (memblock or bootmem)
+ * has been activated and all other subsystems have already allocated/reserved
+ * memory.
  */
-void __init kvm_linear_init(void)
+void __init kvm_cma_reserve(void)
 {
-        /* HPT */
-        kvm_linear_init_one(1 << kvm_hpt_order, kvm_hpt_count, KVM_LINEAR_HPT);
-
-        /* RMA */
-        /* Only do this on PPC970 in HV mode */
-        if (!cpu_has_feature(CPU_FTR_HVMODE) ||
-            !cpu_has_feature(CPU_FTR_ARCH_201))
-                return;
-
-        if (!kvm_rma_size || !kvm_rma_count)
-                return;
-
-        /* Check that the requested size is one supported in hardware */
-        if (lpcr_rmls(kvm_rma_size) < 0) {
-                pr_err("RMA size of 0x%lx not supported\n", kvm_rma_size);
-                return;
+        unsigned long align_size;
+        struct memblock_region *reg;
+        phys_addr_t selected_size = 0;
+        /*
+         * We cannot use memblock_phys_mem_size() here, because
+         * memblock_analyze() has not been called yet.
+         */
+        for_each_memblock(memory, reg)
+                selected_size += memblock_region_memory_end_pfn(reg) -
+                                 memblock_region_memory_base_pfn(reg);
+
+        selected_size = (selected_size * kvm_cma_resv_ratio / 100) << PAGE_SHIFT;
+        if (selected_size) {
+                pr_debug("%s: reserving %ld MiB for global area\n", __func__,
+                         (unsigned long)selected_size / SZ_1M);
+                /*
+                 * Old CPUs require HPT aligned on a multiple of its size. So for them
+                 * make the alignment as max size we could request.
+                 */
+                if (!cpu_has_feature(CPU_FTR_ARCH_206))
+                        align_size = __rounddown_pow_of_two(selected_size);
+                else
+                        align_size = HPT_ALIGN_PAGES << PAGE_SHIFT;
+
+                align_size = max(kvm_rma_pages << PAGE_SHIFT, align_size);
+                kvm_cma_declare_contiguous(selected_size, align_size);
         }
-
-        kvm_linear_init_one(kvm_rma_size, kvm_rma_count, KVM_LINEAR_RMA);
 }
diff --git a/arch/powerpc/kvm/book3s_hv_cma.c b/arch/powerpc/kvm/book3s_hv_cma.c
new file mode 100644
index 000000000000..d9d3d8553d51
--- /dev/null
+++ b/arch/powerpc/kvm/book3s_hv_cma.c
@@ -0,0 +1,240 @@
+/*
+ * Contiguous Memory Allocator for ppc KVM hash pagetable  based on CMA
+ * for DMA mapping framework
+ *
+ * Copyright IBM Corporation, 2013
+ * Author Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License or (at your optional) any later version of the license.
+ *
+ */
+#define pr_fmt(fmt) "kvm_cma: " fmt
+
+#ifdef CONFIG_CMA_DEBUG
+#ifndef DEBUG
+#  define DEBUG
+#endif
+#endif
+
+#include <linux/memblock.h>
+#include <linux/mutex.h>
+#include <linux/sizes.h>
+#include <linux/slab.h>
+
+#include "book3s_hv_cma.h"
+
+struct kvm_cma {
+        unsigned long   base_pfn;
+        unsigned long   count;
+        unsigned long   *bitmap;
+};
+
+static DEFINE_MUTEX(kvm_cma_mutex);
+static struct kvm_cma kvm_cma_area;
+
+/**
+ * kvm_cma_declare_contiguous() - reserve area for contiguous memory handling
+ *                                for kvm hash pagetable
+ * @size:  Size of the reserved memory.
+ * @alignment:  Alignment for the contiguous memory area
+ *
+ * This function reserves memory for kvm cma area. It should be
+ * called by arch code when early allocator (memblock or bootmem)
+ * is still activate.
+ */
+long __init kvm_cma_declare_contiguous(phys_addr_t size, phys_addr_t alignment)
+{
+        long base_pfn;
+        phys_addr_t addr;
+        struct kvm_cma *cma = &kvm_cma_area;
+
+        pr_debug("%s(size %lx)\n", __func__, (unsigned long)size);
+
+        if (!size)
+                return -EINVAL;
+        /*
+         * Sanitise input arguments.
+         * We should be pageblock aligned for CMA.
+         */
+        alignment = max(alignment, (phys_addr_t)(PAGE_SIZE << pageblock_order));
+        size = ALIGN(size, alignment);
+        /*
+         * Reserve memory
+         * Use __memblock_alloc_base() since
+         * memblock_alloc_base() panic()s.
+         */
+        addr = __memblock_alloc_base(size, alignment, 0);
+        if (!addr) {
+                base_pfn = -ENOMEM;
+                goto err;
+        } else
+                base_pfn = PFN_DOWN(addr);
+
+        /*
+         * Each reserved area must be initialised later, when more kernel
+         * subsystems (like slab allocator) are available.
+         */
+        cma->base_pfn = base_pfn;
+        cma->count    = size >> PAGE_SHIFT;
+        pr_info("CMA: reserved %ld MiB\n", (unsigned long)size / SZ_1M);
+        return 0;
+err:
+        pr_err("CMA: failed to reserve %ld MiB\n", (unsigned long)size / SZ_1M);
+        return base_pfn;
+}
+
+/**
+ * kvm_alloc_cma() - allocate pages from contiguous area
+ * @nr_pages: Requested number of pages.
+ * @align_pages: Requested alignment in number of pages
+ *
+ * This function allocates memory buffer for hash pagetable.
+ */
+struct page *kvm_alloc_cma(unsigned long nr_pages, unsigned long align_pages)
+{
+        int ret;
+        struct page *page = NULL;
+        struct kvm_cma *cma = &kvm_cma_area;
+        unsigned long chunk_count, nr_chunk;
+        unsigned long mask, pfn, pageno, start = 0;
+
+
+        if (!cma || !cma->count)
+                return NULL;
+
+        pr_debug("%s(cma %p, count %lu, align pages %lu)\n", __func__,
+                 (void *)cma, nr_pages, align_pages);
+
+        if (!nr_pages)
+                return NULL;
+        /*
+         * align mask with chunk size. The bit tracks pages in chunk size
+         */
+        VM_BUG_ON(!is_power_of_2(align_pages));
+        mask = (align_pages >> (KVM_CMA_CHUNK_ORDER - PAGE_SHIFT)) - 1;
+        BUILD_BUG_ON(PAGE_SHIFT > KVM_CMA_CHUNK_ORDER);
+
+        chunk_count = cma->count >>  (KVM_CMA_CHUNK_ORDER - PAGE_SHIFT);
+        nr_chunk = nr_pages >> (KVM_CMA_CHUNK_ORDER - PAGE_SHIFT);
+
+        mutex_lock(&kvm_cma_mutex);
+        for (;;) {
+                pageno = bitmap_find_next_zero_area(cma->bitmap, chunk_count,
+                                                    start, nr_chunk, mask);
+                if (pageno >= chunk_count)
+                        break;
+
+                pfn = cma->base_pfn + (pageno << (KVM_CMA_CHUNK_ORDER - PAGE_SHIFT));
+                ret = alloc_contig_range(pfn, pfn + nr_pages, MIGRATE_CMA);
+                if (ret == 0) {
+                        bitmap_set(cma->bitmap, pageno, nr_chunk);
+                        page = pfn_to_page(pfn);
+                        memset(pfn_to_kaddr(pfn), 0, nr_pages << PAGE_SHIFT);
+                        break;
+                } else if (ret != -EBUSY) {
+                        break;
+                }
+                pr_debug("%s(): memory range at %p is busy, retrying\n",
+                         __func__, pfn_to_page(pfn));
+                /* try again with a bit different memory target */
+                start = pageno + mask + 1;
+        }
+        mutex_unlock(&kvm_cma_mutex);
+        pr_debug("%s(): returned %p\n", __func__, page);
+        return page;
+}
+
+/**
+ * kvm_release_cma() - release allocated pages for hash pagetable
+ * @pages: Allocated pages.
+ * @nr_pages: Number of allocated pages.
+ *
+ * This function releases memory allocated by kvm_alloc_cma().
+ * It returns false when provided pages do not belong to contiguous area and
+ * true otherwise.
+ */
+bool kvm_release_cma(struct page *pages, unsigned long nr_pages)
+{
+        unsigned long pfn;
+        unsigned long nr_chunk;
+        struct kvm_cma *cma = &kvm_cma_area;
+
+        if (!cma || !pages)
+                return false;
+
+        pr_debug("%s(page %p count %lu)\n", __func__, (void *)pages, nr_pages);
+
+        pfn = page_to_pfn(pages);
+
+        if (pfn < cma->base_pfn || pfn >= cma->base_pfn + cma->count)
+                return false;
+
+        VM_BUG_ON(pfn + nr_pages > cma->base_pfn + cma->count);
+        nr_chunk = nr_pages >>  (KVM_CMA_CHUNK_ORDER - PAGE_SHIFT);
+
+        mutex_lock(&kvm_cma_mutex);
+        bitmap_clear(cma->bitmap,
+                     (pfn - cma->base_pfn) >> (KVM_CMA_CHUNK_ORDER - PAGE_SHIFT),
+                     nr_chunk);
+        free_contig_range(pfn, nr_pages);
+        mutex_unlock(&kvm_cma_mutex);
+
+        return true;
+}
+
+static int __init kvm_cma_activate_area(unsigned long base_pfn,
+                                        unsigned long count)
+{
+        unsigned long pfn = base_pfn;
+        unsigned i = count >> pageblock_order;
+        struct zone *zone;
+
+        WARN_ON_ONCE(!pfn_valid(pfn));
+        zone = page_zone(pfn_to_page(pfn));
+        do {
+                unsigned j;
+                base_pfn = pfn;
+                for (j = pageblock_nr_pages; j; --j, pfn++) {
+                        WARN_ON_ONCE(!pfn_valid(pfn));
+                        /*
+                         * alloc_contig_range requires the pfn range
+                         * specified to be in the same zone. Make this
+                         * simple by forcing the entire CMA resv range
+                         * to be in the same zone.
+                         */
+                        if (page_zone(pfn_to_page(pfn)) != zone)
+                                return -EINVAL;
+                }
+                init_cma_reserved_pageblock(pfn_to_page(base_pfn));
+        } while (--i);
+        return 0;
+}
+
+static int __init kvm_cma_init_reserved_areas(void)
+{
+        int bitmap_size, ret;
+        unsigned long chunk_count;
+        struct kvm_cma *cma = &kvm_cma_area;
+
+        pr_debug("%s()\n", __func__);
+        if (!cma->count)
+                return 0;
+        chunk_count = cma->count >> (KVM_CMA_CHUNK_ORDER - PAGE_SHIFT);
+        bitmap_size = BITS_TO_LONGS(chunk_count) * sizeof(long);
+        cma->bitmap = kzalloc(bitmap_size, GFP_KERNEL);
+        if (!cma->bitmap)
+                return -ENOMEM;
+
+        ret = kvm_cma_activate_area(cma->base_pfn, cma->count);
+        if (ret)
+                goto error;
+        return 0;
+
+error:
+        kfree(cma->bitmap);
+        return ret;
+}
+core_initcall(kvm_cma_init_reserved_areas);
diff --git a/arch/powerpc/kvm/book3s_hv_cma.h b/arch/powerpc/kvm/book3s_hv_cma.h
new file mode 100644
index 000000000000..655144f75fa5
--- /dev/null
+++ b/arch/powerpc/kvm/book3s_hv_cma.h
@@ -0,0 +1,27 @@
+/*
+ * Contiguous Memory Allocator for ppc KVM hash pagetable  based on CMA
+ * for DMA mapping framework
+ *
+ * Copyright IBM Corporation, 2013
+ * Author Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License or (at your optional) any later version of the license.
+ *
+ */
+
+#ifndef __POWERPC_KVM_CMA_ALLOC_H__
+#define __POWERPC_KVM_CMA_ALLOC_H__
+/*
+ * Both RMA and Hash page allocation will be multiple of 256K.
+ */
+#define KVM_CMA_CHUNK_ORDER     18
+
+extern struct page *kvm_alloc_cma(unsigned long nr_pages,
+                                  unsigned long align_pages);
+extern bool kvm_release_cma(struct page *pages, unsigned long nr_pages);
+extern long kvm_cma_declare_contiguous(phys_addr_t size,
+                                       phys_addr_t alignment) __init;
+#endif
diff --git a/arch/powerpc/kvm/book3s_hv_rm_mmu.c b/arch/powerpc/kvm/book3s_hv_rm_mmu.c
index fc25689a9f35..9c515440ad1a 100644
--- a/arch/powerpc/kvm/book3s_hv_rm_mmu.c
+++ b/arch/powerpc/kvm/book3s_hv_rm_mmu.c
@@ -363,7 +363,11 @@ long kvmppc_h_enter(struct kvm_vcpu *vcpu, unsigned long flags,
                                  vcpu->arch.pgdir, true, &vcpu->arch.gpr[4]);
 }
 
+#ifdef __BIG_ENDIAN__
 #define LOCK_TOKEN      (*(u32 *)(&get_paca()->lock_token))
+#else
+#define LOCK_TOKEN      (*(u32 *)(&get_paca()->paca_index))
+#endif
 
 static inline int try_lock_tlbie(unsigned int *lock)
 {
@@ -383,6 +387,80 @@ static inline int try_lock_tlbie(unsigned int *lock)
         return old == 0;
 }
 
+/*
+ * tlbie/tlbiel is a bit different on the PPC970 compared to later
+ * processors such as POWER7; the large page bit is in the instruction
+ * not RB, and the top 16 bits and the bottom 12 bits of the VA
+ * in RB must be 0.
+ */
+static void do_tlbies_970(struct kvm *kvm, unsigned long *rbvalues,
+                          long npages, int global, bool need_sync)
+{
+        long i;
+
+        if (global) {
+                while (!try_lock_tlbie(&kvm->arch.tlbie_lock))
+                        cpu_relax();
+                if (need_sync)
+                        asm volatile("ptesync" : : : "memory");
+                for (i = 0; i < npages; ++i) {
+                        unsigned long rb = rbvalues[i];
+
+                        if (rb & 1)             /* large page */
+                                asm volatile("tlbie %0,1" : :
+                                             "r" (rb & 0x0000fffffffff000ul));
+                        else
+                                asm volatile("tlbie %0,0" : :
+                                             "r" (rb & 0x0000fffffffff000ul));
+                }
+                asm volatile("eieio; tlbsync; ptesync" : : : "memory");
+                kvm->arch.tlbie_lock = 0;
+        } else {
+                if (need_sync)
+                        asm volatile("ptesync" : : : "memory");
+                for (i = 0; i < npages; ++i) {
+                        unsigned long rb = rbvalues[i];
+
+                        if (rb & 1)             /* large page */
+                                asm volatile("tlbiel %0,1" : :
+                                             "r" (rb & 0x0000fffffffff000ul));
+                        else
+                                asm volatile("tlbiel %0,0" : :
+                                             "r" (rb & 0x0000fffffffff000ul));
+                }
+                asm volatile("ptesync" : : : "memory");
+        }
+}
+
+static void do_tlbies(struct kvm *kvm, unsigned long *rbvalues,
+                      long npages, int global, bool need_sync)
+{
+        long i;
+
+        if (cpu_has_feature(CPU_FTR_ARCH_201)) {
+                /* PPC970 tlbie instruction is a bit different */
+                do_tlbies_970(kvm, rbvalues, npages, global, need_sync);
+                return;
+        }
+        if (global) {
+                while (!try_lock_tlbie(&kvm->arch.tlbie_lock))
+                        cpu_relax();
+                if (need_sync)
+                        asm volatile("ptesync" : : : "memory");
+                for (i = 0; i < npages; ++i)
+                        asm volatile(PPC_TLBIE(%1,%0) : :
+                                     "r" (rbvalues[i]), "r" (kvm->arch.lpid));
+                asm volatile("eieio; tlbsync; ptesync" : : : "memory");
+                kvm->arch.tlbie_lock = 0;
+        } else {
+                if (need_sync)
+                        asm volatile("ptesync" : : : "memory");
+                for (i = 0; i < npages; ++i)
+                        asm volatile("tlbiel %0" : : "r" (rbvalues[i]));
+                asm volatile("ptesync" : : : "memory");
+        }
+}
+
 long kvmppc_do_h_remove(struct kvm *kvm, unsigned long flags,
                         unsigned long pte_index, unsigned long avpn,
                         unsigned long *hpret)
@@ -408,19 +486,7 @@ long kvmppc_do_h_remove(struct kvm *kvm, unsigned long flags,
         if (v & HPTE_V_VALID) {
                 hpte[0] &= ~HPTE_V_VALID;
                 rb = compute_tlbie_rb(v, hpte[1], pte_index);
-                if (global_invalidates(kvm, flags)) {
-                        while (!try_lock_tlbie(&kvm->arch.tlbie_lock))
-                                cpu_relax();
-                        asm volatile("ptesync" : : : "memory");
-                        asm volatile(PPC_TLBIE(%1,%0)"; eieio; tlbsync"
-                                     : : "r" (rb), "r" (kvm->arch.lpid));
-                        asm volatile("ptesync" : : : "memory");
-                        kvm->arch.tlbie_lock = 0;
-                } else {
-                        asm volatile("ptesync" : : : "memory");
-                        asm volatile("tlbiel %0" : : "r" (rb));
-                        asm volatile("ptesync" : : : "memory");
-                }
+                do_tlbies(kvm, &rb, 1, global_invalidates(kvm, flags), true);
                 /* Read PTE low word after tlbie to get final R/C values */
                 remove_revmap_chain(kvm, pte_index, rev, v, hpte[1]);
         }
@@ -448,12 +514,11 @@ long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu)
         unsigned long *hp, *hptes[4], tlbrb[4];
         long int i, j, k, n, found, indexes[4];
         unsigned long flags, req, pte_index, rcbits;
-        long int local = 0;
+        int global;
         long int ret = H_SUCCESS;
         struct revmap_entry *rev, *revs[4];
 
-        if (atomic_read(&kvm->online_vcpus) == 1)
-                local = 1;
+        global = global_invalidates(kvm, 0);
         for (i = 0; i < 4 && ret == H_SUCCESS; ) {
                 n = 0;
                 for (; i < 4; ++i) {
@@ -529,22 +594,7 @@ long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu)
                         break;
 
                 /* Now that we've collected a batch, do the tlbies */
-                if (!local) {
-                        while(!try_lock_tlbie(&kvm->arch.tlbie_lock))
-                                cpu_relax();
-                        asm volatile("ptesync" : : : "memory");
-                        for (k = 0; k < n; ++k)
-                                asm volatile(PPC_TLBIE(%1,%0) : :
-                                             "r" (tlbrb[k]),
-                                             "r" (kvm->arch.lpid));
-                        asm volatile("eieio; tlbsync; ptesync" : : : "memory");
-                        kvm->arch.tlbie_lock = 0;
-                } else {
-                        asm volatile("ptesync" : : : "memory");
-                        for (k = 0; k < n; ++k)
-                                asm volatile("tlbiel %0" : : "r" (tlbrb[k]));
-                        asm volatile("ptesync" : : : "memory");
-                }
+                do_tlbies(kvm, tlbrb, n, global, true);
 
                 /* Read PTE low words after tlbie to get final R/C values */
                 for (k = 0; k < n; ++k) {
@@ -603,19 +653,7 @@ long kvmppc_h_protect(struct kvm_vcpu *vcpu, unsigned long flags,
         if (v & HPTE_V_VALID) {
                 rb = compute_tlbie_rb(v, r, pte_index);
                 hpte[0] = v & ~HPTE_V_VALID;
-                if (global_invalidates(kvm, flags)) {
-                        while(!try_lock_tlbie(&kvm->arch.tlbie_lock))
-                                cpu_relax();
-                        asm volatile("ptesync" : : : "memory");
-                        asm volatile(PPC_TLBIE(%1,%0)"; eieio; tlbsync"
-                                     : : "r" (rb), "r" (kvm->arch.lpid));
-                        asm volatile("ptesync" : : : "memory");
-                        kvm->arch.tlbie_lock = 0;
-                } else {
-                        asm volatile("ptesync" : : : "memory");
-                        asm volatile("tlbiel %0" : : "r" (rb));
-                        asm volatile("ptesync" : : : "memory");
-                }
+                do_tlbies(kvm, &rb, 1, global_invalidates(kvm, flags), true);
                 /*
                  * If the host has this page as readonly but the guest
                  * wants to make it read/write, reduce the permissions.
@@ -686,13 +724,7 @@ void kvmppc_invalidate_hpte(struct kvm *kvm, unsigned long *hptep,
 
         hptep[0] &= ~HPTE_V_VALID;
         rb = compute_tlbie_rb(hptep[0], hptep[1], pte_index);
-        while (!try_lock_tlbie(&kvm->arch.tlbie_lock))
-                cpu_relax();
-        asm volatile("ptesync" : : : "memory");
-        asm volatile(PPC_TLBIE(%1,%0)"; eieio; tlbsync"
-                     : : "r" (rb), "r" (kvm->arch.lpid));
-        asm volatile("ptesync" : : : "memory");
-        kvm->arch.tlbie_lock = 0;
+        do_tlbies(kvm, &rb, 1, 1, true);
 }
 EXPORT_SYMBOL_GPL(kvmppc_invalidate_hpte);
 
@@ -706,12 +738,7 @@ void kvmppc_clear_ref_hpte(struct kvm *kvm, unsigned long *hptep,
         rbyte = (hptep[1] & ~HPTE_R_R) >> 8;
         /* modify only the second-last byte, which contains the ref bit */
         *((char *)hptep + 14) = rbyte;
-        while (!try_lock_tlbie(&kvm->arch.tlbie_lock))
-                cpu_relax();
-        asm volatile(PPC_TLBIE(%1,%0)"; eieio; tlbsync"
-                     : : "r" (rb), "r" (kvm->arch.lpid));
-        asm volatile("ptesync" : : : "memory");
-        kvm->arch.tlbie_lock = 0;
+        do_tlbies(kvm, &rb, 1, 1, false);
 }
 EXPORT_SYMBOL_GPL(kvmppc_clear_ref_hpte);
 
diff --git a/arch/powerpc/kvm/book3s_hv_rmhandlers.S b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
index b02f91e4c70d..294b7af28cdd 100644
--- a/arch/powerpc/kvm/book3s_hv_rmhandlers.S
+++ b/arch/powerpc/kvm/book3s_hv_rmhandlers.S
@@ -29,6 +29,10 @@
 #include <asm/kvm_book3s_asm.h>
 #include <asm/mmu-hash64.h>
 
+#ifdef __LITTLE_ENDIAN__
+#error Need to fix lppaca and SLB shadow accesses in little endian mode
+#endif
+
 /*****************************************************************************
  *                                                                           *
  *        Real Mode handlers that need to be in the linear mapping           *
@@ -389,7 +393,11 @@ toc_tlbie_lock:
         .tc     native_tlbie_lock[TC],native_tlbie_lock
         .previous
         ld      r3,toc_tlbie_lock@toc(2)
+#ifdef __BIG_ENDIAN__
         lwz     r8,PACA_LOCK_TOKEN(r13)
+#else
+        lwz     r8,PACAPACAINDEX(r13)
+#endif
 24:     lwarx   r0,0,r3
         cmpwi   r0,0
         bne     24b
@@ -964,7 +972,11 @@ END_FTR_SECTION_IFSET(CPU_FTR_ARCH_201)
 32:     ld      r4,VCPU_KVM(r9)         /* pointer to struct kvm */
 
         /* Take the guest's tlbie_lock */
+#ifdef __BIG_ENDIAN__
         lwz     r8,PACA_LOCK_TOKEN(r13)
+#else
+        lwz     r8,PACAPACAINDEX(r13)
+#endif
         addi    r3,r4,KVM_TLBIE_LOCK
 24:     lwarx   r0,0,r3
         cmpwi   r0,0
@@ -1381,7 +1393,7 @@ hcall_try_real_mode:
         cmpldi  r3,hcall_real_table_end - hcall_real_table
         bge     guest_exit_cont
         LOAD_REG_ADDR(r4, hcall_real_table)
-        lwzx    r3,r3,r4
+        lwax    r3,r3,r4
         cmpwi   r3,0
         beq     guest_exit_cont
         add     r3,r3,r4
diff --git a/arch/powerpc/kvm/book3s_interrupts.S b/arch/powerpc/kvm/book3s_interrupts.S
index 48cbbf862958..17cfae5497a3 100644
--- a/arch/powerpc/kvm/book3s_interrupts.S
+++ b/arch/powerpc/kvm/book3s_interrupts.S
@@ -92,6 +92,11 @@ kvm_start_lightweight:
         PPC_LL  r3, VCPU_HFLAGS(r4)
         rldicl  r3, r3, 0, 63           /* r3 &= 1 */
         stb     r3, HSTATE_RESTORE_HID5(r13)
+
+        /* Load up guest SPRG3 value, since it's user readable */
+        ld      r3, VCPU_SHARED(r4)
+        ld      r3, VCPU_SHARED_SPRG3(r3)
+        mtspr   SPRN_SPRG3, r3
 #endif /* CONFIG_PPC_BOOK3S_64 */
 
         PPC_LL  r4, VCPU_SHADOW_MSR(r4) /* get shadow_msr */
@@ -123,6 +128,15 @@ kvmppc_handler_highmem:
         /* R7 = vcpu */
         PPC_LL  r7, GPR4(r1)
 
+#ifdef CONFIG_PPC_BOOK3S_64
+        /*
+         * Reload kernel SPRG3 value.
+         * No need to save guest value as usermode can't modify SPRG3.
+         */
+        ld      r3, PACA_SPRG3(r13)
+        mtspr   SPRN_SPRG3, r3
+#endif /* CONFIG_PPC_BOOK3S_64 */
+
         PPC_STL r14, VCPU_GPR(R14)(r7)
         PPC_STL r15, VCPU_GPR(R15)(r7)
         PPC_STL r16, VCPU_GPR(R16)(r7)
diff --git a/arch/powerpc/kvm/book3s_pr.c b/arch/powerpc/kvm/book3s_pr.c
index c6e13d9a9e15..27db1e665959 100644
--- a/arch/powerpc/kvm/book3s_pr.c
+++ b/arch/powerpc/kvm/book3s_pr.c
@@ -468,7 +468,8 @@ void kvmppc_giveup_ext(struct kvm_vcpu *vcpu, ulong msr)
                  * both the traditional FP registers and the added VSX
                  * registers into thread.fpr[].
                  */
-                giveup_fpu(current);
+                if (current->thread.regs->msr & MSR_FP)
+                        giveup_fpu(current);
                 for (i = 0; i < ARRAY_SIZE(vcpu->arch.fpr); i++)
                         vcpu_fpr[i] = thread_fpr[get_fpr_index(i)];
 
@@ -483,7 +484,8 @@ void kvmppc_giveup_ext(struct kvm_vcpu *vcpu, ulong msr)
 
 #ifdef CONFIG_ALTIVEC
         if (msr & MSR_VEC) {
-                giveup_altivec(current);
+                if (current->thread.regs->msr & MSR_VEC)
+                        giveup_altivec(current);
                 memcpy(vcpu->arch.vr, t->vr, sizeof(vcpu->arch.vr));
                 vcpu->arch.vscr = t->vscr;
         }
@@ -575,8 +577,6 @@ static int kvmppc_handle_ext(struct kvm_vcpu *vcpu, unsigned int exit_nr,
         printk(KERN_INFO "Loading up ext 0x%lx\n", msr);
 #endif
 
-        current->thread.regs->msr |= msr;
-
         if (msr & MSR_FP) {
                 for (i = 0; i < ARRAY_SIZE(vcpu->arch.fpr); i++)
                         thread_fpr[get_fpr_index(i)] = vcpu_fpr[i];
@@ -598,12 +598,32 @@ static int kvmppc_handle_ext(struct kvm_vcpu *vcpu, unsigned int exit_nr,
 #endif
         }
 
+        current->thread.regs->msr |= msr;
         vcpu->arch.guest_owned_ext |= msr;
         kvmppc_recalc_shadow_msr(vcpu);
 
         return RESUME_GUEST;
 }
 
+/*
+ * Kernel code using FP or VMX could have flushed guest state to
+ * the thread_struct; if so, get it back now.
+ */
+static void kvmppc_handle_lost_ext(struct kvm_vcpu *vcpu)
+{
+        unsigned long lost_ext;
+
+        lost_ext = vcpu->arch.guest_owned_ext & ~current->thread.regs->msr;
+        if (!lost_ext)
+                return;
+
+        if (lost_ext & MSR_FP)
+                kvmppc_load_up_fpu();
+        if (lost_ext & MSR_VEC)
+                kvmppc_load_up_altivec();
+        current->thread.regs->msr |= lost_ext;
+}
+
 int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
                        unsigned int exit_nr)
 {
@@ -772,7 +792,7 @@ program_interrupt:
         }
         case BOOK3S_INTERRUPT_SYSCALL:
                 if (vcpu->arch.papr_enabled &&
-                    (kvmppc_get_last_inst(vcpu) == 0x44000022) &&
+                    (kvmppc_get_last_sc(vcpu) == 0x44000022) &&
                     !(vcpu->arch.shared->msr & MSR_PR)) {
                         /* SC 1 papr hypercalls */
                         ulong cmd = kvmppc_get_gpr(vcpu, 3);
@@ -890,8 +910,9 @@ program_interrupt:
                         local_irq_enable();
                         r = s;
                 } else {
-                        kvmppc_lazy_ee_enable();
+                        kvmppc_fix_ee_before_entry();
                 }
+                kvmppc_handle_lost_ext(vcpu);
         }
 
         trace_kvm_book3s_reenter(r, vcpu);
@@ -1162,7 +1183,7 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
         if (vcpu->arch.shared->msr & MSR_FP)
                 kvmppc_handle_ext(vcpu, BOOK3S_INTERRUPT_FP_UNAVAIL, MSR_FP);
 
-        kvmppc_lazy_ee_enable();
+        kvmppc_fix_ee_before_entry();
 
         ret = __kvmppc_vcpu_run(kvm_run, vcpu);
 
diff --git a/arch/powerpc/kvm/book3s_xics.c b/arch/powerpc/kvm/book3s_xics.c
index 94c1dd46b83d..a3a5cb8ee7ea 100644
--- a/arch/powerpc/kvm/book3s_xics.c
+++ b/arch/powerpc/kvm/book3s_xics.c
@@ -19,6 +19,7 @@
 #include <asm/hvcall.h>
 #include <asm/xics.h>
 #include <asm/debug.h>
+#include <asm/time.h>
 
 #include <linux/debugfs.h>
 #include <linux/seq_file.h>
diff --git a/arch/powerpc/kvm/booke.c b/arch/powerpc/kvm/booke.c
index dcc94f016007..17722d82f1d1 100644
--- a/arch/powerpc/kvm/booke.c
+++ b/arch/powerpc/kvm/booke.c
@@ -674,8 +674,6 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
                 goto out;
         }
 
-        kvm_guest_enter();
-
 #ifdef CONFIG_PPC_FPU
         /* Save userspace FPU state in stack */
         enable_kernel_fp();
@@ -698,7 +696,7 @@ int kvmppc_vcpu_run(struct kvm_run *kvm_run, struct kvm_vcpu *vcpu)
         kvmppc_load_guest_fp(vcpu);
 #endif
 
-        kvmppc_lazy_ee_enable();
+        kvmppc_fix_ee_before_entry();
 
         ret = __kvmppc_vcpu_run(kvm_run, vcpu);
 
@@ -1168,7 +1166,7 @@ int kvmppc_handle_exit(struct kvm_run *run, struct kvm_vcpu *vcpu,
                         local_irq_enable();
                         r = (s << 2) | RESUME_HOST | (r & RESUME_FLAG_NV);
                 } else {
-                        kvmppc_lazy_ee_enable();
+                        kvmppc_fix_ee_before_entry();
                 }
         }
 
diff --git a/arch/powerpc/kvm/emulate.c b/arch/powerpc/kvm/emulate.c
index 2c52ada30775..751cd45f65a0 100644
--- a/arch/powerpc/kvm/emulate.c
+++ b/arch/powerpc/kvm/emulate.c
@@ -30,53 +30,10 @@
 #include <asm/byteorder.h>
 #include <asm/kvm_ppc.h>
 #include <asm/disassemble.h>
+#include <asm/ppc-opcode.h>
 #include "timing.h"
 #include "trace.h"
 
-#define OP_TRAP 3
-#define OP_TRAP_64 2
-
-#define OP_31_XOP_TRAP      4
-#define OP_31_XOP_LWZX      23
-#define OP_31_XOP_DCBST     54
-#define OP_31_XOP_TRAP_64   68
-#define OP_31_XOP_DCBF      86
-#define OP_31_XOP_LBZX      87
-#define OP_31_XOP_STWX      151
-#define OP_31_XOP_STBX      215
-#define OP_31_XOP_LBZUX     119
-#define OP_31_XOP_STBUX     247
-#define OP_31_XOP_LHZX      279
-#define OP_31_XOP_LHZUX     311
-#define OP_31_XOP_MFSPR     339
-#define OP_31_XOP_LHAX      343
-#define OP_31_XOP_STHX      407
-#define OP_31_XOP_STHUX     439
-#define OP_31_XOP_MTSPR     467
-#define OP_31_XOP_DCBI      470
-#define OP_31_XOP_LWBRX     534
-#define OP_31_XOP_TLBSYNC   566
-#define OP_31_XOP_STWBRX    662
-#define OP_31_XOP_LHBRX     790
-#define OP_31_XOP_STHBRX    918
-
-#define OP_LWZ  32
-#define OP_LD   58
-#define OP_LWZU 33
-#define OP_LBZ  34
-#define OP_LBZU 35
-#define OP_STW  36
-#define OP_STWU 37
-#define OP_STD  62
-#define OP_STB  38
-#define OP_STBU 39
-#define OP_LHZ  40
-#define OP_LHZU 41
-#define OP_LHA  42
-#define OP_LHAU 43
-#define OP_STH  44
-#define OP_STHU 45
-
 void kvmppc_emulate_dec(struct kvm_vcpu *vcpu)
 {
         unsigned long dec_nsec;
diff --git a/arch/powerpc/kvm/powerpc.c b/arch/powerpc/kvm/powerpc.c
index 6316ee336e88..07c0106fab76 100644
--- a/arch/powerpc/kvm/powerpc.c
+++ b/arch/powerpc/kvm/powerpc.c
@@ -117,8 +117,6 @@ int kvmppc_prepare_to_enter(struct kvm_vcpu *vcpu)
                         kvm_guest_exit();
                         continue;
                 }
-
-                trace_hardirqs_on();
 #endif
 
                 kvm_guest_enter();
@@ -420,6 +418,10 @@ int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages)
         return kvmppc_core_create_memslot(slot, npages);
 }
 
+void kvm_arch_memslots_updated(struct kvm *kvm)
+{
+}
+
 int kvm_arch_prepare_memory_region(struct kvm *kvm,
                                    struct kvm_memory_slot *memslot,
                                    struct kvm_userspace_memory_region *mem,
@@ -823,39 +825,39 @@ static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu,
 #endif
 #ifdef CONFIG_KVM_MPIC
         case KVM_CAP_IRQ_MPIC: {
-                struct file *filp;
+                struct fd f;
                 struct kvm_device *dev;
 
                 r = -EBADF;
-                filp = fget(cap->args[0]);
-                if (!filp)
+                f = fdget(cap->args[0]);
+                if (!f.file)
                         break;
 
                 r = -EPERM;
-                dev = kvm_device_from_filp(filp);
+                dev = kvm_device_from_filp(f.file);
                 if (dev)
                         r = kvmppc_mpic_connect_vcpu(dev, vcpu, cap->args[1]);
 
-                fput(filp);
+                fdput(f);
                 break;
         }
 #endif
 #ifdef CONFIG_KVM_XICS
         case KVM_CAP_IRQ_XICS: {
-                struct file *filp;
+                struct fd f;
                 struct kvm_device *dev;
 
                 r = -EBADF;
-                filp = fget(cap->args[0]);
-                if (!filp)
+                f = fdget(cap->args[0]);
+                if (!f.file)
                         break;
 
                 r = -EPERM;
-                dev = kvm_device_from_filp(filp);
+                dev = kvm_device_from_filp(f.file);
                 if (dev)
                         r = kvmppc_xics_connect_vcpu(dev, vcpu, cap->args[1]);
 
-                fput(filp);
+                fdput(f);
                 break;
         }
 #endif /* CONFIG_KVM_XICS */
diff --git a/arch/powerpc/lib/locks.c b/arch/powerpc/lib/locks.c
index bb7cfecf2788..0c9c8d7d0734 100644
--- a/arch/powerpc/lib/locks.c
+++ b/arch/powerpc/lib/locks.c
@@ -32,7 +32,7 @@ void __spin_yield(arch_spinlock_t *lock)
                 return;
         holder_cpu = lock_value & 0xffff;
         BUG_ON(holder_cpu >= NR_CPUS);
-        yield_count = lppaca_of(holder_cpu).yield_count;
+        yield_count = be32_to_cpu(lppaca_of(holder_cpu).yield_count);
         if ((yield_count & 1) == 0)
                 return;         /* virtual cpu is currently running */
         rmb();
@@ -57,7 +57,7 @@ void __rw_yield(arch_rwlock_t *rw)
                 return;         /* no write lock at present */
         holder_cpu = lock_value & 0xffff;
         BUG_ON(holder_cpu >= NR_CPUS);
-        yield_count = lppaca_of(holder_cpu).yield_count;
+        yield_count = be32_to_cpu(lppaca_of(holder_cpu).yield_count);
         if ((yield_count & 1) == 0)
                 return;         /* virtual cpu is currently running */
         rmb();
diff --git a/arch/powerpc/lib/sstep.c b/arch/powerpc/lib/sstep.c
index 99c7fc16dc0d..b1faa1593c90 100644
--- a/arch/powerpc/lib/sstep.c
+++ b/arch/powerpc/lib/sstep.c
@@ -100,8 +100,10 @@ static unsigned long __kprobes dform_ea(unsigned int instr, struct pt_regs *regs
         ea = (signed short) instr;              /* sign-extend */
         if (ra) {
                 ea += regs->gpr[ra];
-                if (instr & 0x04000000)         /* update forms */
-                        regs->gpr[ra] = ea;
+                if (instr & 0x04000000) {               /* update forms */
+                        if ((instr>>26) != 47)          /* stmw is not an update form */
+                                regs->gpr[ra] = ea;
+                }
         }
 
         return truncate_if_32bit(regs->msr, ea);
@@ -279,7 +281,7 @@ static int __kprobes write_mem_unaligned(unsigned long val, unsigned long ea,
                 err = write_mem_aligned(val >> (nb - c) * 8, ea, c);
                 if (err)
                         return err;
-                ++ea;
+                ea += c;
         }
         return 0;
 }
@@ -1503,6 +1505,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
                  */
                 if ((ra == 1) && !(regs->msr & MSR_PR) \
                         && (val3 >= (regs->gpr[1] - STACK_INT_FRAME_SIZE))) {
+#ifdef CONFIG_PPC32
                         /*
                          * Check if we will touch kernel sack overflow
                          */
@@ -1511,7 +1514,7 @@ int __kprobes emulate_step(struct pt_regs *regs, unsigned int instr)
                                 err = -EINVAL;
                                 break;
                         }
-
+#endif /* CONFIG_PPC32 */
                         /*
                          * Check if we already set since that means we'll
                          * lose the previous value.
diff --git a/arch/powerpc/math-emu/Makefile b/arch/powerpc/math-emu/Makefile
index 8d035d2d42a6..1b46ab4f6417 100644
--- a/arch/powerpc/math-emu/Makefile
+++ b/arch/powerpc/math-emu/Makefile
@@ -1,15 +1,15 @@
-
-obj-$(CONFIG_MATH_EMULATION)    += fabs.o fadd.o fadds.o fcmpo.o fcmpu.o \
-                                        fctiw.o fctiwz.o fdiv.o fdivs.o \
-                                        fmadd.o fmadds.o fmsub.o fmsubs.o \
-                                        fmul.o fmuls.o fnabs.o fneg.o \
-                                        fnmadd.o fnmadds.o fnmsub.o fnmsubs.o \
-                                        fres.o fre.o frsp.o fsel.o lfs.o \
-                                        frsqrte.o frsqrtes.o \
-                                        fsqrt.o fsqrts.o fsub.o fsubs.o \
-                                        mcrfs.o mffs.o mtfsb0.o mtfsb1.o \
-                                        mtfsf.o mtfsfi.o stfiwx.o stfs.o \
-                                        math.o fmr.o lfd.o stfd.o
+math-emu-common-objs = math.o fre.o fsqrt.o fsqrts.o frsqrtes.o mtfsf.o mtfsfi.o
+obj-$(CONFIG_MATH_EMULATION_HW_UNIMPLEMENTED) += $(math-emu-common-objs)
+obj-$(CONFIG_MATH_EMULATION_FULL) += $(math-emu-common-objs) fabs.o fadd.o \
+                                        fadds.o fcmpo.o fcmpu.o fctiw.o \
+                                        fctiwz.o fdiv.o fdivs.o  fmadd.o \
+                                        fmadds.o fmsub.o fmsubs.o fmul.o \
+                                        fmuls.o fnabs.o fneg.o fnmadd.o \
+                                        fnmadds.o fnmsub.o fnmsubs.o fres.o \
+                                        frsp.o fsel.o lfs.o frsqrte.o fsub.o \
+                                        fsubs.o  mcrfs.o mffs.o mtfsb0.o \
+                                        mtfsb1.o stfiwx.o stfs.o math.o \
+                                        fmr.o lfd.o stfd.o
 
 obj-$(CONFIG_SPE)               += math_efp.o
 
diff --git a/arch/powerpc/math-emu/math.c b/arch/powerpc/math-emu/math.c
index 0328e66e0799..ab151f040502 100644
--- a/arch/powerpc/math-emu/math.c
+++ b/arch/powerpc/math-emu/math.c
@@ -7,12 +7,27 @@
 
 #include <asm/uaccess.h>
 #include <asm/reg.h>
+#include <asm/switch_to.h>
 
 #include <asm/sfp-machine.h>
 #include <math-emu/double.h>
 
 #define FLOATFUNC(x)    extern int x(void *, void *, void *, void *)
 
+/* The instructions list which may be not implemented by a hardware FPU */
+FLOATFUNC(fre);
+FLOATFUNC(frsqrtes);
+FLOATFUNC(fsqrt);
+FLOATFUNC(fsqrts);
+FLOATFUNC(mtfsf);
+FLOATFUNC(mtfsfi);
+
+#ifdef CONFIG_MATH_EMULATION_HW_UNIMPLEMENTED
+#undef FLOATFUNC(x)
+#define FLOATFUNC(x)    static inline int x(void *op1, void *op2, void *op3, \
+                                                 void *op4) { }
+#endif
+
 FLOATFUNC(fadd);
 FLOATFUNC(fadds);
 FLOATFUNC(fdiv);
@@ -42,8 +57,6 @@ FLOATFUNC(mcrfs);
 FLOATFUNC(mffs);
 FLOATFUNC(mtfsb0);
 FLOATFUNC(mtfsb1);
-FLOATFUNC(mtfsf);
-FLOATFUNC(mtfsfi);
 
 FLOATFUNC(lfd);
 FLOATFUNC(lfs);
@@ -58,13 +71,9 @@ FLOATFUNC(fnabs);
 FLOATFUNC(fneg);
 
 /* Optional */
-FLOATFUNC(fre);
 FLOATFUNC(fres);
 FLOATFUNC(frsqrte);
-FLOATFUNC(frsqrtes);
 FLOATFUNC(fsel);
-FLOATFUNC(fsqrt);
-FLOATFUNC(fsqrts);
 
 
 #define OP31            0x1f            /*   31 */
@@ -154,7 +163,6 @@ FLOATFUNC(fsqrts);
 #define XEU     15
 #define XFLB    10
 
-#ifdef CONFIG_MATH_EMULATION
 static int
 record_exception(struct pt_regs *regs, int eflag)
 {
@@ -212,7 +220,6 @@ record_exception(struct pt_regs *regs, int eflag)
 
         return (fpscr & FPSCR_FEX) ? 1 : 0;
 }
-#endif /* CONFIG_MATH_EMULATION */
 
 int
 do_mathemu(struct pt_regs *regs)
@@ -222,56 +229,13 @@ do_mathemu(struct pt_regs *regs)
         signed short sdisp;
         u32 insn = 0;
         int idx = 0;
-#ifdef CONFIG_MATH_EMULATION
         int (*func)(void *, void *, void *, void *);
         int type = 0;
         int eflag, trap;
-#endif
 
         if (get_user(insn, (u32 *)pc))
                 return -EFAULT;
 
-#ifndef CONFIG_MATH_EMULATION
-        switch (insn >> 26) {
-        case LFD:
-                idx = (insn >> 16) & 0x1f;
-                sdisp = (insn & 0xffff);
-                op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
-                op1 = (void *)((idx ? regs->gpr[idx] : 0) + sdisp);
-                lfd(op0, op1, op2, op3);
-                break;
-        case LFDU:
-                idx = (insn >> 16) & 0x1f;
-                sdisp = (insn & 0xffff);
-                op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
-                op1 = (void *)((idx ? regs->gpr[idx] : 0) + sdisp);
-                lfd(op0, op1, op2, op3);
-                regs->gpr[idx] = (unsigned long)op1;
-                break;
-        case STFD:
-                idx = (insn >> 16) & 0x1f;
-                sdisp = (insn & 0xffff);
-                op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
-                op1 = (void *)((idx ? regs->gpr[idx] : 0) + sdisp);
-                stfd(op0, op1, op2, op3);
-                break;
-        case STFDU:
-                idx = (insn >> 16) & 0x1f;
-                sdisp = (insn & 0xffff);
-                op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
-                op1 = (void *)((idx ? regs->gpr[idx] : 0) + sdisp);
-                stfd(op0, op1, op2, op3);
-                regs->gpr[idx] = (unsigned long)op1;
-                break;
-        case OP63:
-                op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
-                op1 = (void *)&current->thread.TS_FPR((insn >> 11) & 0x1f);
-                fmr(op0, op1, op2, op3);
-                break;
-        default:
-                goto illegal;
-        }
-#else /* CONFIG_MATH_EMULATION */
         switch (insn >> 26) {
         case LFS:       func = lfs;     type = D;       break;
         case LFSU:      func = lfs;     type = DU;      break;
@@ -416,21 +380,16 @@ do_mathemu(struct pt_regs *regs)
         case XE:
                 idx = (insn >> 16) & 0x1f;
                 op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
-                if (!idx) {
-                        if (((insn >> 1) & 0x3ff) == STFIWX)
-                                op1 = (void *)(regs->gpr[(insn >> 11) & 0x1f]);
-                        else
-                                goto illegal;
-                } else {
-                        op1 = (void *)(regs->gpr[idx] + regs->gpr[(insn >> 11) & 0x1f]);
-                }
-
+                op1 = (void *)((idx ? regs->gpr[idx] : 0)
+                                + regs->gpr[(insn >> 11) & 0x1f]);
                 break;
 
         case XEU:
                 idx = (insn >> 16) & 0x1f;
+                if (!idx)
+                        goto illegal;
                 op0 = (void *)&current->thread.TS_FPR((insn >> 21) & 0x1f);
-                op1 = (void *)((idx ? regs->gpr[idx] : 0)
+                op1 = (void *)(regs->gpr[idx]
                                 + regs->gpr[(insn >> 11) & 0x1f]);
                 break;
 
@@ -465,6 +424,13 @@ do_mathemu(struct pt_regs *regs)
                 goto illegal;
         }
 
+        /*
+         * If we support a HW FPU, we need to ensure the FP state
+         * is flushed into the thread_struct before attempting
+         * emulation
+         */
+        flush_fp_to_thread(current);
+
         eflag = func(op0, op1, op2, op3);
 
         if (insn & 1) {
@@ -485,7 +451,6 @@ do_mathemu(struct pt_regs *regs)
         default:
                 break;
         }
-#endif /* CONFIG_MATH_EMULATION */
 
         regs->nip += 4;
         return 0;
diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c
index 8726779e1409..51ab9e7e6c39 100644
--- a/arch/powerpc/mm/fault.c
+++ b/arch/powerpc/mm/fault.c
@@ -206,7 +206,7 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
         int trap = TRAP(regs);
         int is_exec = trap == 0x400;
         int fault;
-        int rc = 0;
+        int rc = 0, store_update_sp = 0;
 
 #if !(defined(CONFIG_4xx) || defined(CONFIG_BOOKE))
         /*
@@ -223,9 +223,6 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
         is_write = error_code & ESR_DST;
 #endif /* CONFIG_4xx || CONFIG_BOOKE */
 
-        if (is_write)
-                flags |= FAULT_FLAG_WRITE;
-
 #ifdef CONFIG_PPC_ICSWX
         /*
          * we need to do this early because this "data storage
@@ -280,6 +277,17 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
 
         perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address);
 
+        /*
+         * We want to do this outside mmap_sem, because reading code around nip
+         * can result in fault, which will cause a deadlock when called with
+         * mmap_sem held
+         */
+        if (user_mode(regs))
+                store_update_sp = store_updates_sp(regs);
+
+        if (user_mode(regs))
+                flags |= FAULT_FLAG_USER;
+
         /* When running in the kernel we expect faults to occur only to
          * addresses in user space.  All other faults represent errors in the
          * kernel and should generate an OOPS.  Unfortunately, in the case of an
@@ -345,8 +353,7 @@ retry:
                  * between the last mapped region and the stack will
                  * expand the stack rather than segfaulting.
                  */
-                if (address + 2048 < uregs->gpr[1]
-                    && (!user_mode(regs) || !store_updates_sp(regs)))
+                if (address + 2048 < uregs->gpr[1] && !store_update_sp)
                         goto bad_area;
         }
         if (expand_stack(vma, address))
@@ -408,6 +415,7 @@ good_area:
         } else if (is_write) {
                 if (!(vma->vm_flags & VM_WRITE))
                         goto bad_area;
+                flags |= FAULT_FLAG_WRITE;
         /* a read */
         } else {
                 /* protection fault */
@@ -443,8 +451,12 @@ good_area:
                                       regs, address);
 #ifdef CONFIG_PPC_SMLPAR
                         if (firmware_has_feature(FW_FEATURE_CMO)) {
+                                u32 page_ins;
+
                                 preempt_disable();
-                                get_lppaca()->page_ins += (1 << PAGE_FACTOR);
+                                page_ins = be32_to_cpu(get_lppaca()->page_ins);
+                                page_ins += 1 << PAGE_FACTOR;
+                                get_lppaca()->page_ins = cpu_to_be32(page_ins);
                                 preempt_enable();
                         }
 #endif /* CONFIG_PPC_SMLPAR */
diff --git a/arch/powerpc/mm/gup.c b/arch/powerpc/mm/gup.c
index 49822d90ea96..6936547018b8 100644
--- a/arch/powerpc/mm/gup.c
+++ b/arch/powerpc/mm/gup.c
@@ -117,8 +117,8 @@ static int gup_pud_range(pgd_t pgd, unsigned long addr, unsigned long end,
         return 1;
 }
 
-int get_user_pages_fast(unsigned long start, int nr_pages, int write,
-                        struct page **pages)
+int __get_user_pages_fast(unsigned long start, int nr_pages, int write,
+                          struct page **pages)
 {
         struct mm_struct *mm = current->mm;
         unsigned long addr, len, end;
@@ -135,7 +135,7 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
 
         if (unlikely(!access_ok(write ? VERIFY_WRITE : VERIFY_READ,
                                         start, len)))
-                goto slow_irqon;
+                return 0;
 
         pr_devel("  aligned: %lx .. %lx\n", start, end);
 
@@ -166,30 +166,35 @@ int get_user_pages_fast(unsigned long start, int nr_pages, int write,
                          (void *)pgd_val(pgd));
                 next = pgd_addr_end(addr, end);
                 if (pgd_none(pgd))
-                        goto slow;
+                        break;
                 if (pgd_huge(pgd)) {
                         if (!gup_hugepte((pte_t *)pgdp, PGDIR_SIZE, addr, next,
                                          write, pages, &nr))
-                                goto slow;
+                                break;
                 } else if (is_hugepd(pgdp)) {
                         if (!gup_hugepd((hugepd_t *)pgdp, PGDIR_SHIFT,
                                         addr, next, write, pages, &nr))
-                                goto slow;
+                                break;
                 } else if (!gup_pud_range(pgd, addr, next, write, pages, &nr))
-                        goto slow;
+                        break;
         } while (pgdp++, addr = next, addr != end);
 
         local_irq_enable();
 
-        VM_BUG_ON(nr != (end - start) >> PAGE_SHIFT);
         return nr;
+}
 
-        {
-                int ret;
+int get_user_pages_fast(unsigned long start, int nr_pages, int write,
+                        struct page **pages)
+{
+        struct mm_struct *mm = current->mm;
+        int nr, ret;
+
+        start &= PAGE_MASK;
+        nr = __get_user_pages_fast(start, nr_pages, write, pages);
+        ret = nr;
 
-slow:
-                local_irq_enable();
-slow_irqon:
+        if (nr < nr_pages) {
                 pr_devel("  slow path ! nr = %d\n", nr);
 
                 /* Try to get the remaining pages with get_user_pages */
@@ -198,7 +203,7 @@ slow_irqon:
 
                 down_read(&mm->mmap_sem);
                 ret = get_user_pages(current, mm, start,
-                        (end - start) >> PAGE_SHIFT, write, 0, pages, NULL);
+                                     nr_pages - nr, write, 0, pages, NULL);
                 up_read(&mm->mmap_sem);
 
                 /* Have to be a bit careful with return values */
@@ -208,9 +213,9 @@ slow_irqon:
                         else
                                 ret += nr;
                 }
-
-                return ret;
         }
+
+        return ret;
 }
 
 #endif /* __HAVE_ARCH_PTE_SPECIAL */
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c
index 6ecc38bd5b24..bde8b5589755 100644
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
@@ -907,7 +907,7 @@ static int subpage_protection(struct mm_struct *mm, unsigned long ea)
 
         if (ea >= spt->maxaddr)
                 return 0;
-        if (ea < 0x100000000) {
+        if (ea < 0x100000000UL) {
                 /* addresses below 4GB use spt->low_prot */
                 sbpm = spt->low_prot;
         } else {
diff --git a/arch/powerpc/mm/hugetlbpage.c b/arch/powerpc/mm/hugetlbpage.c
index 834ca8eb38f2..d67db4bd672d 100644
--- a/arch/powerpc/mm/hugetlbpage.c
+++ b/arch/powerpc/mm/hugetlbpage.c
@@ -86,6 +86,11 @@ int pgd_huge(pgd_t pgd)
          */
         return ((pgd_val(pgd) & 0x3) != 0x0);
 }
+
+int pmd_huge_support(void)
+{
+        return 1;
+}
 #else
 int pmd_huge(pmd_t pmd)
 {
@@ -101,6 +106,11 @@ int pgd_huge(pgd_t pgd)
 {
         return 0;
 }
+
+int pmd_huge_support(void)
+{
+        return 0;
+}
 #endif
 
 pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)
diff --git a/arch/powerpc/mm/init_32.c b/arch/powerpc/mm/init_32.c
index 01e2db97a210..d47d3dab4870 100644
--- a/arch/powerpc/mm/init_32.c
+++ b/arch/powerpc/mm/init_32.c
@@ -52,7 +52,7 @@
 #if defined(CONFIG_KERNEL_START_BOOL) || defined(CONFIG_LOWMEM_SIZE_BOOL)
 /* The amount of lowmem must be within 0xF0000000 - KERNELBASE. */
 #if (CONFIG_LOWMEM_SIZE > (0xF0000000 - PAGE_OFFSET))
-#error "You must adjust CONFIG_LOWMEM_SIZE or CONFIG_START_KERNEL"
+#error "You must adjust CONFIG_LOWMEM_SIZE or CONFIG_KERNEL_START"
 #endif
 #endif
 #define MAX_LOW_MEM     CONFIG_LOWMEM_SIZE
diff --git a/arch/powerpc/mm/mem.c b/arch/powerpc/mm/mem.c
index 7f4bea162026..1cf9c5b67f24 100644
--- a/arch/powerpc/mm/mem.c
+++ b/arch/powerpc/mm/mem.c
@@ -514,7 +514,7 @@ static int add_system_ram_resources(void)
                         res->name = "System RAM";
                         res->start = base;
                         res->end = base + size - 1;
-                        res->flags = IORESOURCE_MEM;
+                        res->flags = IORESOURCE_MEM | IORESOURCE_BUSY;
                         WARN_ON(request_resource(&iomem_resource, res) < 0);
                 }
         }
diff --git a/arch/powerpc/mm/numa.c b/arch/powerpc/mm/numa.c
index 5850798826cd..c916127f10c3 100644
--- a/arch/powerpc/mm/numa.c
+++ b/arch/powerpc/mm/numa.c
@@ -58,7 +58,7 @@ static int form1_affinity;
 
 #define MAX_DISTANCE_REF_POINTS 4
 static int distance_ref_points_depth;
-static const unsigned int *distance_ref_points;
+static const __be32 *distance_ref_points;
 static int distance_lookup_table[MAX_NUMNODES][MAX_DISTANCE_REF_POINTS];
 
 /*
@@ -179,7 +179,7 @@ static void unmap_cpu_from_node(unsigned long cpu)
 #endif /* CONFIG_HOTPLUG_CPU || CONFIG_PPC_SPLPAR */
 
 /* must hold reference to node during call */
-static const int *of_get_associativity(struct device_node *dev)
+static const __be32 *of_get_associativity(struct device_node *dev)
 {
         return of_get_property(dev, "ibm,associativity", NULL);
 }
@@ -189,9 +189,9 @@ static const int *of_get_associativity(struct device_node *dev)
  * it exists (the property exists only in kexec/kdump kernels,
  * added by kexec-tools)
  */
-static const u32 *of_get_usable_memory(struct device_node *memory)
+static const __be32 *of_get_usable_memory(struct device_node *memory)
 {
-        const u32 *prop;
+        const __be32 *prop;
         u32 len;
         prop = of_get_property(memory, "linux,drconf-usable-memory", &len);
         if (!prop || len < sizeof(unsigned int))
@@ -219,7 +219,7 @@ int __node_distance(int a, int b)
 }
 
 static void initialize_distance_lookup_table(int nid,
-                const unsigned int *associativity)
+                const __be32 *associativity)
 {
         int i;
 
@@ -227,29 +227,32 @@ static void initialize_distance_lookup_table(int nid,
                 return;
 
         for (i = 0; i < distance_ref_points_depth; i++) {
-                distance_lookup_table[nid][i] =
-                        associativity[distance_ref_points[i]];
+                const __be32 *entry;
+
+                entry = &associativity[be32_to_cpu(distance_ref_points[i])];
+                distance_lookup_table[nid][i] = of_read_number(entry, 1);
         }
 }
 
 /* Returns nid in the range [0..MAX_NUMNODES-1], or -1 if no useful numa
  * info is found.
  */
-static int associativity_to_nid(const unsigned int *associativity)
+static int associativity_to_nid(const __be32 *associativity)
 {
         int nid = -1;
 
         if (min_common_depth == -1)
                 goto out;
 
-        if (associativity[0] >= min_common_depth)
-                nid = associativity[min_common_depth];
+        if (of_read_number(associativity, 1) >= min_common_depth)
+                nid = of_read_number(&associativity[min_common_depth], 1);
 
         /* POWER4 LPAR uses 0xffff as invalid node */
         if (nid == 0xffff || nid >= MAX_NUMNODES)
                 nid = -1;
 
-        if (nid > 0 && associativity[0] >= distance_ref_points_depth)
+        if (nid > 0 &&
+            of_read_number(associativity, 1) >= distance_ref_points_depth)
                 initialize_distance_lookup_table(nid, associativity);
 
 out:
@@ -262,7 +265,7 @@ out:
 static int of_node_to_nid_single(struct device_node *device)
 {
         int nid = -1;
-        const unsigned int *tmp;
+        const __be32 *tmp;
 
         tmp = of_get_associativity(device);
         if (tmp)
@@ -334,7 +337,7 @@ static int __init find_min_common_depth(void)
         }
 
         if (form1_affinity) {
-                depth = distance_ref_points[0];
+                depth = of_read_number(distance_ref_points, 1);
         } else {
                 if (distance_ref_points_depth < 2) {
                         printk(KERN_WARNING "NUMA: "
@@ -342,7 +345,7 @@ static int __init find_min_common_depth(void)
                         goto err;
                 }
 
-                depth = distance_ref_points[1];
+                depth = of_read_number(&distance_ref_points[1], 1);
         }
 
         /*
@@ -376,12 +379,12 @@ static void __init get_n_mem_cells(int *n_addr_cells, int *n_size_cells)
         of_node_put(memory);
 }
 
-static unsigned long read_n_cells(int n, const unsigned int **buf)
+static unsigned long read_n_cells(int n, const __be32 **buf)
 {
         unsigned long result = 0;
 
         while (n--) {
-                result = (result << 32) | **buf;
+                result = (result << 32) | of_read_number(*buf, 1);
                 (*buf)++;
         }
         return result;
@@ -391,17 +394,17 @@ static unsigned long read_n_cells(int n, const unsigned int **buf)
  * Read the next memblock list entry from the ibm,dynamic-memory property
  * and return the information in the provided of_drconf_cell structure.
  */
-static void read_drconf_cell(struct of_drconf_cell *drmem, const u32 **cellp)
+static void read_drconf_cell(struct of_drconf_cell *drmem, const __be32 **cellp)
 {
-        const u32 *cp;
+        const __be32 *cp;
 
         drmem->base_addr = read_n_cells(n_mem_addr_cells, cellp);
 
         cp = *cellp;
-        drmem->drc_index = cp[0];
-        drmem->reserved = cp[1];
-        drmem->aa_index = cp[2];
-        drmem->flags = cp[3];
+        drmem->drc_index = of_read_number(cp, 1);
+        drmem->reserved = of_read_number(&cp[1], 1);
+        drmem->aa_index = of_read_number(&cp[2], 1);
+        drmem->flags = of_read_number(&cp[3], 1);
 
         *cellp = cp + 4;
 }
@@ -413,16 +416,16 @@ static void read_drconf_cell(struct of_drconf_cell *drmem, const u32 **cellp)
  * list entries followed by N memblock list entries.  Each memblock list entry
  * contains information as laid out in the of_drconf_cell struct above.
  */
-static int of_get_drconf_memory(struct device_node *memory, const u32 **dm)
+static int of_get_drconf_memory(struct device_node *memory, const __be32 **dm)
 {
-        const u32 *prop;
+        const __be32 *prop;
         u32 len, entries;
 
         prop = of_get_property(memory, "ibm,dynamic-memory", &len);
         if (!prop || len < sizeof(unsigned int))
                 return 0;
 
-        entries = *prop++;
+        entries = of_read_number(prop++, 1);
 
         /* Now that we know the number of entries, revalidate the size
          * of the property read in to ensure we have everything
@@ -440,7 +443,7 @@ static int of_get_drconf_memory(struct device_node *memory, const u32 **dm)
  */
 static u64 of_get_lmb_size(struct device_node *memory)
 {
-        const u32 *prop;
+        const __be32 *prop;
         u32 len;
 
         prop = of_get_property(memory, "ibm,lmb-size", &len);
@@ -453,7 +456,7 @@ static u64 of_get_lmb_size(struct device_node *memory)
 struct assoc_arrays {
         u32     n_arrays;
         u32     array_sz;
-        const u32 *arrays;
+        const __be32 *arrays;
 };
 
 /*
@@ -469,15 +472,15 @@ struct assoc_arrays {
 static int of_get_assoc_arrays(struct device_node *memory,
                                struct assoc_arrays *aa)
 {
-        const u32 *prop;
+        const __be32 *prop;
         u32 len;
 
         prop = of_get_property(memory, "ibm,associativity-lookup-arrays", &len);
         if (!prop || len < 2 * sizeof(unsigned int))
                 return -1;
 
-        aa->n_arrays = *prop++;
-        aa->array_sz = *prop++;
+        aa->n_arrays = of_read_number(prop++, 1);
+        aa->array_sz = of_read_number(prop++, 1);
 
         /* Now that we know the number of arrays and size of each array,
          * revalidate the size of the property read in.
@@ -504,7 +507,7 @@ static int of_drconf_to_nid_single(struct of_drconf_cell *drmem,
             !(drmem->flags & DRCONF_MEM_AI_INVALID) &&
             drmem->aa_index < aa->n_arrays) {
                 index = drmem->aa_index * aa->array_sz + min_common_depth - 1;
-                nid = aa->arrays[index];
+                nid = of_read_number(&aa->arrays[index], 1);
 
                 if (nid == 0xffff || nid >= MAX_NUMNODES)
                         nid = default_nid;
@@ -595,7 +598,7 @@ static unsigned long __init numa_enforce_memory_limit(unsigned long start,
  * Reads the counter for a given entry in
  * linux,drconf-usable-memory property
  */
-static inline int __init read_usm_ranges(const u32 **usm)
+static inline int __init read_usm_ranges(const __be32 **usm)
 {
         /*
          * For each lmb in ibm,dynamic-memory a corresponding
@@ -612,7 +615,7 @@ static inline int __init read_usm_ranges(const u32 **usm)
  */
 static void __init parse_drconf_memory(struct device_node *memory)
 {
-        const u32 *uninitialized_var(dm), *usm;
+        const __be32 *uninitialized_var(dm), *usm;
         unsigned int n, rc, ranges, is_kexec_kdump = 0;
         unsigned long lmb_size, base, size, sz;
         int nid;
@@ -721,7 +724,7 @@ static int __init parse_numa_properties(void)
                 unsigned long size;
                 int nid;
                 int ranges;
-                const unsigned int *memcell_buf;
+                const __be32 *memcell_buf;
                 unsigned int len;
 
                 memcell_buf = of_get_property(memory,
@@ -1106,7 +1109,7 @@ early_param("numa", early_numa);
 static int hot_add_drconf_scn_to_nid(struct device_node *memory,
                                      unsigned long scn_addr)
 {
-        const u32 *dm;
+        const __be32 *dm;
         unsigned int drconf_cell_cnt, rc;
         unsigned long lmb_size;
         struct assoc_arrays aa;
@@ -1159,7 +1162,7 @@ int hot_add_node_scn_to_nid(unsigned long scn_addr)
         for_each_node_by_type(memory, "memory") {
                 unsigned long start, size;
                 int ranges;
-                const unsigned int *memcell_buf;
+                const __be32 *memcell_buf;
                 unsigned int len;
 
                 memcell_buf = of_get_property(memory, "reg", &len);
@@ -1232,7 +1235,7 @@ static u64 hot_add_drconf_memory_max(void)
         struct device_node *memory = NULL;
         unsigned int drconf_cell_cnt = 0;
         u64 lmb_size = 0;
-        const u32 *dm = 0;
+        const __be32 *dm = 0;
 
         memory = of_find_node_by_path("/ibm,dynamic-reconfiguration-memory");
         if (memory) {
@@ -1337,40 +1340,41 @@ static int update_cpu_associativity_changes_mask(void)
  * Convert the associativity domain numbers returned from the hypervisor
  * to the sequence they would appear in the ibm,associativity property.
  */
-static int vphn_unpack_associativity(const long *packed, unsigned int *unpacked)
+static int vphn_unpack_associativity(const long *packed, __be32 *unpacked)
 {
         int i, nr_assoc_doms = 0;
-        const u16 *field = (const u16*) packed;
+        const __be16 *field = (const __be16 *) packed;
 
 #define VPHN_FIELD_UNUSED       (0xffff)
 #define VPHN_FIELD_MSB          (0x8000)
 #define VPHN_FIELD_MASK         (~VPHN_FIELD_MSB)
 
         for (i = 1; i < VPHN_ASSOC_BUFSIZE; i++) {
-                if (*field == VPHN_FIELD_UNUSED) {
+                if (be16_to_cpup(field) == VPHN_FIELD_UNUSED) {
                         /* All significant fields processed, and remaining
                          * fields contain the reserved value of all 1's.
                          * Just store them.
                          */
-                        unpacked[i] = *((u32*)field);
+                        unpacked[i] = *((__be32 *)field);
                         field += 2;
-                } else if (*field & VPHN_FIELD_MSB) {
+                } else if (be16_to_cpup(field) & VPHN_FIELD_MSB) {
                         /* Data is in the lower 15 bits of this field */
-                        unpacked[i] = *field & VPHN_FIELD_MASK;
+                        unpacked[i] = cpu_to_be32(
+                                be16_to_cpup(field) & VPHN_FIELD_MASK);
                         field++;
                         nr_assoc_doms++;
                 } else {
                         /* Data is in the lower 15 bits of this field
                          * concatenated with the next 16 bit field
                          */
-                        unpacked[i] = *((u32*)field);
+                        unpacked[i] = *((__be32 *)field);
                         field += 2;
                         nr_assoc_doms++;
                 }
         }
 
         /* The first cell contains the length of the property */
-        unpacked[0] = nr_assoc_doms;
+        unpacked[0] = cpu_to_be32(nr_assoc_doms);
 
         return nr_assoc_doms;
 }
@@ -1379,7 +1383,7 @@ static int vphn_unpack_associativity(const long *packed, unsigned int *unpacked)
  * Retrieve the new associativity information for a virtual processor's
  * home node.
  */
-static long hcall_vphn(unsigned long cpu, unsigned int *associativity)
+static long hcall_vphn(unsigned long cpu, __be32 *associativity)
 {
         long rc;
         long retbuf[PLPAR_HCALL9_BUFSIZE] = {0};
@@ -1393,7 +1397,7 @@ static long hcall_vphn(unsigned long cpu, unsigned int *associativity)
 }
 
 static long vphn_get_associativity(unsigned long cpu,
-                                        unsigned int *associativity)
+                                        __be32 *associativity)
 {
         long rc;
 
@@ -1450,7 +1454,7 @@ int arch_update_cpu_topology(void)
 {
         unsigned int cpu, sibling, changed = 0;
         struct topology_update_data *updates, *ud;
-        unsigned int associativity[VPHN_ASSOC_BUFSIZE] = {0};
+        __be32 associativity[VPHN_ASSOC_BUFSIZE] = {0};
         cpumask_t updated_cpus;
         struct device *dev;
         int weight, new_nid, i = 0;
@@ -1609,7 +1613,7 @@ int start_topology_update(void)
 #endif
                 }
         } else if (firmware_has_feature(FW_FEATURE_VPHN) &&
-                   get_lppaca()->shared_proc) {
+                   lppaca_shared_proc(get_lppaca())) {
                 if (!vphn_enabled) {
                         prrn_enabled = 0;
                         vphn_enabled = 1;
diff --git a/arch/powerpc/mm/slb.c b/arch/powerpc/mm/slb.c
index a538c80db2df..9d1d33cd2be5 100644
--- a/arch/powerpc/mm/slb.c
+++ b/arch/powerpc/mm/slb.c
@@ -66,8 +66,10 @@ static inline void slb_shadow_update(unsigned long ea, int ssize,
          * we only update the current CPU's SLB shadow buffer.
          */
         get_slb_shadow()->save_area[entry].esid = 0;
-        get_slb_shadow()->save_area[entry].vsid = mk_vsid_data(ea, ssize, flags);
-        get_slb_shadow()->save_area[entry].esid = mk_esid_data(ea, ssize, entry);
+        get_slb_shadow()->save_area[entry].vsid =
+                                cpu_to_be64(mk_vsid_data(ea, ssize, flags));
+        get_slb_shadow()->save_area[entry].esid =
+                                cpu_to_be64(mk_esid_data(ea, ssize, entry));
 }
 
 static inline void slb_shadow_clear(unsigned long entry)
@@ -112,7 +114,8 @@ static void __slb_flush_and_rebolt(void)
         } else {
                 /* Update stack entry; others don't change */
                 slb_shadow_update(get_paca()->kstack, mmu_kernel_ssize, lflags, 2);
-                ksp_vsid_data = get_slb_shadow()->save_area[2].vsid;
+                ksp_vsid_data =
+                        be64_to_cpu(get_slb_shadow()->save_area[2].vsid);
         }
 
         /* We need to do this all in asm, so we're sure we don't touch
diff --git a/arch/powerpc/mm/subpage-prot.c b/arch/powerpc/mm/subpage-prot.c
index aa74acb0fdfc..a770df2dae70 100644
--- a/arch/powerpc/mm/subpage-prot.c
+++ b/arch/powerpc/mm/subpage-prot.c
@@ -105,7 +105,7 @@ static void subpage_prot_clear(unsigned long addr, unsigned long len)
                 limit = spt->maxaddr;
         for (; addr < limit; addr = next) {
                 next = pmd_addr_end(addr, limit);
-                if (addr < 0x100000000) {
+                if (addr < 0x100000000UL) {
                         spm = spt->low_prot;
                 } else {
                         spm = spt->protptrs[addr >> SBP_L3_SHIFT];
@@ -219,7 +219,7 @@ long sys_subpage_prot(unsigned long addr, unsigned long len, u32 __user *map)
         for (limit = addr + len; addr < limit; addr = next) {
                 next = pmd_addr_end(addr, limit);
                 err = -ENOMEM;
-                if (addr < 0x100000000) {
+                if (addr < 0x100000000UL) {
                         spm = spt->low_prot;
                 } else {
                         spm = spt->protptrs[addr >> SBP_L3_SHIFT];
diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c
index 4f51025f5b00..c77348c5d463 100644
--- a/arch/powerpc/oprofile/common.c
+++ b/arch/powerpc/oprofile/common.c
@@ -119,7 +119,7 @@ static void op_powerpc_stop(void)
                 model->global_stop();
 }
 
-static int op_powerpc_create_files(struct super_block *sb, struct dentry *root)
+static int op_powerpc_create_files(struct dentry *root)
 {
         int i;
 
@@ -128,9 +128,9 @@ static int op_powerpc_create_files(struct super_block *sb, struct dentry *root)
          * There is one mmcr0, mmcr1 and mmcra for setting the events for
          * all of the counters.
          */
-        oprofilefs_create_ulong(sb, root, "mmcr0", &sys.mmcr0);
-        oprofilefs_create_ulong(sb, root, "mmcr1", &sys.mmcr1);
-        oprofilefs_create_ulong(sb, root, "mmcra", &sys.mmcra);
+        oprofilefs_create_ulong(root, "mmcr0", &sys.mmcr0);
+        oprofilefs_create_ulong(root, "mmcr1", &sys.mmcr1);
+        oprofilefs_create_ulong(root, "mmcra", &sys.mmcra);
 #ifdef CONFIG_OPROFILE_CELL
         /* create a file the user tool can check to see what level of profiling
          * support exits with this kernel. Initialize bit mask to indicate
@@ -142,7 +142,7 @@ static int op_powerpc_create_files(struct super_block *sb, struct dentry *root)
          * If the file does not exist, then the kernel only supports SPU
          * cycle profiling, PPU event and cycle profiling.
          */
-        oprofilefs_create_ulong(sb, root, "cell_support", &sys.cell_support);
+        oprofilefs_create_ulong(root, "cell_support", &sys.cell_support);
         sys.cell_support = 0x1; /* Note, the user OProfile tool must check
                                  * that this bit is set before attempting to
                                  * user SPU event profiling.  Older kernels
@@ -160,11 +160,11 @@ static int op_powerpc_create_files(struct super_block *sb, struct dentry *root)
                 char buf[4];
 
                 snprintf(buf, sizeof buf, "%d", i);
-                dir = oprofilefs_mkdir(sb, root, buf);
+                dir = oprofilefs_mkdir(root, buf);
 
-                oprofilefs_create_ulong(sb, dir, "enabled", &ctr[i].enabled);
-                oprofilefs_create_ulong(sb, dir, "event", &ctr[i].event);
-                oprofilefs_create_ulong(sb, dir, "count", &ctr[i].count);
+                oprofilefs_create_ulong(dir, "enabled", &ctr[i].enabled);
+                oprofilefs_create_ulong(dir, "event", &ctr[i].event);
+                oprofilefs_create_ulong(dir, "count", &ctr[i].count);
 
                 /*
                  * Classic PowerPC doesn't support per-counter
@@ -173,14 +173,14 @@ static int op_powerpc_create_files(struct super_block *sb, struct dentry *root)
                  * Book-E style performance monitors, we do
                  * support them.
                  */
-                oprofilefs_create_ulong(sb, dir, "kernel", &ctr[i].kernel);
-                oprofilefs_create_ulong(sb, dir, "user", &ctr[i].user);
+                oprofilefs_create_ulong(dir, "kernel", &ctr[i].kernel);
+                oprofilefs_create_ulong(dir, "user", &ctr[i].user);
 
-                oprofilefs_create_ulong(sb, dir, "unit_mask", &ctr[i].unit_mask);
+                oprofilefs_create_ulong(dir, "unit_mask", &ctr[i].unit_mask);
         }
 
-        oprofilefs_create_ulong(sb, root, "enable_kernel", &sys.enable_kernel);
-        oprofilefs_create_ulong(sb, root, "enable_user", &sys.enable_user);
+        oprofilefs_create_ulong(root, "enable_kernel", &sys.enable_kernel);
+        oprofilefs_create_ulong(root, "enable_user", &sys.enable_user);
 
         /* Default to tracing both kernel and user */
         sys.enable_kernel = 1;
diff --git a/arch/powerpc/oprofile/op_model_fsl_emb.c b/arch/powerpc/oprofile/op_model_fsl_emb.c
index ccc1daa33aed..2a82d3ed464d 100644
--- a/arch/powerpc/oprofile/op_model_fsl_emb.c
+++ b/arch/powerpc/oprofile/op_model_fsl_emb.c
@@ -46,6 +46,12 @@ static inline u32 get_pmlca(int ctr)
                 case 3:
                         pmlca = mfpmr(PMRN_PMLCA3);
                         break;
+                case 4:
+                        pmlca = mfpmr(PMRN_PMLCA4);
+                        break;
+                case 5:
+                        pmlca = mfpmr(PMRN_PMLCA5);
+                        break;
                 default:
                         panic("Bad ctr number\n");
         }
@@ -68,6 +74,12 @@ static inline void set_pmlca(int ctr, u32 pmlca)
                 case 3:
                         mtpmr(PMRN_PMLCA3, pmlca);
                         break;
+                case 4:
+                        mtpmr(PMRN_PMLCA4, pmlca);
+                        break;
+                case 5:
+                        mtpmr(PMRN_PMLCA5, pmlca);
+                        break;
                 default:
                         panic("Bad ctr number\n");
         }
@@ -84,6 +96,10 @@ static inline unsigned int ctr_read(unsigned int i)
                         return mfpmr(PMRN_PMC2);
                 case 3:
                         return mfpmr(PMRN_PMC3);
+                case 4:
+                        return mfpmr(PMRN_PMC4);
+                case 5:
+                        return mfpmr(PMRN_PMC5);
                 default:
                         return 0;
         }
@@ -104,6 +120,12 @@ static inline void ctr_write(unsigned int i, unsigned int val)
                 case 3:
                         mtpmr(PMRN_PMC3, val);
                         break;
+                case 4:
+                        mtpmr(PMRN_PMC4, val);
+                        break;
+                case 5:
+                        mtpmr(PMRN_PMC5, val);
+                        break;
                 default:
                         break;
         }
@@ -133,6 +155,14 @@ static void init_pmc_stop(int ctr)
                         mtpmr(PMRN_PMLCA3, pmlca);
                         mtpmr(PMRN_PMLCB3, pmlcb);
                         break;
+                case 4:
+                        mtpmr(PMRN_PMLCA4, pmlca);
+                        mtpmr(PMRN_PMLCB4, pmlcb);
+                        break;
+                case 5:
+                        mtpmr(PMRN_PMLCA5, pmlca);
+                        mtpmr(PMRN_PMLCB5, pmlcb);
+                        break;
                 default:
                         panic("Bad ctr number!\n");
         }
diff --git a/arch/powerpc/perf/Makefile b/arch/powerpc/perf/Makefile
index 510fae10513d..60d71eea919c 100644
--- a/arch/powerpc/perf/Makefile
+++ b/arch/powerpc/perf/Makefile
@@ -9,7 +9,7 @@ obj64-$(CONFIG_PPC_PERF_CTRS)	+= power4-pmu.o ppc970-pmu.o power5-pmu.o \
 obj32-$(CONFIG_PPC_PERF_CTRS)   += mpc7450-pmu.o
 
 obj-$(CONFIG_FSL_EMB_PERF_EVENT) += core-fsl-emb.o
-obj-$(CONFIG_FSL_EMB_PERF_EVENT_E500) += e500-pmu.o
+obj-$(CONFIG_FSL_EMB_PERF_EVENT_E500) += e500-pmu.o e6500-pmu.o
 
 obj-$(CONFIG_PPC64)             += $(obj64-y)
 obj-$(CONFIG_PPC32)             += $(obj32-y)
diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c
index eeae308cf982..29b89e863d7c 100644
--- a/arch/powerpc/perf/core-book3s.c
+++ b/arch/powerpc/perf/core-book3s.c
@@ -24,7 +24,7 @@
 #define BHRB_MAX_ENTRIES        32
 #define BHRB_TARGET             0x0000000000000002
 #define BHRB_PREDICTION         0x0000000000000001
-#define BHRB_EA                 0xFFFFFFFFFFFFFFFC
+#define BHRB_EA                 0xFFFFFFFFFFFFFFFCUL
 
 struct cpu_hw_events {
         int n_events;
diff --git a/arch/powerpc/perf/core-fsl-emb.c b/arch/powerpc/perf/core-fsl-emb.c
index 106c53354675..d35ae52c69dc 100644
--- a/arch/powerpc/perf/core-fsl-emb.c
+++ b/arch/powerpc/perf/core-fsl-emb.c
@@ -70,6 +70,12 @@ static unsigned long read_pmc(int idx)
         case 3:
                 val = mfpmr(PMRN_PMC3);
                 break;
+        case 4:
+                val = mfpmr(PMRN_PMC4);
+                break;
+        case 5:
+                val = mfpmr(PMRN_PMC5);
+                break;
         default:
                 printk(KERN_ERR "oops trying to read PMC%d\n", idx);
                 val = 0;
@@ -95,6 +101,12 @@ static void write_pmc(int idx, unsigned long val)
         case 3:
                 mtpmr(PMRN_PMC3, val);
                 break;
+        case 4:
+                mtpmr(PMRN_PMC4, val);
+                break;
+        case 5:
+                mtpmr(PMRN_PMC5, val);
+                break;
         default:
                 printk(KERN_ERR "oops trying to write PMC%d\n", idx);
         }
@@ -120,6 +132,12 @@ static void write_pmlca(int idx, unsigned long val)
         case 3:
                 mtpmr(PMRN_PMLCA3, val);
                 break;
+        case 4:
+                mtpmr(PMRN_PMLCA4, val);
+                break;
+        case 5:
+                mtpmr(PMRN_PMLCA5, val);
+                break;
         default:
                 printk(KERN_ERR "oops trying to write PMLCA%d\n", idx);
         }
@@ -145,6 +163,12 @@ static void write_pmlcb(int idx, unsigned long val)
         case 3:
                 mtpmr(PMRN_PMLCB3, val);
                 break;
+        case 4:
+                mtpmr(PMRN_PMLCB4, val);
+                break;
+        case 5:
+                mtpmr(PMRN_PMLCB5, val);
+                break;
         default:
                 printk(KERN_ERR "oops trying to write PMLCB%d\n", idx);
         }
@@ -462,6 +486,12 @@ static int fsl_emb_pmu_event_init(struct perf_event *event)
         int num_restricted;
         int i;
 
+        if (ppmu->n_counter > MAX_HWEVENTS) {
+                WARN(1, "No. of perf counters (%d) is higher than max array size(%d)\n",
+                        ppmu->n_counter, MAX_HWEVENTS);
+                ppmu->n_counter = MAX_HWEVENTS;
+        }
+
         switch (event->attr.type) {
         case PERF_TYPE_HARDWARE:
                 ev = event->attr.config;
diff --git a/arch/powerpc/perf/e6500-pmu.c b/arch/powerpc/perf/e6500-pmu.c
new file mode 100644
index 000000000000..3d877aa777b5
--- /dev/null
+++ b/arch/powerpc/perf/e6500-pmu.c
@@ -0,0 +1,121 @@
+/*
+ * Performance counter support for e6500 family processors.
+ *
+ * Author: Priyanka Jain, Priyanka.Jain@freescale.com
+ * Based on e500-pmu.c
+ * Copyright 2013 Freescale Semiconductor, Inc.
+ * Copyright 2008-2009 Paul Mackerras, IBM Corporation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/string.h>
+#include <linux/perf_event.h>
+#include <asm/reg.h>
+#include <asm/cputable.h>
+
+/*
+ * Map of generic hardware event types to hardware events
+ * Zero if unsupported
+ */
+static int e6500_generic_events[] = {
+        [PERF_COUNT_HW_CPU_CYCLES] = 1,
+        [PERF_COUNT_HW_INSTRUCTIONS] = 2,
+        [PERF_COUNT_HW_CACHE_MISSES] = 221,
+        [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = 12,
+        [PERF_COUNT_HW_BRANCH_MISSES] = 15,
+};
+
+#define C(x)    PERF_COUNT_HW_CACHE_##x
+
+/*
+ * Table of generalized cache-related events.
+ * 0 means not supported, -1 means nonsensical, other values
+ * are event codes.
+ */
+static int e6500_cache_events[C(MAX)][C(OP_MAX)][C(RESULT_MAX)] = {
+        [C(L1D)] = {
+                                /*RESULT_ACCESS         RESULT_MISS */
+                [C(OP_READ)] = {        27,             222     },
+                [C(OP_WRITE)] = {       28,             223     },
+                [C(OP_PREFETCH)] = {    29,             0       },
+        },
+        [C(L1I)] = {
+                                /*RESULT_ACCESS         RESULT_MISS */
+                [C(OP_READ)] = {        2,              254     },
+                [C(OP_WRITE)] = {       -1,             -1      },
+                [C(OP_PREFETCH)] = {    37,             0       },
+        },
+        /*
+         * Assuming LL means L2, it's not a good match for this model.
+         * It does not have separate read/write events (but it does have
+         * separate instruction/data events).
+         */
+        [C(LL)] = {
+                                /*RESULT_ACCESS         RESULT_MISS */
+                [C(OP_READ)] = {        0,              0       },
+                [C(OP_WRITE)] = {       0,              0       },
+                [C(OP_PREFETCH)] = {    0,              0       },
+        },
+        /*
+         * There are data/instruction MMU misses, but that's a miss on
+         * the chip's internal level-one TLB which is probably not
+         * what the user wants.  Instead, unified level-two TLB misses
+         * are reported here.
+         */
+        [C(DTLB)] = {
+                                /*RESULT_ACCESS         RESULT_MISS */
+                [C(OP_READ)] = {        26,             66      },
+                [C(OP_WRITE)] = {       -1,             -1      },
+                [C(OP_PREFETCH)] = {    -1,             -1      },
+        },
+        [C(BPU)] = {
+                                /*RESULT_ACCESS         RESULT_MISS */
+                [C(OP_READ)] = {        12,             15      },
+                [C(OP_WRITE)] = {       -1,             -1      },
+                [C(OP_PREFETCH)] = {    -1,             -1      },
+        },
+        [C(NODE)] = {
+                                /* RESULT_ACCESS        RESULT_MISS */
+                [C(OP_READ)] = {        -1,             -1      },
+                [C(OP_WRITE)] = {       -1,             -1      },
+                [C(OP_PREFETCH)] = {    -1,             -1      },
+        },
+};
+
+static int num_events = 512;
+
+/* Upper half of event id is PMLCb, for threshold events */
+static u64 e6500_xlate_event(u64 event_id)
+{
+        u32 event_low = (u32)event_id;
+        if (event_low >= num_events ||
+                (event_id & (FSL_EMB_EVENT_THRESHMUL | FSL_EMB_EVENT_THRESH)))
+                return 0;
+
+        return FSL_EMB_EVENT_VALID;
+}
+
+static struct fsl_emb_pmu e6500_pmu = {
+        .name                   = "e6500 family",
+        .n_counter              = 6,
+        .n_restricted           = 0,
+        .xlate_event            = e6500_xlate_event,
+        .n_generic              = ARRAY_SIZE(e6500_generic_events),
+        .generic_events         = e6500_generic_events,
+        .cache_events           = &e6500_cache_events,
+};
+
+static int init_e6500_pmu(void)
+{
+        if (!cur_cpu_spec->oprofile_cpu_type ||
+                strcmp(cur_cpu_spec->oprofile_cpu_type, "ppc/e6500"))
+                return -ENODEV;
+
+        return register_fsl_emb_pmu(&e6500_pmu);
+}
+
+early_initcall(init_e6500_pmu);
diff --git a/arch/powerpc/perf/power7-events-list.h b/arch/powerpc/perf/power7-events-list.h
new file mode 100644
index 000000000000..687790a2c0b8
--- /dev/null
+++ b/arch/powerpc/perf/power7-events-list.h
@@ -0,0 +1,548 @@
+/*
+ * Performance counter support for POWER7 processors.
+ *
+ * Copyright 2013 Runzhen Wang, IBM Corporation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+EVENT(PM_IC_DEMAND_L2_BR_ALL,                 0x04898)
+EVENT(PM_GCT_UTIL_7_TO_10_SLOTS,              0x020a0)
+EVENT(PM_PMC2_SAVED,                          0x10022)
+EVENT(PM_CMPLU_STALL_DFU,                     0x2003c)
+EVENT(PM_VSU0_16FLOP,                         0x0a0a4)
+EVENT(PM_MRK_LSU_DERAT_MISS,                  0x3d05a)
+EVENT(PM_MRK_ST_CMPL,                         0x10034)
+EVENT(PM_NEST_PAIR3_ADD,                      0x40881)
+EVENT(PM_L2_ST_DISP,                          0x46180)
+EVENT(PM_L2_CASTOUT_MOD,                      0x16180)
+EVENT(PM_ISEG,                                0x020a4)
+EVENT(PM_MRK_INST_TIMEO,                      0x40034)
+EVENT(PM_L2_RCST_DISP_FAIL_ADDR,              0x36282)
+EVENT(PM_LSU1_DC_PREF_STREAM_CONFIRM,         0x0d0b6)
+EVENT(PM_IERAT_WR_64K,                        0x040be)
+EVENT(PM_MRK_DTLB_MISS_16M,                   0x4d05e)
+EVENT(PM_IERAT_MISS,                          0x100f6)
+EVENT(PM_MRK_PTEG_FROM_LMEM,                  0x4d052)
+EVENT(PM_FLOP,                                0x100f4)
+EVENT(PM_THRD_PRIO_4_5_CYC,                   0x040b4)
+EVENT(PM_BR_PRED_TA,                          0x040aa)
+EVENT(PM_CMPLU_STALL_FXU,                     0x20014)
+EVENT(PM_EXT_INT,                             0x200f8)
+EVENT(PM_VSU_FSQRT_FDIV,                      0x0a888)
+EVENT(PM_MRK_LD_MISS_EXPOSED_CYC,             0x1003e)
+EVENT(PM_LSU1_LDF,                            0x0c086)
+EVENT(PM_IC_WRITE_ALL,                        0x0488c)
+EVENT(PM_LSU0_SRQ_STFWD,                      0x0c0a0)
+EVENT(PM_PTEG_FROM_RL2L3_MOD,                 0x1c052)
+EVENT(PM_MRK_DATA_FROM_L31_SHR,               0x1d04e)
+EVENT(PM_DATA_FROM_L21_MOD,                   0x3c046)
+EVENT(PM_VSU1_SCAL_DOUBLE_ISSUED,             0x0b08a)
+EVENT(PM_VSU0_8FLOP,                          0x0a0a0)
+EVENT(PM_POWER_EVENT1,                        0x1006e)
+EVENT(PM_DISP_CLB_HELD_BAL,                   0x02092)
+EVENT(PM_VSU1_2FLOP,                          0x0a09a)
+EVENT(PM_LWSYNC_HELD,                         0x0209a)
+EVENT(PM_PTEG_FROM_DL2L3_SHR,                 0x3c054)
+EVENT(PM_INST_FROM_L21_MOD,                   0x34046)
+EVENT(PM_IERAT_XLATE_WR_16MPLUS,              0x040bc)
+EVENT(PM_IC_REQ_ALL,                          0x04888)
+EVENT(PM_DSLB_MISS,                           0x0d090)
+EVENT(PM_L3_MISS,                             0x1f082)
+EVENT(PM_LSU0_L1_PREF,                        0x0d0b8)
+EVENT(PM_VSU_SCALAR_SINGLE_ISSUED,            0x0b884)
+EVENT(PM_LSU1_DC_PREF_STREAM_CONFIRM_STRIDE,  0x0d0be)
+EVENT(PM_L2_INST,                             0x36080)
+EVENT(PM_VSU0_FRSP,                           0x0a0b4)
+EVENT(PM_FLUSH_DISP,                          0x02082)
+EVENT(PM_PTEG_FROM_L2MISS,                    0x4c058)
+EVENT(PM_VSU1_DQ_ISSUED,                      0x0b09a)
+EVENT(PM_CMPLU_STALL_LSU,                     0x20012)
+EVENT(PM_MRK_DATA_FROM_DMEM,                  0x1d04a)
+EVENT(PM_LSU_FLUSH_ULD,                       0x0c8b0)
+EVENT(PM_PTEG_FROM_LMEM,                      0x4c052)
+EVENT(PM_MRK_DERAT_MISS_16M,                  0x3d05c)
+EVENT(PM_THRD_ALL_RUN_CYC,                    0x2000c)
+EVENT(PM_MEM0_PREFETCH_DISP,                  0x20083)
+EVENT(PM_MRK_STALL_CMPLU_CYC_COUNT,           0x3003f)
+EVENT(PM_DATA_FROM_DL2L3_MOD,                 0x3c04c)
+EVENT(PM_VSU_FRSP,                            0x0a8b4)
+EVENT(PM_MRK_DATA_FROM_L21_MOD,               0x3d046)
+EVENT(PM_PMC1_OVERFLOW,                       0x20010)
+EVENT(PM_VSU0_SINGLE,                         0x0a0a8)
+EVENT(PM_MRK_PTEG_FROM_L3MISS,                0x2d058)
+EVENT(PM_MRK_PTEG_FROM_L31_SHR,               0x2d056)
+EVENT(PM_VSU0_VECTOR_SP_ISSUED,               0x0b090)
+EVENT(PM_VSU1_FEST,                           0x0a0ba)
+EVENT(PM_MRK_INST_DISP,                       0x20030)
+EVENT(PM_VSU0_COMPLEX_ISSUED,                 0x0b096)
+EVENT(PM_LSU1_FLUSH_UST,                      0x0c0b6)
+EVENT(PM_INST_CMPL,                           0x00002)
+EVENT(PM_FXU_IDLE,                            0x1000e)
+EVENT(PM_LSU0_FLUSH_ULD,                      0x0c0b0)
+EVENT(PM_MRK_DATA_FROM_DL2L3_MOD,             0x3d04c)
+EVENT(PM_LSU_LMQ_SRQ_EMPTY_ALL_CYC,           0x3001c)
+EVENT(PM_LSU1_REJECT_LMQ_FULL,                0x0c0a6)
+EVENT(PM_INST_PTEG_FROM_L21_MOD,              0x3e056)
+EVENT(PM_INST_FROM_RL2L3_MOD,                 0x14042)
+EVENT(PM_SHL_CREATED,                         0x05082)
+EVENT(PM_L2_ST_HIT,                           0x46182)
+EVENT(PM_DATA_FROM_DMEM,                      0x1c04a)
+EVENT(PM_L3_LD_MISS,                          0x2f082)
+EVENT(PM_FXU1_BUSY_FXU0_IDLE,                 0x4000e)
+EVENT(PM_DISP_CLB_HELD_RES,                   0x02094)
+EVENT(PM_L2_SN_SX_I_DONE,                     0x36382)
+EVENT(PM_GRP_CMPL,                            0x30004)
+EVENT(PM_STCX_CMPL,                           0x0c098)
+EVENT(PM_VSU0_2FLOP,                          0x0a098)
+EVENT(PM_L3_PREF_MISS,                        0x3f082)
+EVENT(PM_LSU_SRQ_SYNC_CYC,                    0x0d096)
+EVENT(PM_LSU_REJECT_ERAT_MISS,                0x20064)
+EVENT(PM_L1_ICACHE_MISS,                      0x200fc)
+EVENT(PM_LSU1_FLUSH_SRQ,                      0x0c0be)
+EVENT(PM_LD_REF_L1_LSU0,                      0x0c080)
+EVENT(PM_VSU0_FEST,                           0x0a0b8)
+EVENT(PM_VSU_VECTOR_SINGLE_ISSUED,            0x0b890)
+EVENT(PM_FREQ_UP,                             0x4000c)
+EVENT(PM_DATA_FROM_LMEM,                      0x3c04a)
+EVENT(PM_LSU1_LDX,                            0x0c08a)
+EVENT(PM_PMC3_OVERFLOW,                       0x40010)
+EVENT(PM_MRK_BR_MPRED,                        0x30036)
+EVENT(PM_SHL_MATCH,                           0x05086)
+EVENT(PM_MRK_BR_TAKEN,                        0x10036)
+EVENT(PM_CMPLU_STALL_BRU,                     0x4004e)
+EVENT(PM_ISLB_MISS,                           0x0d092)
+EVENT(PM_CYC,                                 0x0001e)
+EVENT(PM_DISP_HELD_THERMAL,                   0x30006)
+EVENT(PM_INST_PTEG_FROM_RL2L3_SHR,            0x2e054)
+EVENT(PM_LSU1_SRQ_STFWD,                      0x0c0a2)
+EVENT(PM_GCT_NOSLOT_BR_MPRED,                 0x4001a)
+EVENT(PM_1PLUS_PPC_CMPL,                      0x100f2)
+EVENT(PM_PTEG_FROM_DMEM,                      0x2c052)
+EVENT(PM_VSU_2FLOP,                           0x0a898)
+EVENT(PM_GCT_FULL_CYC,                        0x04086)
+EVENT(PM_MRK_DATA_FROM_L3_CYC,                0x40020)
+EVENT(PM_LSU_SRQ_S0_ALLOC,                    0x0d09d)
+EVENT(PM_MRK_DERAT_MISS_4K,                   0x1d05c)
+EVENT(PM_BR_MPRED_TA,                         0x040ae)
+EVENT(PM_INST_PTEG_FROM_L2MISS,               0x4e058)
+EVENT(PM_DPU_HELD_POWER,                      0x20006)
+EVENT(PM_RUN_INST_CMPL,                       0x400fa)
+EVENT(PM_MRK_VSU_FIN,                         0x30032)
+EVENT(PM_LSU_SRQ_S0_VALID,                    0x0d09c)
+EVENT(PM_GCT_EMPTY_CYC,                       0x20008)
+EVENT(PM_IOPS_DISP,                           0x30014)
+EVENT(PM_RUN_SPURR,                           0x10008)
+EVENT(PM_PTEG_FROM_L21_MOD,                   0x3c056)
+EVENT(PM_VSU0_1FLOP,                          0x0a080)
+EVENT(PM_SNOOP_TLBIE,                         0x0d0b2)
+EVENT(PM_DATA_FROM_L3MISS,                    0x2c048)
+EVENT(PM_VSU_SINGLE,                          0x0a8a8)
+EVENT(PM_DTLB_MISS_16G,                       0x1c05e)
+EVENT(PM_CMPLU_STALL_VECTOR,                  0x2001c)
+EVENT(PM_FLUSH,                               0x400f8)
+EVENT(PM_L2_LD_HIT,                           0x36182)
+EVENT(PM_NEST_PAIR2_AND,                      0x30883)
+EVENT(PM_VSU1_1FLOP,                          0x0a082)
+EVENT(PM_IC_PREF_REQ,                         0x0408a)
+EVENT(PM_L3_LD_HIT,                           0x2f080)
+EVENT(PM_GCT_NOSLOT_IC_MISS,                  0x2001a)
+EVENT(PM_DISP_HELD,                           0x10006)
+EVENT(PM_L2_LD,                               0x16080)
+EVENT(PM_LSU_FLUSH_SRQ,                       0x0c8bc)
+EVENT(PM_BC_PLUS_8_CONV,                      0x040b8)
+EVENT(PM_MRK_DATA_FROM_L31_MOD_CYC,           0x40026)
+EVENT(PM_CMPLU_STALL_VECTOR_LONG,             0x4004a)
+EVENT(PM_L2_RCST_BUSY_RC_FULL,                0x26282)
+EVENT(PM_TB_BIT_TRANS,                        0x300f8)
+EVENT(PM_THERMAL_MAX,                         0x40006)
+EVENT(PM_LSU1_FLUSH_ULD,                      0x0c0b2)
+EVENT(PM_LSU1_REJECT_LHS,                     0x0c0ae)
+EVENT(PM_LSU_LRQ_S0_ALLOC,                    0x0d09f)
+EVENT(PM_L3_CO_L31,                           0x4f080)
+EVENT(PM_POWER_EVENT4,                        0x4006e)
+EVENT(PM_DATA_FROM_L31_SHR,                   0x1c04e)
+EVENT(PM_BR_UNCOND,                           0x0409e)
+EVENT(PM_LSU1_DC_PREF_STREAM_ALLOC,           0x0d0aa)
+EVENT(PM_PMC4_REWIND,                         0x10020)
+EVENT(PM_L2_RCLD_DISP,                        0x16280)
+EVENT(PM_THRD_PRIO_2_3_CYC,                   0x040b2)
+EVENT(PM_MRK_PTEG_FROM_L2MISS,                0x4d058)
+EVENT(PM_IC_DEMAND_L2_BHT_REDIRECT,           0x04098)
+EVENT(PM_LSU_DERAT_MISS,                      0x200f6)
+EVENT(PM_IC_PREF_CANCEL_L2,                   0x04094)
+EVENT(PM_MRK_FIN_STALL_CYC_COUNT,             0x1003d)
+EVENT(PM_BR_PRED_CCACHE,                      0x040a0)
+EVENT(PM_GCT_UTIL_1_TO_2_SLOTS,               0x0209c)
+EVENT(PM_MRK_ST_CMPL_INT,                     0x30034)
+EVENT(PM_LSU_TWO_TABLEWALK_CYC,               0x0d0a6)
+EVENT(PM_MRK_DATA_FROM_L3MISS,                0x2d048)
+EVENT(PM_GCT_NOSLOT_CYC,                      0x100f8)
+EVENT(PM_LSU_SET_MPRED,                       0x0c0a8)
+EVENT(PM_FLUSH_DISP_TLBIE,                    0x0208a)
+EVENT(PM_VSU1_FCONV,                          0x0a0b2)
+EVENT(PM_DERAT_MISS_16G,                      0x4c05c)
+EVENT(PM_INST_FROM_LMEM,                      0x3404a)
+EVENT(PM_IC_DEMAND_L2_BR_REDIRECT,            0x0409a)
+EVENT(PM_CMPLU_STALL_SCALAR_LONG,             0x20018)
+EVENT(PM_INST_PTEG_FROM_L2,                   0x1e050)
+EVENT(PM_PTEG_FROM_L2,                        0x1c050)
+EVENT(PM_MRK_DATA_FROM_L21_SHR_CYC,           0x20024)
+EVENT(PM_MRK_DTLB_MISS_4K,                    0x2d05a)
+EVENT(PM_VSU0_FPSCR,                          0x0b09c)
+EVENT(PM_VSU1_VECT_DOUBLE_ISSUED,             0x0b082)
+EVENT(PM_MRK_PTEG_FROM_RL2L3_MOD,             0x1d052)
+EVENT(PM_MEM0_RQ_DISP,                        0x10083)
+EVENT(PM_L2_LD_MISS,                          0x26080)
+EVENT(PM_VMX_RESULT_SAT_1,                    0x0b0a0)
+EVENT(PM_L1_PREF,                             0x0d8b8)
+EVENT(PM_MRK_DATA_FROM_LMEM_CYC,              0x2002c)
+EVENT(PM_GRP_IC_MISS_NONSPEC,                 0x1000c)
+EVENT(PM_PB_NODE_PUMP,                        0x10081)
+EVENT(PM_SHL_MERGED,                          0x05084)
+EVENT(PM_NEST_PAIR1_ADD,                      0x20881)
+EVENT(PM_DATA_FROM_L3,                        0x1c048)
+EVENT(PM_LSU_FLUSH,                           0x0208e)
+EVENT(PM_LSU_SRQ_SYNC_COUNT,                  0x0d097)
+EVENT(PM_PMC2_OVERFLOW,                       0x30010)
+EVENT(PM_LSU_LDF,                             0x0c884)
+EVENT(PM_POWER_EVENT3,                        0x3006e)
+EVENT(PM_DISP_WT,                             0x30008)
+EVENT(PM_CMPLU_STALL_REJECT,                  0x40016)
+EVENT(PM_IC_BANK_CONFLICT,                    0x04082)
+EVENT(PM_BR_MPRED_CR_TA,                      0x048ae)
+EVENT(PM_L2_INST_MISS,                        0x36082)
+EVENT(PM_CMPLU_STALL_ERAT_MISS,               0x40018)
+EVENT(PM_NEST_PAIR2_ADD,                      0x30881)
+EVENT(PM_MRK_LSU_FLUSH,                       0x0d08c)
+EVENT(PM_L2_LDST,                             0x16880)
+EVENT(PM_INST_FROM_L31_SHR,                   0x1404e)
+EVENT(PM_VSU0_FIN,                            0x0a0bc)
+EVENT(PM_LARX_LSU,                            0x0c894)
+EVENT(PM_INST_FROM_RMEM,                      0x34042)
+EVENT(PM_DISP_CLB_HELD_TLBIE,                 0x02096)
+EVENT(PM_MRK_DATA_FROM_DMEM_CYC,              0x2002e)
+EVENT(PM_BR_PRED_CR,                          0x040a8)
+EVENT(PM_LSU_REJECT,                          0x10064)
+EVENT(PM_GCT_UTIL_3_TO_6_SLOTS,               0x0209e)
+EVENT(PM_CMPLU_STALL_END_GCT_NOSLOT,          0x10028)
+EVENT(PM_LSU0_REJECT_LMQ_FULL,                0x0c0a4)
+EVENT(PM_VSU_FEST,                            0x0a8b8)
+EVENT(PM_NEST_PAIR0_AND,                      0x10883)
+EVENT(PM_PTEG_FROM_L3,                        0x2c050)
+EVENT(PM_POWER_EVENT2,                        0x2006e)
+EVENT(PM_IC_PREF_CANCEL_PAGE,                 0x04090)
+EVENT(PM_VSU0_FSQRT_FDIV,                     0x0a088)
+EVENT(PM_MRK_GRP_CMPL,                        0x40030)
+EVENT(PM_VSU0_SCAL_DOUBLE_ISSUED,             0x0b088)
+EVENT(PM_GRP_DISP,                            0x3000a)
+EVENT(PM_LSU0_LDX,                            0x0c088)
+EVENT(PM_DATA_FROM_L2,                        0x1c040)
+EVENT(PM_MRK_DATA_FROM_RL2L3_MOD,             0x1d042)
+EVENT(PM_LD_REF_L1,                           0x0c880)
+EVENT(PM_VSU0_VECT_DOUBLE_ISSUED,             0x0b080)
+EVENT(PM_VSU1_2FLOP_DOUBLE,                   0x0a08e)
+EVENT(PM_THRD_PRIO_6_7_CYC,                   0x040b6)
+EVENT(PM_BC_PLUS_8_RSLV_TAKEN,                0x040ba)
+EVENT(PM_BR_MPRED_CR,                         0x040ac)
+EVENT(PM_L3_CO_MEM,                           0x4f082)
+EVENT(PM_LD_MISS_L1,                          0x400f0)
+EVENT(PM_DATA_FROM_RL2L3_MOD,                 0x1c042)
+EVENT(PM_LSU_SRQ_FULL_CYC,                    0x1001a)
+EVENT(PM_TABLEWALK_CYC,                       0x10026)
+EVENT(PM_MRK_PTEG_FROM_RMEM,                  0x3d052)
+EVENT(PM_LSU_SRQ_STFWD,                       0x0c8a0)
+EVENT(PM_INST_PTEG_FROM_RMEM,                 0x3e052)
+EVENT(PM_FXU0_FIN,                            0x10004)
+EVENT(PM_LSU1_L1_SW_PREF,                     0x0c09e)
+EVENT(PM_PTEG_FROM_L31_MOD,                   0x1c054)
+EVENT(PM_PMC5_OVERFLOW,                       0x10024)
+EVENT(PM_LD_REF_L1_LSU1,                      0x0c082)
+EVENT(PM_INST_PTEG_FROM_L21_SHR,              0x4e056)
+EVENT(PM_CMPLU_STALL_THRD,                    0x1001c)
+EVENT(PM_DATA_FROM_RMEM,                      0x3c042)
+EVENT(PM_VSU0_SCAL_SINGLE_ISSUED,             0x0b084)
+EVENT(PM_BR_MPRED_LSTACK,                     0x040a6)
+EVENT(PM_MRK_DATA_FROM_RL2L3_MOD_CYC,         0x40028)
+EVENT(PM_LSU0_FLUSH_UST,                      0x0c0b4)
+EVENT(PM_LSU_NCST,                            0x0c090)
+EVENT(PM_BR_TAKEN,                            0x20004)
+EVENT(PM_INST_PTEG_FROM_LMEM,                 0x4e052)
+EVENT(PM_GCT_NOSLOT_BR_MPRED_IC_MISS,         0x4001c)
+EVENT(PM_DTLB_MISS_4K,                        0x2c05a)
+EVENT(PM_PMC4_SAVED,                          0x30022)
+EVENT(PM_VSU1_PERMUTE_ISSUED,                 0x0b092)
+EVENT(PM_SLB_MISS,                            0x0d890)
+EVENT(PM_LSU1_FLUSH_LRQ,                      0x0c0ba)
+EVENT(PM_DTLB_MISS,                           0x300fc)
+EVENT(PM_VSU1_FRSP,                           0x0a0b6)
+EVENT(PM_VSU_VECTOR_DOUBLE_ISSUED,            0x0b880)
+EVENT(PM_L2_CASTOUT_SHR,                      0x16182)
+EVENT(PM_DATA_FROM_DL2L3_SHR,                 0x3c044)
+EVENT(PM_VSU1_STF,                            0x0b08e)
+EVENT(PM_ST_FIN,                              0x200f0)
+EVENT(PM_PTEG_FROM_L21_SHR,                   0x4c056)
+EVENT(PM_L2_LOC_GUESS_WRONG,                  0x26480)
+EVENT(PM_MRK_STCX_FAIL,                       0x0d08e)
+EVENT(PM_LSU0_REJECT_LHS,                     0x0c0ac)
+EVENT(PM_IC_PREF_CANCEL_HIT,                  0x04092)
+EVENT(PM_L3_PREF_BUSY,                        0x4f080)
+EVENT(PM_MRK_BRU_FIN,                         0x2003a)
+EVENT(PM_LSU1_NCLD,                           0x0c08e)
+EVENT(PM_INST_PTEG_FROM_L31_MOD,              0x1e054)
+EVENT(PM_LSU_NCLD,                            0x0c88c)
+EVENT(PM_LSU_LDX,                             0x0c888)
+EVENT(PM_L2_LOC_GUESS_CORRECT,                0x16480)
+EVENT(PM_THRESH_TIMEO,                        0x10038)
+EVENT(PM_L3_PREF_ST,                          0x0d0ae)
+EVENT(PM_DISP_CLB_HELD_SYNC,                  0x02098)
+EVENT(PM_VSU_SIMPLE_ISSUED,                   0x0b894)
+EVENT(PM_VSU1_SINGLE,                         0x0a0aa)
+EVENT(PM_DATA_TABLEWALK_CYC,                  0x3001a)
+EVENT(PM_L2_RC_ST_DONE,                       0x36380)
+EVENT(PM_MRK_PTEG_FROM_L21_MOD,               0x3d056)
+EVENT(PM_LARX_LSU1,                           0x0c096)
+EVENT(PM_MRK_DATA_FROM_RMEM,                  0x3d042)
+EVENT(PM_DISP_CLB_HELD,                       0x02090)
+EVENT(PM_DERAT_MISS_4K,                       0x1c05c)
+EVENT(PM_L2_RCLD_DISP_FAIL_ADDR,              0x16282)
+EVENT(PM_SEG_EXCEPTION,                       0x028a4)
+EVENT(PM_FLUSH_DISP_SB,                       0x0208c)
+EVENT(PM_L2_DC_INV,                           0x26182)
+EVENT(PM_PTEG_FROM_DL2L3_MOD,                 0x4c054)
+EVENT(PM_DSEG,                                0x020a6)
+EVENT(PM_BR_PRED_LSTACK,                      0x040a2)
+EVENT(PM_VSU0_STF,                            0x0b08c)
+EVENT(PM_LSU_FX_FIN,                          0x10066)
+EVENT(PM_DERAT_MISS_16M,                      0x3c05c)
+EVENT(PM_MRK_PTEG_FROM_DL2L3_MOD,             0x4d054)
+EVENT(PM_GCT_UTIL_11_PLUS_SLOTS,              0x020a2)
+EVENT(PM_INST_FROM_L3,                        0x14048)
+EVENT(PM_MRK_IFU_FIN,                         0x3003a)
+EVENT(PM_ITLB_MISS,                           0x400fc)
+EVENT(PM_VSU_STF,                             0x0b88c)
+EVENT(PM_LSU_FLUSH_UST,                       0x0c8b4)
+EVENT(PM_L2_LDST_MISS,                        0x26880)
+EVENT(PM_FXU1_FIN,                            0x40004)
+EVENT(PM_SHL_DEALLOCATED,                     0x05080)
+EVENT(PM_L2_SN_M_WR_DONE,                     0x46382)
+EVENT(PM_LSU_REJECT_SET_MPRED,                0x0c8a8)
+EVENT(PM_L3_PREF_LD,                          0x0d0ac)
+EVENT(PM_L2_SN_M_RD_DONE,                     0x46380)
+EVENT(PM_MRK_DERAT_MISS_16G,                  0x4d05c)
+EVENT(PM_VSU_FCONV,                           0x0a8b0)
+EVENT(PM_ANY_THRD_RUN_CYC,                    0x100fa)
+EVENT(PM_LSU_LMQ_FULL_CYC,                    0x0d0a4)
+EVENT(PM_MRK_LSU_REJECT_LHS,                  0x0d082)
+EVENT(PM_MRK_LD_MISS_L1_CYC,                  0x4003e)
+EVENT(PM_MRK_DATA_FROM_L2_CYC,                0x20020)
+EVENT(PM_INST_IMC_MATCH_DISP,                 0x30016)
+EVENT(PM_MRK_DATA_FROM_RMEM_CYC,              0x4002c)
+EVENT(PM_VSU0_SIMPLE_ISSUED,                  0x0b094)
+EVENT(PM_CMPLU_STALL_DIV,                     0x40014)
+EVENT(PM_MRK_PTEG_FROM_RL2L3_SHR,             0x2d054)
+EVENT(PM_VSU_FMA_DOUBLE,                      0x0a890)
+EVENT(PM_VSU_4FLOP,                           0x0a89c)
+EVENT(PM_VSU1_FIN,                            0x0a0be)
+EVENT(PM_NEST_PAIR1_AND,                      0x20883)
+EVENT(PM_INST_PTEG_FROM_RL2L3_MOD,            0x1e052)
+EVENT(PM_RUN_CYC,                             0x200f4)
+EVENT(PM_PTEG_FROM_RMEM,                      0x3c052)
+EVENT(PM_LSU_LRQ_S0_VALID,                    0x0d09e)
+EVENT(PM_LSU0_LDF,                            0x0c084)
+EVENT(PM_FLUSH_COMPLETION,                    0x30012)
+EVENT(PM_ST_MISS_L1,                          0x300f0)
+EVENT(PM_L2_NODE_PUMP,                        0x36480)
+EVENT(PM_INST_FROM_DL2L3_SHR,                 0x34044)
+EVENT(PM_MRK_STALL_CMPLU_CYC,                 0x3003e)
+EVENT(PM_VSU1_DENORM,                         0x0a0ae)
+EVENT(PM_MRK_DATA_FROM_L31_SHR_CYC,           0x20026)
+EVENT(PM_NEST_PAIR0_ADD,                      0x10881)
+EVENT(PM_INST_FROM_L3MISS,                    0x24048)
+EVENT(PM_EE_OFF_EXT_INT,                      0x02080)
+EVENT(PM_INST_PTEG_FROM_DMEM,                 0x2e052)
+EVENT(PM_INST_FROM_DL2L3_MOD,                 0x3404c)
+EVENT(PM_PMC6_OVERFLOW,                       0x30024)
+EVENT(PM_VSU_2FLOP_DOUBLE,                    0x0a88c)
+EVENT(PM_TLB_MISS,                            0x20066)
+EVENT(PM_FXU_BUSY,                            0x2000e)
+EVENT(PM_L2_RCLD_DISP_FAIL_OTHER,             0x26280)
+EVENT(PM_LSU_REJECT_LMQ_FULL,                 0x0c8a4)
+EVENT(PM_IC_RELOAD_SHR,                       0x04096)
+EVENT(PM_GRP_MRK,                             0x10031)
+EVENT(PM_MRK_ST_NEST,                         0x20034)
+EVENT(PM_VSU1_FSQRT_FDIV,                     0x0a08a)
+EVENT(PM_LSU0_FLUSH_LRQ,                      0x0c0b8)
+EVENT(PM_LARX_LSU0,                           0x0c094)
+EVENT(PM_IBUF_FULL_CYC,                       0x04084)
+EVENT(PM_MRK_DATA_FROM_DL2L3_SHR_CYC,         0x2002a)
+EVENT(PM_LSU_DC_PREF_STREAM_ALLOC,            0x0d8a8)
+EVENT(PM_GRP_MRK_CYC,                         0x10030)
+EVENT(PM_MRK_DATA_FROM_RL2L3_SHR_CYC,         0x20028)
+EVENT(PM_L2_GLOB_GUESS_CORRECT,               0x16482)
+EVENT(PM_LSU_REJECT_LHS,                      0x0c8ac)
+EVENT(PM_MRK_DATA_FROM_LMEM,                  0x3d04a)
+EVENT(PM_INST_PTEG_FROM_L3,                   0x2e050)
+EVENT(PM_FREQ_DOWN,                           0x3000c)
+EVENT(PM_PB_RETRY_NODE_PUMP,                  0x30081)
+EVENT(PM_INST_FROM_RL2L3_SHR,                 0x1404c)
+EVENT(PM_MRK_INST_ISSUED,                     0x10032)
+EVENT(PM_PTEG_FROM_L3MISS,                    0x2c058)
+EVENT(PM_RUN_PURR,                            0x400f4)
+EVENT(PM_MRK_GRP_IC_MISS,                     0x40038)
+EVENT(PM_MRK_DATA_FROM_L3,                    0x1d048)
+EVENT(PM_CMPLU_STALL_DCACHE_MISS,             0x20016)
+EVENT(PM_PTEG_FROM_RL2L3_SHR,                 0x2c054)
+EVENT(PM_LSU_FLUSH_LRQ,                       0x0c8b8)
+EVENT(PM_MRK_DERAT_MISS_64K,                  0x2d05c)
+EVENT(PM_INST_PTEG_FROM_DL2L3_MOD,            0x4e054)
+EVENT(PM_L2_ST_MISS,                          0x26082)
+EVENT(PM_MRK_PTEG_FROM_L21_SHR,               0x4d056)
+EVENT(PM_LWSYNC,                              0x0d094)
+EVENT(PM_LSU0_DC_PREF_STREAM_CONFIRM_STRIDE,  0x0d0bc)
+EVENT(PM_MRK_LSU_FLUSH_LRQ,                   0x0d088)
+EVENT(PM_INST_IMC_MATCH_CMPL,                 0x100f0)
+EVENT(PM_NEST_PAIR3_AND,                      0x40883)
+EVENT(PM_PB_RETRY_SYS_PUMP,                   0x40081)
+EVENT(PM_MRK_INST_FIN,                        0x30030)
+EVENT(PM_MRK_PTEG_FROM_DL2L3_SHR,             0x3d054)
+EVENT(PM_INST_FROM_L31_MOD,                   0x14044)
+EVENT(PM_MRK_DTLB_MISS_64K,                   0x3d05e)
+EVENT(PM_LSU_FIN,                             0x30066)
+EVENT(PM_MRK_LSU_REJECT,                      0x40064)
+EVENT(PM_L2_CO_FAIL_BUSY,                     0x16382)
+EVENT(PM_MEM0_WQ_DISP,                        0x40083)
+EVENT(PM_DATA_FROM_L31_MOD,                   0x1c044)
+EVENT(PM_THERMAL_WARN,                        0x10016)
+EVENT(PM_VSU0_4FLOP,                          0x0a09c)
+EVENT(PM_BR_MPRED_CCACHE,                     0x040a4)
+EVENT(PM_CMPLU_STALL_IFU,                     0x4004c)
+EVENT(PM_L1_DEMAND_WRITE,                     0x0408c)
+EVENT(PM_FLUSH_BR_MPRED,                      0x02084)
+EVENT(PM_MRK_DTLB_MISS_16G,                   0x1d05e)
+EVENT(PM_MRK_PTEG_FROM_DMEM,                  0x2d052)
+EVENT(PM_L2_RCST_DISP,                        0x36280)
+EVENT(PM_CMPLU_STALL,                         0x4000a)
+EVENT(PM_LSU_PARTIAL_CDF,                     0x0c0aa)
+EVENT(PM_DISP_CLB_HELD_SB,                    0x020a8)
+EVENT(PM_VSU0_FMA_DOUBLE,                     0x0a090)
+EVENT(PM_FXU0_BUSY_FXU1_IDLE,                 0x3000e)
+EVENT(PM_IC_DEMAND_CYC,                       0x10018)
+EVENT(PM_MRK_DATA_FROM_L21_SHR,               0x3d04e)
+EVENT(PM_MRK_LSU_FLUSH_UST,                   0x0d086)
+EVENT(PM_INST_PTEG_FROM_L3MISS,               0x2e058)
+EVENT(PM_VSU_DENORM,                          0x0a8ac)
+EVENT(PM_MRK_LSU_PARTIAL_CDF,                 0x0d080)
+EVENT(PM_INST_FROM_L21_SHR,                   0x3404e)
+EVENT(PM_IC_PREF_WRITE,                       0x0408e)
+EVENT(PM_BR_PRED,                             0x0409c)
+EVENT(PM_INST_FROM_DMEM,                      0x1404a)
+EVENT(PM_IC_PREF_CANCEL_ALL,                  0x04890)
+EVENT(PM_LSU_DC_PREF_STREAM_CONFIRM,          0x0d8b4)
+EVENT(PM_MRK_LSU_FLUSH_SRQ,                   0x0d08a)
+EVENT(PM_MRK_FIN_STALL_CYC,                   0x1003c)
+EVENT(PM_L2_RCST_DISP_FAIL_OTHER,             0x46280)
+EVENT(PM_VSU1_DD_ISSUED,                      0x0b098)
+EVENT(PM_PTEG_FROM_L31_SHR,                   0x2c056)
+EVENT(PM_DATA_FROM_L21_SHR,                   0x3c04e)
+EVENT(PM_LSU0_NCLD,                           0x0c08c)
+EVENT(PM_VSU1_4FLOP,                          0x0a09e)
+EVENT(PM_VSU1_8FLOP,                          0x0a0a2)
+EVENT(PM_VSU_8FLOP,                           0x0a8a0)
+EVENT(PM_LSU_LMQ_SRQ_EMPTY_CYC,               0x2003e)
+EVENT(PM_DTLB_MISS_64K,                       0x3c05e)
+EVENT(PM_THRD_CONC_RUN_INST,                  0x300f4)
+EVENT(PM_MRK_PTEG_FROM_L2,                    0x1d050)
+EVENT(PM_PB_SYS_PUMP,                         0x20081)
+EVENT(PM_VSU_FIN,                             0x0a8bc)
+EVENT(PM_MRK_DATA_FROM_L31_MOD,               0x1d044)
+EVENT(PM_THRD_PRIO_0_1_CYC,                   0x040b0)
+EVENT(PM_DERAT_MISS_64K,                      0x2c05c)
+EVENT(PM_PMC2_REWIND,                         0x30020)
+EVENT(PM_INST_FROM_L2,                        0x14040)
+EVENT(PM_GRP_BR_MPRED_NONSPEC,                0x1000a)
+EVENT(PM_INST_DISP,                           0x200f2)
+EVENT(PM_MEM0_RD_CANCEL_TOTAL,                0x30083)
+EVENT(PM_LSU0_DC_PREF_STREAM_CONFIRM,         0x0d0b4)
+EVENT(PM_L1_DCACHE_RELOAD_VALID,              0x300f6)
+EVENT(PM_VSU_SCALAR_DOUBLE_ISSUED,            0x0b888)
+EVENT(PM_L3_PREF_HIT,                         0x3f080)
+EVENT(PM_MRK_PTEG_FROM_L31_MOD,               0x1d054)
+EVENT(PM_CMPLU_STALL_STORE,                   0x2004a)
+EVENT(PM_MRK_FXU_FIN,                         0x20038)
+EVENT(PM_PMC4_OVERFLOW,                       0x10010)
+EVENT(PM_MRK_PTEG_FROM_L3,                    0x2d050)
+EVENT(PM_LSU0_LMQ_LHR_MERGE,                  0x0d098)
+EVENT(PM_BTAC_HIT,                            0x0508a)
+EVENT(PM_L3_RD_BUSY,                          0x4f082)
+EVENT(PM_LSU0_L1_SW_PREF,                     0x0c09c)
+EVENT(PM_INST_FROM_L2MISS,                    0x44048)
+EVENT(PM_LSU0_DC_PREF_STREAM_ALLOC,           0x0d0a8)
+EVENT(PM_L2_ST,                               0x16082)
+EVENT(PM_VSU0_DENORM,                         0x0a0ac)
+EVENT(PM_MRK_DATA_FROM_DL2L3_SHR,             0x3d044)
+EVENT(PM_BR_PRED_CR_TA,                       0x048aa)
+EVENT(PM_VSU0_FCONV,                          0x0a0b0)
+EVENT(PM_MRK_LSU_FLUSH_ULD,                   0x0d084)
+EVENT(PM_BTAC_MISS,                           0x05088)
+EVENT(PM_MRK_LD_MISS_EXPOSED_CYC_COUNT,       0x1003f)
+EVENT(PM_MRK_DATA_FROM_L2,                    0x1d040)
+EVENT(PM_LSU_DCACHE_RELOAD_VALID,             0x0d0a2)
+EVENT(PM_VSU_FMA,                             0x0a884)
+EVENT(PM_LSU0_FLUSH_SRQ,                      0x0c0bc)
+EVENT(PM_LSU1_L1_PREF,                        0x0d0ba)
+EVENT(PM_IOPS_CMPL,                           0x10014)
+EVENT(PM_L2_SYS_PUMP,                         0x36482)
+EVENT(PM_L2_RCLD_BUSY_RC_FULL,                0x46282)
+EVENT(PM_LSU_LMQ_S0_ALLOC,                    0x0d0a1)
+EVENT(PM_FLUSH_DISP_SYNC,                     0x02088)
+EVENT(PM_MRK_DATA_FROM_DL2L3_MOD_CYC,         0x4002a)
+EVENT(PM_L2_IC_INV,                           0x26180)
+EVENT(PM_MRK_DATA_FROM_L21_MOD_CYC,           0x40024)
+EVENT(PM_L3_PREF_LDST,                        0x0d8ac)
+EVENT(PM_LSU_SRQ_EMPTY_CYC,                   0x40008)
+EVENT(PM_LSU_LMQ_S0_VALID,                    0x0d0a0)
+EVENT(PM_FLUSH_PARTIAL,                       0x02086)
+EVENT(PM_VSU1_FMA_DOUBLE,                     0x0a092)
+EVENT(PM_1PLUS_PPC_DISP,                      0x400f2)
+EVENT(PM_DATA_FROM_L2MISS,                    0x200fe)
+EVENT(PM_SUSPENDED,                           0x00000)
+EVENT(PM_VSU0_FMA,                            0x0a084)
+EVENT(PM_CMPLU_STALL_SCALAR,                  0x40012)
+EVENT(PM_STCX_FAIL,                           0x0c09a)
+EVENT(PM_VSU0_FSQRT_FDIV_DOUBLE,              0x0a094)
+EVENT(PM_DC_PREF_DST,                         0x0d0b0)
+EVENT(PM_VSU1_SCAL_SINGLE_ISSUED,             0x0b086)
+EVENT(PM_L3_HIT,                              0x1f080)
+EVENT(PM_L2_GLOB_GUESS_WRONG,                 0x26482)
+EVENT(PM_MRK_DFU_FIN,                         0x20032)
+EVENT(PM_INST_FROM_L1,                        0x04080)
+EVENT(PM_BRU_FIN,                             0x10068)
+EVENT(PM_IC_DEMAND_REQ,                       0x04088)
+EVENT(PM_VSU1_FSQRT_FDIV_DOUBLE,              0x0a096)
+EVENT(PM_VSU1_FMA,                            0x0a086)
+EVENT(PM_MRK_LD_MISS_L1,                      0x20036)
+EVENT(PM_VSU0_2FLOP_DOUBLE,                   0x0a08c)
+EVENT(PM_LSU_DC_PREF_STRIDED_STREAM_CONFIRM,  0x0d8bc)
+EVENT(PM_INST_PTEG_FROM_L31_SHR,              0x2e056)
+EVENT(PM_MRK_LSU_REJECT_ERAT_MISS,            0x30064)
+EVENT(PM_MRK_DATA_FROM_L2MISS,                0x4d048)
+EVENT(PM_DATA_FROM_RL2L3_SHR,                 0x1c04c)
+EVENT(PM_INST_FROM_PREF,                      0x14046)
+EVENT(PM_VSU1_SQ,                             0x0b09e)
+EVENT(PM_L2_LD_DISP,                          0x36180)
+EVENT(PM_L2_DISP_ALL,                         0x46080)
+EVENT(PM_THRD_GRP_CMPL_BOTH_CYC,              0x10012)
+EVENT(PM_VSU_FSQRT_FDIV_DOUBLE,               0x0a894)
+EVENT(PM_BR_MPRED,                            0x400f6)
+EVENT(PM_INST_PTEG_FROM_DL2L3_SHR,            0x3e054)
+EVENT(PM_VSU_1FLOP,                           0x0a880)
+EVENT(PM_HV_CYC,                              0x2000a)
+EVENT(PM_MRK_LSU_FIN,                         0x40032)
+EVENT(PM_MRK_DATA_FROM_RL2L3_SHR,             0x1d04c)
+EVENT(PM_DTLB_MISS_16M,                       0x4c05e)
+EVENT(PM_LSU1_LMQ_LHR_MERGE,                  0x0d09a)
+EVENT(PM_IFU_FIN,                             0x40066)
diff --git a/arch/powerpc/perf/power7-pmu.c b/arch/powerpc/perf/power7-pmu.c
index d1821b8bbc4c..56c67bca2f75 100644
--- a/arch/powerpc/perf/power7-pmu.c
+++ b/arch/powerpc/perf/power7-pmu.c
@@ -53,37 +53,13 @@
 /*
  * Power7 event codes.
  */
-#define PME_PM_CYC                      0x1e
-#define PME_PM_GCT_NOSLOT_CYC           0x100f8
-#define PME_PM_CMPLU_STALL              0x4000a
-#define PME_PM_INST_CMPL                0x2
-#define PME_PM_LD_REF_L1                0xc880
-#define PME_PM_LD_MISS_L1               0x400f0
-#define PME_PM_BRU_FIN                  0x10068
-#define PME_PM_BR_MPRED                 0x400f6
-
-#define PME_PM_CMPLU_STALL_FXU                  0x20014
-#define PME_PM_CMPLU_STALL_DIV                  0x40014
-#define PME_PM_CMPLU_STALL_SCALAR               0x40012
-#define PME_PM_CMPLU_STALL_SCALAR_LONG          0x20018
-#define PME_PM_CMPLU_STALL_VECTOR               0x2001c
-#define PME_PM_CMPLU_STALL_VECTOR_LONG          0x4004a
-#define PME_PM_CMPLU_STALL_LSU                  0x20012
-#define PME_PM_CMPLU_STALL_REJECT               0x40016
-#define PME_PM_CMPLU_STALL_ERAT_MISS            0x40018
-#define PME_PM_CMPLU_STALL_DCACHE_MISS          0x20016
-#define PME_PM_CMPLU_STALL_STORE                0x2004a
-#define PME_PM_CMPLU_STALL_THRD                 0x1001c
-#define PME_PM_CMPLU_STALL_IFU                  0x4004c
-#define PME_PM_CMPLU_STALL_BRU                  0x4004e
-#define PME_PM_GCT_NOSLOT_IC_MISS               0x2001a
-#define PME_PM_GCT_NOSLOT_BR_MPRED              0x4001a
-#define PME_PM_GCT_NOSLOT_BR_MPRED_IC_MISS      0x4001c
-#define PME_PM_GRP_CMPL                         0x30004
-#define PME_PM_1PLUS_PPC_CMPL                   0x100f2
-#define PME_PM_CMPLU_STALL_DFU                  0x2003c
-#define PME_PM_RUN_CYC                          0x200f4
-#define PME_PM_RUN_INST_CMPL                    0x400fa
+#define EVENT(_name, _code) \
+        PME_##_name = _code,
+
+enum {
+#include "power7-events-list.h"
+};
+#undef EVENT
 
 /*
  * Layout of constraint bits:
@@ -398,96 +374,36 @@ static int power7_cache_events[C(MAX)][C(OP_MAX)][C(RESULT_MAX)] = {
 };
 
 
-GENERIC_EVENT_ATTR(cpu-cycles,                  CYC);
-GENERIC_EVENT_ATTR(stalled-cycles-frontend,     GCT_NOSLOT_CYC);
-GENERIC_EVENT_ATTR(stalled-cycles-backend,      CMPLU_STALL);
-GENERIC_EVENT_ATTR(instructions,                INST_CMPL);
-GENERIC_EVENT_ATTR(cache-references,            LD_REF_L1);
-GENERIC_EVENT_ATTR(cache-misses,                LD_MISS_L1);
-GENERIC_EVENT_ATTR(branch-instructions,         BRU_FIN);
-GENERIC_EVENT_ATTR(branch-misses,               BR_MPRED);
-
-POWER_EVENT_ATTR(CYC,                           CYC);
-POWER_EVENT_ATTR(GCT_NOSLOT_CYC,                GCT_NOSLOT_CYC);
-POWER_EVENT_ATTR(CMPLU_STALL,                   CMPLU_STALL);
-POWER_EVENT_ATTR(INST_CMPL,                     INST_CMPL);
-POWER_EVENT_ATTR(LD_REF_L1,                     LD_REF_L1);
-POWER_EVENT_ATTR(LD_MISS_L1,                    LD_MISS_L1);
-POWER_EVENT_ATTR(BRU_FIN,                       BRU_FIN)
-POWER_EVENT_ATTR(BR_MPRED,                      BR_MPRED);
-
-POWER_EVENT_ATTR(CMPLU_STALL_FXU,               CMPLU_STALL_FXU);
-POWER_EVENT_ATTR(CMPLU_STALL_DIV,               CMPLU_STALL_DIV);
-POWER_EVENT_ATTR(CMPLU_STALL_SCALAR,            CMPLU_STALL_SCALAR);
-POWER_EVENT_ATTR(CMPLU_STALL_SCALAR_LONG,       CMPLU_STALL_SCALAR_LONG);
-POWER_EVENT_ATTR(CMPLU_STALL_VECTOR,            CMPLU_STALL_VECTOR);
-POWER_EVENT_ATTR(CMPLU_STALL_VECTOR_LONG,       CMPLU_STALL_VECTOR_LONG);
-POWER_EVENT_ATTR(CMPLU_STALL_LSU,               CMPLU_STALL_LSU);
-POWER_EVENT_ATTR(CMPLU_STALL_REJECT,            CMPLU_STALL_REJECT);
-
-POWER_EVENT_ATTR(CMPLU_STALL_ERAT_MISS,         CMPLU_STALL_ERAT_MISS);
-POWER_EVENT_ATTR(CMPLU_STALL_DCACHE_MISS,       CMPLU_STALL_DCACHE_MISS);
-POWER_EVENT_ATTR(CMPLU_STALL_STORE,             CMPLU_STALL_STORE);
-POWER_EVENT_ATTR(CMPLU_STALL_THRD,              CMPLU_STALL_THRD);
-POWER_EVENT_ATTR(CMPLU_STALL_IFU,               CMPLU_STALL_IFU);
-POWER_EVENT_ATTR(CMPLU_STALL_BRU,               CMPLU_STALL_BRU);
-POWER_EVENT_ATTR(GCT_NOSLOT_IC_MISS,            GCT_NOSLOT_IC_MISS);
-
-POWER_EVENT_ATTR(GCT_NOSLOT_BR_MPRED,           GCT_NOSLOT_BR_MPRED);
-POWER_EVENT_ATTR(GCT_NOSLOT_BR_MPRED_IC_MISS,   GCT_NOSLOT_BR_MPRED_IC_MISS);
-POWER_EVENT_ATTR(GRP_CMPL,                      GRP_CMPL);
-POWER_EVENT_ATTR(1PLUS_PPC_CMPL,                1PLUS_PPC_CMPL);
-POWER_EVENT_ATTR(CMPLU_STALL_DFU,               CMPLU_STALL_DFU);
-POWER_EVENT_ATTR(RUN_CYC,                       RUN_CYC);
-POWER_EVENT_ATTR(RUN_INST_CMPL,                 RUN_INST_CMPL);
+GENERIC_EVENT_ATTR(cpu-cycles,                  PM_CYC);
+GENERIC_EVENT_ATTR(stalled-cycles-frontend,     PM_GCT_NOSLOT_CYC);
+GENERIC_EVENT_ATTR(stalled-cycles-backend,      PM_CMPLU_STALL);
+GENERIC_EVENT_ATTR(instructions,                PM_INST_CMPL);
+GENERIC_EVENT_ATTR(cache-references,            PM_LD_REF_L1);
+GENERIC_EVENT_ATTR(cache-misses,                PM_LD_MISS_L1);
+GENERIC_EVENT_ATTR(branch-instructions,         PM_BRU_FIN);
+GENERIC_EVENT_ATTR(branch-misses,               PM_BR_MPRED);
+
+#define EVENT(_name, _code)     POWER_EVENT_ATTR(_name, _name);
+#include "power7-events-list.h"
+#undef EVENT
+
+#define EVENT(_name, _code)     POWER_EVENT_PTR(_name),
 
 static struct attribute *power7_events_attr[] = {
-        GENERIC_EVENT_PTR(CYC),
-        GENERIC_EVENT_PTR(GCT_NOSLOT_CYC),
-        GENERIC_EVENT_PTR(CMPLU_STALL),
-        GENERIC_EVENT_PTR(INST_CMPL),
-        GENERIC_EVENT_PTR(LD_REF_L1),
-        GENERIC_EVENT_PTR(LD_MISS_L1),
-        GENERIC_EVENT_PTR(BRU_FIN),
-        GENERIC_EVENT_PTR(BR_MPRED),
-
-        POWER_EVENT_PTR(CYC),
-        POWER_EVENT_PTR(GCT_NOSLOT_CYC),
-        POWER_EVENT_PTR(CMPLU_STALL),
-        POWER_EVENT_PTR(INST_CMPL),
-        POWER_EVENT_PTR(LD_REF_L1),
-        POWER_EVENT_PTR(LD_MISS_L1),
-        POWER_EVENT_PTR(BRU_FIN),
-        POWER_EVENT_PTR(BR_MPRED),
-
-        POWER_EVENT_PTR(CMPLU_STALL_FXU),
-        POWER_EVENT_PTR(CMPLU_STALL_DIV),
-        POWER_EVENT_PTR(CMPLU_STALL_SCALAR),
-        POWER_EVENT_PTR(CMPLU_STALL_SCALAR_LONG),
-        POWER_EVENT_PTR(CMPLU_STALL_VECTOR),
-        POWER_EVENT_PTR(CMPLU_STALL_VECTOR_LONG),
-        POWER_EVENT_PTR(CMPLU_STALL_LSU),
-        POWER_EVENT_PTR(CMPLU_STALL_REJECT),
-
-        POWER_EVENT_PTR(CMPLU_STALL_ERAT_MISS),
-        POWER_EVENT_PTR(CMPLU_STALL_DCACHE_MISS),
-        POWER_EVENT_PTR(CMPLU_STALL_STORE),
-        POWER_EVENT_PTR(CMPLU_STALL_THRD),
-        POWER_EVENT_PTR(CMPLU_STALL_IFU),
-        POWER_EVENT_PTR(CMPLU_STALL_BRU),
-        POWER_EVENT_PTR(GCT_NOSLOT_IC_MISS),
-        POWER_EVENT_PTR(GCT_NOSLOT_BR_MPRED),
-
-        POWER_EVENT_PTR(GCT_NOSLOT_BR_MPRED_IC_MISS),
-        POWER_EVENT_PTR(GRP_CMPL),
-        POWER_EVENT_PTR(1PLUS_PPC_CMPL),
-        POWER_EVENT_PTR(CMPLU_STALL_DFU),
-        POWER_EVENT_PTR(RUN_CYC),
-        POWER_EVENT_PTR(RUN_INST_CMPL),
+        GENERIC_EVENT_PTR(PM_CYC),
+        GENERIC_EVENT_PTR(PM_GCT_NOSLOT_CYC),
+        GENERIC_EVENT_PTR(PM_CMPLU_STALL),
+        GENERIC_EVENT_PTR(PM_INST_CMPL),
+        GENERIC_EVENT_PTR(PM_LD_REF_L1),
+        GENERIC_EVENT_PTR(PM_LD_MISS_L1),
+        GENERIC_EVENT_PTR(PM_BRU_FIN),
+        GENERIC_EVENT_PTR(PM_BR_MPRED),
+
+        #include "power7-events-list.h"
+        #undef EVENT
         NULL
 };
 
-
 static struct attribute_group power7_pmu_events_group = {
         .name = "events",
         .attrs = power7_events_attr,
diff --git a/arch/powerpc/platforms/44x/warp.c b/arch/powerpc/platforms/44x/warp.c
index 4cfa49901c02..534574a97ec9 100644
--- a/arch/powerpc/platforms/44x/warp.c
+++ b/arch/powerpc/platforms/44x/warp.c
@@ -16,7 +16,6 @@
 #include <linux/interrupt.h>
 #include <linux/delay.h>
 #include <linux/of_gpio.h>
-#include <linux/of_i2c.h>
 #include <linux/slab.h>
 #include <linux/export.h>
 
diff --git a/arch/powerpc/platforms/52xx/mpc52xx_pic.c b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
index b89ef65392dc..b69221ba07fd 100644
--- a/arch/powerpc/platforms/52xx/mpc52xx_pic.c
+++ b/arch/powerpc/platforms/52xx/mpc52xx_pic.c
@@ -373,8 +373,9 @@ static int mpc52xx_irqhost_map(struct irq_domain *h, unsigned int virq,
         case MPC52xx_IRQ_L1_PERP: irqchip = &mpc52xx_periph_irqchip; break;
         case MPC52xx_IRQ_L1_SDMA: irqchip = &mpc52xx_sdma_irqchip; break;
         case MPC52xx_IRQ_L1_CRIT:
+        default:
                 pr_warn("%s: Critical IRQ #%d is unsupported! Nopping it.\n",
-                        __func__, l2irq);
+                        __func__, l1irq);
                 irq_set_chip(virq, &no_irq_chip);
                 return 0;
         }
diff --git a/arch/powerpc/platforms/85xx/Kconfig b/arch/powerpc/platforms/85xx/Kconfig
index efdd37c775ad..de2eb9320993 100644
--- a/arch/powerpc/platforms/85xx/Kconfig
+++ b/arch/powerpc/platforms/85xx/Kconfig
@@ -32,6 +32,12 @@ config BSC9131_RDB
           StarCore SC3850 DSP
           Manufacturer : Freescale Semiconductor, Inc
 
+config C293_PCIE
+          bool "Freescale C293PCIE"
+          select DEFAULT_UIMAGE
+          help
+          This option enables support for the C293PCIE board
+
 config MPC8540_ADS
         bool "Freescale MPC8540 ADS"
         select DEFAULT_UIMAGE
@@ -112,10 +118,10 @@ config P1022_RDK
           reference board.
 
 config P1023_RDS
-        bool "Freescale P1023 RDS"
+        bool "Freescale P1023 RDS/RDB"
         select DEFAULT_UIMAGE
         help
-          This option enables support for the P1023 RDS board
+          This option enables support for the P1023 RDS and RDB boards
 
 config SOCRATES
         bool "Socrates"
diff --git a/arch/powerpc/platforms/85xx/Makefile b/arch/powerpc/platforms/85xx/Makefile
index 2eab37ea4a9d..53c9f75a6907 100644
--- a/arch/powerpc/platforms/85xx/Makefile
+++ b/arch/powerpc/platforms/85xx/Makefile
@@ -6,6 +6,7 @@ obj-$(CONFIG_SMP) += smp.o
 obj-y += common.o
 
 obj-$(CONFIG_BSC9131_RDB) += bsc913x_rdb.o
+obj-$(CONFIG_C293_PCIE)   += c293pcie.o
 obj-$(CONFIG_MPC8540_ADS) += mpc85xx_ads.o
 obj-$(CONFIG_MPC8560_ADS) += mpc85xx_ads.o
 obj-$(CONFIG_MPC85xx_CDS) += mpc85xx_cds.o
diff --git a/arch/powerpc/platforms/85xx/c293pcie.c b/arch/powerpc/platforms/85xx/c293pcie.c
new file mode 100644
index 000000000000..6208e49142bf
--- /dev/null
+++ b/arch/powerpc/platforms/85xx/c293pcie.c
@@ -0,0 +1,75 @@
+/*
+ * C293PCIE Board Setup
+ *
+ * Copyright 2013 Freescale Semiconductor Inc.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/stddef.h>
+#include <linux/kernel.h>
+#include <linux/of_platform.h>
+
+#include <asm/machdep.h>
+#include <asm/udbg.h>
+#include <asm/mpic.h>
+
+#include <sysdev/fsl_soc.h>
+#include <sysdev/fsl_pci.h>
+
+#include "mpc85xx.h"
+
+void __init c293_pcie_pic_init(void)
+{
+        struct mpic *mpic = mpic_alloc(NULL, 0, MPIC_BIG_ENDIAN |
+          MPIC_SINGLE_DEST_CPU, 0, 256, " OpenPIC  ");
+
+        BUG_ON(mpic == NULL);
+
+        mpic_init(mpic);
+}
+
+
+/*
+ * Setup the architecture
+ */
+static void __init c293_pcie_setup_arch(void)
+{
+        if (ppc_md.progress)
+                ppc_md.progress("c293_pcie_setup_arch()", 0);
+
+        fsl_pci_assign_primary();
+
+        printk(KERN_INFO "C293 PCIE board from Freescale Semiconductor\n");
+}
+
+machine_arch_initcall(c293_pcie, mpc85xx_common_publish_devices);
+
+/*
+ * Called very early, device-tree isn't unflattened
+ */
+static int __init c293_pcie_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        if (of_flat_dt_is_compatible(root, "fsl,C293PCIE"))
+                return 1;
+        return 0;
+}
+
+define_machine(c293_pcie) {
+        .name                   = "C293 PCIE",
+        .probe                  = c293_pcie_probe,
+        .setup_arch             = c293_pcie_setup_arch,
+        .init_IRQ               = c293_pcie_pic_init,
+#ifdef CONFIG_PCI
+        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+#endif
+        .get_irq                = mpic_get_irq,
+        .restart                = fsl_rstcr_restart,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = udbg_progress,
+};
diff --git a/arch/powerpc/platforms/85xx/corenet_ds.c b/arch/powerpc/platforms/85xx/corenet_ds.c
index c59c617eee93..aa3690bae415 100644
--- a/arch/powerpc/platforms/85xx/corenet_ds.c
+++ b/arch/powerpc/platforms/85xx/corenet_ds.c
@@ -53,12 +53,6 @@ void __init corenet_ds_setup_arch(void)
 {
         mpc85xx_smp_init();
 
-#if defined(CONFIG_PCI) && defined(CONFIG_PPC64)
-        pci_devs_phb_init();
-#endif
-
-        fsl_pci_assign_primary();
-
         swiotlb_detect_4g();
 
         pr_info("%s board from Freescale Semiconductor\n", ppc_md.name);
diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
index ede8771d6f02..53b6fb0a3d56 100644
--- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
+++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c
@@ -160,6 +160,7 @@ machine_arch_initcall(p2020_rdb_pc, mpc85xx_common_publish_devices);
 machine_arch_initcall(p1020_mbg_pc, mpc85xx_common_publish_devices);
 machine_arch_initcall(p1020_rdb, mpc85xx_common_publish_devices);
 machine_arch_initcall(p1020_rdb_pc, mpc85xx_common_publish_devices);
+machine_arch_initcall(p1020_rdb_pd, mpc85xx_common_publish_devices);
 machine_arch_initcall(p1020_utm_pc, mpc85xx_common_publish_devices);
 machine_arch_initcall(p1021_rdb_pc, mpc85xx_common_publish_devices);
 machine_arch_initcall(p1025_rdb, mpc85xx_common_publish_devices);
@@ -193,6 +194,13 @@ static int __init p1020_rdb_pc_probe(void)
         return of_flat_dt_is_compatible(root, "fsl,P1020RDB-PC");
 }
 
+static int __init p1020_rdb_pd_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        return of_flat_dt_is_compatible(root, "fsl,P1020RDB-PD");
+}
+
 static int __init p1021_rdb_pc_probe(void)
 {
         unsigned long root = of_get_flat_dt_root();
@@ -351,6 +359,20 @@ define_machine(p1020_rdb_pc) {
         .progress               = udbg_progress,
 };
 
+define_machine(p1020_rdb_pd) {
+        .name                   = "P1020RDB-PD",
+        .probe                  = p1020_rdb_pd_probe,
+        .setup_arch             = mpc85xx_rdb_setup_arch,
+        .init_IRQ               = mpc85xx_rdb_pic_init,
+#ifdef CONFIG_PCI
+        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+#endif
+        .get_irq                = mpic_get_irq,
+        .restart                = fsl_rstcr_restart,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = udbg_progress,
+};
+
 define_machine(p1024_rdb) {
         .name                   = "P1024 RDB",
         .probe                  = p1024_rdb_probe,
diff --git a/arch/powerpc/platforms/85xx/p1023_rds.c b/arch/powerpc/platforms/85xx/p1023_rds.c
index 9cc60a738834..2ae9d490c3d9 100644
--- a/arch/powerpc/platforms/85xx/p1023_rds.c
+++ b/arch/powerpc/platforms/85xx/p1023_rds.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2011 Freescale Semiconductor, Inc.
+ * Copyright 2010-2011, 2013 Freescale Semiconductor, Inc.
  *
  * Author: Roy Zang <tie-fei.zang@freescale.com>
  *
@@ -86,6 +86,7 @@ static void __init mpc85xx_rds_setup_arch(void)
 }
 
 machine_arch_initcall(p1023_rds, mpc85xx_common_publish_devices);
+machine_arch_initcall(p1023_rdb, mpc85xx_common_publish_devices);
 
 static void __init mpc85xx_rds_pic_init(void)
 {
@@ -106,6 +107,14 @@ static int __init p1023_rds_probe(void)
 
 }
 
+static int __init p1023_rdb_probe(void)
+{
+        unsigned long root = of_get_flat_dt_root();
+
+        return of_flat_dt_is_compatible(root, "fsl,P1023RDB");
+
+}
+
 define_machine(p1023_rds) {
         .name                   = "P1023 RDS",
         .probe                  = p1023_rds_probe,
@@ -120,3 +129,16 @@ define_machine(p1023_rds) {
 #endif
 };
 
+define_machine(p1023_rdb) {
+        .name                   = "P1023 RDB",
+        .probe                  = p1023_rdb_probe,
+        .setup_arch             = mpc85xx_rds_setup_arch,
+        .init_IRQ               = mpc85xx_rds_pic_init,
+        .get_irq                = mpic_get_irq,
+        .restart                = fsl_rstcr_restart,
+        .calibrate_decr         = generic_calibrate_decr,
+        .progress               = udbg_progress,
+#ifdef CONFIG_PCI
+        .pcibios_fixup_bus      = fsl_pcibios_fixup_bus,
+#endif
+};
diff --git a/arch/powerpc/platforms/85xx/smp.c b/arch/powerpc/platforms/85xx/smp.c
index 5ced4f5bb2b2..281b7f01df63 100644
--- a/arch/powerpc/platforms/85xx/smp.c
+++ b/arch/powerpc/platforms/85xx/smp.c
@@ -69,7 +69,32 @@ static void mpc85xx_give_timebase(void)
         tb_req = 0;
 
         mpc85xx_timebase_freeze(1);
+#ifdef CONFIG_PPC64
+        /*
+         * e5500/e6500 have a workaround for erratum A-006958 in place
+         * that will reread the timebase until TBL is non-zero.
+         * That would be a bad thing when the timebase is frozen.
+         *
+         * Thus, we read it manually, and instead of checking that
+         * TBL is non-zero, we ensure that TB does not change.  We don't
+         * do that for the main mftb implementation, because it requires
+         * a scratch register
+         */
+        {
+                u64 prev;
+
+                asm volatile("mfspr %0, %1" : "=r" (timebase) :
+                             "i" (SPRN_TBRL));
+
+                do {
+                        prev = timebase;
+                        asm volatile("mfspr %0, %1" : "=r" (timebase) :
+                                     "i" (SPRN_TBRL));
+                } while (prev != timebase);
+        }
+#else
         timebase = get_tb();
+#endif
         mb();
         tb_valid = 1;
 
@@ -255,6 +280,7 @@ out:
 
 struct smp_ops_t smp_85xx_ops = {
         .kick_cpu = smp_85xx_kick_cpu,
+        .cpu_bootable = smp_generic_cpu_bootable,
 #ifdef CONFIG_HOTPLUG_CPU
         .cpu_disable    = generic_cpu_disable,
         .cpu_die        = generic_cpu_die,
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index d703775bda30..bf9c6d4cd26c 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -202,17 +202,12 @@ config PPC_P7_NAP
         bool
         default n
 
-config PPC_INDIRECT_IO
-        bool
-        select GENERIC_IOMAP
-
 config PPC_INDIRECT_PIO
         bool
-        select PPC_INDIRECT_IO
+        select GENERIC_IOMAP
 
 config PPC_INDIRECT_MMIO
         bool
-        select PPC_INDIRECT_IO
 
 config PPC_IO_WORKAROUNDS
         bool
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index 47d9a03dd415..6704e2e20e6b 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -96,18 +96,31 @@ config GENERIC_CPU
 
 config CELL_CPU
         bool "Cell Broadband Engine"
+        depends on PPC_BOOK3S_64
 
 config POWER4_CPU
         bool "POWER4"
+        depends on PPC_BOOK3S_64
 
 config POWER5_CPU
         bool "POWER5"
+        depends on PPC_BOOK3S_64
 
 config POWER6_CPU
         bool "POWER6"
+        depends on PPC_BOOK3S_64
 
 config POWER7_CPU
         bool "POWER7"
+        depends on PPC_BOOK3S_64
+
+config E5500_CPU
+        bool "Freescale e5500"
+        depends on E500
+
+config E6500_CPU
+        bool "Freescale e6500"
+        depends on E500
 
 endchoice
 
diff --git a/arch/powerpc/platforms/cell/iommu.c b/arch/powerpc/platforms/cell/iommu.c
index 946306b1bb4e..b53560660b72 100644
--- a/arch/powerpc/platforms/cell/iommu.c
+++ b/arch/powerpc/platforms/cell/iommu.c
@@ -697,7 +697,7 @@ static int __init cell_iommu_get_window(struct device_node *np,
                                          unsigned long *base,
                                          unsigned long *size)
 {
-        const void *dma_window;
+        const __be32 *dma_window;
         unsigned long index;
 
         /* Use ibm,dma-window if available, else, hard code ! */
diff --git a/arch/powerpc/platforms/cell/smp.c b/arch/powerpc/platforms/cell/smp.c
index f75f6fcac729..90745eaa45fe 100644
--- a/arch/powerpc/platforms/cell/smp.c
+++ b/arch/powerpc/platforms/cell/smp.c
@@ -136,25 +136,12 @@ static int smp_cell_kick_cpu(int nr)
         return 0;
 }
 
-static int smp_cell_cpu_bootable(unsigned int nr)
-{
-        /* Special case - we inhibit secondary thread startup
-         * during boot if the user requests it.  Odd-numbered
-         * cpus are assumed to be secondary threads.
-         */
-        if (system_state == SYSTEM_BOOTING &&
-            cpu_has_feature(CPU_FTR_SMT) &&
-            !smt_enabled_at_boot && cpu_thread_in_core(nr) != 0)
-                return 0;
-
-        return 1;
-}
 static struct smp_ops_t bpa_iic_smp_ops = {
         .message_pass   = iic_message_pass,
         .probe          = smp_iic_probe,
         .kick_cpu       = smp_cell_kick_cpu,
         .setup_cpu      = smp_cell_setup_cpu,
-        .cpu_bootable   = smp_cell_cpu_bootable,
+        .cpu_bootable   = smp_generic_cpu_bootable,
 };
 
 /* This is called very early */
diff --git a/arch/powerpc/platforms/cell/spufs/inode.c b/arch/powerpc/platforms/cell/spufs/inode.c
index f3900427ffab..87ba7cf99cd7 100644
--- a/arch/powerpc/platforms/cell/spufs/inode.c
+++ b/arch/powerpc/platforms/cell/spufs/inode.c
@@ -620,12 +620,16 @@ spufs_parse_options(struct super_block *sb, char *options, struct inode *root)
                 case Opt_uid:
                         if (match_int(&args[0], &option))
                                 return 0;
-                        root->i_uid = option;
+                        root->i_uid = make_kuid(current_user_ns(), option);
+                        if (!uid_valid(root->i_uid))
+                                return 0;
                         break;
                 case Opt_gid:
                         if (match_int(&args[0], &option))
                                 return 0;
-                        root->i_gid = option;
+                        root->i_gid = make_kgid(current_user_ns(), option);
+                        if (!gid_valid(root->i_gid))
+                                return 0;
                         break;
                 case Opt_mode:
                         if (match_octal(&args[0], &option))
diff --git a/arch/powerpc/platforms/powernv/Kconfig b/arch/powerpc/platforms/powernv/Kconfig
index c24684c818ab..6fae5eb99ea6 100644
--- a/arch/powerpc/platforms/powernv/Kconfig
+++ b/arch/powerpc/platforms/powernv/Kconfig
@@ -7,6 +7,8 @@ config PPC_POWERNV
         select PPC_P7_NAP
         select PPC_PCI_CHOICE if EMBEDDED
         select EPAPR_BOOT
+        select PPC_INDIRECT_PIO
+        select PPC_UDBG_16550
         default y
 
 config POWERNV_MSI
diff --git a/arch/powerpc/platforms/powernv/Makefile b/arch/powerpc/platforms/powernv/Makefile
index 7fe595152478..300c437d713c 100644
--- a/arch/powerpc/platforms/powernv/Makefile
+++ b/arch/powerpc/platforms/powernv/Makefile
@@ -1,5 +1,5 @@
 obj-y                   += setup.o opal-takeover.o opal-wrappers.o opal.o
-obj-y                   += opal-rtc.o opal-nvram.o
+obj-y                   += opal-rtc.o opal-nvram.o opal-lpc.o
 
 obj-$(CONFIG_SMP)       += smp.o
 obj-$(CONFIG_PCI)       += pci.o pci-p5ioc2.o pci-ioda.o
diff --git a/arch/powerpc/platforms/powernv/eeh-ioda.c b/arch/powerpc/platforms/powernv/eeh-ioda.c
index 0cd1c4a71755..cf42e74514fa 100644
--- a/arch/powerpc/platforms/powernv/eeh-ioda.c
+++ b/arch/powerpc/platforms/powernv/eeh-ioda.c
@@ -36,13 +36,6 @@
 #include "powernv.h"
 #include "pci.h"
 
-/* Debugging option */
-#ifdef IODA_EEH_DBG_ON
-#define IODA_EEH_DBG(args...)   pr_info(args)
-#else
-#define IODA_EEH_DBG(args...)
-#endif
-
 static char *hub_diag = NULL;
 static int ioda_eeh_nb_init = 0;
 
@@ -823,17 +816,17 @@ static int ioda_eeh_next_error(struct eeh_pe **pe)
 
                 /* If OPAL API returns error, we needn't proceed */
                 if (rc != OPAL_SUCCESS) {
-                        IODA_EEH_DBG("%s: Invalid return value on "
-                                     "PHB#%x (0x%lx) from opal_pci_next_error",
-                                     __func__, hose->global_number, rc);
+                        pr_devel("%s: Invalid return value on "
+                                 "PHB#%x (0x%lx) from opal_pci_next_error",
+                                 __func__, hose->global_number, rc);
                         continue;
                 }
 
                 /* If the PHB doesn't have error, stop processing */
                 if (err_type == OPAL_EEH_NO_ERROR ||
                     severity == OPAL_EEH_SEV_NO_ERROR) {
-                        IODA_EEH_DBG("%s: No error found on PHB#%x\n",
-                                     __func__, hose->global_number);
+                        pr_devel("%s: No error found on PHB#%x\n",
+                                 __func__, hose->global_number);
                         continue;
                 }
 
@@ -842,8 +835,9 @@ static int ioda_eeh_next_error(struct eeh_pe **pe)
                  * highest priority reported upon multiple errors on the
                  * specific PHB.
                  */
-                IODA_EEH_DBG("%s: Error (%d, %d, %d) on PHB#%x\n",
-                        err_type, severity, pe_no, hose->global_number);
+                pr_devel("%s: Error (%d, %d, %llu) on PHB#%x\n",
+                         __func__, err_type, severity,
+                         frozen_pe_no, hose->global_number);
                 switch (err_type) {
                 case OPAL_EEH_IOC_ERROR:
                         if (severity == OPAL_EEH_SEV_IOC_DEAD) {
diff --git a/arch/powerpc/platforms/powernv/opal-lpc.c b/arch/powerpc/platforms/powernv/opal-lpc.c
new file mode 100644
index 000000000000..a7614bb14e17
--- /dev/null
+++ b/arch/powerpc/platforms/powernv/opal-lpc.c
@@ -0,0 +1,203 @@
+/*
+ * PowerNV LPC bus handling.
+ *
+ * Copyright 2013 IBM Corp.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version
+ * 2 of the License, or (at your option) any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/of.h>
+#include <linux/bug.h>
+
+#include <asm/machdep.h>
+#include <asm/firmware.h>
+#include <asm/xics.h>
+#include <asm/opal.h>
+
+static int opal_lpc_chip_id = -1;
+
+static u8 opal_lpc_inb(unsigned long port)
+{
+        int64_t rc;
+        uint32_t data;
+
+        if (opal_lpc_chip_id < 0 || port > 0xffff)
+                return 0xff;
+        rc = opal_lpc_read(opal_lpc_chip_id, OPAL_LPC_IO, port, &data, 1);
+        return rc ? 0xff : data;
+}
+
+static __le16 __opal_lpc_inw(unsigned long port)
+{
+        int64_t rc;
+        uint32_t data;
+
+        if (opal_lpc_chip_id < 0 || port > 0xfffe)
+                return 0xffff;
+        if (port & 1)
+                return (__le16)opal_lpc_inb(port) << 8 | opal_lpc_inb(port + 1);
+        rc = opal_lpc_read(opal_lpc_chip_id, OPAL_LPC_IO, port, &data, 2);
+        return rc ? 0xffff : data;
+}
+static u16 opal_lpc_inw(unsigned long port)
+{
+        return le16_to_cpu(__opal_lpc_inw(port));
+}
+
+static __le32 __opal_lpc_inl(unsigned long port)
+{
+        int64_t rc;
+        uint32_t data;
+
+        if (opal_lpc_chip_id < 0 || port > 0xfffc)
+                return 0xffffffff;
+        if (port & 3)
+                return (__le32)opal_lpc_inb(port    ) << 24 |
+                       (__le32)opal_lpc_inb(port + 1) << 16 |
+                       (__le32)opal_lpc_inb(port + 2) <<  8 |
+                               opal_lpc_inb(port + 3);
+        rc = opal_lpc_read(opal_lpc_chip_id, OPAL_LPC_IO, port, &data, 4);
+        return rc ? 0xffffffff : data;
+}
+
+static u32 opal_lpc_inl(unsigned long port)
+{
+        return le32_to_cpu(__opal_lpc_inl(port));
+}
+
+static void opal_lpc_outb(u8 val, unsigned long port)
+{
+        if (opal_lpc_chip_id < 0 || port > 0xffff)
+                return;
+        opal_lpc_write(opal_lpc_chip_id, OPAL_LPC_IO, port, val, 1);
+}
+
+static void __opal_lpc_outw(__le16 val, unsigned long port)
+{
+        if (opal_lpc_chip_id < 0 || port > 0xfffe)
+                return;
+        if (port & 1) {
+                opal_lpc_outb(val >> 8, port);
+                opal_lpc_outb(val     , port + 1);
+                return;
+        }
+        opal_lpc_write(opal_lpc_chip_id, OPAL_LPC_IO, port, val, 2);
+}
+
+static void opal_lpc_outw(u16 val, unsigned long port)
+{
+        __opal_lpc_outw(cpu_to_le16(val), port);
+}
+
+static void __opal_lpc_outl(__le32 val, unsigned long port)
+{
+        if (opal_lpc_chip_id < 0 || port > 0xfffc)
+                return;
+        if (port & 3) {
+                opal_lpc_outb(val >> 24, port);
+                opal_lpc_outb(val >> 16, port + 1);
+                opal_lpc_outb(val >>  8, port + 2);
+                opal_lpc_outb(val      , port + 3);
+                return;
+        }
+        opal_lpc_write(opal_lpc_chip_id, OPAL_LPC_IO, port, val, 4);
+}
+
+static void opal_lpc_outl(u32 val, unsigned long port)
+{
+        __opal_lpc_outl(cpu_to_le32(val), port);
+}
+
+static void opal_lpc_insb(unsigned long p, void *b, unsigned long c)
+{
+        u8 *ptr = b;
+
+        while(c--)
+                *(ptr++) = opal_lpc_inb(p);
+}
+
+static void opal_lpc_insw(unsigned long p, void *b, unsigned long c)
+{
+        __le16 *ptr = b;
+
+        while(c--)
+                *(ptr++) = __opal_lpc_inw(p);
+}
+
+static void opal_lpc_insl(unsigned long p, void *b, unsigned long c)
+{
+        __le32 *ptr = b;
+
+        while(c--)
+                *(ptr++) = __opal_lpc_inl(p);
+}
+
+static void opal_lpc_outsb(unsigned long p, const void *b, unsigned long c)
+{
+        const u8 *ptr = b;
+
+        while(c--)
+                opal_lpc_outb(*(ptr++), p);
+}
+
+static void opal_lpc_outsw(unsigned long p, const void *b, unsigned long c)
+{
+        const __le16 *ptr = b;
+
+        while(c--)
+                __opal_lpc_outw(*(ptr++), p);
+}
+
+static void opal_lpc_outsl(unsigned long p, const void *b, unsigned long c)
+{
+        const __le32 *ptr = b;
+
+        while(c--)
+                __opal_lpc_outl(*(ptr++), p);
+}
+
+static const struct ppc_pci_io opal_lpc_io = {
+        .inb    = opal_lpc_inb,
+        .inw    = opal_lpc_inw,
+        .inl    = opal_lpc_inl,
+        .outb   = opal_lpc_outb,
+        .outw   = opal_lpc_outw,
+        .outl   = opal_lpc_outl,
+        .insb   = opal_lpc_insb,
+        .insw   = opal_lpc_insw,
+        .insl   = opal_lpc_insl,
+        .outsb  = opal_lpc_outsb,
+        .outsw  = opal_lpc_outsw,
+        .outsl  = opal_lpc_outsl,
+};
+
+void opal_lpc_init(void)
+{
+        struct device_node *np;
+
+        /*
+         * Look for a Power8 LPC bus tagged as "primary",
+         * we currently support only one though the OPAL APIs
+         * support any number.
+         */
+        for_each_compatible_node(np, NULL, "ibm,power8-lpc") {
+                if (!of_device_is_available(np))
+                        continue;
+                if (!of_get_property(np, "primary", NULL))
+                        continue;
+                opal_lpc_chip_id = of_get_ibm_chip_id(np);
+                break;
+        }
+        if (opal_lpc_chip_id < 0)
+                return;
+
+        /* Setup special IO ops */
+        ppc_pci_io = opal_lpc_io;
+        isa_io_special = true;
+
+        pr_info("OPAL: Power8 LPC bus found, chip ID %d\n", opal_lpc_chip_id);
+}
diff --git a/arch/powerpc/platforms/powernv/opal-wrappers.S b/arch/powerpc/platforms/powernv/opal-wrappers.S
index e88863ffb135..8f3844535fbb 100644
--- a/arch/powerpc/platforms/powernv/opal-wrappers.S
+++ b/arch/powerpc/platforms/powernv/opal-wrappers.S
@@ -111,3 +111,8 @@ OPAL_CALL(opal_pci_next_error,			OPAL_PCI_NEXT_ERROR);
 OPAL_CALL(opal_pci_poll,                        OPAL_PCI_POLL);
 OPAL_CALL(opal_pci_msi_eoi,                     OPAL_PCI_MSI_EOI);
 OPAL_CALL(opal_pci_get_phb_diag_data2,          OPAL_PCI_GET_PHB_DIAG_DATA2);
+OPAL_CALL(opal_xscom_read,                      OPAL_XSCOM_READ);
+OPAL_CALL(opal_xscom_write,                     OPAL_XSCOM_WRITE);
+OPAL_CALL(opal_lpc_read,                        OPAL_LPC_READ);
+OPAL_CALL(opal_lpc_write,                       OPAL_LPC_WRITE);
+OPAL_CALL(opal_return_cpu,                      OPAL_RETURN_CPU);
diff --git a/arch/powerpc/platforms/powernv/opal.c b/arch/powerpc/platforms/powernv/opal.c
index 106301fd2fa5..2911abe550f1 100644
--- a/arch/powerpc/platforms/powernv/opal.c
+++ b/arch/powerpc/platforms/powernv/opal.c
@@ -380,18 +380,20 @@ static int __init opal_init(void)
                 pr_warn("opal: Node not found\n");
                 return -ENODEV;
         }
+
+        /* Register OPAL consoles if any ports */
         if (firmware_has_feature(FW_FEATURE_OPALv2))
                 consoles = of_find_node_by_path("/ibm,opal/consoles");
         else
                 consoles = of_node_get(opal_node);
-
-        /* Register serial ports */
-        for_each_child_of_node(consoles, np) {
-                if (strcmp(np->name, "serial"))
-                        continue;
-                of_platform_device_create(np, NULL, NULL);
+        if (consoles) {
+                for_each_child_of_node(consoles, np) {
+                        if (strcmp(np->name, "serial"))
+                                continue;
+                        of_platform_device_create(np, NULL, NULL);
+                }
+                of_node_put(consoles);
         }
-        of_node_put(consoles);
 
         /* Find all OPAL interrupts and request them */
         irqs = of_get_property(opal_node, "opal-interrupts", &irqlen);
@@ -422,7 +424,7 @@ void opal_shutdown(void)
 
         for (i = 0; i < opal_irq_count; i++) {
                 if (opal_irqs[i])
-                        free_irq(opal_irqs[i], 0);
+                        free_irq(opal_irqs[i], NULL);
                 opal_irqs[i] = 0;
         }
 }
diff --git a/arch/powerpc/platforms/powernv/pci-ioda.c b/arch/powerpc/platforms/powernv/pci-ioda.c
index d8140b125e62..74a5a5773b1f 100644
--- a/arch/powerpc/platforms/powernv/pci-ioda.c
+++ b/arch/powerpc/platforms/powernv/pci-ioda.c
@@ -1104,16 +1104,16 @@ void __init pnv_pci_init_ioda_phb(struct device_node *np,
                                   u64 hub_id, int ioda_type)
 {
         struct pci_controller *hose;
-        static int primary = 1;
         struct pnv_phb *phb;
         unsigned long size, m32map_off, iomap_off, pemap_off;
         const u64 *prop64;
         const u32 *prop32;
+        int len;
         u64 phb_id;
         void *aux;
         long rc;
 
-        pr_info(" Initializing IODA%d OPAL PHB %s\n", ioda_type, np->full_name);
+        pr_info("Initializing IODA%d OPAL PHB %s\n", ioda_type, np->full_name);
 
         prop64 = of_get_property(np, "ibm,opal-phbid", NULL);
         if (!prop64) {
@@ -1124,20 +1124,31 @@ void __init pnv_pci_init_ioda_phb(struct device_node *np,
         pr_debug("  PHB-ID  : 0x%016llx\n", phb_id);
 
         phb = alloc_bootmem(sizeof(struct pnv_phb));
-        if (phb) {
-                memset(phb, 0, sizeof(struct pnv_phb));
-                phb->hose = hose = pcibios_alloc_controller(np);
+        if (!phb) {
+                pr_err("  Out of memory !\n");
+                return;
         }
-        if (!phb || !phb->hose) {
-                pr_err("PCI: Failed to allocate PCI controller for %s\n",
+
+        /* Allocate PCI controller */
+        memset(phb, 0, sizeof(struct pnv_phb));
+        phb->hose = hose = pcibios_alloc_controller(np);
+        if (!phb->hose) {
+                pr_err("  Can't allocate PCI controller for %s\n",
                        np->full_name);
+                free_bootmem((unsigned long)phb, sizeof(struct pnv_phb));
                 return;
         }
 
         spin_lock_init(&phb->lock);
-        /* XXX Use device-tree */
-        hose->first_busno = 0;
-        hose->last_busno = 0xff;
+        prop32 = of_get_property(np, "bus-range", &len);
+        if (prop32 && len == 8) {
+                hose->first_busno = prop32[0];
+                hose->last_busno = prop32[1];
+        } else {
+                pr_warn("  Broken <bus-range> on %s\n", np->full_name);
+                hose->first_busno = 0;
+                hose->last_busno = 0xff;
+        }
         hose->private_data = phb;
         phb->hub_id = hub_id;
         phb->opal_id = phb_id;
@@ -1152,8 +1163,7 @@ void __init pnv_pci_init_ioda_phb(struct device_node *np,
                 phb->model = PNV_PHB_MODEL_UNKNOWN;
 
         /* Parse 32-bit and IO ranges (if any) */
-        pci_process_bridge_OF_ranges(phb->hose, np, primary);
-        primary = 0;
+        pci_process_bridge_OF_ranges(hose, np, !hose->global_number);
 
         /* Get registers */
         phb->regs = of_iomap(np, 0);
@@ -1177,22 +1187,23 @@ void __init pnv_pci_init_ioda_phb(struct device_node *np,
         phb->ioda.io_segsize = phb->ioda.io_size / phb->ioda.total_pe;
         phb->ioda.io_pci_base = 0; /* XXX calculate this ? */
 
-        /* Allocate aux data & arrays
-         *
-         * XXX TODO: Don't allocate io segmap on PHB3
-         */
+        /* Allocate aux data & arrays. We don't have IO ports on PHB3 */
         size = _ALIGN_UP(phb->ioda.total_pe / 8, sizeof(unsigned long));
         m32map_off = size;
         size += phb->ioda.total_pe * sizeof(phb->ioda.m32_segmap[0]);
         iomap_off = size;
-        size += phb->ioda.total_pe * sizeof(phb->ioda.io_segmap[0]);
+        if (phb->type == PNV_PHB_IODA1) {
+                iomap_off = size;
+                size += phb->ioda.total_pe * sizeof(phb->ioda.io_segmap[0]);
+        }
         pemap_off = size;
         size += phb->ioda.total_pe * sizeof(struct pnv_ioda_pe);
         aux = alloc_bootmem(size);
         memset(aux, 0, size);
         phb->ioda.pe_alloc = aux;
         phb->ioda.m32_segmap = aux + m32map_off;
-        phb->ioda.io_segmap = aux + iomap_off;
+        if (phb->type == PNV_PHB_IODA1)
+                phb->ioda.io_segmap = aux + iomap_off;
         phb->ioda.pe_array = aux + pemap_off;
         set_bit(0, phb->ioda.pe_alloc);
 
diff --git a/arch/powerpc/platforms/powernv/powernv.h b/arch/powerpc/platforms/powernv/powernv.h
index a1c6f83fc391..de6819be1f95 100644
--- a/arch/powerpc/platforms/powernv/powernv.h
+++ b/arch/powerpc/platforms/powernv/powernv.h
@@ -15,4 +15,6 @@ static inline void pnv_pci_init(void) { }
 static inline void pnv_pci_shutdown(void) { }
 #endif
 
+extern void pnv_lpc_init(void);
+
 #endif /* _POWERNV_H */
diff --git a/arch/powerpc/platforms/powernv/setup.c b/arch/powerpc/platforms/powernv/setup.c
index 84438af96c05..e239dcfa224c 100644
--- a/arch/powerpc/platforms/powernv/setup.c
+++ b/arch/powerpc/platforms/powernv/setup.c
@@ -31,6 +31,7 @@
 #include <asm/xics.h>
 #include <asm/rtas.h>
 #include <asm/opal.h>
+#include <asm/kexec.h>
 
 #include "powernv.h"
 
@@ -54,6 +55,12 @@ static void __init pnv_setup_arch(void)
 
 static void __init pnv_init_early(void)
 {
+        /*
+         * Initialize the LPC bus now so that legacy serial
+         * ports can be found on it
+         */
+        opal_lpc_init();
+
 #ifdef CONFIG_HVC_OPAL
         if (firmware_has_feature(FW_FEATURE_OPAL))
                 hvc_opal_init_early();
@@ -147,6 +154,16 @@ static void pnv_shutdown(void)
 static void pnv_kexec_cpu_down(int crash_shutdown, int secondary)
 {
         xics_kexec_teardown_cpu(secondary);
+
+        /* Return secondary CPUs to firmware on OPAL v3 */
+        if (firmware_has_feature(FW_FEATURE_OPALv3) && secondary) {
+                mb();
+                get_paca()->kexec_state = KEXEC_STATE_REAL_MODE;
+                mb();
+
+                /* Return the CPU to OPAL */
+                opal_return_cpu();
+        }
 }
 #endif /* CONFIG_KEXEC */
 
diff --git a/arch/powerpc/platforms/powernv/smp.c b/arch/powerpc/platforms/powernv/smp.c
index 89e3857af4e0..908672bdcea6 100644
--- a/arch/powerpc/platforms/powernv/smp.c
+++ b/arch/powerpc/platforms/powernv/smp.c
@@ -46,22 +46,6 @@ static void pnv_smp_setup_cpu(int cpu)
                 xics_setup_cpu();
 }
 
-static int pnv_smp_cpu_bootable(unsigned int nr)
-{
-        /* Special case - we inhibit secondary thread startup
-         * during boot if the user requests it.
-         */
-        if (system_state == SYSTEM_BOOTING && cpu_has_feature(CPU_FTR_SMT)) {
-                if (!smt_enabled_at_boot && cpu_thread_in_core(nr) != 0)
-                        return 0;
-                if (smt_enabled_at_boot
-                    && cpu_thread_in_core(nr) >= smt_enabled_at_boot)
-                        return 0;
-        }
-
-        return 1;
-}
-
 int pnv_smp_kick_cpu(int nr)
 {
         unsigned int pcpu = get_hard_smp_processor_id(nr);
@@ -195,7 +179,7 @@ static struct smp_ops_t pnv_smp_ops = {
         .probe          = xics_smp_probe,
         .kick_cpu       = pnv_smp_kick_cpu,
         .setup_cpu      = pnv_smp_setup_cpu,
-        .cpu_bootable   = pnv_smp_cpu_bootable,
+        .cpu_bootable   = smp_generic_cpu_bootable,
 #ifdef CONFIG_HOTPLUG_CPU
         .cpu_disable    = pnv_smp_cpu_disable,
         .cpu_die        = generic_cpu_die,
diff --git a/arch/powerpc/platforms/ps3/time.c b/arch/powerpc/platforms/ps3/time.c
index cba1e6be68e5..ce73ce865613 100644
--- a/arch/powerpc/platforms/ps3/time.c
+++ b/arch/powerpc/platforms/ps3/time.c
@@ -90,7 +90,7 @@ static int __init ps3_rtc_init(void)
 
         pdev = platform_device_register_simple("rtc-ps3", -1, NULL, 0);
 
-        return PTR_RET(pdev);
+        return PTR_ERR_OR_ZERO(pdev);
 }
 
 module_init(ps3_rtc_init);
diff --git a/arch/powerpc/platforms/pseries/Makefile b/arch/powerpc/platforms/pseries/Makefile
index 8ae010381316..6c61ec5ee914 100644
--- a/arch/powerpc/platforms/pseries/Makefile
+++ b/arch/powerpc/platforms/pseries/Makefile
@@ -22,6 +22,7 @@ obj-$(CONFIG_CMM)		+= cmm.o
 obj-$(CONFIG_DTL)               += dtl.o
 obj-$(CONFIG_IO_EVENT_IRQ)      += io_event_irq.o
 obj-$(CONFIG_PSERIES_IDLE)      += processor_idle.o
+obj-$(CONFIG_LPARCFG)           += lparcfg.o
 
 ifeq ($(CONFIG_PPC_PSERIES),y)
 obj-$(CONFIG_SUSPEND)           += suspend.o
diff --git a/arch/powerpc/platforms/pseries/cmm.c b/arch/powerpc/platforms/pseries/cmm.c
index c638535753df..1e561bef459b 100644
--- a/arch/powerpc/platforms/pseries/cmm.c
+++ b/arch/powerpc/platforms/pseries/cmm.c
@@ -40,8 +40,7 @@
 #include <asm/pgalloc.h>
 #include <asm/uaccess.h>
 #include <linux/memory.h>
-
-#include "plpar_wrappers.h"
+#include <asm/plpar_wrappers.h>
 
 #define CMM_DRIVER_VERSION      "1.0.0"
 #define CMM_DEFAULT_DELAY       1
diff --git a/arch/powerpc/platforms/pseries/dlpar.c b/arch/powerpc/platforms/pseries/dlpar.c
index a1a7b9a67ffd..7cfdaae1721a 100644
--- a/arch/powerpc/platforms/pseries/dlpar.c
+++ b/arch/powerpc/platforms/pseries/dlpar.c
@@ -63,26 +63,32 @@ static struct property *dlpar_parse_cc_property(struct cc_workarea *ccwa)
         return prop;
 }
 
-static struct device_node *dlpar_parse_cc_node(struct cc_workarea *ccwa)
+static struct device_node *dlpar_parse_cc_node(struct cc_workarea *ccwa,
+                                               const char *path)
 {
         struct device_node *dn;
         char *name;
 
+        /* If parent node path is "/" advance path to NULL terminator to
+         * prevent double leading slashs in full_name.
+         */
+        if (!path[1])
+                path++;
+
         dn = kzalloc(sizeof(*dn), GFP_KERNEL);
         if (!dn)
                 return NULL;
 
-        /* The configure connector reported name does not contain a
-         * preceding '/', so we allocate a buffer large enough to
-         * prepend this to the full_name.
-         */
         name = (char *)ccwa + ccwa->name_offset;
-        dn->full_name = kasprintf(GFP_KERNEL, "/%s", name);
+        dn->full_name = kasprintf(GFP_KERNEL, "%s/%s", path, name);
         if (!dn->full_name) {
                 kfree(dn);
                 return NULL;
         }
 
+        of_node_set_flag(dn, OF_DYNAMIC);
+        kref_init(&dn->kref);
+
         return dn;
 }
 
@@ -120,7 +126,8 @@ void dlpar_free_cc_nodes(struct device_node *dn)
 #define CALL_AGAIN      -2
 #define ERR_CFG_USE     -9003
 
-struct device_node *dlpar_configure_connector(u32 drc_index)
+struct device_node *dlpar_configure_connector(u32 drc_index,
+                                              struct device_node *parent)
 {
         struct device_node *dn;
         struct device_node *first_dn = NULL;
@@ -129,6 +136,7 @@ struct device_node *dlpar_configure_connector(u32 drc_index)
         struct property *last_property = NULL;
         struct cc_workarea *ccwa;
         char *data_buf;
+        const char *parent_path = parent->full_name;
         int cc_token;
         int rc = -1;
 
@@ -162,7 +170,7 @@ struct device_node *dlpar_configure_connector(u32 drc_index)
                         break;
 
                 case NEXT_SIBLING:
-                        dn = dlpar_parse_cc_node(ccwa);
+                        dn = dlpar_parse_cc_node(ccwa, parent_path);
                         if (!dn)
                                 goto cc_error;
 
@@ -172,13 +180,17 @@ struct device_node *dlpar_configure_connector(u32 drc_index)
                         break;
 
                 case NEXT_CHILD:
-                        dn = dlpar_parse_cc_node(ccwa);
+                        if (first_dn)
+                                parent_path = last_dn->full_name;
+
+                        dn = dlpar_parse_cc_node(ccwa, parent_path);
                         if (!dn)
                                 goto cc_error;
 
-                        if (!first_dn)
+                        if (!first_dn) {
+                                dn->parent = parent;
                                 first_dn = dn;
-                        else {
+                        } else {
                                 dn->parent = last_dn;
                                 if (last_dn)
                                         last_dn->child = dn;
@@ -202,6 +214,7 @@ struct device_node *dlpar_configure_connector(u32 drc_index)
 
                 case PREV_PARENT:
                         last_dn = last_dn->parent;
+                        parent_path = last_dn->parent->full_name;
                         break;
 
                 case CALL_AGAIN:
@@ -256,8 +269,6 @@ int dlpar_attach_node(struct device_node *dn)
 {
         int rc;
 
-        of_node_set_flag(dn, OF_DYNAMIC);
-        kref_init(&dn->kref);
         dn->parent = derive_parent(dn->full_name);
         if (!dn->parent)
                 return -ENOMEM;
@@ -275,8 +286,15 @@ int dlpar_attach_node(struct device_node *dn)
 
 int dlpar_detach_node(struct device_node *dn)
 {
+        struct device_node *child;
         int rc;
 
+        child = of_get_next_child(dn, NULL);
+        while (child) {
+                dlpar_detach_node(child);
+                child = of_get_next_child(dn, child);
+        }
+
         rc = of_detach_node(dn);
         if (rc)
                 return rc;
@@ -382,9 +400,8 @@ out:
 
 static ssize_t dlpar_cpu_probe(const char *buf, size_t count)
 {
-        struct device_node *dn;
+        struct device_node *dn, *parent;
         unsigned long drc_index;
-        char *cpu_name;
         int rc;
 
         cpu_hotplug_driver_lock();
@@ -394,25 +411,19 @@ static ssize_t dlpar_cpu_probe(const char *buf, size_t count)
                 goto out;
         }
 
-        dn = dlpar_configure_connector(drc_index);
-        if (!dn) {
-                rc = -EINVAL;
+        parent = of_find_node_by_path("/cpus");
+        if (!parent) {
+                rc = -ENODEV;
                 goto out;
         }
 
-        /* configure-connector reports cpus as living in the base
-         * directory of the device tree.  CPUs actually live in the
-         * cpus directory so we need to fixup the full_name.
-         */
-        cpu_name = kasprintf(GFP_KERNEL, "/cpus%s", dn->full_name);
-        if (!cpu_name) {
-                dlpar_free_cc_nodes(dn);
-                rc = -ENOMEM;
+        dn = dlpar_configure_connector(drc_index, parent);
+        if (!dn) {
+                rc = -EINVAL;
                 goto out;
         }
 
-        kfree(dn->full_name);
-        dn->full_name = cpu_name;
+        of_node_put(parent);
 
         rc = dlpar_acquire_drc(drc_index);
         if (rc) {
diff --git a/arch/powerpc/platforms/pseries/dtl.c b/arch/powerpc/platforms/pseries/dtl.c
index 0cc0ac07a55d..5db66f1fbc26 100644
--- a/arch/powerpc/platforms/pseries/dtl.c
+++ b/arch/powerpc/platforms/pseries/dtl.c
@@ -29,8 +29,7 @@
 #include <asm/firmware.h>
 #include <asm/lppaca.h>
 #include <asm/debug.h>
-
-#include "plpar_wrappers.h"
+#include <asm/plpar_wrappers.h>
 
 struct dtl {
         struct dtl_entry        *buf;
@@ -87,7 +86,7 @@ static void consume_dtle(struct dtl_entry *dtle, u64 index)
         barrier();
 
         /* check for hypervisor ring buffer overflow, ignore this entry if so */
-        if (index + N_DISPATCH_LOG < vpa->dtl_idx)
+        if (index + N_DISPATCH_LOG < be64_to_cpu(vpa->dtl_idx))
                 return;
 
         ++wp;
diff --git a/arch/powerpc/platforms/pseries/hotplug-cpu.c b/arch/powerpc/platforms/pseries/hotplug-cpu.c
index 217ca5c75b20..82789e79e539 100644
--- a/arch/powerpc/platforms/pseries/hotplug-cpu.c
+++ b/arch/powerpc/platforms/pseries/hotplug-cpu.c
@@ -30,7 +30,8 @@
 #include <asm/machdep.h>
 #include <asm/vdso_datapage.h>
 #include <asm/xics.h>
-#include "plpar_wrappers.h"
+#include <asm/plpar_wrappers.h>
+
 #include "offline_states.h"
 
 /* This version can't take the spinlock, because it never returns */
@@ -123,7 +124,7 @@ static void pseries_mach_cpu_die(void)
                 cede_latency_hint = 2;
 
                 get_lppaca()->idle = 1;
-                if (!get_lppaca()->shared_proc)
+                if (!lppaca_shared_proc(get_lppaca()))
                         get_lppaca()->donate_dedicated_cpu = 1;
 
                 while (get_preferred_offline_state(cpu) == CPU_STATE_INACTIVE) {
@@ -137,7 +138,7 @@ static void pseries_mach_cpu_die(void)
 
                 local_irq_disable();
 
-                if (!get_lppaca()->shared_proc)
+                if (!lppaca_shared_proc(get_lppaca()))
                         get_lppaca()->donate_dedicated_cpu = 0;
                 get_lppaca()->idle = 0;
 
diff --git a/arch/powerpc/platforms/pseries/hvconsole.c b/arch/powerpc/platforms/pseries/hvconsole.c
index b344f94b0400..849b29b3e9ae 100644
--- a/arch/powerpc/platforms/pseries/hvconsole.c
+++ b/arch/powerpc/platforms/pseries/hvconsole.c
@@ -28,7 +28,7 @@
 #include <linux/errno.h>
 #include <asm/hvcall.h>
 #include <asm/hvconsole.h>
-#include "plpar_wrappers.h"
+#include <asm/plpar_wrappers.h>
 
 /**
  * hvc_get_chars - retrieve characters from firmware for denoted vterm adatper
@@ -40,10 +40,16 @@
  */
 int hvc_get_chars(uint32_t vtermno, char *buf, int count)
 {
-        unsigned long got;
+        long ret;
+        unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
+        unsigned long *lbuf = (unsigned long *)buf;
+
+        ret = plpar_hcall(H_GET_TERM_CHAR, retbuf, vtermno);
+        lbuf[0] = be64_to_cpu(retbuf[1]);
+        lbuf[1] = be64_to_cpu(retbuf[2]);
 
-        if (plpar_get_term_char(vtermno, &got, buf) == H_SUCCESS)
-                return got;
+        if (ret == H_SUCCESS)
+                return retbuf[0];
 
         return 0;
 }
@@ -69,8 +75,9 @@ int hvc_put_chars(uint32_t vtermno, const char *buf, int count)
         if (count > MAX_VIO_PUT_CHARS)
                 count = MAX_VIO_PUT_CHARS;
 
-        ret = plpar_hcall_norets(H_PUT_TERM_CHAR, vtermno, count, lbuf[0],
-                                 lbuf[1]);
+        ret = plpar_hcall_norets(H_PUT_TERM_CHAR, vtermno, count,
+                                 cpu_to_be64(lbuf[0]),
+                                 cpu_to_be64(lbuf[1]));
         if (ret == H_SUCCESS)
                 return count;
         if (ret == H_BUSY)
diff --git a/arch/powerpc/platforms/pseries/iommu.c b/arch/powerpc/platforms/pseries/iommu.c
index 23fc1dcf4434..0307901e4132 100644
--- a/arch/powerpc/platforms/pseries/iommu.c
+++ b/arch/powerpc/platforms/pseries/iommu.c
@@ -48,8 +48,7 @@
 #include <asm/ppc-pci.h>
 #include <asm/udbg.h>
 #include <asm/mmzone.h>
-
-#include "plpar_wrappers.h"
+#include <asm/plpar_wrappers.h>
 
 
 static void tce_invalidate_pSeries_sw(struct iommu_table *tbl,
@@ -530,7 +529,7 @@ static void iommu_table_setparms(struct pci_controller *phb,
 static void iommu_table_setparms_lpar(struct pci_controller *phb,
                                       struct device_node *dn,
                                       struct iommu_table *tbl,
-                                      const void *dma_window)
+                                      const __be32 *dma_window)
 {
         unsigned long offset, size;
 
@@ -630,7 +629,7 @@ static void pci_dma_bus_setup_pSeriesLP(struct pci_bus *bus)
         struct iommu_table *tbl;
         struct device_node *dn, *pdn;
         struct pci_dn *ppci;
-        const void *dma_window = NULL;
+        const __be32 *dma_window = NULL;
 
         dn = pci_bus_to_OF_node(bus);
 
@@ -1152,7 +1151,7 @@ static void pci_dma_dev_setup_pSeriesLP(struct pci_dev *dev)
 {
         struct device_node *pdn, *dn;
         struct iommu_table *tbl;
-        const void *dma_window = NULL;
+        const __be32 *dma_window = NULL;
         struct pci_dn *pci;
 
         pr_debug("pci_dma_dev_setup_pSeriesLP: %s\n", pci_name(dev));
@@ -1201,7 +1200,7 @@ static int dma_set_mask_pSeriesLP(struct device *dev, u64 dma_mask)
         bool ddw_enabled = false;
         struct device_node *pdn, *dn;
         struct pci_dev *pdev;
-        const void *dma_window = NULL;
+        const __be32 *dma_window = NULL;
         u64 dma_offset;
 
         if (!dev->dma_mask)
diff --git a/arch/powerpc/platforms/pseries/kexec.c b/arch/powerpc/platforms/pseries/kexec.c
index 7d94bdc63d50..13fa95b3aa8b 100644
--- a/arch/powerpc/platforms/pseries/kexec.c
+++ b/arch/powerpc/platforms/pseries/kexec.c
@@ -17,9 +17,9 @@
 #include <asm/mpic.h>
 #include <asm/xics.h>
 #include <asm/smp.h>
+#include <asm/plpar_wrappers.h>
 
 #include "pseries.h"
-#include "plpar_wrappers.h"
 
 static void pseries_kexec_cpu_down(int crash_shutdown, int secondary)
 {
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 8bad880bd177..356bc75ca74f 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -41,8 +41,8 @@
 #include <asm/smp.h>
 #include <asm/trace.h>
 #include <asm/firmware.h>
+#include <asm/plpar_wrappers.h>
 
-#include "plpar_wrappers.h"
 #include "pseries.h"
 
 /* Flag bits for H_BULK_REMOVE */
@@ -68,6 +68,12 @@ void vpa_init(int cpu)
         struct paca_struct *pp;
         struct dtl_entry *dtl;
 
+        /*
+         * The spec says it "may be problematic" if CPU x registers the VPA of
+         * CPU y. We should never do that, but wail if we ever do.
+         */
+        WARN_ON(cpu != smp_processor_id());
+
         if (cpu_has_feature(CPU_FTR_ALTIVEC))
                 lppaca_of(cpu).vmxregs_in_use = 1;
 
@@ -106,7 +112,7 @@ void vpa_init(int cpu)
                 lppaca_of(cpu).dtl_idx = 0;
 
                 /* hypervisor reads buffer length from this field */
-                dtl->enqueue_to_dispatch_time = DISPATCH_LOG_BYTES;
+                dtl->enqueue_to_dispatch_time = cpu_to_be32(DISPATCH_LOG_BYTES);
                 ret = register_dtl(hwcpu, __pa(dtl));
                 if (ret)
                         pr_err("WARNING: DTL registration of cpu %d (hw %d) "
@@ -724,7 +730,7 @@ int h_get_mpp(struct hvcall_mpp_data *mpp_data)
 
         mpp_data->mem_weight = (retbuf[3] >> 7 * 8) & 0xff;
         mpp_data->unallocated_mem_weight = (retbuf[3] >> 6 * 8) & 0xff;
-        mpp_data->unallocated_entitlement = retbuf[3] & 0xffffffffffff;
+        mpp_data->unallocated_entitlement = retbuf[3] & 0xffffffffffffUL;
 
         mpp_data->pool_size = retbuf[4];
         mpp_data->loan_request = retbuf[5];
diff --git a/arch/powerpc/kernel/lparcfg.c b/arch/powerpc/platforms/pseries/lparcfg.c
index d92f3871e9cf..e738007eae64 100644
--- a/arch/powerpc/kernel/lparcfg.c
+++ b/arch/powerpc/platforms/pseries/lparcfg.c
@@ -35,7 +35,13 @@
 #include <asm/vdso_datapage.h>
 #include <asm/vio.h>
 #include <asm/mmu.h>
+#include <asm/machdep.h>
 
+
+/*
+ * This isn't a module but we expose that to userspace
+ * via /proc so leave the definitions here
+ */
 #define MODULE_VERS "1.9"
 #define MODULE_NAME "lparcfg"
 
@@ -165,7 +171,7 @@ static void parse_ppp_data(struct seq_file *m)
                    ppp_data.active_system_procs);
 
         /* pool related entries are appropriate for shared configs */
-        if (lppaca_of(0).shared_proc) {
+        if (lppaca_shared_proc(get_lppaca())) {
                 unsigned long pool_idle_time, pool_procs;
 
                 seq_printf(m, "pool=%d\n", ppp_data.pool_num);
@@ -387,8 +393,8 @@ static void pseries_cmo_data(struct seq_file *m)
                 return;
 
         for_each_possible_cpu(cpu) {
-                cmo_faults += lppaca_of(cpu).cmo_faults;
-                cmo_fault_time += lppaca_of(cpu).cmo_fault_time;
+                cmo_faults += be64_to_cpu(lppaca_of(cpu).cmo_faults);
+                cmo_fault_time += be64_to_cpu(lppaca_of(cpu).cmo_fault_time);
         }
 
         seq_printf(m, "cmo_faults=%lu\n", cmo_faults);
@@ -406,8 +412,9 @@ static void splpar_dispatch_data(struct seq_file *m)
         unsigned long dispatch_dispersions = 0;
 
         for_each_possible_cpu(cpu) {
-                dispatches += lppaca_of(cpu).yield_count;
-                dispatch_dispersions += lppaca_of(cpu).dispersion_count;
+                dispatches += be32_to_cpu(lppaca_of(cpu).yield_count);
+                dispatch_dispersions +=
+                        be32_to_cpu(lppaca_of(cpu).dispersion_count);
         }
 
         seq_printf(m, "dispatches=%lu\n", dispatches);
@@ -418,7 +425,8 @@ static void parse_em_data(struct seq_file *m)
 {
         unsigned long retbuf[PLPAR_HCALL_BUFSIZE];
 
-        if (plpar_hcall(H_GET_EM_PARMS, retbuf) == H_SUCCESS)
+        if (firmware_has_feature(FW_FEATURE_LPAR) &&
+            plpar_hcall(H_GET_EM_PARMS, retbuf) == H_SUCCESS)
                 seq_printf(m, "power_mode_data=%016lx\n", retbuf[0]);
 }
 
@@ -473,7 +481,8 @@ static int pseries_lparcfg_data(struct seq_file *m, void *v)
         seq_printf(m, "partition_potential_processors=%d\n",
                    partition_potential_processors);
 
-        seq_printf(m, "shared_processor_mode=%d\n", lppaca_of(0).shared_proc);
+        seq_printf(m, "shared_processor_mode=%d\n",
+                   lppaca_shared_proc(get_lppaca()));
 
         seq_printf(m, "slb_size=%d\n", mmu_slb_size);
 
@@ -677,7 +686,6 @@ static int lparcfg_open(struct inode *inode, struct file *file)
 }
 
 static const struct file_operations lparcfg_fops = {
-        .owner          = THIS_MODULE,
         .read           = seq_read,
         .write          = lparcfg_write,
         .open           = lparcfg_open,
@@ -699,14 +707,4 @@ static int __init lparcfg_init(void)
         }
         return 0;
 }
-
-static void __exit lparcfg_cleanup(void)
-{
-        remove_proc_subtree("powerpc/lparcfg", NULL);
-}
-
-module_init(lparcfg_init);
-module_exit(lparcfg_cleanup);
-MODULE_DESCRIPTION("Interface for LPAR configuration data");
-MODULE_AUTHOR("Dave Engebretsen");
-MODULE_LICENSE("GPL");
+machine_device_initcall(pseries, lparcfg_init);
diff --git a/arch/powerpc/platforms/pseries/mobility.c b/arch/powerpc/platforms/pseries/mobility.c
index 3d01eee9ffb1..cde4e0a095ae 100644
--- a/arch/powerpc/platforms/pseries/mobility.c
+++ b/arch/powerpc/platforms/pseries/mobility.c
@@ -28,7 +28,7 @@ struct update_props_workarea {
         u32 state;
         u64 reserved;
         u32 nprops;
-};
+} __packed;
 
 #define NODE_ACTION_MASK        0xff000000
 #define NODE_COUNT_MASK         0x00ffffff
@@ -62,6 +62,7 @@ static int delete_dt_node(u32 phandle)
                 return -ENOENT;
 
         dlpar_detach_node(dn);
+        of_node_put(dn);
         return 0;
 }
 
@@ -119,7 +120,7 @@ static int update_dt_property(struct device_node *dn, struct property **prop,
 
         if (!more) {
                 of_update_property(dn, new_prop);
-                new_prop = NULL;
+                *prop = NULL;
         }
 
         return 0;
@@ -130,7 +131,7 @@ static int update_dt_node(u32 phandle, s32 scope)
         struct update_props_workarea *upwa;
         struct device_node *dn;
         struct property *prop = NULL;
-        int i, rc;
+        int i, rc, rtas_rc;
         char *prop_data;
         char *rtas_buf;
         int update_properties_token;
@@ -154,25 +155,26 @@ static int update_dt_node(u32 phandle, s32 scope)
         upwa->phandle = phandle;
 
         do {
-                rc = mobility_rtas_call(update_properties_token, rtas_buf,
+                rtas_rc = mobility_rtas_call(update_properties_token, rtas_buf,
                                         scope);
-                if (rc < 0)
+                if (rtas_rc < 0)
                         break;
 
                 prop_data = rtas_buf + sizeof(*upwa);
 
-                /* The first element of the buffer is the path of the node
-                 * being updated in the form of a 8 byte string length
-                 * followed by the string. Skip past this to get to the
-                 * properties being updated.
+                /* On the first call to ibm,update-properties for a node the
+                 * the first property value descriptor contains an empty
+                 * property name, the property value length encoded as u32,
+                 * and the property value is the node path being updated.
                  */
-                vd = *prop_data++;
-                prop_data += vd;
+                if (*prop_data == 0) {
+                        prop_data++;
+                        vd = *(u32 *)prop_data;
+                        prop_data += vd + sizeof(vd);
+                        upwa->nprops--;
+                }
 
-                /* The path we skipped over is counted as one of the elements
-                 * returned so start counting at one.
-                 */
-                for (i = 1; i < upwa->nprops; i++) {
+                for (i = 0; i < upwa->nprops; i++) {
                         char *prop_name;
 
                         prop_name = prop_data;
@@ -202,7 +204,7 @@ static int update_dt_node(u32 phandle, s32 scope)
                                 prop_data += vd;
                         }
                 }
-        } while (rc == 1);
+        } while (rtas_rc == 1);
 
         of_node_put(dn);
         kfree(rtas_buf);
@@ -215,17 +217,14 @@ static int add_dt_node(u32 parent_phandle, u32 drc_index)
         struct device_node *parent_dn;
         int rc;
 
-        dn = dlpar_configure_connector(drc_index);
-        if (!dn)
+        parent_dn = of_find_node_by_phandle(parent_phandle);
+        if (!parent_dn)
                 return -ENOENT;
 
-        parent_dn = of_find_node_by_phandle(parent_phandle);
-        if (!parent_dn) {
-                dlpar_free_cc_nodes(dn);
+        dn = dlpar_configure_connector(drc_index, parent_dn);
+        if (!dn)
                 return -ENOENT;
-        }
 
-        dn->parent = parent_dn;
         rc = dlpar_attach_node(dn);
         if (rc)
                 dlpar_free_cc_nodes(dn);
diff --git a/arch/powerpc/platforms/pseries/nvram.c b/arch/powerpc/platforms/pseries/nvram.c
index 6a5f2b1f32ca..d276cd3edd8f 100644
--- a/arch/powerpc/platforms/pseries/nvram.c
+++ b/arch/powerpc/platforms/pseries/nvram.c
@@ -539,36 +539,6 @@ static int zip_oops(size_t text_len)
 }
 
 #ifdef CONFIG_PSTORE
-/* Derived from logfs_uncompress */
-int nvram_decompress(void *in, void *out, size_t inlen, size_t outlen)
-{
-        int err, ret;
-
-        ret = -EIO;
-        err = zlib_inflateInit(&stream);
-        if (err != Z_OK)
-                goto error;
-
-        stream.next_in = in;
-        stream.avail_in = inlen;
-        stream.total_in = 0;
-        stream.next_out = out;
-        stream.avail_out = outlen;
-        stream.total_out = 0;
-
-        err = zlib_inflate(&stream, Z_FINISH);
-        if (err != Z_STREAM_END)
-                goto error;
-
-        err = zlib_inflateEnd(&stream);
-        if (err != Z_OK)
-                goto error;
-
-        ret = stream.total_out;
-error:
-        return ret;
-}
-
 static int nvram_pstore_open(struct pstore_info *psi)
 {
         /* Reset the iterator to start reading partitions again */
@@ -584,7 +554,7 @@ static int nvram_pstore_open(struct pstore_info *psi)
  * @part:               pstore writes data to registered buffer in parts,
  *                      part number will indicate the same.
  * @count:              Indicates oops count
- * @hsize:              Size of header added by pstore
+ * @compressed:         Flag to indicate the log is compressed
  * @size:               number of bytes written to the registered buffer
  * @psi:                registered pstore_info structure
  *
@@ -595,7 +565,7 @@ static int nvram_pstore_open(struct pstore_info *psi)
 static int nvram_pstore_write(enum pstore_type_id type,
                                 enum kmsg_dump_reason reason,
                                 u64 *id, unsigned int part, int count,
-                                size_t hsize, size_t size,
+                                bool compressed, size_t size,
                                 struct pstore_info *psi)
 {
         int rc;
@@ -611,30 +581,11 @@ static int nvram_pstore_write(enum pstore_type_id type,
         oops_hdr->report_length = (u16) size;
         oops_hdr->timestamp = get_seconds();
 
-        if (big_oops_buf) {
-                rc = zip_oops(size);
-                /*
-                 * If compression fails copy recent log messages from
-                 * big_oops_buf to oops_data.
-                 */
-                if (rc != 0) {
-                        size_t diff = size - oops_data_sz + hsize;
-
-                        if (size > oops_data_sz) {
-                                memcpy(oops_data, big_oops_buf, hsize);
-                                memcpy(oops_data + hsize, big_oops_buf + diff,
-                                        oops_data_sz - hsize);
-
-                                oops_hdr->report_length = (u16) oops_data_sz;
-                        } else
-                                memcpy(oops_data, big_oops_buf, size);
-                } else
-                        err_type = ERR_TYPE_KERNEL_PANIC_GZ;
-        }
+        if (compressed)
+                err_type = ERR_TYPE_KERNEL_PANIC_GZ;
 
         rc = nvram_write_os_partition(&oops_log_partition, oops_buf,
-                (int) (sizeof(*oops_hdr) + oops_hdr->report_length), err_type,
-                count);
+                (int) (sizeof(*oops_hdr) + size), err_type, count);
 
         if (rc != 0)
                 return rc;
@@ -650,12 +601,12 @@ static int nvram_pstore_write(enum pstore_type_id type,
  */
 static ssize_t nvram_pstore_read(u64 *id, enum pstore_type_id *type,
                                 int *count, struct timespec *time, char **buf,
-                                struct pstore_info *psi)
+                                bool *compressed, struct pstore_info *psi)
 {
         struct oops_log_info *oops_hdr;
         unsigned int err_type, id_no, size = 0;
         struct nvram_os_partition *part = NULL;
-        char *buff = NULL, *big_buff = NULL;
+        char *buff = NULL;
         int sig = 0;
         loff_t p;
 
@@ -719,8 +670,7 @@ static ssize_t nvram_pstore_read(u64 *id, enum pstore_type_id *type,
                 *id = id_no;
 
         if (nvram_type_ids[read_type] == PSTORE_TYPE_DMESG) {
-                int length, unzipped_len;
-                size_t hdr_size;
+                size_t length, hdr_size;
 
                 oops_hdr = (struct oops_log_info *)buff;
                 if (oops_hdr->version < OOPS_HDR_VERSION) {
@@ -741,23 +691,10 @@ static ssize_t nvram_pstore_read(u64 *id, enum pstore_type_id *type,
                 memcpy(*buf, buff + hdr_size, length);
                 kfree(buff);
 
-                if (err_type == ERR_TYPE_KERNEL_PANIC_GZ) {
-                        big_buff = kmalloc(big_oops_buf_sz, GFP_KERNEL);
-                        if (!big_buff)
-                                return -ENOMEM;
-
-                        unzipped_len = nvram_decompress(*buf, big_buff,
-                                                length, big_oops_buf_sz);
-
-                        if (unzipped_len < 0) {
-                                pr_err("nvram: decompression failed, returned "
-                                        "rc %d\n", unzipped_len);
-                                kfree(big_buff);
-                        } else {
-                                *buf = big_buff;
-                                length = unzipped_len;
-                        }
-                }
+                if (err_type == ERR_TYPE_KERNEL_PANIC_GZ)
+                        *compressed = true;
+                else
+                        *compressed = false;
                 return length;
         }
 
@@ -777,13 +714,8 @@ static int nvram_pstore_init(void)
 {
         int rc = 0;
 
-        if (big_oops_buf) {
-                nvram_pstore_info.buf = big_oops_buf;
-                nvram_pstore_info.bufsize = big_oops_buf_sz;
-        } else {
-                nvram_pstore_info.buf = oops_data;
-                nvram_pstore_info.bufsize = oops_data_sz;
-        }
+        nvram_pstore_info.buf = oops_data;
+        nvram_pstore_info.bufsize = oops_data_sz;
 
         rc = pstore_register(&nvram_pstore_info);
         if (rc != 0)
@@ -802,7 +734,6 @@ static int nvram_pstore_init(void)
 static void __init nvram_init_oops_partition(int rtas_partition_exists)
 {
         int rc;
-        size_t size;
 
         rc = pseries_nvram_init_os_partition(&oops_log_partition);
         if (rc != 0) {
@@ -823,6 +754,11 @@ static void __init nvram_init_oops_partition(int rtas_partition_exists)
         oops_data = oops_buf + sizeof(struct oops_log_info);
         oops_data_sz = oops_log_partition.size - sizeof(struct oops_log_info);
 
+        rc = nvram_pstore_init();
+
+        if (!rc)
+                return;
+
         /*
          * Figure compression (preceded by elimination of each line's <n>
          * severity prefix) will reduce the oops/panic report to at most
@@ -831,9 +767,8 @@ static void __init nvram_init_oops_partition(int rtas_partition_exists)
         big_oops_buf_sz = (oops_data_sz * 100) / 45;
         big_oops_buf = kmalloc(big_oops_buf_sz, GFP_KERNEL);
         if (big_oops_buf) {
-                size = max(zlib_deflate_workspacesize(WINDOW_BITS, MEM_LEVEL),
-                        zlib_inflate_workspacesize());
-                stream.workspace = kmalloc(size, GFP_KERNEL);
+                stream.workspace =  kmalloc(zlib_deflate_workspacesize(
+                                        WINDOW_BITS, MEM_LEVEL), GFP_KERNEL);
                 if (!stream.workspace) {
                         pr_err("nvram: No memory for compression workspace; "
                                 "skipping compression of %s partition data\n",
@@ -847,11 +782,6 @@ static void __init nvram_init_oops_partition(int rtas_partition_exists)
                 stream.workspace = NULL;
         }
 
-        rc = nvram_pstore_init();
-
-        if (!rc)
-                return;
-
         rc = kmsg_dump_register(&nvram_kmsg_dumper);
         if (rc != 0) {
                 pr_err("nvram: kmsg_dump_register() failed; returned %d\n", rc);
diff --git a/arch/powerpc/platforms/pseries/processor_idle.c b/arch/powerpc/platforms/pseries/processor_idle.c
index 4644efa06941..a166e38bd683 100644
--- a/arch/powerpc/platforms/pseries/processor_idle.c
+++ b/arch/powerpc/platforms/pseries/processor_idle.c
@@ -18,9 +18,7 @@
 #include <asm/machdep.h>
 #include <asm/firmware.h>
 #include <asm/runlatch.h>
-
-#include "plpar_wrappers.h"
-#include "pseries.h"
+#include <asm/plpar_wrappers.h>
 
 struct cpuidle_driver pseries_idle_driver = {
         .name             = "pseries_idle",
@@ -45,7 +43,11 @@ static inline void idle_loop_prolog(unsigned long *in_purr)
 
 static inline void idle_loop_epilog(unsigned long in_purr)
 {
-        get_lppaca()->wait_state_cycles += mfspr(SPRN_PURR) - in_purr;
+        u64 wait_cycles;
+
+        wait_cycles = be64_to_cpu(get_lppaca()->wait_state_cycles);
+        wait_cycles += mfspr(SPRN_PURR) - in_purr;
+        get_lppaca()->wait_state_cycles = cpu_to_be64(wait_cycles);
         get_lppaca()->idle = 0;
 }
 
@@ -308,7 +310,7 @@ static int pseries_idle_probe(void)
                 return -EPERM;
         }
 
-        if (get_lppaca()->shared_proc)
+        if (lppaca_shared_proc(get_lppaca()))
                 cpuidle_state_table = shared_states;
         else
                 cpuidle_state_table = dedicated_states;
diff --git a/arch/powerpc/platforms/pseries/pseries.h b/arch/powerpc/platforms/pseries/pseries.h
index c2a3a258001c..99219530ea4a 100644
--- a/arch/powerpc/platforms/pseries/pseries.h
+++ b/arch/powerpc/platforms/pseries/pseries.h
@@ -56,13 +56,10 @@ extern void hvc_vio_init_early(void);
 /* Dynamic logical Partitioning/Mobility */
 extern void dlpar_free_cc_nodes(struct device_node *);
 extern void dlpar_free_cc_property(struct property *);
-extern struct device_node *dlpar_configure_connector(u32);
+extern struct device_node *dlpar_configure_connector(u32, struct device_node *);
 extern int dlpar_attach_node(struct device_node *);
 extern int dlpar_detach_node(struct device_node *);
 
-/* Snooze Delay, pseries_idle */
-DECLARE_PER_CPU(long, smt_snooze_delay);
-
 /* PCI root bridge prepare function override for pseries */
 struct pci_host_bridge;
 int pseries_root_bridge_prepare(struct pci_host_bridge *bridge);
diff --git a/arch/powerpc/platforms/pseries/pseries_energy.c b/arch/powerpc/platforms/pseries/pseries_energy.c
index a91e6dadda2c..92767791f93b 100644
--- a/arch/powerpc/platforms/pseries/pseries_energy.c
+++ b/arch/powerpc/platforms/pseries/pseries_energy.c
@@ -108,8 +108,8 @@ err:
  * energy consumption.
  */
 
-#define FLAGS_MODE1     0x004E200000080E01
-#define FLAGS_MODE2     0x004E200000080401
+#define FLAGS_MODE1     0x004E200000080E01UL
+#define FLAGS_MODE2     0x004E200000080401UL
 #define FLAGS_ACTIVATE  0x100
 
 static ssize_t get_best_energy_list(char *page, int activate)
diff --git a/arch/powerpc/platforms/pseries/setup.c b/arch/powerpc/platforms/pseries/setup.c
index c11c8238797c..1f97e2b87a62 100644
--- a/arch/powerpc/platforms/pseries/setup.c
+++ b/arch/powerpc/platforms/pseries/setup.c
@@ -66,8 +66,8 @@
 #include <asm/firmware.h>
 #include <asm/eeh.h>
 #include <asm/reg.h>
+#include <asm/plpar_wrappers.h>
 
-#include "plpar_wrappers.h"
 #include "pseries.h"
 
 int CMO_PrPSP = -1;
@@ -183,7 +183,7 @@ static void __init pseries_mpic_init_IRQ(void)
         np = of_find_node_by_path("/");
         naddr = of_n_addr_cells(np);
         opprop = of_get_property(np, "platform-open-pic", &opplen);
-        if (opprop != 0) {
+        if (opprop != NULL) {
                 openpic_addr = of_read_number(opprop, naddr);
                 printk(KERN_DEBUG "OpenPIC addr: %lx\n", openpic_addr);
         }
@@ -323,7 +323,7 @@ static int alloc_dispatch_logs(void)
         get_paca()->lppaca_ptr->dtl_idx = 0;
 
         /* hypervisor reads buffer length from this field */
-        dtl->enqueue_to_dispatch_time = DISPATCH_LOG_BYTES;
+        dtl->enqueue_to_dispatch_time = cpu_to_be32(DISPATCH_LOG_BYTES);
         ret = register_dtl(hard_smp_processor_id(), __pa(dtl));
         if (ret)
                 pr_err("WARNING: DTL registration of cpu %d (hw %d) failed "
@@ -354,7 +354,7 @@ static int alloc_dispatch_log_kmem_cache(void)
 }
 early_initcall(alloc_dispatch_log_kmem_cache);
 
-static void pSeries_idle(void)
+static void pseries_lpar_idle(void)
 {
         /* This would call on the cpuidle framework, and the back-end pseries
          * driver to  go to idle states
@@ -362,10 +362,22 @@ static void pSeries_idle(void)
         if (cpuidle_idle_call()) {
                 /* On error, execute default handler
                  * to go into low thread priority and possibly
-                 * low power mode.
+                 * low power mode by cedeing processor to hypervisor
                  */
-                HMT_low();
-                HMT_very_low();
+
+                /* Indicate to hypervisor that we are idle. */
+                get_lppaca()->idle = 1;
+
+                /*
+                 * Yield the processor to the hypervisor.  We return if
+                 * an external interrupt occurs (which are driven prior
+                 * to returning here) or if a prod occurs from another
+                 * processor. When returning here, external interrupts
+                 * are enabled.
+                 */
+                cede_processor();
+
+                get_lppaca()->idle = 0;
         }
 }
 
@@ -456,15 +468,14 @@ static void __init pSeries_setup_arch(void)
 
         pSeries_nvram_init();
 
-        if (firmware_has_feature(FW_FEATURE_SPLPAR)) {
+        if (firmware_has_feature(FW_FEATURE_LPAR)) {
                 vpa_init(boot_cpuid);
-                ppc_md.power_save = pSeries_idle;
-        }
-
-        if (firmware_has_feature(FW_FEATURE_LPAR))
+                ppc_md.power_save = pseries_lpar_idle;
                 ppc_md.enable_pmcs = pseries_lpar_enable_pmcs;
-        else
+        } else {
+                /* No special idle routine */
                 ppc_md.enable_pmcs = power4_enable_pmcs;
+        }
 
         ppc_md.pcibios_root_bridge_prepare = pseries_root_bridge_prepare;
 
diff --git a/arch/powerpc/platforms/pseries/smp.c b/arch/powerpc/platforms/pseries/smp.c
index 306643cc9dbc..24f58cb0a543 100644
--- a/arch/powerpc/platforms/pseries/smp.c
+++ b/arch/powerpc/platforms/pseries/smp.c
@@ -43,8 +43,8 @@
 #include <asm/cputhreads.h>
 #include <asm/xics.h>
 #include <asm/dbell.h>
+#include <asm/plpar_wrappers.h>
 
-#include "plpar_wrappers.h"
 #include "pseries.h"
 #include "offline_states.h"
 
@@ -187,22 +187,6 @@ static int smp_pSeries_kick_cpu(int nr)
         return 0;
 }
 
-static int smp_pSeries_cpu_bootable(unsigned int nr)
-{
-        /* Special case - we inhibit secondary thread startup
-         * during boot if the user requests it.
-         */
-        if (system_state == SYSTEM_BOOTING && cpu_has_feature(CPU_FTR_SMT)) {
-                if (!smt_enabled_at_boot && cpu_thread_in_core(nr) != 0)
-                        return 0;
-                if (smt_enabled_at_boot
-                    && cpu_thread_in_core(nr) >= smt_enabled_at_boot)
-                        return 0;
-        }
-
-        return 1;
-}
-
 /* Only used on systems that support multiple IPI mechanisms */
 static void pSeries_cause_ipi_mux(int cpu, unsigned long data)
 {
@@ -237,7 +221,7 @@ static struct smp_ops_t pSeries_xics_smp_ops = {
         .probe          = pSeries_smp_probe,
         .kick_cpu       = smp_pSeries_kick_cpu,
         .setup_cpu      = smp_xics_setup_cpu,
-        .cpu_bootable   = smp_pSeries_cpu_bootable,
+        .cpu_bootable   = smp_generic_cpu_bootable,
 };
 
 /* This is called very early */
@@ -249,18 +233,24 @@ static void __init smp_init_pseries(void)
 
         alloc_bootmem_cpumask_var(&of_spin_mask);
 
-        /* Mark threads which are still spinning in hold loops. */
-        if (cpu_has_feature(CPU_FTR_SMT)) {
-                for_each_present_cpu(i) { 
-                        if (cpu_thread_in_core(i) == 0)
-                                cpumask_set_cpu(i, of_spin_mask);
-                }
-        } else {
-                cpumask_copy(of_spin_mask, cpu_present_mask);
+        /*
+         * Mark threads which are still spinning in hold loops
+         *
+         * We know prom_init will not have started them if RTAS supports
+         * query-cpu-stopped-state.
+         */
+        if (rtas_token("query-cpu-stopped-state") == RTAS_UNKNOWN_SERVICE) {
+                if (cpu_has_feature(CPU_FTR_SMT)) {
+                        for_each_present_cpu(i) {
+                                if (cpu_thread_in_core(i) == 0)
+                                        cpumask_set_cpu(i, of_spin_mask);
+                        }
+                } else
+                        cpumask_copy(of_spin_mask, cpu_present_mask);
+
+                cpumask_clear_cpu(boot_cpuid, of_spin_mask);
         }
 
-        cpumask_clear_cpu(boot_cpuid, of_spin_mask);
-
         /* Non-lpar has additional take/give timebase */
         if (rtas_token("freeze-time-base") != RTAS_UNKNOWN_SERVICE) {
                 smp_ops->give_timebase = rtas_give_timebase;
diff --git a/arch/powerpc/platforms/wsp/wsp.h b/arch/powerpc/platforms/wsp/wsp.h
index 62ef21afb89a..a563a8aaf812 100644
--- a/arch/powerpc/platforms/wsp/wsp.h
+++ b/arch/powerpc/platforms/wsp/wsp.h
@@ -17,7 +17,6 @@ extern void scom_init_wsp(void);
 extern void a2_setup_smp(void);
 extern int a2_scom_startup_cpu(unsigned int lcpu, int thr_idx,
                                struct device_node *np);
-extern int smp_a2_cpu_bootable(unsigned int nr);
 extern int smp_a2_kick_cpu(int nr);
 
 extern void opb_pic_init(void);
diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index ab02db3d02d8..77efbaec7b9c 100644
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -28,6 +28,18 @@
 #include "fsl_msi.h"
 #include "fsl_pci.h"
 
+#define MSIIR_OFFSET_MASK       0xfffff
+#define MSIIR_IBS_SHIFT         0
+#define MSIIR_SRS_SHIFT         5
+#define MSIIR1_IBS_SHIFT        4
+#define MSIIR1_SRS_SHIFT        0
+#define MSI_SRS_MASK            0xf
+#define MSI_IBS_MASK            0x1f
+
+#define msi_hwirq(msi, msir_index, intr_index) \
+                ((msir_index) << (msi)->srs_shift | \
+                 ((intr_index) << (msi)->ibs_shift))
+
 static LIST_HEAD(msi_head);
 
 struct fsl_msi_feature {
@@ -80,18 +92,19 @@ static const struct irq_domain_ops fsl_msi_host_ops = {
 
 static int fsl_msi_init_allocator(struct fsl_msi *msi_data)
 {
-        int rc;
+        int rc, hwirq;
 
-        rc = msi_bitmap_alloc(&msi_data->bitmap, NR_MSI_IRQS,
+        rc = msi_bitmap_alloc(&msi_data->bitmap, NR_MSI_IRQS_MAX,
                               msi_data->irqhost->of_node);
         if (rc)
                 return rc;
 
-        rc = msi_bitmap_reserve_dt_hwirqs(&msi_data->bitmap);
-        if (rc < 0) {
-                msi_bitmap_free(&msi_data->bitmap);
-                return rc;
-        }
+        /*
+         * Reserve all the hwirqs
+         * The available hwirqs will be released in fsl_msi_setup_hwirq()
+         */
+        for (hwirq = 0; hwirq < NR_MSI_IRQS_MAX; hwirq++)
+                msi_bitmap_reserve_hwirq(&msi_data->bitmap, hwirq);
 
         return 0;
 }
@@ -144,8 +157,9 @@ static void fsl_compose_msi_msg(struct pci_dev *pdev, int hwirq,
 
         msg->data = hwirq;
 
-        pr_debug("%s: allocated srs: %d, ibs: %d\n",
-                __func__, hwirq / IRQS_PER_MSI_REG, hwirq % IRQS_PER_MSI_REG);
+        pr_debug("%s: allocated srs: %d, ibs: %d\n", __func__,
+                 (hwirq >> msi_data->srs_shift) & MSI_SRS_MASK,
+                 (hwirq >> msi_data->ibs_shift) & MSI_IBS_MASK);
 }
 
 static int fsl_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
@@ -255,7 +269,7 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc)
 
         msir_index = cascade_data->index;
 
-        if (msir_index >= NR_MSI_REG)
+        if (msir_index >= NR_MSI_REG_MAX)
                 cascade_irq = NO_IRQ;
 
         irqd_set_chained_irq_inprogress(idata);
@@ -285,8 +299,8 @@ static void fsl_msi_cascade(unsigned int irq, struct irq_desc *desc)
                 intr_index = ffs(msir_value) - 1;
 
                 cascade_irq = irq_linear_revmap(msi_data->irqhost,
-                                msir_index * IRQS_PER_MSI_REG +
-                                        intr_index + have_shift);
+                                msi_hwirq(msi_data, msir_index,
+                                          intr_index + have_shift));
                 if (cascade_irq != NO_IRQ)
                         generic_handle_irq(cascade_irq);
                 have_shift += intr_index + 1;
@@ -316,7 +330,7 @@ static int fsl_of_msi_remove(struct platform_device *ofdev)
 
         if (msi->list.prev != NULL)
                 list_del(&msi->list);
-        for (i = 0; i < NR_MSI_REG; i++) {
+        for (i = 0; i < NR_MSI_REG_MAX; i++) {
                 virq = msi->msi_virqs[i];
                 if (virq != NO_IRQ) {
                         cascade_data = irq_get_handler_data(virq);
@@ -339,7 +353,7 @@ static int fsl_msi_setup_hwirq(struct fsl_msi *msi, struct platform_device *dev,
                                int offset, int irq_index)
 {
         struct fsl_msi_cascade_data *cascade_data = NULL;
-        int virt_msir;
+        int virt_msir, i;
 
         virt_msir = irq_of_parse_and_map(dev->dev.of_node, irq_index);
         if (virt_msir == NO_IRQ) {
@@ -360,6 +374,11 @@ static int fsl_msi_setup_hwirq(struct fsl_msi *msi, struct platform_device *dev,
         irq_set_handler_data(virt_msir, cascade_data);
         irq_set_chained_handler(virt_msir, fsl_msi_cascade);
 
+        /* Release the hwirqs corresponding to this MSI register */
+        for (i = 0; i < IRQS_PER_MSI_REG; i++)
+                msi_bitmap_free_hwirqs(&msi->bitmap,
+                                       msi_hwirq(msi, offset, i), 1);
+
         return 0;
 }
 
@@ -368,14 +387,12 @@ static int fsl_of_msi_probe(struct platform_device *dev)
 {
         const struct of_device_id *match;
         struct fsl_msi *msi;
-        struct resource res;
+        struct resource res, msiir;
         int err, i, j, irq_index, count;
-        int rc;
         const u32 *p;
         const struct fsl_msi_feature *features;
         int len;
         u32 offset;
-        static const u32 all_avail[] = { 0, NR_MSI_IRQS };
 
         match = of_match_device(fsl_of_msi_ids, &dev->dev);
         if (!match)
@@ -392,7 +409,7 @@ static int fsl_of_msi_probe(struct platform_device *dev)
         platform_set_drvdata(dev, msi);
 
         msi->irqhost = irq_domain_add_linear(dev->dev.of_node,
-                                      NR_MSI_IRQS, &fsl_msi_host_ops, msi);
+                                      NR_MSI_IRQS_MAX, &fsl_msi_host_ops, msi);
 
         if (msi->irqhost == NULL) {
                 dev_err(&dev->dev, "No memory for MSI irqhost\n");
@@ -421,6 +438,16 @@ static int fsl_of_msi_probe(struct platform_device *dev)
                 }
                 msi->msiir_offset =
                         features->msiir_offset + (res.start & 0xfffff);
+
+                /*
+                 * First read the MSIIR/MSIIR1 offset from dts
+                 * On failure use the hardcode MSIIR offset
+                 */
+                if (of_address_to_resource(dev->dev.of_node, 1, &msiir))
+                        msi->msiir_offset = features->msiir_offset +
+                                            (res.start & MSIIR_OFFSET_MASK);
+                else
+                        msi->msiir_offset = msiir.start & MSIIR_OFFSET_MASK;
         }
 
         msi->feature = features->fsl_pic_ip;
@@ -431,42 +458,66 @@ static int fsl_of_msi_probe(struct platform_device *dev)
          */
         msi->phandle = dev->dev.of_node->phandle;
 
-        rc = fsl_msi_init_allocator(msi);
-        if (rc) {
+        err = fsl_msi_init_allocator(msi);
+        if (err) {
                 dev_err(&dev->dev, "Error allocating MSI bitmap\n");
                 goto error_out;
         }
 
         p = of_get_property(dev->dev.of_node, "msi-available-ranges", &len);
-        if (p && len % (2 * sizeof(u32)) != 0) {
-                dev_err(&dev->dev, "%s: Malformed msi-available-ranges property\n",
-                        __func__);
-                err = -EINVAL;
-                goto error_out;
-        }
 
-        if (!p) {
-                p = all_avail;
-                len = sizeof(all_avail);
-        }
+        if (of_device_is_compatible(dev->dev.of_node, "fsl,mpic-msi-v4.3")) {
+                msi->srs_shift = MSIIR1_SRS_SHIFT;
+                msi->ibs_shift = MSIIR1_IBS_SHIFT;
+                if (p)
+                        dev_warn(&dev->dev, "%s: dose not support msi-available-ranges property\n",
+                                __func__);
+
+                for (irq_index = 0; irq_index < NR_MSI_REG_MSIIR1;
+                     irq_index++) {
+                        err = fsl_msi_setup_hwirq(msi, dev,
+                                                  irq_index, irq_index);
+                        if (err)
+                                goto error_out;
+                }
+        } else {
+                static const u32 all_avail[] =
+                        { 0, NR_MSI_REG_MSIIR * IRQS_PER_MSI_REG };
 
-        for (irq_index = 0, i = 0; i < len / (2 * sizeof(u32)); i++) {
-                if (p[i * 2] % IRQS_PER_MSI_REG ||
-                    p[i * 2 + 1] % IRQS_PER_MSI_REG) {
-                        printk(KERN_WARNING "%s: %s: msi available range of %u at %u is not IRQ-aligned\n",
-                               __func__, dev->dev.of_node->full_name,
-                               p[i * 2 + 1], p[i * 2]);
+                msi->srs_shift = MSIIR_SRS_SHIFT;
+                msi->ibs_shift = MSIIR_IBS_SHIFT;
+
+                if (p && len % (2 * sizeof(u32)) != 0) {
+                        dev_err(&dev->dev, "%s: Malformed msi-available-ranges property\n",
+                                __func__);
                         err = -EINVAL;
                         goto error_out;
                 }
 
-                offset = p[i * 2] / IRQS_PER_MSI_REG;
-                count = p[i * 2 + 1] / IRQS_PER_MSI_REG;
+                if (!p) {
+                        p = all_avail;
+                        len = sizeof(all_avail);
+                }
 
-                for (j = 0; j < count; j++, irq_index++) {
-                        err = fsl_msi_setup_hwirq(msi, dev, offset + j, irq_index);
-                        if (err)
+                for (irq_index = 0, i = 0; i < len / (2 * sizeof(u32)); i++) {
+                        if (p[i * 2] % IRQS_PER_MSI_REG ||
+                            p[i * 2 + 1] % IRQS_PER_MSI_REG) {
+                                pr_warn("%s: %s: msi available range of %u at %u is not IRQ-aligned\n",
+                                       __func__, dev->dev.of_node->full_name,
+                                       p[i * 2 + 1], p[i * 2]);
+                                err = -EINVAL;
                                 goto error_out;
+                        }
+
+                        offset = p[i * 2] / IRQS_PER_MSI_REG;
+                        count = p[i * 2 + 1] / IRQS_PER_MSI_REG;
+
+                        for (j = 0; j < count; j++, irq_index++) {
+                                err = fsl_msi_setup_hwirq(msi, dev, offset + j,
+                                                          irq_index);
+                                if (err)
+                                        goto error_out;
+                        }
                 }
         }
 
@@ -509,6 +560,10 @@ static const struct of_device_id fsl_of_msi_ids[] = {
                 .data = &mpic_msi_feature,
         },
         {
+                .compatible = "fsl,mpic-msi-v4.3",
+                .data = &mpic_msi_feature,
+        },
+        {
                 .compatible = "fsl,ipic-msi",
                 .data = &ipic_msi_feature,
         },
diff --git a/arch/powerpc/sysdev/fsl_msi.h b/arch/powerpc/sysdev/fsl_msi.h
index 8225f8653f78..df9aa9fe0933 100644
--- a/arch/powerpc/sysdev/fsl_msi.h
+++ b/arch/powerpc/sysdev/fsl_msi.h
@@ -16,9 +16,11 @@
 #include <linux/of.h>
 #include <asm/msi_bitmap.h>
 
-#define NR_MSI_REG              8
+#define NR_MSI_REG_MSIIR        8  /* MSIIR can index 8 MSI registers */
+#define NR_MSI_REG_MSIIR1       16 /* MSIIR1 can index 16 MSI registers */
+#define NR_MSI_REG_MAX          NR_MSI_REG_MSIIR1
 #define IRQS_PER_MSI_REG        32
-#define NR_MSI_IRQS     (NR_MSI_REG * IRQS_PER_MSI_REG)
+#define NR_MSI_IRQS_MAX (NR_MSI_REG_MAX * IRQS_PER_MSI_REG)
 
 #define FSL_PIC_IP_MASK   0x0000000F
 #define FSL_PIC_IP_MPIC   0x00000001
@@ -31,9 +33,11 @@ struct fsl_msi {
         unsigned long cascade_irq;
 
         u32 msiir_offset; /* Offset of MSIIR, relative to start of CCSR */
+        u32 ibs_shift; /* Shift of interrupt bit select */
+        u32 srs_shift; /* Shift of the shared interrupt register select */
         void __iomem *msi_regs;
         u32 feature;
-        int msi_virqs[NR_MSI_REG];
+        int msi_virqs[NR_MSI_REG_MAX];
 
         struct msi_bitmap bitmap;
 
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c
index 46ac1ddea683..ccfb50ddfe38 100644
--- a/arch/powerpc/sysdev/fsl_pci.c
+++ b/arch/powerpc/sysdev/fsl_pci.c
@@ -26,11 +26,15 @@
 #include <linux/memblock.h>
 #include <linux/log2.h>
 #include <linux/slab.h>
+#include <linux/uaccess.h>
 
 #include <asm/io.h>
 #include <asm/prom.h>
 #include <asm/pci-bridge.h>
+#include <asm/ppc-pci.h>
 #include <asm/machdep.h>
+#include <asm/disassemble.h>
+#include <asm/ppc-opcode.h>
 #include <sysdev/fsl_soc.h>
 #include <sysdev/fsl_pci.h>
 
@@ -64,7 +68,7 @@ static int fsl_pcie_check_link(struct pci_controller *hose)
         if (hose->indirect_type & PPC_INDIRECT_TYPE_FSL_CFG_REG_LINK) {
                 if (hose->ops->read == fsl_indirect_read_config) {
                         struct pci_bus bus;
-                        bus.number = 0;
+                        bus.number = hose->first_busno;
                         bus.sysdata = hose;
                         bus.ops = hose->ops;
                         indirect_read_config(&bus, 0, PCIE_LTSSM, 4, &val);
@@ -297,10 +301,10 @@ static void setup_pci_atmu(struct pci_controller *hose)
         if (early_find_capability(hose, 0, 0, PCI_CAP_ID_EXP)) {
                 /* Size window to exact size if power-of-two or one size up */
                 if ((1ull << mem_log) != mem) {
+                        mem_log++;
                         if ((1ull << mem_log) > mem)
                                 pr_info("%s: Setting PCI inbound window "
                                         "greater than memory size\n", name);
-                        mem_log++;
                 }
 
                 piwar |= ((mem_log - 1) & PIWAR_SZ_MASK);
@@ -373,7 +377,9 @@ static void setup_pci_atmu(struct pci_controller *hose)
         }
 
         if (hose->dma_window_size < mem) {
-#ifndef CONFIG_SWIOTLB
+#ifdef CONFIG_SWIOTLB
+                ppc_swiotlb_enable = 1;
+#else
                 pr_err("%s: ERROR: Memory size exceeds PCI ATMU ability to "
                         "map - enable CONFIG_SWIOTLB to avoid dma errors.\n",
                          name);
@@ -868,6 +874,160 @@ u64 fsl_pci_immrbar_base(struct pci_controller *hose)
         return 0;
 }
 
+#ifdef CONFIG_E500
+static int mcheck_handle_load(struct pt_regs *regs, u32 inst)
+{
+        unsigned int rd, ra, rb, d;
+
+        rd = get_rt(inst);
+        ra = get_ra(inst);
+        rb = get_rb(inst);
+        d = get_d(inst);
+
+        switch (get_op(inst)) {
+        case 31:
+                switch (get_xop(inst)) {
+                case OP_31_XOP_LWZX:
+                case OP_31_XOP_LWBRX:
+                        regs->gpr[rd] = 0xffffffff;
+                        break;
+
+                case OP_31_XOP_LWZUX:
+                        regs->gpr[rd] = 0xffffffff;
+                        regs->gpr[ra] += regs->gpr[rb];
+                        break;
+
+                case OP_31_XOP_LBZX:
+                        regs->gpr[rd] = 0xff;
+                        break;
+
+                case OP_31_XOP_LBZUX:
+                        regs->gpr[rd] = 0xff;
+                        regs->gpr[ra] += regs->gpr[rb];
+                        break;
+
+                case OP_31_XOP_LHZX:
+                case OP_31_XOP_LHBRX:
+                        regs->gpr[rd] = 0xffff;
+                        break;
+
+                case OP_31_XOP_LHZUX:
+                        regs->gpr[rd] = 0xffff;
+                        regs->gpr[ra] += regs->gpr[rb];
+                        break;
+
+                case OP_31_XOP_LHAX:
+                        regs->gpr[rd] = ~0UL;
+                        break;
+
+                case OP_31_XOP_LHAUX:
+                        regs->gpr[rd] = ~0UL;
+                        regs->gpr[ra] += regs->gpr[rb];
+                        break;
+
+                default:
+                        return 0;
+                }
+                break;
+
+        case OP_LWZ:
+                regs->gpr[rd] = 0xffffffff;
+                break;
+
+        case OP_LWZU:
+                regs->gpr[rd] = 0xffffffff;
+                regs->gpr[ra] += (s16)d;
+                break;
+
+        case OP_LBZ:
+                regs->gpr[rd] = 0xff;
+                break;
+
+        case OP_LBZU:
+                regs->gpr[rd] = 0xff;
+                regs->gpr[ra] += (s16)d;
+                break;
+
+        case OP_LHZ:
+                regs->gpr[rd] = 0xffff;
+                break;
+
+        case OP_LHZU:
+                regs->gpr[rd] = 0xffff;
+                regs->gpr[ra] += (s16)d;
+                break;
+
+        case OP_LHA:
+                regs->gpr[rd] = ~0UL;
+                break;
+
+        case OP_LHAU:
+                regs->gpr[rd] = ~0UL;
+                regs->gpr[ra] += (s16)d;
+                break;
+
+        default:
+                return 0;
+        }
+
+        return 1;
+}
+
+static int is_in_pci_mem_space(phys_addr_t addr)
+{
+        struct pci_controller *hose;
+        struct resource *res;
+        int i;
+
+        list_for_each_entry(hose, &hose_list, list_node) {
+                if (!(hose->indirect_type & PPC_INDIRECT_TYPE_EXT_REG))
+                        continue;
+
+                for (i = 0; i < 3; i++) {
+                        res = &hose->mem_resources[i];
+                        if ((res->flags & IORESOURCE_MEM) &&
+                                addr >= res->start && addr <= res->end)
+                                return 1;
+                }
+        }
+        return 0;
+}
+
+int fsl_pci_mcheck_exception(struct pt_regs *regs)
+{
+        u32 inst;
+        int ret;
+        phys_addr_t addr = 0;
+
+        /* Let KVM/QEMU deal with the exception */
+        if (regs->msr & MSR_GS)
+                return 0;
+
+#ifdef CONFIG_PHYS_64BIT
+        addr = mfspr(SPRN_MCARU);
+        addr <<= 32;
+#endif
+        addr += mfspr(SPRN_MCAR);
+
+        if (is_in_pci_mem_space(addr)) {
+                if (user_mode(regs)) {
+                        pagefault_disable();
+                        ret = get_user(regs->nip, &inst);
+                        pagefault_enable();
+                } else {
+                        ret = probe_kernel_address(regs->nip, inst);
+                }
+
+                if (mcheck_handle_load(regs, inst)) {
+                        regs->nip += 4;
+                        return 1;
+                }
+        }
+
+        return 0;
+}
+#endif
+
 #if defined(CONFIG_FSL_SOC_BOOKE) || defined(CONFIG_PPC_86xx)
 static const struct of_device_id pci_ids[] = {
         { .compatible = "fsl,mpc8540-pci", },
@@ -928,28 +1088,10 @@ static int fsl_pci_probe(struct platform_device *pdev)
 {
         int ret;
         struct device_node *node;
-#ifdef CONFIG_SWIOTLB
-        struct pci_controller *hose;
-#endif
 
         node = pdev->dev.of_node;
         ret = fsl_add_bridge(pdev, fsl_pci_primary == node);
 
-#ifdef CONFIG_SWIOTLB
-        if (ret == 0) {
-                hose = pci_find_hose_for_OF_device(pdev->dev.of_node);
-
-                /*
-                 * if we couldn't map all of DRAM via the dma windows
-                 * we need SWIOTLB to handle buffers located outside of
-                 * dma capable memory region
-                 */
-                if (memblock_end_of_DRAM() - 1 > hose->dma_window_base_cur +
-                                hose->dma_window_size)
-                        ppc_swiotlb_enable = 1;
-        }
-#endif
-
         mpc85xx_pci_err_probe(pdev);
 
         return 0;
diff --git a/arch/powerpc/sysdev/fsl_pci.h b/arch/powerpc/sysdev/fsl_pci.h
index 72b5625330e2..8d455df58471 100644
--- a/arch/powerpc/sysdev/fsl_pci.h
+++ b/arch/powerpc/sysdev/fsl_pci.h
@@ -16,6 +16,11 @@
 
 struct platform_device;
 
+
+/* FSL PCI controller BRR1 register */
+#define PCI_FSL_BRR1      0xbf8
+#define PCI_FSL_BRR1_VER 0xffff
+
 #define PCIE_LTSSM      0x0404          /* PCIE Link Training and Status */
 #define PCIE_LTSSM_L0   0x16            /* L0 state */
 #define PCIE_IP_REV_2_2         0x02080202 /* PCIE IP block version Rev2.2 */
@@ -126,5 +131,11 @@ static inline int mpc85xx_pci_err_probe(struct platform_device *op)
 }
 #endif
 
+#ifdef CONFIG_FSL_PCI
+extern int fsl_pci_mcheck_exception(struct pt_regs *);
+#else
+static inline int fsl_pci_mcheck_exception(struct pt_regs *regs) {return 0; }
+#endif
+
 #endif /* __POWERPC_FSL_PCI_H */
 #endif /* __KERNEL__ */
diff --git a/arch/powerpc/sysdev/rtc_cmos_setup.c b/arch/powerpc/sysdev/rtc_cmos_setup.c
index af79e1ea74b6..af0f9beddca9 100644
--- a/arch/powerpc/sysdev/rtc_cmos_setup.c
+++ b/arch/powerpc/sysdev/rtc_cmos_setup.c
@@ -62,7 +62,7 @@ static int  __init add_rtc(void)
         pd = platform_device_register_simple("rtc_cmos", -1,
                                              &res[0], num_res);
 
-        return PTR_RET(pd);
+        return PTR_ERR_OR_ZERO(pd);
 }
 fs_initcall(add_rtc);
 
diff --git a/arch/powerpc/sysdev/xics/icp-native.c b/arch/powerpc/sysdev/xics/icp-native.c
index 7cd728b3b5e4..9dee47071af8 100644
--- a/arch/powerpc/sysdev/xics/icp-native.c
+++ b/arch/powerpc/sysdev/xics/icp-native.c
@@ -216,7 +216,7 @@ static int __init icp_native_init_one_node(struct device_node *np,
                                            unsigned int *indx)
 {
         unsigned int ilen;
-        const u32 *ireg;
+        const __be32 *ireg;
         int i;
         int reg_tuple_size;
         int num_servers = 0;
diff --git a/arch/powerpc/sysdev/xics/xics-common.c b/arch/powerpc/sysdev/xics/xics-common.c
index 9049d9f44485..fe0cca477164 100644
--- a/arch/powerpc/sysdev/xics/xics-common.c
+++ b/arch/powerpc/sysdev/xics/xics-common.c
@@ -49,7 +49,7 @@ void xics_update_irq_servers(void)
         int i, j;
         struct device_node *np;
         u32 ilen;
-        const u32 *ireg;
+        const __be32 *ireg;
         u32 hcpuid;
 
         /* Find the server numbers for the boot cpu. */
@@ -75,8 +75,8 @@ void xics_update_irq_servers(void)
          * default distribution server
          */
         for (j = 0; j < i; j += 2) {
-                if (ireg[j] == hcpuid) {
-                        xics_default_distrib_server = ireg[j+1];
+                if (be32_to_cpu(ireg[j]) == hcpuid) {
+                        xics_default_distrib_server = be32_to_cpu(ireg[j+1]);
                         break;
                 }
         }
@@ -383,7 +383,7 @@ void __init xics_register_ics(struct ics *ics)
 static void __init xics_get_server_size(void)
 {
         struct device_node *np;
-        const u32 *isize;
+        const __be32 *isize;
 
         /* We fetch the interrupt server size from the first ICS node
          * we find if any
@@ -394,7 +394,7 @@ static void __init xics_get_server_size(void)
         isize = of_get_property(np, "ibm,interrupt-server#-size", NULL);
         if (!isize)
                 return;
-        xics_interrupt_server_size = *isize;
+        xics_interrupt_server_size = be32_to_cpu(*isize);
         of_node_put(np);
 }
 
diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c
index 96bf5bd30fbc..af9d3469fb99 100644
--- a/arch/powerpc/xmon/xmon.c
+++ b/arch/powerpc/xmon/xmon.c
@@ -972,27 +972,27 @@ static void bootcmds(void)
 static int cpu_cmd(void)
 {
 #ifdef CONFIG_SMP
-        unsigned long cpu;
+        unsigned long cpu, first_cpu, last_cpu;
         int timeout;
-        int count;
 
         if (!scanhex(&cpu)) {
                 /* print cpus waiting or in xmon */
                 printf("cpus stopped:");
-                count = 0;
+                last_cpu = first_cpu = NR_CPUS;
                 for_each_possible_cpu(cpu) {
                         if (cpumask_test_cpu(cpu, &cpus_in_xmon)) {
-                                if (count == 0)
-                                        printf(" %x", cpu);
-                                ++count;
-                        } else {
-                                if (count > 1)
-                                        printf("-%x", cpu - 1);
-                                count = 0;
+                                if (cpu == last_cpu + 1) {
+                                        last_cpu = cpu;
+                                } else {
+                                        if (last_cpu != first_cpu)
+                                                printf("-%lx", last_cpu);
+                                        last_cpu = first_cpu = cpu;
+                                        printf(" %lx", cpu);
+                                }
                         }
                 }
-                if (count > 1)
-                        printf("-%x", NR_CPUS - 1);
+                if (last_cpu != first_cpu)
+                        printf("-%lx", last_cpu);
                 printf("\n");
                 return 0;
         }
@@ -1256,11 +1256,18 @@ const char *getvecname(unsigned long vec)
         case 0x700:     ret = "(Program Check)"; break;
         case 0x800:     ret = "(FPU Unavailable)"; break;
         case 0x900:     ret = "(Decrementer)"; break;
+        case 0x980:     ret = "(Hypervisor Decrementer)"; break;
+        case 0xa00:     ret = "(Doorbell)"; break;
         case 0xc00:     ret = "(System Call)"; break;
         case 0xd00:     ret = "(Single Step)"; break;
+        case 0xe40:     ret = "(Emulation Assist)"; break;
+        case 0xe60:     ret = "(HMI)"; break;
+        case 0xe80:     ret = "(Hypervisor Doorbell)"; break;
         case 0xf00:     ret = "(Performance Monitor)"; break;
         case 0xf20:     ret = "(Altivec Unavailable)"; break;
         case 0x1300:    ret = "(Instruction Breakpoint)"; break;
+        case 0x1500:    ret = "(Denormalisation)"; break;
+        case 0x1700:    ret = "(Altivec Assist)"; break;
         default: ret = "";
         }
         return ret;
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index 8a4cae78f03c..dcc6ac2d8026 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -62,6 +62,7 @@ config S390
         def_bool y
         select ARCH_DISCARD_MEMBLOCK
         select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
+        select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
         select ARCH_HAVE_NMI_SAFE_CMPXCHG
         select ARCH_INLINE_READ_LOCK
         select ARCH_INLINE_READ_LOCK_BH
@@ -91,7 +92,6 @@ config S390
         select ARCH_INLINE_WRITE_UNLOCK_BH
         select ARCH_INLINE_WRITE_UNLOCK_IRQ
         select ARCH_INLINE_WRITE_UNLOCK_IRQRESTORE
-        select ARCH_HAS_DEBUG_STRICT_USER_COPY_CHECKS
         select ARCH_SAVE_PAGE_KEYS if HIBERNATION
         select ARCH_WANT_IPC_PARSE_VERSION
         select BUILDTIME_EXTABLE_SORT
@@ -134,15 +134,15 @@ config S390
         select HAVE_SYSCALL_TRACEPOINTS
         select HAVE_UID16 if 32BIT
         select HAVE_VIRT_CPU_ACCOUNTING
-        select VIRT_TO_BUS
         select INIT_ALL_POSSIBLE
         select KTIME_SCALAR if 32BIT
         select MODULES_USE_ELF_RELA
-        select OLD_SIGSUSPEND3
         select OLD_SIGACTION
+        select OLD_SIGSUSPEND3
         select SYSCTL_EXCEPTION_TRACE
         select USE_GENERIC_SMP_HELPERS if SMP
         select VIRT_CPU_ACCOUNTING
+        select VIRT_TO_BUS
 
 config SCHED_OMIT_FRAME_POINTER
         def_bool y
@@ -430,7 +430,6 @@ menuconfig PCI
         bool "PCI support"
         default n
         depends on 64BIT
-        select ARCH_SUPPORTS_MSI
         select PCI_MSI
         help
           Enable PCI support.
@@ -445,6 +444,16 @@ config PCI_NR_FUNCTIONS
           This allows you to specify the maximum number of PCI functions which
           this kernel will support.
 
+config PCI_NR_MSI
+        int "Maximum number of MSI interrupts (64-32768)"
+        range 64 32768
+        default "256"
+        help
+          This defines the number of virtual interrupts the kernel will
+          provide for MSI interrupts. If you configure your system to have
+          too few drivers will fail to allocate MSI interrupts for all
+          PCI devices.
+
 source "drivers/pci/Kconfig"
 source "drivers/pci/pcie/Kconfig"
 source "drivers/pci/hotplug/Kconfig"
@@ -516,6 +525,7 @@ config CRASH_DUMP
         bool "kernel crash dumps"
         depends on 64BIT && SMP
         select KEXEC
+        select ZFCPDUMP
         help
           Generate crash dump after being started by kexec.
           Crash dump kernels are loaded in the main kernel with kexec-tools
@@ -526,7 +536,7 @@ config CRASH_DUMP
 config ZFCPDUMP
         def_bool n
         prompt "zfcpdump support"
-        select SMP
+        depends on SMP
         help
           Select this option if you want to build an zfcpdump enabled kernel.
           Refer to <file:Documentation/s390/zfcpdump.txt> for more details on this.
diff --git a/arch/s390/defconfig b/arch/s390/defconfig
index b74400e3e035..d204c65bf722 100644
--- a/arch/s390/defconfig
+++ b/arch/s390/defconfig
@@ -1,14 +1,13 @@
-CONFIG_EXPERIMENTAL=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
 CONFIG_FHANDLE=y
+CONFIG_AUDIT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_AUDIT=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
 CONFIG_RCU_FAST_NO_HZ=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
@@ -27,6 +26,7 @@ CONFIG_RD_BZIP2=y
 CONFIG_RD_LZMA=y
 CONFIG_RD_XZ=y
 CONFIG_RD_LZO=y
+CONFIG_RD_LZ4=y
 CONFIG_EXPERT=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_PROFILING=y
@@ -38,11 +38,13 @@ CONFIG_MODULE_UNLOAD=y
 CONFIG_MODVERSIONS=y
 CONFIG_PARTITION_ADVANCED=y
 CONFIG_IBM_PARTITION=y
+# CONFIG_EFI_PARTITION is not set
 CONFIG_DEFAULT_DEADLINE=y
 CONFIG_HZ_100=y
 CONFIG_MEMORY_HOTPLUG=y
 CONFIG_MEMORY_HOTREMOVE=y
 CONFIG_KSM=y
+CONFIG_TRANSPARENT_HUGEPAGE=y
 CONFIG_CRASH_DUMP=y
 CONFIG_BINFMT_MISC=m
 CONFIG_HIBERNATION=y
@@ -92,40 +94,49 @@ CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_SCAN_ASYNC=y
 CONFIG_ZFCP=y
+CONFIG_SCSI_VIRTIO=y
 CONFIG_NETDEVICES=y
 CONFIG_BONDING=m
 CONFIG_DUMMY=m
 CONFIG_EQUALIZER=m
 CONFIG_TUN=m
 CONFIG_VIRTIO_NET=y
+# CONFIG_INPUT is not set
+# CONFIG_SERIO is not set
 CONFIG_RAW_DRIVER=m
 CONFIG_VIRTIO_BALLOON=y
-CONFIG_EXT2_FS=y
-CONFIG_EXT3_FS=y
-# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_POSIX_ACL=y
 CONFIG_EXT4_FS_SECURITY=y
+CONFIG_XFS_FS=y
+CONFIG_XFS_QUOTA=y
+CONFIG_XFS_POSIX_ACL=y
+CONFIG_XFS_RT=y
+CONFIG_BTRFS_FS=y
+CONFIG_BTRFS_FS_POSIX_ACL=y
+CONFIG_FANOTIFY=y
+CONFIG_FUSE_FS=y
 CONFIG_PROC_KCORE=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
+CONFIG_HUGETLBFS=y
 # CONFIG_NETWORK_FILESYSTEMS is not set
+CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
 CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_PAGEALLOC=y
 CONFIG_TIMER_STATS=y
 CONFIG_PROVE_LOCKING=y
-CONFIG_PROVE_RCU=y
 CONFIG_LOCK_STAT=y
 CONFIG_DEBUG_LOCKDEP=y
 CONFIG_DEBUG_LIST=y
 CONFIG_DEBUG_NOTIFIERS=y
+CONFIG_PROVE_RCU=y
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_RCU_TRACE=y
-CONFIG_KPROBES_SANITY_TEST=y
-CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
 CONFIG_LATENCYTOP=y
-CONFIG_DEBUG_PAGEALLOC=y
 CONFIG_BLK_DEV_IO_TRACE=y
+CONFIG_KPROBES_SANITY_TEST=y
 # CONFIG_STRICT_DEVMEM is not set
-CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_AUTHENC=m
 CONFIG_CRYPTO_TEST=m
@@ -137,8 +148,10 @@ CONFIG_CRYPTO_ECB=m
 CONFIG_CRYPTO_LRW=m
 CONFIG_CRYPTO_PCBC=m
 CONFIG_CRYPTO_XTS=m
+CONFIG_CRYPTO_CMAC=m
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_VMAC=m
+CONFIG_CRYPTO_CRC32=m
 CONFIG_CRYPTO_MD4=m
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_RMD128=m
@@ -165,6 +178,8 @@ CONFIG_CRYPTO_TWOFISH=m
 CONFIG_CRYPTO_DEFLATE=m
 CONFIG_CRYPTO_ZLIB=m
 CONFIG_CRYPTO_LZO=m
+CONFIG_CRYPTO_LZ4=m
+CONFIG_CRYPTO_LZ4HC=m
 CONFIG_ZCRYPT=m
 CONFIG_CRYPTO_SHA1_S390=m
 CONFIG_CRYPTO_SHA256_S390=m
diff --git a/arch/s390/hypfs/hypfs.h b/arch/s390/hypfs/hypfs.h
index f41e0ef7fdf9..79f2ac55253f 100644
--- a/arch/s390/hypfs/hypfs.h
+++ b/arch/s390/hypfs/hypfs.h
@@ -18,26 +18,23 @@
 #define UPDATE_FILE_MODE 0220
 #define DIR_MODE         0550
 
-extern struct dentry *hypfs_mkdir(struct super_block *sb, struct dentry *parent,
-                                  const char *name);
+extern struct dentry *hypfs_mkdir(struct dentry *parent, const char *name);
 
-extern struct dentry *hypfs_create_u64(struct super_block *sb,
-                                       struct dentry *dir, const char *name,
+extern struct dentry *hypfs_create_u64(struct dentry *dir, const char *name,
                                        __u64 value);
 
-extern struct dentry *hypfs_create_str(struct super_block *sb,
-                                       struct dentry *dir, const char *name,
+extern struct dentry *hypfs_create_str(struct dentry *dir, const char *name,
                                        char *string);
 
 /* LPAR Hypervisor */
 extern int hypfs_diag_init(void);
 extern void hypfs_diag_exit(void);
-extern int hypfs_diag_create_files(struct super_block *sb, struct dentry *root);
+extern int hypfs_diag_create_files(struct dentry *root);
 
 /* VM Hypervisor */
 extern int hypfs_vm_init(void);
 extern void hypfs_vm_exit(void);
-extern int hypfs_vm_create_files(struct super_block *sb, struct dentry *root);
+extern int hypfs_vm_create_files(struct dentry *root);
 
 /* debugfs interface */
 struct hypfs_dbfs_file;
diff --git a/arch/s390/hypfs/hypfs_dbfs.c b/arch/s390/hypfs/hypfs_dbfs.c
index bb5dd496614f..17ab8b7b53cc 100644
--- a/arch/s390/hypfs/hypfs_dbfs.c
+++ b/arch/s390/hypfs/hypfs_dbfs.c
@@ -105,7 +105,7 @@ void hypfs_dbfs_remove_file(struct hypfs_dbfs_file *df)
 int hypfs_dbfs_init(void)
 {
         dbfs_dir = debugfs_create_dir("s390_hypfs", NULL);
-        return PTR_RET(dbfs_dir);
+        return PTR_ERR_OR_ZERO(dbfs_dir);
 }
 
 void hypfs_dbfs_exit(void)
diff --git a/arch/s390/hypfs/hypfs_diag.c b/arch/s390/hypfs/hypfs_diag.c
index 138893e5f736..5eeffeefae06 100644
--- a/arch/s390/hypfs/hypfs_diag.c
+++ b/arch/s390/hypfs/hypfs_diag.c
@@ -623,8 +623,7 @@ void hypfs_diag_exit(void)
  * *******************************************
  */
 
-static int hypfs_create_cpu_files(struct super_block *sb,
-                                  struct dentry *cpus_dir, void *cpu_info)
+static int hypfs_create_cpu_files(struct dentry *cpus_dir, void *cpu_info)
 {
         struct dentry *cpu_dir;
         char buffer[TMP_SIZE];
@@ -632,30 +631,29 @@ static int hypfs_create_cpu_files(struct super_block *sb,
 
         snprintf(buffer, TMP_SIZE, "%d", cpu_info__cpu_addr(diag204_info_type,
                                                             cpu_info));
-        cpu_dir = hypfs_mkdir(sb, cpus_dir, buffer);
-        rc = hypfs_create_u64(sb, cpu_dir, "mgmtime",
+        cpu_dir = hypfs_mkdir(cpus_dir, buffer);
+        rc = hypfs_create_u64(cpu_dir, "mgmtime",
                               cpu_info__acc_time(diag204_info_type, cpu_info) -
                               cpu_info__lp_time(diag204_info_type, cpu_info));
         if (IS_ERR(rc))
                 return PTR_ERR(rc);
-        rc = hypfs_create_u64(sb, cpu_dir, "cputime",
+        rc = hypfs_create_u64(cpu_dir, "cputime",
                               cpu_info__lp_time(diag204_info_type, cpu_info));
         if (IS_ERR(rc))
                 return PTR_ERR(rc);
         if (diag204_info_type == INFO_EXT) {
-                rc = hypfs_create_u64(sb, cpu_dir, "onlinetime",
+                rc = hypfs_create_u64(cpu_dir, "onlinetime",
                                       cpu_info__online_time(diag204_info_type,
                                                             cpu_info));
                 if (IS_ERR(rc))
                         return PTR_ERR(rc);
         }
         diag224_idx2name(cpu_info__ctidx(diag204_info_type, cpu_info), buffer);
-        rc = hypfs_create_str(sb, cpu_dir, "type", buffer);
+        rc = hypfs_create_str(cpu_dir, "type", buffer);
         return PTR_RET(rc);
 }
 
-static void *hypfs_create_lpar_files(struct super_block *sb,
-                                     struct dentry *systems_dir, void *part_hdr)
+static void *hypfs_create_lpar_files(struct dentry *systems_dir, void *part_hdr)
 {
         struct dentry *cpus_dir;
         struct dentry *lpar_dir;
@@ -665,16 +663,16 @@ static void *hypfs_create_lpar_files(struct super_block *sb,
 
         part_hdr__part_name(diag204_info_type, part_hdr, lpar_name);
         lpar_name[LPAR_NAME_LEN] = 0;
-        lpar_dir = hypfs_mkdir(sb, systems_dir, lpar_name);
+        lpar_dir = hypfs_mkdir(systems_dir, lpar_name);
         if (IS_ERR(lpar_dir))
                 return lpar_dir;
-        cpus_dir = hypfs_mkdir(sb, lpar_dir, "cpus");
+        cpus_dir = hypfs_mkdir(lpar_dir, "cpus");
         if (IS_ERR(cpus_dir))
                 return cpus_dir;
         cpu_info = part_hdr + part_hdr__size(diag204_info_type);
         for (i = 0; i < part_hdr__rcpus(diag204_info_type, part_hdr); i++) {
                 int rc;
-                rc = hypfs_create_cpu_files(sb, cpus_dir, cpu_info);
+                rc = hypfs_create_cpu_files(cpus_dir, cpu_info);
                 if (rc)
                         return ERR_PTR(rc);
                 cpu_info += cpu_info__size(diag204_info_type);
@@ -682,8 +680,7 @@ static void *hypfs_create_lpar_files(struct super_block *sb,
         return cpu_info;
 }
 
-static int hypfs_create_phys_cpu_files(struct super_block *sb,
-                                       struct dentry *cpus_dir, void *cpu_info)
+static int hypfs_create_phys_cpu_files(struct dentry *cpus_dir, void *cpu_info)
 {
         struct dentry *cpu_dir;
         char buffer[TMP_SIZE];
@@ -691,32 +688,31 @@ static int hypfs_create_phys_cpu_files(struct super_block *sb,
 
         snprintf(buffer, TMP_SIZE, "%i", phys_cpu__cpu_addr(diag204_info_type,
                                                             cpu_info));
-        cpu_dir = hypfs_mkdir(sb, cpus_dir, buffer);
+        cpu_dir = hypfs_mkdir(cpus_dir, buffer);
         if (IS_ERR(cpu_dir))
                 return PTR_ERR(cpu_dir);
-        rc = hypfs_create_u64(sb, cpu_dir, "mgmtime",
+        rc = hypfs_create_u64(cpu_dir, "mgmtime",
                               phys_cpu__mgm_time(diag204_info_type, cpu_info));
         if (IS_ERR(rc))
                 return PTR_ERR(rc);
         diag224_idx2name(phys_cpu__ctidx(diag204_info_type, cpu_info), buffer);
-        rc = hypfs_create_str(sb, cpu_dir, "type", buffer);
+        rc = hypfs_create_str(cpu_dir, "type", buffer);
         return PTR_RET(rc);
 }
 
-static void *hypfs_create_phys_files(struct super_block *sb,
-                                     struct dentry *parent_dir, void *phys_hdr)
+static void *hypfs_create_phys_files(struct dentry *parent_dir, void *phys_hdr)
 {
         int i;
         void *cpu_info;
         struct dentry *cpus_dir;
 
-        cpus_dir = hypfs_mkdir(sb, parent_dir, "cpus");
+        cpus_dir = hypfs_mkdir(parent_dir, "cpus");
         if (IS_ERR(cpus_dir))
                 return cpus_dir;
         cpu_info = phys_hdr + phys_hdr__size(diag204_info_type);
         for (i = 0; i < phys_hdr__cpus(diag204_info_type, phys_hdr); i++) {
                 int rc;
-                rc = hypfs_create_phys_cpu_files(sb, cpus_dir, cpu_info);
+                rc = hypfs_create_phys_cpu_files(cpus_dir, cpu_info);
                 if (rc)
                         return ERR_PTR(rc);
                 cpu_info += phys_cpu__size(diag204_info_type);
@@ -724,7 +720,7 @@ static void *hypfs_create_phys_files(struct super_block *sb,
         return cpu_info;
 }
 
-int hypfs_diag_create_files(struct super_block *sb, struct dentry *root)
+int hypfs_diag_create_files(struct dentry *root)
 {
         struct dentry *systems_dir, *hyp_dir;
         void *time_hdr, *part_hdr;
@@ -735,7 +731,7 @@ int hypfs_diag_create_files(struct super_block *sb, struct dentry *root)
         if (IS_ERR(buffer))
                 return PTR_ERR(buffer);
 
-        systems_dir = hypfs_mkdir(sb, root, "systems");
+        systems_dir = hypfs_mkdir(root, "systems");
         if (IS_ERR(systems_dir)) {
                 rc = PTR_ERR(systems_dir);
                 goto err_out;
@@ -743,25 +739,25 @@ int hypfs_diag_create_files(struct super_block *sb, struct dentry *root)
         time_hdr = (struct x_info_blk_hdr *)buffer;
         part_hdr = time_hdr + info_blk_hdr__size(diag204_info_type);
         for (i = 0; i < info_blk_hdr__npar(diag204_info_type, time_hdr); i++) {
-                part_hdr = hypfs_create_lpar_files(sb, systems_dir, part_hdr);
+                part_hdr = hypfs_create_lpar_files(systems_dir, part_hdr);
                 if (IS_ERR(part_hdr)) {
                         rc = PTR_ERR(part_hdr);
                         goto err_out;
                 }
         }
         if (info_blk_hdr__flags(diag204_info_type, time_hdr) & LPAR_PHYS_FLG) {
-                ptr = hypfs_create_phys_files(sb, root, part_hdr);
+                ptr = hypfs_create_phys_files(root, part_hdr);
                 if (IS_ERR(ptr)) {
                         rc = PTR_ERR(ptr);
                         goto err_out;
                 }
         }
-        hyp_dir = hypfs_mkdir(sb, root, "hyp");
+        hyp_dir = hypfs_mkdir(root, "hyp");
         if (IS_ERR(hyp_dir)) {
                 rc = PTR_ERR(hyp_dir);
                 goto err_out;
         }
-        ptr = hypfs_create_str(sb, hyp_dir, "type", "LPAR Hypervisor");
+        ptr = hypfs_create_str(hyp_dir, "type", "LPAR Hypervisor");
         if (IS_ERR(ptr)) {
                 rc = PTR_ERR(ptr);
                 goto err_out;
diff --git a/arch/s390/hypfs/hypfs_vm.c b/arch/s390/hypfs/hypfs_vm.c
index f364dcf77e8e..24908ce149f1 100644
--- a/arch/s390/hypfs/hypfs_vm.c
+++ b/arch/s390/hypfs/hypfs_vm.c
@@ -107,16 +107,15 @@ static void diag2fc_free(const void *data)
         vfree(data);
 }
 
-#define ATTRIBUTE(sb, dir, name, member) \
+#define ATTRIBUTE(dir, name, member) \
 do { \
         void *rc; \
-        rc = hypfs_create_u64(sb, dir, name, member); \
+        rc = hypfs_create_u64(dir, name, member); \
         if (IS_ERR(rc)) \
                 return PTR_ERR(rc); \
 } while(0)
 
-static int hpyfs_vm_create_guest(struct super_block *sb,
-                                 struct dentry *systems_dir,
+static int hpyfs_vm_create_guest(struct dentry *systems_dir,
                                  struct diag2fc_data *data)
 {
         char guest_name[NAME_LEN + 1] = {};
@@ -130,46 +129,46 @@ static int hpyfs_vm_create_guest(struct super_block *sb,
         memcpy(guest_name, data->guest_name, NAME_LEN);
         EBCASC(guest_name, NAME_LEN);
         strim(guest_name);
-        guest_dir = hypfs_mkdir(sb, systems_dir, guest_name);
+        guest_dir = hypfs_mkdir(systems_dir, guest_name);
         if (IS_ERR(guest_dir))
                 return PTR_ERR(guest_dir);
-        ATTRIBUTE(sb, guest_dir, "onlinetime_us", data->el_time);
+        ATTRIBUTE(guest_dir, "onlinetime_us", data->el_time);
 
         /* logical cpu information */
-        cpus_dir = hypfs_mkdir(sb, guest_dir, "cpus");
+        cpus_dir = hypfs_mkdir(guest_dir, "cpus");
         if (IS_ERR(cpus_dir))
                 return PTR_ERR(cpus_dir);
-        ATTRIBUTE(sb, cpus_dir, "cputime_us", data->used_cpu);
-        ATTRIBUTE(sb, cpus_dir, "capped", capped_value);
-        ATTRIBUTE(sb, cpus_dir, "dedicated", dedicated_flag);
-        ATTRIBUTE(sb, cpus_dir, "count", data->vcpus);
-        ATTRIBUTE(sb, cpus_dir, "weight_min", data->cpu_min);
-        ATTRIBUTE(sb, cpus_dir, "weight_max", data->cpu_max);
-        ATTRIBUTE(sb, cpus_dir, "weight_cur", data->cpu_shares);
+        ATTRIBUTE(cpus_dir, "cputime_us", data->used_cpu);
+        ATTRIBUTE(cpus_dir, "capped", capped_value);
+        ATTRIBUTE(cpus_dir, "dedicated", dedicated_flag);
+        ATTRIBUTE(cpus_dir, "count", data->vcpus);
+        ATTRIBUTE(cpus_dir, "weight_min", data->cpu_min);
+        ATTRIBUTE(cpus_dir, "weight_max", data->cpu_max);
+        ATTRIBUTE(cpus_dir, "weight_cur", data->cpu_shares);
 
         /* memory information */
-        mem_dir = hypfs_mkdir(sb, guest_dir, "mem");
+        mem_dir = hypfs_mkdir(guest_dir, "mem");
         if (IS_ERR(mem_dir))
                 return PTR_ERR(mem_dir);
-        ATTRIBUTE(sb, mem_dir, "min_KiB", data->mem_min_kb);
-        ATTRIBUTE(sb, mem_dir, "max_KiB", data->mem_max_kb);
-        ATTRIBUTE(sb, mem_dir, "used_KiB", data->mem_used_kb);
-        ATTRIBUTE(sb, mem_dir, "share_KiB", data->mem_share_kb);
+        ATTRIBUTE(mem_dir, "min_KiB", data->mem_min_kb);
+        ATTRIBUTE(mem_dir, "max_KiB", data->mem_max_kb);
+        ATTRIBUTE(mem_dir, "used_KiB", data->mem_used_kb);
+        ATTRIBUTE(mem_dir, "share_KiB", data->mem_share_kb);
 
         /* samples */
-        samples_dir = hypfs_mkdir(sb, guest_dir, "samples");
+        samples_dir = hypfs_mkdir(guest_dir, "samples");
         if (IS_ERR(samples_dir))
                 return PTR_ERR(samples_dir);
-        ATTRIBUTE(sb, samples_dir, "cpu_using", data->cpu_use_samp);
-        ATTRIBUTE(sb, samples_dir, "cpu_delay", data->cpu_delay_samp);
-        ATTRIBUTE(sb, samples_dir, "mem_delay", data->page_wait_samp);
-        ATTRIBUTE(sb, samples_dir, "idle", data->idle_samp);
-        ATTRIBUTE(sb, samples_dir, "other", data->other_samp);
-        ATTRIBUTE(sb, samples_dir, "total", data->total_samp);
+        ATTRIBUTE(samples_dir, "cpu_using", data->cpu_use_samp);
+        ATTRIBUTE(samples_dir, "cpu_delay", data->cpu_delay_samp);
+        ATTRIBUTE(samples_dir, "mem_delay", data->page_wait_samp);
+        ATTRIBUTE(samples_dir, "idle", data->idle_samp);
+        ATTRIBUTE(samples_dir, "other", data->other_samp);
+        ATTRIBUTE(samples_dir, "total", data->total_samp);
         return 0;
 }
 
-int hypfs_vm_create_files(struct super_block *sb, struct dentry *root)
+int hypfs_vm_create_files(struct dentry *root)
 {
         struct dentry *dir, *file;
         struct diag2fc_data *data;
@@ -181,38 +180,38 @@ int hypfs_vm_create_files(struct super_block *sb, struct dentry *root)
                 return PTR_ERR(data);
 
         /* Hpervisor Info */
-        dir = hypfs_mkdir(sb, root, "hyp");
+        dir = hypfs_mkdir(root, "hyp");
         if (IS_ERR(dir)) {
                 rc = PTR_ERR(dir);
                 goto failed;
         }
-        file = hypfs_create_str(sb, dir, "type", "z/VM Hypervisor");
+        file = hypfs_create_str(dir, "type", "z/VM Hypervisor");
         if (IS_ERR(file)) {
                 rc = PTR_ERR(file);
                 goto failed;
         }
 
         /* physical cpus */
-        dir = hypfs_mkdir(sb, root, "cpus");
+        dir = hypfs_mkdir(root, "cpus");
         if (IS_ERR(dir)) {
                 rc = PTR_ERR(dir);
                 goto failed;
         }
-        file = hypfs_create_u64(sb, dir, "count", data->lcpus);
+        file = hypfs_create_u64(dir, "count", data->lcpus);
         if (IS_ERR(file)) {
                 rc = PTR_ERR(file);
                 goto failed;
         }
 
         /* guests */
-        dir = hypfs_mkdir(sb, root, "systems");
+        dir = hypfs_mkdir(root, "systems");
         if (IS_ERR(dir)) {
                 rc = PTR_ERR(dir);
                 goto failed;
         }
 
         for (i = 0; i < count; i++) {
-                rc = hpyfs_vm_create_guest(sb, dir, &(data[i]));
+                rc = hpyfs_vm_create_guest(dir, &(data[i]));
                 if (rc)
                         goto failed;
         }
diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c
index 7a539f4f5e30..ddfe09b45134 100644
--- a/arch/s390/hypfs/inode.c
+++ b/arch/s390/hypfs/inode.c
@@ -28,8 +28,7 @@
 #define HYPFS_MAGIC 0x687970    /* ASCII 'hyp' */
 #define TMP_SIZE 64             /* size of temporary buffers */
 
-static struct dentry *hypfs_create_update_file(struct super_block *sb,
-                                               struct dentry *dir);
+static struct dentry *hypfs_create_update_file(struct dentry *dir);
 
 struct hypfs_sb_info {
         kuid_t uid;                     /* uid used for files and dirs */
@@ -193,9 +192,9 @@ static ssize_t hypfs_aio_write(struct kiocb *iocb, const struct iovec *iov,
         }
         hypfs_delete_tree(sb->s_root);
         if (MACHINE_IS_VM)
-                rc = hypfs_vm_create_files(sb, sb->s_root);
+                rc = hypfs_vm_create_files(sb->s_root);
         else
-                rc = hypfs_diag_create_files(sb, sb->s_root);
+                rc = hypfs_diag_create_files(sb->s_root);
         if (rc) {
                 pr_err("Updating the hypfs tree failed\n");
                 hypfs_delete_tree(sb->s_root);
@@ -302,12 +301,12 @@ static int hypfs_fill_super(struct super_block *sb, void *data, int silent)
         if (!root_dentry)
                 return -ENOMEM;
         if (MACHINE_IS_VM)
-                rc = hypfs_vm_create_files(sb, root_dentry);
+                rc = hypfs_vm_create_files(root_dentry);
         else
-                rc = hypfs_diag_create_files(sb, root_dentry);
+                rc = hypfs_diag_create_files(root_dentry);
         if (rc)
                 return rc;
-        sbi->update_file = hypfs_create_update_file(sb, root_dentry);
+        sbi->update_file = hypfs_create_update_file(root_dentry);
         if (IS_ERR(sbi->update_file))
                 return PTR_ERR(sbi->update_file);
         hypfs_update_update(sb);
@@ -334,8 +333,7 @@ static void hypfs_kill_super(struct super_block *sb)
         kill_litter_super(sb);
 }
 
-static struct dentry *hypfs_create_file(struct super_block *sb,
-                                        struct dentry *parent, const char *name,
+static struct dentry *hypfs_create_file(struct dentry *parent, const char *name,
                                         char *data, umode_t mode)
 {
         struct dentry *dentry;
@@ -347,7 +345,7 @@ static struct dentry *hypfs_create_file(struct super_block *sb,
                 dentry = ERR_PTR(-ENOMEM);
                 goto fail;
         }
-        inode = hypfs_make_inode(sb, mode);
+        inode = hypfs_make_inode(parent->d_sb, mode);
         if (!inode) {
                 dput(dentry);
                 dentry = ERR_PTR(-ENOMEM);
@@ -373,24 +371,22 @@ fail:
         return dentry;
 }
 
-struct dentry *hypfs_mkdir(struct super_block *sb, struct dentry *parent,
-                           const char *name)
+struct dentry *hypfs_mkdir(struct dentry *parent, const char *name)
 {
         struct dentry *dentry;
 
-        dentry = hypfs_create_file(sb, parent, name, NULL, S_IFDIR | DIR_MODE);
+        dentry = hypfs_create_file(parent, name, NULL, S_IFDIR | DIR_MODE);
         if (IS_ERR(dentry))
                 return dentry;
         hypfs_add_dentry(dentry);
         return dentry;
 }
 
-static struct dentry *hypfs_create_update_file(struct super_block *sb,
-                                               struct dentry *dir)
+static struct dentry *hypfs_create_update_file(struct dentry *dir)
 {
         struct dentry *dentry;
 
-        dentry = hypfs_create_file(sb, dir, "update", NULL,
+        dentry = hypfs_create_file(dir, "update", NULL,
                                    S_IFREG | UPDATE_FILE_MODE);
         /*
          * We do not put the update file on the 'delete' list with
@@ -400,7 +396,7 @@ static struct dentry *hypfs_create_update_file(struct super_block *sb,
         return dentry;
 }
 
-struct dentry *hypfs_create_u64(struct super_block *sb, struct dentry *dir,
+struct dentry *hypfs_create_u64(struct dentry *dir,
                                 const char *name, __u64 value)
 {
         char *buffer;
@@ -412,7 +408,7 @@ struct dentry *hypfs_create_u64(struct super_block *sb, struct dentry *dir,
         if (!buffer)
                 return ERR_PTR(-ENOMEM);
         dentry =
-            hypfs_create_file(sb, dir, name, buffer, S_IFREG | REG_FILE_MODE);
+            hypfs_create_file(dir, name, buffer, S_IFREG | REG_FILE_MODE);
         if (IS_ERR(dentry)) {
                 kfree(buffer);
                 return ERR_PTR(-ENOMEM);
@@ -421,7 +417,7 @@ struct dentry *hypfs_create_u64(struct super_block *sb, struct dentry *dir,
         return dentry;
 }
 
-struct dentry *hypfs_create_str(struct super_block *sb, struct dentry *dir,
+struct dentry *hypfs_create_str(struct dentry *dir,
                                 const char *name, char *string)
 {
         char *buffer;
@@ -432,7 +428,7 @@ struct dentry *hypfs_create_str(struct super_block *sb, struct dentry *dir,
                 return ERR_PTR(-ENOMEM);
         sprintf(buffer, "%s\n", string);
         dentry =
-            hypfs_create_file(sb, dir, name, buffer, S_IFREG | REG_FILE_MODE);
+            hypfs_create_file(dir, name, buffer, S_IFREG | REG_FILE_MODE);
         if (IS_ERR(dentry)) {
                 kfree(buffer);
                 return ERR_PTR(-ENOMEM);
diff --git a/arch/s390/include/asm/airq.h b/arch/s390/include/asm/airq.h
index 4066cee0c2d2..4bbb5957ed1b 100644
--- a/arch/s390/include/asm/airq.h
+++ b/arch/s390/include/asm/airq.h
@@ -9,6 +9,8 @@
 #ifndef _ASM_S390_AIRQ_H
 #define _ASM_S390_AIRQ_H
 
+#include <linux/bit_spinlock.h>
+
 struct airq_struct {
         struct hlist_node list;         /* Handler queueing. */
         void (*handler)(struct airq_struct *);  /* Thin-interrupt handler */
@@ -23,4 +25,69 @@ struct airq_struct {
 int register_adapter_interrupt(struct airq_struct *airq);
 void unregister_adapter_interrupt(struct airq_struct *airq);
 
+/* Adapter interrupt bit vector */
+struct airq_iv {
+        unsigned long *vector;  /* Adapter interrupt bit vector */
+        unsigned long *avail;   /* Allocation bit mask for the bit vector */
+        unsigned long *bitlock; /* Lock bit mask for the bit vector */
+        unsigned long *ptr;     /* Pointer associated with each bit */
+        unsigned int *data;     /* 32 bit value associated with each bit */
+        unsigned long bits;     /* Number of bits in the vector */
+        unsigned long end;      /* Number of highest allocated bit + 1 */
+        spinlock_t lock;        /* Lock to protect alloc & free */
+};
+
+#define AIRQ_IV_ALLOC   1       /* Use an allocation bit mask */
+#define AIRQ_IV_BITLOCK 2       /* Allocate the lock bit mask */
+#define AIRQ_IV_PTR     4       /* Allocate the ptr array */
+#define AIRQ_IV_DATA    8       /* Allocate the data array */
+
+struct airq_iv *airq_iv_create(unsigned long bits, unsigned long flags);
+void airq_iv_release(struct airq_iv *iv);
+unsigned long airq_iv_alloc_bit(struct airq_iv *iv);
+void airq_iv_free_bit(struct airq_iv *iv, unsigned long bit);
+unsigned long airq_iv_scan(struct airq_iv *iv, unsigned long start,
+                           unsigned long end);
+
+static inline unsigned long airq_iv_end(struct airq_iv *iv)
+{
+        return iv->end;
+}
+
+static inline void airq_iv_lock(struct airq_iv *iv, unsigned long bit)
+{
+        const unsigned long be_to_le = BITS_PER_LONG - 1;
+        bit_spin_lock(bit ^ be_to_le, iv->bitlock);
+}
+
+static inline void airq_iv_unlock(struct airq_iv *iv, unsigned long bit)
+{
+        const unsigned long be_to_le = BITS_PER_LONG - 1;
+        bit_spin_unlock(bit ^ be_to_le, iv->bitlock);
+}
+
+static inline void airq_iv_set_data(struct airq_iv *iv, unsigned long bit,
+                                    unsigned int data)
+{
+        iv->data[bit] = data;
+}
+
+static inline unsigned int airq_iv_get_data(struct airq_iv *iv,
+                                            unsigned long bit)
+{
+        return iv->data[bit];
+}
+
+static inline void airq_iv_set_ptr(struct airq_iv *iv, unsigned long bit,
+                                   unsigned long ptr)
+{
+        iv->ptr[bit] = ptr;
+}
+
+static inline unsigned long airq_iv_get_ptr(struct airq_iv *iv,
+                                            unsigned long bit)
+{
+        return iv->ptr[bit];
+}
+
 #endif /* _ASM_S390_AIRQ_H */
diff --git a/arch/s390/include/asm/bitops.h b/arch/s390/include/asm/bitops.h
index 7d4676758733..10135a38673c 100644
--- a/arch/s390/include/asm/bitops.h
+++ b/arch/s390/include/asm/bitops.h
@@ -216,7 +216,7 @@ static inline void __set_bit(unsigned long nr, volatile unsigned long *ptr)
         addr = (unsigned long) ptr + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         asm volatile(
                 "       oc      %O0(1,%R0),%1"
-                : "=Q" (*(char *) addr) : "Q" (_oi_bitmap[nr & 7]) : "cc" );
+                : "+Q" (*(char *) addr) : "Q" (_oi_bitmap[nr & 7]) : "cc");
 }
 
 static inline void 
@@ -244,7 +244,7 @@ __clear_bit(unsigned long nr, volatile unsigned long *ptr)
         addr = (unsigned long) ptr + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         asm volatile(
                 "       nc      %O0(1,%R0),%1"
-                : "=Q" (*(char *) addr) : "Q" (_ni_bitmap[nr & 7]) : "cc" );
+                : "+Q" (*(char *) addr) : "Q" (_ni_bitmap[nr & 7]) : "cc");
 }
 
 static inline void 
@@ -271,7 +271,7 @@ static inline void __change_bit(unsigned long nr, volatile unsigned long *ptr)
         addr = (unsigned long) ptr + ((nr ^ (BITS_PER_LONG - 8)) >> 3);
         asm volatile(
                 "       xc      %O0(1,%R0),%1"
-                : "=Q" (*(char *) addr) : "Q" (_oi_bitmap[nr & 7]) : "cc" );
+                : "+Q" (*(char *) addr) : "Q" (_oi_bitmap[nr & 7]) : "cc");
 }
 
 static inline void 
@@ -301,7 +301,7 @@ test_and_set_bit_simple(unsigned long nr, volatile unsigned long *ptr)
         ch = *(unsigned char *) addr;
         asm volatile(
                 "       oc      %O0(1,%R0),%1"
-                : "=Q" (*(char *) addr) : "Q" (_oi_bitmap[nr & 7])
+                : "+Q" (*(char *) addr) : "Q" (_oi_bitmap[nr & 7])
                 : "cc", "memory");
         return (ch >> (nr & 7)) & 1;
 }
@@ -320,7 +320,7 @@ test_and_clear_bit_simple(unsigned long nr, volatile unsigned long *ptr)
         ch = *(unsigned char *) addr;
         asm volatile(
                 "       nc      %O0(1,%R0),%1"
-                : "=Q" (*(char *) addr) : "Q" (_ni_bitmap[nr & 7])
+                : "+Q" (*(char *) addr) : "Q" (_ni_bitmap[nr & 7])
                 : "cc", "memory");
         return (ch >> (nr & 7)) & 1;
 }
@@ -339,7 +339,7 @@ test_and_change_bit_simple(unsigned long nr, volatile unsigned long *ptr)
         ch = *(unsigned char *) addr;
         asm volatile(
                 "       xc      %O0(1,%R0),%1"
-                : "=Q" (*(char *) addr) : "Q" (_oi_bitmap[nr & 7])
+                : "+Q" (*(char *) addr) : "Q" (_oi_bitmap[nr & 7])
                 : "cc", "memory");
         return (ch >> (nr & 7)) & 1;
 }
diff --git a/arch/s390/include/asm/cio.h b/arch/s390/include/asm/cio.h
index ffb898961c8d..d42625053c37 100644
--- a/arch/s390/include/asm/cio.h
+++ b/arch/s390/include/asm/cio.h
@@ -296,6 +296,7 @@ static inline int ccw_dev_id_is_equal(struct ccw_dev_id *dev_id1,
         return 0;
 }
 
+void channel_subsystem_reinit(void);
 extern void css_schedule_reprobe(void);
 
 extern void reipl_ccw_dev(struct ccw_dev_id *id);
diff --git a/arch/s390/include/asm/cputime.h b/arch/s390/include/asm/cputime.h
index d2ff41370c0c..f65bd3634519 100644
--- a/arch/s390/include/asm/cputime.h
+++ b/arch/s390/include/asm/cputime.h
@@ -13,9 +13,6 @@
 #include <asm/div64.h>
 
 
-#define __ARCH_HAS_VTIME_ACCOUNT
-#define __ARCH_HAS_VTIME_TASK_SWITCH
-
 /* We want to use full resolution of the CPU timer: 2**-12 micro-seconds. */
 
 typedef unsigned long long __nocast cputime_t;
diff --git a/arch/s390/include/asm/hardirq.h b/arch/s390/include/asm/hardirq.h
index 0c82ba86e997..a908d2941c5d 100644
--- a/arch/s390/include/asm/hardirq.h
+++ b/arch/s390/include/asm/hardirq.h
@@ -20,4 +20,9 @@
 
 #define HARDIRQ_BITS    8
 
+static inline void ack_bad_irq(unsigned int irq)
+{
+        printk(KERN_CRIT "unexpected IRQ trap at vector %02x\n", irq);
+}
+
 #endif /* __ASM_HARDIRQ_H */
diff --git a/arch/s390/include/asm/hugetlb.h b/arch/s390/include/asm/hugetlb.h
index bd90359d6d22..11eae5f55b70 100644
--- a/arch/s390/include/asm/hugetlb.h
+++ b/arch/s390/include/asm/hugetlb.h
@@ -17,6 +17,9 @@
 
 void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
                      pte_t *ptep, pte_t pte);
+pte_t huge_ptep_get(pte_t *ptep);
+pte_t huge_ptep_get_and_clear(struct mm_struct *mm,
+                              unsigned long addr, pte_t *ptep);
 
 /*
  * If the arch doesn't supply something else, assume that hugepage
@@ -38,147 +41,75 @@ static inline int prepare_hugepage_range(struct file *file,
 int arch_prepare_hugepage(struct page *page);
 void arch_release_hugepage(struct page *page);
 
-static inline pte_t huge_pte_wrprotect(pte_t pte)
+static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr,
+                                  pte_t *ptep)
 {
-        pte_val(pte) |= _PAGE_RO;
-        return pte;
+        pte_val(*ptep) = _SEGMENT_ENTRY_EMPTY;
 }
 
-static inline int huge_pte_none(pte_t pte)
+static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
+                                         unsigned long address, pte_t *ptep)
 {
-        return (pte_val(pte) & _SEGMENT_ENTRY_INV) &&
-                !(pte_val(pte) & _SEGMENT_ENTRY_RO);
+        huge_ptep_get_and_clear(vma->vm_mm, address, ptep);
 }
 
-static inline pte_t huge_ptep_get(pte_t *ptep)
+static inline int huge_ptep_set_access_flags(struct vm_area_struct *vma,
+                                             unsigned long addr, pte_t *ptep,
+                                             pte_t pte, int dirty)
 {
-        pte_t pte = *ptep;
-        unsigned long mask;
-
-        if (!MACHINE_HAS_HPAGE) {
-                ptep = (pte_t *) (pte_val(pte) & _SEGMENT_ENTRY_ORIGIN);
-                if (ptep) {
-                        mask = pte_val(pte) &
-                                (_SEGMENT_ENTRY_INV | _SEGMENT_ENTRY_RO);
-                        pte = pte_mkhuge(*ptep);
-                        pte_val(pte) |= mask;
-                }
+        int changed = !pte_same(huge_ptep_get(ptep), pte);
+        if (changed) {
+                huge_ptep_get_and_clear(vma->vm_mm, addr, ptep);
+                set_huge_pte_at(vma->vm_mm, addr, ptep, pte);
         }
-        return pte;
+        return changed;
 }
 
-static inline void __pmd_csp(pmd_t *pmdp)
+static inline void huge_ptep_set_wrprotect(struct mm_struct *mm,
+                                           unsigned long addr, pte_t *ptep)
 {
-        register unsigned long reg2 asm("2") = pmd_val(*pmdp);
-        register unsigned long reg3 asm("3") = pmd_val(*pmdp) |
-                                               _SEGMENT_ENTRY_INV;
-        register unsigned long reg4 asm("4") = ((unsigned long) pmdp) + 5;
-
-        asm volatile(
-                "       csp %1,%3"
-                : "=m" (*pmdp)
-                : "d" (reg2), "d" (reg3), "d" (reg4), "m" (*pmdp) : "cc");
+        pte_t pte = huge_ptep_get_and_clear(mm, addr, ptep);
+        set_huge_pte_at(mm, addr, ptep, pte_wrprotect(pte));
 }
 
-static inline void huge_ptep_invalidate(struct mm_struct *mm,
-                                        unsigned long address, pte_t *ptep)
-{
-        pmd_t *pmdp = (pmd_t *) ptep;
-
-        if (MACHINE_HAS_IDTE)
-                __pmd_idte(address, pmdp);
-        else
-                __pmd_csp(pmdp);
-        pmd_val(*pmdp) = _SEGMENT_ENTRY_INV | _SEGMENT_ENTRY;
-}
-
-static inline pte_t huge_ptep_get_and_clear(struct mm_struct *mm,
-                                            unsigned long addr, pte_t *ptep)
-{
-        pte_t pte = huge_ptep_get(ptep);
-
-        huge_ptep_invalidate(mm, addr, ptep);
-        return pte;
-}
-
-#define huge_ptep_set_access_flags(__vma, __addr, __ptep, __entry, __dirty) \
-({                                                                          \
-        int __changed = !pte_same(huge_ptep_get(__ptep), __entry);          \
-        if (__changed) {                                                    \
-                huge_ptep_invalidate((__vma)->vm_mm, __addr, __ptep);       \
-                set_huge_pte_at((__vma)->vm_mm, __addr, __ptep, __entry);   \
-        }                                                                   \
-        __changed;                                                          \
-})
-
-#define huge_ptep_set_wrprotect(__mm, __addr, __ptep)                   \
-({                                                                      \
-        pte_t __pte = huge_ptep_get(__ptep);                            \
-        if (huge_pte_write(__pte)) {                                    \
-                huge_ptep_invalidate(__mm, __addr, __ptep);             \
-                set_huge_pte_at(__mm, __addr, __ptep,                   \
-                                huge_pte_wrprotect(__pte));             \
-        }                                                               \
-})
-
-static inline void huge_ptep_clear_flush(struct vm_area_struct *vma,
-                                         unsigned long address, pte_t *ptep)
+static inline pte_t mk_huge_pte(struct page *page, pgprot_t pgprot)
 {
-        huge_ptep_invalidate(vma->vm_mm, address, ptep);
+        return mk_pte(page, pgprot);
 }
 
-static inline pte_t mk_huge_pte(struct page *page, pgprot_t pgprot)
+static inline int huge_pte_none(pte_t pte)
 {
-        pte_t pte;
-        pmd_t pmd;
-
-        pmd = mk_pmd_phys(page_to_phys(page), pgprot);
-        pte_val(pte) = pmd_val(pmd);
-        return pte;
+        return pte_none(pte);
 }
 
 static inline int huge_pte_write(pte_t pte)
 {
-        pmd_t pmd;
-
-        pmd_val(pmd) = pte_val(pte);
-        return pmd_write(pmd);
+        return pte_write(pte);
 }
 
 static inline int huge_pte_dirty(pte_t pte)
 {
-        /* No dirty bit in the segment table entry. */
-        return 0;
+        return pte_dirty(pte);
 }
 
 static inline pte_t huge_pte_mkwrite(pte_t pte)
 {
-        pmd_t pmd;
-
-        pmd_val(pmd) = pte_val(pte);
-        pte_val(pte) = pmd_val(pmd_mkwrite(pmd));
-        return pte;
+        return pte_mkwrite(pte);
 }
 
 static inline pte_t huge_pte_mkdirty(pte_t pte)
 {
-        /* No dirty bit in the segment table entry. */
-        return pte;
+        return pte_mkdirty(pte);
 }
 
-static inline pte_t huge_pte_modify(pte_t pte, pgprot_t newprot)
+static inline pte_t huge_pte_wrprotect(pte_t pte)
 {
-        pmd_t pmd;
-
-        pmd_val(pmd) = pte_val(pte);
-        pte_val(pte) = pmd_val(pmd_modify(pmd, newprot));
-        return pte;
+        return pte_wrprotect(pte);
 }
 
-static inline void huge_pte_clear(struct mm_struct *mm, unsigned long addr,
-                                  pte_t *ptep)
+static inline pte_t huge_pte_modify(pte_t pte, pgprot_t newprot)
 {
-        pmd_clear((pmd_t *) ptep);
+        return pte_modify(pte, newprot);
 }
 
 #endif /* _ASM_S390_HUGETLB_H */
diff --git a/arch/s390/include/asm/hw_irq.h b/arch/s390/include/asm/hw_irq.h
index 7e3d2586c1ff..ee96a8b697f9 100644
--- a/arch/s390/include/asm/hw_irq.h
+++ b/arch/s390/include/asm/hw_irq.h
@@ -4,19 +4,8 @@
 #include <linux/msi.h>
 #include <linux/pci.h>
 
-static inline struct msi_desc *irq_get_msi_desc(unsigned int irq)
-{
-        return __irq_get_msi_desc(irq);
-}
-
-/* Must be called with msi map lock held */
-static inline int irq_set_msi_desc(unsigned int irq, struct msi_desc *msi)
-{
-        if (!msi)
-                return -EINVAL;
-
-        msi->irq = irq;
-        return 0;
-}
+void __init init_airq_interrupts(void);
+void __init init_cio_interrupts(void);
+void __init init_ext_interrupts(void);
 
 #endif
diff --git a/arch/s390/include/asm/irq.h b/arch/s390/include/asm/irq.h
index 87c17bfb2968..5f8bcc5fe423 100644
--- a/arch/s390/include/asm/irq.h
+++ b/arch/s390/include/asm/irq.h
@@ -1,17 +1,28 @@
 #ifndef _ASM_IRQ_H
 #define _ASM_IRQ_H
 
+#define EXT_INTERRUPT   1
+#define IO_INTERRUPT    2
+#define THIN_INTERRUPT  3
+
+#define NR_IRQS_BASE    4
+
+#ifdef CONFIG_PCI_NR_MSI
+# define NR_IRQS        (NR_IRQS_BASE + CONFIG_PCI_NR_MSI)
+#else
+# define NR_IRQS        NR_IRQS_BASE
+#endif
+
+/* This number is used when no interrupt has been assigned */
+#define NO_IRQ          0
+
+#ifndef __ASSEMBLY__
+
 #include <linux/hardirq.h>
 #include <linux/percpu.h>
 #include <linux/cache.h>
 #include <linux/types.h>
 
-enum interruption_main_class {
-        EXTERNAL_INTERRUPT,
-        IO_INTERRUPT,
-        NR_IRQS
-};
-
 enum interruption_class {
         IRQEXT_CLK,
         IRQEXT_EXC,
@@ -67,19 +78,17 @@ typedef void (*ext_int_handler_t)(struct ext_code, unsigned int, unsigned long);
 
 int register_external_interrupt(u16 code, ext_int_handler_t handler);
 int unregister_external_interrupt(u16 code, ext_int_handler_t handler);
-void service_subclass_irq_register(void);
-void service_subclass_irq_unregister(void);
-void measurement_alert_subclass_register(void);
-void measurement_alert_subclass_unregister(void);
-
-#ifdef CONFIG_LOCKDEP
-#  define disable_irq_nosync_lockdep(irq)       disable_irq_nosync(irq)
-#  define disable_irq_nosync_lockdep_irqsave(irq, flags) \
-                                                disable_irq_nosync(irq)
-#  define disable_irq_lockdep(irq)              disable_irq(irq)
-#  define enable_irq_lockdep(irq)               enable_irq(irq)
-#  define enable_irq_lockdep_irqrestore(irq, flags) \
-                                                enable_irq(irq)
-#endif
+
+enum irq_subclass {
+        IRQ_SUBCLASS_MEASUREMENT_ALERT = 5,
+        IRQ_SUBCLASS_SERVICE_SIGNAL = 9,
+};
+
+void irq_subclass_register(enum irq_subclass subclass);
+void irq_subclass_unregister(enum irq_subclass subclass);
+
+#define irq_canonicalize(irq)  (irq)
+
+#endif /* __ASSEMBLY__ */
 
 #endif /* _ASM_IRQ_H */
diff --git a/arch/s390/include/asm/kprobes.h b/arch/s390/include/asm/kprobes.h
index dcf6948a875c..4176dfe0fba1 100644
--- a/arch/s390/include/asm/kprobes.h
+++ b/arch/s390/include/asm/kprobes.h
@@ -31,6 +31,8 @@
 #include <linux/ptrace.h>
 #include <linux/percpu.h>
 
+#define __ARCH_WANT_KPROBES_INSN_SLOT
+
 struct pt_regs;
 struct kprobe;
 
@@ -57,7 +59,7 @@ typedef u16 kprobe_opcode_t;
 /* Architecture specific copy of original instruction */
 struct arch_specific_insn {
         /* copy of original instruction */
-        kprobe_opcode_t insn[MAX_INSN_SIZE];
+        kprobe_opcode_t *insn;
 };
 
 struct prev_kprobe {
diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_host.h
index 3238d4004e84..e87ecaa2c569 100644
--- a/arch/s390/include/asm/kvm_host.h
+++ b/arch/s390/include/asm/kvm_host.h
@@ -274,6 +274,14 @@ struct kvm_arch{
         int css_support;
 };
 
+#define KVM_HVA_ERR_BAD         (-1UL)
+#define KVM_HVA_ERR_RO_BAD      (-2UL)
+
+static inline bool kvm_is_error_hva(unsigned long addr)
+{
+        return IS_ERR_VALUE(addr);
+}
+
 extern int sie64a(struct kvm_s390_sie_block *, u64 *);
 extern char sie_exit;
 #endif
diff --git a/arch/s390/include/asm/mmu.h b/arch/s390/include/asm/mmu.h
index 6340178748bf..ff132ac64ddd 100644
--- a/arch/s390/include/asm/mmu.h
+++ b/arch/s390/include/asm/mmu.h
@@ -12,8 +12,6 @@ typedef struct {
         unsigned long asce_bits;
         unsigned long asce_limit;
         unsigned long vdso_base;
-        /* Cloned contexts will be created with extended page tables. */
-        unsigned int alloc_pgste:1;
         /* The mmu context has extended page tables. */
         unsigned int has_pgste:1;
 } mm_context_t;
diff --git a/arch/s390/include/asm/mmu_context.h b/arch/s390/include/asm/mmu_context.h
index 084e7755ed9b..9f973d8de90e 100644
--- a/arch/s390/include/asm/mmu_context.h
+++ b/arch/s390/include/asm/mmu_context.h
@@ -21,24 +21,7 @@ static inline int init_new_context(struct task_struct *tsk,
 #ifdef CONFIG_64BIT
         mm->context.asce_bits |= _ASCE_TYPE_REGION3;
 #endif
-        if (current->mm && current->mm->context.alloc_pgste) {
-                /*
-                 * alloc_pgste indicates, that any NEW context will be created
-                 * with extended page tables. The old context is unchanged. The
-                 * page table allocation and the page table operations will
-                 * look at has_pgste to distinguish normal and extended page
-                 * tables. The only way to create extended page tables is to
-                 * set alloc_pgste and then create a new context (e.g. dup_mm).
-                 * The page table allocation is called after init_new_context
-                 * and if has_pgste is set, it will create extended page
-                 * tables.
-                 */
-                mm->context.has_pgste = 1;
-                mm->context.alloc_pgste = 1;
-        } else {
-                mm->context.has_pgste = 0;
-                mm->context.alloc_pgste = 0;
-        }
+        mm->context.has_pgste = 0;
         mm->context.asce_limit = STACK_TOP_MAX;
         crst_table_init((unsigned long *) mm->pgd, pgd_entry_type(mm));
         return 0;
@@ -77,8 +60,7 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
         WARN_ON(atomic_read(&prev->context.attach_count) < 0);
         atomic_inc(&next->context.attach_count);
         /* Check for TLBs not flushed yet */
-        if (next->context.flush_mm)
-                __tlb_flush_mm(next);
+        __tlb_flush_mm_lazy(next);
 }
 
 #define enter_lazy_tlb(mm,tsk)  do { } while (0)
diff --git a/arch/s390/include/asm/page.h b/arch/s390/include/asm/page.h
index 5d64fb7619cc..1e51f2915b2e 100644
--- a/arch/s390/include/asm/page.h
+++ b/arch/s390/include/asm/page.h
@@ -32,16 +32,6 @@
 
 void storage_key_init_range(unsigned long start, unsigned long end);
 
-static inline unsigned long pfmf(unsigned long function, unsigned long address)
-{
-        asm volatile(
-                "       .insn   rre,0xb9af0000,%[function],%[address]"
-                : [address] "+a" (address)
-                : [function] "d" (function)
-                : "memory");
-        return address;
-}
-
 static inline void clear_page(void *page)
 {
         register unsigned long reg1 asm ("1") = 0;
@@ -150,15 +140,6 @@ static inline int page_reset_referenced(unsigned long addr)
 #define _PAGE_FP_BIT            0x08    /* HW fetch protection bit      */
 #define _PAGE_ACC_BITS          0xf0    /* HW access control bits       */
 
-/*
- * Test and clear referenced bit in storage key.
- */
-#define __HAVE_ARCH_PAGE_TEST_AND_CLEAR_YOUNG
-static inline int page_test_and_clear_young(unsigned long pfn)
-{
-        return page_reset_referenced(pfn << PAGE_SHIFT);
-}
-
 struct page;
 void arch_free_page(struct page *page, int order);
 void arch_alloc_page(struct page *page, int order);
diff --git a/arch/s390/include/asm/pci.h b/arch/s390/include/asm/pci.h
index 6e577ba0e5da..1cc185da9d38 100644
--- a/arch/s390/include/asm/pci.h
+++ b/arch/s390/include/asm/pci.h
@@ -6,6 +6,7 @@
 /* must be set before including pci_clp.h */
 #define PCI_BAR_COUNT   6
 
+#include <linux/pci.h>
 #include <asm-generic/pci.h>
 #include <asm-generic/pci-dma-compat.h>
 #include <asm/pci_clp.h>
@@ -21,10 +22,6 @@ void pci_iounmap(struct pci_dev *, void __iomem *);
 int pci_domain_nr(struct pci_bus *);
 int pci_proc_domain(struct pci_bus *);
 
-/* MSI arch hooks */
-#define arch_setup_msi_irqs     arch_setup_msi_irqs
-#define arch_teardown_msi_irqs  arch_teardown_msi_irqs
-
 #define ZPCI_BUS_NR                     0       /* default bus number */
 #define ZPCI_DEVFN                      0       /* default device number */
 
@@ -53,14 +50,9 @@ struct zpci_fmb {
         atomic64_t unmapped_pages;
 } __packed __aligned(16);
 
-struct msi_map {
-        unsigned long irq;
-        struct msi_desc *msi;
-        struct hlist_node msi_chain;
-};
-
-#define ZPCI_NR_MSI_VECS        64
-#define ZPCI_MSI_MASK           (ZPCI_NR_MSI_VECS - 1)
+#define ZPCI_MSI_VEC_BITS       11
+#define ZPCI_MSI_VEC_MAX        (1 << ZPCI_MSI_VEC_BITS)
+#define ZPCI_MSI_VEC_MASK       (ZPCI_MSI_VEC_MAX - 1)
 
 enum zpci_state {
         ZPCI_FN_STATE_RESERVED,
@@ -91,8 +83,7 @@ struct zpci_dev {
 
         /* IRQ stuff */
         u64             msi_addr;       /* MSI address */
-        struct zdev_irq_map *irq_map;
-        struct msi_map *msi_map[ZPCI_NR_MSI_VECS];
+        struct airq_iv *aibv;           /* adapter interrupt bit vector */
         unsigned int    aisb;           /* number of the summary bit */
 
         /* DMA stuff */
@@ -122,11 +113,6 @@ struct zpci_dev {
         struct dentry   *debugfs_perf;
 };
 
-struct pci_hp_callback_ops {
-        int (*create_slot)      (struct zpci_dev *zdev);
-        void (*remove_slot)     (struct zpci_dev *zdev);
-};
-
 static inline bool zdev_enabled(struct zpci_dev *zdev)
 {
         return (zdev->fh & (1UL << 31)) ? true : false;
@@ -146,32 +132,38 @@ int zpci_register_ioat(struct zpci_dev *, u8, u64, u64, u64);
 int zpci_unregister_ioat(struct zpci_dev *, u8);
 
 /* CLP */
-int clp_find_pci_devices(void);
+int clp_scan_pci_devices(void);
+int clp_rescan_pci_devices(void);
+int clp_rescan_pci_devices_simple(void);
 int clp_add_pci_device(u32, u32, int);
 int clp_enable_fh(struct zpci_dev *, u8);
 int clp_disable_fh(struct zpci_dev *);
 
-/* MSI */
-struct msi_desc *__irq_get_msi_desc(unsigned int);
-int zpci_msi_set_mask_bits(struct msi_desc *, u32, u32);
-int zpci_setup_msi_irq(struct zpci_dev *, struct msi_desc *, unsigned int, int);
-void zpci_teardown_msi_irq(struct zpci_dev *, struct msi_desc *);
-int zpci_msihash_init(void);
-void zpci_msihash_exit(void);
-
 #ifdef CONFIG_PCI
 /* Error handling and recovery */
 void zpci_event_error(void *);
 void zpci_event_availability(void *);
+void zpci_rescan(void);
 #else /* CONFIG_PCI */
 static inline void zpci_event_error(void *e) {}
 static inline void zpci_event_availability(void *e) {}
+static inline void zpci_rescan(void) {}
 #endif /* CONFIG_PCI */
 
+#ifdef CONFIG_HOTPLUG_PCI_S390
+int zpci_init_slot(struct zpci_dev *);
+void zpci_exit_slot(struct zpci_dev *);
+#else /* CONFIG_HOTPLUG_PCI_S390 */
+static inline int zpci_init_slot(struct zpci_dev *zdev)
+{
+        return 0;
+}
+static inline void zpci_exit_slot(struct zpci_dev *zdev) {}
+#endif /* CONFIG_HOTPLUG_PCI_S390 */
+
 /* Helpers */
 struct zpci_dev *get_zdev(struct pci_dev *);
 struct zpci_dev *get_zdev_by_fid(u32);
-bool zpci_fid_present(u32);
 
 /* sysfs */
 int zpci_sysfs_add_device(struct device *);
@@ -181,14 +173,6 @@ void zpci_sysfs_remove_device(struct device *);
 int zpci_dma_init(void);
 void zpci_dma_exit(void);
 
-/* Hotplug */
-extern struct mutex zpci_list_lock;
-extern struct list_head zpci_list;
-extern unsigned int s390_pci_probe;
-
-void zpci_register_hp_ops(struct pci_hp_callback_ops *);
-void zpci_deregister_hp_ops(void);
-
 /* FMB */
 int zpci_fmb_enable_device(struct zpci_dev *);
 int zpci_fmb_disable_device(struct zpci_dev *);
diff --git a/arch/s390/include/asm/pci_insn.h b/arch/s390/include/asm/pci_insn.h
index e6a2bdd4d705..df6eac9f0cb4 100644
--- a/arch/s390/include/asm/pci_insn.h
+++ b/arch/s390/include/asm/pci_insn.h
@@ -79,11 +79,11 @@ struct zpci_fib {
 } __packed;
 
 
-int s390pci_mod_fc(u64 req, struct zpci_fib *fib);
-int s390pci_refresh_trans(u64 fn, u64 addr, u64 range);
-int s390pci_load(u64 *data, u64 req, u64 offset);
-int s390pci_store(u64 data, u64 req, u64 offset);
-int s390pci_store_block(const u64 *data, u64 req, u64 offset);
-void set_irq_ctrl(u16 ctl, char *unused, u8 isc);
+int zpci_mod_fc(u64 req, struct zpci_fib *fib);
+int zpci_refresh_trans(u64 fn, u64 addr, u64 range);
+int zpci_load(u64 *data, u64 req, u64 offset);
+int zpci_store(u64 data, u64 req, u64 offset);
+int zpci_store_block(const u64 *data, u64 req, u64 offset);
+void zpci_set_irq_ctrl(u16 ctl, char *unused, u8 isc);
 
 #endif
diff --git a/arch/s390/include/asm/pci_io.h b/arch/s390/include/asm/pci_io.h
index 83a9caa6ae53..d194d544d694 100644
--- a/arch/s390/include/asm/pci_io.h
+++ b/arch/s390/include/asm/pci_io.h
@@ -36,7 +36,7 @@ static inline RETTYPE zpci_read_##RETTYPE(const volatile void __iomem *addr)	\
         u64 data;                                                               \
         int rc;                                                                 \
                                                                                 \
-        rc = s390pci_load(&data, req, ZPCI_OFFSET(addr));                       \
+        rc = zpci_load(&data, req, ZPCI_OFFSET(addr));                          \
         if (rc)                                                                 \
                 data = -1ULL;                                                   \
         return (RETTYPE) data;                                                  \
@@ -50,7 +50,7 @@ static inline void zpci_write_##VALTYPE(VALTYPE val,				\
         u64 req = ZPCI_CREATE_REQ(entry->fh, entry->bar, LENGTH);               \
         u64 data = (VALTYPE) val;                                               \
                                                                                 \
-        s390pci_store(data, req, ZPCI_OFFSET(addr));                            \
+        zpci_store(data, req, ZPCI_OFFSET(addr));                               \
 }
 
 zpci_read(8, u64)
@@ -83,7 +83,7 @@ static inline int zpci_write_single(u64 req, const u64 *data, u64 offset, u8 len
                 val = 0;                /* let FW report error */
                 break;
         }
-        return s390pci_store(val, req, offset);
+        return zpci_store(val, req, offset);
 }
 
 static inline int zpci_read_single(u64 req, u64 *dst, u64 offset, u8 len)
@@ -91,7 +91,7 @@ static inline int zpci_read_single(u64 req, u64 *dst, u64 offset, u8 len)
         u64 data;
         int cc;
 
-        cc = s390pci_load(&data, req, offset);
+        cc = zpci_load(&data, req, offset);
         if (cc)
                 goto out;
 
@@ -115,7 +115,7 @@ out:
 
 static inline int zpci_write_block(u64 req, const u64 *data, u64 offset)
 {
-        return s390pci_store_block(data, req, offset);
+        return zpci_store_block(data, req, offset);
 }
 
 static inline u8 zpci_get_max_write_size(u64 src, u64 dst, int len, int max)
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index 75fb726de91f..9b60a36c348d 100644
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -217,63 +217,57 @@ extern unsigned long MODULES_END;
 
 /* Hardware bits in the page table entry */
 #define _PAGE_CO        0x100           /* HW Change-bit override */
-#define _PAGE_RO        0x200           /* HW read-only bit  */
+#define _PAGE_PROTECT   0x200           /* HW read-only bit  */
 #define _PAGE_INVALID   0x400           /* HW invalid bit    */
+#define _PAGE_LARGE     0x800           /* Bit to mark a large pte */
 
 /* Software bits in the page table entry */
-#define _PAGE_SWT       0x001           /* SW pte type bit t */
-#define _PAGE_SWX       0x002           /* SW pte type bit x */
-#define _PAGE_SWC       0x004           /* SW pte changed bit */
-#define _PAGE_SWR       0x008           /* SW pte referenced bit */
-#define _PAGE_SWW       0x010           /* SW pte write bit */
-#define _PAGE_SPECIAL   0x020           /* SW associated with special page */
+#define _PAGE_PRESENT   0x001           /* SW pte present bit */
+#define _PAGE_TYPE      0x002           /* SW pte type bit */
+#define _PAGE_YOUNG     0x004           /* SW pte young bit */
+#define _PAGE_DIRTY     0x008           /* SW pte dirty bit */
+#define _PAGE_READ      0x010           /* SW pte read bit */
+#define _PAGE_WRITE     0x020           /* SW pte write bit */
+#define _PAGE_SPECIAL   0x040           /* SW associated with special page */
 #define __HAVE_ARCH_PTE_SPECIAL
 
 /* Set of bits not changed in pte_modify */
 #define _PAGE_CHG_MASK          (PAGE_MASK | _PAGE_SPECIAL | _PAGE_CO | \
-                                 _PAGE_SWC | _PAGE_SWR)
-
-/* Six different types of pages. */
-#define _PAGE_TYPE_EMPTY        0x400
-#define _PAGE_TYPE_NONE         0x401
-#define _PAGE_TYPE_SWAP         0x403
-#define _PAGE_TYPE_FILE         0x601   /* bit 0x002 is used for offset !! */
-#define _PAGE_TYPE_RO           0x200
-#define _PAGE_TYPE_RW           0x000
-
-/*
- * Only four types for huge pages, using the invalid bit and protection bit
- * of a segment table entry.
- */
-#define _HPAGE_TYPE_EMPTY       0x020   /* _SEGMENT_ENTRY_INV */
-#define _HPAGE_TYPE_NONE        0x220
-#define _HPAGE_TYPE_RO          0x200   /* _SEGMENT_ENTRY_RO  */
-#define _HPAGE_TYPE_RW          0x000
+                                 _PAGE_DIRTY | _PAGE_YOUNG)
 
 /*
- * PTE type bits are rather complicated. handle_pte_fault uses pte_present,
- * pte_none and pte_file to find out the pte type WITHOUT holding the page
- * table lock. ptep_clear_flush on the other hand uses ptep_clear_flush to
- * invalidate a given pte. ipte sets the hw invalid bit and clears all tlbs
- * for the page. The page table entry is set to _PAGE_TYPE_EMPTY afterwards.
- * This change is done while holding the lock, but the intermediate step
- * of a previously valid pte with the hw invalid bit set can be observed by
- * handle_pte_fault. That makes it necessary that all valid pte types with
- * the hw invalid bit set must be distinguishable from the four pte types
- * empty, none, swap and file.
+ * handle_pte_fault uses pte_present, pte_none and pte_file to find out the
+ * pte type WITHOUT holding the page table lock. The _PAGE_PRESENT bit
+ * is used to distinguish present from not-present ptes. It is changed only
+ * with the page table lock held.
+ *
+ * The following table gives the different possible bit combinations for
+ * the pte hardware and software bits in the last 12 bits of a pte:
  *
- *                      irxt  ipte  irxt
- * _PAGE_TYPE_EMPTY     1000   ->   1000
- * _PAGE_TYPE_NONE      1001   ->   1001
- * _PAGE_TYPE_SWAP      1011   ->   1011
- * _PAGE_TYPE_FILE      11?1   ->   11?1
- * _PAGE_TYPE_RO        0100   ->   1100
- * _PAGE_TYPE_RW        0000   ->   1000
+ *                              842100000000
+ *                              000084210000
+ *                              000000008421
+ *                              .IR...wrdytp
+ * empty                        .10...000000
+ * swap                         .10...xxxx10
+ * file                         .11...xxxxx0
+ * prot-none, clean, old        .11...000001
+ * prot-none, clean, young      .11...000101
+ * prot-none, dirty, old        .10...001001
+ * prot-none, dirty, young      .10...001101
+ * read-only, clean, old        .11...010001
+ * read-only, clean, young      .01...010101
+ * read-only, dirty, old        .11...011001
+ * read-only, dirty, young      .01...011101
+ * read-write, clean, old       .11...110001
+ * read-write, clean, young     .01...110101
+ * read-write, dirty, old       .10...111001
+ * read-write, dirty, young     .00...111101
  *
- * pte_none is true for bits combinations 1000, 1010, 1100, 1110
- * pte_present is true for bits combinations 0000, 0010, 0100, 0110, 1001
- * pte_file is true for bits combinations 1101, 1111
- * swap pte is 1011 and 0001, 0011, 0101, 0111 are invalid.
+ * pte_present is true for the bit pattern .xx...xxxxx1, (pte & 0x001) == 0x001
+ * pte_none    is true for the bit pattern .10...xxxx00, (pte & 0x603) == 0x400
+ * pte_file    is true for the bit pattern .11...xxxxx0, (pte & 0x601) == 0x600
+ * pte_swap    is true for the bit pattern .10...xxxx10, (pte & 0x603) == 0x402
  */
 
 #ifndef CONFIG_64BIT
@@ -286,14 +280,25 @@ extern unsigned long MODULES_END;
 #define _ASCE_TABLE_LENGTH      0x7f    /* 128 x 64 entries = 8k            */
 
 /* Bits in the segment table entry */
+#define _SEGMENT_ENTRY_BITS     0x7fffffffUL    /* Valid segment table bits */
 #define _SEGMENT_ENTRY_ORIGIN   0x7fffffc0UL    /* page table origin        */
-#define _SEGMENT_ENTRY_RO       0x200   /* page protection bit              */
-#define _SEGMENT_ENTRY_INV      0x20    /* invalid segment table entry      */
+#define _SEGMENT_ENTRY_PROTECT  0x200   /* page protection bit              */
+#define _SEGMENT_ENTRY_INVALID  0x20    /* invalid segment table entry      */
 #define _SEGMENT_ENTRY_COMMON   0x10    /* common segment bit               */
 #define _SEGMENT_ENTRY_PTL      0x0f    /* page table length                */
+#define _SEGMENT_ENTRY_NONE     _SEGMENT_ENTRY_PROTECT
 
 #define _SEGMENT_ENTRY          (_SEGMENT_ENTRY_PTL)
-#define _SEGMENT_ENTRY_EMPTY    (_SEGMENT_ENTRY_INV)
+#define _SEGMENT_ENTRY_EMPTY    (_SEGMENT_ENTRY_INVALID)
+
+/*
+ * Segment table entry encoding (I = invalid, R = read-only bit):
+ *              ..R...I.....
+ * prot-none    ..1...1.....
+ * read-only    ..1...0.....
+ * read-write   ..0...0.....
+ * empty        ..0...1.....
+ */
 
 /* Page status table bits for virtualization */
 #define PGSTE_ACC_BITS  0xf0000000UL
@@ -303,9 +308,7 @@ extern unsigned long MODULES_END;
 #define PGSTE_HC_BIT    0x00200000UL
 #define PGSTE_GR_BIT    0x00040000UL
 #define PGSTE_GC_BIT    0x00020000UL
-#define PGSTE_UR_BIT    0x00008000UL
-#define PGSTE_UC_BIT    0x00004000UL    /* user dirty (migration) */
-#define PGSTE_IN_BIT    0x00002000UL    /* IPTE notify bit */
+#define PGSTE_IN_BIT    0x00008000UL    /* IPTE notify bit */
 
 #else /* CONFIG_64BIT */
 
@@ -324,8 +327,8 @@ extern unsigned long MODULES_END;
 
 /* Bits in the region table entry */
 #define _REGION_ENTRY_ORIGIN    ~0xfffUL/* region/segment table origin      */
-#define _REGION_ENTRY_RO        0x200   /* region protection bit            */
-#define _REGION_ENTRY_INV       0x20    /* invalid region table entry       */
+#define _REGION_ENTRY_PROTECT   0x200   /* region protection bit            */
+#define _REGION_ENTRY_INVALID   0x20    /* invalid region table entry       */
 #define _REGION_ENTRY_TYPE_MASK 0x0c    /* region/segment table type mask   */
 #define _REGION_ENTRY_TYPE_R1   0x0c    /* region first table type          */
 #define _REGION_ENTRY_TYPE_R2   0x08    /* region second table type         */
@@ -333,29 +336,47 @@ extern unsigned long MODULES_END;
 #define _REGION_ENTRY_LENGTH    0x03    /* region third length              */
 
 #define _REGION1_ENTRY          (_REGION_ENTRY_TYPE_R1 | _REGION_ENTRY_LENGTH)
-#define _REGION1_ENTRY_EMPTY    (_REGION_ENTRY_TYPE_R1 | _REGION_ENTRY_INV)
+#define _REGION1_ENTRY_EMPTY    (_REGION_ENTRY_TYPE_R1 | _REGION_ENTRY_INVALID)
 #define _REGION2_ENTRY          (_REGION_ENTRY_TYPE_R2 | _REGION_ENTRY_LENGTH)
-#define _REGION2_ENTRY_EMPTY    (_REGION_ENTRY_TYPE_R2 | _REGION_ENTRY_INV)
+#define _REGION2_ENTRY_EMPTY    (_REGION_ENTRY_TYPE_R2 | _REGION_ENTRY_INVALID)
 #define _REGION3_ENTRY          (_REGION_ENTRY_TYPE_R3 | _REGION_ENTRY_LENGTH)
-#define _REGION3_ENTRY_EMPTY    (_REGION_ENTRY_TYPE_R3 | _REGION_ENTRY_INV)
+#define _REGION3_ENTRY_EMPTY    (_REGION_ENTRY_TYPE_R3 | _REGION_ENTRY_INVALID)
 
 #define _REGION3_ENTRY_LARGE    0x400   /* RTTE-format control, large page  */
 #define _REGION3_ENTRY_RO       0x200   /* page protection bit              */
 #define _REGION3_ENTRY_CO       0x100   /* change-recording override        */
 
 /* Bits in the segment table entry */
+#define _SEGMENT_ENTRY_BITS     0xfffffffffffffe33UL
+#define _SEGMENT_ENTRY_BITS_LARGE 0xfffffffffff1ff33UL
 #define _SEGMENT_ENTRY_ORIGIN_LARGE ~0xfffffUL /* large page address        */
 #define _SEGMENT_ENTRY_ORIGIN   ~0x7ffUL/* segment table origin             */
-#define _SEGMENT_ENTRY_RO       0x200   /* page protection bit              */
-#define _SEGMENT_ENTRY_INV      0x20    /* invalid segment table entry      */
+#define _SEGMENT_ENTRY_PROTECT  0x200   /* page protection bit              */
+#define _SEGMENT_ENTRY_INVALID  0x20    /* invalid segment table entry      */
 
 #define _SEGMENT_ENTRY          (0)
-#define _SEGMENT_ENTRY_EMPTY    (_SEGMENT_ENTRY_INV)
+#define _SEGMENT_ENTRY_EMPTY    (_SEGMENT_ENTRY_INVALID)
 
 #define _SEGMENT_ENTRY_LARGE    0x400   /* STE-format control, large page   */
 #define _SEGMENT_ENTRY_CO       0x100   /* change-recording override   */
+#define _SEGMENT_ENTRY_SPLIT    0x001   /* THP splitting bit */
+#define _SEGMENT_ENTRY_YOUNG    0x002   /* SW segment young bit */
+#define _SEGMENT_ENTRY_NONE     _SEGMENT_ENTRY_YOUNG
+
+/*
+ * Segment table entry encoding (R = read-only, I = invalid, y = young bit):
+ *                      ..R...I...y.
+ * prot-none, old       ..0...1...1.
+ * prot-none, young     ..1...1...1.
+ * read-only, old       ..1...1...0.
+ * read-only, young     ..1...0...1.
+ * read-write, old      ..0...1...0.
+ * read-write, young    ..0...0...1.
+ * The segment table origin is used to distinguish empty (origin==0) from
+ * read-write, old segment table entries (origin!=0)
+ */
+
 #define _SEGMENT_ENTRY_SPLIT_BIT 0      /* THP splitting bit number */
-#define _SEGMENT_ENTRY_SPLIT    (1UL << _SEGMENT_ENTRY_SPLIT_BIT)
 
 /* Set of bits not changed in pmd_modify */
 #define _SEGMENT_CHG_MASK       (_SEGMENT_ENTRY_ORIGIN | _SEGMENT_ENTRY_LARGE \
@@ -369,9 +390,7 @@ extern unsigned long MODULES_END;
 #define PGSTE_HC_BIT    0x0020000000000000UL
 #define PGSTE_GR_BIT    0x0004000000000000UL
 #define PGSTE_GC_BIT    0x0002000000000000UL
-#define PGSTE_UR_BIT    0x0000800000000000UL
-#define PGSTE_UC_BIT    0x0000400000000000UL    /* user dirty (migration) */
-#define PGSTE_IN_BIT    0x0000200000000000UL    /* IPTE notify bit */
+#define PGSTE_IN_BIT    0x0000800000000000UL    /* IPTE notify bit */
 
 #endif /* CONFIG_64BIT */
 
@@ -386,14 +405,18 @@ extern unsigned long MODULES_END;
 /*
  * Page protection definitions.
  */
-#define PAGE_NONE       __pgprot(_PAGE_TYPE_NONE)
-#define PAGE_RO         __pgprot(_PAGE_TYPE_RO)
-#define PAGE_RW         __pgprot(_PAGE_TYPE_RO | _PAGE_SWW)
-#define PAGE_RWC        __pgprot(_PAGE_TYPE_RW | _PAGE_SWW | _PAGE_SWC)
-
-#define PAGE_KERNEL     PAGE_RWC
-#define PAGE_SHARED     PAGE_KERNEL
-#define PAGE_COPY       PAGE_RO
+#define PAGE_NONE       __pgprot(_PAGE_PRESENT | _PAGE_INVALID)
+#define PAGE_READ       __pgprot(_PAGE_PRESENT | _PAGE_READ | \
+                                 _PAGE_INVALID | _PAGE_PROTECT)
+#define PAGE_WRITE      __pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \
+                                 _PAGE_INVALID | _PAGE_PROTECT)
+
+#define PAGE_SHARED     __pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \
+                                 _PAGE_YOUNG | _PAGE_DIRTY)
+#define PAGE_KERNEL     __pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_WRITE | \
+                                 _PAGE_YOUNG | _PAGE_DIRTY)
+#define PAGE_KERNEL_RO  __pgprot(_PAGE_PRESENT | _PAGE_READ | _PAGE_YOUNG | \
+                                 _PAGE_PROTECT)
 
 /*
  * On s390 the page table entry has an invalid bit and a read-only bit.
@@ -402,35 +425,31 @@ extern unsigned long MODULES_END;
  */
          /*xwr*/
 #define __P000  PAGE_NONE
-#define __P001  PAGE_RO
-#define __P010  PAGE_RO
-#define __P011  PAGE_RO
-#define __P100  PAGE_RO
-#define __P101  PAGE_RO
-#define __P110  PAGE_RO
-#define __P111  PAGE_RO
+#define __P001  PAGE_READ
+#define __P010  PAGE_READ
+#define __P011  PAGE_READ
+#define __P100  PAGE_READ
+#define __P101  PAGE_READ
+#define __P110  PAGE_READ
+#define __P111  PAGE_READ
 
 #define __S000  PAGE_NONE
-#define __S001  PAGE_RO
-#define __S010  PAGE_RW
-#define __S011  PAGE_RW
-#define __S100  PAGE_RO
-#define __S101  PAGE_RO
-#define __S110  PAGE_RW
-#define __S111  PAGE_RW
+#define __S001  PAGE_READ
+#define __S010  PAGE_WRITE
+#define __S011  PAGE_WRITE
+#define __S100  PAGE_READ
+#define __S101  PAGE_READ
+#define __S110  PAGE_WRITE
+#define __S111  PAGE_WRITE
 
 /*
  * Segment entry (large page) protection definitions.
  */
-#define SEGMENT_NONE    __pgprot(_HPAGE_TYPE_NONE)
-#define SEGMENT_RO      __pgprot(_HPAGE_TYPE_RO)
-#define SEGMENT_RW      __pgprot(_HPAGE_TYPE_RW)
-
-static inline int mm_exclusive(struct mm_struct *mm)
-{
-        return likely(mm == current->active_mm &&
-                      atomic_read(&mm->context.attach_count) <= 1);
-}
+#define SEGMENT_NONE    __pgprot(_SEGMENT_ENTRY_INVALID | \
+                                 _SEGMENT_ENTRY_NONE)
+#define SEGMENT_READ    __pgprot(_SEGMENT_ENTRY_INVALID | \
+                                 _SEGMENT_ENTRY_PROTECT)
+#define SEGMENT_WRITE   __pgprot(_SEGMENT_ENTRY_INVALID)
 
 static inline int mm_has_pgste(struct mm_struct *mm)
 {
@@ -467,7 +486,7 @@ static inline int pgd_none(pgd_t pgd)
 {
         if ((pgd_val(pgd) & _REGION_ENTRY_TYPE_MASK) < _REGION_ENTRY_TYPE_R2)
                 return 0;
-        return (pgd_val(pgd) & _REGION_ENTRY_INV) != 0UL;
+        return (pgd_val(pgd) & _REGION_ENTRY_INVALID) != 0UL;
 }
 
 static inline int pgd_bad(pgd_t pgd)
@@ -478,7 +497,7 @@ static inline int pgd_bad(pgd_t pgd)
          * invalid for either table entry.
          */
         unsigned long mask =
-                ~_SEGMENT_ENTRY_ORIGIN & ~_REGION_ENTRY_INV &
+                ~_SEGMENT_ENTRY_ORIGIN & ~_REGION_ENTRY_INVALID &
                 ~_REGION_ENTRY_TYPE_MASK & ~_REGION_ENTRY_LENGTH;
         return (pgd_val(pgd) & mask) != 0;
 }
@@ -494,7 +513,7 @@ static inline int pud_none(pud_t pud)
 {
         if ((pud_val(pud) & _REGION_ENTRY_TYPE_MASK) < _REGION_ENTRY_TYPE_R3)
                 return 0;
-        return (pud_val(pud) & _REGION_ENTRY_INV) != 0UL;
+        return (pud_val(pud) & _REGION_ENTRY_INVALID) != 0UL;
 }
 
 static inline int pud_large(pud_t pud)
@@ -512,7 +531,7 @@ static inline int pud_bad(pud_t pud)
          * invalid for either table entry.
          */
         unsigned long mask =
-                ~_SEGMENT_ENTRY_ORIGIN & ~_REGION_ENTRY_INV &
+                ~_SEGMENT_ENTRY_ORIGIN & ~_REGION_ENTRY_INVALID &
                 ~_REGION_ENTRY_TYPE_MASK & ~_REGION_ENTRY_LENGTH;
         return (pud_val(pud) & mask) != 0;
 }
@@ -521,30 +540,36 @@ static inline int pud_bad(pud_t pud)
 
 static inline int pmd_present(pmd_t pmd)
 {
-        unsigned long mask = _SEGMENT_ENTRY_INV | _SEGMENT_ENTRY_RO;
-        return (pmd_val(pmd) & mask) == _HPAGE_TYPE_NONE ||
-               !(pmd_val(pmd) & _SEGMENT_ENTRY_INV);
+        return pmd_val(pmd) != _SEGMENT_ENTRY_INVALID;
 }
 
 static inline int pmd_none(pmd_t pmd)
 {
-        return (pmd_val(pmd) & _SEGMENT_ENTRY_INV) &&
-               !(pmd_val(pmd) & _SEGMENT_ENTRY_RO);
+        return pmd_val(pmd) == _SEGMENT_ENTRY_INVALID;
 }
 
 static inline int pmd_large(pmd_t pmd)
 {
 #ifdef CONFIG_64BIT
-        return !!(pmd_val(pmd) & _SEGMENT_ENTRY_LARGE);
+        return (pmd_val(pmd) & _SEGMENT_ENTRY_LARGE) != 0;
 #else
         return 0;
 #endif
 }
 
+static inline int pmd_prot_none(pmd_t pmd)
+{
+        return (pmd_val(pmd) & _SEGMENT_ENTRY_INVALID) &&
+                (pmd_val(pmd) & _SEGMENT_ENTRY_NONE);
+}
+
 static inline int pmd_bad(pmd_t pmd)
 {
-        unsigned long mask = ~_SEGMENT_ENTRY_ORIGIN & ~_SEGMENT_ENTRY_INV;
-        return (pmd_val(pmd) & mask) != _SEGMENT_ENTRY;
+#ifdef CONFIG_64BIT
+        if (pmd_large(pmd))
+                return (pmd_val(pmd) & ~_SEGMENT_ENTRY_BITS_LARGE) != 0;
+#endif
+        return (pmd_val(pmd) & ~_SEGMENT_ENTRY_BITS) != 0;
 }
 
 #define __HAVE_ARCH_PMDP_SPLITTING_FLUSH
@@ -563,31 +588,40 @@ extern int pmdp_clear_flush_young(struct vm_area_struct *vma,
 #define __HAVE_ARCH_PMD_WRITE
 static inline int pmd_write(pmd_t pmd)
 {
-        return (pmd_val(pmd) & _SEGMENT_ENTRY_RO) == 0;
+        if (pmd_prot_none(pmd))
+                return 0;
+        return (pmd_val(pmd) & _SEGMENT_ENTRY_PROTECT) == 0;
 }
 
 static inline int pmd_young(pmd_t pmd)
 {
-        return 0;
+        int young = 0;
+#ifdef CONFIG_64BIT
+        if (pmd_prot_none(pmd))
+                young = (pmd_val(pmd) & _SEGMENT_ENTRY_PROTECT) != 0;
+        else
+                young = (pmd_val(pmd) & _SEGMENT_ENTRY_YOUNG) != 0;
+#endif
+        return young;
 }
 
-static inline int pte_none(pte_t pte)
+static inline int pte_present(pte_t pte)
 {
-        return (pte_val(pte) & _PAGE_INVALID) && !(pte_val(pte) & _PAGE_SWT);
+        /* Bit pattern: (pte & 0x001) == 0x001 */
+        return (pte_val(pte) & _PAGE_PRESENT) != 0;
 }
 
-static inline int pte_present(pte_t pte)
+static inline int pte_none(pte_t pte)
 {
-        unsigned long mask = _PAGE_RO | _PAGE_INVALID | _PAGE_SWT | _PAGE_SWX;
-        return (pte_val(pte) & mask) == _PAGE_TYPE_NONE ||
-                (!(pte_val(pte) & _PAGE_INVALID) &&
-                 !(pte_val(pte) & _PAGE_SWT));
+        /* Bit pattern: pte == 0x400 */
+        return pte_val(pte) == _PAGE_INVALID;
 }
 
 static inline int pte_file(pte_t pte)
 {
-        unsigned long mask = _PAGE_RO | _PAGE_INVALID | _PAGE_SWT;
-        return (pte_val(pte) & mask) == _PAGE_TYPE_FILE;
+        /* Bit pattern: (pte & 0x601) == 0x600 */
+        return (pte_val(pte) & (_PAGE_INVALID | _PAGE_PROTECT | _PAGE_PRESENT))
+                == (_PAGE_INVALID | _PAGE_PROTECT);
 }
 
 static inline int pte_special(pte_t pte)
@@ -634,6 +668,15 @@ static inline void pgste_set_unlock(pte_t *ptep, pgste_t pgste)
 #endif
 }
 
+static inline pgste_t pgste_get(pte_t *ptep)
+{
+        unsigned long pgste = 0;
+#ifdef CONFIG_PGSTE
+        pgste = *(unsigned long *)(ptep + PTRS_PER_PTE);
+#endif
+        return __pgste(pgste);
+}
+
 static inline void pgste_set(pte_t *ptep, pgste_t pgste)
 {
 #ifdef CONFIG_PGSTE
@@ -644,33 +687,28 @@ static inline void pgste_set(pte_t *ptep, pgste_t pgste)
 static inline pgste_t pgste_update_all(pte_t *ptep, pgste_t pgste)
 {
 #ifdef CONFIG_PGSTE
-        unsigned long address, bits;
-        unsigned char skey;
+        unsigned long address, bits, skey;
 
         if (pte_val(*ptep) & _PAGE_INVALID)
                 return pgste;
         address = pte_val(*ptep) & PAGE_MASK;
-        skey = page_get_storage_key(address);
+        skey = (unsigned long) page_get_storage_key(address);
         bits = skey & (_PAGE_CHANGED | _PAGE_REFERENCED);
-        /* Clear page changed & referenced bit in the storage key */
-        if (bits & _PAGE_CHANGED)
+        if (!(pgste_val(pgste) & PGSTE_HC_BIT) && (bits & _PAGE_CHANGED)) {
+                /* Transfer dirty + referenced bit to host bits in pgste */
+                pgste_val(pgste) |= bits << 52;
                 page_set_storage_key(address, skey ^ bits, 0);
-        else if (bits)
+        } else if (!(pgste_val(pgste) & PGSTE_HR_BIT) &&
+                   (bits & _PAGE_REFERENCED)) {
+                /* Transfer referenced bit to host bit in pgste */
+                pgste_val(pgste) |= PGSTE_HR_BIT;
                 page_reset_referenced(address);
+        }
         /* Transfer page changed & referenced bit to guest bits in pgste */
         pgste_val(pgste) |= bits << 48;         /* GR bit & GC bit */
-        /* Get host changed & referenced bits from pgste */
-        bits |= (pgste_val(pgste) & (PGSTE_HR_BIT | PGSTE_HC_BIT)) >> 52;
-        /* Transfer page changed & referenced bit to kvm user bits */
-        pgste_val(pgste) |= bits << 45;         /* PGSTE_UR_BIT & PGSTE_UC_BIT */
-        /* Clear relevant host bits in pgste. */
-        pgste_val(pgste) &= ~(PGSTE_HR_BIT | PGSTE_HC_BIT);
-        pgste_val(pgste) &= ~(PGSTE_ACC_BITS | PGSTE_FP_BIT);
         /* Copy page access key and fetch protection bit to pgste */
-        pgste_val(pgste) |=
-                (unsigned long) (skey & (_PAGE_ACC_BITS | _PAGE_FP_BIT)) << 56;
-        /* Transfer referenced bit to pte */
-        pte_val(*ptep) |= (bits & _PAGE_REFERENCED) << 1;
+        pgste_val(pgste) &= ~(PGSTE_ACC_BITS | PGSTE_FP_BIT);
+        pgste_val(pgste) |= (skey & (_PAGE_ACC_BITS | _PAGE_FP_BIT)) << 56;
 #endif
         return pgste;
 
@@ -679,24 +717,11 @@ static inline pgste_t pgste_update_all(pte_t *ptep, pgste_t pgste)
 static inline pgste_t pgste_update_young(pte_t *ptep, pgste_t pgste)
 {
 #ifdef CONFIG_PGSTE
-        int young;
-
         if (pte_val(*ptep) & _PAGE_INVALID)
                 return pgste;
         /* Get referenced bit from storage key */
-        young = page_reset_referenced(pte_val(*ptep) & PAGE_MASK);
-        if (young)
-                pgste_val(pgste) |= PGSTE_GR_BIT;
-        /* Get host referenced bit from pgste */
-        if (pgste_val(pgste) & PGSTE_HR_BIT) {
-                pgste_val(pgste) &= ~PGSTE_HR_BIT;
-                young = 1;
-        }
-        /* Transfer referenced bit to kvm user bits and pte */
-        if (young) {
-                pgste_val(pgste) |= PGSTE_UR_BIT;
-                pte_val(*ptep) |= _PAGE_SWR;
-        }
+        if (page_reset_referenced(pte_val(*ptep) & PAGE_MASK))
+                pgste_val(pgste) |= PGSTE_HR_BIT | PGSTE_GR_BIT;
 #endif
         return pgste;
 }
@@ -723,13 +748,13 @@ static inline void pgste_set_key(pte_t *ptep, pgste_t pgste, pte_t entry)
 
 static inline void pgste_set_pte(pte_t *ptep, pte_t entry)
 {
-        if (!MACHINE_HAS_ESOP && (pte_val(entry) & _PAGE_SWW)) {
+        if (!MACHINE_HAS_ESOP && (pte_val(entry) & _PAGE_WRITE)) {
                 /*
                  * Without enhanced suppression-on-protection force
                  * the dirty bit on for all writable ptes.
                  */
-                pte_val(entry) |= _PAGE_SWC;
-                pte_val(entry) &= ~_PAGE_RO;
+                pte_val(entry) |= _PAGE_DIRTY;
+                pte_val(entry) &= ~_PAGE_PROTECT;
         }
         *ptep = entry;
 }
@@ -841,21 +866,17 @@ static inline void set_pte_at(struct mm_struct *mm, unsigned long addr,
  */
 static inline int pte_write(pte_t pte)
 {
-        return (pte_val(pte) & _PAGE_SWW) != 0;
+        return (pte_val(pte) & _PAGE_WRITE) != 0;
 }
 
 static inline int pte_dirty(pte_t pte)
 {
-        return (pte_val(pte) & _PAGE_SWC) != 0;
+        return (pte_val(pte) & _PAGE_DIRTY) != 0;
 }
 
 static inline int pte_young(pte_t pte)
 {
-#ifdef CONFIG_PGSTE
-        if (pte_val(pte) & _PAGE_SWR)
-                return 1;
-#endif
-        return 0;
+        return (pte_val(pte) & _PAGE_YOUNG) != 0;
 }
 
 /*
@@ -880,12 +901,12 @@ static inline void pud_clear(pud_t *pud)
 
 static inline void pmd_clear(pmd_t *pmdp)
 {
-        pmd_val(*pmdp) = _SEGMENT_ENTRY_EMPTY;
+        pmd_val(*pmdp) = _SEGMENT_ENTRY_INVALID;
 }
 
 static inline void pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
 {
-        pte_val(*ptep) = _PAGE_TYPE_EMPTY;
+        pte_val(*ptep) = _PAGE_INVALID;
 }
 
 /*
@@ -896,55 +917,63 @@ static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
 {
         pte_val(pte) &= _PAGE_CHG_MASK;
         pte_val(pte) |= pgprot_val(newprot);
-        if ((pte_val(pte) & _PAGE_SWC) && (pte_val(pte) & _PAGE_SWW))
-                pte_val(pte) &= ~_PAGE_RO;
+        /*
+         * newprot for PAGE_NONE, PAGE_READ and PAGE_WRITE has the
+         * invalid bit set, clear it again for readable, young pages
+         */
+        if ((pte_val(pte) & _PAGE_YOUNG) && (pte_val(pte) & _PAGE_READ))
+                pte_val(pte) &= ~_PAGE_INVALID;
+        /*
+         * newprot for PAGE_READ and PAGE_WRITE has the page protection
+         * bit set, clear it again for writable, dirty pages
+         */
+        if ((pte_val(pte) & _PAGE_DIRTY) && (pte_val(pte) & _PAGE_WRITE))
+                pte_val(pte) &= ~_PAGE_PROTECT;
         return pte;
 }
 
 static inline pte_t pte_wrprotect(pte_t pte)
 {
-        pte_val(pte) &= ~_PAGE_SWW;
-        /* Do not clobber _PAGE_TYPE_NONE pages!  */
-        if (!(pte_val(pte) & _PAGE_INVALID))
-                pte_val(pte) |= _PAGE_RO;
+        pte_val(pte) &= ~_PAGE_WRITE;
+        pte_val(pte) |= _PAGE_PROTECT;
         return pte;
 }
 
 static inline pte_t pte_mkwrite(pte_t pte)
 {
-        pte_val(pte) |= _PAGE_SWW;
-        if (pte_val(pte) & _PAGE_SWC)
-                pte_val(pte) &= ~_PAGE_RO;
+        pte_val(pte) |= _PAGE_WRITE;
+        if (pte_val(pte) & _PAGE_DIRTY)
+                pte_val(pte) &= ~_PAGE_PROTECT;
         return pte;
 }
 
 static inline pte_t pte_mkclean(pte_t pte)
 {
-        pte_val(pte) &= ~_PAGE_SWC;
-        /* Do not clobber _PAGE_TYPE_NONE pages!  */
-        if (!(pte_val(pte) & _PAGE_INVALID))
-                pte_val(pte) |= _PAGE_RO;
+        pte_val(pte) &= ~_PAGE_DIRTY;
+        pte_val(pte) |= _PAGE_PROTECT;
         return pte;
 }
 
 static inline pte_t pte_mkdirty(pte_t pte)
 {
-        pte_val(pte) |= _PAGE_SWC;
-        if (pte_val(pte) & _PAGE_SWW)
-                pte_val(pte) &= ~_PAGE_RO;
+        pte_val(pte) |= _PAGE_DIRTY;
+        if (pte_val(pte) & _PAGE_WRITE)
+                pte_val(pte) &= ~_PAGE_PROTECT;
         return pte;
 }
 
 static inline pte_t pte_mkold(pte_t pte)
 {
-#ifdef CONFIG_PGSTE
-        pte_val(pte) &= ~_PAGE_SWR;
-#endif
+        pte_val(pte) &= ~_PAGE_YOUNG;
+        pte_val(pte) |= _PAGE_INVALID;
         return pte;
 }
 
 static inline pte_t pte_mkyoung(pte_t pte)
 {
+        pte_val(pte) |= _PAGE_YOUNG;
+        if (pte_val(pte) & _PAGE_READ)
+                pte_val(pte) &= ~_PAGE_INVALID;
         return pte;
 }
 
@@ -957,7 +986,7 @@ static inline pte_t pte_mkspecial(pte_t pte)
 #ifdef CONFIG_HUGETLB_PAGE
 static inline pte_t pte_mkhuge(pte_t pte)
 {
-        pte_val(pte) |= (_SEGMENT_ENTRY_LARGE | _SEGMENT_ENTRY_CO);
+        pte_val(pte) |= _PAGE_LARGE;
         return pte;
 }
 #endif
@@ -974,8 +1003,8 @@ static inline int ptep_test_and_clear_user_dirty(struct mm_struct *mm,
         if (mm_has_pgste(mm)) {
                 pgste = pgste_get_lock(ptep);
                 pgste = pgste_update_all(ptep, pgste);
-                dirty = !!(pgste_val(pgste) & PGSTE_UC_BIT);
-                pgste_val(pgste) &= ~PGSTE_UC_BIT;
+                dirty = !!(pgste_val(pgste) & PGSTE_HC_BIT);
+                pgste_val(pgste) &= ~PGSTE_HC_BIT;
                 pgste_set_unlock(ptep, pgste);
                 return dirty;
         }
@@ -994,59 +1023,75 @@ static inline int ptep_test_and_clear_user_young(struct mm_struct *mm,
         if (mm_has_pgste(mm)) {
                 pgste = pgste_get_lock(ptep);
                 pgste = pgste_update_young(ptep, pgste);
-                young = !!(pgste_val(pgste) & PGSTE_UR_BIT);
-                pgste_val(pgste) &= ~PGSTE_UR_BIT;
+                young = !!(pgste_val(pgste) & PGSTE_HR_BIT);
+                pgste_val(pgste) &= ~PGSTE_HR_BIT;
                 pgste_set_unlock(ptep, pgste);
         }
         return young;
 }
 
+static inline void __ptep_ipte(unsigned long address, pte_t *ptep)
+{
+        if (!(pte_val(*ptep) & _PAGE_INVALID)) {
+#ifndef CONFIG_64BIT
+                /* pto must point to the start of the segment table */
+                pte_t *pto = (pte_t *) (((unsigned long) ptep) & 0x7ffffc00);
+#else
+                /* ipte in zarch mode can do the math */
+                pte_t *pto = ptep;
+#endif
+                asm volatile(
+                        "       ipte    %2,%3"
+                        : "=m" (*ptep) : "m" (*ptep),
+                          "a" (pto), "a" (address));
+        }
+}
+
+static inline void ptep_flush_lazy(struct mm_struct *mm,
+                                   unsigned long address, pte_t *ptep)
+{
+        int active = (mm == current->active_mm) ? 1 : 0;
+
+        if (atomic_read(&mm->context.attach_count) > active)
+                __ptep_ipte(address, ptep);
+        else
+                mm->context.flush_mm = 1;
+}
+
 #define __HAVE_ARCH_PTEP_TEST_AND_CLEAR_YOUNG
 static inline int ptep_test_and_clear_young(struct vm_area_struct *vma,
                                             unsigned long addr, pte_t *ptep)
 {
         pgste_t pgste;
         pte_t pte;
+        int young;
 
         if (mm_has_pgste(vma->vm_mm)) {
                 pgste = pgste_get_lock(ptep);
-                pgste = pgste_update_young(ptep, pgste);
-                pte = *ptep;
-                *ptep = pte_mkold(pte);
-                pgste_set_unlock(ptep, pgste);
-                return pte_young(pte);
+                pgste = pgste_ipte_notify(vma->vm_mm, addr, ptep, pgste);
         }
-        return 0;
+
+        pte = *ptep;
+        __ptep_ipte(addr, ptep);
+        young = pte_young(pte);
+        pte = pte_mkold(pte);
+
+        if (mm_has_pgste(vma->vm_mm)) {
+                pgste_set_pte(ptep, pte);
+                pgste_set_unlock(ptep, pgste);
+        } else
+                *ptep = pte;
+
+        return young;
 }
 
 #define __HAVE_ARCH_PTEP_CLEAR_YOUNG_FLUSH
 static inline int ptep_clear_flush_young(struct vm_area_struct *vma,
                                          unsigned long address, pte_t *ptep)
 {
-        /* No need to flush TLB
-         * On s390 reference bits are in storage key and never in TLB
-         * With virtualization we handle the reference bit, without we
-         * we can simply return */
         return ptep_test_and_clear_young(vma, address, ptep);
 }
 
-static inline void __ptep_ipte(unsigned long address, pte_t *ptep)
-{
-        if (!(pte_val(*ptep) & _PAGE_INVALID)) {
-#ifndef CONFIG_64BIT
-                /* pto must point to the start of the segment table */
-                pte_t *pto = (pte_t *) (((unsigned long) ptep) & 0x7ffffc00);
-#else
-                /* ipte in zarch mode can do the math */
-                pte_t *pto = ptep;
-#endif
-                asm volatile(
-                        "       ipte    %2,%3"
-                        : "=m" (*ptep) : "m" (*ptep),
-                          "a" (pto), "a" (address));
-        }
-}
-
 /*
  * This is hard to understand. ptep_get_and_clear and ptep_clear_flush
  * both clear the TLB for the unmapped pte. The reason is that
@@ -1067,16 +1112,14 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm,
         pgste_t pgste;
         pte_t pte;
 
-        mm->context.flush_mm = 1;
         if (mm_has_pgste(mm)) {
                 pgste = pgste_get_lock(ptep);
                 pgste = pgste_ipte_notify(mm, address, ptep, pgste);
         }
 
         pte = *ptep;
-        if (!mm_exclusive(mm))
-                __ptep_ipte(address, ptep);
-        pte_val(*ptep) = _PAGE_TYPE_EMPTY;
+        ptep_flush_lazy(mm, address, ptep);
+        pte_val(*ptep) = _PAGE_INVALID;
 
         if (mm_has_pgste(mm)) {
                 pgste = pgste_update_all(&pte, pgste);
@@ -1093,15 +1136,14 @@ static inline pte_t ptep_modify_prot_start(struct mm_struct *mm,
         pgste_t pgste;
         pte_t pte;
 
-        mm->context.flush_mm = 1;
         if (mm_has_pgste(mm)) {
                 pgste = pgste_get_lock(ptep);
                 pgste_ipte_notify(mm, address, ptep, pgste);
         }
 
         pte = *ptep;
-        if (!mm_exclusive(mm))
-                __ptep_ipte(address, ptep);
+        ptep_flush_lazy(mm, address, ptep);
+        pte_val(*ptep) |= _PAGE_INVALID;
 
         if (mm_has_pgste(mm)) {
                 pgste = pgste_update_all(&pte, pgste);
@@ -1117,7 +1159,7 @@ static inline void ptep_modify_prot_commit(struct mm_struct *mm,
         pgste_t pgste;
 
         if (mm_has_pgste(mm)) {
-                pgste = *(pgste_t *)(ptep + PTRS_PER_PTE);
+                pgste = pgste_get(ptep);
                 pgste_set_key(ptep, pgste, pte);
                 pgste_set_pte(ptep, pte);
                 pgste_set_unlock(ptep, pgste);
@@ -1139,7 +1181,7 @@ static inline pte_t ptep_clear_flush(struct vm_area_struct *vma,
 
         pte = *ptep;
         __ptep_ipte(address, ptep);
-        pte_val(*ptep) = _PAGE_TYPE_EMPTY;
+        pte_val(*ptep) = _PAGE_INVALID;
 
         if (mm_has_pgste(vma->vm_mm)) {
                 pgste = pgste_update_all(&pte, pgste);
@@ -1163,18 +1205,17 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm,
         pgste_t pgste;
         pte_t pte;
 
-        if (mm_has_pgste(mm)) {
+        if (!full && mm_has_pgste(mm)) {
                 pgste = pgste_get_lock(ptep);
-                if (!full)
-                        pgste = pgste_ipte_notify(mm, address, ptep, pgste);
+                pgste = pgste_ipte_notify(mm, address, ptep, pgste);
         }
 
         pte = *ptep;
         if (!full)
-                __ptep_ipte(address, ptep);
-        pte_val(*ptep) = _PAGE_TYPE_EMPTY;
+                ptep_flush_lazy(mm, address, ptep);
+        pte_val(*ptep) = _PAGE_INVALID;
 
-        if (mm_has_pgste(mm)) {
+        if (!full && mm_has_pgste(mm)) {
                 pgste = pgste_update_all(&pte, pgste);
                 pgste_set_unlock(ptep, pgste);
         }
@@ -1189,14 +1230,12 @@ static inline pte_t ptep_set_wrprotect(struct mm_struct *mm,
         pte_t pte = *ptep;
 
         if (pte_write(pte)) {
-                mm->context.flush_mm = 1;
                 if (mm_has_pgste(mm)) {
                         pgste = pgste_get_lock(ptep);
                         pgste = pgste_ipte_notify(mm, address, ptep, pgste);
                 }
 
-                if (!mm_exclusive(mm))
-                        __ptep_ipte(address, ptep);
+                ptep_flush_lazy(mm, address, ptep);
                 pte = pte_wrprotect(pte);
 
                 if (mm_has_pgste(mm)) {
@@ -1240,7 +1279,7 @@ static inline pte_t mk_pte_phys(unsigned long physpage, pgprot_t pgprot)
 {
         pte_t __pte;
         pte_val(__pte) = physpage + pgprot_val(pgprot);
-        return __pte;
+        return pte_mkyoung(__pte);
 }
 
 static inline pte_t mk_pte(struct page *page, pgprot_t pgprot)
@@ -1248,10 +1287,8 @@ static inline pte_t mk_pte(struct page *page, pgprot_t pgprot)
         unsigned long physpage = page_to_phys(page);
         pte_t __pte = mk_pte_phys(physpage, pgprot);
 
-        if ((pte_val(__pte) & _PAGE_SWW) && PageDirty(page)) {
-                pte_val(__pte) |= _PAGE_SWC;
-                pte_val(__pte) &= ~_PAGE_RO;
-        }
+        if (pte_write(__pte) && PageDirty(page))
+                __pte = pte_mkdirty(__pte);
         return __pte;
 }
 
@@ -1313,7 +1350,7 @@ static inline void __pmd_idte(unsigned long address, pmd_t *pmdp)
         unsigned long sto = (unsigned long) pmdp -
                             pmd_index(address) * sizeof(pmd_t);
 
-        if (!(pmd_val(*pmdp) & _SEGMENT_ENTRY_INV)) {
+        if (!(pmd_val(*pmdp) & _SEGMENT_ENTRY_INVALID)) {
                 asm volatile(
                         "       .insn   rrf,0xb98e0000,%2,%3,0,0"
                         : "=m" (*pmdp)
@@ -1324,24 +1361,68 @@ static inline void __pmd_idte(unsigned long address, pmd_t *pmdp)
         }
 }
 
+static inline void __pmd_csp(pmd_t *pmdp)
+{
+        register unsigned long reg2 asm("2") = pmd_val(*pmdp);
+        register unsigned long reg3 asm("3") = pmd_val(*pmdp) |
+                                               _SEGMENT_ENTRY_INVALID;
+        register unsigned long reg4 asm("4") = ((unsigned long) pmdp) + 5;
+
+        asm volatile(
+                "       csp %1,%3"
+                : "=m" (*pmdp)
+                : "d" (reg2), "d" (reg3), "d" (reg4), "m" (*pmdp) : "cc");
+}
+
 #if defined(CONFIG_TRANSPARENT_HUGEPAGE) || defined(CONFIG_HUGETLB_PAGE)
 static inline unsigned long massage_pgprot_pmd(pgprot_t pgprot)
 {
         /*
-         * pgprot is PAGE_NONE, PAGE_RO, or PAGE_RW (see __Pxxx / __Sxxx)
+         * pgprot is PAGE_NONE, PAGE_READ, or PAGE_WRITE (see __Pxxx / __Sxxx)
          * Convert to segment table entry format.
          */
         if (pgprot_val(pgprot) == pgprot_val(PAGE_NONE))
                 return pgprot_val(SEGMENT_NONE);
-        if (pgprot_val(pgprot) == pgprot_val(PAGE_RO))
-                return pgprot_val(SEGMENT_RO);
-        return pgprot_val(SEGMENT_RW);
+        if (pgprot_val(pgprot) == pgprot_val(PAGE_READ))
+                return pgprot_val(SEGMENT_READ);
+        return pgprot_val(SEGMENT_WRITE);
+}
+
+static inline pmd_t pmd_mkyoung(pmd_t pmd)
+{
+#ifdef CONFIG_64BIT
+        if (pmd_prot_none(pmd)) {
+                pmd_val(pmd) |= _SEGMENT_ENTRY_PROTECT;
+        } else {
+                pmd_val(pmd) |= _SEGMENT_ENTRY_YOUNG;
+                pmd_val(pmd) &= ~_SEGMENT_ENTRY_INVALID;
+        }
+#endif
+        return pmd;
+}
+
+static inline pmd_t pmd_mkold(pmd_t pmd)
+{
+#ifdef CONFIG_64BIT
+        if (pmd_prot_none(pmd)) {
+                pmd_val(pmd) &= ~_SEGMENT_ENTRY_PROTECT;
+        } else {
+                pmd_val(pmd) &= ~_SEGMENT_ENTRY_YOUNG;
+                pmd_val(pmd) |= _SEGMENT_ENTRY_INVALID;
+        }
+#endif
+        return pmd;
 }
 
 static inline pmd_t pmd_modify(pmd_t pmd, pgprot_t newprot)
 {
+        int young;
+
+        young = pmd_young(pmd);
         pmd_val(pmd) &= _SEGMENT_CHG_MASK;
         pmd_val(pmd) |= massage_pgprot_pmd(newprot);
+        if (young)
+                pmd = pmd_mkyoung(pmd);
         return pmd;
 }
 
@@ -1349,18 +1430,29 @@ static inline pmd_t mk_pmd_phys(unsigned long physpage, pgprot_t pgprot)
 {
         pmd_t __pmd;
         pmd_val(__pmd) = physpage + massage_pgprot_pmd(pgprot);
-        return __pmd;
+        return pmd_mkyoung(__pmd);
 }
 
 static inline pmd_t pmd_mkwrite(pmd_t pmd)
 {
-        /* Do not clobber _HPAGE_TYPE_NONE pages! */
-        if (!(pmd_val(pmd) & _SEGMENT_ENTRY_INV))
-                pmd_val(pmd) &= ~_SEGMENT_ENTRY_RO;
+        /* Do not clobber PROT_NONE segments! */
+        if (!pmd_prot_none(pmd))
+                pmd_val(pmd) &= ~_SEGMENT_ENTRY_PROTECT;
         return pmd;
 }
 #endif /* CONFIG_TRANSPARENT_HUGEPAGE || CONFIG_HUGETLB_PAGE */
 
+static inline void pmdp_flush_lazy(struct mm_struct *mm,
+                                   unsigned long address, pmd_t *pmdp)
+{
+        int active = (mm == current->active_mm) ? 1 : 0;
+
+        if ((atomic_read(&mm->context.attach_count) & 0xffff) > active)
+                __pmd_idte(address, pmdp);
+        else
+                mm->context.flush_mm = 1;
+}
+
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
 
 #define __HAVE_ARCH_PGTABLE_DEPOSIT
@@ -1378,7 +1470,7 @@ static inline int pmd_trans_splitting(pmd_t pmd)
 static inline void set_pmd_at(struct mm_struct *mm, unsigned long addr,
                               pmd_t *pmdp, pmd_t entry)
 {
-        if (!(pmd_val(entry) & _SEGMENT_ENTRY_INV) && MACHINE_HAS_EDAT1)
+        if (!(pmd_val(entry) & _SEGMENT_ENTRY_INVALID) && MACHINE_HAS_EDAT1)
                 pmd_val(entry) |= _SEGMENT_ENTRY_CO;
         *pmdp = entry;
 }
@@ -1391,7 +1483,9 @@ static inline pmd_t pmd_mkhuge(pmd_t pmd)
 
 static inline pmd_t pmd_wrprotect(pmd_t pmd)
 {
-        pmd_val(pmd) |= _SEGMENT_ENTRY_RO;
+        /* Do not clobber PROT_NONE segments! */
+        if (!pmd_prot_none(pmd))
+                pmd_val(pmd) |= _SEGMENT_ENTRY_PROTECT;
         return pmd;
 }
 
@@ -1401,50 +1495,16 @@ static inline pmd_t pmd_mkdirty(pmd_t pmd)
         return pmd;
 }
 
-static inline pmd_t pmd_mkold(pmd_t pmd)
-{
-        /* No referenced bit in the segment table entry. */
-        return pmd;
-}
-
-static inline pmd_t pmd_mkyoung(pmd_t pmd)
-{
-        /* No referenced bit in the segment table entry. */
-        return pmd;
-}
-
 #define __HAVE_ARCH_PMDP_TEST_AND_CLEAR_YOUNG
 static inline int pmdp_test_and_clear_young(struct vm_area_struct *vma,
                                             unsigned long address, pmd_t *pmdp)
 {
-        unsigned long pmd_addr = pmd_val(*pmdp) & HPAGE_MASK;
-        long tmp, rc;
-        int counter;
+        pmd_t pmd;
 
-        rc = 0;
-        if (MACHINE_HAS_RRBM) {
-                counter = PTRS_PER_PTE >> 6;
-                asm volatile(
-                        "0:     .insn   rre,0xb9ae0000,%0,%3\n" /* rrbm */
-                        "       ogr     %1,%0\n"
-                        "       la      %3,0(%4,%3)\n"
-                        "       brct    %2,0b\n"
-                        : "=&d" (tmp), "+&d" (rc), "+d" (counter),
-                          "+a" (pmd_addr)
-                        : "a" (64 * 4096UL) : "cc");
-                rc = !!rc;
-        } else {
-                counter = PTRS_PER_PTE;
-                asm volatile(
-                        "0:     rrbe    0,%2\n"
-                        "       la      %2,0(%3,%2)\n"
-                        "       brc     12,1f\n"
-                        "       lhi     %0,1\n"
-                        "1:     brct    %1,0b\n"
-                        : "+d" (rc), "+d" (counter), "+a" (pmd_addr)
-                        : "a" (4096UL) : "cc");
-        }
-        return rc;
+        pmd = *pmdp;
+        __pmd_idte(address, pmdp);
+        *pmdp = pmd_mkold(pmd);
+        return pmd_young(pmd);
 }
 
 #define __HAVE_ARCH_PMDP_GET_AND_CLEAR
@@ -1510,10 +1570,8 @@ static inline unsigned long pmd_pfn(pmd_t pmd)
  * exception will occur instead of a page translation exception. The
  * specifiation exception has the bad habit not to store necessary
  * information in the lowcore.
- * Bit 21 and bit 22 are the page invalid bit and the page protection
- * bit. We set both to indicate a swapped page.
- * Bit 30 and 31 are used to distinguish the different page types. For
- * a swapped page these bits need to be zero.
+ * Bits 21, 22, 30 and 31 are used to indicate the page type.
+ * A swap pte is indicated by bit pattern (pte & 0x603) == 0x402
  * This leaves the bits 1-19 and bits 24-29 to store type and offset.
  * We use the 5 bits from 25-29 for the type and the 20 bits from 1-19
  * plus 24 for the offset.
@@ -1527,10 +1585,8 @@ static inline unsigned long pmd_pfn(pmd_t pmd)
  * exception will occur instead of a page translation exception. The
  * specifiation exception has the bad habit not to store necessary
  * information in the lowcore.
- * Bit 53 and bit 54 are the page invalid bit and the page protection
- * bit. We set both to indicate a swapped page.
- * Bit 62 and 63 are used to distinguish the different page types. For
- * a swapped page these bits need to be zero.
+ * Bits 53, 54, 62 and 63 are used to indicate the page type.
+ * A swap pte is indicated by bit pattern (pte & 0x603) == 0x402
  * This leaves the bits 0-51 and bits 56-61 to store type and offset.
  * We use the 5 bits from 57-61 for the type and the 53 bits from 0-51
  * plus 56 for the offset.
@@ -1547,7 +1603,7 @@ static inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
 {
         pte_t pte;
         offset &= __SWP_OFFSET_MASK;
-        pte_val(pte) = _PAGE_TYPE_SWAP | ((type & 0x1f) << 2) |
+        pte_val(pte) = _PAGE_INVALID | _PAGE_TYPE | ((type & 0x1f) << 2) |
                 ((offset & 1UL) << 7) | ((offset & ~1UL) << 11);
         return pte;
 }
@@ -1570,7 +1626,7 @@ static inline pte_t mk_swap_pte(unsigned long type, unsigned long offset)
 
 #define pgoff_to_pte(__off) \
         ((pte_t) { ((((__off) & 0x7f) << 1) + (((__off) >> 7) << 12)) \
-                   | _PAGE_TYPE_FILE })
+                   | _PAGE_INVALID | _PAGE_PROTECT })
 
 #endif /* !__ASSEMBLY__ */
 
diff --git a/arch/s390/include/asm/processor.h b/arch/s390/include/asm/processor.h
index b0e6435b2f02..0eb37505cab1 100644
--- a/arch/s390/include/asm/processor.h
+++ b/arch/s390/include/asm/processor.h
@@ -43,6 +43,7 @@ extern void execve_tail(void);
 #ifndef CONFIG_64BIT
 
 #define TASK_SIZE               (1UL << 31)
+#define TASK_MAX_SIZE           (1UL << 31)
 #define TASK_UNMAPPED_BASE      (1UL << 30)
 
 #else /* CONFIG_64BIT */
@@ -51,6 +52,7 @@ extern void execve_tail(void);
 #define TASK_UNMAPPED_BASE      (test_thread_flag(TIF_31BIT) ? \
                                         (1UL << 30) : (1UL << 41))
 #define TASK_SIZE               TASK_SIZE_OF(current)
+#define TASK_MAX_SIZE           (1UL << 53)
 
 #endif /* CONFIG_64BIT */
 
diff --git a/arch/s390/include/asm/sclp.h b/arch/s390/include/asm/sclp.h
index 06a136136047..7dc7f9c63b65 100644
--- a/arch/s390/include/asm/sclp.h
+++ b/arch/s390/include/asm/sclp.h
@@ -56,5 +56,6 @@ bool sclp_has_linemode(void);
 bool sclp_has_vt220(void);
 int sclp_pci_configure(u32 fid);
 int sclp_pci_deconfigure(u32 fid);
+int memcpy_hsa(void *dest, unsigned long src, size_t count, int mode);
 
 #endif /* _ASM_S390_SCLP_H */
diff --git a/arch/s390/include/asm/serial.h b/arch/s390/include/asm/serial.h
new file mode 100644
index 000000000000..5b3e48ef534b
--- /dev/null
+++ b/arch/s390/include/asm/serial.h
@@ -0,0 +1,6 @@
+#ifndef _ASM_S390_SERIAL_H
+#define _ASM_S390_SERIAL_H
+
+#define BASE_BAUD 0
+
+#endif /* _ASM_S390_SERIAL_H */
diff --git a/arch/s390/include/asm/switch_to.h b/arch/s390/include/asm/switch_to.h
index 80b6f11263c4..6dbd559763c9 100644
--- a/arch/s390/include/asm/switch_to.h
+++ b/arch/s390/include/asm/switch_to.h
@@ -8,6 +8,7 @@
 #define __ASM_SWITCH_TO_H
 
 #include <linux/thread_info.h>
+#include <asm/ptrace.h>
 
 extern struct task_struct *__switch_to(void *, void *);
 extern void update_cr_regs(struct task_struct *task);
@@ -68,12 +69,16 @@ static inline void restore_fp_regs(s390_fp_regs *fpregs)
 
 static inline void save_access_regs(unsigned int *acrs)
 {
-        asm volatile("stam 0,15,%0" : "=Q" (*acrs));
+        typedef struct { int _[NUM_ACRS]; } acrstype;
+
+        asm volatile("stam 0,15,%0" : "=Q" (*(acrstype *)acrs));
 }
 
 static inline void restore_access_regs(unsigned int *acrs)
 {
-        asm volatile("lam 0,15,%0" : : "Q" (*acrs));
+        typedef struct { int _[NUM_ACRS]; } acrstype;
+
+        asm volatile("lam 0,15,%0" : : "Q" (*(acrstype *)acrs));
 }
 
 #define switch_to(prev,next,last) do {                                  \
diff --git a/arch/s390/include/asm/tlb.h b/arch/s390/include/asm/tlb.h
index 6d6d92b4ea11..2cb846c4b37f 100644
--- a/arch/s390/include/asm/tlb.h
+++ b/arch/s390/include/asm/tlb.h
@@ -63,13 +63,14 @@ static inline void tlb_gather_mmu(struct mmu_gather *tlb,
 
 static inline void tlb_flush_mmu(struct mmu_gather *tlb)
 {
+        __tlb_flush_mm_lazy(tlb->mm);
         tlb_table_flush(tlb);
 }
 
 static inline void tlb_finish_mmu(struct mmu_gather *tlb,
                                   unsigned long start, unsigned long end)
 {
-        tlb_table_flush(tlb);
+        tlb_flush_mmu(tlb);
 }
 
 /*
diff --git a/arch/s390/include/asm/tlbflush.h b/arch/s390/include/asm/tlbflush.h
index 6b32af30878c..f9fef0425fee 100644
--- a/arch/s390/include/asm/tlbflush.h
+++ b/arch/s390/include/asm/tlbflush.h
@@ -86,7 +86,7 @@ static inline void __tlb_flush_mm(struct mm_struct * mm)
                 __tlb_flush_full(mm);
 }
 
-static inline void __tlb_flush_mm_cond(struct mm_struct * mm)
+static inline void __tlb_flush_mm_lazy(struct mm_struct * mm)
 {
         if (mm->context.flush_mm) {
                 __tlb_flush_mm(mm);
@@ -118,13 +118,13 @@ static inline void __tlb_flush_mm_cond(struct mm_struct * mm)
 
 static inline void flush_tlb_mm(struct mm_struct *mm)
 {
-        __tlb_flush_mm_cond(mm);
+        __tlb_flush_mm_lazy(mm);
 }
 
 static inline void flush_tlb_range(struct vm_area_struct *vma,
                                    unsigned long start, unsigned long end)
 {
-        __tlb_flush_mm_cond(vma->vm_mm);
+        __tlb_flush_mm_lazy(vma->vm_mm);
 }
 
 static inline void flush_tlb_kernel_range(unsigned long start,
diff --git a/arch/s390/include/asm/vtime.h b/arch/s390/include/asm/vtime.h
new file mode 100644
index 000000000000..af9896c53eb3
--- /dev/null
+++ b/arch/s390/include/asm/vtime.h
@@ -0,0 +1,7 @@
+#ifndef _S390_VTIME_H
+#define _S390_VTIME_H
+
+#define __ARCH_HAS_VTIME_ACCOUNT
+#define __ARCH_HAS_VTIME_TASK_SWITCH
+
+#endif /* _S390_VTIME_H */
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c
index 8b6e4f5288a2..1f1b8c70ab97 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -221,25 +221,26 @@ static int groups16_from_user(struct group_info *group_info, u16 __user *groupli
 
 asmlinkage long sys32_getgroups16(int gidsetsize, u16 __user *grouplist)
 {
+        const struct cred *cred = current_cred();
         int i;
 
         if (gidsetsize < 0)
                 return -EINVAL;
 
-        get_group_info(current->cred->group_info);
-        i = current->cred->group_info->ngroups;
+        get_group_info(cred->group_info);
+        i = cred->group_info->ngroups;
         if (gidsetsize) {
                 if (i > gidsetsize) {
                         i = -EINVAL;
                         goto out;
                 }
-                if (groups16_to_user(grouplist, current->cred->group_info)) {
+                if (groups16_to_user(grouplist, cred->group_info)) {
                         i = -EFAULT;
                         goto out;
                 }
         }
 out:
-        put_group_info(current->cred->group_info);
+        put_group_info(cred->group_info);
         return i;
 }
 
diff --git a/arch/s390/kernel/compat_signal.c b/arch/s390/kernel/compat_signal.c
index c439ac9ced09..1389b637dae5 100644
--- a/arch/s390/kernel/compat_signal.c
+++ b/arch/s390/kernel/compat_signal.c
@@ -332,9 +332,9 @@ static int setup_frame32(int sig, struct k_sigaction *ka,
         /* Set up to return from userspace.  If provided, use a stub
            already in userspace.  */
         if (ka->sa.sa_flags & SA_RESTORER) {
-                regs->gprs[14] = (__u64) ka->sa.sa_restorer | PSW32_ADDR_AMODE;
+                regs->gprs[14] = (__u64 __force) ka->sa.sa_restorer | PSW32_ADDR_AMODE;
         } else {
-                regs->gprs[14] = (__u64) frame->retcode | PSW32_ADDR_AMODE;
+                regs->gprs[14] = (__u64 __force) frame->retcode | PSW32_ADDR_AMODE;
                 if (__put_user(S390_SYSCALL_OPCODE | __NR_sigreturn,
                                (u16 __force __user *)(frame->retcode)))
                         goto give_sigsegv;
@@ -400,9 +400,9 @@ static int setup_rt_frame32(int sig, struct k_sigaction *ka, siginfo_t *info,
         /* Set up to return from userspace.  If provided, use a stub
            already in userspace.  */
         if (ka->sa.sa_flags & SA_RESTORER) {
-                regs->gprs[14] = (__u64) ka->sa.sa_restorer | PSW32_ADDR_AMODE;
+                regs->gprs[14] = (__u64 __force) ka->sa.sa_restorer | PSW32_ADDR_AMODE;
         } else {
-                regs->gprs[14] = (__u64) frame->retcode | PSW32_ADDR_AMODE;
+                regs->gprs[14] = (__u64 __force) frame->retcode | PSW32_ADDR_AMODE;
                 err |= __put_user(S390_SYSCALL_OPCODE | __NR_rt_sigreturn,
                                   (u16 __force __user *)(frame->retcode));
         }
@@ -417,7 +417,7 @@ static int setup_rt_frame32(int sig, struct k_sigaction *ka, siginfo_t *info,
         regs->psw.mask = PSW_MASK_BA |
                 (psw_user_bits & PSW_MASK_ASC) |
                 (regs->psw.mask & ~PSW_MASK_ASC);
-        regs->psw.addr = (__u64) ka->sa.sa_handler;
+        regs->psw.addr = (__u64 __force) ka->sa.sa_handler;
 
         regs->gprs[2] = map_signal(sig);
         regs->gprs[3] = (__force __u64) &frame->info;
diff --git a/arch/s390/kernel/crash_dump.c b/arch/s390/kernel/crash_dump.c
index d8f355657171..c84f33d51f7b 100644
--- a/arch/s390/kernel/crash_dump.c
+++ b/arch/s390/kernel/crash_dump.c
@@ -16,6 +16,7 @@
 #include <asm/os_info.h>
 #include <asm/elf.h>
 #include <asm/ipl.h>
+#include <asm/sclp.h>
 
 #define PTR_ADD(x, y) (((char *) (x)) + ((unsigned long) (y)))
 #define PTR_SUB(x, y) (((char *) (x)) - ((unsigned long) (y)))
@@ -64,22 +65,46 @@ static ssize_t copy_page_real(void *buf, void *src, size_t csize)
 }
 
 /*
- * Copy one page from "oldmem"
+ * Pointer to ELF header in new kernel
+ */
+static void *elfcorehdr_newmem;
+
+/*
+ * Copy one page from zfcpdump "oldmem"
+ *
+ * For pages below ZFCPDUMP_HSA_SIZE memory from the HSA is copied. Otherwise
+ * real memory copy is used.
+ */
+static ssize_t copy_oldmem_page_zfcpdump(char *buf, size_t csize,
+                                         unsigned long src, int userbuf)
+{
+        int rc;
+
+        if (src < ZFCPDUMP_HSA_SIZE) {
+                rc = memcpy_hsa(buf, src, csize, userbuf);
+        } else {
+                if (userbuf)
+                        rc = copy_to_user_real((void __force __user *) buf,
+                                               (void *) src, csize);
+                else
+                        rc = memcpy_real(buf, (void *) src, csize);
+        }
+        return rc ? rc : csize;
+}
+
+/*
+ * Copy one page from kdump "oldmem"
  *
  * For the kdump reserved memory this functions performs a swap operation:
  *  - [OLDMEM_BASE - OLDMEM_BASE + OLDMEM_SIZE] is mapped to [0 - OLDMEM_SIZE].
  *  - [0 - OLDMEM_SIZE] is mapped to [OLDMEM_BASE - OLDMEM_BASE + OLDMEM_SIZE]
  */
-ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
-                         size_t csize, unsigned long offset, int userbuf)
+static ssize_t copy_oldmem_page_kdump(char *buf, size_t csize,
+                                      unsigned long src, int userbuf)
+
 {
-        unsigned long src;
         int rc;
 
-        if (!csize)
-                return 0;
-
-        src = (pfn << PAGE_SHIFT) + offset;
         if (src < OLDMEM_SIZE)
                 src += OLDMEM_BASE;
         else if (src > OLDMEM_BASE &&
@@ -90,7 +115,88 @@ ssize_t copy_oldmem_page(unsigned long pfn, char *buf,
                                        (void *) src, csize);
         else
                 rc = copy_page_real(buf, (void *) src, csize);
-        return (rc == 0) ? csize : rc;
+        return (rc == 0) ? rc : csize;
+}
+
+/*
+ * Copy one page from "oldmem"
+ */
+ssize_t copy_oldmem_page(unsigned long pfn, char *buf, size_t csize,
+                         unsigned long offset, int userbuf)
+{
+        unsigned long src;
+
+        if (!csize)
+                return 0;
+        src = (pfn << PAGE_SHIFT) + offset;
+        if (OLDMEM_BASE)
+                return copy_oldmem_page_kdump(buf, csize, src, userbuf);
+        else
+                return copy_oldmem_page_zfcpdump(buf, csize, src, userbuf);
+}
+
+/*
+ * Remap "oldmem" for kdump
+ *
+ * For the kdump reserved memory this functions performs a swap operation:
+ * [0 - OLDMEM_SIZE] is mapped to [OLDMEM_BASE - OLDMEM_BASE + OLDMEM_SIZE]
+ */
+static int remap_oldmem_pfn_range_kdump(struct vm_area_struct *vma,
+                                        unsigned long from, unsigned long pfn,
+                                        unsigned long size, pgprot_t prot)
+{
+        unsigned long size_old;
+        int rc;
+
+        if (pfn < OLDMEM_SIZE >> PAGE_SHIFT) {
+                size_old = min(size, OLDMEM_SIZE - (pfn << PAGE_SHIFT));
+                rc = remap_pfn_range(vma, from,
+                                     pfn + (OLDMEM_BASE >> PAGE_SHIFT),
+                                     size_old, prot);
+                if (rc || size == size_old)
+                        return rc;
+                size -= size_old;
+                from += size_old;
+                pfn += size_old >> PAGE_SHIFT;
+        }
+        return remap_pfn_range(vma, from, pfn, size, prot);
+}
+
+/*
+ * Remap "oldmem" for zfcpdump
+ *
+ * We only map available memory above ZFCPDUMP_HSA_SIZE. Memory below
+ * ZFCPDUMP_HSA_SIZE is read on demand using the copy_oldmem_page() function.
+ */
+static int remap_oldmem_pfn_range_zfcpdump(struct vm_area_struct *vma,
+                                           unsigned long from,
+                                           unsigned long pfn,
+                                           unsigned long size, pgprot_t prot)
+{
+        unsigned long size_hsa;
+
+        if (pfn < ZFCPDUMP_HSA_SIZE >> PAGE_SHIFT) {
+                size_hsa = min(size, ZFCPDUMP_HSA_SIZE - (pfn << PAGE_SHIFT));
+                if (size == size_hsa)
+                        return 0;
+                size -= size_hsa;
+                from += size_hsa;
+                pfn += size_hsa >> PAGE_SHIFT;
+        }
+        return remap_pfn_range(vma, from, pfn, size, prot);
+}
+
+/*
+ * Remap "oldmem" for kdump or zfcpdump
+ */
+int remap_oldmem_pfn_range(struct vm_area_struct *vma, unsigned long from,
+                           unsigned long pfn, unsigned long size, pgprot_t prot)
+{
+        if (OLDMEM_BASE)
+                return remap_oldmem_pfn_range_kdump(vma, from, pfn, size, prot);
+        else
+                return remap_oldmem_pfn_range_zfcpdump(vma, from, pfn, size,
+                                                       prot);
 }
 
 /*
@@ -101,11 +207,21 @@ int copy_from_oldmem(void *dest, void *src, size_t count)
         unsigned long copied = 0;
         int rc;
 
-        if ((unsigned long) src < OLDMEM_SIZE) {
-                copied = min(count, OLDMEM_SIZE - (unsigned long) src);
-                rc = memcpy_real(dest, src + OLDMEM_BASE, copied);
-                if (rc)
-                        return rc;
+        if (OLDMEM_BASE) {
+                if ((unsigned long) src < OLDMEM_SIZE) {
+                        copied = min(count, OLDMEM_SIZE - (unsigned long) src);
+                        rc = memcpy_real(dest, src + OLDMEM_BASE, copied);
+                        if (rc)
+                                return rc;
+                }
+        } else {
+                if ((unsigned long) src < ZFCPDUMP_HSA_SIZE) {
+                        copied = min(count,
+                                     ZFCPDUMP_HSA_SIZE - (unsigned long) src);
+                        rc = memcpy_hsa(dest, (unsigned long) src, copied, 0);
+                        if (rc)
+                                return rc;
+                }
         }
         return memcpy_real(dest + copied, src + copied, count - copied);
 }
@@ -368,14 +484,6 @@ static int get_mem_chunk_cnt(void)
 }
 
 /*
- * Relocate pointer in order to allow vmcore code access the data
- */
-static inline unsigned long relocate(unsigned long addr)
-{
-        return OLDMEM_BASE + addr;
-}
-
-/*
  * Initialize ELF loads (new kernel)
  */
 static int loads_init(Elf64_Phdr *phdr, u64 loads_offset)
@@ -426,7 +534,7 @@ static void *notes_init(Elf64_Phdr *phdr, void *ptr, u64 notes_offset)
         ptr = nt_vmcoreinfo(ptr);
         memset(phdr, 0, sizeof(*phdr));
         phdr->p_type = PT_NOTE;
-        phdr->p_offset = relocate(notes_offset);
+        phdr->p_offset = notes_offset;
         phdr->p_filesz = (unsigned long) PTR_SUB(ptr, ptr_start);
         phdr->p_memsz = phdr->p_filesz;
         return ptr;
@@ -435,7 +543,7 @@ static void *notes_init(Elf64_Phdr *phdr, void *ptr, u64 notes_offset)
 /*
  * Create ELF core header (new kernel)
  */
-static void s390_elf_corehdr_create(char **elfcorebuf, size_t *elfcorebuf_sz)
+int elfcorehdr_alloc(unsigned long long *addr, unsigned long long *size)
 {
         Elf64_Phdr *phdr_notes, *phdr_loads;
         int mem_chunk_cnt;
@@ -443,6 +551,12 @@ static void s390_elf_corehdr_create(char **elfcorebuf, size_t *elfcorebuf_sz)
         u32 alloc_size;
         u64 hdr_off;
 
+        /* If we are not in kdump or zfcpdump mode return */
+        if (!OLDMEM_BASE && ipl_info.type != IPL_TYPE_FCP_DUMP)
+                return 0;
+        /* If elfcorehdr= has been passed via cmdline, we use that one */
+        if (elfcorehdr_addr != ELFCORE_ADDR_MAX)
+                return 0;
         mem_chunk_cnt = get_mem_chunk_cnt();
 
         alloc_size = 0x1000 + get_cpu_cnt() * 0x300 +
@@ -460,27 +574,52 @@ static void s390_elf_corehdr_create(char **elfcorebuf, size_t *elfcorebuf_sz)
         ptr = notes_init(phdr_notes, ptr, ((unsigned long) hdr) + hdr_off);
         /* Init loads */
         hdr_off = PTR_DIFF(ptr, hdr);
-        loads_init(phdr_loads, ((unsigned long) hdr) + hdr_off);
-        *elfcorebuf_sz = hdr_off;
-        *elfcorebuf = (void *) relocate((unsigned long) hdr);
-        BUG_ON(*elfcorebuf_sz > alloc_size);
+        loads_init(phdr_loads, hdr_off);
+        *addr = (unsigned long long) hdr;
+        elfcorehdr_newmem = hdr;
+        *size = (unsigned long long) hdr_off;
+        BUG_ON(elfcorehdr_size > alloc_size);
+        return 0;
 }
 
 /*
- * Create kdump ELF core header in new kernel, if it has not been passed via
- * the "elfcorehdr" kernel parameter
+ * Free ELF core header (new kernel)
  */
-static int setup_kdump_elfcorehdr(void)
+void elfcorehdr_free(unsigned long long addr)
 {
-        size_t elfcorebuf_sz;
-        char *elfcorebuf;
+        if (!elfcorehdr_newmem)
+                return;
+        kfree((void *)(unsigned long)addr);
+}
 
-        if (!OLDMEM_BASE || is_kdump_kernel())
-                return -EINVAL;
-        s390_elf_corehdr_create(&elfcorebuf, &elfcorebuf_sz);
-        elfcorehdr_addr = (unsigned long long) elfcorebuf;
-        elfcorehdr_size = elfcorebuf_sz;
-        return 0;
+/*
+ * Read from ELF header
+ */
+ssize_t elfcorehdr_read(char *buf, size_t count, u64 *ppos)
+{
+        void *src = (void *)(unsigned long)*ppos;
+
+        src = elfcorehdr_newmem ? src : src - OLDMEM_BASE;
+        memcpy(buf, src, count);
+        *ppos += count;
+        return count;
 }
 
-subsys_initcall(setup_kdump_elfcorehdr);
+/*
+ * Read from ELF notes data
+ */
+ssize_t elfcorehdr_read_notes(char *buf, size_t count, u64 *ppos)
+{
+        void *src = (void *)(unsigned long)*ppos;
+        int rc;
+
+        if (elfcorehdr_newmem) {
+                memcpy(buf, src, count);
+        } else {
+                rc = copy_from_oldmem(buf, src, count);
+                if (rc)
+                        return rc;
+        }
+        *ppos += count;
+        return count;
+}
diff --git a/arch/s390/kernel/dumpstack.c b/arch/s390/kernel/dumpstack.c
index 87acc38f73c6..99e7f6035895 100644
--- a/arch/s390/kernel/dumpstack.c
+++ b/arch/s390/kernel/dumpstack.c
@@ -40,14 +40,15 @@ __show_trace(unsigned long sp, unsigned long low, unsigned long high)
 {
         struct stack_frame *sf;
         struct pt_regs *regs;
+        unsigned long addr;
 
         while (1) {
                 sp = sp & PSW_ADDR_INSN;
                 if (sp < low || sp > high - sizeof(*sf))
                         return sp;
                 sf = (struct stack_frame *) sp;
-                printk("([<%016lx>] ", sf->gprs[8] & PSW_ADDR_INSN);
-                print_symbol("%s)\n", sf->gprs[8] & PSW_ADDR_INSN);
+                addr = sf->gprs[8] & PSW_ADDR_INSN;
+                printk("([<%016lx>] %pSR)\n", addr, (void *)addr);
                 /* Follow the backchain. */
                 while (1) {
                         low = sp;
@@ -57,16 +58,16 @@ __show_trace(unsigned long sp, unsigned long low, unsigned long high)
                         if (sp <= low || sp > high - sizeof(*sf))
                                 return sp;
                         sf = (struct stack_frame *) sp;
-                        printk(" [<%016lx>] ", sf->gprs[8] & PSW_ADDR_INSN);
-                        print_symbol("%s\n", sf->gprs[8] & PSW_ADDR_INSN);
+                        addr = sf->gprs[8] & PSW_ADDR_INSN;
+                        printk(" [<%016lx>] %pSR\n", addr, (void *)addr);
                 }
                 /* Zero backchain detected, check for interrupt frame. */
                 sp = (unsigned long) (sf + 1);
                 if (sp <= low || sp > high - sizeof(*regs))
                         return sp;
                 regs = (struct pt_regs *) sp;
-                printk(" [<%016lx>] ", regs->psw.addr & PSW_ADDR_INSN);
-                print_symbol("%s\n", regs->psw.addr & PSW_ADDR_INSN);
+                addr = regs->psw.addr & PSW_ADDR_INSN;
+                printk(" [<%016lx>] %pSR\n", addr, (void *)addr);
                 low = sp;
                 sp = regs->gprs[15];
         }
@@ -128,8 +129,7 @@ static void show_last_breaking_event(struct pt_regs *regs)
 {
 #ifdef CONFIG_64BIT
         printk("Last Breaking-Event-Address:\n");
-        printk(" [<%016lx>] ", regs->args[0] & PSW_ADDR_INSN);
-        print_symbol("%s\n", regs->args[0] & PSW_ADDR_INSN);
+        printk(" [<%016lx>] %pSR\n", regs->args[0], (void *)regs->args[0]);
 #endif
 }
 
@@ -143,10 +143,10 @@ void show_registers(struct pt_regs *regs)
         char *mode;
 
         mode = user_mode(regs) ? "User" : "Krnl";
-        printk("%s PSW : %p %p",
+        printk("%s PSW : %p %p (%pSR)\n",
                mode, (void *) regs->psw.mask,
+               (void *) regs->psw.addr,
                (void *) regs->psw.addr);
-        print_symbol(" (%s)\n", regs->psw.addr & PSW_ADDR_INSN);
         printk("           R:%x T:%x IO:%x EX:%x Key:%x M:%x W:%x "
                "P:%x AS:%x CC:%x PM:%x", mask_bits(regs, PSW_MASK_PER),
                mask_bits(regs, PSW_MASK_DAT), mask_bits(regs, PSW_MASK_IO),
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index be7a408be7a1..cc30d1fb000c 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -18,6 +18,7 @@
 #include <asm/unistd.h>
 #include <asm/page.h>
 #include <asm/sigp.h>
+#include <asm/irq.h>
 
 __PT_R0      =  __PT_GPRS
 __PT_R1      =  __PT_GPRS + 4
@@ -435,6 +436,11 @@ io_skip:
 io_loop:
         l       %r1,BASED(.Ldo_IRQ)
         lr      %r2,%r11                # pass pointer to pt_regs
+        lhi     %r3,IO_INTERRUPT
+        tm      __PT_INT_CODE+8(%r11),0x80      # adapter interrupt ?
+        jz      io_call
+        lhi     %r3,THIN_INTERRUPT
+io_call:
         basr    %r14,%r1                # call do_IRQ
         tm      __LC_MACHINE_FLAGS+2,0x10       # MACHINE_FLAG_LPAR
         jz      io_return
@@ -584,9 +590,10 @@ ext_skip:
         mvc     __PT_INT_CODE(4,%r11),__LC_EXT_CPU_ADDR
         mvc     __PT_INT_PARM(4,%r11),__LC_EXT_PARAMS
         TRACE_IRQS_OFF
+        l       %r1,BASED(.Ldo_IRQ)
         lr      %r2,%r11                # pass pointer to pt_regs
-        l       %r1,BASED(.Ldo_extint)
-        basr    %r14,%r1                # call do_extint
+        lhi     %r3,EXT_INTERRUPT
+        basr    %r14,%r1                # call do_IRQ
         j       io_return
 
 /*
@@ -879,13 +886,13 @@ cleanup_idle:
         stm     %r9,%r10,__LC_SYSTEM_TIMER
         mvc     __LC_LAST_UPDATE_TIMER(8),__TIMER_IDLE_EXIT(%r2)
         # prepare return psw
-        n       %r8,BASED(cleanup_idle_wait)    # clear wait state bit
+        n       %r8,BASED(cleanup_idle_wait)    # clear irq & wait state bits
         l       %r9,24(%r11)                    # return from psw_idle
         br      %r14
 cleanup_idle_insn:
         .long   psw_idle_lpsw + 0x80000000
 cleanup_idle_wait:
-        .long   0xfffdffff
+        .long   0xfcfdffff
 
 /*
  * Integer constants
@@ -902,7 +909,6 @@ cleanup_idle_wait:
 .Ldo_machine_check:     .long   s390_do_machine_check
 .Lhandle_mcck:          .long   s390_handle_mcck
 .Ldo_IRQ:               .long   do_IRQ
-.Ldo_extint:            .long   do_extint
 .Ldo_signal:            .long   do_signal
 .Ldo_notify_resume:     .long   do_notify_resume
 .Ldo_per_trap:          .long   do_per_trap
diff --git a/arch/s390/kernel/entry.h b/arch/s390/kernel/entry.h
index 3ddbc26d246e..e9b04c33d383 100644
--- a/arch/s390/kernel/entry.h
+++ b/arch/s390/kernel/entry.h
@@ -53,27 +53,21 @@ void handle_signal32(unsigned long sig, struct k_sigaction *ka,
                     siginfo_t *info, sigset_t *oldset, struct pt_regs *regs);
 void do_notify_resume(struct pt_regs *regs);
 
-struct ext_code;
-void do_extint(struct pt_regs *regs);
+void __init init_IRQ(void);
+void do_IRQ(struct pt_regs *regs, int irq);
 void do_restart(void);
 void __init startup_init(void);
 void die(struct pt_regs *regs, const char *str);
-
+int setup_profiling_timer(unsigned int multiplier);
 void __init time_init(void);
+int pfn_is_nosave(unsigned long);
+void s390_early_resume(void);
+unsigned long prepare_ftrace_return(unsigned long parent, unsigned long ip);
 
 struct s390_mmap_arg_struct;
 struct fadvise64_64_args;
 struct old_sigaction;
 
-long sys_mmap2(struct s390_mmap_arg_struct __user  *arg);
-long sys_s390_ipc(uint call, int first, unsigned long second,
-             unsigned long third, void __user *ptr);
-long sys_s390_personality(unsigned int personality);
-long sys_s390_fadvise64(int fd, u32 offset_high, u32 offset_low,
-                    size_t len, int advice);
-long sys_s390_fadvise64_64(struct fadvise64_64_args __user *args);
-long sys_s390_fallocate(int fd, int mode, loff_t offset, u32 len_high,
-                        u32 len_low);
 long sys_sigreturn(void);
 long sys_rt_sigreturn(void);
 long sys32_sigreturn(void);
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index 1c039d0c24c7..2b2188b97c6a 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -19,6 +19,7 @@
 #include <asm/unistd.h>
 #include <asm/page.h>
 #include <asm/sigp.h>
+#include <asm/irq.h>
 
 __PT_R0      =  __PT_GPRS
 __PT_R1      =  __PT_GPRS + 8
@@ -468,6 +469,11 @@ io_skip:
         xc      __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
 io_loop:
         lgr     %r2,%r11                # pass pointer to pt_regs
+        lghi    %r3,IO_INTERRUPT
+        tm      __PT_INT_CODE+8(%r11),0x80      # adapter interrupt ?
+        jz      io_call
+        lghi    %r3,THIN_INTERRUPT
+io_call:
         brasl   %r14,do_IRQ
         tm      __LC_MACHINE_FLAGS+6,0x10       # MACHINE_FLAG_LPAR
         jz      io_return
@@ -623,7 +629,8 @@ ext_skip:
         TRACE_IRQS_OFF
         xc      __SF_BACKCHAIN(8,%r15),__SF_BACKCHAIN(%r15)
         lgr     %r2,%r11                # pass pointer to pt_regs
-        brasl   %r14,do_extint
+        lghi    %r3,EXT_INTERRUPT
+        brasl   %r14,do_IRQ
         j       io_return
 
 /*
@@ -922,7 +929,7 @@ cleanup_idle:
         stg     %r9,__LC_SYSTEM_TIMER
         mvc     __LC_LAST_UPDATE_TIMER(8),__TIMER_IDLE_EXIT(%r2)
         # prepare return psw
-        nihh    %r8,0xfffd              # clear wait state bit
+        nihh    %r8,0xfcfd              # clear irq & wait state bits
         lg      %r9,48(%r11)            # return from psw_idle
         br      %r14
 cleanup_idle_insn:
diff --git a/arch/s390/kernel/ftrace.c b/arch/s390/kernel/ftrace.c
index e3043aef87a9..1014ad5f7693 100644
--- a/arch/s390/kernel/ftrace.c
+++ b/arch/s390/kernel/ftrace.c
@@ -15,6 +15,7 @@
 #include <linux/kprobes.h>
 #include <trace/syscall.h>
 #include <asm/asm-offsets.h>
+#include "entry.h"
 
 #ifdef CONFIG_DYNAMIC_FTRACE
 
@@ -177,7 +178,7 @@ int ftrace_enable_ftrace_graph_caller(void)
 
         offset = ((void *) prepare_ftrace_return -
                   (void *) ftrace_graph_caller) / 2;
-        return probe_kernel_write(ftrace_graph_caller + 2,
+        return probe_kernel_write((void *) ftrace_graph_caller + 2,
                                   &offset, sizeof(offset));
 }
 
@@ -185,7 +186,7 @@ int ftrace_disable_ftrace_graph_caller(void)
 {
         static unsigned short offset = 0x0002;
 
-        return probe_kernel_write(ftrace_graph_caller + 2,
+        return probe_kernel_write((void *) ftrace_graph_caller + 2,
                                   &offset, sizeof(offset));
 }
 
diff --git a/arch/s390/kernel/irq.c b/arch/s390/kernel/irq.c
index 54b0995514e8..8ac2097f13d4 100644
--- a/arch/s390/kernel/irq.c
+++ b/arch/s390/kernel/irq.c
@@ -22,6 +22,7 @@
 #include <asm/cputime.h>
 #include <asm/lowcore.h>
 #include <asm/irq.h>
+#include <asm/hw_irq.h>
 #include "entry.h"
 
 DEFINE_PER_CPU_SHARED_ALIGNED(struct irq_stat, irq_stat);
@@ -42,9 +43,10 @@ struct irq_class {
  * Since the external and I/O interrupt fields are already sums we would end
  * up with having a sum which accounts each interrupt twice.
  */
-static const struct irq_class irqclass_main_desc[NR_IRQS] = {
-        [EXTERNAL_INTERRUPT] = {.name = "EXT"},
-        [IO_INTERRUPT]       = {.name = "I/O"}
+static const struct irq_class irqclass_main_desc[NR_IRQS_BASE] = {
+        [EXT_INTERRUPT]  = {.name = "EXT"},
+        [IO_INTERRUPT]   = {.name = "I/O"},
+        [THIN_INTERRUPT] = {.name = "AIO"},
 };
 
 /*
@@ -86,6 +88,28 @@ static const struct irq_class irqclass_sub_desc[NR_ARCH_IRQS] = {
         [CPU_RST]    = {.name = "RST", .desc = "[CPU] CPU Restart"},
 };
 
+void __init init_IRQ(void)
+{
+        irq_reserve_irqs(0, THIN_INTERRUPT);
+        init_cio_interrupts();
+        init_airq_interrupts();
+        init_ext_interrupts();
+}
+
+void do_IRQ(struct pt_regs *regs, int irq)
+{
+        struct pt_regs *old_regs;
+
+        old_regs = set_irq_regs(regs);
+        irq_enter();
+        if (S390_lowcore.int_clock >= S390_lowcore.clock_comparator)
+                /* Serve timer interrupts first. */
+                clock_comparator_work();
+        generic_handle_irq(irq);
+        irq_exit();
+        set_irq_regs(old_regs);
+}
+
 /*
  * show_interrupts is needed by /proc/interrupts.
  */
@@ -100,27 +124,36 @@ int show_interrupts(struct seq_file *p, void *v)
                 for_each_online_cpu(cpu)
                         seq_printf(p, "CPU%d       ", cpu);
                 seq_putc(p, '\n');
+                goto out;
         }
         if (irq < NR_IRQS) {
+                if (irq >= NR_IRQS_BASE)
+                        goto out;
                 seq_printf(p, "%s: ", irqclass_main_desc[irq].name);
                 for_each_online_cpu(cpu)
-                        seq_printf(p, "%10u ", kstat_cpu(cpu).irqs[irq]);
+                        seq_printf(p, "%10u ", kstat_irqs_cpu(irq, cpu));
                 seq_putc(p, '\n');
-                goto skip_arch_irqs;
+                goto out;
         }
         for (irq = 0; irq < NR_ARCH_IRQS; irq++) {
                 seq_printf(p, "%s: ", irqclass_sub_desc[irq].name);
                 for_each_online_cpu(cpu)
-                        seq_printf(p, "%10u ", per_cpu(irq_stat, cpu).irqs[irq]);
+                        seq_printf(p, "%10u ",
+                                   per_cpu(irq_stat, cpu).irqs[irq]);
                 if (irqclass_sub_desc[irq].desc)
                         seq_printf(p, "  %s", irqclass_sub_desc[irq].desc);
                 seq_putc(p, '\n');
         }
-skip_arch_irqs:
+out:
         put_online_cpus();
         return 0;
 }
 
+int arch_show_interrupts(struct seq_file *p, int prec)
+{
+        return 0;
+}
+
 /*
  * Switch to the asynchronous interrupt stack for softirq execution.
  */
@@ -159,41 +192,27 @@ asmlinkage void do_softirq(void)
         local_irq_restore(flags);
 }
 
-#ifdef CONFIG_PROC_FS
-void init_irq_proc(void)
-{
-        if (proc_mkdir("irq", NULL))
-                create_prof_cpu_mask();
-}
-#endif
-
 /*
  * ext_int_hash[index] is the list head for all external interrupts that hash
  * to this index.
  */
-static struct list_head ext_int_hash[256];
+static struct hlist_head ext_int_hash[32] ____cacheline_aligned;
 
 struct ext_int_info {
         ext_int_handler_t handler;
-        u16 code;
-        struct list_head entry;
+        struct hlist_node entry;
         struct rcu_head rcu;
+        u16 code;
 };
 
 /* ext_int_hash_lock protects the handler lists for external interrupts */
-DEFINE_SPINLOCK(ext_int_hash_lock);
-
-static void __init init_external_interrupts(void)
-{
-        int idx;
-
-        for (idx = 0; idx < ARRAY_SIZE(ext_int_hash); idx++)
-                INIT_LIST_HEAD(&ext_int_hash[idx]);
-}
+static DEFINE_SPINLOCK(ext_int_hash_lock);
 
 static inline int ext_hash(u16 code)
 {
-        return (code + (code >> 9)) & 0xff;
+        BUILD_BUG_ON(!is_power_of_2(ARRAY_SIZE(ext_int_hash)));
+
+        return (code + (code >> 9)) & (ARRAY_SIZE(ext_int_hash) - 1);
 }
 
 int register_external_interrupt(u16 code, ext_int_handler_t handler)
@@ -210,7 +229,7 @@ int register_external_interrupt(u16 code, ext_int_handler_t handler)
         index = ext_hash(code);
 
         spin_lock_irqsave(&ext_int_hash_lock, flags);
-        list_add_rcu(&p->entry, &ext_int_hash[index]);
+        hlist_add_head_rcu(&p->entry, &ext_int_hash[index]);
         spin_unlock_irqrestore(&ext_int_hash_lock, flags);
         return 0;
 }
@@ -223,9 +242,9 @@ int unregister_external_interrupt(u16 code, ext_int_handler_t handler)
         int index = ext_hash(code);
 
         spin_lock_irqsave(&ext_int_hash_lock, flags);
-        list_for_each_entry_rcu(p, &ext_int_hash[index], entry) {
+        hlist_for_each_entry_rcu(p, &ext_int_hash[index], entry) {
                 if (p->code == code && p->handler == handler) {
-                        list_del_rcu(&p->entry);
+                        hlist_del_rcu(&p->entry);
                         kfree_rcu(p, rcu);
                 }
         }
@@ -234,148 +253,64 @@ int unregister_external_interrupt(u16 code, ext_int_handler_t handler)
 }
 EXPORT_SYMBOL(unregister_external_interrupt);
 
-void __irq_entry do_extint(struct pt_regs *regs)
+static irqreturn_t do_ext_interrupt(int irq, void *dummy)
 {
+        struct pt_regs *regs = get_irq_regs();
         struct ext_code ext_code;
-        struct pt_regs *old_regs;
         struct ext_int_info *p;
         int index;
 
-        old_regs = set_irq_regs(regs);
-        irq_enter();
-        if (S390_lowcore.int_clock >= S390_lowcore.clock_comparator) {
-                /* Serve timer interrupts first. */
-                clock_comparator_work();
-        }
-        kstat_incr_irqs_this_cpu(EXTERNAL_INTERRUPT, NULL);
         ext_code = *(struct ext_code *) &regs->int_code;
         if (ext_code.code != 0x1004)
                 __get_cpu_var(s390_idle).nohz_delay = 1;
 
         index = ext_hash(ext_code.code);
         rcu_read_lock();
-        list_for_each_entry_rcu(p, &ext_int_hash[index], entry)
-                if (likely(p->code == ext_code.code))
-                        p->handler(ext_code, regs->int_parm,
-                                   regs->int_parm_long);
+        hlist_for_each_entry_rcu(p, &ext_int_hash[index], entry) {
+                if (unlikely(p->code != ext_code.code))
+                        continue;
+                p->handler(ext_code, regs->int_parm, regs->int_parm_long);
+        }
         rcu_read_unlock();
-        irq_exit();
-        set_irq_regs(old_regs);
+        return IRQ_HANDLED;
 }
 
-void __init init_IRQ(void)
-{
-        init_external_interrupts();
-}
-
-static DEFINE_SPINLOCK(sc_irq_lock);
-static int sc_irq_refcount;
-
-void service_subclass_irq_register(void)
-{
-        spin_lock(&sc_irq_lock);
-        if (!sc_irq_refcount)
-                ctl_set_bit(0, 9);
-        sc_irq_refcount++;
-        spin_unlock(&sc_irq_lock);
-}
-EXPORT_SYMBOL(service_subclass_irq_register);
-
-void service_subclass_irq_unregister(void)
-{
-        spin_lock(&sc_irq_lock);
-        sc_irq_refcount--;
-        if (!sc_irq_refcount)
-                ctl_clear_bit(0, 9);
-        spin_unlock(&sc_irq_lock);
-}
-EXPORT_SYMBOL(service_subclass_irq_unregister);
-
-static DEFINE_SPINLOCK(ma_subclass_lock);
-static int ma_subclass_refcount;
-
-void measurement_alert_subclass_register(void)
-{
-        spin_lock(&ma_subclass_lock);
-        if (!ma_subclass_refcount)
-                ctl_set_bit(0, 5);
-        ma_subclass_refcount++;
-        spin_unlock(&ma_subclass_lock);
-}
-EXPORT_SYMBOL(measurement_alert_subclass_register);
-
-void measurement_alert_subclass_unregister(void)
-{
-        spin_lock(&ma_subclass_lock);
-        ma_subclass_refcount--;
-        if (!ma_subclass_refcount)
-                ctl_clear_bit(0, 5);
-        spin_unlock(&ma_subclass_lock);
-}
-EXPORT_SYMBOL(measurement_alert_subclass_unregister);
-
-#ifdef CONFIG_SMP
-void synchronize_irq(unsigned int irq)
-{
-        /*
-         * Not needed, the handler is protected by a lock and IRQs that occur
-         * after the handler is deleted are just NOPs.
-         */
-}
-EXPORT_SYMBOL_GPL(synchronize_irq);
-#endif
-
-#ifndef CONFIG_PCI
-
-/* Only PCI devices have dynamically-defined IRQ handlers */
-
-int request_irq(unsigned int irq, irq_handler_t handler,
-                unsigned long irqflags, const char *devname, void *dev_id)
-{
-        return -EINVAL;
-}
-EXPORT_SYMBOL_GPL(request_irq);
-
-void free_irq(unsigned int irq, void *dev_id)
-{
-        WARN_ON(1);
-}
-EXPORT_SYMBOL_GPL(free_irq);
-
-void enable_irq(unsigned int irq)
-{
-        WARN_ON(1);
-}
-EXPORT_SYMBOL_GPL(enable_irq);
+static struct irqaction external_interrupt = {
+        .name    = "EXT",
+        .handler = do_ext_interrupt,
+};
 
-void disable_irq(unsigned int irq)
+void __init init_ext_interrupts(void)
 {
-        WARN_ON(1);
-}
-EXPORT_SYMBOL_GPL(disable_irq);
+        int idx;
 
-#endif /* !CONFIG_PCI */
+        for (idx = 0; idx < ARRAY_SIZE(ext_int_hash); idx++)
+                INIT_HLIST_HEAD(&ext_int_hash[idx]);
 
-void disable_irq_nosync(unsigned int irq)
-{
-        disable_irq(irq);
+        irq_set_chip_and_handler(EXT_INTERRUPT,
+                                 &dummy_irq_chip, handle_percpu_irq);
+        setup_irq(EXT_INTERRUPT, &external_interrupt);
 }
-EXPORT_SYMBOL_GPL(disable_irq_nosync);
 
-unsigned long probe_irq_on(void)
-{
-        return 0;
-}
-EXPORT_SYMBOL_GPL(probe_irq_on);
+static DEFINE_SPINLOCK(irq_subclass_lock);
+static unsigned char irq_subclass_refcount[64];
 
-int probe_irq_off(unsigned long val)
+void irq_subclass_register(enum irq_subclass subclass)
 {
-        return 0;
+        spin_lock(&irq_subclass_lock);
+        if (!irq_subclass_refcount[subclass])
+                ctl_set_bit(0, subclass);
+        irq_subclass_refcount[subclass]++;
+        spin_unlock(&irq_subclass_lock);
 }
-EXPORT_SYMBOL_GPL(probe_irq_off);
+EXPORT_SYMBOL(irq_subclass_register);
 
-unsigned int probe_irq_mask(unsigned long val)
+void irq_subclass_unregister(enum irq_subclass subclass)
 {
-        return val;
+        spin_lock(&irq_subclass_lock);
+        irq_subclass_refcount[subclass]--;
+        if (!irq_subclass_refcount[subclass])
+                ctl_clear_bit(0, subclass);
+        spin_unlock(&irq_subclass_lock);
 }
-EXPORT_SYMBOL_GPL(probe_irq_mask);
+EXPORT_SYMBOL(irq_subclass_unregister);
diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c
index 3388b2b2a07d..0ce9fb245034 100644
--- a/arch/s390/kernel/kprobes.c
+++ b/arch/s390/kernel/kprobes.c
@@ -37,6 +37,26 @@ DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
 
 struct kretprobe_blackpoint kretprobe_blacklist[] = { };
 
+DEFINE_INSN_CACHE_OPS(dmainsn);
+
+static void *alloc_dmainsn_page(void)
+{
+        return (void *)__get_free_page(GFP_KERNEL | GFP_DMA);
+}
+
+static void free_dmainsn_page(void *page)
+{
+        free_page((unsigned long)page);
+}
+
+struct kprobe_insn_cache kprobe_dmainsn_slots = {
+        .mutex = __MUTEX_INITIALIZER(kprobe_dmainsn_slots.mutex),
+        .alloc = alloc_dmainsn_page,
+        .free = free_dmainsn_page,
+        .pages = LIST_HEAD_INIT(kprobe_dmainsn_slots.pages),
+        .insn_size = MAX_INSN_SIZE,
+};
+
 static int __kprobes is_prohibited_opcode(kprobe_opcode_t *insn)
 {
         switch (insn[0] >> 8) {
@@ -100,35 +120,161 @@ static int __kprobes get_fixup_type(kprobe_opcode_t *insn)
                         fixup |= FIXUP_RETURN_REGISTER;
                 break;
         case 0xc0:
-                if ((insn[0] & 0x0f) == 0x00 || /* larl  */
-                    (insn[0] & 0x0f) == 0x05)   /* brasl */
-                fixup |= FIXUP_RETURN_REGISTER;
+                if ((insn[0] & 0x0f) == 0x05)   /* brasl */
+                        fixup |= FIXUP_RETURN_REGISTER;
                 break;
         case 0xeb:
-                if ((insn[2] & 0xff) == 0x44 || /* bxhg  */
-                    (insn[2] & 0xff) == 0x45)   /* bxleg */
+                switch (insn[2] & 0xff) {
+                case 0x44: /* bxhg  */
+                case 0x45: /* bxleg */
                         fixup = FIXUP_BRANCH_NOT_TAKEN;
+                        break;
+                }
                 break;
         case 0xe3:      /* bctg */
                 if ((insn[2] & 0xff) == 0x46)
                         fixup = FIXUP_BRANCH_NOT_TAKEN;
                 break;
+        case 0xec:
+                switch (insn[2] & 0xff) {
+                case 0xe5: /* clgrb */
+                case 0xe6: /* cgrb  */
+                case 0xf6: /* crb   */
+                case 0xf7: /* clrb  */
+                case 0xfc: /* cgib  */
+                case 0xfd: /* cglib */
+                case 0xfe: /* cib   */
+                case 0xff: /* clib  */
+                        fixup = FIXUP_BRANCH_NOT_TAKEN;
+                        break;
+                }
+                break;
         }
         return fixup;
 }
 
+static int __kprobes is_insn_relative_long(kprobe_opcode_t *insn)
+{
+        /* Check if we have a RIL-b or RIL-c format instruction which
+         * we need to modify in order to avoid instruction emulation. */
+        switch (insn[0] >> 8) {
+        case 0xc0:
+                if ((insn[0] & 0x0f) == 0x00) /* larl */
+                        return true;
+                break;
+        case 0xc4:
+                switch (insn[0] & 0x0f) {
+                case 0x02: /* llhrl  */
+                case 0x04: /* lghrl  */
+                case 0x05: /* lhrl   */
+                case 0x06: /* llghrl */
+                case 0x07: /* sthrl  */
+                case 0x08: /* lgrl   */
+                case 0x0b: /* stgrl  */
+                case 0x0c: /* lgfrl  */
+                case 0x0d: /* lrl    */
+                case 0x0e: /* llgfrl */
+                case 0x0f: /* strl   */
+                        return true;
+                }
+                break;
+        case 0xc6:
+                switch (insn[0] & 0x0f) {
+                case 0x00: /* exrl   */
+                case 0x02: /* pfdrl  */
+                case 0x04: /* cghrl  */
+                case 0x05: /* chrl   */
+                case 0x06: /* clghrl */
+                case 0x07: /* clhrl  */
+                case 0x08: /* cgrl   */
+                case 0x0a: /* clgrl  */
+                case 0x0c: /* cgfrl  */
+                case 0x0d: /* crl    */
+                case 0x0e: /* clgfrl */
+                case 0x0f: /* clrl   */
+                        return true;
+                }
+                break;
+        }
+        return false;
+}
+
+static void __kprobes copy_instruction(struct kprobe *p)
+{
+        s64 disp, new_disp;
+        u64 addr, new_addr;
+
+        memcpy(p->ainsn.insn, p->addr, ((p->opcode >> 14) + 3) & -2);
+        if (!is_insn_relative_long(p->ainsn.insn))
+                return;
+        /*
+         * For pc-relative instructions in RIL-b or RIL-c format patch the
+         * RI2 displacement field. We have already made sure that the insn
+         * slot for the patched instruction is within the same 2GB area
+         * as the original instruction (either kernel image or module area).
+         * Therefore the new displacement will always fit.
+         */
+        disp = *(s32 *)&p->ainsn.insn[1];
+        addr = (u64)(unsigned long)p->addr;
+        new_addr = (u64)(unsigned long)p->ainsn.insn;
+        new_disp = ((addr + (disp * 2)) - new_addr) / 2;
+        *(s32 *)&p->ainsn.insn[1] = new_disp;
+}
+
+static inline int is_kernel_addr(void *addr)
+{
+        return addr < (void *)_end;
+}
+
+static inline int is_module_addr(void *addr)
+{
+#ifdef CONFIG_64BIT
+        BUILD_BUG_ON(MODULES_LEN > (1UL << 31));
+        if (addr < (void *)MODULES_VADDR)
+                return 0;
+        if (addr > (void *)MODULES_END)
+                return 0;
+#endif
+        return 1;
+}
+
+static int __kprobes s390_get_insn_slot(struct kprobe *p)
+{
+        /*
+         * Get an insn slot that is within the same 2GB area like the original
+         * instruction. That way instructions with a 32bit signed displacement
+         * field can be patched and executed within the insn slot.
+         */
+        p->ainsn.insn = NULL;
+        if (is_kernel_addr(p->addr))
+                p->ainsn.insn = get_dmainsn_slot();
+        if (is_module_addr(p->addr))
+                p->ainsn.insn = get_insn_slot();
+        return p->ainsn.insn ? 0 : -ENOMEM;
+}
+
+static void __kprobes s390_free_insn_slot(struct kprobe *p)
+{
+        if (!p->ainsn.insn)
+                return;
+        if (is_kernel_addr(p->addr))
+                free_dmainsn_slot(p->ainsn.insn, 0);
+        else
+                free_insn_slot(p->ainsn.insn, 0);
+        p->ainsn.insn = NULL;
+}
+
 int __kprobes arch_prepare_kprobe(struct kprobe *p)
 {
         if ((unsigned long) p->addr & 0x01)
                 return -EINVAL;
-
         /* Make sure the probe isn't going on a difficult instruction */
         if (is_prohibited_opcode(p->addr))
                 return -EINVAL;
-
+        if (s390_get_insn_slot(p))
+                return -ENOMEM;
         p->opcode = *p->addr;
-        memcpy(p->ainsn.insn, p->addr, ((p->opcode >> 14) + 3) & -2);
-
+        copy_instruction(p);
         return 0;
 }
 
@@ -169,6 +315,7 @@ void __kprobes arch_disarm_kprobe(struct kprobe *p)
 
 void __kprobes arch_remove_kprobe(struct kprobe *p)
 {
+        s390_free_insn_slot(p);
 }
 
 static void __kprobes enable_singlestep(struct kprobe_ctlblk *kcb,
diff --git a/arch/s390/kernel/machine_kexec.c b/arch/s390/kernel/machine_kexec.c
index ac2178161ec3..719e27b2cf22 100644
--- a/arch/s390/kernel/machine_kexec.c
+++ b/arch/s390/kernel/machine_kexec.c
@@ -50,7 +50,7 @@ static void add_elf_notes(int cpu)
 /*
  * Initialize CPU ELF notes
  */
-void setup_regs(void)
+static void setup_regs(void)
 {
         unsigned long sa = S390_lowcore.prefixreg_save_area + SAVE_AREA_BASE;
         int cpu, this_cpu;
diff --git a/arch/s390/kernel/nmi.c b/arch/s390/kernel/nmi.c
index 504175ebf8b0..c4c033819879 100644
--- a/arch/s390/kernel/nmi.c
+++ b/arch/s390/kernel/nmi.c
@@ -214,10 +214,7 @@ static int notrace s390_revalidate_registers(struct mci *mci)
                         : "0", "cc");
 #endif
         /* Revalidate clock comparator register */
-        if (S390_lowcore.clock_comparator == -1)
-                set_clock_comparator(S390_lowcore.mcck_clock);
-        else
-                set_clock_comparator(S390_lowcore.clock_comparator);
+        set_clock_comparator(S390_lowcore.clock_comparator);
         /* Check if old PSW is valid */
         if (!mci->wp)
                 /*
diff --git a/arch/s390/kernel/perf_cpum_cf.c b/arch/s390/kernel/perf_cpum_cf.c
index fb99c2057b85..1105502bf6e9 100644
--- a/arch/s390/kernel/perf_cpum_cf.c
+++ b/arch/s390/kernel/perf_cpum_cf.c
@@ -274,7 +274,7 @@ static int reserve_pmc_hardware(void)
         int flags = PMC_INIT;
 
         on_each_cpu(setup_pmc_cpu, &flags, 1);
-        measurement_alert_subclass_register();
+        irq_subclass_register(IRQ_SUBCLASS_MEASUREMENT_ALERT);
 
         return 0;
 }
@@ -285,7 +285,7 @@ static void release_pmc_hardware(void)
         int flags = PMC_RELEASE;
 
         on_each_cpu(setup_pmc_cpu, &flags, 1);
-        measurement_alert_subclass_unregister();
+        irq_subclass_unregister(IRQ_SUBCLASS_MEASUREMENT_ALERT);
 }
 
 /* Release the PMU if event is the last perf event */
diff --git a/arch/s390/kernel/perf_event.c b/arch/s390/kernel/perf_event.c
index 500aa1029bcb..2343c218b8f9 100644
--- a/arch/s390/kernel/perf_event.c
+++ b/arch/s390/kernel/perf_event.c
@@ -105,13 +105,10 @@ void perf_event_print_debug(void)
 
         cpu = smp_processor_id();
         memset(&cf_info, 0, sizeof(cf_info));
-        if (!qctri(&cf_info)) {
+        if (!qctri(&cf_info))
                 pr_info("CPU[%i] CPUM_CF: ver=%u.%u A=%04x E=%04x C=%04x\n",
                         cpu, cf_info.cfvn, cf_info.csvn,
                         cf_info.auth_ctl, cf_info.enable_ctl, cf_info.act_ctl);
-                print_hex_dump_bytes("CPUMF Query: ", DUMP_PREFIX_OFFSET,
-                                     &cf_info, sizeof(cf_info));
-        }
 
         local_irq_restore(flags);
 }
diff --git a/arch/s390/kernel/process.c b/arch/s390/kernel/process.c
index 2bc3eddae34a..c5dbb335716d 100644
--- a/arch/s390/kernel/process.c
+++ b/arch/s390/kernel/process.c
@@ -71,6 +71,7 @@ void arch_cpu_idle(void)
         }
         /* Halt the cpu and keep track of cpu time accounting. */
         vtime_stop_cpu();
+        local_irq_enable();
 }
 
 void arch_cpu_idle_exit(void)
diff --git a/arch/s390/kernel/ptrace.c b/arch/s390/kernel/ptrace.c
index e9fadb04e3c6..9556905bd3ce 100644
--- a/arch/s390/kernel/ptrace.c
+++ b/arch/s390/kernel/ptrace.c
@@ -60,11 +60,11 @@ void update_cr_regs(struct task_struct *task)
 
                 __ctl_store(cr, 0, 2);
                 cr_new[1] = cr[1];
-                /* Set or clear transaction execution TXC/PIFO bits 8 and 9. */
+                /* Set or clear transaction execution TXC bit 8. */
                 if (task->thread.per_flags & PER_FLAG_NO_TE)
-                        cr_new[0] = cr[0] & ~(3UL << 54);
+                        cr_new[0] = cr[0] & ~(1UL << 55);
                 else
-                        cr_new[0] = cr[0] | (3UL << 54);
+                        cr_new[0] = cr[0] | (1UL << 55);
                 /* Set or clear transaction execution TDC bits 62 and 63. */
                 cr_new[2] = cr[2] & ~3UL;
                 if (task->thread.per_flags & PER_FLAG_TE_ABORT_RAND) {
@@ -1299,7 +1299,7 @@ int regs_query_register_offset(const char *name)
 
         if (!name || *name != 'r')
                 return -EINVAL;
-        if (strict_strtoul(name + 1, 10, &offset))
+        if (kstrtoul(name + 1, 10, &offset))
                 return -EINVAL;
         if (offset >= NUM_GPRS)
                 return -EINVAL;
diff --git a/arch/s390/kernel/runtime_instr.c b/arch/s390/kernel/runtime_instr.c
index 077a99389b07..e1c9d1c292fa 100644
--- a/arch/s390/kernel/runtime_instr.c
+++ b/arch/s390/kernel/runtime_instr.c
@@ -139,10 +139,10 @@ static int __init runtime_instr_init(void)
         if (!runtime_instr_avail())
                 return 0;
 
-        measurement_alert_subclass_register();
+        irq_subclass_register(IRQ_SUBCLASS_MEASUREMENT_ALERT);
         rc = register_external_interrupt(0x1407, runtime_instr_int_handler);
         if (rc)
-                measurement_alert_subclass_unregister();
+                irq_subclass_unregister(IRQ_SUBCLASS_MEASUREMENT_ALERT);
         else
                 pr_info("Runtime instrumentation facility initialized\n");
         return rc;
diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index d386c4e9d2e5..1a4313a1b60f 100644
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -362,7 +362,7 @@ void smp_yield_cpu(int cpu)
  * Send cpus emergency shutdown signal. This gives the cpus the
  * opportunity to complete outstanding interrupts.
  */
-void smp_emergency_stop(cpumask_t *cpumask)
+static void smp_emergency_stop(cpumask_t *cpumask)
 {
         u64 end;
         int cpu;
diff --git a/arch/s390/kernel/suspend.c b/arch/s390/kernel/suspend.c
index c479d2f9605b..a7a7537ce1e7 100644
--- a/arch/s390/kernel/suspend.c
+++ b/arch/s390/kernel/suspend.c
@@ -10,6 +10,10 @@
 #include <linux/suspend.h>
 #include <linux/mm.h>
 #include <asm/ctl_reg.h>
+#include <asm/ipl.h>
+#include <asm/cio.h>
+#include <asm/pci.h>
+#include "entry.h"
 
 /*
  * References to section boundaries
@@ -211,3 +215,11 @@ void restore_processor_state(void)
         __ctl_set_bit(0,28);
         local_mcck_enable();
 }
+
+/* Called at the end of swsusp_arch_resume */
+void s390_early_resume(void)
+{
+        lgr_info_log();
+        channel_subsystem_reinit();
+        zpci_rescan();
+}
diff --git a/arch/s390/kernel/swsusp_asm64.S b/arch/s390/kernel/swsusp_asm64.S
index c487be4cfc81..6b09fdffbd2f 100644
--- a/arch/s390/kernel/swsusp_asm64.S
+++ b/arch/s390/kernel/swsusp_asm64.S
@@ -281,11 +281,8 @@ restore_registers:
         lghi    %r2,0
         brasl   %r14,arch_set_page_states
 
-        /* Log potential guest relocation */
-        brasl   %r14,lgr_info_log
-
-        /* Reinitialize the channel subsystem */
-        brasl   %r14,channel_subsystem_reinit
+        /* Call arch specific early resume code */
+        brasl   %r14,s390_early_resume
 
         /* Return 0 */
         lmg     %r6,%r15,STACK_FRAME_OVERHEAD + __SF_GPRS(%r15)
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index 876546b9cfa1..064c3082ab33 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -92,7 +92,6 @@ void clock_comparator_work(void)
         struct clock_event_device *cd;
 
         S390_lowcore.clock_comparator = -1ULL;
-        set_clock_comparator(S390_lowcore.clock_comparator);
         cd = &__get_cpu_var(comparators);
         cd->event_handler(cd);
 }
diff --git a/arch/s390/kernel/vdso.c b/arch/s390/kernel/vdso.c
index d7776281cb60..05d75c413137 100644
--- a/arch/s390/kernel/vdso.c
+++ b/arch/s390/kernel/vdso.c
@@ -63,7 +63,7 @@ static int __init vdso_setup(char *s)
         else if (strncmp(s, "off", 4) == 0)
                 vdso_enabled = 0;
         else {
-                rc = strict_strtoul(s, 0, &val);
+                rc = kstrtoul(s, 0, &val);
                 vdso_enabled = rc ? 0 : !!val;
         }
         return !rc;
@@ -113,11 +113,11 @@ int vdso_alloc_per_cpu(struct _lowcore *lowcore)
 
         clear_table((unsigned long *) segment_table, _SEGMENT_ENTRY_EMPTY,
                     PAGE_SIZE << SEGMENT_ORDER);
-        clear_table((unsigned long *) page_table, _PAGE_TYPE_EMPTY,
+        clear_table((unsigned long *) page_table, _PAGE_INVALID,
                     256*sizeof(unsigned long));
 
         *(unsigned long *) segment_table = _SEGMENT_ENTRY + page_table;
-        *(unsigned long *) page_table = _PAGE_RO + page_frame;
+        *(unsigned long *) page_table = _PAGE_PROTECT + page_frame;
 
         psal = (u32 *) (page_table + 256*sizeof(unsigned long));
         aste = psal + 32;
diff --git a/arch/s390/kernel/vtime.c b/arch/s390/kernel/vtime.c
index 9b9c1b78ec67..abcfab55f99b 100644
--- a/arch/s390/kernel/vtime.c
+++ b/arch/s390/kernel/vtime.c
@@ -19,6 +19,7 @@
 #include <asm/irq_regs.h>
 #include <asm/cputime.h>
 #include <asm/vtimer.h>
+#include <asm/vtime.h>
 #include <asm/irq.h>
 #include "entry.h"
 
diff --git a/arch/s390/kvm/diag.c b/arch/s390/kvm/diag.c
index 3074475c8ae0..3a74d8af0d69 100644
--- a/arch/s390/kvm/diag.c
+++ b/arch/s390/kvm/diag.c
@@ -119,12 +119,21 @@ static int __diag_virtio_hypercall(struct kvm_vcpu *vcpu)
          * The layout is as follows:
          * - gpr 2 contains the subchannel id (passed as addr)
          * - gpr 3 contains the virtqueue index (passed as datamatch)
+         * - gpr 4 contains the index on the bus (optionally)
          */
-        ret = kvm_io_bus_write(vcpu->kvm, KVM_VIRTIO_CCW_NOTIFY_BUS,
-                                vcpu->run->s.regs.gprs[2],
-                                8, &vcpu->run->s.regs.gprs[3]);
+        ret = kvm_io_bus_write_cookie(vcpu->kvm, KVM_VIRTIO_CCW_NOTIFY_BUS,
+                                      vcpu->run->s.regs.gprs[2],
+                                      8, &vcpu->run->s.regs.gprs[3],
+                                      vcpu->run->s.regs.gprs[4]);
         srcu_read_unlock(&vcpu->kvm->srcu, idx);
-        /* kvm_io_bus_write returns -EOPNOTSUPP if it found no match. */
+
+        /*
+         * Return cookie in gpr 2, but don't overwrite the register if the
+         * diagnose will be handled by userspace.
+         */
+        if (ret != -EOPNOTSUPP)
+                vcpu->run->s.regs.gprs[2] = ret;
+        /* kvm_io_bus_write_cookie returns -EOPNOTSUPP if it found no match. */
         return ret < 0 ? ret : 0;
 }
 
diff --git a/arch/s390/kvm/gaccess.h b/arch/s390/kvm/gaccess.h
index 302e0e52b009..99d789e8a018 100644
--- a/arch/s390/kvm/gaccess.h
+++ b/arch/s390/kvm/gaccess.h
@@ -42,9 +42,11 @@ static inline void __user *__gptr_to_uptr(struct kvm_vcpu *vcpu,
 ({                                                              \
         __typeof__(gptr) __uptr = __gptr_to_uptr(vcpu, gptr, 1);\
         int __mask = sizeof(__typeof__(*(gptr))) - 1;           \
-        int __ret = PTR_RET((void __force *)__uptr);            \
+        int __ret;                                              \
                                                                 \
-        if (!__ret) {                                           \
+        if (IS_ERR((void __force *)__uptr)) {                   \
+                __ret = PTR_ERR((void __force *)__uptr);        \
+        } else {                                                \
                 BUG_ON((unsigned long)__uptr & __mask);         \
                 __ret = get_user(x, __uptr);                    \
         }                                                       \
@@ -55,9 +57,11 @@ static inline void __user *__gptr_to_uptr(struct kvm_vcpu *vcpu,
 ({                                                              \
         __typeof__(gptr) __uptr = __gptr_to_uptr(vcpu, gptr, 1);\
         int __mask = sizeof(__typeof__(*(gptr))) - 1;           \
-        int __ret = PTR_RET((void __force *)__uptr);            \
+        int __ret;                                              \
                                                                 \
-        if (!__ret) {                                           \
+        if (IS_ERR((void __force *)__uptr)) {                   \
+                __ret = PTR_ERR((void __force *)__uptr);        \
+        } else {                                                \
                 BUG_ON((unsigned long)__uptr & __mask);         \
                 __ret = put_user(x, __uptr);                    \
         }                                                       \
diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
index 34c1c9a90be2..776dafe918db 100644
--- a/arch/s390/kvm/kvm-s390.c
+++ b/arch/s390/kvm/kvm-s390.c
@@ -28,6 +28,7 @@
 #include <asm/pgtable.h>
 #include <asm/nmi.h>
 #include <asm/switch_to.h>
+#include <asm/facility.h>
 #include <asm/sclp.h>
 #include "kvm-s390.h"
 #include "gaccess.h"
@@ -84,9 +85,15 @@ struct kvm_stats_debugfs_item debugfs_entries[] = {
         { NULL }
 };
 
-static unsigned long long *facilities;
+unsigned long *vfacilities;
 static struct gmap_notifier gmap_notifier;
 
+/* test availability of vfacility */
+static inline int test_vfacility(unsigned long nr)
+{
+        return __test_facility(nr, (void *) vfacilities);
+}
+
 /* Section: not file related */
 int kvm_arch_hardware_enable(void *garbage)
 {
@@ -387,7 +394,7 @@ int kvm_arch_vcpu_setup(struct kvm_vcpu *vcpu)
         vcpu->arch.sie_block->ecb   = 6;
         vcpu->arch.sie_block->ecb2  = 8;
         vcpu->arch.sie_block->eca   = 0xC1002001U;
-        vcpu->arch.sie_block->fac   = (int) (long) facilities;
+        vcpu->arch.sie_block->fac   = (int) (long) vfacilities;
         hrtimer_init(&vcpu->arch.ckc_timer, CLOCK_REALTIME, HRTIMER_MODE_ABS);
         tasklet_init(&vcpu->arch.tasklet, kvm_s390_tasklet,
                      (unsigned long) vcpu);
@@ -1063,6 +1070,10 @@ int kvm_arch_create_memslot(struct kvm_memory_slot *slot, unsigned long npages)
         return 0;
 }
 
+void kvm_arch_memslots_updated(struct kvm *kvm)
+{
+}
+
 /* Section: memory related */
 int kvm_arch_prepare_memory_region(struct kvm *kvm,
                                    struct kvm_memory_slot *memslot,
@@ -1129,20 +1140,20 @@ static int __init kvm_s390_init(void)
          * to hold the maximum amount of facilities. On the other hand, we
          * only set facilities that are known to work in KVM.
          */
-        facilities = (unsigned long long *) get_zeroed_page(GFP_KERNEL|GFP_DMA);
-        if (!facilities) {
+        vfacilities = (unsigned long *) get_zeroed_page(GFP_KERNEL|GFP_DMA);
+        if (!vfacilities) {
                 kvm_exit();
                 return -ENOMEM;
         }
-        memcpy(facilities, S390_lowcore.stfle_fac_list, 16);
-        facilities[0] &= 0xff82fff3f47c0000ULL;
-        facilities[1] &= 0x001c000000000000ULL;
+        memcpy(vfacilities, S390_lowcore.stfle_fac_list, 16);
+        vfacilities[0] &= 0xff82fff3f47c0000UL;
+        vfacilities[1] &= 0x001c000000000000UL;
         return 0;
 }
 
 static void __exit kvm_s390_exit(void)
 {
-        free_page((unsigned long) facilities);
+        free_page((unsigned long) vfacilities);
         kvm_exit();
 }
 
diff --git a/arch/s390/kvm/kvm-s390.h b/arch/s390/kvm/kvm-s390.h
index 028ca9fd2158..dc99f1ca4267 100644
--- a/arch/s390/kvm/kvm-s390.h
+++ b/arch/s390/kvm/kvm-s390.h
@@ -24,6 +24,9 @@
 
 typedef int (*intercept_handler_t)(struct kvm_vcpu *vcpu);
 
+/* declare vfacilities extern */
+extern unsigned long *vfacilities;
+
 /* negativ values are error codes, positive values for internal conditions */
 #define SIE_INTERCEPT_RERUNVCPU         (1<<0)
 #define SIE_INTERCEPT_UCONTROL          (1<<1)
@@ -112,6 +115,13 @@ static inline u64 kvm_s390_get_base_disp_rs(struct kvm_vcpu *vcpu)
         return (base2 ? vcpu->run->s.regs.gprs[base2] : 0) + disp2;
 }
 
+/* Set the condition code in the guest program status word */
+static inline void kvm_s390_set_psw_cc(struct kvm_vcpu *vcpu, unsigned long cc)
+{
+        vcpu->arch.sie_block->gpsw.mask &= ~(3UL << 44);
+        vcpu->arch.sie_block->gpsw.mask |= cc << 44;
+}
+
 int kvm_s390_handle_wait(struct kvm_vcpu *vcpu);
 enum hrtimer_restart kvm_s390_idle_wakeup(struct hrtimer *timer);
 void kvm_s390_tasklet(unsigned long parm);
diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
index 4cdc54e63ebc..59200ee275e5 100644
--- a/arch/s390/kvm/priv.c
+++ b/arch/s390/kvm/priv.c
@@ -164,8 +164,7 @@ static int handle_tpi(struct kvm_vcpu *vcpu)
         kfree(inti);
 no_interrupt:
         /* Set condition code and we're done. */
-        vcpu->arch.sie_block->gpsw.mask &= ~(3ul << 44);
-        vcpu->arch.sie_block->gpsw.mask |= (cc & 3ul) << 44;
+        kvm_s390_set_psw_cc(vcpu, cc);
         return 0;
 }
 
@@ -220,15 +219,13 @@ static int handle_io_inst(struct kvm_vcpu *vcpu)
                  * Set condition code 3 to stop the guest from issueing channel
                  * I/O instructions.
                  */
-                vcpu->arch.sie_block->gpsw.mask &= ~(3ul << 44);
-                vcpu->arch.sie_block->gpsw.mask |= (3 & 3ul) << 44;
+                kvm_s390_set_psw_cc(vcpu, 3);
                 return 0;
         }
 }
 
 static int handle_stfl(struct kvm_vcpu *vcpu)
 {
-        unsigned int facility_list;
         int rc;
 
         vcpu->stat.instruction_stfl++;
@@ -236,15 +233,13 @@ static int handle_stfl(struct kvm_vcpu *vcpu)
         if (vcpu->arch.sie_block->gpsw.mask & PSW_MASK_PSTATE)
                 return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP);
 
-        /* only pass the facility bits, which we can handle */
-        facility_list = S390_lowcore.stfl_fac_list & 0xff82fff3;
-
         rc = copy_to_guest(vcpu, offsetof(struct _lowcore, stfl_fac_list),
-                           &facility_list, sizeof(facility_list));
+                           vfacilities, 4);
         if (rc)
                 return kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING);
-        VCPU_EVENT(vcpu, 5, "store facility list value %x", facility_list);
-        trace_kvm_s390_handle_stfl(vcpu, facility_list);
+        VCPU_EVENT(vcpu, 5, "store facility list value %x",
+                   *(unsigned int *) vfacilities);
+        trace_kvm_s390_handle_stfl(vcpu, *(unsigned int *) vfacilities);
         return 0;
 }
 
@@ -387,7 +382,7 @@ static int handle_stsi(struct kvm_vcpu *vcpu)
                 return kvm_s390_inject_program_int(vcpu, PGM_PRIVILEGED_OP);
 
         if (fc > 3) {
-                vcpu->arch.sie_block->gpsw.mask |= 3ul << 44;     /* cc 3 */
+                kvm_s390_set_psw_cc(vcpu, 3);
                 return 0;
         }
 
@@ -397,7 +392,7 @@ static int handle_stsi(struct kvm_vcpu *vcpu)
 
         if (fc == 0) {
                 vcpu->run->s.regs.gprs[0] = 3 << 28;
-                vcpu->arch.sie_block->gpsw.mask &= ~(3ul << 44);  /* cc 0 */
+                kvm_s390_set_psw_cc(vcpu, 0);
                 return 0;
         }
 
@@ -431,12 +426,11 @@ static int handle_stsi(struct kvm_vcpu *vcpu)
         }
         trace_kvm_s390_handle_stsi(vcpu, fc, sel1, sel2, operand2);
         free_page(mem);
-        vcpu->arch.sie_block->gpsw.mask &= ~(3ul << 44);
+        kvm_s390_set_psw_cc(vcpu, 0);
         vcpu->run->s.regs.gprs[0] = 0;
         return 0;
 out_no_data:
-        /* condition code 3 */
-        vcpu->arch.sie_block->gpsw.mask |= 3ul << 44;
+        kvm_s390_set_psw_cc(vcpu, 3);
 out_exception:
         free_page(mem);
         return rc;
@@ -494,12 +488,12 @@ static int handle_epsw(struct kvm_vcpu *vcpu)
         kvm_s390_get_regs_rre(vcpu, &reg1, &reg2);
 
         /* This basically extracts the mask half of the psw. */
-        vcpu->run->s.regs.gprs[reg1] &= 0xffffffff00000000;
+        vcpu->run->s.regs.gprs[reg1] &= 0xffffffff00000000UL;
         vcpu->run->s.regs.gprs[reg1] |= vcpu->arch.sie_block->gpsw.mask >> 32;
         if (reg2) {
-                vcpu->run->s.regs.gprs[reg2] &= 0xffffffff00000000;
+                vcpu->run->s.regs.gprs[reg2] &= 0xffffffff00000000UL;
                 vcpu->run->s.regs.gprs[reg2] |=
-                        vcpu->arch.sie_block->gpsw.mask & 0x00000000ffffffff;
+                        vcpu->arch.sie_block->gpsw.mask & 0x00000000ffffffffUL;
         }
         return 0;
 }
diff --git a/arch/s390/lib/delay.c b/arch/s390/lib/delay.c
index c61b9fad43cc..57c87d7d7ede 100644
--- a/arch/s390/lib/delay.c
+++ b/arch/s390/lib/delay.c
@@ -44,7 +44,6 @@ static void __udelay_disabled(unsigned long long usecs)
         do {
                 set_clock_comparator(end);
                 vtime_stop_cpu();
-                local_irq_disable();
         } while (get_tod_clock() < end);
         lockdep_on();
         __ctl_load(cr0, 0, 0);
@@ -64,7 +63,6 @@ static void __udelay_enabled(unsigned long long usecs)
                         set_clock_comparator(end);
                 }
                 vtime_stop_cpu();
-                local_irq_disable();
                 if (clock_saved)
                         local_tick_enable(clock_saved);
         } while (get_tod_clock() < end);
diff --git a/arch/s390/lib/uaccess_pt.c b/arch/s390/lib/uaccess_pt.c
index 50ea137a2d3c..1694d738b175 100644
--- a/arch/s390/lib/uaccess_pt.c
+++ b/arch/s390/lib/uaccess_pt.c
@@ -86,28 +86,28 @@ static unsigned long follow_table(struct mm_struct *mm,
         switch (mm->context.asce_bits & _ASCE_TYPE_MASK) {
         case _ASCE_TYPE_REGION1:
                 table = table + ((address >> 53) & 0x7ff);
-                if (unlikely(*table & _REGION_ENTRY_INV))
+                if (unlikely(*table & _REGION_ENTRY_INVALID))
                         return -0x39UL;
                 table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
                 /* fallthrough */
         case _ASCE_TYPE_REGION2:
                 table = table + ((address >> 42) & 0x7ff);
-                if (unlikely(*table & _REGION_ENTRY_INV))
+                if (unlikely(*table & _REGION_ENTRY_INVALID))
                         return -0x3aUL;
                 table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
                 /* fallthrough */
         case _ASCE_TYPE_REGION3:
                 table = table + ((address >> 31) & 0x7ff);
-                if (unlikely(*table & _REGION_ENTRY_INV))
+                if (unlikely(*table & _REGION_ENTRY_INVALID))
                         return -0x3bUL;
                 table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
                 /* fallthrough */
         case _ASCE_TYPE_SEGMENT:
                 table = table + ((address >> 20) & 0x7ff);
-                if (unlikely(*table & _SEGMENT_ENTRY_INV))
+                if (unlikely(*table & _SEGMENT_ENTRY_INVALID))
                         return -0x10UL;
                 if (unlikely(*table & _SEGMENT_ENTRY_LARGE)) {
-                        if (write && (*table & _SEGMENT_ENTRY_RO))
+                        if (write && (*table & _SEGMENT_ENTRY_PROTECT))
                                 return -0x04UL;
                         return (*table & _SEGMENT_ENTRY_ORIGIN_LARGE) +
                                 (address & ~_SEGMENT_ENTRY_ORIGIN_LARGE);
@@ -117,7 +117,7 @@ static unsigned long follow_table(struct mm_struct *mm,
         table = table + ((address >> 12) & 0xff);
         if (unlikely(*table & _PAGE_INVALID))
                 return -0x11UL;
-        if (write && (*table & _PAGE_RO))
+        if (write && (*table & _PAGE_PROTECT))
                 return -0x04UL;
         return (*table & PAGE_MASK) + (address & ~PAGE_MASK);
 }
@@ -130,13 +130,13 @@ static unsigned long follow_table(struct mm_struct *mm,
         unsigned long *table = (unsigned long *)__pa(mm->pgd);
 
         table = table + ((address >> 20) & 0x7ff);
-        if (unlikely(*table & _SEGMENT_ENTRY_INV))
+        if (unlikely(*table & _SEGMENT_ENTRY_INVALID))
                 return -0x10UL;
         table = (unsigned long *)(*table & _SEGMENT_ENTRY_ORIGIN);
         table = table + ((address >> 12) & 0xff);
         if (unlikely(*table & _PAGE_INVALID))
                 return -0x11UL;
-        if (write && (*table & _PAGE_RO))
+        if (write && (*table & _PAGE_PROTECT))
                 return -0x04UL;
         return (*table & PAGE_MASK) + (address & ~PAGE_MASK);
 }
diff --git a/arch/s390/mm/dump_pagetables.c b/arch/s390/mm/dump_pagetables.c
index 3ad65b04ac15..46d517c3c763 100644
--- a/arch/s390/mm/dump_pagetables.c
+++ b/arch/s390/mm/dump_pagetables.c
@@ -53,7 +53,7 @@ static void print_prot(struct seq_file *m, unsigned int pr, int level)
                 seq_printf(m, "I\n");
                 return;
         }
-        seq_printf(m, "%s", pr & _PAGE_RO ? "RO " : "RW ");
+        seq_printf(m, "%s", pr & _PAGE_PROTECT ? "RO " : "RW ");
         seq_printf(m, "%s", pr & _PAGE_CO ? "CO " : "   ");
         seq_putc(m, '\n');
 }
@@ -105,12 +105,12 @@ static void note_page(struct seq_file *m, struct pg_state *st,
 }
 
 /*
- * The actual page table walker functions. In order to keep the implementation
- * of print_prot() short, we only check and pass _PAGE_INVALID and _PAGE_RO
- * flags to note_page() if a region, segment or page table entry is invalid or
- * read-only.
- * After all it's just a hint that the current level being walked contains an
- * invalid or read-only entry.
+ * The actual page table walker functions. In order to keep the
+ * implementation of print_prot() short, we only check and pass
+ * _PAGE_INVALID and _PAGE_PROTECT flags to note_page() if a region,
+ * segment or page table entry is invalid or read-only.
+ * After all it's just a hint that the current level being walked
+ * contains an invalid or read-only entry.
  */
 static void walk_pte_level(struct seq_file *m, struct pg_state *st,
                            pmd_t *pmd, unsigned long addr)
@@ -122,14 +122,14 @@ static void walk_pte_level(struct seq_file *m, struct pg_state *st,
         for (i = 0; i < PTRS_PER_PTE && addr < max_addr; i++) {
                 st->current_address = addr;
                 pte = pte_offset_kernel(pmd, addr);
-                prot = pte_val(*pte) & (_PAGE_RO | _PAGE_INVALID);
+                prot = pte_val(*pte) & (_PAGE_PROTECT | _PAGE_INVALID);
                 note_page(m, st, prot, 4);
                 addr += PAGE_SIZE;
         }
 }
 
 #ifdef CONFIG_64BIT
-#define _PMD_PROT_MASK (_SEGMENT_ENTRY_RO | _SEGMENT_ENTRY_CO)
+#define _PMD_PROT_MASK (_SEGMENT_ENTRY_PROTECT | _SEGMENT_ENTRY_CO)
 #else
 #define _PMD_PROT_MASK 0
 #endif
diff --git a/arch/s390/mm/fault.c b/arch/s390/mm/fault.c
index f00aefb66a4e..fc6679210d83 100644
--- a/arch/s390/mm/fault.c
+++ b/arch/s390/mm/fault.c
@@ -302,6 +302,8 @@ static inline int do_exception(struct pt_regs *regs, int access)
         address = trans_exc_code & __FAIL_ADDR_MASK;
         perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, address);
         flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
+        if (user_mode(regs))
+                flags |= FAULT_FLAG_USER;
         if (access == VM_WRITE || (trans_exc_code & store_indication) == 0x400)
                 flags |= FAULT_FLAG_WRITE;
         down_read(&mm->mmap_sem);
@@ -673,7 +675,7 @@ static int __init pfault_irq_init(void)
         rc = pfault_init() == 0 ? 0 : -EOPNOTSUPP;
         if (rc)
                 goto out_pfault;
-        service_subclass_irq_register();
+        irq_subclass_register(IRQ_SUBCLASS_SERVICE_SIGNAL);
         hotcpu_notifier(pfault_cpu_notify, 0);
         return 0;
 
diff --git a/arch/s390/mm/gup.c b/arch/s390/mm/gup.c
index 1f5315d1215c..5d758db27bdc 100644
--- a/arch/s390/mm/gup.c
+++ b/arch/s390/mm/gup.c
@@ -24,7 +24,7 @@ static inline int gup_pte_range(pmd_t *pmdp, pmd_t pmd, unsigned long addr,
         pte_t *ptep, pte;
         struct page *page;
 
-        mask = (write ? _PAGE_RO : 0) | _PAGE_INVALID | _PAGE_SPECIAL;
+        mask = (write ? _PAGE_PROTECT : 0) | _PAGE_INVALID | _PAGE_SPECIAL;
 
         ptep = ((pte_t *) pmd_deref(pmd)) + pte_index(addr);
         do {
@@ -55,8 +55,8 @@ static inline int gup_huge_pmd(pmd_t *pmdp, pmd_t pmd, unsigned long addr,
         struct page *head, *page, *tail;
         int refs;
 
-        result = write ? 0 : _SEGMENT_ENTRY_RO;
-        mask = result | _SEGMENT_ENTRY_INV;
+        result = write ? 0 : _SEGMENT_ENTRY_PROTECT;
+        mask = result | _SEGMENT_ENTRY_INVALID;
         if ((pmd_val(pmd) & mask) != result)
                 return 0;
         VM_BUG_ON(!pfn_valid(pmd_val(pmd) >> PAGE_SHIFT));
diff --git a/arch/s390/mm/hugetlbpage.c b/arch/s390/mm/hugetlbpage.c
index 121089d57802..d261c62e40a6 100644
--- a/arch/s390/mm/hugetlbpage.c
+++ b/arch/s390/mm/hugetlbpage.c
@@ -8,21 +8,127 @@
 #include <linux/mm.h>
 #include <linux/hugetlb.h>
 
+static inline pmd_t __pte_to_pmd(pte_t pte)
+{
+        int none, young, prot;
+        pmd_t pmd;
+
+        /*
+         * Convert encoding               pte bits        pmd bits
+         *                              .IR...wrdytp    ..R...I...y.
+         * empty                        .10...000000 -> ..0...1...0.
+         * prot-none, clean, old        .11...000001 -> ..0...1...1.
+         * prot-none, clean, young      .11...000101 -> ..1...1...1.
+         * prot-none, dirty, old        .10...001001 -> ..0...1...1.
+         * prot-none, dirty, young      .10...001101 -> ..1...1...1.
+         * read-only, clean, old        .11...010001 -> ..1...1...0.
+         * read-only, clean, young      .01...010101 -> ..1...0...1.
+         * read-only, dirty, old        .11...011001 -> ..1...1...0.
+         * read-only, dirty, young      .01...011101 -> ..1...0...1.
+         * read-write, clean, old       .11...110001 -> ..0...1...0.
+         * read-write, clean, young     .01...110101 -> ..0...0...1.
+         * read-write, dirty, old       .10...111001 -> ..0...1...0.
+         * read-write, dirty, young     .00...111101 -> ..0...0...1.
+         * Huge ptes are dirty by definition, a clean pte is made dirty
+         * by the conversion.
+         */
+        if (pte_present(pte)) {
+                pmd_val(pmd) = pte_val(pte) & PAGE_MASK;
+                if (pte_val(pte) & _PAGE_INVALID)
+                        pmd_val(pmd) |= _SEGMENT_ENTRY_INVALID;
+                none = (pte_val(pte) & _PAGE_PRESENT) &&
+                        !(pte_val(pte) & _PAGE_READ) &&
+                        !(pte_val(pte) & _PAGE_WRITE);
+                prot = (pte_val(pte) & _PAGE_PROTECT) &&
+                        !(pte_val(pte) & _PAGE_WRITE);
+                young = pte_val(pte) & _PAGE_YOUNG;
+                if (none || young)
+                        pmd_val(pmd) |= _SEGMENT_ENTRY_YOUNG;
+                if (prot || (none && young))
+                        pmd_val(pmd) |= _SEGMENT_ENTRY_PROTECT;
+        } else
+                pmd_val(pmd) = _SEGMENT_ENTRY_INVALID;
+        return pmd;
+}
+
+static inline pte_t __pmd_to_pte(pmd_t pmd)
+{
+        pte_t pte;
+
+        /*
+         * Convert encoding       pmd bits        pte bits
+         *                      ..R...I...y.    .IR...wrdytp
+         * empty                ..0...1...0. -> .10...000000
+         * prot-none, old       ..0...1...1. -> .10...001001
+         * prot-none, young     ..1...1...1. -> .10...001101
+         * read-only, old       ..1...1...0. -> .11...011001
+         * read-only, young     ..1...0...1. -> .01...011101
+         * read-write, old      ..0...1...0. -> .10...111001
+         * read-write, young    ..0...0...1. -> .00...111101
+         * Huge ptes are dirty by definition
+         */
+        if (pmd_present(pmd)) {
+                pte_val(pte) = _PAGE_PRESENT | _PAGE_LARGE | _PAGE_DIRTY |
+                        (pmd_val(pmd) & PAGE_MASK);
+                if (pmd_val(pmd) & _SEGMENT_ENTRY_INVALID)
+                        pte_val(pte) |= _PAGE_INVALID;
+                if (pmd_prot_none(pmd)) {
+                        if (pmd_val(pmd) & _SEGMENT_ENTRY_PROTECT)
+                                pte_val(pte) |= _PAGE_YOUNG;
+                } else {
+                        pte_val(pte) |= _PAGE_READ;
+                        if (pmd_val(pmd) & _SEGMENT_ENTRY_PROTECT)
+                                pte_val(pte) |= _PAGE_PROTECT;
+                        else
+                                pte_val(pte) |= _PAGE_WRITE;
+                        if (pmd_val(pmd) & _SEGMENT_ENTRY_YOUNG)
+                                pte_val(pte) |= _PAGE_YOUNG;
+                }
+        } else
+                pte_val(pte) = _PAGE_INVALID;
+        return pte;
+}
 
 void set_huge_pte_at(struct mm_struct *mm, unsigned long addr,
-                                   pte_t *pteptr, pte_t pteval)
+                     pte_t *ptep, pte_t pte)
 {
-        pmd_t *pmdp = (pmd_t *) pteptr;
-        unsigned long mask;
+        pmd_t pmd;
 
+        pmd = __pte_to_pmd(pte);
         if (!MACHINE_HAS_HPAGE) {
-                pteptr = (pte_t *) pte_page(pteval)[1].index;
-                mask = pte_val(pteval) &
-                                (_SEGMENT_ENTRY_INV | _SEGMENT_ENTRY_RO);
-                pte_val(pteval) = (_SEGMENT_ENTRY + __pa(pteptr)) | mask;
+                pmd_val(pmd) &= ~_SEGMENT_ENTRY_ORIGIN;
+                pmd_val(pmd) |= pte_page(pte)[1].index;
+        } else
+                pmd_val(pmd) |= _SEGMENT_ENTRY_LARGE | _SEGMENT_ENTRY_CO;
+        *(pmd_t *) ptep = pmd;
+}
+
+pte_t huge_ptep_get(pte_t *ptep)
+{
+        unsigned long origin;
+        pmd_t pmd;
+
+        pmd = *(pmd_t *) ptep;
+        if (!MACHINE_HAS_HPAGE && pmd_present(pmd)) {
+                origin = pmd_val(pmd) & _SEGMENT_ENTRY_ORIGIN;
+                pmd_val(pmd) &= ~_SEGMENT_ENTRY_ORIGIN;
+                pmd_val(pmd) |= *(unsigned long *) origin;
         }
+        return __pmd_to_pte(pmd);
+}
 
-        pmd_val(*pmdp) = pte_val(pteval);
+pte_t huge_ptep_get_and_clear(struct mm_struct *mm,
+                              unsigned long addr, pte_t *ptep)
+{
+        pmd_t *pmdp = (pmd_t *) ptep;
+        pte_t pte = huge_ptep_get(ptep);
+
+        if (MACHINE_HAS_IDTE)
+                __pmd_idte(addr, pmdp);
+        else
+                __pmd_csp(pmdp);
+        pmd_val(*pmdp) = _SEGMENT_ENTRY_EMPTY;
+        return pte;
 }
 
 int arch_prepare_hugepage(struct page *page)
@@ -58,7 +164,7 @@ void arch_release_hugepage(struct page *page)
         ptep = (pte_t *) page[1].index;
         if (!ptep)
                 return;
-        clear_table((unsigned long *) ptep, _PAGE_TYPE_EMPTY,
+        clear_table((unsigned long *) ptep, _PAGE_INVALID,
                     PTRS_PER_PTE * sizeof(pte_t));
         page_table_free(&init_mm, (unsigned long *) ptep);
         page[1].index = 0;
@@ -117,6 +223,11 @@ int pud_huge(pud_t pud)
         return 0;
 }
 
+int pmd_huge_support(void)
+{
+        return 1;
+}
+
 struct page *follow_huge_pmd(struct mm_struct *mm, unsigned long address,
                              pmd_t *pmdp, int write)
 {
diff --git a/arch/s390/mm/maccess.c b/arch/s390/mm/maccess.c
index 921fa541dc04..d1e0e0c7a7e2 100644
--- a/arch/s390/mm/maccess.c
+++ b/arch/s390/mm/maccess.c
@@ -14,6 +14,7 @@
 #include <linux/gfp.h>
 #include <linux/cpu.h>
 #include <asm/ctl_reg.h>
+#include <asm/io.h>
 
 /*
  * This function writes to kernel memory bypassing DAT and possible
diff --git a/arch/s390/mm/pageattr.c b/arch/s390/mm/pageattr.c
index 80adfbf75065..990397420e6b 100644
--- a/arch/s390/mm/pageattr.c
+++ b/arch/s390/mm/pageattr.c
@@ -118,7 +118,7 @@ void kernel_map_pages(struct page *page, int numpages, int enable)
                 pte = pte_offset_kernel(pmd, address);
                 if (!enable) {
                         __ptep_ipte(address, pte);
-                        pte_val(*pte) = _PAGE_TYPE_EMPTY;
+                        pte_val(*pte) = _PAGE_INVALID;
                         continue;
                 }
                 pte_val(*pte) = __pa(address);
diff --git a/arch/s390/mm/pgtable.c b/arch/s390/mm/pgtable.c
index a8154a1a2c94..de8cbc30dcd1 100644
--- a/arch/s390/mm/pgtable.c
+++ b/arch/s390/mm/pgtable.c
@@ -161,7 +161,7 @@ static int gmap_unlink_segment(struct gmap *gmap, unsigned long *table)
         struct gmap_rmap *rmap;
         struct page *page;
 
-        if (*table & _SEGMENT_ENTRY_INV)
+        if (*table & _SEGMENT_ENTRY_INVALID)
                 return 0;
         page = pfn_to_page(*table >> PAGE_SHIFT);
         mp = (struct gmap_pgtable *) page->index;
@@ -172,7 +172,7 @@ static int gmap_unlink_segment(struct gmap *gmap, unsigned long *table)
                 kfree(rmap);
                 break;
         }
-        *table = _SEGMENT_ENTRY_INV | _SEGMENT_ENTRY_RO | mp->vmaddr;
+        *table = mp->vmaddr | _SEGMENT_ENTRY_INVALID | _SEGMENT_ENTRY_PROTECT;
         return 1;
 }
 
@@ -245,7 +245,9 @@ EXPORT_SYMBOL_GPL(gmap_disable);
  * gmap_alloc_table is assumed to be called with mmap_sem held
  */
 static int gmap_alloc_table(struct gmap *gmap,
-                               unsigned long *table, unsigned long init)
+                            unsigned long *table, unsigned long init)
+        __releases(&gmap->mm->page_table_lock)
+        __acquires(&gmap->mm->page_table_lock)
 {
         struct page *page;
         unsigned long *new;
@@ -258,7 +260,7 @@ static int gmap_alloc_table(struct gmap *gmap,
                 return -ENOMEM;
         new = (unsigned long *) page_to_phys(page);
         crst_table_init(new, init);
-        if (*table & _REGION_ENTRY_INV) {
+        if (*table & _REGION_ENTRY_INVALID) {
                 list_add(&page->lru, &gmap->crst_list);
                 *table = (unsigned long) new | _REGION_ENTRY_LENGTH |
                         (*table & _REGION_ENTRY_TYPE_MASK);
@@ -292,22 +294,22 @@ int gmap_unmap_segment(struct gmap *gmap, unsigned long to, unsigned long len)
         for (off = 0; off < len; off += PMD_SIZE) {
                 /* Walk the guest addr space page table */
                 table = gmap->table + (((to + off) >> 53) & 0x7ff);
-                if (*table & _REGION_ENTRY_INV)
+                if (*table & _REGION_ENTRY_INVALID)
                         goto out;
                 table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
                 table = table + (((to + off) >> 42) & 0x7ff);
-                if (*table & _REGION_ENTRY_INV)
+                if (*table & _REGION_ENTRY_INVALID)
                         goto out;
                 table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
                 table = table + (((to + off) >> 31) & 0x7ff);
-                if (*table & _REGION_ENTRY_INV)
+                if (*table & _REGION_ENTRY_INVALID)
                         goto out;
                 table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
                 table = table + (((to + off) >> 20) & 0x7ff);
 
                 /* Clear segment table entry in guest address space. */
                 flush |= gmap_unlink_segment(gmap, table);
-                *table = _SEGMENT_ENTRY_INV;
+                *table = _SEGMENT_ENTRY_INVALID;
         }
 out:
         spin_unlock(&gmap->mm->page_table_lock);
@@ -335,7 +337,7 @@ int gmap_map_segment(struct gmap *gmap, unsigned long from,
 
         if ((from | to | len) & (PMD_SIZE - 1))
                 return -EINVAL;
-        if (len == 0 || from + len > PGDIR_SIZE ||
+        if (len == 0 || from + len > TASK_MAX_SIZE ||
             from + len < from || to + len < to)
                 return -EINVAL;
 
@@ -345,17 +347,17 @@ int gmap_map_segment(struct gmap *gmap, unsigned long from,
         for (off = 0; off < len; off += PMD_SIZE) {
                 /* Walk the gmap address space page table */
                 table = gmap->table + (((to + off) >> 53) & 0x7ff);
-                if ((*table & _REGION_ENTRY_INV) &&
+                if ((*table & _REGION_ENTRY_INVALID) &&
                     gmap_alloc_table(gmap, table, _REGION2_ENTRY_EMPTY))
                         goto out_unmap;
                 table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
                 table = table + (((to + off) >> 42) & 0x7ff);
-                if ((*table & _REGION_ENTRY_INV) &&
+                if ((*table & _REGION_ENTRY_INVALID) &&
                     gmap_alloc_table(gmap, table, _REGION3_ENTRY_EMPTY))
                         goto out_unmap;
                 table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
                 table = table + (((to + off) >> 31) & 0x7ff);
-                if ((*table & _REGION_ENTRY_INV) &&
+                if ((*table & _REGION_ENTRY_INVALID) &&
                     gmap_alloc_table(gmap, table, _SEGMENT_ENTRY_EMPTY))
                         goto out_unmap;
                 table = (unsigned long *) (*table & _REGION_ENTRY_ORIGIN);
@@ -363,7 +365,8 @@ int gmap_map_segment(struct gmap *gmap, unsigned long from,
 
                 /* Store 'from' address in an invalid segment table entry. */
                 flush |= gmap_unlink_segment(gmap, table);
-                *table = _SEGMENT_ENTRY_INV | _SEGMENT_ENTRY_RO | (from + off);
+                *table =  (from + off) | (_SEGMENT_ENTRY_INVALID |
+                                          _SEGMENT_ENTRY_PROTECT);
         }
         spin_unlock(&gmap->mm->page_table_lock);
         up_read(&gmap->mm->mmap_sem);
@@ -384,15 +387,15 @@ static unsigned long *gmap_table_walk(unsigned long address, struct gmap *gmap)
         unsigned long *table;
 
         table = gmap->table + ((address >> 53) & 0x7ff);
-        if (unlikely(*table & _REGION_ENTRY_INV))
+        if (unlikely(*table & _REGION_ENTRY_INVALID))
                 return ERR_PTR(-EFAULT);
         table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
         table = table + ((address >> 42) & 0x7ff);
-        if (unlikely(*table & _REGION_ENTRY_INV))
+        if (unlikely(*table & _REGION_ENTRY_INVALID))
                 return ERR_PTR(-EFAULT);
         table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
         table = table + ((address >> 31) & 0x7ff);
-        if (unlikely(*table & _REGION_ENTRY_INV))
+        if (unlikely(*table & _REGION_ENTRY_INVALID))
                 return ERR_PTR(-EFAULT);
         table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
         table = table + ((address >> 20) & 0x7ff);
@@ -422,11 +425,11 @@ unsigned long __gmap_translate(unsigned long address, struct gmap *gmap)
                 return PTR_ERR(segment_ptr);
         /* Convert the gmap address to an mm address. */
         segment = *segment_ptr;
-        if (!(segment & _SEGMENT_ENTRY_INV)) {
+        if (!(segment & _SEGMENT_ENTRY_INVALID)) {
                 page = pfn_to_page(segment >> PAGE_SHIFT);
                 mp = (struct gmap_pgtable *) page->index;
                 return mp->vmaddr | (address & ~PMD_MASK);
-        } else if (segment & _SEGMENT_ENTRY_RO) {
+        } else if (segment & _SEGMENT_ENTRY_PROTECT) {
                 vmaddr = segment & _SEGMENT_ENTRY_ORIGIN;
                 return vmaddr | (address & ~PMD_MASK);
         }
@@ -517,8 +520,8 @@ static void gmap_disconnect_pgtable(struct mm_struct *mm, unsigned long *table)
         page = pfn_to_page(__pa(table) >> PAGE_SHIFT);
         mp = (struct gmap_pgtable *) page->index;
         list_for_each_entry_safe(rmap, next, &mp->mapper, list) {
-                *rmap->entry =
-                        _SEGMENT_ENTRY_INV | _SEGMENT_ENTRY_RO | mp->vmaddr;
+                *rmap->entry = mp->vmaddr | (_SEGMENT_ENTRY_INVALID |
+                                             _SEGMENT_ENTRY_PROTECT);
                 list_del(&rmap->list);
                 kfree(rmap);
                 flush = 1;
@@ -545,13 +548,13 @@ unsigned long __gmap_fault(unsigned long address, struct gmap *gmap)
         /* Convert the gmap address to an mm address. */
         while (1) {
                 segment = *segment_ptr;
-                if (!(segment & _SEGMENT_ENTRY_INV)) {
+                if (!(segment & _SEGMENT_ENTRY_INVALID)) {
                         /* Page table is present */
                         page = pfn_to_page(segment >> PAGE_SHIFT);
                         mp = (struct gmap_pgtable *) page->index;
                         return mp->vmaddr | (address & ~PMD_MASK);
                 }
-                if (!(segment & _SEGMENT_ENTRY_RO))
+                if (!(segment & _SEGMENT_ENTRY_PROTECT))
                         /* Nothing mapped in the gmap address space. */
                         break;
                 rc = gmap_connect_pgtable(address, segment, segment_ptr, gmap);
@@ -586,25 +589,25 @@ void gmap_discard(unsigned long from, unsigned long to, struct gmap *gmap)
         while (address < to) {
                 /* Walk the gmap address space page table */
                 table = gmap->table + ((address >> 53) & 0x7ff);
-                if (unlikely(*table & _REGION_ENTRY_INV)) {
+                if (unlikely(*table & _REGION_ENTRY_INVALID)) {
                         address = (address + PMD_SIZE) & PMD_MASK;
                         continue;
                 }
                 table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
                 table = table + ((address >> 42) & 0x7ff);
-                if (unlikely(*table & _REGION_ENTRY_INV)) {
+                if (unlikely(*table & _REGION_ENTRY_INVALID)) {
                         address = (address + PMD_SIZE) & PMD_MASK;
                         continue;
                 }
                 table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
                 table = table + ((address >> 31) & 0x7ff);
-                if (unlikely(*table & _REGION_ENTRY_INV)) {
+                if (unlikely(*table & _REGION_ENTRY_INVALID)) {
                         address = (address + PMD_SIZE) & PMD_MASK;
                         continue;
                 }
                 table = (unsigned long *)(*table & _REGION_ENTRY_ORIGIN);
                 table = table + ((address >> 20) & 0x7ff);
-                if (unlikely(*table & _SEGMENT_ENTRY_INV)) {
+                if (unlikely(*table & _SEGMENT_ENTRY_INVALID)) {
                         address = (address + PMD_SIZE) & PMD_MASK;
                         continue;
                 }
@@ -687,7 +690,7 @@ int gmap_ipte_notify(struct gmap *gmap, unsigned long start, unsigned long len)
                         continue;
                 /* Set notification bit in the pgste of the pte */
                 entry = *ptep;
-                if ((pte_val(entry) & (_PAGE_INVALID | _PAGE_RO)) == 0) {
+                if ((pte_val(entry) & (_PAGE_INVALID | _PAGE_PROTECT)) == 0) {
                         pgste = pgste_get_lock(ptep);
                         pgste_val(pgste) |= PGSTE_IN_BIT;
                         pgste_set_unlock(ptep, pgste);
@@ -731,6 +734,11 @@ void gmap_do_ipte_notify(struct mm_struct *mm, unsigned long addr, pte_t *pte)
         spin_unlock(&gmap_notifier_lock);
 }
 
+static inline int page_table_with_pgste(struct page *page)
+{
+        return atomic_read(&page->_mapcount) == 0;
+}
+
 static inline unsigned long *page_table_alloc_pgste(struct mm_struct *mm,
                                                     unsigned long vmaddr)
 {
@@ -750,10 +758,11 @@ static inline unsigned long *page_table_alloc_pgste(struct mm_struct *mm,
         mp->vmaddr = vmaddr & PMD_MASK;
         INIT_LIST_HEAD(&mp->mapper);
         page->index = (unsigned long) mp;
-        atomic_set(&page->_mapcount, 3);
+        atomic_set(&page->_mapcount, 0);
         table = (unsigned long *) page_to_phys(page);
-        clear_table(table, _PAGE_TYPE_EMPTY, PAGE_SIZE/2);
-        clear_table(table + PTRS_PER_PTE, 0, PAGE_SIZE/2);
+        clear_table(table, _PAGE_INVALID, PAGE_SIZE/2);
+        clear_table(table + PTRS_PER_PTE, PGSTE_HR_BIT | PGSTE_HC_BIT,
+                    PAGE_SIZE/2);
         return table;
 }
 
@@ -791,26 +800,21 @@ int set_guest_storage_key(struct mm_struct *mm, unsigned long addr,
         pgste_val(new) |= (key & (_PAGE_CHANGED | _PAGE_REFERENCED)) << 48;
         pgste_val(new) |= (key & (_PAGE_ACC_BITS | _PAGE_FP_BIT)) << 56;
         if (!(pte_val(*ptep) & _PAGE_INVALID)) {
-                unsigned long address, bits;
-                unsigned char skey;
+                unsigned long address, bits, skey;
 
                 address = pte_val(*ptep) & PAGE_MASK;
-                skey = page_get_storage_key(address);
+                skey = (unsigned long) page_get_storage_key(address);
                 bits = skey & (_PAGE_CHANGED | _PAGE_REFERENCED);
+                skey = key & (_PAGE_ACC_BITS | _PAGE_FP_BIT);
                 /* Set storage key ACC and FP */
-                page_set_storage_key(address,
-                                (key & (_PAGE_ACC_BITS | _PAGE_FP_BIT)),
-                                !nq);
-
+                page_set_storage_key(address, skey, !nq);
                 /* Merge host changed & referenced into pgste  */
                 pgste_val(new) |= bits << 52;
-                /* Transfer skey changed & referenced bit to kvm user bits */
-                pgste_val(new) |= bits << 45;   /* PGSTE_UR_BIT & PGSTE_UC_BIT */
         }
         /* changing the guest storage key is considered a change of the page */
         if ((pgste_val(new) ^ pgste_val(old)) &
             (PGSTE_ACC_BITS | PGSTE_FP_BIT | PGSTE_GR_BIT | PGSTE_GC_BIT))
-                pgste_val(new) |= PGSTE_UC_BIT;
+                pgste_val(new) |= PGSTE_HC_BIT;
 
         pgste_set_unlock(ptep, new);
         pte_unmap_unlock(*ptep, ptl);
@@ -821,6 +825,11 @@ EXPORT_SYMBOL(set_guest_storage_key);
 
 #else /* CONFIG_PGSTE */
 
+static inline int page_table_with_pgste(struct page *page)
+{
+        return 0;
+}
+
 static inline unsigned long *page_table_alloc_pgste(struct mm_struct *mm,
                                                     unsigned long vmaddr)
 {
@@ -878,7 +887,7 @@ unsigned long *page_table_alloc(struct mm_struct *mm, unsigned long vmaddr)
                 pgtable_page_ctor(page);
                 atomic_set(&page->_mapcount, 1);
                 table = (unsigned long *) page_to_phys(page);
-                clear_table(table, _PAGE_TYPE_EMPTY, PAGE_SIZE);
+                clear_table(table, _PAGE_INVALID, PAGE_SIZE);
                 spin_lock_bh(&mm->context.list_lock);
                 list_add(&page->lru, &mm->context.pgtable_list);
         } else {
@@ -897,12 +906,12 @@ void page_table_free(struct mm_struct *mm, unsigned long *table)
         struct page *page;
         unsigned int bit, mask;
 
-        if (mm_has_pgste(mm)) {
+        page = pfn_to_page(__pa(table) >> PAGE_SHIFT);
+        if (page_table_with_pgste(page)) {
                 gmap_disconnect_pgtable(mm, table);
                 return page_table_free_pgste(table);
         }
         /* Free 1K/2K page table fragment of a 4K page */
-        page = pfn_to_page(__pa(table) >> PAGE_SHIFT);
         bit = 1 << ((__pa(table) & ~PAGE_MASK)/(PTRS_PER_PTE*sizeof(pte_t)));
         spin_lock_bh(&mm->context.list_lock);
         if ((atomic_read(&page->_mapcount) & FRAG_MASK) != FRAG_MASK)
@@ -940,14 +949,14 @@ void page_table_free_rcu(struct mmu_gather *tlb, unsigned long *table)
         unsigned int bit, mask;
 
         mm = tlb->mm;
-        if (mm_has_pgste(mm)) {
+        page = pfn_to_page(__pa(table) >> PAGE_SHIFT);
+        if (page_table_with_pgste(page)) {
                 gmap_disconnect_pgtable(mm, table);
                 table = (unsigned long *) (__pa(table) | FRAG_MASK);
                 tlb_remove_table(tlb, table);
                 return;
         }
         bit = 1 << ((__pa(table) & ~PAGE_MASK) / (PTRS_PER_PTE*sizeof(pte_t)));
-        page = pfn_to_page(__pa(table) >> PAGE_SHIFT);
         spin_lock_bh(&mm->context.list_lock);
         if ((atomic_read(&page->_mapcount) & FRAG_MASK) != FRAG_MASK)
                 list_del(&page->lru);
@@ -959,7 +968,7 @@ void page_table_free_rcu(struct mmu_gather *tlb, unsigned long *table)
         tlb_remove_table(tlb, table);
 }
 
-void __tlb_remove_table(void *_table)
+static void __tlb_remove_table(void *_table)
 {
         const unsigned long mask = (FRAG_MASK << 4) | FRAG_MASK;
         void *table = (void *)((unsigned long) _table & ~mask);
@@ -1007,7 +1016,6 @@ void tlb_table_flush(struct mmu_gather *tlb)
         struct mmu_table_batch **batch = &tlb->batch;
 
         if (*batch) {
-                __tlb_flush_mm(tlb->mm);
                 call_rcu_sched(&(*batch)->rcu, tlb_remove_table_rcu);
                 *batch = NULL;
         }
@@ -1017,11 +1025,12 @@ void tlb_remove_table(struct mmu_gather *tlb, void *table)
 {
         struct mmu_table_batch **batch = &tlb->batch;
 
+        tlb->mm->context.flush_mm = 1;
         if (*batch == NULL) {
                 *batch = (struct mmu_table_batch *)
                         __get_free_page(GFP_NOWAIT | __GFP_NOWARN);
                 if (*batch == NULL) {
-                        __tlb_flush_mm(tlb->mm);
+                        __tlb_flush_mm_lazy(tlb->mm);
                         tlb_remove_table_one(table);
                         return;
                 }
@@ -1029,40 +1038,124 @@ void tlb_remove_table(struct mmu_gather *tlb, void *table)
         }
         (*batch)->tables[(*batch)->nr++] = table;
         if ((*batch)->nr == MAX_TABLE_BATCH)
-                tlb_table_flush(tlb);
+                tlb_flush_mmu(tlb);
 }
 
 #ifdef CONFIG_TRANSPARENT_HUGEPAGE
-void thp_split_vma(struct vm_area_struct *vma)
+static inline void thp_split_vma(struct vm_area_struct *vma)
 {
         unsigned long addr;
-        struct page *page;
 
-        for (addr = vma->vm_start; addr < vma->vm_end; addr += PAGE_SIZE) {
-                page = follow_page(vma, addr, FOLL_SPLIT);
-        }
+        for (addr = vma->vm_start; addr < vma->vm_end; addr += PAGE_SIZE)
+                follow_page(vma, addr, FOLL_SPLIT);
 }
 
-void thp_split_mm(struct mm_struct *mm)
+static inline void thp_split_mm(struct mm_struct *mm)
 {
-        struct vm_area_struct *vma = mm->mmap;
+        struct vm_area_struct *vma;
 
-        while (vma != NULL) {
+        for (vma = mm->mmap; vma != NULL; vma = vma->vm_next) {
                 thp_split_vma(vma);
                 vma->vm_flags &= ~VM_HUGEPAGE;
                 vma->vm_flags |= VM_NOHUGEPAGE;
-                vma = vma->vm_next;
         }
+        mm->def_flags |= VM_NOHUGEPAGE;
+}
+#else
+static inline void thp_split_mm(struct mm_struct *mm)
+{
 }
 #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
 
+static unsigned long page_table_realloc_pmd(struct mmu_gather *tlb,
+                                struct mm_struct *mm, pud_t *pud,
+                                unsigned long addr, unsigned long end)
+{
+        unsigned long next, *table, *new;
+        struct page *page;
+        pmd_t *pmd;
+
+        pmd = pmd_offset(pud, addr);
+        do {
+                next = pmd_addr_end(addr, end);
+again:
+                if (pmd_none_or_clear_bad(pmd))
+                        continue;
+                table = (unsigned long *) pmd_deref(*pmd);
+                page = pfn_to_page(__pa(table) >> PAGE_SHIFT);
+                if (page_table_with_pgste(page))
+                        continue;
+                /* Allocate new page table with pgstes */
+                new = page_table_alloc_pgste(mm, addr);
+                if (!new) {
+                        mm->context.has_pgste = 0;
+                        continue;
+                }
+                spin_lock(&mm->page_table_lock);
+                if (likely((unsigned long *) pmd_deref(*pmd) == table)) {
+                        /* Nuke pmd entry pointing to the "short" page table */
+                        pmdp_flush_lazy(mm, addr, pmd);
+                        pmd_clear(pmd);
+                        /* Copy ptes from old table to new table */
+                        memcpy(new, table, PAGE_SIZE/2);
+                        clear_table(table, _PAGE_INVALID, PAGE_SIZE/2);
+                        /* Establish new table */
+                        pmd_populate(mm, pmd, (pte_t *) new);
+                        /* Free old table with rcu, there might be a walker! */
+                        page_table_free_rcu(tlb, table);
+                        new = NULL;
+                }
+                spin_unlock(&mm->page_table_lock);
+                if (new) {
+                        page_table_free_pgste(new);
+                        goto again;
+                }
+        } while (pmd++, addr = next, addr != end);
+
+        return addr;
+}
+
+static unsigned long page_table_realloc_pud(struct mmu_gather *tlb,
+                                   struct mm_struct *mm, pgd_t *pgd,
+                                   unsigned long addr, unsigned long end)
+{
+        unsigned long next;
+        pud_t *pud;
+
+        pud = pud_offset(pgd, addr);
+        do {
+                next = pud_addr_end(addr, end);
+                if (pud_none_or_clear_bad(pud))
+                        continue;
+                next = page_table_realloc_pmd(tlb, mm, pud, addr, next);
+        } while (pud++, addr = next, addr != end);
+
+        return addr;
+}
+
+static void page_table_realloc(struct mmu_gather *tlb, struct mm_struct *mm,
+                               unsigned long addr, unsigned long end)
+{
+        unsigned long next;
+        pgd_t *pgd;
+
+        pgd = pgd_offset(mm, addr);
+        do {
+                next = pgd_addr_end(addr, end);
+                if (pgd_none_or_clear_bad(pgd))
+                        continue;
+                next = page_table_realloc_pud(tlb, mm, pgd, addr, next);
+        } while (pgd++, addr = next, addr != end);
+}
+
 /*
  * switch on pgstes for its userspace process (for kvm)
  */
 int s390_enable_sie(void)
 {
         struct task_struct *tsk = current;
-        struct mm_struct *mm, *old_mm;
+        struct mm_struct *mm = tsk->mm;
+        struct mmu_gather tlb;
 
         /* Do we have switched amode? If no, we cannot do sie */
         if (s390_user_mode == HOME_SPACE_MODE)
@@ -1072,57 +1165,16 @@ int s390_enable_sie(void)
         if (mm_has_pgste(tsk->mm))
                 return 0;
 
-        /* lets check if we are allowed to replace the mm */
-        task_lock(tsk);
-        if (!tsk->mm || atomic_read(&tsk->mm->mm_users) > 1 ||
-#ifdef CONFIG_AIO
-            !hlist_empty(&tsk->mm->ioctx_list) ||
-#endif
-            tsk->mm != tsk->active_mm) {
-                task_unlock(tsk);
-                return -EINVAL;
-        }
-        task_unlock(tsk);
-
-        /* we copy the mm and let dup_mm create the page tables with_pgstes */
-        tsk->mm->context.alloc_pgste = 1;
-        /* make sure that both mms have a correct rss state */
-        sync_mm_rss(tsk->mm);
-        mm = dup_mm(tsk);
-        tsk->mm->context.alloc_pgste = 0;
-        if (!mm)
-                return -ENOMEM;
-
-#ifdef CONFIG_TRANSPARENT_HUGEPAGE
+        down_write(&mm->mmap_sem);
         /* split thp mappings and disable thp for future mappings */
         thp_split_mm(mm);
-        mm->def_flags |= VM_NOHUGEPAGE;
-#endif
-
-        /* Now lets check again if something happened */
-        task_lock(tsk);
-        if (!tsk->mm || atomic_read(&tsk->mm->mm_users) > 1 ||
-#ifdef CONFIG_AIO
-            !hlist_empty(&tsk->mm->ioctx_list) ||
-#endif
-            tsk->mm != tsk->active_mm) {
-                mmput(mm);
-                task_unlock(tsk);
-                return -EINVAL;
-        }
-
-        /* ok, we are alone. No ptrace, no threads, etc. */
-        old_mm = tsk->mm;
-        tsk->mm = tsk->active_mm = mm;
-        preempt_disable();
-        update_mm(mm, tsk);
-        atomic_inc(&mm->context.attach_count);
-        atomic_dec(&old_mm->context.attach_count);
-        cpumask_set_cpu(smp_processor_id(), mm_cpumask(mm));
-        preempt_enable();
-        task_unlock(tsk);
-        mmput(old_mm);
-        return 0;
+        /* Reallocate the page tables with pgstes */
+        mm->context.has_pgste = 1;
+        tlb_gather_mmu(&tlb, mm, 0, TASK_SIZE);
+        page_table_realloc(&tlb, mm, 0, TASK_SIZE);
+        tlb_finish_mmu(&tlb, 0, TASK_SIZE);
+        up_write(&mm->mmap_sem);
+        return mm->context.has_pgste ? 0 : -ENOMEM;
 }
 EXPORT_SYMBOL_GPL(s390_enable_sie);
 
@@ -1198,9 +1250,9 @@ pgtable_t pgtable_trans_huge_withdraw(struct mm_struct *mm, pmd_t *pmdp)
                 list_del(lh);
         }
         ptep = (pte_t *) pgtable;
-        pte_val(*ptep) = _PAGE_TYPE_EMPTY;
+        pte_val(*ptep) = _PAGE_INVALID;
         ptep++;
-        pte_val(*ptep) = _PAGE_TYPE_EMPTY;
+        pte_val(*ptep) = _PAGE_INVALID;
         return pgtable;
 }
 #endif /* CONFIG_TRANSPARENT_HUGEPAGE */
diff --git a/arch/s390/mm/vmem.c b/arch/s390/mm/vmem.c
index 8b268fcc4612..bcfb70b60be6 100644
--- a/arch/s390/mm/vmem.c
+++ b/arch/s390/mm/vmem.c
@@ -69,7 +69,7 @@ static pte_t __ref *vmem_pte_alloc(unsigned long address)
                 pte = alloc_bootmem(PTRS_PER_PTE * sizeof(pte_t));
         if (!pte)
                 return NULL;
-        clear_table((unsigned long *) pte, _PAGE_TYPE_EMPTY,
+        clear_table((unsigned long *) pte, _PAGE_INVALID,
                     PTRS_PER_PTE * sizeof(pte_t));
         return pte;
 }
@@ -101,7 +101,7 @@ static int vmem_add_mem(unsigned long start, unsigned long size, int ro)
                     !(address & ~PUD_MASK) && (address + PUD_SIZE <= end)) {
                         pud_val(*pu_dir) = __pa(address) |
                                 _REGION_ENTRY_TYPE_R3 | _REGION3_ENTRY_LARGE |
-                                (ro ? _REGION_ENTRY_RO : 0);
+                                (ro ? _REGION_ENTRY_PROTECT : 0);
                         address += PUD_SIZE;
                         continue;
                 }
@@ -118,7 +118,8 @@ static int vmem_add_mem(unsigned long start, unsigned long size, int ro)
                     !(address & ~PMD_MASK) && (address + PMD_SIZE <= end)) {
                         pmd_val(*pm_dir) = __pa(address) |
                                 _SEGMENT_ENTRY | _SEGMENT_ENTRY_LARGE |
-                                (ro ? _SEGMENT_ENTRY_RO : 0);
+                                _SEGMENT_ENTRY_YOUNG |
+                                (ro ? _SEGMENT_ENTRY_PROTECT : 0);
                         address += PMD_SIZE;
                         continue;
                 }
@@ -131,7 +132,8 @@ static int vmem_add_mem(unsigned long start, unsigned long size, int ro)
                 }
 
                 pt_dir = pte_offset_kernel(pm_dir, address);
-                pte_val(*pt_dir) = __pa(address) | (ro ? _PAGE_RO : 0);
+                pte_val(*pt_dir) = __pa(address) |
+                        pgprot_val(ro ? PAGE_KERNEL_RO : PAGE_KERNEL);
                 address += PAGE_SIZE;
         }
         ret = 0;
@@ -154,7 +156,7 @@ static void vmem_remove_range(unsigned long start, unsigned long size)
         pte_t *pt_dir;
         pte_t  pte;
 
-        pte_val(pte) = _PAGE_TYPE_EMPTY;
+        pte_val(pte) = _PAGE_INVALID;
         while (address < end) {
                 pg_dir = pgd_offset_k(address);
                 if (pgd_none(*pg_dir)) {
@@ -255,7 +257,8 @@ int __meminit vmemmap_populate(unsigned long start, unsigned long end, int node)
                         new_page =__pa(vmem_alloc_pages(0));
                         if (!new_page)
                                 goto out;
-                        pte_val(*pt_dir) = __pa(new_page);
+                        pte_val(*pt_dir) =
+                                __pa(new_page) | pgprot_val(PAGE_KERNEL);
                 }
                 address += PAGE_SIZE;
         }
diff --git a/arch/s390/net/bpf_jit_comp.c b/arch/s390/net/bpf_jit_comp.c
index d5f10a43a58f..709239285869 100644
--- a/arch/s390/net/bpf_jit_comp.c
+++ b/arch/s390/net/bpf_jit_comp.c
@@ -805,7 +805,7 @@ static struct bpf_binary_header *bpf_alloc_binary(unsigned int bpfsize,
                 return NULL;
         memset(header, 0, sz);
         header->pages = sz / PAGE_SIZE;
-        hole = sz - bpfsize + sizeof(*header);
+        hole = sz - (bpfsize + sizeof(*header));
         /* Insert random number of illegal instructions before BPF code
          * and make sure the first instruction starts at an even address.
          */
diff --git a/arch/s390/oprofile/hwsampler.c b/arch/s390/oprofile/hwsampler.c
index b5b2916895e0..231cecafc2f1 100644
--- a/arch/s390/oprofile/hwsampler.c
+++ b/arch/s390/oprofile/hwsampler.c
@@ -1001,7 +1001,7 @@ int hwsampler_deallocate(void)
         if (hws_state != HWS_STOPPED)
                 goto deallocate_exit;
 
-        measurement_alert_subclass_unregister();
+        irq_subclass_unregister(IRQ_SUBCLASS_MEASUREMENT_ALERT);
         deallocate_sdbt();
 
         hws_state = HWS_DEALLOCATED;
@@ -1115,7 +1115,7 @@ int hwsampler_shutdown(void)
                 mutex_lock(&hws_sem);
 
                 if (hws_state == HWS_STOPPED) {
-                        measurement_alert_subclass_unregister();
+                        irq_subclass_unregister(IRQ_SUBCLASS_MEASUREMENT_ALERT);
                         deallocate_sdbt();
                 }
                 if (hws_wq) {
@@ -1190,7 +1190,7 @@ start_all_exit:
         hws_oom = 1;
         hws_flush_all = 0;
         /* now let them in, 1407 CPUMF external interrupts */
-        measurement_alert_subclass_register();
+        irq_subclass_register(IRQ_SUBCLASS_MEASUREMENT_ALERT);
 
         return 0;
 }
diff --git a/arch/s390/oprofile/init.c b/arch/s390/oprofile/init.c
index 930783d2c99b..04e1b6a85362 100644
--- a/arch/s390/oprofile/init.c
+++ b/arch/s390/oprofile/init.c
@@ -346,16 +346,15 @@ static const struct file_operations timer_enabled_fops = {
 };
 
 
-static int oprofile_create_hwsampling_files(struct super_block *sb,
-                                            struct dentry *root)
+static int oprofile_create_hwsampling_files(struct dentry *root)
 {
         struct dentry *dir;
 
-        dir = oprofilefs_mkdir(sb, root, "timer");
+        dir = oprofilefs_mkdir(root, "timer");
         if (!dir)
                 return -EINVAL;
 
-        oprofilefs_create_file(sb, dir, "enabled", &timer_enabled_fops);
+        oprofilefs_create_file(dir, "enabled", &timer_enabled_fops);
 
         if (!hwsampler_available)
                 return 0;
@@ -376,17 +375,17 @@ static int oprofile_create_hwsampling_files(struct super_block *sb,
                  * and can only be set to 0.
                  */
 
-                dir = oprofilefs_mkdir(sb, root, "0");
+                dir = oprofilefs_mkdir(root, "0");
                 if (!dir)
                         return -EINVAL;
 
-                oprofilefs_create_file(sb, dir, "enabled", &hwsampler_fops);
-                oprofilefs_create_file(sb, dir, "event", &zero_fops);
-                oprofilefs_create_file(sb, dir, "count", &hw_interval_fops);
-                oprofilefs_create_file(sb, dir, "unit_mask", &zero_fops);
-                oprofilefs_create_file(sb, dir, "kernel", &kernel_fops);
-                oprofilefs_create_file(sb, dir, "user", &user_fops);
-                oprofilefs_create_ulong(sb, dir, "hw_sdbt_blocks",
+                oprofilefs_create_file(dir, "enabled", &hwsampler_fops);
+                oprofilefs_create_file(dir, "event", &zero_fops);
+                oprofilefs_create_file(dir, "count", &hw_interval_fops);
+                oprofilefs_create_file(dir, "unit_mask", &zero_fops);
+                oprofilefs_create_file(dir, "kernel", &kernel_fops);
+                oprofilefs_create_file(dir, "user", &user_fops);
+                oprofilefs_create_ulong(dir, "hw_sdbt_blocks",
                                         &oprofile_sdbt_blocks);
 
         } else {
@@ -396,19 +395,19 @@ static int oprofile_create_hwsampling_files(struct super_block *sb,
                  * space tools.  The /dev/oprofile/hwsampling fs is
                  * provided in that case.
                  */
-                dir = oprofilefs_mkdir(sb, root, "hwsampling");
+                dir = oprofilefs_mkdir(root, "hwsampling");
                 if (!dir)
                         return -EINVAL;
 
-                oprofilefs_create_file(sb, dir, "hwsampler",
+                oprofilefs_create_file(dir, "hwsampler",
                                        &hwsampler_fops);
-                oprofilefs_create_file(sb, dir, "hw_interval",
+                oprofilefs_create_file(dir, "hw_interval",
                                        &hw_interval_fops);
-                oprofilefs_create_ro_ulong(sb, dir, "hw_min_interval",
+                oprofilefs_create_ro_ulong(dir, "hw_min_interval",
                                            &oprofile_min_interval);
-                oprofilefs_create_ro_ulong(sb, dir, "hw_max_interval",
+                oprofilefs_create_ro_ulong(dir, "hw_max_interval",
                                            &oprofile_max_interval);
-                oprofilefs_create_ulong(sb, dir, "hw_sdbt_blocks",
+                oprofilefs_create_ulong(dir, "hw_sdbt_blocks",
                                         &oprofile_sdbt_blocks);
         }
         return 0;
diff --git a/arch/s390/pci/Makefile b/arch/s390/pci/Makefile
index 086a2e37935d..a9e1dc4ae442 100644
--- a/arch/s390/pci/Makefile
+++ b/arch/s390/pci/Makefile
@@ -2,5 +2,5 @@
 # Makefile for the s390 PCI subsystem.
 #
 
-obj-$(CONFIG_PCI)       += pci.o pci_dma.o pci_clp.o pci_msi.o pci_sysfs.o \
+obj-$(CONFIG_PCI)       += pci.o pci_dma.o pci_clp.o pci_sysfs.o \
                            pci_event.o pci_debug.o pci_insn.o
diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index e2956ad39a4f..f17a8343e360 100644
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -42,45 +42,26 @@
 #define SIC_IRQ_MODE_SINGLE             1
 
 #define ZPCI_NR_DMA_SPACES              1
-#define ZPCI_MSI_VEC_BITS               6
 #define ZPCI_NR_DEVICES                 CONFIG_PCI_NR_FUNCTIONS
 
 /* list of all detected zpci devices */
-LIST_HEAD(zpci_list);
-EXPORT_SYMBOL_GPL(zpci_list);
-DEFINE_MUTEX(zpci_list_lock);
-EXPORT_SYMBOL_GPL(zpci_list_lock);
+static LIST_HEAD(zpci_list);
+static DEFINE_SPINLOCK(zpci_list_lock);
 
-static struct pci_hp_callback_ops *hotplug_ops;
+static void zpci_enable_irq(struct irq_data *data);
+static void zpci_disable_irq(struct irq_data *data);
 
-static DECLARE_BITMAP(zpci_domain, ZPCI_NR_DEVICES);
-static DEFINE_SPINLOCK(zpci_domain_lock);
-
-struct callback {
-        irq_handler_t   handler;
-        void            *data;
+static struct irq_chip zpci_irq_chip = {
+        .name = "zPCI",
+        .irq_unmask = zpci_enable_irq,
+        .irq_mask = zpci_disable_irq,
 };
 
-struct zdev_irq_map {
-        unsigned long   aibv;           /* AI bit vector */
-        int             msi_vecs;       /* consecutive MSI-vectors used */
-        int             __unused;
-        struct callback cb[ZPCI_NR_MSI_VECS]; /* callback handler array */
-        spinlock_t      lock;           /* protect callbacks against de-reg */
-};
-
-struct intr_bucket {
-        /* amap of adapters, one bit per dev, corresponds to one irq nr */
-        unsigned long   *alloc;
-        /* AI summary bit, global page for all devices */
-        unsigned long   *aisb;
-        /* pointer to aibv and callback data in zdev */
-        struct zdev_irq_map *imap[ZPCI_NR_DEVICES];
-        /* protects the whole bucket struct */
-        spinlock_t      lock;
-};
+static DECLARE_BITMAP(zpci_domain, ZPCI_NR_DEVICES);
+static DEFINE_SPINLOCK(zpci_domain_lock);
 
-static struct intr_bucket *bucket;
+static struct airq_iv *zpci_aisb_iv;
+static struct airq_iv *zpci_aibv[ZPCI_NR_DEVICES];
 
 /* Adapter interrupt definitions */
 static void zpci_irq_handler(struct airq_struct *airq);
@@ -96,27 +77,8 @@ static DECLARE_BITMAP(zpci_iomap, ZPCI_IOMAP_MAX_ENTRIES);
 struct zpci_iomap_entry *zpci_iomap_start;
 EXPORT_SYMBOL_GPL(zpci_iomap_start);
 
-/* highest irq summary bit */
-static int __read_mostly aisb_max;
-
-static struct kmem_cache *zdev_irq_cache;
 static struct kmem_cache *zdev_fmb_cache;
 
-static inline int irq_to_msi_nr(unsigned int irq)
-{
-        return irq & ZPCI_MSI_MASK;
-}
-
-static inline int irq_to_dev_nr(unsigned int irq)
-{
-        return irq >> ZPCI_MSI_VEC_BITS;
-}
-
-static inline struct zdev_irq_map *get_imap(unsigned int irq)
-{
-        return bucket->imap[irq_to_dev_nr(irq)];
-}
-
 struct zpci_dev *get_zdev(struct pci_dev *pdev)
 {
         return (struct zpci_dev *) pdev->sysdata;
@@ -126,22 +88,17 @@ struct zpci_dev *get_zdev_by_fid(u32 fid)
 {
         struct zpci_dev *tmp, *zdev = NULL;
 
-        mutex_lock(&zpci_list_lock);
+        spin_lock(&zpci_list_lock);
         list_for_each_entry(tmp, &zpci_list, entry) {
                 if (tmp->fid == fid) {
                         zdev = tmp;
                         break;
                 }
         }
-        mutex_unlock(&zpci_list_lock);
+        spin_unlock(&zpci_list_lock);
         return zdev;
 }
 
-bool zpci_fid_present(u32 fid)
-{
-        return (get_zdev_by_fid(fid) != NULL) ? true : false;
-}
-
 static struct zpci_dev *get_zdev_by_bus(struct pci_bus *bus)
 {
         return (bus && bus->sysdata) ? (struct zpci_dev *) bus->sysdata : NULL;
@@ -160,8 +117,7 @@ int pci_proc_domain(struct pci_bus *bus)
 EXPORT_SYMBOL_GPL(pci_proc_domain);
 
 /* Modify PCI: Register adapter interruptions */
-static int zpci_register_airq(struct zpci_dev *zdev, unsigned int aisb,
-                              u64 aibv)
+static int zpci_set_airq(struct zpci_dev *zdev)
 {
         u64 req = ZPCI_CREATE_REQ(zdev->fh, 0, ZPCI_MOD_FC_REG_INT);
         struct zpci_fib *fib;
@@ -172,14 +128,14 @@ static int zpci_register_airq(struct zpci_dev *zdev, unsigned int aisb,
                 return -ENOMEM;
 
         fib->isc = PCI_ISC;
-        fib->noi = zdev->irq_map->msi_vecs;
         fib->sum = 1;           /* enable summary notifications */
-        fib->aibv = aibv;
-        fib->aibvo = 0;         /* every function has its own page */
-        fib->aisb = (u64) bucket->aisb + aisb / 8;
-        fib->aisbo = aisb & ZPCI_MSI_MASK;
+        fib->noi = airq_iv_end(zdev->aibv);
+        fib->aibv = (unsigned long) zdev->aibv->vector;
+        fib->aibvo = 0;         /* each zdev has its own interrupt vector */
+        fib->aisb = (unsigned long) zpci_aisb_iv->vector + (zdev->aisb/64)*8;
+        fib->aisbo = zdev->aisb & 63;
 
-        rc = s390pci_mod_fc(req, fib);
+        rc = zpci_mod_fc(req, fib);
         pr_debug("%s mpcifc returned noi: %d\n", __func__, fib->noi);
 
         free_page((unsigned long) fib);
@@ -209,7 +165,7 @@ static int mod_pci(struct zpci_dev *zdev, int fn, u8 dmaas, struct mod_pci_args
         fib->iota = args->iota;
         fib->fmb_addr = args->fmb_addr;
 
-        rc = s390pci_mod_fc(req, fib);
+        rc = zpci_mod_fc(req, fib);
         free_page((unsigned long) fib);
         return rc;
 }
@@ -234,7 +190,7 @@ int zpci_unregister_ioat(struct zpci_dev *zdev, u8 dmaas)
 }
 
 /* Modify PCI: Unregister adapter interruptions */
-static int zpci_unregister_airq(struct zpci_dev *zdev)
+static int zpci_clear_airq(struct zpci_dev *zdev)
 {
         struct mod_pci_args args = { 0, 0, 0, 0 };
 
@@ -283,7 +239,7 @@ static int zpci_cfg_load(struct zpci_dev *zdev, int offset, u32 *val, u8 len)
         u64 data;
         int rc;
 
-        rc = s390pci_load(&data, req, offset);
+        rc = zpci_load(&data, req, offset);
         if (!rc) {
                 data = data << ((8 - len) * 8);
                 data = le64_to_cpu(data);
@@ -301,25 +257,46 @@ static int zpci_cfg_store(struct zpci_dev *zdev, int offset, u32 val, u8 len)
 
         data = cpu_to_le64(data);
         data = data >> ((8 - len) * 8);
-        rc = s390pci_store(data, req, offset);
+        rc = zpci_store(data, req, offset);
         return rc;
 }
 
-void enable_irq(unsigned int irq)
+static int zpci_msi_set_mask_bits(struct msi_desc *msi, u32 mask, u32 flag)
+{
+        int offset, pos;
+        u32 mask_bits;
+
+        if (msi->msi_attrib.is_msix) {
+                offset = msi->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +
+                        PCI_MSIX_ENTRY_VECTOR_CTRL;
+                msi->masked = readl(msi->mask_base + offset);
+                writel(flag, msi->mask_base + offset);
+        } else if (msi->msi_attrib.maskbit) {
+                pos = (long) msi->mask_base;
+                pci_read_config_dword(msi->dev, pos, &mask_bits);
+                mask_bits &= ~(mask);
+                mask_bits |= flag & mask;
+                pci_write_config_dword(msi->dev, pos, mask_bits);
+        } else
+                return 0;
+
+        msi->msi_attrib.maskbit = !!flag;
+        return 1;
+}
+
+static void zpci_enable_irq(struct irq_data *data)
 {
-        struct msi_desc *msi = irq_get_msi_desc(irq);
+        struct msi_desc *msi = irq_get_msi_desc(data->irq);
 
         zpci_msi_set_mask_bits(msi, 1, 0);
 }
-EXPORT_SYMBOL_GPL(enable_irq);
 
-void disable_irq(unsigned int irq)
+static void zpci_disable_irq(struct irq_data *data)
 {
-        struct msi_desc *msi = irq_get_msi_desc(irq);
+        struct msi_desc *msi = irq_get_msi_desc(data->irq);
 
         zpci_msi_set_mask_bits(msi, 1, 1);
 }
-EXPORT_SYMBOL_GPL(disable_irq);
 
 void pcibios_fixup_bus(struct pci_bus *bus)
 {
@@ -404,152 +381,147 @@ static struct pci_ops pci_root_ops = {
         .write = pci_write,
 };
 
-/* store the last handled bit to implement fair scheduling of devices */
-static DEFINE_PER_CPU(unsigned long, next_sbit);
-
 static void zpci_irq_handler(struct airq_struct *airq)
 {
-        unsigned long sbit, mbit, last = 0, start = __get_cpu_var(next_sbit);
-        int rescan = 0, max = aisb_max;
-        struct zdev_irq_map *imap;
+        unsigned long si, ai;
+        struct airq_iv *aibv;
+        int irqs_on = 0;
 
         inc_irq_stat(IRQIO_PCI);
-        sbit = start;
-
-scan:
-        /* find summary_bit */
-        for_each_set_bit_left_cont(sbit, bucket->aisb, max) {
-                clear_bit(63 - (sbit & 63), bucket->aisb + (sbit >> 6));
-                last = sbit;
+        for (si = 0;;) {
+                /* Scan adapter summary indicator bit vector */
+                si = airq_iv_scan(zpci_aisb_iv, si, airq_iv_end(zpci_aisb_iv));
+                if (si == -1UL) {
+                        if (irqs_on++)
+                                /* End of second scan with interrupts on. */
+                                break;
+                        /* First scan complete, reenable interrupts. */
+                        zpci_set_irq_ctrl(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC);
+                        si = 0;
+                        continue;
+                }
 
-                /* find vector bit */
-                imap = bucket->imap[sbit];
-                for_each_set_bit_left(mbit, &imap->aibv, imap->msi_vecs) {
+                /* Scan the adapter interrupt vector for this device. */
+                aibv = zpci_aibv[si];
+                for (ai = 0;;) {
+                        ai = airq_iv_scan(aibv, ai, airq_iv_end(aibv));
+                        if (ai == -1UL)
+                                break;
                         inc_irq_stat(IRQIO_MSI);
-                        clear_bit(63 - mbit, &imap->aibv);
-
-                        spin_lock(&imap->lock);
-                        if (imap->cb[mbit].handler)
-                                imap->cb[mbit].handler(mbit,
-                                        imap->cb[mbit].data);
-                        spin_unlock(&imap->lock);
+                        airq_iv_lock(aibv, ai);
+                        generic_handle_irq(airq_iv_get_data(aibv, ai));
+                        airq_iv_unlock(aibv, ai);
                 }
         }
-
-        if (rescan)
-                goto out;
-
-        /* scan the skipped bits */
-        if (start > 0) {
-                sbit = 0;
-                max = start;
-                start = 0;
-                goto scan;
-        }
-
-        /* enable interrupts again */
-        set_irq_ctrl(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC);
-
-        /* check again to not lose initiative */
-        rmb();
-        max = aisb_max;
-        sbit = find_first_bit_left(bucket->aisb, max);
-        if (sbit != max) {
-                rescan++;
-                goto scan;
-        }
-out:
-        /* store next device bit to scan */
-        __get_cpu_var(next_sbit) = (++last >= aisb_max) ? 0 : last;
 }
 
-/* msi_vecs - number of requested interrupts, 0 place function to error state */
-static int zpci_setup_msi(struct pci_dev *pdev, int msi_vecs)
+int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
 {
         struct zpci_dev *zdev = get_zdev(pdev);
-        unsigned int aisb, msi_nr;
+        unsigned int hwirq, irq, msi_vecs;
+        unsigned long aisb;
         struct msi_desc *msi;
+        struct msi_msg msg;
         int rc;
 
-        /* store the number of used MSI vectors */
-        zdev->irq_map->msi_vecs = min(msi_vecs, ZPCI_NR_MSI_VECS);
-
-        spin_lock(&bucket->lock);
-        aisb = find_first_zero_bit(bucket->alloc, PAGE_SIZE);
-        /* alloc map exhausted? */
-        if (aisb == PAGE_SIZE) {
-                spin_unlock(&bucket->lock);
-                return -EIO;
-        }
-        set_bit(aisb, bucket->alloc);
-        spin_unlock(&bucket->lock);
+        pr_debug("%s: requesting %d MSI-X interrupts...", __func__, nvec);
+        if (type != PCI_CAP_ID_MSIX && type != PCI_CAP_ID_MSI)
+                return -EINVAL;
+        msi_vecs = min(nvec, ZPCI_MSI_VEC_MAX);
+        msi_vecs = min_t(unsigned int, msi_vecs, CONFIG_PCI_NR_MSI);
 
+        /* Allocate adapter summary indicator bit */
+        rc = -EIO;
+        aisb = airq_iv_alloc_bit(zpci_aisb_iv);
+        if (aisb == -1UL)
+                goto out;
         zdev->aisb = aisb;
-        if (aisb + 1 > aisb_max)
-                aisb_max = aisb + 1;
 
-        /* wire up IRQ shortcut pointer */
-        bucket->imap[zdev->aisb] = zdev->irq_map;
-        pr_debug("%s: imap[%u] linked to %p\n", __func__, zdev->aisb, zdev->irq_map);
+        /* Create adapter interrupt vector */
+        rc = -ENOMEM;
+        zdev->aibv = airq_iv_create(msi_vecs, AIRQ_IV_DATA | AIRQ_IV_BITLOCK);
+        if (!zdev->aibv)
+                goto out_si;
 
-        /* TODO: irq number 0 wont be found if we return less than requested MSIs.
-         * ignore it for now and fix in common code.
-         */
-        msi_nr = aisb << ZPCI_MSI_VEC_BITS;
+        /* Wire up shortcut pointer */
+        zpci_aibv[aisb] = zdev->aibv;
 
+        /* Request MSI interrupts */
+        hwirq = 0;
         list_for_each_entry(msi, &pdev->msi_list, list) {
-                rc = zpci_setup_msi_irq(zdev, msi, msi_nr,
-                                          aisb << ZPCI_MSI_VEC_BITS);
+                rc = -EIO;
+                irq = irq_alloc_desc(0);        /* Alloc irq on node 0 */
+                if (irq == NO_IRQ)
+                        goto out_msi;
+                rc = irq_set_msi_desc(irq, msi);
                 if (rc)
-                        return rc;
-                msi_nr++;
+                        goto out_msi;
+                irq_set_chip_and_handler(irq, &zpci_irq_chip,
+                                         handle_simple_irq);
+                msg.data = hwirq;
+                msg.address_lo = zdev->msi_addr & 0xffffffff;
+                msg.address_hi = zdev->msi_addr >> 32;
+                write_msi_msg(irq, &msg);
+                airq_iv_set_data(zdev->aibv, hwirq, irq);
+                hwirq++;
         }
 
-        rc = zpci_register_airq(zdev, aisb, (u64) &zdev->irq_map->aibv);
-        if (rc) {
-                clear_bit(aisb, bucket->alloc);
-                dev_err(&pdev->dev, "register MSI failed with: %d\n", rc);
-                return rc;
+        /* Enable adapter interrupts */
+        rc = zpci_set_airq(zdev);
+        if (rc)
+                goto out_msi;
+
+        return (msi_vecs == nvec) ? 0 : msi_vecs;
+
+out_msi:
+        list_for_each_entry(msi, &pdev->msi_list, list) {
+                if (hwirq-- == 0)
+                        break;
+                irq_set_msi_desc(msi->irq, NULL);
+                irq_free_desc(msi->irq);
+                msi->msg.address_lo = 0;
+                msi->msg.address_hi = 0;
+                msi->msg.data = 0;
+                msi->irq = 0;
         }
-        return (zdev->irq_map->msi_vecs == msi_vecs) ?
-                0 : zdev->irq_map->msi_vecs;
+        zpci_aibv[aisb] = NULL;
+        airq_iv_release(zdev->aibv);
+out_si:
+        airq_iv_free_bit(zpci_aisb_iv, aisb);
+out:
+        dev_err(&pdev->dev, "register MSI failed with: %d\n", rc);
+        return rc;
 }
 
-static void zpci_teardown_msi(struct pci_dev *pdev)
+void arch_teardown_msi_irqs(struct pci_dev *pdev)
 {
         struct zpci_dev *zdev = get_zdev(pdev);
         struct msi_desc *msi;
-        int aisb, rc;
+        int rc;
 
-        rc = zpci_unregister_airq(zdev);
+        pr_info("%s: on pdev: %p\n", __func__, pdev);
+
+        /* Disable adapter interrupts */
+        rc = zpci_clear_airq(zdev);
         if (rc) {
                 dev_err(&pdev->dev, "deregister MSI failed with: %d\n", rc);
                 return;
         }
 
-        msi = list_first_entry(&pdev->msi_list, struct msi_desc, list);
-        aisb = irq_to_dev_nr(msi->irq);
-
-        list_for_each_entry(msi, &pdev->msi_list, list)
-                zpci_teardown_msi_irq(zdev, msi);
-
-        clear_bit(aisb, bucket->alloc);
-        if (aisb + 1 == aisb_max)
-                aisb_max--;
-}
-
-int arch_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type)
-{
-        pr_debug("%s: requesting %d MSI-X interrupts...", __func__, nvec);
-        if (type != PCI_CAP_ID_MSIX && type != PCI_CAP_ID_MSI)
-                return -EINVAL;
-        return zpci_setup_msi(pdev, nvec);
-}
+        /* Release MSI interrupts */
+        list_for_each_entry(msi, &pdev->msi_list, list) {
+                zpci_msi_set_mask_bits(msi, 1, 1);
+                irq_set_msi_desc(msi->irq, NULL);
+                irq_free_desc(msi->irq);
+                msi->msg.address_lo = 0;
+                msi->msg.address_hi = 0;
+                msi->msg.data = 0;
+                msi->irq = 0;
+        }
 
-void arch_teardown_msi_irqs(struct pci_dev *pdev)
-{
-        pr_info("%s: on pdev: %p\n", __func__, pdev);
-        zpci_teardown_msi(pdev);
+        zpci_aibv[zdev->aisb] = NULL;
+        airq_iv_release(zdev->aibv);
+        airq_iv_free_bit(zpci_aisb_iv, zdev->aisb);
 }
 
 static void zpci_map_resources(struct zpci_dev *zdev)
@@ -564,8 +536,6 @@ static void zpci_map_resources(struct zpci_dev *zdev)
                         continue;
                 pdev->resource[i].start = (resource_size_t) pci_iomap(pdev, i, 0);
                 pdev->resource[i].end = pdev->resource[i].start + len - 1;
-                pr_debug("BAR%i: -> start: %Lx  end: %Lx\n",
-                        i, pdev->resource[i].start, pdev->resource[i].end);
         }
 }
 
@@ -589,162 +559,47 @@ struct zpci_dev *zpci_alloc_device(void)
 
         /* Alloc memory for our private pci device data */
         zdev = kzalloc(sizeof(*zdev), GFP_KERNEL);
-        if (!zdev)
-                return ERR_PTR(-ENOMEM);
-
-        /* Alloc aibv & callback space */
-        zdev->irq_map = kmem_cache_zalloc(zdev_irq_cache, GFP_KERNEL);
-        if (!zdev->irq_map)
-                goto error;
-        WARN_ON((u64) zdev->irq_map & 0xff);
-        return zdev;
-
-error:
-        kfree(zdev);
-        return ERR_PTR(-ENOMEM);
+        return zdev ? : ERR_PTR(-ENOMEM);
 }
 
 void zpci_free_device(struct zpci_dev *zdev)
 {
-        kmem_cache_free(zdev_irq_cache, zdev->irq_map);
         kfree(zdev);
 }
 
-/*
- * Too late for any s390 specific setup, since interrupts must be set up
- * already which requires DMA setup too and the pci scan will access the
- * config space, which only works if the function handle is enabled.
- */
-int pcibios_enable_device(struct pci_dev *pdev, int mask)
-{
-        struct resource *res;
-        u16 cmd;
-        int i;
-
-        pci_read_config_word(pdev, PCI_COMMAND, &cmd);
-
-        for (i = 0; i < PCI_BAR_COUNT; i++) {
-                res = &pdev->resource[i];
-
-                if (res->flags & IORESOURCE_IO)
-                        return -EINVAL;
-
-                if (res->flags & IORESOURCE_MEM)
-                        cmd |= PCI_COMMAND_MEMORY;
-        }
-        pci_write_config_word(pdev, PCI_COMMAND, cmd);
-        return 0;
-}
-
 int pcibios_add_platform_entries(struct pci_dev *pdev)
 {
         return zpci_sysfs_add_device(&pdev->dev);
 }
 
-int zpci_request_irq(unsigned int irq, irq_handler_t handler, void *data)
-{
-        int msi_nr = irq_to_msi_nr(irq);
-        struct zdev_irq_map *imap;
-        struct msi_desc *msi;
-
-        msi = irq_get_msi_desc(irq);
-        if (!msi)
-                return -EIO;
-
-        imap = get_imap(irq);
-        spin_lock_init(&imap->lock);
-
-        pr_debug("%s: register handler for IRQ:MSI %d:%d\n", __func__, irq >> 6, msi_nr);
-        imap->cb[msi_nr].handler = handler;
-        imap->cb[msi_nr].data = data;
-
-        /*
-         * The generic MSI code returns with the interrupt disabled on the
-         * card, using the MSI mask bits. Firmware doesn't appear to unmask
-         * at that level, so we do it here by hand.
-         */
-        zpci_msi_set_mask_bits(msi, 1, 0);
-        return 0;
-}
-
-void zpci_free_irq(unsigned int irq)
-{
-        struct zdev_irq_map *imap = get_imap(irq);
-        int msi_nr = irq_to_msi_nr(irq);
-        unsigned long flags;
-
-        pr_debug("%s: for irq: %d\n", __func__, irq);
-
-        spin_lock_irqsave(&imap->lock, flags);
-        imap->cb[msi_nr].handler = NULL;
-        imap->cb[msi_nr].data = NULL;
-        spin_unlock_irqrestore(&imap->lock, flags);
-}
-
-int request_irq(unsigned int irq, irq_handler_t handler,
-                unsigned long irqflags, const char *devname, void *dev_id)
-{
-        pr_debug("%s: irq: %d  handler: %p  flags: %lx  dev: %s\n",
-                __func__, irq, handler, irqflags, devname);
-
-        return zpci_request_irq(irq, handler, dev_id);
-}
-EXPORT_SYMBOL_GPL(request_irq);
-
-void free_irq(unsigned int irq, void *dev_id)
-{
-        zpci_free_irq(irq);
-}
-EXPORT_SYMBOL_GPL(free_irq);
-
 static int __init zpci_irq_init(void)
 {
-        int cpu, rc;
-
-        bucket = kzalloc(sizeof(*bucket), GFP_KERNEL);
-        if (!bucket)
-                return -ENOMEM;
-
-        bucket->aisb = (unsigned long *) get_zeroed_page(GFP_KERNEL);
-        if (!bucket->aisb) {
-                rc = -ENOMEM;
-                goto out_aisb;
-        }
-
-        bucket->alloc = (unsigned long *) get_zeroed_page(GFP_KERNEL);
-        if (!bucket->alloc) {
-                rc = -ENOMEM;
-                goto out_alloc;
-        }
+        int rc;
 
         rc = register_adapter_interrupt(&zpci_airq);
         if (rc)
-                goto out_ai;
+                goto out;
         /* Set summary to 1 to be called every time for the ISC. */
         *zpci_airq.lsi_ptr = 1;
 
-        for_each_online_cpu(cpu)
-                per_cpu(next_sbit, cpu) = 0;
+        rc = -ENOMEM;
+        zpci_aisb_iv = airq_iv_create(ZPCI_NR_DEVICES, AIRQ_IV_ALLOC);
+        if (!zpci_aisb_iv)
+                goto out_airq;
 
-        spin_lock_init(&bucket->lock);
-        set_irq_ctrl(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC);
+        zpci_set_irq_ctrl(SIC_IRQ_MODE_SINGLE, NULL, PCI_ISC);
         return 0;
 
-out_ai:
-        free_page((unsigned long) bucket->alloc);
-out_alloc:
-        free_page((unsigned long) bucket->aisb);
-out_aisb:
-        kfree(bucket);
+out_airq:
+        unregister_adapter_interrupt(&zpci_airq);
+out:
         return rc;
 }
 
 static void zpci_irq_exit(void)
 {
-        free_page((unsigned long) bucket->alloc);
-        free_page((unsigned long) bucket->aisb);
+        airq_iv_release(zpci_aisb_iv);
         unregister_adapter_interrupt(&zpci_airq);
-        kfree(bucket);
 }
 
 static struct resource *zpci_alloc_bus_resource(unsigned long start, unsigned long size,
@@ -801,16 +656,49 @@ static void zpci_free_iomap(struct zpci_dev *zdev, int entry)
 int pcibios_add_device(struct pci_dev *pdev)
 {
         struct zpci_dev *zdev = get_zdev(pdev);
+        struct resource *res;
+        int i;
+
+        zdev->pdev = pdev;
+        zpci_map_resources(zdev);
+
+        for (i = 0; i < PCI_BAR_COUNT; i++) {
+                res = &pdev->resource[i];
+                if (res->parent || !res->flags)
+                        continue;
+                pci_claim_resource(pdev, i);
+        }
+
+        return 0;
+}
+
+int pcibios_enable_device(struct pci_dev *pdev, int mask)
+{
+        struct zpci_dev *zdev = get_zdev(pdev);
+        struct resource *res;
+        u16 cmd;
+        int i;
 
         zdev->pdev = pdev;
         zpci_debug_init_device(zdev);
         zpci_fmb_enable_device(zdev);
         zpci_map_resources(zdev);
 
+        pci_read_config_word(pdev, PCI_COMMAND, &cmd);
+        for (i = 0; i < PCI_BAR_COUNT; i++) {
+                res = &pdev->resource[i];
+
+                if (res->flags & IORESOURCE_IO)
+                        return -EINVAL;
+
+                if (res->flags & IORESOURCE_MEM)
+                        cmd |= PCI_COMMAND_MEMORY;
+        }
+        pci_write_config_word(pdev, PCI_COMMAND, cmd);
         return 0;
 }
 
-void pcibios_release_device(struct pci_dev *pdev)
+void pcibios_disable_device(struct pci_dev *pdev)
 {
         struct zpci_dev *zdev = get_zdev(pdev);
 
@@ -898,6 +786,8 @@ int zpci_enable_device(struct zpci_dev *zdev)
         rc = zpci_dma_init_device(zdev);
         if (rc)
                 goto out_dma;
+
+        zdev->state = ZPCI_FN_STATE_ONLINE;
         return 0;
 
 out_dma:
@@ -926,18 +816,16 @@ int zpci_create_device(struct zpci_dev *zdev)
                 rc = zpci_enable_device(zdev);
                 if (rc)
                         goto out_free;
-
-                zdev->state = ZPCI_FN_STATE_ONLINE;
         }
         rc = zpci_scan_bus(zdev);
         if (rc)
                 goto out_disable;
 
-        mutex_lock(&zpci_list_lock);
+        spin_lock(&zpci_list_lock);
         list_add_tail(&zdev->entry, &zpci_list);
-        if (hotplug_ops)
-                hotplug_ops->create_slot(zdev);
-        mutex_unlock(&zpci_list_lock);
+        spin_unlock(&zpci_list_lock);
+
+        zpci_init_slot(zdev);
 
         return 0;
 
@@ -967,15 +855,10 @@ static inline int barsize(u8 size)
 
 static int zpci_mem_init(void)
 {
-        zdev_irq_cache = kmem_cache_create("PCI_IRQ_cache", sizeof(struct zdev_irq_map),
-                                L1_CACHE_BYTES, SLAB_HWCACHE_ALIGN, NULL);
-        if (!zdev_irq_cache)
-                goto error_zdev;
-
         zdev_fmb_cache = kmem_cache_create("PCI_FMB_cache", sizeof(struct zpci_fmb),
                                 16, 0, NULL);
         if (!zdev_fmb_cache)
-                goto error_fmb;
+                goto error_zdev;
 
         /* TODO: use realloc */
         zpci_iomap_start = kzalloc(ZPCI_IOMAP_MAX_ENTRIES * sizeof(*zpci_iomap_start),
@@ -986,8 +869,6 @@ static int zpci_mem_init(void)
 
 error_iomap:
         kmem_cache_destroy(zdev_fmb_cache);
-error_fmb:
-        kmem_cache_destroy(zdev_irq_cache);
 error_zdev:
         return -ENOMEM;
 }
@@ -995,28 +876,10 @@ error_zdev:
 static void zpci_mem_exit(void)
 {
         kfree(zpci_iomap_start);
-        kmem_cache_destroy(zdev_irq_cache);
         kmem_cache_destroy(zdev_fmb_cache);
 }
 
-void zpci_register_hp_ops(struct pci_hp_callback_ops *ops)
-{
-        mutex_lock(&zpci_list_lock);
-        hotplug_ops = ops;
-        mutex_unlock(&zpci_list_lock);
-}
-EXPORT_SYMBOL_GPL(zpci_register_hp_ops);
-
-void zpci_deregister_hp_ops(void)
-{
-        mutex_lock(&zpci_list_lock);
-        hotplug_ops = NULL;
-        mutex_unlock(&zpci_list_lock);
-}
-EXPORT_SYMBOL_GPL(zpci_deregister_hp_ops);
-
-unsigned int s390_pci_probe;
-EXPORT_SYMBOL_GPL(s390_pci_probe);
+static unsigned int s390_pci_probe;
 
 char * __init pcibios_setup(char *str)
 {
@@ -1044,16 +907,12 @@ static int __init pci_base_init(void)
 
         rc = zpci_debug_init();
         if (rc)
-                return rc;
+                goto out;
 
         rc = zpci_mem_init();
         if (rc)
                 goto out_mem;
 
-        rc = zpci_msihash_init();
-        if (rc)
-                goto out_hash;
-
         rc = zpci_irq_init();
         if (rc)
                 goto out_irq;
@@ -1062,7 +921,7 @@ static int __init pci_base_init(void)
         if (rc)
                 goto out_dma;
 
-        rc = clp_find_pci_devices();
+        rc = clp_scan_pci_devices();
         if (rc)
                 goto out_find;
 
@@ -1073,11 +932,15 @@ out_find:
 out_dma:
         zpci_irq_exit();
 out_irq:
-        zpci_msihash_exit();
-out_hash:
         zpci_mem_exit();
 out_mem:
         zpci_debug_exit();
+out:
         return rc;
 }
-subsys_initcall(pci_base_init);
+subsys_initcall_sync(pci_base_init);
+
+void zpci_rescan(void)
+{
+        clp_rescan_pci_devices_simple();
+}
diff --git a/arch/s390/pci/pci_clp.c b/arch/s390/pci/pci_clp.c
index 2e9539625d93..475563c3d1e4 100644
--- a/arch/s390/pci/pci_clp.c
+++ b/arch/s390/pci/pci_clp.c
@@ -36,9 +36,9 @@ static inline u8 clp_instr(void *data)
         return cc;
 }
 
-static void *clp_alloc_block(void)
+static void *clp_alloc_block(gfp_t gfp_mask)
 {
-        return (void *) __get_free_pages(GFP_KERNEL, get_order(CLP_BLK_SIZE));
+        return (void *) __get_free_pages(gfp_mask, get_order(CLP_BLK_SIZE));
 }
 
 static void clp_free_block(void *ptr)
@@ -70,7 +70,7 @@ static int clp_query_pci_fngrp(struct zpci_dev *zdev, u8 pfgid)
         struct clp_req_rsp_query_pci_grp *rrb;
         int rc;
 
-        rrb = clp_alloc_block();
+        rrb = clp_alloc_block(GFP_KERNEL);
         if (!rrb)
                 return -ENOMEM;
 
@@ -113,7 +113,7 @@ static int clp_query_pci_fn(struct zpci_dev *zdev, u32 fh)
         struct clp_req_rsp_query_pci *rrb;
         int rc;
 
-        rrb = clp_alloc_block();
+        rrb = clp_alloc_block(GFP_KERNEL);
         if (!rrb)
                 return -ENOMEM;
 
@@ -179,9 +179,9 @@ error:
 static int clp_set_pci_fn(u32 *fh, u8 nr_dma_as, u8 command)
 {
         struct clp_req_rsp_set_pci *rrb;
-        int rc, retries = 1000;
+        int rc, retries = 100;
 
-        rrb = clp_alloc_block();
+        rrb = clp_alloc_block(GFP_KERNEL);
         if (!rrb)
                 return -ENOMEM;
 
@@ -199,7 +199,7 @@ static int clp_set_pci_fn(u32 *fh, u8 nr_dma_as, u8 command)
                         retries--;
                         if (retries < 0)
                                 break;
-                        msleep(1);
+                        msleep(20);
                 }
         } while (rrb->response.hdr.rsp == CLP_RC_SETPCIFN_BUSY);
 
@@ -245,49 +245,12 @@ int clp_disable_fh(struct zpci_dev *zdev)
         return rc;
 }
 
-static void clp_check_pcifn_entry(struct clp_fh_list_entry *entry)
+static int clp_list_pci(struct clp_req_rsp_list_pci *rrb,
+                        void (*cb)(struct clp_fh_list_entry *entry))
 {
-        int present, rc;
-
-        if (!entry->vendor_id)
-                return;
-
-        /* TODO: be a little bit more scalable */
-        present = zpci_fid_present(entry->fid);
-
-        if (present)
-                pr_debug("%s: device %x already present\n", __func__, entry->fid);
-
-        /* skip already used functions */
-        if (present && entry->config_state)
-                return;
-
-        /* aev 306: function moved to stand-by state */
-        if (present && !entry->config_state) {
-                /*
-                 * The handle is already disabled, that means no iota/irq freeing via
-                 * the firmware interfaces anymore. Need to free resources manually
-                 * (DMA memory, debug, sysfs)...
-                 */
-                zpci_stop_device(get_zdev_by_fid(entry->fid));
-                return;
-        }
-
-        rc = clp_add_pci_device(entry->fid, entry->fh, entry->config_state);
-        if (rc)
-                pr_err("Failed to add fid: 0x%x\n", entry->fid);
-}
-
-int clp_find_pci_devices(void)
-{
-        struct clp_req_rsp_list_pci *rrb;
         u64 resume_token = 0;
         int entries, i, rc;
 
-        rrb = clp_alloc_block();
-        if (!rrb)
-                return -ENOMEM;
-
         do {
                 memset(rrb, 0, sizeof(*rrb));
                 rrb->request.hdr.len = sizeof(rrb->request);
@@ -316,12 +279,101 @@ int clp_find_pci_devices(void)
                 resume_token = rrb->response.resume_token;
 
                 for (i = 0; i < entries; i++)
-                        clp_check_pcifn_entry(&rrb->response.fh_list[i]);
+                        cb(&rrb->response.fh_list[i]);
         } while (resume_token);
 
         pr_debug("Maximum number of supported PCI functions: %u\n",
                 rrb->response.max_fn);
 out:
+        return rc;
+}
+
+static void __clp_add(struct clp_fh_list_entry *entry)
+{
+        if (!entry->vendor_id)
+                return;
+
+        clp_add_pci_device(entry->fid, entry->fh, entry->config_state);
+}
+
+static void __clp_rescan(struct clp_fh_list_entry *entry)
+{
+        struct zpci_dev *zdev;
+
+        if (!entry->vendor_id)
+                return;
+
+        zdev = get_zdev_by_fid(entry->fid);
+        if (!zdev) {
+                clp_add_pci_device(entry->fid, entry->fh, entry->config_state);
+                return;
+        }
+
+        if (!entry->config_state) {
+                /*
+                 * The handle is already disabled, that means no iota/irq freeing via
+                 * the firmware interfaces anymore. Need to free resources manually
+                 * (DMA memory, debug, sysfs)...
+                 */
+                zpci_stop_device(zdev);
+        }
+}
+
+static void __clp_update(struct clp_fh_list_entry *entry)
+{
+        struct zpci_dev *zdev;
+
+        if (!entry->vendor_id)
+                return;
+
+        zdev = get_zdev_by_fid(entry->fid);
+        if (!zdev)
+                return;
+
+        zdev->fh = entry->fh;
+}
+
+int clp_scan_pci_devices(void)
+{
+        struct clp_req_rsp_list_pci *rrb;
+        int rc;
+
+        rrb = clp_alloc_block(GFP_KERNEL);
+        if (!rrb)
+                return -ENOMEM;
+
+        rc = clp_list_pci(rrb, __clp_add);
+
+        clp_free_block(rrb);
+        return rc;
+}
+
+int clp_rescan_pci_devices(void)
+{
+        struct clp_req_rsp_list_pci *rrb;
+        int rc;
+
+        rrb = clp_alloc_block(GFP_KERNEL);
+        if (!rrb)
+                return -ENOMEM;
+
+        rc = clp_list_pci(rrb, __clp_rescan);
+
+        clp_free_block(rrb);
+        return rc;
+}
+
+int clp_rescan_pci_devices_simple(void)
+{
+        struct clp_req_rsp_list_pci *rrb;
+        int rc;
+
+        rrb = clp_alloc_block(GFP_NOWAIT);
+        if (!rrb)
+                return -ENOMEM;
+
+        rc = clp_list_pci(rrb, __clp_update);
+
         clp_free_block(rrb);
         return rc;
 }
diff --git a/arch/s390/pci/pci_dma.c b/arch/s390/pci/pci_dma.c
index a2343c1f6e04..7e5573acb063 100644
--- a/arch/s390/pci/pci_dma.c
+++ b/arch/s390/pci/pci_dma.c
@@ -10,6 +10,7 @@
 #include <linux/export.h>
 #include <linux/iommu-helper.h>
 #include <linux/dma-mapping.h>
+#include <linux/vmalloc.h>
 #include <linux/pci.h>
 #include <asm/pci_dma.h>
 
@@ -170,8 +171,8 @@ static int dma_update_trans(struct zpci_dev *zdev, unsigned long pa,
                  */
                 goto no_refresh;
 
-        rc = s390pci_refresh_trans((u64) zdev->fh << 32, start_dma_addr,
-                                   nr_pages * PAGE_SIZE);
+        rc = zpci_refresh_trans((u64) zdev->fh << 32, start_dma_addr,
+                                nr_pages * PAGE_SIZE);
 
 no_refresh:
         spin_unlock_irqrestore(&zdev->dma_table_lock, irq_flags);
@@ -407,7 +408,6 @@ static void s390_dma_unmap_sg(struct device *dev, struct scatterlist *sg,
 
 int zpci_dma_init_device(struct zpci_dev *zdev)
 {
-        unsigned int bitmap_order;
         int rc;
 
         spin_lock_init(&zdev->iommu_bitmap_lock);
@@ -421,12 +421,7 @@ int zpci_dma_init_device(struct zpci_dev *zdev)
 
         zdev->iommu_size = (unsigned long) high_memory - PAGE_OFFSET;
         zdev->iommu_pages = zdev->iommu_size >> PAGE_SHIFT;
-        bitmap_order = get_order(zdev->iommu_pages / 8);
-        pr_info("iommu_size: 0x%lx  iommu_pages: 0x%lx  bitmap_order: %i\n",
-                 zdev->iommu_size, zdev->iommu_pages, bitmap_order);
-
-        zdev->iommu_bitmap = (void *) __get_free_pages(GFP_KERNEL | __GFP_ZERO,
-                                                       bitmap_order);
+        zdev->iommu_bitmap = vzalloc(zdev->iommu_pages / 8);
         if (!zdev->iommu_bitmap) {
                 rc = -ENOMEM;
                 goto out_reg;
@@ -451,8 +446,7 @@ void zpci_dma_exit_device(struct zpci_dev *zdev)
 {
         zpci_unregister_ioat(zdev, 0);
         dma_cleanup_tables(zdev);
-        free_pages((unsigned long) zdev->iommu_bitmap,
-                   get_order(zdev->iommu_pages / 8));
+        vfree(zdev->iommu_bitmap);
         zdev->iommu_bitmap = NULL;
         zdev->next_bit = 0;
 }
diff --git a/arch/s390/pci/pci_event.c b/arch/s390/pci/pci_event.c
index ec62e3a0dc09..0aecaf954845 100644
--- a/arch/s390/pci/pci_event.c
+++ b/arch/s390/pci/pci_event.c
@@ -69,7 +69,7 @@ static void zpci_event_log_avail(struct zpci_ccdf_avail *ccdf)
                 clp_add_pci_device(ccdf->fid, ccdf->fh, 0);
                 break;
         case 0x0306:
-                clp_find_pci_devices();
+                clp_rescan_pci_devices();
                 break;
         default:
                 break;
diff --git a/arch/s390/pci/pci_insn.c b/arch/s390/pci/pci_insn.c
index 22eeb9d7ffeb..85267c058af8 100644
--- a/arch/s390/pci/pci_insn.c
+++ b/arch/s390/pci/pci_insn.c
@@ -27,7 +27,7 @@ static inline u8 __mpcifc(u64 req, struct zpci_fib *fib, u8 *status)
         return cc;
 }
 
-int s390pci_mod_fc(u64 req, struct zpci_fib *fib)
+int zpci_mod_fc(u64 req, struct zpci_fib *fib)
 {
         u8 cc, status;
 
@@ -61,7 +61,7 @@ static inline u8 __rpcit(u64 fn, u64 addr, u64 range, u8 *status)
         return cc;
 }
 
-int s390pci_refresh_trans(u64 fn, u64 addr, u64 range)
+int zpci_refresh_trans(u64 fn, u64 addr, u64 range)
 {
         u8 cc, status;
 
@@ -78,7 +78,7 @@ int s390pci_refresh_trans(u64 fn, u64 addr, u64 range)
 }
 
 /* Set Interruption Controls */
-void set_irq_ctrl(u16 ctl, char *unused, u8 isc)
+void zpci_set_irq_ctrl(u16 ctl, char *unused, u8 isc)
 {
         asm volatile (
                 "       .insn   rsy,0xeb00000000d1,%[ctl],%[isc],%[u]\n"
@@ -109,7 +109,7 @@ static inline int __pcilg(u64 *data, u64 req, u64 offset, u8 *status)
         return cc;
 }
 
-int s390pci_load(u64 *data, u64 req, u64 offset)
+int zpci_load(u64 *data, u64 req, u64 offset)
 {
         u8 status;
         int cc;
@@ -125,7 +125,7 @@ int s390pci_load(u64 *data, u64 req, u64 offset)
                             __func__, cc, status, req, offset);
         return (cc > 0) ? -EIO : cc;
 }
-EXPORT_SYMBOL_GPL(s390pci_load);
+EXPORT_SYMBOL_GPL(zpci_load);
 
 /* PCI Store */
 static inline int __pcistg(u64 data, u64 req, u64 offset, u8 *status)
@@ -147,7 +147,7 @@ static inline int __pcistg(u64 data, u64 req, u64 offset, u8 *status)
         return cc;
 }
 
-int s390pci_store(u64 data, u64 req, u64 offset)
+int zpci_store(u64 data, u64 req, u64 offset)
 {
         u8 status;
         int cc;
@@ -163,7 +163,7 @@ int s390pci_store(u64 data, u64 req, u64 offset)
                         __func__, cc, status, req, offset);
         return (cc > 0) ? -EIO : cc;
 }
-EXPORT_SYMBOL_GPL(s390pci_store);
+EXPORT_SYMBOL_GPL(zpci_store);
 
 /* PCI Store Block */
 static inline int __pcistb(const u64 *data, u64 req, u64 offset, u8 *status)
@@ -183,7 +183,7 @@ static inline int __pcistb(const u64 *data, u64 req, u64 offset, u8 *status)
         return cc;
 }
 
-int s390pci_store_block(const u64 *data, u64 req, u64 offset)
+int zpci_store_block(const u64 *data, u64 req, u64 offset)
 {
         u8 status;
         int cc;
@@ -199,4 +199,4 @@ int s390pci_store_block(const u64 *data, u64 req, u64 offset)
                             __func__, cc, status, req, offset);
         return (cc > 0) ? -EIO : cc;
 }
-EXPORT_SYMBOL_GPL(s390pci_store_block);
+EXPORT_SYMBOL_GPL(zpci_store_block);
diff --git a/arch/s390/pci/pci_msi.c b/arch/s390/pci/pci_msi.c
deleted file mode 100644
index b097aed05a9b..000000000000
--- a/arch/s390/pci/pci_msi.c
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright IBM Corp. 2012
- *
- * Author(s):
- *   Jan Glauber <jang@linux.vnet.ibm.com>
- */
-
-#define COMPONENT "zPCI"
-#define pr_fmt(fmt) COMPONENT ": " fmt
-
-#include <linux/kernel.h>
-#include <linux/err.h>
-#include <linux/rculist.h>
-#include <linux/hash.h>
-#include <linux/pci.h>
-#include <linux/msi.h>
-#include <asm/hw_irq.h>
-
-/* mapping of irq numbers to msi_desc */
-static struct hlist_head *msi_hash;
-static const unsigned int msi_hash_bits = 8;
-#define MSI_HASH_BUCKETS (1U << msi_hash_bits)
-#define msi_hashfn(nr)  hash_long(nr, msi_hash_bits)
-
-static DEFINE_SPINLOCK(msi_map_lock);
-
-struct msi_desc *__irq_get_msi_desc(unsigned int irq)
-{
-        struct msi_map *map;
-
-        hlist_for_each_entry_rcu(map,
-                        &msi_hash[msi_hashfn(irq)], msi_chain)
-                if (map->irq == irq)
-                        return map->msi;
-        return NULL;
-}
-
-int zpci_msi_set_mask_bits(struct msi_desc *msi, u32 mask, u32 flag)
-{
-        if (msi->msi_attrib.is_msix) {
-                int offset = msi->msi_attrib.entry_nr * PCI_MSIX_ENTRY_SIZE +
-                        PCI_MSIX_ENTRY_VECTOR_CTRL;
-                msi->masked = readl(msi->mask_base + offset);
-                writel(flag, msi->mask_base + offset);
-        } else {
-                if (msi->msi_attrib.maskbit) {
-                        int pos;
-                        u32 mask_bits;
-
-                        pos = (long) msi->mask_base;
-                        pci_read_config_dword(msi->dev, pos, &mask_bits);
-                        mask_bits &= ~(mask);
-                        mask_bits |= flag & mask;
-                        pci_write_config_dword(msi->dev, pos, mask_bits);
-                } else {
-                        return 0;
-                }
-        }
-
-        msi->msi_attrib.maskbit = !!flag;
-        return 1;
-}
-
-int zpci_setup_msi_irq(struct zpci_dev *zdev, struct msi_desc *msi,
-                        unsigned int nr, int offset)
-{
-        struct msi_map *map;
-        struct msi_msg msg;
-        int rc;
-
-        map = kmalloc(sizeof(*map), GFP_KERNEL);
-        if (map == NULL)
-                return -ENOMEM;
-
-        map->irq = nr;
-        map->msi = msi;
-        zdev->msi_map[nr & ZPCI_MSI_MASK] = map;
-        INIT_HLIST_NODE(&map->msi_chain);
-
-        pr_debug("%s hashing irq: %u  to bucket nr: %llu\n",
-                __func__, nr, msi_hashfn(nr));
-        hlist_add_head_rcu(&map->msi_chain, &msi_hash[msi_hashfn(nr)]);
-
-        spin_lock(&msi_map_lock);
-        rc = irq_set_msi_desc(nr, msi);
-        if (rc) {
-                spin_unlock(&msi_map_lock);
-                hlist_del_rcu(&map->msi_chain);
-                kfree(map);
-                zdev->msi_map[nr & ZPCI_MSI_MASK] = NULL;
-                return rc;
-        }
-        spin_unlock(&msi_map_lock);
-
-        msg.data = nr - offset;
-        msg.address_lo = zdev->msi_addr & 0xffffffff;
-        msg.address_hi = zdev->msi_addr >> 32;
-        write_msi_msg(nr, &msg);
-        return 0;
-}
-
-void zpci_teardown_msi_irq(struct zpci_dev *zdev, struct msi_desc *msi)
-{
-        int irq = msi->irq & ZPCI_MSI_MASK;
-        struct msi_map *map;
-
-        msi->msg.address_lo = 0;
-        msi->msg.address_hi = 0;
-        msi->msg.data = 0;
-        msi->irq = 0;
-        zpci_msi_set_mask_bits(msi, 1, 1);
-
-        spin_lock(&msi_map_lock);
-        map = zdev->msi_map[irq];
-        hlist_del_rcu(&map->msi_chain);
-        kfree(map);
-        zdev->msi_map[irq] = NULL;
-        spin_unlock(&msi_map_lock);
-}
-
-/*
- * The msi hash table has 256 entries which is good for 4..20
- * devices (a typical device allocates 10 + CPUs MSI's). Maybe make
- * the hash table size adjustable later.
- */
-int __init zpci_msihash_init(void)
-{
-        unsigned int i;
-
-        msi_hash = kmalloc(MSI_HASH_BUCKETS * sizeof(*msi_hash), GFP_KERNEL);
-        if (!msi_hash)
-                return -ENOMEM;
-
-        for (i = 0; i < MSI_HASH_BUCKETS; i++)
-                INIT_HLIST_HEAD(&msi_hash[i]);
-        return 0;
-}
-
-void __init zpci_msihash_exit(void)
-{
-        kfree(msi_hash);
-}
diff --git a/arch/s390/pci/pci_sysfs.c b/arch/s390/pci/pci_sysfs.c
index e99a2557f186..cf8a12ff733b 100644
--- a/arch/s390/pci/pci_sysfs.c
+++ b/arch/s390/pci/pci_sysfs.c
@@ -48,11 +48,38 @@ static ssize_t show_pfgid(struct device *dev, struct device_attribute *attr,
 }
 static DEVICE_ATTR(pfgid, S_IRUGO, show_pfgid, NULL);
 
+static void recover_callback(struct device *dev)
+{
+        struct pci_dev *pdev = to_pci_dev(dev);
+        struct zpci_dev *zdev = get_zdev(pdev);
+        int ret;
+
+        pci_stop_and_remove_bus_device(pdev);
+        ret = zpci_disable_device(zdev);
+        if (ret)
+                return;
+
+        ret = zpci_enable_device(zdev);
+        if (ret)
+                return;
+
+        pci_rescan_bus(zdev->bus);
+}
+
+static ssize_t store_recover(struct device *dev, struct device_attribute *attr,
+                             const char *buf, size_t count)
+{
+        int rc = device_schedule_callback(dev, recover_callback);
+        return rc ? rc : count;
+}
+static DEVICE_ATTR(recover, S_IWUSR, NULL, store_recover);
+
 static struct device_attribute *zpci_dev_attrs[] = {
         &dev_attr_function_id,
         &dev_attr_function_handle,
         &dev_attr_pchid,
         &dev_attr_pfgid,
+        &dev_attr_recover,
         NULL,
 };
 
diff --git a/arch/score/Kconfig b/arch/score/Kconfig
index 5fc237581caf..a1be70db75fe 100644
--- a/arch/score/Kconfig
+++ b/arch/score/Kconfig
@@ -2,7 +2,6 @@ menu "Machine selection"
 
 config SCORE
        def_bool y
-       select HAVE_GENERIC_HARDIRQS
        select GENERIC_IRQ_SHOW
        select GENERIC_IOMAP
        select GENERIC_ATOMIC64
diff --git a/arch/score/mm/fault.c b/arch/score/mm/fault.c
index 6b18fb0189ae..52238983527d 100644
--- a/arch/score/mm/fault.c
+++ b/arch/score/mm/fault.c
@@ -47,6 +47,7 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write,
         struct task_struct *tsk = current;
         struct mm_struct *mm = tsk->mm;
         const int field = sizeof(unsigned long) * 2;
+        unsigned long flags = 0;
         siginfo_t info;
         int fault;
 
@@ -75,6 +76,9 @@ asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long write,
         if (in_atomic() || !mm)
                 goto bad_area_nosemaphore;
 
+        if (user_mode(regs))
+                flags |= FAULT_FLAG_USER;
+
         down_read(&mm->mmap_sem);
         vma = find_vma(mm, address);
         if (!vma)
@@ -95,18 +99,18 @@ good_area:
         if (write) {
                 if (!(vma->vm_flags & VM_WRITE))
                         goto bad_area;
+                flags |= FAULT_FLAG_WRITE;
         } else {
                 if (!(vma->vm_flags & (VM_READ | VM_WRITE | VM_EXEC)))
                         goto bad_area;
         }
 
-survive:
         /*
         * If for any reason at all we couldn't handle the fault,
         * make sure we exit gracefully rather than endlessly redo
         * the fault.
         */
-        fault = handle_mm_fault(mm, vma, address, write);
+        fault = handle_mm_fault(mm, vma, address, flags);
         if (unlikely(fault & VM_FAULT_ERROR)) {
                 if (fault & VM_FAULT_OOM)
                         goto out_of_memory;
@@ -167,11 +171,6 @@ no_context:
         */
 out_of_memory:
         up_read(&mm->mmap_sem);
-        if (is_global_init(tsk)) {
-                yield();
-                down_read(&mm->mmap_sem);
-                goto survive;
-        }
         if (!user_mode(regs))
                 goto no_context;
         pagefault_out_of_memory();
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index 1020dd85431a..224f4bc9925e 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -26,7 +26,6 @@ config SUPERH
         select ARCH_WANT_IPC_PARSE_VERSION
         select HAVE_SYSCALL_TRACEPOINTS
         select HAVE_REGS_AND_STACK_ACCESS_API
-        select HAVE_GENERIC_HARDIRQS
         select MAY_HAVE_SPARSE_IRQ
         select IRQ_FORCED_THREADING
         select RTC_LIB
@@ -643,9 +642,9 @@ config KEXEC
 
           It is an ongoing process to be certain the hardware in a machine
           is properly shutdown, so do not be surprised if this code does not
-          initially work for you.  It may help to enable device hotplugging
-          support.  As of this writing the exact hardware interface is
-          strongly in flux, so no good recommendation can be made.
+          initially work for you.  As of this writing the exact hardware
+          interface is strongly in flux, so no good recommendation can be
+          made.
 
 config CRASH_DUMP
         bool "kernel crash dumps (EXPERIMENTAL)"
diff --git a/arch/sh/boards/board-espt.c b/arch/sh/boards/board-espt.c
index 4d94dff9015c..7291e2f11a47 100644
--- a/arch/sh/boards/board-espt.c
+++ b/arch/sh/boards/board-espt.c
@@ -80,7 +80,6 @@ static struct resource sh_eth_resources[] = {
 static struct sh_eth_plat_data sh7763_eth_pdata = {
         .phy = 0,
         .edmac_endian = EDMAC_LITTLE_ENDIAN,
-        .register_type = SH_ETH_REG_GIGABIT,
         .phy_interface = PHY_INTERFACE_MODE_MII,
 };
 
diff --git a/arch/sh/boards/board-sh7757lcr.c b/arch/sh/boards/board-sh7757lcr.c
index 4f114d1cd019..25c5a932f9fe 100644
--- a/arch/sh/boards/board-sh7757lcr.c
+++ b/arch/sh/boards/board-sh7757lcr.c
@@ -77,7 +77,6 @@ static struct resource sh_eth0_resources[] = {
 static struct sh_eth_plat_data sh7757_eth0_pdata = {
         .phy = 1,
         .edmac_endian = EDMAC_LITTLE_ENDIAN,
-        .register_type = SH_ETH_REG_FAST_SH4,
         .set_mdio_gate = sh7757_eth_set_mdio_gate,
 };
 
@@ -106,7 +105,6 @@ static struct resource sh_eth1_resources[] = {
 static struct sh_eth_plat_data sh7757_eth1_pdata = {
         .phy = 1,
         .edmac_endian = EDMAC_LITTLE_ENDIAN,
-        .register_type = SH_ETH_REG_FAST_SH4,
         .set_mdio_gate = sh7757_eth_set_mdio_gate,
 };
 
@@ -151,7 +149,6 @@ static struct resource sh_eth_giga0_resources[] = {
 static struct sh_eth_plat_data sh7757_eth_giga0_pdata = {
         .phy = 18,
         .edmac_endian = EDMAC_LITTLE_ENDIAN,
-        .register_type = SH_ETH_REG_GIGABIT,
         .set_mdio_gate = sh7757_eth_giga_set_mdio_gate,
         .phy_interface = PHY_INTERFACE_MODE_RGMII_ID,
 };
@@ -186,7 +183,6 @@ static struct resource sh_eth_giga1_resources[] = {
 static struct sh_eth_plat_data sh7757_eth_giga1_pdata = {
         .phy = 19,
         .edmac_endian = EDMAC_LITTLE_ENDIAN,
-        .register_type = SH_ETH_REG_GIGABIT,
         .set_mdio_gate = sh7757_eth_giga_set_mdio_gate,
         .phy_interface = PHY_INTERFACE_MODE_RGMII_ID,
 };
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c
index 61fade0ffa96..1fa8be409771 100644
--- a/arch/sh/boards/mach-ecovec24/setup.c
+++ b/arch/sh/boards/mach-ecovec24/setup.c
@@ -30,6 +30,7 @@
 #include <linux/spi/mmc_spi.h>
 #include <linux/input.h>
 #include <linux/input/sh_keysc.h>
+#include <linux/platform_data/gpio_backlight.h>
 #include <linux/sh_eth.h>
 #include <linux/sh_intc.h>
 #include <linux/videodev2.h>
@@ -159,7 +160,6 @@ static struct resource sh_eth_resources[] = {
 static struct sh_eth_plat_data sh_eth_plat = {
         .phy = 0x1f, /* SMSC LAN8700 */
         .edmac_endian = EDMAC_LITTLE_ENDIAN,
-        .register_type = SH_ETH_REG_FAST_SH4,
         .phy_interface = PHY_INTERFACE_MODE_MII,
         .ether_link_active_low = 1
 };
@@ -303,7 +303,7 @@ static struct platform_device usbhs_device = {
         .resource       = usbhs_resources,
 };
 
-/* LCDC */
+/* LCDC and backlight */
 static const struct fb_videomode ecovec_lcd_modes[] = {
         {
                 .name           = "Panel",
@@ -334,13 +334,6 @@ static const struct fb_videomode ecovec_dvi_modes[] = {
         },
 };
 
-static int ecovec24_set_brightness(int brightness)
-{
-        gpio_set_value(GPIO_PTR1, brightness);
-
-        return 0;
-}
-
 static struct sh_mobile_lcdc_info lcdc_info = {
         .ch[0] = {
                 .interface_type = RGB18,
@@ -350,11 +343,6 @@ static struct sh_mobile_lcdc_info lcdc_info = {
                         .width = 152,
                         .height = 91,
                 },
-                .bl_info = {
-                        .name = "sh_mobile_lcdc_bl",
-                        .max_brightness = 1,
-                        .set_brightness = ecovec24_set_brightness,
-                },
         }
 };
 
@@ -380,6 +368,20 @@ static struct platform_device lcdc_device = {
         },
 };
 
+static struct gpio_backlight_platform_data gpio_backlight_data = {
+        .fbdev = &lcdc_device.dev,
+        .gpio = GPIO_PTR1,
+        .def_value = 1,
+        .name = "backlight",
+};
+
+static struct platform_device gpio_backlight_device = {
+        .name = "gpio-backlight",
+        .dev = {
+                .platform_data = &gpio_backlight_data,
+        },
+};
+
 /* CEU0 */
 static struct sh_mobile_ceu_info sh_mobile_ceu0_info = {
         .flags = SH_CEU_FLAG_USE_8BIT_BUS,
@@ -598,37 +600,13 @@ static struct platform_device sdhi0_power = {
         },
 };
 
-static void sdhi0_set_pwr(struct platform_device *pdev, int state)
-{
-        static int power_gpio = -EINVAL;
-
-        if (power_gpio < 0) {
-                int ret = gpio_request(GPIO_PTB6, NULL);
-                if (!ret) {
-                        power_gpio = GPIO_PTB6;
-                        gpio_direction_output(power_gpio, 0);
-                }
-        }
-
-        /*
-         * Toggle the GPIO regardless, whether we managed to grab it above or
-         * the fixed regulator driver did.
-         */
-        gpio_set_value(GPIO_PTB6, state);
-}
-
-static int sdhi0_get_cd(struct platform_device *pdev)
-{
-        return !gpio_get_value(GPIO_PTY7);
-}
-
 static struct sh_mobile_sdhi_info sdhi0_info = {
         .dma_slave_tx   = SHDMA_SLAVE_SDHI0_TX,
         .dma_slave_rx   = SHDMA_SLAVE_SDHI0_RX,
-        .set_pwr        = sdhi0_set_pwr,
         .tmio_caps      = MMC_CAP_SDIO_IRQ | MMC_CAP_POWER_OFF_CARD |
                           MMC_CAP_NEEDS_POLL,
-        .get_cd         = sdhi0_get_cd,
+        .tmio_flags     = TMIO_MMC_USE_GPIO_CD,
+        .cd_gpio        = GPIO_PTY7,
 };
 
 static struct resource sdhi0_resources[] = {
@@ -654,39 +632,15 @@ static struct platform_device sdhi0_device = {
         },
 };
 
-static void cn12_set_pwr(struct platform_device *pdev, int state)
-{
-        static int power_gpio = -EINVAL;
-
-        if (power_gpio < 0) {
-                int ret = gpio_request(GPIO_PTB7, NULL);
-                if (!ret) {
-                        power_gpio = GPIO_PTB7;
-                        gpio_direction_output(power_gpio, 0);
-                }
-        }
-
-        /*
-         * Toggle the GPIO regardless, whether we managed to grab it above or
-         * the fixed regulator driver did.
-         */
-        gpio_set_value(GPIO_PTB7, state);
-}
-
 #if !defined(CONFIG_MMC_SH_MMCIF) && !defined(CONFIG_MMC_SH_MMCIF_MODULE)
 /* SDHI1 */
-static int sdhi1_get_cd(struct platform_device *pdev)
-{
-        return !gpio_get_value(GPIO_PTW7);
-}
-
 static struct sh_mobile_sdhi_info sdhi1_info = {
         .dma_slave_tx   = SHDMA_SLAVE_SDHI1_TX,
         .dma_slave_rx   = SHDMA_SLAVE_SDHI1_RX,
         .tmio_caps      = MMC_CAP_SDIO_IRQ | MMC_CAP_POWER_OFF_CARD |
                           MMC_CAP_NEEDS_POLL,
-        .set_pwr        = cn12_set_pwr,
-        .get_cd         = sdhi1_get_cd,
+        .tmio_flags     = TMIO_MMC_USE_GPIO_CD,
+        .cd_gpio        = GPIO_PTW7,
 };
 
 static struct resource sdhi1_resources[] = {
@@ -716,27 +670,19 @@ static struct platform_device sdhi1_device = {
 #else
 
 /* MMC SPI */
-static int mmc_spi_get_ro(struct device *dev)
-{
-        return gpio_get_value(GPIO_PTY6);
-}
-
-static int mmc_spi_get_cd(struct device *dev)
-{
-        return !gpio_get_value(GPIO_PTY7);
-}
-
 static void mmc_spi_setpower(struct device *dev, unsigned int maskval)
 {
         gpio_set_value(GPIO_PTB6, maskval ? 1 : 0);
 }
 
 static struct mmc_spi_platform_data mmc_spi_info = {
-        .get_ro = mmc_spi_get_ro,
-        .get_cd = mmc_spi_get_cd,
         .caps = MMC_CAP_NEEDS_POLL,
+        .caps2 = MMC_CAP2_RO_ACTIVE_HIGH,
         .ocr_mask = MMC_VDD_32_33 | MMC_VDD_33_34, /* 3.3V only */
         .setpower = mmc_spi_setpower,
+        .flags = MMC_SPI_USE_CD_GPIO | MMC_SPI_USE_RO_GPIO,
+        .cd_gpio = GPIO_PTY7,
+        .ro_gpio = GPIO_PTY6,
 };
 
 static struct spi_board_info spi_bus[] = {
@@ -996,11 +942,6 @@ static struct platform_device vou_device = {
 
 #if defined(CONFIG_MMC_SH_MMCIF) || defined(CONFIG_MMC_SH_MMCIF_MODULE)
 /* SH_MMCIF */
-static void mmcif_down_pwr(struct platform_device *pdev)
-{
-        cn12_set_pwr(pdev, 0);
-}
-
 static struct resource sh_mmcif_resources[] = {
         [0] = {
                 .name   = "SH_MMCIF",
@@ -1021,8 +962,6 @@ static struct resource sh_mmcif_resources[] = {
 };
 
 static struct sh_mmcif_plat_data sh_mmcif_plat = {
-        .set_pwr        = cn12_set_pwr,
-        .down_pwr       = mmcif_down_pwr,
         .sup_pclk       = 0, /* SH7724: Max Pclk/2 */
         .caps           = MMC_CAP_4_BIT_DATA |
                           MMC_CAP_8_BIT_DATA |
@@ -1049,6 +988,7 @@ static struct platform_device *ecovec_devices[] __initdata = {
         &usb1_common_device,
         &usbhs_device,
         &lcdc_device,
+        &gpio_backlight_device,
         &ceu0_device,
         &ceu1_device,
         &keysc_device,
@@ -1239,11 +1179,9 @@ static int __init arch_setup(void)
 
         gpio_request(GPIO_PTE6, NULL);
         gpio_request(GPIO_PTU1, NULL);
-        gpio_request(GPIO_PTR1, NULL);
         gpio_request(GPIO_PTA2, NULL);
         gpio_direction_input(GPIO_PTE6);
         gpio_direction_output(GPIO_PTU1, 0);
-        gpio_direction_output(GPIO_PTR1, 0);
         gpio_direction_output(GPIO_PTA2, 0);
 
         /* I/O buffer drive ability is high */
@@ -1256,6 +1194,9 @@ static int __init arch_setup(void)
                 lcdc_info.ch[0].lcd_modes               = ecovec_dvi_modes;
                 lcdc_info.ch[0].num_modes               = ARRAY_SIZE(ecovec_dvi_modes);
 
+                /* No backlight */
+                gpio_backlight_data.fbdev = NULL;
+
                 gpio_set_value(GPIO_PTA2, 1);
                 gpio_set_value(GPIO_PTU1, 1);
         } else {
@@ -1265,8 +1206,6 @@ static int __init arch_setup(void)
                 lcdc_info.ch[0].lcd_modes               = ecovec_lcd_modes;
                 lcdc_info.ch[0].num_modes               = ARRAY_SIZE(ecovec_lcd_modes);
 
-                gpio_set_value(GPIO_PTR1, 1);
-
                 /* FIXME
                  *
                  * LCDDON control is needed for Panel,
@@ -1339,10 +1278,6 @@ static int __init arch_setup(void)
         gpio_direction_input(GPIO_PTR6);
 
         /* SD-card slot CN11 */
-        /* Card-detect, used on CN11, either with SDHI0 or with SPI */
-        gpio_request(GPIO_PTY7, NULL);
-        gpio_direction_input(GPIO_PTY7);
-
 #if defined(CONFIG_MMC_SDHI) || defined(CONFIG_MMC_SDHI_MODULE)
         /* enable SDHI0 on CN11 (needs DS2.4 set to ON) */
         gpio_request(GPIO_FN_SDHI0WP,  NULL);
@@ -1361,8 +1296,6 @@ static int __init arch_setup(void)
         gpio_direction_output(GPIO_PTM4, 1); /* active low CS */
         gpio_request(GPIO_PTB6, NULL); /* 3.3V power control */
         gpio_direction_output(GPIO_PTB6, 0); /* disable power by default */
-        gpio_request(GPIO_PTY6, NULL); /* write protect */
-        gpio_direction_input(GPIO_PTY6);
 
         spi_register_board_info(spi_bus, ARRAY_SIZE(spi_bus));
 #endif
@@ -1392,10 +1325,6 @@ static int __init arch_setup(void)
         gpio_request(GPIO_FN_SDHI1D1,  NULL);
         gpio_request(GPIO_FN_SDHI1D0,  NULL);
 
-        /* Card-detect, used on CN12 with SDHI1 */
-        gpio_request(GPIO_PTW7, NULL);
-        gpio_direction_input(GPIO_PTW7);
-
         cn12_enabled = true;
 #endif
 
diff --git a/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c b/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c
index c62050332629..355a78a3b313 100644
--- a/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c
+++ b/arch/sh/boards/mach-kfr2r09/lcd_wqvga.c
@@ -276,51 +276,3 @@ void kfr2r09_lcd_start(void *sohandle, struct sh_mobile_lcdc_sys_bus_ops *so)
 {
         write_memory_start(sohandle, so);
 }
-
-#define CTRL_CKSW       0x10
-#define CTRL_C10        0x20
-#define CTRL_CPSW       0x80
-#define MAIN_MLED4      0x40
-#define MAIN_MSW        0x80
-
-int kfr2r09_lcd_set_brightness(int brightness)
-{
-        struct i2c_adapter *a;
-        struct i2c_msg msg;
-        unsigned char buf[2];
-        int ret;
-
-        a = i2c_get_adapter(0);
-        if (!a)
-                return -ENODEV;
-
-        buf[0] = 0x00;
-        if (brightness)
-                buf[1] = CTRL_CPSW | CTRL_C10 | CTRL_CKSW;
-        else
-                buf[1] = 0;
-
-        msg.addr = 0x75;
-        msg.buf = buf;
-        msg.len = 2;
-        msg.flags = 0;
-        ret = i2c_transfer(a, &msg, 1);
-        if (ret != 1)
-                return -ENODEV;
-
-        buf[0] = 0x01;
-        if (brightness)
-                buf[1] = MAIN_MSW | MAIN_MLED4 | 0x0c;
-        else
-                buf[1] = 0;
-
-        msg.addr = 0x75;
-        msg.buf = buf;
-        msg.len = 2;
-        msg.flags = 0;
-        ret = i2c_transfer(a, &msg, 1);
-        if (ret != 1)
-                return -ENODEV;
-
-        return 0;
-}
diff --git a/arch/sh/boards/mach-kfr2r09/setup.c b/arch/sh/boards/mach-kfr2r09/setup.c
index ab502f12ef57..1df4398f8375 100644
--- a/arch/sh/boards/mach-kfr2r09/setup.c
+++ b/arch/sh/boards/mach-kfr2r09/setup.c
@@ -21,6 +21,7 @@
 #include <linux/input.h>
 #include <linux/input/sh_keysc.h>
 #include <linux/i2c.h>
+#include <linux/platform_data/lv5207lp.h>
 #include <linux/regulator/fixed.h>
 #include <linux/regulator/machine.h>
 #include <linux/usb/r8a66597.h>
@@ -159,11 +160,6 @@ static struct sh_mobile_lcdc_info kfr2r09_sh_lcdc_info = {
                         .setup_sys = kfr2r09_lcd_setup,
                         .start_transfer = kfr2r09_lcd_start,
                 },
-                .bl_info = {
-                        .name = "sh_mobile_lcdc_bl",
-                        .max_brightness = 1,
-                        .set_brightness = kfr2r09_lcd_set_brightness,
-                },
                 .sys_bus_cfg = {
                         .ldmt2r = 0x07010904,
                         .ldmt3r = 0x14012914,
@@ -195,6 +191,17 @@ static struct platform_device kfr2r09_sh_lcdc_device = {
         },
 };
 
+static struct lv5207lp_platform_data kfr2r09_backlight_data = {
+        .fbdev = &kfr2r09_sh_lcdc_device.dev,
+        .def_value = 13,
+        .max_value = 13,
+};
+
+static struct i2c_board_info kfr2r09_backlight_board_info = {
+        I2C_BOARD_INFO("lv5207lp", 0x75),
+        .platform_data = &kfr2r09_backlight_data,
+};
+
 static struct r8a66597_platdata kfr2r09_usb0_gadget_data = {
         .on_chip = 1,
 };
@@ -627,6 +634,8 @@ static int __init kfr2r09_devices_setup(void)
         gpio_request(GPIO_FN_SDHI0CMD, NULL);
         gpio_request(GPIO_FN_SDHI0CLK, NULL);
 
+        i2c_register_board_info(0, &kfr2r09_backlight_board_info, 1);
+
         return platform_add_devices(kfr2r09_devices,
                                     ARRAY_SIZE(kfr2r09_devices));
 }
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index b70180ef3e29..21e4230659a5 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -365,7 +365,7 @@ static struct platform_device keysc_device = {
 static struct resource sh_eth_resources[] = {
         [0] = {
                 .start = SH_ETH_ADDR,
-                .end   = SH_ETH_ADDR + 0x1FC,
+                .end   = SH_ETH_ADDR + 0x1FC - 1,
                 .flags = IORESOURCE_MEM,
         },
         [1] = {
@@ -377,6 +377,7 @@ static struct resource sh_eth_resources[] = {
 static struct sh_eth_plat_data sh_eth_plat = {
         .phy = 0x1f, /* SMSC LAN8187 */
         .edmac_endian = EDMAC_LITTLE_ENDIAN,
+        .phy_interface = PHY_INTERFACE_MODE_MII,
 };
 
 static struct platform_device sh_eth_device = {
diff --git a/arch/sh/boards/mach-sh7763rdp/setup.c b/arch/sh/boards/mach-sh7763rdp/setup.c
index 50ba481fa240..2c8fb04685d4 100644
--- a/arch/sh/boards/mach-sh7763rdp/setup.c
+++ b/arch/sh/boards/mach-sh7763rdp/setup.c
@@ -88,7 +88,6 @@ static struct resource sh_eth_resources[] = {
 static struct sh_eth_plat_data sh7763_eth_pdata = {
         .phy = 1,
         .edmac_endian = EDMAC_LITTLE_ENDIAN,
-        .register_type = SH_ETH_REG_GIGABIT,
         .phy_interface = PHY_INTERFACE_MODE_MII,
 };
 
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index 102f5d58b037..60ed3e1c4b75 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -69,7 +69,6 @@ static void pcibios_scanbus(struct pci_channel *hose)
 
                 pci_bus_size_bridges(bus);
                 pci_bus_assign_resources(bus);
-                pci_enable_bridges(bus);
         } else {
                 pci_free_resource_list(&resources);
         }
diff --git a/arch/sh/include/mach-kfr2r09/mach/kfr2r09.h b/arch/sh/include/mach-kfr2r09/mach/kfr2r09.h
index c20c9e5f5eab..79f154e5cb9c 100644
--- a/arch/sh/include/mach-kfr2r09/mach/kfr2r09.h
+++ b/arch/sh/include/mach-kfr2r09/mach/kfr2r09.h
@@ -4,13 +4,11 @@
 #include <video/sh_mobile_lcdc.h>
 
 #if defined(CONFIG_FB_SH_MOBILE_LCDC) || defined(CONFIG_FB_SH_MOBILE_LCDC_MODULE)
-int kfr2r09_lcd_set_brightness(int brightness);
 int kfr2r09_lcd_setup(void *sys_ops_handle,
                       struct sh_mobile_lcdc_sys_bus_ops *sys_ops);
 void kfr2r09_lcd_start(void *sys_ops_handle,
                        struct sh_mobile_lcdc_sys_bus_ops *sys_ops);
 #else
-static int kfr2r09_lcd_set_brightness(int brightness) {}
 static int kfr2r09_lcd_setup(void *sys_ops_handle,
                                 struct sh_mobile_lcdc_sys_bus_ops *sys_ops)
 {
diff --git a/arch/sh/kernel/cpu/sh2/setup-sh7619.c b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
index bb11e1925178..4df4d4ffe39b 100644
--- a/arch/sh/kernel/cpu/sh2/setup-sh7619.c
+++ b/arch/sh/kernel/cpu/sh2/setup-sh7619.c
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/serial.h>
 #include <linux/serial_sci.h>
+#include <linux/sh_eth.h>
 #include <linux/sh_timer.h>
 #include <linux/io.h>
 
@@ -110,10 +111,16 @@ static struct platform_device scif2_device = {
         },
 };
 
+static struct sh_eth_plat_data eth_platform_data = {
+        .phy            = 1,
+        .edmac_endian   = EDMAC_LITTLE_ENDIAN,
+        .phy_interface  = PHY_INTERFACE_MODE_MII,
+};
+
 static struct resource eth_resources[] = {
         [0] = {
                 .start = 0xfb000000,
-                .end =   0xfb0001c8,
+                .end = 0xfb0001c7,
                 .flags = IORESOURCE_MEM,
         },
         [1] = {
@@ -127,7 +134,7 @@ static struct platform_device eth_device = {
         .name = "sh7619-ether",
         .id = -1,
         .dev = {
-                .platform_data = (void *)1,
+                .platform_data = &eth_platform_data,
         },
         .num_resources = ARRAY_SIZE(eth_resources),
         .resource = eth_resources,
diff --git a/arch/sh/kernel/cpu/shmobile/cpuidle.c b/arch/sh/kernel/cpu/shmobile/cpuidle.c
index d30622592116..e3abfd4277e2 100644
--- a/arch/sh/kernel/cpu/shmobile/cpuidle.c
+++ b/arch/sh/kernel/cpu/shmobile/cpuidle.c
@@ -91,13 +91,11 @@ static struct cpuidle_driver cpuidle_driver = {
 
 int __init sh_mobile_setup_cpuidle(void)
 {
-        int ret;
-
         if (sh_mobile_sleep_supported & SUSP_SH_SF)
                 cpuidle_driver.states[1].disabled = false;
 
         if (sh_mobile_sleep_supported & SUSP_SH_STANDBY)
                 cpuidle_driver.states[2].disabled = false;
 
-        return cpuidle_register(&cpuidle_driver);
+        return cpuidle_register(&cpuidle_driver, NULL);
 }
diff --git a/arch/sh/mm/fault.c b/arch/sh/mm/fault.c
index 1f49c28affa9..541dc6101508 100644
--- a/arch/sh/mm/fault.c
+++ b/arch/sh/mm/fault.c
@@ -400,9 +400,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
         struct mm_struct *mm;
         struct vm_area_struct * vma;
         int fault;
-        int write = error_code & FAULT_CODE_WRITE;
-        unsigned int flags = (FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
-                              (write ? FAULT_FLAG_WRITE : 0));
+        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
 
         tsk = current;
         mm = tsk->mm;
@@ -476,6 +474,11 @@ good_area:
 
         set_thread_fault_code(error_code);
 
+        if (user_mode(regs))
+                flags |= FAULT_FLAG_USER;
+        if (error_code & FAULT_CODE_WRITE)
+                flags |= FAULT_FLAG_WRITE;
+
         /*
          * If for any reason at all we couldn't handle the fault,
          * make sure we exit gracefully rather than endlessly redo
diff --git a/arch/sh/mm/hugetlbpage.c b/arch/sh/mm/hugetlbpage.c
index d7762349ea48..0d676a41081e 100644
--- a/arch/sh/mm/hugetlbpage.c
+++ b/arch/sh/mm/hugetlbpage.c
@@ -83,6 +83,11 @@ int pud_huge(pud_t pud)
         return 0;
 }
 
+int pmd_huge_support(void)
+{
+        return 0;
+}
+
 struct page *follow_huge_pmd(struct mm_struct *mm, unsigned long address,
                              pmd_t *pmd, int write)
 {
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index a00cbd356db5..2137ad667438 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -26,7 +26,6 @@ config SPARC
         select HAVE_DMA_ATTRS
         select HAVE_DMA_API_DEBUG
         select HAVE_ARCH_JUMP_LABEL
-        select HAVE_GENERIC_HARDIRQS
         select GENERIC_IRQ_SHOW
         select ARCH_WANT_IPC_PARSE_VERSION
         select USE_GENERIC_SMP_HELPERS if SMP
@@ -52,7 +51,6 @@ config SPARC32
 
 config SPARC64
         def_bool 64BIT
-        select ARCH_SUPPORTS_MSI
         select HAVE_FUNCTION_TRACER
         select HAVE_FUNCTION_GRAPH_TRACER
         select HAVE_FUNCTION_GRAPH_FP_TEST
diff --git a/arch/sparc/include/asm/switch_to_64.h b/arch/sparc/include/asm/switch_to_64.h
index c7de3323819c..8d284801f232 100644
--- a/arch/sparc/include/asm/switch_to_64.h
+++ b/arch/sparc/include/asm/switch_to_64.h
@@ -48,8 +48,8 @@ do {	save_and_clear_fpu();						\
         "wrpr   %%g0, 14, %%pil\n\t"                                    \
         "brz,pt %%o7, switch_to_pc\n\t"                                 \
         " mov   %%g7, %0\n\t"                                           \
-        "sethi  %%hi(ret_from_syscall), %%g1\n\t"                       \
-        "jmpl   %%g1 + %%lo(ret_from_syscall), %%g0\n\t"                \
+        "sethi  %%hi(ret_from_fork), %%g1\n\t"                          \
+        "jmpl   %%g1 + %%lo(ret_from_fork), %%g0\n\t"                   \
         " nop\n\t"                                                      \
         ".globl switch_to_pc\n\t"                                       \
         "switch_to_pc:\n\t"                                             \
diff --git a/arch/sparc/kernel/cpumap.c b/arch/sparc/kernel/cpumap.c
index e4de74c2c9b0..cb5d272d658a 100644
--- a/arch/sparc/kernel/cpumap.c
+++ b/arch/sparc/kernel/cpumap.c
@@ -327,6 +327,7 @@ static int iterate_cpu(struct cpuinfo_tree *t, unsigned int root_index)
         case SUN4V_CHIP_NIAGARA3:
         case SUN4V_CHIP_NIAGARA4:
         case SUN4V_CHIP_NIAGARA5:
+        case SUN4V_CHIP_SPARC64X:
                 rover_inc_table = niagara_iterate_method;
                 break;
         default:
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index e2a030045089..33c02b15f478 100644
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -839,7 +839,7 @@ sys_sigreturn:
          nop
 
         call    syscall_trace
-         nop
+         mov    1, %o1
 
 1:
         /* We don't want to muck with user registers like a
diff --git a/arch/sparc/kernel/kgdb_64.c b/arch/sparc/kernel/kgdb_64.c
index c8759550799f..53c0a82e6030 100644
--- a/arch/sparc/kernel/kgdb_64.c
+++ b/arch/sparc/kernel/kgdb_64.c
@@ -42,7 +42,7 @@ void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p)
 {
         struct thread_info *t = task_thread_info(p);
         extern unsigned int switch_to_pc;
-        extern unsigned int ret_from_syscall;
+        extern unsigned int ret_from_fork;
         struct reg_window *win;
         unsigned long pc, cwp;
         int i;
@@ -66,7 +66,7 @@ void sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *p)
                 gdb_regs[i] = 0;
 
         if (t->new_child)
-                pc = (unsigned long) &ret_from_syscall;
+                pc = (unsigned long) &ret_from_fork;
         else
                 pc = (unsigned long) &switch_to_pc;
 
diff --git a/arch/sparc/kernel/ktlb.S b/arch/sparc/kernel/ktlb.S
index 0746e5e32b37..fde5a419cf27 100644
--- a/arch/sparc/kernel/ktlb.S
+++ b/arch/sparc/kernel/ktlb.S
@@ -25,11 +25,10 @@ kvmap_itlb:
          */
 kvmap_itlb_4v:
 
-kvmap_itlb_nonlinear:
         /* Catch kernel NULL pointer calls.  */
         sethi           %hi(PAGE_SIZE), %g5
         cmp             %g4, %g5
-        bleu,pn         %xcc, kvmap_dtlb_longpath
+        blu,pn          %xcc, kvmap_itlb_longpath
          nop
 
         KERN_TSB_LOOKUP_TL1(%g4, %g6, %g5, %g1, %g2, %g3, kvmap_itlb_load)
diff --git a/arch/sparc/kernel/ptrace_64.c b/arch/sparc/kernel/ptrace_64.c
index 7ff45e4ba681..773c1f2983ce 100644
--- a/arch/sparc/kernel/ptrace_64.c
+++ b/arch/sparc/kernel/ptrace_64.c
@@ -14,6 +14,7 @@
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/errno.h>
+#include <linux/export.h>
 #include <linux/ptrace.h>
 #include <linux/user.h>
 #include <linux/smp.h>
@@ -116,6 +117,7 @@ void flush_ptrace_access(struct vm_area_struct *vma, struct page *page,
 
         preempt_enable();
 }
+EXPORT_SYMBOL_GPL(flush_ptrace_access);
 
 static int get_from_target(struct task_struct *target, unsigned long uaddr,
                            void *kbuf, int len)
@@ -1087,7 +1089,7 @@ asmlinkage void syscall_trace_leave(struct pt_regs *regs)
         audit_syscall_exit(regs);
 
         if (unlikely(test_thread_flag(TIF_SYSCALL_TRACEPOINT)))
-                trace_sys_exit(regs, regs->u_regs[UREG_G1]);
+                trace_sys_exit(regs, regs->u_regs[UREG_I0]);
 
         if (test_thread_flag(TIF_SYSCALL_TRACE))
                 tracehook_report_syscall_exit(regs, 0);
diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c
index 13785547e435..3fdb455e3318 100644
--- a/arch/sparc/kernel/setup_64.c
+++ b/arch/sparc/kernel/setup_64.c
@@ -499,12 +499,14 @@ static void __init init_sparc64_elf_hwcap(void)
                     sun4v_chip_type == SUN4V_CHIP_NIAGARA2 ||
                     sun4v_chip_type == SUN4V_CHIP_NIAGARA3 ||
                     sun4v_chip_type == SUN4V_CHIP_NIAGARA4 ||
-                    sun4v_chip_type == SUN4V_CHIP_NIAGARA5)
+                    sun4v_chip_type == SUN4V_CHIP_NIAGARA5 ||
+                    sun4v_chip_type == SUN4V_CHIP_SPARC64X)
                         cap |= HWCAP_SPARC_BLKINIT;
                 if (sun4v_chip_type == SUN4V_CHIP_NIAGARA2 ||
                     sun4v_chip_type == SUN4V_CHIP_NIAGARA3 ||
                     sun4v_chip_type == SUN4V_CHIP_NIAGARA4 ||
-                    sun4v_chip_type == SUN4V_CHIP_NIAGARA5)
+                    sun4v_chip_type == SUN4V_CHIP_NIAGARA5 ||
+                    sun4v_chip_type == SUN4V_CHIP_SPARC64X)
                         cap |= HWCAP_SPARC_N2;
         }
 
@@ -530,13 +532,15 @@ static void __init init_sparc64_elf_hwcap(void)
                         if (sun4v_chip_type == SUN4V_CHIP_NIAGARA2 ||
                             sun4v_chip_type == SUN4V_CHIP_NIAGARA3 ||
                             sun4v_chip_type == SUN4V_CHIP_NIAGARA4 ||
-                            sun4v_chip_type == SUN4V_CHIP_NIAGARA5)
+                            sun4v_chip_type == SUN4V_CHIP_NIAGARA5 ||
+                            sun4v_chip_type == SUN4V_CHIP_SPARC64X)
                                 cap |= (AV_SPARC_VIS | AV_SPARC_VIS2 |
                                         AV_SPARC_ASI_BLK_INIT |
                                         AV_SPARC_POPC);
                         if (sun4v_chip_type == SUN4V_CHIP_NIAGARA3 ||
                             sun4v_chip_type == SUN4V_CHIP_NIAGARA4 ||
-                            sun4v_chip_type == SUN4V_CHIP_NIAGARA5)
+                            sun4v_chip_type == SUN4V_CHIP_NIAGARA5 ||
+                            sun4v_chip_type == SUN4V_CHIP_SPARC64X)
                                 cap |= (AV_SPARC_VIS3 | AV_SPARC_HPC |
                                         AV_SPARC_FMAF);
                 }
diff --git a/arch/sparc/kernel/sys_sparc32.c b/arch/sparc/kernel/sys_sparc32.c
index 3d0ddbc005fe..71368850dfc0 100644
--- a/arch/sparc/kernel/sys_sparc32.c
+++ b/arch/sparc/kernel/sys_sparc32.c
@@ -169,10 +169,10 @@ COMPAT_SYSCALL_DEFINE5(rt_sigaction, int, sig,
                 new_ka.ka_restorer = restorer;
                 ret = get_user(u_handler, &act->sa_handler);
                 new_ka.sa.sa_handler =  compat_ptr(u_handler);
-                ret |= __copy_from_user(&set32, &act->sa_mask, sizeof(compat_sigset_t));
+                ret |= copy_from_user(&set32, &act->sa_mask, sizeof(compat_sigset_t));
                 sigset_from_compat(&new_ka.sa.sa_mask, &set32);
-                ret |= __get_user(new_ka.sa.sa_flags, &act->sa_flags);
-                ret |= __get_user(u_restorer, &act->sa_restorer);
+                ret |= get_user(new_ka.sa.sa_flags, &act->sa_flags);
+                ret |= get_user(u_restorer, &act->sa_restorer);
                 new_ka.sa.sa_restorer = compat_ptr(u_restorer);
                 if (ret)
                         return -EFAULT;
@@ -183,9 +183,9 @@ COMPAT_SYSCALL_DEFINE5(rt_sigaction, int, sig,
         if (!ret && oact) {
                 sigset_to_compat(&set32, &old_ka.sa.sa_mask);
                 ret = put_user(ptr_to_compat(old_ka.sa.sa_handler), &oact->sa_handler);
-                ret |= __copy_to_user(&oact->sa_mask, &set32, sizeof(compat_sigset_t));
-                ret |= __put_user(old_ka.sa.sa_flags, &oact->sa_flags);
-                ret |= __put_user(ptr_to_compat(old_ka.sa.sa_restorer), &oact->sa_restorer);
+                ret |= copy_to_user(&oact->sa_mask, &set32, sizeof(compat_sigset_t));
+                ret |= put_user(old_ka.sa.sa_flags, &oact->sa_flags);
+                ret |= put_user(ptr_to_compat(old_ka.sa.sa_restorer), &oact->sa_restorer);
                 if (ret)
                         ret = -EFAULT;
         }
diff --git a/arch/sparc/kernel/syscalls.S b/arch/sparc/kernel/syscalls.S
index 22a1098961f5..d950197a17e1 100644
--- a/arch/sparc/kernel/syscalls.S
+++ b/arch/sparc/kernel/syscalls.S
@@ -98,8 +98,8 @@ sys_clone:
         ba,pt   %xcc, sparc_do_fork
          add    %sp, PTREGS_OFF, %o2
 
-        .globl  ret_from_syscall
-ret_from_syscall:
+        .globl  ret_from_fork
+ret_from_fork:
         /* Clear current_thread_info()->new_child. */
         stb     %g0, [%g6 + TI_NEW_CHILD]
         call    schedule_tail
@@ -152,7 +152,7 @@ linux_syscall_trace32:
         srl     %i4, 0, %o4
         srl     %i1, 0, %o1
         srl     %i2, 0, %o2
-        ba,pt   %xcc, 2f
+        ba,pt   %xcc, 5f
          srl    %i3, 0, %o3
 
 linux_syscall_trace:
@@ -182,13 +182,13 @@ linux_sparc_syscall32:
         srl     %i1, 0, %o1                             ! IEU0  Group
         ldx     [%g6 + TI_FLAGS], %l0           ! Load
 
-        srl     %i5, 0, %o5                             ! IEU1
+        srl     %i3, 0, %o3                             ! IEU0
         srl     %i2, 0, %o2                             ! IEU0  Group
         andcc   %l0, (_TIF_SYSCALL_TRACE|_TIF_SECCOMP|_TIF_SYSCALL_AUDIT|_TIF_SYSCALL_TRACEPOINT), %g0
         bne,pn  %icc, linux_syscall_trace32             ! CTI
          mov    %i0, %l5                                ! IEU1
-        call    %l7                                     ! CTI   Group brk forced
-         srl    %i3, 0, %o3                             ! IEU0
+5:      call    %l7                                     ! CTI   Group brk forced
+         srl    %i5, 0, %o5                             ! IEU1
         ba,a,pt %xcc, 3f
 
         /* Linux native system calls enter here... */
diff --git a/arch/sparc/kernel/trampoline_64.S b/arch/sparc/kernel/trampoline_64.S
index e0b1e13a0736..ad4bde3bb61e 100644
--- a/arch/sparc/kernel/trampoline_64.S
+++ b/arch/sparc/kernel/trampoline_64.S
@@ -129,7 +129,6 @@ startup_continue:
         clr             %l5
         sethi           %hi(num_kernel_image_mappings), %l6
         lduw            [%l6 + %lo(num_kernel_image_mappings)], %l6
-        add             %l6, 1, %l6
 
         mov             15, %l7
         BRANCH_IF_ANY_CHEETAH(g1,g5,2f)
@@ -222,7 +221,6 @@ niagara_lock_tlb:
         clr             %l5
         sethi           %hi(num_kernel_image_mappings), %l6
         lduw            [%l6 + %lo(num_kernel_image_mappings)], %l6
-        add             %l6, 1, %l6
 
 1:
         mov             HV_FAST_MMU_MAP_PERM_ADDR, %o5
diff --git a/arch/sparc/lib/ksyms.c b/arch/sparc/lib/ksyms.c
index 0c4e35e522fa..323335b9cd2b 100644
--- a/arch/sparc/lib/ksyms.c
+++ b/arch/sparc/lib/ksyms.c
@@ -98,15 +98,6 @@ EXPORT_SYMBOL(___copy_from_user);
 EXPORT_SYMBOL(___copy_in_user);
 EXPORT_SYMBOL(__clear_user);
 
-/* RW semaphores */
-EXPORT_SYMBOL(__down_read);
-EXPORT_SYMBOL(__down_read_trylock);
-EXPORT_SYMBOL(__down_write);
-EXPORT_SYMBOL(__down_write_trylock);
-EXPORT_SYMBOL(__up_read);
-EXPORT_SYMBOL(__up_write);
-EXPORT_SYMBOL(__downgrade_write);
-
 /* Atomic counter implementation. */
 EXPORT_SYMBOL(atomic_add);
 EXPORT_SYMBOL(atomic_add_ret);
diff --git a/arch/sparc/mm/fault_32.c b/arch/sparc/mm/fault_32.c
index e98bfda205a2..59dbd4645725 100644
--- a/arch/sparc/mm/fault_32.c
+++ b/arch/sparc/mm/fault_32.c
@@ -177,8 +177,7 @@ asmlinkage void do_sparc_fault(struct pt_regs *regs, int text_fault, int write,
         unsigned long g2;
         int from_user = !(regs->psr & PSR_PS);
         int fault, code;
-        unsigned int flags = (FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
-                              (write ? FAULT_FLAG_WRITE : 0));
+        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
 
         if (text_fault)
                 address = regs->pc;
@@ -235,6 +234,11 @@ good_area:
                         goto bad_area;
         }
 
+        if (from_user)
+                flags |= FAULT_FLAG_USER;
+        if (write)
+                flags |= FAULT_FLAG_WRITE;
+
         /*
          * If for any reason at all we couldn't handle the fault,
          * make sure we exit gracefully rather than endlessly redo
@@ -383,6 +387,7 @@ static void force_user_fault(unsigned long address, int write)
         struct vm_area_struct *vma;
         struct task_struct *tsk = current;
         struct mm_struct *mm = tsk->mm;
+        unsigned int flags = FAULT_FLAG_USER;
         int code;
 
         code = SEGV_MAPERR;
@@ -402,11 +407,12 @@ good_area:
         if (write) {
                 if (!(vma->vm_flags & VM_WRITE))
                         goto bad_area;
+                flags |= FAULT_FLAG_WRITE;
         } else {
                 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
                         goto bad_area;
         }
-        switch (handle_mm_fault(mm, vma, address, write ? FAULT_FLAG_WRITE : 0)) {
+        switch (handle_mm_fault(mm, vma, address, flags)) {
         case VM_FAULT_SIGBUS:
         case VM_FAULT_OOM:
                 goto do_sigbus;
diff --git a/arch/sparc/mm/fault_64.c b/arch/sparc/mm/fault_64.c
index 5062ff389e83..2ebec263d685 100644
--- a/arch/sparc/mm/fault_64.c
+++ b/arch/sparc/mm/fault_64.c
@@ -315,7 +315,8 @@ asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
                         bad_kernel_pc(regs, address);
                         return;
                 }
-        }
+        } else
+                flags |= FAULT_FLAG_USER;
 
         /*
          * If we're in an interrupt or have no user
@@ -418,13 +419,14 @@ good_area:
                     vma->vm_file != NULL)
                         set_thread_fault_code(fault_code |
                                               FAULT_CODE_BLKCOMMIT);
+
+                flags |= FAULT_FLAG_WRITE;
         } else {
                 /* Allow reads even for write-only mappings */
                 if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
                         goto bad_area;
         }
 
-        flags |= ((fault_code & FAULT_CODE_WRITE) ? FAULT_FLAG_WRITE : 0);
         fault = handle_mm_fault(mm, vma, address, flags);
 
         if ((fault & VM_FAULT_RETRY) && fatal_signal_pending(current))
diff --git a/arch/sparc/mm/hugetlbpage.c b/arch/sparc/mm/hugetlbpage.c
index d2b59441ebdd..96399646570a 100644
--- a/arch/sparc/mm/hugetlbpage.c
+++ b/arch/sparc/mm/hugetlbpage.c
@@ -234,6 +234,11 @@ int pud_huge(pud_t pud)
         return 0;
 }
 
+int pmd_huge_support(void)
+{
+        return 0;
+}
+
 struct page *follow_huge_pmd(struct mm_struct *mm, unsigned long address,
                              pmd_t *pmd, int write)
 {
diff --git a/arch/tile/Kconfig b/arch/tile/Kconfig
index 24565a7ffe6d..d45a2c48f185 100644
--- a/arch/tile/Kconfig
+++ b/arch/tile/Kconfig
@@ -11,7 +11,6 @@ config TILE
         select USE_GENERIC_SMP_HELPERS
         select CC_OPTIMIZE_FOR_SIZE
         select HAVE_DEBUG_KMEMLEAK
-        select HAVE_GENERIC_HARDIRQS
         select GENERIC_IRQ_PROBE
         select GENERIC_PENDING_IRQ if SMP
         select GENERIC_IRQ_SHOW
@@ -26,6 +25,7 @@ config TILE
         select HAVE_SYSCALL_TRACEPOINTS
         select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
         select HAVE_DEBUG_STACKOVERFLOW
+        select ARCH_WANT_FRAME_POINTERS
 
 # FIXME: investigate whether we need/want these options.
 #       select HAVE_IOREMAP_PROT
@@ -64,6 +64,9 @@ config HUGETLB_SUPER_PAGES
         depends on HUGETLB_PAGE && TILEGX
         def_bool y
 
+config GENERIC_TIME_VSYSCALL
+        def_bool y
+
 # FIXME: tilegx can implement a more efficient rwsem.
 config RWSEM_GENERIC_SPINLOCK
         def_bool y
@@ -112,10 +115,19 @@ config SMP
 config HVC_TILE
         depends on TTY
         select HVC_DRIVER
+        select HVC_IRQ if TILEGX
         def_bool y
 
 config TILEGX
-        bool "Building with TILE-Gx (64-bit) compiler and toolchain"
+        bool "Building for TILE-Gx (64-bit) processor"
+        select HAVE_FUNCTION_TRACER
+        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
+        select HAVE_FUNCTION_GRAPH_TRACER
+        select HAVE_DYNAMIC_FTRACE
+        select HAVE_FTRACE_MCOUNT_RECORD
+        select HAVE_KPROBES
+        select HAVE_KRETPROBES
+        select HAVE_ARCH_KGDB
 
 config TILEPRO
         def_bool !TILEGX
@@ -194,7 +206,7 @@ config SYSVIPC_COMPAT
         def_bool y
         depends on COMPAT && SYSVIPC
 
-# We do not currently support disabling HIGHMEM on tile64 and tilepro.
+# We do not currently support disabling HIGHMEM on tilepro.
 config HIGHMEM
         bool # "Support for more than 512 MB of RAM"
         default !TILEGX
@@ -300,6 +312,8 @@ config PAGE_OFFSET
 
 source "mm/Kconfig"
 
+source "kernel/Kconfig.preempt"
+
 config CMDLINE_BOOL
         bool "Built-in kernel command line"
         default n
@@ -347,7 +361,7 @@ config CMDLINE_OVERRIDE
 
 config VMALLOC_RESERVE
         hex
-        default 0x1000000
+        default 0x2000000
 
 config HARDWALL
         bool "Hardwall support to allow access to user dynamic network"
@@ -380,7 +394,6 @@ config PCI
         select PCI_DOMAINS
         select GENERIC_PCI_IOMAP
         select TILE_GXIO_TRIO if TILEGX
-        select ARCH_SUPPORTS_MSI if TILEGX
         select PCI_MSI if TILEGX
         ---help---
           Enable PCI root complex support, so PCIe endpoint devices can
@@ -396,8 +409,20 @@ config NO_IOMEM
 config NO_IOPORT
         def_bool !PCI
 
+config TILE_PCI_IO
+        bool "PCI I/O space support"
+        default n
+        depends on PCI
+        depends on TILEGX
+        ---help---
+          Enable PCI I/O space support on TILEGx. Since the PCI I/O space
+          is used by few modern PCIe endpoint devices, its support is disabled
+          by default to save the TRIO PIO Region resource for other purposes.
+
 source "drivers/pci/Kconfig"
 
+source "drivers/pci/pcie/Kconfig"
+
 config TILE_USB
         tristate "Tilera USB host adapter support"
         default y
diff --git a/arch/tile/Kconfig.debug b/arch/tile/Kconfig.debug
index 9165ea979e85..19734d3ab1e8 100644
--- a/arch/tile/Kconfig.debug
+++ b/arch/tile/Kconfig.debug
@@ -14,14 +14,12 @@ config EARLY_PRINTK
           with klogd/syslogd. You should normally N here,
           unless you want to debug such a crash.
 
-config DEBUG_EXTRA_FLAGS
-        string "Additional compiler arguments when building with '-g'"
-        depends on DEBUG_INFO
-        default ""
+config TILE_HVGLUE_TRACE
+        bool "Provide wrapper functions for hypervisor ABI calls"
+        default n
         help
-          Debug info can be large, and flags like
-          `-femit-struct-debug-baseonly' can reduce the kernel file
-          size and build time noticeably.  Such flags are often
-          helpful if the main use of debug info is line number info.
+          Provide wrapper functions for the hypervisor ABI calls
+          defined in arch/tile/kernel/hvglue.S.  This allows tracing
+          mechanisms, etc., to have visibility into those calls.
 
 endmenu
diff --git a/arch/tile/Makefile b/arch/tile/Makefile
index 3d15364c6071..4dc380a519d4 100644
--- a/arch/tile/Makefile
+++ b/arch/tile/Makefile
@@ -30,10 +30,6 @@ endif
 # In kernel modules, this causes load failures due to unsupported relocations.
 KBUILD_CFLAGS   += -fno-asynchronous-unwind-tables
 
-ifneq ($(CONFIG_DEBUG_EXTRA_FLAGS),"")
-KBUILD_CFLAGS   += $(CONFIG_DEBUG_EXTRA_FLAGS)
-endif
-
 LIBGCC_PATH     := \
   $(shell $(CC) $(KBUILD_CFLAGS) $(KCFLAGS) -print-libgcc-file-name)
 
diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig
index 47684815e5c8..730e40d9cf62 100644
--- a/arch/tile/configs/tilegx_defconfig
+++ b/arch/tile/configs/tilegx_defconfig
@@ -1,16 +1,15 @@
 CONFIG_TILEGX=y
-CONFIG_EXPERIMENTAL=y
-# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_FHANDLE=y
+CONFIG_AUDIT=y
+CONFIG_NO_HZ=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_FHANDLE=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_AUDIT=y
 CONFIG_LOG_BUF_SHIFT=19
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_DEBUG=y
@@ -18,18 +17,18 @@ CONFIG_CGROUP_DEVICE=y
 CONFIG_CPUSETS=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEMCG=y
-CONFIG_CGROUP_MEMCG_SWAP=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_BLK_CGROUP=y
 CONFIG_NAMESPACES=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
+CONFIG_RD_XZ=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_EMBEDDED=y
 # CONFIG_COMPAT_BRK is not set
 CONFIG_PROFILING=y
+CONFIG_KPROBES=y
 CONFIG_MODULES=y
 CONFIG_MODULE_FORCE_LOAD=y
 CONFIG_MODULE_UNLOAD=y
@@ -45,12 +44,12 @@ CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_SGI_PARTITION=y
 CONFIG_SUN_PARTITION=y
 CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
 CONFIG_CFQ_GROUP_IOSCHED=y
 CONFIG_NR_CPUS=100
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
 CONFIG_HZ_100=y
+# CONFIG_COMPACTION is not set
+CONFIG_PREEMPT_VOLUNTARY=y
+CONFIG_TILE_PCI_IO=y
 CONFIG_PCI_DEBUG=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_MISC=y
@@ -108,150 +107,9 @@ CONFIG_IPV6_MULTIPLE_TABLES=y
 CONFIG_IPV6_MROUTE=y
 CONFIG_IPV6_PIMSM_V2=y
 CONFIG_NETLABEL=y
-CONFIG_NETFILTER=y
-CONFIG_NF_CONNTRACK=m
-CONFIG_NF_CONNTRACK_SECMARK=y
-CONFIG_NF_CONNTRACK_ZONES=y
-CONFIG_NF_CONNTRACK_EVENTS=y
-CONFIG_NF_CT_PROTO_DCCP=m
-CONFIG_NF_CT_PROTO_UDPLITE=m
-CONFIG_NF_CONNTRACK_AMANDA=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_CONNTRACK_H323=m
-CONFIG_NF_CONNTRACK_IRC=m
-CONFIG_NF_CONNTRACK_NETBIOS_NS=m
-CONFIG_NF_CONNTRACK_PPTP=m
-CONFIG_NF_CONNTRACK_SANE=m
-CONFIG_NF_CONNTRACK_SIP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NETFILTER_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
-CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
-CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
-CONFIG_NETFILTER_XT_TARGET_DSCP=m
-CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
-CONFIG_NETFILTER_XT_TARGET_MARK=m
-CONFIG_NETFILTER_XT_TARGET_NFLOG=m
-CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
-CONFIG_NETFILTER_XT_TARGET_TEE=m
-CONFIG_NETFILTER_XT_TARGET_TPROXY=m
-CONFIG_NETFILTER_XT_TARGET_TRACE=m
-CONFIG_NETFILTER_XT_TARGET_SECMARK=m
-CONFIG_NETFILTER_XT_TARGET_TCPMSS=m
-CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m
-CONFIG_NETFILTER_XT_MATCH_CLUSTER=m
-CONFIG_NETFILTER_XT_MATCH_COMMENT=m
-CONFIG_NETFILTER_XT_MATCH_CONNBYTES=m
-CONFIG_NETFILTER_XT_MATCH_CONNLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_CONNMARK=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_DCCP=m
-CONFIG_NETFILTER_XT_MATCH_DSCP=m
-CONFIG_NETFILTER_XT_MATCH_ESP=m
-CONFIG_NETFILTER_XT_MATCH_HASHLIMIT=m
-CONFIG_NETFILTER_XT_MATCH_HELPER=m
-CONFIG_NETFILTER_XT_MATCH_IPRANGE=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NETFILTER_XT_MATCH_LENGTH=m
-CONFIG_NETFILTER_XT_MATCH_LIMIT=m
-CONFIG_NETFILTER_XT_MATCH_MAC=m
-CONFIG_NETFILTER_XT_MATCH_MARK=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_NETFILTER_XT_MATCH_OSF=m
-CONFIG_NETFILTER_XT_MATCH_OWNER=m
-CONFIG_NETFILTER_XT_MATCH_POLICY=m
-CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m
-CONFIG_NETFILTER_XT_MATCH_PKTTYPE=m
-CONFIG_NETFILTER_XT_MATCH_QUOTA=m
-CONFIG_NETFILTER_XT_MATCH_RATEEST=m
-CONFIG_NETFILTER_XT_MATCH_REALM=m
-CONFIG_NETFILTER_XT_MATCH_RECENT=m
-CONFIG_NETFILTER_XT_MATCH_SOCKET=m
-CONFIG_NETFILTER_XT_MATCH_STATE=m
-CONFIG_NETFILTER_XT_MATCH_STATISTIC=m
-CONFIG_NETFILTER_XT_MATCH_STRING=m
-CONFIG_NETFILTER_XT_MATCH_TCPMSS=m
-CONFIG_NETFILTER_XT_MATCH_TIME=m
-CONFIG_NETFILTER_XT_MATCH_U32=m
-CONFIG_IP_VS=m
-CONFIG_IP_VS_IPV6=y
-CONFIG_IP_VS_PROTO_TCP=y
-CONFIG_IP_VS_PROTO_UDP=y
-CONFIG_IP_VS_PROTO_ESP=y
-CONFIG_IP_VS_PROTO_AH=y
-CONFIG_IP_VS_PROTO_SCTP=y
-CONFIG_IP_VS_RR=m
-CONFIG_IP_VS_WRR=m
-CONFIG_IP_VS_LC=m
-CONFIG_IP_VS_WLC=m
-CONFIG_IP_VS_LBLC=m
-CONFIG_IP_VS_LBLCR=m
-CONFIG_IP_VS_SED=m
-CONFIG_IP_VS_NQ=m
-CONFIG_NF_CONNTRACK_IPV4=m
-# CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
-CONFIG_IP_NF_QUEUE=m
-CONFIG_IP_NF_IPTABLES=y
-CONFIG_IP_NF_MATCH_AH=m
-CONFIG_IP_NF_MATCH_ECN=m
-CONFIG_IP_NF_MATCH_TTL=m
-CONFIG_IP_NF_FILTER=y
-CONFIG_IP_NF_TARGET_REJECT=y
-CONFIG_IP_NF_TARGET_LOG=m
-CONFIG_IP_NF_TARGET_ULOG=m
-CONFIG_IP_NF_MANGLE=m
-CONFIG_IP_NF_TARGET_ECN=m
-CONFIG_IP_NF_TARGET_TTL=m
-CONFIG_IP_NF_RAW=m
-CONFIG_IP_NF_SECURITY=m
-CONFIG_IP_NF_ARPTABLES=m
-CONFIG_IP_NF_ARPFILTER=m
-CONFIG_IP_NF_ARP_MANGLE=m
-CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
-CONFIG_IP6_NF_IPTABLES=m
-CONFIG_IP6_NF_MATCH_AH=m
-CONFIG_IP6_NF_MATCH_EUI64=m
-CONFIG_IP6_NF_MATCH_FRAG=m
-CONFIG_IP6_NF_MATCH_OPTS=m
-CONFIG_IP6_NF_MATCH_HL=m
-CONFIG_IP6_NF_MATCH_IPV6HEADER=m
-CONFIG_IP6_NF_MATCH_MH=m
-CONFIG_IP6_NF_MATCH_RT=m
-CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_LOG=m
-CONFIG_IP6_NF_FILTER=m
-CONFIG_IP6_NF_TARGET_REJECT=m
-CONFIG_IP6_NF_MANGLE=m
-CONFIG_IP6_NF_RAW=m
-CONFIG_IP6_NF_SECURITY=m
-CONFIG_BRIDGE_NF_EBTABLES=m
-CONFIG_BRIDGE_EBT_BROUTE=m
-CONFIG_BRIDGE_EBT_T_FILTER=m
-CONFIG_BRIDGE_EBT_T_NAT=m
-CONFIG_BRIDGE_EBT_802_3=m
-CONFIG_BRIDGE_EBT_AMONG=m
-CONFIG_BRIDGE_EBT_ARP=m
-CONFIG_BRIDGE_EBT_IP=m
-CONFIG_BRIDGE_EBT_IP6=m
-CONFIG_BRIDGE_EBT_LIMIT=m
-CONFIG_BRIDGE_EBT_MARK=m
-CONFIG_BRIDGE_EBT_PKTTYPE=m
-CONFIG_BRIDGE_EBT_STP=m
-CONFIG_BRIDGE_EBT_VLAN=m
-CONFIG_BRIDGE_EBT_ARPREPLY=m
-CONFIG_BRIDGE_EBT_DNAT=m
-CONFIG_BRIDGE_EBT_MARK_T=m
-CONFIG_BRIDGE_EBT_REDIRECT=m
-CONFIG_BRIDGE_EBT_SNAT=m
-CONFIG_BRIDGE_EBT_LOG=m
-CONFIG_BRIDGE_EBT_ULOG=m
-CONFIG_BRIDGE_EBT_NFLOG=m
 CONFIG_RDS=m
 CONFIG_RDS_TCP=m
 CONFIG_BRIDGE=m
-CONFIG_NET_DSA=y
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_PHONET=m
@@ -292,13 +150,13 @@ CONFIG_NET_ACT_POLICE=m
 CONFIG_NET_ACT_GACT=m
 CONFIG_GACT_PROB=y
 CONFIG_NET_ACT_MIRRED=m
-CONFIG_NET_ACT_IPT=m
 CONFIG_NET_ACT_NAT=m
 CONFIG_NET_ACT_PEDIT=m
 CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_CLS_IND=y
 CONFIG_DCB=y
+CONFIG_DNS_RESOLVER=y
 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
@@ -317,10 +175,12 @@ CONFIG_BLK_DEV_SD=y
 CONFIG_SCSI_CONSTANTS=y
 CONFIG_SCSI_LOGGING=y
 CONFIG_SCSI_SAS_ATA=y
+CONFIG_ISCSI_TCP=m
 CONFIG_SCSI_MVSAS=y
 # CONFIG_SCSI_MVSAS_DEBUG is not set
 CONFIG_SCSI_MVSAS_TASKLET=y
 CONFIG_ATA=y
+CONFIG_SATA_AHCI=y
 CONFIG_SATA_SIL24=y
 # CONFIG_ATA_SFF is not set
 CONFIG_MD=y
@@ -343,6 +203,12 @@ CONFIG_DM_MULTIPATH_QL=m
 CONFIG_DM_MULTIPATH_ST=m
 CONFIG_DM_DELAY=m
 CONFIG_DM_UEVENT=y
+CONFIG_TARGET_CORE=m
+CONFIG_TCM_IBLOCK=m
+CONFIG_TCM_FILEIO=m
+CONFIG_TCM_PSCSI=m
+CONFIG_LOOPBACK_TARGET=m
+CONFIG_ISCSI_TARGET=m
 CONFIG_FUSION=y
 CONFIG_FUSION_SAS=y
 CONFIG_NETDEVICES=y
@@ -359,42 +225,8 @@ CONFIG_VETH=m
 CONFIG_NET_DSA_MV88E6060=y
 CONFIG_NET_DSA_MV88E6131=y
 CONFIG_NET_DSA_MV88E6123_61_65=y
-# CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_ADAPTEC is not set
-# CONFIG_NET_VENDOR_ALTEON is not set
-# CONFIG_NET_VENDOR_AMD is not set
-# CONFIG_NET_VENDOR_ATHEROS is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_BROCADE is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_CISCO is not set
-# CONFIG_NET_VENDOR_DEC is not set
-# CONFIG_NET_VENDOR_DLINK is not set
-# CONFIG_NET_VENDOR_EMULEX is not set
-# CONFIG_NET_VENDOR_EXAR is not set
-# CONFIG_NET_VENDOR_HP is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MELLANOX is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_MYRI is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_NVIDIA is not set
-# CONFIG_NET_VENDOR_OKI is not set
-# CONFIG_NET_PACKET_ENGINE is not set
-# CONFIG_NET_VENDOR_QLOGIC is not set
-# CONFIG_NET_VENDOR_REALTEK is not set
-# CONFIG_NET_VENDOR_RDC is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SILAN is not set
-# CONFIG_NET_VENDOR_SIS is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_SUN is not set
-# CONFIG_NET_VENDOR_TEHUTI is not set
-# CONFIG_NET_VENDOR_TI is not set
-# CONFIG_TILE_NET is not set
-# CONFIG_NET_VENDOR_VIA is not set
+CONFIG_SKY2=y
+CONFIG_PTP_1588_CLOCK_TILEGX=y
 # CONFIG_WLAN is not set
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_KEYBOARD is not set
@@ -402,6 +234,7 @@ CONFIG_NET_DSA_MV88E6123_61_65=y
 # CONFIG_SERIO is not set
 # CONFIG_VT is not set
 # CONFIG_LEGACY_PTYS is not set
+CONFIG_SERIAL_TILEGX=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_I2C=y
@@ -410,13 +243,16 @@ CONFIG_I2C_CHARDEV=y
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 # CONFIG_VGA_ARB is not set
-# CONFIG_HID_SUPPORT is not set
+CONFIG_DRM=m
+CONFIG_DRM_TDFX=m
+CONFIG_DRM_R128=m
+CONFIG_DRM_MGA=m
+CONFIG_DRM_VIA=m
+CONFIG_DRM_SAVAGE=m
 CONFIG_USB=y
-# CONFIG_USB_DEVICE_CLASS is not set
 CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_USB_STORAGE=y
-CONFIG_USB_LIBUSUAL=y
 CONFIG_EDAC=y
 CONFIG_EDAC_MM_EDAC=y
 CONFIG_RTC_CLASS=y
@@ -464,9 +300,8 @@ CONFIG_ECRYPT_FS=m
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
+CONFIG_NFS_V4=m
 CONFIG_NFS_V4_1=y
 CONFIG_NFS_FSCACHE=y
 CONFIG_NFSD=m
@@ -519,25 +354,28 @@ CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
 CONFIG_NLS_KOI8_U=m
 CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
 CONFIG_DLM_DEBUG=y
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_INFO_REDUCED=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
-CONFIG_MAGIC_SYSRQ=y
 CONFIG_STRIP_ASM_SYMS=y
 CONFIG_DEBUG_FS=y
 CONFIG_HEADERS_CHECK=y
+# CONFIG_FRAME_POINTER is not set
+CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
+CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_MEMORY_INIT=y
+CONFIG_DEBUG_STACKOVERFLOW=y
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_INFO_REDUCED=y
-CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DEBUG_LIST=y
 CONFIG_DEBUG_CREDENTIALS=y
-CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
-CONFIG_DYNAMIC_DEBUG=y
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_ASYNC_RAID6_TEST=m
-CONFIG_DEBUG_STACKOVERFLOW=y
+CONFIG_KGDB=y
 CONFIG_KEYS_DEBUG_PROC_KEYS=y
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
@@ -546,7 +384,6 @@ CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SECURITY_SELINUX_DISABLE=y
-CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_TEST=m
@@ -559,14 +396,12 @@ CONFIG_CRYPTO_XTS=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_VMAC=m
-CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_RMD128=m
 CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RMD256=m
 CONFIG_CRYPTO_RMD320=m
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
diff --git a/arch/tile/configs/tilepro_defconfig b/arch/tile/configs/tilepro_defconfig
index dd2b8f0c631f..80fc32ed0491 100644
--- a/arch/tile/configs/tilepro_defconfig
+++ b/arch/tile/configs/tilepro_defconfig
@@ -1,15 +1,14 @@
-CONFIG_EXPERIMENTAL=y
-# CONFIG_LOCALVERSION_AUTO is not set
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
+CONFIG_AUDIT=y
+CONFIG_NO_HZ=y
+CONFIG_HIGH_RES_TIMERS=y
 CONFIG_BSD_PROCESS_ACCT=y
 CONFIG_BSD_PROCESS_ACCT_V3=y
-CONFIG_FHANDLE=y
 CONFIG_TASKSTATS=y
 CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_XACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
-CONFIG_AUDIT=y
 CONFIG_LOG_BUF_SHIFT=19
 CONFIG_CGROUPS=y
 CONFIG_CGROUP_DEBUG=y
@@ -17,14 +16,13 @@ CONFIG_CGROUP_DEVICE=y
 CONFIG_CPUSETS=y
 CONFIG_CGROUP_CPUACCT=y
 CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEMCG=y
-CONFIG_CGROUP_MEMCG_SWAP=y
 CONFIG_CGROUP_SCHED=y
 CONFIG_RT_GROUP_SCHED=y
 CONFIG_BLK_CGROUP=y
 CONFIG_NAMESPACES=y
 CONFIG_RELAY=y
 CONFIG_BLK_DEV_INITRD=y
+CONFIG_RD_XZ=y
 CONFIG_SYSCTL_SYSCALL=y
 CONFIG_EMBEDDED=y
 # CONFIG_COMPAT_BRK is not set
@@ -44,11 +42,10 @@ CONFIG_UNIXWARE_DISKLABEL=y
 CONFIG_SGI_PARTITION=y
 CONFIG_SUN_PARTITION=y
 CONFIG_KARMA_PARTITION=y
-CONFIG_EFI_PARTITION=y
 CONFIG_CFQ_GROUP_IOSCHED=y
-CONFIG_NO_HZ=y
-CONFIG_HIGH_RES_TIMERS=y
 CONFIG_HZ_100=y
+# CONFIG_COMPACTION is not set
+CONFIG_PREEMPT_VOLUNTARY=y
 CONFIG_PCI_DEBUG=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
 CONFIG_BINFMT_MISC=y
@@ -122,16 +119,15 @@ CONFIG_NF_CONNTRACK_PPTP=m
 CONFIG_NF_CONNTRACK_SANE=m
 CONFIG_NF_CONNTRACK_SIP=m
 CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_NETFILTER_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
 CONFIG_NETFILTER_XT_TARGET_CONNMARK=m
 CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=m
-CONFIG_NETFILTER_XT_TARGET_CT=m
 CONFIG_NETFILTER_XT_TARGET_DSCP=m
 CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m
 CONFIG_NETFILTER_XT_TARGET_MARK=m
 CONFIG_NETFILTER_XT_TARGET_NFLOG=m
 CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=m
 CONFIG_NETFILTER_XT_TARGET_TEE=m
 CONFIG_NETFILTER_XT_TARGET_TPROXY=m
 CONFIG_NETFILTER_XT_TARGET_TRACE=m
@@ -189,14 +185,12 @@ CONFIG_IP_VS_SED=m
 CONFIG_IP_VS_NQ=m
 CONFIG_NF_CONNTRACK_IPV4=m
 # CONFIG_NF_CONNTRACK_PROC_COMPAT is not set
-CONFIG_IP_NF_QUEUE=m
 CONFIG_IP_NF_IPTABLES=y
 CONFIG_IP_NF_MATCH_AH=m
 CONFIG_IP_NF_MATCH_ECN=m
 CONFIG_IP_NF_MATCH_TTL=m
 CONFIG_IP_NF_FILTER=y
 CONFIG_IP_NF_TARGET_REJECT=y
-CONFIG_IP_NF_TARGET_LOG=m
 CONFIG_IP_NF_TARGET_ULOG=m
 CONFIG_IP_NF_MANGLE=m
 CONFIG_IP_NF_TARGET_ECN=m
@@ -207,8 +201,6 @@ CONFIG_IP_NF_ARPTABLES=m
 CONFIG_IP_NF_ARPFILTER=m
 CONFIG_IP_NF_ARP_MANGLE=m
 CONFIG_NF_CONNTRACK_IPV6=m
-CONFIG_IP6_NF_QUEUE=m
-CONFIG_IP6_NF_IPTABLES=m
 CONFIG_IP6_NF_MATCH_AH=m
 CONFIG_IP6_NF_MATCH_EUI64=m
 CONFIG_IP6_NF_MATCH_FRAG=m
@@ -218,7 +210,6 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m
 CONFIG_IP6_NF_MATCH_MH=m
 CONFIG_IP6_NF_MATCH_RT=m
 CONFIG_IP6_NF_TARGET_HL=m
-CONFIG_IP6_NF_TARGET_LOG=m
 CONFIG_IP6_NF_FILTER=m
 CONFIG_IP6_NF_TARGET_REJECT=m
 CONFIG_IP6_NF_MANGLE=m
@@ -249,7 +240,6 @@ CONFIG_BRIDGE_EBT_NFLOG=m
 CONFIG_RDS=m
 CONFIG_RDS_TCP=m
 CONFIG_BRIDGE=m
-CONFIG_NET_DSA=y
 CONFIG_VLAN_8021Q=m
 CONFIG_VLAN_8021Q_GVRP=y
 CONFIG_PHONET=m
@@ -297,6 +287,7 @@ CONFIG_NET_ACT_SIMP=m
 CONFIG_NET_ACT_SKBEDIT=m
 CONFIG_NET_CLS_IND=y
 CONFIG_DCB=y
+CONFIG_DNS_RESOLVER=y
 # CONFIG_WIRELESS is not set
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
@@ -354,40 +345,7 @@ CONFIG_NET_DSA_MV88E6060=y
 CONFIG_NET_DSA_MV88E6131=y
 CONFIG_NET_DSA_MV88E6123_61_65=y
 # CONFIG_NET_VENDOR_3COM is not set
-# CONFIG_NET_VENDOR_ADAPTEC is not set
-# CONFIG_NET_VENDOR_ALTEON is not set
-# CONFIG_NET_VENDOR_AMD is not set
-# CONFIG_NET_VENDOR_ATHEROS is not set
-# CONFIG_NET_VENDOR_BROADCOM is not set
-# CONFIG_NET_VENDOR_BROCADE is not set
-# CONFIG_NET_VENDOR_CHELSIO is not set
-# CONFIG_NET_VENDOR_CISCO is not set
-# CONFIG_NET_VENDOR_DEC is not set
-# CONFIG_NET_VENDOR_DLINK is not set
-# CONFIG_NET_VENDOR_EMULEX is not set
-# CONFIG_NET_VENDOR_EXAR is not set
-# CONFIG_NET_VENDOR_HP is not set
-# CONFIG_NET_VENDOR_INTEL is not set
-# CONFIG_NET_VENDOR_MARVELL is not set
-# CONFIG_NET_VENDOR_MELLANOX is not set
-# CONFIG_NET_VENDOR_MICREL is not set
-# CONFIG_NET_VENDOR_MYRI is not set
-# CONFIG_NET_VENDOR_NATSEMI is not set
-# CONFIG_NET_VENDOR_NVIDIA is not set
-# CONFIG_NET_VENDOR_OKI is not set
-# CONFIG_NET_PACKET_ENGINE is not set
-# CONFIG_NET_VENDOR_QLOGIC is not set
-# CONFIG_NET_VENDOR_REALTEK is not set
-# CONFIG_NET_VENDOR_RDC is not set
-# CONFIG_NET_VENDOR_SEEQ is not set
-# CONFIG_NET_VENDOR_SILAN is not set
-# CONFIG_NET_VENDOR_SIS is not set
-# CONFIG_NET_VENDOR_SMSC is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
-# CONFIG_NET_VENDOR_SUN is not set
-# CONFIG_NET_VENDOR_TEHUTI is not set
-# CONFIG_NET_VENDOR_TI is not set
-# CONFIG_NET_VENDOR_VIA is not set
+CONFIG_E1000E=y
 # CONFIG_WLAN is not set
 # CONFIG_INPUT_MOUSEDEV is not set
 # CONFIG_INPUT_KEYBOARD is not set
@@ -403,7 +361,6 @@ CONFIG_I2C_CHARDEV=y
 CONFIG_WATCHDOG=y
 CONFIG_WATCHDOG_NOWAYOUT=y
 # CONFIG_VGA_ARB is not set
-# CONFIG_HID_SUPPORT is not set
 # CONFIG_USB_SUPPORT is not set
 CONFIG_EDAC=y
 CONFIG_EDAC_MM_EDAC=y
@@ -448,13 +405,13 @@ CONFIG_PROC_KCORE=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_HUGETLBFS=y
+CONFIG_CONFIGFS_FS=m
 CONFIG_ECRYPT_FS=m
 CONFIG_CRAMFS=m
 CONFIG_SQUASHFS=m
 CONFIG_NFS_FS=m
-CONFIG_NFS_V3=y
 CONFIG_NFS_V3_ACL=y
-CONFIG_NFS_V4=y
+CONFIG_NFS_V4=m
 CONFIG_NFS_V4_1=y
 CONFIG_NFS_FSCACHE=y
 CONFIG_NFSD=m
@@ -508,26 +465,29 @@ CONFIG_NLS_ISO8859_15=m
 CONFIG_NLS_KOI8_R=m
 CONFIG_NLS_KOI8_U=m
 CONFIG_NLS_UTF8=m
+CONFIG_DLM=m
 CONFIG_DLM_DEBUG=y
+CONFIG_DYNAMIC_DEBUG=y
+CONFIG_DEBUG_INFO=y
+CONFIG_DEBUG_INFO_REDUCED=y
 # CONFIG_ENABLE_WARN_DEPRECATED is not set
 CONFIG_FRAME_WARN=2048
-CONFIG_MAGIC_SYSRQ=y
 CONFIG_STRIP_ASM_SYMS=y
 CONFIG_DEBUG_FS=y
 CONFIG_HEADERS_CHECK=y
+# CONFIG_FRAME_POINTER is not set
+CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
+CONFIG_MAGIC_SYSRQ=y
+CONFIG_DEBUG_VM=y
+CONFIG_DEBUG_MEMORY_INIT=y
+CONFIG_DEBUG_STACKOVERFLOW=y
 CONFIG_LOCKUP_DETECTOR=y
 CONFIG_SCHEDSTATS=y
 CONFIG_TIMER_STATS=y
-CONFIG_DEBUG_INFO=y
-CONFIG_DEBUG_INFO_REDUCED=y
-CONFIG_DEBUG_VM=y
-CONFIG_DEBUG_MEMORY_INIT=y
 CONFIG_DEBUG_LIST=y
 CONFIG_DEBUG_CREDENTIALS=y
-CONFIG_DEBUG_FORCE_WEAK_PER_CPU=y
-CONFIG_DYNAMIC_DEBUG=y
+CONFIG_RCU_CPU_STALL_TIMEOUT=60
 CONFIG_ASYNC_RAID6_TEST=m
-CONFIG_DEBUG_STACKOVERFLOW=y
 CONFIG_KEYS_DEBUG_PROC_KEYS=y
 CONFIG_SECURITY=y
 CONFIG_SECURITYFS=y
@@ -536,7 +496,6 @@ CONFIG_SECURITY_NETWORK_XFRM=y
 CONFIG_SECURITY_SELINUX=y
 CONFIG_SECURITY_SELINUX_BOOTPARAM=y
 CONFIG_SECURITY_SELINUX_DISABLE=y
-CONFIG_CRYPTO_NULL=m
 CONFIG_CRYPTO_PCRYPT=m
 CONFIG_CRYPTO_CRYPTD=m
 CONFIG_CRYPTO_TEST=m
@@ -549,14 +508,12 @@ CONFIG_CRYPTO_XTS=m
 CONFIG_CRYPTO_HMAC=y
 CONFIG_CRYPTO_XCBC=m
 CONFIG_CRYPTO_VMAC=m
-CONFIG_CRYPTO_CRC32C=y
 CONFIG_CRYPTO_MICHAEL_MIC=m
 CONFIG_CRYPTO_RMD128=m
 CONFIG_CRYPTO_RMD160=m
 CONFIG_CRYPTO_RMD256=m
 CONFIG_CRYPTO_RMD320=m
 CONFIG_CRYPTO_SHA1=y
-CONFIG_CRYPTO_SHA256=m
 CONFIG_CRYPTO_SHA512=m
 CONFIG_CRYPTO_TGR192=m
 CONFIG_CRYPTO_WP512=m
diff --git a/arch/tile/gxio/Kconfig b/arch/tile/gxio/Kconfig
index d221f8d6de8b..d4e10d58071b 100644
--- a/arch/tile/gxio/Kconfig
+++ b/arch/tile/gxio/Kconfig
@@ -26,3 +26,8 @@ config TILE_GXIO_TRIO
 config TILE_GXIO_USB_HOST
         bool
         select TILE_GXIO
+
+# Support direct access to the TILE-Gx UART hardware from kernel space.
+config TILE_GXIO_UART
+        bool
+        select TILE_GXIO
diff --git a/arch/tile/gxio/Makefile b/arch/tile/gxio/Makefile
index 8684bcaa74ea..26ae2c727467 100644
--- a/arch/tile/gxio/Makefile
+++ b/arch/tile/gxio/Makefile
@@ -6,4 +6,5 @@ obj-$(CONFIG_TILE_GXIO) += iorpc_globals.o kiorpc.o
 obj-$(CONFIG_TILE_GXIO_DMA) += dma_queue.o
 obj-$(CONFIG_TILE_GXIO_MPIPE) += mpipe.o iorpc_mpipe.o iorpc_mpipe_info.o
 obj-$(CONFIG_TILE_GXIO_TRIO) += trio.o iorpc_trio.o
+obj-$(CONFIG_TILE_GXIO_UART) += uart.o iorpc_uart.o
 obj-$(CONFIG_TILE_GXIO_USB_HOST) += usb_host.o iorpc_usb_host.o
diff --git a/arch/tile/gxio/iorpc_mpipe.c b/arch/tile/gxio/iorpc_mpipe.c
index 31b87bf8c027..e19325c4c431 100644
--- a/arch/tile/gxio/iorpc_mpipe.c
+++ b/arch/tile/gxio/iorpc_mpipe.c
@@ -21,7 +21,7 @@ struct alloc_buffer_stacks_param {
         unsigned int flags;
 };
 
-int gxio_mpipe_alloc_buffer_stacks(gxio_mpipe_context_t * context,
+int gxio_mpipe_alloc_buffer_stacks(gxio_mpipe_context_t *context,
                                    unsigned int count, unsigned int first,
                                    unsigned int flags)
 {
@@ -45,7 +45,7 @@ struct init_buffer_stack_aux_param {
         unsigned int buffer_size_enum;
 };
 
-int gxio_mpipe_init_buffer_stack_aux(gxio_mpipe_context_t * context,
+int gxio_mpipe_init_buffer_stack_aux(gxio_mpipe_context_t *context,
                                      void *mem_va, size_t mem_size,
                                      unsigned int mem_flags, unsigned int stack,
                                      unsigned int buffer_size_enum)
@@ -80,7 +80,7 @@ struct alloc_notif_rings_param {
         unsigned int flags;
 };
 
-int gxio_mpipe_alloc_notif_rings(gxio_mpipe_context_t * context,
+int gxio_mpipe_alloc_notif_rings(gxio_mpipe_context_t *context,
                                  unsigned int count, unsigned int first,
                                  unsigned int flags)
 {
@@ -102,7 +102,7 @@ struct init_notif_ring_aux_param {
         unsigned int ring;
 };
 
-int gxio_mpipe_init_notif_ring_aux(gxio_mpipe_context_t * context, void *mem_va,
+int gxio_mpipe_init_notif_ring_aux(gxio_mpipe_context_t *context, void *mem_va,
                                    size_t mem_size, unsigned int mem_flags,
                                    unsigned int ring)
 {
@@ -133,7 +133,7 @@ struct request_notif_ring_interrupt_param {
         unsigned int ring;
 };
 
-int gxio_mpipe_request_notif_ring_interrupt(gxio_mpipe_context_t * context,
+int gxio_mpipe_request_notif_ring_interrupt(gxio_mpipe_context_t *context,
                                             int inter_x, int inter_y,
                                             int inter_ipi, int inter_event,
                                             unsigned int ring)
@@ -158,7 +158,7 @@ struct enable_notif_ring_interrupt_param {
         unsigned int ring;
 };
 
-int gxio_mpipe_enable_notif_ring_interrupt(gxio_mpipe_context_t * context,
+int gxio_mpipe_enable_notif_ring_interrupt(gxio_mpipe_context_t *context,
                                            unsigned int ring)
 {
         struct enable_notif_ring_interrupt_param temp;
@@ -179,7 +179,7 @@ struct alloc_notif_groups_param {
         unsigned int flags;
 };
 
-int gxio_mpipe_alloc_notif_groups(gxio_mpipe_context_t * context,
+int gxio_mpipe_alloc_notif_groups(gxio_mpipe_context_t *context,
                                   unsigned int count, unsigned int first,
                                   unsigned int flags)
 {
@@ -201,7 +201,7 @@ struct init_notif_group_param {
         gxio_mpipe_notif_group_bits_t bits;
 };
 
-int gxio_mpipe_init_notif_group(gxio_mpipe_context_t * context,
+int gxio_mpipe_init_notif_group(gxio_mpipe_context_t *context,
                                 unsigned int group,
                                 gxio_mpipe_notif_group_bits_t bits)
 {
@@ -223,7 +223,7 @@ struct alloc_buckets_param {
         unsigned int flags;
 };
 
-int gxio_mpipe_alloc_buckets(gxio_mpipe_context_t * context, unsigned int count,
+int gxio_mpipe_alloc_buckets(gxio_mpipe_context_t *context, unsigned int count,
                              unsigned int first, unsigned int flags)
 {
         struct alloc_buckets_param temp;
@@ -244,7 +244,7 @@ struct init_bucket_param {
         MPIPE_LBL_INIT_DAT_BSTS_TBL_t bucket_info;
 };
 
-int gxio_mpipe_init_bucket(gxio_mpipe_context_t * context, unsigned int bucket,
+int gxio_mpipe_init_bucket(gxio_mpipe_context_t *context, unsigned int bucket,
                            MPIPE_LBL_INIT_DAT_BSTS_TBL_t bucket_info)
 {
         struct init_bucket_param temp;
@@ -265,7 +265,7 @@ struct alloc_edma_rings_param {
         unsigned int flags;
 };
 
-int gxio_mpipe_alloc_edma_rings(gxio_mpipe_context_t * context,
+int gxio_mpipe_alloc_edma_rings(gxio_mpipe_context_t *context,
                                 unsigned int count, unsigned int first,
                                 unsigned int flags)
 {
@@ -288,7 +288,7 @@ struct init_edma_ring_aux_param {
         unsigned int channel;
 };
 
-int gxio_mpipe_init_edma_ring_aux(gxio_mpipe_context_t * context, void *mem_va,
+int gxio_mpipe_init_edma_ring_aux(gxio_mpipe_context_t *context, void *mem_va,
                                   size_t mem_size, unsigned int mem_flags,
                                   unsigned int ring, unsigned int channel)
 {
@@ -315,7 +315,7 @@ int gxio_mpipe_init_edma_ring_aux(gxio_mpipe_context_t * context, void *mem_va,
 EXPORT_SYMBOL(gxio_mpipe_init_edma_ring_aux);
 
 
-int gxio_mpipe_commit_rules(gxio_mpipe_context_t * context, const void *blob,
+int gxio_mpipe_commit_rules(gxio_mpipe_context_t *context, const void *blob,
                             size_t blob_size)
 {
         const void *params = blob;
@@ -332,7 +332,7 @@ struct register_client_memory_param {
         unsigned int flags;
 };
 
-int gxio_mpipe_register_client_memory(gxio_mpipe_context_t * context,
+int gxio_mpipe_register_client_memory(gxio_mpipe_context_t *context,
                                       unsigned int iotlb, HV_PTE pte,
                                       unsigned int flags)
 {
@@ -355,7 +355,7 @@ struct link_open_aux_param {
         unsigned int flags;
 };
 
-int gxio_mpipe_link_open_aux(gxio_mpipe_context_t * context,
+int gxio_mpipe_link_open_aux(gxio_mpipe_context_t *context,
                              _gxio_mpipe_link_name_t name, unsigned int flags)
 {
         struct link_open_aux_param temp;
@@ -374,7 +374,7 @@ struct link_close_aux_param {
         int mac;
 };
 
-int gxio_mpipe_link_close_aux(gxio_mpipe_context_t * context, int mac)
+int gxio_mpipe_link_close_aux(gxio_mpipe_context_t *context, int mac)
 {
         struct link_close_aux_param temp;
         struct link_close_aux_param *params = &temp;
@@ -387,6 +387,27 @@ int gxio_mpipe_link_close_aux(gxio_mpipe_context_t * context, int mac)
 
 EXPORT_SYMBOL(gxio_mpipe_link_close_aux);
 
+struct link_set_attr_aux_param {
+        int mac;
+        uint32_t attr;
+        int64_t val;
+};
+
+int gxio_mpipe_link_set_attr_aux(gxio_mpipe_context_t *context, int mac,
+                                 uint32_t attr, int64_t val)
+{
+        struct link_set_attr_aux_param temp;
+        struct link_set_attr_aux_param *params = &temp;
+
+        params->mac = mac;
+        params->attr = attr;
+        params->val = val;
+
+        return hv_dev_pwrite(context->fd, 0, (HV_VirtAddr) params,
+                             sizeof(*params), GXIO_MPIPE_OP_LINK_SET_ATTR_AUX);
+}
+
+EXPORT_SYMBOL(gxio_mpipe_link_set_attr_aux);
 
 struct get_timestamp_aux_param {
         uint64_t sec;
@@ -394,8 +415,8 @@ struct get_timestamp_aux_param {
         uint64_t cycles;
 };
 
-int gxio_mpipe_get_timestamp_aux(gxio_mpipe_context_t * context, uint64_t * sec,
-                                 uint64_t * nsec, uint64_t * cycles)
+int gxio_mpipe_get_timestamp_aux(gxio_mpipe_context_t *context, uint64_t *sec,
+                                 uint64_t *nsec, uint64_t *cycles)
 {
         int __result;
         struct get_timestamp_aux_param temp;
@@ -419,7 +440,7 @@ struct set_timestamp_aux_param {
         uint64_t cycles;
 };
 
-int gxio_mpipe_set_timestamp_aux(gxio_mpipe_context_t * context, uint64_t sec,
+int gxio_mpipe_set_timestamp_aux(gxio_mpipe_context_t *context, uint64_t sec,
                                  uint64_t nsec, uint64_t cycles)
 {
         struct set_timestamp_aux_param temp;
@@ -439,8 +460,7 @@ struct adjust_timestamp_aux_param {
         int64_t nsec;
 };
 
-int gxio_mpipe_adjust_timestamp_aux(gxio_mpipe_context_t * context,
-                                    int64_t nsec)
+int gxio_mpipe_adjust_timestamp_aux(gxio_mpipe_context_t *context, int64_t nsec)
 {
         struct adjust_timestamp_aux_param temp;
         struct adjust_timestamp_aux_param *params = &temp;
@@ -454,11 +474,55 @@ int gxio_mpipe_adjust_timestamp_aux(gxio_mpipe_context_t * context,
 
 EXPORT_SYMBOL(gxio_mpipe_adjust_timestamp_aux);
 
+struct config_edma_ring_blks_param {
+        unsigned int ering;
+        unsigned int max_blks;
+        unsigned int min_snf_blks;
+        unsigned int db;
+};
+
+int gxio_mpipe_config_edma_ring_blks(gxio_mpipe_context_t *context,
+                                     unsigned int ering, unsigned int max_blks,
+                                     unsigned int min_snf_blks, unsigned int db)
+{
+        struct config_edma_ring_blks_param temp;
+        struct config_edma_ring_blks_param *params = &temp;
+
+        params->ering = ering;
+        params->max_blks = max_blks;
+        params->min_snf_blks = min_snf_blks;
+        params->db = db;
+
+        return hv_dev_pwrite(context->fd, 0, (HV_VirtAddr) params,
+                             sizeof(*params),
+                             GXIO_MPIPE_OP_CONFIG_EDMA_RING_BLKS);
+}
+
+EXPORT_SYMBOL(gxio_mpipe_config_edma_ring_blks);
+
+struct adjust_timestamp_freq_param {
+        int32_t ppb;
+};
+
+int gxio_mpipe_adjust_timestamp_freq(gxio_mpipe_context_t *context, int32_t ppb)
+{
+        struct adjust_timestamp_freq_param temp;
+        struct adjust_timestamp_freq_param *params = &temp;
+
+        params->ppb = ppb;
+
+        return hv_dev_pwrite(context->fd, 0, (HV_VirtAddr) params,
+                             sizeof(*params),
+                             GXIO_MPIPE_OP_ADJUST_TIMESTAMP_FREQ);
+}
+
+EXPORT_SYMBOL(gxio_mpipe_adjust_timestamp_freq);
+
 struct arm_pollfd_param {
         union iorpc_pollfd pollfd;
 };
 
-int gxio_mpipe_arm_pollfd(gxio_mpipe_context_t * context, int pollfd_cookie)
+int gxio_mpipe_arm_pollfd(gxio_mpipe_context_t *context, int pollfd_cookie)
 {
         struct arm_pollfd_param temp;
         struct arm_pollfd_param *params = &temp;
@@ -475,7 +539,7 @@ struct close_pollfd_param {
         union iorpc_pollfd pollfd;
 };
 
-int gxio_mpipe_close_pollfd(gxio_mpipe_context_t * context, int pollfd_cookie)
+int gxio_mpipe_close_pollfd(gxio_mpipe_context_t *context, int pollfd_cookie)
 {
         struct close_pollfd_param temp;
         struct close_pollfd_param *params = &temp;
@@ -492,7 +556,7 @@ struct get_mmio_base_param {
         HV_PTE base;
 };
 
-int gxio_mpipe_get_mmio_base(gxio_mpipe_context_t * context, HV_PTE *base)
+int gxio_mpipe_get_mmio_base(gxio_mpipe_context_t *context, HV_PTE *base)
 {
         int __result;
         struct get_mmio_base_param temp;
@@ -513,7 +577,7 @@ struct check_mmio_offset_param {
         unsigned long size;
 };
 
-int gxio_mpipe_check_mmio_offset(gxio_mpipe_context_t * context,
+int gxio_mpipe_check_mmio_offset(gxio_mpipe_context_t *context,
                                  unsigned long offset, unsigned long size)
 {
         struct check_mmio_offset_param temp;
diff --git a/arch/tile/gxio/iorpc_mpipe_info.c b/arch/tile/gxio/iorpc_mpipe_info.c
index d0254aa60cba..77019c6e9b4a 100644
--- a/arch/tile/gxio/iorpc_mpipe_info.c
+++ b/arch/tile/gxio/iorpc_mpipe_info.c
@@ -15,16 +15,33 @@
 /* This file is machine-generated; DO NOT EDIT! */
 #include "gxio/iorpc_mpipe_info.h"
 
+struct instance_aux_param {
+        _gxio_mpipe_link_name_t name;
+};
+
+int gxio_mpipe_info_instance_aux(gxio_mpipe_info_context_t *context,
+                                 _gxio_mpipe_link_name_t name)
+{
+        struct instance_aux_param temp;
+        struct instance_aux_param *params = &temp;
+
+        params->name = name;
+
+        return hv_dev_pwrite(context->fd, 0, (HV_VirtAddr) params,
+                             sizeof(*params), GXIO_MPIPE_INFO_OP_INSTANCE_AUX);
+}
+
+EXPORT_SYMBOL(gxio_mpipe_info_instance_aux);
 
 struct enumerate_aux_param {
         _gxio_mpipe_link_name_t name;
         _gxio_mpipe_link_mac_t mac;
 };
 
-int gxio_mpipe_info_enumerate_aux(gxio_mpipe_info_context_t * context,
+int gxio_mpipe_info_enumerate_aux(gxio_mpipe_info_context_t *context,
                                   unsigned int idx,
-                                  _gxio_mpipe_link_name_t * name,
-                                  _gxio_mpipe_link_mac_t * mac)
+                                  _gxio_mpipe_link_name_t *name,
+                                  _gxio_mpipe_link_mac_t *mac)
 {
         int __result;
         struct enumerate_aux_param temp;
@@ -32,7 +49,7 @@ int gxio_mpipe_info_enumerate_aux(gxio_mpipe_info_context_t * context,
 
         __result =
             hv_dev_pread(context->fd, 0, (HV_VirtAddr) params, sizeof(*params),
-                         (((uint64_t) idx << 32) |
+                         (((uint64_t)idx << 32) |
                           GXIO_MPIPE_INFO_OP_ENUMERATE_AUX));
         *name = params->name;
         *mac = params->mac;
@@ -46,7 +63,7 @@ struct get_mmio_base_param {
         HV_PTE base;
 };
 
-int gxio_mpipe_info_get_mmio_base(gxio_mpipe_info_context_t * context,
+int gxio_mpipe_info_get_mmio_base(gxio_mpipe_info_context_t *context,
                                   HV_PTE *base)
 {
         int __result;
@@ -68,7 +85,7 @@ struct check_mmio_offset_param {
         unsigned long size;
 };
 
-int gxio_mpipe_info_check_mmio_offset(gxio_mpipe_info_context_t * context,
+int gxio_mpipe_info_check_mmio_offset(gxio_mpipe_info_context_t *context,
                                       unsigned long offset, unsigned long size)
 {
         struct check_mmio_offset_param temp;
diff --git a/arch/tile/gxio/iorpc_trio.c b/arch/tile/gxio/iorpc_trio.c
index cef4b2209cda..1d3cedb9aeb4 100644
--- a/arch/tile/gxio/iorpc_trio.c
+++ b/arch/tile/gxio/iorpc_trio.c
@@ -21,7 +21,7 @@ struct alloc_asids_param {
         unsigned int flags;
 };
 
-int gxio_trio_alloc_asids(gxio_trio_context_t * context, unsigned int count,
+int gxio_trio_alloc_asids(gxio_trio_context_t *context, unsigned int count,
                           unsigned int first, unsigned int flags)
 {
         struct alloc_asids_param temp;
@@ -44,7 +44,7 @@ struct alloc_memory_maps_param {
         unsigned int flags;
 };
 
-int gxio_trio_alloc_memory_maps(gxio_trio_context_t * context,
+int gxio_trio_alloc_memory_maps(gxio_trio_context_t *context,
                                 unsigned int count, unsigned int first,
                                 unsigned int flags)
 {
@@ -61,6 +61,29 @@ int gxio_trio_alloc_memory_maps(gxio_trio_context_t * context,
 
 EXPORT_SYMBOL(gxio_trio_alloc_memory_maps);
 
+struct alloc_scatter_queues_param {
+        unsigned int count;
+        unsigned int first;
+        unsigned int flags;
+};
+
+int gxio_trio_alloc_scatter_queues(gxio_trio_context_t *context,
+                                   unsigned int count, unsigned int first,
+                                   unsigned int flags)
+{
+        struct alloc_scatter_queues_param temp;
+        struct alloc_scatter_queues_param *params = &temp;
+
+        params->count = count;
+        params->first = first;
+        params->flags = flags;
+
+        return hv_dev_pwrite(context->fd, 0, (HV_VirtAddr) params,
+                             sizeof(*params),
+                             GXIO_TRIO_OP_ALLOC_SCATTER_QUEUES);
+}
+
+EXPORT_SYMBOL(gxio_trio_alloc_scatter_queues);
 
 struct alloc_pio_regions_param {
         unsigned int count;
@@ -68,7 +91,7 @@ struct alloc_pio_regions_param {
         unsigned int flags;
 };
 
-int gxio_trio_alloc_pio_regions(gxio_trio_context_t * context,
+int gxio_trio_alloc_pio_regions(gxio_trio_context_t *context,
                                 unsigned int count, unsigned int first,
                                 unsigned int flags)
 {
@@ -92,7 +115,7 @@ struct init_pio_region_aux_param {
         unsigned int flags;
 };
 
-int gxio_trio_init_pio_region_aux(gxio_trio_context_t * context,
+int gxio_trio_init_pio_region_aux(gxio_trio_context_t *context,
                                   unsigned int pio_region, unsigned int mac,
                                   uint32_t bus_address_hi, unsigned int flags)
 {
@@ -122,7 +145,7 @@ struct init_memory_map_mmu_aux_param {
         unsigned int order_mode;
 };
 
-int gxio_trio_init_memory_map_mmu_aux(gxio_trio_context_t * context,
+int gxio_trio_init_memory_map_mmu_aux(gxio_trio_context_t *context,
                                       unsigned int map, unsigned long va,
                                       uint64_t size, unsigned int asid,
                                       unsigned int mac, uint64_t bus_address,
@@ -152,7 +175,7 @@ struct get_port_property_param {
         struct pcie_trio_ports_property trio_ports;
 };
 
-int gxio_trio_get_port_property(gxio_trio_context_t * context,
+int gxio_trio_get_port_property(gxio_trio_context_t *context,
                                 struct pcie_trio_ports_property *trio_ports)
 {
         int __result;
@@ -175,7 +198,7 @@ struct config_legacy_intr_param {
         unsigned int intx;
 };
 
-int gxio_trio_config_legacy_intr(gxio_trio_context_t * context, int inter_x,
+int gxio_trio_config_legacy_intr(gxio_trio_context_t *context, int inter_x,
                                  int inter_y, int inter_ipi, int inter_event,
                                  unsigned int mac, unsigned int intx)
 {
@@ -204,7 +227,7 @@ struct config_msi_intr_param {
         unsigned int asid;
 };
 
-int gxio_trio_config_msi_intr(gxio_trio_context_t * context, int inter_x,
+int gxio_trio_config_msi_intr(gxio_trio_context_t *context, int inter_x,
                               int inter_y, int inter_ipi, int inter_event,
                               unsigned int mac, unsigned int mem_map,
                               uint64_t mem_map_base, uint64_t mem_map_limit,
@@ -236,7 +259,7 @@ struct set_mps_mrs_param {
         unsigned int mac;
 };
 
-int gxio_trio_set_mps_mrs(gxio_trio_context_t * context, uint16_t mps,
+int gxio_trio_set_mps_mrs(gxio_trio_context_t *context, uint16_t mps,
                           uint16_t mrs, unsigned int mac)
 {
         struct set_mps_mrs_param temp;
@@ -256,7 +279,7 @@ struct force_rc_link_up_param {
         unsigned int mac;
 };
 
-int gxio_trio_force_rc_link_up(gxio_trio_context_t * context, unsigned int mac)
+int gxio_trio_force_rc_link_up(gxio_trio_context_t *context, unsigned int mac)
 {
         struct force_rc_link_up_param temp;
         struct force_rc_link_up_param *params = &temp;
@@ -273,7 +296,7 @@ struct force_ep_link_up_param {
         unsigned int mac;
 };
 
-int gxio_trio_force_ep_link_up(gxio_trio_context_t * context, unsigned int mac)
+int gxio_trio_force_ep_link_up(gxio_trio_context_t *context, unsigned int mac)
 {
         struct force_ep_link_up_param temp;
         struct force_ep_link_up_param *params = &temp;
@@ -290,7 +313,7 @@ struct get_mmio_base_param {
         HV_PTE base;
 };
 
-int gxio_trio_get_mmio_base(gxio_trio_context_t * context, HV_PTE *base)
+int gxio_trio_get_mmio_base(gxio_trio_context_t *context, HV_PTE *base)
 {
         int __result;
         struct get_mmio_base_param temp;
@@ -311,7 +334,7 @@ struct check_mmio_offset_param {
         unsigned long size;
 };
 
-int gxio_trio_check_mmio_offset(gxio_trio_context_t * context,
+int gxio_trio_check_mmio_offset(gxio_trio_context_t *context,
                                 unsigned long offset, unsigned long size)
 {
         struct check_mmio_offset_param temp;
diff --git a/arch/tile/gxio/iorpc_uart.c b/arch/tile/gxio/iorpc_uart.c
new file mode 100644
index 000000000000..b9a6d6193d73
--- /dev/null
+++ b/arch/tile/gxio/iorpc_uart.c
@@ -0,0 +1,77 @@
+/*
+ * Copyright 2013 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+/* This file is machine-generated; DO NOT EDIT! */
+#include "gxio/iorpc_uart.h"
+
+struct cfg_interrupt_param {
+        union iorpc_interrupt interrupt;
+};
+
+int gxio_uart_cfg_interrupt(gxio_uart_context_t *context, int inter_x,
+                            int inter_y, int inter_ipi, int inter_event)
+{
+        struct cfg_interrupt_param temp;
+        struct cfg_interrupt_param *params = &temp;
+
+        params->interrupt.kernel.x = inter_x;
+        params->interrupt.kernel.y = inter_y;
+        params->interrupt.kernel.ipi = inter_ipi;
+        params->interrupt.kernel.event = inter_event;
+
+        return hv_dev_pwrite(context->fd, 0, (HV_VirtAddr) params,
+                             sizeof(*params), GXIO_UART_OP_CFG_INTERRUPT);
+}
+
+EXPORT_SYMBOL(gxio_uart_cfg_interrupt);
+
+struct get_mmio_base_param {
+        HV_PTE base;
+};
+
+int gxio_uart_get_mmio_base(gxio_uart_context_t *context, HV_PTE *base)
+{
+        int __result;
+        struct get_mmio_base_param temp;
+        struct get_mmio_base_param *params = &temp;
+
+        __result =
+            hv_dev_pread(context->fd, 0, (HV_VirtAddr) params, sizeof(*params),
+                         GXIO_UART_OP_GET_MMIO_BASE);
+        *base = params->base;
+
+        return __result;
+}
+
+EXPORT_SYMBOL(gxio_uart_get_mmio_base);
+
+struct check_mmio_offset_param {
+        unsigned long offset;
+        unsigned long size;
+};
+
+int gxio_uart_check_mmio_offset(gxio_uart_context_t *context,
+                                unsigned long offset, unsigned long size)
+{
+        struct check_mmio_offset_param temp;
+        struct check_mmio_offset_param *params = &temp;
+
+        params->offset = offset;
+        params->size = size;
+
+        return hv_dev_pwrite(context->fd, 0, (HV_VirtAddr) params,
+                             sizeof(*params), GXIO_UART_OP_CHECK_MMIO_OFFSET);
+}
+
+EXPORT_SYMBOL(gxio_uart_check_mmio_offset);
diff --git a/arch/tile/gxio/iorpc_usb_host.c b/arch/tile/gxio/iorpc_usb_host.c
index cf3c3cc12204..9c820073bfc0 100644
--- a/arch/tile/gxio/iorpc_usb_host.c
+++ b/arch/tile/gxio/iorpc_usb_host.c
@@ -19,7 +19,7 @@ struct cfg_interrupt_param {
         union iorpc_interrupt interrupt;
 };
 
-int gxio_usb_host_cfg_interrupt(gxio_usb_host_context_t * context, int inter_x,
+int gxio_usb_host_cfg_interrupt(gxio_usb_host_context_t *context, int inter_x,
                                 int inter_y, int inter_ipi, int inter_event)
 {
         struct cfg_interrupt_param temp;
@@ -41,7 +41,7 @@ struct register_client_memory_param {
         unsigned int flags;
 };
 
-int gxio_usb_host_register_client_memory(gxio_usb_host_context_t * context,
+int gxio_usb_host_register_client_memory(gxio_usb_host_context_t *context,
                                          HV_PTE pte, unsigned int flags)
 {
         struct register_client_memory_param temp;
@@ -61,7 +61,7 @@ struct get_mmio_base_param {
         HV_PTE base;
 };
 
-int gxio_usb_host_get_mmio_base(gxio_usb_host_context_t * context, HV_PTE *base)
+int gxio_usb_host_get_mmio_base(gxio_usb_host_context_t *context, HV_PTE *base)
 {
         int __result;
         struct get_mmio_base_param temp;
@@ -82,7 +82,7 @@ struct check_mmio_offset_param {
         unsigned long size;
 };
 
-int gxio_usb_host_check_mmio_offset(gxio_usb_host_context_t * context,
+int gxio_usb_host_check_mmio_offset(gxio_usb_host_context_t *context,
                                     unsigned long offset, unsigned long size)
 {
         struct check_mmio_offset_param temp;
diff --git a/arch/tile/gxio/mpipe.c b/arch/tile/gxio/mpipe.c
index e71c63390acc..5301a9ffbae1 100644
--- a/arch/tile/gxio/mpipe.c
+++ b/arch/tile/gxio/mpipe.c
@@ -36,8 +36,14 @@ int gxio_mpipe_init(gxio_mpipe_context_t *context, unsigned int mpipe_index)
         int fd;
         int i;
 
+        if (mpipe_index >= GXIO_MPIPE_INSTANCE_MAX)
+                return -EINVAL;
+
         snprintf(file, sizeof(file), "mpipe/%d/iorpc", mpipe_index);
         fd = hv_dev_open((HV_VirtAddr) file, 0);
+
+        context->fd = fd;
+
         if (fd < 0) {
                 if (fd >= GXIO_ERR_MIN && fd <= GXIO_ERR_MAX)
                         return fd;
@@ -45,8 +51,6 @@ int gxio_mpipe_init(gxio_mpipe_context_t *context, unsigned int mpipe_index)
                         return -ENODEV;
         }
 
-        context->fd = fd;
-
         /* Map in the MMIO space. */
         context->mmio_cfg_base = (void __force *)
                 iorpc_ioremap(fd, HV_MPIPE_CONFIG_MMIO_OFFSET,
@@ -64,12 +68,15 @@ int gxio_mpipe_init(gxio_mpipe_context_t *context, unsigned int mpipe_index)
         for (i = 0; i < 8; i++)
                 context->__stacks.stacks[i] = 255;
 
+        context->instance = mpipe_index;
+
         return 0;
 
       fast_failed:
         iounmap((void __force __iomem *)(context->mmio_cfg_base));
       cfg_failed:
         hv_dev_close(context->fd);
+        context->fd = -1;
         return -ENODEV;
 }
 
@@ -383,7 +390,7 @@ EXPORT_SYMBOL_GPL(gxio_mpipe_iqueue_init);
 
 int gxio_mpipe_equeue_init(gxio_mpipe_equeue_t *equeue,
                            gxio_mpipe_context_t *context,
-                           unsigned int edma_ring_id,
+                           unsigned int ering,
                            unsigned int channel,
                            void *mem, unsigned int mem_size,
                            unsigned int mem_flags)
@@ -394,7 +401,7 @@ int gxio_mpipe_equeue_init(gxio_mpipe_equeue_t *equeue,
         /* Offset used to read number of completed commands. */
         MPIPE_EDMA_POST_REGION_ADDR_t offset;
 
-        int result = gxio_mpipe_init_edma_ring(context, edma_ring_id, channel,
+        int result = gxio_mpipe_init_edma_ring(context, ering, channel,
                                                mem, mem_size, mem_flags);
         if (result < 0)
                 return result;
@@ -405,7 +412,7 @@ int gxio_mpipe_equeue_init(gxio_mpipe_equeue_t *equeue,
         offset.region =
                 MPIPE_MMIO_ADDR__REGION_VAL_EDMA -
                 MPIPE_MMIO_ADDR__REGION_VAL_IDMA;
-        offset.ring = edma_ring_id;
+        offset.ring = ering;
 
         __gxio_dma_queue_init(&equeue->dma_queue,
                               context->mmio_fast_base + offset.word,
@@ -413,6 +420,9 @@ int gxio_mpipe_equeue_init(gxio_mpipe_equeue_t *equeue,
         equeue->edescs = mem;
         equeue->mask_num_entries = num_entries - 1;
         equeue->log2_num_entries = __builtin_ctz(num_entries);
+        equeue->context = context;
+        equeue->ering = ering;
+        equeue->channel = channel;
 
         return 0;
 }
@@ -493,6 +503,20 @@ static gxio_mpipe_context_t *_gxio_get_link_context(void)
         return contextp;
 }
 
+int gxio_mpipe_link_instance(const char *link_name)
+{
+        _gxio_mpipe_link_name_t name;
+        gxio_mpipe_context_t *context = _gxio_get_link_context();
+
+        if (!context)
+                return GXIO_ERR_NO_DEVICE;
+
+        strncpy(name.name, link_name, sizeof(name.name));
+        name.name[GXIO_MPIPE_LINK_NAME_LEN - 1] = '\0';
+
+        return gxio_mpipe_info_instance_aux(context, name);
+}
+
 int gxio_mpipe_link_enumerate_mac(int idx, char *link_name, uint8_t *link_mac)
 {
         int rv;
@@ -543,3 +567,12 @@ int gxio_mpipe_link_close(gxio_mpipe_link_t *link)
 }
 
 EXPORT_SYMBOL_GPL(gxio_mpipe_link_close);
+
+int gxio_mpipe_link_set_attr(gxio_mpipe_link_t *link, uint32_t attr,
+                             int64_t val)
+{
+        return gxio_mpipe_link_set_attr_aux(link->context, link->mac, attr,
+                                            val);
+}
+
+EXPORT_SYMBOL_GPL(gxio_mpipe_link_set_attr);
diff --git a/arch/tile/gxio/uart.c b/arch/tile/gxio/uart.c
new file mode 100644
index 000000000000..ba585175ef88
--- /dev/null
+++ b/arch/tile/gxio/uart.c
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2013 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+/*
+ * Implementation of UART gxio calls.
+ */
+
+#include <linux/io.h>
+#include <linux/errno.h>
+#include <linux/module.h>
+
+#include <gxio/uart.h>
+#include <gxio/iorpc_globals.h>
+#include <gxio/iorpc_uart.h>
+#include <gxio/kiorpc.h>
+
+int gxio_uart_init(gxio_uart_context_t *context, int uart_index)
+{
+        char file[32];
+        int fd;
+
+        snprintf(file, sizeof(file), "uart/%d/iorpc", uart_index);
+        fd = hv_dev_open((HV_VirtAddr) file, 0);
+        if (fd < 0) {
+                if (fd >= GXIO_ERR_MIN && fd <= GXIO_ERR_MAX)
+                        return fd;
+                else
+                        return -ENODEV;
+        }
+
+        context->fd = fd;
+
+        /* Map in the MMIO space. */
+        context->mmio_base = (void __force *)
+                iorpc_ioremap(fd, HV_UART_MMIO_OFFSET, HV_UART_MMIO_SIZE);
+
+        if (context->mmio_base == NULL) {
+                hv_dev_close(context->fd);
+                context->fd = -1;
+                return -ENODEV;
+        }
+
+        return 0;
+}
+
+EXPORT_SYMBOL_GPL(gxio_uart_init);
+
+int gxio_uart_destroy(gxio_uart_context_t *context)
+{
+        iounmap((void __force __iomem *)(context->mmio_base));
+        hv_dev_close(context->fd);
+
+        context->mmio_base = NULL;
+        context->fd = -1;
+
+        return 0;
+}
+
+EXPORT_SYMBOL_GPL(gxio_uart_destroy);
+
+/* UART register write wrapper. */
+void gxio_uart_write(gxio_uart_context_t *context, uint64_t offset,
+                     uint64_t word)
+{
+        __gxio_mmio_write(context->mmio_base + offset, word);
+}
+
+EXPORT_SYMBOL_GPL(gxio_uart_write);
+
+/* UART register read wrapper. */
+uint64_t gxio_uart_read(gxio_uart_context_t *context, uint64_t offset)
+{
+        return __gxio_mmio_read(context->mmio_base + offset);
+}
+
+EXPORT_SYMBOL_GPL(gxio_uart_read);
diff --git a/arch/tile/gxio/usb_host.c b/arch/tile/gxio/usb_host.c
index 66b002f54ecc..785afad7922e 100644
--- a/arch/tile/gxio/usb_host.c
+++ b/arch/tile/gxio/usb_host.c
@@ -26,7 +26,7 @@
 #include <gxio/kiorpc.h>
 #include <gxio/usb_host.h>
 
-int gxio_usb_host_init(gxio_usb_host_context_t * context, int usb_index,
+int gxio_usb_host_init(gxio_usb_host_context_t *context, int usb_index,
                        int is_ehci)
 {
         char file[32];
@@ -63,7 +63,7 @@ int gxio_usb_host_init(gxio_usb_host_context_t * context, int usb_index,
 
 EXPORT_SYMBOL_GPL(gxio_usb_host_init);
 
-int gxio_usb_host_destroy(gxio_usb_host_context_t * context)
+int gxio_usb_host_destroy(gxio_usb_host_context_t *context)
 {
         iounmap((void __force __iomem *)(context->mmio_base));
         hv_dev_close(context->fd);
@@ -76,14 +76,14 @@ int gxio_usb_host_destroy(gxio_usb_host_context_t * context)
 
 EXPORT_SYMBOL_GPL(gxio_usb_host_destroy);
 
-void *gxio_usb_host_get_reg_start(gxio_usb_host_context_t * context)
+void *gxio_usb_host_get_reg_start(gxio_usb_host_context_t *context)
 {
         return context->mmio_base;
 }
 
 EXPORT_SYMBOL_GPL(gxio_usb_host_get_reg_start);
 
-size_t gxio_usb_host_get_reg_len(gxio_usb_host_context_t * context)
+size_t gxio_usb_host_get_reg_len(gxio_usb_host_context_t *context)
 {
         return HV_USB_HOST_MMIO_SIZE;
 }
diff --git a/arch/tile/include/arch/mpipe.h b/arch/tile/include/arch/mpipe.h
index 8a33912fd6cc..904538e754d8 100644
--- a/arch/tile/include/arch/mpipe.h
+++ b/arch/tile/include/arch/mpipe.h
@@ -176,7 +176,18 @@ typedef union
      */
     uint_reg_t stack_idx    : 5;
     /* Reserved. */
-    uint_reg_t __reserved_2 : 5;
+    uint_reg_t __reserved_2 : 3;
+    /*
+     * Instance ID.  For devices that support automatic buffer return between
+     * mPIPE instances, this field indicates the buffer owner.  If the INST
+     * field does not match the mPIPE's instance number when a packet is
+     * egressed, buffers with HWB set will be returned to the other mPIPE
+     * instance.  Note that not all devices support multi-mPIPE buffer
+     * return.  The MPIPE_EDMA_INFO.REMOTE_BUFF_RTN_SUPPORT bit indicates
+     * whether the INST field in the buffer descriptor is populated by iDMA
+     * hardware. This field is ignored on writes.
+     */
+    uint_reg_t inst         : 2;
     /*
      * Reads as one to indicate that this is a hardware managed buffer.
      * Ignored on writes since all buffers on a given stack are the same size.
@@ -205,7 +216,8 @@ typedef union
     uint_reg_t c            : 2;
     uint_reg_t size         : 3;
     uint_reg_t hwb          : 1;
-    uint_reg_t __reserved_2 : 5;
+    uint_reg_t inst         : 2;
+    uint_reg_t __reserved_2 : 3;
     uint_reg_t stack_idx    : 5;
     uint_reg_t __reserved_1 : 6;
     int_reg_t va           : 35;
@@ -231,9 +243,9 @@ typedef union
     /* Reserved. */
     uint_reg_t __reserved_0 : 3;
     /* eDMA ring being accessed */
-    uint_reg_t ring         : 5;
+    uint_reg_t ring         : 6;
     /* Reserved. */
-    uint_reg_t __reserved_1 : 18;
+    uint_reg_t __reserved_1 : 17;
     /*
      * This field of the address selects the region (address space) to be
      * accessed.  For the egress DMA post region, this field must be 5.
@@ -250,8 +262,8 @@ typedef union
     uint_reg_t svc_dom      : 5;
     uint_reg_t __reserved_2 : 6;
     uint_reg_t region       : 3;
-    uint_reg_t __reserved_1 : 18;
-    uint_reg_t ring         : 5;
+    uint_reg_t __reserved_1 : 17;
+    uint_reg_t ring         : 6;
     uint_reg_t __reserved_0 : 3;
 #endif
   };
diff --git a/arch/tile/include/arch/mpipe_constants.h b/arch/tile/include/arch/mpipe_constants.h
index 410a0400e055..84022ac5fe82 100644
--- a/arch/tile/include/arch/mpipe_constants.h
+++ b/arch/tile/include/arch/mpipe_constants.h
@@ -16,13 +16,13 @@
 #ifndef __ARCH_MPIPE_CONSTANTS_H__
 #define __ARCH_MPIPE_CONSTANTS_H__
 
-#define MPIPE_NUM_CLASSIFIERS 10
+#define MPIPE_NUM_CLASSIFIERS 16
 #define MPIPE_CLS_MHZ 1200
 
-#define MPIPE_NUM_EDMA_RINGS 32
+#define MPIPE_NUM_EDMA_RINGS 64
 
 #define MPIPE_NUM_SGMII_MACS 16
-#define MPIPE_NUM_XAUI_MACS 4
+#define MPIPE_NUM_XAUI_MACS 16
 #define MPIPE_NUM_LOOPBACK_CHANNELS 4
 #define MPIPE_NUM_NON_LB_CHANNELS 28
 
diff --git a/arch/tile/include/arch/mpipe_shm.h b/arch/tile/include/arch/mpipe_shm.h
index f2e9e122818d..13b3c4300e50 100644
--- a/arch/tile/include/arch/mpipe_shm.h
+++ b/arch/tile/include/arch/mpipe_shm.h
@@ -44,8 +44,14 @@ typedef union
      * descriptors toggles each time the ring tail pointer wraps.
      */
     uint_reg_t gen        : 1;
+    /**
+     * For devices with EDMA reorder support, this field allows the
+     * descriptor to select the egress FIFO.  The associated DMA ring must
+     * have ALLOW_EFIFO_SEL enabled.
+     */
+    uint_reg_t efifo_sel  : 6;
     /** Reserved.  Must be zero. */
-    uint_reg_t r0         : 7;
+    uint_reg_t r0         : 1;
     /** Checksum generation enabled for this transfer. */
     uint_reg_t csum       : 1;
     /**
@@ -110,7 +116,8 @@ typedef union
     uint_reg_t notif      : 1;
     uint_reg_t ns         : 1;
     uint_reg_t csum       : 1;
-    uint_reg_t r0         : 7;
+    uint_reg_t r0         : 1;
+    uint_reg_t efifo_sel  : 6;
     uint_reg_t gen        : 1;
 #endif
 
@@ -126,14 +133,16 @@ typedef union
     /** Reserved. */
     uint_reg_t __reserved_1 : 3;
     /**
-     * Instance ID.  For devices that support more than one mPIPE instance,
-     * this field indicates the buffer owner.  If the INST field does not
-     * match the mPIPE's instance number when a packet is egressed, buffers
-     * with HWB set will be returned to the other mPIPE instance.
+     * Instance ID.  For devices that support automatic buffer return between
+     * mPIPE instances, this field indicates the buffer owner.  If the INST
+     * field does not match the mPIPE's instance number when a packet is
+     * egressed, buffers with HWB set will be returned to the other mPIPE
+     * instance.  Note that not all devices support multi-mPIPE buffer
+     * return.  The MPIPE_EDMA_INFO.REMOTE_BUFF_RTN_SUPPORT bit indicates
+     * whether the INST field in the buffer descriptor is populated by iDMA
+     * hardware.
      */
-    uint_reg_t inst         : 1;
-    /** Reserved. */
-    uint_reg_t __reserved_2 : 1;
+    uint_reg_t inst         : 2;
     /**
      * Always set to one by hardware in iDMA packet descriptors.  For eDMA,
      * indicates whether the buffer will be released to the buffer stack
@@ -166,8 +175,7 @@ typedef union
     uint_reg_t c            : 2;
     uint_reg_t size         : 3;
     uint_reg_t hwb          : 1;
-    uint_reg_t __reserved_2 : 1;
-    uint_reg_t inst         : 1;
+    uint_reg_t inst         : 2;
     uint_reg_t __reserved_1 : 3;
     uint_reg_t stack_idx    : 5;
     uint_reg_t __reserved_0 : 6;
@@ -408,7 +416,10 @@ typedef union
     /**
      * Sequence number applied when packet is distributed.   Classifier
      * selects which sequence number is to be applied by writing the 13-bit
-     * SQN-selector into this field.
+     * SQN-selector into this field.  For devices that support EXT_SQN (as
+     * indicated in IDMA_INFO.EXT_SQN_SUPPORT), the GP_SQN can be extended to
+     * 32-bits via the IDMA_CTL.EXT_SQN register.  In this case the
+     * PACKET_SQN will be reduced to 32 bits.
      */
     uint_reg_t gp_sqn     : 16;
     /**
@@ -451,14 +462,16 @@ typedef union
     /** Reserved. */
     uint_reg_t __reserved_5 : 3;
     /**
-     * Instance ID.  For devices that support more than one mPIPE instance,
-     * this field indicates the buffer owner.  If the INST field does not
-     * match the mPIPE's instance number when a packet is egressed, buffers
-     * with HWB set will be returned to the other mPIPE instance.
+     * Instance ID.  For devices that support automatic buffer return between
+     * mPIPE instances, this field indicates the buffer owner.  If the INST
+     * field does not match the mPIPE's instance number when a packet is
+     * egressed, buffers with HWB set will be returned to the other mPIPE
+     * instance.  Note that not all devices support multi-mPIPE buffer
+     * return.  The MPIPE_EDMA_INFO.REMOTE_BUFF_RTN_SUPPORT bit indicates
+     * whether the INST field in the buffer descriptor is populated by iDMA
+     * hardware.
      */
-    uint_reg_t inst         : 1;
-    /** Reserved. */
-    uint_reg_t __reserved_6 : 1;
+    uint_reg_t inst         : 2;
     /**
      * Always set to one by hardware in iDMA packet descriptors.  For eDMA,
      * indicates whether the buffer will be released to the buffer stack
@@ -491,8 +504,7 @@ typedef union
     uint_reg_t c            : 2;
     uint_reg_t size         : 3;
     uint_reg_t hwb          : 1;
-    uint_reg_t __reserved_6 : 1;
-    uint_reg_t inst         : 1;
+    uint_reg_t inst         : 2;
     uint_reg_t __reserved_5 : 3;
     uint_reg_t stack_idx    : 5;
     uint_reg_t __reserved_4 : 6;
diff --git a/arch/tile/include/arch/trio.h b/arch/tile/include/arch/trio.h
index d3000a871a21..c0ddedcae085 100644
--- a/arch/tile/include/arch/trio.h
+++ b/arch/tile/include/arch/trio.h
@@ -23,6 +23,45 @@
 #ifndef __ASSEMBLER__
 
 /*
+ * Map SQ Doorbell Format.
+ * This describes the format of the write-only doorbell register that exists
+ * in the last 8-bytes of the MAP_SQ_BASE/LIM range.  This register is only
+ * writable from PCIe space.  Writes to this register will not be written to
+ * Tile memory space and thus no IO VA translation is required if the last
+ * page of the BASE/LIM range is not otherwise written.
+ */
+
+__extension__
+typedef union
+{
+  struct
+  {
+#ifndef __BIG_ENDIAN__
+    /*
+     * When written with a 1, the associated MAP_SQ region's doorbell
+     * interrupt will be triggered once all previous writes are visible to
+     * Tile software.
+     */
+    uint_reg_t doorbell   : 1;
+    /*
+     * When written with a 1, the descriptor at the head of the associated
+     * MAP_SQ's FIFO will be dequeued.
+     */
+    uint_reg_t pop        : 1;
+    /* Reserved. */
+    uint_reg_t __reserved : 62;
+#else   /* __BIG_ENDIAN__ */
+    uint_reg_t __reserved : 62;
+    uint_reg_t pop        : 1;
+    uint_reg_t doorbell   : 1;
+#endif
+  };
+
+  uint_reg_t word;
+} TRIO_MAP_SQ_DOORBELL_FMT_t;
+
+
+/*
  * Tile PIO Region Configuration - CFG Address Format.
  * This register describes the address format for PIO accesses when the
  * associated region is setup with TYPE=CFG.
diff --git a/arch/tile/include/arch/trio_constants.h b/arch/tile/include/arch/trio_constants.h
index 628b045436b8..85647e91a458 100644
--- a/arch/tile/include/arch/trio_constants.h
+++ b/arch/tile/include/arch/trio_constants.h
@@ -16,21 +16,21 @@
 #ifndef __ARCH_TRIO_CONSTANTS_H__
 #define __ARCH_TRIO_CONSTANTS_H__
 
-#define TRIO_NUM_ASIDS 16
+#define TRIO_NUM_ASIDS 32
 #define TRIO_NUM_TLBS_PER_ASID 16
 
 #define TRIO_NUM_TPIO_REGIONS 8
 #define TRIO_LOG2_NUM_TPIO_REGIONS 3
 
-#define TRIO_NUM_MAP_MEM_REGIONS 16
-#define TRIO_LOG2_NUM_MAP_MEM_REGIONS 4
+#define TRIO_NUM_MAP_MEM_REGIONS 32
+#define TRIO_LOG2_NUM_MAP_MEM_REGIONS 5
 #define TRIO_NUM_MAP_SQ_REGIONS 8
 #define TRIO_LOG2_NUM_MAP_SQ_REGIONS 3
 
 #define TRIO_LOG2_NUM_SQ_FIFO_ENTRIES 6
 
-#define TRIO_NUM_PUSH_DMA_RINGS 32
+#define TRIO_NUM_PUSH_DMA_RINGS 64
 
-#define TRIO_NUM_PULL_DMA_RINGS 32
+#define TRIO_NUM_PULL_DMA_RINGS 64
 
 #endif /* __ARCH_TRIO_CONSTANTS_H__ */
diff --git a/arch/tile/include/arch/uart.h b/arch/tile/include/arch/uart.h
new file mode 100644
index 000000000000..07966970adad
--- /dev/null
+++ b/arch/tile/include/arch/uart.h
@@ -0,0 +1,300 @@
+/*
+ * Copyright 2013 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+/* Machine-generated file; do not edit. */
+
+#ifndef __ARCH_UART_H__
+#define __ARCH_UART_H__
+
+#include <arch/abi.h>
+#include <arch/uart_def.h>
+
+#ifndef __ASSEMBLER__
+
+/* Divisor. */
+
+__extension__
+typedef union
+{
+  struct
+  {
+#ifndef __BIG_ENDIAN__
+    /*
+     * Baud Rate Divisor.  Desired_baud_rate = REF_CLK frequency / (baud *
+     * 16).
+     *                       Note: REF_CLK is always 125 MHz, the default
+     * divisor = 68, baud rate = 125M/(68*16) = 115200 baud.
+     */
+    uint_reg_t divisor    : 12;
+    /* Reserved. */
+    uint_reg_t __reserved : 52;
+#else   /* __BIG_ENDIAN__ */
+    uint_reg_t __reserved : 52;
+    uint_reg_t divisor    : 12;
+#endif
+  };
+
+  uint_reg_t word;
+} UART_DIVISOR_t;
+
+/* FIFO Count. */
+
+__extension__
+typedef union
+{
+  struct
+  {
+#ifndef __BIG_ENDIAN__
+    /*
+     * n: n active entries in the receive FIFO (max is 2**8). Each entry has
+     * 8 bits.
+     * 0: no active entry in the receive FIFO (that is empty).
+     */
+    uint_reg_t rfifo_count  : 9;
+    /* Reserved. */
+    uint_reg_t __reserved_0 : 7;
+    /*
+     * n: n active entries in the transmit FIFO (max is 2**8). Each entry has
+     * 8 bits.
+     * 0: no active entry in the transmit FIFO (that is empty).
+     */
+    uint_reg_t tfifo_count  : 9;
+    /* Reserved. */
+    uint_reg_t __reserved_1 : 7;
+    /*
+     * n: n active entries in the write FIFO (max is 2**2). Each entry has 8
+     * bits.
+     * 0: no active entry in the write FIFO (that is empty).
+     */
+    uint_reg_t wfifo_count  : 3;
+    /* Reserved. */
+    uint_reg_t __reserved_2 : 29;
+#else   /* __BIG_ENDIAN__ */
+    uint_reg_t __reserved_2 : 29;
+    uint_reg_t wfifo_count  : 3;
+    uint_reg_t __reserved_1 : 7;
+    uint_reg_t tfifo_count  : 9;
+    uint_reg_t __reserved_0 : 7;
+    uint_reg_t rfifo_count  : 9;
+#endif
+  };
+
+  uint_reg_t word;
+} UART_FIFO_COUNT_t;
+
+/* FLAG. */
+
+__extension__
+typedef union
+{
+  struct
+  {
+#ifndef __BIG_ENDIAN__
+    /* Reserved. */
+    uint_reg_t __reserved_0 : 1;
+    /* 1: receive FIFO is empty */
+    uint_reg_t rfifo_empty  : 1;
+    /* 1: write FIFO is empty. */
+    uint_reg_t wfifo_empty  : 1;
+    /* 1: transmit FIFO is empty. */
+    uint_reg_t tfifo_empty  : 1;
+    /* 1: receive FIFO is full. */
+    uint_reg_t rfifo_full   : 1;
+    /* 1: write FIFO is full. */
+    uint_reg_t wfifo_full   : 1;
+    /* 1: transmit FIFO is full. */
+    uint_reg_t tfifo_full   : 1;
+    /* Reserved. */
+    uint_reg_t __reserved_1 : 57;
+#else   /* __BIG_ENDIAN__ */
+    uint_reg_t __reserved_1 : 57;
+    uint_reg_t tfifo_full   : 1;
+    uint_reg_t wfifo_full   : 1;
+    uint_reg_t rfifo_full   : 1;
+    uint_reg_t tfifo_empty  : 1;
+    uint_reg_t wfifo_empty  : 1;
+    uint_reg_t rfifo_empty  : 1;
+    uint_reg_t __reserved_0 : 1;
+#endif
+  };
+
+  uint_reg_t word;
+} UART_FLAG_t;
+
+/*
+ * Interrupt Vector Mask.
+ * Each bit in this register corresponds to a specific interrupt. When set,
+ * the associated interrupt will not be dispatched.
+ */
+
+__extension__
+typedef union
+{
+  struct
+  {
+#ifndef __BIG_ENDIAN__
+    /* Read data FIFO read and no data available */
+    uint_reg_t rdat_err       : 1;
+    /* Write FIFO was written but it was full */
+    uint_reg_t wdat_err       : 1;
+    /* Stop bit not found when current data was received */
+    uint_reg_t frame_err      : 1;
+    /* Parity error was detected when current data was received */
+    uint_reg_t parity_err     : 1;
+    /* Data was received but the receive FIFO was full */
+    uint_reg_t rfifo_overflow : 1;
+    /*
+     * An almost full event is reached when data is to be written to the
+     * receive FIFO, and the receive FIFO has more than or equal to
+     * BUFFER_THRESHOLD.RFIFO_AFULL bytes.
+     */
+    uint_reg_t rfifo_afull    : 1;
+    /* Reserved. */
+    uint_reg_t __reserved_0   : 1;
+    /* An entry in the transmit FIFO was popped */
+    uint_reg_t tfifo_re       : 1;
+    /* An entry has been pushed into the receive FIFO */
+    uint_reg_t rfifo_we       : 1;
+    /* An entry of the write FIFO has been popped */
+    uint_reg_t wfifo_re       : 1;
+    /* Rshim read receive FIFO in protocol mode */
+    uint_reg_t rfifo_err      : 1;
+    /*
+     * An almost empty event is reached when data is to be read from the
+     * transmit FIFO, and the transmit FIFO has less than or equal to
+     * BUFFER_THRESHOLD.TFIFO_AEMPTY bytes.
+     */
+    uint_reg_t tfifo_aempty   : 1;
+    /* Reserved. */
+    uint_reg_t __reserved_1   : 52;
+#else   /* __BIG_ENDIAN__ */
+    uint_reg_t __reserved_1   : 52;
+    uint_reg_t tfifo_aempty   : 1;
+    uint_reg_t rfifo_err      : 1;
+    uint_reg_t wfifo_re       : 1;
+    uint_reg_t rfifo_we       : 1;
+    uint_reg_t tfifo_re       : 1;
+    uint_reg_t __reserved_0   : 1;
+    uint_reg_t rfifo_afull    : 1;
+    uint_reg_t rfifo_overflow : 1;
+    uint_reg_t parity_err     : 1;
+    uint_reg_t frame_err      : 1;
+    uint_reg_t wdat_err       : 1;
+    uint_reg_t rdat_err       : 1;
+#endif
+  };
+
+  uint_reg_t word;
+} UART_INTERRUPT_MASK_t;
+
+/*
+ * Interrupt vector, write-one-to-clear.
+ * Each bit in this register corresponds to a specific interrupt. Hardware
+ * sets the bit when the associated condition has occurred. Writing a 1
+ * clears the status bit.
+ */
+
+__extension__
+typedef union
+{
+  struct
+  {
+#ifndef __BIG_ENDIAN__
+    /* Read data FIFO read and no data available */
+    uint_reg_t rdat_err       : 1;
+    /* Write FIFO was written but it was full */
+    uint_reg_t wdat_err       : 1;
+    /* Stop bit not found when current data was received */
+    uint_reg_t frame_err      : 1;
+    /* Parity error was detected when current data was received */
+    uint_reg_t parity_err     : 1;
+    /* Data was received but the receive FIFO was full */
+    uint_reg_t rfifo_overflow : 1;
+    /*
+     * Data was received and the receive FIFO is now almost full (more than
+     * BUFFER_THRESHOLD.RFIFO_AFULL bytes in it)
+     */
+    uint_reg_t rfifo_afull    : 1;
+    /* Reserved. */
+    uint_reg_t __reserved_0   : 1;
+    /* An entry in the transmit FIFO was popped */
+    uint_reg_t tfifo_re       : 1;
+    /* An entry has been pushed into the receive FIFO */
+    uint_reg_t rfifo_we       : 1;
+    /* An entry of the write FIFO has been popped */
+    uint_reg_t wfifo_re       : 1;
+    /* Rshim read receive FIFO in protocol mode */
+    uint_reg_t rfifo_err      : 1;
+    /*
+     * Data was read from the transmit FIFO and now it is almost empty (less
+     * than or equal to BUFFER_THRESHOLD.TFIFO_AEMPTY bytes in it).
+     */
+    uint_reg_t tfifo_aempty   : 1;
+    /* Reserved. */
+    uint_reg_t __reserved_1   : 52;
+#else   /* __BIG_ENDIAN__ */
+    uint_reg_t __reserved_1   : 52;
+    uint_reg_t tfifo_aempty   : 1;
+    uint_reg_t rfifo_err      : 1;
+    uint_reg_t wfifo_re       : 1;
+    uint_reg_t rfifo_we       : 1;
+    uint_reg_t tfifo_re       : 1;
+    uint_reg_t __reserved_0   : 1;
+    uint_reg_t rfifo_afull    : 1;
+    uint_reg_t rfifo_overflow : 1;
+    uint_reg_t parity_err     : 1;
+    uint_reg_t frame_err      : 1;
+    uint_reg_t wdat_err       : 1;
+    uint_reg_t rdat_err       : 1;
+#endif
+  };
+
+  uint_reg_t word;
+} UART_INTERRUPT_STATUS_t;
+
+/* Type. */
+
+__extension__
+typedef union
+{
+  struct
+  {
+#ifndef __BIG_ENDIAN__
+    /* Number of stop bits, rx and tx */
+    uint_reg_t sbits        : 1;
+    /* Reserved. */
+    uint_reg_t __reserved_0 : 1;
+    /* Data word size, rx and tx */
+    uint_reg_t dbits        : 1;
+    /* Reserved. */
+    uint_reg_t __reserved_1 : 1;
+    /* Parity selection, rx and tx */
+    uint_reg_t ptype        : 3;
+    /* Reserved. */
+    uint_reg_t __reserved_2 : 57;
+#else   /* __BIG_ENDIAN__ */
+    uint_reg_t __reserved_2 : 57;
+    uint_reg_t ptype        : 3;
+    uint_reg_t __reserved_1 : 1;
+    uint_reg_t dbits        : 1;
+    uint_reg_t __reserved_0 : 1;
+    uint_reg_t sbits        : 1;
+#endif
+  };
+
+  uint_reg_t word;
+} UART_TYPE_t;
+#endif /* !defined(__ASSEMBLER__) */
+
+#endif /* !defined(__ARCH_UART_H__) */
diff --git a/arch/tile/include/arch/uart_def.h b/arch/tile/include/arch/uart_def.h
new file mode 100644
index 000000000000..42bcaf535379
--- /dev/null
+++ b/arch/tile/include/arch/uart_def.h
@@ -0,0 +1,120 @@
+/*
+ * Copyright 2013 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+/* Machine-generated file; do not edit. */
+
+#ifndef __ARCH_UART_DEF_H__
+#define __ARCH_UART_DEF_H__
+#define UART_DIVISOR 0x0158
+#define UART_FIFO_COUNT 0x0110
+#define UART_FLAG 0x0108
+#define UART_INTERRUPT_MASK 0x0208
+#define UART_INTERRUPT_MASK__RDAT_ERR_SHIFT 0
+#define UART_INTERRUPT_MASK__RDAT_ERR_WIDTH 1
+#define UART_INTERRUPT_MASK__RDAT_ERR_RESET_VAL 1
+#define UART_INTERRUPT_MASK__RDAT_ERR_RMASK 0x1
+#define UART_INTERRUPT_MASK__RDAT_ERR_MASK  0x1
+#define UART_INTERRUPT_MASK__RDAT_ERR_FIELD 0,0
+#define UART_INTERRUPT_MASK__WDAT_ERR_SHIFT 1
+#define UART_INTERRUPT_MASK__WDAT_ERR_WIDTH 1
+#define UART_INTERRUPT_MASK__WDAT_ERR_RESET_VAL 1
+#define UART_INTERRUPT_MASK__WDAT_ERR_RMASK 0x1
+#define UART_INTERRUPT_MASK__WDAT_ERR_MASK  0x2
+#define UART_INTERRUPT_MASK__WDAT_ERR_FIELD 1,1
+#define UART_INTERRUPT_MASK__FRAME_ERR_SHIFT 2
+#define UART_INTERRUPT_MASK__FRAME_ERR_WIDTH 1
+#define UART_INTERRUPT_MASK__FRAME_ERR_RESET_VAL 1
+#define UART_INTERRUPT_MASK__FRAME_ERR_RMASK 0x1
+#define UART_INTERRUPT_MASK__FRAME_ERR_MASK  0x4
+#define UART_INTERRUPT_MASK__FRAME_ERR_FIELD 2,2
+#define UART_INTERRUPT_MASK__PARITY_ERR_SHIFT 3
+#define UART_INTERRUPT_MASK__PARITY_ERR_WIDTH 1
+#define UART_INTERRUPT_MASK__PARITY_ERR_RESET_VAL 1
+#define UART_INTERRUPT_MASK__PARITY_ERR_RMASK 0x1
+#define UART_INTERRUPT_MASK__PARITY_ERR_MASK  0x8
+#define UART_INTERRUPT_MASK__PARITY_ERR_FIELD 3,3
+#define UART_INTERRUPT_MASK__RFIFO_OVERFLOW_SHIFT 4
+#define UART_INTERRUPT_MASK__RFIFO_OVERFLOW_WIDTH 1
+#define UART_INTERRUPT_MASK__RFIFO_OVERFLOW_RESET_VAL 1
+#define UART_INTERRUPT_MASK__RFIFO_OVERFLOW_RMASK 0x1
+#define UART_INTERRUPT_MASK__RFIFO_OVERFLOW_MASK  0x10
+#define UART_INTERRUPT_MASK__RFIFO_OVERFLOW_FIELD 4,4
+#define UART_INTERRUPT_MASK__RFIFO_AFULL_SHIFT 5
+#define UART_INTERRUPT_MASK__RFIFO_AFULL_WIDTH 1
+#define UART_INTERRUPT_MASK__RFIFO_AFULL_RESET_VAL 1
+#define UART_INTERRUPT_MASK__RFIFO_AFULL_RMASK 0x1
+#define UART_INTERRUPT_MASK__RFIFO_AFULL_MASK  0x20
+#define UART_INTERRUPT_MASK__RFIFO_AFULL_FIELD 5,5
+#define UART_INTERRUPT_MASK__TFIFO_RE_SHIFT 7
+#define UART_INTERRUPT_MASK__TFIFO_RE_WIDTH 1
+#define UART_INTERRUPT_MASK__TFIFO_RE_RESET_VAL 1
+#define UART_INTERRUPT_MASK__TFIFO_RE_RMASK 0x1
+#define UART_INTERRUPT_MASK__TFIFO_RE_MASK  0x80
+#define UART_INTERRUPT_MASK__TFIFO_RE_FIELD 7,7
+#define UART_INTERRUPT_MASK__RFIFO_WE_SHIFT 8
+#define UART_INTERRUPT_MASK__RFIFO_WE_WIDTH 1
+#define UART_INTERRUPT_MASK__RFIFO_WE_RESET_VAL 1
+#define UART_INTERRUPT_MASK__RFIFO_WE_RMASK 0x1
+#define UART_INTERRUPT_MASK__RFIFO_WE_MASK  0x100
+#define UART_INTERRUPT_MASK__RFIFO_WE_FIELD 8,8
+#define UART_INTERRUPT_MASK__WFIFO_RE_SHIFT 9
+#define UART_INTERRUPT_MASK__WFIFO_RE_WIDTH 1
+#define UART_INTERRUPT_MASK__WFIFO_RE_RESET_VAL 1
+#define UART_INTERRUPT_MASK__WFIFO_RE_RMASK 0x1
+#define UART_INTERRUPT_MASK__WFIFO_RE_MASK  0x200
+#define UART_INTERRUPT_MASK__WFIFO_RE_FIELD 9,9
+#define UART_INTERRUPT_MASK__RFIFO_ERR_SHIFT 10
+#define UART_INTERRUPT_MASK__RFIFO_ERR_WIDTH 1
+#define UART_INTERRUPT_MASK__RFIFO_ERR_RESET_VAL 1
+#define UART_INTERRUPT_MASK__RFIFO_ERR_RMASK 0x1
+#define UART_INTERRUPT_MASK__RFIFO_ERR_MASK  0x400
+#define UART_INTERRUPT_MASK__RFIFO_ERR_FIELD 10,10
+#define UART_INTERRUPT_MASK__TFIFO_AEMPTY_SHIFT 11
+#define UART_INTERRUPT_MASK__TFIFO_AEMPTY_WIDTH 1
+#define UART_INTERRUPT_MASK__TFIFO_AEMPTY_RESET_VAL 1
+#define UART_INTERRUPT_MASK__TFIFO_AEMPTY_RMASK 0x1
+#define UART_INTERRUPT_MASK__TFIFO_AEMPTY_MASK  0x800
+#define UART_INTERRUPT_MASK__TFIFO_AEMPTY_FIELD 11,11
+#define UART_INTERRUPT_STATUS 0x0200
+#define UART_RECEIVE_DATA 0x0148
+#define UART_TRANSMIT_DATA 0x0140
+#define UART_TYPE 0x0160
+#define UART_TYPE__SBITS_SHIFT 0
+#define UART_TYPE__SBITS_WIDTH 1
+#define UART_TYPE__SBITS_RESET_VAL 1
+#define UART_TYPE__SBITS_RMASK 0x1
+#define UART_TYPE__SBITS_MASK  0x1
+#define UART_TYPE__SBITS_FIELD 0,0
+#define UART_TYPE__SBITS_VAL_ONE_SBITS 0x0
+#define UART_TYPE__SBITS_VAL_TWO_SBITS 0x1
+#define UART_TYPE__DBITS_SHIFT 2
+#define UART_TYPE__DBITS_WIDTH 1
+#define UART_TYPE__DBITS_RESET_VAL 0
+#define UART_TYPE__DBITS_RMASK 0x1
+#define UART_TYPE__DBITS_MASK  0x4
+#define UART_TYPE__DBITS_FIELD 2,2
+#define UART_TYPE__DBITS_VAL_EIGHT_DBITS 0x0
+#define UART_TYPE__DBITS_VAL_SEVEN_DBITS 0x1
+#define UART_TYPE__PTYPE_SHIFT 4
+#define UART_TYPE__PTYPE_WIDTH 3
+#define UART_TYPE__PTYPE_RESET_VAL 3
+#define UART_TYPE__PTYPE_RMASK 0x7
+#define UART_TYPE__PTYPE_MASK  0x70
+#define UART_TYPE__PTYPE_FIELD 4,6
+#define UART_TYPE__PTYPE_VAL_NONE 0x0
+#define UART_TYPE__PTYPE_VAL_MARK 0x1
+#define UART_TYPE__PTYPE_VAL_SPACE 0x2
+#define UART_TYPE__PTYPE_VAL_EVEN 0x3
+#define UART_TYPE__PTYPE_VAL_ODD 0x4
+#endif /* !defined(__ARCH_UART_DEF_H__) */
diff --git a/arch/tile/include/asm/Kbuild b/arch/tile/include/asm/Kbuild
index b17b9b8e53cd..664d6ad23f80 100644
--- a/arch/tile/include/asm/Kbuild
+++ b/arch/tile/include/asm/Kbuild
@@ -11,12 +11,13 @@ generic-y += errno.h
 generic-y += exec.h
 generic-y += fb.h
 generic-y += fcntl.h
+generic-y += hw_irq.h
 generic-y += ioctl.h
 generic-y += ioctls.h
 generic-y += ipcbuf.h
 generic-y += irq_regs.h
-generic-y += kdebug.h
 generic-y += local.h
+generic-y += local64.h
 generic-y += msgbuf.h
 generic-y += mutex.h
 generic-y += param.h
diff --git a/arch/tile/include/asm/atomic.h b/arch/tile/include/asm/atomic.h
index e71387ab20ca..d385eaadece7 100644
--- a/arch/tile/include/asm/atomic.h
+++ b/arch/tile/include/asm/atomic.h
@@ -114,6 +114,32 @@ static inline int atomic_read(const atomic_t *v)
 #define atomic_inc_and_test(v)          (atomic_inc_return(v) == 0)
 
 /**
+ * atomic_xchg - atomically exchange contents of memory with a new value
+ * @v: pointer of type atomic_t
+ * @i: integer value to store in memory
+ *
+ * Atomically sets @v to @i and returns old @v
+ */
+static inline int atomic_xchg(atomic_t *v, int n)
+{
+        return xchg(&v->counter, n);
+}
+
+/**
+ * atomic_cmpxchg - atomically exchange contents of memory if it matches
+ * @v: pointer of type atomic_t
+ * @o: old value that memory should have
+ * @n: new value to write to memory if it matches
+ *
+ * Atomically checks if @v holds @o and replaces it with @n if so.
+ * Returns the old value at @v.
+ */
+static inline int atomic_cmpxchg(atomic_t *v, int o, int n)
+{
+        return cmpxchg(&v->counter, o, n);
+}
+
+/**
  * atomic_add_negative - add and test if negative
  * @v: pointer of type atomic_t
  * @i: integer value to add
@@ -133,6 +159,32 @@ static inline int atomic_read(const atomic_t *v)
 
 #ifndef __ASSEMBLY__
 
+/**
+ * atomic64_xchg - atomically exchange contents of memory with a new value
+ * @v: pointer of type atomic64_t
+ * @i: integer value to store in memory
+ *
+ * Atomically sets @v to @i and returns old @v
+ */
+static inline u64 atomic64_xchg(atomic64_t *v, u64 n)
+{
+        return xchg64(&v->counter, n);
+}
+
+/**
+ * atomic64_cmpxchg - atomically exchange contents of memory if it matches
+ * @v: pointer of type atomic64_t
+ * @o: old value that memory should have
+ * @n: new value to write to memory if it matches
+ *
+ * Atomically checks if @v holds @o and replaces it with @n if so.
+ * Returns the old value at @v.
+ */
+static inline u64 atomic64_cmpxchg(atomic64_t *v, u64 o, u64 n)
+{
+        return cmpxchg64(&v->counter, o, n);
+}
+
 static inline long long atomic64_dec_if_positive(atomic64_t *v)
 {
         long long c, old, dec;
diff --git a/arch/tile/include/asm/atomic_32.h b/arch/tile/include/asm/atomic_32.h
index e7fb5cfb9597..0d0395b1b152 100644
--- a/arch/tile/include/asm/atomic_32.h
+++ b/arch/tile/include/asm/atomic_32.h
@@ -22,40 +22,6 @@
 
 #ifndef __ASSEMBLY__
 
-/* Tile-specific routines to support <linux/atomic.h>. */
-int _atomic_xchg(atomic_t *v, int n);
-int _atomic_xchg_add(atomic_t *v, int i);
-int _atomic_xchg_add_unless(atomic_t *v, int a, int u);
-int _atomic_cmpxchg(atomic_t *v, int o, int n);
-
-/**
- * atomic_xchg - atomically exchange contents of memory with a new value
- * @v: pointer of type atomic_t
- * @i: integer value to store in memory
- *
- * Atomically sets @v to @i and returns old @v
- */
-static inline int atomic_xchg(atomic_t *v, int n)
-{
-        smp_mb();  /* barrier for proper semantics */
-        return _atomic_xchg(v, n);
-}
-
-/**
- * atomic_cmpxchg - atomically exchange contents of memory if it matches
- * @v: pointer of type atomic_t
- * @o: old value that memory should have
- * @n: new value to write to memory if it matches
- *
- * Atomically checks if @v holds @o and replaces it with @n if so.
- * Returns the old value at @v.
- */
-static inline int atomic_cmpxchg(atomic_t *v, int o, int n)
-{
-        smp_mb();  /* barrier for proper semantics */
-        return _atomic_cmpxchg(v, o, n);
-}
-
 /**
  * atomic_add - add integer to atomic variable
  * @i: integer value to add
@@ -65,7 +31,7 @@ static inline int atomic_cmpxchg(atomic_t *v, int o, int n)
  */
 static inline void atomic_add(int i, atomic_t *v)
 {
-        _atomic_xchg_add(v, i);
+        _atomic_xchg_add(&v->counter, i);
 }
 
 /**
@@ -78,7 +44,7 @@ static inline void atomic_add(int i, atomic_t *v)
 static inline int atomic_add_return(int i, atomic_t *v)
 {
         smp_mb();  /* barrier for proper semantics */
-        return _atomic_xchg_add(v, i) + i;
+        return _atomic_xchg_add(&v->counter, i) + i;
 }
 
 /**
@@ -93,7 +59,7 @@ static inline int atomic_add_return(int i, atomic_t *v)
 static inline int __atomic_add_unless(atomic_t *v, int a, int u)
 {
         smp_mb();  /* barrier for proper semantics */
-        return _atomic_xchg_add_unless(v, a, u);
+        return _atomic_xchg_add_unless(&v->counter, a, u);
 }
 
 /**
@@ -108,7 +74,7 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
  */
 static inline void atomic_set(atomic_t *v, int n)
 {
-        _atomic_xchg(v, n);
+        _atomic_xchg(&v->counter, n);
 }
 
 /* A 64bit atomic type */
@@ -119,11 +85,6 @@ typedef struct {
 
 #define ATOMIC64_INIT(val) { (val) }
 
-u64 _atomic64_xchg(atomic64_t *v, u64 n);
-u64 _atomic64_xchg_add(atomic64_t *v, u64 i);
-u64 _atomic64_xchg_add_unless(atomic64_t *v, u64 a, u64 u);
-u64 _atomic64_cmpxchg(atomic64_t *v, u64 o, u64 n);
-
 /**
  * atomic64_read - read atomic variable
  * @v: pointer of type atomic64_t
@@ -137,35 +98,7 @@ static inline u64 atomic64_read(const atomic64_t *v)
          * Casting away const is safe since the atomic support routines
          * do not write to memory if the value has not been modified.
          */
-        return _atomic64_xchg_add((atomic64_t *)v, 0);
-}
-
-/**
- * atomic64_xchg - atomically exchange contents of memory with a new value
- * @v: pointer of type atomic64_t
- * @i: integer value to store in memory
- *
- * Atomically sets @v to @i and returns old @v
- */
-static inline u64 atomic64_xchg(atomic64_t *v, u64 n)
-{
-        smp_mb();  /* barrier for proper semantics */
-        return _atomic64_xchg(v, n);
-}
-
-/**
- * atomic64_cmpxchg - atomically exchange contents of memory if it matches
- * @v: pointer of type atomic64_t
- * @o: old value that memory should have
- * @n: new value to write to memory if it matches
- *
- * Atomically checks if @v holds @o and replaces it with @n if so.
- * Returns the old value at @v.
- */
-static inline u64 atomic64_cmpxchg(atomic64_t *v, u64 o, u64 n)
-{
-        smp_mb();  /* barrier for proper semantics */
-        return _atomic64_cmpxchg(v, o, n);
+        return _atomic64_xchg_add((u64 *)&v->counter, 0);
 }
 
 /**
@@ -177,7 +110,7 @@ static inline u64 atomic64_cmpxchg(atomic64_t *v, u64 o, u64 n)
  */
 static inline void atomic64_add(u64 i, atomic64_t *v)
 {
-        _atomic64_xchg_add(v, i);
+        _atomic64_xchg_add(&v->counter, i);
 }
 
 /**
@@ -190,7 +123,7 @@ static inline void atomic64_add(u64 i, atomic64_t *v)
 static inline u64 atomic64_add_return(u64 i, atomic64_t *v)
 {
         smp_mb();  /* barrier for proper semantics */
-        return _atomic64_xchg_add(v, i) + i;
+        return _atomic64_xchg_add(&v->counter, i) + i;
 }
 
 /**
@@ -205,7 +138,7 @@ static inline u64 atomic64_add_return(u64 i, atomic64_t *v)
 static inline u64 atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
 {
         smp_mb();  /* barrier for proper semantics */
-        return _atomic64_xchg_add_unless(v, a, u) != u;
+        return _atomic64_xchg_add_unless(&v->counter, a, u) != u;
 }
 
 /**
@@ -220,7 +153,7 @@ static inline u64 atomic64_add_unless(atomic64_t *v, u64 a, u64 u)
  */
 static inline void atomic64_set(atomic64_t *v, u64 n)
 {
-        _atomic64_xchg(v, n);
+        _atomic64_xchg(&v->counter, n);
 }
 
 #define atomic64_add_negative(a, v)     (atomic64_add_return((a), (v)) < 0)
@@ -252,21 +185,6 @@ static inline void atomic64_set(atomic64_t *v, u64 n)
  * Internal definitions only beyond this point.
  */
 
-#define ATOMIC_LOCKS_FOUND_VIA_TABLE() \
-  (!CHIP_HAS_CBOX_HOME_MAP() && defined(CONFIG_SMP))
-
-#if ATOMIC_LOCKS_FOUND_VIA_TABLE()
-
-/* Number of entries in atomic_lock_ptr[]. */
-#define ATOMIC_HASH_L1_SHIFT 6
-#define ATOMIC_HASH_L1_SIZE (1 << ATOMIC_HASH_L1_SHIFT)
-
-/* Number of locks in each struct pointed to by atomic_lock_ptr[]. */
-#define ATOMIC_HASH_L2_SHIFT (CHIP_L2_LOG_LINE_SIZE() - 2)
-#define ATOMIC_HASH_L2_SIZE (1 << ATOMIC_HASH_L2_SHIFT)
-
-#else /* ATOMIC_LOCKS_FOUND_VIA_TABLE() */
-
 /*
  * Number of atomic locks in atomic_locks[]. Must be a power of two.
  * There is no reason for more than PAGE_SIZE / 8 entries, since that
@@ -281,8 +199,6 @@ static inline void atomic64_set(atomic64_t *v, u64 n)
 extern int atomic_locks[];
 #endif
 
-#endif /* ATOMIC_LOCKS_FOUND_VIA_TABLE() */
-
 /*
  * All the code that may fault while holding an atomic lock must
  * place the pointer to the lock in ATOMIC_LOCK_REG so the fault code
diff --git a/arch/tile/include/asm/atomic_64.h b/arch/tile/include/asm/atomic_64.h
index f4500c688ffa..ad220eed05fc 100644
--- a/arch/tile/include/asm/atomic_64.h
+++ b/arch/tile/include/asm/atomic_64.h
@@ -32,25 +32,6 @@
  * on any routine which updates memory and returns a value.
  */
 
-static inline int atomic_cmpxchg(atomic_t *v, int o, int n)
-{
-        int val;
-        __insn_mtspr(SPR_CMPEXCH_VALUE, o);
-        smp_mb();  /* barrier for proper semantics */
-        val = __insn_cmpexch4((void *)&v->counter, n);
-        smp_mb();  /* barrier for proper semantics */
-        return val;
-}
-
-static inline int atomic_xchg(atomic_t *v, int n)
-{
-        int val;
-        smp_mb();  /* barrier for proper semantics */
-        val = __insn_exch4((void *)&v->counter, n);
-        smp_mb();  /* barrier for proper semantics */
-        return val;
-}
-
 static inline void atomic_add(int i, atomic_t *v)
 {
         __insn_fetchadd4((void *)&v->counter, i);
@@ -72,7 +53,7 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
                 if (oldval == u)
                         break;
                 guess = oldval;
-                oldval = atomic_cmpxchg(v, guess, guess + a);
+                oldval = cmpxchg(&v->counter, guess, guess + a);
         } while (guess != oldval);
         return oldval;
 }
@@ -84,25 +65,6 @@ static inline int __atomic_add_unless(atomic_t *v, int a, int u)
 #define atomic64_read(v)                ((v)->counter)
 #define atomic64_set(v, i) ((v)->counter = (i))
 
-static inline long atomic64_cmpxchg(atomic64_t *v, long o, long n)
-{
-        long val;
-        smp_mb();  /* barrier for proper semantics */
-        __insn_mtspr(SPR_CMPEXCH_VALUE, o);
-        val = __insn_cmpexch((void *)&v->counter, n);
-        smp_mb();  /* barrier for proper semantics */
-        return val;
-}
-
-static inline long atomic64_xchg(atomic64_t *v, long n)
-{
-        long val;
-        smp_mb();  /* barrier for proper semantics */
-        val = __insn_exch((void *)&v->counter, n);
-        smp_mb();  /* barrier for proper semantics */
-        return val;
-}
-
 static inline void atomic64_add(long i, atomic64_t *v)
 {
         __insn_fetchadd((void *)&v->counter, i);
@@ -124,7 +86,7 @@ static inline long atomic64_add_unless(atomic64_t *v, long a, long u)
                 if (oldval == u)
                         break;
                 guess = oldval;
-                oldval = atomic64_cmpxchg(v, guess, guess + a);
+                oldval = cmpxchg(&v->counter, guess, guess + a);
         } while (guess != oldval);
         return oldval != u;
 }
diff --git a/arch/tile/include/asm/barrier.h b/arch/tile/include/asm/barrier.h
index 990a217a0b72..a9a73da5865d 100644
--- a/arch/tile/include/asm/barrier.h
+++ b/arch/tile/include/asm/barrier.h
@@ -77,7 +77,6 @@
 
 #define __sync()        __insn_mf()
 
-#if !CHIP_HAS_MF_WAITS_FOR_VICTIMS()
 #include <hv/syscall_public.h>
 /*
  * Issue an uncacheable load to each memory controller, then
@@ -96,7 +95,6 @@ static inline void __mb_incoherent(void)
                        "r20", "r21", "r22", "r23", "r24",
                        "r25", "r26", "r27", "r28", "r29");
 }
-#endif
 
 /* Fence to guarantee visibility of stores to incoherent memory. */
 static inline void
@@ -104,7 +102,6 @@ mb_incoherent(void)
 {
         __insn_mf();
 
-#if !CHIP_HAS_MF_WAITS_FOR_VICTIMS()
         {
 #if CHIP_HAS_TILE_WRITE_PENDING()
                 const unsigned long WRITE_TIMEOUT_CYCLES = 400;
@@ -116,7 +113,6 @@ mb_incoherent(void)
 #endif /* CHIP_HAS_TILE_WRITE_PENDING() */
                 (void) __mb_incoherent();
         }
-#endif /* CHIP_HAS_MF_WAITS_FOR_VICTIMS() */
 }
 
 #define fast_wmb()      __sync()
diff --git a/arch/tile/include/asm/bitops.h b/arch/tile/include/asm/bitops.h
index bd186c4eaa50..d5a206865036 100644
--- a/arch/tile/include/asm/bitops.h
+++ b/arch/tile/include/asm/bitops.h
@@ -29,17 +29,6 @@
 #endif
 
 /**
- * __ffs - find first set bit in word
- * @word: The word to search
- *
- * Undefined if no set bit exists, so code should check against 0 first.
- */
-static inline unsigned long __ffs(unsigned long word)
-{
-        return __builtin_ctzl(word);
-}
-
-/**
  * ffz - find first zero bit in word
  * @word: The word to search
  *
@@ -50,33 +39,6 @@ static inline unsigned long ffz(unsigned long word)
         return __builtin_ctzl(~word);
 }
 
-/**
- * __fls - find last set bit in word
- * @word: The word to search
- *
- * Undefined if no set bit exists, so code should check against 0 first.
- */
-static inline unsigned long __fls(unsigned long word)
-{
-        return (sizeof(word) * 8) - 1 - __builtin_clzl(word);
-}
-
-/**
- * ffs - find first set bit in word
- * @x: the word to search
- *
- * This is defined the same way as the libc and compiler builtin ffs
- * routines, therefore differs in spirit from the other bitops.
- *
- * ffs(value) returns 0 if value is 0 or the position of the first
- * set bit if value is nonzero. The first (least significant) bit
- * is at position 1.
- */
-static inline int ffs(int x)
-{
-        return __builtin_ffs(x);
-}
-
 static inline int fls64(__u64 w)
 {
         return (sizeof(__u64) * 8) - __builtin_clzll(w);
@@ -118,6 +80,9 @@ static inline unsigned long __arch_hweight64(__u64 w)
         return __builtin_popcountll(w);
 }
 
+#include <asm-generic/bitops/builtin-__ffs.h>
+#include <asm-generic/bitops/builtin-__fls.h>
+#include <asm-generic/bitops/builtin-ffs.h>
 #include <asm-generic/bitops/const_hweight.h>
 #include <asm-generic/bitops/lock.h>
 #include <asm-generic/bitops/find.h>
diff --git a/arch/tile/include/asm/bitops_32.h b/arch/tile/include/asm/bitops_32.h
index ddc4c1efde43..386865ad2f55 100644
--- a/arch/tile/include/asm/bitops_32.h
+++ b/arch/tile/include/asm/bitops_32.h
@@ -16,7 +16,7 @@
 #define _ASM_TILE_BITOPS_32_H
 
 #include <linux/compiler.h>
-#include <linux/atomic.h>
+#include <asm/barrier.h>
 
 /* Tile-specific routines to support <asm/bitops.h>. */
 unsigned long _atomic_or(volatile unsigned long *p, unsigned long mask);
diff --git a/arch/tile/include/asm/bitops_64.h b/arch/tile/include/asm/bitops_64.h
index 60b87ee54fb8..ad34cd056085 100644
--- a/arch/tile/include/asm/bitops_64.h
+++ b/arch/tile/include/asm/bitops_64.h
@@ -16,7 +16,7 @@
 #define _ASM_TILE_BITOPS_64_H
 
 #include <linux/compiler.h>
-#include <linux/atomic.h>
+#include <asm/cmpxchg.h>
 
 /* See <asm/bitops.h> for API comments. */
 
@@ -44,8 +44,7 @@ static inline void change_bit(unsigned nr, volatile unsigned long *addr)
         oldval = *addr;
         do {
                 guess = oldval;
-                oldval = atomic64_cmpxchg((atomic64_t *)addr,
-                                          guess, guess ^ mask);
+                oldval = cmpxchg(addr, guess, guess ^ mask);
         } while (guess != oldval);
 }
 
@@ -90,8 +89,7 @@ static inline int test_and_change_bit(unsigned nr,
         oldval = *addr;
         do {
                 guess = oldval;
-                oldval = atomic64_cmpxchg((atomic64_t *)addr,
-                                          guess, guess ^ mask);
+                oldval = cmpxchg(addr, guess, guess ^ mask);
         } while (guess != oldval);
         return (oldval & mask) != 0;
 }
diff --git a/arch/tile/include/asm/cache.h b/arch/tile/include/asm/cache.h
index a9a529964e07..6160761d5f61 100644
--- a/arch/tile/include/asm/cache.h
+++ b/arch/tile/include/asm/cache.h
@@ -49,9 +49,16 @@
 #define __read_mostly __attribute__((__section__(".data..read_mostly")))
 
 /*
- * Attribute for data that is kept read/write coherent until the end of
- * initialization, then bumped to read/only incoherent for performance.
+ * Originally we used small TLB pages for kernel data and grouped some
+ * things together as "write once", enforcing the property at the end
+ * of initialization by making those pages read-only and non-coherent.
+ * This allowed better cache utilization since cache inclusion did not
+ * need to be maintained.  However, to do this requires an extra TLB
+ * entry, which on balance is more of a performance hit than the
+ * non-coherence is a performance gain, so we now just make "read
+ * mostly" and "write once" be synonyms.  We keep the attribute
+ * separate in case we change our minds at a future date.
  */
-#define __write_once __attribute__((__section__(".w1data")))
+#define __write_once __read_mostly
 
 #endif /* _ASM_TILE_CACHE_H */
diff --git a/arch/tile/include/asm/cacheflush.h b/arch/tile/include/asm/cacheflush.h
index 0fc63c488edf..92ee4c8a4f76 100644
--- a/arch/tile/include/asm/cacheflush.h
+++ b/arch/tile/include/asm/cacheflush.h
@@ -75,23 +75,6 @@ static inline void copy_to_user_page(struct vm_area_struct *vma,
 #define copy_from_user_page(vma, page, vaddr, dst, src, len) \
         memcpy((dst), (src), (len))
 
-/*
- * Invalidate a VA range; pads to L2 cacheline boundaries.
- *
- * Note that on TILE64, __inv_buffer() actually flushes modified
- * cache lines in addition to invalidating them, i.e., it's the
- * same as __finv_buffer().
- */
-static inline void __inv_buffer(void *buffer, size_t size)
-{
-        char *next = (char *)((long)buffer & -L2_CACHE_BYTES);
-        char *finish = (char *)L2_CACHE_ALIGN((long)buffer + size);
-        while (next < finish) {
-                __insn_inv(next);
-                next += CHIP_INV_STRIDE();
-        }
-}
-
 /* Flush a VA range; pads to L2 cacheline boundaries. */
 static inline void __flush_buffer(void *buffer, size_t size)
 {
@@ -115,13 +98,6 @@ static inline void __finv_buffer(void *buffer, size_t size)
 }
 
 
-/* Invalidate a VA range and wait for it to be complete. */
-static inline void inv_buffer(void *buffer, size_t size)
-{
-        __inv_buffer(buffer, size);
-        mb();
-}
-
 /*
  * Flush a locally-homecached VA range and wait for the evicted
  * cachelines to hit memory.
@@ -142,6 +118,26 @@ static inline void finv_buffer_local(void *buffer, size_t size)
         mb_incoherent();
 }
 
+#ifdef __tilepro__
+/* Invalidate a VA range; pads to L2 cacheline boundaries. */
+static inline void __inv_buffer(void *buffer, size_t size)
+{
+        char *next = (char *)((long)buffer & -L2_CACHE_BYTES);
+        char *finish = (char *)L2_CACHE_ALIGN((long)buffer + size);
+        while (next < finish) {
+                __insn_inv(next);
+                next += CHIP_INV_STRIDE();
+        }
+}
+
+/* Invalidate a VA range and wait for it to be complete. */
+static inline void inv_buffer(void *buffer, size_t size)
+{
+        __inv_buffer(buffer, size);
+        mb();
+}
+#endif
+
 /*
  * Flush and invalidate a VA range that is homed remotely, waiting
  * until the memory controller holds the flushed values.  If "hfh" is
diff --git a/arch/tile/include/asm/cmpxchg.h b/arch/tile/include/asm/cmpxchg.h
index 276f067e3640..4001d5eab4bb 100644
--- a/arch/tile/include/asm/cmpxchg.h
+++ b/arch/tile/include/asm/cmpxchg.h
@@ -20,53 +20,108 @@
 
 #ifndef __ASSEMBLY__
 
-/* Nonexistent functions intended to cause link errors. */
-extern unsigned long __xchg_called_with_bad_pointer(void);
-extern unsigned long __cmpxchg_called_with_bad_pointer(void);
+#include <asm/barrier.h>
 
-#define xchg(ptr, x)                                                    \
+/* Nonexistent functions intended to cause compile errors. */
+extern void __xchg_called_with_bad_pointer(void)
+        __compiletime_error("Bad argument size for xchg");
+extern void __cmpxchg_called_with_bad_pointer(void)
+        __compiletime_error("Bad argument size for cmpxchg");
+
+#ifndef __tilegx__
+
+/* Note the _atomic_xxx() routines include a final mb(). */
+int _atomic_xchg(int *ptr, int n);
+int _atomic_xchg_add(int *v, int i);
+int _atomic_xchg_add_unless(int *v, int a, int u);
+int _atomic_cmpxchg(int *ptr, int o, int n);
+u64 _atomic64_xchg(u64 *v, u64 n);
+u64 _atomic64_xchg_add(u64 *v, u64 i);
+u64 _atomic64_xchg_add_unless(u64 *v, u64 a, u64 u);
+u64 _atomic64_cmpxchg(u64 *v, u64 o, u64 n);
+
+#define xchg(ptr, n)                                                    \
+        ({                                                              \
+                if (sizeof(*(ptr)) != 4)                                \
+                        __xchg_called_with_bad_pointer();               \
+                smp_mb();                                               \
+                (typeof(*(ptr)))_atomic_xchg((int *)(ptr), (int)(n));   \
+        })
+
+#define cmpxchg(ptr, o, n)                                              \
+        ({                                                              \
+                if (sizeof(*(ptr)) != 4)                                \
+                        __cmpxchg_called_with_bad_pointer();            \
+                smp_mb();                                               \
+                (typeof(*(ptr)))_atomic_cmpxchg((int *)ptr, (int)o, (int)n); \
+        })
+
+#define xchg64(ptr, n)                                                  \
+        ({                                                              \
+                if (sizeof(*(ptr)) != 8)                                \
+                        __xchg_called_with_bad_pointer();               \
+                smp_mb();                                               \
+                (typeof(*(ptr)))_atomic64_xchg((u64 *)(ptr), (u64)(n)); \
+        })
+
+#define cmpxchg64(ptr, o, n)                                            \
+        ({                                                              \
+                if (sizeof(*(ptr)) != 8)                                \
+                        __cmpxchg_called_with_bad_pointer();            \
+                smp_mb();                                               \
+                (typeof(*(ptr)))_atomic64_cmpxchg((u64 *)ptr, (u64)o, (u64)n); \
+        })
+
+#else
+
+#define xchg(ptr, n)                                                    \
         ({                                                              \
                 typeof(*(ptr)) __x;                                     \
+                smp_mb();                                               \
                 switch (sizeof(*(ptr))) {                               \
                 case 4:                                                 \
-                        __x = (typeof(__x))(typeof(__x-__x))atomic_xchg( \
-                                (atomic_t *)(ptr),                      \
-                                (u32)(typeof((x)-(x)))(x));             \
+                        __x = (typeof(__x))(unsigned long)              \
+                                __insn_exch4((ptr), (u32)(unsigned long)(n)); \
                         break;                                          \
                 case 8:                                                 \
-                        __x = (typeof(__x))(typeof(__x-__x))atomic64_xchg( \
-                                (atomic64_t *)(ptr),                    \
-                                (u64)(typeof((x)-(x)))(x));             \
+                        __x = (typeof(__x))                     \
+                                __insn_exch((ptr), (unsigned long)(n)); \
                         break;                                          \
                 default:                                                \
                         __xchg_called_with_bad_pointer();               \
+                        break;                                          \
                 }                                                       \
+                smp_mb();                                               \
                 __x;                                                    \
         })
 
 #define cmpxchg(ptr, o, n)                                              \
         ({                                                              \
                 typeof(*(ptr)) __x;                                     \
+                __insn_mtspr(SPR_CMPEXCH_VALUE, (unsigned long)(o));    \
+                smp_mb();                                               \
                 switch (sizeof(*(ptr))) {                               \
                 case 4:                                                 \
-                        __x = (typeof(__x))(typeof(__x-__x))atomic_cmpxchg( \
-                                (atomic_t *)(ptr),                      \
-                                (u32)(typeof((o)-(o)))(o),              \
-                                (u32)(typeof((n)-(n)))(n));             \
+                        __x = (typeof(__x))(unsigned long)              \
+                                __insn_cmpexch4((ptr), (u32)(unsigned long)(n)); \
                         break;                                          \
                 case 8:                                                 \
-                        __x = (typeof(__x))(typeof(__x-__x))atomic64_cmpxchg( \
-                                (atomic64_t *)(ptr),                    \
-                                (u64)(typeof((o)-(o)))(o),              \
-                                (u64)(typeof((n)-(n)))(n));             \
+                        __x = (typeof(__x))__insn_cmpexch((ptr), (u64)(n)); \
                         break;                                          \
                 default:                                                \
                         __cmpxchg_called_with_bad_pointer();            \
+                        break;                                          \
                 }                                                       \
+                smp_mb();                                               \
                 __x;                                                    \
         })
 
-#define tas(ptr) (xchg((ptr), 1))
+#define xchg64 xchg
+#define cmpxchg64 cmpxchg
+
+#endif
+
+#define tas(ptr) xchg((ptr), 1)
 
 #endif /* __ASSEMBLY__ */
 
diff --git a/arch/tile/include/asm/device.h b/arch/tile/include/asm/device.h
index 5182705bd056..6ab8bf146d4c 100644
--- a/arch/tile/include/asm/device.h
+++ b/arch/tile/include/asm/device.h
@@ -23,7 +23,10 @@ struct dev_archdata {
         /* Offset of the DMA address from the PA. */
         dma_addr_t              dma_offset;
 
-        /* Highest DMA address that can be generated by this device. */
+        /*
+         * Highest DMA address that can be generated by devices that
+         * have limited DMA capability, i.e. non 64-bit capable.
+         */
         dma_addr_t              max_direct_dma_addr;
 };
 
diff --git a/arch/tile/include/asm/dma-mapping.h b/arch/tile/include/asm/dma-mapping.h
index f2ff191376b4..1eae359d8315 100644
--- a/arch/tile/include/asm/dma-mapping.h
+++ b/arch/tile/include/asm/dma-mapping.h
@@ -20,9 +20,14 @@
 #include <linux/cache.h>
 #include <linux/io.h>
 
+#ifdef __tilegx__
+#define ARCH_HAS_DMA_GET_REQUIRED_MASK
+#endif
+
 extern struct dma_map_ops *tile_dma_map_ops;
 extern struct dma_map_ops *gx_pci_dma_map_ops;
 extern struct dma_map_ops *gx_legacy_pci_dma_map_ops;
+extern struct dma_map_ops *gx_hybrid_pci_dma_map_ops;
 
 static inline struct dma_map_ops *get_dma_ops(struct device *dev)
 {
@@ -44,12 +49,12 @@ static inline void set_dma_offset(struct device *dev, dma_addr_t off)
 
 static inline dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr)
 {
-        return paddr + get_dma_offset(dev);
+        return paddr;
 }
 
 static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t daddr)
 {
-        return daddr - get_dma_offset(dev);
+        return daddr;
 }
 
 static inline void dma_mark_clean(void *addr, size_t size) {}
@@ -87,11 +92,19 @@ dma_set_mask(struct device *dev, u64 mask)
 {
         struct dma_map_ops *dma_ops = get_dma_ops(dev);
 
-        /* Handle legacy PCI devices with limited memory addressability. */
-        if ((dma_ops == gx_pci_dma_map_ops) && (mask <= DMA_BIT_MASK(32))) {
-                set_dma_ops(dev, gx_legacy_pci_dma_map_ops);
-                set_dma_offset(dev, 0);
-                if (mask > dev->archdata.max_direct_dma_addr)
+        /*
+         * For PCI devices with 64-bit DMA addressing capability, promote
+         * the dma_ops to hybrid, with the consistent memory DMA space limited
+         * to 32-bit. For 32-bit capable devices, limit the streaming DMA
+         * address range to max_direct_dma_addr.
+         */
+        if (dma_ops == gx_pci_dma_map_ops ||
+            dma_ops == gx_hybrid_pci_dma_map_ops ||
+            dma_ops == gx_legacy_pci_dma_map_ops) {
+                if (mask == DMA_BIT_MASK(64) &&
+                    dma_ops == gx_legacy_pci_dma_map_ops)
+                        set_dma_ops(dev, gx_hybrid_pci_dma_map_ops);
+                else if (mask > dev->archdata.max_direct_dma_addr)
                         mask = dev->archdata.max_direct_dma_addr;
         }
 
diff --git a/arch/tile/include/asm/elf.h b/arch/tile/include/asm/elf.h
index ff8a93408823..41d9878a9686 100644
--- a/arch/tile/include/asm/elf.h
+++ b/arch/tile/include/asm/elf.h
@@ -30,7 +30,6 @@ typedef unsigned long elf_greg_t;
 #define ELF_NGREG (sizeof(struct pt_regs) / sizeof(elf_greg_t))
 typedef elf_greg_t elf_gregset_t[ELF_NGREG];
 
-#define EM_TILE64  187
 #define EM_TILEPRO 188
 #define EM_TILEGX  191
 
@@ -132,6 +131,15 @@ extern int dump_task_regs(struct task_struct *, elf_gregset_t *);
 struct linux_binprm;
 extern int arch_setup_additional_pages(struct linux_binprm *bprm,
                                        int executable_stack);
+#define ARCH_DLINFO \
+do { \
+        NEW_AUX_ENT(AT_SYSINFO_EHDR, VDSO_BASE); \
+} while (0)
+
+struct mm_struct;
+extern unsigned long arch_randomize_brk(struct mm_struct *mm);
+#define arch_randomize_brk arch_randomize_brk
+
 #ifdef CONFIG_COMPAT
 
 #define COMPAT_ELF_PLATFORM "tilegx-m32"
diff --git a/arch/tile/include/asm/fixmap.h b/arch/tile/include/asm/fixmap.h
index e16dbf929cb5..c6b9c1b38fd1 100644
--- a/arch/tile/include/asm/fixmap.h
+++ b/arch/tile/include/asm/fixmap.h
@@ -78,14 +78,6 @@ enum fixed_addresses {
 #endif
 };
 
-extern void __set_fixmap(enum fixed_addresses idx,
-                         unsigned long phys, pgprot_t flags);
-
-#define set_fixmap(idx, phys) \
-                __set_fixmap(idx, phys, PAGE_KERNEL)
-#define clear_fixmap(idx) \
-                __set_fixmap(idx, 0, __pgprot(0))
-
 #define __FIXADDR_SIZE  (__end_of_permanent_fixed_addresses << PAGE_SHIFT)
 #define __FIXADDR_BOOT_SIZE     (__end_of_fixed_addresses << PAGE_SHIFT)
 #define FIXADDR_START           (FIXADDR_TOP + PAGE_SIZE - __FIXADDR_SIZE)
diff --git a/arch/tile/include/asm/ftrace.h b/arch/tile/include/asm/ftrace.h
index 461459b06d98..13a9bb81a8ab 100644
--- a/arch/tile/include/asm/ftrace.h
+++ b/arch/tile/include/asm/ftrace.h
@@ -15,6 +15,26 @@
 #ifndef _ASM_TILE_FTRACE_H
 #define _ASM_TILE_FTRACE_H
 
-/* empty */
+#ifdef CONFIG_FUNCTION_TRACER
+
+#define MCOUNT_ADDR ((unsigned long)(__mcount))
+#define MCOUNT_INSN_SIZE 8              /* sizeof mcount call */
+
+#ifndef __ASSEMBLY__
+extern void __mcount(void);
+
+#ifdef CONFIG_DYNAMIC_FTRACE
+static inline unsigned long ftrace_call_adjust(unsigned long addr)
+{
+        return addr;
+}
+
+struct dyn_arch_ftrace {
+};
+#endif /*  CONFIG_DYNAMIC_FTRACE */
+
+#endif /* __ASSEMBLY__ */
+
+#endif /* CONFIG_FUNCTION_TRACER */
 
 #endif /* _ASM_TILE_FTRACE_H */
diff --git a/arch/tile/include/asm/futex.h b/arch/tile/include/asm/futex.h
index 5909ac3d7218..1a6ef1b69cb1 100644
--- a/arch/tile/include/asm/futex.h
+++ b/arch/tile/include/asm/futex.h
@@ -43,6 +43,7 @@
             ".pushsection .fixup,\"ax\"\n"                      \
             "0: { movei %0, %5; j 9f }\n"                       \
             ".section __ex_table,\"a\"\n"                       \
+            ".align 8\n"                                        \
             ".quad 1b, 0b\n"                                    \
             ".popsection\n"                                     \
             "9:"                                                \
diff --git a/arch/tile/include/asm/homecache.h b/arch/tile/include/asm/homecache.h
index 7b7771328642..7ddd1b8d6910 100644
--- a/arch/tile/include/asm/homecache.h
+++ b/arch/tile/include/asm/homecache.h
@@ -33,8 +33,7 @@ struct zone;
 
 /*
  * Is this page immutable (unwritable) and thus able to be cached more
- * widely than would otherwise be possible?  On tile64 this means we
- * mark the PTE to cache locally; on tilepro it means we have "nc" set.
+ * widely than would otherwise be possible?  This means we have "nc" set.
  */
 #define PAGE_HOME_IMMUTABLE -2
 
@@ -44,16 +43,8 @@ struct zone;
  */
 #define PAGE_HOME_INCOHERENT -3
 
-#if CHIP_HAS_CBOX_HOME_MAP()
 /* Home for the page is distributed via hash-for-home. */
 #define PAGE_HOME_HASH -4
-#endif
-
-/* Homing is unknown or unspecified.  Not valid for page_home(). */
-#define PAGE_HOME_UNKNOWN -5
-
-/* Home on the current cpu.  Not valid for page_home(). */
-#define PAGE_HOME_HERE -6
 
 /* Support wrapper to use instead of explicit hv_flush_remote(). */
 extern void flush_remote(unsigned long cache_pfn, unsigned long cache_length,
diff --git a/arch/tile/include/asm/io.h b/arch/tile/include/asm/io.h
index 31672918064c..9fe434969fab 100644
--- a/arch/tile/include/asm/io.h
+++ b/arch/tile/include/asm/io.h
@@ -19,7 +19,8 @@
 #include <linux/bug.h>
 #include <asm/page.h>
 
-#define IO_SPACE_LIMIT 0xfffffffful
+/* Maximum PCI I/O space address supported. */
+#define IO_SPACE_LIMIT 0xffffffff
 
 /*
  * Convert a physical pointer to a virtual kernel pointer for /dev/mem
@@ -254,7 +255,7 @@ static inline void writeq(u64 val, unsigned long addr)
 
 static inline void memset_io(volatile void *dst, int val, size_t len)
 {
-        int x;
+        size_t x;
         BUG_ON((unsigned long)dst & 0x3);
         val = (val & 0xff) * 0x01010101;
         for (x = 0; x < len; x += 4)
@@ -264,7 +265,7 @@ static inline void memset_io(volatile void *dst, int val, size_t len)
 static inline void memcpy_fromio(void *dst, const volatile void __iomem *src,
                                  size_t len)
 {
-        int x;
+        size_t x;
         BUG_ON((unsigned long)src & 0x3);
         for (x = 0; x < len; x += 4)
                 *(u32 *)(dst + x) = readl(src + x);
@@ -273,7 +274,7 @@ static inline void memcpy_fromio(void *dst, const volatile void __iomem *src,
 static inline void memcpy_toio(volatile void __iomem *dst, const void *src,
                                 size_t len)
 {
-        int x;
+        size_t x;
         BUG_ON((unsigned long)dst & 0x3);
         for (x = 0; x < len; x += 4)
                 writel(*(u32 *)(src + x), dst + x);
@@ -281,8 +282,108 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src,
 
 #endif
 
+#if CHIP_HAS_MMIO() && defined(CONFIG_TILE_PCI_IO)
+
+static inline u8 inb(unsigned long addr)
+{
+        return readb((volatile void __iomem *) addr);
+}
+
+static inline u16 inw(unsigned long addr)
+{
+        return readw((volatile void __iomem *) addr);
+}
+
+static inline u32 inl(unsigned long addr)
+{
+        return readl((volatile void __iomem *) addr);
+}
+
+static inline void outb(u8 b, unsigned long addr)
+{
+        writeb(b, (volatile void __iomem *) addr);
+}
+
+static inline void outw(u16 b, unsigned long addr)
+{
+        writew(b, (volatile void __iomem *) addr);
+}
+
+static inline void outl(u32 b, unsigned long addr)
+{
+        writel(b, (volatile void __iomem *) addr);
+}
+
+static inline void insb(unsigned long addr, void *buffer, int count)
+{
+        if (count) {
+                u8 *buf = buffer;
+                do {
+                        u8 x = inb(addr);
+                        *buf++ = x;
+                } while (--count);
+        }
+}
+
+static inline void insw(unsigned long addr, void *buffer, int count)
+{
+        if (count) {
+                u16 *buf = buffer;
+                do {
+                        u16 x = inw(addr);
+                        *buf++ = x;
+                } while (--count);
+        }
+}
+
+static inline void insl(unsigned long addr, void *buffer, int count)
+{
+        if (count) {
+                u32 *buf = buffer;
+                do {
+                        u32 x = inl(addr);
+                        *buf++ = x;
+                } while (--count);
+        }
+}
+
+static inline void outsb(unsigned long addr, const void *buffer, int count)
+{
+        if (count) {
+                const u8 *buf = buffer;
+                do {
+                        outb(*buf++, addr);
+                } while (--count);
+        }
+}
+
+static inline void outsw(unsigned long addr, const void *buffer, int count)
+{
+        if (count) {
+                const u16 *buf = buffer;
+                do {
+                        outw(*buf++, addr);
+                } while (--count);
+        }
+}
+
+static inline void outsl(unsigned long addr, const void *buffer, int count)
+{
+        if (count) {
+                const u32 *buf = buffer;
+                do {
+                        outl(*buf++, addr);
+                } while (--count);
+        }
+}
+
+extern void __iomem *ioport_map(unsigned long port, unsigned int len);
+extern void ioport_unmap(void __iomem *addr);
+
+#else
+
 /*
- * The Tile architecture does not support IOPORT, even with PCI.
+ * The TilePro architecture does not support IOPORT, even with PCI.
  * Unfortunately we can't yet simply not declare these methods,
  * since some generic code that compiles into the kernel, but
  * we never run, uses them unconditionally.
@@ -290,7 +391,12 @@ static inline void memcpy_toio(volatile void __iomem *dst, const void *src,
 
 static inline long ioport_panic(void)
 {
+#ifdef __tilegx__
+        panic("PCI IO space support is disabled. Configure the kernel with"
+              " CONFIG_TILE_PCI_IO to enable it");
+#else
         panic("inb/outb and friends do not exist on tile");
+#endif
         return 0;
 }
 
@@ -335,13 +441,6 @@ static inline void outl(u32 b, unsigned long addr)
         ioport_panic();
 }
 
-#define inb_p(addr)     inb(addr)
-#define inw_p(addr)     inw(addr)
-#define inl_p(addr)     inl(addr)
-#define outb_p(x, addr) outb((x), (addr))
-#define outw_p(x, addr) outw((x), (addr))
-#define outl_p(x, addr) outl((x), (addr))
-
 static inline void insb(unsigned long addr, void *buffer, int count)
 {
         ioport_panic();
@@ -372,6 +471,15 @@ static inline void outsl(unsigned long addr, const void *buffer, int count)
         ioport_panic();
 }
 
+#endif /* CHIP_HAS_MMIO() && defined(CONFIG_TILE_PCI_IO) */
+
+#define inb_p(addr)     inb(addr)
+#define inw_p(addr)     inw(addr)
+#define inl_p(addr)     inl(addr)
+#define outb_p(x, addr) outb((x), (addr))
+#define outw_p(x, addr) outw((x), (addr))
+#define outl_p(x, addr) outl((x), (addr))
+
 #define ioread16be(addr)        be16_to_cpu(ioread16(addr))
 #define ioread32be(addr)        be32_to_cpu(ioread32(addr))
 #define iowrite16be(v, addr)    iowrite16(be16_to_cpu(v), (addr))
diff --git a/arch/tile/include/asm/irqflags.h b/arch/tile/include/asm/irqflags.h
index c96f9bbb760d..71af5747874d 100644
--- a/arch/tile/include/asm/irqflags.h
+++ b/arch/tile/include/asm/irqflags.h
@@ -124,6 +124,12 @@
 DECLARE_PER_CPU(unsigned long long, interrupts_enabled_mask);
 #define INITIAL_INTERRUPTS_ENABLED (1ULL << INT_MEM_ERROR)
 
+#ifdef CONFIG_DEBUG_PREEMPT
+/* Due to inclusion issues, we can't rely on <linux/smp.h> here. */
+extern unsigned int debug_smp_processor_id(void);
+# define smp_processor_id() debug_smp_processor_id()
+#endif
+
 /* Disable interrupts. */
 #define arch_local_irq_disable() \
         interrupt_mask_set_mask(LINUX_MASKABLE_INTERRUPTS)
@@ -132,9 +138,18 @@ DECLARE_PER_CPU(unsigned long long, interrupts_enabled_mask);
 #define arch_local_irq_disable_all() \
         interrupt_mask_set_mask(-1ULL)
 
+/*
+ * Read the set of maskable interrupts.
+ * We avoid the preemption warning here via __this_cpu_ptr since even
+ * if irqs are already enabled, it's harmless to read the wrong cpu's
+ * enabled mask.
+ */
+#define arch_local_irqs_enabled() \
+        (*__this_cpu_ptr(&interrupts_enabled_mask))
+
 /* Re-enable all maskable interrupts. */
 #define arch_local_irq_enable() \
-        interrupt_mask_reset_mask(__get_cpu_var(interrupts_enabled_mask))
+        interrupt_mask_reset_mask(arch_local_irqs_enabled())
 
 /* Disable or enable interrupts based on flag argument. */
 #define arch_local_irq_restore(disabled) do { \
@@ -161,7 +176,7 @@ DECLARE_PER_CPU(unsigned long long, interrupts_enabled_mask);
 
 /* Prevent the given interrupt from being enabled next time we enable irqs. */
 #define arch_local_irq_mask(interrupt) \
-        (__get_cpu_var(interrupts_enabled_mask) &= ~(1ULL << (interrupt)))
+        this_cpu_and(interrupts_enabled_mask, ~(1ULL << (interrupt)))
 
 /* Prevent the given interrupt from being enabled immediately. */
 #define arch_local_irq_mask_now(interrupt) do { \
@@ -171,7 +186,7 @@ DECLARE_PER_CPU(unsigned long long, interrupts_enabled_mask);
 
 /* Allow the given interrupt to be enabled next time we enable irqs. */
 #define arch_local_irq_unmask(interrupt) \
-        (__get_cpu_var(interrupts_enabled_mask) |= (1ULL << (interrupt)))
+        this_cpu_or(interrupts_enabled_mask, (1ULL << (interrupt)))
 
 /* Allow the given interrupt to be enabled immediately, if !irqs_disabled. */
 #define arch_local_irq_unmask_now(interrupt) do { \
diff --git a/arch/tile/include/asm/hw_irq.h b/arch/tile/include/asm/kdebug.h
index 4fac5fbf333e..5bbbfa904c2d 100644
--- a/arch/tile/include/asm/hw_irq.h
+++ b/arch/tile/include/asm/kdebug.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2010 Tilera Corporation. All Rights Reserved.
+ * Copyright 2012 Tilera Corporation. All Rights Reserved.
  *
  *   This program is free software; you can redistribute it and/or
  *   modify it under the terms of the GNU General Public License
@@ -12,7 +12,17 @@
  *   more details.
  */
 
-#ifndef _ASM_TILE_HW_IRQ_H
-#define _ASM_TILE_HW_IRQ_H
+#ifndef _ASM_TILE_KDEBUG_H
+#define _ASM_TILE_KDEBUG_H
 
-#endif /* _ASM_TILE_HW_IRQ_H */
+#include <linux/notifier.h>
+
+enum die_val {
+        DIE_OOPS = 1,
+        DIE_BREAK,
+        DIE_SSTEPBP,
+        DIE_PAGE_FAULT,
+        DIE_COMPILED_BPT
+};
+
+#endif /* _ASM_TILE_KDEBUG_H */
diff --git a/arch/tile/include/asm/kgdb.h b/arch/tile/include/asm/kgdb.h
new file mode 100644
index 000000000000..280c181cf0db
--- /dev/null
+++ b/arch/tile/include/asm/kgdb.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright 2013 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ *
+ * TILE-Gx KGDB support.
+ */
+
+#ifndef __TILE_KGDB_H__
+#define __TILE_KGDB_H__
+
+#include <linux/kdebug.h>
+#include <arch/opcode.h>
+
+#define GDB_SIZEOF_REG          sizeof(unsigned long)
+
+/*
+ * TILE-Gx gdb is expecting the following register layout:
+ * 56 GPRs(R0 - R52, TP, SP, LR), 8 special GPRs(networks and ZERO),
+ * plus the PC and the faultnum.
+ *
+ * Even though kernel not use the 8 special GPRs, they need to be present
+ * in the registers sent for correct processing in the host-side gdb.
+ *
+ */
+#define DBG_MAX_REG_NUM         (56+8+2)
+#define NUMREGBYTES             (DBG_MAX_REG_NUM * GDB_SIZEOF_REG)
+
+/*
+ * BUFMAX defines the maximum number of characters in inbound/outbound
+ * buffers at least NUMREGBYTES*2 are needed for register packets,
+ * Longer buffer is needed to list all threads.
+ */
+#define BUFMAX                  2048
+
+#define BREAK_INSTR_SIZE        TILEGX_BUNDLE_SIZE_IN_BYTES
+
+/*
+ * Require cache flush for set/clear a software breakpoint or write memory.
+ */
+#define CACHE_FLUSH_IS_SAFE     1
+
+/*
+ * The compiled-in breakpoint instruction can be used to "break" into
+ * the debugger via magic system request key (sysrq-G).
+ */
+static tile_bundle_bits compiled_bpt = TILEGX_BPT_BUNDLE | DIE_COMPILED_BPT;
+
+enum tilegx_regnum {
+        TILEGX_PC_REGNUM = TREG_LAST_GPR + 9,
+        TILEGX_FAULTNUM_REGNUM,
+};
+
+/*
+ * Generate a breakpoint exception to "break" into the debugger.
+ */
+static inline void arch_kgdb_breakpoint(void)
+{
+        asm volatile (".quad %0\n\t"
+                      ::""(compiled_bpt));
+}
+
+#endif /* __TILE_KGDB_H__ */
diff --git a/arch/tile/include/asm/kprobes.h b/arch/tile/include/asm/kprobes.h
new file mode 100644
index 000000000000..d8f9a83943b1
--- /dev/null
+++ b/arch/tile/include/asm/kprobes.h
@@ -0,0 +1,79 @@
+/*
+ * arch/tile/include/asm/kprobes.h
+ *
+ * Copyright 2012 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#ifndef _ASM_TILE_KPROBES_H
+#define _ASM_TILE_KPROBES_H
+
+#include <linux/types.h>
+#include <linux/ptrace.h>
+#include <linux/percpu.h>
+
+#include <arch/opcode.h>
+
+#define __ARCH_WANT_KPROBES_INSN_SLOT
+#define MAX_INSN_SIZE                   2
+
+#define kretprobe_blacklist_size 0
+
+typedef tile_bundle_bits kprobe_opcode_t;
+
+#define flush_insn_slot(p)                                              \
+        flush_icache_range((unsigned long)p->addr,                      \
+                           (unsigned long)p->addr +                     \
+                           (MAX_INSN_SIZE * sizeof(kprobe_opcode_t)))
+
+struct kprobe;
+
+/* Architecture specific copy of original instruction. */
+struct arch_specific_insn {
+        kprobe_opcode_t *insn;
+};
+
+struct prev_kprobe {
+        struct kprobe *kp;
+        unsigned long status;
+        unsigned long saved_pc;
+};
+
+#define MAX_JPROBES_STACK_SIZE 128
+#define MAX_JPROBES_STACK_ADDR \
+        (((unsigned long)current_thread_info()) + THREAD_SIZE - 32 \
+                - sizeof(struct pt_regs))
+
+#define MIN_JPROBES_STACK_SIZE(ADDR)                                    \
+        ((((ADDR) + MAX_JPROBES_STACK_SIZE) > MAX_JPROBES_STACK_ADDR)   \
+                ? MAX_JPROBES_STACK_ADDR - (ADDR)                       \
+                : MAX_JPROBES_STACK_SIZE)
+
+/* per-cpu kprobe control block. */
+struct kprobe_ctlblk {
+        unsigned long kprobe_status;
+        unsigned long kprobe_saved_pc;
+        unsigned long jprobe_saved_sp;
+        struct prev_kprobe prev_kprobe;
+        struct pt_regs jprobe_saved_regs;
+        char jprobes_stack[MAX_JPROBES_STACK_SIZE];
+};
+
+extern tile_bundle_bits breakpoint2_insn;
+extern tile_bundle_bits breakpoint_insn;
+
+void arch_remove_kprobe(struct kprobe *);
+
+extern int kprobe_exceptions_notify(struct notifier_block *self,
+                             unsigned long val, void *data);
+
+#endif /* _ASM_TILE_KPROBES_H */
diff --git a/arch/tile/include/asm/mmu.h b/arch/tile/include/asm/mmu.h
index e2c789096795..0cab1182bde1 100644
--- a/arch/tile/include/asm/mmu.h
+++ b/arch/tile/include/asm/mmu.h
@@ -22,6 +22,7 @@ struct mm_context {
          * semaphore but atomically, but it is conservatively set.
          */
         unsigned long priority_cached;
+        unsigned long vdso_base;
 };
 
 typedef struct mm_context mm_context_t;
diff --git a/arch/tile/include/asm/mmu_context.h b/arch/tile/include/asm/mmu_context.h
index 37f0b741dee7..4734215e2ad4 100644
--- a/arch/tile/include/asm/mmu_context.h
+++ b/arch/tile/include/asm/mmu_context.h
@@ -45,7 +45,7 @@ static inline void __install_page_table(pgd_t *pgdir, int asid, pgprot_t prot)
 
 static inline void install_page_table(pgd_t *pgdir, int asid)
 {
-        pte_t *ptep = virt_to_pte(NULL, (unsigned long)pgdir);
+        pte_t *ptep = virt_to_kpte((unsigned long)pgdir);
         __install_page_table(pgdir, asid, *ptep);
 }
 
diff --git a/arch/tile/include/asm/mmzone.h b/arch/tile/include/asm/mmzone.h
index 9d3dbce8f953..804f1098b6cd 100644
--- a/arch/tile/include/asm/mmzone.h
+++ b/arch/tile/include/asm/mmzone.h
@@ -42,7 +42,7 @@ static inline int pfn_to_nid(unsigned long pfn)
 
 #define kern_addr_valid(kaddr)  virt_addr_valid((void *)kaddr)
 
-static inline int pfn_valid(int pfn)
+static inline int pfn_valid(unsigned long pfn)
 {
         int nid = pfn_to_nid(pfn);
 
diff --git a/arch/tile/include/asm/page.h b/arch/tile/include/asm/page.h
index dd033a4fd627..672768008618 100644
--- a/arch/tile/include/asm/page.h
+++ b/arch/tile/include/asm/page.h
@@ -39,6 +39,12 @@
 #define HPAGE_MASK      (~(HPAGE_SIZE - 1))
 
 /*
+ * We do define AT_SYSINFO_EHDR to support vDSO,
+ * but don't use the gate mechanism.
+ */
+#define __HAVE_ARCH_GATE_AREA           1
+
+/*
  * If the Kconfig doesn't specify, set a maximum zone order that
  * is enough so that we can create huge pages from small pages given
  * the respective sizes of the two page types.  See <linux/mmzone.h>.
@@ -142,8 +148,12 @@ static inline __attribute_const__ int get_order(unsigned long size)
 #define HAVE_ARCH_HUGETLB_UNMAPPED_AREA
 #endif
 
+/* Allow overriding how much VA or PA the kernel will use. */
+#define MAX_PA_WIDTH CHIP_PA_WIDTH()
+#define MAX_VA_WIDTH CHIP_VA_WIDTH()
+
 /* Each memory controller has PAs distinct in their high bits. */
-#define NR_PA_HIGHBIT_SHIFT (CHIP_PA_WIDTH() - CHIP_LOG_NUM_MSHIMS())
+#define NR_PA_HIGHBIT_SHIFT (MAX_PA_WIDTH - CHIP_LOG_NUM_MSHIMS())
 #define NR_PA_HIGHBIT_VALUES (1 << CHIP_LOG_NUM_MSHIMS())
 #define __pa_to_highbits(pa) ((phys_addr_t)(pa) >> NR_PA_HIGHBIT_SHIFT)
 #define __pfn_to_highbits(pfn) ((pfn) >> (NR_PA_HIGHBIT_SHIFT - PAGE_SHIFT))
@@ -154,7 +164,7 @@ static inline __attribute_const__ int get_order(unsigned long size)
  * We reserve the lower half of memory for user-space programs, and the
  * upper half for system code.  We re-map all of physical memory in the
  * upper half, which takes a quarter of our VA space.  Then we have
- * the vmalloc regions.  The supervisor code lives at 0xfffffff700000000,
+ * the vmalloc regions.  The supervisor code lives at the highest address,
  * with the hypervisor above that.
  *
  * Loadable kernel modules are placed immediately after the static
@@ -166,26 +176,18 @@ static inline __attribute_const__ int get_order(unsigned long size)
  * Similarly, for now we don't play any struct page mapping games.
  */
 
-#if CHIP_PA_WIDTH() + 2 > CHIP_VA_WIDTH()
+#if MAX_PA_WIDTH + 2 > MAX_VA_WIDTH
 # error Too much PA to map with the VA available!
 #endif
-#define HALF_VA_SPACE           (_AC(1, UL) << (CHIP_VA_WIDTH() - 1))
 
-#define MEM_LOW_END             (HALF_VA_SPACE - 1)         /* low half */
-#define MEM_HIGH_START          (-HALF_VA_SPACE)            /* high half */
-#define PAGE_OFFSET             MEM_HIGH_START
-#define FIXADDR_BASE            _AC(0xfffffff400000000, UL) /* 4 GB */
-#define FIXADDR_TOP             _AC(0xfffffff500000000, UL) /* 4 GB */
+#define PAGE_OFFSET             (-(_AC(1, UL) << (MAX_VA_WIDTH - 1)))
+#define KERNEL_HIGH_VADDR       _AC(0xfffffff800000000, UL)  /* high 32GB */
+#define FIXADDR_BASE            (KERNEL_HIGH_VADDR - 0x300000000) /* 4 GB */
+#define FIXADDR_TOP             (KERNEL_HIGH_VADDR - 0x200000000) /* 4 GB */
 #define _VMALLOC_START          FIXADDR_TOP
-#define HUGE_VMAP_BASE          _AC(0xfffffff600000000, UL) /* 4 GB */
-#define MEM_SV_START            _AC(0xfffffff700000000, UL) /* 256 MB */
-#define MEM_SV_INTRPT           MEM_SV_START
-#define MEM_MODULE_START        _AC(0xfffffff710000000, UL) /* 256 MB */
+#define MEM_SV_START            (KERNEL_HIGH_VADDR - 0x100000000) /* 256 MB */
+#define MEM_MODULE_START        (MEM_SV_START + (256*1024*1024)) /* 256 MB */
 #define MEM_MODULE_END          (MEM_MODULE_START + (256*1024*1024))
-#define MEM_HV_START            _AC(0xfffffff800000000, UL) /* 32 GB */
-
-/* Highest DTLB address we will use */
-#define KERNEL_HIGH_VADDR       MEM_SV_START
 
 #else /* !__tilegx__ */
 
@@ -207,25 +209,18 @@ static inline __attribute_const__ int get_order(unsigned long size)
  * values, and after that, we show "typical" values, since the actual
  * addresses depend on kernel #defines.
  *
- * MEM_HV_INTRPT                   0xfe000000
- * MEM_SV_INTRPT (kernel code)     0xfd000000
+ * MEM_HV_START                    0xfe000000
+ * MEM_SV_START  (kernel code)     0xfd000000
  * MEM_USER_INTRPT (user vector)   0xfc000000
- * FIX_KMAP_xxx                    0xf8000000 (via NR_CPUS * KM_TYPE_NR)
- * PKMAP_BASE                      0xf7000000 (via LAST_PKMAP)
- * HUGE_VMAP                       0xf3000000 (via CONFIG_NR_HUGE_VMAPS)
- * VMALLOC_START                   0xf0000000 (via __VMALLOC_RESERVE)
+ * FIX_KMAP_xxx                    0xfa000000 (via NR_CPUS * KM_TYPE_NR)
+ * PKMAP_BASE                      0xf9000000 (via LAST_PKMAP)
+ * VMALLOC_START                   0xf7000000 (via VMALLOC_RESERVE)
  * mapped LOWMEM                   0xc0000000
  */
 
 #define MEM_USER_INTRPT         _AC(0xfc000000, UL)
-#if CONFIG_KERNEL_PL == 1
-#define MEM_SV_INTRPT           _AC(0xfd000000, UL)
-#define MEM_HV_INTRPT           _AC(0xfe000000, UL)
-#else
-#define MEM_GUEST_INTRPT        _AC(0xfd000000, UL)
-#define MEM_SV_INTRPT           _AC(0xfe000000, UL)
-#define MEM_HV_INTRPT           _AC(0xff000000, UL)
-#endif
+#define MEM_SV_START            _AC(0xfd000000, UL)
+#define MEM_HV_START            _AC(0xfe000000, UL)
 
 #define INTRPT_SIZE             0x4000
 
@@ -246,7 +241,7 @@ static inline __attribute_const__ int get_order(unsigned long size)
 
 #endif /* __tilegx__ */
 
-#ifndef __ASSEMBLY__
+#if !defined(__ASSEMBLY__) && !defined(VDSO_BUILD)
 
 #ifdef CONFIG_HIGHMEM
 
@@ -332,6 +327,7 @@ static inline int pfn_valid(unsigned long pfn)
 
 struct mm_struct;
 extern pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr);
+extern pte_t *virt_to_kpte(unsigned long kaddr);
 
 #endif /* !__ASSEMBLY__ */
 
diff --git a/arch/tile/include/asm/pci.h b/arch/tile/include/asm/pci.h
index 54a924208d3c..dfedd7ac7298 100644
--- a/arch/tile/include/asm/pci.h
+++ b/arch/tile/include/asm/pci.h
@@ -17,7 +17,6 @@
 
 #include <linux/dma-mapping.h>
 #include <linux/pci.h>
-#include <linux/numa.h>
 #include <asm-generic/pci_iomap.h>
 
 #ifndef __tilegx__
@@ -29,7 +28,6 @@ struct pci_controller {
         int index;              /* PCI domain number */
         struct pci_bus *root_bus;
 
-        int first_busno;
         int last_busno;
 
         int hv_cfg_fd[2];       /* config{0,1} fds for this PCIe controller */
@@ -124,6 +122,11 @@ static inline void pci_iounmap(struct pci_dev *dev, void __iomem *addr) {}
  * the CPA plus TILE_PCI_MEM_MAP_BASE_OFFSET. To support 32-bit
  * devices, we create a separate map region that handles the low
  * 4GB.
+ *
+ * This design lets us avoid the "PCI hole" problem where the host bridge
+ * won't pass DMA traffic with target addresses that happen to fall within the
+ * BAR space. This enables us to use all the physical memory for DMA, instead
+ * of wasting the same amount of physical memory as the BAR window size.
  */
 #define TILE_PCI_MEM_MAP_BASE_OFFSET    (1ULL << CHIP_PA_WIDTH())
 
@@ -145,6 +148,10 @@ struct pci_controller {
 
         int pio_mem_index;      /* PIO region index for memory access */
 
+#ifdef CONFIG_TILE_PCI_IO
+        int pio_io_index;       /* PIO region index for I/O space access */
+#endif
+
         /*
          * Mem-Map regions for all the memory controllers so that Linux can
          * map all of its physical memory space to the PCI bus.
@@ -154,6 +161,10 @@ struct pci_controller {
         int index;              /* PCI domain number */
         struct pci_bus *root_bus;
 
+        /* PCI I/O space resource for this controller. */
+        struct resource io_space;
+        char io_space_name[32];
+
         /* PCI memory space resource for this controller. */
         struct resource mem_space;
         char mem_space_name[32];
@@ -166,13 +177,11 @@ struct pci_controller {
 
         /* Table that maps the INTx numbers to Linux irq numbers. */
         int irq_intx_table[4];
-
-        /* Address ranges that are routed to this controller/bridge. */
-        struct resource mem_resources[3];
 };
 
 extern struct pci_controller pci_controllers[TILEGX_NUM_TRIO * TILEGX_TRIO_PCIES];
 extern gxio_trio_context_t trio_contexts[TILEGX_NUM_TRIO];
+extern int num_trio_shims;
 
 extern void pci_iounmap(struct pci_dev *dev, void __iomem *);
 
@@ -211,7 +220,8 @@ static inline int pcibios_assign_all_busses(void)
 }
 
 #define PCIBIOS_MIN_MEM         0
-#define PCIBIOS_MIN_IO          0
+/* Minimum PCI I/O address, starting at the page boundary. */
+#define PCIBIOS_MIN_IO          PAGE_SIZE
 
 /* Use any cpu for PCI. */
 #define cpumask_of_pcibus(bus) cpu_online_mask
diff --git a/arch/tile/include/asm/pgtable_32.h b/arch/tile/include/asm/pgtable_32.h
index 4ce4a7a99c24..d26a42279036 100644
--- a/arch/tile/include/asm/pgtable_32.h
+++ b/arch/tile/include/asm/pgtable_32.h
@@ -55,17 +55,9 @@
 #define PKMAP_BASE   ((FIXADDR_BOOT_START - PAGE_SIZE*LAST_PKMAP) & PGDIR_MASK)
 
 #ifdef CONFIG_HIGHMEM
-# define __VMAPPING_END (PKMAP_BASE & ~(HPAGE_SIZE-1))
+# define _VMALLOC_END   (PKMAP_BASE & ~(HPAGE_SIZE-1))
 #else
-# define __VMAPPING_END (FIXADDR_START & ~(HPAGE_SIZE-1))
-#endif
-
-#ifdef CONFIG_HUGEVMAP
-#define HUGE_VMAP_END   __VMAPPING_END
-#define HUGE_VMAP_BASE  (HUGE_VMAP_END - CONFIG_NR_HUGE_VMAPS * HPAGE_SIZE)
-#define _VMALLOC_END    HUGE_VMAP_BASE
-#else
-#define _VMALLOC_END    __VMAPPING_END
+# define _VMALLOC_END   (FIXADDR_START & ~(HPAGE_SIZE-1))
 #endif
 
 /*
@@ -84,10 +76,12 @@ extern unsigned long VMALLOC_RESERVE /* = CONFIG_VMALLOC_RESERVE */;
 /* We have no pmd or pud since we are strictly a two-level page table */
 #include <asm-generic/pgtable-nopmd.h>
 
+static inline int pud_huge_page(pud_t pud)      { return 0; }
+
 /* We don't define any pgds for these addresses. */
 static inline int pgd_addr_invalid(unsigned long addr)
 {
-        return addr >= MEM_HV_INTRPT;
+        return addr >= MEM_HV_START;
 }
 
 /*
diff --git a/arch/tile/include/asm/pgtable_64.h b/arch/tile/include/asm/pgtable_64.h
index 2492fa5478e7..2c8a9cd102d3 100644
--- a/arch/tile/include/asm/pgtable_64.h
+++ b/arch/tile/include/asm/pgtable_64.h
@@ -52,17 +52,24 @@
  * memory allocation code).  The vmalloc code puts in an internal
  * guard page between each allocation.
  */
-#define _VMALLOC_END    HUGE_VMAP_BASE
+#define _VMALLOC_END    MEM_SV_START
 #define VMALLOC_END     _VMALLOC_END
 #define VMALLOC_START   _VMALLOC_START
 
-#define HUGE_VMAP_END   (HUGE_VMAP_BASE + PGDIR_SIZE)
-
 #ifndef __ASSEMBLY__
 
 /* We have no pud since we are a three-level page table. */
 #include <asm-generic/pgtable-nopud.h>
 
+/*
+ * pmds are the same as pgds and ptes, so converting is a no-op.
+ */
+#define pmd_pte(pmd) (pmd)
+#define pmdp_ptep(pmdp) (pmdp)
+#define pte_pmd(pte) (pte)
+
+#define pud_pte(pud) ((pud).pgd)
+
 static inline int pud_none(pud_t pud)
 {
         return pud_val(pud) == 0;
@@ -73,6 +80,11 @@ static inline int pud_present(pud_t pud)
         return pud_val(pud) & _PAGE_PRESENT;
 }
 
+static inline int pud_huge_page(pud_t pud)
+{
+        return pud_val(pud) & _PAGE_HUGE_PAGE;
+}
+
 #define pmd_ERROR(e) \
         pr_err("%s:%d: bad pmd 0x%016llx.\n", __FILE__, __LINE__, pmd_val(e))
 
@@ -89,6 +101,9 @@ static inline int pud_bad(pud_t pud)
 /* Return the page-table frame number (ptfn) that a pud_t points at. */
 #define pud_ptfn(pud) hv_pte_get_ptfn((pud).pgd)
 
+/* Return the page frame number (pfn) that a pud_t points at. */
+#define pud_pfn(pud) pte_pfn(pud_pte(pud))
+
 /*
  * A given kernel pud_t maps to a kernel pmd_t table at a specific
  * virtual address.  Since kernel pmd_t tables can be aligned at
@@ -123,8 +138,7 @@ static inline unsigned long pgd_addr_normalize(unsigned long addr)
 /* We don't define any pgds for these addresses. */
 static inline int pgd_addr_invalid(unsigned long addr)
 {
-        return addr >= MEM_HV_START ||
-                (addr > MEM_LOW_END && addr < MEM_HIGH_START);
+        return addr >= KERNEL_HIGH_VADDR || addr != pgd_addr_normalize(addr);
 }
 
 /*
@@ -152,13 +166,6 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm,
         return hv_pte(__insn_exch(&ptep->val, 0UL));
 }
 
-/*
- * pmds are the same as pgds and ptes, so converting is a no-op.
- */
-#define pmd_pte(pmd) (pmd)
-#define pmdp_ptep(pmdp) (pmdp)
-#define pte_pmd(pte) (pte)
-
 #endif /* __ASSEMBLY__ */
 
 #endif /* _ASM_TILE_PGTABLE_64_H */
diff --git a/arch/tile/include/asm/processor.h b/arch/tile/include/asm/processor.h
index b3f104953da2..42323636c459 100644
--- a/arch/tile/include/asm/processor.h
+++ b/arch/tile/include/asm/processor.h
@@ -15,6 +15,8 @@
 #ifndef _ASM_TILE_PROCESSOR_H
 #define _ASM_TILE_PROCESSOR_H
 
+#include <arch/chip.h>
+
 #ifndef __ASSEMBLY__
 
 /*
@@ -25,7 +27,6 @@
 #include <asm/ptrace.h>
 #include <asm/percpu.h>
 
-#include <arch/chip.h>
 #include <arch/spr_def.h>
 
 struct task_struct;
@@ -110,18 +111,16 @@ struct thread_struct {
         unsigned long long interrupt_mask;
         /* User interrupt-control 0 state */
         unsigned long intctrl_0;
-#if CHIP_HAS_PROC_STATUS_SPR()
+        /* Is this task currently doing a backtrace? */
+        bool in_backtrace;
         /* Any other miscellaneous processor state bits */
         unsigned long proc_status;
-#endif
 #if !CHIP_HAS_FIXED_INTVEC_BASE()
         /* Interrupt base for PL0 interrupts */
         unsigned long interrupt_vector_base;
 #endif
-#if CHIP_HAS_TILE_RTF_HWM()
         /* Tile cache retry fifo high-water mark */
         unsigned long tile_rtf_hwm;
-#endif
 #if CHIP_HAS_DSTREAM_PF()
         /* Data stream prefetch control */
         unsigned long dstream_pf;
@@ -134,21 +133,16 @@ struct thread_struct {
         /* Async DMA TLB fault information */
         struct async_tlb dma_async_tlb;
 #endif
-#if CHIP_HAS_SN_PROC()
-        /* Was static network processor when we were switched out? */
-        int sn_proc_running;
-        /* Async SNI TLB fault information */
-        struct async_tlb sn_async_tlb;
-#endif
 };
 
 #endif /* !__ASSEMBLY__ */
 
 /*
  * Start with "sp" this many bytes below the top of the kernel stack.
- * This preserves the invariant that a called function may write to *sp.
+ * This allows us to be cache-aware when handling the initial save
+ * of the pt_regs value to the stack.
  */
-#define STACK_TOP_DELTA 8
+#define STACK_TOP_DELTA 64
 
 /*
  * When entering the kernel via a fault, start with the top of the
@@ -164,7 +158,7 @@ struct thread_struct {
 #ifndef __ASSEMBLY__
 
 #ifdef __tilegx__
-#define TASK_SIZE_MAX           (MEM_LOW_END + 1)
+#define TASK_SIZE_MAX           (_AC(1, UL) << (MAX_VA_WIDTH - 1))
 #else
 #define TASK_SIZE_MAX           PAGE_OFFSET
 #endif
@@ -178,10 +172,10 @@ struct thread_struct {
 #define TASK_SIZE               TASK_SIZE_MAX
 #endif
 
-/* We provide a minimal "vdso" a la x86; just the sigreturn code for now. */
-#define VDSO_BASE               (TASK_SIZE - PAGE_SIZE)
+#define VDSO_BASE       ((unsigned long)current->active_mm->context.vdso_base)
+#define VDSO_SYM(x)     (VDSO_BASE + (unsigned long)(x))
 
-#define STACK_TOP               VDSO_BASE
+#define STACK_TOP               TASK_SIZE
 
 /* STACK_TOP_MAX is used temporarily in execve and should not check COMPAT. */
 #define STACK_TOP_MAX           TASK_SIZE_MAX
@@ -232,21 +226,28 @@ extern int do_work_pending(struct pt_regs *regs, u32 flags);
 unsigned long get_wchan(struct task_struct *p);
 
 /* Return initial ksp value for given task. */
-#define task_ksp0(task) ((unsigned long)(task)->stack + THREAD_SIZE)
+#define task_ksp0(task) \
+        ((unsigned long)(task)->stack + THREAD_SIZE - STACK_TOP_DELTA)
 
 /* Return some info about the user process TASK. */
-#define KSTK_TOP(task)  (task_ksp0(task) - STACK_TOP_DELTA)
 #define task_pt_regs(task) \
-  ((struct pt_regs *)(task_ksp0(task) - KSTK_PTREGS_GAP) - 1)
+        ((struct pt_regs *)(task_ksp0(task) - KSTK_PTREGS_GAP) - 1)
 #define current_pt_regs()                                   \
-  ((struct pt_regs *)((stack_pointer | (THREAD_SIZE - 1)) - \
-                      (KSTK_PTREGS_GAP - 1)) - 1)
+        ((struct pt_regs *)((stack_pointer | (THREAD_SIZE - 1)) - \
+                            STACK_TOP_DELTA - (KSTK_PTREGS_GAP - 1)) - 1)
 #define task_sp(task)   (task_pt_regs(task)->sp)
 #define task_pc(task)   (task_pt_regs(task)->pc)
 /* Aliases for pc and sp (used in fs/proc/array.c) */
 #define KSTK_EIP(task)  task_pc(task)
 #define KSTK_ESP(task)  task_sp(task)
 
+/* Fine-grained unaligned JIT support */
+#define GET_UNALIGN_CTL(tsk, adr)       get_unalign_ctl((tsk), (adr))
+#define SET_UNALIGN_CTL(tsk, val)       set_unalign_ctl((tsk), (val))
+
+extern int get_unalign_ctl(struct task_struct *tsk, unsigned long adr);
+extern int set_unalign_ctl(struct task_struct *tsk, unsigned int val);
+
 /* Standard format for printing registers and other word-size data. */
 #ifdef __tilegx__
 # define REGFMT "0x%016lx"
@@ -275,7 +276,6 @@ extern char chip_model[64];
 /* Data on which physical memory controller corresponds to which NUMA node. */
 extern int node_controller[];
 
-#if CHIP_HAS_CBOX_HOME_MAP()
 /* Does the heap allocator return hash-for-home pages by default? */
 extern int hash_default;
 
@@ -285,11 +285,6 @@ extern int kstack_hash;
 /* Does MAP_ANONYMOUS return hash-for-home pages by default? */
 #define uheap_hash hash_default
 
-#else
-#define hash_default 0
-#define kstack_hash 0
-#define uheap_hash 0
-#endif
 
 /* Are we using huge pages in the TLB for kernel data? */
 extern int kdata_huge;
@@ -337,7 +332,6 @@ extern int kdata_huge;
 
 /*
  * Provide symbolic constants for PLs.
- * Note that assembly code assumes that USER_PL is zero.
  */
 #define USER_PL 0
 #if CONFIG_KERNEL_PL == 2
@@ -346,20 +340,38 @@ extern int kdata_huge;
 #define KERNEL_PL CONFIG_KERNEL_PL
 
 /* SYSTEM_SAVE_K_0 holds the current cpu number ORed with ksp0. */
-#define CPU_LOG_MASK_VALUE 12
-#define CPU_MASK_VALUE ((1 << CPU_LOG_MASK_VALUE) - 1)
-#if CONFIG_NR_CPUS > CPU_MASK_VALUE
-# error Too many cpus!
+#ifdef __tilegx__
+#define CPU_SHIFT 48
+#if CHIP_VA_WIDTH() > CPU_SHIFT
+# error Too many VA bits!
 #endif
+#define MAX_CPU_ID ((1 << (64 - CPU_SHIFT)) - 1)
+#define raw_smp_processor_id() \
+        ((int)(__insn_mfspr(SPR_SYSTEM_SAVE_K_0) >> CPU_SHIFT))
+#define get_current_ksp0() \
+        ((unsigned long)(((long)__insn_mfspr(SPR_SYSTEM_SAVE_K_0) << \
+                          (64 - CPU_SHIFT)) >> (64 - CPU_SHIFT)))
+#define next_current_ksp0(task) ({ \
+        unsigned long __ksp0 = task_ksp0(task) & ((1UL << CPU_SHIFT) - 1); \
+        unsigned long __cpu = (long)raw_smp_processor_id() << CPU_SHIFT; \
+        __ksp0 | __cpu; \
+})
+#else
+#define LOG2_NR_CPU_IDS 6
+#define MAX_CPU_ID ((1 << LOG2_NR_CPU_IDS) - 1)
 #define raw_smp_processor_id() \
-        ((int)__insn_mfspr(SPR_SYSTEM_SAVE_K_0) & CPU_MASK_VALUE)
+        ((int)__insn_mfspr(SPR_SYSTEM_SAVE_K_0) & MAX_CPU_ID)
 #define get_current_ksp0() \
-        (__insn_mfspr(SPR_SYSTEM_SAVE_K_0) & ~CPU_MASK_VALUE)
+        (__insn_mfspr(SPR_SYSTEM_SAVE_K_0) & ~MAX_CPU_ID)
 #define next_current_ksp0(task) ({ \
         unsigned long __ksp0 = task_ksp0(task); \
         int __cpu = raw_smp_processor_id(); \
-        BUG_ON(__ksp0 & CPU_MASK_VALUE); \
+        BUG_ON(__ksp0 & MAX_CPU_ID); \
         __ksp0 | __cpu; \
 })
+#endif
+#if CONFIG_NR_CPUS > (MAX_CPU_ID + 1)
+# error Too many cpus!
+#endif
 
 #endif /* _ASM_TILE_PROCESSOR_H */
diff --git a/arch/tile/include/asm/ptrace.h b/arch/tile/include/asm/ptrace.h
index fd412260aff7..b9620c077abc 100644
--- a/arch/tile/include/asm/ptrace.h
+++ b/arch/tile/include/asm/ptrace.h
@@ -33,12 +33,13 @@ typedef unsigned long pt_reg_t;
 
 #ifndef __ASSEMBLY__
 
+#define regs_return_value(regs) ((regs)->regs[0])
 #define instruction_pointer(regs) ((regs)->pc)
 #define profile_pc(regs) instruction_pointer(regs)
 #define user_stack_pointer(regs) ((regs)->sp)
 
 /* Does the process account for user or for system time? */
-#define user_mode(regs) (EX1_PL((regs)->ex1) == USER_PL)
+#define user_mode(regs) (EX1_PL((regs)->ex1) < KERNEL_PL)
 
 /* Fill in a struct pt_regs with the current kernel registers. */
 struct pt_regs *get_pt_regs(struct pt_regs *);
@@ -79,8 +80,7 @@ extern void single_step_execve(void);
 
 struct task_struct;
 
-extern void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs,
-                         int error_code);
+extern void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs);
 
 #ifdef __tilegx__
 /* We need this since sigval_t has a user pointer in it, for GETSIGINFO etc. */
diff --git a/arch/tile/include/asm/sections.h b/arch/tile/include/asm/sections.h
index 7d8a935a9238..5d5d3b739a6b 100644
--- a/arch/tile/include/asm/sections.h
+++ b/arch/tile/include/asm/sections.h
@@ -25,10 +25,16 @@ extern char _sinitdata[], _einitdata[];
 /* Write-once data is writable only till the end of initialization. */
 extern char __w1data_begin[], __w1data_end[];
 
+extern char vdso_start[], vdso_end[];
+#ifdef CONFIG_COMPAT
+extern char vdso32_start[], vdso32_end[];
+#endif
 
 /* Not exactly sections, but PC comparison points in the code. */
 extern char __rt_sigreturn[], __rt_sigreturn_end[];
-#ifndef __tilegx__
+#ifdef __tilegx__
+extern char __start_unalign_asm_code[], __end_unalign_asm_code[];
+#else
 extern char sys_cmpxchg[], __sys_cmpxchg_end[];
 extern char __sys_cmpxchg_grab_lock[];
 extern char __start_atomic_asm_code[], __end_atomic_asm_code[];
diff --git a/arch/tile/include/asm/setup.h b/arch/tile/include/asm/setup.h
index d048888c5d9a..e98909033e5b 100644
--- a/arch/tile/include/asm/setup.h
+++ b/arch/tile/include/asm/setup.h
@@ -24,9 +24,8 @@
  */
 #define MAXMEM_PFN      PFN_DOWN(MAXMEM)
 
+int tile_console_write(const char *buf, int count);
 void early_panic(const char *fmt, ...);
-void warn_early_printk(void);
-void __init disable_early_printk(void);
 
 /* Init-time routine to do tile-specific per-cpu setup. */
 void setup_cpu(int boot);
diff --git a/arch/tile/include/asm/smp.h b/arch/tile/include/asm/smp.h
index 1aa759aeb5b3..9a326b64f7ae 100644
--- a/arch/tile/include/asm/smp.h
+++ b/arch/tile/include/asm/smp.h
@@ -101,10 +101,8 @@ void print_disabled_cpus(void);
 extern struct cpumask cpu_lotar_map;
 #define cpu_is_valid_lotar(cpu) cpumask_test_cpu((cpu), &cpu_lotar_map)
 
-#if CHIP_HAS_CBOX_HOME_MAP()
 /* Which processors are used for hash-for-home mapping */
 extern struct cpumask hash_for_home_map;
-#endif
 
 /* Which cpus can have their cache flushed by hv_flush_remote(). */
 extern struct cpumask cpu_cacheable_map;
diff --git a/arch/tile/include/asm/spinlock_64.h b/arch/tile/include/asm/spinlock_64.h
index 5f8b6a095fd8..9a12b9c7e5d3 100644
--- a/arch/tile/include/asm/spinlock_64.h
+++ b/arch/tile/include/asm/spinlock_64.h
@@ -27,7 +27,7 @@
  * Return the "current" portion of a ticket lock value,
  * i.e. the number that currently owns the lock.
  */
-static inline int arch_spin_current(u32 val)
+static inline u32 arch_spin_current(u32 val)
 {
         return val >> __ARCH_SPIN_CURRENT_SHIFT;
 }
@@ -36,7 +36,7 @@ static inline int arch_spin_current(u32 val)
  * Return the "next" portion of a ticket lock value,
  * i.e. the number that the next task to try to acquire the lock will get.
  */
-static inline int arch_spin_next(u32 val)
+static inline u32 arch_spin_next(u32 val)
 {
         return val & __ARCH_SPIN_NEXT_MASK;
 }
diff --git a/arch/tile/include/asm/string.h b/arch/tile/include/asm/string.h
index 7535cf1a30e4..92b271bd9ebd 100644
--- a/arch/tile/include/asm/string.h
+++ b/arch/tile/include/asm/string.h
@@ -21,8 +21,10 @@
 #define __HAVE_ARCH_MEMMOVE
 #define __HAVE_ARCH_STRCHR
 #define __HAVE_ARCH_STRLEN
+#define __HAVE_ARCH_STRNLEN
 
 extern __kernel_size_t strlen(const char *);
+extern __kernel_size_t strnlen(const char *, __kernel_size_t);
 extern char *strchr(const char *s, int c);
 extern void *memchr(const void *s, int c, size_t n);
 extern void *memset(void *, int, __kernel_size_t);
diff --git a/arch/tile/include/asm/thread_info.h b/arch/tile/include/asm/thread_info.h
index d1733dee98a2..b8aa6df3e102 100644
--- a/arch/tile/include/asm/thread_info.h
+++ b/arch/tile/include/asm/thread_info.h
@@ -39,6 +39,11 @@ struct thread_info {
         struct restart_block    restart_block;
         struct single_step_state *step_state;   /* single step state
                                                    (if non-zero) */
+        int                     align_ctl;      /* controls unaligned access */
+#ifdef __tilegx__
+        unsigned long           unalign_jit_tmp[4]; /* temp r0..r3 storage */
+        void __user             *unalign_jit_base; /* unalign fixup JIT base */
+#endif
 };
 
 /*
@@ -56,6 +61,7 @@ struct thread_info {
                 .fn = do_no_restart_syscall,    \
         },                                      \
         .step_state     = NULL,                 \
+        .align_ctl      = 0,                    \
 }
 
 #define init_thread_info        (init_thread_union.thread_info)
diff --git a/arch/tile/include/asm/topology.h b/arch/tile/include/asm/topology.h
index d5e86c9f74fd..d15c0d8d550f 100644
--- a/arch/tile/include/asm/topology.h
+++ b/arch/tile/include/asm/topology.h
@@ -89,9 +89,6 @@ static inline const struct cpumask *cpumask_of_node(int node)
 #define topology_core_id(cpu)                   (cpu)
 #define topology_core_cpumask(cpu)              ((void)(cpu), cpu_online_mask)
 #define topology_thread_cpumask(cpu)            cpumask_of(cpu)
-
-/* indicates that pointers to the topology struct cpumask maps are valid */
-#define arch_provides_topology_pointers         yes
 #endif
 
 #endif /* _ASM_TILE_TOPOLOGY_H */
diff --git a/arch/tile/include/asm/traps.h b/arch/tile/include/asm/traps.h
index e28c3df4176a..4b99a1c3aab2 100644
--- a/arch/tile/include/asm/traps.h
+++ b/arch/tile/include/asm/traps.h
@@ -15,12 +15,13 @@
 #ifndef _ASM_TILE_TRAPS_H
 #define _ASM_TILE_TRAPS_H
 
+#ifndef __ASSEMBLY__
 #include <arch/chip.h>
 
 /* mm/fault.c */
 void do_page_fault(struct pt_regs *, int fault_num,
                    unsigned long address, unsigned long write);
-#if CHIP_HAS_TILE_DMA() || CHIP_HAS_SN_PROC()
+#if CHIP_HAS_TILE_DMA()
 void do_async_page_fault(struct pt_regs *);
 #endif
 
@@ -69,6 +70,16 @@ void gx_singlestep_handle(struct pt_regs *, int fault_num);
 
 /* kernel/intvec_64.S */
 void fill_ra_stack(void);
+
+/* Handle unalign data fixup. */
+extern void do_unaligned(struct pt_regs *regs, int vecnum);
+#endif
+
+#endif /* __ASSEMBLY__ */
+
+#ifdef __tilegx__
+/* 128 byte JIT per unalign fixup. */
+#define UNALIGN_JIT_SHIFT    7
 #endif
 
 #endif /* _ASM_TILE_TRAPS_H */
diff --git a/arch/tile/include/asm/uaccess.h b/arch/tile/include/asm/uaccess.h
index e4d44bd7df27..b6cde3209b96 100644
--- a/arch/tile/include/asm/uaccess.h
+++ b/arch/tile/include/asm/uaccess.h
@@ -127,8 +127,10 @@ extern int fixup_exception(struct pt_regs *regs);
 
 #ifdef __LP64__
 #define _ASM_PTR        ".quad"
+#define _ASM_ALIGN      ".align 8"
 #else
 #define _ASM_PTR        ".long"
+#define _ASM_ALIGN      ".align 4"
 #endif
 
 #define __get_user_asm(OP, x, ptr, ret)                                 \
@@ -137,6 +139,7 @@ extern int fixup_exception(struct pt_regs *regs);
                      "0: { movei %1, 0; movei %0, %3 }\n"               \
                      "j 9f\n"                                           \
                      ".section __ex_table,\"a\"\n"                      \
+                     _ASM_ALIGN "\n"                                    \
                      _ASM_PTR " 1b, 0b\n"                               \
                      ".popsection\n"                                    \
                      "9:"                                               \
@@ -168,6 +171,7 @@ extern int fixup_exception(struct pt_regs *regs);
                              "0: { movei %1, 0; movei %2, 0 }\n"        \
                              "{ movei %0, %4; j 9f }\n"                 \
                              ".section __ex_table,\"a\"\n"              \
+                             ".align 4\n"                               \
                              ".word 1b, 0b\n"                           \
                              ".word 2b, 0b\n"                           \
                              ".popsection\n"                            \
@@ -224,6 +228,7 @@ extern int __get_user_bad(void)
                      ".pushsection .fixup,\"ax\"\n"                     \
                      "0: { movei %0, %3; j 9f }\n"                      \
                      ".section __ex_table,\"a\"\n"                      \
+                     _ASM_ALIGN "\n"                                    \
                      _ASM_PTR " 1b, 0b\n"                               \
                      ".popsection\n"                                    \
                      "9:"                                               \
@@ -248,6 +253,7 @@ extern int __get_user_bad(void)
                              ".pushsection .fixup,\"ax\"\n"             \
                              "0: { movei %0, %4; j 9f }\n"              \
                              ".section __ex_table,\"a\"\n"              \
+                             ".align 4\n"                               \
                              ".word 1b, 0b\n"                           \
                              ".word 2b, 0b\n"                           \
                              ".popsection\n"                            \
@@ -567,37 +573,6 @@ static inline unsigned long __must_check flush_user(
 }
 
 /**
- * inv_user: - Invalidate a block of memory in user space from cache.
- * @mem:   Destination address, in user space.
- * @len:   Number of bytes to invalidate.
- *
- * Returns number of bytes that could not be invalidated.
- * On success, this will be zero.
- *
- * Note that on Tile64, the "inv" operation is in fact a
- * "flush and invalidate", so cache write-backs will occur prior
- * to the cache being marked invalid.
- */
-extern unsigned long inv_user_asm(void __user *mem, unsigned long len);
-static inline unsigned long __must_check __inv_user(
-        void __user *mem, unsigned long len)
-{
-        int retval;
-
-        might_fault();
-        retval = inv_user_asm(mem, len);
-        mb_incoherent();
-        return retval;
-}
-static inline unsigned long __must_check inv_user(
-        void __user *mem, unsigned long len)
-{
-        if (access_ok(VERIFY_WRITE, mem, len))
-                return __inv_user(mem, len);
-        return len;
-}
-
-/**
  * finv_user: - Flush-inval a block of memory in user space from cache.
  * @mem:   Destination address, in user space.
  * @len:   Number of bytes to invalidate.
diff --git a/arch/tile/include/asm/unaligned.h b/arch/tile/include/asm/unaligned.h
index 37dfbe598872..5a58a0d11449 100644
--- a/arch/tile/include/asm/unaligned.h
+++ b/arch/tile/include/asm/unaligned.h
@@ -15,11 +15,15 @@
 #ifndef _ASM_TILE_UNALIGNED_H
 #define _ASM_TILE_UNALIGNED_H
 
-#include <linux/unaligned/le_struct.h>
-#include <linux/unaligned/be_byteshift.h>
-#include <linux/unaligned/generic.h>
-#define get_unaligned   __get_unaligned_le
-#define put_unaligned   __put_unaligned_le
+/*
+ * We could implement faster get_unaligned_[be/le]64 using the ldna
+ * instruction on tilegx; however, we need to either copy all of the
+ * other generic functions to here (which is pretty ugly) or else
+ * modify both the generic code and other arch code to allow arch
+ * specific unaligned data access functions.  Given these functions
+ * are not often called, we'll stick with the generic version.
+ */
+#include <asm-generic/unaligned.h>
 
 /*
  * Is the kernel doing fixups of unaligned accesses?  If <0, no kernel
diff --git a/arch/tile/include/asm/vdso.h b/arch/tile/include/asm/vdso.h
new file mode 100644
index 000000000000..9f6a78d665fa
--- /dev/null
+++ b/arch/tile/include/asm/vdso.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright 2012 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#ifndef __TILE_VDSO_H__
+#define __TILE_VDSO_H__
+
+#include <linux/types.h>
+
+/*
+ * Note about the vdso_data structure:
+ *
+ * NEVER USE THEM IN USERSPACE CODE DIRECTLY. The layout of the
+ * structure is supposed to be known only to the function in the vdso
+ * itself and may change without notice.
+ */
+
+struct vdso_data {
+        __u64 tz_update_count;  /* Timezone atomicity ctr             */
+        __u64 tb_update_count;  /* Timebase atomicity ctr             */
+        __u64 xtime_tod_stamp;  /* TOD clock for xtime                */
+        __u64 xtime_clock_sec;  /* Kernel time second                 */
+        __u64 xtime_clock_nsec; /* Kernel time nanosecond             */
+        __u64 wtom_clock_sec;   /* Wall to monotonic clock second     */
+        __u64 wtom_clock_nsec;  /* Wall to monotonic clock nanosecond */
+        __u32 mult;             /* Cycle to nanosecond multiplier     */
+        __u32 shift;            /* Cycle to nanosecond divisor (power of two) */
+        __u32 tz_minuteswest;   /* Minutes west of Greenwich          */
+        __u32 tz_dsttime;       /* Type of dst correction             */
+};
+
+extern struct vdso_data *vdso_data;
+
+/* __vdso_rt_sigreturn is defined with the addresses in the vdso page. */
+extern void __vdso_rt_sigreturn(void);
+
+extern int setup_vdso_pages(void);
+
+#endif /* __TILE_VDSO_H__ */
diff --git a/arch/tile/include/gxio/iorpc_mpipe.h b/arch/tile/include/gxio/iorpc_mpipe.h
index 9d50fce1b1a7..4cda03de734f 100644
--- a/arch/tile/include/gxio/iorpc_mpipe.h
+++ b/arch/tile/include/gxio/iorpc_mpipe.h
@@ -44,93 +44,101 @@
 #define GXIO_MPIPE_OP_REGISTER_CLIENT_MEMORY IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x1210)
 #define GXIO_MPIPE_OP_LINK_OPEN_AUX    IORPC_OPCODE(IORPC_FORMAT_NONE, 0x1211)
 #define GXIO_MPIPE_OP_LINK_CLOSE_AUX   IORPC_OPCODE(IORPC_FORMAT_NONE, 0x1212)
+#define GXIO_MPIPE_OP_LINK_SET_ATTR_AUX IORPC_OPCODE(IORPC_FORMAT_NONE, 0x1213)
 
-#define GXIO_MPIPE_OP_GET_TIMESTAMP_AUX IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x121e)
-#define GXIO_MPIPE_OP_SET_TIMESTAMP_AUX IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x121f)
-#define GXIO_MPIPE_OP_ADJUST_TIMESTAMP_AUX IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x1220)
+#define GXIO_MPIPE_OP_GET_TIMESTAMP_AUX IORPC_OPCODE(IORPC_FORMAT_NONE, 0x121e)
+#define GXIO_MPIPE_OP_SET_TIMESTAMP_AUX IORPC_OPCODE(IORPC_FORMAT_NONE, 0x121f)
+#define GXIO_MPIPE_OP_ADJUST_TIMESTAMP_AUX IORPC_OPCODE(IORPC_FORMAT_NONE, 0x1220)
+#define GXIO_MPIPE_OP_CONFIG_EDMA_RING_BLKS IORPC_OPCODE(IORPC_FORMAT_NONE, 0x1221)
+#define GXIO_MPIPE_OP_ADJUST_TIMESTAMP_FREQ IORPC_OPCODE(IORPC_FORMAT_NONE, 0x1222)
 #define GXIO_MPIPE_OP_ARM_POLLFD       IORPC_OPCODE(IORPC_FORMAT_KERNEL_POLLFD, 0x9000)
 #define GXIO_MPIPE_OP_CLOSE_POLLFD     IORPC_OPCODE(IORPC_FORMAT_KERNEL_POLLFD, 0x9001)
 #define GXIO_MPIPE_OP_GET_MMIO_BASE    IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x8000)
 #define GXIO_MPIPE_OP_CHECK_MMIO_OFFSET IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x8001)
 
-int gxio_mpipe_alloc_buffer_stacks(gxio_mpipe_context_t * context,
+int gxio_mpipe_alloc_buffer_stacks(gxio_mpipe_context_t *context,
                                    unsigned int count, unsigned int first,
                                    unsigned int flags);
 
-int gxio_mpipe_init_buffer_stack_aux(gxio_mpipe_context_t * context,
+int gxio_mpipe_init_buffer_stack_aux(gxio_mpipe_context_t *context,
                                      void *mem_va, size_t mem_size,
                                      unsigned int mem_flags, unsigned int stack,
                                      unsigned int buffer_size_enum);
 
 
-int gxio_mpipe_alloc_notif_rings(gxio_mpipe_context_t * context,
+int gxio_mpipe_alloc_notif_rings(gxio_mpipe_context_t *context,
                                  unsigned int count, unsigned int first,
                                  unsigned int flags);
 
-int gxio_mpipe_init_notif_ring_aux(gxio_mpipe_context_t * context, void *mem_va,
+int gxio_mpipe_init_notif_ring_aux(gxio_mpipe_context_t *context, void *mem_va,
                                    size_t mem_size, unsigned int mem_flags,
                                    unsigned int ring);
 
-int gxio_mpipe_request_notif_ring_interrupt(gxio_mpipe_context_t * context,
+int gxio_mpipe_request_notif_ring_interrupt(gxio_mpipe_context_t *context,
                                             int inter_x, int inter_y,
                                             int inter_ipi, int inter_event,
                                             unsigned int ring);
 
-int gxio_mpipe_enable_notif_ring_interrupt(gxio_mpipe_context_t * context,
+int gxio_mpipe_enable_notif_ring_interrupt(gxio_mpipe_context_t *context,
                                            unsigned int ring);
 
-int gxio_mpipe_alloc_notif_groups(gxio_mpipe_context_t * context,
+int gxio_mpipe_alloc_notif_groups(gxio_mpipe_context_t *context,
                                   unsigned int count, unsigned int first,
                                   unsigned int flags);
 
-int gxio_mpipe_init_notif_group(gxio_mpipe_context_t * context,
+int gxio_mpipe_init_notif_group(gxio_mpipe_context_t *context,
                                 unsigned int group,
                                 gxio_mpipe_notif_group_bits_t bits);
 
-int gxio_mpipe_alloc_buckets(gxio_mpipe_context_t * context, unsigned int count,
+int gxio_mpipe_alloc_buckets(gxio_mpipe_context_t *context, unsigned int count,
                              unsigned int first, unsigned int flags);
 
-int gxio_mpipe_init_bucket(gxio_mpipe_context_t * context, unsigned int bucket,
+int gxio_mpipe_init_bucket(gxio_mpipe_context_t *context, unsigned int bucket,
                            MPIPE_LBL_INIT_DAT_BSTS_TBL_t bucket_info);
 
-int gxio_mpipe_alloc_edma_rings(gxio_mpipe_context_t * context,
+int gxio_mpipe_alloc_edma_rings(gxio_mpipe_context_t *context,
                                 unsigned int count, unsigned int first,
                                 unsigned int flags);
 
-int gxio_mpipe_init_edma_ring_aux(gxio_mpipe_context_t * context, void *mem_va,
+int gxio_mpipe_init_edma_ring_aux(gxio_mpipe_context_t *context, void *mem_va,
                                   size_t mem_size, unsigned int mem_flags,
                                   unsigned int ring, unsigned int channel);
 
 
-int gxio_mpipe_commit_rules(gxio_mpipe_context_t * context, const void *blob,
+int gxio_mpipe_commit_rules(gxio_mpipe_context_t *context, const void *blob,
                             size_t blob_size);
 
-int gxio_mpipe_register_client_memory(gxio_mpipe_context_t * context,
+int gxio_mpipe_register_client_memory(gxio_mpipe_context_t *context,
                                       unsigned int iotlb, HV_PTE pte,
                                       unsigned int flags);
 
-int gxio_mpipe_link_open_aux(gxio_mpipe_context_t * context,
+int gxio_mpipe_link_open_aux(gxio_mpipe_context_t *context,
                              _gxio_mpipe_link_name_t name, unsigned int flags);
 
-int gxio_mpipe_link_close_aux(gxio_mpipe_context_t * context, int mac);
+int gxio_mpipe_link_close_aux(gxio_mpipe_context_t *context, int mac);
 
+int gxio_mpipe_link_set_attr_aux(gxio_mpipe_context_t *context, int mac,
+                                 uint32_t attr, int64_t val);
 
-int gxio_mpipe_get_timestamp_aux(gxio_mpipe_context_t * context, uint64_t * sec,
-                                 uint64_t * nsec, uint64_t * cycles);
+int gxio_mpipe_get_timestamp_aux(gxio_mpipe_context_t *context, uint64_t *sec,
+                                 uint64_t *nsec, uint64_t *cycles);
 
-int gxio_mpipe_set_timestamp_aux(gxio_mpipe_context_t * context, uint64_t sec,
+int gxio_mpipe_set_timestamp_aux(gxio_mpipe_context_t *context, uint64_t sec,
                                  uint64_t nsec, uint64_t cycles);
 
-int gxio_mpipe_adjust_timestamp_aux(gxio_mpipe_context_t * context,
+int gxio_mpipe_adjust_timestamp_aux(gxio_mpipe_context_t *context,
                                     int64_t nsec);
 
-int gxio_mpipe_arm_pollfd(gxio_mpipe_context_t * context, int pollfd_cookie);
+int gxio_mpipe_adjust_timestamp_freq(gxio_mpipe_context_t *context,
+                                     int32_t ppb);
 
-int gxio_mpipe_close_pollfd(gxio_mpipe_context_t * context, int pollfd_cookie);
+int gxio_mpipe_arm_pollfd(gxio_mpipe_context_t *context, int pollfd_cookie);
 
-int gxio_mpipe_get_mmio_base(gxio_mpipe_context_t * context, HV_PTE *base);
+int gxio_mpipe_close_pollfd(gxio_mpipe_context_t *context, int pollfd_cookie);
 
-int gxio_mpipe_check_mmio_offset(gxio_mpipe_context_t * context,
+int gxio_mpipe_get_mmio_base(gxio_mpipe_context_t *context, HV_PTE *base);
+
+int gxio_mpipe_check_mmio_offset(gxio_mpipe_context_t *context,
                                  unsigned long offset, unsigned long size);
 
 #endif /* !__GXIO_MPIPE_LINUX_RPC_H__ */
diff --git a/arch/tile/include/gxio/iorpc_mpipe_info.h b/arch/tile/include/gxio/iorpc_mpipe_info.h
index 0bcf3f71ce8b..f0b04284468b 100644
--- a/arch/tile/include/gxio/iorpc_mpipe_info.h
+++ b/arch/tile/include/gxio/iorpc_mpipe_info.h
@@ -27,20 +27,24 @@
 #include <asm/pgtable.h>
 
 
+#define GXIO_MPIPE_INFO_OP_INSTANCE_AUX IORPC_OPCODE(IORPC_FORMAT_NONE, 0x1250)
 #define GXIO_MPIPE_INFO_OP_ENUMERATE_AUX IORPC_OPCODE(IORPC_FORMAT_NONE, 0x1251)
 #define GXIO_MPIPE_INFO_OP_GET_MMIO_BASE IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x8000)
 #define GXIO_MPIPE_INFO_OP_CHECK_MMIO_OFFSET IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x8001)
 
 
-int gxio_mpipe_info_enumerate_aux(gxio_mpipe_info_context_t * context,
+int gxio_mpipe_info_instance_aux(gxio_mpipe_info_context_t *context,
+                                 _gxio_mpipe_link_name_t name);
+
+int gxio_mpipe_info_enumerate_aux(gxio_mpipe_info_context_t *context,
                                   unsigned int idx,
-                                  _gxio_mpipe_link_name_t * name,
-                                  _gxio_mpipe_link_mac_t * mac);
+                                  _gxio_mpipe_link_name_t *name,
+                                  _gxio_mpipe_link_mac_t *mac);
 
-int gxio_mpipe_info_get_mmio_base(gxio_mpipe_info_context_t * context,
+int gxio_mpipe_info_get_mmio_base(gxio_mpipe_info_context_t *context,
                                   HV_PTE *base);
 
-int gxio_mpipe_info_check_mmio_offset(gxio_mpipe_info_context_t * context,
+int gxio_mpipe_info_check_mmio_offset(gxio_mpipe_info_context_t *context,
                                       unsigned long offset, unsigned long size);
 
 #endif /* !__GXIO_MPIPE_INFO_LINUX_RPC_H__ */
diff --git a/arch/tile/include/gxio/iorpc_trio.h b/arch/tile/include/gxio/iorpc_trio.h
index 58105c31228b..376a4f771167 100644
--- a/arch/tile/include/gxio/iorpc_trio.h
+++ b/arch/tile/include/gxio/iorpc_trio.h
@@ -30,6 +30,7 @@
 
 #define GXIO_TRIO_OP_ALLOC_MEMORY_MAPS IORPC_OPCODE(IORPC_FORMAT_NONE, 0x1404)
 
+#define GXIO_TRIO_OP_ALLOC_SCATTER_QUEUES IORPC_OPCODE(IORPC_FORMAT_NONE, 0x140e)
 #define GXIO_TRIO_OP_ALLOC_PIO_REGIONS IORPC_OPCODE(IORPC_FORMAT_NONE, 0x1412)
 
 #define GXIO_TRIO_OP_INIT_PIO_REGION_AUX IORPC_OPCODE(IORPC_FORMAT_NONE, 0x1414)
@@ -45,55 +46,59 @@
 #define GXIO_TRIO_OP_GET_MMIO_BASE     IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x8000)
 #define GXIO_TRIO_OP_CHECK_MMIO_OFFSET IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x8001)
 
-int gxio_trio_alloc_asids(gxio_trio_context_t * context, unsigned int count,
+int gxio_trio_alloc_asids(gxio_trio_context_t *context, unsigned int count,
                           unsigned int first, unsigned int flags);
 
 
-int gxio_trio_alloc_memory_maps(gxio_trio_context_t * context,
+int gxio_trio_alloc_memory_maps(gxio_trio_context_t *context,
                                 unsigned int count, unsigned int first,
                                 unsigned int flags);
 
 
-int gxio_trio_alloc_pio_regions(gxio_trio_context_t * context,
+int gxio_trio_alloc_scatter_queues(gxio_trio_context_t *context,
+                                   unsigned int count, unsigned int first,
+                                   unsigned int flags);
+
+int gxio_trio_alloc_pio_regions(gxio_trio_context_t *context,
                                 unsigned int count, unsigned int first,
                                 unsigned int flags);
 
-int gxio_trio_init_pio_region_aux(gxio_trio_context_t * context,
+int gxio_trio_init_pio_region_aux(gxio_trio_context_t *context,
                                   unsigned int pio_region, unsigned int mac,
                                   uint32_t bus_address_hi, unsigned int flags);
 
 
-int gxio_trio_init_memory_map_mmu_aux(gxio_trio_context_t * context,
+int gxio_trio_init_memory_map_mmu_aux(gxio_trio_context_t *context,
                                       unsigned int map, unsigned long va,
                                       uint64_t size, unsigned int asid,
                                       unsigned int mac, uint64_t bus_address,
                                       unsigned int node,
                                       unsigned int order_mode);
 
-int gxio_trio_get_port_property(gxio_trio_context_t * context,
+int gxio_trio_get_port_property(gxio_trio_context_t *context,
                                 struct pcie_trio_ports_property *trio_ports);
 
-int gxio_trio_config_legacy_intr(gxio_trio_context_t * context, int inter_x,
+int gxio_trio_config_legacy_intr(gxio_trio_context_t *context, int inter_x,
                                  int inter_y, int inter_ipi, int inter_event,
                                  unsigned int mac, unsigned int intx);
 
-int gxio_trio_config_msi_intr(gxio_trio_context_t * context, int inter_x,
+int gxio_trio_config_msi_intr(gxio_trio_context_t *context, int inter_x,
                               int inter_y, int inter_ipi, int inter_event,
                               unsigned int mac, unsigned int mem_map,
                               uint64_t mem_map_base, uint64_t mem_map_limit,
                               unsigned int asid);
 
 
-int gxio_trio_set_mps_mrs(gxio_trio_context_t * context, uint16_t mps,
+int gxio_trio_set_mps_mrs(gxio_trio_context_t *context, uint16_t mps,
                           uint16_t mrs, unsigned int mac);
 
-int gxio_trio_force_rc_link_up(gxio_trio_context_t * context, unsigned int mac);
+int gxio_trio_force_rc_link_up(gxio_trio_context_t *context, unsigned int mac);
 
-int gxio_trio_force_ep_link_up(gxio_trio_context_t * context, unsigned int mac);
+int gxio_trio_force_ep_link_up(gxio_trio_context_t *context, unsigned int mac);
 
-int gxio_trio_get_mmio_base(gxio_trio_context_t * context, HV_PTE *base);
+int gxio_trio_get_mmio_base(gxio_trio_context_t *context, HV_PTE *base);
 
-int gxio_trio_check_mmio_offset(gxio_trio_context_t * context,
+int gxio_trio_check_mmio_offset(gxio_trio_context_t *context,
                                 unsigned long offset, unsigned long size);
 
 #endif /* !__GXIO_TRIO_LINUX_RPC_H__ */
diff --git a/arch/tile/include/gxio/iorpc_uart.h b/arch/tile/include/gxio/iorpc_uart.h
new file mode 100644
index 000000000000..55429d48ea56
--- /dev/null
+++ b/arch/tile/include/gxio/iorpc_uart.h
@@ -0,0 +1,40 @@
+/*
+ * Copyright 2013 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+/* This file is machine-generated; DO NOT EDIT! */
+#ifndef __GXIO_UART_LINUX_RPC_H__
+#define __GXIO_UART_LINUX_RPC_H__
+
+#include <hv/iorpc.h>
+
+#include <hv/drv_uart_intf.h>
+#include <gxio/uart.h>
+#include <gxio/kiorpc.h>
+#include <linux/string.h>
+#include <linux/module.h>
+#include <asm/pgtable.h>
+
+#define GXIO_UART_OP_CFG_INTERRUPT     IORPC_OPCODE(IORPC_FORMAT_KERNEL_INTERRUPT, 0x1900)
+#define GXIO_UART_OP_GET_MMIO_BASE     IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x8000)
+#define GXIO_UART_OP_CHECK_MMIO_OFFSET IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x8001)
+
+int gxio_uart_cfg_interrupt(gxio_uart_context_t *context, int inter_x,
+                            int inter_y, int inter_ipi, int inter_event);
+
+int gxio_uart_get_mmio_base(gxio_uart_context_t *context, HV_PTE *base);
+
+int gxio_uart_check_mmio_offset(gxio_uart_context_t *context,
+                                unsigned long offset, unsigned long size);
+
+#endif /* !__GXIO_UART_LINUX_RPC_H__ */
diff --git a/arch/tile/include/gxio/iorpc_usb_host.h b/arch/tile/include/gxio/iorpc_usb_host.h
index 8622e7d126ad..79962a97de8e 100644
--- a/arch/tile/include/gxio/iorpc_usb_host.h
+++ b/arch/tile/include/gxio/iorpc_usb_host.h
@@ -31,16 +31,16 @@
 #define GXIO_USB_HOST_OP_GET_MMIO_BASE IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x8000)
 #define GXIO_USB_HOST_OP_CHECK_MMIO_OFFSET IORPC_OPCODE(IORPC_FORMAT_NONE_NOUSER, 0x8001)
 
-int gxio_usb_host_cfg_interrupt(gxio_usb_host_context_t * context, int inter_x,
+int gxio_usb_host_cfg_interrupt(gxio_usb_host_context_t *context, int inter_x,
                                 int inter_y, int inter_ipi, int inter_event);
 
-int gxio_usb_host_register_client_memory(gxio_usb_host_context_t * context,
+int gxio_usb_host_register_client_memory(gxio_usb_host_context_t *context,
                                          HV_PTE pte, unsigned int flags);
 
-int gxio_usb_host_get_mmio_base(gxio_usb_host_context_t * context,
+int gxio_usb_host_get_mmio_base(gxio_usb_host_context_t *context,
                                 HV_PTE *base);
 
-int gxio_usb_host_check_mmio_offset(gxio_usb_host_context_t * context,
+int gxio_usb_host_check_mmio_offset(gxio_usb_host_context_t *context,
                                     unsigned long offset, unsigned long size);
 
 #endif /* !__GXIO_USB_HOST_LINUX_RPC_H__ */
diff --git a/arch/tile/include/gxio/mpipe.h b/arch/tile/include/gxio/mpipe.h
index b74f470ed11e..e37cf4f0cffd 100644
--- a/arch/tile/include/gxio/mpipe.h
+++ b/arch/tile/include/gxio/mpipe.h
@@ -220,6 +220,13 @@ typedef MPIPE_PDESC_t gxio_mpipe_idesc_t;
  */
 typedef MPIPE_EDMA_DESC_t gxio_mpipe_edesc_t;
 
+/*
+ * Max # of mpipe instances. 2 currently.
+ */
+#define GXIO_MPIPE_INSTANCE_MAX  HV_MPIPE_INSTANCE_MAX
+
+#define NR_MPIPE_MAX   GXIO_MPIPE_INSTANCE_MAX
+
 /* Get the "va" field from an "idesc".
  *
  * This is the address at which the ingress hardware copied the first
@@ -311,6 +318,9 @@ typedef struct {
         /* File descriptor for calling up to Linux (and thus the HV). */
         int fd;
 
+        /* Corresponding mpipe instance #. */
+        int instance;
+
         /* The VA at which configuration registers are mapped. */
         char *mmio_cfg_base;
 
@@ -810,7 +820,7 @@ extern int gxio_mpipe_alloc_edma_rings(gxio_mpipe_context_t *context,
 /* Initialize an eDMA ring, using the given memory and size.
  *
  * @param context An initialized mPIPE context.
- * @param ring The eDMA ring index.
+ * @param ering The eDMA ring index.
  * @param channel The channel to use.  This must be one of the channels
  * associated with the context's set of open links.
  * @param mem A physically contiguous region of memory to be filled
@@ -823,10 +833,37 @@ extern int gxio_mpipe_alloc_edma_rings(gxio_mpipe_context_t *context,
  * ::GXIO_ERR_INVAL_MEMORY_SIZE on failure.
  */
 extern int gxio_mpipe_init_edma_ring(gxio_mpipe_context_t *context,
-                                     unsigned int ring, unsigned int channel,
+                                     unsigned int ering, unsigned int channel,
                                      void *mem, size_t mem_size,
                                      unsigned int mem_flags);
 
+/* Set the "max_blks", "min_snf_blks", and "db" fields of
+ * ::MPIPE_EDMA_RG_INIT_DAT_THRESH_t for a given edma ring.
+ *
+ * The global pool of dynamic blocks will be automatically adjusted.
+ *
+ * This function should not be called after any egress has been done
+ * on the edma ring.
+ *
+ * Most applications should just use gxio_mpipe_equeue_set_snf_size().
+ *
+ * @param context An initialized mPIPE context.
+ * @param ering The eDMA ring index.
+ * @param max_blks The number of blocks to dedicate to the ring
+ * (normally min_snf_blks + 1).  Must be greater than min_snf_blocks.
+ * @param min_snf_blks The number of blocks which must be stored
+ * prior to starting to send the packet (normally 12).
+ * @param db Whether to allow use of dynamic blocks by the ring
+ * (normally 1).
+ *
+ * @return 0 on success, negative on error.
+ */
+extern int gxio_mpipe_config_edma_ring_blks(gxio_mpipe_context_t *context,
+                                            unsigned int ering,
+                                            unsigned int max_blks,
+                                            unsigned int min_snf_blks,
+                                            unsigned int db);
+
 /*****************************************************************
  *                      Classifier Program                        *
  ******************************************************************/
@@ -1288,15 +1325,39 @@ typedef struct {
         /* The log2() of the number of entries. */
         unsigned long log2_num_entries;
 
+        /* The context. */
+        gxio_mpipe_context_t *context;
+
+        /* The ering. */
+        unsigned int ering;
+
+        /* The channel. */
+        unsigned int channel;
+
 } gxio_mpipe_equeue_t;
 
 /* Initialize an "equeue".
  *
- * Takes the equeue plus the same args as gxio_mpipe_init_edma_ring().
+ * This function uses gxio_mpipe_init_edma_ring() to initialize the
+ * underlying edma_ring using the provided arguments.
+ *
+ * @param equeue An egress queue to be initialized.
+ * @param context An initialized mPIPE context.
+ * @param ering The eDMA ring index.
+ * @param channel The channel to use.  This must be one of the channels
+ * associated with the context's set of open links.
+ * @param mem A physically contiguous region of memory to be filled
+ * with a ring of ::gxio_mpipe_edesc_t structures.
+ * @param mem_size Number of bytes in the ring.  Must be 512, 2048,
+ * 8192 or 65536, times 16 (i.e. sizeof(gxio_mpipe_edesc_t)).
+ * @param mem_flags ::gxio_mpipe_mem_flags_e memory flags.
+ *
+ * @return 0 on success, ::GXIO_MPIPE_ERR_BAD_EDMA_RING or
+ * ::GXIO_ERR_INVAL_MEMORY_SIZE on failure.
  */
 extern int gxio_mpipe_equeue_init(gxio_mpipe_equeue_t *equeue,
                                   gxio_mpipe_context_t *context,
-                                  unsigned int edma_ring_id,
+                                  unsigned int ering,
                                   unsigned int channel,
                                   void *mem, unsigned int mem_size,
                                   unsigned int mem_flags);
@@ -1494,6 +1555,37 @@ static inline int gxio_mpipe_equeue_is_complete(gxio_mpipe_equeue_t *equeue,
                                             completion_slot, update);
 }
 
+/* Set the snf (store and forward) size for an equeue.
+ *
+ * The snf size for an equeue defaults to 1536, and encodes the size
+ * of the largest packet for which egress is guaranteed to avoid
+ * transmission underruns and/or corrupt checksums under heavy load.
+ *
+ * The snf size affects a global resource pool which cannot support,
+ * for example, all 24 equeues each requesting an snf size of 8K.
+ *
+ * To ensure that jumbo packets can be egressed properly, the snf size
+ * should be set to the size of the largest possible packet, which
+ * will usually be limited by the size of the app's largest buffer.
+ *
+ * This is a convenience wrapper around
+ * gxio_mpipe_config_edma_ring_blks().
+ *
+ * This function should not be called after any egress has been done
+ * on the equeue.
+ *
+ * @param equeue An egress queue initialized via gxio_mpipe_equeue_init().
+ * @param size The snf size, in bytes.
+ * @return Zero on success, negative error otherwise.
+ */
+static inline int gxio_mpipe_equeue_set_snf_size(gxio_mpipe_equeue_t *equeue,
+                                                 size_t size)
+{
+        int blks = (size + 127) / 128;
+        return gxio_mpipe_config_edma_ring_blks(equeue->context, equeue->ering,
+                                                blks + 1, blks, 1);
+}
+
 /*****************************************************************
  *                        Link Management                         *
  ******************************************************************/
@@ -1634,6 +1726,24 @@ typedef struct {
         uint8_t mac;
 } gxio_mpipe_link_t;
 
+/* Translate a link name to the instance number of the mPIPE shim which is
+ *  connected to that link.  This call does not verify whether the link is
+ *  currently available, and does not reserve any link resources;
+ *  gxio_mpipe_link_open() must be called to perform those functions.
+ *
+ *  Typically applications will call this function to translate a link name
+ *  to an mPIPE instance number; call gxio_mpipe_init(), passing it that
+ *  instance number, to initialize the mPIPE shim; and then call
+ *  gxio_mpipe_link_open(), passing it the same link name plus the mPIPE
+ *  context, to configure the link.
+ *
+ * @param link_name Name of the link; see @ref gxio_mpipe_link_names.
+ * @return The mPIPE instance number which is associated with the named
+ *  link, or a negative error code (::GXIO_ERR_NO_DEVICE) if the link does
+ *  not exist.
+ */
+extern int gxio_mpipe_link_instance(const char *link_name);
+
 /* Retrieve one of this system's legal link names, and its MAC address.
  *
  * @param index Link name index.  If a system supports N legal link names,
@@ -1697,6 +1807,17 @@ static inline int gxio_mpipe_link_channel(gxio_mpipe_link_t *link)
         return link->channel;
 }
 
+/* Set a link attribute.
+ *
+ * @param link A properly initialized link state object.
+ * @param attr An attribute from the set of @ref gxio_mpipe_link_attrs.
+ * @param val New value of the attribute.
+ * @return 0 if the attribute was successfully set, or a negative error
+ *  code.
+ */
+extern int gxio_mpipe_link_set_attr(gxio_mpipe_link_t *link, uint32_t attr,
+                                    int64_t val);
+
 ///////////////////////////////////////////////////////////////////
 //                             Timestamp                         //
 ///////////////////////////////////////////////////////////////////
@@ -1733,4 +1854,18 @@ extern int gxio_mpipe_set_timestamp(gxio_mpipe_context_t *context,
 extern int gxio_mpipe_adjust_timestamp(gxio_mpipe_context_t *context,
                                        int64_t delta);
 
+/** Adjust the mPIPE timestamp clock frequency.
+ *
+ * @param context An initialized mPIPE context.
+ * @param ppb A 32-bit signed PPB (Parts Per Billion) value to adjust.
+ * The absolute value of ppb must be less than or equal to 1000000000.
+ * Values less than about 30000 will generally cause a GXIO_ERR_INVAL
+ * return due to the granularity of the hardware that converts reference
+ * clock cycles into seconds and nanoseconds.
+ * @return If the call was successful, zero; otherwise, a negative error
+ *  code.
+ */
+extern int gxio_mpipe_adjust_timestamp_freq(gxio_mpipe_context_t* context,
+                                            int32_t ppb);
+
 #endif /* !_GXIO_MPIPE_H_ */
diff --git a/arch/tile/include/gxio/uart.h b/arch/tile/include/gxio/uart.h
new file mode 100644
index 000000000000..438ee7e46c7b
--- /dev/null
+++ b/arch/tile/include/gxio/uart.h
@@ -0,0 +1,105 @@
+/*
+ * Copyright 2013 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#ifndef _GXIO_UART_H_
+#define _GXIO_UART_H_
+
+#include "common.h"
+
+#include <hv/drv_uart_intf.h>
+#include <hv/iorpc.h>
+
+/*
+ *
+ * An API for manipulating UART interface.
+ */
+
+/*
+ *
+ * The Rshim allows access to the processor's UART interface.
+ */
+
+/* A context object used to manage UART resources. */
+typedef struct {
+
+        /* File descriptor for calling up to the hypervisor. */
+        int fd;
+
+        /* The VA at which our MMIO registers are mapped. */
+        char *mmio_base;
+
+} gxio_uart_context_t;
+
+/* Request UART interrupts.
+ *
+ *  Request that interrupts be delivered to a tile when the UART's
+ *  Receive FIFO is written, or the Write FIFO is read.
+ *
+ * @param context Pointer to a properly initialized gxio_uart_context_t.
+ * @param bind_cpu_x X coordinate of CPU to which interrupt will be delivered.
+ * @param bind_cpu_y Y coordinate of CPU to which interrupt will be delivered.
+ * @param bind_interrupt IPI interrupt number.
+ * @param bind_event Sub-interrupt event bit number; a negative value can
+ *  disable the interrupt.
+ * @return Zero if all of the requested UART events were successfully
+ *  configured to interrupt.
+ */
+extern int gxio_uart_cfg_interrupt(gxio_uart_context_t *context,
+                                   int bind_cpu_x,
+                                   int bind_cpu_y,
+                                   int bind_interrupt, int bind_event);
+
+/* Initialize a UART context.
+ *
+ *  A properly initialized context must be obtained before any of the other
+ *  gxio_uart routines may be used.
+ *
+ * @param context Pointer to a gxio_uart_context_t, which will be initialized
+ *  by this routine, if it succeeds.
+ * @param uart_index Index of the UART to use.
+ * @return Zero if the context was successfully initialized, else a
+ *  GXIO_ERR_xxx error code.
+ */
+extern int gxio_uart_init(gxio_uart_context_t *context, int uart_index);
+
+/* Destroy a UART context.
+ *
+ *  Once destroyed, a context may not be used with any gxio_uart routines
+ *  other than gxio_uart_init().  After this routine returns, no further
+ *  interrupts requested on this context will be delivered.  The state and
+ *  configuration of the pins which had been attached to this context are
+ *  unchanged by this operation.
+ *
+ * @param context Pointer to a gxio_uart_context_t.
+ * @return Zero if the context was successfully destroyed, else a
+ *  GXIO_ERR_xxx error code.
+ */
+extern int gxio_uart_destroy(gxio_uart_context_t *context);
+
+/* Write UART register.
+ * @param context Pointer to a gxio_uart_context_t.
+ * @param offset UART register offset.
+ * @param word Data will be wrote to UART reigister.
+ */
+extern void gxio_uart_write(gxio_uart_context_t *context, uint64_t offset,
+                            uint64_t word);
+
+/* Read UART register.
+ * @param context Pointer to a gxio_uart_context_t.
+ * @param offset UART register offset.
+ * @return Data read from UART register.
+ */
+extern uint64_t gxio_uart_read(gxio_uart_context_t *context, uint64_t offset);
+
+#endif /* _GXIO_UART_H_ */
diff --git a/arch/tile/include/gxio/usb_host.h b/arch/tile/include/gxio/usb_host.h
index 5eedec0e988e..93c9636d2dd7 100644
--- a/arch/tile/include/gxio/usb_host.h
+++ b/arch/tile/include/gxio/usb_host.h
@@ -53,7 +53,7 @@ typedef struct {
  * @return Zero if the context was successfully initialized, else a
  *  GXIO_ERR_xxx error code.
  */
-extern int gxio_usb_host_init(gxio_usb_host_context_t * context, int usb_index,
+extern int gxio_usb_host_init(gxio_usb_host_context_t *context, int usb_index,
                               int is_ehci);
 
 /* Destroy a USB context.
@@ -68,20 +68,20 @@ extern int gxio_usb_host_init(gxio_usb_host_context_t * context, int usb_index,
  * @return Zero if the context was successfully destroyed, else a
  *  GXIO_ERR_xxx error code.
  */
-extern int gxio_usb_host_destroy(gxio_usb_host_context_t * context);
+extern int gxio_usb_host_destroy(gxio_usb_host_context_t *context);
 
 /* Retrieve the address of the shim's MMIO registers.
  *
  * @param context Pointer to a properly initialized gxio_usb_host_context_t.
  * @return The address of the shim's MMIO registers.
  */
-extern void *gxio_usb_host_get_reg_start(gxio_usb_host_context_t * context);
+extern void *gxio_usb_host_get_reg_start(gxio_usb_host_context_t *context);
 
 /* Retrieve the length of the shim's MMIO registers.
  *
  * @param context Pointer to a properly initialized gxio_usb_host_context_t.
  * @return The length of the shim's MMIO registers.
  */
-extern size_t gxio_usb_host_get_reg_len(gxio_usb_host_context_t * context);
+extern size_t gxio_usb_host_get_reg_len(gxio_usb_host_context_t *context);
 
 #endif /* _GXIO_USB_H_ */
diff --git a/arch/tile/include/hv/drv_mpipe_intf.h b/arch/tile/include/hv/drv_mpipe_intf.h
index 6cdae3bf046e..c97e416dd963 100644
--- a/arch/tile/include/hv/drv_mpipe_intf.h
+++ b/arch/tile/include/hv/drv_mpipe_intf.h
@@ -23,6 +23,9 @@
 #include <arch/mpipe_constants.h>
 
 
+/** Number of mPIPE instances supported */
+#define HV_MPIPE_INSTANCE_MAX   (2)
+
 /** Number of buffer stacks (32). */
 #define HV_MPIPE_NUM_BUFFER_STACKS \
   (MPIPE_MMIO_INIT_DAT_GX36_1__BUFFER_STACK_MASK_WIDTH)
diff --git a/arch/tile/include/hv/drv_trio_intf.h b/arch/tile/include/hv/drv_trio_intf.h
index ef9f3f52ee27..237e04dee66c 100644
--- a/arch/tile/include/hv/drv_trio_intf.h
+++ b/arch/tile/include/hv/drv_trio_intf.h
@@ -64,8 +64,9 @@ struct pcie_port_property
    *  will not consider it an error if the link comes up as a x8 link. */
   uint8_t allow_x8: 1;
 
-  /** Reserved. */
-  uint8_t reserved: 1;
+  /** If true, this link is connected to a device which may or may not
+   *  be present. */
+  uint8_t removable: 1;
 
 };
 
@@ -167,6 +168,9 @@ pcie_stream_intr_config_sel_t;
 struct pcie_trio_ports_property
 {
   struct pcie_port_property ports[TILEGX_TRIO_PCIES];
+
+  /** Set if this TRIO belongs to a Gx72 device. */
+  uint8_t is_gx72;
 };
 
 /* Flags indicating traffic class. */
diff --git a/arch/tile/include/hv/drv_uart_intf.h b/arch/tile/include/hv/drv_uart_intf.h
new file mode 100644
index 000000000000..f5379e2404fd
--- /dev/null
+++ b/arch/tile/include/hv/drv_uart_intf.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2013 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+/**
+ * Interface definitions for the UART driver.
+ */
+
+#ifndef _SYS_HV_DRV_UART_INTF_H
+#define _SYS_HV_DRV_UART_INTF_H
+
+#include <arch/uart.h>
+
+/** Number of UART ports supported. */
+#define TILEGX_UART_NR        2
+
+/** The mmap file offset (PA) of the UART MMIO region. */
+#define HV_UART_MMIO_OFFSET   0
+
+/** The maximum size of the UARTs MMIO region (64K Bytes). */
+#define HV_UART_MMIO_SIZE     (1UL << 16)
+
+#endif /* _SYS_HV_DRV_UART_INTF_H */
diff --git a/arch/tile/include/hv/hypervisor.h b/arch/tile/include/hv/hypervisor.h
index 837dca5328c2..dfcdeb61ba34 100644
--- a/arch/tile/include/hv/hypervisor.h
+++ b/arch/tile/include/hv/hypervisor.h
@@ -318,8 +318,11 @@
 /** hv_set_pte_super_shift */
 #define HV_DISPATCH_SET_PTE_SUPER_SHIFT           57
 
+/** hv_console_set_ipi */
+#define HV_DISPATCH_CONSOLE_SET_IPI               63
+
 /** One more than the largest dispatch value */
-#define _HV_DISPATCH_END                          58
+#define _HV_DISPATCH_END                          64
 
 
 #ifndef __ASSEMBLER__
@@ -541,14 +544,24 @@ typedef enum {
   HV_CONFSTR_CPUMOD_REV      = 18,
 
   /** Human-readable CPU module description. */
-  HV_CONFSTR_CPUMOD_DESC     = 19
+  HV_CONFSTR_CPUMOD_DESC     = 19,
+
+  /** Per-tile hypervisor statistics.  When this identifier is specified,
+   *  the hv_confstr call takes two extra arguments.  The first is the
+   *  HV_XY_TO_LOTAR of the target tile's coordinates.  The second is
+   *  a flag word.  The only current flag is the lowest bit, which means
+   *  "zero out the stats instead of retrieving them"; in this case the
+   *  buffer and buffer length are ignored. */
+  HV_CONFSTR_HV_STATS        = 20
 
 } HV_ConfstrQuery;
 
 /** Query a configuration string from the hypervisor.
  *
  * @param query Identifier for the specific string to be retrieved
- *        (HV_CONFSTR_xxx).
+ *        (HV_CONFSTR_xxx).  Some strings may require or permit extra
+ *        arguments to be appended which select specific objects to be
+ *        described; see the string descriptions above.
  * @param buf Buffer in which to place the string.
  * @param len Length of the buffer.
  * @return If query is valid, then the length of the corresponding string,
@@ -556,21 +569,16 @@ typedef enum {
  *        was truncated.  If query is invalid, HV_EINVAL.  If the specified
  *        buffer is not writable by the client, HV_EFAULT.
  */
-int hv_confstr(HV_ConfstrQuery query, HV_VirtAddr buf, int len);
+int hv_confstr(HV_ConfstrQuery query, HV_VirtAddr buf, int len, ...);
 
 /** Tile coordinate */
 typedef struct
 {
-#ifndef __BIG_ENDIAN__
   /** X coordinate, relative to supervisor's top-left coordinate */
   int x;
 
   /** Y coordinate, relative to supervisor's top-left coordinate */
   int y;
-#else
-  int y;
-  int x;
-#endif
 } HV_Coord;
 
 
@@ -585,6 +593,30 @@ typedef struct
  */
 int hv_get_ipi_pte(HV_Coord tile, int pl, HV_PTE* pte);
 
+/** Configure the console interrupt.
+ *
+ * When the console client interrupt is enabled, the hypervisor will
+ * deliver the specified IPI to the client in the following situations:
+ *
+ * - The console has at least one character available for input.
+ *
+ * - The console can accept new characters for output, and the last call
+ *   to hv_console_write() did not write all of the characters requested
+ *   by the client.
+ *
+ * Note that in some system configurations, console interrupt will not
+ * be available; clients should be prepared for this routine to fail and
+ * to fall back to periodic console polling in that case.
+ *
+ * @param ipi Index of the IPI register which will receive the interrupt.
+ * @param event IPI event number for console interrupt. If less than 0,
+ *        disable the console IPI interrupt.
+ * @param coord Tile to be targeted for console interrupt.
+ * @return 0 on success, otherwise, HV_EINVAL if illegal parameter,
+ *         HV_ENOTSUP if console interrupt are not available.
+ */
+int hv_console_set_ipi(int ipi, int event, HV_Coord coord);
+
 #else /* !CHIP_HAS_IPI() */
 
 /** A set of interrupts. */
@@ -1092,13 +1124,8 @@ HV_VirtAddrRange hv_inquire_virtual(int idx);
 /** A range of ASID values. */
 typedef struct
 {
-#ifndef __BIG_ENDIAN__
   HV_ASID start;        /**< First ASID in the range. */
   unsigned int size;    /**< Number of ASIDs. Zero for an invalid range. */
-#else
-  unsigned int size;    /**< Number of ASIDs. Zero for an invalid range. */
-  HV_ASID start;        /**< First ASID in the range. */
-#endif
 } HV_ASIDRange;
 
 /** Returns information about a range of ASIDs.
@@ -1422,7 +1449,6 @@ typedef enum
 /** Message recipient. */
 typedef struct
 {
-#ifndef __BIG_ENDIAN__
   /** X coordinate, relative to supervisor's top-left coordinate */
   unsigned int x:11;
 
@@ -1431,11 +1457,6 @@ typedef struct
 
   /** Status of this recipient */
   HV_Recip_State state:10;
-#else //__BIG_ENDIAN__
-  HV_Recip_State state:10;
-  unsigned int y:11;
-  unsigned int x:11;
-#endif
 } HV_Recipient;
 
 /** Send a message to a set of recipients.
diff --git a/arch/tile/include/uapi/arch/Kbuild b/arch/tile/include/uapi/arch/Kbuild
index 4ebc34f4768d..97dfbecec6b6 100644
--- a/arch/tile/include/uapi/arch/Kbuild
+++ b/arch/tile/include/uapi/arch/Kbuild
@@ -1,7 +1,6 @@
 # UAPI Header export list
 header-y += abi.h
 header-y += chip.h
-header-y += chip_tile64.h
 header-y += chip_tilegx.h
 header-y += chip_tilepro.h
 header-y += icache.h
diff --git a/arch/tile/include/uapi/arch/chip.h b/arch/tile/include/uapi/arch/chip.h
index 926d3db0e91e..4c91f90b9369 100644
--- a/arch/tile/include/uapi/arch/chip.h
+++ b/arch/tile/include/uapi/arch/chip.h
@@ -12,9 +12,7 @@
  *   more details.
  */
 
-#if __tile_chip__ == 0
-#include <arch/chip_tile64.h>
-#elif __tile_chip__ == 1
+#if __tile_chip__ == 1
 #include <arch/chip_tilepro.h>
 #elif defined(__tilegx__)
 #include <arch/chip_tilegx.h>
diff --git a/arch/tile/include/uapi/arch/chip_tile64.h b/arch/tile/include/uapi/arch/chip_tile64.h
deleted file mode 100644
index 261aaba092d4..000000000000
--- a/arch/tile/include/uapi/arch/chip_tile64.h
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
- * Copyright 2010 Tilera Corporation. All Rights Reserved.
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   as published by the Free Software Foundation, version 2.
- *
- *   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, GOOD TITLE or
- *   NON INFRINGEMENT.  See the GNU General Public License for
- *   more details.
- */
-
-/*
- * @file
- * Global header file.
- * This header file specifies defines for TILE64.
- */
-
-#ifndef __ARCH_CHIP_H__
-#define __ARCH_CHIP_H__
-
-/** Specify chip version.
- * When possible, prefer the CHIP_xxx symbols below for future-proofing.
- * This is intended for cross-compiling; native compilation should
- * use the predefined __tile_chip__ symbol.
- */
-#define TILE_CHIP 0
-
-/** Specify chip revision.
- * This provides for the case of a respin of a particular chip type;
- * the normal value for this symbol is "0".
- * This is intended for cross-compiling; native compilation should
- * use the predefined __tile_chip_rev__ symbol.
- */
-#define TILE_CHIP_REV 0
-
-/** The name of this architecture. */
-#define CHIP_ARCH_NAME "tile64"
-
-/** The ELF e_machine type for binaries for this chip. */
-#define CHIP_ELF_TYPE() EM_TILE64
-
-/** The alternate ELF e_machine type for binaries for this chip. */
-#define CHIP_COMPAT_ELF_TYPE() 0x2506
-
-/** What is the native word size of the machine? */
-#define CHIP_WORD_SIZE() 32
-
-/** How many bits of a virtual address are used. Extra bits must be
- * the sign extension of the low bits.
- */
-#define CHIP_VA_WIDTH() 32
-
-/** How many bits are in a physical address? */
-#define CHIP_PA_WIDTH() 36
-
-/** Size of the L2 cache, in bytes. */
-#define CHIP_L2_CACHE_SIZE() 65536
-
-/** Log size of an L2 cache line in bytes. */
-#define CHIP_L2_LOG_LINE_SIZE() 6
-
-/** Size of an L2 cache line, in bytes. */
-#define CHIP_L2_LINE_SIZE() (1 << CHIP_L2_LOG_LINE_SIZE())
-
-/** Associativity of the L2 cache. */
-#define CHIP_L2_ASSOC() 2
-
-/** Size of the L1 data cache, in bytes. */
-#define CHIP_L1D_CACHE_SIZE() 8192
-
-/** Log size of an L1 data cache line in bytes. */
-#define CHIP_L1D_LOG_LINE_SIZE() 4
-
-/** Size of an L1 data cache line, in bytes. */
-#define CHIP_L1D_LINE_SIZE() (1 << CHIP_L1D_LOG_LINE_SIZE())
-
-/** Associativity of the L1 data cache. */
-#define CHIP_L1D_ASSOC() 2
-
-/** Size of the L1 instruction cache, in bytes. */
-#define CHIP_L1I_CACHE_SIZE() 8192
-
-/** Log size of an L1 instruction cache line in bytes. */
-#define CHIP_L1I_LOG_LINE_SIZE() 6
-
-/** Size of an L1 instruction cache line, in bytes. */
-#define CHIP_L1I_LINE_SIZE() (1 << CHIP_L1I_LOG_LINE_SIZE())
-
-/** Associativity of the L1 instruction cache. */
-#define CHIP_L1I_ASSOC() 1
-
-/** Stride with which flush instructions must be issued. */
-#define CHIP_FLUSH_STRIDE() CHIP_L2_LINE_SIZE()
-
-/** Stride with which inv instructions must be issued. */
-#define CHIP_INV_STRIDE() CHIP_L1D_LINE_SIZE()
-
-/** Stride with which finv instructions must be issued. */
-#define CHIP_FINV_STRIDE() CHIP_L1D_LINE_SIZE()
-
-/** Can the local cache coherently cache data that is homed elsewhere? */
-#define CHIP_HAS_COHERENT_LOCAL_CACHE() 0
-
-/** How many simultaneous outstanding victims can the L2 cache have? */
-#define CHIP_MAX_OUTSTANDING_VICTIMS() 2
-
-/** Does the TLB support the NC and NOALLOC bits? */
-#define CHIP_HAS_NC_AND_NOALLOC_BITS() 0
-
-/** Does the chip support hash-for-home caching? */
-#define CHIP_HAS_CBOX_HOME_MAP() 0
-
-/** Number of entries in the chip's home map tables. */
-/* #define CHIP_CBOX_HOME_MAP_SIZE() -- does not apply to chip 0 */
-
-/** Do uncacheable requests miss in the cache regardless of whether
- * there is matching data? */
-#define CHIP_HAS_ENFORCED_UNCACHEABLE_REQUESTS() 0
-
-/** Does the mf instruction wait for victims? */
-#define CHIP_HAS_MF_WAITS_FOR_VICTIMS() 1
-
-/** Does the chip have an "inv" instruction that doesn't also flush? */
-#define CHIP_HAS_INV() 0
-
-/** Does the chip have a "wh64" instruction? */
-#define CHIP_HAS_WH64() 0
-
-/** Does this chip have a 'dword_align' instruction? */
-#define CHIP_HAS_DWORD_ALIGN() 0
-
-/** Number of performance counters. */
-#define CHIP_PERFORMANCE_COUNTERS() 2
-
-/** Does this chip have auxiliary performance counters? */
-#define CHIP_HAS_AUX_PERF_COUNTERS() 0
-
-/** Is the CBOX_MSR1 SPR supported? */
-#define CHIP_HAS_CBOX_MSR1() 0
-
-/** Is the TILE_RTF_HWM SPR supported? */
-#define CHIP_HAS_TILE_RTF_HWM() 0
-
-/** Is the TILE_WRITE_PENDING SPR supported? */
-#define CHIP_HAS_TILE_WRITE_PENDING() 0
-
-/** Is the PROC_STATUS SPR supported? */
-#define CHIP_HAS_PROC_STATUS_SPR() 0
-
-/** Is the DSTREAM_PF SPR supported? */
-#define CHIP_HAS_DSTREAM_PF() 0
-
-/** Log of the number of mshims we have. */
-#define CHIP_LOG_NUM_MSHIMS() 2
-
-/** Are the bases of the interrupt vector areas fixed? */
-#define CHIP_HAS_FIXED_INTVEC_BASE() 1
-
-/** Are the interrupt masks split up into 2 SPRs? */
-#define CHIP_HAS_SPLIT_INTR_MASK() 1
-
-/** Is the cycle count split up into 2 SPRs? */
-#define CHIP_HAS_SPLIT_CYCLE() 1
-
-/** Does the chip have a static network? */
-#define CHIP_HAS_SN() 1
-
-/** Does the chip have a static network processor? */
-#define CHIP_HAS_SN_PROC() 1
-
-/** Size of the L1 static network processor instruction cache, in bytes. */
-#define CHIP_L1SNI_CACHE_SIZE() 2048
-
-/** Does the chip have DMA support in each tile? */
-#define CHIP_HAS_TILE_DMA() 1
-
-/** Does the chip have the second revision of the directly accessible
- *  dynamic networks?  This encapsulates a number of characteristics,
- *  including the absence of the catch-all, the absence of inline message
- *  tags, the absence of support for network context-switching, and so on.
- */
-#define CHIP_HAS_REV1_XDN() 0
-
-/** Does the chip have cmpexch and similar (fetchadd, exch, etc.)? */
-#define CHIP_HAS_CMPEXCH() 0
-
-/** Does the chip have memory-mapped I/O support? */
-#define CHIP_HAS_MMIO() 0
-
-/** Does the chip have post-completion interrupts? */
-#define CHIP_HAS_POST_COMPLETION_INTERRUPTS() 0
-
-/** Does the chip have native single step support? */
-#define CHIP_HAS_SINGLE_STEP() 0
-
-#ifndef __OPEN_SOURCE__  /* features only relevant to hypervisor-level code */
-
-/** How many entries are present in the instruction TLB? */
-#define CHIP_ITLB_ENTRIES() 8
-
-/** How many entries are present in the data TLB? */
-#define CHIP_DTLB_ENTRIES() 16
-
-/** How many MAF entries does the XAUI shim have? */
-#define CHIP_XAUI_MAF_ENTRIES() 16
-
-/** Does the memory shim have a source-id table? */
-#define CHIP_HAS_MSHIM_SRCID_TABLE() 1
-
-/** Does the L1 instruction cache clear on reset? */
-#define CHIP_HAS_L1I_CLEAR_ON_RESET() 0
-
-/** Does the chip come out of reset with valid coordinates on all tiles?
- * Note that if defined, this also implies that the upper left is 1,1.
- */
-#define CHIP_HAS_VALID_TILE_COORD_RESET() 0
-
-/** Does the chip have unified packet formats? */
-#define CHIP_HAS_UNIFIED_PACKET_FORMATS() 0
-
-/** Does the chip support write reordering? */
-#define CHIP_HAS_WRITE_REORDERING() 0
-
-/** Does the chip support Y-X routing as well as X-Y? */
-#define CHIP_HAS_Y_X_ROUTING() 0
-
-/** Is INTCTRL_3 managed with the correct MPL? */
-#define CHIP_HAS_INTCTRL_3_STATUS_FIX() 0
-
-/** Is it possible to configure the chip to be big-endian? */
-#define CHIP_HAS_BIG_ENDIAN_CONFIG() 0
-
-/** Is the CACHE_RED_WAY_OVERRIDDEN SPR supported? */
-#define CHIP_HAS_CACHE_RED_WAY_OVERRIDDEN() 0
-
-/** Is the DIAG_TRACE_WAY SPR supported? */
-#define CHIP_HAS_DIAG_TRACE_WAY() 0
-
-/** Is the MEM_STRIPE_CONFIG SPR supported? */
-#define CHIP_HAS_MEM_STRIPE_CONFIG() 0
-
-/** Are the TLB_PERF SPRs supported? */
-#define CHIP_HAS_TLB_PERF() 0
-
-/** Is the VDN_SNOOP_SHIM_CTL SPR supported? */
-#define CHIP_HAS_VDN_SNOOP_SHIM_CTL() 0
-
-/** Does the chip support rev1 DMA packets? */
-#define CHIP_HAS_REV1_DMA_PACKETS() 0
-
-/** Does the chip have an IPI shim? */
-#define CHIP_HAS_IPI() 0
-
-#endif /* !__OPEN_SOURCE__ */
-#endif /* __ARCH_CHIP_H__ */
diff --git a/arch/tile/include/uapi/arch/opcode_tilegx.h b/arch/tile/include/uapi/arch/opcode_tilegx.h
index c14d02c81600..d76ff2db745e 100644
--- a/arch/tile/include/uapi/arch/opcode_tilegx.h
+++ b/arch/tile/include/uapi/arch/opcode_tilegx.h
@@ -61,6 +61,7 @@ typedef tilegx_bundle_bits tile_bundle_bits;
 #define TILE_BUNDLE_ALIGNMENT_IN_BYTES TILEGX_BUNDLE_ALIGNMENT_IN_BYTES
 #define TILE_LOG2_BUNDLE_ALIGNMENT_IN_BYTES \
   TILEGX_LOG2_BUNDLE_ALIGNMENT_IN_BYTES
+#define TILE_BPT_BUNDLE TILEGX_BPT_BUNDLE
 
 /* 64-bit pattern for a { bpt ; nop } bundle. */
 #define TILEGX_BPT_BUNDLE 0x286a44ae51485000ULL
diff --git a/arch/tile/include/uapi/arch/opcode_tilepro.h b/arch/tile/include/uapi/arch/opcode_tilepro.h
index 71b763b8ce83..4451cff1a861 100644
--- a/arch/tile/include/uapi/arch/opcode_tilepro.h
+++ b/arch/tile/include/uapi/arch/opcode_tilepro.h
@@ -71,6 +71,7 @@ typedef tilepro_bundle_bits tile_bundle_bits;
 #define TILE_BUNDLE_ALIGNMENT_IN_BYTES TILEPRO_BUNDLE_ALIGNMENT_IN_BYTES
 #define TILE_LOG2_BUNDLE_ALIGNMENT_IN_BYTES \
   TILEPRO_LOG2_BUNDLE_ALIGNMENT_IN_BYTES
+#define TILE_BPT_BUNDLE TILEPRO_BPT_BUNDLE
 
 /* 64-bit pattern for a { bpt ; nop } bundle. */
 #define TILEPRO_BPT_BUNDLE 0x400b3cae70166000ULL
diff --git a/arch/tile/include/uapi/arch/spr_def_32.h b/arch/tile/include/uapi/arch/spr_def_32.h
index c689446e6284..78daa3146d25 100644
--- a/arch/tile/include/uapi/arch/spr_def_32.h
+++ b/arch/tile/include/uapi/arch/spr_def_32.h
@@ -200,8 +200,6 @@
 #define SPR_SIM_CONTROL 0x4e0c
 #define SPR_SNCTL 0x0805
 #define SPR_SNCTL__FRZFABRIC_MASK  0x1
-#define SPR_SNCTL__FRZPROC_MASK  0x2
-#define SPR_SNPC 0x080b
 #define SPR_SNSTATIC 0x080c
 #define SPR_SYSTEM_SAVE_0_0 0x4b00
 #define SPR_SYSTEM_SAVE_0_1 0x4b01
diff --git a/arch/tile/include/uapi/asm/auxvec.h b/arch/tile/include/uapi/asm/auxvec.h
index 1d393edb0641..c93e92709f14 100644
--- a/arch/tile/include/uapi/asm/auxvec.h
+++ b/arch/tile/include/uapi/asm/auxvec.h
@@ -15,6 +15,7 @@
 #ifndef _ASM_TILE_AUXVEC_H
 #define _ASM_TILE_AUXVEC_H
 
-/* No extensions to auxvec */
+/* The vDSO location. */
+#define AT_SYSINFO_EHDR         33
 
 #endif /* _ASM_TILE_AUXVEC_H */
diff --git a/arch/tile/include/uapi/asm/cachectl.h b/arch/tile/include/uapi/asm/cachectl.h
index af4c9f9154d1..572ddcad2090 100644
--- a/arch/tile/include/uapi/asm/cachectl.h
+++ b/arch/tile/include/uapi/asm/cachectl.h
@@ -29,8 +29,8 @@
  * to honor the arguments at some point.)
  *
  * Flush and invalidation of memory can normally be performed with the
- * __insn_flush(), __insn_inv(), and __insn_finv() instructions from
- * userspace.  The DCACHE option to the system call allows userspace
+ * __insn_flush() and __insn_finv() instructions from userspace.
+ * The DCACHE option to the system call allows userspace
  * to flush the entire L1+L2 data cache from the core.  In this case,
  * the address and length arguments are not used.  The DCACHE flush is
  * restricted to the current core, not all cores in the address space.
diff --git a/arch/tile/kernel/Makefile b/arch/tile/kernel/Makefile
index 5334be8e2538..27a2bf39dae8 100644
--- a/arch/tile/kernel/Makefile
+++ b/arch/tile/kernel/Makefile
@@ -3,11 +3,17 @@
 #
 
 extra-y := vmlinux.lds head_$(BITS).o
-obj-y := backtrace.o entry.o irq.o messaging.o \
+obj-y := backtrace.o entry.o hvglue.o irq.o messaging.o \
         pci-dma.o proc.o process.o ptrace.o reboot.o \
-        setup.o signal.o single_step.o stack.o sys.o sysfs.o time.o traps.o \
+        setup.o signal.o single_step.o stack.o sys.o \
+        sysfs.o time.o traps.o unaligned.o vdso.o \
         intvec_$(BITS).o regs_$(BITS).o tile-desc_$(BITS).o
 
+ifdef CONFIG_FUNCTION_TRACER
+CFLAGS_REMOVE_ftrace.o = -pg
+CFLAGS_REMOVE_early_printk.o = -pg
+endif
+
 obj-$(CONFIG_HARDWALL)          += hardwall.o
 obj-$(CONFIG_COMPAT)            += compat.o compat_signal.o
 obj-$(CONFIG_SMP)               += smpboot.o smp.o tlb.o
@@ -20,3 +26,9 @@ else
 obj-$(CONFIG_PCI)               += pci.o
 endif
 obj-$(CONFIG_TILE_USB)          += usb.o
+obj-$(CONFIG_TILE_HVGLUE_TRACE) += hvglue_trace.o
+obj-$(CONFIG_FUNCTION_TRACER)   += ftrace.o mcount_64.o
+obj-$(CONFIG_KPROBES)           += kprobes.o
+obj-$(CONFIG_KGDB)              += kgdb.o
+
+obj-y                           += vdso/
diff --git a/arch/tile/kernel/asm-offsets.c b/arch/tile/kernel/asm-offsets.c
index 01ddf19cc36d..375e7c321eef 100644
--- a/arch/tile/kernel/asm-offsets.c
+++ b/arch/tile/kernel/asm-offsets.c
@@ -14,13 +14,6 @@
  * Generates definitions from c-type structures used by assembly sources.
  */
 
-#include <linux/kbuild.h>
-#include <linux/thread_info.h>
-#include <linux/sched.h>
-#include <linux/hardirq.h>
-#include <linux/ptrace.h>
-#include <hv/hypervisor.h>
-
 /* Check for compatible compiler early in the build. */
 #ifdef CONFIG_TILEGX
 # ifndef __tilegx__
@@ -31,46 +24,61 @@
 # endif
 #else
 # ifdef __tilegx__
-#  error Can not build TILEPro/TILE64 configurations with tilegx compiler
+#  error Can not build TILEPro configurations with tilegx compiler
 # endif
 #endif
 
+#include <linux/kbuild.h>
+#include <linux/thread_info.h>
+#include <linux/sched.h>
+#include <linux/hardirq.h>
+#include <linux/ptrace.h>
+#include <hv/hypervisor.h>
+
 void foo(void)
 {
-        DEFINE(SINGLESTEP_STATE_BUFFER_OFFSET, \
+        DEFINE(SINGLESTEP_STATE_BUFFER_OFFSET,
                offsetof(struct single_step_state, buffer));
-        DEFINE(SINGLESTEP_STATE_FLAGS_OFFSET, \
+        DEFINE(SINGLESTEP_STATE_FLAGS_OFFSET,
                offsetof(struct single_step_state, flags));
-        DEFINE(SINGLESTEP_STATE_ORIG_PC_OFFSET, \
+        DEFINE(SINGLESTEP_STATE_ORIG_PC_OFFSET,
                offsetof(struct single_step_state, orig_pc));
-        DEFINE(SINGLESTEP_STATE_NEXT_PC_OFFSET, \
+        DEFINE(SINGLESTEP_STATE_NEXT_PC_OFFSET,
                offsetof(struct single_step_state, next_pc));
-        DEFINE(SINGLESTEP_STATE_BRANCH_NEXT_PC_OFFSET, \
+        DEFINE(SINGLESTEP_STATE_BRANCH_NEXT_PC_OFFSET,
                offsetof(struct single_step_state, branch_next_pc));
-        DEFINE(SINGLESTEP_STATE_UPDATE_VALUE_OFFSET, \
+        DEFINE(SINGLESTEP_STATE_UPDATE_VALUE_OFFSET,
                offsetof(struct single_step_state, update_value));
 
-        DEFINE(THREAD_INFO_TASK_OFFSET, \
+        DEFINE(THREAD_INFO_TASK_OFFSET,
                offsetof(struct thread_info, task));
-        DEFINE(THREAD_INFO_FLAGS_OFFSET, \
+        DEFINE(THREAD_INFO_FLAGS_OFFSET,
                offsetof(struct thread_info, flags));
-        DEFINE(THREAD_INFO_STATUS_OFFSET, \
+        DEFINE(THREAD_INFO_STATUS_OFFSET,
                offsetof(struct thread_info, status));
-        DEFINE(THREAD_INFO_HOMECACHE_CPU_OFFSET, \
+        DEFINE(THREAD_INFO_HOMECACHE_CPU_OFFSET,
                offsetof(struct thread_info, homecache_cpu));
-        DEFINE(THREAD_INFO_STEP_STATE_OFFSET, \
+        DEFINE(THREAD_INFO_PREEMPT_COUNT_OFFSET,
+               offsetof(struct thread_info, preempt_count));
+        DEFINE(THREAD_INFO_STEP_STATE_OFFSET,
                offsetof(struct thread_info, step_state));
+#ifdef __tilegx__
+        DEFINE(THREAD_INFO_UNALIGN_JIT_BASE_OFFSET,
+               offsetof(struct thread_info, unalign_jit_base));
+        DEFINE(THREAD_INFO_UNALIGN_JIT_TMP_OFFSET,
+               offsetof(struct thread_info, unalign_jit_tmp));
+#endif
 
         DEFINE(TASK_STRUCT_THREAD_KSP_OFFSET,
                offsetof(struct task_struct, thread.ksp));
         DEFINE(TASK_STRUCT_THREAD_PC_OFFSET,
                offsetof(struct task_struct, thread.pc));
 
-        DEFINE(HV_TOPOLOGY_WIDTH_OFFSET, \
+        DEFINE(HV_TOPOLOGY_WIDTH_OFFSET,
                offsetof(HV_Topology, width));
-        DEFINE(HV_TOPOLOGY_HEIGHT_OFFSET, \
+        DEFINE(HV_TOPOLOGY_HEIGHT_OFFSET,
                offsetof(HV_Topology, height));
 
-        DEFINE(IRQ_CPUSTAT_SYSCALL_COUNT_OFFSET, \
+        DEFINE(IRQ_CPUSTAT_SYSCALL_COUNT_OFFSET,
                offsetof(irq_cpustat_t, irq_syscall_count));
 }
diff --git a/arch/tile/kernel/compat.c b/arch/tile/kernel/compat.c
index ed378416b86a..49120843ff96 100644
--- a/arch/tile/kernel/compat.c
+++ b/arch/tile/kernel/compat.c
@@ -84,7 +84,7 @@ COMPAT_SYSCALL_DEFINE5(llseek, unsigned int, fd, unsigned int, offset_high,
 {
         return sys_llseek(fd, offset_high, offset_low, result, origin);
 }
- 
+
 /* Provide the compat syscall number to call mapping. */
 #undef __SYSCALL
 #define __SYSCALL(nr, call) [nr] = (call),
diff --git a/arch/tile/kernel/compat_signal.c b/arch/tile/kernel/compat_signal.c
index d0a052e725be..85e00b2f39bf 100644
--- a/arch/tile/kernel/compat_signal.c
+++ b/arch/tile/kernel/compat_signal.c
@@ -32,6 +32,7 @@
 #include <asm/ucontext.h>
 #include <asm/sigframe.h>
 #include <asm/syscalls.h>
+#include <asm/vdso.h>
 #include <arch/interrupts.h>
 
 struct compat_ucontext {
@@ -227,7 +228,7 @@ int compat_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         if (err)
                 goto give_sigsegv;
 
-        restorer = VDSO_BASE;
+        restorer = VDSO_SYM(&__vdso_rt_sigreturn);
         if (ka->sa.sa_flags & SA_RESTORER)
                 restorer = ptr_to_compat_reg(ka->sa.sa_restorer);
 
diff --git a/arch/tile/kernel/early_printk.c b/arch/tile/kernel/early_printk.c
index 34d72a151bf3..b608e00e7f6d 100644
--- a/arch/tile/kernel/early_printk.c
+++ b/arch/tile/kernel/early_printk.c
@@ -23,19 +23,24 @@
 
 static void early_hv_write(struct console *con, const char *s, unsigned n)
 {
-        hv_console_write((HV_VirtAddr) s, n);
+        tile_console_write(s, n);
+
+        /*
+         * Convert NL to NLCR (close enough to CRNL) during early boot.
+         * We assume newlines are at the ends of strings, which turns out
+         * to be good enough for early boot console output.
+         */
+        if (n && s[n-1] == '\n')
+                tile_console_write("\r", 1);
 }
 
 static struct console early_hv_console = {
         .name =         "earlyhv",
         .write =        early_hv_write,
-        .flags =        CON_PRINTBUFFER,
+        .flags =        CON_PRINTBUFFER | CON_BOOT,
         .index =        -1,
 };
 
-/* Direct interface for emergencies */
-static int early_console_complete;
-
 void early_panic(const char *fmt, ...)
 {
         va_list ap;
@@ -43,51 +48,21 @@ void early_panic(const char *fmt, ...)
         va_start(ap, fmt);
         early_printk("Kernel panic - not syncing: ");
         early_vprintk(fmt, ap);
-        early_console->write(early_console, "\n", 1);
+        early_printk("\n");
         va_end(ap);
         dump_stack();
         hv_halt();
 }
 
-static int __initdata keep_early;
-
 static int __init setup_early_printk(char *str)
 {
         if (early_console)
                 return 1;
 
-        if (str != NULL && strncmp(str, "keep", 4) == 0)
-                keep_early = 1;
-
         early_console = &early_hv_console;
         register_console(early_console);
 
         return 0;
 }
 
-void __init disable_early_printk(void)
-{
-        early_console_complete = 1;
-        if (!early_console)
-                return;
-        if (!keep_early) {
-                early_printk("disabling early console\n");
-                unregister_console(early_console);
-                early_console = NULL;
-        } else {
-                early_printk("keeping early console\n");
-        }
-}
-
-void warn_early_printk(void)
-{
-        if (early_console_complete || early_console)
-                return;
-        early_printk("\
-Machine shutting down before console output is fully initialized.\n\
-You may wish to reboot and add the option 'earlyprintk' to your\n\
-boot command line to see any diagnostic early console output.\n\
-");
-}
-
 early_param("earlyprintk", setup_early_printk);
diff --git a/arch/tile/kernel/entry.S b/arch/tile/kernel/entry.S
index f116cb0bce20..3d9175992a20 100644
--- a/arch/tile/kernel/entry.S
+++ b/arch/tile/kernel/entry.S
@@ -27,22 +27,6 @@ STD_ENTRY(current_text_addr)
         { move r0, lr; jrp lr }
         STD_ENDPROC(current_text_addr)
 
-/*
- * We don't run this function directly, but instead copy it to a page
- * we map into every user process.  See vdso_setup().
- *
- * Note that libc has a copy of this function that it uses to compare
- * against the PC when a stack backtrace ends, so if this code is
- * changed, the libc implementation(s) should also be updated.
- */
-        .pushsection .data
-ENTRY(__rt_sigreturn)
-        moveli TREG_SYSCALL_NR_NAME,__NR_rt_sigreturn
-        swint1
-        ENDPROC(__rt_sigreturn)
-        ENTRY(__rt_sigreturn_end)
-        .popsection
-
 STD_ENTRY(dump_stack)
         { move r2, lr; lnk r1 }
         { move r4, r52; addli r1, r1, dump_stack - . }
diff --git a/arch/tile/kernel/ftrace.c b/arch/tile/kernel/ftrace.c
new file mode 100644
index 000000000000..f1c452092eeb
--- /dev/null
+++ b/arch/tile/kernel/ftrace.c
@@ -0,0 +1,246 @@
+/*
+ * Copyright 2012 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ *
+ * TILE-Gx specific ftrace support
+ */
+
+#include <linux/ftrace.h>
+#include <linux/uaccess.h>
+
+#include <asm/cacheflush.h>
+#include <asm/ftrace.h>
+#include <asm/sections.h>
+
+#include <arch/opcode.h>
+
+#ifdef CONFIG_DYNAMIC_FTRACE
+
+static inline tilegx_bundle_bits NOP(void)
+{
+        return create_UnaryOpcodeExtension_X0(FNOP_UNARY_OPCODE_X0) |
+                create_RRROpcodeExtension_X0(UNARY_RRR_0_OPCODE_X0) |
+                create_Opcode_X0(RRR_0_OPCODE_X0) |
+                create_UnaryOpcodeExtension_X1(NOP_UNARY_OPCODE_X1) |
+                create_RRROpcodeExtension_X1(UNARY_RRR_0_OPCODE_X1) |
+                create_Opcode_X1(RRR_0_OPCODE_X1);
+}
+
+static int machine_stopped __read_mostly;
+
+int ftrace_arch_code_modify_prepare(void)
+{
+        machine_stopped = 1;
+        return 0;
+}
+
+int ftrace_arch_code_modify_post_process(void)
+{
+        flush_icache_range(0, CHIP_L1I_CACHE_SIZE());
+        machine_stopped = 0;
+        return 0;
+}
+
+/*
+ * Put { move r10, lr; jal ftrace_caller } in a bundle, this lets dynamic
+ * tracer just add one cycle overhead to every kernel function when disabled.
+ */
+static unsigned long ftrace_gen_branch(unsigned long pc, unsigned long addr,
+                                       bool link)
+{
+        tilegx_bundle_bits opcode_x0, opcode_x1;
+        long pcrel_by_instr = (addr - pc) >> TILEGX_LOG2_BUNDLE_SIZE_IN_BYTES;
+
+        if (link) {
+                /* opcode: jal addr */
+                opcode_x1 =
+                        create_Opcode_X1(JUMP_OPCODE_X1) |
+                        create_JumpOpcodeExtension_X1(JAL_JUMP_OPCODE_X1) |
+                        create_JumpOff_X1(pcrel_by_instr);
+        } else {
+                /* opcode: j addr */
+                opcode_x1 =
+                        create_Opcode_X1(JUMP_OPCODE_X1) |
+                        create_JumpOpcodeExtension_X1(J_JUMP_OPCODE_X1) |
+                        create_JumpOff_X1(pcrel_by_instr);
+        }
+
+        if (addr == FTRACE_ADDR) {
+                /* opcode: or r10, lr, zero */
+                opcode_x0 =
+                        create_Dest_X0(10) |
+                        create_SrcA_X0(TREG_LR) |
+                        create_SrcB_X0(TREG_ZERO) |
+                        create_RRROpcodeExtension_X0(OR_RRR_0_OPCODE_X0) |
+                        create_Opcode_X0(RRR_0_OPCODE_X0);
+        } else {
+                /* opcode: fnop */
+                opcode_x0 =
+                        create_UnaryOpcodeExtension_X0(FNOP_UNARY_OPCODE_X0) |
+                        create_RRROpcodeExtension_X0(UNARY_RRR_0_OPCODE_X0) |
+                        create_Opcode_X0(RRR_0_OPCODE_X0);
+        }
+
+        return opcode_x1 | opcode_x0;
+}
+
+static unsigned long ftrace_nop_replace(struct dyn_ftrace *rec)
+{
+        return NOP();
+}
+
+static unsigned long ftrace_call_replace(unsigned long pc, unsigned long addr)
+{
+        return ftrace_gen_branch(pc, addr, true);
+}
+
+static int ftrace_modify_code(unsigned long pc, unsigned long old,
+                              unsigned long new)
+{
+        unsigned long pc_wr;
+
+        /* Check if the address is in kernel text space and module space. */
+        if (!kernel_text_address(pc))
+                return -EINVAL;
+
+        /* Operate on writable kernel text mapping. */
+        pc_wr = pc - MEM_SV_START + PAGE_OFFSET;
+
+        if (probe_kernel_write((void *)pc_wr, &new, MCOUNT_INSN_SIZE))
+                return -EPERM;
+
+        smp_wmb();
+
+        if (!machine_stopped && num_online_cpus() > 1)
+                flush_icache_range(pc, pc + MCOUNT_INSN_SIZE);
+
+        return 0;
+}
+
+int ftrace_update_ftrace_func(ftrace_func_t func)
+{
+        unsigned long pc, old;
+        unsigned long new;
+        int ret;
+
+        pc = (unsigned long)&ftrace_call;
+        memcpy(&old, &ftrace_call, MCOUNT_INSN_SIZE);
+        new = ftrace_call_replace(pc, (unsigned long)func);
+
+        ret = ftrace_modify_code(pc, old, new);
+
+        return ret;
+}
+
+int ftrace_make_call(struct dyn_ftrace *rec, unsigned long addr)
+{
+        unsigned long new, old;
+        unsigned long ip = rec->ip;
+
+        old = ftrace_nop_replace(rec);
+        new = ftrace_call_replace(ip, addr);
+
+        return ftrace_modify_code(rec->ip, old, new);
+}
+
+int ftrace_make_nop(struct module *mod,
+                    struct dyn_ftrace *rec, unsigned long addr)
+{
+        unsigned long ip = rec->ip;
+        unsigned long old;
+        unsigned long new;
+        int ret;
+
+        old = ftrace_call_replace(ip, addr);
+        new = ftrace_nop_replace(rec);
+        ret = ftrace_modify_code(ip, old, new);
+
+        return ret;
+}
+
+int __init ftrace_dyn_arch_init(void *data)
+{
+        *(unsigned long *)data = 0;
+
+        return 0;
+}
+#endif /* CONFIG_DYNAMIC_FTRACE */
+
+#ifdef CONFIG_FUNCTION_GRAPH_TRACER
+void prepare_ftrace_return(unsigned long *parent, unsigned long self_addr,
+                           unsigned long frame_pointer)
+{
+        unsigned long return_hooker = (unsigned long) &return_to_handler;
+        struct ftrace_graph_ent trace;
+        unsigned long old;
+        int err;
+
+        if (unlikely(atomic_read(&current->tracing_graph_pause)))
+                return;
+
+        old = *parent;
+        *parent = return_hooker;
+
+        err = ftrace_push_return_trace(old, self_addr, &trace.depth,
+                                       frame_pointer);
+        if (err == -EBUSY) {
+                *parent = old;
+                return;
+        }
+
+        trace.func = self_addr;
+
+        /* Only trace if the calling function expects to */
+        if (!ftrace_graph_entry(&trace)) {
+                current->curr_ret_stack--;
+                *parent = old;
+        }
+}
+
+#ifdef CONFIG_DYNAMIC_FTRACE
+extern unsigned long ftrace_graph_call;
+
+static int __ftrace_modify_caller(unsigned long *callsite,
+                                  void (*func) (void), bool enable)
+{
+        unsigned long caller_fn = (unsigned long) func;
+        unsigned long pc = (unsigned long) callsite;
+        unsigned long branch = ftrace_gen_branch(pc, caller_fn, false);
+        unsigned long nop = NOP();
+        unsigned long old = enable ? nop : branch;
+        unsigned long new = enable ? branch : nop;
+
+        return ftrace_modify_code(pc, old, new);
+}
+
+static int ftrace_modify_graph_caller(bool enable)
+{
+        int ret;
+
+        ret = __ftrace_modify_caller(&ftrace_graph_call,
+                                     ftrace_graph_caller,
+                                     enable);
+
+        return ret;
+}
+
+int ftrace_enable_ftrace_graph_caller(void)
+{
+        return ftrace_modify_graph_caller(true);
+}
+
+int ftrace_disable_ftrace_graph_caller(void)
+{
+        return ftrace_modify_graph_caller(false);
+}
+#endif /* CONFIG_DYNAMIC_FTRACE */
+#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
diff --git a/arch/tile/kernel/futex_64.S b/arch/tile/kernel/futex_64.S
deleted file mode 100644
index f465d1eda20f..000000000000
--- a/arch/tile/kernel/futex_64.S
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2011 Tilera Corporation. All Rights Reserved.
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   as published by the Free Software Foundation, version 2.
- *
- *   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, GOOD TITLE or
- *   NON INFRINGEMENT.  See the GNU General Public License for
- *   more details.
- *
- * Atomically access user memory, but use MMU to avoid propagating
- * kernel exceptions.
- */
-
-#include <linux/linkage.h>
-#include <asm/errno.h>
-#include <asm/futex.h>
-#include <asm/page.h>
-#include <asm/processor.h>
-
-/*
- * Provide a set of atomic memory operations supporting <asm/futex.h>.
- *
- * r0: user address to manipulate
- * r1: new value to write, or for cmpxchg, old value to compare against
- * r2: (cmpxchg only) new value to write
- *
- * Return __get_user struct, r0 with value, r1 with error.
- */
-#define FUTEX_OP(name, ...) \
-STD_ENTRY(futex_##name)                 \
-        __VA_ARGS__;                    \
-        {                               \
-         move   r1, zero;               \
-         jrp    lr                      \
-        };                              \
-        STD_ENDPROC(futex_##name);      \
-        .pushsection __ex_table,"a";    \
-        .quad 1b, get_user_fault;       \
-        .popsection
-
-        .pushsection .fixup,"ax"
-get_user_fault:
-        { movei r1, -EFAULT; jrp lr }
-        ENDPROC(get_user_fault)
-        .popsection
-
-FUTEX_OP(cmpxchg, mtspr CMPEXCH_VALUE, r1; 1: cmpexch4 r0, r0, r2)
-FUTEX_OP(set, 1: exch4 r0, r0, r1)
-FUTEX_OP(add, 1: fetchadd4 r0, r0, r1)
-FUTEX_OP(or, 1: fetchor4 r0, r0, r1)
-FUTEX_OP(andn, nor r1, r1, zero; 1: fetchand4 r0, r0, r1)
diff --git a/arch/tile/kernel/hardwall.c b/arch/tile/kernel/hardwall.c
index 38ac189d9575..df27a1fd94a3 100644
--- a/arch/tile/kernel/hardwall.c
+++ b/arch/tile/kernel/hardwall.c
@@ -272,9 +272,9 @@ static void hardwall_setup_func(void *info)
         struct hardwall_info *r = info;
         struct hardwall_type *hwt = r->type;
 
-        int cpu = smp_processor_id();
-        int x = cpu % smp_width;
-        int y = cpu / smp_width;
+        int cpu = smp_processor_id();  /* on_each_cpu disables preemption */
+        int x = cpu_x(cpu);
+        int y = cpu_y(cpu);
         int bits = 0;
         if (x == r->ulhc_x)
                 bits |= W_PROTECT;
@@ -317,6 +317,7 @@ static void hardwall_protect_rectangle(struct hardwall_info *r)
         on_each_cpu_mask(&rect_cpus, hardwall_setup_func, r, 1);
 }
 
+/* Entered from INT_xDN_FIREWALL interrupt vector with irqs disabled. */
 void __kprobes do_hardwall_trap(struct pt_regs* regs, int fault_num)
 {
         struct hardwall_info *rect;
@@ -325,7 +326,6 @@ void __kprobes do_hardwall_trap(struct pt_regs* regs, int fault_num)
         struct siginfo info;
         int cpu = smp_processor_id();
         int found_processes;
-        unsigned long flags;
         struct pt_regs *old_regs = set_irq_regs(regs);
 
         irq_enter();
@@ -346,7 +346,7 @@ void __kprobes do_hardwall_trap(struct pt_regs* regs, int fault_num)
         BUG_ON(hwt->disabled);
 
         /* This tile trapped a network access; find the rectangle. */
-        spin_lock_irqsave(&hwt->lock, flags);
+        spin_lock(&hwt->lock);
         list_for_each_entry(rect, &hwt->list, list) {
                 if (cpumask_test_cpu(cpu, &rect->cpumask))
                         break;
@@ -401,7 +401,7 @@ void __kprobes do_hardwall_trap(struct pt_regs* regs, int fault_num)
                 pr_notice("hardwall: no associated processes!\n");
 
  done:
-        spin_unlock_irqrestore(&hwt->lock, flags);
+        spin_unlock(&hwt->lock);
 
         /*
          * We have to disable firewall interrupts now, or else when we
@@ -540,6 +540,14 @@ static struct hardwall_info *hardwall_create(struct hardwall_type *hwt,
                 }
         }
 
+        /*
+         * Eliminate cpus that are not part of this Linux client.
+         * Note that this allows for configurations that we might not want to
+         * support, such as one client on every even cpu, another client on
+         * every odd cpu.
+         */
+        cpumask_and(&info->cpumask, &info->cpumask, cpu_online_mask);
+
         /* Confirm it doesn't overlap and add it to the list. */
         spin_lock_irqsave(&hwt->lock, flags);
         list_for_each_entry(iter, &hwt->list, list) {
@@ -612,7 +620,7 @@ static int hardwall_activate(struct hardwall_info *info)
 
 /*
  * Deactivate a task's hardwall.  Must hold lock for hardwall_type.
- * This method may be called from free_task(), so we don't want to
+ * This method may be called from exit_thread(), so we don't want to
  * rely on too many fields of struct task_struct still being valid.
  * We assume the cpus_allowed, pid, and comm fields are still valid.
  */
@@ -653,7 +661,7 @@ static int hardwall_deactivate(struct hardwall_type *hwt,
                 return -EINVAL;
 
         printk(KERN_DEBUG "Pid %d (%s) deactivated for %s hardwall: cpu %d\n",
-               task->pid, task->comm, hwt->name, smp_processor_id());
+               task->pid, task->comm, hwt->name, raw_smp_processor_id());
         return 0;
 }
 
@@ -795,8 +803,8 @@ static void reset_xdn_network_state(struct hardwall_type *hwt)
         /* Reset UDN coordinates to their standard value */
         {
                 unsigned int cpu = smp_processor_id();
-                unsigned int x = cpu % smp_width;
-                unsigned int y = cpu / smp_width;
+                unsigned int x = cpu_x(cpu);
+                unsigned int y = cpu_y(cpu);
                 __insn_mtspr(SPR_UDN_TILE_COORD, (x << 18) | (y << 7));
         }
 
diff --git a/arch/tile/kernel/head_32.S b/arch/tile/kernel/head_32.S
index ac115307e5e4..8d5b40ff2922 100644
--- a/arch/tile/kernel/head_32.S
+++ b/arch/tile/kernel/head_32.S
@@ -39,12 +39,12 @@ ENTRY(_start)
         }
         {
           moveli r0, _HV_VERSION_OLD_HV_INIT
-          jal hv_init
+          jal _hv_init
         }
         /* Get a reasonable default ASID in r0 */
         {
           move r0, zero
-          jal hv_inquire_asid
+          jal _hv_inquire_asid
         }
         /* Install the default page table */
         {
@@ -64,7 +64,7 @@ ENTRY(_start)
           auli r0, r0, ha16(swapper_pg_dir - PAGE_OFFSET)
         }
         {
-          inv r6
+          finv r6
           move r1, zero   /* high 32 bits of CPA is zero */
         }
         {
@@ -73,12 +73,12 @@ ENTRY(_start)
         }
         {
           auli lr, lr, ha16(1f)
-          j hv_install_context
+          j _hv_install_context
         }
 1:
 
         /* Get our processor number and save it away in SAVE_K_0. */
-        jal hv_inquire_topology
+        jal _hv_inquire_topology
         mulll_uu r4, r1, r2        /* r1 == y, r2 == width */
         add r4, r4, r0             /* r0 == x, so r4 == cpu == y*width + x */
 
@@ -86,7 +86,7 @@ ENTRY(_start)
         /*
          * Load up our per-cpu offset.  When the first (master) tile
          * boots, this value is still zero, so we will load boot_pc
-         * with start_kernel, and boot_sp with init_stack + THREAD_SIZE.
+         * with start_kernel, and boot_sp at the top of init_stack.
          * The master tile initializes the per-cpu offset array, so that
          * when subsequent (secondary) tiles boot, they will instead load
          * from their per-cpu versions of boot_sp and boot_pc.
@@ -126,7 +126,6 @@ ENTRY(_start)
         lw sp, r1
         or r4, sp, r4
         mtspr SPR_SYSTEM_SAVE_K_0, r4  /* save ksp0 + cpu */
-        addi sp, sp, -STACK_TOP_DELTA
         {
           move lr, zero   /* stop backtraces in the called function */
           jr r0
@@ -163,8 +162,8 @@ ENTRY(swapper_pg_dir)
         .set addr, addr + PGDIR_SIZE
         .endr
 
-        /* The true text VAs are mapped as VA = PA + MEM_SV_INTRPT */
-        PTE MEM_SV_INTRPT, 0, (1 << (HV_PTE_INDEX_READABLE - 32)) | \
+        /* The true text VAs are mapped as VA = PA + MEM_SV_START */
+        PTE MEM_SV_START, 0, (1 << (HV_PTE_INDEX_READABLE - 32)) | \
                               (1 << (HV_PTE_INDEX_EXECUTABLE - 32))
         .org swapper_pg_dir + PGDIR_SIZE
         END(swapper_pg_dir)
diff --git a/arch/tile/kernel/head_64.S b/arch/tile/kernel/head_64.S
index 6093964fa5c7..bd0e12f283f3 100644
--- a/arch/tile/kernel/head_64.S
+++ b/arch/tile/kernel/head_64.S
@@ -25,6 +25,15 @@
 #include <arch/chip.h>
 #include <arch/spr_def.h>
 
+/* Extract two 32-bit bit values that were read into one register. */
+#ifdef __BIG_ENDIAN__
+#define GET_FIRST_INT(rd, rs) shrsi rd, rs, 32
+#define GET_SECOND_INT(rd, rs) addxi rd, rs, 0
+#else
+#define GET_FIRST_INT(rd, rs) addxi rd, rs, 0
+#define GET_SECOND_INT(rd, rs) shrsi rd, rs, 32
+#endif
+
 /*
  * This module contains the entry code for kernel images. It performs the
  * minimal setup needed to call the generic C routines.
@@ -46,11 +55,11 @@ ENTRY(_start)
           movei r2, TILE_CHIP_REV
           movei r3, KERNEL_PL
         }
-        jal hv_init
+        jal _hv_init
         /* Get a reasonable default ASID in r0 */
         {
           move r0, zero
-          jal hv_inquire_asid
+          jal _hv_inquire_asid
         }
 
         /*
@@ -61,7 +70,7 @@ ENTRY(_start)
          * other CPUs should see a properly-constructed page table.
          */
         {
-          v4int_l r2, zero, r0    /* ASID for hv_install_context */
+          GET_FIRST_INT(r2, r0)    /* ASID for hv_install_context */
           moveli r4, hw1_last(swapper_pgprot - PAGE_OFFSET)
         }
         {
@@ -77,7 +86,7 @@ ENTRY(_start)
         {
           /* After initializing swapper_pgprot, HV_PTE_GLOBAL is set. */
           bfextu r7, r1, HV_PTE_INDEX_GLOBAL, HV_PTE_INDEX_GLOBAL
-          inv r4
+          finv r4
         }
         bnez r7, .Lno_write
         {
@@ -121,29 +130,24 @@ ENTRY(_start)
         }
         {
           moveli r3, CTX_PAGE_FLAG
-          j hv_install_context
+          j _hv_install_context
         }
 1:
 
         /* Install the interrupt base. */
-        moveli r0, hw2_last(MEM_SV_START)
-        shl16insli r0, r0, hw1(MEM_SV_START)
-        shl16insli r0, r0, hw0(MEM_SV_START)
+        moveli r0, hw2_last(intrpt_start)
+        shl16insli r0, r0, hw1(intrpt_start)
+        shl16insli r0, r0, hw0(intrpt_start)
         mtspr SPR_INTERRUPT_VECTOR_BASE_K, r0
 
-        /*
-         * Get our processor number and save it away in SAVE_K_0.
-         * Extract stuff from the topology structure: r4 = y, r6 = x,
-         * r5 = width.  FIXME: consider whether we want to just make these
-         * 64-bit values (and if so fix smp_topology write below, too).
-         */
-        jal hv_inquire_topology
+        /* Get our processor number and save it away in SAVE_K_0. */
+        jal _hv_inquire_topology
         {
-          v4int_l r5, zero, r1    /* r5 = width */
-          shrui r4, r0, 32        /* r4 = y */
+          GET_FIRST_INT(r5, r1)   /* r5 = width */
+          GET_SECOND_INT(r4, r0)  /* r4 = y */
         }
         {
-          v4int_l r6, zero, r0    /* r6 = x */
+          GET_FIRST_INT(r6, r0)   /* r6 = x */
           mul_lu_lu r4, r4, r5
         }
         {
@@ -154,7 +158,7 @@ ENTRY(_start)
         /*
          * Load up our per-cpu offset.  When the first (master) tile
          * boots, this value is still zero, so we will load boot_pc
-         * with start_kernel, and boot_sp with init_stack + THREAD_SIZE.
+         * with start_kernel, and boot_sp with at the top of init_stack.
          * The master tile initializes the per-cpu offset array, so that
          * when subsequent (secondary) tiles boot, they will instead load
          * from their per-cpu versions of boot_sp and boot_pc.
@@ -198,9 +202,9 @@ ENTRY(_start)
         }
         ld r0, r0
         ld sp, r1
-        or r4, sp, r4
+        shli r4, r4, CPU_SHIFT
+        bfins r4, sp, 0, CPU_SHIFT-1
         mtspr SPR_SYSTEM_SAVE_K_0, r4  /* save ksp0 + cpu */
-        addi sp, sp, -STACK_TOP_DELTA
         {
           move lr, zero   /* stop backtraces in the called function */
           jr r0
diff --git a/arch/tile/kernel/hvglue.S b/arch/tile/kernel/hvglue.S
new file mode 100644
index 000000000000..2ab456622391
--- /dev/null
+++ b/arch/tile/kernel/hvglue.S
@@ -0,0 +1,74 @@
+/* Hypervisor call vector addresses; see <hv/hypervisor.h> */
+.macro gensym sym, val, size
+.org \val
+.global _\sym
+.type _\sym,function
+_\sym:
+.size _\sym,\size
+#ifndef CONFIG_TILE_HVGLUE_TRACE
+.globl \sym
+.set \sym,_\sym
+#endif
+.endm
+
+.section .hvglue,"x",@nobits
+.align 8
+gensym hv_init, 0x20, 32
+gensym hv_install_context, 0x40, 32
+gensym hv_sysconf, 0x60, 32
+gensym hv_get_rtc, 0x80, 32
+gensym hv_set_rtc, 0xa0, 32
+gensym hv_flush_asid, 0xc0, 32
+gensym hv_flush_page, 0xe0, 32
+gensym hv_flush_pages, 0x100, 32
+gensym hv_restart, 0x120, 32
+gensym hv_halt, 0x140, 32
+gensym hv_power_off, 0x160, 32
+gensym hv_inquire_physical, 0x180, 32
+gensym hv_inquire_memory_controller, 0x1a0, 32
+gensym hv_inquire_virtual, 0x1c0, 32
+gensym hv_inquire_asid, 0x1e0, 32
+gensym hv_nanosleep, 0x200, 32
+gensym hv_console_read_if_ready, 0x220, 32
+gensym hv_console_write, 0x240, 32
+gensym hv_downcall_dispatch, 0x260, 32
+gensym hv_inquire_topology, 0x280, 32
+gensym hv_fs_findfile, 0x2a0, 32
+gensym hv_fs_fstat, 0x2c0, 32
+gensym hv_fs_pread, 0x2e0, 32
+gensym hv_physaddr_read64, 0x300, 32
+gensym hv_physaddr_write64, 0x320, 32
+gensym hv_get_command_line, 0x340, 32
+gensym hv_set_caching, 0x360, 32
+gensym hv_bzero_page, 0x380, 32
+gensym hv_register_message_state, 0x3a0, 32
+gensym hv_send_message, 0x3c0, 32
+gensym hv_receive_message, 0x3e0, 32
+gensym hv_inquire_context, 0x400, 32
+gensym hv_start_all_tiles, 0x420, 32
+gensym hv_dev_open, 0x440, 32
+gensym hv_dev_close, 0x460, 32
+gensym hv_dev_pread, 0x480, 32
+gensym hv_dev_pwrite, 0x4a0, 32
+gensym hv_dev_poll, 0x4c0, 32
+gensym hv_dev_poll_cancel, 0x4e0, 32
+gensym hv_dev_preada, 0x500, 32
+gensym hv_dev_pwritea, 0x520, 32
+gensym hv_flush_remote, 0x540, 32
+gensym hv_console_putc, 0x560, 32
+gensym hv_inquire_tiles, 0x580, 32
+gensym hv_confstr, 0x5a0, 32
+gensym hv_reexec, 0x5c0, 32
+gensym hv_set_command_line, 0x5e0, 32
+gensym hv_clear_intr, 0x600, 32
+gensym hv_enable_intr, 0x620, 32
+gensym hv_disable_intr, 0x640, 32
+gensym hv_raise_intr, 0x660, 32
+gensym hv_trigger_ipi, 0x680, 32
+gensym hv_store_mapping, 0x6a0, 32
+gensym hv_inquire_realpa, 0x6c0, 32
+gensym hv_flush_all, 0x6e0, 32
+gensym hv_get_ipi_pte, 0x700, 32
+gensym hv_set_pte_super_shift, 0x720, 32
+gensym hv_console_set_ipi, 0x7e0, 32
+gensym hv_glue_internals, 0x800, 30720
diff --git a/arch/tile/kernel/hvglue.lds b/arch/tile/kernel/hvglue.lds
deleted file mode 100644
index d44c5a67a1ed..000000000000
--- a/arch/tile/kernel/hvglue.lds
+++ /dev/null
@@ -1,59 +0,0 @@
-/* Hypervisor call vector addresses; see <hv/hypervisor.h> */
-hv_init = TEXT_OFFSET + 0x10020;
-hv_install_context = TEXT_OFFSET + 0x10040;
-hv_sysconf = TEXT_OFFSET + 0x10060;
-hv_get_rtc = TEXT_OFFSET + 0x10080;
-hv_set_rtc = TEXT_OFFSET + 0x100a0;
-hv_flush_asid = TEXT_OFFSET + 0x100c0;
-hv_flush_page = TEXT_OFFSET + 0x100e0;
-hv_flush_pages = TEXT_OFFSET + 0x10100;
-hv_restart = TEXT_OFFSET + 0x10120;
-hv_halt = TEXT_OFFSET + 0x10140;
-hv_power_off = TEXT_OFFSET + 0x10160;
-hv_inquire_physical = TEXT_OFFSET + 0x10180;
-hv_inquire_memory_controller = TEXT_OFFSET + 0x101a0;
-hv_inquire_virtual = TEXT_OFFSET + 0x101c0;
-hv_inquire_asid = TEXT_OFFSET + 0x101e0;
-hv_nanosleep = TEXT_OFFSET + 0x10200;
-hv_console_read_if_ready = TEXT_OFFSET + 0x10220;
-hv_console_write = TEXT_OFFSET + 0x10240;
-hv_downcall_dispatch = TEXT_OFFSET + 0x10260;
-hv_inquire_topology = TEXT_OFFSET + 0x10280;
-hv_fs_findfile = TEXT_OFFSET + 0x102a0;
-hv_fs_fstat = TEXT_OFFSET + 0x102c0;
-hv_fs_pread = TEXT_OFFSET + 0x102e0;
-hv_physaddr_read64 = TEXT_OFFSET + 0x10300;
-hv_physaddr_write64 = TEXT_OFFSET + 0x10320;
-hv_get_command_line = TEXT_OFFSET + 0x10340;
-hv_set_caching = TEXT_OFFSET + 0x10360;
-hv_bzero_page = TEXT_OFFSET + 0x10380;
-hv_register_message_state = TEXT_OFFSET + 0x103a0;
-hv_send_message = TEXT_OFFSET + 0x103c0;
-hv_receive_message = TEXT_OFFSET + 0x103e0;
-hv_inquire_context = TEXT_OFFSET + 0x10400;
-hv_start_all_tiles = TEXT_OFFSET + 0x10420;
-hv_dev_open = TEXT_OFFSET + 0x10440;
-hv_dev_close = TEXT_OFFSET + 0x10460;
-hv_dev_pread = TEXT_OFFSET + 0x10480;
-hv_dev_pwrite = TEXT_OFFSET + 0x104a0;
-hv_dev_poll = TEXT_OFFSET + 0x104c0;
-hv_dev_poll_cancel = TEXT_OFFSET + 0x104e0;
-hv_dev_preada = TEXT_OFFSET + 0x10500;
-hv_dev_pwritea = TEXT_OFFSET + 0x10520;
-hv_flush_remote = TEXT_OFFSET + 0x10540;
-hv_console_putc = TEXT_OFFSET + 0x10560;
-hv_inquire_tiles = TEXT_OFFSET + 0x10580;
-hv_confstr = TEXT_OFFSET + 0x105a0;
-hv_reexec = TEXT_OFFSET + 0x105c0;
-hv_set_command_line = TEXT_OFFSET + 0x105e0;
-hv_clear_intr = TEXT_OFFSET + 0x10600;
-hv_enable_intr = TEXT_OFFSET + 0x10620;
-hv_disable_intr = TEXT_OFFSET + 0x10640;
-hv_raise_intr = TEXT_OFFSET + 0x10660;
-hv_trigger_ipi = TEXT_OFFSET + 0x10680;
-hv_store_mapping = TEXT_OFFSET + 0x106a0;
-hv_inquire_realpa = TEXT_OFFSET + 0x106c0;
-hv_flush_all = TEXT_OFFSET + 0x106e0;
-hv_get_ipi_pte = TEXT_OFFSET + 0x10700;
-hv_set_pte_super_shift = TEXT_OFFSET + 0x10720;
-hv_glue_internals = TEXT_OFFSET + 0x10740;
diff --git a/arch/tile/kernel/hvglue_trace.c b/arch/tile/kernel/hvglue_trace.c
new file mode 100644
index 000000000000..85c74ad29312
--- /dev/null
+++ b/arch/tile/kernel/hvglue_trace.c
@@ -0,0 +1,266 @@
+/*
+ * Copyright 2013 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+/*
+ * Pull in the hypervisor header so we declare all the ABI functions
+ * with the underscore versions, then undef the names so that we can
+ * provide our own wrapper versions.
+ */
+#define hv_init _hv_init
+#define hv_install_context _hv_install_context
+#define hv_sysconf _hv_sysconf
+#define hv_get_rtc _hv_get_rtc
+#define hv_set_rtc _hv_set_rtc
+#define hv_flush_asid _hv_flush_asid
+#define hv_flush_page _hv_flush_page
+#define hv_flush_pages _hv_flush_pages
+#define hv_restart _hv_restart
+#define hv_halt _hv_halt
+#define hv_power_off _hv_power_off
+#define hv_inquire_physical _hv_inquire_physical
+#define hv_inquire_memory_controller _hv_inquire_memory_controller
+#define hv_inquire_virtual _hv_inquire_virtual
+#define hv_inquire_asid _hv_inquire_asid
+#define hv_nanosleep _hv_nanosleep
+#define hv_console_read_if_ready _hv_console_read_if_ready
+#define hv_console_write _hv_console_write
+#define hv_downcall_dispatch _hv_downcall_dispatch
+#define hv_inquire_topology _hv_inquire_topology
+#define hv_fs_findfile _hv_fs_findfile
+#define hv_fs_fstat _hv_fs_fstat
+#define hv_fs_pread _hv_fs_pread
+#define hv_physaddr_read64 _hv_physaddr_read64
+#define hv_physaddr_write64 _hv_physaddr_write64
+#define hv_get_command_line _hv_get_command_line
+#define hv_set_caching _hv_set_caching
+#define hv_bzero_page _hv_bzero_page
+#define hv_register_message_state _hv_register_message_state
+#define hv_send_message _hv_send_message
+#define hv_receive_message _hv_receive_message
+#define hv_inquire_context _hv_inquire_context
+#define hv_start_all_tiles _hv_start_all_tiles
+#define hv_dev_open _hv_dev_open
+#define hv_dev_close _hv_dev_close
+#define hv_dev_pread _hv_dev_pread
+#define hv_dev_pwrite _hv_dev_pwrite
+#define hv_dev_poll _hv_dev_poll
+#define hv_dev_poll_cancel _hv_dev_poll_cancel
+#define hv_dev_preada _hv_dev_preada
+#define hv_dev_pwritea _hv_dev_pwritea
+#define hv_flush_remote _hv_flush_remote
+#define hv_console_putc _hv_console_putc
+#define hv_inquire_tiles _hv_inquire_tiles
+#define hv_confstr _hv_confstr
+#define hv_reexec _hv_reexec
+#define hv_set_command_line _hv_set_command_line
+#define hv_clear_intr _hv_clear_intr
+#define hv_enable_intr _hv_enable_intr
+#define hv_disable_intr _hv_disable_intr
+#define hv_raise_intr _hv_raise_intr
+#define hv_trigger_ipi _hv_trigger_ipi
+#define hv_store_mapping _hv_store_mapping
+#define hv_inquire_realpa _hv_inquire_realpa
+#define hv_flush_all _hv_flush_all
+#define hv_get_ipi_pte _hv_get_ipi_pte
+#define hv_set_pte_super_shift _hv_set_pte_super_shift
+#define hv_console_set_ipi _hv_console_set_ipi
+#include <hv/hypervisor.h>
+#undef hv_init
+#undef hv_install_context
+#undef hv_sysconf
+#undef hv_get_rtc
+#undef hv_set_rtc
+#undef hv_flush_asid
+#undef hv_flush_page
+#undef hv_flush_pages
+#undef hv_restart
+#undef hv_halt
+#undef hv_power_off
+#undef hv_inquire_physical
+#undef hv_inquire_memory_controller
+#undef hv_inquire_virtual
+#undef hv_inquire_asid
+#undef hv_nanosleep
+#undef hv_console_read_if_ready
+#undef hv_console_write
+#undef hv_downcall_dispatch
+#undef hv_inquire_topology
+#undef hv_fs_findfile
+#undef hv_fs_fstat
+#undef hv_fs_pread
+#undef hv_physaddr_read64
+#undef hv_physaddr_write64
+#undef hv_get_command_line
+#undef hv_set_caching
+#undef hv_bzero_page
+#undef hv_register_message_state
+#undef hv_send_message
+#undef hv_receive_message
+#undef hv_inquire_context
+#undef hv_start_all_tiles
+#undef hv_dev_open
+#undef hv_dev_close
+#undef hv_dev_pread
+#undef hv_dev_pwrite
+#undef hv_dev_poll
+#undef hv_dev_poll_cancel
+#undef hv_dev_preada
+#undef hv_dev_pwritea
+#undef hv_flush_remote
+#undef hv_console_putc
+#undef hv_inquire_tiles
+#undef hv_confstr
+#undef hv_reexec
+#undef hv_set_command_line
+#undef hv_clear_intr
+#undef hv_enable_intr
+#undef hv_disable_intr
+#undef hv_raise_intr
+#undef hv_trigger_ipi
+#undef hv_store_mapping
+#undef hv_inquire_realpa
+#undef hv_flush_all
+#undef hv_get_ipi_pte
+#undef hv_set_pte_super_shift
+#undef hv_console_set_ipi
+
+/*
+ * Provide macros based on <linux/syscalls.h> to provide a wrapper
+ * function that invokes the same function with an underscore prefix.
+ * We can't use the existing __SC_xxx macros because we need to
+ * support up to nine arguments rather than up to six, and also this
+ * way the file stands alone from possible changes in the
+ * implementation of <linux/syscalls.h>.
+ */
+#define HV_WRAP0(type, name)                                    \
+        type name(void);                                        \
+        type name(void)                                         \
+        {                                                       \
+                return _##name();                               \
+        }
+#define __HV_DECL1(t1, a1)      t1 a1
+#define __HV_DECL2(t2, a2, ...) t2 a2, __HV_DECL1(__VA_ARGS__)
+#define __HV_DECL3(t3, a3, ...) t3 a3, __HV_DECL2(__VA_ARGS__)
+#define __HV_DECL4(t4, a4, ...) t4 a4, __HV_DECL3(__VA_ARGS__)
+#define __HV_DECL5(t5, a5, ...) t5 a5, __HV_DECL4(__VA_ARGS__)
+#define __HV_DECL6(t6, a6, ...) t6 a6, __HV_DECL5(__VA_ARGS__)
+#define __HV_DECL7(t7, a7, ...) t7 a7, __HV_DECL6(__VA_ARGS__)
+#define __HV_DECL8(t8, a8, ...) t8 a8, __HV_DECL7(__VA_ARGS__)
+#define __HV_DECL9(t9, a9, ...) t9 a9, __HV_DECL8(__VA_ARGS__)
+#define __HV_PASS1(t1, a1)      a1
+#define __HV_PASS2(t2, a2, ...) a2, __HV_PASS1(__VA_ARGS__)
+#define __HV_PASS3(t3, a3, ...) a3, __HV_PASS2(__VA_ARGS__)
+#define __HV_PASS4(t4, a4, ...) a4, __HV_PASS3(__VA_ARGS__)
+#define __HV_PASS5(t5, a5, ...) a5, __HV_PASS4(__VA_ARGS__)
+#define __HV_PASS6(t6, a6, ...) a6, __HV_PASS5(__VA_ARGS__)
+#define __HV_PASS7(t7, a7, ...) a7, __HV_PASS6(__VA_ARGS__)
+#define __HV_PASS8(t8, a8, ...) a8, __HV_PASS7(__VA_ARGS__)
+#define __HV_PASS9(t9, a9, ...) a9, __HV_PASS8(__VA_ARGS__)
+#define HV_WRAPx(x, type, name, ...)                            \
+        type name(__HV_DECL##x(__VA_ARGS__));                   \
+        type name(__HV_DECL##x(__VA_ARGS__))                    \
+        {                                                       \
+                return _##name(__HV_PASS##x(__VA_ARGS__));      \
+        }
+#define HV_WRAP1(type, name, ...) HV_WRAPx(1, type, name, __VA_ARGS__)
+#define HV_WRAP2(type, name, ...) HV_WRAPx(2, type, name, __VA_ARGS__)
+#define HV_WRAP3(type, name, ...) HV_WRAPx(3, type, name, __VA_ARGS__)
+#define HV_WRAP4(type, name, ...) HV_WRAPx(4, type, name, __VA_ARGS__)
+#define HV_WRAP5(type, name, ...) HV_WRAPx(5, type, name, __VA_ARGS__)
+#define HV_WRAP6(type, name, ...) HV_WRAPx(6, type, name, __VA_ARGS__)
+#define HV_WRAP7(type, name, ...) HV_WRAPx(7, type, name, __VA_ARGS__)
+#define HV_WRAP8(type, name, ...) HV_WRAPx(8, type, name, __VA_ARGS__)
+#define HV_WRAP9(type, name, ...) HV_WRAPx(9, type, name, __VA_ARGS__)
+
+/* List all the hypervisor API functions. */
+HV_WRAP4(void, hv_init, HV_VersionNumber, interface_version_number,
+         int, chip_num, int, chip_rev_num, int, client_pl)
+HV_WRAP1(long, hv_sysconf, HV_SysconfQuery, query)
+HV_WRAP3(int, hv_confstr, HV_ConfstrQuery, query, HV_VirtAddr, buf, int, len)
+#if CHIP_HAS_IPI()
+HV_WRAP3(int, hv_get_ipi_pte, HV_Coord, tile, int, pl, HV_PTE*, pte)
+HV_WRAP3(int, hv_console_set_ipi, int, ipi, int, event, HV_Coord, coord);
+#else
+HV_WRAP1(void, hv_enable_intr, HV_IntrMask, enab_mask)
+HV_WRAP1(void, hv_disable_intr, HV_IntrMask, disab_mask)
+HV_WRAP1(void, hv_clear_intr, HV_IntrMask, clear_mask)
+HV_WRAP1(void, hv_raise_intr, HV_IntrMask, raise_mask)
+HV_WRAP2(HV_Errno, hv_trigger_ipi, HV_Coord, tile, int, interrupt)
+#endif /* !CHIP_HAS_IPI() */
+HV_WRAP3(int, hv_store_mapping, HV_VirtAddr, va, unsigned int, len,
+         HV_PhysAddr, pa)
+HV_WRAP2(HV_PhysAddr, hv_inquire_realpa, HV_PhysAddr, cpa, unsigned int, len)
+HV_WRAP0(HV_RTCTime, hv_get_rtc)
+HV_WRAP1(void, hv_set_rtc, HV_RTCTime, time)
+HV_WRAP4(int, hv_install_context, HV_PhysAddr, page_table, HV_PTE, access,
+         HV_ASID, asid, __hv32, flags)
+HV_WRAP2(int, hv_set_pte_super_shift, int, level, int, log2_count)
+HV_WRAP0(HV_Context, hv_inquire_context)
+HV_WRAP1(int, hv_flush_asid, HV_ASID, asid)
+HV_WRAP2(int, hv_flush_page, HV_VirtAddr, address, HV_PageSize, page_size)
+HV_WRAP3(int, hv_flush_pages, HV_VirtAddr, start, HV_PageSize, page_size,
+         unsigned long, size)
+HV_WRAP1(int, hv_flush_all, int, preserve_global)
+HV_WRAP2(void, hv_restart, HV_VirtAddr, cmd, HV_VirtAddr, args)
+HV_WRAP0(void, hv_halt)
+HV_WRAP0(void, hv_power_off)
+HV_WRAP1(int, hv_reexec, HV_PhysAddr, entry)
+HV_WRAP0(HV_Topology, hv_inquire_topology)
+HV_WRAP3(HV_Errno, hv_inquire_tiles, HV_InqTileSet, set, HV_VirtAddr, cpumask,
+         int, length)
+HV_WRAP1(HV_PhysAddrRange, hv_inquire_physical, int, idx)
+HV_WRAP2(HV_MemoryControllerInfo, hv_inquire_memory_controller, HV_Coord, coord,
+         int, controller)
+HV_WRAP1(HV_VirtAddrRange, hv_inquire_virtual, int, idx)
+HV_WRAP1(HV_ASIDRange, hv_inquire_asid, int, idx)
+HV_WRAP1(void, hv_nanosleep, int, nanosecs)
+HV_WRAP0(int, hv_console_read_if_ready)
+HV_WRAP1(void, hv_console_putc, int, byte)
+HV_WRAP2(int, hv_console_write, HV_VirtAddr, bytes, int, len)
+HV_WRAP0(void, hv_downcall_dispatch)
+HV_WRAP1(int, hv_fs_findfile, HV_VirtAddr, filename)
+HV_WRAP1(HV_FS_StatInfo, hv_fs_fstat, int, inode)
+HV_WRAP4(int, hv_fs_pread, int, inode, HV_VirtAddr, buf,
+         int, length, int, offset)
+HV_WRAP2(unsigned long long, hv_physaddr_read64, HV_PhysAddr, addr,
+         HV_PTE, access)
+HV_WRAP3(void, hv_physaddr_write64, HV_PhysAddr, addr, HV_PTE, access,
+         unsigned long long, val)
+HV_WRAP2(int, hv_get_command_line, HV_VirtAddr, buf, int, length)
+HV_WRAP2(HV_Errno, hv_set_command_line, HV_VirtAddr, buf, int, length)
+HV_WRAP1(void, hv_set_caching, unsigned long, bitmask)
+HV_WRAP2(void, hv_bzero_page, HV_VirtAddr, va, unsigned int, size)
+HV_WRAP1(HV_Errno, hv_register_message_state, HV_MsgState*, msgstate)
+HV_WRAP4(int, hv_send_message, HV_Recipient *, recips, int, nrecip,
+         HV_VirtAddr, buf, int, buflen)
+HV_WRAP3(HV_RcvMsgInfo, hv_receive_message, HV_MsgState, msgstate,
+         HV_VirtAddr, buf, int, buflen)
+HV_WRAP0(void, hv_start_all_tiles)
+HV_WRAP2(int, hv_dev_open, HV_VirtAddr, name, __hv32, flags)
+HV_WRAP1(int, hv_dev_close, int, devhdl)
+HV_WRAP5(int, hv_dev_pread, int, devhdl, __hv32, flags, HV_VirtAddr, va,
+         __hv32, len, __hv64, offset)
+HV_WRAP5(int, hv_dev_pwrite, int, devhdl, __hv32, flags, HV_VirtAddr, va,
+         __hv32, len, __hv64, offset)
+HV_WRAP3(int, hv_dev_poll, int, devhdl, __hv32, events, HV_IntArg, intarg)
+HV_WRAP1(int, hv_dev_poll_cancel, int, devhdl)
+HV_WRAP6(int, hv_dev_preada, int, devhdl, __hv32, flags, __hv32, sgl_len,
+         HV_SGL *, sglp, __hv64, offset, HV_IntArg, intarg)
+HV_WRAP6(int, hv_dev_pwritea, int, devhdl, __hv32, flags, __hv32, sgl_len,
+         HV_SGL *, sglp, __hv64, offset, HV_IntArg, intarg)
+HV_WRAP9(int, hv_flush_remote, HV_PhysAddr, cache_pa,
+         unsigned long, cache_control, unsigned long*, cache_cpumask,
+         HV_VirtAddr, tlb_va, unsigned long, tlb_length,
+         unsigned long, tlb_pgsize, unsigned long*, tlb_cpumask,
+         HV_Remote_ASID*, asids, int, asidcount)
diff --git a/arch/tile/kernel/intvec_32.S b/arch/tile/kernel/intvec_32.S
index cb52d66343ed..088d5c141e68 100644
--- a/arch/tile/kernel/intvec_32.S
+++ b/arch/tile/kernel/intvec_32.S
@@ -28,20 +28,10 @@
 #include <arch/interrupts.h>
 #include <arch/spr_def.h>
 
-#ifdef CONFIG_PREEMPT
-# error "No support for kernel preemption currently"
-#endif
-
 #define PTREGS_PTR(reg, ptreg) addli reg, sp, C_ABI_SAVE_AREA_SIZE + (ptreg)
 
 #define PTREGS_OFFSET_SYSCALL PTREGS_OFFSET_REG(TREG_SYSCALL_NR)
 
-#if !CHIP_HAS_WH64()
-        /* By making this an empty macro, we can use wh64 in the code. */
-        .macro  wh64 reg
-        .endm
-#endif
-
         .macro  push_reg reg, ptr=sp, delta=-4
         {
          sw     \ptr, \reg
@@ -189,7 +179,7 @@ intvec_\vecname:
          * point sp at the top aligned address on the actual stack page.
          */
         mfspr   r0, SPR_SYSTEM_SAVE_K_0
-        mm      r0, r0, zero, LOG2_THREAD_SIZE, 31
+        mm      r0, r0, zero, LOG2_NR_CPU_IDS, 31
 
 0:
         /*
@@ -207,6 +197,9 @@ intvec_\vecname:
          *    cache line 1: r14...r29
          *    cache line 0: 2 x frame, r0..r13
          */
+#if STACK_TOP_DELTA != 64
+#error STACK_TOP_DELTA must be 64 for assumptions here and in task_pt_regs()
+#endif
         andi    r0, r0, -64
 
         /*
@@ -326,18 +319,14 @@ intvec_\vecname:
          movei  r3, -1   /* not used, but set for consistency */
         }
         .else
-#if CHIP_HAS_AUX_PERF_COUNTERS()
         .ifc \c_routine, op_handle_aux_perf_interrupt
         {
          mfspr  r2, AUX_PERF_COUNT_STS
          movei  r3, -1   /* not used, but set for consistency */
         }
         .else
-#endif
         movei   r3, 0
-#if CHIP_HAS_AUX_PERF_COUNTERS()
         .endif
-#endif
         .endif
         .endif
         .endif
@@ -354,7 +343,7 @@ intvec_\vecname:
 #ifdef __COLLECT_LINKER_FEEDBACK__
         .pushsection .text.intvec_feedback,"ax"
         .org    (\vecnum << 5)
-        FEEDBACK_ENTER_EXPLICIT(intvec_\vecname, .intrpt1, 1 << 8)
+        FEEDBACK_ENTER_EXPLICIT(intvec_\vecname, .intrpt, 1 << 8)
         jrp     lr
         .popsection
 #endif
@@ -468,7 +457,7 @@ intvec_\vecname:
         }
         {
          auli   r21, r21, ha16(__per_cpu_offset)
-         mm     r20, r20, zero, 0, LOG2_THREAD_SIZE-1
+         mm     r20, r20, zero, 0, LOG2_NR_CPU_IDS-1
         }
         s2a     r20, r20, r21
         lw      tp, r20
@@ -562,7 +551,6 @@ intvec_\vecname:
         .endif
         mtspr   INTERRUPT_CRITICAL_SECTION, zero
 
-#if CHIP_HAS_WH64()
         /*
          * Prepare the first 256 stack bytes to be rapidly accessible
          * without having to fetch the background data.  We don't really
@@ -583,7 +571,6 @@ intvec_\vecname:
          addi   r52, r52, -64
         }
         wh64    r52
-#endif
 
 #ifdef CONFIG_TRACE_IRQFLAGS
         .ifnc \function,handle_nmi
@@ -762,7 +749,7 @@ intvec_\vecname:
         .macro  dc_dispatch vecnum, vecname
         .org    (\vecnum << 8)
 intvec_\vecname:
-        j       hv_downcall_dispatch
+        j       _hv_downcall_dispatch
         ENDPROC(intvec_\vecname)
         .endm
 
@@ -812,17 +799,34 @@ STD_ENTRY(interrupt_return)
         }
         lw      r29, r29
         andi    r29, r29, SPR_EX_CONTEXT_1_1__PL_MASK  /* mask off ICS */
+        bzt     r29, .Lresume_userspace
+
+#ifdef CONFIG_PREEMPT
+        /* Returning to kernel space. Check if we need preemption. */
+        GET_THREAD_INFO(r29)
+        addli   r28, r29, THREAD_INFO_FLAGS_OFFSET
         {
-         bzt    r29, .Lresume_userspace
-         PTREGS_PTR(r29, PTREGS_OFFSET_PC)
+         lw     r28, r28
+         addli  r29, r29, THREAD_INFO_PREEMPT_COUNT_OFFSET
         }
+        {
+         andi   r28, r28, _TIF_NEED_RESCHED
+         lw     r29, r29
+        }
+        bzt     r28, 1f
+        bnz     r29, 1f
+        jal     preempt_schedule_irq
+        FEEDBACK_REENTER(interrupt_return)
+1:
+#endif
 
         /* If we're resuming to _cpu_idle_nap, bump PC forward by 8. */
         {
-         lw     r28, r29
+         PTREGS_PTR(r29, PTREGS_OFFSET_PC)
          moveli r27, lo16(_cpu_idle_nap)
         }
         {
+         lw     r28, r29
          auli   r27, r27, ha16(_cpu_idle_nap)
         }
         {
@@ -1420,7 +1424,6 @@ handle_ill:
         {
          lw     r0, r0          /* indirect thru thread_info to get task_info*/
          addi   r1, sp, C_ABI_SAVE_AREA_SIZE  /* put ptregs pointer into r1 */
-         move   r2, zero        /* load error code into r2 */
         }
 
         jal     send_sigtrap    /* issue a SIGTRAP */
@@ -1518,12 +1521,10 @@ STD_ENTRY(_sys_clone)
         __HEAD
         .align 64
         /* Align much later jump on the start of a cache line. */
-#if !ATOMIC_LOCKS_FOUND_VIA_TABLE()
         nop
 #if PAGE_SIZE >= 0x10000
         nop
 #endif
-#endif
 ENTRY(sys_cmpxchg)
 
         /*
@@ -1557,45 +1558,6 @@ ENTRY(sys_cmpxchg)
 # error Code here assumes PAGE_OFFSET can be loaded with just hi16()
 #endif
 
-#if ATOMIC_LOCKS_FOUND_VIA_TABLE()
-        {
-         /* Check for unaligned input. */
-         bnz    sp, .Lcmpxchg_badaddr
-         mm     r25, r0, zero, 3, PAGE_SHIFT-1
-        }
-        {
-         crc32_32 r25, zero, r25
-         moveli r21, lo16(atomic_lock_ptr)
-        }
-        {
-         auli   r21, r21, ha16(atomic_lock_ptr)
-         auli   r23, zero, hi16(PAGE_OFFSET)  /* hugepage-aligned */
-        }
-        {
-         shri   r20, r25, 32 - ATOMIC_HASH_L1_SHIFT
-         slt_u  r23, r0, r23
-         lw     r26, r0  /* see comment in the "#else" for the "lw r26". */
-        }
-        {
-         s2a    r21, r20, r21
-         bbns   r23, .Lcmpxchg_badaddr
-        }
-        {
-         lw     r21, r21
-         seqi   r23, TREG_SYSCALL_NR_NAME, __NR_FAST_cmpxchg64
-         andi   r25, r25, ATOMIC_HASH_L2_SIZE - 1
-        }
-        {
-         /* Branch away at this point if we're doing a 64-bit cmpxchg. */
-         bbs    r23, .Lcmpxchg64
-         andi   r23, r0, 7       /* Precompute alignment for cmpxchg64. */
-        }
-        {
-         s2a    ATOMIC_LOCK_REG_NAME, r25, r21
-         j      .Lcmpxchg32_tns   /* see comment in the #else for the jump. */
-        }
-
-#else /* ATOMIC_LOCKS_FOUND_VIA_TABLE() */
         {
          /* Check for unaligned input. */
          bnz    sp, .Lcmpxchg_badaddr
@@ -1609,7 +1571,7 @@ ENTRY(sys_cmpxchg)
           * Because of C pointer arithmetic, we want to compute this:
           *
           * ((char*)atomic_locks +
-          *  (((r0 >> 3) & (1 << (ATOMIC_HASH_SIZE - 1))) << 2))
+          *  (((r0 >> 3) & ((1 << ATOMIC_HASH_SHIFT) - 1)) << 2))
           *
           * Instead of two shifts we just ">> 1", and use 'mm'
           * to ignore the low and high bits we don't want.
@@ -1620,12 +1582,9 @@ ENTRY(sys_cmpxchg)
 
          /*
           * Ensure that the TLB is loaded before we take out the lock.
-          * On tilepro, this will start fetching the value all the way
-          * into our L1 as well (and if it gets modified before we
-          * grab the lock, it will be invalidated from our cache
-          * before we reload it).  On tile64, we'll start fetching it
-          * into our L1 if we're the home, and if we're not, we'll
-          * still at least start fetching it into the home's L2.
+          * This will start fetching the value all the way into our L1
+          * as well (and if it gets modified before we grab the lock,
+          * it will be invalidated from our cache before we reload it).
           */
          lw     r26, r0
         }
@@ -1668,8 +1627,6 @@ ENTRY(sys_cmpxchg)
          j      .Lcmpxchg32_tns
         }
 
-#endif /* ATOMIC_LOCKS_FOUND_VIA_TABLE() */
-
 /* Symbol for do_page_fault_ics() to use to compare against the PC. */
 .global __sys_cmpxchg_grab_lock
 __sys_cmpxchg_grab_lock:
@@ -1807,9 +1764,6 @@ __sys_cmpxchg_grab_lock:
         .align 64
 .Lcmpxchg64:
         {
-#if ATOMIC_LOCKS_FOUND_VIA_TABLE()
-         s2a    ATOMIC_LOCK_REG_NAME, r25, r21
-#endif
          bzt     r23, .Lcmpxchg64_tns
         }
         j       .Lcmpxchg_badaddr
@@ -1875,8 +1829,8 @@ int_unalign:
         push_extra_callee_saves r0
         j       do_trap
 
-/* Include .intrpt1 array of interrupt vectors */
-        .section ".intrpt1", "ax"
+/* Include .intrpt array of interrupt vectors */
+        .section ".intrpt", "ax"
 
 #define op_handle_perf_interrupt bad_intr
 #define op_handle_aux_perf_interrupt bad_intr
@@ -1944,10 +1898,8 @@ int_unalign:
                      do_page_fault
         int_hand     INT_SN_CPL, SN_CPL, bad_intr
         int_hand     INT_DOUBLE_FAULT, DOUBLE_FAULT, do_trap
-#if CHIP_HAS_AUX_PERF_COUNTERS()
         int_hand     INT_AUX_PERF_COUNT, AUX_PERF_COUNT, \
                      op_handle_aux_perf_interrupt, handle_nmi
-#endif
 
         /* Synthetic interrupt delivered only by the simulator */
         int_hand     INT_BREAKPOINT, BREAKPOINT, do_breakpoint
diff --git a/arch/tile/kernel/intvec_64.S b/arch/tile/kernel/intvec_64.S
index 85d483957027..ec755d3f3734 100644
--- a/arch/tile/kernel/intvec_64.S
+++ b/arch/tile/kernel/intvec_64.S
@@ -17,25 +17,33 @@
 #include <linux/linkage.h>
 #include <linux/errno.h>
 #include <linux/unistd.h>
+#include <linux/init.h>
 #include <asm/ptrace.h>
 #include <asm/thread_info.h>
 #include <asm/irqflags.h>
 #include <asm/asm-offsets.h>
 #include <asm/types.h>
+#include <asm/traps.h>
 #include <asm/signal.h>
 #include <hv/hypervisor.h>
 #include <arch/abi.h>
 #include <arch/interrupts.h>
 #include <arch/spr_def.h>
 
-#ifdef CONFIG_PREEMPT
-# error "No support for kernel preemption currently"
-#endif
-
 #define PTREGS_PTR(reg, ptreg) addli reg, sp, C_ABI_SAVE_AREA_SIZE + (ptreg)
 
 #define PTREGS_OFFSET_SYSCALL PTREGS_OFFSET_REG(TREG_SYSCALL_NR)
 
+#if CONFIG_KERNEL_PL == 1 || CONFIG_KERNEL_PL == 2
+/*
+ * Set "result" non-zero if ex1 holds the PL of the kernel
+ * (with or without ICS being set).  Note this works only
+ * because we never find the PL at level 3.
+ */
+# define IS_KERNEL_EX1(result, ex1) andi result, ex1, CONFIG_KERNEL_PL
+#else
+# error Recode IS_KERNEL_EX1 for CONFIG_KERNEL_PL
+#endif
 
         .macro  push_reg reg, ptr=sp, delta=-8
         {
@@ -98,6 +106,185 @@
         }
         .endm
 
+        /*
+         * Unalign data exception fast handling: In order to handle
+         * unaligned data access, a fast JIT version is generated and stored
+         * in a specific area in user space. We first need to do a quick poke
+         * to see if the JIT is available. We use certain bits in the fault
+         * PC (3 to 9 is used for 16KB page size) as index to address the JIT
+         * code area. The first 64bit word is the fault PC, and the 2nd one is
+         * the fault bundle itself. If these 2 words both match, then we
+         * directly "iret" to JIT code. If not, a slow path is invoked to
+         * generate new JIT code. Note: the current JIT code WILL be
+         * overwritten if it existed. So, ideally we can handle 128 unalign
+         * fixups via JIT. For lookup efficiency and to effectively support
+         * tight loops with multiple unaligned reference, a simple
+         * direct-mapped cache is used.
+         *
+         * SPR_EX_CONTEXT_K_0 is modified to return to JIT code.
+         * SPR_EX_CONTEXT_K_1 has ICS set.
+         * SPR_EX_CONTEXT_0_0 is setup to user program's next PC.
+         * SPR_EX_CONTEXT_0_1 = 0.
+         */
+        .macro int_hand_unalign_fast  vecnum, vecname
+        .org  (\vecnum << 8)
+intvec_\vecname:
+        /* Put r3 in SPR_SYSTEM_SAVE_K_1.  */
+        mtspr   SPR_SYSTEM_SAVE_K_1, r3
+
+        mfspr   r3, SPR_EX_CONTEXT_K_1
+        /*
+         * Examine if exception comes from user without ICS set.
+         * If not, just go directly to the slow path.
+         */
+        bnez    r3, hand_unalign_slow_nonuser
+
+        mfspr   r3, SPR_SYSTEM_SAVE_K_0
+
+        /* Get &thread_info->unalign_jit_tmp[0] in r3. */
+        bfexts  r3, r3, 0, CPU_SHIFT-1
+        mm      r3, zero, LOG2_THREAD_SIZE, 63
+        addli   r3, r3, THREAD_INFO_UNALIGN_JIT_TMP_OFFSET
+
+        /*
+         * Save r0, r1, r2 into thread_info array r3 points to
+         * from low to high memory in order.
+         */
+        st_add  r3, r0, 8
+        st_add  r3, r1, 8
+        {
+         st_add r3, r2, 8
+         andi   r2, sp, 7
+        }
+
+        /* Save stored r3 value so we can revert it on a page fault. */
+        mfspr   r1, SPR_SYSTEM_SAVE_K_1
+        st      r3, r1
+
+        {
+         /* Generate a SIGBUS if sp is not 8-byte aligned. */
+         bnez   r2, hand_unalign_slow_badsp
+        }
+
+        /*
+         * Get the thread_info in r0; load r1 with pc. Set the low bit of sp
+         * as an indicator to the page fault code in case we fault.
+         */
+        {
+         ori    sp, sp, 1
+         mfspr  r1, SPR_EX_CONTEXT_K_0
+        }
+
+        /* Add the jit_info offset in thread_info; extract r1 [3:9] into r2. */
+        {
+         addli  r0, r3, THREAD_INFO_UNALIGN_JIT_BASE_OFFSET - \
+          (THREAD_INFO_UNALIGN_JIT_TMP_OFFSET + (3 * 8))
+         bfextu r2, r1, 3, (2 + PAGE_SHIFT - UNALIGN_JIT_SHIFT)
+        }
+
+        /* Load the jit_info; multiply r2 by 128. */
+        {
+         ld     r0, r0
+         shli   r2, r2, UNALIGN_JIT_SHIFT
+        }
+
+        /*
+         * If r0 is NULL, the JIT page is not mapped, so go to slow path;
+         * add offset r2 to r0 at the same time.
+         */
+        {
+         beqz   r0, hand_unalign_slow
+         add    r2, r0, r2
+        }
+
+        /*
+         * We are loading from userspace (both the JIT info PC and
+         * instruction word, and the instruction word we executed)
+         * and since either could fault while holding the interrupt
+         * critical section, we must tag this region and check it in
+         * do_page_fault() to handle it properly.
+         */
+ENTRY(__start_unalign_asm_code)
+
+        /* Load first word of JIT in r0 and increment r2 by 8. */
+        ld_add  r0, r2, 8
+
+        /*
+         * Compare the PC with the 1st word in JIT; load the fault bundle
+         * into r1.
+         */
+        {
+         cmpeq  r0, r0, r1
+         ld     r1, r1
+        }
+
+        /* Go to slow path if PC doesn't match. */
+        beqz    r0, hand_unalign_slow
+
+        /*
+         * Load the 2nd word of JIT, which is supposed to be the fault
+         * bundle for a cache hit. Increment r2; after this bundle r2 will
+         * point to the potential start of the JIT code we want to run.
+         */
+        ld_add  r0, r2, 8
+
+        /* No further accesses to userspace are done after this point. */
+ENTRY(__end_unalign_asm_code)
+
+        /* Compare the real bundle with what is saved in the JIT area. */
+        {
+         cmpeq  r0, r1, r0
+         mtspr  SPR_EX_CONTEXT_0_1, zero
+        }
+
+        /* Go to slow path if the fault bundle does not match. */
+        beqz    r0, hand_unalign_slow
+
+        /*
+         * A cache hit is found.
+         * r2 points to start of JIT code (3rd word).
+         * r0 is the fault pc.
+         * r1 is the fault bundle.
+         * Reset the low bit of sp.
+         */
+        {
+         mfspr  r0, SPR_EX_CONTEXT_K_0
+         andi   sp, sp, ~1
+        }
+
+        /* Write r2 into EX_CONTEXT_K_0 and increment PC. */
+        {
+         mtspr  SPR_EX_CONTEXT_K_0, r2
+         addi   r0, r0, 8
+        }
+
+        /*
+         * Set ICS on kernel EX_CONTEXT_K_1 in order to "iret" to
+         * user with ICS set. This way, if the JIT fixup causes another
+         * unalign exception (which shouldn't be possible) the user
+         * process will be terminated with SIGBUS. Also, our fixup will
+         * run without interleaving with external interrupts.
+         * Each fixup is at most 14 bundles, so it won't hold ICS for long.
+         */
+        {
+         movei  r1, PL_ICS_EX1(USER_PL, 1)
+         mtspr  SPR_EX_CONTEXT_0_0, r0
+        }
+
+        {
+         mtspr  SPR_EX_CONTEXT_K_1, r1
+         addi   r3, r3, -(3 * 8)
+        }
+
+        /* Restore r0..r3. */
+        ld_add  r0, r3, 8
+        ld_add  r1, r3, 8
+        ld_add  r2, r3, 8
+        ld      r3, r3
+
+        iret
+        ENDPROC(intvec_\vecname)
+        .endm
 
 #ifdef __COLLECT_LINKER_FEEDBACK__
         .pushsection .text.intvec_feedback,"ax"
@@ -118,15 +305,21 @@ intvec_feedback:
          * The "processing" argument specifies the code for processing
          * the interrupt. Defaults to "handle_interrupt".
          */
-        .macro  int_hand vecnum, vecname, c_routine, processing=handle_interrupt
-        .org    (\vecnum << 8)
+        .macro __int_hand vecnum, vecname, c_routine,processing=handle_interrupt
 intvec_\vecname:
         /* Temporarily save a register so we have somewhere to work. */
 
         mtspr   SPR_SYSTEM_SAVE_K_1, r0
         mfspr   r0, SPR_EX_CONTEXT_K_1
 
-        andi    r0, r0, SPR_EX_CONTEXT_1_1__PL_MASK  /* mask off ICS */
+        /*
+         * The unalign data fastpath code sets the low bit in sp to
+         * force us to reset it here on fault.
+         */
+        {
+         blbs   sp, 2f
+         IS_KERNEL_EX1(r0, r0)
+        }
 
         .ifc    \vecnum, INT_DOUBLE_FAULT
         /*
@@ -176,15 +369,15 @@ intvec_\vecname:
         }
         .endif
 
-
+2:
         /*
-         * SYSTEM_SAVE_K_0 holds the cpu number in the low bits, and
-         * the current stack top in the higher bits.  So we recover
-         * our stack top by just masking off the low bits, then
+         * SYSTEM_SAVE_K_0 holds the cpu number in the high bits, and
+         * the current stack top in the lower bits.  So we recover
+         * our starting stack value by sign-extending the low bits, then
          * point sp at the top aligned address on the actual stack page.
          */
         mfspr   r0, SPR_SYSTEM_SAVE_K_0
-        mm      r0, zero, LOG2_THREAD_SIZE, 63
+        bfexts  r0, r0, 0, CPU_SHIFT-1
 
 0:
         /*
@@ -206,6 +399,9 @@ intvec_\vecname:
          *    cache line 1: r6...r13
          *    cache line 0: 2 x frame, r0..r5
          */
+#if STACK_TOP_DELTA != 64
+#error STACK_TOP_DELTA must be 64 for assumptions here and in task_pt_regs()
+#endif
         andi    r0, r0, -64
 
         /*
@@ -305,7 +501,7 @@ intvec_\vecname:
         mfspr   r3, SPR_SYSTEM_SAVE_K_2   /* info about page fault */
         .else
         .ifc \vecnum, INT_ILL_TRANS
-        mfspr   r2, ILL_TRANS_REASON
+        mfspr   r2, ILL_VA_PC
         .else
         .ifc \vecnum, INT_DOUBLE_FAULT
         mfspr   r2, SPR_SYSTEM_SAVE_K_2   /* double fault info from HV */
@@ -315,12 +511,10 @@ intvec_\vecname:
         .else
         .ifc \c_routine, op_handle_perf_interrupt
         mfspr   r2, PERF_COUNT_STS
-#if CHIP_HAS_AUX_PERF_COUNTERS()
         .else
         .ifc \c_routine, op_handle_aux_perf_interrupt
         mfspr   r2, AUX_PERF_COUNT_STS
         .endif
-#endif
         .endif
         .endif
         .endif
@@ -339,7 +533,7 @@ intvec_\vecname:
 #ifdef __COLLECT_LINKER_FEEDBACK__
         .pushsection .text.intvec_feedback,"ax"
         .org    (\vecnum << 5)
-        FEEDBACK_ENTER_EXPLICIT(intvec_\vecname, .intrpt1, 1 << 8)
+        FEEDBACK_ENTER_EXPLICIT(intvec_\vecname, .intrpt, 1 << 8)
         jrp     lr
         .popsection
 #endif
@@ -455,11 +649,12 @@ intvec_\vecname:
         /*
          * If we will be returning to the kernel, we will need to
          * reset the interrupt masks to the state they had before.
-         * Set DISABLE_IRQ in flags iff we came from PL1 with irqs disabled.
+         * Set DISABLE_IRQ in flags iff we came from kernel pl with
+         * irqs disabled.
          */
         mfspr   r32, SPR_EX_CONTEXT_K_1
         {
-         andi   r32, r32, SPR_EX_CONTEXT_1_1__PL_MASK  /* mask off ICS */
+         IS_KERNEL_EX1(r22, r22)
          PTREGS_PTR(r21, PTREGS_OFFSET_FLAGS)
         }
         beqzt   r32, 1f       /* zero if from user space */
@@ -503,7 +698,7 @@ intvec_\vecname:
         }
         {
          shl16insli r21, r21, hw1(__per_cpu_offset)
-         bfextu r20, r20, 0, LOG2_THREAD_SIZE-1
+         bfextu r20, r20, CPU_SHIFT, 63
         }
         shl16insli r21, r21, hw0(__per_cpu_offset)
         shl3add r20, r20, r21
@@ -585,7 +780,7 @@ intvec_\vecname:
         .macro  dc_dispatch vecnum, vecname
         .org    (\vecnum << 8)
 intvec_\vecname:
-        j       hv_downcall_dispatch
+        j       _hv_downcall_dispatch
         ENDPROC(intvec_\vecname)
         .endm
 
@@ -626,14 +821,36 @@ STD_ENTRY(interrupt_return)
          PTREGS_PTR(r29, PTREGS_OFFSET_EX1)
         }
         ld      r29, r29
-        andi    r29, r29, SPR_EX_CONTEXT_1_1__PL_MASK  /* mask off ICS */
+        IS_KERNEL_EX1(r29, r29)
         {
          beqzt  r29, .Lresume_userspace
-         PTREGS_PTR(r29, PTREGS_OFFSET_PC)
+         move   r29, sp
+        }
+
+#ifdef CONFIG_PREEMPT
+        /* Returning to kernel space. Check if we need preemption. */
+        EXTRACT_THREAD_INFO(r29)
+        addli   r28, r29, THREAD_INFO_FLAGS_OFFSET
+        {
+         ld     r28, r28
+         addli  r29, r29, THREAD_INFO_PREEMPT_COUNT_OFFSET
+        }
+        {
+         andi   r28, r28, _TIF_NEED_RESCHED
+         ld4s   r29, r29
         }
+        beqzt   r28, 1f
+        bnez    r29, 1f
+        jal     preempt_schedule_irq
+        FEEDBACK_REENTER(interrupt_return)
+1:
+#endif
 
         /* If we're resuming to _cpu_idle_nap, bump PC forward by 8. */
-        moveli  r27, hw2_last(_cpu_idle_nap)
+        {
+         moveli r27, hw2_last(_cpu_idle_nap)
+         PTREGS_PTR(r29, PTREGS_OFFSET_PC)
+        }
         {
          ld     r28, r29
          shl16insli r27, r27, hw1(_cpu_idle_nap)
@@ -728,7 +945,7 @@ STD_ENTRY(interrupt_return)
          PTREGS_PTR(r32, PTREGS_OFFSET_FLAGS)
         }
         {
-         andi   r0, r0, SPR_EX_CONTEXT_1_1__PL_MASK
+         IS_KERNEL_EX1(r0, r0)
          ld     r32, r32
         }
         bnez    r0, 1f
@@ -799,7 +1016,7 @@ STD_ENTRY(interrupt_return)
         pop_reg r21, sp, PTREGS_OFFSET_REG(31) - PTREGS_OFFSET_PC
         {
          mtspr  SPR_EX_CONTEXT_K_1, lr
-         andi   lr, lr, SPR_EX_CONTEXT_1_1__PL_MASK  /* mask off ICS */
+         IS_KERNEL_EX1(lr, lr)
         }
         {
          mtspr  SPR_EX_CONTEXT_K_0, r21
@@ -1223,10 +1440,31 @@ STD_ENTRY(_sys_clone)
         j       sys_clone
         STD_ENDPROC(_sys_clone)
 
-/* The single-step support may need to read all the registers. */
+        /*
+         * Recover r3, r2, r1 and r0 here saved by unalign fast vector.
+         * The vector area limit is 32 bundles, so we handle the reload here.
+         * r0, r1, r2 are in thread_info from low to high memory in order.
+         * r3 points to location the original r3 was saved.
+         * We put this code in the __HEAD section so it can be reached
+         * via a conditional branch from the fast path.
+         */
+        __HEAD
+hand_unalign_slow:
+        andi    sp, sp, ~1
+hand_unalign_slow_badsp:
+        addi    r3, r3, -(3 * 8)
+        ld_add  r0, r3, 8
+        ld_add  r1, r3, 8
+        ld      r2, r3
+hand_unalign_slow_nonuser:
+        mfspr   r3, SPR_SYSTEM_SAVE_K_1
+        __int_hand     INT_UNALIGN_DATA, UNALIGN_DATA_SLOW, int_unalign
+
+/* The unaligned data support needs to read all the registers. */
 int_unalign:
         push_extra_callee_saves r0
-        j       do_trap
+        j       do_unaligned
+ENDPROC(hand_unalign_slow)
 
 /* Fill the return address stack with nonzero entries. */
 STD_ENTRY(fill_ra_stack)
@@ -1240,8 +1478,15 @@ STD_ENTRY(fill_ra_stack)
 4:      jrp     r0
         STD_ENDPROC(fill_ra_stack)
 
-/* Include .intrpt1 array of interrupt vectors */
-        .section ".intrpt1", "ax"
+        .macro int_hand  vecnum, vecname, c_routine, processing=handle_interrupt
+        .org   (\vecnum << 8)
+                __int_hand   \vecnum, \vecname, \c_routine, \processing
+        .endm
+
+/* Include .intrpt array of interrupt vectors */
+        .section ".intrpt", "ax"
+        .global intrpt_start
+intrpt_start:
 
 #define op_handle_perf_interrupt bad_intr
 #define op_handle_aux_perf_interrupt bad_intr
@@ -1272,7 +1517,7 @@ STD_ENTRY(fill_ra_stack)
         int_hand     INT_SWINT_1, SWINT_1, SYSCALL, handle_syscall
         int_hand     INT_SWINT_0, SWINT_0, do_trap
         int_hand     INT_ILL_TRANS, ILL_TRANS, do_trap
-        int_hand     INT_UNALIGN_DATA, UNALIGN_DATA, int_unalign
+        int_hand_unalign_fast INT_UNALIGN_DATA, UNALIGN_DATA
         int_hand     INT_DTLB_MISS, DTLB_MISS, do_page_fault
         int_hand     INT_DTLB_ACCESS, DTLB_ACCESS, do_page_fault
         int_hand     INT_IDN_FIREWALL, IDN_FIREWALL, do_hardwall_trap
diff --git a/arch/tile/kernel/irq.c b/arch/tile/kernel/irq.c
index 3ccf2cd7182e..0586fdb9352d 100644
--- a/arch/tile/kernel/irq.c
+++ b/arch/tile/kernel/irq.c
@@ -55,7 +55,8 @@ static DEFINE_PER_CPU(int, irq_depth);
 
 /* State for allocating IRQs on Gx. */
 #if CHIP_HAS_IPI()
-static unsigned long available_irqs = ~(1UL << IRQ_RESCHEDULE);
+static unsigned long available_irqs = ((1UL << NR_IRQS) - 1) &
+                                      (~(1UL << IRQ_RESCHEDULE));
 static DEFINE_SPINLOCK(available_irqs_lock);
 #endif
 
@@ -73,7 +74,8 @@ static DEFINE_SPINLOCK(available_irqs_lock);
 
 /*
  * The interrupt handling path, implemented in terms of HV interrupt
- * emulation on TILE64 and TILEPro, and IPI hardware on TILE-Gx.
+ * emulation on TILEPro, and IPI hardware on TILE-Gx.
+ * Entered with interrupts disabled.
  */
 void tile_dev_intr(struct pt_regs *regs, int intnum)
 {
@@ -233,7 +235,7 @@ void tile_irq_activate(unsigned int irq, int tile_irq_type)
 {
         /*
          * We use handle_level_irq() by default because the pending
-         * interrupt vector (whether modeled by the HV on TILE64 and
+         * interrupt vector (whether modeled by the HV on
          * TILEPro or implemented in hardware on TILE-Gx) has
          * level-style semantics for each bit.  An interrupt fires
          * whenever a bit is high, not just at edges.
diff --git a/arch/tile/kernel/kgdb.c b/arch/tile/kernel/kgdb.c
new file mode 100644
index 000000000000..4cd88381a83e
--- /dev/null
+++ b/arch/tile/kernel/kgdb.c
@@ -0,0 +1,499 @@
+/*
+ * Copyright 2013 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ *
+ * TILE-Gx KGDB support.
+ */
+
+#include <linux/ptrace.h>
+#include <linux/kgdb.h>
+#include <linux/kdebug.h>
+#include <linux/uaccess.h>
+#include <linux/module.h>
+#include <asm/cacheflush.h>
+
+static tile_bundle_bits singlestep_insn = TILEGX_BPT_BUNDLE | DIE_SSTEPBP;
+static unsigned long stepped_addr;
+static tile_bundle_bits stepped_instr;
+
+struct dbg_reg_def_t dbg_reg_def[DBG_MAX_REG_NUM] = {
+        { "r0", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[0])},
+        { "r1", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[1])},
+        { "r2", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[2])},
+        { "r3", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[3])},
+        { "r4", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[4])},
+        { "r5", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[5])},
+        { "r6", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[6])},
+        { "r7", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[7])},
+        { "r8", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[8])},
+        { "r9", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[9])},
+        { "r10", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[10])},
+        { "r11", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[11])},
+        { "r12", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[12])},
+        { "r13", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[13])},
+        { "r14", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[14])},
+        { "r15", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[15])},
+        { "r16", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[16])},
+        { "r17", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[17])},
+        { "r18", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[18])},
+        { "r19", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[19])},
+        { "r20", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[20])},
+        { "r21", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[21])},
+        { "r22", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[22])},
+        { "r23", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[23])},
+        { "r24", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[24])},
+        { "r25", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[25])},
+        { "r26", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[26])},
+        { "r27", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[27])},
+        { "r28", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[28])},
+        { "r29", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[29])},
+        { "r30", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[30])},
+        { "r31", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[31])},
+        { "r32", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[32])},
+        { "r33", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[33])},
+        { "r34", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[34])},
+        { "r35", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[35])},
+        { "r36", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[36])},
+        { "r37", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[37])},
+        { "r38", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[38])},
+        { "r39", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[39])},
+        { "r40", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[40])},
+        { "r41", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[41])},
+        { "r42", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[42])},
+        { "r43", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[43])},
+        { "r44", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[44])},
+        { "r45", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[45])},
+        { "r46", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[46])},
+        { "r47", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[47])},
+        { "r48", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[48])},
+        { "r49", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[49])},
+        { "r50", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[50])},
+        { "r51", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[51])},
+        { "r52", GDB_SIZEOF_REG, offsetof(struct pt_regs, regs[52])},
+        { "tp", GDB_SIZEOF_REG, offsetof(struct pt_regs, tp)},
+        { "sp", GDB_SIZEOF_REG, offsetof(struct pt_regs, sp)},
+        { "lr", GDB_SIZEOF_REG, offsetof(struct pt_regs, lr)},
+        { "sn", GDB_SIZEOF_REG, -1},
+        { "idn0", GDB_SIZEOF_REG, -1},
+        { "idn1", GDB_SIZEOF_REG, -1},
+        { "udn0", GDB_SIZEOF_REG, -1},
+        { "udn1", GDB_SIZEOF_REG, -1},
+        { "udn2", GDB_SIZEOF_REG, -1},
+        { "udn3", GDB_SIZEOF_REG, -1},
+        { "zero", GDB_SIZEOF_REG, -1},
+        { "pc", GDB_SIZEOF_REG, offsetof(struct pt_regs, pc)},
+        { "faultnum", GDB_SIZEOF_REG, offsetof(struct pt_regs, faultnum)},
+};
+
+char *dbg_get_reg(int regno, void *mem, struct pt_regs *regs)
+{
+        if (regno >= DBG_MAX_REG_NUM || regno < 0)
+                return NULL;
+
+        if (dbg_reg_def[regno].offset != -1)
+                memcpy(mem, (void *)regs + dbg_reg_def[regno].offset,
+                       dbg_reg_def[regno].size);
+        else
+                memset(mem, 0, dbg_reg_def[regno].size);
+        return dbg_reg_def[regno].name;
+}
+
+int dbg_set_reg(int regno, void *mem, struct pt_regs *regs)
+{
+        if (regno >= DBG_MAX_REG_NUM || regno < 0)
+                return -EINVAL;
+
+        if (dbg_reg_def[regno].offset != -1)
+                memcpy((void *)regs + dbg_reg_def[regno].offset, mem,
+                       dbg_reg_def[regno].size);
+        return 0;
+}
+
+/*
+ * Similar to pt_regs_to_gdb_regs() except that process is sleeping and so
+ * we may not be able to get all the info.
+ */
+void
+sleeping_thread_to_gdb_regs(unsigned long *gdb_regs, struct task_struct *task)
+{
+        int reg;
+        struct pt_regs *thread_regs;
+        unsigned long *ptr = gdb_regs;
+
+        if (task == NULL)
+                return;
+
+        /* Initialize to zero. */
+        memset(gdb_regs, 0, NUMREGBYTES);
+
+        thread_regs = task_pt_regs(task);
+        for (reg = 0; reg <= TREG_LAST_GPR; reg++)
+                *(ptr++) = thread_regs->regs[reg];
+
+        gdb_regs[TILEGX_PC_REGNUM] = thread_regs->pc;
+        gdb_regs[TILEGX_FAULTNUM_REGNUM] = thread_regs->faultnum;
+}
+
+void kgdb_arch_set_pc(struct pt_regs *regs, unsigned long pc)
+{
+        regs->pc = pc;
+}
+
+static void kgdb_call_nmi_hook(void *ignored)
+{
+        kgdb_nmicallback(raw_smp_processor_id(), NULL);
+}
+
+void kgdb_roundup_cpus(unsigned long flags)
+{
+        local_irq_enable();
+        smp_call_function(kgdb_call_nmi_hook, NULL, 0);
+        local_irq_disable();
+}
+
+/*
+ * Convert a kernel address to the writable kernel text mapping.
+ */
+static unsigned long writable_address(unsigned long addr)
+{
+        unsigned long ret = 0;
+
+        if (core_kernel_text(addr))
+                ret = addr - MEM_SV_START + PAGE_OFFSET;
+        else if (is_module_text_address(addr))
+                ret = addr;
+        else
+                pr_err("Unknown virtual address 0x%lx\n", addr);
+
+        return ret;
+}
+
+/*
+ * Calculate the new address for after a step.
+ */
+static unsigned long get_step_address(struct pt_regs *regs)
+{
+        int src_reg;
+        int jump_off;
+        int br_off;
+        unsigned long addr;
+        unsigned int opcode;
+        tile_bundle_bits bundle;
+
+        /* Move to the next instruction by default. */
+        addr = regs->pc + TILEGX_BUNDLE_SIZE_IN_BYTES;
+        bundle = *(unsigned long *)instruction_pointer(regs);
+
+        /* 0: X mode, Otherwise: Y mode. */
+        if (bundle & TILEGX_BUNDLE_MODE_MASK) {
+                if (get_Opcode_Y1(bundle) == RRR_1_OPCODE_Y1 &&
+                    get_RRROpcodeExtension_Y1(bundle) ==
+                    UNARY_RRR_1_OPCODE_Y1) {
+                        opcode = get_UnaryOpcodeExtension_Y1(bundle);
+
+                        switch (opcode) {
+                        case JALR_UNARY_OPCODE_Y1:
+                        case JALRP_UNARY_OPCODE_Y1:
+                        case JR_UNARY_OPCODE_Y1:
+                        case JRP_UNARY_OPCODE_Y1:
+                                src_reg = get_SrcA_Y1(bundle);
+                                dbg_get_reg(src_reg, &addr, regs);
+                                break;
+                        }
+                }
+        } else if (get_Opcode_X1(bundle) == RRR_0_OPCODE_X1) {
+                if (get_RRROpcodeExtension_X1(bundle) ==
+                    UNARY_RRR_0_OPCODE_X1) {
+                        opcode = get_UnaryOpcodeExtension_X1(bundle);
+
+                        switch (opcode) {
+                        case JALR_UNARY_OPCODE_X1:
+                        case JALRP_UNARY_OPCODE_X1:
+                        case JR_UNARY_OPCODE_X1:
+                        case JRP_UNARY_OPCODE_X1:
+                                src_reg = get_SrcA_X1(bundle);
+                                dbg_get_reg(src_reg, &addr, regs);
+                                break;
+                        }
+                }
+        } else if (get_Opcode_X1(bundle) == JUMP_OPCODE_X1) {
+                opcode = get_JumpOpcodeExtension_X1(bundle);
+
+                switch (opcode) {
+                case JAL_JUMP_OPCODE_X1:
+                case J_JUMP_OPCODE_X1:
+                        jump_off = sign_extend(get_JumpOff_X1(bundle), 27);
+                        addr = regs->pc +
+                                (jump_off << TILEGX_LOG2_BUNDLE_SIZE_IN_BYTES);
+                        break;
+                }
+        } else if (get_Opcode_X1(bundle) == BRANCH_OPCODE_X1) {
+                br_off = 0;
+                opcode = get_BrType_X1(bundle);
+
+                switch (opcode) {
+                case BEQZT_BRANCH_OPCODE_X1:
+                case BEQZ_BRANCH_OPCODE_X1:
+                        if (get_SrcA_X1(bundle) == 0)
+                                br_off = get_BrOff_X1(bundle);
+                        break;
+                case BGEZT_BRANCH_OPCODE_X1:
+                case BGEZ_BRANCH_OPCODE_X1:
+                        if (get_SrcA_X1(bundle) >= 0)
+                                br_off = get_BrOff_X1(bundle);
+                        break;
+                case BGTZT_BRANCH_OPCODE_X1:
+                case BGTZ_BRANCH_OPCODE_X1:
+                        if (get_SrcA_X1(bundle) > 0)
+                                br_off = get_BrOff_X1(bundle);
+                        break;
+                case BLBCT_BRANCH_OPCODE_X1:
+                case BLBC_BRANCH_OPCODE_X1:
+                        if (!(get_SrcA_X1(bundle) & 1))
+                                br_off = get_BrOff_X1(bundle);
+                        break;
+                case BLBST_BRANCH_OPCODE_X1:
+                case BLBS_BRANCH_OPCODE_X1:
+                        if (get_SrcA_X1(bundle) & 1)
+                                br_off = get_BrOff_X1(bundle);
+                        break;
+                case BLEZT_BRANCH_OPCODE_X1:
+                case BLEZ_BRANCH_OPCODE_X1:
+                        if (get_SrcA_X1(bundle) <= 0)
+                                br_off = get_BrOff_X1(bundle);
+                        break;
+                case BLTZT_BRANCH_OPCODE_X1:
+                case BLTZ_BRANCH_OPCODE_X1:
+                        if (get_SrcA_X1(bundle) < 0)
+                                br_off = get_BrOff_X1(bundle);
+                        break;
+                case BNEZT_BRANCH_OPCODE_X1:
+                case BNEZ_BRANCH_OPCODE_X1:
+                        if (get_SrcA_X1(bundle) != 0)
+                                br_off = get_BrOff_X1(bundle);
+                        break;
+                }
+
+                if (br_off != 0) {
+                        br_off = sign_extend(br_off, 17);
+                        addr = regs->pc +
+                                (br_off << TILEGX_LOG2_BUNDLE_SIZE_IN_BYTES);
+                }
+        }
+
+        return addr;
+}
+
+/*
+ * Replace the next instruction after the current instruction with a
+ * breakpoint instruction.
+ */
+static void do_single_step(struct pt_regs *regs)
+{
+        unsigned long addr_wr;
+
+        /* Determine where the target instruction will send us to. */
+        stepped_addr = get_step_address(regs);
+        probe_kernel_read((char *)&stepped_instr, (char *)stepped_addr,
+                          BREAK_INSTR_SIZE);
+
+        addr_wr = writable_address(stepped_addr);
+        probe_kernel_write((char *)addr_wr, (char *)&singlestep_insn,
+                           BREAK_INSTR_SIZE);
+        smp_wmb();
+        flush_icache_range(stepped_addr, stepped_addr + BREAK_INSTR_SIZE);
+}
+
+static void undo_single_step(struct pt_regs *regs)
+{
+        unsigned long addr_wr;
+
+        if (stepped_instr == 0)
+                return;
+
+        addr_wr = writable_address(stepped_addr);
+        probe_kernel_write((char *)addr_wr, (char *)&stepped_instr,
+                           BREAK_INSTR_SIZE);
+        stepped_instr = 0;
+        smp_wmb();
+        flush_icache_range(stepped_addr, stepped_addr + BREAK_INSTR_SIZE);
+}
+
+/*
+ * Calls linux_debug_hook before the kernel dies. If KGDB is enabled,
+ * then try to fall into the debugger.
+ */
+static int
+kgdb_notify(struct notifier_block *self, unsigned long cmd, void *ptr)
+{
+        int ret;
+        unsigned long flags;
+        struct die_args *args = (struct die_args *)ptr;
+        struct pt_regs *regs = args->regs;
+
+#ifdef CONFIG_KPROBES
+        /*
+         * Return immediately if the kprobes fault notifier has set
+         * DIE_PAGE_FAULT.
+         */
+        if (cmd == DIE_PAGE_FAULT)
+                return NOTIFY_DONE;
+#endif /* CONFIG_KPROBES */
+
+        switch (cmd) {
+        case DIE_BREAK:
+        case DIE_COMPILED_BPT:
+                break;
+        case DIE_SSTEPBP:
+                local_irq_save(flags);
+                kgdb_handle_exception(0, SIGTRAP, 0, regs);
+                local_irq_restore(flags);
+                return NOTIFY_STOP;
+        default:
+                /* Userspace events, ignore. */
+                if (user_mode(regs))
+                        return NOTIFY_DONE;
+        }
+
+        local_irq_save(flags);
+        ret = kgdb_handle_exception(args->trapnr, args->signr, args->err, regs);
+        local_irq_restore(flags);
+        if (ret)
+                return NOTIFY_DONE;
+
+        return NOTIFY_STOP;
+}
+
+static struct notifier_block kgdb_notifier = {
+        .notifier_call = kgdb_notify,
+};
+
+/*
+ * kgdb_arch_handle_exception - Handle architecture specific GDB packets.
+ * @vector: The error vector of the exception that happened.
+ * @signo: The signal number of the exception that happened.
+ * @err_code: The error code of the exception that happened.
+ * @remcom_in_buffer: The buffer of the packet we have read.
+ * @remcom_out_buffer: The buffer of %BUFMAX bytes to write a packet into.
+ * @regs: The &struct pt_regs of the current process.
+ *
+ * This function MUST handle the 'c' and 's' command packets,
+ * as well packets to set / remove a hardware breakpoint, if used.
+ * If there are additional packets which the hardware needs to handle,
+ * they are handled here. The code should return -1 if it wants to
+ * process more packets, and a %0 or %1 if it wants to exit from the
+ * kgdb callback.
+ */
+int kgdb_arch_handle_exception(int vector, int signo, int err_code,
+                               char *remcom_in_buffer, char *remcom_out_buffer,
+                               struct pt_regs *regs)
+{
+        char *ptr;
+        unsigned long address;
+
+        /* Undo any stepping we may have done. */
+        undo_single_step(regs);
+
+        switch (remcom_in_buffer[0]) {
+        case 'c':
+        case 's':
+        case 'D':
+        case 'k':
+                /*
+                 * Try to read optional parameter, pc unchanged if no parm.
+                 * If this was a compiled-in breakpoint, we need to move
+                 * to the next instruction or we will just breakpoint
+                 * over and over again.
+                 */
+                ptr = &remcom_in_buffer[1];
+                if (kgdb_hex2long(&ptr, &address))
+                        regs->pc = address;
+                else if (*(unsigned long *)regs->pc == compiled_bpt)
+                        regs->pc += BREAK_INSTR_SIZE;
+
+                if (remcom_in_buffer[0] == 's') {
+                        do_single_step(regs);
+                        kgdb_single_step = 1;
+                        atomic_set(&kgdb_cpu_doing_single_step,
+                                   raw_smp_processor_id());
+                } else
+                        atomic_set(&kgdb_cpu_doing_single_step, -1);
+
+                return 0;
+        }
+
+        return -1; /* this means that we do not want to exit from the handler */
+}
+
+struct kgdb_arch arch_kgdb_ops;
+
+/*
+ * kgdb_arch_init - Perform any architecture specific initalization.
+ *
+ * This function will handle the initalization of any architecture
+ * specific callbacks.
+ */
+int kgdb_arch_init(void)
+{
+        tile_bundle_bits bundle = TILEGX_BPT_BUNDLE;
+
+        memcpy(arch_kgdb_ops.gdb_bpt_instr, &bundle, BREAK_INSTR_SIZE);
+        return register_die_notifier(&kgdb_notifier);
+}
+
+/*
+ * kgdb_arch_exit - Perform any architecture specific uninitalization.
+ *
+ * This function will handle the uninitalization of any architecture
+ * specific callbacks, for dynamic registration and unregistration.
+ */
+void kgdb_arch_exit(void)
+{
+        unregister_die_notifier(&kgdb_notifier);
+}
+
+int kgdb_arch_set_breakpoint(struct kgdb_bkpt *bpt)
+{
+        int err;
+        unsigned long addr_wr = writable_address(bpt->bpt_addr);
+
+        if (addr_wr == 0)
+                return -1;
+
+        err = probe_kernel_read(bpt->saved_instr, (char *)bpt->bpt_addr,
+                                BREAK_INSTR_SIZE);
+        if (err)
+                return err;
+
+        err = probe_kernel_write((char *)addr_wr, arch_kgdb_ops.gdb_bpt_instr,
+                                 BREAK_INSTR_SIZE);
+        smp_wmb();
+        flush_icache_range((unsigned long)bpt->bpt_addr,
+                           (unsigned long)bpt->bpt_addr + BREAK_INSTR_SIZE);
+        return err;
+}
+
+int kgdb_arch_remove_breakpoint(struct kgdb_bkpt *bpt)
+{
+        int err;
+        unsigned long addr_wr = writable_address(bpt->bpt_addr);
+
+        if (addr_wr == 0)
+                return -1;
+
+        err = probe_kernel_write((char *)addr_wr, (char *)bpt->saved_instr,
+                                 BREAK_INSTR_SIZE);
+        smp_wmb();
+        flush_icache_range((unsigned long)bpt->bpt_addr,
+                           (unsigned long)bpt->bpt_addr + BREAK_INSTR_SIZE);
+        return err;
+}
diff --git a/arch/tile/kernel/kprobes.c b/arch/tile/kernel/kprobes.c
new file mode 100644
index 000000000000..27cdcacbe81d
--- /dev/null
+++ b/arch/tile/kernel/kprobes.c
@@ -0,0 +1,528 @@
+/*
+ * arch/tile/kernel/kprobes.c
+ * Kprobes on TILE-Gx
+ *
+ * Some portions copied from the MIPS version.
+ *
+ * Copyright (C) IBM Corporation, 2002, 2004
+ * Copyright 2006 Sony Corp.
+ * Copyright 2010 Cavium Networks
+ *
+ * Copyright 2012 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#include <linux/kprobes.h>
+#include <linux/kdebug.h>
+#include <linux/module.h>
+#include <linux/slab.h>
+#include <linux/uaccess.h>
+#include <asm/cacheflush.h>
+
+#include <arch/opcode.h>
+
+DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL;
+DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk);
+
+tile_bundle_bits breakpoint_insn = TILEGX_BPT_BUNDLE;
+tile_bundle_bits breakpoint2_insn = TILEGX_BPT_BUNDLE | DIE_SSTEPBP;
+
+/*
+ * Check whether instruction is branch or jump, or if executing it
+ * has different results depending on where it is executed (e.g. lnk).
+ */
+static int __kprobes insn_has_control(kprobe_opcode_t insn)
+{
+        if (get_Mode(insn) != 0) {   /* Y-format bundle */
+                if (get_Opcode_Y1(insn) != RRR_1_OPCODE_Y1 ||
+                    get_RRROpcodeExtension_Y1(insn) != UNARY_RRR_1_OPCODE_Y1)
+                        return 0;
+
+                switch (get_UnaryOpcodeExtension_Y1(insn)) {
+                case JALRP_UNARY_OPCODE_Y1:
+                case JALR_UNARY_OPCODE_Y1:
+                case JRP_UNARY_OPCODE_Y1:
+                case JR_UNARY_OPCODE_Y1:
+                case LNK_UNARY_OPCODE_Y1:
+                        return 1;
+                default:
+                        return 0;
+                }
+        }
+
+        switch (get_Opcode_X1(insn)) {
+        case BRANCH_OPCODE_X1:  /* branch instructions */
+        case JUMP_OPCODE_X1:    /* jump instructions: j and jal */
+                return 1;
+
+        case RRR_0_OPCODE_X1:   /* other jump instructions */
+                if (get_RRROpcodeExtension_X1(insn) != UNARY_RRR_0_OPCODE_X1)
+                        return 0;
+                switch (get_UnaryOpcodeExtension_X1(insn)) {
+                case JALRP_UNARY_OPCODE_X1:
+                case JALR_UNARY_OPCODE_X1:
+                case JRP_UNARY_OPCODE_X1:
+                case JR_UNARY_OPCODE_X1:
+                case LNK_UNARY_OPCODE_X1:
+                        return 1;
+                default:
+                        return 0;
+                }
+        default:
+                return 0;
+        }
+}
+
+int __kprobes arch_prepare_kprobe(struct kprobe *p)
+{
+        unsigned long addr = (unsigned long)p->addr;
+
+        if (addr & (sizeof(kprobe_opcode_t) - 1))
+                return -EINVAL;
+
+        if (insn_has_control(*p->addr)) {
+                pr_notice("Kprobes for control instructions are not "
+                          "supported\n");
+                return -EINVAL;
+        }
+
+        /* insn: must be on special executable page on tile. */
+        p->ainsn.insn = get_insn_slot();
+        if (!p->ainsn.insn)
+                return -ENOMEM;
+
+        /*
+         * In the kprobe->ainsn.insn[] array we store the original
+         * instruction at index zero and a break trap instruction at
+         * index one.
+         */
+        memcpy(&p->ainsn.insn[0], p->addr, sizeof(kprobe_opcode_t));
+        p->ainsn.insn[1] = breakpoint2_insn;
+        p->opcode = *p->addr;
+
+        return 0;
+}
+
+void __kprobes arch_arm_kprobe(struct kprobe *p)
+{
+        unsigned long addr_wr;
+
+        /* Operate on writable kernel text mapping. */
+        addr_wr = (unsigned long)p->addr - MEM_SV_START + PAGE_OFFSET;
+
+        if (probe_kernel_write((void *)addr_wr, &breakpoint_insn,
+                sizeof(breakpoint_insn)))
+                pr_err("%s: failed to enable kprobe\n", __func__);
+
+        smp_wmb();
+        flush_insn_slot(p);
+}
+
+void __kprobes arch_disarm_kprobe(struct kprobe *kp)
+{
+        unsigned long addr_wr;
+
+        /* Operate on writable kernel text mapping. */
+        addr_wr = (unsigned long)kp->addr - MEM_SV_START + PAGE_OFFSET;
+
+        if (probe_kernel_write((void *)addr_wr, &kp->opcode,
+                sizeof(kp->opcode)))
+                pr_err("%s: failed to enable kprobe\n", __func__);
+
+        smp_wmb();
+        flush_insn_slot(kp);
+}
+
+void __kprobes arch_remove_kprobe(struct kprobe *p)
+{
+        if (p->ainsn.insn) {
+                free_insn_slot(p->ainsn.insn, 0);
+                p->ainsn.insn = NULL;
+        }
+}
+
+static void __kprobes save_previous_kprobe(struct kprobe_ctlblk *kcb)
+{
+        kcb->prev_kprobe.kp = kprobe_running();
+        kcb->prev_kprobe.status = kcb->kprobe_status;
+        kcb->prev_kprobe.saved_pc = kcb->kprobe_saved_pc;
+}
+
+static void __kprobes restore_previous_kprobe(struct kprobe_ctlblk *kcb)
+{
+        __this_cpu_write(current_kprobe, kcb->prev_kprobe.kp);
+        kcb->kprobe_status = kcb->prev_kprobe.status;
+        kcb->kprobe_saved_pc = kcb->prev_kprobe.saved_pc;
+}
+
+static void __kprobes set_current_kprobe(struct kprobe *p, struct pt_regs *regs,
+                        struct kprobe_ctlblk *kcb)
+{
+        __this_cpu_write(current_kprobe, p);
+        kcb->kprobe_saved_pc = regs->pc;
+}
+
+static void __kprobes prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
+{
+        /* Single step inline if the instruction is a break. */
+        if (p->opcode == breakpoint_insn ||
+            p->opcode == breakpoint2_insn)
+                regs->pc = (unsigned long)p->addr;
+        else
+                regs->pc = (unsigned long)&p->ainsn.insn[0];
+}
+
+static int __kprobes kprobe_handler(struct pt_regs *regs)
+{
+        struct kprobe *p;
+        int ret = 0;
+        kprobe_opcode_t *addr;
+        struct kprobe_ctlblk *kcb;
+
+        addr = (kprobe_opcode_t *)regs->pc;
+
+        /*
+         * We don't want to be preempted for the entire
+         * duration of kprobe processing.
+         */
+        preempt_disable();
+        kcb = get_kprobe_ctlblk();
+
+        /* Check we're not actually recursing. */
+        if (kprobe_running()) {
+                p = get_kprobe(addr);
+                if (p) {
+                        if (kcb->kprobe_status == KPROBE_HIT_SS &&
+                            p->ainsn.insn[0] == breakpoint_insn) {
+                                goto no_kprobe;
+                        }
+                        /*
+                         * We have reentered the kprobe_handler(), since
+                         * another probe was hit while within the handler.
+                         * We here save the original kprobes variables and
+                         * just single step on the instruction of the new probe
+                         * without calling any user handlers.
+                         */
+                        save_previous_kprobe(kcb);
+                        set_current_kprobe(p, regs, kcb);
+                        kprobes_inc_nmissed_count(p);
+                        prepare_singlestep(p, regs);
+                        kcb->kprobe_status = KPROBE_REENTER;
+                        return 1;
+                } else {
+                        if (*addr != breakpoint_insn) {
+                                /*
+                                 * The breakpoint instruction was removed by
+                                 * another cpu right after we hit, no further
+                                 * handling of this interrupt is appropriate.
+                                 */
+                                ret = 1;
+                                goto no_kprobe;
+                        }
+                        p = __this_cpu_read(current_kprobe);
+                        if (p->break_handler && p->break_handler(p, regs))
+                                goto ss_probe;
+                }
+                goto no_kprobe;
+        }
+
+        p = get_kprobe(addr);
+        if (!p) {
+                if (*addr != breakpoint_insn) {
+                        /*
+                         * The breakpoint instruction was removed right
+                         * after we hit it.  Another cpu has removed
+                         * either a probepoint or a debugger breakpoint
+                         * at this address.  In either case, no further
+                         * handling of this interrupt is appropriate.
+                         */
+                        ret = 1;
+                }
+                /* Not one of ours: let kernel handle it. */
+                goto no_kprobe;
+        }
+
+        set_current_kprobe(p, regs, kcb);
+        kcb->kprobe_status = KPROBE_HIT_ACTIVE;
+
+        if (p->pre_handler && p->pre_handler(p, regs)) {
+                /* Handler has already set things up, so skip ss setup. */
+                return 1;
+        }
+
+ss_probe:
+        prepare_singlestep(p, regs);
+        kcb->kprobe_status = KPROBE_HIT_SS;
+        return 1;
+
+no_kprobe:
+        preempt_enable_no_resched();
+        return ret;
+}
+
+/*
+ * Called after single-stepping.  p->addr is the address of the
+ * instruction that has been replaced by the breakpoint. To avoid the
+ * SMP problems that can occur when we temporarily put back the
+ * original opcode to single-step, we single-stepped a copy of the
+ * instruction.  The address of this copy is p->ainsn.insn.
+ *
+ * This function prepares to return from the post-single-step
+ * breakpoint trap.
+ */
+static void __kprobes resume_execution(struct kprobe *p,
+                                       struct pt_regs *regs,
+                                       struct kprobe_ctlblk *kcb)
+{
+        unsigned long orig_pc = kcb->kprobe_saved_pc;
+        regs->pc = orig_pc + 8;
+}
+
+static inline int post_kprobe_handler(struct pt_regs *regs)
+{
+        struct kprobe *cur = kprobe_running();
+        struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
+
+        if (!cur)
+                return 0;
+
+        if ((kcb->kprobe_status != KPROBE_REENTER) && cur->post_handler) {
+                kcb->kprobe_status = KPROBE_HIT_SSDONE;
+                cur->post_handler(cur, regs, 0);
+        }
+
+        resume_execution(cur, regs, kcb);
+
+        /* Restore back the original saved kprobes variables and continue. */
+        if (kcb->kprobe_status == KPROBE_REENTER) {
+                restore_previous_kprobe(kcb);
+                goto out;
+        }
+        reset_current_kprobe();
+out:
+        preempt_enable_no_resched();
+
+        return 1;
+}
+
+static inline int kprobe_fault_handler(struct pt_regs *regs, int trapnr)
+{
+        struct kprobe *cur = kprobe_running();
+        struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
+
+        if (cur->fault_handler && cur->fault_handler(cur, regs, trapnr))
+                return 1;
+
+        if (kcb->kprobe_status & KPROBE_HIT_SS) {
+                /*
+                 * We are here because the instruction being single
+                 * stepped caused a page fault. We reset the current
+                 * kprobe and the ip points back to the probe address
+                 * and allow the page fault handler to continue as a
+                 * normal page fault.
+                 */
+                resume_execution(cur, regs, kcb);
+                reset_current_kprobe();
+                preempt_enable_no_resched();
+        }
+        return 0;
+}
+
+/*
+ * Wrapper routine for handling exceptions.
+ */
+int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
+                                       unsigned long val, void *data)
+{
+        struct die_args *args = (struct die_args *)data;
+        int ret = NOTIFY_DONE;
+
+        switch (val) {
+        case DIE_BREAK:
+                if (kprobe_handler(args->regs))
+                        ret = NOTIFY_STOP;
+                break;
+        case DIE_SSTEPBP:
+                if (post_kprobe_handler(args->regs))
+                        ret = NOTIFY_STOP;
+                break;
+        case DIE_PAGE_FAULT:
+                /* kprobe_running() needs smp_processor_id(). */
+                preempt_disable();
+
+                if (kprobe_running()
+                    && kprobe_fault_handler(args->regs, args->trapnr))
+                        ret = NOTIFY_STOP;
+                preempt_enable();
+                break;
+        default:
+                break;
+        }
+        return ret;
+}
+
+int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
+{
+        struct jprobe *jp = container_of(p, struct jprobe, kp);
+        struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
+
+        kcb->jprobe_saved_regs = *regs;
+        kcb->jprobe_saved_sp = regs->sp;
+
+        memcpy(kcb->jprobes_stack, (void *)kcb->jprobe_saved_sp,
+               MIN_JPROBES_STACK_SIZE(kcb->jprobe_saved_sp));
+
+        regs->pc = (unsigned long)(jp->entry);
+
+        return 1;
+}
+
+/* Defined in the inline asm below. */
+void jprobe_return_end(void);
+
+void __kprobes jprobe_return(void)
+{
+        asm volatile(
+                "bpt\n\t"
+                ".globl jprobe_return_end\n"
+                "jprobe_return_end:\n");
+}
+
+int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
+{
+        struct kprobe_ctlblk *kcb = get_kprobe_ctlblk();
+
+        if (regs->pc >= (unsigned long)jprobe_return &&
+            regs->pc <= (unsigned long)jprobe_return_end) {
+                *regs = kcb->jprobe_saved_regs;
+                memcpy((void *)kcb->jprobe_saved_sp, kcb->jprobes_stack,
+                       MIN_JPROBES_STACK_SIZE(kcb->jprobe_saved_sp));
+                preempt_enable_no_resched();
+
+                return 1;
+        }
+        return 0;
+}
+
+/*
+ * Function return probe trampoline:
+ * - init_kprobes() establishes a probepoint here
+ * - When the probed function returns, this probe causes the
+ *   handlers to fire
+ */
+static void __used kretprobe_trampoline_holder(void)
+{
+        asm volatile(
+                "nop\n\t"
+                ".global kretprobe_trampoline\n"
+                "kretprobe_trampoline:\n\t"
+                "nop\n\t"
+                : : : "memory");
+}
+
+void kretprobe_trampoline(void);
+
+void __kprobes arch_prepare_kretprobe(struct kretprobe_instance *ri,
+                                      struct pt_regs *regs)
+{
+        ri->ret_addr = (kprobe_opcode_t *) regs->lr;
+
+        /* Replace the return addr with trampoline addr */
+        regs->lr = (unsigned long)kretprobe_trampoline;
+}
+
+/*
+ * Called when the probe at kretprobe trampoline is hit.
+ */
+static int __kprobes trampoline_probe_handler(struct kprobe *p,
+                                                struct pt_regs *regs)
+{
+        struct kretprobe_instance *ri = NULL;
+        struct hlist_head *head, empty_rp;
+        struct hlist_node *tmp;
+        unsigned long flags, orig_ret_address = 0;
+        unsigned long trampoline_address = (unsigned long)kretprobe_trampoline;
+
+        INIT_HLIST_HEAD(&empty_rp);
+        kretprobe_hash_lock(current, &head, &flags);
+
+        /*
+         * It is possible to have multiple instances associated with a given
+         * task either because multiple functions in the call path have
+         * a return probe installed on them, and/or more than one return
+         * return probe was registered for a target function.
+         *
+         * We can handle this because:
+         *     - instances are always inserted at the head of the list
+         *     - when multiple return probes are registered for the same
+         *       function, the first instance's ret_addr will point to the
+         *       real return address, and all the rest will point to
+         *       kretprobe_trampoline
+         */
+        hlist_for_each_entry_safe(ri, tmp, head, hlist) {
+                if (ri->task != current)
+                        /* another task is sharing our hash bucket */
+                        continue;
+
+                if (ri->rp && ri->rp->handler)
+                        ri->rp->handler(ri, regs);
+
+                orig_ret_address = (unsigned long)ri->ret_addr;
+                recycle_rp_inst(ri, &empty_rp);
+
+                if (orig_ret_address != trampoline_address) {
+                        /*
+                         * This is the real return address. Any other
+                         * instances associated with this task are for
+                         * other calls deeper on the call stack
+                         */
+                        break;
+                }
+        }
+
+        kretprobe_assert(ri, orig_ret_address, trampoline_address);
+        instruction_pointer(regs) = orig_ret_address;
+
+        reset_current_kprobe();
+        kretprobe_hash_unlock(current, &flags);
+        preempt_enable_no_resched();
+
+        hlist_for_each_entry_safe(ri, tmp, &empty_rp, hlist) {
+                hlist_del(&ri->hlist);
+                kfree(ri);
+        }
+        /*
+         * By returning a non-zero value, we are telling
+         * kprobe_handler() that we don't want the post_handler
+         * to run (and have re-enabled preemption)
+         */
+        return 1;
+}
+
+int __kprobes arch_trampoline_kprobe(struct kprobe *p)
+{
+        if (p->addr == (kprobe_opcode_t *)kretprobe_trampoline)
+                return 1;
+
+        return 0;
+}
+
+static struct kprobe trampoline_p = {
+        .addr = (kprobe_opcode_t *)kretprobe_trampoline,
+        .pre_handler = trampoline_probe_handler
+};
+
+int __init arch_init_kprobes(void)
+{
+        register_kprobe(&trampoline_p);
+        return 0;
+}
diff --git a/arch/tile/kernel/mcount_64.S b/arch/tile/kernel/mcount_64.S
new file mode 100644
index 000000000000..70d7bb0c4d8f
--- /dev/null
+++ b/arch/tile/kernel/mcount_64.S
@@ -0,0 +1,224 @@
+/*
+ * Copyright 2012 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ *
+ * TILE-Gx specific __mcount support
+ */
+
+#include <linux/linkage.h>
+#include <asm/ftrace.h>
+
+#define REGSIZE 8
+
+        .text
+        .global __mcount
+
+        .macro  MCOUNT_SAVE_REGS
+        addli   sp, sp, -REGSIZE
+        {
+         st     sp, lr
+         addli  r29, sp, - (12 * REGSIZE)
+        }
+        {
+         addli  sp, sp, - (13 * REGSIZE)
+         st     r29, sp
+        }
+        addli   r29, r29, REGSIZE
+        { st    r29, r0; addli  r29, r29, REGSIZE }
+        { st    r29, r1; addli  r29, r29, REGSIZE }
+        { st    r29, r2; addli  r29, r29, REGSIZE }
+        { st    r29, r3; addli  r29, r29, REGSIZE }
+        { st    r29, r4; addli  r29, r29, REGSIZE }
+        { st    r29, r5; addli  r29, r29, REGSIZE }
+        { st    r29, r6; addli  r29, r29, REGSIZE }
+        { st    r29, r7; addli  r29, r29, REGSIZE }
+        { st    r29, r8; addli  r29, r29, REGSIZE }
+        { st    r29, r9; addli  r29, r29, REGSIZE }
+        { st    r29, r10; addli r29, r29, REGSIZE }
+        .endm
+
+        .macro  MCOUNT_RESTORE_REGS
+        addli   r29, sp, (2 * REGSIZE)
+        { ld    r0, r29; addli  r29, r29, REGSIZE }
+        { ld    r1, r29; addli  r29, r29, REGSIZE }
+        { ld    r2, r29; addli  r29, r29, REGSIZE }
+        { ld    r3, r29; addli  r29, r29, REGSIZE }
+        { ld    r4, r29; addli  r29, r29, REGSIZE }
+        { ld    r5, r29; addli  r29, r29, REGSIZE }
+        { ld    r6, r29; addli  r29, r29, REGSIZE }
+        { ld    r7, r29; addli  r29, r29, REGSIZE }
+        { ld    r8, r29; addli  r29, r29, REGSIZE }
+        { ld    r9, r29; addli  r29, r29, REGSIZE }
+        { ld    r10, r29; addli lr, sp, (13 * REGSIZE) }
+        { ld    lr, lr;  addli  sp, sp, (14 * REGSIZE) }
+        .endm
+
+        .macro  RETURN_BACK
+        { move  r12, lr; move   lr, r10 }
+        jrp     r12
+        .endm
+
+#ifdef CONFIG_DYNAMIC_FTRACE
+
+        .align  64
+STD_ENTRY(__mcount)
+__mcount:
+        j       ftrace_stub
+STD_ENDPROC(__mcount)
+
+        .align  64
+STD_ENTRY(ftrace_caller)
+        moveli  r11, hw2_last(function_trace_stop)
+        { shl16insli    r11, r11, hw1(function_trace_stop); move r12, lr }
+        { shl16insli    r11, r11, hw0(function_trace_stop); move lr, r10 }
+        ld      r11, r11
+        beqz    r11, 1f
+        jrp     r12
+
+1:
+        { move  r10, lr; move   lr, r12 }
+        MCOUNT_SAVE_REGS
+
+        /* arg1: self return address */
+        /* arg2: parent's return address */
+        { move  r0, lr; move    r1, r10 }
+
+        .global ftrace_call
+ftrace_call:
+        /*
+         * a placeholder for the call to a real tracing function, i.e.
+         * ftrace_trace_function()
+         */
+        nop
+
+#ifdef CONFIG_FUNCTION_GRAPH_TRACER
+        .global ftrace_graph_call
+ftrace_graph_call:
+        /*
+         * a placeholder for the call to a real tracing function, i.e.
+         * ftrace_graph_caller()
+         */
+        nop
+#endif
+        MCOUNT_RESTORE_REGS
+        .global ftrace_stub
+ftrace_stub:
+        RETURN_BACK
+STD_ENDPROC(ftrace_caller)
+
+#else /* ! CONFIG_DYNAMIC_FTRACE */
+
+        .align  64
+STD_ENTRY(__mcount)
+        moveli  r11, hw2_last(function_trace_stop)
+        { shl16insli    r11, r11, hw1(function_trace_stop); move r12, lr }
+        { shl16insli    r11, r11, hw0(function_trace_stop); move lr, r10 }
+        ld      r11, r11
+        beqz    r11, 1f
+        jrp     r12
+
+1:
+        { move  r10, lr; move   lr, r12 }
+        {
+         moveli r11, hw2_last(ftrace_trace_function)
+         moveli r13, hw2_last(ftrace_stub)
+        }
+        {
+         shl16insli     r11, r11, hw1(ftrace_trace_function)
+         shl16insli     r13, r13, hw1(ftrace_stub)
+        }
+        {
+         shl16insli     r11, r11, hw0(ftrace_trace_function)
+         shl16insli     r13, r13, hw0(ftrace_stub)
+        }
+
+        ld      r11, r11
+        sub     r14, r13, r11
+        bnez    r14, static_trace
+
+#ifdef  CONFIG_FUNCTION_GRAPH_TRACER
+        moveli  r15, hw2_last(ftrace_graph_return)
+        shl16insli      r15, r15, hw1(ftrace_graph_return)
+        shl16insli      r15, r15, hw0(ftrace_graph_return)
+        ld      r15, r15
+        sub     r15, r15, r13
+        bnez    r15, ftrace_graph_caller
+
+        {
+         moveli r16, hw2_last(ftrace_graph_entry)
+         moveli r17, hw2_last(ftrace_graph_entry_stub)
+        }
+        {
+         shl16insli     r16, r16, hw1(ftrace_graph_entry)
+         shl16insli     r17, r17, hw1(ftrace_graph_entry_stub)
+        }
+        {
+         shl16insli     r16, r16, hw0(ftrace_graph_entry)
+         shl16insli     r17, r17, hw0(ftrace_graph_entry_stub)
+        }
+        ld      r16, r16
+        sub     r17, r16, r17
+        bnez    r17, ftrace_graph_caller
+
+#endif
+        RETURN_BACK
+
+static_trace:
+        MCOUNT_SAVE_REGS
+
+        /* arg1: self return address */
+        /* arg2: parent's return address */
+        { move  r0, lr; move    r1, r10 }
+
+        /* call ftrace_trace_function() */
+        jalr    r11
+
+        MCOUNT_RESTORE_REGS
+
+        .global ftrace_stub
+ftrace_stub:
+        RETURN_BACK
+STD_ENDPROC(__mcount)
+
+#endif  /* ! CONFIG_DYNAMIC_FTRACE */
+
+#ifdef CONFIG_FUNCTION_GRAPH_TRACER
+
+STD_ENTRY(ftrace_graph_caller)
+ftrace_graph_caller:
+#ifndef CONFIG_DYNAMIC_FTRACE
+        MCOUNT_SAVE_REGS
+#endif
+
+        /* arg1: Get the location of the parent's return address */
+        addi    r0, sp, 12 * REGSIZE
+        /* arg2: Get self return address */
+        move    r1, lr
+
+        jal prepare_ftrace_return
+
+        MCOUNT_RESTORE_REGS
+        RETURN_BACK
+STD_ENDPROC(ftrace_graph_caller)
+
+        .global return_to_handler
+return_to_handler:
+        MCOUNT_SAVE_REGS
+
+        jal     ftrace_return_to_handler
+        /* restore the real parent address */
+        move    r11, r0
+
+        MCOUNT_RESTORE_REGS
+        jr      r11
+
+#endif /* CONFIG_FUNCTION_GRAPH_TRACER */
diff --git a/arch/tile/kernel/pci-dma.c b/arch/tile/kernel/pci-dma.c
index b9fe80ec1089..09b58703ac26 100644
--- a/arch/tile/kernel/pci-dma.c
+++ b/arch/tile/kernel/pci-dma.c
@@ -36,8 +36,9 @@ static void *tile_dma_alloc_coherent(struct device *dev, size_t size,
                                      dma_addr_t *dma_handle, gfp_t gfp,
                                      struct dma_attrs *attrs)
 {
-        u64 dma_mask = dev->coherent_dma_mask ?: DMA_BIT_MASK(32);
-        int node = dev_to_node(dev);
+        u64 dma_mask = (dev && dev->coherent_dma_mask) ?
+                dev->coherent_dma_mask : DMA_BIT_MASK(32);
+        int node = dev ? dev_to_node(dev) : 0;
         int order = get_order(size);
         struct page *pg;
         dma_addr_t addr;
@@ -256,7 +257,7 @@ static void tile_dma_unmap_page(struct device *dev, dma_addr_t dma_address,
         BUG_ON(!valid_dma_direction(direction));
 
         __dma_complete_page(pfn_to_page(PFN_DOWN(dma_address)),
-                            dma_address & PAGE_OFFSET, size, direction);
+                            dma_address & (PAGE_SIZE - 1), size, direction);
 }
 
 static void tile_dma_sync_single_for_cpu(struct device *dev,
@@ -357,7 +358,7 @@ static void *tile_pci_dma_alloc_coherent(struct device *dev, size_t size,
 
         addr = page_to_phys(pg);
 
-        *dma_handle = phys_to_dma(dev, addr);
+        *dma_handle = addr + get_dma_offset(dev);
 
         return page_address(pg);
 }
@@ -387,7 +388,7 @@ static int tile_pci_dma_map_sg(struct device *dev, struct scatterlist *sglist,
                 sg->dma_address = sg_phys(sg);
                 __dma_prep_pa_range(sg->dma_address, sg->length, direction);
 
-                sg->dma_address = phys_to_dma(dev, sg->dma_address);
+                sg->dma_address = sg->dma_address + get_dma_offset(dev);
 #ifdef CONFIG_NEED_SG_DMA_LENGTH
                 sg->dma_length = sg->length;
 #endif
@@ -422,7 +423,7 @@ static dma_addr_t tile_pci_dma_map_page(struct device *dev, struct page *page,
         BUG_ON(offset + size > PAGE_SIZE);
         __dma_prep_page(page, offset, size, direction);
 
-        return phys_to_dma(dev, page_to_pa(page) + offset);
+        return page_to_pa(page) + offset + get_dma_offset(dev);
 }
 
 static void tile_pci_dma_unmap_page(struct device *dev, dma_addr_t dma_address,
@@ -432,10 +433,10 @@ static void tile_pci_dma_unmap_page(struct device *dev, dma_addr_t dma_address,
 {
         BUG_ON(!valid_dma_direction(direction));
 
-        dma_address = dma_to_phys(dev, dma_address);
+        dma_address -= get_dma_offset(dev);
 
         __dma_complete_page(pfn_to_page(PFN_DOWN(dma_address)),
-                            dma_address & PAGE_OFFSET, size, direction);
+                            dma_address & (PAGE_SIZE - 1), size, direction);
 }
 
 static void tile_pci_dma_sync_single_for_cpu(struct device *dev,
@@ -445,7 +446,7 @@ static void tile_pci_dma_sync_single_for_cpu(struct device *dev,
 {
         BUG_ON(!valid_dma_direction(direction));
 
-        dma_handle = dma_to_phys(dev, dma_handle);
+        dma_handle -= get_dma_offset(dev);
 
         __dma_complete_pa_range(dma_handle, size, direction);
 }
@@ -456,7 +457,7 @@ static void tile_pci_dma_sync_single_for_device(struct device *dev,
                                                 enum dma_data_direction
                                                 direction)
 {
-        dma_handle = dma_to_phys(dev, dma_handle);
+        dma_handle -= get_dma_offset(dev);
 
         __dma_prep_pa_range(dma_handle, size, direction);
 }
@@ -558,22 +559,47 @@ static struct dma_map_ops pci_swiotlb_dma_ops = {
         .mapping_error = swiotlb_dma_mapping_error,
 };
 
+static struct dma_map_ops pci_hybrid_dma_ops = {
+        .alloc = tile_swiotlb_alloc_coherent,
+        .free = tile_swiotlb_free_coherent,
+        .map_page = tile_pci_dma_map_page,
+        .unmap_page = tile_pci_dma_unmap_page,
+        .map_sg = tile_pci_dma_map_sg,
+        .unmap_sg = tile_pci_dma_unmap_sg,
+        .sync_single_for_cpu = tile_pci_dma_sync_single_for_cpu,
+        .sync_single_for_device = tile_pci_dma_sync_single_for_device,
+        .sync_sg_for_cpu = tile_pci_dma_sync_sg_for_cpu,
+        .sync_sg_for_device = tile_pci_dma_sync_sg_for_device,
+        .mapping_error = tile_pci_dma_mapping_error,
+        .dma_supported = tile_pci_dma_supported
+};
+
 struct dma_map_ops *gx_legacy_pci_dma_map_ops = &pci_swiotlb_dma_ops;
+struct dma_map_ops *gx_hybrid_pci_dma_map_ops = &pci_hybrid_dma_ops;
 #else
 struct dma_map_ops *gx_legacy_pci_dma_map_ops;
+struct dma_map_ops *gx_hybrid_pci_dma_map_ops;
 #endif
 EXPORT_SYMBOL(gx_legacy_pci_dma_map_ops);
+EXPORT_SYMBOL(gx_hybrid_pci_dma_map_ops);
 
 #ifdef CONFIG_ARCH_HAS_DMA_SET_COHERENT_MASK
 int dma_set_coherent_mask(struct device *dev, u64 mask)
 {
         struct dma_map_ops *dma_ops = get_dma_ops(dev);
 
-        /* Handle legacy PCI devices with limited memory addressability. */
-        if (((dma_ops == gx_pci_dma_map_ops) ||
-            (dma_ops == gx_legacy_pci_dma_map_ops)) &&
-            (mask <= DMA_BIT_MASK(32))) {
-                if (mask > dev->archdata.max_direct_dma_addr)
+        /*
+         * For PCI devices with 64-bit DMA addressing capability, promote
+         * the dma_ops to full capability for both streams and consistent
+         * memory access. For 32-bit capable devices, limit the consistent 
+         * memory DMA range to max_direct_dma_addr.
+         */
+        if (dma_ops == gx_pci_dma_map_ops ||
+            dma_ops == gx_hybrid_pci_dma_map_ops ||
+            dma_ops == gx_legacy_pci_dma_map_ops) {
+                if (mask == DMA_BIT_MASK(64))
+                        set_dma_ops(dev, gx_pci_dma_map_ops);
+                else if (mask > dev->archdata.max_direct_dma_addr)
                         mask = dev->archdata.max_direct_dma_addr;
         }
 
@@ -584,3 +610,21 @@ int dma_set_coherent_mask(struct device *dev, u64 mask)
 }
 EXPORT_SYMBOL(dma_set_coherent_mask);
 #endif
+
+#ifdef ARCH_HAS_DMA_GET_REQUIRED_MASK
+/*
+ * The generic dma_get_required_mask() uses the highest physical address
+ * (max_pfn) to provide the hint to the PCI drivers regarding 32-bit or
+ * 64-bit DMA configuration. Since TILEGx has I/O TLB/MMU, allowing the
+ * DMAs to use the full 64-bit PCI address space and not limited by
+ * the physical memory space, we always let the PCI devices use
+ * 64-bit DMA if they have that capability, by returning the 64-bit
+ * DMA mask here. The device driver has the option to use 32-bit DMA if
+ * the device is not capable of 64-bit DMA.
+ */
+u64 dma_get_required_mask(struct device *dev)
+{
+        return DMA_BIT_MASK(64);
+}
+EXPORT_SYMBOL_GPL(dma_get_required_mask);
+#endif
diff --git a/arch/tile/kernel/pci.c b/arch/tile/kernel/pci.c
index 67237d34c2e2..b7180e6e900d 100644
--- a/arch/tile/kernel/pci.c
+++ b/arch/tile/kernel/pci.c
@@ -20,7 +20,6 @@
 #include <linux/capability.h>
 #include <linux/sched.h>
 #include <linux/errno.h>
-#include <linux/bootmem.h>
 #include <linux/irq.h>
 #include <linux/io.h>
 #include <linux/uaccess.h>
@@ -52,6 +51,8 @@
  *
  */
 
+static int pci_probe = 1;
+
 /*
  * This flag tells if the platform is TILEmpower that needs
  * special configuration for the PLX switch chip.
@@ -144,6 +145,11 @@ int __init tile_pci_init(void)
 {
         int i;
 
+        if (!pci_probe) {
+                pr_info("PCI: disabled by boot argument\n");
+                return 0;
+        }
+
         pr_info("PCI: Searching for controllers...\n");
 
         /* Re-init number of PCIe controllers to support hot-plug feature. */
@@ -192,7 +198,6 @@ int __init tile_pci_init(void)
                         controller->hv_cfg_fd[0] = hv_cfg_fd0;
                         controller->hv_cfg_fd[1] = hv_cfg_fd1;
                         controller->hv_mem_fd = hv_mem_fd;
-                        controller->first_busno = 0;
                         controller->last_busno = 0xff;
                         controller->ops = &tile_cfg_ops;
 
@@ -283,7 +288,7 @@ int __init pcibios_init(void)
          * known to require at least 20ms here, but we use a more
          * conservative value.
          */
-        mdelay(250);
+        msleep(250);
 
         /* Scan all of the recorded PCI controllers.  */
         for (i = 0; i < TILE_NUM_PCIE; i++) {
@@ -304,18 +309,10 @@ int __init pcibios_init(void)
 
                         pr_info("PCI: initializing controller #%d\n", i);
 
-                        /*
-                         * This comes from the generic Linux PCI driver.
-                         *
-                         * It reads the PCI tree for this bus into the Linux
-                         * data structures.
-                         *
-                         * This is inlined in linux/pci.h and calls into
-                         * pci_scan_bus_parented() in probe.c.
-                         */
                         pci_add_resource(&resources, &ioport_resource);
                         pci_add_resource(&resources, &iomem_resource);
-                        bus = pci_scan_root_bus(NULL, 0, controller->ops, controller, &resources);
+                        bus = pci_scan_root_bus(NULL, 0, controller->ops,
+                                                controller, &resources);
                         controller->root_bus = bus;
                         controller->last_busno = bus->busn_res.end;
                 }
@@ -388,6 +385,16 @@ void pcibios_set_master(struct pci_dev *dev)
         /* No special bus mastering setup handling. */
 }
 
+/* Process any "pci=" kernel boot arguments. */
+char *__init pcibios_setup(char *str)
+{
+        if (!strcmp(str, "off")) {
+                pci_probe = 0;
+                return NULL;
+        }
+        return str;
+}
+
 /*
  * Enable memory and/or address decoding, as appropriate, for the
  * device described by the 'dev' struct.
diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c
index 11425633b2d7..a97a6452b812 100644
--- a/arch/tile/kernel/pci_gx.c
+++ b/arch/tile/kernel/pci_gx.c
@@ -69,19 +69,32 @@ static int pcie_rc[TILEGX_NUM_TRIO][TILEGX_TRIO_PCIES];
  * a HW PCIe link-training bug. The exact delay is specified with
  * a kernel boot argument in the form of "pcie_rc_delay=T,P,S",
  * where T is the TRIO instance number, P is the port number and S is
- * the delay in seconds. If the delay is not provided, the value
- * will be DEFAULT_RC_DELAY.
+ * the delay in seconds. If the argument is specified, but the delay is
+ * not provided, the value will be DEFAULT_RC_DELAY.
  */
 static int rc_delay[TILEGX_NUM_TRIO][TILEGX_TRIO_PCIES];
 
 /* Default number of seconds that the PCIe RC port probe can be delayed. */
 #define DEFAULT_RC_DELAY        10
 
-/* Max number of seconds that the PCIe RC port probe can be delayed. */
-#define MAX_RC_DELAY            20
+/* The PCI I/O space size in each PCI domain. */
+#define IO_SPACE_SIZE           0x10000
+
+/* Provide shorter versions of some very long constant names. */
+#define AUTO_CONFIG_RC  \
+        TRIO_PCIE_INTFC_PORT_CONFIG__STRAP_STATE_VAL_AUTO_CONFIG_RC
+#define AUTO_CONFIG_RC_G1       \
+        TRIO_PCIE_INTFC_PORT_CONFIG__STRAP_STATE_VAL_AUTO_CONFIG_RC_G1
+#define AUTO_CONFIG_EP  \
+        TRIO_PCIE_INTFC_PORT_CONFIG__STRAP_STATE_VAL_AUTO_CONFIG_ENDPOINT
+#define AUTO_CONFIG_EP_G1       \
+        TRIO_PCIE_INTFC_PORT_CONFIG__STRAP_STATE_VAL_AUTO_CONFIG_ENDPOINT_G1
 
 /* Array of the PCIe ports configuration info obtained from the BIB. */
-struct pcie_port_property pcie_ports[TILEGX_NUM_TRIO][TILEGX_TRIO_PCIES];
+struct pcie_trio_ports_property pcie_ports[TILEGX_NUM_TRIO];
+
+/* Number of configured TRIO instances. */
+int num_trio_shims;
 
 /* All drivers share the TRIO contexts defined here. */
 gxio_trio_context_t trio_contexts[TILEGX_NUM_TRIO];
@@ -89,24 +102,21 @@ gxio_trio_context_t trio_contexts[TILEGX_NUM_TRIO];
 /* Pointer to an array of PCIe RC controllers. */
 struct pci_controller pci_controllers[TILEGX_NUM_TRIO * TILEGX_TRIO_PCIES];
 int num_rc_controllers;
-static int num_ep_controllers;
 
 static struct pci_ops tile_cfg_ops;
 
 /* Mask of CPUs that should receive PCIe interrupts. */
 static struct cpumask intr_cpus_map;
 
-/*
- * We don't need to worry about the alignment of resources.
- */
+/* We don't need to worry about the alignment of resources. */
 resource_size_t pcibios_align_resource(void *data, const struct resource *res,
-                                resource_size_t size, resource_size_t align)
+                                       resource_size_t size,
+                                       resource_size_t align)
 {
         return res->start;
 }
 EXPORT_SYMBOL(pcibios_align_resource);
 
-
 /*
  * Pick a CPU to receive and handle the PCIe interrupts, based on the IRQ #.
  * For now, we simply send interrupts to non-dataplane CPUs.
@@ -134,24 +144,19 @@ static int tile_irq_cpu(int irq)
         return cpu;
 }
 
-/*
- * Open a file descriptor to the TRIO shim.
- */
+/* Open a file descriptor to the TRIO shim. */
 static int tile_pcie_open(int trio_index)
 {
         gxio_trio_context_t *context = &trio_contexts[trio_index];
         int ret;
+        int mac;
 
-        /*
-         * This opens a file descriptor to the TRIO shim.
-         */
+        /* This opens a file descriptor to the TRIO shim. */
         ret = gxio_trio_init(context, trio_index);
         if (ret < 0)
-                return ret;
+                goto gxio_trio_init_failure;
 
-        /*
-         * Allocate an ASID for the kernel.
-         */
+        /* Allocate an ASID for the kernel. */
         ret = gxio_trio_alloc_asids(context, 1, 0, 0);
         if (ret < 0) {
                 pr_err("PCI: ASID alloc failure on TRIO %d, give up\n",
@@ -189,31 +194,97 @@ static int tile_pcie_open(int trio_index)
         }
 #endif
 
+        /* Get the properties of the PCIe ports on this TRIO instance. */
+        ret = gxio_trio_get_port_property(context, &pcie_ports[trio_index]);
+        if (ret < 0) {
+                pr_err("PCI: PCIE_GET_PORT_PROPERTY failure, error %d,"
+                       " on TRIO %d\n", ret, trio_index);
+                goto get_port_property_failure;
+        }
+
+        context->mmio_base_mac =
+                iorpc_ioremap(context->fd, 0, HV_TRIO_CONFIG_IOREMAP_SIZE);
+        if (context->mmio_base_mac == NULL) {
+                pr_err("PCI: TRIO config space mapping failure, error %d,"
+                       " on TRIO %d\n", ret, trio_index);
+                ret = -ENOMEM;
+
+                goto trio_mmio_mapping_failure;
+        }
+
+        /* Check the port strap state which will override the BIB setting. */
+        for (mac = 0; mac < TILEGX_TRIO_PCIES; mac++) {
+                TRIO_PCIE_INTFC_PORT_CONFIG_t port_config;
+                unsigned int reg_offset;
+
+                /* Ignore ports that are not specified in the BIB. */
+                if (!pcie_ports[trio_index].ports[mac].allow_rc &&
+                    !pcie_ports[trio_index].ports[mac].allow_ep)
+                        continue;
+
+                reg_offset =
+                        (TRIO_PCIE_INTFC_PORT_CONFIG <<
+                                TRIO_CFG_REGION_ADDR__REG_SHIFT) |
+                        (TRIO_CFG_REGION_ADDR__INTFC_VAL_MAC_INTERFACE <<
+                                TRIO_CFG_REGION_ADDR__INTFC_SHIFT) |
+                        (mac << TRIO_CFG_REGION_ADDR__MAC_SEL_SHIFT);
+
+                port_config.word =
+                        __gxio_mmio_read(context->mmio_base_mac + reg_offset);
+
+                if (port_config.strap_state != AUTO_CONFIG_RC &&
+                    port_config.strap_state != AUTO_CONFIG_RC_G1) {
+                        /*
+                         * If this is really intended to be an EP port, record
+                         * it so that the endpoint driver will know about it.
+                         */
+                        if (port_config.strap_state == AUTO_CONFIG_EP ||
+                            port_config.strap_state == AUTO_CONFIG_EP_G1)
+                                pcie_ports[trio_index].ports[mac].allow_ep = 1;
+                }
+        }
+
         return ret;
 
+trio_mmio_mapping_failure:
+get_port_property_failure:
 asid_alloc_failure:
 #ifdef USE_SHARED_PCIE_CONFIG_REGION
 pio_alloc_failure:
 #endif
         hv_dev_close(context->fd);
+gxio_trio_init_failure:
+        context->fd = -1;
 
         return ret;
 }
 
-static void
-tilegx_legacy_irq_ack(struct irq_data *d)
+static int __init tile_trio_init(void)
+{
+        int i;
+
+        /* We loop over all the TRIO shims. */
+        for (i = 0; i < TILEGX_NUM_TRIO; i++) {
+                if (tile_pcie_open(i) < 0)
+                        continue;
+                num_trio_shims++;
+        }
+
+        return 0;
+}
+postcore_initcall(tile_trio_init);
+
+static void tilegx_legacy_irq_ack(struct irq_data *d)
 {
         __insn_mtspr(SPR_IPI_EVENT_RESET_K, 1UL << d->irq);
 }
 
-static void
-tilegx_legacy_irq_mask(struct irq_data *d)
+static void tilegx_legacy_irq_mask(struct irq_data *d)
 {
         __insn_mtspr(SPR_IPI_MASK_SET_K, 1UL << d->irq);
 }
 
-static void
-tilegx_legacy_irq_unmask(struct irq_data *d)
+static void tilegx_legacy_irq_unmask(struct irq_data *d)
 {
         __insn_mtspr(SPR_IPI_MASK_RESET_K, 1UL << d->irq);
 }
@@ -234,8 +305,7 @@ static struct irq_chip tilegx_legacy_irq_chip = {
  * to Linux which just calls handle_level_irq() after clearing the
  * MAC INTx Assert status bit associated with this interrupt.
  */
-static void
-trio_handle_level_irq(unsigned int irq, struct irq_desc *desc)
+static void trio_handle_level_irq(unsigned int irq, struct irq_desc *desc)
 {
         struct pci_controller *controller = irq_desc_get_handler_data(desc);
         gxio_trio_context_t *trio_context = controller->trio;
@@ -301,9 +371,7 @@ static int tile_init_irqs(struct pci_controller *controller)
                         goto free_irqs;
                 }
 
-                /*
-                 * Register the IRQ handler with the kernel.
-                 */
+                /* Register the IRQ handler with the kernel. */
                 irq_set_chip_and_handler(irq, &tilegx_legacy_irq_chip,
                                         trio_handle_level_irq);
                 irq_set_chip_data(irq, (void *)(uint64_t)i);
@@ -320,14 +388,39 @@ free_irqs:
 }
 
 /*
+ * Return 1 if the port is strapped to operate in RC mode.
+ */
+static int
+strapped_for_rc(gxio_trio_context_t *trio_context, int mac)
+{
+        TRIO_PCIE_INTFC_PORT_CONFIG_t port_config;
+        unsigned int reg_offset;
+
+        /* Check the port configuration. */
+        reg_offset =
+                (TRIO_PCIE_INTFC_PORT_CONFIG <<
+                        TRIO_CFG_REGION_ADDR__REG_SHIFT) |
+                (TRIO_CFG_REGION_ADDR__INTFC_VAL_MAC_INTERFACE <<
+                        TRIO_CFG_REGION_ADDR__INTFC_SHIFT) |
+                (mac << TRIO_CFG_REGION_ADDR__MAC_SEL_SHIFT);
+        port_config.word =
+                __gxio_mmio_read(trio_context->mmio_base_mac + reg_offset);
+
+        if (port_config.strap_state == AUTO_CONFIG_RC ||
+            port_config.strap_state == AUTO_CONFIG_RC_G1)
+                return 1;
+        else
+                return 0;
+}
+
+/*
  * Find valid controllers and fill in pci_controller structs for each
  * of them.
  *
- * Returns the number of controllers discovered.
+ * Return the number of controllers discovered.
  */
 int __init tile_pci_init(void)
 {
-        int num_trio_shims = 0;
         int ctl_index = 0;
         int i, j;
 
@@ -338,64 +431,62 @@ int __init tile_pci_init(void)
 
         pr_info("PCI: Searching for controllers...\n");
 
-        /*
-         * We loop over all the TRIO shims.
-         */
-        for (i = 0; i < TILEGX_NUM_TRIO; i++) {
-                int ret;
-
-                ret = tile_pcie_open(i);
-                if (ret < 0)
-                        continue;
-
-                num_trio_shims++;
-        }
-
         if (num_trio_shims == 0 || sim_is_simulator())
                 return 0;
 
         /*
-         * Now determine which PCIe ports are configured to operate in RC mode.
-         * We look at the Board Information Block first and then see if there
-         * are any overriding configuration by the HW strapping pin.
+         * Now determine which PCIe ports are configured to operate in RC
+         * mode. There is a differece in the port configuration capability
+         * between the Gx36 and Gx72 devices.
+         *
+         * The Gx36 has configuration capability for each of the 3 PCIe
+         * interfaces (disable, auto endpoint, auto RC, etc.).
+         * On the Gx72, you can only select one of the 3 PCIe interfaces per
+         * TRIO to train automatically. Further, the allowable training modes
+         * are reduced to four options (auto endpoint, auto RC, stream x1,
+         * stream x4).
+         *
+         * For Gx36 ports, it must be allowed to be in RC mode by the
+         * Board Information Block, and the hardware strapping pins must be
+         * set to RC mode.
+         *
+         * For Gx72 ports, the port will operate in RC mode if either of the
+         * following is true:
+         * 1. It is allowed to be in RC mode by the Board Information Block,
+         *    and the BIB doesn't allow the EP mode.
+         * 2. It is allowed to be in either the RC or the EP mode by the BIB,
+         *    and the hardware strapping pin is set to RC mode.
          */
         for (i = 0; i < TILEGX_NUM_TRIO; i++) {
                 gxio_trio_context_t *context = &trio_contexts[i];
-                int ret;
 
                 if (context->fd < 0)
                         continue;
 
-                ret = hv_dev_pread(context->fd, 0,
-                        (HV_VirtAddr)&pcie_ports[i][0],
-                        sizeof(struct pcie_port_property) * TILEGX_TRIO_PCIES,
-                        GXIO_TRIO_OP_GET_PORT_PROPERTY);
-                if (ret < 0) {
-                        pr_err("PCI: PCIE_GET_PORT_PROPERTY failure, error %d,"
-                                " on TRIO %d\n", ret, i);
-                        continue;
-                }
-
                 for (j = 0; j < TILEGX_TRIO_PCIES; j++) {
-                        if (pcie_ports[i][j].allow_rc) {
+                        int is_rc = 0;
+
+                        if (pcie_ports[i].is_gx72 &&
+                            pcie_ports[i].ports[j].allow_rc) {
+                                if (!pcie_ports[i].ports[j].allow_ep ||
+                                    strapped_for_rc(context, j))
+                                        is_rc = 1;
+                        } else if (pcie_ports[i].ports[j].allow_rc &&
+                                   strapped_for_rc(context, j)) {
+                                is_rc = 1;
+                        }
+                        if (is_rc) {
                                 pcie_rc[i][j] = 1;
                                 num_rc_controllers++;
                         }
-                        else if (pcie_ports[i][j].allow_ep) {
-                                num_ep_controllers++;
-                        }
                 }
         }
 
-        /*
-         * Return if no PCIe ports are configured to operate in RC mode.
-         */
+        /* Return if no PCIe ports are configured to operate in RC mode. */
         if (num_rc_controllers == 0)
                 return 0;
 
-        /*
-         * Set the TRIO pointer and MAC index for each PCIe RC port.
-         */
+        /* Set the TRIO pointer and MAC index for each PCIe RC port. */
         for (i = 0; i < TILEGX_NUM_TRIO; i++) {
                 for (j = 0; j < TILEGX_TRIO_PCIES; j++) {
                         if (pcie_rc[i][j]) {
@@ -411,26 +502,32 @@ int __init tile_pci_init(void)
         }
 
 out:
-        /*
-         * Configure each PCIe RC port.
-         */
+        /* Configure each PCIe RC port. */
         for (i = 0; i < num_rc_controllers; i++) {
-                /*
-                 * Configure the PCIe MAC to run in RC mode.
-                 */
 
+                /* Configure the PCIe MAC to run in RC mode. */
                 struct pci_controller *controller = &pci_controllers[i];
 
                 controller->index = i;
                 controller->ops = &tile_cfg_ops;
 
+                controller->io_space.start = PCIBIOS_MIN_IO +
+                        (i * IO_SPACE_SIZE);
+                controller->io_space.end = controller->io_space.start +
+                        IO_SPACE_SIZE - 1;
+                BUG_ON(controller->io_space.end > IO_SPACE_LIMIT);
+                controller->io_space.flags = IORESOURCE_IO;
+                snprintf(controller->io_space_name,
+                         sizeof(controller->io_space_name),
+                         "PCI I/O domain %d", i);
+                controller->io_space.name = controller->io_space_name;
+
                 /*
                  * The PCI memory resource is located above the PA space.
                  * For every host bridge, the BAR window or the MMIO aperture
                  * is in range [3GB, 4GB - 1] of a 4GB space beyond the
                  * PA space.
                  */
-
                 controller->mem_offset = TILE_PCI_MEM_START +
                         (i * TILE_PCI_BAR_WINDOW_TOP);
                 controller->mem_space.start = controller->mem_offset +
@@ -458,7 +555,6 @@ static int tile_map_irq(const struct pci_dev *dev, u8 device, u8 pin)
         return controller->irq_intx_table[pin - 1];
 }
 
-
 static void fixup_read_and_payload_sizes(struct pci_controller *controller)
 {
         gxio_trio_context_t *trio_context = controller->trio;
@@ -472,9 +568,7 @@ static void fixup_read_and_payload_sizes(struct pci_controller *controller)
 
         mac = controller->mac;
 
-        /*
-         * Set our max read request size to be 4KB.
-         */
+        /* Set our max read request size to be 4KB. */
         reg_offset =
                 (TRIO_PCIE_RC_DEVICE_CONTROL <<
                         TRIO_CFG_REGION_ADDR__REG_SHIFT) |
@@ -483,10 +577,10 @@ static void fixup_read_and_payload_sizes(struct pci_controller *controller)
                 (mac << TRIO_CFG_REGION_ADDR__MAC_SEL_SHIFT);
 
         dev_control.word = __gxio_mmio_read32(trio_context->mmio_base_mac +
-                                                reg_offset);
+                                              reg_offset);
         dev_control.max_read_req_sz = 5;
         __gxio_mmio_write32(trio_context->mmio_base_mac + reg_offset,
-                                                dev_control.word);
+                            dev_control.word);
 
         /*
          * Set the max payload size supported by this Gx PCIe MAC.
@@ -502,19 +596,14 @@ static void fixup_read_and_payload_sizes(struct pci_controller *controller)
                 (mac << TRIO_CFG_REGION_ADDR__MAC_SEL_SHIFT);
 
         rc_dev_cap.word = __gxio_mmio_read32(trio_context->mmio_base_mac +
-                                                reg_offset);
+                                             reg_offset);
         rc_dev_cap.mps_sup = 1;
         __gxio_mmio_write32(trio_context->mmio_base_mac + reg_offset,
-                                                rc_dev_cap.word);
+                            rc_dev_cap.word);
 
         /* Configure PCI Express MPS setting. */
-        list_for_each_entry(child, &root_bus->children, node) {
-                struct pci_dev *self = child->self;
-                if (!self)
-                        continue;
-
-                pcie_bus_configure_settings(child, self->pcie_mpss);
-        }
+        list_for_each_entry(child, &root_bus->children, node)
+                pcie_bus_configure_settings(child);
 
         /*
          * Set the mac_config register in trio based on the MPS/MRS of the link.
@@ -533,7 +622,7 @@ static void fixup_read_and_payload_sizes(struct pci_controller *controller)
                                     dev_control.max_payload_size,
                                     dev_control.max_read_req_sz,
                                     mac);
-        if (err < 0) {
+        if (err < 0) {
                 pr_err("PCI: PCIE_CONFIGURE_MAC_MPS_MRS failure, "
                         "MAC %d on TRIO %d\n",
                         mac, controller->trio_index);
@@ -570,21 +659,14 @@ static int setup_pcie_rc_delay(char *str)
                 if (!isdigit(*str))
                         return -EINVAL;
                 delay = simple_strtoul(str, (char **)&str, 10);
-                if (delay > MAX_RC_DELAY)
-                        return -EINVAL;
         }
 
         rc_delay[trio_index][mac] = delay ? : DEFAULT_RC_DELAY;
-        pr_info("Delaying PCIe RC link training for %u sec"
-                " on MAC %lu on TRIO %lu\n", rc_delay[trio_index][mac],
-                mac, trio_index);
         return 0;
 }
 early_param("pcie_rc_delay", setup_pcie_rc_delay);
 
-/*
- * PCI initialization entry point, called by subsys_initcall.
- */
+/* PCI initialization entry point, called by subsys_initcall. */
 int __init pcibios_init(void)
 {
         resource_size_t offset;
@@ -594,35 +676,10 @@ int __init pcibios_init(void)
 
         tile_pci_init();
 
-        if (num_rc_controllers == 0 && num_ep_controllers == 0)
+        if (num_rc_controllers == 0)
                 return 0;
 
         /*
-         * We loop over all the TRIO shims and set up the MMIO mappings.
-         */
-        for (i = 0; i < TILEGX_NUM_TRIO; i++) {
-                gxio_trio_context_t *context = &trio_contexts[i];
-
-                if (context->fd < 0)
-                        continue;
-
-                /*
-                 * Map in the MMIO space for the MAC.
-                 */
-                offset = 0;
-                context->mmio_base_mac =
-                        iorpc_ioremap(context->fd, offset,
-                                      HV_TRIO_CONFIG_IOREMAP_SIZE);
-                if (context->mmio_base_mac == NULL) {
-                        pr_err("PCI: MAC map failure on TRIO %d\n", i);
-
-                        hv_dev_close(context->fd);
-                        context->fd = -1;
-                        continue;
-                }
-        }
-
-        /*
          * Delay a bit in case devices aren't ready.  Some devices are
          * known to require at least 20ms here, but we use a more
          * conservative value.
@@ -633,7 +690,6 @@ int __init pcibios_init(void)
         for (next_busno = 0, i = 0; i < num_rc_controllers; i++) {
                 struct pci_controller *controller = &pci_controllers[i];
                 gxio_trio_context_t *trio_context = controller->trio;
-                TRIO_PCIE_INTFC_PORT_CONFIG_t port_config;
                 TRIO_PCIE_INTFC_PORT_STATUS_t port_status;
                 TRIO_PCIE_INTFC_TX_FIFO_CTL_t tx_fifo_ctl;
                 struct pci_bus *bus;
@@ -650,75 +706,64 @@ int __init pcibios_init(void)
                 mac = controller->mac;
 
                 /*
-                 * Check the port strap state which will override the BIB
-                 * setting.
+                 * Check for PCIe link-up status to decide if we need
+                 * to force the link to come up.
                  */
-
                 reg_offset =
-                        (TRIO_PCIE_INTFC_PORT_CONFIG <<
+                        (TRIO_PCIE_INTFC_PORT_STATUS <<
                                 TRIO_CFG_REGION_ADDR__REG_SHIFT) |
                         (TRIO_CFG_REGION_ADDR__INTFC_VAL_MAC_INTERFACE <<
-                                TRIO_CFG_REGION_ADDR__INTFC_SHIFT ) |
+                                TRIO_CFG_REGION_ADDR__INTFC_SHIFT) |
                         (mac << TRIO_CFG_REGION_ADDR__MAC_SEL_SHIFT);
 
-                port_config.word =
+                port_status.word =
                         __gxio_mmio_read(trio_context->mmio_base_mac +
                                          reg_offset);
-
-                if ((port_config.strap_state !=
-                        TRIO_PCIE_INTFC_PORT_CONFIG__STRAP_STATE_VAL_AUTO_CONFIG_RC) &&
-                        (port_config.strap_state !=
-                        TRIO_PCIE_INTFC_PORT_CONFIG__STRAP_STATE_VAL_AUTO_CONFIG_RC_G1)) {
-                        /*
-                         * If this is really intended to be an EP port,
-                         * record it so that the endpoint driver will know about it.
-                         */
-                        if (port_config.strap_state ==
-                        TRIO_PCIE_INTFC_PORT_CONFIG__STRAP_STATE_VAL_AUTO_CONFIG_ENDPOINT ||
-                        port_config.strap_state ==
-                        TRIO_PCIE_INTFC_PORT_CONFIG__STRAP_STATE_VAL_AUTO_CONFIG_ENDPOINT_G1)
-                                pcie_ports[trio_index][mac].allow_ep = 1;
-
-                        continue;
+                if (!port_status.dl_up) {
+                        if (rc_delay[trio_index][mac]) {
+                                pr_info("Delaying PCIe RC TRIO init %d sec"
+                                        " on MAC %d on TRIO %d\n",
+                                        rc_delay[trio_index][mac], mac,
+                                        trio_index);
+                                msleep(rc_delay[trio_index][mac] * 1000);
+                        }
+                        ret = gxio_trio_force_rc_link_up(trio_context, mac);
+                        if (ret < 0)
+                                pr_err("PCI: PCIE_FORCE_LINK_UP failure, "
+                                        "MAC %d on TRIO %d\n", mac, trio_index);
                 }
 
-                /*
-                 * Delay the RC link training if needed.
-                 */
-                if (rc_delay[trio_index][mac])
-                        msleep(rc_delay[trio_index][mac] * 1000);
-
-                ret = gxio_trio_force_rc_link_up(trio_context, mac);
-                if (ret < 0)
-                        pr_err("PCI: PCIE_FORCE_LINK_UP failure, "
-                                "MAC %d on TRIO %d\n", mac, trio_index);
-
                 pr_info("PCI: Found PCI controller #%d on TRIO %d MAC %d\n", i,
                         trio_index, controller->mac);
 
-                /*
-                 * Wait a bit here because some EP devices take longer
-                 * to come up.
-                 */
-                msleep(1000);
-
-                /*
-                 * Check for PCIe link-up status.
-                 */
-
-                reg_offset =
-                        (TRIO_PCIE_INTFC_PORT_STATUS <<
-                                TRIO_CFG_REGION_ADDR__REG_SHIFT) |
-                        (TRIO_CFG_REGION_ADDR__INTFC_VAL_MAC_INTERFACE <<
-                                TRIO_CFG_REGION_ADDR__INTFC_SHIFT ) |
-                        (mac << TRIO_CFG_REGION_ADDR__MAC_SEL_SHIFT);
+                /* Delay the bus probe if needed. */
+                if (rc_delay[trio_index][mac]) {
+                        pr_info("Delaying PCIe RC bus enumerating %d sec"
+                                " on MAC %d on TRIO %d\n",
+                                rc_delay[trio_index][mac], mac,
+                                trio_index);
+                        msleep(rc_delay[trio_index][mac] * 1000);
+                } else {
+                        /*
+                         * Wait a bit here because some EP devices
+                         * take longer to come up.
+                         */
+                        msleep(1000);
+                }
 
+                /* Check for PCIe link-up status again. */
                 port_status.word =
                         __gxio_mmio_read(trio_context->mmio_base_mac +
                                          reg_offset);
                 if (!port_status.dl_up) {
-                        pr_err("PCI: link is down, MAC %d on TRIO %d\n",
-                                mac, trio_index);
+                        if (pcie_ports[trio_index].ports[mac].removable) {
+                                pr_info("PCI: link is down, MAC %d on TRIO %d\n",
+                                        mac, trio_index);
+                                pr_info("This is expected if no PCIe card"
+                                        " is connected to this link\n");
+                        } else
+                                pr_err("PCI: link is down, MAC %d on TRIO %d\n",
+                                        mac, trio_index);
                         continue;
                 }
 
@@ -744,7 +789,6 @@ int __init pcibios_init(void)
                  * Change the device ID so that Linux bus crawl doesn't confuse
                  * the internal bridge with any Tilera endpoints.
                  */
-
                 reg_offset =
                         (TRIO_PCIE_RC_DEVICE_ID_VEN_ID <<
                                 TRIO_CFG_REGION_ADDR__REG_SHIFT) |
@@ -757,10 +801,7 @@ int __init pcibios_init(void)
                                     TRIO_PCIE_RC_DEVICE_ID_VEN_ID__DEV_ID_SHIFT) |
                                     TILERA_VENDOR_ID);
 
-                /*
-                 * Set the internal P2P bridge class code.
-                 */
-
+                /* Set the internal P2P bridge class code. */
                 reg_offset =
                         (TRIO_PCIE_RC_REVISION_ID <<
                                 TRIO_CFG_REGION_ADDR__REG_SHIFT) |
@@ -771,26 +812,22 @@ int __init pcibios_init(void)
                 class_code_revision =
                         __gxio_mmio_read32(trio_context->mmio_base_mac +
                                            reg_offset);
-                class_code_revision = (class_code_revision & 0xff ) |
-                                        (PCI_CLASS_BRIDGE_PCI << 16);
+                class_code_revision = (class_code_revision & 0xff) |
+                        (PCI_CLASS_BRIDGE_PCI << 16);
 
                 __gxio_mmio_write32(trio_context->mmio_base_mac +
                                     reg_offset, class_code_revision);
 
 #ifdef USE_SHARED_PCIE_CONFIG_REGION
 
-                /*
-                 * Map in the MMIO space for the PIO region.
-                 */
+                /* Map in the MMIO space for the PIO region. */
                 offset = HV_TRIO_PIO_OFFSET(trio_context->pio_cfg_index) |
                         (((unsigned long long)mac) <<
                         TRIO_TILE_PIO_REGION_SETUP_CFG_ADDR__MAC_SHIFT);
 
 #else
 
-                /*
-                 * Alloc a PIO region for PCI config access per MAC.
-                 */
+                /* Alloc a PIO region for PCI config access per MAC. */
                 ret = gxio_trio_alloc_pio_regions(trio_context, 1, 0, 0);
                 if (ret < 0) {
                         pr_err("PCI: PCI CFG PIO alloc failure for mac %d "
@@ -801,9 +838,7 @@ int __init pcibios_init(void)
 
                 trio_context->pio_cfg_index[mac] = ret;
 
-                /*
-                 * For PIO CFG, the bus_address_hi parameter is 0.
-                 */
+                /* For PIO CFG, the bus_address_hi parameter is 0. */
                 ret = gxio_trio_init_pio_region_aux(trio_context,
                         trio_context->pio_cfg_index[mac],
                         mac, 0, HV_TRIO_PIO_FLAG_CONFIG_SPACE);
@@ -820,9 +855,15 @@ int __init pcibios_init(void)
 
 #endif
 
+                /*
+                 * To save VMALLOC space, we take advantage of the fact that
+                 * bit 29 in the PIO CFG address format is reserved 0. With
+                 * TRIO_TILE_PIO_REGION_SETUP_CFG_ADDR__MAC_SHIFT being 30,
+                 * this cuts VMALLOC space usage from 1GB to 512MB per mac.
+                 */
                 trio_context->mmio_base_pio_cfg[mac] =
-                        iorpc_ioremap(trio_context->fd, offset,
-                        (1 << TRIO_TILE_PIO_REGION_SETUP_CFG_ADDR__MAC_SHIFT));
+                        iorpc_ioremap(trio_context->fd, offset, (1UL <<
+                        (TRIO_TILE_PIO_REGION_SETUP_CFG_ADDR__MAC_SHIFT - 1)));
                 if (trio_context->mmio_base_pio_cfg[mac] == NULL) {
                         pr_err("PCI: PIO map failure for mac %d on TRIO %d\n",
                                 mac, trio_index);
@@ -830,9 +871,7 @@ int __init pcibios_init(void)
                         continue;
                 }
 
-                /*
-                 * Initialize the PCIe interrupts.
-                 */
+                /* Initialize the PCIe interrupts. */
                 if (tile_init_irqs(controller)) {
                         pr_err("PCI: IRQs init failure for mac %d on TRIO %d\n",
                                 mac, trio_index);
@@ -843,17 +882,16 @@ int __init pcibios_init(void)
                 /*
                  * The PCI memory resource is located above the PA space.
                  * The memory range for the PCI root bus should not overlap
-                 * with the physical RAM
+                 * with the physical RAM.
                  */
                 pci_add_resource_offset(&resources, &controller->mem_space,
                                         controller->mem_offset);
-
+                pci_add_resource(&resources, &controller->io_space);
                 controller->first_busno = next_busno;
                 bus = pci_scan_root_bus(NULL, next_busno, controller->ops,
                                         controller, &resources);
                 controller->root_bus = bus;
                 next_busno = bus->busn_res.end + 1;
-
         }
 
         /* Do machine dependent PCI interrupt routing */
@@ -865,7 +903,6 @@ int __init pcibios_init(void)
          * It allocates all of the resources (I/O memory, etc)
          * associated with the devices read in above.
          */
-
         pci_assign_unassigned_resources();
 
         /* Record the I/O resources in the PCI controller structure. */
@@ -873,9 +910,6 @@ int __init pcibios_init(void)
                 struct pci_controller *controller = &pci_controllers[i];
                 gxio_trio_context_t *trio_context = controller->trio;
                 struct pci_bus *root_bus = pci_controllers[i].root_bus;
-                struct pci_bus *next_bus;
-                uint32_t bus_address_hi;
-                struct pci_dev *dev;
                 int ret;
                 int j;
 
@@ -889,43 +923,12 @@ int __init pcibios_init(void)
                 /* Configure the max_payload_size values for this domain. */
                 fixup_read_and_payload_sizes(controller);
 
-                list_for_each_entry(dev, &root_bus->devices, bus_list) {
-                        /* Find the PCI host controller, ie. the 1st bridge. */
-                        if ((dev->class >> 8) == PCI_CLASS_BRIDGE_PCI &&
-                                (PCI_SLOT(dev->devfn) == 0)) {
-                                next_bus = dev->subordinate;
-                                pci_controllers[i].mem_resources[0] =
-                                        *next_bus->resource[0];
-                                pci_controllers[i].mem_resources[1] =
-                                         *next_bus->resource[1];
-                                pci_controllers[i].mem_resources[2] =
-                                         *next_bus->resource[2];
-
-                                break;
-                        }
-                }
-
-                if (pci_controllers[i].mem_resources[1].flags & IORESOURCE_MEM)
-                        bus_address_hi =
-                                pci_controllers[i].mem_resources[1].start >> 32;
-                else if (pci_controllers[i].mem_resources[2].flags & IORESOURCE_PREFETCH)
-                        bus_address_hi =
-                                pci_controllers[i].mem_resources[2].start >> 32;
-                else {
-                        /* This is unlikely. */
-                        pr_err("PCI: no memory resources on TRIO %d mac %d\n",
-                                controller->trio_index, controller->mac);
-                        continue;
-                }
-
-                /*
-                 * Alloc a PIO region for PCI memory access for each RC port.
-                 */
+                /* Alloc a PIO region for PCI memory access for each RC port. */
                 ret = gxio_trio_alloc_pio_regions(trio_context, 1, 0, 0);
                 if (ret < 0) {
                         pr_err("PCI: MEM PIO alloc failure on TRIO %d mac %d, "
-                                "give up\n", controller->trio_index,
-                                controller->mac);
+                               "give up\n", controller->trio_index,
+                               controller->mac);
 
                         continue;
                 }
@@ -943,12 +946,45 @@ int __init pcibios_init(void)
                                                     0);
                 if (ret < 0) {
                         pr_err("PCI: MEM PIO init failure on TRIO %d mac %d, "
-                                "give up\n", controller->trio_index,
-                                controller->mac);
+                               "give up\n", controller->trio_index,
+                               controller->mac);
+
+                        continue;
+                }
+
+#ifdef CONFIG_TILE_PCI_IO
+                /*
+                 * Alloc a PIO region for PCI I/O space access for each RC port.
+                 */
+                ret = gxio_trio_alloc_pio_regions(trio_context, 1, 0, 0);
+                if (ret < 0) {
+                        pr_err("PCI: I/O PIO alloc failure on TRIO %d mac %d, "
+                               "give up\n", controller->trio_index,
+                               controller->mac);
 
                         continue;
                 }
 
+                controller->pio_io_index = ret;
+
+                /*
+                 * For PIO IO, the bus_address_hi parameter is hard-coded 0
+                 * because PCI I/O address space is 32-bit.
+                 */
+                ret = gxio_trio_init_pio_region_aux(trio_context,
+                                                    controller->pio_io_index,
+                                                    controller->mac,
+                                                    0,
+                                                    HV_TRIO_PIO_FLAG_IO_SPACE);
+                if (ret < 0) {
+                        pr_err("PCI: I/O PIO init failure on TRIO %d mac %d, "
+                               "give up\n", controller->trio_index,
+                               controller->mac);
+
+                        continue;
+                }
+#endif
+
                 /*
                  * Configure a Mem-Map region for each memory controller so
                  * that Linux can map all of its PA space to the PCI bus.
@@ -963,9 +999,9 @@ int __init pcibios_init(void)
                                                           0);
                         if (ret < 0) {
                                 pr_err("PCI: Mem-Map alloc failure on TRIO %d "
-                                        "mac %d for MC %d, give up\n",
-                                        controller->trio_index,
-                                        controller->mac, j);
+                                       "mac %d for MC %d, give up\n",
+                                       controller->trio_index,
+                                       controller->mac, j);
 
                                 goto alloc_mem_map_failed;
                         }
@@ -996,9 +1032,9 @@ int __init pcibios_init(void)
                                 GXIO_TRIO_ORDER_MODE_UNORDERED);
                         if (ret < 0) {
                                 pr_err("PCI: Mem-Map init failure on TRIO %d "
-                                        "mac %d for MC %d, give up\n",
-                                        controller->trio_index,
-                                        controller->mac, j);
+                                       "mac %d for MC %d, give up\n",
+                                       controller->trio_index,
+                                       controller->mac, j);
 
                                 goto alloc_mem_map_failed;
                         }
@@ -1007,23 +1043,19 @@ int __init pcibios_init(void)
 alloc_mem_map_failed:
                         break;
                 }
-
         }
 
         return 0;
 }
 subsys_initcall(pcibios_init);
 
-/* Note: to be deleted after Linux 3.6 merge. */
+/* No bus fixups needed. */
 void pcibios_fixup_bus(struct pci_bus *bus)
 {
 }
 
-/*
- * This can be called from the generic PCI layer, but doesn't need to
- * do anything.
- */
-char *pcibios_setup(char *str)
+/* Process any "pci=" kernel boot arguments. */
+char *__init pcibios_setup(char *str)
 {
         if (!strcmp(str, "off")) {
                 pci_probe = 0;
@@ -1034,8 +1066,7 @@ char *pcibios_setup(char *str)
 
 /*
  * Enable memory address decoding, as appropriate, for the
- * device described by the 'dev' struct. The I/O decoding
- * is disabled, though the TILE-Gx supports I/O addressing.
+ * device described by the 'dev' struct.
  *
  * This is called from the generic PCI layer, and can be called
  * for bridges or endpoints.
@@ -1045,13 +1076,24 @@ int pcibios_enable_device(struct pci_dev *dev, int mask)
         return pci_enable_resources(dev, mask);
 }
 
-/* Called for each device after PCI setup is done. */
+/*
+ * Called for each device after PCI setup is done.
+ * We initialize the PCI device capabilities conservatively, assuming that
+ * all devices can only address the 32-bit DMA space. The exception here is
+ * that the device dma_offset is set to the value that matches the 64-bit
+ * capable devices. This is OK because dma_offset is not used by legacy
+ * dma_ops, nor by the hybrid dma_ops's streaming DMAs, which are 64-bit ops.
+ * This implementation matches the kernel design of setting PCI devices'
+ * coherent_dma_mask to 0xffffffffull by default, allowing the device drivers
+ * to skip calling pci_set_consistent_dma_mask(DMA_BIT_MASK(32)).
+ */
 static void pcibios_fixup_final(struct pci_dev *pdev)
 {
-        set_dma_ops(&pdev->dev, gx_pci_dma_map_ops);
+        set_dma_ops(&pdev->dev, gx_legacy_pci_dma_map_ops);
         set_dma_offset(&pdev->dev, TILE_PCI_MEM_MAP_BASE_OFFSET);
         pdev->dev.archdata.max_direct_dma_addr =
                 TILE_PCI_MAX_DIRECT_DMA_ADDRESS;
+        pdev->dev.coherent_dma_mask = TILE_PCI_MAX_DIRECT_DMA_ADDRESS;
 }
 DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, pcibios_fixup_final);
 
@@ -1065,19 +1107,15 @@ void __iomem *ioremap(resource_size_t phys_addr, unsigned long size)
         resource_size_t start;
         resource_size_t end;
         int trio_fd;
-        int i, j;
+        int i;
 
         start = phys_addr;
         end = phys_addr + size - 1;
 
         /*
-         * In the following, each PCI controller's mem_resources[1]
-         * represents its (non-prefetchable) PCI memory resource and
-         * mem_resources[2] refers to its prefetchable PCI memory resource.
-         * By searching phys_addr in each controller's mem_resources[], we can
+         * By searching phys_addr in each controller's mem_space, we can
          * determine the controller that should accept the PCI memory access.
          */
-
         for (i = 0; i < num_rc_controllers; i++) {
                 /*
                  * Skip controllers that are not properly initialized or
@@ -1086,25 +1124,18 @@ void __iomem *ioremap(resource_size_t phys_addr, unsigned long size)
                 if (pci_controllers[i].root_bus == NULL)
                         continue;
 
-                for (j = 1; j < 3; j++) {
-                        bar_start =
-                                pci_controllers[i].mem_resources[j].start;
-                        bar_end =
-                                pci_controllers[i].mem_resources[j].end;
+                bar_start = pci_controllers[i].mem_space.start;
+                bar_end = pci_controllers[i].mem_space.end;
 
-                        if ((start >= bar_start) && (end <= bar_end)) {
-
-                                controller = &pci_controllers[i];
-
-                                goto got_it;
-                        }
+                if ((start >= bar_start) && (end <= bar_end)) {
+                        controller = &pci_controllers[i];
+                        break;
                 }
         }
 
         if (controller == NULL)
                 return NULL;
 
-got_it:
         trio_fd = controller->trio->fd;
 
         /* Convert the resource start to the bus address offset. */
@@ -1112,14 +1143,71 @@ got_it:
 
         offset = HV_TRIO_PIO_OFFSET(controller->pio_mem_index) + start;
 
-        /*
-         * We need to keep the PCI bus address's in-page offset in the VA.
-         */
+        /* We need to keep the PCI bus address's in-page offset in the VA. */
         return iorpc_ioremap(trio_fd, offset, size) +
-                (phys_addr & (PAGE_SIZE - 1));
+                (start & (PAGE_SIZE - 1));
 }
 EXPORT_SYMBOL(ioremap);
 
+#ifdef CONFIG_TILE_PCI_IO
+/* Map a PCI I/O address into VA space. */
+void __iomem *ioport_map(unsigned long port, unsigned int size)
+{
+        struct pci_controller *controller = NULL;
+        resource_size_t bar_start;
+        resource_size_t bar_end;
+        resource_size_t offset;
+        resource_size_t start;
+        resource_size_t end;
+        int trio_fd;
+        int i;
+
+        start = port;
+        end = port + size - 1;
+
+        /*
+         * By searching the port in each controller's io_space, we can
+         * determine the controller that should accept the PCI I/O access.
+         */
+        for (i = 0; i < num_rc_controllers; i++) {
+                /*
+                 * Skip controllers that are not properly initialized or
+                 * have down links.
+                 */
+                if (pci_controllers[i].root_bus == NULL)
+                        continue;
+
+                bar_start = pci_controllers[i].io_space.start;
+                bar_end = pci_controllers[i].io_space.end;
+
+                if ((start >= bar_start) && (end <= bar_end)) {
+                        controller = &pci_controllers[i];
+                        break;
+                }
+        }
+
+        if (controller == NULL)
+                return NULL;
+
+        trio_fd = controller->trio->fd;
+
+        /* Convert the resource start to the bus address offset. */
+        port -= controller->io_space.start;
+
+        offset = HV_TRIO_PIO_OFFSET(controller->pio_io_index) + port;
+
+        /* We need to keep the PCI bus address's in-page offset in the VA. */
+        return iorpc_ioremap(trio_fd, offset, size) + (port & (PAGE_SIZE - 1));
+}
+EXPORT_SYMBOL(ioport_map);
+
+void ioport_unmap(void __iomem *addr)
+{
+        iounmap(addr);
+}
+EXPORT_SYMBOL(ioport_unmap);
+#endif
+
 void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
 {
         iounmap(addr);
@@ -1141,7 +1229,6 @@ EXPORT_SYMBOL(pci_iounmap);
  * offset is in bytes, from the start of config space for the
  * specified bus & device.
  */
-
 static int tile_cfg_read(struct pci_bus *bus, unsigned int devfn, int offset,
                          int size, u32 *val)
 {
@@ -1191,7 +1278,6 @@ static int tile_cfg_read(struct pci_bus *bus, unsigned int devfn, int offset,
          * Accesses to the directly attached device have to be
          * sent as type-0 configs.
          */
-
         if (busnum == (controller->first_busno + 1)) {
                 /*
                  * There is only one device off of our built-in P2P bridge.
@@ -1213,9 +1299,8 @@ static int tile_cfg_read(struct pci_bus *bus, unsigned int devfn, int offset,
          * Note that we don't set the mac field in cfg_addr because the
          * mapping is per port.
          */
-
         mmio_addr = trio_context->mmio_base_pio_cfg[controller->mac] +
-                        cfg_addr.word;
+                cfg_addr.word;
 
 valid_device:
 
@@ -1319,7 +1404,6 @@ static int tile_cfg_write(struct pci_bus *bus, unsigned int devfn, int offset,
          * Accesses to the directly attached device have to be
          * sent as type-0 configs.
          */
-
         if (busnum == (controller->first_busno + 1)) {
                 /*
                  * There is only one device off of our built-in P2P bridge.
@@ -1341,7 +1425,6 @@ static int tile_cfg_write(struct pci_bus *bus, unsigned int devfn, int offset,
          * Note that we don't set the mac field in cfg_addr because the
          * mapping is per port.
          */
-
         mmio_addr = trio_context->mmio_base_pio_cfg[controller->mac] +
                         cfg_addr.word;
 
@@ -1379,11 +1462,8 @@ static struct pci_ops tile_cfg_ops = {
 };
 
 
-/*
- * MSI support starts here.
- */
-static unsigned int
-tilegx_msi_startup(struct irq_data *d)
+/* MSI support starts here. */
+static unsigned int tilegx_msi_startup(struct irq_data *d)
 {
         if (d->msi_desc)
                 unmask_msi_irq(d);
@@ -1391,21 +1471,18 @@ tilegx_msi_startup(struct irq_data *d)
         return 0;
 }
 
-static void
-tilegx_msi_ack(struct irq_data *d)
+static void tilegx_msi_ack(struct irq_data *d)
 {
         __insn_mtspr(SPR_IPI_EVENT_RESET_K, 1UL << d->irq);
 }
 
-static void
-tilegx_msi_mask(struct irq_data *d)
+static void tilegx_msi_mask(struct irq_data *d)
 {
         mask_msi_irq(d);
         __insn_mtspr(SPR_IPI_MASK_SET_K, 1UL << d->irq);
 }
 
-static void
-tilegx_msi_unmask(struct irq_data *d)
+static void tilegx_msi_unmask(struct irq_data *d)
 {
         __insn_mtspr(SPR_IPI_MASK_RESET_K, 1UL << d->irq);
         unmask_msi_irq(d);
@@ -1462,32 +1539,55 @@ int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
         trio_context = controller->trio;
 
         /*
-         * Allocate the Mem-Map that will accept the MSI write and
-         * trigger the TILE-side interrupts.
+         * Allocate a scatter-queue that will accept the MSI write and
+         * trigger the TILE-side interrupts. We use the scatter-queue regions
+         * before the mem map regions, because the latter are needed by more
+         * applications.
          */
-        mem_map = gxio_trio_alloc_memory_maps(trio_context, 1, 0, 0);
-        if (mem_map < 0) {
-                dev_printk(KERN_INFO, &pdev->dev,
-                        "%s Mem-Map alloc failure. "
-                        "Failed to initialize MSI interrupts. "
-                        "Falling back to legacy interrupts.\n",
-                        desc->msi_attrib.is_msix ? "MSI-X" : "MSI");
+        mem_map = gxio_trio_alloc_scatter_queues(trio_context, 1, 0, 0);
+        if (mem_map >= 0) {
+                TRIO_MAP_SQ_DOORBELL_FMT_t doorbell_template = {{
+                        .pop = 0,
+                        .doorbell = 1,
+                }};
+
+                mem_map += TRIO_NUM_MAP_MEM_REGIONS;
+                mem_map_base = MEM_MAP_INTR_REGIONS_BASE +
+                        mem_map * MEM_MAP_INTR_REGION_SIZE;
+                mem_map_limit = mem_map_base + MEM_MAP_INTR_REGION_SIZE - 1;
+
+                msi_addr = mem_map_base + MEM_MAP_INTR_REGION_SIZE - 8;
+                msg.data = (unsigned int)doorbell_template.word;
+        } else {
+                /* SQ regions are out, allocate from map mem regions. */
+                mem_map = gxio_trio_alloc_memory_maps(trio_context, 1, 0, 0);
+                if (mem_map < 0) {
+                        dev_printk(KERN_INFO, &pdev->dev,
+                                "%s Mem-Map alloc failure. "
+                                "Failed to initialize MSI interrupts. "
+                                "Falling back to legacy interrupts.\n",
+                                desc->msi_attrib.is_msix ? "MSI-X" : "MSI");
+                        ret = -ENOMEM;
+                        goto msi_mem_map_alloc_failure;
+                }
 
-                ret = -ENOMEM;
-                goto msi_mem_map_alloc_failure;
+                mem_map_base = MEM_MAP_INTR_REGIONS_BASE +
+                        mem_map * MEM_MAP_INTR_REGION_SIZE;
+                mem_map_limit = mem_map_base + MEM_MAP_INTR_REGION_SIZE - 1;
+
+                msi_addr = mem_map_base + TRIO_MAP_MEM_REG_INT3 -
+                        TRIO_MAP_MEM_REG_INT0;
+
+                msg.data = mem_map;
         }
 
         /* We try to distribute different IRQs to different tiles. */
         cpu = tile_irq_cpu(irq);
 
         /*
-         * Now call up to the HV to configure the Mem-Map interrupt and
+         * Now call up to the HV to configure the MSI interrupt and
          * set up the IPI binding.
          */
-        mem_map_base = MEM_MAP_INTR_REGIONS_BASE +
-                mem_map * MEM_MAP_INTR_REGION_SIZE;
-        mem_map_limit = mem_map_base + MEM_MAP_INTR_REGION_SIZE - 1;
-
         ret = gxio_trio_config_msi_intr(trio_context, cpu_x(cpu), cpu_y(cpu),
                                         KERNEL_PL, irq, controller->mac,
                                         mem_map, mem_map_base, mem_map_limit,
@@ -1500,13 +1600,9 @@ int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)
 
         irq_set_msi_desc(irq, desc);
 
-        msi_addr = mem_map_base + TRIO_MAP_MEM_REG_INT3 - TRIO_MAP_MEM_REG_INT0;
-
         msg.address_hi = msi_addr >> 32;
         msg.address_lo = msi_addr & 0xffffffff;
 
-        msg.data = mem_map;
-
         write_msi_msg(irq, &msg);
         irq_set_chip_and_handler(irq, &tilegx_msi_chip, handle_level_irq);
         irq_set_handler_data(irq, controller);
diff --git a/arch/tile/kernel/proc.c b/arch/tile/kernel/proc.c
index dafc447b5125..681100c59fda 100644
--- a/arch/tile/kernel/proc.c
+++ b/arch/tile/kernel/proc.c
@@ -113,7 +113,6 @@ arch_initcall(proc_tile_init);
  * Support /proc/sys/tile directory
  */
 
-#ifndef __tilegx__  /* FIXME: GX: no support for unaligned access yet */
 static ctl_table unaligned_subtable[] = {
         {
                 .procname       = "enabled",
@@ -160,4 +159,3 @@ static int __init proc_sys_tile_init(void)
 }
 
 arch_initcall(proc_sys_tile_init);
-#endif
diff --git a/arch/tile/kernel/process.c b/arch/tile/kernel/process.c
index 8ac304484f98..16ed58948757 100644
--- a/arch/tile/kernel/process.c
+++ b/arch/tile/kernel/process.c
@@ -33,6 +33,7 @@
 #include <asm/syscalls.h>
 #include <asm/traps.h>
 #include <asm/setup.h>
+#include <asm/uaccess.h>
 #ifdef CONFIG_HARDWALL
 #include <asm/hardwall.h>
 #endif
@@ -74,19 +75,6 @@ void arch_release_thread_info(struct thread_info *info)
 {
         struct single_step_state *step_state = info->step_state;
 
-#ifdef CONFIG_HARDWALL
-        /*
-         * We free a thread_info from the context of the task that has
-         * been scheduled next, so the original task is already dead.
-         * Calling deactivate here just frees up the data structures.
-         * If the task we're freeing held the last reference to a
-         * hardwall fd, it would have been released prior to this point
-         * anyway via exit_files(), and the hardwall_task.info pointers
-         * would be NULL by now.
-         */
-        hardwall_deactivate_all(info->task);
-#endif
-
         if (step_state) {
 
                 /*
@@ -160,6 +148,14 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
          */
         task_thread_info(p)->step_state = NULL;
 
+#ifdef __tilegx__
+        /*
+         * Do not clone unalign jit fixup from the parent; each thread
+         * must allocate its own on demand.
+         */
+        task_thread_info(p)->unalign_jit_base = NULL;
+#endif
+
         /*
          * Copy the registers onto the kernel stack so the
          * return-from-interrupt code will reload it into registers.
@@ -191,16 +187,8 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
         memset(&p->thread.dma_async_tlb, 0, sizeof(struct async_tlb));
 #endif
 
-#if CHIP_HAS_SN_PROC()
-        /* Likewise, the new thread is not running static processor code. */
-        p->thread.sn_proc_running = 0;
-        memset(&p->thread.sn_async_tlb, 0, sizeof(struct async_tlb));
-#endif
-
-#if CHIP_HAS_PROC_STATUS_SPR()
         /* New thread has its miscellaneous processor state bits clear. */
         p->thread.proc_status = 0;
-#endif
 
 #ifdef CONFIG_HARDWALL
         /* New thread does not own any networks. */
@@ -218,19 +206,32 @@ int copy_thread(unsigned long clone_flags, unsigned long sp,
         return 0;
 }
 
+int set_unalign_ctl(struct task_struct *tsk, unsigned int val)
+{
+        task_thread_info(tsk)->align_ctl = val;
+        return 0;
+}
+
+int get_unalign_ctl(struct task_struct *tsk, unsigned long adr)
+{
+        return put_user(task_thread_info(tsk)->align_ctl,
+                        (unsigned int __user *)adr);
+}
+
+static struct task_struct corrupt_current = { .comm = "<corrupt>" };
+
 /*
  * Return "current" if it looks plausible, or else a pointer to a dummy.
  * This can be helpful if we are just trying to emit a clean panic.
  */
 struct task_struct *validate_current(void)
 {
-        static struct task_struct corrupt = { .comm = "<corrupt>" };
         struct task_struct *tsk = current;
         if (unlikely((unsigned long)tsk < PAGE_OFFSET ||
                      (high_memory && (void *)tsk > high_memory) ||
                      ((unsigned long)tsk & (__alignof__(*tsk) - 1)) != 0)) {
                 pr_err("Corrupt 'current' %p (sp %#lx)\n", tsk, stack_pointer);
-                tsk = &corrupt;
+                tsk = &corrupt_current;
         }
         return tsk;
 }
@@ -369,15 +370,11 @@ static void save_arch_state(struct thread_struct *t)
         t->system_save[2] = __insn_mfspr(SPR_SYSTEM_SAVE_0_2);
         t->system_save[3] = __insn_mfspr(SPR_SYSTEM_SAVE_0_3);
         t->intctrl_0 = __insn_mfspr(SPR_INTCTRL_0_STATUS);
-#if CHIP_HAS_PROC_STATUS_SPR()
         t->proc_status = __insn_mfspr(SPR_PROC_STATUS);
-#endif
 #if !CHIP_HAS_FIXED_INTVEC_BASE()
         t->interrupt_vector_base = __insn_mfspr(SPR_INTERRUPT_VECTOR_BASE_0);
 #endif
-#if CHIP_HAS_TILE_RTF_HWM()
         t->tile_rtf_hwm = __insn_mfspr(SPR_TILE_RTF_HWM);
-#endif
 #if CHIP_HAS_DSTREAM_PF()
         t->dstream_pf = __insn_mfspr(SPR_DSTREAM_PF);
 #endif
@@ -398,15 +395,11 @@ static void restore_arch_state(const struct thread_struct *t)
         __insn_mtspr(SPR_SYSTEM_SAVE_0_2, t->system_save[2]);
         __insn_mtspr(SPR_SYSTEM_SAVE_0_3, t->system_save[3]);
         __insn_mtspr(SPR_INTCTRL_0_STATUS, t->intctrl_0);
-#if CHIP_HAS_PROC_STATUS_SPR()
         __insn_mtspr(SPR_PROC_STATUS, t->proc_status);
-#endif
 #if !CHIP_HAS_FIXED_INTVEC_BASE()
         __insn_mtspr(SPR_INTERRUPT_VECTOR_BASE_0, t->interrupt_vector_base);
 #endif
-#if CHIP_HAS_TILE_RTF_HWM()
         __insn_mtspr(SPR_TILE_RTF_HWM, t->tile_rtf_hwm);
-#endif
 #if CHIP_HAS_DSTREAM_PF()
         __insn_mtspr(SPR_DSTREAM_PF, t->dstream_pf);
 #endif
@@ -415,26 +408,11 @@ static void restore_arch_state(const struct thread_struct *t)
 
 void _prepare_arch_switch(struct task_struct *next)
 {
-#if CHIP_HAS_SN_PROC()
-        int snctl;
-#endif
 #if CHIP_HAS_TILE_DMA()
         struct tile_dma_state *dma = &current->thread.tile_dma_state;
         if (dma->enabled)
                 save_tile_dma_state(dma);
 #endif
-#if CHIP_HAS_SN_PROC()
-        /*
-         * Suspend the static network processor if it was running.
-         * We do not suspend the fabric itself, just like we don't
-         * try to suspend the UDN.
-         */
-        snctl = __insn_mfspr(SPR_SNCTL);
-        current->thread.sn_proc_running =
-                (snctl & SPR_SNCTL__FRZPROC_MASK) == 0;
-        if (current->thread.sn_proc_running)
-                __insn_mtspr(SPR_SNCTL, snctl | SPR_SNCTL__FRZPROC_MASK);
-#endif
 }
 
 
@@ -462,17 +440,6 @@ struct task_struct *__sched _switch_to(struct task_struct *prev,
         /* Restore other arch state. */
         restore_arch_state(&next->thread);
 
-#if CHIP_HAS_SN_PROC()
-        /*
-         * Restart static network processor in the new process
-         * if it was running before.
-         */
-        if (next->thread.sn_proc_running) {
-                int snctl = __insn_mfspr(SPR_SNCTL);
-                __insn_mtspr(SPR_SNCTL, snctl & ~SPR_SNCTL__FRZPROC_MASK);
-        }
-#endif
-
 #ifdef CONFIG_HARDWALL
         /* Enable or disable access to the network registers appropriately. */
         hardwall_switch_tasks(prev, next);
@@ -514,7 +481,7 @@ int do_work_pending(struct pt_regs *regs, u32 thread_info_flags)
                 schedule();
                 return 1;
         }
-#if CHIP_HAS_TILE_DMA() || CHIP_HAS_SN_PROC()
+#if CHIP_HAS_TILE_DMA()
         if (thread_info_flags & _TIF_ASYNC_TLB) {
                 do_async_page_fault(regs);
                 return 1;
@@ -564,7 +531,15 @@ void flush_thread(void)
  */
 void exit_thread(void)
 {
-        /* Nothing */
+#ifdef CONFIG_HARDWALL
+        /*
+         * Remove the task from the list of tasks that are associated
+         * with any live hardwalls.  (If the task that is exiting held
+         * the last reference to a hardwall fd, it would already have
+         * been released and deactivated at this point.)
+         */
+        hardwall_deactivate_all(current);
+#endif
 }
 
 void show_regs(struct pt_regs *regs)
@@ -573,23 +548,24 @@ void show_regs(struct pt_regs *regs)
         int i;
 
         pr_err("\n");
-        show_regs_print_info(KERN_ERR);
+        if (tsk != &corrupt_current)
+                show_regs_print_info(KERN_ERR);
 #ifdef __tilegx__
-        for (i = 0; i < 51; i += 3)
+        for (i = 0; i < 17; i++)
                 pr_err(" r%-2d: "REGFMT" r%-2d: "REGFMT" r%-2d: "REGFMT"\n",
-                       i, regs->regs[i], i+1, regs->regs[i+1],
-                       i+2, regs->regs[i+2]);
-        pr_err(" r51: "REGFMT" r52: "REGFMT" tp : "REGFMT"\n",
-               regs->regs[51], regs->regs[52], regs->tp);
+                       i, regs->regs[i], i+18, regs->regs[i+18],
+                       i+36, regs->regs[i+36]);
+        pr_err(" r17: "REGFMT" r35: "REGFMT" tp : "REGFMT"\n",
+               regs->regs[17], regs->regs[35], regs->tp);
         pr_err(" sp : "REGFMT" lr : "REGFMT"\n", regs->sp, regs->lr);
 #else
-        for (i = 0; i < 52; i += 4)
+        for (i = 0; i < 13; i++)
                 pr_err(" r%-2d: "REGFMT" r%-2d: "REGFMT
                        " r%-2d: "REGFMT" r%-2d: "REGFMT"\n",
-                       i, regs->regs[i], i+1, regs->regs[i+1],
-                       i+2, regs->regs[i+2], i+3, regs->regs[i+3]);
-        pr_err(" r52: "REGFMT" tp : "REGFMT" sp : "REGFMT" lr : "REGFMT"\n",
-               regs->regs[52], regs->tp, regs->sp, regs->lr);
+                       i, regs->regs[i], i+14, regs->regs[i+14],
+                       i+27, regs->regs[i+27], i+40, regs->regs[i+40]);
+        pr_err(" r13: "REGFMT" tp : "REGFMT" sp : "REGFMT" lr : "REGFMT"\n",
+               regs->regs[13], regs->tp, regs->sp, regs->lr);
 #endif
         pr_err(" pc : "REGFMT" ex1: %ld     faultnum: %ld\n",
                regs->pc, regs->ex1, regs->faultnum);
diff --git a/arch/tile/kernel/ptrace.c b/arch/tile/kernel/ptrace.c
index 0f83ed4602b2..de98c6ddf136 100644
--- a/arch/tile/kernel/ptrace.c
+++ b/arch/tile/kernel/ptrace.c
@@ -265,6 +265,21 @@ int do_syscall_trace_enter(struct pt_regs *regs)
 
 void do_syscall_trace_exit(struct pt_regs *regs)
 {
+        long errno;
+
+        /*
+         * The standard tile calling convention returns the value (or negative
+         * errno) in r0, and zero (or positive errno) in r1.
+         * It saves a couple of cycles on the hot path to do this work in
+         * registers only as we return, rather than updating the in-memory
+         * struct ptregs.
+         */
+        errno = (long) regs->regs[0];
+        if (errno < 0 && errno > -4096)
+                regs->regs[1] = -errno;
+        else
+                regs->regs[1] = 0;
+
         if (test_thread_flag(TIF_SYSCALL_TRACE))
                 tracehook_report_syscall_exit(regs, 0);
 
@@ -272,7 +287,7 @@ void do_syscall_trace_exit(struct pt_regs *regs)
                 trace_sys_exit(regs, regs->regs[0]);
 }
 
-void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code)
+void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs)
 {
         struct siginfo info;
 
@@ -288,5 +303,5 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code)
 /* Handle synthetic interrupt delivered only by the simulator. */
 void __kprobes do_breakpoint(struct pt_regs* regs, int fault_num)
 {
-        send_sigtrap(current, regs, fault_num);
+        send_sigtrap(current, regs);
 }
diff --git a/arch/tile/kernel/reboot.c b/arch/tile/kernel/reboot.c
index d1b5c913ae72..6c5d2c070a12 100644
--- a/arch/tile/kernel/reboot.c
+++ b/arch/tile/kernel/reboot.c
@@ -27,7 +27,6 @@
 
 void machine_halt(void)
 {
-        warn_early_printk();
         arch_local_irq_disable_all();
         smp_send_stop();
         hv_halt();
@@ -35,7 +34,6 @@ void machine_halt(void)
 
 void machine_power_off(void)
 {
-        warn_early_printk();
         arch_local_irq_disable_all();
         smp_send_stop();
         hv_power_off();
diff --git a/arch/tile/kernel/regs_32.S b/arch/tile/kernel/regs_32.S
index c12280c2d904..542cae17a93a 100644
--- a/arch/tile/kernel/regs_32.S
+++ b/arch/tile/kernel/regs_32.S
@@ -20,7 +20,7 @@
 #include <asm/switch_to.h>
 
 /*
- * See <asm/system.h>; called with prev and next task_struct pointers.
+ * See <asm/switch_to.h>; called with prev and next task_struct pointers.
  * "prev" is returned in r0 for _switch_to and also for ret_from_fork.
  *
  * We want to save pc/sp in "prev", and get the new pc/sp from "next".
@@ -39,7 +39,7 @@
  */
 
 #if CALLEE_SAVED_REGS_COUNT != 24
-# error Mismatch between <asm/system.h> and kernel/entry.S
+# error Mismatch between <asm/switch_to.h> and kernel/entry.S
 #endif
 #define FRAME_SIZE ((2 + CALLEE_SAVED_REGS_COUNT) * 4)
 
diff --git a/arch/tile/kernel/regs_64.S b/arch/tile/kernel/regs_64.S
index 0829fd01fa30..bbffcc6f340f 100644
--- a/arch/tile/kernel/regs_64.S
+++ b/arch/tile/kernel/regs_64.S
@@ -20,7 +20,7 @@
 #include <asm/switch_to.h>
 
 /*
- * See <asm/system.h>; called with prev and next task_struct pointers.
+ * See <asm/switch_to.h>; called with prev and next task_struct pointers.
  * "prev" is returned in r0 for _switch_to and also for ret_from_fork.
  *
  * We want to save pc/sp in "prev", and get the new pc/sp from "next".
@@ -39,7 +39,7 @@
  */
 
 #if CALLEE_SAVED_REGS_COUNT != 24
-# error Mismatch between <asm/system.h> and kernel/entry.S
+# error Mismatch between <asm/switch_to.h> and kernel/entry.S
 #endif
 #define FRAME_SIZE ((2 + CALLEE_SAVED_REGS_COUNT) * 8)
 
diff --git a/arch/tile/kernel/relocate_kernel_32.S b/arch/tile/kernel/relocate_kernel_32.S
index 010b418515f8..e44fbcf8cbd5 100644
--- a/arch/tile/kernel/relocate_kernel_32.S
+++ b/arch/tile/kernel/relocate_kernel_32.S
@@ -20,15 +20,6 @@
 #include <asm/page.h>
 #include <hv/hypervisor.h>
 
-#define ___hvb  MEM_SV_INTRPT + HV_GLUE_START_CPA
-
-#define ___hv_dispatch(f) (___hvb + (HV_DISPATCH_ENTRY_SIZE * f))
-
-#define ___hv_console_putc ___hv_dispatch(HV_DISPATCH_CONSOLE_PUTC)
-#define ___hv_halt         ___hv_dispatch(HV_DISPATCH_HALT)
-#define ___hv_reexec       ___hv_dispatch(HV_DISPATCH_REEXEC)
-#define ___hv_flush_remote ___hv_dispatch(HV_DISPATCH_FLUSH_REMOTE)
-
 #undef RELOCATE_NEW_KERNEL_VERBOSE
 
 STD_ENTRY(relocate_new_kernel)
@@ -43,8 +34,8 @@ STD_ENTRY(relocate_new_kernel)
         addi    sp, sp, -8
         /* we now have a stack (whether we need one or not) */
 
-        moveli  r40, lo16(___hv_console_putc)
-        auli    r40, r40, ha16(___hv_console_putc)
+        moveli  r40, lo16(hv_console_putc)
+        auli    r40, r40, ha16(hv_console_putc)
 
 #ifdef RELOCATE_NEW_KERNEL_VERBOSE
         moveli  r0, 'r'
@@ -86,7 +77,6 @@ STD_ENTRY(relocate_new_kernel)
         move    r30, sp
         addi    sp, sp, -8
 
-#if CHIP_HAS_CBOX_HOME_MAP()
         /*
          * On TILEPro, we need to flush all tiles' caches, since we may
          * have been doing hash-for-home caching there.  Note that we
@@ -114,15 +104,14 @@ STD_ENTRY(relocate_new_kernel)
         }
         {
          move   r8, zero         /* asids */
-         moveli r20, lo16(___hv_flush_remote)
+         moveli r20, lo16(hv_flush_remote)
         }
         {
          move   r9, zero         /* asidcount */
-         auli   r20, r20, ha16(___hv_flush_remote)
+         auli   r20, r20, ha16(hv_flush_remote)
         }
 
         jalr    r20
-#endif
 
         /* r33 is destination pointer, default to zero */
 
@@ -175,8 +164,8 @@ STD_ENTRY(relocate_new_kernel)
         move    r0, r32
         moveli  r1, 0           /* arg to hv_reexec is 64 bits */
 
-        moveli  r41, lo16(___hv_reexec)
-        auli    r41, r41, ha16(___hv_reexec)
+        moveli  r41, lo16(hv_reexec)
+        auli    r41, r41, ha16(hv_reexec)
 
         jalr    r41
 
@@ -267,8 +256,8 @@ STD_ENTRY(relocate_new_kernel)
         moveli  r0, '\n'
         jalr    r40
 .Lhalt:
-        moveli  r41, lo16(___hv_halt)
-        auli    r41, r41, ha16(___hv_halt)
+        moveli  r41, lo16(hv_halt)
+        auli    r41, r41, ha16(hv_halt)
 
         jalr    r41
         STD_ENDPROC(relocate_new_kernel)
diff --git a/arch/tile/kernel/relocate_kernel_64.S b/arch/tile/kernel/relocate_kernel_64.S
index 1c09a4f5a4ea..d9d8cf6176e8 100644
--- a/arch/tile/kernel/relocate_kernel_64.S
+++ b/arch/tile/kernel/relocate_kernel_64.S
@@ -34,11 +34,11 @@ STD_ENTRY(relocate_new_kernel)
         addi    sp, sp, -8
         /* we now have a stack (whether we need one or not) */
 
+#ifdef RELOCATE_NEW_KERNEL_VERBOSE
         moveli  r40, hw2_last(hv_console_putc)
         shl16insli r40, r40, hw1(hv_console_putc)
         shl16insli r40, r40, hw0(hv_console_putc)
 
-#ifdef RELOCATE_NEW_KERNEL_VERBOSE
         moveli  r0, 'r'
         jalr    r40
 
@@ -78,7 +78,6 @@ STD_ENTRY(relocate_new_kernel)
         move    r30, sp
         addi    sp, sp, -16
 
-#if CHIP_HAS_CBOX_HOME_MAP()
         /*
          * On TILE-GX, we need to flush all tiles' caches, since we may
          * have been doing hash-for-home caching there.  Note that we
@@ -116,7 +115,6 @@ STD_ENTRY(relocate_new_kernel)
         shl16insli      r20, r20, hw0(hv_flush_remote)
 
         jalr    r20
-#endif
 
         /* r33 is destination pointer, default to zero */
 
@@ -176,10 +174,12 @@ STD_ENTRY(relocate_new_kernel)
 
         /* we should not get here */
 
+#ifdef RELOCATE_NEW_KERNEL_VERBOSE
         moveli  r0, '?'
         jalr    r40
         moveli  r0, '\n'
         jalr    r40
+#endif
 
         j       .Lhalt
 
@@ -237,7 +237,9 @@ STD_ENTRY(relocate_new_kernel)
         j       .Lloop
 
 
-.Lerr:  moveli  r0, 'e'
+.Lerr:
+#ifdef RELOCATE_NEW_KERNEL_VERBOSE
+        moveli  r0, 'e'
         jalr    r40
         moveli  r0, 'r'
         jalr    r40
@@ -245,6 +247,7 @@ STD_ENTRY(relocate_new_kernel)
         jalr    r40
         moveli  r0, '\n'
         jalr    r40
+#endif
 .Lhalt:
         moveli r41, hw2_last(hv_halt)
         shl16insli r41, r41, hw1(hv_halt)
diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c
index eceb8344280f..74c91729a62a 100644
--- a/arch/tile/kernel/setup.c
+++ b/arch/tile/kernel/setup.c
@@ -154,6 +154,65 @@ static int __init setup_maxnodemem(char *str)
 }
 early_param("maxnodemem", setup_maxnodemem);
 
+struct memmap_entry {
+        u64 addr;       /* start of memory segment */
+        u64 size;       /* size of memory segment */
+};
+static struct memmap_entry memmap_map[64];
+static int memmap_nr;
+
+static void add_memmap_region(u64 addr, u64 size)
+{
+        if (memmap_nr >= ARRAY_SIZE(memmap_map)) {
+                pr_err("Ooops! Too many entries in the memory map!\n");
+                return;
+        }
+        memmap_map[memmap_nr].addr = addr;
+        memmap_map[memmap_nr].size = size;
+        memmap_nr++;
+}
+
+static int __init setup_memmap(char *p)
+{
+        char *oldp;
+        u64 start_at, mem_size;
+
+        if (!p)
+                return -EINVAL;
+
+        if (!strncmp(p, "exactmap", 8)) {
+                pr_err("\"memmap=exactmap\" not valid on tile\n");
+                return 0;
+        }
+
+        oldp = p;
+        mem_size = memparse(p, &p);
+        if (p == oldp)
+                return -EINVAL;
+
+        if (*p == '@') {
+                pr_err("\"memmap=nn@ss\" (force RAM) invalid on tile\n");
+        } else if (*p == '#') {
+                pr_err("\"memmap=nn#ss\" (force ACPI data) invalid on tile\n");
+        } else if (*p == '$') {
+                start_at = memparse(p+1, &p);
+                add_memmap_region(start_at, mem_size);
+        } else {
+                if (mem_size == 0)
+                        return -EINVAL;
+                maxmem_pfn = (mem_size >> HPAGE_SHIFT) <<
+                        (HPAGE_SHIFT - PAGE_SHIFT);
+        }
+        return *p == '\0' ? 0 : -EINVAL;
+}
+early_param("memmap", setup_memmap);
+
+static int __init setup_mem(char *str)
+{
+        return setup_maxmem(str);
+}
+early_param("mem", setup_mem);  /* compatibility with x86 */
+
 static int __init setup_isolnodes(char *str)
 {
         char buf[MAX_NUMNODES * 5];
@@ -209,7 +268,7 @@ early_param("vmalloc", parse_vmalloc);
 /*
  * Determine for each controller where its lowmem is mapped and how much of
  * it is mapped there.  On controller zero, the first few megabytes are
- * already mapped in as code at MEM_SV_INTRPT, so in principle we could
+ * already mapped in as code at MEM_SV_START, so in principle we could
  * start our data mappings higher up, but for now we don't bother, to avoid
  * additional confusion.
  *
@@ -614,11 +673,12 @@ static void __init setup_bootmem_allocator_node(int i)
         /*
          * Throw away any memory aliased by the PCI region.
          */
-        if (pci_reserve_start_pfn < end && pci_reserve_end_pfn > start)
-                reserve_bootmem(PFN_PHYS(pci_reserve_start_pfn),
-                                PFN_PHYS(pci_reserve_end_pfn -
-                                         pci_reserve_start_pfn),
+        if (pci_reserve_start_pfn < end && pci_reserve_end_pfn > start) {
+                start = max(pci_reserve_start_pfn, start);
+                end = min(pci_reserve_end_pfn, end);
+                reserve_bootmem(PFN_PHYS(start), PFN_PHYS(end - start),
                                 BOOTMEM_EXCLUSIVE);
+        }
 #endif
 }
 
@@ -628,6 +688,31 @@ static void __init setup_bootmem_allocator(void)
         for (i = 0; i < MAX_NUMNODES; ++i)
                 setup_bootmem_allocator_node(i);
 
+        /* Reserve any memory excluded by "memmap" arguments. */
+        for (i = 0; i < memmap_nr; ++i) {
+                struct memmap_entry *m = &memmap_map[i];
+                reserve_bootmem(m->addr, m->size, 0);
+        }
+
+#ifdef CONFIG_BLK_DEV_INITRD
+        if (initrd_start) {
+                /* Make sure the initrd memory region is not modified. */
+                if (reserve_bootmem(initrd_start, initrd_end - initrd_start,
+                                    BOOTMEM_EXCLUSIVE)) {
+                        pr_crit("The initrd memory region has been polluted. Disabling it.\n");
+                        initrd_start = 0;
+                        initrd_end = 0;
+                } else {
+                        /*
+                         * Translate initrd_start & initrd_end from PA to VA for
+                         * future access.
+                         */
+                        initrd_start += PAGE_OFFSET;
+                        initrd_end += PAGE_OFFSET;
+                }
+        }
+#endif
+
 #ifdef CONFIG_KEXEC
         if (crashk_res.start != crashk_res.end)
                 reserve_bootmem(crashk_res.start, resource_size(&crashk_res), 0);
@@ -961,9 +1046,6 @@ void setup_cpu(int boot)
         arch_local_irq_unmask(INT_DMATLB_MISS);
         arch_local_irq_unmask(INT_DMATLB_ACCESS);
 #endif
-#if CHIP_HAS_SN_PROC()
-        arch_local_irq_unmask(INT_SNITLB_MISS);
-#endif
 #ifdef __tilegx__
         arch_local_irq_unmask(INT_SINGLE_STEP_K);
 #endif
@@ -978,10 +1060,6 @@ void setup_cpu(int boot)
         /* Static network is not restricted. */
         __insn_mtspr(SPR_MPL_SN_ACCESS_SET_0, 1);
 #endif
-#if CHIP_HAS_SN_PROC()
-        __insn_mtspr(SPR_MPL_SN_NOTIFY_SET_0, 1);
-        __insn_mtspr(SPR_MPL_SN_CPL_SET_0, 1);
-#endif
 
         /*
          * Set the MPL for interrupt control 0 & 1 to the corresponding
@@ -1029,6 +1107,10 @@ static void __init load_hv_initrd(void)
         int fd, rc;
         void *initrd;
 
+        /* If initrd has already been set, skip initramfs file in hvfs. */
+        if (initrd_start)
+                return;
+
         fd = hv_fs_findfile((HV_VirtAddr) initramfs_file);
         if (fd == HV_ENOENT) {
                 if (set_initramfs_file) {
@@ -1067,6 +1149,25 @@ void __init free_initrd_mem(unsigned long begin, unsigned long end)
         free_bootmem(__pa(begin), end - begin);
 }
 
+static int __init setup_initrd(char *str)
+{
+        char *endp;
+        unsigned long initrd_size;
+
+        initrd_size = str ? simple_strtoul(str, &endp, 0) : 0;
+        if (initrd_size == 0 || *endp != '@')
+                return -EINVAL;
+
+        initrd_start = simple_strtoul(endp+1, &endp, 0);
+        if (initrd_start == 0)
+                return -EINVAL;
+
+        initrd_end = initrd_start + initrd_size;
+
+        return 0;
+}
+early_param("initrd", setup_initrd);
+
 #else
 static inline void load_hv_initrd(void) {}
 #endif /* CONFIG_BLK_DEV_INITRD */
@@ -1134,7 +1235,7 @@ static void __init validate_va(void)
 #ifndef __tilegx__   /* FIXME: GX: probably some validation relevant here */
         /*
          * Similarly, make sure we're only using allowed VAs.
-         * We assume we can contiguously use MEM_USER_INTRPT .. MEM_HV_INTRPT,
+         * We assume we can contiguously use MEM_USER_INTRPT .. MEM_HV_START,
          * and 0 .. KERNEL_HIGH_VADDR.
          * In addition, make sure we CAN'T use the end of memory, since
          * we use the last chunk of each pgd for the pgd_list.
@@ -1149,7 +1250,7 @@ static void __init validate_va(void)
                 if (range.size == 0)
                         break;
                 if (range.start <= MEM_USER_INTRPT &&
-                    range.start + range.size >= MEM_HV_INTRPT)
+                    range.start + range.size >= MEM_HV_START)
                         user_kernel_ok = 1;
                 if (range.start == 0)
                         max_va = range.size;
@@ -1167,8 +1268,7 @@ static void __init validate_va(void)
         if ((long)VMALLOC_START >= 0)
                 early_panic(
                         "Linux VMALLOC region below the 2GB line (%#lx)!\n"
-                        "Reconfigure the kernel with fewer NR_HUGE_VMAPS\n"
-                        "or smaller VMALLOC_RESERVE.\n",
+                        "Reconfigure the kernel with smaller VMALLOC_RESERVE.\n",
                         VMALLOC_START);
 #endif
 }
@@ -1183,7 +1283,6 @@ static void __init validate_va(void)
 struct cpumask __write_once cpu_lotar_map;
 EXPORT_SYMBOL(cpu_lotar_map);
 
-#if CHIP_HAS_CBOX_HOME_MAP()
 /*
  * hash_for_home_map lists all the tiles that hash-for-home data
  * will be cached on.  Note that this may includes tiles that are not
@@ -1193,7 +1292,6 @@ EXPORT_SYMBOL(cpu_lotar_map);
  */
 struct cpumask hash_for_home_map;
 EXPORT_SYMBOL(hash_for_home_map);
-#endif
 
 /*
  * cpu_cacheable_map lists all the cpus whose caches the hypervisor can
@@ -1286,7 +1384,6 @@ static void __init setup_cpu_maps(void)
                 cpu_lotar_map = *cpu_possible_mask;
         }
 
-#if CHIP_HAS_CBOX_HOME_MAP()
         /* Retrieve set of CPUs used for hash-for-home caching */
         rc = hv_inquire_tiles(HV_INQ_TILES_HFH_CACHE,
                               (HV_VirtAddr) hash_for_home_map.bits,
@@ -1294,9 +1391,6 @@ static void __init setup_cpu_maps(void)
         if (rc < 0)
                 early_panic("hv_inquire_tiles(HFH_CACHE) failed: rc %d\n", rc);
         cpumask_or(&cpu_cacheable_map, cpu_possible_mask, &hash_for_home_map);
-#else
-        cpu_cacheable_map = *cpu_possible_mask;
-#endif
 }
 
 
@@ -1492,7 +1586,7 @@ void __init setup_per_cpu_areas(void)
 
                         /* Update the vmalloc mapping and page home. */
                         unsigned long addr = (unsigned long)ptr + i;
-                        pte_t *ptep = virt_to_pte(NULL, addr);
+                        pte_t *ptep = virt_to_kpte(addr);
                         pte_t pte = *ptep;
                         BUG_ON(pfn != pte_pfn(pte));
                         pte = hv_pte_set_mode(pte, HV_PTE_MODE_CACHE_TILE_L3);
@@ -1501,12 +1595,12 @@ void __init setup_per_cpu_areas(void)
 
                         /* Update the lowmem mapping for consistency. */
                         lowmem_va = (unsigned long)pfn_to_kaddr(pfn);
-                        ptep = virt_to_pte(NULL, lowmem_va);
+                        ptep = virt_to_kpte(lowmem_va);
                         if (pte_huge(*ptep)) {
                                 printk(KERN_DEBUG "early shatter of huge page"
                                        " at %#lx\n", lowmem_va);
                                 shatter_pmd((pmd_t *)ptep);
-                                ptep = virt_to_pte(NULL, lowmem_va);
+                                ptep = virt_to_kpte(lowmem_va);
                                 BUG_ON(pte_huge(*ptep));
                         }
                         BUG_ON(pfn != pte_pfn(*ptep));
@@ -1548,6 +1642,8 @@ insert_non_bus_resource(void)
 {
         struct resource *res =
                 kzalloc(sizeof(struct resource), GFP_ATOMIC);
+        if (!res)
+                return NULL;
         res->name = "Non-Bus Physical Address Space";
         res->start = (1ULL << 32);
         res->end = -1LL;
@@ -1561,11 +1657,13 @@ insert_non_bus_resource(void)
 #endif
 
 static struct resource* __init
-insert_ram_resource(u64 start_pfn, u64 end_pfn)
+insert_ram_resource(u64 start_pfn, u64 end_pfn, bool reserved)
 {
         struct resource *res =
                 kzalloc(sizeof(struct resource), GFP_ATOMIC);
-        res->name = "System RAM";
+        if (!res)
+                return NULL;
+        res->name = reserved ? "Reserved" : "System RAM";
         res->start = start_pfn << PAGE_SHIFT;
         res->end = (end_pfn << PAGE_SHIFT) - 1;
         res->flags = IORESOURCE_BUSY | IORESOURCE_MEM;
@@ -1585,7 +1683,7 @@ insert_ram_resource(u64 start_pfn, u64 end_pfn)
 static int __init request_standard_resources(void)
 {
         int i;
-        enum { CODE_DELTA = MEM_SV_INTRPT - PAGE_OFFSET };
+        enum { CODE_DELTA = MEM_SV_START - PAGE_OFFSET };
 
 #if defined(CONFIG_PCI) && !defined(__tilegx__)
         insert_non_bus_resource();
@@ -1600,11 +1698,11 @@ static int __init request_standard_resources(void)
                     end_pfn > pci_reserve_start_pfn) {
                         if (end_pfn > pci_reserve_end_pfn)
                                 insert_ram_resource(pci_reserve_end_pfn,
-                                                     end_pfn);
+                                                    end_pfn, 0);
                         end_pfn = pci_reserve_start_pfn;
                 }
 #endif
-                insert_ram_resource(start_pfn, end_pfn);
+                insert_ram_resource(start_pfn, end_pfn, 0);
         }
 
         code_resource.start = __pa(_text - CODE_DELTA);
@@ -1615,6 +1713,13 @@ static int __init request_standard_resources(void)
         insert_resource(&iomem_resource, &code_resource);
         insert_resource(&iomem_resource, &data_resource);
 
+        /* Mark any "memmap" regions busy for the resource manager. */
+        for (i = 0; i < memmap_nr; ++i) {
+                struct memmap_entry *m = &memmap_map[i];
+                insert_ram_resource(PFN_DOWN(m->addr),
+                                    PFN_UP(m->addr + m->size - 1), 1);
+        }
+
 #ifdef CONFIG_KEXEC
         insert_resource(&iomem_resource, &crashk_res);
 #endif
diff --git a/arch/tile/kernel/signal.c b/arch/tile/kernel/signal.c
index 9531845bf661..2d1dbf38a9ab 100644
--- a/arch/tile/kernel/signal.c
+++ b/arch/tile/kernel/signal.c
@@ -33,6 +33,7 @@
 #include <asm/ucontext.h>
 #include <asm/sigframe.h>
 #include <asm/syscalls.h>
+#include <asm/vdso.h>
 #include <arch/interrupts.h>
 
 #define DEBUG_SIG 0
@@ -190,7 +191,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
         if (err)
                 goto give_sigsegv;
 
-        restorer = VDSO_BASE;
+        restorer = VDSO_SYM(&__vdso_rt_sigreturn);
         if (ka->sa.sa_flags & SA_RESTORER)
                 restorer = (unsigned long) ka->sa.sa_restorer;
 
diff --git a/arch/tile/kernel/single_step.c b/arch/tile/kernel/single_step.c
index 27742e87e255..de07fa7d1315 100644
--- a/arch/tile/kernel/single_step.c
+++ b/arch/tile/kernel/single_step.c
@@ -12,41 +12,30 @@
  *   more details.
  *
  * A code-rewriter that enables instruction single-stepping.
- * Derived from iLib's single-stepping code.
  */
 
-#ifndef __tilegx__   /* Hardware support for single step unavailable. */
-
-/* These functions are only used on the TILE platform */
+#include <linux/smp.h>
+#include <linux/ptrace.h>
 #include <linux/slab.h>
 #include <linux/thread_info.h>
 #include <linux/uaccess.h>
 #include <linux/mman.h>
 #include <linux/types.h>
 #include <linux/err.h>
+#include <linux/prctl.h>
 #include <asm/cacheflush.h>
+#include <asm/traps.h>
+#include <asm/uaccess.h>
 #include <asm/unaligned.h>
 #include <arch/abi.h>
+#include <arch/spr_def.h>
 #include <arch/opcode.h>
 
-#define signExtend17(val) sign_extend((val), 17)
-#define TILE_X1_MASK (0xffffffffULL << 31)
-
-int unaligned_printk;
 
-static int __init setup_unaligned_printk(char *str)
-{
-        long val;
-        if (strict_strtol(str, 0, &val) != 0)
-                return 0;
-        unaligned_printk = val;
-        pr_info("Printk for each unaligned data accesses is %s\n",
-                unaligned_printk ? "enabled" : "disabled");
-        return 1;
-}
-__setup("unaligned_printk=", setup_unaligned_printk);
+#ifndef __tilegx__   /* Hardware support for single step unavailable. */
 
-unsigned int unaligned_fixup_count;
+#define signExtend17(val) sign_extend((val), 17)
+#define TILE_X1_MASK (0xffffffffULL << 31)
 
 enum mem_op {
         MEMOP_NONE,
@@ -56,12 +45,13 @@ enum mem_op {
         MEMOP_STORE_POSTINCR
 };
 
-static inline tile_bundle_bits set_BrOff_X1(tile_bundle_bits n, s32 offset)
+static inline tilepro_bundle_bits set_BrOff_X1(tilepro_bundle_bits n,
+        s32 offset)
 {
-        tile_bundle_bits result;
+        tilepro_bundle_bits result;
 
         /* mask out the old offset */
-        tile_bundle_bits mask = create_BrOff_X1(-1);
+        tilepro_bundle_bits mask = create_BrOff_X1(-1);
         result = n & (~mask);
 
         /* or in the new offset */
@@ -70,10 +60,11 @@ static inline tile_bundle_bits set_BrOff_X1(tile_bundle_bits n, s32 offset)
         return result;
 }
 
-static inline tile_bundle_bits move_X1(tile_bundle_bits n, int dest, int src)
+static inline tilepro_bundle_bits move_X1(tilepro_bundle_bits n, int dest,
+        int src)
 {
-        tile_bundle_bits result;
-        tile_bundle_bits op;
+        tilepro_bundle_bits result;
+        tilepro_bundle_bits op;
 
         result = n & (~TILE_X1_MASK);
 
@@ -87,13 +78,13 @@ static inline tile_bundle_bits move_X1(tile_bundle_bits n, int dest, int src)
         return result;
 }
 
-static inline tile_bundle_bits nop_X1(tile_bundle_bits n)
+static inline tilepro_bundle_bits nop_X1(tilepro_bundle_bits n)
 {
         return move_X1(n, TREG_ZERO, TREG_ZERO);
 }
 
-static inline tile_bundle_bits addi_X1(
-        tile_bundle_bits n, int dest, int src, int imm)
+static inline tilepro_bundle_bits addi_X1(
+        tilepro_bundle_bits n, int dest, int src, int imm)
 {
         n &= ~TILE_X1_MASK;
 
@@ -107,15 +98,26 @@ static inline tile_bundle_bits addi_X1(
         return n;
 }
 
-static tile_bundle_bits rewrite_load_store_unaligned(
+static tilepro_bundle_bits rewrite_load_store_unaligned(
         struct single_step_state *state,
-        tile_bundle_bits bundle,
+        tilepro_bundle_bits bundle,
         struct pt_regs *regs,
         enum mem_op mem_op,
         int size, int sign_ext)
 {
         unsigned char __user *addr;
         int val_reg, addr_reg, err, val;
+        int align_ctl;
+
+        align_ctl = unaligned_fixup;
+        switch (task_thread_info(current)->align_ctl) {
+        case PR_UNALIGN_NOPRINT:
+                align_ctl = 1;
+                break;
+        case PR_UNALIGN_SIGBUS:
+                align_ctl = 0;
+                break;
+        }
 
         /* Get address and value registers */
         if (bundle & TILEPRO_BUNDLE_Y_ENCODING_MASK) {
@@ -160,7 +162,7 @@ static tile_bundle_bits rewrite_load_store_unaligned(
          * tilepro hardware would be doing, if it could provide us with the
          * actual bad address in an SPR, which it doesn't.
          */
-        if (unaligned_fixup == 0) {
+        if (align_ctl == 0) {
                 siginfo_t info = {
                         .si_signo = SIGBUS,
                         .si_code = BUS_ADRALN,
@@ -209,14 +211,14 @@ static tile_bundle_bits rewrite_load_store_unaligned(
 
         if (err) {
                 siginfo_t info = {
-                        .si_signo = SIGSEGV,
-                        .si_code = SEGV_MAPERR,
+                        .si_signo = SIGBUS,
+                        .si_code = BUS_ADRALN,
                         .si_addr = addr
                 };
-                trace_unhandled_signal("segfault", regs,
-                                       (unsigned long)addr, SIGSEGV);
+                trace_unhandled_signal("bad address for unaligned fixup", regs,
+                                       (unsigned long)addr, SIGBUS);
                 force_sig_info(info.si_signo, &info, current);
-                return (tile_bundle_bits) 0;
+                return (tilepro_bundle_bits) 0;
         }
 
         if (unaligned_printk || unaligned_fixup_count == 0) {
@@ -285,7 +287,7 @@ void single_step_execve(void)
         ti->step_state = NULL;
 }
 
-/**
+/*
  * single_step_once() - entry point when single stepping has been triggered.
  * @regs: The machine register state
  *
@@ -304,20 +306,31 @@ void single_step_execve(void)
  */
 void single_step_once(struct pt_regs *regs)
 {
-        extern tile_bundle_bits __single_step_ill_insn;
-        extern tile_bundle_bits __single_step_j_insn;
-        extern tile_bundle_bits __single_step_addli_insn;
-        extern tile_bundle_bits __single_step_auli_insn;
+        extern tilepro_bundle_bits __single_step_ill_insn;
+        extern tilepro_bundle_bits __single_step_j_insn;
+        extern tilepro_bundle_bits __single_step_addli_insn;
+        extern tilepro_bundle_bits __single_step_auli_insn;
         struct thread_info *info = (void *)current_thread_info();
         struct single_step_state *state = info->step_state;
         int is_single_step = test_ti_thread_flag(info, TIF_SINGLESTEP);
-        tile_bundle_bits __user *buffer, *pc;
-        tile_bundle_bits bundle;
+        tilepro_bundle_bits __user *buffer, *pc;
+        tilepro_bundle_bits bundle;
         int temp_reg;
         int target_reg = TREG_LR;
         int err;
         enum mem_op mem_op = MEMOP_NONE;
         int size = 0, sign_ext = 0;  /* happy compiler */
+        int align_ctl;
+
+        align_ctl = unaligned_fixup;
+        switch (task_thread_info(current)->align_ctl) {
+        case PR_UNALIGN_NOPRINT:
+                align_ctl = 1;
+                break;
+        case PR_UNALIGN_SIGBUS:
+                align_ctl = 0;
+                break;
+        }
 
         asm(
 "    .pushsection .rodata.single_step\n"
@@ -390,7 +403,7 @@ void single_step_once(struct pt_regs *regs)
         if (regs->faultnum == INT_SWINT_1)
                 regs->pc -= 8;
 
-        pc = (tile_bundle_bits __user *)(regs->pc);
+        pc = (tilepro_bundle_bits __user *)(regs->pc);
         if (get_user(bundle, pc) != 0) {
                 pr_err("Couldn't read instruction at %p trying to step\n", pc);
                 return;
@@ -533,7 +546,6 @@ void single_step_once(struct pt_regs *regs)
                         }
                         break;
 
-#if CHIP_HAS_WH64()
                 /* postincrement operations */
                 case IMM_0_OPCODE_X1:
                         switch (get_ImmOpcodeExtension_X1(bundle)) {
@@ -568,7 +580,6 @@ void single_step_once(struct pt_regs *regs)
                                 break;
                         }
                         break;
-#endif /* CHIP_HAS_WH64() */
                 }
 
                 if (state->update) {
@@ -627,9 +638,9 @@ void single_step_once(struct pt_regs *regs)
 
         /*
          * Check if we need to rewrite an unaligned load/store.
-         * Returning zero is a special value meaning we need to SIGSEGV.
+         * Returning zero is a special value meaning we generated a signal.
          */
-        if (mem_op != MEMOP_NONE && unaligned_fixup >= 0) {
+        if (mem_op != MEMOP_NONE && align_ctl >= 0) {
                 bundle = rewrite_load_store_unaligned(state, bundle, regs,
                                                       mem_op, size, sign_ext);
                 if (bundle == 0)
@@ -668,9 +679,9 @@ void single_step_once(struct pt_regs *regs)
                 }
 
                 /* End with a jump back to the next instruction */
-                delta = ((regs->pc + TILE_BUNDLE_SIZE_IN_BYTES) -
+                delta = ((regs->pc + TILEPRO_BUNDLE_SIZE_IN_BYTES) -
                         (unsigned long)buffer) >>
-                        TILE_LOG2_BUNDLE_ALIGNMENT_IN_BYTES;
+                        TILEPRO_LOG2_BUNDLE_ALIGNMENT_IN_BYTES;
                 bundle = __single_step_j_insn;
                 bundle |= create_JOffLong_X1(delta);
                 err |= __put_user(bundle, buffer++);
@@ -698,9 +709,6 @@ void single_step_once(struct pt_regs *regs)
 }
 
 #else
-#include <linux/smp.h>
-#include <linux/ptrace.h>
-#include <arch/spr_def.h>
 
 static DEFINE_PER_CPU(unsigned long, ss_saved_pc);
 
@@ -743,10 +751,10 @@ void gx_singlestep_handle(struct pt_regs *regs, int fault_num)
         } else if ((*ss_pc != regs->pc) ||
                    (!(control & SPR_SINGLE_STEP_CONTROL_1__CANCELED_MASK))) {
 
-                ptrace_notify(SIGTRAP);
                 control |= SPR_SINGLE_STEP_CONTROL_1__CANCELED_MASK;
                 control |= SPR_SINGLE_STEP_CONTROL_1__INHIBIT_MASK;
                 __insn_mtspr(SPR_SINGLE_STEP_CONTROL_K, control);
+                send_sigtrap(current, regs);
         }
 }
 
diff --git a/arch/tile/kernel/smp.c b/arch/tile/kernel/smp.c
index cbc73a8b8fe1..01e8ab29f43a 100644
--- a/arch/tile/kernel/smp.c
+++ b/arch/tile/kernel/smp.c
@@ -20,8 +20,13 @@
 #include <linux/irq.h>
 #include <linux/module.h>
 #include <asm/cacheflush.h>
+#include <asm/homecache.h>
 
-HV_Topology smp_topology __write_once;
+/*
+ * We write to width and height with a single store in head_NN.S,
+ * so make the variable aligned to "long".
+ */
+HV_Topology smp_topology __write_once __aligned(sizeof(long));
 EXPORT_SYMBOL(smp_topology);
 
 #if CHIP_HAS_IPI()
@@ -100,8 +105,8 @@ static void smp_start_cpu_interrupt(void)
 /* Handler to stop the current cpu. */
 static void smp_stop_cpu_interrupt(void)
 {
-        set_cpu_online(smp_processor_id(), 0);
         arch_local_irq_disable_all();
+        set_cpu_online(smp_processor_id(), 0);
         for (;;)
                 asm("nap; nop");
 }
@@ -167,9 +172,16 @@ static void ipi_flush_icache_range(void *info)
 void flush_icache_range(unsigned long start, unsigned long end)
 {
         struct ipi_flush flush = { start, end };
-        preempt_disable();
-        on_each_cpu(ipi_flush_icache_range, &flush, 1);
-        preempt_enable();
+
+        /* If invoked with irqs disabled, we can not issue IPIs. */
+        if (irqs_disabled())
+                flush_remote(0, HV_FLUSH_EVICT_L1I, NULL, 0, 0, 0,
+                        NULL, NULL, 0);
+        else {
+                preempt_disable();
+                on_each_cpu(ipi_flush_icache_range, &flush, 1);
+                preempt_enable();
+        }
 }
 
 
diff --git a/arch/tile/kernel/smpboot.c b/arch/tile/kernel/smpboot.c
index a535655b7089..732e9d138661 100644
--- a/arch/tile/kernel/smpboot.c
+++ b/arch/tile/kernel/smpboot.c
@@ -142,13 +142,15 @@ static struct cpumask cpu_started;
  */
 static void start_secondary(void)
 {
-        int cpuid = smp_processor_id();
+        int cpuid;
+
+        preempt_disable();
+
+        cpuid = smp_processor_id();
 
         /* Set our thread pointer appropriately. */
         set_my_cpu_offset(__per_cpu_offset[cpuid]);
 
-        preempt_disable();
-
         /*
          * In large machines even this will slow us down, since we
          * will be contending for for the printk spinlock.
diff --git a/arch/tile/kernel/stack.c b/arch/tile/kernel/stack.c
index af8dfc9665f6..362284af3afd 100644
--- a/arch/tile/kernel/stack.c
+++ b/arch/tile/kernel/stack.c
@@ -29,6 +29,7 @@
 #include <asm/switch_to.h>
 #include <asm/sigframe.h>
 #include <asm/stack.h>
+#include <asm/vdso.h>
 #include <arch/abi.h>
 #include <arch/interrupts.h>
 
@@ -102,9 +103,8 @@ static struct pt_regs *valid_fault_handler(struct KBacktraceIterator* kbt)
             p->sp >= sp) {
                 if (kbt->verbose)
                         pr_err("  <%s while in kernel mode>\n", fault);
-        } else if (EX1_PL(p->ex1) == USER_PL &&
-            p->pc < PAGE_OFFSET &&
-            p->sp < PAGE_OFFSET) {
+        } else if (user_mode(p) &&
+                   p->sp < PAGE_OFFSET && p->sp != 0) {
                 if (kbt->verbose)
                         pr_err("  <%s while in user mode>\n", fault);
         } else if (kbt->verbose) {
@@ -120,7 +120,7 @@ static struct pt_regs *valid_fault_handler(struct KBacktraceIterator* kbt)
 /* Is the pc pointing to a sigreturn trampoline? */
 static int is_sigreturn(unsigned long pc)
 {
-        return (pc == VDSO_BASE);
+        return current->mm && (pc == VDSO_SYM(&__vdso_rt_sigreturn));
 }
 
 /* Return a pt_regs pointer for a valid signal handler frame */
@@ -129,7 +129,7 @@ static struct pt_regs *valid_sigframe(struct KBacktraceIterator* kbt,
 {
         BacktraceIterator *b = &kbt->it;
 
-        if (b->pc == VDSO_BASE && b->sp < PAGE_OFFSET &&
+        if (is_sigreturn(b->pc) && b->sp < PAGE_OFFSET &&
             b->sp % sizeof(long) == 0) {
                 int retval;
                 pagefault_disable();
@@ -195,21 +195,21 @@ static int KBacktraceIterator_next_item_inclusive(
  */
 static void validate_stack(struct pt_regs *regs)
 {
-        int cpu = smp_processor_id();
+        int cpu = raw_smp_processor_id();
         unsigned long ksp0 = get_current_ksp0();
-        unsigned long ksp0_base = ksp0 - THREAD_SIZE;
+        unsigned long ksp0_base = ksp0 & -THREAD_SIZE;
         unsigned long sp = stack_pointer;
 
         if (EX1_PL(regs->ex1) == KERNEL_PL && regs->sp >= ksp0) {
-                pr_err("WARNING: cpu %d: kernel stack page %#lx underrun!\n"
+                pr_err("WARNING: cpu %d: kernel stack %#lx..%#lx underrun!\n"
                        "  sp %#lx (%#lx in caller), caller pc %#lx, lr %#lx\n",
-                       cpu, ksp0_base, sp, regs->sp, regs->pc, regs->lr);
+                       cpu, ksp0_base, ksp0, sp, regs->sp, regs->pc, regs->lr);
         }
 
         else if (sp < ksp0_base + sizeof(struct thread_info)) {
-                pr_err("WARNING: cpu %d: kernel stack page %#lx overrun!\n"
+                pr_err("WARNING: cpu %d: kernel stack %#lx..%#lx overrun!\n"
                        "  sp %#lx (%#lx in caller), caller pc %#lx, lr %#lx\n",
-                       cpu, ksp0_base, sp, regs->sp, regs->pc, regs->lr);
+                       cpu, ksp0_base, ksp0, sp, regs->sp, regs->pc, regs->lr);
         }
 }
 
@@ -352,6 +352,26 @@ static void describe_addr(struct KBacktraceIterator *kbt,
 }
 
 /*
+ * Avoid possible crash recursion during backtrace.  If it happens, it
+ * makes it easy to lose the actual root cause of the failure, so we
+ * put a simple guard on all the backtrace loops.
+ */
+static bool start_backtrace(void)
+{
+        if (current->thread.in_backtrace) {
+                pr_err("Backtrace requested while in backtrace!\n");
+                return false;
+        }
+        current->thread.in_backtrace = true;
+        return true;
+}
+
+static void end_backtrace(void)
+{
+        current->thread.in_backtrace = false;
+}
+
+/*
  * This method wraps the backtracer's more generic support.
  * It is only invoked from the architecture-specific code; show_stack()
  * and dump_stack() (in entry.S) are architecture-independent entry points.
@@ -361,6 +381,8 @@ void tile_show_stack(struct KBacktraceIterator *kbt, int headers)
         int i;
         int have_mmap_sem = 0;
 
+        if (!start_backtrace())
+                return;
         if (headers) {
                 /*
                  * Add a blank line since if we are called from panic(),
@@ -371,7 +393,7 @@ void tile_show_stack(struct KBacktraceIterator *kbt, int headers)
                 pr_err("Starting stack dump of tid %d, pid %d (%s)"
                        " on cpu %d at cycle %lld\n",
                        kbt->task->pid, kbt->task->tgid, kbt->task->comm,
-                       smp_processor_id(), get_cycles());
+                       raw_smp_processor_id(), get_cycles());
         }
         kbt->verbose = 1;
         i = 0;
@@ -402,6 +424,7 @@ void tile_show_stack(struct KBacktraceIterator *kbt, int headers)
                 pr_err("Stack dump complete\n");
         if (have_mmap_sem)
                 up_read(&kbt->task->mm->mmap_sem);
+        end_backtrace();
 }
 EXPORT_SYMBOL(tile_show_stack);
 
@@ -463,6 +486,8 @@ void save_stack_trace_tsk(struct task_struct *task, struct stack_trace *trace)
         int skip = trace->skip;
         int i = 0;
 
+        if (!start_backtrace())
+                goto done;
         if (task == NULL || task == current)
                 KBacktraceIterator_init_current(&kbt);
         else
@@ -476,6 +501,8 @@ void save_stack_trace_tsk(struct task_struct *task, struct stack_trace *trace)
                         break;
                 trace->entries[i++] = kbt.it.pc;
         }
+        end_backtrace();
+done:
         trace->nr_entries = i;
 }
 EXPORT_SYMBOL(save_stack_trace_tsk);
diff --git a/arch/tile/kernel/sys.c b/arch/tile/kernel/sys.c
index b881a7be24bd..38debe706061 100644
--- a/arch/tile/kernel/sys.c
+++ b/arch/tile/kernel/sys.c
@@ -38,8 +38,10 @@
 SYSCALL_DEFINE3(cacheflush, unsigned long, addr, unsigned long, len,
                 unsigned long, flags)
 {
+        /* DCACHE is not particularly effective if not bound to one cpu. */
         if (flags & DCACHE)
-                homecache_evict(cpumask_of(smp_processor_id()));
+                homecache_evict(cpumask_of(raw_smp_processor_id()));
+
         if (flags & ICACHE)
                 flush_remote(0, HV_FLUSH_EVICT_L1I, mm_cpumask(current->mm),
                              0, 0, 0, NULL, NULL, 0);
diff --git a/arch/tile/kernel/sysfs.c b/arch/tile/kernel/sysfs.c
index e25b0a89c18f..a3ed12f8f83b 100644
--- a/arch/tile/kernel/sysfs.c
+++ b/arch/tile/kernel/sysfs.c
@@ -157,6 +157,67 @@ hvconfig_bin_read(struct file *filp, struct kobject *kobj,
         return count;
 }
 
+static ssize_t hv_stats_show(struct device *dev,
+                             struct device_attribute *attr,
+                             char *page)
+{
+        int cpu = dev->id;
+        long lotar = HV_XY_TO_LOTAR(cpu_x(cpu), cpu_y(cpu));
+
+        ssize_t n = hv_confstr(HV_CONFSTR_HV_STATS,
+                               (unsigned long)page, PAGE_SIZE - 1,
+                               lotar, 0);
+        n = n < 0 ? 0 : min(n, (ssize_t)PAGE_SIZE - 1);
+        page[n] = '\0';
+        return n;
+}
+
+static ssize_t hv_stats_store(struct device *dev,
+                              struct device_attribute *attr,
+                              const char *page,
+                              size_t count)
+{
+        int cpu = dev->id;
+        long lotar = HV_XY_TO_LOTAR(cpu_x(cpu), cpu_y(cpu));
+
+        ssize_t n = hv_confstr(HV_CONFSTR_HV_STATS, 0, 0, lotar, 1);
+        return n < 0 ? n : count;
+}
+
+static DEVICE_ATTR(hv_stats, 0644, hv_stats_show, hv_stats_store);
+
+static int hv_stats_device_add(struct device *dev, struct subsys_interface *sif)
+{
+        int err, cpu = dev->id;
+
+        if (!cpu_online(cpu))
+                return 0;
+
+        err = sysfs_create_file(&dev->kobj, &dev_attr_hv_stats.attr);
+
+        return err;
+}
+
+static int hv_stats_device_remove(struct device *dev,
+                                  struct subsys_interface *sif)
+{
+        int cpu = dev->id;
+
+        if (!cpu_online(cpu))
+                return 0;
+
+        sysfs_remove_file(&dev->kobj, &dev_attr_hv_stats.attr);
+        return 0;
+}
+
+
+static struct subsys_interface hv_stats_interface = {
+        .name                   = "hv_stats",
+        .subsys                 = &cpu_subsys,
+        .add_dev                = hv_stats_device_add,
+        .remove_dev             = hv_stats_device_remove,
+};
+
 static int __init create_sysfs_entries(void)
 {
         int err = 0;
@@ -188,6 +249,21 @@ static int __init create_sysfs_entries(void)
                 err = sysfs_create_bin_file(hypervisor_kobj, &hvconfig_bin);
         }
 
+        if (!err) {
+                /*
+                 * Don't bother adding the hv_stats files on each CPU if
+                 * our hypervisor doesn't supply statistics.
+                 */
+                int cpu = raw_smp_processor_id();
+                long lotar = HV_XY_TO_LOTAR(cpu_x(cpu), cpu_y(cpu));
+                char dummy;
+                ssize_t n = hv_confstr(HV_CONFSTR_HV_STATS,
+                                       (unsigned long) &dummy, 1,
+                                       lotar, 0);
+                if (n >= 0)
+                        err = subsys_interface_register(&hv_stats_interface);
+        }
+
         return err;
 }
 subsys_initcall(create_sysfs_entries);
diff --git a/arch/tile/kernel/time.c b/arch/tile/kernel/time.c
index 7c353d8c2da9..5d10642db63e 100644
--- a/arch/tile/kernel/time.c
+++ b/arch/tile/kernel/time.c
@@ -23,8 +23,10 @@
 #include <linux/smp.h>
 #include <linux/delay.h>
 #include <linux/module.h>
+#include <linux/timekeeper_internal.h>
 #include <asm/irq_regs.h>
 #include <asm/traps.h>
+#include <asm/vdso.h>
 #include <hv/hypervisor.h>
 #include <arch/interrupts.h>
 #include <arch/spr_def.h>
@@ -110,7 +112,6 @@ void __init time_init(void)
         setup_tile_timer();
 }
 
-
 /*
  * Define the tile timer clock event device.  The timer is driven by
  * the TILE_TIMER_CONTROL register, which consists of a 31-bit down
@@ -237,3 +238,37 @@ cycles_t ns2cycles(unsigned long nsecs)
         struct clock_event_device *dev = &__raw_get_cpu_var(tile_timer);
         return ((u64)nsecs * dev->mult) >> dev->shift;
 }
+
+void update_vsyscall_tz(void)
+{
+        /* Userspace gettimeofday will spin while this value is odd. */
+        ++vdso_data->tz_update_count;
+        smp_wmb();
+        vdso_data->tz_minuteswest = sys_tz.tz_minuteswest;
+        vdso_data->tz_dsttime = sys_tz.tz_dsttime;
+        smp_wmb();
+        ++vdso_data->tz_update_count;
+}
+
+void update_vsyscall(struct timekeeper *tk)
+{
+        struct timespec wall_time = tk_xtime(tk);
+        struct timespec *wtm = &tk->wall_to_monotonic;
+        struct clocksource *clock = tk->clock;
+
+        if (clock != &cycle_counter_cs)
+                return;
+
+        /* Userspace gettimeofday will spin while this value is odd. */
+        ++vdso_data->tb_update_count;
+        smp_wmb();
+        vdso_data->xtime_tod_stamp = clock->cycle_last;
+        vdso_data->xtime_clock_sec = wall_time.tv_sec;
+        vdso_data->xtime_clock_nsec = wall_time.tv_nsec;
+        vdso_data->wtom_clock_sec = wtm->tv_sec;
+        vdso_data->wtom_clock_nsec = wtm->tv_nsec;
+        vdso_data->mult = clock->mult;
+        vdso_data->shift = clock->shift;
+        smp_wmb();
+        ++vdso_data->tb_update_count;
+}
diff --git a/arch/tile/kernel/tlb.c b/arch/tile/kernel/tlb.c
index 3fd54d5bbd4c..f23b53515671 100644
--- a/arch/tile/kernel/tlb.c
+++ b/arch/tile/kernel/tlb.c
@@ -91,8 +91,14 @@ void flush_tlb_all(void)
         }
 }
 
+/*
+ * Callers need to flush the L1I themselves if necessary, e.g. for
+ * kernel module unload.  Otherwise we assume callers are not using
+ * executable pgprot_t's.  Using EVICT_L1I means that dataplane cpus
+ * will get an unnecessary interrupt otherwise.
+ */
 void flush_tlb_kernel_range(unsigned long start, unsigned long end)
 {
-        flush_remote(0, HV_FLUSH_EVICT_L1I, cpu_online_mask,
+        flush_remote(0, 0, NULL,
                      start, end - start, PAGE_SIZE, cpu_online_mask, NULL, 0);
 }
diff --git a/arch/tile/kernel/traps.c b/arch/tile/kernel/traps.c
index 5b19a23c8908..6b603d556ca6 100644
--- a/arch/tile/kernel/traps.c
+++ b/arch/tile/kernel/traps.c
@@ -15,6 +15,7 @@
 #include <linux/sched.h>
 #include <linux/kernel.h>
 #include <linux/kprobes.h>
+#include <linux/kdebug.h>
 #include <linux/module.h>
 #include <linux/reboot.h>
 #include <linux/uaccess.h>
@@ -29,7 +30,7 @@
 
 void __init trap_init(void)
 {
-        /* Nothing needed here since we link code at .intrpt1 */
+        /* Nothing needed here since we link code at .intrpt */
 }
 
 int unaligned_fixup = 1;
@@ -100,13 +101,7 @@ static int retry_gpv(unsigned int gpv_reason)
 
 #endif /* CHIP_HAS_TILE_DMA() */
 
-#ifdef __tilegx__
-#define bundle_bits tilegx_bundle_bits
-#else
-#define bundle_bits tile_bundle_bits
-#endif
-
-extern bundle_bits bpt_code;
+extern tile_bundle_bits bpt_code;
 
 asm(".pushsection .rodata.bpt_code,\"a\";"
     ".align 8;"
@@ -114,7 +109,7 @@ asm(".pushsection .rodata.bpt_code,\"a\";"
     ".size bpt_code,.-bpt_code;"
     ".popsection");
 
-static int special_ill(bundle_bits bundle, int *sigp, int *codep)
+static int special_ill(tile_bundle_bits bundle, int *sigp, int *codep)
 {
         int sig, code, maxcode;
 
@@ -214,24 +209,73 @@ static const char *const int_name[] = {
 #endif
 };
 
+static int do_bpt(struct pt_regs *regs)
+{
+        unsigned long bundle, bcode, bpt;
+
+        bundle = *(unsigned long *)instruction_pointer(regs);
+
+        /*
+         * bpt shoule be { bpt; nop }, which is 0x286a44ae51485000ULL.
+         * we encode the unused least significant bits for other purpose.
+         */
+        bpt = bundle & ~((1ULL << 12) - 1);
+        if (bpt != TILE_BPT_BUNDLE)
+                return 0;
+
+        bcode = bundle & ((1ULL << 12) - 1);
+        /*
+         * notify the kprobe handlers, if instruction is likely to
+         * pertain to them.
+         */
+        switch (bcode) {
+        /* breakpoint_insn */
+        case 0:
+                notify_die(DIE_BREAK, "debug", regs, bundle,
+                        INT_ILL, SIGTRAP);
+                break;
+        /* compiled_bpt */
+        case DIE_COMPILED_BPT:
+                notify_die(DIE_COMPILED_BPT, "debug", regs, bundle,
+                        INT_ILL, SIGTRAP);
+                break;
+        /* breakpoint2_insn */
+        case DIE_SSTEPBP:
+                notify_die(DIE_SSTEPBP, "single_step", regs, bundle,
+                        INT_ILL, SIGTRAP);
+                break;
+        default:
+                return 0;
+        }
+
+        return 1;
+}
+
 void __kprobes do_trap(struct pt_regs *regs, int fault_num,
                        unsigned long reason)
 {
         siginfo_t info = { 0 };
         int signo, code;
         unsigned long address = 0;
-        bundle_bits instr;
+        tile_bundle_bits instr;
+        int is_kernel = !user_mode(regs);
+
+        /* Handle breakpoints, etc. */
+        if (is_kernel && fault_num == INT_ILL && do_bpt(regs))
+                return;
 
-        /* Re-enable interrupts. */
-        local_irq_enable();
+        /* Re-enable interrupts, if they were previously enabled. */
+        if (!(regs->flags & PT_FLAGS_DISABLE_IRQ))
+                local_irq_enable();
 
         /*
          * If it hits in kernel mode and we can't fix it up, just exit the
          * current process and hope for the best.
          */
-        if (!user_mode(regs)) {
+        if (is_kernel) {
                 const char *name;
-                if (fixup_exception(regs))  /* only UNALIGN_DATA in practice */
+                char buf[100];
+                if (fixup_exception(regs))  /* ILL_TRANS or UNALIGN_DATA */
                         return;
                 if (fault_num >= 0 &&
                     fault_num < sizeof(int_name)/sizeof(int_name[0]) &&
@@ -239,10 +283,16 @@ void __kprobes do_trap(struct pt_regs *regs, int fault_num,
                         name = int_name[fault_num];
                 else
                         name = "Unknown interrupt";
-                pr_alert("Kernel took bad trap %d (%s) at PC %#lx\n",
-                         fault_num, name, regs->pc);
                 if (fault_num == INT_GPV)
-                        pr_alert("GPV_REASON is %#lx\n", reason);
+                        snprintf(buf, sizeof(buf), "; GPV_REASON %#lx", reason);
+#ifdef __tilegx__
+                else if (fault_num == INT_ILL_TRANS)
+                        snprintf(buf, sizeof(buf), "; address %#lx", reason);
+#endif
+                else
+                        buf[0] = '\0';
+                pr_alert("Kernel took bad trap %d (%s) at PC %#lx%s\n",
+                         fault_num, name, regs->pc, buf);
                 show_regs(regs);
                 do_exit(SIGKILL);  /* FIXME: implement i386 die() */
                 return;
@@ -324,11 +374,8 @@ void __kprobes do_trap(struct pt_regs *regs, int fault_num,
                 fill_ra_stack();
 
                 signo = SIGSEGV;
+                address = reason;
                 code = SEGV_MAPERR;
-                if (reason & SPR_ILL_TRANS_REASON__I_STREAM_VA_RMASK)
-                        address = regs->pc;
-                else
-                        address = 0;  /* FIXME: GX: single-step for address */
                 break;
         }
 #endif
diff --git a/arch/tile/kernel/unaligned.c b/arch/tile/kernel/unaligned.c
new file mode 100644
index 000000000000..b030b4e78845
--- /dev/null
+++ b/arch/tile/kernel/unaligned.c
@@ -0,0 +1,1609 @@
+/*
+ * Copyright 2013 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ *
+ * A code-rewriter that handles unaligned exception.
+ */
+
+#include <linux/smp.h>
+#include <linux/ptrace.h>
+#include <linux/slab.h>
+#include <linux/thread_info.h>
+#include <linux/uaccess.h>
+#include <linux/mman.h>
+#include <linux/types.h>
+#include <linux/err.h>
+#include <linux/module.h>
+#include <linux/compat.h>
+#include <linux/prctl.h>
+#include <asm/cacheflush.h>
+#include <asm/traps.h>
+#include <asm/uaccess.h>
+#include <asm/unaligned.h>
+#include <arch/abi.h>
+#include <arch/spr_def.h>
+#include <arch/opcode.h>
+
+
+/*
+ * This file handles unaligned exception for tile-Gx. The tilepro's unaligned
+ * exception is supported out of single_step.c
+ */
+
+int unaligned_printk;
+
+static int __init setup_unaligned_printk(char *str)
+{
+        long val;
+        if (kstrtol(str, 0, &val) != 0)
+                return 0;
+        unaligned_printk = val;
+        pr_info("Printk for each unaligned data accesses is %s\n",
+                unaligned_printk ? "enabled" : "disabled");
+        return 1;
+}
+__setup("unaligned_printk=", setup_unaligned_printk);
+
+unsigned int unaligned_fixup_count;
+
+#ifdef __tilegx__
+
+/*
+ * Unalign data jit fixup code fragement. Reserved space is 128 bytes.
+ * The 1st 64-bit word saves fault PC address, 2nd word is the fault
+ * instruction bundle followed by 14 JIT bundles.
+ */
+
+struct unaligned_jit_fragment {
+        unsigned long       pc;
+        tilegx_bundle_bits  bundle;
+        tilegx_bundle_bits  insn[14];
+};
+
+/*
+ * Check if a nop or fnop at bundle's pipeline X0.
+ */
+
+static bool is_bundle_x0_nop(tilegx_bundle_bits bundle)
+{
+        return (((get_UnaryOpcodeExtension_X0(bundle) ==
+                  NOP_UNARY_OPCODE_X0) &&
+                 (get_RRROpcodeExtension_X0(bundle) ==
+                  UNARY_RRR_0_OPCODE_X0) &&
+                 (get_Opcode_X0(bundle) ==
+                  RRR_0_OPCODE_X0)) ||
+                ((get_UnaryOpcodeExtension_X0(bundle) ==
+                  FNOP_UNARY_OPCODE_X0) &&
+                 (get_RRROpcodeExtension_X0(bundle) ==
+                  UNARY_RRR_0_OPCODE_X0) &&
+                 (get_Opcode_X0(bundle) ==
+                  RRR_0_OPCODE_X0)));
+}
+
+/*
+ * Check if nop or fnop at bundle's pipeline X1.
+ */
+
+static bool is_bundle_x1_nop(tilegx_bundle_bits bundle)
+{
+        return (((get_UnaryOpcodeExtension_X1(bundle) ==
+                  NOP_UNARY_OPCODE_X1) &&
+                 (get_RRROpcodeExtension_X1(bundle) ==
+                  UNARY_RRR_0_OPCODE_X1) &&
+                 (get_Opcode_X1(bundle) ==
+                  RRR_0_OPCODE_X1)) ||
+                ((get_UnaryOpcodeExtension_X1(bundle) ==
+                  FNOP_UNARY_OPCODE_X1) &&
+                 (get_RRROpcodeExtension_X1(bundle) ==
+                  UNARY_RRR_0_OPCODE_X1) &&
+                 (get_Opcode_X1(bundle) ==
+                  RRR_0_OPCODE_X1)));
+}
+
+/*
+ * Check if nop or fnop at bundle's Y0 pipeline.
+ */
+
+static bool is_bundle_y0_nop(tilegx_bundle_bits bundle)
+{
+        return (((get_UnaryOpcodeExtension_Y0(bundle) ==
+                  NOP_UNARY_OPCODE_Y0) &&
+                 (get_RRROpcodeExtension_Y0(bundle) ==
+                  UNARY_RRR_1_OPCODE_Y0) &&
+                 (get_Opcode_Y0(bundle) ==
+                  RRR_1_OPCODE_Y0)) ||
+                ((get_UnaryOpcodeExtension_Y0(bundle) ==
+                  FNOP_UNARY_OPCODE_Y0) &&
+                 (get_RRROpcodeExtension_Y0(bundle) ==
+                  UNARY_RRR_1_OPCODE_Y0) &&
+                 (get_Opcode_Y0(bundle) ==
+                  RRR_1_OPCODE_Y0)));
+}
+
+/*
+ * Check if nop or fnop at bundle's pipeline Y1.
+ */
+
+static bool is_bundle_y1_nop(tilegx_bundle_bits bundle)
+{
+        return (((get_UnaryOpcodeExtension_Y1(bundle) ==
+                  NOP_UNARY_OPCODE_Y1) &&
+                 (get_RRROpcodeExtension_Y1(bundle) ==
+                  UNARY_RRR_1_OPCODE_Y1) &&
+                 (get_Opcode_Y1(bundle) ==
+                  RRR_1_OPCODE_Y1)) ||
+                ((get_UnaryOpcodeExtension_Y1(bundle) ==
+                  FNOP_UNARY_OPCODE_Y1) &&
+                 (get_RRROpcodeExtension_Y1(bundle) ==
+                  UNARY_RRR_1_OPCODE_Y1) &&
+                 (get_Opcode_Y1(bundle) ==
+                  RRR_1_OPCODE_Y1)));
+}
+
+/*
+ * Test if a bundle's y0 and y1 pipelines are both nop or fnop.
+ */
+
+static bool is_y0_y1_nop(tilegx_bundle_bits bundle)
+{
+        return is_bundle_y0_nop(bundle) && is_bundle_y1_nop(bundle);
+}
+
+/*
+ * Test if a bundle's x0 and x1 pipelines are both nop or fnop.
+ */
+
+static bool is_x0_x1_nop(tilegx_bundle_bits bundle)
+{
+        return is_bundle_x0_nop(bundle) && is_bundle_x1_nop(bundle);
+}
+
+/*
+ * Find the destination, source registers of fault unalign access instruction
+ * at X1 or Y2. Also, allocate up to 3 scratch registers clob1, clob2 and
+ * clob3, which are guaranteed different from any register used in the fault
+ * bundle. r_alias is used to return if the other instructions other than the
+ * unalign load/store shares same register with ra, rb and rd.
+ */
+
+static void find_regs(tilegx_bundle_bits bundle, uint64_t *rd, uint64_t *ra,
+                      uint64_t *rb, uint64_t *clob1, uint64_t *clob2,
+                      uint64_t *clob3, bool *r_alias)
+{
+        int i;
+        uint64_t reg;
+        uint64_t reg_map = 0, alias_reg_map = 0, map;
+        bool alias;
+
+        *ra = -1;
+        *rb = -1;
+
+        if (rd)
+                *rd = -1;
+
+        *clob1 = -1;
+        *clob2 = -1;
+        *clob3 = -1;
+        alias = false;
+
+        /*
+         * Parse fault bundle, find potential used registers and mark
+         * corresponding bits in reg_map and alias_map. These 2 bit maps
+         * are used to find the scratch registers and determine if there
+         * is register alais.
+         */
+        if (bundle & TILEGX_BUNDLE_MODE_MASK) {  /* Y Mode Bundle. */
+
+                reg = get_SrcA_Y2(bundle);
+                reg_map |= 1ULL << reg;
+                *ra = reg;
+                reg = get_SrcBDest_Y2(bundle);
+                reg_map |= 1ULL << reg;
+
+                if (rd) {
+                        /* Load. */
+                        *rd = reg;
+                        alias_reg_map = (1ULL << *rd) | (1ULL << *ra);
+                } else {
+                        /* Store. */
+                        *rb = reg;
+                        alias_reg_map = (1ULL << *ra) | (1ULL << *rb);
+                }
+
+                if (!is_bundle_y1_nop(bundle)) {
+                        reg = get_SrcA_Y1(bundle);
+                        reg_map |= (1ULL << reg);
+                        map = (1ULL << reg);
+
+                        reg = get_SrcB_Y1(bundle);
+                        reg_map |= (1ULL << reg);
+                        map |= (1ULL << reg);
+
+                        reg = get_Dest_Y1(bundle);
+                        reg_map |= (1ULL << reg);
+                        map |= (1ULL << reg);
+
+                        if (map & alias_reg_map)
+                                alias = true;
+                }
+
+                if (!is_bundle_y0_nop(bundle)) {
+                        reg = get_SrcA_Y0(bundle);
+                        reg_map |= (1ULL << reg);
+                        map = (1ULL << reg);
+
+                        reg = get_SrcB_Y0(bundle);
+                        reg_map |= (1ULL << reg);
+                        map |= (1ULL << reg);
+
+                        reg = get_Dest_Y0(bundle);
+                        reg_map |= (1ULL << reg);
+                        map |= (1ULL << reg);
+
+                        if (map & alias_reg_map)
+                                alias = true;
+                }
+        } else  { /* X Mode Bundle. */
+
+                reg = get_SrcA_X1(bundle);
+                reg_map |= (1ULL << reg);
+                *ra = reg;
+                if (rd) {
+                        /* Load. */
+                        reg = get_Dest_X1(bundle);
+                        reg_map |= (1ULL << reg);
+                        *rd = reg;
+                        alias_reg_map = (1ULL << *rd) | (1ULL << *ra);
+                } else {
+                        /* Store. */
+                        reg = get_SrcB_X1(bundle);
+                        reg_map |= (1ULL << reg);
+                        *rb = reg;
+                        alias_reg_map = (1ULL << *ra) | (1ULL << *rb);
+                }
+
+                if (!is_bundle_x0_nop(bundle)) {
+                        reg = get_SrcA_X0(bundle);
+                        reg_map |= (1ULL << reg);
+                        map = (1ULL << reg);
+
+                        reg = get_SrcB_X0(bundle);
+                        reg_map |= (1ULL << reg);
+                        map |= (1ULL << reg);
+
+                        reg = get_Dest_X0(bundle);
+                        reg_map |= (1ULL << reg);
+                        map |= (1ULL << reg);
+
+                        if (map & alias_reg_map)
+                                alias = true;
+                }
+        }
+
+        /*
+         * "alias" indicates if the unalign access registers have collision
+         * with others in the same bundle. We jsut simply test all register
+         * operands case (RRR), ignored the case with immidate. If a bundle
+         * has no register alias, we may do fixup in a simple or fast manner.
+         * So if an immidata field happens to hit with a register, we may end
+         * up fall back to the generic handling.
+         */
+
+        *r_alias = alias;
+
+        /* Flip bits on reg_map. */
+        reg_map ^= -1ULL;
+
+        /* Scan reg_map lower 54(TREG_SP) bits to find 3 set bits. */
+        for (i = 0; i < TREG_SP; i++) {
+                if (reg_map & (0x1ULL << i)) {
+                        if (*clob1 == -1) {
+                                *clob1 = i;
+                        } else if (*clob2 == -1) {
+                                *clob2 = i;
+                        } else if (*clob3 == -1) {
+                                *clob3 = i;
+                                return;
+                        }
+                }
+        }
+}
+
+/*
+ * Sanity check for register ra, rb, rd, clob1/2/3. Return true if any of them
+ * is unexpected.
+ */
+
+static bool check_regs(uint64_t rd, uint64_t ra, uint64_t rb,
+                       uint64_t clob1, uint64_t clob2,  uint64_t clob3)
+{
+        bool unexpected = false;
+        if ((ra >= 56) && (ra != TREG_ZERO))
+                unexpected = true;
+
+        if ((clob1 >= 56) || (clob2 >= 56) || (clob3 >= 56))
+                unexpected = true;
+
+        if (rd != -1) {
+                if ((rd >= 56) && (rd != TREG_ZERO))
+                        unexpected = true;
+        } else {
+                if ((rb >= 56) && (rb != TREG_ZERO))
+                        unexpected = true;
+        }
+        return unexpected;
+}
+
+
+#define  GX_INSN_X0_MASK   ((1ULL << 31) - 1)
+#define  GX_INSN_X1_MASK   (((1ULL << 31) - 1) << 31)
+#define  GX_INSN_Y0_MASK   ((0xFULL << 27) | (0xFFFFFULL))
+#define  GX_INSN_Y1_MASK   (GX_INSN_Y0_MASK << 31)
+#define  GX_INSN_Y2_MASK   ((0x7FULL << 51) | (0x7FULL << 20))
+
+#ifdef __LITTLE_ENDIAN
+#define  GX_INSN_BSWAP(_bundle_)    (_bundle_)
+#else
+#define  GX_INSN_BSWAP(_bundle_)    swab64(_bundle_)
+#endif /* __LITTLE_ENDIAN */
+
+/*
+ * __JIT_CODE(.) creates template bundles in .rodata.unalign_data section.
+ * The corresponding static function jix_x#_###(.) generates partial or
+ * whole bundle based on the template and given arguments.
+ */
+
+#define __JIT_CODE(_X_)                                         \
+        asm (".pushsection .rodata.unalign_data, \"a\"\n"       \
+             _X_"\n"                                            \
+             ".popsection\n")
+
+__JIT_CODE("__unalign_jit_x1_mtspr:   {mtspr 0,  r0}");
+static tilegx_bundle_bits jit_x1_mtspr(int spr, int reg)
+{
+        extern  tilegx_bundle_bits __unalign_jit_x1_mtspr;
+        return (GX_INSN_BSWAP(__unalign_jit_x1_mtspr) & GX_INSN_X1_MASK) |
+                create_MT_Imm14_X1(spr) | create_SrcA_X1(reg);
+}
+
+__JIT_CODE("__unalign_jit_x1_mfspr:   {mfspr r0, 0}");
+static tilegx_bundle_bits  jit_x1_mfspr(int reg, int spr)
+{
+        extern  tilegx_bundle_bits __unalign_jit_x1_mfspr;
+        return (GX_INSN_BSWAP(__unalign_jit_x1_mfspr) & GX_INSN_X1_MASK) |
+                create_MF_Imm14_X1(spr) | create_Dest_X1(reg);
+}
+
+__JIT_CODE("__unalign_jit_x0_addi:   {addi  r0, r0, 0; iret}");
+static tilegx_bundle_bits  jit_x0_addi(int rd, int ra, int imm8)
+{
+        extern  tilegx_bundle_bits __unalign_jit_x0_addi;
+        return (GX_INSN_BSWAP(__unalign_jit_x0_addi) & GX_INSN_X0_MASK) |
+                create_Dest_X0(rd) | create_SrcA_X0(ra) |
+                create_Imm8_X0(imm8);
+}
+
+__JIT_CODE("__unalign_jit_x1_ldna:   {ldna  r0, r0}");
+static tilegx_bundle_bits  jit_x1_ldna(int rd, int ra)
+{
+        extern  tilegx_bundle_bits __unalign_jit_x1_ldna;
+        return (GX_INSN_BSWAP(__unalign_jit_x1_ldna) &  GX_INSN_X1_MASK) |
+                create_Dest_X1(rd) | create_SrcA_X1(ra);
+}
+
+__JIT_CODE("__unalign_jit_x0_dblalign:   {dblalign r0, r0 ,r0}");
+static tilegx_bundle_bits  jit_x0_dblalign(int rd, int ra, int rb)
+{
+        extern  tilegx_bundle_bits __unalign_jit_x0_dblalign;
+        return (GX_INSN_BSWAP(__unalign_jit_x0_dblalign) & GX_INSN_X0_MASK) |
+                create_Dest_X0(rd) | create_SrcA_X0(ra) |
+                create_SrcB_X0(rb);
+}
+
+__JIT_CODE("__unalign_jit_x1_iret:   {iret}");
+static tilegx_bundle_bits  jit_x1_iret(void)
+{
+        extern  tilegx_bundle_bits __unalign_jit_x1_iret;
+        return GX_INSN_BSWAP(__unalign_jit_x1_iret) & GX_INSN_X1_MASK;
+}
+
+__JIT_CODE("__unalign_jit_x01_fnop:   {fnop;fnop}");
+static tilegx_bundle_bits  jit_x0_fnop(void)
+{
+        extern  tilegx_bundle_bits __unalign_jit_x01_fnop;
+        return GX_INSN_BSWAP(__unalign_jit_x01_fnop) & GX_INSN_X0_MASK;
+}
+
+static tilegx_bundle_bits  jit_x1_fnop(void)
+{
+        extern  tilegx_bundle_bits __unalign_jit_x01_fnop;
+        return GX_INSN_BSWAP(__unalign_jit_x01_fnop) & GX_INSN_X1_MASK;
+}
+
+__JIT_CODE("__unalign_jit_y2_dummy:   {fnop; fnop; ld zero, sp}");
+static tilegx_bundle_bits  jit_y2_dummy(void)
+{
+        extern  tilegx_bundle_bits __unalign_jit_y2_dummy;
+        return GX_INSN_BSWAP(__unalign_jit_y2_dummy) & GX_INSN_Y2_MASK;
+}
+
+static tilegx_bundle_bits  jit_y1_fnop(void)
+{
+        extern  tilegx_bundle_bits __unalign_jit_y2_dummy;
+        return GX_INSN_BSWAP(__unalign_jit_y2_dummy) & GX_INSN_Y1_MASK;
+}
+
+__JIT_CODE("__unalign_jit_x1_st1_add:  {st1_add r1, r0, 0}");
+static tilegx_bundle_bits  jit_x1_st1_add(int ra, int rb, int imm8)
+{
+        extern  tilegx_bundle_bits __unalign_jit_x1_st1_add;
+        return (GX_INSN_BSWAP(__unalign_jit_x1_st1_add) &
+                (~create_SrcA_X1(-1)) &
+                GX_INSN_X1_MASK) | create_SrcA_X1(ra) |
+                create_SrcB_X1(rb) | create_Dest_Imm8_X1(imm8);
+}
+
+__JIT_CODE("__unalign_jit_x1_st:  {crc32_8 r1, r0, r0; st  r0, r0}");
+static tilegx_bundle_bits  jit_x1_st(int ra, int rb)
+{
+        extern  tilegx_bundle_bits __unalign_jit_x1_st;
+        return (GX_INSN_BSWAP(__unalign_jit_x1_st) & GX_INSN_X1_MASK) |
+                create_SrcA_X1(ra) | create_SrcB_X1(rb);
+}
+
+__JIT_CODE("__unalign_jit_x1_st_add:  {st_add  r1, r0, 0}");
+static tilegx_bundle_bits  jit_x1_st_add(int ra, int rb, int imm8)
+{
+        extern  tilegx_bundle_bits __unalign_jit_x1_st_add;
+        return (GX_INSN_BSWAP(__unalign_jit_x1_st_add) &
+                (~create_SrcA_X1(-1)) &
+                GX_INSN_X1_MASK) | create_SrcA_X1(ra) |
+                create_SrcB_X1(rb) | create_Dest_Imm8_X1(imm8);
+}
+
+__JIT_CODE("__unalign_jit_x1_ld:  {crc32_8 r1, r0, r0; ld  r0, r0}");
+static tilegx_bundle_bits  jit_x1_ld(int rd, int ra)
+{
+        extern  tilegx_bundle_bits __unalign_jit_x1_ld;
+        return (GX_INSN_BSWAP(__unalign_jit_x1_ld) & GX_INSN_X1_MASK) |
+                create_Dest_X1(rd) | create_SrcA_X1(ra);
+}
+
+__JIT_CODE("__unalign_jit_x1_ld_add:  {ld_add  r1, r0, 0}");
+static tilegx_bundle_bits  jit_x1_ld_add(int rd, int ra, int imm8)
+{
+        extern  tilegx_bundle_bits __unalign_jit_x1_ld_add;
+        return (GX_INSN_BSWAP(__unalign_jit_x1_ld_add) &
+                (~create_Dest_X1(-1)) &
+                GX_INSN_X1_MASK) | create_Dest_X1(rd) |
+                create_SrcA_X1(ra) | create_Imm8_X1(imm8);
+}
+
+__JIT_CODE("__unalign_jit_x0_bfexts:  {bfexts r0, r0, 0, 0}");
+static tilegx_bundle_bits  jit_x0_bfexts(int rd, int ra, int bfs, int bfe)
+{
+        extern  tilegx_bundle_bits __unalign_jit_x0_bfexts;
+        return (GX_INSN_BSWAP(__unalign_jit_x0_bfexts) &
+                GX_INSN_X0_MASK) |
+                create_Dest_X0(rd) | create_SrcA_X0(ra) |
+                create_BFStart_X0(bfs) | create_BFEnd_X0(bfe);
+}
+
+__JIT_CODE("__unalign_jit_x0_bfextu:  {bfextu r0, r0, 0, 0}");
+static tilegx_bundle_bits  jit_x0_bfextu(int rd, int ra, int bfs, int bfe)
+{
+        extern  tilegx_bundle_bits __unalign_jit_x0_bfextu;
+        return (GX_INSN_BSWAP(__unalign_jit_x0_bfextu) &
+                GX_INSN_X0_MASK) |
+                create_Dest_X0(rd) | create_SrcA_X0(ra) |
+                create_BFStart_X0(bfs) | create_BFEnd_X0(bfe);
+}
+
+__JIT_CODE("__unalign_jit_x1_addi:  {bfextu r1, r1, 0, 0; addi r0, r0, 0}");
+static tilegx_bundle_bits  jit_x1_addi(int rd, int ra, int imm8)
+{
+        extern  tilegx_bundle_bits __unalign_jit_x1_addi;
+        return (GX_INSN_BSWAP(__unalign_jit_x1_addi) & GX_INSN_X1_MASK) |
+                create_Dest_X1(rd) | create_SrcA_X1(ra) |
+                create_Imm8_X1(imm8);
+}
+
+__JIT_CODE("__unalign_jit_x0_shrui:  {shrui r0, r0, 0; iret}");
+static tilegx_bundle_bits  jit_x0_shrui(int rd, int ra, int imm6)
+{
+        extern  tilegx_bundle_bits __unalign_jit_x0_shrui;
+        return (GX_INSN_BSWAP(__unalign_jit_x0_shrui) &
+                GX_INSN_X0_MASK) |
+                create_Dest_X0(rd) | create_SrcA_X0(ra) |
+                create_ShAmt_X0(imm6);
+}
+
+__JIT_CODE("__unalign_jit_x0_rotli:  {rotli r0, r0, 0; iret}");
+static tilegx_bundle_bits  jit_x0_rotli(int rd, int ra, int imm6)
+{
+        extern  tilegx_bundle_bits __unalign_jit_x0_rotli;
+        return (GX_INSN_BSWAP(__unalign_jit_x0_rotli) &
+                GX_INSN_X0_MASK) |
+                create_Dest_X0(rd) | create_SrcA_X0(ra) |
+                create_ShAmt_X0(imm6);
+}
+
+__JIT_CODE("__unalign_jit_x1_bnezt:  {bnezt r0, __unalign_jit_x1_bnezt}");
+static tilegx_bundle_bits  jit_x1_bnezt(int ra, int broff)
+{
+        extern  tilegx_bundle_bits __unalign_jit_x1_bnezt;
+        return (GX_INSN_BSWAP(__unalign_jit_x1_bnezt) &
+                GX_INSN_X1_MASK) |
+                create_SrcA_X1(ra) | create_BrOff_X1(broff);
+}
+
+#undef __JIT_CODE
+
+/*
+ * This function generates unalign fixup JIT.
+ *
+ * We first find unalign load/store instruction's destination, source
+ * registers: ra, rb and rd. and 3 scratch registers by calling
+ * find_regs(...). 3 scratch clobbers should not alias with any register
+ * used in the fault bundle. Then analyze the fault bundle to determine
+ * if it's a load or store, operand width, branch or address increment etc.
+ * At last generated JIT is copied into JIT code area in user space.
+ */
+
+static
+void jit_bundle_gen(struct pt_regs *regs, tilegx_bundle_bits bundle,
+                    int align_ctl)
+{
+        struct thread_info *info = current_thread_info();
+        struct unaligned_jit_fragment frag;
+        struct unaligned_jit_fragment *jit_code_area;
+        tilegx_bundle_bits bundle_2 = 0;
+        /* If bundle_2_enable = false, bundle_2 is fnop/nop operation. */
+        bool     bundle_2_enable = true;
+        uint64_t ra, rb, rd = -1, clob1, clob2, clob3;
+        /*
+         * Indicate if the unalign access
+         * instruction's registers hit with
+         * others in the same bundle.
+         */
+        bool     alias = false;
+        bool     load_n_store = true;
+        bool     load_store_signed = false;
+        unsigned int  load_store_size = 8;
+        bool     y1_br = false;  /* True, for a branch in same bundle at Y1.*/
+        int      y1_br_reg = 0;
+        /* True for link operation. i.e. jalr or lnk at Y1 */
+        bool     y1_lr = false;
+        int      y1_lr_reg = 0;
+        bool     x1_add = false;/* True, for load/store ADD instruction at X1*/
+        int      x1_add_imm8 = 0;
+        bool     unexpected = false;
+        int      n = 0, k;
+
+        jit_code_area =
+                (struct unaligned_jit_fragment *)(info->unalign_jit_base);
+
+        memset((void *)&frag, 0, sizeof(frag));
+
+        /* 0: X mode, Otherwise: Y mode. */
+        if (bundle & TILEGX_BUNDLE_MODE_MASK) {
+                unsigned int mod, opcode;
+
+                if (get_Opcode_Y1(bundle) == RRR_1_OPCODE_Y1 &&
+                    get_RRROpcodeExtension_Y1(bundle) ==
+                    UNARY_RRR_1_OPCODE_Y1) {
+
+                        opcode = get_UnaryOpcodeExtension_Y1(bundle);
+
+                        /*
+                         * Test "jalr", "jalrp", "jr", "jrp" instruction at Y1
+                         * pipeline.
+                         */
+                        switch (opcode) {
+                        case JALR_UNARY_OPCODE_Y1:
+                        case JALRP_UNARY_OPCODE_Y1:
+                                y1_lr = true;
+                                y1_lr_reg = 55; /* Link register. */
+                                /* FALLTHROUGH */
+                        case JR_UNARY_OPCODE_Y1:
+                        case JRP_UNARY_OPCODE_Y1:
+                                y1_br = true;
+                                y1_br_reg = get_SrcA_Y1(bundle);
+                                break;
+                        case LNK_UNARY_OPCODE_Y1:
+                                /* "lnk" at Y1 pipeline. */
+                                y1_lr = true;
+                                y1_lr_reg = get_Dest_Y1(bundle);
+                                break;
+                        }
+                }
+
+                opcode = get_Opcode_Y2(bundle);
+                mod = get_Mode(bundle);
+
+                /*
+                 *  bundle_2 is bundle after making Y2 as a dummy operation
+                 *  - ld zero, sp
+                 */
+                bundle_2 = (bundle & (~GX_INSN_Y2_MASK)) | jit_y2_dummy();
+
+                /* Make Y1 as fnop if Y1 is a branch or lnk operation. */
+                if (y1_br || y1_lr) {
+                        bundle_2 &= ~(GX_INSN_Y1_MASK);
+                        bundle_2 |= jit_y1_fnop();
+                }
+
+                if (is_y0_y1_nop(bundle_2))
+                        bundle_2_enable = false;
+
+                if (mod == MODE_OPCODE_YC2) {
+                        /* Store. */
+                        load_n_store = false;
+                        load_store_size = 1 << opcode;
+                        load_store_signed = false;
+                        find_regs(bundle, 0, &ra, &rb, &clob1, &clob2,
+                                  &clob3, &alias);
+                        if (load_store_size > 8)
+                                unexpected = true;
+                } else {
+                        /* Load. */
+                        load_n_store = true;
+                        if (mod == MODE_OPCODE_YB2) {
+                                switch (opcode) {
+                                case LD_OPCODE_Y2:
+                                        load_store_signed = false;
+                                        load_store_size = 8;
+                                        break;
+                                case LD4S_OPCODE_Y2:
+                                        load_store_signed = true;
+                                        load_store_size = 4;
+                                        break;
+                                case LD4U_OPCODE_Y2:
+                                        load_store_signed = false;
+                                        load_store_size = 4;
+                                        break;
+                                default:
+                                        unexpected = true;
+                                }
+                        } else if (mod == MODE_OPCODE_YA2) {
+                                if (opcode == LD2S_OPCODE_Y2) {
+                                        load_store_signed = true;
+                                        load_store_size = 2;
+                                } else if (opcode == LD2U_OPCODE_Y2) {
+                                        load_store_signed = false;
+                                        load_store_size = 2;
+                                } else
+                                        unexpected = true;
+                        } else
+                                unexpected = true;
+                        find_regs(bundle, &rd, &ra, &rb, &clob1, &clob2,
+                                  &clob3, &alias);
+                }
+        } else {
+                unsigned int opcode;
+
+                /* bundle_2 is bundle after making X1 as "fnop". */
+                bundle_2 = (bundle & (~GX_INSN_X1_MASK)) | jit_x1_fnop();
+
+                if (is_x0_x1_nop(bundle_2))
+                        bundle_2_enable = false;
+
+                if (get_Opcode_X1(bundle) == RRR_0_OPCODE_X1) {
+                        opcode = get_UnaryOpcodeExtension_X1(bundle);
+
+                        if (get_RRROpcodeExtension_X1(bundle) ==
+                            UNARY_RRR_0_OPCODE_X1) {
+                                load_n_store = true;
+                                find_regs(bundle, &rd, &ra, &rb, &clob1,
+                                          &clob2, &clob3, &alias);
+
+                                switch (opcode) {
+                                case LD_UNARY_OPCODE_X1:
+                                        load_store_signed = false;
+                                        load_store_size = 8;
+                                        break;
+                                case LD4S_UNARY_OPCODE_X1:
+                                        load_store_signed = true;
+                                        /* FALLTHROUGH */
+                                case LD4U_UNARY_OPCODE_X1:
+                                        load_store_size = 4;
+                                        break;
+
+                                case LD2S_UNARY_OPCODE_X1:
+                                        load_store_signed = true;
+                                        /* FALLTHROUGH */
+                                case LD2U_UNARY_OPCODE_X1:
+                                        load_store_size = 2;
+                                        break;
+                                default:
+                                        unexpected = true;
+                                }
+                        } else {
+                                load_n_store = false;
+                                load_store_signed = false;
+                                find_regs(bundle, 0, &ra, &rb,
+                                          &clob1, &clob2, &clob3,
+                                          &alias);
+
+                                opcode = get_RRROpcodeExtension_X1(bundle);
+                                switch (opcode) {
+                                case ST_RRR_0_OPCODE_X1:
+                                        load_store_size = 8;
+                                        break;
+                                case ST4_RRR_0_OPCODE_X1:
+                                        load_store_size = 4;
+                                        break;
+                                case ST2_RRR_0_OPCODE_X1:
+                                        load_store_size = 2;
+                                        break;
+                                default:
+                                        unexpected = true;
+                                }
+                        }
+                } else if (get_Opcode_X1(bundle) == IMM8_OPCODE_X1) {
+                        load_n_store = true;
+                        opcode = get_Imm8OpcodeExtension_X1(bundle);
+                        switch (opcode) {
+                        case LD_ADD_IMM8_OPCODE_X1:
+                                load_store_size = 8;
+                                break;
+
+                        case LD4S_ADD_IMM8_OPCODE_X1:
+                                load_store_signed = true;
+                                /* FALLTHROUGH */
+                        case LD4U_ADD_IMM8_OPCODE_X1:
+                                load_store_size = 4;
+                                break;
+
+                        case LD2S_ADD_IMM8_OPCODE_X1:
+                                load_store_signed = true;
+                                /* FALLTHROUGH */
+                        case LD2U_ADD_IMM8_OPCODE_X1:
+                                load_store_size = 2;
+                                break;
+
+                        case ST_ADD_IMM8_OPCODE_X1:
+                                load_n_store = false;
+                                load_store_size = 8;
+                                break;
+                        case ST4_ADD_IMM8_OPCODE_X1:
+                                load_n_store = false;
+                                load_store_size = 4;
+                                break;
+                        case ST2_ADD_IMM8_OPCODE_X1:
+                                load_n_store = false;
+                                load_store_size = 2;
+                                break;
+                        default:
+                                unexpected = true;
+                        }
+
+                        if (!unexpected) {
+                                x1_add = true;
+                                if (load_n_store)
+                                        x1_add_imm8 = get_Imm8_X1(bundle);
+                                else
+                                        x1_add_imm8 = get_Dest_Imm8_X1(bundle);
+                        }
+
+                        find_regs(bundle, load_n_store ? (&rd) : NULL,
+                                  &ra, &rb, &clob1, &clob2, &clob3, &alias);
+                } else
+                        unexpected = true;
+        }
+
+        /*
+         * Some sanity check for register numbers extracted from fault bundle.
+         */
+        if (check_regs(rd, ra, rb, clob1, clob2, clob3) == true)
+                unexpected = true;
+
+        /* Give warning if register ra has an aligned address. */
+        if (!unexpected)
+                WARN_ON(!((load_store_size - 1) & (regs->regs[ra])));
+
+
+        /*
+         * Fault came from kernel space, here we only need take care of
+         * unaligned "get_user/put_user" macros defined in "uaccess.h".
+         * Basically, we will handle bundle like this:
+         * {ld/2u/4s rd, ra; movei rx, 0} or {st/2/4 ra, rb; movei rx, 0}
+         * (Refer to file "arch/tile/include/asm/uaccess.h" for details).
+         * For either load or store, byte-wise operation is performed by calling
+         * get_user() or put_user(). If the macro returns non-zero value,
+         * set the value to rx, otherwise set zero to rx. Finally make pc point
+         * to next bundle and return.
+         */
+
+        if (EX1_PL(regs->ex1) != USER_PL) {
+
+                unsigned long rx = 0;
+                unsigned long x = 0, ret = 0;
+
+                if (y1_br || y1_lr || x1_add ||
+                    (load_store_signed !=
+                     (load_n_store && load_store_size == 4))) {
+                        /* No branch, link, wrong sign-ext or load/store add. */
+                        unexpected = true;
+                } else if (!unexpected) {
+                        if (bundle & TILEGX_BUNDLE_MODE_MASK) {
+                                /*
+                                 * Fault bundle is Y mode.
+                                 * Check if the Y1 and Y0 is the form of
+                                 * { movei rx, 0; nop/fnop }, if yes,
+                                 * find the rx.
+                                 */
+
+                                if ((get_Opcode_Y1(bundle) == ADDI_OPCODE_Y1)
+                                    && (get_SrcA_Y1(bundle) == TREG_ZERO) &&
+                                    (get_Imm8_Y1(bundle) == 0) &&
+                                    is_bundle_y0_nop(bundle)) {
+                                        rx = get_Dest_Y1(bundle);
+                                } else if ((get_Opcode_Y0(bundle) ==
+                                            ADDI_OPCODE_Y0) &&
+                                           (get_SrcA_Y0(bundle) == TREG_ZERO) &&
+                                           (get_Imm8_Y0(bundle) == 0) &&
+                                           is_bundle_y1_nop(bundle)) {
+                                        rx = get_Dest_Y0(bundle);
+                                } else {
+                                        unexpected = true;
+                                }
+                        } else {
+                                /*
+                                 * Fault bundle is X mode.
+                                 * Check if the X0 is 'movei rx, 0',
+                                 * if yes, find the rx.
+                                 */
+
+                                if ((get_Opcode_X0(bundle) == IMM8_OPCODE_X0)
+                                    && (get_Imm8OpcodeExtension_X0(bundle) ==
+                                        ADDI_IMM8_OPCODE_X0) &&
+                                    (get_SrcA_X0(bundle) == TREG_ZERO) &&
+                                    (get_Imm8_X0(bundle) == 0)) {
+                                        rx = get_Dest_X0(bundle);
+                                } else {
+                                        unexpected = true;
+                                }
+                        }
+
+                        /* rx should be less than 56. */
+                        if (!unexpected && (rx >= 56))
+                                unexpected = true;
+                }
+
+                if (!search_exception_tables(regs->pc)) {
+                        /* No fixup in the exception tables for the pc. */
+                        unexpected = true;
+                }
+
+                if (unexpected) {
+                        /* Unexpected unalign kernel fault. */
+                        struct task_struct *tsk = validate_current();
+
+                        bust_spinlocks(1);
+
+                        show_regs(regs);
+
+                        if (unlikely(tsk->pid < 2)) {
+                                panic("Kernel unalign fault running %s!",
+                                      tsk->pid ? "init" : "the idle task");
+                        }
+#ifdef SUPPORT_DIE
+                        die("Oops", regs);
+#endif
+                        bust_spinlocks(1);
+
+                        do_group_exit(SIGKILL);
+
+                } else {
+                        unsigned long i, b = 0;
+                        unsigned char *ptr =
+                                (unsigned char *)regs->regs[ra];
+                        if (load_n_store) {
+                                /* handle get_user(x, ptr) */
+                                for (i = 0; i < load_store_size; i++) {
+                                        ret = get_user(b, ptr++);
+                                        if (!ret) {
+                                                /* Success! update x. */
+#ifdef __LITTLE_ENDIAN
+                                                x |= (b << (8 * i));
+#else
+                                                x <<= 8;
+                                                x |= b;
+#endif /* __LITTLE_ENDIAN */
+                                        } else {
+                                                x = 0;
+                                                break;
+                                        }
+                                }
+
+                                /* Sign-extend 4-byte loads. */
+                                if (load_store_size == 4)
+                                        x = (long)(int)x;
+
+                                /* Set register rd. */
+                                regs->regs[rd] = x;
+
+                                /* Set register rx. */
+                                regs->regs[rx] = ret;
+
+                                /* Bump pc. */
+                                regs->pc += 8;
+
+                        } else {
+                                /* Handle put_user(x, ptr) */
+                                x = regs->regs[rb];
+#ifdef __LITTLE_ENDIAN
+                                b = x;
+#else
+                                /*
+                                 * Swap x in order to store x from low
+                                 * to high memory same as the
+                                 * little-endian case.
+                                 */
+                                switch (load_store_size) {
+                                case 8:
+                                        b = swab64(x);
+                                        break;
+                                case 4:
+                                        b = swab32(x);
+                                        break;
+                                case 2:
+                                        b = swab16(x);
+                                        break;
+                                }
+#endif /* __LITTLE_ENDIAN */
+                                for (i = 0; i < load_store_size; i++) {
+                                        ret = put_user(b, ptr++);
+                                        if (ret)
+                                                break;
+                                        /* Success! shift 1 byte. */
+                                        b >>= 8;
+                                }
+                                /* Set register rx. */
+                                regs->regs[rx] = ret;
+
+                                /* Bump pc. */
+                                regs->pc += 8;
+                        }
+                }
+
+                unaligned_fixup_count++;
+
+                if (unaligned_printk) {
+                        pr_info("%s/%d. Unalign fixup for kernel access "
+                                "to userspace %lx.",
+                                current->comm, current->pid, regs->regs[ra]);
+                }
+
+                /* Done! Return to the exception handler. */
+                return;
+        }
+
+        if ((align_ctl == 0) || unexpected) {
+                siginfo_t info = {
+                        .si_signo = SIGBUS,
+                        .si_code = BUS_ADRALN,
+                        .si_addr = (unsigned char __user *)0
+                };
+                if (unaligned_printk)
+                        pr_info("Unalign bundle: unexp @%llx, %llx",
+                                (unsigned long long)regs->pc,
+                                (unsigned long long)bundle);
+
+                if (ra < 56) {
+                        unsigned long uaa = (unsigned long)regs->regs[ra];
+                        /* Set bus Address. */
+                        info.si_addr = (unsigned char __user *)uaa;
+                }
+
+                unaligned_fixup_count++;
+
+                trace_unhandled_signal("unaligned fixup trap", regs,
+                                       (unsigned long)info.si_addr, SIGBUS);
+                force_sig_info(info.si_signo, &info, current);
+                return;
+        }
+
+#ifdef __LITTLE_ENDIAN
+#define UA_FIXUP_ADDR_DELTA          1
+#define UA_FIXUP_BFEXT_START(_B_)    0
+#define UA_FIXUP_BFEXT_END(_B_)     (8 * (_B_) - 1)
+#else /* __BIG_ENDIAN */
+#define UA_FIXUP_ADDR_DELTA          -1
+#define UA_FIXUP_BFEXT_START(_B_)   (64 - 8 * (_B_))
+#define UA_FIXUP_BFEXT_END(_B_)      63
+#endif /* __LITTLE_ENDIAN */
+
+
+
+        if ((ra != rb) && (rd != TREG_SP) && !alias &&
+            !y1_br && !y1_lr && !x1_add) {
+                /*
+                 * Simple case: ra != rb and no register alias found,
+                 * and no branch or link. This will be the majority.
+                 * We can do a little better for simplae case than the
+                 * generic scheme below.
+                 */
+                if (!load_n_store) {
+                        /*
+                         * Simple store: ra != rb, no need for scratch register.
+                         * Just store and rotate to right bytewise.
+                         */
+#ifdef __BIG_ENDIAN
+                        frag.insn[n++] =
+                                jit_x0_addi(ra, ra, load_store_size - 1) |
+                                jit_x1_fnop();
+#endif /* __BIG_ENDIAN */
+                        for (k = 0; k < load_store_size; k++) {
+                                /* Store a byte. */
+                                frag.insn[n++] =
+                                        jit_x0_rotli(rb, rb, 56) |
+                                        jit_x1_st1_add(ra, rb,
+                                                       UA_FIXUP_ADDR_DELTA);
+                        }
+#ifdef __BIG_ENDIAN
+                        frag.insn[n] = jit_x1_addi(ra, ra, 1);
+#else
+                        frag.insn[n] = jit_x1_addi(ra, ra,
+                                                   -1 * load_store_size);
+#endif /* __LITTLE_ENDIAN */
+
+                        if (load_store_size == 8) {
+                                frag.insn[n] |= jit_x0_fnop();
+                        } else if (load_store_size == 4) {
+                                frag.insn[n] |= jit_x0_rotli(rb, rb, 32);
+                        } else { /* = 2 */
+                                frag.insn[n] |= jit_x0_rotli(rb, rb, 16);
+                        }
+                        n++;
+                        if (bundle_2_enable)
+                                frag.insn[n++] = bundle_2;
+                        frag.insn[n++] = jit_x0_fnop() | jit_x1_iret();
+                } else {
+                        if (rd == ra) {
+                                /* Use two clobber registers: clob1/2. */
+                                frag.insn[n++] =
+                                        jit_x0_addi(TREG_SP, TREG_SP, -16) |
+                                        jit_x1_fnop();
+                                frag.insn[n++] =
+                                        jit_x0_addi(clob1, ra, 7) |
+                                        jit_x1_st_add(TREG_SP, clob1, -8);
+                                frag.insn[n++] =
+                                        jit_x0_addi(clob2, ra, 0) |
+                                        jit_x1_st(TREG_SP, clob2);
+                                frag.insn[n++] =
+                                        jit_x0_fnop() |
+                                        jit_x1_ldna(rd, ra);
+                                frag.insn[n++] =
+                                        jit_x0_fnop() |
+                                        jit_x1_ldna(clob1, clob1);
+                                /*
+                                 * Note: we must make sure that rd must not
+                                 * be sp. Recover clob1/2 from stack.
+                                 */
+                                frag.insn[n++] =
+                                        jit_x0_dblalign(rd, clob1, clob2) |
+                                        jit_x1_ld_add(clob2, TREG_SP, 8);
+                                frag.insn[n++] =
+                                        jit_x0_fnop() |
+                                        jit_x1_ld_add(clob1, TREG_SP, 16);
+                        } else {
+                                /* Use one clobber register: clob1 only. */
+                                frag.insn[n++] =
+                                        jit_x0_addi(TREG_SP, TREG_SP, -16) |
+                                        jit_x1_fnop();
+                                frag.insn[n++] =
+                                        jit_x0_addi(clob1, ra, 7) |
+                                        jit_x1_st(TREG_SP, clob1);
+                                frag.insn[n++] =
+                                        jit_x0_fnop() |
+                                        jit_x1_ldna(rd, ra);
+                                frag.insn[n++] =
+                                        jit_x0_fnop() |
+                                        jit_x1_ldna(clob1, clob1);
+                                /*
+                                 * Note: we must make sure that rd must not
+                                 * be sp. Recover clob1 from stack.
+                                 */
+                                frag.insn[n++] =
+                                        jit_x0_dblalign(rd, clob1, ra) |
+                                        jit_x1_ld_add(clob1, TREG_SP, 16);
+                        }
+
+                        if (bundle_2_enable)
+                                frag.insn[n++] = bundle_2;
+                        /*
+                         * For non 8-byte load, extract corresponding bytes and
+                         * signed extension.
+                         */
+                        if (load_store_size == 4) {
+                                if (load_store_signed)
+                                        frag.insn[n++] =
+                                                jit_x0_bfexts(
+                                                        rd, rd,
+                                                        UA_FIXUP_BFEXT_START(4),
+                                                        UA_FIXUP_BFEXT_END(4)) |
+                                                jit_x1_fnop();
+                                else
+                                        frag.insn[n++] =
+                                                jit_x0_bfextu(
+                                                        rd, rd,
+                                                        UA_FIXUP_BFEXT_START(4),
+                                                        UA_FIXUP_BFEXT_END(4)) |
+                                                jit_x1_fnop();
+                        } else if (load_store_size == 2) {
+                                if (load_store_signed)
+                                        frag.insn[n++] =
+                                                jit_x0_bfexts(
+                                                        rd, rd,
+                                                        UA_FIXUP_BFEXT_START(2),
+                                                        UA_FIXUP_BFEXT_END(2)) |
+                                                jit_x1_fnop();
+                                else
+                                        frag.insn[n++] =
+                                                jit_x0_bfextu(
+                                                        rd, rd,
+                                                        UA_FIXUP_BFEXT_START(2),
+                                                        UA_FIXUP_BFEXT_END(2)) |
+                                                jit_x1_fnop();
+                        }
+
+                        frag.insn[n++] =
+                                jit_x0_fnop()  |
+                                jit_x1_iret();
+                }
+        } else if (!load_n_store) {
+
+                /*
+                 * Generic memory store cases: use 3 clobber registers.
+                 *
+                 * Alloc space for saveing clob2,1,3 on user's stack.
+                 * register clob3 points to where clob2 saved, followed by
+                 * clob1 and 3 from high to low memory.
+                 */
+                frag.insn[n++] =
+                        jit_x0_addi(TREG_SP, TREG_SP, -32)    |
+                        jit_x1_fnop();
+                frag.insn[n++] =
+                        jit_x0_addi(clob3, TREG_SP, 16)  |
+                        jit_x1_st_add(TREG_SP, clob3, 8);
+#ifdef __LITTLE_ENDIAN
+                frag.insn[n++] =
+                        jit_x0_addi(clob1, ra, 0)   |
+                        jit_x1_st_add(TREG_SP, clob1, 8);
+#else
+                frag.insn[n++] =
+                        jit_x0_addi(clob1, ra, load_store_size - 1)   |
+                        jit_x1_st_add(TREG_SP, clob1, 8);
+#endif
+                if (load_store_size == 8) {
+                        /*
+                         * We save one byte a time, not for fast, but compact
+                         * code. After each store, data source register shift
+                         * right one byte. unchanged after 8 stores.
+                         */
+                        frag.insn[n++] =
+                                jit_x0_addi(clob2, TREG_ZERO, 7)     |
+                                jit_x1_st_add(TREG_SP, clob2, 16);
+                        frag.insn[n++] =
+                                jit_x0_rotli(rb, rb, 56)      |
+                                jit_x1_st1_add(clob1, rb, UA_FIXUP_ADDR_DELTA);
+                        frag.insn[n++] =
+                                jit_x0_addi(clob2, clob2, -1) |
+                                jit_x1_bnezt(clob2, -1);
+                        frag.insn[n++] =
+                                jit_x0_fnop()                 |
+                                jit_x1_addi(clob2, y1_br_reg, 0);
+                } else if (load_store_size == 4) {
+                        frag.insn[n++] =
+                                jit_x0_addi(clob2, TREG_ZERO, 3)     |
+                                jit_x1_st_add(TREG_SP, clob2, 16);
+                        frag.insn[n++] =
+                                jit_x0_rotli(rb, rb, 56)      |
+                                jit_x1_st1_add(clob1, rb, UA_FIXUP_ADDR_DELTA);
+                        frag.insn[n++] =
+                                jit_x0_addi(clob2, clob2, -1) |
+                                jit_x1_bnezt(clob2, -1);
+                        /*
+                         * same as 8-byte case, but need shift another 4
+                         * byte to recover rb for 4-byte store.
+                         */
+                        frag.insn[n++] = jit_x0_rotli(rb, rb, 32)      |
+                                jit_x1_addi(clob2, y1_br_reg, 0);
+                } else { /* =2 */
+                        frag.insn[n++] =
+                                jit_x0_addi(clob2, rb, 0)     |
+                                jit_x1_st_add(TREG_SP, clob2, 16);
+                        for (k = 0; k < 2; k++) {
+                                frag.insn[n++] =
+                                        jit_x0_shrui(rb, rb, 8)  |
+                                        jit_x1_st1_add(clob1, rb,
+                                                       UA_FIXUP_ADDR_DELTA);
+                        }
+                        frag.insn[n++] =
+                                jit_x0_addi(rb, clob2, 0)       |
+                                jit_x1_addi(clob2, y1_br_reg, 0);
+                }
+
+                if (bundle_2_enable)
+                        frag.insn[n++] = bundle_2;
+
+                if (y1_lr) {
+                        frag.insn[n++] =
+                                jit_x0_fnop()                    |
+                                jit_x1_mfspr(y1_lr_reg,
+                                             SPR_EX_CONTEXT_0_0);
+                }
+                if (y1_br) {
+                        frag.insn[n++] =
+                                jit_x0_fnop()                    |
+                                jit_x1_mtspr(SPR_EX_CONTEXT_0_0,
+                                             clob2);
+                }
+                if (x1_add) {
+                        frag.insn[n++] =
+                                jit_x0_addi(ra, ra, x1_add_imm8) |
+                                jit_x1_ld_add(clob2, clob3, -8);
+                } else {
+                        frag.insn[n++] =
+                                jit_x0_fnop()                    |
+                                jit_x1_ld_add(clob2, clob3, -8);
+                }
+                frag.insn[n++] =
+                        jit_x0_fnop()   |
+                        jit_x1_ld_add(clob1, clob3, -8);
+                frag.insn[n++] = jit_x0_fnop()   | jit_x1_ld(clob3, clob3);
+                frag.insn[n++] = jit_x0_fnop()   | jit_x1_iret();
+
+        } else {
+                /*
+                 * Generic memory load cases.
+                 *
+                 * Alloc space for saveing clob1,2,3 on user's stack.
+                 * register clob3 points to where clob1 saved, followed
+                 * by clob2 and 3 from high to low memory.
+                 */
+
+                frag.insn[n++] =
+                        jit_x0_addi(TREG_SP, TREG_SP, -32) |
+                        jit_x1_fnop();
+                frag.insn[n++] =
+                        jit_x0_addi(clob3, TREG_SP, 16) |
+                        jit_x1_st_add(TREG_SP, clob3, 8);
+                frag.insn[n++] =
+                        jit_x0_addi(clob2, ra, 0) |
+                        jit_x1_st_add(TREG_SP, clob2, 8);
+
+                if (y1_br) {
+                        frag.insn[n++] =
+                                jit_x0_addi(clob1, y1_br_reg, 0) |
+                                jit_x1_st_add(TREG_SP, clob1, 16);
+                } else {
+                        frag.insn[n++] =
+                                jit_x0_fnop() |
+                                jit_x1_st_add(TREG_SP, clob1, 16);
+                }
+
+                if (bundle_2_enable)
+                        frag.insn[n++] = bundle_2;
+
+                if (y1_lr) {
+                        frag.insn[n++] =
+                                jit_x0_fnop()  |
+                                jit_x1_mfspr(y1_lr_reg,
+                                             SPR_EX_CONTEXT_0_0);
+                }
+
+                if (y1_br) {
+                        frag.insn[n++] =
+                                jit_x0_fnop() |
+                                jit_x1_mtspr(SPR_EX_CONTEXT_0_0,
+                                             clob1);
+                }
+
+                frag.insn[n++] =
+                        jit_x0_addi(clob1, clob2, 7)      |
+                        jit_x1_ldna(rd, clob2);
+                frag.insn[n++] =
+                        jit_x0_fnop()                     |
+                        jit_x1_ldna(clob1, clob1);
+                frag.insn[n++] =
+                        jit_x0_dblalign(rd, clob1, clob2) |
+                        jit_x1_ld_add(clob1, clob3, -8);
+                if (x1_add) {
+                        frag.insn[n++] =
+                                jit_x0_addi(ra, ra, x1_add_imm8) |
+                                jit_x1_ld_add(clob2, clob3, -8);
+                } else {
+                        frag.insn[n++] =
+                                jit_x0_fnop()  |
+                                jit_x1_ld_add(clob2, clob3, -8);
+                }
+
+                frag.insn[n++] =
+                        jit_x0_fnop() |
+                        jit_x1_ld(clob3, clob3);
+
+                if (load_store_size == 4) {
+                        if (load_store_signed)
+                                frag.insn[n++] =
+                                        jit_x0_bfexts(
+                                                rd, rd,
+                                                UA_FIXUP_BFEXT_START(4),
+                                                UA_FIXUP_BFEXT_END(4)) |
+                                        jit_x1_fnop();
+                        else
+                                frag.insn[n++] =
+                                        jit_x0_bfextu(
+                                                rd, rd,
+                                                UA_FIXUP_BFEXT_START(4),
+                                                UA_FIXUP_BFEXT_END(4)) |
+                                        jit_x1_fnop();
+                } else if (load_store_size == 2) {
+                        if (load_store_signed)
+                                frag.insn[n++] =
+                                        jit_x0_bfexts(
+                                                rd, rd,
+                                                UA_FIXUP_BFEXT_START(2),
+                                                UA_FIXUP_BFEXT_END(2)) |
+                                        jit_x1_fnop();
+                        else
+                                frag.insn[n++] =
+                                        jit_x0_bfextu(
+                                                rd, rd,
+                                                UA_FIXUP_BFEXT_START(2),
+                                                UA_FIXUP_BFEXT_END(2)) |
+                                        jit_x1_fnop();
+                }
+
+                frag.insn[n++] = jit_x0_fnop() | jit_x1_iret();
+        }
+
+        /* Max JIT bundle count is 14. */
+        WARN_ON(n > 14);
+
+        if (!unexpected) {
+                int status = 0;
+                int idx = (regs->pc >> 3) &
+                        ((1ULL << (PAGE_SHIFT - UNALIGN_JIT_SHIFT)) - 1);
+
+                frag.pc = regs->pc;
+                frag.bundle = bundle;
+
+                if (unaligned_printk) {
+                        pr_info("%s/%d, Unalign fixup: pc=%lx "
+                                "bundle=%lx %d %d %d %d %d %d %d %d.",
+                                current->comm, current->pid,
+                                (unsigned long)frag.pc,
+                                (unsigned long)frag.bundle,
+                                (int)alias, (int)rd, (int)ra,
+                                (int)rb, (int)bundle_2_enable,
+                                (int)y1_lr, (int)y1_br, (int)x1_add);
+
+                        for (k = 0; k < n; k += 2)
+                                pr_info("[%d] %016llx %016llx", k,
+                                        (unsigned long long)frag.insn[k],
+                                        (unsigned long long)frag.insn[k+1]);
+                }
+
+                /* Swap bundle byte order for big endian sys. */
+#ifdef __BIG_ENDIAN
+                frag.bundle = GX_INSN_BSWAP(frag.bundle);
+                for (k = 0; k < n; k++)
+                        frag.insn[k] = GX_INSN_BSWAP(frag.insn[k]);
+#endif /* __BIG_ENDIAN */
+
+                status = copy_to_user((void __user *)&jit_code_area[idx],
+                                      &frag, sizeof(frag));
+                if (status) {
+                        /* Fail to copy JIT into user land. send SIGSEGV. */
+                        siginfo_t info = {
+                                .si_signo = SIGSEGV,
+                                .si_code = SEGV_MAPERR,
+                                .si_addr = (void __user *)&jit_code_area[idx]
+                        };
+
+                        pr_warn("Unalign fixup: pid=%d %s jit_code_area=%llx",
+                                current->pid, current->comm,
+                                (unsigned long long)&jit_code_area[idx]);
+
+                        trace_unhandled_signal("segfault in unalign fixup",
+                                               regs,
+                                               (unsigned long)info.si_addr,
+                                               SIGSEGV);
+                        force_sig_info(info.si_signo, &info, current);
+                        return;
+                }
+
+
+                /* Do a cheaper increment, not accurate. */
+                unaligned_fixup_count++;
+                __flush_icache_range((unsigned long)&jit_code_area[idx],
+                                     (unsigned long)&jit_code_area[idx] +
+                                     sizeof(frag));
+
+                /* Setup SPR_EX_CONTEXT_0_0/1 for returning to user program.*/
+                __insn_mtspr(SPR_EX_CONTEXT_0_0, regs->pc + 8);
+                __insn_mtspr(SPR_EX_CONTEXT_0_1, PL_ICS_EX1(USER_PL, 0));
+
+                /* Modify pc at the start of new JIT. */
+                regs->pc = (unsigned long)&jit_code_area[idx].insn[0];
+                /* Set ICS in SPR_EX_CONTEXT_K_1. */
+                regs->ex1 = PL_ICS_EX1(USER_PL, 1);
+        }
+}
+
+
+/*
+ * C function to generate unalign data JIT. Called from unalign data
+ * interrupt handler.
+ *
+ * First check if unalign fix is disabled or exception did not not come from
+ * user space or sp register points to unalign address, if true, generate a
+ * SIGBUS. Then map a page into user space as JIT area if it is not mapped
+ * yet. Genenerate JIT code by calling jit_bundle_gen(). After that return
+ * back to exception handler.
+ *
+ * The exception handler will "iret" to new generated JIT code after
+ * restoring caller saved registers. In theory, the JIT code will perform
+ * another "iret" to resume user's program.
+ */
+
+void do_unaligned(struct pt_regs *regs, int vecnum)
+{
+        tilegx_bundle_bits __user  *pc;
+        tilegx_bundle_bits bundle;
+        struct thread_info *info = current_thread_info();
+        int align_ctl;
+
+        /* Checks the per-process unaligned JIT flags */
+        align_ctl = unaligned_fixup;
+        switch (task_thread_info(current)->align_ctl) {
+        case PR_UNALIGN_NOPRINT:
+                align_ctl = 1;
+                break;
+        case PR_UNALIGN_SIGBUS:
+                align_ctl = 0;
+                break;
+        }
+
+        /* Enable iterrupt in order to access user land. */
+        local_irq_enable();
+
+        /*
+         * The fault came from kernel space. Two choices:
+         * (a) unaligned_fixup < 1, we will first call get/put_user fixup
+         *     to return -EFAULT. If no fixup, simply panic the kernel.
+         * (b) unaligned_fixup >=1, we will try to fix the unaligned access
+         *     if it was triggered by get_user/put_user() macros. Panic the
+         *     kernel if it is not fixable.
+         */
+
+        if (EX1_PL(regs->ex1) != USER_PL) {
+
+                if (align_ctl < 1) {
+                        unaligned_fixup_count++;
+                        /* If exception came from kernel, try fix it up. */
+                        if (fixup_exception(regs)) {
+                                if (unaligned_printk)
+                                        pr_info("Unalign fixup: %d %llx @%llx",
+                                                (int)unaligned_fixup,
+                                                (unsigned long long)regs->ex1,
+                                                (unsigned long long)regs->pc);
+                                return;
+                        }
+                        /* Not fixable. Go panic. */
+                        panic("Unalign exception in Kernel. pc=%lx",
+                              regs->pc);
+                        return;
+                } else {
+                        /*
+                         * Try to fix the exception. If we can't, panic the
+                         * kernel.
+                         */
+                        bundle = GX_INSN_BSWAP(
+                                *((tilegx_bundle_bits *)(regs->pc)));
+                        jit_bundle_gen(regs, bundle, align_ctl);
+                        return;
+                }
+        }
+
+        /*
+         * Fault came from user with ICS or stack is not aligned.
+         * If so, we will trigger SIGBUS.
+         */
+        if ((regs->sp & 0x7) || (regs->ex1) || (align_ctl < 0)) {
+                siginfo_t info = {
+                        .si_signo = SIGBUS,
+                        .si_code = BUS_ADRALN,
+                        .si_addr = (unsigned char __user *)0
+                };
+
+                if (unaligned_printk)
+                        pr_info("Unalign fixup: %d %llx @%llx",
+                                (int)unaligned_fixup,
+                                (unsigned long long)regs->ex1,
+                                (unsigned long long)regs->pc);
+
+                unaligned_fixup_count++;
+
+                trace_unhandled_signal("unaligned fixup trap", regs, 0, SIGBUS);
+                force_sig_info(info.si_signo, &info, current);
+                return;
+        }
+
+
+        /* Read the bundle casued the exception! */
+        pc = (tilegx_bundle_bits __user *)(regs->pc);
+        if (get_user(bundle, pc) != 0) {
+                /* Probably never be here since pc is valid user address.*/
+                siginfo_t info = {
+                        .si_signo = SIGSEGV,
+                        .si_code = SEGV_MAPERR,
+                        .si_addr = (void __user *)pc
+                };
+                pr_err("Couldn't read instruction at %p trying to step\n", pc);
+                trace_unhandled_signal("segfault in unalign fixup", regs,
+                                       (unsigned long)info.si_addr, SIGSEGV);
+                force_sig_info(info.si_signo, &info, current);
+                return;
+        }
+
+        if (!info->unalign_jit_base) {
+                void __user *user_page;
+
+                /*
+                 * Allocate a page in userland.
+                 * For 64-bit processes we try to place the mapping far
+                 * from anything else that might be going on (specifically
+                 * 64 GB below the top of the user address space).  If it
+                 * happens not to be possible to put it there, it's OK;
+                 * the kernel will choose another location and we'll
+                 * remember it for later.
+                 */
+                if (is_compat_task())
+                        user_page = NULL;
+                else
+                        user_page = (void __user *)(TASK_SIZE - (1UL << 36)) +
+                                (current->pid << PAGE_SHIFT);
+
+                user_page = (void __user *) vm_mmap(NULL,
+                                                    (unsigned long)user_page,
+                                                    PAGE_SIZE,
+                                                    PROT_EXEC | PROT_READ |
+                                                    PROT_WRITE,
+#ifdef CONFIG_HOMECACHE
+                                                    MAP_CACHE_HOME_TASK |
+#endif
+                                                    MAP_PRIVATE |
+                                                    MAP_ANONYMOUS,
+                                                    0);
+
+                if (IS_ERR((void __force *)user_page)) {
+                        pr_err("Out of kernel pages trying do_mmap.\n");
+                        return;
+                }
+
+                /* Save the address in the thread_info struct */
+                info->unalign_jit_base = user_page;
+                if (unaligned_printk)
+                        pr_info("Unalign bundle: %d:%d, allocate page @%llx",
+                                raw_smp_processor_id(), current->pid,
+                                (unsigned long long)user_page);
+        }
+
+        /* Generate unalign JIT */
+        jit_bundle_gen(regs, GX_INSN_BSWAP(bundle), align_ctl);
+}
+
+#endif /* __tilegx__ */
diff --git a/arch/tile/kernel/vdso.c b/arch/tile/kernel/vdso.c
new file mode 100644
index 000000000000..1533af24106e
--- /dev/null
+++ b/arch/tile/kernel/vdso.c
@@ -0,0 +1,212 @@
+/*
+ * Copyright 2012 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#include <linux/binfmts.h>
+#include <linux/compat.h>
+#include <linux/elf.h>
+#include <linux/mm.h>
+#include <linux/pagemap.h>
+
+#include <asm/vdso.h>
+#include <asm/mman.h>
+#include <asm/sections.h>
+
+#include <arch/sim.h>
+
+/* The alignment of the vDSO. */
+#define VDSO_ALIGNMENT  PAGE_SIZE
+
+
+static unsigned int vdso_pages;
+static struct page **vdso_pagelist;
+
+#ifdef CONFIG_COMPAT
+static unsigned int vdso32_pages;
+static struct page **vdso32_pagelist;
+#endif
+static int vdso_ready;
+
+/*
+ * The vdso data page.
+ */
+static union {
+        struct vdso_data        data;
+        u8                      page[PAGE_SIZE];
+} vdso_data_store __page_aligned_data;
+
+struct vdso_data *vdso_data = &vdso_data_store.data;
+
+static unsigned int __read_mostly vdso_enabled = 1;
+
+static struct page **vdso_setup(void *vdso_kbase, unsigned int pages)
+{
+        int i;
+        struct page **pagelist;
+
+        pagelist = kzalloc(sizeof(struct page *) * (pages + 1), GFP_KERNEL);
+        BUG_ON(pagelist == NULL);
+        for (i = 0; i < pages - 1; i++) {
+                struct page *pg = virt_to_page(vdso_kbase + i*PAGE_SIZE);
+                ClearPageReserved(pg);
+                pagelist[i] = pg;
+        }
+        pagelist[pages - 1] = virt_to_page(vdso_data);
+        pagelist[pages] = NULL;
+
+        return pagelist;
+}
+
+static int __init vdso_init(void)
+{
+        int data_pages = sizeof(vdso_data_store) >> PAGE_SHIFT;
+
+        /*
+         * We can disable vDSO support generally, but we need to retain
+         * one page to support the two-bundle (16-byte) rt_sigreturn path.
+         */
+        if (!vdso_enabled) {
+                size_t offset = (unsigned long)&__vdso_rt_sigreturn;
+                static struct page *sigret_page;
+                sigret_page = alloc_page(GFP_KERNEL | __GFP_ZERO);
+                BUG_ON(sigret_page == NULL);
+                vdso_pagelist = &sigret_page;
+                vdso_pages = 1;
+                BUG_ON(offset >= PAGE_SIZE);
+                memcpy(page_address(sigret_page) + offset,
+                       vdso_start + offset, 16);
+#ifdef CONFIG_COMPAT
+                vdso32_pages = vdso_pages;
+                vdso32_pagelist = vdso_pagelist;
+#endif
+                vdso_ready = 1;
+                return 0;
+        }
+
+        vdso_pages = (vdso_end - vdso_start) >> PAGE_SHIFT;
+        vdso_pages += data_pages;
+        vdso_pagelist = vdso_setup(vdso_start, vdso_pages);
+
+#ifdef CONFIG_COMPAT
+        vdso32_pages = (vdso32_end - vdso32_start) >> PAGE_SHIFT;
+        vdso32_pages += data_pages;
+        vdso32_pagelist = vdso_setup(vdso32_start, vdso32_pages);
+#endif
+
+        smp_wmb();
+        vdso_ready = 1;
+
+        return 0;
+}
+arch_initcall(vdso_init);
+
+const char *arch_vma_name(struct vm_area_struct *vma)
+{
+        if (vma->vm_mm && vma->vm_start == VDSO_BASE)
+                return "[vdso]";
+#ifndef __tilegx__
+        if (vma->vm_start == MEM_USER_INTRPT)
+                return "[intrpt]";
+#endif
+        return NULL;
+}
+
+struct vm_area_struct *get_gate_vma(struct mm_struct *mm)
+{
+        return NULL;
+}
+
+int in_gate_area(struct mm_struct *mm, unsigned long address)
+{
+        return 0;
+}
+
+int in_gate_area_no_mm(unsigned long address)
+{
+        return 0;
+}
+
+int setup_vdso_pages(void)
+{
+        struct page **pagelist;
+        unsigned long pages;
+        struct mm_struct *mm = current->mm;
+        unsigned long vdso_base = 0;
+        int retval = 0;
+
+        if (!vdso_ready)
+                return 0;
+
+        mm->context.vdso_base = 0;
+
+        pagelist = vdso_pagelist;
+        pages = vdso_pages;
+#ifdef CONFIG_COMPAT
+        if (is_compat_task()) {
+                pagelist = vdso32_pagelist;
+                pages = vdso32_pages;
+        }
+#endif
+
+        /*
+         * vDSO has a problem and was disabled, just don't "enable" it for the
+         * process.
+         */
+        if (pages == 0)
+                return 0;
+
+        vdso_base = get_unmapped_area(NULL, vdso_base,
+                                      (pages << PAGE_SHIFT) +
+                                      ((VDSO_ALIGNMENT - 1) & PAGE_MASK),
+                                      0, 0);
+        if (IS_ERR_VALUE(vdso_base)) {
+                retval = vdso_base;
+                return retval;
+        }
+
+        /* Add required alignment. */
+        vdso_base = ALIGN(vdso_base, VDSO_ALIGNMENT);
+
+        /*
+         * Put vDSO base into mm struct. We need to do this before calling
+         * install_special_mapping or the perf counter mmap tracking code
+         * will fail to recognise it as a vDSO (since arch_vma_name fails).
+         */
+        mm->context.vdso_base = vdso_base;
+
+        /*
+         * our vma flags don't have VM_WRITE so by default, the process isn't
+         * allowed to write those pages.
+         * gdb can break that with ptrace interface, and thus trigger COW on
+         * those pages but it's then your responsibility to never do that on
+         * the "data" page of the vDSO or you'll stop getting kernel updates
+         * and your nice userland gettimeofday will be totally dead.
+         * It's fine to use that for setting breakpoints in the vDSO code
+         * pages though
+         */
+        retval = install_special_mapping(mm, vdso_base,
+                                         pages << PAGE_SHIFT,
+                                         VM_READ|VM_EXEC |
+                                         VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC,
+                                         pagelist);
+        if (retval)
+                mm->context.vdso_base = 0;
+
+        return retval;
+}
+
+static __init int vdso_func(char *s)
+{
+        return kstrtouint(s, 0, &vdso_enabled);
+}
+__setup("vdso=", vdso_func);
diff --git a/arch/tile/kernel/vdso/Makefile b/arch/tile/kernel/vdso/Makefile
new file mode 100644
index 000000000000..e2b7a2f4ee41
--- /dev/null
+++ b/arch/tile/kernel/vdso/Makefile
@@ -0,0 +1,118 @@
+# Symbols present in the vdso
+vdso-syms = rt_sigreturn gettimeofday
+
+# Files to link into the vdso
+obj-vdso = $(patsubst %, v%.o, $(vdso-syms))
+
+# Build rules
+targets := $(obj-vdso) vdso.so vdso.so.dbg vdso.lds
+obj-vdso := $(addprefix $(obj)/, $(obj-vdso))
+
+# vdso32 is only for tilegx -m32 compat task.
+VDSO32-$(CONFIG_COMPAT) := y
+
+obj-y += vdso.o
+obj-$(VDSO32-y) += vdso32.o
+extra-y += vdso.lds
+CPPFLAGS_vdso.lds += -P -C -U$(ARCH)
+
+# vDSO code runs in userspace and -pg doesn't help with profiling anyway.
+CFLAGS_REMOVE_vdso.o = -pg
+CFLAGS_REMOVE_vdso32.o = -pg
+CFLAGS_REMOVE_vrt_sigreturn.o = -pg
+CFLAGS_REMOVE_vrt_sigreturn32.o = -pg
+CFLAGS_REMOVE_vgettimeofday.o = -pg
+CFLAGS_REMOVE_vgettimeofday32.o = -pg
+
+ifdef CONFIG_FEEDBACK_COLLECT
+# vDSO code runs in userspace, not collecting feedback data.
+CFLAGS_REMOVE_vdso.o = -ffeedback-generate
+CFLAGS_REMOVE_vdso32.o = -ffeedback-generate
+CFLAGS_REMOVE_vrt_sigreturn.o = -ffeedback-generate
+CFLAGS_REMOVE_vrt_sigreturn32.o = -ffeedback-generate
+CFLAGS_REMOVE_vgettimeofday.o = -ffeedback-generate
+CFLAGS_REMOVE_vgettimeofday32.o = -ffeedback-generate
+endif
+
+# Disable gcov profiling for VDSO code
+GCOV_PROFILE := n
+
+# Force dependency
+$(obj)/vdso.o: $(obj)/vdso.so
+
+# link rule for the .so file, .lds has to be first
+SYSCFLAGS_vdso.so.dbg = $(c_flags)
+$(obj)/vdso.so.dbg: $(src)/vdso.lds $(obj-vdso)
+        $(call if_changed,vdsold)
+
+
+# We also create a special relocatable object that should mirror the symbol
+# table and layout of the linked DSO.  With ld -R we can then refer to
+# these symbols in the kernel code rather than hand-coded addresses.
+extra-y += vdso-syms.o
+$(obj)/built-in.o: $(obj)/vdso-syms.o
+$(obj)/built-in.o: ld_flags += -R $(obj)/vdso-syms.o
+
+SYSCFLAGS_vdso.so.dbg = -shared -s -Wl,-soname=linux-vdso.so.1 \
+                            $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
+SYSCFLAGS_vdso_syms.o = -r
+$(obj)/vdso-syms.o: $(src)/vdso.lds $(obj)/vrt_sigreturn.o FORCE
+        $(call if_changed,vdsold)
+
+
+# strip rule for the .so file
+$(obj)/%.so: OBJCOPYFLAGS := -S
+$(obj)/%.so: $(obj)/%.so.dbg FORCE
+        $(call if_changed,objcopy)
+
+# actual build commands
+# The DSO images are built using a special linker script
+# Add -lgcc so tilepro gets static muldi3 and lshrdi3 definitions.
+# Make sure only to export the intended __vdso_xxx symbol offsets.
+quiet_cmd_vdsold = VDSOLD  $@
+      cmd_vdsold = $(CC) $(KCFLAGS) -nostdlib $(SYSCFLAGS_$(@F)) \
+                           -Wl,-T,$(filter-out FORCE,$^) -o $@.tmp -lgcc && \
+                   $(CROSS_COMPILE)objcopy \
+                           $(patsubst %, -G __vdso_%, $(vdso-syms)) $@.tmp $@
+
+# install commands for the unstripped file
+quiet_cmd_vdso_install = INSTALL $@
+      cmd_vdso_install = cp $(obj)/$@.dbg $(MODLIB)/vdso/$@
+
+vdso.so: $(obj)/vdso.so.dbg
+        @mkdir -p $(MODLIB)/vdso
+        $(call cmd,vdso_install)
+
+vdso32.so: $(obj)/vdso32.so.dbg
+        $(call cmd,vdso_install)
+
+vdso_install: vdso.so
+vdso32_install: vdso32.so
+
+
+KBUILD_AFLAGS_32 := $(filter-out -m64,$(KBUILD_AFLAGS))
+KBUILD_AFLAGS_32 += -m32 -s
+KBUILD_CFLAGS_32 := $(filter-out -m64,$(KBUILD_CFLAGS))
+KBUILD_CFLAGS_32 += -m32 -fPIC -shared
+
+obj-vdso32 = $(patsubst %, v%32.o, $(vdso-syms))
+obj-vdso32 := $(addprefix $(obj)/, $(obj-vdso32))
+
+targets += $(obj-vdso32) vdso32.so vdso32.so.dbg
+
+$(obj-vdso32:%=%): KBUILD_AFLAGS = $(KBUILD_AFLAGS_32)
+$(obj-vdso32:%=%): KBUILD_CFLAGS = $(KBUILD_CFLAGS_32)
+
+$(obj)/vgettimeofday32.o: $(obj)/vgettimeofday.c
+        $(call if_changed,cc_o_c)
+
+$(obj)/vrt_sigreturn32.o: $(obj)/vrt_sigreturn.S
+        $(call if_changed,as_o_S)
+
+# Force dependency
+$(obj)/vdso32.o: $(obj)/vdso32.so
+
+SYSCFLAGS_vdso32.so.dbg = -m32 -shared -s -Wl,-soname=linux-vdso32.so.1 \
+                            $(call cc-ldoption, -Wl$(comma)--hash-style=sysv)
+$(obj)/vdso32.so.dbg: $(src)/vdso.lds $(obj-vdso32)
+        $(call if_changed,vdsold)
diff --git a/arch/tile/kernel/vdso/vdso.S b/arch/tile/kernel/vdso/vdso.S
new file mode 100644
index 000000000000..3467adb41630
--- /dev/null
+++ b/arch/tile/kernel/vdso/vdso.S
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2012 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#include <linux/init.h>
+#include <linux/linkage.h>
+#include <asm/page.h>
+
+        __PAGE_ALIGNED_DATA
+
+        .global vdso_start, vdso_end
+        .align PAGE_SIZE
+vdso_start:
+        .incbin "arch/tile/kernel/vdso/vdso.so"
+        .align PAGE_SIZE
+vdso_end:
+
+        .previous
diff --git a/arch/tile/kernel/vdso/vdso.lds.S b/arch/tile/kernel/vdso/vdso.lds.S
new file mode 100644
index 000000000000..041cd6c39c83
--- /dev/null
+++ b/arch/tile/kernel/vdso/vdso.lds.S
@@ -0,0 +1,87 @@
+/*
+ * Copyright 2012 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#define VDSO_VERSION_STRING     LINUX_2.6
+
+
+OUTPUT_ARCH(tile)
+
+/* The ELF entry point can be used to set the AT_SYSINFO value. */
+ENTRY(__vdso_rt_sigreturn);
+
+
+SECTIONS
+{
+        . = SIZEOF_HEADERS;
+
+        .hash           : { *(.hash) }                  :text
+        .gnu.hash       : { *(.gnu.hash) }
+        .dynsym         : { *(.dynsym) }
+        .dynstr         : { *(.dynstr) }
+        .gnu.version    : { *(.gnu.version) }
+        .gnu.version_d  : { *(.gnu.version_d) }
+        .gnu.version_r  : { *(.gnu.version_r) }
+
+        .note           : { *(.note.*) }                :text   :note
+        .dynamic        : { *(.dynamic) }               :text   :dynamic
+
+        .eh_frame_hdr   : { *(.eh_frame_hdr) }          :text   :eh_frame_hdr
+        .eh_frame       : { KEEP (*(.eh_frame)) }       :text
+
+        .rodata  : { *(.rodata .rodata.* .gnu.linkonce.r.*) }
+
+        /*
+         * This linker script is used both with -r and with -shared.
+         * For the layouts to match, we need to skip more than enough
+         * space for the dynamic symbol table et al. If this amount
+         * is insufficient, ld -shared will barf. Just increase it here.
+         */
+        . = 0x1000;
+        .text           : { *(.text .text.*) }          :text
+
+        .data           : {
+                *(.got.plt) *(.got)
+                *(.data .data.* .gnu.linkonce.d.*)
+                *(.dynbss)
+                *(.bss .bss.* .gnu.linkonce.b.*)
+        }
+}
+
+
+/*
+ * We must supply the ELF program headers explicitly to get just one
+ * PT_LOAD segment, and set the flags explicitly to make segments read-only.
+ */
+PHDRS
+{
+        text            PT_LOAD         FLAGS(5) FILEHDR PHDRS; /* PF_R|PF_X */
+        dynamic         PT_DYNAMIC      FLAGS(4);               /* PF_R */
+        note            PT_NOTE         FLAGS(4);               /* PF_R */
+        eh_frame_hdr    PT_GNU_EH_FRAME;
+}
+
+
+/*
+ * This controls what userland symbols we export from the vDSO.
+ */
+VERSION
+{
+        VDSO_VERSION_STRING {
+        global:
+                __vdso_rt_sigreturn;
+                __vdso_gettimeofday;
+                gettimeofday;
+        local:*;
+        };
+}
diff --git a/arch/tile/kernel/vdso/vdso32.S b/arch/tile/kernel/vdso/vdso32.S
new file mode 100644
index 000000000000..1d1ac3257e11
--- /dev/null
+++ b/arch/tile/kernel/vdso/vdso32.S
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2013 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#include <linux/init.h>
+#include <linux/linkage.h>
+#include <asm/page.h>
+
+        __PAGE_ALIGNED_DATA
+
+        .global vdso32_start, vdso32_end
+        .align PAGE_SIZE
+vdso32_start:
+        .incbin "arch/tile/kernel/vdso/vdso32.so"
+        .align PAGE_SIZE
+vdso32_end:
+
+        .previous
diff --git a/arch/tile/kernel/vdso/vgettimeofday.c b/arch/tile/kernel/vdso/vgettimeofday.c
new file mode 100644
index 000000000000..51ec8e46f5f9
--- /dev/null
+++ b/arch/tile/kernel/vdso/vgettimeofday.c
@@ -0,0 +1,107 @@
+/*
+ * Copyright 2012 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#define VDSO_BUILD  /* avoid some shift warnings for -m32 in <asm/page.h> */
+#include <linux/time.h>
+#include <asm/timex.h>
+#include <asm/vdso.h>
+
+#if CHIP_HAS_SPLIT_CYCLE()
+static inline cycles_t get_cycles_inline(void)
+{
+        unsigned int high = __insn_mfspr(SPR_CYCLE_HIGH);
+        unsigned int low = __insn_mfspr(SPR_CYCLE_LOW);
+        unsigned int high2 = __insn_mfspr(SPR_CYCLE_HIGH);
+
+        while (unlikely(high != high2)) {
+                low = __insn_mfspr(SPR_CYCLE_LOW);
+                high = high2;
+                high2 = __insn_mfspr(SPR_CYCLE_HIGH);
+        }
+
+        return (((cycles_t)high) << 32) | low;
+}
+#define get_cycles get_cycles_inline
+#endif
+
+/*
+ * Find out the vDSO data page address in the process address space.
+ */
+inline unsigned long get_datapage(void)
+{
+        unsigned long ret;
+
+        /* vdso data page located in the 2nd vDSO page. */
+        asm volatile ("lnk %0" : "=r"(ret));
+        ret &= ~(PAGE_SIZE - 1);
+        ret += PAGE_SIZE;
+
+        return ret;
+}
+
+int __vdso_gettimeofday(struct timeval *tv, struct timezone *tz)
+{
+        cycles_t cycles;
+        unsigned long count, sec, ns;
+        volatile struct vdso_data *vdso_data;
+
+        vdso_data = (struct vdso_data *)get_datapage();
+        /* The use of the timezone is obsolete, normally tz is NULL. */
+        if (unlikely(tz != NULL)) {
+                while (1) {
+                        /* Spin until the update finish. */
+                        count = vdso_data->tz_update_count;
+                        if (count & 1)
+                                continue;
+
+                        tz->tz_minuteswest = vdso_data->tz_minuteswest;
+                        tz->tz_dsttime = vdso_data->tz_dsttime;
+
+                        /* Check whether updated, read again if so. */
+                        if (count == vdso_data->tz_update_count)
+                                break;
+                }
+        }
+
+        if (unlikely(tv == NULL))
+                return 0;
+
+        while (1) {
+                /* Spin until the update finish. */
+                count = vdso_data->tb_update_count;
+                if (count & 1)
+                        continue;
+
+                cycles = (get_cycles() - vdso_data->xtime_tod_stamp);
+                ns = (cycles * vdso_data->mult) >> vdso_data->shift;
+                sec = vdso_data->xtime_clock_sec;
+                ns += vdso_data->xtime_clock_nsec;
+                if (ns >= NSEC_PER_SEC) {
+                        ns -= NSEC_PER_SEC;
+                        sec += 1;
+                }
+
+                /* Check whether updated, read again if so. */
+                if (count == vdso_data->tb_update_count)
+                        break;
+        }
+
+        tv->tv_sec = sec;
+        tv->tv_usec = ns / 1000;
+
+        return 0;
+}
+
+int gettimeofday(struct timeval *tv, struct timezone *tz)
+        __attribute__((weak, alias("__vdso_gettimeofday")));
diff --git a/arch/tile/kernel/vdso/vrt_sigreturn.S b/arch/tile/kernel/vdso/vrt_sigreturn.S
new file mode 100644
index 000000000000..6326caf4a039
--- /dev/null
+++ b/arch/tile/kernel/vdso/vrt_sigreturn.S
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2012 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#include <linux/linkage.h>
+#include <arch/abi.h>
+#include <asm/unistd.h>
+
+/*
+ * Note that libc has a copy of this function that it uses to compare
+ * against the PC when a stack backtrace ends, so if this code is
+ * changed, the libc implementation(s) should also be updated.
+ */
+ENTRY(__vdso_rt_sigreturn)
+        moveli TREG_SYSCALL_NR_NAME, __NR_rt_sigreturn
+        swint1
+        /* We don't use ENDPROC to avoid tagging this symbol as FUNC,
+         * which confuses the perf tool.
+         */
+        END(__vdso_rt_sigreturn)
diff --git a/arch/tile/kernel/vmlinux.lds.S b/arch/tile/kernel/vmlinux.lds.S
index a13ed902afbb..f1819423ffc9 100644
--- a/arch/tile/kernel/vmlinux.lds.S
+++ b/arch/tile/kernel/vmlinux.lds.S
@@ -5,7 +5,7 @@
 #include <hv/hypervisor.h>
 
 /* Text loads starting from the supervisor interrupt vector address. */
-#define TEXT_OFFSET MEM_SV_INTRPT
+#define TEXT_OFFSET MEM_SV_START
 
 OUTPUT_ARCH(tile)
 ENTRY(_start)
@@ -13,7 +13,7 @@ jiffies = jiffies_64;
 
 PHDRS
 {
-  intrpt1 PT_LOAD ;
+  intrpt PT_LOAD ;
   text PT_LOAD ;
   data PT_LOAD ;
 }
@@ -24,14 +24,17 @@ SECTIONS
   #define LOAD_OFFSET TEXT_OFFSET
 
   /* Interrupt vectors */
-  .intrpt1 (LOAD_OFFSET) : AT ( 0 )   /* put at the start of physical memory */
+  .intrpt (LOAD_OFFSET) : AT ( 0 )   /* put at the start of physical memory */
   {
     _text = .;
-    *(.intrpt1)
-  } :intrpt1 =0
+    *(.intrpt)
+  } :intrpt =0
 
   /* Hypervisor call vectors */
-  #include "hvglue.lds"
+  . = ALIGN(0x10000);
+  .hvglue : AT (ADDR(.hvglue) - LOAD_OFFSET) {
+    *(.hvglue)
+  } :NONE
 
   /* Now the real code */
   . = ALIGN(0x20000);
@@ -40,7 +43,11 @@ SECTIONS
     HEAD_TEXT
     SCHED_TEXT
     LOCK_TEXT
+    KPROBES_TEXT
+    IRQENTRY_TEXT
     __fix_text_end = .;   /* tile-cpack won't rearrange before this */
+    ALIGN_FUNCTION();
+    *(.hottext*)
     TEXT_TEXT
     *(.text.*)
     *(.coldtext*)
@@ -67,20 +74,8 @@ SECTIONS
   __init_end = .;
 
   _sdata = .;                   /* Start of data section */
-
   RO_DATA_SECTION(PAGE_SIZE)
-
-  /* initially writeable, then read-only */
-  . = ALIGN(PAGE_SIZE);
-  __w1data_begin = .;
-  .w1data : AT(ADDR(.w1data) - LOAD_OFFSET) {
-    VMLINUX_SYMBOL(__w1data_begin) = .;
-    *(.w1data)
-    VMLINUX_SYMBOL(__w1data_end) = .;
-  }
-
   RW_DATA_SECTION(L2_CACHE_BYTES, PAGE_SIZE, THREAD_SIZE)
-
   _edata = .;
 
   EXCEPTION_TABLE(L2_CACHE_BYTES)
diff --git a/arch/tile/lib/Makefile b/arch/tile/lib/Makefile
index 985f59858234..c4211cbb2021 100644
--- a/arch/tile/lib/Makefile
+++ b/arch/tile/lib/Makefile
@@ -4,15 +4,15 @@
 
 lib-y = cacheflush.o checksum.o cpumask.o delay.o uaccess.o \
         memmove.o memcpy_$(BITS).o memchr_$(BITS).o memset_$(BITS).o \
-        strchr_$(BITS).o strlen_$(BITS).o
-
-ifeq ($(CONFIG_TILEGX),y)
-CFLAGS_REMOVE_memcpy_user_64.o = -fno-omit-frame-pointer
-lib-y += memcpy_user_64.o
-else
-lib-y += atomic_32.o atomic_asm_32.o memcpy_tile64.o
-endif
+        strchr_$(BITS).o strlen_$(BITS).o strnlen_$(BITS).o
 
+lib-$(CONFIG_TILEGX) += memcpy_user_64.o
+lib-$(CONFIG_TILEPRO) += atomic_32.o atomic_asm_32.o
 lib-$(CONFIG_SMP) += spinlock_$(BITS).o usercopy_$(BITS).o
 
 obj-$(CONFIG_MODULES) += exports.o
+
+# The finv_buffer_remote() and copy_{to,from}_user() routines can't
+# have -pg added, since they both rely on being leaf functions.
+CFLAGS_REMOVE_cacheflush.o = -pg
+CFLAGS_REMOVE_memcpy_user_64.o = -pg
diff --git a/arch/tile/lib/atomic_32.c b/arch/tile/lib/atomic_32.c
index f5cada70c3c8..759efa337be8 100644
--- a/arch/tile/lib/atomic_32.c
+++ b/arch/tile/lib/atomic_32.c
@@ -20,50 +20,12 @@
 #include <linux/atomic.h>
 #include <arch/chip.h>
 
-/* See <asm/atomic_32.h> */
-#if ATOMIC_LOCKS_FOUND_VIA_TABLE()
-
-/*
- * A block of memory containing locks for atomic ops. Each instance of this
- * struct will be homed on a different CPU.
- */
-struct atomic_locks_on_cpu {
-        int lock[ATOMIC_HASH_L2_SIZE];
-} __attribute__((aligned(ATOMIC_HASH_L2_SIZE * 4)));
-
-static DEFINE_PER_CPU(struct atomic_locks_on_cpu, atomic_lock_pool);
-
-/* The locks we'll use until __init_atomic_per_cpu is called. */
-static struct atomic_locks_on_cpu __initdata initial_atomic_locks;
-
-/* Hash into this vector to get a pointer to lock for the given atomic. */
-struct atomic_locks_on_cpu *atomic_lock_ptr[ATOMIC_HASH_L1_SIZE]
-        __write_once = {
-        [0 ... ATOMIC_HASH_L1_SIZE-1] (&initial_atomic_locks)
-};
-
-#else /* ATOMIC_LOCKS_FOUND_VIA_TABLE() */
-
 /* This page is remapped on startup to be hash-for-home. */
 int atomic_locks[PAGE_SIZE / sizeof(int)] __page_aligned_bss;
 
-#endif /* ATOMIC_LOCKS_FOUND_VIA_TABLE() */
-
 int *__atomic_hashed_lock(volatile void *v)
 {
         /* NOTE: this code must match "sys_cmpxchg" in kernel/intvec_32.S */
-#if ATOMIC_LOCKS_FOUND_VIA_TABLE()
-        unsigned long i =
-                (unsigned long) v & ((PAGE_SIZE-1) & -sizeof(long long));
-        unsigned long n = __insn_crc32_32(0, i);
-
-        /* Grab high bits for L1 index. */
-        unsigned long l1_index = n >> ((sizeof(n) * 8) - ATOMIC_HASH_L1_SHIFT);
-        /* Grab low bits for L2 index. */
-        unsigned long l2_index = n & (ATOMIC_HASH_L2_SIZE - 1);
-
-        return &atomic_lock_ptr[l1_index]->lock[l2_index];
-#else
         /*
          * Use bits [3, 3 + ATOMIC_HASH_SHIFT) as the lock index.
          * Using mm works here because atomic_locks is page aligned.
@@ -72,26 +34,13 @@ int *__atomic_hashed_lock(volatile void *v)
                                       (unsigned long)atomic_locks,
                                       2, (ATOMIC_HASH_SHIFT + 2) - 1);
         return (int *)ptr;
-#endif
 }
 
 #ifdef CONFIG_SMP
 /* Return whether the passed pointer is a valid atomic lock pointer. */
 static int is_atomic_lock(int *p)
 {
-#if ATOMIC_LOCKS_FOUND_VIA_TABLE()
-        int i;
-        for (i = 0; i < ATOMIC_HASH_L1_SIZE; ++i) {
-
-                if (p >= &atomic_lock_ptr[i]->lock[0] &&
-                    p < &atomic_lock_ptr[i]->lock[ATOMIC_HASH_L2_SIZE]) {
-                        return 1;
-                }
-        }
-        return 0;
-#else
         return p >= &atomic_locks[0] && p < &atomic_locks[ATOMIC_HASH_SIZE];
-#endif
 }
 
 void __atomic_fault_unlock(int *irqlock_word)
@@ -110,33 +59,32 @@ static inline int *__atomic_setup(volatile void *v)
         return __atomic_hashed_lock(v);
 }
 
-int _atomic_xchg(atomic_t *v, int n)
+int _atomic_xchg(int *v, int n)
 {
-        return __atomic_xchg(&v->counter, __atomic_setup(v), n).val;
+        return __atomic_xchg(v, __atomic_setup(v), n).val;
 }
 EXPORT_SYMBOL(_atomic_xchg);
 
-int _atomic_xchg_add(atomic_t *v, int i)
+int _atomic_xchg_add(int *v, int i)
 {
-        return __atomic_xchg_add(&v->counter, __atomic_setup(v), i).val;
+        return __atomic_xchg_add(v, __atomic_setup(v), i).val;
 }
 EXPORT_SYMBOL(_atomic_xchg_add);
 
-int _atomic_xchg_add_unless(atomic_t *v, int a, int u)
+int _atomic_xchg_add_unless(int *v, int a, int u)
 {
         /*
          * Note: argument order is switched here since it is easier
          * to use the first argument consistently as the "old value"
          * in the assembly, as is done for _atomic_cmpxchg().
          */
-        return __atomic_xchg_add_unless(&v->counter, __atomic_setup(v), u, a)
-                .val;
+        return __atomic_xchg_add_unless(v, __atomic_setup(v), u, a).val;
 }
 EXPORT_SYMBOL(_atomic_xchg_add_unless);
 
-int _atomic_cmpxchg(atomic_t *v, int o, int n)
+int _atomic_cmpxchg(int *v, int o, int n)
 {
-        return __atomic_cmpxchg(&v->counter, __atomic_setup(v), o, n).val;
+        return __atomic_cmpxchg(v, __atomic_setup(v), o, n).val;
 }
 EXPORT_SYMBOL(_atomic_cmpxchg);
 
@@ -159,33 +107,32 @@ unsigned long _atomic_xor(volatile unsigned long *p, unsigned long mask)
 EXPORT_SYMBOL(_atomic_xor);
 
 
-u64 _atomic64_xchg(atomic64_t *v, u64 n)
+u64 _atomic64_xchg(u64 *v, u64 n)
 {
-        return __atomic64_xchg(&v->counter, __atomic_setup(v), n);
+        return __atomic64_xchg(v, __atomic_setup(v), n);
 }
 EXPORT_SYMBOL(_atomic64_xchg);
 
-u64 _atomic64_xchg_add(atomic64_t *v, u64 i)
+u64 _atomic64_xchg_add(u64 *v, u64 i)
 {
-        return __atomic64_xchg_add(&v->counter, __atomic_setup(v), i);
+        return __atomic64_xchg_add(v, __atomic_setup(v), i);
 }
 EXPORT_SYMBOL(_atomic64_xchg_add);
 
-u64 _atomic64_xchg_add_unless(atomic64_t *v, u64 a, u64 u)
+u64 _atomic64_xchg_add_unless(u64 *v, u64 a, u64 u)
 {
         /*
          * Note: argument order is switched here since it is easier
          * to use the first argument consistently as the "old value"
          * in the assembly, as is done for _atomic_cmpxchg().
          */
-        return __atomic64_xchg_add_unless(&v->counter, __atomic_setup(v),
-                                          u, a);
+        return __atomic64_xchg_add_unless(v, __atomic_setup(v), u, a);
 }
 EXPORT_SYMBOL(_atomic64_xchg_add_unless);
 
-u64 _atomic64_cmpxchg(atomic64_t *v, u64 o, u64 n)
+u64 _atomic64_cmpxchg(u64 *v, u64 o, u64 n)
 {
-        return __atomic64_cmpxchg(&v->counter, __atomic_setup(v), o, n);
+        return __atomic64_cmpxchg(v, __atomic_setup(v), o, n);
 }
 EXPORT_SYMBOL(_atomic64_cmpxchg);
 
@@ -208,54 +155,8 @@ struct __get_user __atomic_bad_address(int __user *addr)
 }
 
 
-#if CHIP_HAS_CBOX_HOME_MAP()
-static int __init noatomichash(char *str)
-{
-        pr_warning("noatomichash is deprecated.\n");
-        return 1;
-}
-__setup("noatomichash", noatomichash);
-#endif
-
 void __init __init_atomic_per_cpu(void)
 {
-#if ATOMIC_LOCKS_FOUND_VIA_TABLE()
-
-        unsigned int i;
-        int actual_cpu;
-
-        /*
-         * Before this is called from setup, we just have one lock for
-         * all atomic objects/operations.  Here we replace the
-         * elements of atomic_lock_ptr so that they point at per_cpu
-         * integers.  This seemingly over-complex approach stems from
-         * the fact that DEFINE_PER_CPU defines an entry for each cpu
-         * in the grid, not each cpu from 0..ATOMIC_HASH_SIZE-1.  But
-         * for efficient hashing of atomics to their locks we want a
-         * compile time constant power of 2 for the size of this
-         * table, so we use ATOMIC_HASH_SIZE.
-         *
-         * Here we populate atomic_lock_ptr from the per cpu
-         * atomic_lock_pool, interspersing by actual cpu so that
-         * subsequent elements are homed on consecutive cpus.
-         */
-
-        actual_cpu = cpumask_first(cpu_possible_mask);
-
-        for (i = 0; i < ATOMIC_HASH_L1_SIZE; ++i) {
-                /*
-                 * Preincrement to slightly bias against using cpu 0,
-                 * which has plenty of stuff homed on it already.
-                 */
-                actual_cpu = cpumask_next(actual_cpu, cpu_possible_mask);
-                if (actual_cpu >= nr_cpu_ids)
-                        actual_cpu = cpumask_first(cpu_possible_mask);
-
-                atomic_lock_ptr[i] = &per_cpu(atomic_lock_pool, actual_cpu);
-        }
-
-#else /* ATOMIC_LOCKS_FOUND_VIA_TABLE() */
-
         /* Validate power-of-two and "bigger than cpus" assumption */
         BUILD_BUG_ON(ATOMIC_HASH_SIZE & (ATOMIC_HASH_SIZE-1));
         BUG_ON(ATOMIC_HASH_SIZE < nr_cpu_ids);
@@ -279,6 +180,4 @@ void __init __init_atomic_per_cpu(void)
          * That should not produce more indices than ATOMIC_HASH_SIZE.
          */
         BUILD_BUG_ON((PAGE_SIZE >> 3) > ATOMIC_HASH_SIZE);
-
-#endif /* ATOMIC_LOCKS_FOUND_VIA_TABLE() */
 }
diff --git a/arch/tile/lib/atomic_asm_32.S b/arch/tile/lib/atomic_asm_32.S
index 30638042691d..6bda3132cd61 100644
--- a/arch/tile/lib/atomic_asm_32.S
+++ b/arch/tile/lib/atomic_asm_32.S
@@ -164,6 +164,7 @@ STD_ENTRY_SECTION(__atomic\name, .text.atomic)
         STD_ENDPROC(__atomic\name)
         .ifc \bitwidth,32
         .pushsection __ex_table,"a"
+        .align  4
         .word   1b, __atomic\name
         .word   2b, __atomic\name
         .word   __atomic\name, __atomic_bad_address
diff --git a/arch/tile/lib/cacheflush.c b/arch/tile/lib/cacheflush.c
index 8f8ad814b139..9c0ec22009a5 100644
--- a/arch/tile/lib/cacheflush.c
+++ b/arch/tile/lib/cacheflush.c
@@ -36,7 +36,8 @@ static inline void force_load(char *p)
  * core (if "!hfh") or homed via hash-for-home (if "hfh"), waiting
  * until the memory controller holds the flushed values.
  */
-void finv_buffer_remote(void *buffer, size_t size, int hfh)
+void __attribute__((optimize("omit-frame-pointer")))
+finv_buffer_remote(void *buffer, size_t size, int hfh)
 {
         char *p, *base;
         size_t step_size, load_count;
@@ -147,18 +148,21 @@ void finv_buffer_remote(void *buffer, size_t size, int hfh)
                 force_load(p);
 
         /*
-         * Repeat, but with inv's instead of loads, to get rid of the
+         * Repeat, but with finv's instead of loads, to get rid of the
          * data we just loaded into our own cache and the old home L3.
-         * No need to unroll since inv's don't target a register.
+         * No need to unroll since finv's don't target a register.
+         * The finv's are guaranteed not to actually flush the data in
+         * the buffer back to their home, since we just read it, so the
+         * lines are clean in cache; we will only invalidate those lines.
          */
         p = (char *)buffer + size - 1;
-        __insn_inv(p);
+        __insn_finv(p);
         p -= step_size;
         p = (char *)((unsigned long)p | (step_size - 1));
         for (; p >= base; p -= step_size)
-                __insn_inv(p);
+                __insn_finv(p);
 
-        /* Wait for the load+inv's (and thus finvs) to have completed. */
+        /* Wait for these finv's (and thus the first finvs) to be done. */
         __insn_mf();
 
 #ifdef __tilegx__
diff --git a/arch/tile/lib/exports.c b/arch/tile/lib/exports.c
index a93b02a25222..82733c87d67e 100644
--- a/arch/tile/lib/exports.c
+++ b/arch/tile/lib/exports.c
@@ -22,7 +22,6 @@ EXPORT_SYMBOL(strnlen_user_asm);
 EXPORT_SYMBOL(strncpy_from_user_asm);
 EXPORT_SYMBOL(clear_user_asm);
 EXPORT_SYMBOL(flush_user_asm);
-EXPORT_SYMBOL(inv_user_asm);
 EXPORT_SYMBOL(finv_user_asm);
 
 /* arch/tile/kernel/entry.S */
@@ -34,6 +33,12 @@ EXPORT_SYMBOL(dump_stack);
 /* arch/tile/kernel/head.S */
 EXPORT_SYMBOL(empty_zero_page);
 
+#ifdef CONFIG_FUNCTION_TRACER
+/* arch/tile/kernel/mcount_64.S */
+#include <asm/ftrace.h>
+EXPORT_SYMBOL(__mcount);
+#endif /* CONFIG_FUNCTION_TRACER */
+
 /* arch/tile/lib/, various memcpy files */
 EXPORT_SYMBOL(memcpy);
 EXPORT_SYMBOL(__copy_to_user_inatomic);
diff --git a/arch/tile/lib/memchr_64.c b/arch/tile/lib/memchr_64.c
index 6f867dbf7c56..f8196b3a950e 100644
--- a/arch/tile/lib/memchr_64.c
+++ b/arch/tile/lib/memchr_64.c
@@ -36,7 +36,7 @@ void *memchr(const void *s, int c, size_t n)
         p = (const uint64_t *)(s_int & -8);
 
         /* Create eight copies of the byte for which we are looking. */
-        goal = 0x0101010101010101ULL * (uint8_t) c;
+        goal = copy_byte(c);
 
         /* Read the first word, but munge it so that bytes before the array
          * will not match goal.
diff --git a/arch/tile/lib/memcpy_32.S b/arch/tile/lib/memcpy_32.S
index 2a419a6122db..a2771ae5da53 100644
--- a/arch/tile/lib/memcpy_32.S
+++ b/arch/tile/lib/memcpy_32.S
@@ -22,14 +22,6 @@
 
 #include <linux/linkage.h>
 
-/* On TILE64, we wrap these functions via arch/tile/lib/memcpy_tile64.c */
-#if !CHIP_HAS_COHERENT_LOCAL_CACHE()
-#define memcpy __memcpy_asm
-#define __copy_to_user_inatomic __copy_to_user_inatomic_asm
-#define __copy_from_user_inatomic __copy_from_user_inatomic_asm
-#define __copy_from_user_zeroing __copy_from_user_zeroing_asm
-#endif
-
 #define IS_MEMCPY         0
 #define IS_COPY_FROM_USER  1
 #define IS_COPY_FROM_USER_ZEROING  2
@@ -44,6 +36,7 @@
  */
 #define EX \
         .pushsection __ex_table, "a"; \
+        .align 4; \
         .word 9f, memcpy_common_fixup; \
         .popsection; \
         9
@@ -158,12 +151,9 @@ EX:	{ sw r0, r3; addi r0, r0, 4; addi r2, r2, -4 }
 
         { addi r3, r1, 60; andi r9, r9, -64 }
 
-#if CHIP_HAS_WH64()
         /* No need to prefetch dst, we'll just do the wh64
          * right before we copy a line.
          */
-#endif
-
 EX:     { lw r5, r3; addi r3, r3, 64; movei r4, 1 }
         /* Intentionally stall for a few cycles to leave L2 cache alone. */
         { bnzt zero, .; move r27, lr }
@@ -171,21 +161,6 @@ EX:	{ lw r6, r3; addi r3, r3, 64 }
         /* Intentionally stall for a few cycles to leave L2 cache alone. */
         { bnzt zero, . }
 EX:     { lw r7, r3; addi r3, r3, 64 }
-#if !CHIP_HAS_WH64()
-        /* Prefetch the dest */
-        /* Intentionally stall for a few cycles to leave L2 cache alone. */
-        { bnzt zero, . }
-        /* Use a real load to cause a TLB miss if necessary.  We aren't using
-         * r28, so this should be fine.
-         */
-EX:     { lw r28, r9; addi r9, r9, 64 }
-        /* Intentionally stall for a few cycles to leave L2 cache alone. */
-        { bnzt zero, . }
-        { prefetch r9; addi r9, r9, 64 }
-        /* Intentionally stall for a few cycles to leave L2 cache alone. */
-        { bnzt zero, . }
-        { prefetch r9; addi r9, r9, 64 }
-#endif
         /* Intentionally stall for a few cycles to leave L2 cache alone. */
         { bz zero, .Lbig_loop2 }
 
@@ -286,13 +261,8 @@ EX:	{ lw r7, r3; addi r3, r3, 64 }
         /* Fill second L1D line. */
 EX:     { lw r17, r17; addi r1, r1, 48; mvz r3, r13, r1 } /* r17 = WORD_4 */
 
-#if CHIP_HAS_WH64()
         /* Prepare destination line for writing. */
 EX:     { wh64 r9; addi r9, r9, 64 }
-#else
-        /* Prefetch dest line */
-        { prefetch r9; addi r9, r9, 64 }
-#endif
         /* Load seven words that are L1D hits to cover wh64 L2 usage. */
 
         /* Load the three remaining words from the last L1D line, which
@@ -330,16 +300,7 @@ EX:	{ lw r18, r1; addi r1, r1, 4 }                  /* r18 = WORD_8 */
 EX:     { sw r0, r16; addi r0, r0, 4; add r16, r0, r2 } /* store(WORD_0) */
 EX:     { sw r0, r13; addi r0, r0, 4; andi r16, r16, -64 } /* store(WORD_1) */
 EX:     { sw r0, r14; addi r0, r0, 4; slt_u r16, r9, r16 } /* store(WORD_2) */
-#if CHIP_HAS_WH64()
 EX:     { sw r0, r15; addi r0, r0, 4; addi r13, sp, -64 } /* store(WORD_3) */
-#else
-        /* Back up the r9 to a cache line we are already storing to
-         * if it gets past the end of the dest vector.  Strictly speaking,
-         * we don't need to back up to the start of a cache line, but it's free
-         * and tidy, so why not?
-         */
-EX:     { sw r0, r15; addi r0, r0, 4; andi r13, r0, -64 } /* store(WORD_3) */
-#endif
         /* Store second L1D line. */
 EX:     { sw r0, r17; addi r0, r0, 4; mvz r9, r16, r13 }/* store(WORD_4) */
 EX:     { sw r0, r19; addi r0, r0, 4 }                  /* store(WORD_5) */
@@ -403,7 +364,6 @@ EX:	{ sb r0, r3;   addi r0, r0, 1; addi r2, r2, -1 }
 
 .Ldest_is_word_aligned:
 
-#if CHIP_HAS_DWORD_ALIGN()
 EX:     { andi r8, r0, 63; lwadd_na r6, r1, 4}
         { slti_u r9, r2, 64; bz r8, .Ldest_is_L2_line_aligned }
 
@@ -511,26 +471,6 @@ EX:	{ swadd r0, r13, 4; addi r2, r2, -32 }
         /* Move r1 back to the point where it corresponds to r0. */
         { addi r1, r1, -4 }
 
-#else /* !CHIP_HAS_DWORD_ALIGN() */
-
-        /* Compute right/left shift counts and load initial source words. */
-        { andi r5, r1, -4; andi r3, r1, 3 }
-EX:     { lw r6, r5; addi r5, r5, 4; shli r3, r3, 3 }
-EX:     { lw r7, r5; addi r5, r5, 4; sub r4, zero, r3 }
-
-        /* Load and store one word at a time, using shifts and ORs
-         * to correct for the misaligned src.
-         */
-.Lcopy_unaligned_src_loop:
-        { shr r6, r6, r3; shl r8, r7, r4 }
-EX:     { lw r7, r5; or r8, r8, r6; move r6, r7 }
-EX:     { sw r0, r8; addi r0, r0, 4; addi r2, r2, -4 }
-        { addi r5, r5, 4; slti_u r8, r2, 8 }
-        { bzt r8, .Lcopy_unaligned_src_loop; addi r1, r1, 4 }
-
-        { bz r2, .Lcopy_unaligned_done }
-#endif /* !CHIP_HAS_DWORD_ALIGN() */
-
         /* Fall through */
 
 /*
@@ -614,5 +554,6 @@ memcpy_fixup_loop:
         .size memcpy_common_fixup, . - memcpy_common_fixup
 
         .section __ex_table,"a"
+        .align 4
         .word .Lcfu, .Lcopy_from_user_fixup_zero_remainder
         .word .Lctu, .Lcopy_to_user_fixup_done
diff --git a/arch/tile/lib/memcpy_64.c b/arch/tile/lib/memcpy_64.c
index c79b8e7c6828..4815354b8cd2 100644
--- a/arch/tile/lib/memcpy_64.c
+++ b/arch/tile/lib/memcpy_64.c
@@ -18,14 +18,17 @@
 /* EXPORT_SYMBOL() is in arch/tile/lib/exports.c since this should be asm. */
 
 /* Must be 8 bytes in size. */
-#define word_t uint64_t
+#define op_t uint64_t
 
-#if CHIP_L2_LINE_SIZE() != 64 && CHIP_L2_LINE_SIZE() != 128
-#error "Assumes 64 or 128 byte line size"
+/* Threshold value for when to enter the unrolled loops. */
+#define OP_T_THRES      16
+
+#if CHIP_L2_LINE_SIZE() != 64
+#error "Assumes 64 byte line size"
 #endif
 
 /* How many cache lines ahead should we prefetch? */
-#define PREFETCH_LINES_AHEAD 3
+#define PREFETCH_LINES_AHEAD 4
 
 /*
  * Provide "base versions" of load and store for the normal code path.
@@ -51,15 +54,16 @@ void *memcpy(void *__restrict dstv, const void *__restrict srcv, size_t n)
  * macros to return a count of uncopied bytes due to mm fault.
  */
 #define RETVAL 0
-int USERCOPY_FUNC(void *__restrict dstv, const void *__restrict srcv, size_t n)
+int __attribute__((optimize("omit-frame-pointer")))
+USERCOPY_FUNC(void *__restrict dstv, const void *__restrict srcv, size_t n)
 #endif
 {
         char *__restrict dst1 = (char *)dstv;
         const char *__restrict src1 = (const char *)srcv;
         const char *__restrict src1_end;
         const char *__restrict prefetch;
-        word_t *__restrict dst8;    /* 8-byte pointer to destination memory. */
-        word_t final; /* Final bytes to write to trailing word, if any */
+        op_t *__restrict dst8;    /* 8-byte pointer to destination memory. */
+        op_t final; /* Final bytes to write to trailing word, if any */
         long i;
 
         if (n < 16) {
@@ -79,104 +83,228 @@ int USERCOPY_FUNC(void *__restrict dstv, const void *__restrict srcv, size_t n)
         for (i = 0; i < PREFETCH_LINES_AHEAD; i++) {
                 __insn_prefetch(prefetch);
                 prefetch += CHIP_L2_LINE_SIZE();
-                prefetch = (prefetch > src1_end) ? prefetch : src1;
+                prefetch = (prefetch < src1_end) ? prefetch : src1;
         }
 
         /* Copy bytes until dst is word-aligned. */
-        for (; (uintptr_t)dst1 & (sizeof(word_t) - 1); n--)
+        for (; (uintptr_t)dst1 & (sizeof(op_t) - 1); n--)
                 ST1(dst1++, LD1(src1++));
 
         /* 8-byte pointer to destination memory. */
-        dst8 = (word_t *)dst1;
-
-        if (__builtin_expect((uintptr_t)src1 & (sizeof(word_t) - 1), 0)) {
-                /*
-                 * Misaligned copy.  Copy 8 bytes at a time, but don't
-                 * bother with other fanciness.
-                 *
-                 * TODO: Consider prefetching and using wh64 as well.
-                 */
-
-                /* Create an aligned src8. */
-                const word_t *__restrict src8 =
-                        (const word_t *)((uintptr_t)src1 & -sizeof(word_t));
-                word_t b;
-
-                word_t a = LD8(src8++);
-                for (; n >= sizeof(word_t); n -= sizeof(word_t)) {
-                        b = LD8(src8++);
-                        a = __insn_dblalign(a, b, src1);
-                        ST8(dst8++, a);
-                        a = b;
+        dst8 = (op_t *)dst1;
+
+        if (__builtin_expect((uintptr_t)src1 & (sizeof(op_t) - 1), 0)) {
+                /* Unaligned copy. */
+
+                op_t  tmp0 = 0, tmp1 = 0, tmp2, tmp3;
+                const op_t *src8 = (const op_t *) ((uintptr_t)src1 &
+                                                   -sizeof(op_t));
+                const void *srci = (void *)src1;
+                int m;
+
+                m = (CHIP_L2_LINE_SIZE() << 2) -
+                        (((uintptr_t)dst8) & ((CHIP_L2_LINE_SIZE() << 2) - 1));
+                m = (n < m) ? n : m;
+                m /= sizeof(op_t);
+
+                /* Copy until 'dst' is cache-line-aligned. */
+                n -= (sizeof(op_t) * m);
+
+                switch (m % 4) {
+                case 0:
+                        if (__builtin_expect(!m, 0))
+                                goto _M0;
+                        tmp1 = LD8(src8++);
+                        tmp2 = LD8(src8++);
+                        goto _8B3;
+                case 2:
+                        m += 2;
+                        tmp3 = LD8(src8++);
+                        tmp0 = LD8(src8++);
+                        goto _8B1;
+                case 3:
+                        m += 1;
+                        tmp2 = LD8(src8++);
+                        tmp3 = LD8(src8++);
+                        goto _8B2;
+                case 1:
+                        m--;
+                        tmp0 = LD8(src8++);
+                        tmp1 = LD8(src8++);
+                        if (__builtin_expect(!m, 0))
+                                goto _8B0;
+                }
+
+                do {
+                        tmp2 = LD8(src8++);
+                        tmp0 =  __insn_dblalign(tmp0, tmp1, srci);
+                        ST8(dst8++, tmp0);
+_8B3:
+                        tmp3 = LD8(src8++);
+                        tmp1 = __insn_dblalign(tmp1, tmp2, srci);
+                        ST8(dst8++, tmp1);
+_8B2:
+                        tmp0 = LD8(src8++);
+                        tmp2 = __insn_dblalign(tmp2, tmp3, srci);
+                        ST8(dst8++, tmp2);
+_8B1:
+                        tmp1 = LD8(src8++);
+                        tmp3 = __insn_dblalign(tmp3, tmp0, srci);
+                        ST8(dst8++, tmp3);
+                        m -= 4;
+                } while (m);
+
+_8B0:
+                tmp0 = __insn_dblalign(tmp0, tmp1, srci);
+                ST8(dst8++, tmp0);
+                src8--;
+
+_M0:
+                if (__builtin_expect(n >= CHIP_L2_LINE_SIZE(), 0)) {
+                        op_t tmp4, tmp5, tmp6, tmp7, tmp8;
+
+                        prefetch = ((const char *)src8) +
+                                CHIP_L2_LINE_SIZE() * PREFETCH_LINES_AHEAD;
+
+                        for (tmp0 = LD8(src8++); n >= CHIP_L2_LINE_SIZE();
+                             n -= CHIP_L2_LINE_SIZE()) {
+                                /* Prefetch and advance to next line to
+                                   prefetch, but don't go past the end.  */
+                                __insn_prefetch(prefetch);
+
+                                /* Make sure prefetch got scheduled
+                                   earlier.  */
+                                __asm__ ("" : : : "memory");
+
+                                prefetch += CHIP_L2_LINE_SIZE();
+                                prefetch = (prefetch < src1_end) ? prefetch :
+                                        (const char *) src8;
+
+                                tmp1 = LD8(src8++);
+                                tmp2 = LD8(src8++);
+                                tmp3 = LD8(src8++);
+                                tmp4 = LD8(src8++);
+                                tmp5 = LD8(src8++);
+                                tmp6 = LD8(src8++);
+                                tmp7 = LD8(src8++);
+                                tmp8 = LD8(src8++);
+
+                                tmp0 = __insn_dblalign(tmp0, tmp1, srci);
+                                tmp1 = __insn_dblalign(tmp1, tmp2, srci);
+                                tmp2 = __insn_dblalign(tmp2, tmp3, srci);
+                                tmp3 = __insn_dblalign(tmp3, tmp4, srci);
+                                tmp4 = __insn_dblalign(tmp4, tmp5, srci);
+                                tmp5 = __insn_dblalign(tmp5, tmp6, srci);
+                                tmp6 = __insn_dblalign(tmp6, tmp7, srci);
+                                tmp7 = __insn_dblalign(tmp7, tmp8, srci);
+
+                                __insn_wh64(dst8);
+
+                                ST8(dst8++, tmp0);
+                                ST8(dst8++, tmp1);
+                                ST8(dst8++, tmp2);
+                                ST8(dst8++, tmp3);
+                                ST8(dst8++, tmp4);
+                                ST8(dst8++, tmp5);
+                                ST8(dst8++, tmp6);
+                                ST8(dst8++, tmp7);
+
+                                tmp0 = tmp8;
+                        }
+                        src8--;
+                }
+
+                /* Copy the rest 8-byte chunks. */
+                if (n >= sizeof(op_t)) {
+                        tmp0 = LD8(src8++);
+                        for (; n >= sizeof(op_t); n -= sizeof(op_t)) {
+                                tmp1 = LD8(src8++);
+                                tmp0 = __insn_dblalign(tmp0, tmp1, srci);
+                                ST8(dst8++, tmp0);
+                                tmp0 = tmp1;
+                        }
+                        src8--;
                 }
 
                 if (n == 0)
                         return RETVAL;
 
-                b = ((const char *)src8 <= src1_end) ? *src8 : 0;
+                tmp0 = LD8(src8++);
+                tmp1 = ((const char *)src8 <= src1_end)
+                        ? LD8((op_t *)src8) : 0;
+                final = __insn_dblalign(tmp0, tmp1, srci);
 
-                /*
-                 * Final source bytes to write to trailing partial
-                 * word, if any.
-                 */
-                final = __insn_dblalign(a, b, src1);
         } else {
                 /* Aligned copy. */
 
-                const word_t* __restrict src8 = (const word_t *)src1;
+                const op_t *__restrict src8 = (const op_t *)src1;
 
                 /* src8 and dst8 are both word-aligned. */
                 if (n >= CHIP_L2_LINE_SIZE()) {
                         /* Copy until 'dst' is cache-line-aligned. */
                         for (; (uintptr_t)dst8 & (CHIP_L2_LINE_SIZE() - 1);
-                             n -= sizeof(word_t))
+                             n -= sizeof(op_t))
                                 ST8(dst8++, LD8(src8++));
 
                         for (; n >= CHIP_L2_LINE_SIZE(); ) {
-                                __insn_wh64(dst8);
+                                op_t tmp0, tmp1, tmp2, tmp3;
+                                op_t tmp4, tmp5, tmp6, tmp7;
 
                                 /*
                                  * Prefetch and advance to next line
-                                 * to prefetch, but don't go past the end
+                                 * to prefetch, but don't go past the
+                                 * end.
                                  */
                                 __insn_prefetch(prefetch);
+
+                                /* Make sure prefetch got scheduled
+                                   earlier.  */
+                                __asm__ ("" : : : "memory");
+
                                 prefetch += CHIP_L2_LINE_SIZE();
-                                prefetch = (prefetch > src1_end) ? prefetch :
+                                prefetch = (prefetch < src1_end) ? prefetch :
                                         (const char *)src8;
 
                                 /*
-                                 * Copy an entire cache line.  Manually
-                                 * unrolled to avoid idiosyncracies of
-                                 * compiler unrolling.
+                                 * Do all the loads before wh64.  This
+                                 * is necessary if [src8, src8+7] and
+                                 * [dst8, dst8+7] share the same cache
+                                 * line and dst8 <= src8, as can be
+                                 * the case when called from memmove,
+                                 * or with code tested on x86 whose
+                                 * memcpy always works with forward
+                                 * copies.
                                  */
-#define COPY_WORD(offset) ({ ST8(dst8+offset, LD8(src8+offset)); n -= 8; })
-                                COPY_WORD(0);
-                                COPY_WORD(1);
-                                COPY_WORD(2);
-                                COPY_WORD(3);
-                                COPY_WORD(4);
-                                COPY_WORD(5);
-                                COPY_WORD(6);
-                                COPY_WORD(7);
-#if CHIP_L2_LINE_SIZE() == 128
-                                COPY_WORD(8);
-                                COPY_WORD(9);
-                                COPY_WORD(10);
-                                COPY_WORD(11);
-                                COPY_WORD(12);
-                                COPY_WORD(13);
-                                COPY_WORD(14);
-                                COPY_WORD(15);
-#elif CHIP_L2_LINE_SIZE() != 64
-# error Fix code that assumes particular L2 cache line sizes
-#endif
+                                tmp0 = LD8(src8++);
+                                tmp1 = LD8(src8++);
+                                tmp2 = LD8(src8++);
+                                tmp3 = LD8(src8++);
+                                tmp4 = LD8(src8++);
+                                tmp5 = LD8(src8++);
+                                tmp6 = LD8(src8++);
+                                tmp7 = LD8(src8++);
+
+                                /* wh64 and wait for tmp7 load completion. */
+                                __asm__ ("move %0, %0; wh64 %1\n"
+                                         : : "r"(tmp7), "r"(dst8));
 
-                                dst8 += CHIP_L2_LINE_SIZE() / sizeof(word_t);
-                                src8 += CHIP_L2_LINE_SIZE() / sizeof(word_t);
+                                ST8(dst8++, tmp0);
+                                ST8(dst8++, tmp1);
+                                ST8(dst8++, tmp2);
+                                ST8(dst8++, tmp3);
+                                ST8(dst8++, tmp4);
+                                ST8(dst8++, tmp5);
+                                ST8(dst8++, tmp6);
+                                ST8(dst8++, tmp7);
+
+                                n -= CHIP_L2_LINE_SIZE();
                         }
+#if CHIP_L2_LINE_SIZE() != 64
+# error "Fix code that assumes particular L2 cache line size."
+#endif
                 }
 
-                for (; n >= sizeof(word_t); n -= sizeof(word_t))
+                for (; n >= sizeof(op_t); n -= sizeof(op_t))
                         ST8(dst8++, LD8(src8++));
 
                 if (__builtin_expect(n == 0, 1))
diff --git a/arch/tile/lib/memcpy_tile64.c b/arch/tile/lib/memcpy_tile64.c
deleted file mode 100644
index 3bc4b4e40d93..000000000000
--- a/arch/tile/lib/memcpy_tile64.c
+++ /dev/null
@@ -1,276 +0,0 @@
-/*
- * Copyright 2010 Tilera Corporation. All Rights Reserved.
- *
- *   This program is free software; you can redistribute it and/or
- *   modify it under the terms of the GNU General Public License
- *   as published by the Free Software Foundation, version 2.
- *
- *   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, GOOD TITLE or
- *   NON INFRINGEMENT.  See the GNU General Public License for
- *   more details.
- */
-
-#include <linux/string.h>
-#include <linux/smp.h>
-#include <linux/module.h>
-#include <linux/uaccess.h>
-#include <asm/fixmap.h>
-#include <asm/kmap_types.h>
-#include <asm/tlbflush.h>
-#include <hv/hypervisor.h>
-#include <arch/chip.h>
-
-
-#if !CHIP_HAS_COHERENT_LOCAL_CACHE()
-
-/* Defined in memcpy.S */
-extern unsigned long __memcpy_asm(void *to, const void *from, unsigned long n);
-extern unsigned long __copy_to_user_inatomic_asm(
-        void __user *to, const void *from, unsigned long n);
-extern unsigned long __copy_from_user_inatomic_asm(
-        void *to, const void __user *from, unsigned long n);
-extern unsigned long __copy_from_user_zeroing_asm(
-        void *to, const void __user *from, unsigned long n);
-
-typedef unsigned long (*memcpy_t)(void *, const void *, unsigned long);
-
-/* Size above which to consider TLB games for performance */
-#define LARGE_COPY_CUTOFF 2048
-
-/* Communicate to the simulator what we are trying to do. */
-#define sim_allow_multiple_caching(b) \
-  __insn_mtspr(SPR_SIM_CONTROL, \
-   SIM_CONTROL_ALLOW_MULTIPLE_CACHING | ((b) << _SIM_CONTROL_OPERATOR_BITS))
-
-/*
- * Copy memory by briefly enabling incoherent cacheline-at-a-time mode.
- *
- * We set up our own source and destination PTEs that we fully control.
- * This is the only way to guarantee that we don't race with another
- * thread that is modifying the PTE; we can't afford to try the
- * copy_{to,from}_user() technique of catching the interrupt, since
- * we must run with interrupts disabled to avoid the risk of some
- * other code seeing the incoherent data in our cache.  (Recall that
- * our cache is indexed by PA, so even if the other code doesn't use
- * our kmap_atomic virtual addresses, they'll still hit in cache using
- * the normal VAs that aren't supposed to hit in cache.)
- */
-static void memcpy_multicache(void *dest, const void *source,
-                              pte_t dst_pte, pte_t src_pte, int len)
-{
-        int idx;
-        unsigned long flags, newsrc, newdst;
-        pmd_t *pmdp;
-        pte_t *ptep;
-        int type0, type1;
-        int cpu = get_cpu();
-
-        /*
-         * Disable interrupts so that we don't recurse into memcpy()
-         * in an interrupt handler, nor accidentally reference
-         * the PA of the source from an interrupt routine.  Also
-         * notify the simulator that we're playing games so we don't
-         * generate spurious coherency warnings.
-         */
-        local_irq_save(flags);
-        sim_allow_multiple_caching(1);
-
-        /* Set up the new dest mapping */
-        type0 = kmap_atomic_idx_push();
-        idx = FIX_KMAP_BEGIN + (KM_TYPE_NR * cpu) + type0;
-        newdst = __fix_to_virt(idx) + ((unsigned long)dest & (PAGE_SIZE-1));
-        pmdp = pmd_offset(pud_offset(pgd_offset_k(newdst), newdst), newdst);
-        ptep = pte_offset_kernel(pmdp, newdst);
-        if (pte_val(*ptep) != pte_val(dst_pte)) {
-                set_pte(ptep, dst_pte);
-                local_flush_tlb_page(NULL, newdst, PAGE_SIZE);
-        }
-
-        /* Set up the new source mapping */
-        type1 = kmap_atomic_idx_push();
-        idx += (type0 - type1);
-        src_pte = hv_pte_set_nc(src_pte);
-        src_pte = hv_pte_clear_writable(src_pte);  /* be paranoid */
-        newsrc = __fix_to_virt(idx) + ((unsigned long)source & (PAGE_SIZE-1));
-        pmdp = pmd_offset(pud_offset(pgd_offset_k(newsrc), newsrc), newsrc);
-        ptep = pte_offset_kernel(pmdp, newsrc);
-        __set_pte(ptep, src_pte);   /* set_pte() would be confused by this */
-        local_flush_tlb_page(NULL, newsrc, PAGE_SIZE);
-
-        /* Actually move the data. */
-        __memcpy_asm((void *)newdst, (const void *)newsrc, len);
-
-        /*
-         * Remap the source as locally-cached and not OLOC'ed so that
-         * we can inval without also invaling the remote cpu's cache.
-         * This also avoids known errata with inv'ing cacheable oloc data.
-         */
-        src_pte = hv_pte_set_mode(src_pte, HV_PTE_MODE_CACHE_NO_L3);
-        src_pte = hv_pte_set_writable(src_pte); /* need write access for inv */
-        __set_pte(ptep, src_pte);   /* set_pte() would be confused by this */
-        local_flush_tlb_page(NULL, newsrc, PAGE_SIZE);
-
-        /*
-         * Do the actual invalidation, covering the full L2 cache line
-         * at the end since __memcpy_asm() is somewhat aggressive.
-         */
-        __inv_buffer((void *)newsrc, len);
-
-        /*
-         * We're done: notify the simulator that all is back to normal,
-         * and re-enable interrupts and pre-emption.
-         */
-        kmap_atomic_idx_pop();
-        kmap_atomic_idx_pop();
-        sim_allow_multiple_caching(0);
-        local_irq_restore(flags);
-        put_cpu();
-}
-
-/*
- * Identify large copies from remotely-cached memory, and copy them
- * via memcpy_multicache() if they look good, otherwise fall back
- * to the particular kind of copying passed as the memcpy_t function.
- */
-static unsigned long fast_copy(void *dest, const void *source, int len,
-                               memcpy_t func)
-{
-        /*
-         * Check if it's big enough to bother with.  We may end up doing a
-         * small copy via TLB manipulation if we're near a page boundary,
-         * but presumably we'll make it up when we hit the second page.
-         */
-        while (len >= LARGE_COPY_CUTOFF) {
-                int copy_size, bytes_left_on_page;
-                pte_t *src_ptep, *dst_ptep;
-                pte_t src_pte, dst_pte;
-                struct page *src_page, *dst_page;
-
-                /* Is the source page oloc'ed to a remote cpu? */
-retry_source:
-                src_ptep = virt_to_pte(current->mm, (unsigned long)source);
-                if (src_ptep == NULL)
-                        break;
-                src_pte = *src_ptep;
-                if (!hv_pte_get_present(src_pte) ||
-                    !hv_pte_get_readable(src_pte) ||
-                    hv_pte_get_mode(src_pte) != HV_PTE_MODE_CACHE_TILE_L3)
-                        break;
-                if (get_remote_cache_cpu(src_pte) == smp_processor_id())
-                        break;
-                src_page = pfn_to_page(pte_pfn(src_pte));
-                get_page(src_page);
-                if (pte_val(src_pte) != pte_val(*src_ptep)) {
-                        put_page(src_page);
-                        goto retry_source;
-                }
-                if (pte_huge(src_pte)) {
-                        /* Adjust the PTE to correspond to a small page */
-                        int pfn = pte_pfn(src_pte);
-                        pfn += (((unsigned long)source & (HPAGE_SIZE-1))
-                                >> PAGE_SHIFT);
-                        src_pte = pfn_pte(pfn, src_pte);
-                        src_pte = pte_mksmall(src_pte);
-                }
-
-                /* Is the destination page writable? */
-retry_dest:
-                dst_ptep = virt_to_pte(current->mm, (unsigned long)dest);
-                if (dst_ptep == NULL) {
-                        put_page(src_page);
-                        break;
-                }
-                dst_pte = *dst_ptep;
-                if (!hv_pte_get_present(dst_pte) ||
-                    !hv_pte_get_writable(dst_pte)) {
-                        put_page(src_page);
-                        break;
-                }
-                dst_page = pfn_to_page(pte_pfn(dst_pte));
-                if (dst_page == src_page) {
-                        /*
-                         * Source and dest are on the same page; this
-                         * potentially exposes us to incoherence if any
-                         * part of src and dest overlap on a cache line.
-                         * Just give up rather than trying to be precise.
-                         */
-                        put_page(src_page);
-                        break;
-                }
-                get_page(dst_page);
-                if (pte_val(dst_pte) != pte_val(*dst_ptep)) {
-                        put_page(dst_page);
-                        goto retry_dest;
-                }
-                if (pte_huge(dst_pte)) {
-                        /* Adjust the PTE to correspond to a small page */
-                        int pfn = pte_pfn(dst_pte);
-                        pfn += (((unsigned long)dest & (HPAGE_SIZE-1))
-                                >> PAGE_SHIFT);
-                        dst_pte = pfn_pte(pfn, dst_pte);
-                        dst_pte = pte_mksmall(dst_pte);
-                }
-
-                /* All looks good: create a cachable PTE and copy from it */
-                copy_size = len;
-                bytes_left_on_page =
-                        PAGE_SIZE - (((int)source) & (PAGE_SIZE-1));
-                if (copy_size > bytes_left_on_page)
-                        copy_size = bytes_left_on_page;
-                bytes_left_on_page =
-                        PAGE_SIZE - (((int)dest) & (PAGE_SIZE-1));
-                if (copy_size > bytes_left_on_page)
-                        copy_size = bytes_left_on_page;
-                memcpy_multicache(dest, source, dst_pte, src_pte, copy_size);
-
-                /* Release the pages */
-                put_page(dst_page);
-                put_page(src_page);
-
-                /* Continue on the next page */
-                dest += copy_size;
-                source += copy_size;
-                len -= copy_size;
-        }
-
-        return func(dest, source, len);
-}
-
-void *memcpy(void *to, const void *from, __kernel_size_t n)
-{
-        if (n < LARGE_COPY_CUTOFF)
-                return (void *)__memcpy_asm(to, from, n);
-        else
-                return (void *)fast_copy(to, from, n, __memcpy_asm);
-}
-
-unsigned long __copy_to_user_inatomic(void __user *to, const void *from,
-                                      unsigned long n)
-{
-        if (n < LARGE_COPY_CUTOFF)
-                return __copy_to_user_inatomic_asm(to, from, n);
-        else
-                return fast_copy(to, from, n, __copy_to_user_inatomic_asm);
-}
-
-unsigned long __copy_from_user_inatomic(void *to, const void __user *from,
-                                        unsigned long n)
-{
-        if (n < LARGE_COPY_CUTOFF)
-                return __copy_from_user_inatomic_asm(to, from, n);
-        else
-                return fast_copy(to, from, n, __copy_from_user_inatomic_asm);
-}
-
-unsigned long __copy_from_user_zeroing(void *to, const void __user *from,
-                                       unsigned long n)
-{
-        if (n < LARGE_COPY_CUTOFF)
-                return __copy_from_user_zeroing_asm(to, from, n);
-        else
-                return fast_copy(to, from, n, __copy_from_user_zeroing_asm);
-}
-
-#endif /* !CHIP_HAS_COHERENT_LOCAL_CACHE() */
diff --git a/arch/tile/lib/memcpy_user_64.c b/arch/tile/lib/memcpy_user_64.c
index 37440caa7370..88c7016492c4 100644
--- a/arch/tile/lib/memcpy_user_64.c
+++ b/arch/tile/lib/memcpy_user_64.c
@@ -31,6 +31,7 @@
                     ".pushsection .coldtext.memcpy,\"ax\";"     \
                     "2: { move r0, %2; jrp lr };"               \
                     ".section __ex_table,\"a\";"                \
+                    ".align 8;"                                 \
                     ".quad 1b, 2b;"                             \
                     ".popsection"                               \
                     : "=m" (*(p)) : "r" (v), "r" (n));          \
@@ -43,6 +44,7 @@
                     ".pushsection .coldtext.memcpy,\"ax\";"     \
                     "2: { move r0, %2; jrp lr };"               \
                     ".section __ex_table,\"a\";"                \
+                    ".align 8;"                                 \
                     ".quad 1b, 2b;"                             \
                     ".popsection"                               \
                     : "=r" (__v) : "m" (*(p)), "r" (n));        \
diff --git a/arch/tile/lib/memset_32.c b/arch/tile/lib/memset_32.c
index 57dbb3a5bff8..2042bfe6595f 100644
--- a/arch/tile/lib/memset_32.c
+++ b/arch/tile/lib/memset_32.c
@@ -12,13 +12,10 @@
  *   more details.
  */
 
-#include <arch/chip.h>
-
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/module.h>
-
-#undef memset
+#include <arch/chip.h>
 
 void *memset(void *s, int c, size_t n)
 {
@@ -26,11 +23,7 @@ void *memset(void *s, int c, size_t n)
         int n32;
         uint32_t v16, v32;
         uint8_t *out8 = s;
-#if !CHIP_HAS_WH64()
-        int ahead32;
-#else
         int to_align32;
-#endif
 
         /* Experimentation shows that a trivial tight loop is a win up until
          * around a size of 20, where writing a word at a time starts to win.
@@ -61,21 +54,6 @@ void *memset(void *s, int c, size_t n)
                 return s;
         }
 
-#if !CHIP_HAS_WH64()
-        /* Use a spare issue slot to start prefetching the first cache
-         * line early. This instruction is free as the store can be buried
-         * in otherwise idle issue slots doing ALU ops.
-         */
-        __insn_prefetch(out8);
-
-        /* We prefetch the end so that a short memset that spans two cache
-         * lines gets some prefetching benefit. Again we believe this is free
-         * to issue.
-         */
-        __insn_prefetch(&out8[n - 1]);
-#endif /* !CHIP_HAS_WH64() */
-
-
         /* Align 'out8'. We know n >= 3 so this won't write past the end. */
         while (((uintptr_t) out8 & 3) != 0) {
                 *out8++ = c;
@@ -96,90 +74,6 @@ void *memset(void *s, int c, size_t n)
         /* This must be at least 8 or the following loop doesn't work. */
 #define CACHE_LINE_SIZE_IN_WORDS (CHIP_L2_LINE_SIZE() / 4)
 
-#if !CHIP_HAS_WH64()
-
-        ahead32 = CACHE_LINE_SIZE_IN_WORDS;
-
-        /* We already prefetched the first and last cache lines, so
-         * we only need to do more prefetching if we are storing
-         * to more than two cache lines.
-         */
-        if (n32 > CACHE_LINE_SIZE_IN_WORDS * 2) {
-                int i;
-
-                /* Prefetch the next several cache lines.
-                 * This is the setup code for the software-pipelined
-                 * loop below.
-                 */
-#define MAX_PREFETCH 5
-                ahead32 = n32 & -CACHE_LINE_SIZE_IN_WORDS;
-                if (ahead32 > MAX_PREFETCH * CACHE_LINE_SIZE_IN_WORDS)
-                        ahead32 = MAX_PREFETCH * CACHE_LINE_SIZE_IN_WORDS;
-
-                for (i = CACHE_LINE_SIZE_IN_WORDS;
-                     i < ahead32; i += CACHE_LINE_SIZE_IN_WORDS)
-                        __insn_prefetch(&out32[i]);
-        }
-
-        if (n32 > ahead32) {
-                while (1) {
-                        int j;
-
-                        /* Prefetch by reading one word several cache lines
-                         * ahead.  Since loads are non-blocking this will
-                         * cause the full cache line to be read while we are
-                         * finishing earlier cache lines.  Using a store
-                         * here causes microarchitectural performance
-                         * problems where a victimizing store miss goes to
-                         * the head of the retry FIFO and locks the pipe for
-                         * a few cycles.  So a few subsequent stores in this
-                         * loop go into the retry FIFO, and then later
-                         * stores see other stores to the same cache line
-                         * are already in the retry FIFO and themselves go
-                         * into the retry FIFO, filling it up and grinding
-                         * to a halt waiting for the original miss to be
-                         * satisfied.
-                         */
-                        __insn_prefetch(&out32[ahead32]);
-
-#if CACHE_LINE_SIZE_IN_WORDS % 4 != 0
-#error "Unhandled CACHE_LINE_SIZE_IN_WORDS"
-#endif
-
-                        n32 -= CACHE_LINE_SIZE_IN_WORDS;
-
-                        /* Save icache space by only partially unrolling
-                         * this loop.
-                         */
-                        for (j = CACHE_LINE_SIZE_IN_WORDS / 4; j > 0; j--) {
-                                *out32++ = v32;
-                                *out32++ = v32;
-                                *out32++ = v32;
-                                *out32++ = v32;
-                        }
-
-                        /* To save compiled code size, reuse this loop even
-                         * when we run out of prefetching to do by dropping
-                         * ahead32 down.
-                         */
-                        if (n32 <= ahead32) {
-                                /* Not even a full cache line left,
-                                 * so stop now.
-                                 */
-                                if (n32 < CACHE_LINE_SIZE_IN_WORDS)
-                                        break;
-
-                                /* Choose a small enough value that we don't
-                                 * prefetch past the end.  There's no sense
-                                 * in touching cache lines we don't have to.
-                                 */
-                                ahead32 = CACHE_LINE_SIZE_IN_WORDS - 1;
-                        }
-                }
-        }
-
-#else /* CHIP_HAS_WH64() */
-
         /* Determine how many words we need to emit before the 'out32'
          * pointer becomes aligned modulo the cache line size.
          */
@@ -236,8 +130,6 @@ void *memset(void *s, int c, size_t n)
                 n32 &= CACHE_LINE_SIZE_IN_WORDS - 1;
         }
 
-#endif /* CHIP_HAS_WH64() */
-
         /* Now handle any leftover values. */
         if (n32 != 0) {
                 do {
diff --git a/arch/tile/lib/memset_64.c b/arch/tile/lib/memset_64.c
index 3873085711d5..03ef69cd73de 100644
--- a/arch/tile/lib/memset_64.c
+++ b/arch/tile/lib/memset_64.c
@@ -12,13 +12,11 @@
  *   more details.
  */
 
-#include <arch/chip.h>
-
 #include <linux/types.h>
 #include <linux/string.h>
 #include <linux/module.h>
-
-#undef memset
+#include <arch/chip.h>
+#include "string-endian.h"
 
 void *memset(void *s, int c, size_t n)
 {
@@ -70,8 +68,7 @@ void *memset(void *s, int c, size_t n)
         n64 = n >> 3;
 
         /* Tile input byte out to 64 bits. */
-        /* KLUDGE */
-        v64 = 0x0101010101010101ULL * (uint8_t)c;
+        v64 = copy_byte(c);
 
         /* This must be at least 8 or the following loop doesn't work. */
 #define CACHE_LINE_SIZE_IN_DOUBLEWORDS (CHIP_L2_LINE_SIZE() / 8)
diff --git a/arch/tile/lib/strchr_32.c b/arch/tile/lib/strchr_32.c
index c94e6f7ae7b5..841fe6963019 100644
--- a/arch/tile/lib/strchr_32.c
+++ b/arch/tile/lib/strchr_32.c
@@ -16,8 +16,6 @@
 #include <linux/string.h>
 #include <linux/module.h>
 
-#undef strchr
-
 char *strchr(const char *s, int c)
 {
         int z, g;
diff --git a/arch/tile/lib/strchr_64.c b/arch/tile/lib/strchr_64.c
index f39f9dc422b0..fe6e31c06f8d 100644
--- a/arch/tile/lib/strchr_64.c
+++ b/arch/tile/lib/strchr_64.c
@@ -26,7 +26,7 @@ char *strchr(const char *s, int c)
         const uint64_t *p = (const uint64_t *)(s_int & -8);
 
         /* Create eight copies of the byte for which we are looking. */
-        const uint64_t goal = 0x0101010101010101ULL * (uint8_t) c;
+        const uint64_t goal = copy_byte(c);
 
         /* Read the first aligned word, but force bytes before the string to
          * match neither zero nor goal (we make sure the high bit of each
diff --git a/arch/tile/lib/string-endian.h b/arch/tile/lib/string-endian.h
index c0eed7ce69c3..2e49cbfe9371 100644
--- a/arch/tile/lib/string-endian.h
+++ b/arch/tile/lib/string-endian.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011 Tilera Corporation. All Rights Reserved.
+ * Copyright 2013 Tilera Corporation. All Rights Reserved.
  *
  *   This program is free software; you can redistribute it and/or
  *   modify it under the terms of the GNU General Public License
@@ -31,3 +31,14 @@
 #define CFZ(x) __insn_clz(x)
 #define REVCZ(x) __insn_ctz(x)
 #endif
+
+/*
+ * Create eight copies of the byte in a uint64_t.  Byte Shuffle uses
+ * the bytes of srcB as the index into the dest vector to select a
+ * byte.  With all indices of zero, the first byte is copied into all
+ * the other bytes.
+ */
+static inline uint64_t copy_byte(uint8_t byte)
+{
+        return __insn_shufflebytes(byte, 0, 0);
+}
diff --git a/arch/tile/lib/strlen_32.c b/arch/tile/lib/strlen_32.c
index 4974292a5534..f26f88e11e4a 100644
--- a/arch/tile/lib/strlen_32.c
+++ b/arch/tile/lib/strlen_32.c
@@ -16,8 +16,6 @@
 #include <linux/string.h>
 #include <linux/module.h>
 
-#undef strlen
-
 size_t strlen(const char *s)
 {
         /* Get an aligned pointer. */
diff --git a/arch/tile/lib/strnlen_32.c b/arch/tile/lib/strnlen_32.c
new file mode 100644
index 000000000000..1434141d9e01
--- /dev/null
+++ b/arch/tile/lib/strnlen_32.c
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2013 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/module.h>
+
+size_t strnlen(const char *s, size_t count)
+{
+        /* Get an aligned pointer. */
+        const uintptr_t s_int = (uintptr_t) s;
+        const uint32_t *p = (const uint32_t *)(s_int & -4);
+        size_t bytes_read = sizeof(*p) - (s_int & (sizeof(*p) - 1));
+        size_t len;
+        uint32_t v, bits;
+
+        /* Avoid page fault risk by not reading any bytes when count is 0. */
+        if (count == 0)
+                return 0;
+
+        /* Read first word, but force bytes before the string to be nonzero. */
+        v = *p | ((1 << ((s_int << 3) & 31)) - 1);
+
+        while ((bits = __insn_seqb(v, 0)) == 0) {
+                if (bytes_read >= count) {
+                        /* Read COUNT bytes and didn't find the terminator. */
+                        return count;
+                }
+                v = *++p;
+                bytes_read += sizeof(v);
+        }
+
+        len = ((const char *) p) + (__insn_ctz(bits) >> 3) - s;
+        return (len < count ? len : count);
+}
+EXPORT_SYMBOL(strnlen);
diff --git a/arch/tile/lib/strnlen_64.c b/arch/tile/lib/strnlen_64.c
new file mode 100644
index 000000000000..2e8de6a5136f
--- /dev/null
+++ b/arch/tile/lib/strnlen_64.c
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2013 Tilera Corporation. All Rights Reserved.
+ *
+ *   This program is free software; you can redistribute it and/or
+ *   modify it under the terms of the GNU General Public License
+ *   as published by the Free Software Foundation, version 2.
+ *
+ *   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, GOOD TITLE or
+ *   NON INFRINGEMENT.  See the GNU General Public License for
+ *   more details.
+ */
+
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/module.h>
+#include "string-endian.h"
+
+size_t strnlen(const char *s, size_t count)
+{
+        /* Get an aligned pointer. */
+        const uintptr_t s_int = (uintptr_t) s;
+        const uint64_t *p = (const uint64_t *)(s_int & -8);
+        size_t bytes_read = sizeof(*p) - (s_int & (sizeof(*p) - 1));
+        size_t len;
+        uint64_t v, bits;
+
+        /* Avoid page fault risk by not reading any bytes when count is 0. */
+        if (count == 0)
+                return 0;
+
+        /* Read and MASK the first word. */
+        v = *p | MASK(s_int);
+
+        while ((bits = __insn_v1cmpeqi(v, 0)) == 0) {
+                if (bytes_read >= count) {
+                        /* Read COUNT bytes and didn't find the terminator. */
+                        return count;
+                }
+                v = *++p;
+                bytes_read += sizeof(v);
+        }
+
+        len = ((const char *) p) + (CFZ(bits) >> 3) - s;
+        return (len < count ? len : count);
+}
+EXPORT_SYMBOL(strnlen);
diff --git a/arch/tile/lib/usercopy_32.S b/arch/tile/lib/usercopy_32.S
index b62d002af009..1bc162224638 100644
--- a/arch/tile/lib/usercopy_32.S
+++ b/arch/tile/lib/usercopy_32.S
@@ -36,6 +36,7 @@ strnlen_user_fault:
         { move r0, zero; jrp lr }
         ENDPROC(strnlen_user_fault)
         .section __ex_table,"a"
+        .align 4
         .word 1b, strnlen_user_fault
         .popsection
 
@@ -47,18 +48,20 @@ strnlen_user_fault:
  */
 STD_ENTRY(strncpy_from_user_asm)
         { bz r2, 2f; move r3, r0 }
-1:      { lb_u r4, r1; addi r1, r1, 1; addi r2, r2, -1 }
+1:      { lb_u r4, r1; addi r1, r1, 1; addi r2, r2, -1 }
         { sb r0, r4; addi r0, r0, 1 }
-        bz r2, 2f
-        bnzt r4, 1b
-        addi r0, r0, -1   /* don't count the trailing NUL */
-2:      { sub r0, r0, r3; jrp lr }
+        bz r4, 2f
+        bnzt r2, 1b
+        { sub r0, r0, r3; jrp lr }
+2:      addi r0, r0, -1   /* don't count the trailing NUL */
+        { sub r0, r0, r3; jrp lr }
         STD_ENDPROC(strncpy_from_user_asm)
         .pushsection .fixup,"ax"
 strncpy_from_user_fault:
         { movei r0, -EFAULT; jrp lr }
         ENDPROC(strncpy_from_user_fault)
         .section __ex_table,"a"
+        .align 4
         .word 1b, strncpy_from_user_fault
         .popsection
 
@@ -77,6 +80,7 @@ STD_ENTRY(clear_user_asm)
         bnzt r1, 1b
 2:      { move r0, r1; jrp lr }
         .pushsection __ex_table,"a"
+        .align 4
         .word 1b, 2b
         .popsection
 
@@ -86,6 +90,7 @@ STD_ENTRY(clear_user_asm)
 2:      { move r0, r1; jrp lr }
         STD_ENDPROC(clear_user_asm)
         .pushsection __ex_table,"a"
+        .align 4
         .word 1b, 2b
         .popsection
 
@@ -105,25 +110,7 @@ STD_ENTRY(flush_user_asm)
 2:      { move r0, r1; jrp lr }
         STD_ENDPROC(flush_user_asm)
         .pushsection __ex_table,"a"
-        .word 1b, 2b
-        .popsection
-
-/*
- * inv_user_asm takes the user target address in r0 and the
- * number of bytes to invalidate in r1.
- * It returns the number of not inv'able bytes (hopefully zero) in r0.
- */
-STD_ENTRY(inv_user_asm)
-        bz r1, 2f
-        { movei r2, L2_CACHE_BYTES; add r1, r0, r1 }
-        { sub r2, zero, r2; addi r1, r1, L2_CACHE_BYTES-1 }
-        { and r0, r0, r2; and r1, r1, r2 }
-        { sub r1, r1, r0 }
-1:      { inv r0; addi r1, r1, -CHIP_INV_STRIDE() }
-        { addi r0, r0, CHIP_INV_STRIDE(); bnzt r1, 1b }
-2:      { move r0, r1; jrp lr }
-        STD_ENDPROC(inv_user_asm)
-        .pushsection __ex_table,"a"
+        .align 4
         .word 1b, 2b
         .popsection
 
@@ -143,5 +130,6 @@ STD_ENTRY(finv_user_asm)
 2:      { move r0, r1; jrp lr }
         STD_ENDPROC(finv_user_asm)
         .pushsection __ex_table,"a"
+        .align 4
         .word 1b, 2b
         .popsection
diff --git a/arch/tile/lib/usercopy_64.S b/arch/tile/lib/usercopy_64.S
index adb2dbbc70cd..b3b31a3306f8 100644
--- a/arch/tile/lib/usercopy_64.S
+++ b/arch/tile/lib/usercopy_64.S
@@ -36,6 +36,7 @@ strnlen_user_fault:
         { move r0, zero; jrp lr }
         ENDPROC(strnlen_user_fault)
         .section __ex_table,"a"
+        .align 8
         .quad 1b, strnlen_user_fault
         .popsection
 
@@ -47,18 +48,20 @@ strnlen_user_fault:
  */
 STD_ENTRY(strncpy_from_user_asm)
         { beqz r2, 2f; move r3, r0 }
-1:      { ld1u r4, r1; addi r1, r1, 1; addi r2, r2, -1 }
+1:      { ld1u r4, r1; addi r1, r1, 1; addi r2, r2, -1 }
         { st1 r0, r4; addi r0, r0, 1 }
-        beqz r2, 2f
-        bnezt r4, 1b
-        addi r0, r0, -1   /* don't count the trailing NUL */
-2:      { sub r0, r0, r3; jrp lr }
+        beqz r4, 2f
+        bnezt r2, 1b
+        { sub r0, r0, r3; jrp lr }
+2:      addi r0, r0, -1   /* don't count the trailing NUL */
+        { sub r0, r0, r3; jrp lr }
         STD_ENDPROC(strncpy_from_user_asm)
         .pushsection .fixup,"ax"
 strncpy_from_user_fault:
         { movei r0, -EFAULT; jrp lr }
         ENDPROC(strncpy_from_user_fault)
         .section __ex_table,"a"
+        .align 8
         .quad 1b, strncpy_from_user_fault
         .popsection
 
@@ -77,6 +80,7 @@ STD_ENTRY(clear_user_asm)
         bnezt r1, 1b
 2:      { move r0, r1; jrp lr }
         .pushsection __ex_table,"a"
+        .align 8
         .quad 1b, 2b
         .popsection
 
@@ -86,6 +90,7 @@ STD_ENTRY(clear_user_asm)
 2:      { move r0, r1; jrp lr }
         STD_ENDPROC(clear_user_asm)
         .pushsection __ex_table,"a"
+        .align 8
         .quad 1b, 2b
         .popsection
 
@@ -105,25 +110,7 @@ STD_ENTRY(flush_user_asm)
 2:      { move r0, r1; jrp lr }
         STD_ENDPROC(flush_user_asm)
         .pushsection __ex_table,"a"
-        .quad 1b, 2b
-        .popsection
-
-/*
- * inv_user_asm takes the user target address in r0 and the
- * number of bytes to invalidate in r1.
- * It returns the number of not inv'able bytes (hopefully zero) in r0.
- */
-STD_ENTRY(inv_user_asm)
-        beqz r1, 2f
-        { movei r2, L2_CACHE_BYTES; add r1, r0, r1 }
-        { sub r2, zero, r2; addi r1, r1, L2_CACHE_BYTES-1 }
-        { and r0, r0, r2; and r1, r1, r2 }
-        { sub r1, r1, r0 }
-1:      { inv r0; addi r1, r1, -CHIP_INV_STRIDE() }
-        { addi r0, r0, CHIP_INV_STRIDE(); bnezt r1, 1b }
-2:      { move r0, r1; jrp lr }
-        STD_ENDPROC(inv_user_asm)
-        .pushsection __ex_table,"a"
+        .align 8
         .quad 1b, 2b
         .popsection
 
@@ -143,5 +130,6 @@ STD_ENTRY(finv_user_asm)
 2:      { move r0, r1; jrp lr }
         STD_ENDPROC(finv_user_asm)
         .pushsection __ex_table,"a"
+        .align 8
         .quad 1b, 2b
         .popsection
diff --git a/arch/tile/mm/elf.c b/arch/tile/mm/elf.c
index 743c951c61b0..23f044e8a7ab 100644
--- a/arch/tile/mm/elf.c
+++ b/arch/tile/mm/elf.c
@@ -21,7 +21,8 @@
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
 #include <asm/sections.h>
-#include <arch/sim_def.h>
+#include <asm/vdso.h>
+#include <arch/sim.h>
 
 /* Notify a running simulator, if any, that an exec just occurred. */
 static void sim_notify_exec(const char *binary_name)
@@ -38,21 +39,55 @@ static void sim_notify_exec(const char *binary_name)
 
 static int notify_exec(struct mm_struct *mm)
 {
-        int retval = 0;  /* failure */
-
-        if (mm->exe_file) {
-                char *buf = (char *) __get_free_page(GFP_KERNEL);
-                if (buf) {
-                        char *path = d_path(&mm->exe_file->f_path,
-                                            buf, PAGE_SIZE);
-                        if (!IS_ERR(path)) {
-                                sim_notify_exec(path);
-                                retval = 1;
-                        }
-                        free_page((unsigned long)buf);
+        char *buf, *path;
+        struct vm_area_struct *vma;
+
+        if (!sim_is_simulator())
+                return 1;
+
+        if (mm->exe_file == NULL)
+                return 0;
+
+        for (vma = current->mm->mmap; ; vma = vma->vm_next) {
+                if (vma == NULL)
+                        return 0;
+                if (vma->vm_file == mm->exe_file)
+                        break;
+        }
+
+        buf = (char *) __get_free_page(GFP_KERNEL);
+        if (buf == NULL)
+                return 0;
+
+        path = d_path(&mm->exe_file->f_path, buf, PAGE_SIZE);
+        if (IS_ERR(path)) {
+                free_page((unsigned long)buf);
+                return 0;
+        }
+
+        /*
+         * Notify simulator of an ET_DYN object so we know the load address.
+         * The somewhat cryptic overuse of SIM_CONTROL_DLOPEN allows us
+         * to be backward-compatible with older simulator releases.
+         */
+        if (vma->vm_start == (ELF_ET_DYN_BASE & PAGE_MASK)) {
+                char buf[64];
+                int i;
+
+                snprintf(buf, sizeof(buf), "0x%lx:@", vma->vm_start);
+                for (i = 0; ; ++i) {
+                        char c = buf[i];
+                        __insn_mtspr(SPR_SIM_CONTROL,
+                                     (SIM_CONTROL_DLOPEN
+                                      | (c << _SIM_CONTROL_OPERATOR_BITS)));
+                        if (c == '\0')
+                                break;
                 }
         }
-        return retval;
+
+        sim_notify_exec(path);
+        free_page((unsigned long)buf);
+        return 1;
 }
 
 /* Notify a running simulator, if any, that we loaded an interpreter. */
@@ -68,37 +103,10 @@ static void sim_notify_interp(unsigned long load_addr)
 }
 
 
-/* Kernel address of page used to map read-only kernel data into userspace. */
-static void *vdso_page;
-
-/* One-entry array used for install_special_mapping. */
-static struct page *vdso_pages[1];
-
-static int __init vdso_setup(void)
-{
-        vdso_page = (void *)get_zeroed_page(GFP_ATOMIC);
-        memcpy(vdso_page, __rt_sigreturn, __rt_sigreturn_end - __rt_sigreturn);
-        vdso_pages[0] = virt_to_page(vdso_page);
-        return 0;
-}
-device_initcall(vdso_setup);
-
-const char *arch_vma_name(struct vm_area_struct *vma)
-{
-        if (vma->vm_private_data == vdso_pages)
-                return "[vdso]";
-#ifndef __tilegx__
-        if (vma->vm_start == MEM_USER_INTRPT)
-                return "[intrpt]";
-#endif
-        return NULL;
-}
-
 int arch_setup_additional_pages(struct linux_binprm *bprm,
                                 int executable_stack)
 {
         struct mm_struct *mm = current->mm;
-        unsigned long vdso_base;
         int retval = 0;
 
         down_write(&mm->mmap_sem);
@@ -111,14 +119,7 @@ int arch_setup_additional_pages(struct linux_binprm *bprm,
         if (!notify_exec(mm))
                 sim_notify_exec(bprm->filename);
 
-        /*
-         * MAYWRITE to allow gdb to COW and set breakpoints
-         */
-        vdso_base = VDSO_BASE;
-        retval = install_special_mapping(mm, vdso_base, PAGE_SIZE,
-                                         VM_READ|VM_EXEC|
-                                         VM_MAYREAD|VM_MAYWRITE|VM_MAYEXEC,
-                                         vdso_pages);
+        retval = setup_vdso_pages();
 
 #ifndef __tilegx__
         /*
diff --git a/arch/tile/mm/fault.c b/arch/tile/mm/fault.c
index f7f99f90cbe0..6c0571216a9d 100644
--- a/arch/tile/mm/fault.c
+++ b/arch/tile/mm/fault.c
@@ -34,6 +34,7 @@
 #include <linux/hugetlb.h>
 #include <linux/syscalls.h>
 #include <linux/uaccess.h>
+#include <linux/kdebug.h>
 
 #include <asm/pgalloc.h>
 #include <asm/sections.h>
@@ -122,10 +123,9 @@ static inline pmd_t *vmalloc_sync_one(pgd_t *pgd, unsigned long address)
         pmd_k = pmd_offset(pud_k, address);
         if (!pmd_present(*pmd_k))
                 return NULL;
-        if (!pmd_present(*pmd)) {
+        if (!pmd_present(*pmd))
                 set_pmd(pmd, *pmd_k);
-                arch_flush_lazy_mmu_mode();
-        } else
+        else
                 BUG_ON(pmd_ptfn(*pmd) != pmd_ptfn(*pmd_k));
         return pmd_k;
 }
@@ -149,8 +149,6 @@ static inline int vmalloc_fault(pgd_t *pgd, unsigned long address)
         pmd_k = vmalloc_sync_one(pgd, address);
         if (!pmd_k)
                 return -1;
-        if (pmd_huge(*pmd_k))
-                return 0;   /* support TILE huge_vmap() API */
         pte_k = pte_offset_kernel(pmd_k, address);
         if (!pte_present(*pte_k))
                 return -1;
@@ -280,10 +278,9 @@ static int handle_page_fault(struct pt_regs *regs,
         if (!is_page_fault)
                 write = 1;
 
-        flags = (FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
-                 (write ? FAULT_FLAG_WRITE : 0));
+        flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
 
-        is_kernel_mode = (EX1_PL(regs->ex1) != USER_PL);
+        is_kernel_mode = !user_mode(regs);
 
         tsk = validate_current();
 
@@ -365,6 +362,9 @@ static int handle_page_fault(struct pt_regs *regs,
                 goto bad_area_nosemaphore;
         }
 
+        if (!is_kernel_mode)
+                flags |= FAULT_FLAG_USER;
+
         /*
          * When running in the kernel we expect faults to occur only to
          * addresses in user space.  All other faults represent errors in the
@@ -425,12 +425,12 @@ good_area:
 #endif
                 if (!(vma->vm_flags & VM_WRITE))
                         goto bad_area;
+                flags |= FAULT_FLAG_WRITE;
         } else {
                 if (!is_page_fault || !(vma->vm_flags & VM_READ))
                         goto bad_area;
         }
 
- survive:
         /*
          * If for any reason at all we couldn't handle the fault,
          * make sure we exit gracefully rather than endlessly redo
@@ -466,28 +466,15 @@ good_area:
                 }
         }
 
-#if CHIP_HAS_TILE_DMA() || CHIP_HAS_SN_PROC()
-        /*
-         * If this was an asynchronous fault,
-         * restart the appropriate engine.
-         */
-        switch (fault_num) {
 #if CHIP_HAS_TILE_DMA()
+        /* If this was a DMA TLB fault, restart the DMA engine. */
+        switch (fault_num) {
         case INT_DMATLB_MISS:
         case INT_DMATLB_MISS_DWNCL:
         case INT_DMATLB_ACCESS:
         case INT_DMATLB_ACCESS_DWNCL:
                 __insn_mtspr(SPR_DMA_CTR, SPR_DMA_CTR__REQUEST_MASK);
                 break;
-#endif
-#if CHIP_HAS_SN_PROC()
-        case INT_SNITLB_MISS:
-        case INT_SNITLB_MISS_DWNCL:
-                __insn_mtspr(SPR_SNCTL,
-                             __insn_mfspr(SPR_SNCTL) &
-                             ~SPR_SNCTL__FRZPROC_MASK);
-                break;
-#endif
         }
 #endif
 
@@ -568,11 +555,6 @@ no_context:
  */
 out_of_memory:
         up_read(&mm->mmap_sem);
-        if (is_global_init(tsk)) {
-                yield();
-                down_read(&mm->mmap_sem);
-                goto survive;
-        }
         if (is_kernel_mode)
                 goto no_context;
         pagefault_out_of_memory();
@@ -722,8 +704,60 @@ void do_page_fault(struct pt_regs *regs, int fault_num,
 {
         int is_page_fault;
 
+#ifdef CONFIG_KPROBES
+        /*
+         * This is to notify the fault handler of the kprobes.  The
+         * exception code is redundant as it is also carried in REGS,
+         * but we pass it anyhow.
+         */
+        if (notify_die(DIE_PAGE_FAULT, "page fault", regs, -1,
+                       regs->faultnum, SIGSEGV) == NOTIFY_STOP)
+                return;
+#endif
+
+#ifdef __tilegx__
+        /*
+         * We don't need early do_page_fault_ics() support, since unlike
+         * Pro we don't need to worry about unlocking the atomic locks.
+         * There is only one current case in GX where we touch any memory
+         * under ICS other than our own kernel stack, and we handle that
+         * here.  (If we crash due to trying to touch our own stack,
+         * we're in too much trouble for C code to help out anyway.)
+         */
+        if (write & ~1) {
+                unsigned long pc = write & ~1;
+                if (pc >= (unsigned long) __start_unalign_asm_code &&
+                    pc < (unsigned long) __end_unalign_asm_code) {
+                        struct thread_info *ti = current_thread_info();
+                        /*
+                         * Our EX_CONTEXT is still what it was from the
+                         * initial unalign exception, but now we've faulted
+                         * on the JIT page.  We would like to complete the
+                         * page fault however is appropriate, and then retry
+                         * the instruction that caused the unalign exception.
+                         * Our state has been "corrupted" by setting the low
+                         * bit in "sp", and stashing r0..r3 in the
+                         * thread_info area, so we revert all of that, then
+                         * continue as if this were a normal page fault.
+                         */
+                        regs->sp &= ~1UL;
+                        regs->regs[0] = ti->unalign_jit_tmp[0];
+                        regs->regs[1] = ti->unalign_jit_tmp[1];
+                        regs->regs[2] = ti->unalign_jit_tmp[2];
+                        regs->regs[3] = ti->unalign_jit_tmp[3];
+                        write &= 1;
+                } else {
+                        pr_alert("%s/%d: ICS set at page fault at %#lx: %#lx\n",
+                                 current->comm, current->pid, pc, address);
+                        show_regs(regs);
+                        do_group_exit(SIGKILL);
+                        return;
+                }
+        }
+#else
         /* This case should have been handled by do_page_fault_ics(). */
         BUG_ON(write & ~1);
+#endif
 
 #if CHIP_HAS_TILE_DMA()
         /*
@@ -752,10 +786,6 @@ void do_page_fault(struct pt_regs *regs, int fault_num,
         case INT_DMATLB_MISS:
         case INT_DMATLB_MISS_DWNCL:
 #endif
-#if CHIP_HAS_SN_PROC()
-        case INT_SNITLB_MISS:
-        case INT_SNITLB_MISS_DWNCL:
-#endif
                 is_page_fault = 1;
                 break;
 
@@ -771,8 +801,8 @@ void do_page_fault(struct pt_regs *regs, int fault_num,
                 panic("Bad fault number %d in do_page_fault", fault_num);
         }
 
-#if CHIP_HAS_TILE_DMA() || CHIP_HAS_SN_PROC()
-        if (EX1_PL(regs->ex1) != USER_PL) {
+#if CHIP_HAS_TILE_DMA()
+        if (!user_mode(regs)) {
                 struct async_tlb *async;
                 switch (fault_num) {
 #if CHIP_HAS_TILE_DMA()
@@ -783,12 +813,6 @@ void do_page_fault(struct pt_regs *regs, int fault_num,
                         async = &current->thread.dma_async_tlb;
                         break;
 #endif
-#if CHIP_HAS_SN_PROC()
-                case INT_SNITLB_MISS:
-                case INT_SNITLB_MISS_DWNCL:
-                        async = &current->thread.sn_async_tlb;
-                        break;
-#endif
                 default:
                         async = NULL;
                 }
@@ -821,14 +845,22 @@ void do_page_fault(struct pt_regs *regs, int fault_num,
 }
 
 
-#if CHIP_HAS_TILE_DMA() || CHIP_HAS_SN_PROC()
+#if CHIP_HAS_TILE_DMA()
 /*
- * Check an async_tlb structure to see if a deferred fault is waiting,
- * and if so pass it to the page-fault code.
+ * This routine effectively re-issues asynchronous page faults
+ * when we are returning to user space.
  */
-static void handle_async_page_fault(struct pt_regs *regs,
-                                    struct async_tlb *async)
+void do_async_page_fault(struct pt_regs *regs)
 {
+        struct async_tlb *async = &current->thread.dma_async_tlb;
+
+        /*
+         * Clear thread flag early.  If we re-interrupt while processing
+         * code here, we will reset it and recall this routine before
+         * returning to user space.
+         */
+        clear_thread_flag(TIF_ASYNC_TLB);
+
         if (async->fault_num) {
                 /*
                  * Clear async->fault_num before calling the page-fault
@@ -842,35 +874,15 @@ static void handle_async_page_fault(struct pt_regs *regs,
                                   async->address, async->is_write);
         }
 }
-
-/*
- * This routine effectively re-issues asynchronous page faults
- * when we are returning to user space.
- */
-void do_async_page_fault(struct pt_regs *regs)
-{
-        /*
-         * Clear thread flag early.  If we re-interrupt while processing
-         * code here, we will reset it and recall this routine before
-         * returning to user space.
-         */
-        clear_thread_flag(TIF_ASYNC_TLB);
-
-#if CHIP_HAS_TILE_DMA()
-        handle_async_page_fault(regs, &current->thread.dma_async_tlb);
-#endif
-#if CHIP_HAS_SN_PROC()
-        handle_async_page_fault(regs, &current->thread.sn_async_tlb);
-#endif
-}
-#endif /* CHIP_HAS_TILE_DMA() || CHIP_HAS_SN_PROC() */
+#endif /* CHIP_HAS_TILE_DMA() */
 
 
 void vmalloc_sync_all(void)
 {
 #ifdef __tilegx__
         /* Currently all L1 kernel pmd's are static and shared. */
-        BUG_ON(pgd_index(VMALLOC_END) != pgd_index(VMALLOC_START));
+        BUILD_BUG_ON(pgd_index(VMALLOC_END - PAGE_SIZE) !=
+                     pgd_index(VMALLOC_START));
 #else
         /*
          * Note that races in the updates of insync and start aren't
diff --git a/arch/tile/mm/highmem.c b/arch/tile/mm/highmem.c
index 347d123b14be..0dc218294770 100644
--- a/arch/tile/mm/highmem.c
+++ b/arch/tile/mm/highmem.c
@@ -114,7 +114,6 @@ static void kmap_atomic_register(struct page *page, int type,
 
         list_add(&amp->list, &amp_list);
         set_pte(ptep, pteval);
-        arch_flush_lazy_mmu_mode();
 
         spin_unlock(&amp_lock);
         homecache_kpte_unlock(flags);
@@ -259,7 +258,6 @@ void __kunmap_atomic(void *kvaddr)
                 BUG_ON(vaddr >= (unsigned long)high_memory);
         }
 
-        arch_flush_lazy_mmu_mode();
         pagefault_enable();
 }
 EXPORT_SYMBOL(__kunmap_atomic);
diff --git a/arch/tile/mm/homecache.c b/arch/tile/mm/homecache.c
index 1ae911939a18..004ba568d93f 100644
--- a/arch/tile/mm/homecache.c
+++ b/arch/tile/mm/homecache.c
@@ -43,12 +43,9 @@
 #include "migrate.h"
 
 
-#if CHIP_HAS_COHERENT_LOCAL_CACHE()
-
 /*
  * The noallocl2 option suppresses all use of the L2 cache to cache
- * locally from a remote home.  There's no point in using it if we
- * don't have coherent local caching, though.
+ * locally from a remote home.
  */
 static int __write_once noallocl2;
 static int __init set_noallocl2(char *str)
@@ -58,12 +55,6 @@ static int __init set_noallocl2(char *str)
 }
 early_param("noallocl2", set_noallocl2);
 
-#else
-
-#define noallocl2 0
-
-#endif
-
 
 /*
  * Update the irq_stat for cpus that we are going to interrupt
@@ -172,7 +163,8 @@ void flush_remote(unsigned long cache_pfn, unsigned long cache_control,
 
 static void homecache_finv_page_va(void* va, int home)
 {
-        if (home == smp_processor_id()) {
+        int cpu = get_cpu();
+        if (home == cpu) {
                 finv_buffer_local(va, PAGE_SIZE);
         } else if (home == PAGE_HOME_HASH) {
                 finv_buffer_remote(va, PAGE_SIZE, 1);
@@ -180,6 +172,7 @@ static void homecache_finv_page_va(void* va, int home)
                 BUG_ON(home < 0 || home >= NR_CPUS);
                 finv_buffer_remote(va, PAGE_SIZE, 0);
         }
+        put_cpu();
 }
 
 void homecache_finv_map_page(struct page *page, int home)
@@ -198,7 +191,7 @@ void homecache_finv_map_page(struct page *page, int home)
 #else
         va = __fix_to_virt(FIX_HOMECACHE_BEGIN + smp_processor_id());
 #endif
-        ptep = virt_to_pte(NULL, (unsigned long)va);
+        ptep = virt_to_kpte(va);
         pte = pfn_pte(page_to_pfn(page), PAGE_KERNEL);
         __set_pte(ptep, pte_set_home(pte, home));
         homecache_finv_page_va((void *)va, home);
@@ -263,10 +256,8 @@ static int pte_to_home(pte_t pte)
                 return PAGE_HOME_INCOHERENT;
         case HV_PTE_MODE_UNCACHED:
                 return PAGE_HOME_UNCACHED;
-#if CHIP_HAS_CBOX_HOME_MAP()
         case HV_PTE_MODE_CACHE_HASH_L3:
                 return PAGE_HOME_HASH;
-#endif
         }
         panic("Bad PTE %#llx\n", pte.val);
 }
@@ -323,20 +314,16 @@ pte_t pte_set_home(pte_t pte, int home)
                                                       HV_PTE_MODE_CACHE_NO_L3);
                         }
                 } else
-#if CHIP_HAS_CBOX_HOME_MAP()
                 if (hash_default)
                         pte = hv_pte_set_mode(pte, HV_PTE_MODE_CACHE_HASH_L3);
                 else
-#endif
                         pte = hv_pte_set_mode(pte, HV_PTE_MODE_CACHE_NO_L3);
                 pte = hv_pte_set_nc(pte);
                 break;
 
-#if CHIP_HAS_CBOX_HOME_MAP()
         case PAGE_HOME_HASH:
                 pte = hv_pte_set_mode(pte, HV_PTE_MODE_CACHE_HASH_L3);
                 break;
-#endif
 
         default:
                 BUG_ON(home < 0 || home >= NR_CPUS ||
@@ -346,7 +333,6 @@ pte_t pte_set_home(pte_t pte, int home)
                 break;
         }
 
-#if CHIP_HAS_NC_AND_NOALLOC_BITS()
         if (noallocl2)
                 pte = hv_pte_set_no_alloc_l2(pte);
 
@@ -355,7 +341,6 @@ pte_t pte_set_home(pte_t pte, int home)
             hv_pte_get_mode(pte) == HV_PTE_MODE_CACHE_NO_L3) {
                 pte = hv_pte_set_mode(pte, HV_PTE_MODE_UNCACHED);
         }
-#endif
 
         /* Checking this case here gives a better panic than from the hv. */
         BUG_ON(hv_pte_get_mode(pte) == 0);
@@ -371,19 +356,13 @@ EXPORT_SYMBOL(pte_set_home);
  * so they're not suitable for anything but infrequent use.
  */
 
-#if CHIP_HAS_CBOX_HOME_MAP()
-static inline int initial_page_home(void) { return PAGE_HOME_HASH; }
-#else
-static inline int initial_page_home(void) { return 0; }
-#endif
-
 int page_home(struct page *page)
 {
         if (PageHighMem(page)) {
-                return initial_page_home();
+                return PAGE_HOME_HASH;
         } else {
                 unsigned long kva = (unsigned long)page_address(page);
-                return pte_to_home(*virt_to_pte(NULL, kva));
+                return pte_to_home(*virt_to_kpte(kva));
         }
 }
 EXPORT_SYMBOL(page_home);
@@ -402,7 +381,7 @@ void homecache_change_page_home(struct page *page, int order, int home)
                      NULL, 0);
 
         for (i = 0; i < pages; ++i, kva += PAGE_SIZE) {
-                pte_t *ptep = virt_to_pte(NULL, kva);
+                pte_t *ptep = virt_to_kpte(kva);
                 pte_t pteval = *ptep;
                 BUG_ON(!pte_present(pteval) || pte_huge(pteval));
                 __set_pte(ptep, pte_set_home(pteval, home));
@@ -436,7 +415,7 @@ struct page *homecache_alloc_pages_node(int nid, gfp_t gfp_mask,
 void __homecache_free_pages(struct page *page, unsigned int order)
 {
         if (put_page_testzero(page)) {
-                homecache_change_page_home(page, order, initial_page_home());
+                homecache_change_page_home(page, order, PAGE_HOME_HASH);
                 if (order == 0) {
                         free_hot_cold_page(page, 0);
                 } else {
diff --git a/arch/tile/mm/hugetlbpage.c b/arch/tile/mm/hugetlbpage.c
index 650ccff8378c..0cb3bbaa580c 100644
--- a/arch/tile/mm/hugetlbpage.c
+++ b/arch/tile/mm/hugetlbpage.c
@@ -49,38 +49,6 @@ int huge_shift[HUGE_SHIFT_ENTRIES] = {
 #endif
 };
 
-/*
- * This routine is a hybrid of pte_alloc_map() and pte_alloc_kernel().
- * It assumes that L2 PTEs are never in HIGHMEM (we don't support that).
- * It locks the user pagetable, and bumps up the mm->nr_ptes field,
- * but otherwise allocate the page table using the kernel versions.
- */
-static pte_t *pte_alloc_hugetlb(struct mm_struct *mm, pmd_t *pmd,
-                                unsigned long address)
-{
-        pte_t *new;
-
-        if (pmd_none(*pmd)) {
-                new = pte_alloc_one_kernel(mm, address);
-                if (!new)
-                        return NULL;
-
-                smp_wmb(); /* See comment in __pte_alloc */
-
-                spin_lock(&mm->page_table_lock);
-                if (likely(pmd_none(*pmd))) {  /* Has another populated it ? */
-                        mm->nr_ptes++;
-                        pmd_populate_kernel(mm, pmd, new);
-                        new = NULL;
-                } else
-                        VM_BUG_ON(pmd_trans_splitting(*pmd));
-                spin_unlock(&mm->page_table_lock);
-                if (new)
-                        pte_free_kernel(mm, new);
-        }
-
-        return pte_offset_kernel(pmd, address);
-}
 #endif
 
 pte_t *huge_pte_alloc(struct mm_struct *mm,
@@ -109,7 +77,7 @@ pte_t *huge_pte_alloc(struct mm_struct *mm,
                 else {
                         if (sz != PAGE_SIZE << huge_shift[HUGE_SHIFT_PAGE])
                                 panic("Unexpected page size %#lx\n", sz);
-                        return pte_alloc_hugetlb(mm, pmd, addr);
+                        return pte_alloc_map(mm, NULL, pmd, addr);
                 }
         }
 #else
@@ -144,14 +112,14 @@ pte_t *huge_pte_offset(struct mm_struct *mm, unsigned long addr)
 
         /* Get the top-level page table entry. */
         pgd = (pgd_t *)get_pte((pte_t *)mm->pgd, pgd_index(addr), 0);
-        if (!pgd_present(*pgd))
-                return NULL;
 
         /* We don't have four levels. */
         pud = pud_offset(pgd, addr);
 #ifndef __PAGETABLE_PUD_FOLDED
 # error support fourth page table level
 #endif
+        if (!pud_present(*pud))
+                return NULL;
 
         /* Check for an L0 huge PTE, if we have three levels. */
 #ifndef __PAGETABLE_PMD_FOLDED
@@ -198,6 +166,11 @@ int pud_huge(pud_t pud)
         return !!(pud_val(pud) & _PAGE_HUGE_PAGE);
 }
 
+int pmd_huge_support(void)
+{
+        return 1;
+}
+
 struct page *follow_huge_pmd(struct mm_struct *mm, unsigned long address,
                              pmd_t *pmd, int write)
 {
diff --git a/arch/tile/mm/init.c b/arch/tile/mm/init.c
index e182958c707d..0fa1acfac79a 100644
--- a/arch/tile/mm/init.c
+++ b/arch/tile/mm/init.c
@@ -106,10 +106,8 @@ pte_t *get_prealloc_pte(unsigned long pfn)
  */
 static int initial_heap_home(void)
 {
-#if CHIP_HAS_CBOX_HOME_MAP()
         if (hash_default)
                 return PAGE_HOME_HASH;
-#endif
         return smp_processor_id();
 }
 
@@ -190,14 +188,11 @@ static void __init page_table_range_init(unsigned long start,
 }
 
 
-#if CHIP_HAS_CBOX_HOME_MAP()
-
 static int __initdata ktext_hash = 1;  /* .text pages */
 static int __initdata kdata_hash = 1;  /* .data and .bss pages */
 int __write_once hash_default = 1;     /* kernel allocator pages */
 EXPORT_SYMBOL(hash_default);
 int __write_once kstack_hash = 1;      /* if no homecaching, use h4h */
-#endif /* CHIP_HAS_CBOX_HOME_MAP */
 
 /*
  * CPUs to use to for striping the pages of kernel data.  If hash-for-home
@@ -215,14 +210,12 @@ int __write_once kdata_huge;       /* if no homecaching, small pages */
 static pgprot_t __init construct_pgprot(pgprot_t prot, int home)
 {
         prot = pte_set_home(prot, home);
-#if CHIP_HAS_CBOX_HOME_MAP()
         if (home == PAGE_HOME_IMMUTABLE) {
                 if (ktext_hash)
                         prot = hv_pte_set_mode(prot, HV_PTE_MODE_CACHE_HASH_L3);
                 else
                         prot = hv_pte_set_mode(prot, HV_PTE_MODE_CACHE_NO_L3);
         }
-#endif
         return prot;
 }
 
@@ -234,22 +227,17 @@ static pgprot_t __init init_pgprot(ulong address)
 {
         int cpu;
         unsigned long page;
-        enum { CODE_DELTA = MEM_SV_INTRPT - PAGE_OFFSET };
+        enum { CODE_DELTA = MEM_SV_START - PAGE_OFFSET };
 
-#if CHIP_HAS_CBOX_HOME_MAP()
         /* For kdata=huge, everything is just hash-for-home. */
         if (kdata_huge)
                 return construct_pgprot(PAGE_KERNEL, PAGE_HOME_HASH);
-#endif
 
         /* We map the aliased pages of permanent text inaccessible. */
         if (address < (ulong) _sinittext - CODE_DELTA)
                 return PAGE_NONE;
 
-        /*
-         * We map read-only data non-coherent for performance.  We could
-         * use neighborhood caching on TILE64, but it's not clear it's a win.
-         */
+        /* We map read-only data non-coherent for performance. */
         if ((address >= (ulong) __start_rodata &&
              address < (ulong) __end_rodata) ||
             address == (ulong) empty_zero_page) {
@@ -257,12 +245,10 @@ static pgprot_t __init init_pgprot(ulong address)
         }
 
 #ifndef __tilegx__
-#if !ATOMIC_LOCKS_FOUND_VIA_TABLE()
         /* Force the atomic_locks[] array page to be hash-for-home. */
         if (address == (ulong) atomic_locks)
                 return construct_pgprot(PAGE_KERNEL, PAGE_HOME_HASH);
 #endif
-#endif
 
         /*
          * Everything else that isn't data or bss is heap, so mark it
@@ -280,19 +266,9 @@ static pgprot_t __init init_pgprot(ulong address)
         if (address >= (ulong) _end || address < (ulong) _einitdata)
                 return construct_pgprot(PAGE_KERNEL, initial_heap_home());
 
-#if CHIP_HAS_CBOX_HOME_MAP()
         /* Use hash-for-home if requested for data/bss. */
         if (kdata_hash)
                 return construct_pgprot(PAGE_KERNEL, PAGE_HOME_HASH);
-#endif
-
-        /*
-         * Make the w1data homed like heap to start with, to avoid
-         * making it part of the page-striped data area when we're just
-         * going to convert it to read-only soon anyway.
-         */
-        if (address >= (ulong)__w1data_begin && address < (ulong)__w1data_end)
-                return construct_pgprot(PAGE_KERNEL, initial_heap_home());
 
         /*
          * Otherwise we just hand out consecutive cpus.  To avoid
@@ -301,7 +277,7 @@ static pgprot_t __init init_pgprot(ulong address)
          * the requested address, while walking cpu home around kdata_mask.
          * This is typically no more than a dozen or so iterations.
          */
-        page = (((ulong)__w1data_end) + PAGE_SIZE - 1) & PAGE_MASK;
+        page = (((ulong)__end_rodata) + PAGE_SIZE - 1) & PAGE_MASK;
         BUG_ON(address < page || address >= (ulong)_end);
         cpu = cpumask_first(&kdata_mask);
         for (; page < address; page += PAGE_SIZE) {
@@ -311,11 +287,9 @@ static pgprot_t __init init_pgprot(ulong address)
                 if (page == (ulong)empty_zero_page)
                         continue;
 #ifndef __tilegx__
-#if !ATOMIC_LOCKS_FOUND_VIA_TABLE()
                 if (page == (ulong)atomic_locks)
                         continue;
 #endif
-#endif
                 cpu = cpumask_next(cpu, &kdata_mask);
                 if (cpu == NR_CPUS)
                         cpu = cpumask_first(&kdata_mask);
@@ -358,7 +332,7 @@ static int __init setup_ktext(char *str)
 
         ktext_arg_seen = 1;
 
-        /* Default setting on Tile64: use a huge page */
+        /* Default setting: use a huge page */
         if (strcmp(str, "huge") == 0)
                 pr_info("ktext: using one huge locally cached page\n");
 
@@ -404,10 +378,8 @@ static inline pgprot_t ktext_set_nocache(pgprot_t prot)
 {
         if (!ktext_nocache)
                 prot = hv_pte_set_nc(prot);
-#if CHIP_HAS_NC_AND_NOALLOC_BITS()
         else
                 prot = hv_pte_set_no_alloc_l2(prot);
-#endif
         return prot;
 }
 
@@ -440,7 +412,6 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base)
         struct cpumask kstripe_mask;
         int rc, i;
 
-#if CHIP_HAS_CBOX_HOME_MAP()
         if (ktext_arg_seen && ktext_hash) {
                 pr_warning("warning: \"ktext\" boot argument ignored"
                            " if \"kcache_hash\" sets up text hash-for-home\n");
@@ -457,7 +428,6 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base)
                           " kcache_hash=all or =allbutstack\n");
                 kdata_huge = 0;
         }
-#endif
 
         /*
          * Set up a mask for cpus to use for kernel striping.
@@ -538,7 +508,7 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base)
                 }
         }
 
-        address = MEM_SV_INTRPT;
+        address = MEM_SV_START;
         pmd = get_pmd(pgtables, address);
         pfn = 0;  /* code starts at PA 0 */
         if (ktext_small) {
@@ -585,13 +555,11 @@ static void __init kernel_physical_mapping_init(pgd_t *pgd_base)
         } else {
                 pte_t pteval = pfn_pte(0, PAGE_KERNEL_EXEC);
                 pteval = pte_mkhuge(pteval);
-#if CHIP_HAS_CBOX_HOME_MAP()
                 if (ktext_hash) {
                         pteval = hv_pte_set_mode(pteval,
                                                  HV_PTE_MODE_CACHE_HASH_L3);
                         pteval = ktext_set_nocache(pteval);
                 } else
-#endif /* CHIP_HAS_CBOX_HOME_MAP() */
                 if (cpumask_weight(&ktext_mask) == 1) {
                         pteval = set_remote_cache_cpu(pteval,
                                               cpumask_first(&ktext_mask));
@@ -777,10 +745,7 @@ void __init paging_init(void)
 
         kernel_physical_mapping_init(pgd_base);
 
-        /*
-         * Fixed mappings, only the page table structure has to be
-         * created - mappings will be set by set_fixmap():
-         */
+        /* Fixed mappings, only the page table structure has to be created. */
         page_table_range_init(fix_to_virt(__end_of_fixed_addresses - 1),
                               FIXADDR_TOP, pgd_base);
 
@@ -863,10 +828,6 @@ void __init mem_init(void)
         printk(KERN_DEBUG "  PKMAP   %#lx - %#lx\n",
                PKMAP_BASE, PKMAP_ADDR(LAST_PKMAP) - 1);
 #endif
-#ifdef CONFIG_HUGEVMAP
-        printk(KERN_DEBUG "  HUGEMAP %#lx - %#lx\n",
-               HUGE_VMAP_BASE, HUGE_VMAP_END - 1);
-#endif
         printk(KERN_DEBUG "  VMALLOC %#lx - %#lx\n",
                _VMALLOC_START, _VMALLOC_END - 1);
 #ifdef __tilegx__
@@ -941,26 +902,6 @@ void __init pgtable_cache_init(void)
                 panic("pgtable_cache_init(): Cannot create pgd cache");
 }
 
-#if !CHIP_HAS_COHERENT_LOCAL_CACHE()
-/*
- * The __w1data area holds data that is only written during initialization,
- * and is read-only and thus freely cacheable thereafter.  Fix the page
- * table entries that cover that region accordingly.
- */
-static void mark_w1data_ro(void)
-{
-        /* Loop over page table entries */
-        unsigned long addr = (unsigned long)__w1data_begin;
-        BUG_ON((addr & (PAGE_SIZE-1)) != 0);
-        for (; addr <= (unsigned long)__w1data_end - 1; addr += PAGE_SIZE) {
-                unsigned long pfn = kaddr_to_pfn((void *)addr);
-                pte_t *ptep = virt_to_pte(NULL, addr);
-                BUG_ON(pte_huge(*ptep));   /* not relevant for kdata_huge */
-                set_pte_at(&init_mm, addr, ptep, pfn_pte(pfn, PAGE_KERNEL_RO));
-        }
-}
-#endif
-
 #ifdef CONFIG_DEBUG_PAGEALLOC
 static long __write_once initfree;
 #else
@@ -1000,7 +941,7 @@ static void free_init_pages(char *what, unsigned long begin, unsigned long end)
                  */
                 int pfn = kaddr_to_pfn((void *)addr);
                 struct page *page = pfn_to_page(pfn);
-                pte_t *ptep = virt_to_pte(NULL, addr);
+                pte_t *ptep = virt_to_kpte(addr);
                 if (!initfree) {
                         /*
                          * If debugging page accesses then do not free
@@ -1024,15 +965,11 @@ static void free_init_pages(char *what, unsigned long begin, unsigned long end)
 
 void free_initmem(void)
 {
-        const unsigned long text_delta = MEM_SV_INTRPT - PAGE_OFFSET;
+        const unsigned long text_delta = MEM_SV_START - PAGE_OFFSET;
 
         /*
-         * Evict the dirty initdata on the boot cpu, evict the w1data
-         * wherever it's homed, and evict all the init code everywhere.
-         * We are guaranteed that no one will touch the init pages any
-         * more, and although other cpus may be touching the w1data,
-         * we only actually change the caching on tile64, which won't
-         * be keeping local copies in the other tiles' caches anyway.
+         * Evict the cache on all cores to avoid incoherence.
+         * We are guaranteed that no one will touch the init pages any more.
          */
         homecache_evict(&cpu_cacheable_map);
 
@@ -1043,26 +980,11 @@ void free_initmem(void)
 
         /*
          * Free the pages mapped from 0xc0000000 that correspond to code
-         * pages from MEM_SV_INTRPT that we won't use again after init.
+         * pages from MEM_SV_START that we won't use again after init.
          */
         free_init_pages("unused kernel text",
                         (unsigned long)_sinittext - text_delta,
                         (unsigned long)_einittext - text_delta);
-
-#if !CHIP_HAS_COHERENT_LOCAL_CACHE()
-        /*
-         * Upgrade the .w1data section to globally cached.
-         * We don't do this on tilepro, since the cache architecture
-         * pretty much makes it irrelevant, and in any case we end
-         * up having racing issues with other tiles that may touch
-         * the data after we flush the cache but before we update
-         * the PTEs and flush the TLBs, causing sharer shootdowns
-         * later.  Even though this is to clean data, it seems like
-         * an unnecessary complication.
-         */
-        mark_w1data_ro();
-#endif
-
         /* Do a global TLB flush so everyone sees the changes. */
         flush_tlb_all();
 }
diff --git a/arch/tile/mm/migrate_32.S b/arch/tile/mm/migrate_32.S
index 5305814bf187..772085491bf9 100644
--- a/arch/tile/mm/migrate_32.S
+++ b/arch/tile/mm/migrate_32.S
@@ -136,7 +136,7 @@ STD_ENTRY(flush_and_install_context)
          move r8, zero  /* asids */
          move r9, zero  /* asidcount */
         }
-        jal hv_flush_remote
+        jal _hv_flush_remote
         bnz r0, .Ldone
 
         /* Now install the new page table. */
@@ -152,7 +152,7 @@ STD_ENTRY(flush_and_install_context)
          move r4, r_asid
          moveli r5, HV_CTX_DIRECTIO | CTX_PAGE_FLAG
         }
-        jal hv_install_context
+        jal _hv_install_context
         bnz r0, .Ldone
 
         /* Finally, flush the TLB. */
diff --git a/arch/tile/mm/migrate_64.S b/arch/tile/mm/migrate_64.S
index 1d15b10833d1..a49eee38f872 100644
--- a/arch/tile/mm/migrate_64.S
+++ b/arch/tile/mm/migrate_64.S
@@ -123,7 +123,7 @@ STD_ENTRY(flush_and_install_context)
         }
         {
          move r8, zero  /* asidcount */
-         jal hv_flush_remote
+         jal _hv_flush_remote
         }
         bnez r0, 1f
 
@@ -136,7 +136,7 @@ STD_ENTRY(flush_and_install_context)
          move r2, r_asid
          moveli r3, HV_CTX_DIRECTIO | CTX_PAGE_FLAG
         }
-        jal hv_install_context
+        jal _hv_install_context
         bnez r0, 1f
 
         /* Finally, flush the TLB. */
diff --git a/arch/tile/mm/mmap.c b/arch/tile/mm/mmap.c
index d67d91ebf63e..851a94e6ae58 100644
--- a/arch/tile/mm/mmap.c
+++ b/arch/tile/mm/mmap.c
@@ -58,16 +58,36 @@ void arch_pick_mmap_layout(struct mm_struct *mm)
 #else
         int is_32bit = 0;
 #endif
+        unsigned long random_factor = 0UL;
+
+        /*
+         *  8 bits of randomness in 32bit mmaps, 24 address space bits
+         * 12 bits of randomness in 64bit mmaps, 28 address space bits
+         */
+        if (current->flags & PF_RANDOMIZE) {
+                if (is_32bit)
+                        random_factor = get_random_int() % (1<<8);
+                else
+                        random_factor = get_random_int() % (1<<12);
+
+                random_factor <<= PAGE_SHIFT;
+        }
 
         /*
          * Use standard layout if the expected stack growth is unlimited
          * or we are running native 64 bits.
          */
-        if (!is_32bit || rlimit(RLIMIT_STACK) == RLIM_INFINITY) {
-                mm->mmap_base = TASK_UNMAPPED_BASE;
+        if (rlimit(RLIMIT_STACK) == RLIM_INFINITY) {
+                mm->mmap_base = TASK_UNMAPPED_BASE + random_factor;
                 mm->get_unmapped_area = arch_get_unmapped_area;
         } else {
                 mm->mmap_base = mmap_base(mm);
                 mm->get_unmapped_area = arch_get_unmapped_area_topdown;
         }
 }
+
+unsigned long arch_randomize_brk(struct mm_struct *mm)
+{
+        unsigned long range_end = mm->brk + 0x02000000;
+        return randomize_range(mm->brk, range_end, 0) ? : mm->brk;
+}
diff --git a/arch/tile/mm/pgtable.c b/arch/tile/mm/pgtable.c
index dfd63ce87327..4fd9ec0b58ed 100644
--- a/arch/tile/mm/pgtable.c
+++ b/arch/tile/mm/pgtable.c
@@ -83,55 +83,6 @@ void show_mem(unsigned int filter)
         }
 }
 
-/*
- * Associate a virtual page frame with a given physical page frame
- * and protection flags for that frame.
- */
-static void set_pte_pfn(unsigned long vaddr, unsigned long pfn, pgprot_t flags)
-{
-        pgd_t *pgd;
-        pud_t *pud;
-        pmd_t *pmd;
-        pte_t *pte;
-
-        pgd = swapper_pg_dir + pgd_index(vaddr);
-        if (pgd_none(*pgd)) {
-                BUG();
-                return;
-        }
-        pud = pud_offset(pgd, vaddr);
-        if (pud_none(*pud)) {
-                BUG();
-                return;
-        }
-        pmd = pmd_offset(pud, vaddr);
-        if (pmd_none(*pmd)) {
-                BUG();
-                return;
-        }
-        pte = pte_offset_kernel(pmd, vaddr);
-        /* <pfn,flags> stored as-is, to permit clearing entries */
-        set_pte(pte, pfn_pte(pfn, flags));
-
-        /*
-         * It's enough to flush this one mapping.
-         * This appears conservative since it is only called
-         * from __set_fixmap.
-         */
-        local_flush_tlb_page(NULL, vaddr, PAGE_SIZE);
-}
-
-void __set_fixmap(enum fixed_addresses idx, unsigned long phys, pgprot_t flags)
-{
-        unsigned long address = __fix_to_virt(idx);
-
-        if (idx >= __end_of_fixed_addresses) {
-                BUG();
-                return;
-        }
-        set_pte_pfn(address, phys >> PAGE_SHIFT, flags);
-}
-
 /**
  * shatter_huge_page() - ensure a given address is mapped by a small page.
  *
@@ -176,8 +127,7 @@ void shatter_huge_page(unsigned long addr)
         }
 
         /* Shatter the huge page into the preallocated L2 page table. */
-        pmd_populate_kernel(&init_mm, pmd,
-                            get_prealloc_pte(pte_pfn(*(pte_t *)pmd)));
+        pmd_populate_kernel(&init_mm, pmd, get_prealloc_pte(pmd_pfn(*pmd)));
 
 #ifdef __PAGETABLE_PMD_FOLDED
         /* Walk every pgd on the system and update the pmd there. */
@@ -374,6 +324,17 @@ void ptep_set_wrprotect(struct mm_struct *mm,
 
 #endif
 
+/*
+ * Return a pointer to the PTE that corresponds to the given
+ * address in the given page table.  A NULL page table just uses
+ * the standard kernel page table; the preferred API in this case
+ * is virt_to_kpte().
+ *
+ * The returned pointer can point to a huge page in other levels
+ * of the page table than the bottom, if the huge page is present
+ * in the page table.  For bottom-level PTEs, the returned pointer
+ * can point to a PTE that is either present or not.
+ */
 pte_t *virt_to_pte(struct mm_struct* mm, unsigned long addr)
 {
         pgd_t *pgd;
@@ -387,13 +348,23 @@ pte_t *virt_to_pte(struct mm_struct* mm, unsigned long addr)
         pud = pud_offset(pgd, addr);
         if (!pud_present(*pud))
                 return NULL;
+        if (pud_huge_page(*pud))
+                return (pte_t *)pud;
         pmd = pmd_offset(pud, addr);
-        if (pmd_huge_page(*pmd))
-                return (pte_t *)pmd;
         if (!pmd_present(*pmd))
                 return NULL;
+        if (pmd_huge_page(*pmd))
+                return (pte_t *)pmd;
         return pte_offset_kernel(pmd, addr);
 }
+EXPORT_SYMBOL(virt_to_pte);
+
+pte_t *virt_to_kpte(unsigned long kaddr)
+{
+        BUG_ON(kaddr < PAGE_OFFSET);
+        return virt_to_pte(NULL, kaddr);
+}
+EXPORT_SYMBOL(virt_to_kpte);
 
 pgprot_t set_remote_cache_cpu(pgprot_t prot, int cpu)
 {
@@ -568,7 +539,7 @@ void __iomem *ioremap_prot(resource_size_t phys_addr, unsigned long size,
         addr = area->addr;
         if (ioremap_page_range((unsigned long)addr, (unsigned long)addr + size,
                                phys_addr, pgprot)) {
-                remove_vm_area((void *)(PAGE_MASK & (unsigned long) addr));
+                free_vm_area(area);
                 return NULL;
         }
         return (__force void __iomem *) (offset + (char *)addr);
diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
index bceee6623b00..8ddea1f8006a 100644
--- a/arch/um/Kconfig.common
+++ b/arch/um/Kconfig.common
@@ -6,7 +6,6 @@ config DEFCONFIG_LIST
 config UML
         bool
         default y
-        select HAVE_GENERIC_HARDIRQS
         select HAVE_UID16
         select GENERIC_IRQ_SHOW
         select GENERIC_CPU_DEVICES
diff --git a/arch/um/defconfig b/arch/um/defconfig
index 08107a795062..2665e6b683f5 100644
--- a/arch/um/defconfig
+++ b/arch/um/defconfig
@@ -129,12 +129,10 @@ CONFIG_BSD_PROCESS_ACCT=y
 # CONFIG_FHANDLE is not set
 # CONFIG_TASKSTATS is not set
 # CONFIG_AUDIT is not set
-CONFIG_HAVE_GENERIC_HARDIRQS=y
 
 #
 # IRQ subsystem
 #
-CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_SHOW=y
 
 #
diff --git a/arch/um/drivers/ubd.h b/arch/um/drivers/ubd.h
index 3845051f1b10..3b48cd2081ee 100644
--- a/arch/um/drivers/ubd.h
+++ b/arch/um/drivers/ubd.h
@@ -7,7 +7,6 @@
 #ifndef __UM_UBD_USER_H
 #define __UM_UBD_USER_H
 
-extern void ignore_sigwinch_sig(void);
 extern int start_io_thread(unsigned long sp, int *fds_out);
 extern int io_thread(void *arg);
 extern int kernel_fd;
diff --git a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
index 879990cb66c6..3716e6952554 100644
--- a/arch/um/drivers/ubd_kern.c
+++ b/arch/um/drivers/ubd_kern.c
@@ -41,7 +41,7 @@
 #include <os.h>
 #include "cow.h"
 
-enum ubd_req { UBD_READ, UBD_WRITE };
+enum ubd_req { UBD_READ, UBD_WRITE, UBD_FLUSH };
 
 struct io_thread_req {
         struct request *req;
@@ -866,6 +866,7 @@ static int ubd_add(int n, char **error_out)
                 goto out;
         }
         ubd_dev->queue->queuedata = ubd_dev;
+        blk_queue_flush(ubd_dev->queue, REQ_FLUSH);
 
         blk_queue_max_segments(ubd_dev->queue, MAX_SG);
         err = ubd_disk_register(UBD_MAJOR, ubd_dev->size, n, &ubd_gendisk[n]);
@@ -1239,11 +1240,40 @@ static void prepare_request(struct request *req, struct io_thread_req *io_req,
 }
 
 /* Called with dev->lock held */
+static void prepare_flush_request(struct request *req,
+                                  struct io_thread_req *io_req)
+{
+        struct gendisk *disk = req->rq_disk;
+        struct ubd *ubd_dev = disk->private_data;
+
+        io_req->req = req;
+        io_req->fds[0] = (ubd_dev->cow.file != NULL) ? ubd_dev->cow.fd :
+                ubd_dev->fd;
+        io_req->op = UBD_FLUSH;
+}
+
+static bool submit_request(struct io_thread_req *io_req, struct ubd *dev)
+{
+        int n = os_write_file(thread_fd, &io_req,
+                             sizeof(io_req));
+        if (n != sizeof(io_req)) {
+                if (n != -EAGAIN)
+                        printk("write to io thread failed, "
+                               "errno = %d\n", -n);
+                else if (list_empty(&dev->restart))
+                        list_add(&dev->restart, &restart);
+
+                kfree(io_req);
+                return false;
+        }
+        return true;
+}
+
+/* Called with dev->lock held */
 static void do_ubd_request(struct request_queue *q)
 {
         struct io_thread_req *io_req;
         struct request *req;
-        int n;
 
         while(1){
                 struct ubd *dev = q->queuedata;
@@ -1259,6 +1289,19 @@ static void do_ubd_request(struct request_queue *q)
                 }
 
                 req = dev->request;
+
+                if (req->cmd_flags & REQ_FLUSH) {
+                        io_req = kmalloc(sizeof(struct io_thread_req),
+                                         GFP_ATOMIC);
+                        if (io_req == NULL) {
+                                if (list_empty(&dev->restart))
+                                        list_add(&dev->restart, &restart);
+                                return;
+                        }
+                        prepare_flush_request(req, io_req);
+                        submit_request(io_req, dev);
+                }
+
                 while(dev->start_sg < dev->end_sg){
                         struct scatterlist *sg = &dev->sg[dev->start_sg];
 
@@ -1273,17 +1316,8 @@ static void do_ubd_request(struct request_queue *q)
                                         (unsigned long long)dev->rq_pos << 9,
                                         sg->offset, sg->length, sg_page(sg));
 
-                        n = os_write_file(thread_fd, &io_req,
-                                          sizeof(struct io_thread_req *));
-                        if(n != sizeof(struct io_thread_req *)){
-                                if(n != -EAGAIN)
-                                        printk("write to io thread failed, "
-                                               "errno = %d\n", -n);
-                                else if(list_empty(&dev->restart))
-                                        list_add(&dev->restart, &restart);
-                                kfree(io_req);
+                        if (submit_request(io_req, dev) == false)
                                 return;
-                        }
 
                         dev->rq_pos += sg->length >> 9;
                         dev->start_sg++;
@@ -1367,6 +1401,17 @@ static void do_io(struct io_thread_req *req)
         int err;
         __u64 off;
 
+        if (req->op == UBD_FLUSH) {
+                /* fds[0] is always either the rw image or our cow file */
+                n = os_sync_file(req->fds[0]);
+                if (n != 0) {
+                        printk("do_io - sync failed err = %d "
+                               "fd = %d\n", -n, req->fds[0]);
+                        req->error = 1;
+                }
+                return;
+        }
+
         nsectors = req->length / req->sectorsize;
         start = 0;
         do {
@@ -1431,7 +1476,8 @@ int io_thread(void *arg)
         struct io_thread_req *req;
         int n;
 
-        ignore_sigwinch_sig();
+        os_fix_helper_signals();
+
         while(1){
                 n = os_read_file(kernel_fd, &req,
                                  sizeof(struct io_thread_req *));
diff --git a/arch/um/drivers/ubd_user.c b/arch/um/drivers/ubd_user.c
index a703e45d8aac..e376f9b9c68d 100644
--- a/arch/um/drivers/ubd_user.c
+++ b/arch/um/drivers/ubd_user.c
@@ -21,11 +21,6 @@
 #include "ubd.h"
 #include <os.h>
 
-void ignore_sigwinch_sig(void)
-{
-        signal(SIGWINCH, SIG_IGN);
-}
-
 int start_io_thread(unsigned long sp, int *fd_out)
 {
         int pid, fds[2], err;
diff --git a/arch/um/include/shared/os.h b/arch/um/include/shared/os.h
index 95feaa47a2fb..021104d98cb3 100644
--- a/arch/um/include/shared/os.h
+++ b/arch/um/include/shared/os.h
@@ -141,6 +141,7 @@ extern int os_seek_file(int fd, unsigned long long offset);
 extern int os_open_file(const char *file, struct openflags flags, int mode);
 extern int os_read_file(int fd, void *buf, int len);
 extern int os_write_file(int fd, const void *buf, int count);
+extern int os_sync_file(int fd);
 extern int os_file_size(const char *file, unsigned long long *size_out);
 extern int os_file_modtime(const char *file, unsigned long *modtime);
 extern int os_pipe(int *fd, int stream, int close_on_exec);
@@ -200,6 +201,7 @@ extern int os_unmap_memory(void *addr, int len);
 extern int os_drop_memory(void *addr, int length);
 extern int can_drop_memory(void);
 extern void os_flush_stdout(void);
+extern int os_mincore(void *addr, unsigned long len);
 
 /* execvp.c */
 extern int execvp_noalloc(char *buf, const char *file, char *const argv[]);
@@ -233,6 +235,7 @@ extern void setup_machinename(char *machine_out);
 extern void setup_hostinfo(char *buf, int len);
 extern void os_dump_core(void) __attribute__ ((noreturn));
 extern void um_early_printk(const char *s, unsigned int n);
+extern void os_fix_helper_signals(void);
 
 /* time.c */
 extern void idle_sleep(unsigned long long nsecs);
diff --git a/arch/um/kernel/Makefile b/arch/um/kernel/Makefile
index babe21826e3e..d8b78a03855c 100644
--- a/arch/um/kernel/Makefile
+++ b/arch/um/kernel/Makefile
@@ -13,7 +13,7 @@ clean-files :=
 obj-y = config.o exec.o exitcode.o irq.o ksyms.o mem.o \
         physmem.o process.o ptrace.o reboot.o sigio.o \
         signal.o smp.o syscall.o sysrq.o time.o tlb.o trap.o \
-        um_arch.o umid.o skas/
+        um_arch.o umid.o maccess.o skas/
 
 obj-$(CONFIG_BLK_DEV_INITRD) += initrd.o
 obj-$(CONFIG_GPROF)     += gprof_syms.o
diff --git a/arch/um/kernel/irq.c b/arch/um/kernel/irq.c
index 36e12f0cefd5..1d8505b1e290 100644
--- a/arch/um/kernel/irq.c
+++ b/arch/um/kernel/irq.c
@@ -337,6 +337,8 @@ static struct irq_chip normal_irq_type = {
         .irq_disable = dummy,
         .irq_enable = dummy,
         .irq_ack = dummy,
+        .irq_mask = dummy,
+        .irq_unmask = dummy,
 };
 
 static struct irq_chip SIGVTALRM_irq_type = {
@@ -344,6 +346,8 @@ static struct irq_chip SIGVTALRM_irq_type = {
         .irq_disable = dummy,
         .irq_enable = dummy,
         .irq_ack = dummy,
+        .irq_mask = dummy,
+        .irq_unmask = dummy,
 };
 
 void __init init_IRQ(void)
diff --git a/arch/um/kernel/maccess.c b/arch/um/kernel/maccess.c
new file mode 100644
index 000000000000..1f3d5c4910d1
--- /dev/null
+++ b/arch/um/kernel/maccess.c
@@ -0,0 +1,24 @@
+/*
+ * Copyright (C) 2013 Richard Weinberger <richrd@nod.at>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/uaccess.h>
+#include <linux/kernel.h>
+#include <os.h>
+
+long probe_kernel_read(void *dst, const void *src, size_t size)
+{
+        void *psrc = (void *)rounddown((unsigned long)src, PAGE_SIZE);
+
+        if ((unsigned long)src < PAGE_SIZE || size <= 0)
+                return -EFAULT;
+
+        if (os_mincore(psrc, size + src - psrc) <= 0)
+                return -EFAULT;
+
+        return __probe_kernel_read(dst, src, size);
+}
diff --git a/arch/um/kernel/trap.c b/arch/um/kernel/trap.c
index 089f3987e273..5c3aef74237f 100644
--- a/arch/um/kernel/trap.c
+++ b/arch/um/kernel/trap.c
@@ -30,8 +30,7 @@ int handle_page_fault(unsigned long address, unsigned long ip,
         pmd_t *pmd;
         pte_t *pte;
         int err = -EFAULT;
-        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
-                                 (is_write ? FAULT_FLAG_WRITE : 0);
+        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
 
         *code_out = SEGV_MAPERR;
 
@@ -42,6 +41,8 @@ int handle_page_fault(unsigned long address, unsigned long ip,
         if (in_atomic())
                 goto out_nosemaphore;
 
+        if (is_user)
+                flags |= FAULT_FLAG_USER;
 retry:
         down_read(&mm->mmap_sem);
         vma = find_vma(mm, address);
@@ -58,12 +59,15 @@ retry:
 
 good_area:
         *code_out = SEGV_ACCERR;
-        if (is_write && !(vma->vm_flags & VM_WRITE))
-                goto out;
-
-        /* Don't require VM_READ|VM_EXEC for write faults! */
-        if (!is_write && !(vma->vm_flags & (VM_READ | VM_EXEC)))
-                goto out;
+        if (is_write) {
+                if (!(vma->vm_flags & VM_WRITE))
+                        goto out;
+                flags |= FAULT_FLAG_WRITE;
+        } else {
+                /* Don't require VM_READ|VM_EXEC for write faults! */
+                if (!(vma->vm_flags & (VM_READ | VM_EXEC)))
+                        goto out;
+        }
 
         do {
                 int fault;
@@ -124,6 +128,8 @@ out_of_memory:
          * (which will retry the fault, or kill us if we got oom-killed).
          */
         up_read(&mm->mmap_sem);
+        if (!is_user)
+                goto out_nosemaphore;
         pagefault_out_of_memory();
         return 0;
 }
diff --git a/arch/um/os-Linux/aio.c b/arch/um/os-Linux/aio.c
index 3a6bc2af0961..014eb35fd13b 100644
--- a/arch/um/os-Linux/aio.c
+++ b/arch/um/os-Linux/aio.c
@@ -104,8 +104,7 @@ static int aio_thread(void *arg)
         struct io_event event;
         int err, n, reply_fd;
 
-        signal(SIGWINCH, SIG_IGN);
-
+        os_fix_helper_signals();
         while (1) {
                 n = io_getevents(ctx, 1, 1, &event, NULL);
                 if (n < 0) {
@@ -173,7 +172,7 @@ static int not_aio_thread(void *arg)
         struct aio_thread_reply reply;
         int err;
 
-        signal(SIGWINCH, SIG_IGN);
+        os_fix_helper_signals();
         while (1) {
                 err = read(aio_req_fd_r, &req, sizeof(req));
                 if (err != sizeof(req)) {
diff --git a/arch/um/os-Linux/file.c b/arch/um/os-Linux/file.c
index c17bd6f7d674..07a750197bb0 100644
--- a/arch/um/os-Linux/file.c
+++ b/arch/um/os-Linux/file.c
@@ -266,6 +266,15 @@ int os_write_file(int fd, const void *buf, int len)
         return n;
 }
 
+int os_sync_file(int fd)
+{
+        int n = fsync(fd);
+
+        if (n < 0)
+                return -errno;
+        return n;
+}
+
 int os_file_size(const char *file, unsigned long long *size_out)
 {
         struct uml_stat buf;
diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c
index 749c96da7b99..e1704ff600ff 100644
--- a/arch/um/os-Linux/main.c
+++ b/arch/um/os-Linux/main.c
@@ -123,6 +123,8 @@ int __init main(int argc, char **argv, char **envp)
 
         setup_env_path();
 
+        setsid();
+
         new_argv = malloc((argc + 1) * sizeof(char *));
         if (new_argv == NULL) {
                 perror("Mallocing argv");
diff --git a/arch/um/os-Linux/process.c b/arch/um/os-Linux/process.c
index b8f34c9e53ae..33496fe2bb52 100644
--- a/arch/um/os-Linux/process.c
+++ b/arch/um/os-Linux/process.c
@@ -4,6 +4,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 #include <signal.h>
@@ -232,6 +233,57 @@ out:
         return ok;
 }
 
+static int os_page_mincore(void *addr)
+{
+        char vec[2];
+        int ret;
+
+        ret = mincore(addr, UM_KERN_PAGE_SIZE, vec);
+        if (ret < 0) {
+                if (errno == ENOMEM || errno == EINVAL)
+                        return 0;
+                else
+                        return -errno;
+        }
+
+        return vec[0] & 1;
+}
+
+int os_mincore(void *addr, unsigned long len)
+{
+        char *vec;
+        int ret, i;
+
+        if (len <= UM_KERN_PAGE_SIZE)
+                return os_page_mincore(addr);
+
+        vec = calloc(1, (len + UM_KERN_PAGE_SIZE - 1) / UM_KERN_PAGE_SIZE);
+        if (!vec)
+                return -ENOMEM;
+
+        ret = mincore(addr, UM_KERN_PAGE_SIZE, vec);
+        if (ret < 0) {
+                if (errno == ENOMEM || errno == EINVAL)
+                        ret = 0;
+                else
+                        ret = -errno;
+
+                goto out;
+        }
+
+        for (i = 0; i < ((len + UM_KERN_PAGE_SIZE - 1) / UM_KERN_PAGE_SIZE); i++) {
+                if (!(vec[i] & 1)) {
+                        ret = 0;
+                        goto out;
+                }
+        }
+
+        ret = 1;
+out:
+        free(vec);
+        return ret;
+}
+
 void init_new_thread_signals(void)
 {
         set_handler(SIGSEGV);
@@ -242,5 +294,4 @@ void init_new_thread_signals(void)
         signal(SIGHUP, SIG_IGN);
         set_handler(SIGIO);
         signal(SIGWINCH, SIG_IGN);
-        signal(SIGTERM, SIG_DFL);
 }
diff --git a/arch/um/os-Linux/sigio.c b/arch/um/os-Linux/sigio.c
index 8b61cc0e82c8..46e762f926eb 100644
--- a/arch/um/os-Linux/sigio.c
+++ b/arch/um/os-Linux/sigio.c
@@ -55,7 +55,7 @@ static int write_sigio_thread(void *unused)
         int i, n, respond_fd;
         char c;
 
-        signal(SIGWINCH, SIG_IGN);
+        os_fix_helper_signals();
         fds = &current_poll;
         while (1) {
                 n = poll(fds->poll, fds->used, -1);
diff --git a/arch/um/os-Linux/util.c b/arch/um/os-Linux/util.c
index 492ef5e6e166..faee55ef6d2f 100644
--- a/arch/um/os-Linux/util.c
+++ b/arch/um/os-Linux/util.c
@@ -94,6 +94,16 @@ static inline void __attribute__ ((noreturn)) uml_abort(void)
                         exit(127);
 }
 
+/*
+ * UML helper threads must not handle SIGWINCH/INT/TERM
+ */
+void os_fix_helper_signals(void)
+{
+        signal(SIGWINCH, SIG_IGN);
+        signal(SIGINT, SIG_DFL);
+        signal(SIGTERM, SIG_DFL);
+}
+
 void os_dump_core(void)
 {
         int pid;
diff --git a/arch/unicore32/Kconfig b/arch/unicore32/Kconfig
index 41bcc0013442..82cdd8906f3d 100644
--- a/arch/unicore32/Kconfig
+++ b/arch/unicore32/Kconfig
@@ -2,7 +2,6 @@ config UNICORE32
         def_bool y
         select HAVE_MEMBLOCK
         select HAVE_GENERIC_DMA_COHERENT
-        select HAVE_GENERIC_HARDIRQS
         select HAVE_DMA_ATTRS
         select HAVE_KERNEL_GZIP
         select HAVE_KERNEL_BZIP2
diff --git a/arch/unicore32/mm/fault.c b/arch/unicore32/mm/fault.c
index f9b5c10bccee..0dc922dba915 100644
--- a/arch/unicore32/mm/fault.c
+++ b/arch/unicore32/mm/fault.c
@@ -209,8 +209,7 @@ static int do_pf(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
         struct task_struct *tsk;
         struct mm_struct *mm;
         int fault, sig, code;
-        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
-                                 ((!(fsr ^ 0x12)) ? FAULT_FLAG_WRITE : 0);
+        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
 
         tsk = current;
         mm = tsk->mm;
@@ -222,6 +221,11 @@ static int do_pf(unsigned long addr, unsigned int fsr, struct pt_regs *regs)
         if (in_atomic() || !mm)
                 goto no_context;
 
+        if (user_mode(regs))
+                flags |= FAULT_FLAG_USER;
+        if (!(fsr ^ 0x12))
+                flags |= FAULT_FLAG_WRITE;
+
         /*
          * As per x86, we may deadlock here.  However, since the kernel only
          * validly references user space from well defined areas of the code,
@@ -278,6 +282,13 @@ retry:
                (VM_FAULT_ERROR | VM_FAULT_BADMAP | VM_FAULT_BADACCESS))))
                 return 0;
 
+        /*
+         * If we are in kernel mode at this point, we
+         * have no context to handle this fault with.
+         */
+        if (!user_mode(regs))
+                goto no_context;
+
         if (fault & VM_FAULT_OOM) {
                 /*
                  * We ran out of memory, call the OOM killer, and return to
@@ -288,13 +299,6 @@ retry:
                 return 0;
         }
 
-        /*
-         * If we are in kernel mode at this point, we
-         * have no context to handle this fault with.
-         */
-        if (!user_mode(regs))
-                goto no_context;
-
         if (fault & VM_FAULT_SIGBUS) {
                 /*
                  * We had some memory, but were unable to
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index b1fb846e6dac..ee2fb9d37745 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -16,6 +16,7 @@ config X86_64
         def_bool y
         depends on 64BIT
         select X86_DEV_DMA_OPS
+        select ARCH_USE_CMPXCHG_LOCKREF
 
 ### Arch settings
 config X86
@@ -81,8 +82,6 @@ config X86
         select HAVE_USER_RETURN_NOTIFIER
         select ARCH_BINFMT_ELF_RANDOMIZE_PIE
         select HAVE_ARCH_JUMP_LABEL
-        select HAVE_TEXT_POKE_SMP
-        select HAVE_GENERIC_HARDIRQS
         select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
         select SPARSE_IRQ
         select GENERIC_FIND_FIRST_BIT
@@ -482,11 +481,12 @@ config X86_INTEL_LPSS
         bool "Intel Low Power Subsystem Support"
         depends on ACPI
         select COMMON_CLK
+        select PINCTRL
         ---help---
           Select to build support for Intel Low Power Subsystem such as
           found on Intel Lynxpoint PCH. Selecting this option enables
-          things like clock tree (common clock framework) which are needed
-          by the LPSS peripheral drivers.
+          things like clock tree (common clock framework) and pincontrol
+          which are needed by the LPSS peripheral drivers.
 
 config X86_RDC321X
         bool "RDC R-321x SoC"
@@ -1354,8 +1354,12 @@ config ARCH_SELECT_MEMORY_MODEL
         depends on ARCH_SPARSEMEM_ENABLE
 
 config ARCH_MEMORY_PROBE
-        def_bool y
+        bool "Enable sysfs memory/probe interface"
         depends on X86_64 && MEMORY_HOTPLUG
+        help
+          This option enables a sysfs memory/probe interface for testing.
+          See Documentation/memory-hotplug.txt for more information.
+          If you are unsure how to answer this question, answer N.
 
 config ARCH_PROC_KCORE_TEXT
         def_bool y
@@ -1637,9 +1641,9 @@ config KEXEC
 
           It is an ongoing process to be certain the hardware in a machine
           is properly shutdown, so do not be surprised if this code does not
-          initially work for you.  It may help to enable device hotplugging
-          support.  As of this writing the exact hardware interface is
-          strongly in flux, so no good recommendation can be made.
+          initially work for you.  As of this writing the exact hardware
+          interface is strongly in flux, so no good recommendation can be
+          made.
 
 config CRASH_DUMP
         bool "kernel crash dumps"
@@ -1726,9 +1730,10 @@ config X86_NEED_RELOCS
         depends on X86_32 && RELOCATABLE
 
 config PHYSICAL_ALIGN
-        hex "Alignment value to which kernel should be aligned" if X86_32
+        hex "Alignment value to which kernel should be aligned"
         default "0x1000000"
-        range 0x2000 0x1000000
+        range 0x2000 0x1000000 if X86_32
+        range 0x200000 0x1000000 if X86_64
         ---help---
           This value puts the alignment restrictions on physical address
           where kernel is loaded and run from. Kernel is compiled for an
@@ -1746,6 +1751,9 @@ config PHYSICAL_ALIGN
           end result is that kernel runs from a physical address meeting
           above alignment restrictions.
 
+          On 32-bit this value must be a multiple of 0x2000. On 64-bit
+          this value must be a multiple of 0x200000.
+
           Don't change this unless you know what you are doing.
 
 config HOTPLUG_CPU
@@ -2024,7 +2032,6 @@ menu "Bus options (PCI etc.)"
 config PCI
         bool "PCI support"
         default y
-        select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC)
         ---help---
           Find out whether you have a PCI motherboard. PCI is the name of a
           bus system, i.e. the way the CPU talks to the other stuff inside
@@ -2280,6 +2287,32 @@ config RAPIDIO
 
 source "drivers/rapidio/Kconfig"
 
+config X86_SYSFB
+        bool "Mark VGA/VBE/EFI FB as generic system framebuffer"
+        help
+          Firmwares often provide initial graphics framebuffers so the BIOS,
+          bootloader or kernel can show basic video-output during boot for
+          user-guidance and debugging. Historically, x86 used the VESA BIOS
+          Extensions and EFI-framebuffers for this, which are mostly limited
+          to x86.
+          This option, if enabled, marks VGA/VBE/EFI framebuffers as generic
+          framebuffers so the new generic system-framebuffer drivers can be
+          used on x86. If the framebuffer is not compatible with the generic
+          modes, it is adverticed as fallback platform framebuffer so legacy
+          drivers like efifb, vesafb and uvesafb can pick it up.
+          If this option is not selected, all system framebuffers are always
+          marked as fallback platform framebuffers as usual.
+
+          Note: Legacy fbdev drivers, including vesafb, efifb, uvesafb, will
+          not be able to pick up generic system framebuffers if this option
+          is selected. You are highly encouraged to enable simplefb as
+          replacement if you select this option. simplefb can correctly deal
+          with generic system framebuffers. But you should still keep vesafb
+          and others enabled as fallback if a system framebuffer is
+          incompatible with simplefb.
+
+          If unsure, say Y.
+
 endmenu
 
 
@@ -2342,10 +2375,6 @@ config HAVE_ATOMIC_IOMAP
         def_bool y
         depends on X86_32
 
-config HAVE_TEXT_POKE_SMP
-        bool
-        select STOP_MACHINE if SMP
-
 config X86_DEV_DMA_OPS
         bool
         depends on X86_64 || STA2X11
diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index 07639c656fcd..41250fb33985 100644
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -16,6 +16,10 @@ endif
 # e.g.: obj-y += foo_$(BITS).o
 export BITS
 
+ifdef CONFIG_X86_NEED_RELOCS
+        LDFLAGS_vmlinux := --emit-relocs
+endif
+
 ifeq ($(CONFIG_X86_32),y)
         BITS := 32
         UTS_MACHINE := i386
@@ -25,10 +29,6 @@ ifeq ($(CONFIG_X86_32),y)
         KBUILD_AFLAGS += $(biarch)
         KBUILD_CFLAGS += $(biarch)
 
-        ifdef CONFIG_RELOCATABLE
-                LDFLAGS_vmlinux := --emit-relocs
-        endif
-
         KBUILD_CFLAGS += -msoft-float -mregparm=3 -freg-struct-return
 
         # Never want PIC in a 32-bit kernel, prevent breakage with GCC built
diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h
index 5b7531966b84..ef72baeff484 100644
--- a/arch/x86/boot/boot.h
+++ b/arch/x86/boot/boot.h
@@ -355,6 +355,7 @@ int strncmp(const char *cs, const char *ct, size_t count);
 size_t strnlen(const char *s, size_t maxlen);
 unsigned int atou(const char *s);
 unsigned long long simple_strtoull(const char *cp, char **endp, unsigned int base);
+size_t strlen(const char *s);
 
 /* tty.c */
 void puts(const char *);
diff --git a/arch/x86/boot/compressed/head_32.S b/arch/x86/boot/compressed/head_32.S
index 1e3184f6072f..5d6f6891b188 100644
--- a/arch/x86/boot/compressed/head_32.S
+++ b/arch/x86/boot/compressed/head_32.S
@@ -181,8 +181,9 @@ relocated:
 /*
  * Do the decompression, and jump to the new kernel..
  */
-        leal    z_extract_offset_negative(%ebx), %ebp
                                 /* push arguments for decompress_kernel: */
+        pushl   $z_output_len   /* decompressed length */
+        leal    z_extract_offset_negative(%ebx), %ebp
         pushl   %ebp            /* output address */
         pushl   $z_input_len    /* input_len */
         leal    input_data(%ebx), %eax
@@ -191,33 +192,7 @@ relocated:
         pushl   %eax            /* heap area */
         pushl   %esi            /* real mode pointer */
         call    decompress_kernel
-        addl    $20, %esp
-
-#if CONFIG_RELOCATABLE
-/*
- * Find the address of the relocations.
- */
-        leal    z_output_len(%ebp), %edi
-
-/*
- * Calculate the delta between where vmlinux was compiled to run
- * and where it was actually loaded.
- */
-        movl    %ebp, %ebx
-        subl    $LOAD_PHYSICAL_ADDR, %ebx
-        jz      2f      /* Nothing to be done if loaded at compiled addr. */
-/*
- * Process relocations.
- */
-
-1:      subl    $4, %edi
-        movl    (%edi), %ecx
-        testl   %ecx, %ecx
-        jz      2f
-        addl    %ebx, -__PAGE_OFFSET(%ebx, %ecx)
-        jmp     1b
-2:
-#endif
+        addl    $24, %esp
 
 /*
  * Jump to the decompressed kernel.
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
index 06e71c2c16bf..c337422b575d 100644
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -338,6 +338,7 @@ relocated:
         leaq    input_data(%rip), %rdx  /* input_data */
         movl    $z_input_len, %ecx      /* input_len */
         movq    %rbp, %r8               /* output target address */
+        movq    $z_output_len, %r9      /* decompressed length */
         call    decompress_kernel
         popq    %rsi
 
diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c
index 0319c88290a5..434f077d2c4d 100644
--- a/arch/x86/boot/compressed/misc.c
+++ b/arch/x86/boot/compressed/misc.c
@@ -271,6 +271,79 @@ static void error(char *x)
                 asm("hlt");
 }
 
+#if CONFIG_X86_NEED_RELOCS
+static void handle_relocations(void *output, unsigned long output_len)
+{
+        int *reloc;
+        unsigned long delta, map, ptr;
+        unsigned long min_addr = (unsigned long)output;
+        unsigned long max_addr = min_addr + output_len;
+
+        /*
+         * Calculate the delta between where vmlinux was linked to load
+         * and where it was actually loaded.
+         */
+        delta = min_addr - LOAD_PHYSICAL_ADDR;
+        if (!delta) {
+                debug_putstr("No relocation needed... ");
+                return;
+        }
+        debug_putstr("Performing relocations... ");
+
+        /*
+         * The kernel contains a table of relocation addresses. Those
+         * addresses have the final load address of the kernel in virtual
+         * memory. We are currently working in the self map. So we need to
+         * create an adjustment for kernel memory addresses to the self map.
+         * This will involve subtracting out the base address of the kernel.
+         */
+        map = delta - __START_KERNEL_map;
+
+        /*
+         * Process relocations: 32 bit relocations first then 64 bit after.
+         * Two sets of binary relocations are added to the end of the kernel
+         * before compression. Each relocation table entry is the kernel
+         * address of the location which needs to be updated stored as a
+         * 32-bit value which is sign extended to 64 bits.
+         *
+         * Format is:
+         *
+         * kernel bits...
+         * 0 - zero terminator for 64 bit relocations
+         * 64 bit relocation repeated
+         * 0 - zero terminator for 32 bit relocations
+         * 32 bit relocation repeated
+         *
+         * So we work backwards from the end of the decompressed image.
+         */
+        for (reloc = output + output_len - sizeof(*reloc); *reloc; reloc--) {
+                int extended = *reloc;
+                extended += map;
+
+                ptr = (unsigned long)extended;
+                if (ptr < min_addr || ptr > max_addr)
+                        error("32-bit relocation outside of kernel!\n");
+
+                *(uint32_t *)ptr += delta;
+        }
+#ifdef CONFIG_X86_64
+        for (reloc--; *reloc; reloc--) {
+                long extended = *reloc;
+                extended += map;
+
+                ptr = (unsigned long)extended;
+                if (ptr < min_addr || ptr > max_addr)
+                        error("64-bit relocation outside of kernel!\n");
+
+                *(uint64_t *)ptr += delta;
+        }
+#endif
+}
+#else
+static inline void handle_relocations(void *output, unsigned long output_len)
+{ }
+#endif
+
 static void parse_elf(void *output)
 {
 #ifdef CONFIG_X86_64
@@ -325,7 +398,8 @@ static void parse_elf(void *output)
 asmlinkage void decompress_kernel(void *rmode, memptr heap,
                                   unsigned char *input_data,
                                   unsigned long input_len,
-                                  unsigned char *output)
+                                  unsigned char *output,
+                                  unsigned long output_len)
 {
         real_mode = rmode;
 
@@ -365,6 +439,7 @@ asmlinkage void decompress_kernel(void *rmode, memptr heap,
         debug_putstr("\nDecompressing Linux... ");
         decompress(input_data, input_len, NULL, NULL, output, NULL, error);
         parse_elf(output);
+        handle_relocations(output, output_len);
         debug_putstr("done.\nBooting the kernel.\n");
         return;
 }
diff --git a/arch/x86/boot/printf.c b/arch/x86/boot/printf.c
index cdac91ca55d3..565083c16e5c 100644
--- a/arch/x86/boot/printf.c
+++ b/arch/x86/boot/printf.c
@@ -55,7 +55,7 @@ static char *number(char *str, long num, int base, int size, int precision,
         locase = (type & SMALL);
         if (type & LEFT)
                 type &= ~ZEROPAD;
-        if (base < 2 || base > 36)
+        if (base < 2 || base > 16)
                 return NULL;
         c = (type & ZEROPAD) ? '0' : ' ';
         sign = 0;
diff --git a/arch/x86/crypto/Makefile b/arch/x86/crypto/Makefile
index 6c63c358a7e6..7d6ba9db1be9 100644
--- a/arch/x86/crypto/Makefile
+++ b/arch/x86/crypto/Makefile
@@ -27,6 +27,7 @@ obj-$(CONFIG_CRYPTO_SHA1_SSSE3) += sha1-ssse3.o
 obj-$(CONFIG_CRYPTO_CRC32_PCLMUL) += crc32-pclmul.o
 obj-$(CONFIG_CRYPTO_SHA256_SSSE3) += sha256-ssse3.o
 obj-$(CONFIG_CRYPTO_SHA512_SSSE3) += sha512-ssse3.o
+obj-$(CONFIG_CRYPTO_CRCT10DIF_PCLMUL) += crct10dif-pclmul.o
 
 # These modules require assembler to support AVX.
 ifeq ($(avx_supported),yes)
@@ -81,3 +82,4 @@ crc32c-intel-$(CONFIG_64BIT) += crc32c-pcl-intel-asm_64.o
 crc32-pclmul-y := crc32-pclmul_asm.o crc32-pclmul_glue.o
 sha256-ssse3-y := sha256-ssse3-asm.o sha256-avx-asm.o sha256-avx2-asm.o sha256_ssse3_glue.o
 sha512-ssse3-y := sha512-ssse3-asm.o sha512-avx-asm.o sha512-avx2-asm.o sha512_ssse3_glue.o
+crct10dif-pclmul-y := crct10dif-pcl-asm_64.o crct10dif-pclmul_glue.o
diff --git a/arch/x86/crypto/camellia_glue.c b/arch/x86/crypto/camellia_glue.c
index 5cb86ccd4acb..c171dcbf192d 100644
--- a/arch/x86/crypto/camellia_glue.c
+++ b/arch/x86/crypto/camellia_glue.c
@@ -62,7 +62,7 @@ static void camellia_decrypt(struct crypto_tfm *tfm, u8 *dst, const u8 *src)
 }
 
 /* camellia sboxes */
-const u64 camellia_sp10011110[256] = {
+__visible const u64 camellia_sp10011110[256] = {
         0x7000007070707000ULL, 0x8200008282828200ULL, 0x2c00002c2c2c2c00ULL,
         0xec0000ecececec00ULL, 0xb30000b3b3b3b300ULL, 0x2700002727272700ULL,
         0xc00000c0c0c0c000ULL, 0xe50000e5e5e5e500ULL, 0xe40000e4e4e4e400ULL,
@@ -151,7 +151,7 @@ const u64 camellia_sp10011110[256] = {
         0x9e00009e9e9e9e00ULL,
 };
 
-const u64 camellia_sp22000222[256] = {
+__visible const u64 camellia_sp22000222[256] = {
         0xe0e0000000e0e0e0ULL, 0x0505000000050505ULL, 0x5858000000585858ULL,
         0xd9d9000000d9d9d9ULL, 0x6767000000676767ULL, 0x4e4e0000004e4e4eULL,
         0x8181000000818181ULL, 0xcbcb000000cbcbcbULL, 0xc9c9000000c9c9c9ULL,
@@ -240,7 +240,7 @@ const u64 camellia_sp22000222[256] = {
         0x3d3d0000003d3d3dULL,
 };
 
-const u64 camellia_sp03303033[256] = {
+__visible const u64 camellia_sp03303033[256] = {
         0x0038380038003838ULL, 0x0041410041004141ULL, 0x0016160016001616ULL,
         0x0076760076007676ULL, 0x00d9d900d900d9d9ULL, 0x0093930093009393ULL,
         0x0060600060006060ULL, 0x00f2f200f200f2f2ULL, 0x0072720072007272ULL,
@@ -329,7 +329,7 @@ const u64 camellia_sp03303033[256] = {
         0x004f4f004f004f4fULL,
 };
 
-const u64 camellia_sp00444404[256] = {
+__visible const u64 camellia_sp00444404[256] = {
         0x0000707070700070ULL, 0x00002c2c2c2c002cULL, 0x0000b3b3b3b300b3ULL,
         0x0000c0c0c0c000c0ULL, 0x0000e4e4e4e400e4ULL, 0x0000575757570057ULL,
         0x0000eaeaeaea00eaULL, 0x0000aeaeaeae00aeULL, 0x0000232323230023ULL,
@@ -418,7 +418,7 @@ const u64 camellia_sp00444404[256] = {
         0x00009e9e9e9e009eULL,
 };
 
-const u64 camellia_sp02220222[256] = {
+__visible const u64 camellia_sp02220222[256] = {
         0x00e0e0e000e0e0e0ULL, 0x0005050500050505ULL, 0x0058585800585858ULL,
         0x00d9d9d900d9d9d9ULL, 0x0067676700676767ULL, 0x004e4e4e004e4e4eULL,
         0x0081818100818181ULL, 0x00cbcbcb00cbcbcbULL, 0x00c9c9c900c9c9c9ULL,
@@ -507,7 +507,7 @@ const u64 camellia_sp02220222[256] = {
         0x003d3d3d003d3d3dULL,
 };
 
-const u64 camellia_sp30333033[256] = {
+__visible const u64 camellia_sp30333033[256] = {
         0x3800383838003838ULL, 0x4100414141004141ULL, 0x1600161616001616ULL,
         0x7600767676007676ULL, 0xd900d9d9d900d9d9ULL, 0x9300939393009393ULL,
         0x6000606060006060ULL, 0xf200f2f2f200f2f2ULL, 0x7200727272007272ULL,
@@ -596,7 +596,7 @@ const u64 camellia_sp30333033[256] = {
         0x4f004f4f4f004f4fULL,
 };
 
-const u64 camellia_sp44044404[256] = {
+__visible const u64 camellia_sp44044404[256] = {
         0x7070007070700070ULL, 0x2c2c002c2c2c002cULL, 0xb3b300b3b3b300b3ULL,
         0xc0c000c0c0c000c0ULL, 0xe4e400e4e4e400e4ULL, 0x5757005757570057ULL,
         0xeaea00eaeaea00eaULL, 0xaeae00aeaeae00aeULL, 0x2323002323230023ULL,
@@ -685,7 +685,7 @@ const u64 camellia_sp44044404[256] = {
         0x9e9e009e9e9e009eULL,
 };
 
-const u64 camellia_sp11101110[256] = {
+__visible const u64 camellia_sp11101110[256] = {
         0x7070700070707000ULL, 0x8282820082828200ULL, 0x2c2c2c002c2c2c00ULL,
         0xececec00ececec00ULL, 0xb3b3b300b3b3b300ULL, 0x2727270027272700ULL,
         0xc0c0c000c0c0c000ULL, 0xe5e5e500e5e5e500ULL, 0xe4e4e400e4e4e400ULL,
@@ -828,8 +828,8 @@ static void camellia_setup_tail(u64 *subkey, u64 *subRL, int max)
 
         subRL[1] ^= (subRL[1] & ~subRL[9]) << 32;
         /* modified for FLinv(kl2) */
-        dw = (subRL[1] & subRL[9]) >> 32,
-                subRL[1] ^= rol32(dw, 1);
+        dw = (subRL[1] & subRL[9]) >> 32;
+        subRL[1] ^= rol32(dw, 1);
 
         /* round 8 */
         subRL[11] ^= subRL[1];
@@ -840,8 +840,8 @@ static void camellia_setup_tail(u64 *subkey, u64 *subRL, int max)
 
         subRL[1] ^= (subRL[1] & ~subRL[17]) << 32;
         /* modified for FLinv(kl4) */
-        dw = (subRL[1] & subRL[17]) >> 32,
-                subRL[1] ^= rol32(dw, 1);
+        dw = (subRL[1] & subRL[17]) >> 32;
+        subRL[1] ^= rol32(dw, 1);
 
         /* round 14 */
         subRL[19] ^= subRL[1];
@@ -859,8 +859,8 @@ static void camellia_setup_tail(u64 *subkey, u64 *subRL, int max)
         } else {
                 subRL[1] ^= (subRL[1] & ~subRL[25]) << 32;
                 /* modified for FLinv(kl6) */
-                dw = (subRL[1] & subRL[25]) >> 32,
-                        subRL[1] ^= rol32(dw, 1);
+                dw = (subRL[1] & subRL[25]) >> 32;
+                subRL[1] ^= rol32(dw, 1);
 
                 /* round 20 */
                 subRL[27] ^= subRL[1];
@@ -882,8 +882,8 @@ static void camellia_setup_tail(u64 *subkey, u64 *subRL, int max)
 
                 kw4 ^= (kw4 & ~subRL[24]) << 32;
                 /* modified for FL(kl5) */
-                dw = (kw4 & subRL[24]) >> 32,
-                        kw4 ^= rol32(dw, 1);
+                dw = (kw4 & subRL[24]) >> 32;
+                kw4 ^= rol32(dw, 1);
         }
 
         /* round 17 */
@@ -895,8 +895,8 @@ static void camellia_setup_tail(u64 *subkey, u64 *subRL, int max)
 
         kw4 ^= (kw4 & ~subRL[16]) << 32;
         /* modified for FL(kl3) */
-        dw = (kw4 & subRL[16]) >> 32,
-                kw4 ^= rol32(dw, 1);
+        dw = (kw4 & subRL[16]) >> 32;
+        kw4 ^= rol32(dw, 1);
 
         /* round 11 */
         subRL[14] ^= kw4;
@@ -907,8 +907,8 @@ static void camellia_setup_tail(u64 *subkey, u64 *subRL, int max)
 
         kw4 ^= (kw4 & ~subRL[8]) << 32;
         /* modified for FL(kl1) */
-        dw = (kw4 & subRL[8]) >> 32,
-                kw4 ^= rol32(dw, 1);
+        dw = (kw4 & subRL[8]) >> 32;
+        kw4 ^= rol32(dw, 1);
 
         /* round 5 */
         subRL[6] ^= kw4;
@@ -928,8 +928,8 @@ static void camellia_setup_tail(u64 *subkey, u64 *subRL, int max)
         SET_SUBKEY_LR(6, subRL[5] ^ subRL[7]);                  /* round 5 */
 
         tl = (subRL[10] >> 32) ^ (subRL[10] & ~subRL[8]);
-        dw = tl & (subRL[8] >> 32),                             /* FL(kl1) */
-                tr = subRL[10] ^ rol32(dw, 1);
+        dw = tl & (subRL[8] >> 32);                             /* FL(kl1) */
+        tr = subRL[10] ^ rol32(dw, 1);
         tt = (tr | ((u64)tl << 32));
 
         SET_SUBKEY_LR(7, subRL[6] ^ tt);                        /* round 6 */
@@ -937,8 +937,8 @@ static void camellia_setup_tail(u64 *subkey, u64 *subRL, int max)
         SET_SUBKEY_LR(9, subRL[9]);                             /* FLinv(kl2) */
 
         tl = (subRL[7] >> 32) ^ (subRL[7] & ~subRL[9]);
-        dw = tl & (subRL[9] >> 32),                             /* FLinv(kl2) */
-                tr = subRL[7] ^ rol32(dw, 1);
+        dw = tl & (subRL[9] >> 32);                             /* FLinv(kl2) */
+        tr = subRL[7] ^ rol32(dw, 1);
         tt = (tr | ((u64)tl << 32));
 
         SET_SUBKEY_LR(10, subRL[11] ^ tt);                      /* round 7 */
@@ -948,8 +948,8 @@ static void camellia_setup_tail(u64 *subkey, u64 *subRL, int max)
         SET_SUBKEY_LR(14, subRL[13] ^ subRL[15]);               /* round 11 */
 
         tl = (subRL[18] >> 32) ^ (subRL[18] & ~subRL[16]);
-        dw = tl & (subRL[16] >> 32),                            /* FL(kl3) */
-                tr = subRL[18] ^ rol32(dw, 1);
+        dw = tl & (subRL[16] >> 32);                            /* FL(kl3) */
+        tr = subRL[18] ^ rol32(dw, 1);
         tt = (tr | ((u64)tl << 32));
 
         SET_SUBKEY_LR(15, subRL[14] ^ tt);                      /* round 12 */
@@ -957,8 +957,8 @@ static void camellia_setup_tail(u64 *subkey, u64 *subRL, int max)
         SET_SUBKEY_LR(17, subRL[17]);                           /* FLinv(kl4) */
 
         tl = (subRL[15] >> 32) ^ (subRL[15] & ~subRL[17]);
-        dw = tl & (subRL[17] >> 32),                            /* FLinv(kl4) */
-                tr = subRL[15] ^ rol32(dw, 1);
+        dw = tl & (subRL[17] >> 32);                            /* FLinv(kl4) */
+        tr = subRL[15] ^ rol32(dw, 1);
         tt = (tr | ((u64)tl << 32));
 
         SET_SUBKEY_LR(18, subRL[19] ^ tt);                      /* round 13 */
@@ -972,8 +972,8 @@ static void camellia_setup_tail(u64 *subkey, u64 *subRL, int max)
                 SET_SUBKEY_LR(24, subRL[24] ^ subRL[23]);       /* kw3 */
         } else {
                 tl = (subRL[26] >> 32) ^ (subRL[26] & ~subRL[24]);
-                dw = tl & (subRL[24] >> 32),                    /* FL(kl5) */
-                        tr = subRL[26] ^ rol32(dw, 1);
+                dw = tl & (subRL[24] >> 32);                    /* FL(kl5) */
+                tr = subRL[26] ^ rol32(dw, 1);
                 tt = (tr | ((u64)tl << 32));
 
                 SET_SUBKEY_LR(23, subRL[22] ^ tt);              /* round 18 */
@@ -981,8 +981,8 @@ static void camellia_setup_tail(u64 *subkey, u64 *subRL, int max)
                 SET_SUBKEY_LR(25, subRL[25]);                   /* FLinv(kl6) */
 
                 tl = (subRL[23] >> 32) ^ (subRL[23] & ~subRL[25]);
-                dw = tl & (subRL[25] >> 32),                    /* FLinv(kl6) */
-                        tr = subRL[23] ^ rol32(dw, 1);
+                dw = tl & (subRL[25] >> 32);                    /* FLinv(kl6) */
+                tr = subRL[23] ^ rol32(dw, 1);
                 tt = (tr | ((u64)tl << 32));
 
                 SET_SUBKEY_LR(26, subRL[27] ^ tt);              /* round 19 */
diff --git a/arch/x86/crypto/crct10dif-pcl-asm_64.S b/arch/x86/crypto/crct10dif-pcl-asm_64.S
new file mode 100644
index 000000000000..35e97569d05f
--- /dev/null
+++ b/arch/x86/crypto/crct10dif-pcl-asm_64.S
@@ -0,0 +1,643 @@
+########################################################################
+# Implement fast CRC-T10DIF computation with SSE and PCLMULQDQ instructions
+#
+# Copyright (c) 2013, Intel Corporation
+#
+# Authors:
+#     Erdinc Ozturk <erdinc.ozturk@intel.com>
+#     Vinodh Gopal <vinodh.gopal@intel.com>
+#     James Guilford <james.guilford@intel.com>
+#     Tim Chen <tim.c.chen@linux.intel.com>
+#
+# This software is available to you under a choice of one of two
+# licenses.  You may choose to be licensed under the terms of the GNU
+# General Public License (GPL) Version 2, available from the file
+# COPYING in the main directory of this source tree, or the
+# OpenIB.org BSD license below:
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+#   notice, this list of conditions and the following disclaimer.
+#
+# * Redistributions in binary form must reproduce the above copyright
+#   notice, this list of conditions and the following disclaimer in the
+#   documentation and/or other materials provided with the
+#   distribution.
+#
+# * Neither the name of the Intel Corporation nor the names of its
+#   contributors may be used to endorse or promote products derived from
+#   this software without specific prior written permission.
+#
+#
+# THIS SOFTWARE IS PROVIDED BY INTEL CORPORATION ""AS IS"" AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL CORPORATION OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+########################################################################
+#       Function API:
+#       UINT16 crc_t10dif_pcl(
+#               UINT16 init_crc, //initial CRC value, 16 bits
+#               const unsigned char *buf, //buffer pointer to calculate CRC on
+#               UINT64 len //buffer length in bytes (64-bit data)
+#       );
+#
+#       Reference paper titled "Fast CRC Computation for Generic
+#       Polynomials Using PCLMULQDQ Instruction"
+#       URL: http://www.intel.com/content/dam/www/public/us/en/documents
+#  /white-papers/fast-crc-computation-generic-polynomials-pclmulqdq-paper.pdf
+#
+#
+
+#include <linux/linkage.h>
+
+.text
+
+#define        arg1 %rdi
+#define        arg2 %rsi
+#define        arg3 %rdx
+
+#define        arg1_low32 %edi
+
+ENTRY(crc_t10dif_pcl)
+.align 16
+
+        # adjust the 16-bit initial_crc value, scale it to 32 bits
+        shl     $16, arg1_low32
+
+        # Allocate Stack Space
+        mov     %rsp, %rcx
+        sub     $16*2, %rsp
+        # align stack to 16 byte boundary
+        and     $~(0x10 - 1), %rsp
+
+        # check if smaller than 256
+        cmp     $256, arg3
+
+        # for sizes less than 128, we can't fold 64B at a time...
+        jl      _less_than_128
+
+
+        # load the initial crc value
+        movd    arg1_low32, %xmm10      # initial crc
+
+        # crc value does not need to be byte-reflected, but it needs
+        # to be moved to the high part of the register.
+        # because data will be byte-reflected and will align with
+        # initial crc at correct place.
+        pslldq  $12, %xmm10
+
+        movdqa  SHUF_MASK(%rip), %xmm11
+        # receive the initial 64B data, xor the initial crc value
+        movdqu  16*0(arg2), %xmm0
+        movdqu  16*1(arg2), %xmm1
+        movdqu  16*2(arg2), %xmm2
+        movdqu  16*3(arg2), %xmm3
+        movdqu  16*4(arg2), %xmm4
+        movdqu  16*5(arg2), %xmm5
+        movdqu  16*6(arg2), %xmm6
+        movdqu  16*7(arg2), %xmm7
+
+        pshufb  %xmm11, %xmm0
+        # XOR the initial_crc value
+        pxor    %xmm10, %xmm0
+        pshufb  %xmm11, %xmm1
+        pshufb  %xmm11, %xmm2
+        pshufb  %xmm11, %xmm3
+        pshufb  %xmm11, %xmm4
+        pshufb  %xmm11, %xmm5
+        pshufb  %xmm11, %xmm6
+        pshufb  %xmm11, %xmm7
+
+        movdqa  rk3(%rip), %xmm10       #xmm10 has rk3 and rk4
+                                        #imm value of pclmulqdq instruction
+                                        #will determine which constant to use
+
+        #################################################################
+        # we subtract 256 instead of 128 to save one instruction from the loop
+        sub     $256, arg3
+
+        # at this section of the code, there is 64*x+y (0<=y<64) bytes of
+        # buffer. The _fold_64_B_loop will fold 64B at a time
+        # until we have 64+y Bytes of buffer
+
+
+        # fold 64B at a time. This section of the code folds 4 xmm
+        # registers in parallel
+_fold_64_B_loop:
+
+        # update the buffer pointer
+        add     $128, arg2              #    buf += 64#
+
+        movdqu  16*0(arg2), %xmm9
+        movdqu  16*1(arg2), %xmm12
+        pshufb  %xmm11, %xmm9
+        pshufb  %xmm11, %xmm12
+        movdqa  %xmm0, %xmm8
+        movdqa  %xmm1, %xmm13
+        pclmulqdq       $0x0 , %xmm10, %xmm0
+        pclmulqdq       $0x11, %xmm10, %xmm8
+        pclmulqdq       $0x0 , %xmm10, %xmm1
+        pclmulqdq       $0x11, %xmm10, %xmm13
+        pxor    %xmm9 , %xmm0
+        xorps   %xmm8 , %xmm0
+        pxor    %xmm12, %xmm1
+        xorps   %xmm13, %xmm1
+
+        movdqu  16*2(arg2), %xmm9
+        movdqu  16*3(arg2), %xmm12
+        pshufb  %xmm11, %xmm9
+        pshufb  %xmm11, %xmm12
+        movdqa  %xmm2, %xmm8
+        movdqa  %xmm3, %xmm13
+        pclmulqdq       $0x0, %xmm10, %xmm2
+        pclmulqdq       $0x11, %xmm10, %xmm8
+        pclmulqdq       $0x0, %xmm10, %xmm3
+        pclmulqdq       $0x11, %xmm10, %xmm13
+        pxor    %xmm9 , %xmm2
+        xorps   %xmm8 , %xmm2
+        pxor    %xmm12, %xmm3
+        xorps   %xmm13, %xmm3
+
+        movdqu  16*4(arg2), %xmm9
+        movdqu  16*5(arg2), %xmm12
+        pshufb  %xmm11, %xmm9
+        pshufb  %xmm11, %xmm12
+        movdqa  %xmm4, %xmm8
+        movdqa  %xmm5, %xmm13
+        pclmulqdq       $0x0,  %xmm10, %xmm4
+        pclmulqdq       $0x11, %xmm10, %xmm8
+        pclmulqdq       $0x0,  %xmm10, %xmm5
+        pclmulqdq       $0x11, %xmm10, %xmm13
+        pxor    %xmm9 ,  %xmm4
+        xorps   %xmm8 ,  %xmm4
+        pxor    %xmm12,  %xmm5
+        xorps   %xmm13,  %xmm5
+
+        movdqu  16*6(arg2), %xmm9
+        movdqu  16*7(arg2), %xmm12
+        pshufb  %xmm11, %xmm9
+        pshufb  %xmm11, %xmm12
+        movdqa  %xmm6 , %xmm8
+        movdqa  %xmm7 , %xmm13
+        pclmulqdq       $0x0 , %xmm10, %xmm6
+        pclmulqdq       $0x11, %xmm10, %xmm8
+        pclmulqdq       $0x0 , %xmm10, %xmm7
+        pclmulqdq       $0x11, %xmm10, %xmm13
+        pxor    %xmm9 , %xmm6
+        xorps   %xmm8 , %xmm6
+        pxor    %xmm12, %xmm7
+        xorps   %xmm13, %xmm7
+
+        sub     $128, arg3
+
+        # check if there is another 64B in the buffer to be able to fold
+        jge     _fold_64_B_loop
+        ##################################################################
+
+
+        add     $128, arg2
+        # at this point, the buffer pointer is pointing at the last y Bytes
+        # of the buffer the 64B of folded data is in 4 of the xmm
+        # registers: xmm0, xmm1, xmm2, xmm3
+
+
+        # fold the 8 xmm registers to 1 xmm register with different constants
+
+        movdqa  rk9(%rip), %xmm10
+        movdqa  %xmm0, %xmm8
+        pclmulqdq       $0x11, %xmm10, %xmm0
+        pclmulqdq       $0x0 , %xmm10, %xmm8
+        pxor    %xmm8, %xmm7
+        xorps   %xmm0, %xmm7
+
+        movdqa  rk11(%rip), %xmm10
+        movdqa  %xmm1, %xmm8
+        pclmulqdq        $0x11, %xmm10, %xmm1
+        pclmulqdq        $0x0 , %xmm10, %xmm8
+        pxor    %xmm8, %xmm7
+        xorps   %xmm1, %xmm7
+
+        movdqa  rk13(%rip), %xmm10
+        movdqa  %xmm2, %xmm8
+        pclmulqdq        $0x11, %xmm10, %xmm2
+        pclmulqdq        $0x0 , %xmm10, %xmm8
+        pxor    %xmm8, %xmm7
+        pxor    %xmm2, %xmm7
+
+        movdqa  rk15(%rip), %xmm10
+        movdqa  %xmm3, %xmm8
+        pclmulqdq       $0x11, %xmm10, %xmm3
+        pclmulqdq       $0x0 , %xmm10, %xmm8
+        pxor    %xmm8, %xmm7
+        xorps   %xmm3, %xmm7
+
+        movdqa  rk17(%rip), %xmm10
+        movdqa  %xmm4, %xmm8
+        pclmulqdq       $0x11, %xmm10, %xmm4
+        pclmulqdq       $0x0 , %xmm10, %xmm8
+        pxor    %xmm8, %xmm7
+        pxor    %xmm4, %xmm7
+
+        movdqa  rk19(%rip), %xmm10
+        movdqa  %xmm5, %xmm8
+        pclmulqdq       $0x11, %xmm10, %xmm5
+        pclmulqdq       $0x0 , %xmm10, %xmm8
+        pxor    %xmm8, %xmm7
+        xorps   %xmm5, %xmm7
+
+        movdqa  rk1(%rip), %xmm10       #xmm10 has rk1 and rk2
+                                        #imm value of pclmulqdq instruction
+                                        #will determine which constant to use
+        movdqa  %xmm6, %xmm8
+        pclmulqdq       $0x11, %xmm10, %xmm6
+        pclmulqdq       $0x0 , %xmm10, %xmm8
+        pxor    %xmm8, %xmm7
+        pxor    %xmm6, %xmm7
+
+
+        # instead of 64, we add 48 to the loop counter to save 1 instruction
+        # from the loop instead of a cmp instruction, we use the negative
+        # flag with the jl instruction
+        add     $128-16, arg3
+        jl      _final_reduction_for_128
+
+        # now we have 16+y bytes left to reduce. 16 Bytes is in register xmm7
+        # and the rest is in memory. We can fold 16 bytes at a time if y>=16
+        # continue folding 16B at a time
+
+_16B_reduction_loop:
+        movdqa  %xmm7, %xmm8
+        pclmulqdq       $0x11, %xmm10, %xmm7
+        pclmulqdq       $0x0 , %xmm10, %xmm8
+        pxor    %xmm8, %xmm7
+        movdqu  (arg2), %xmm0
+        pshufb  %xmm11, %xmm0
+        pxor    %xmm0 , %xmm7
+        add     $16, arg2
+        sub     $16, arg3
+        # instead of a cmp instruction, we utilize the flags with the
+        # jge instruction equivalent of: cmp arg3, 16-16
+        # check if there is any more 16B in the buffer to be able to fold
+        jge     _16B_reduction_loop
+
+        #now we have 16+z bytes left to reduce, where 0<= z < 16.
+        #first, we reduce the data in the xmm7 register
+
+
+_final_reduction_for_128:
+        # check if any more data to fold. If not, compute the CRC of
+        # the final 128 bits
+        add     $16, arg3
+        je      _128_done
+
+        # here we are getting data that is less than 16 bytes.
+        # since we know that there was data before the pointer, we can
+        # offset the input pointer before the actual point, to receive
+        # exactly 16 bytes. after that the registers need to be adjusted.
+_get_last_two_xmms:
+        movdqa  %xmm7, %xmm2
+
+        movdqu  -16(arg2, arg3), %xmm1
+        pshufb  %xmm11, %xmm1
+
+        # get rid of the extra data that was loaded before
+        # load the shift constant
+        lea     pshufb_shf_table+16(%rip), %rax
+        sub     arg3, %rax
+        movdqu  (%rax), %xmm0
+
+        # shift xmm2 to the left by arg3 bytes
+        pshufb  %xmm0, %xmm2
+
+        # shift xmm7 to the right by 16-arg3 bytes
+        pxor    mask1(%rip), %xmm0
+        pshufb  %xmm0, %xmm7
+        pblendvb        %xmm2, %xmm1    #xmm0 is implicit
+
+        # fold 16 Bytes
+        movdqa  %xmm1, %xmm2
+        movdqa  %xmm7, %xmm8
+        pclmulqdq       $0x11, %xmm10, %xmm7
+        pclmulqdq       $0x0 , %xmm10, %xmm8
+        pxor    %xmm8, %xmm7
+        pxor    %xmm2, %xmm7
+
+_128_done:
+        # compute crc of a 128-bit value
+        movdqa  rk5(%rip), %xmm10       # rk5 and rk6 in xmm10
+        movdqa  %xmm7, %xmm0
+
+        #64b fold
+        pclmulqdq       $0x1, %xmm10, %xmm7
+        pslldq  $8   ,  %xmm0
+        pxor    %xmm0,  %xmm7
+
+        #32b fold
+        movdqa  %xmm7, %xmm0
+
+        pand    mask2(%rip), %xmm0
+
+        psrldq  $12, %xmm7
+        pclmulqdq       $0x10, %xmm10, %xmm7
+        pxor    %xmm0, %xmm7
+
+        #barrett reduction
+_barrett:
+        movdqa  rk7(%rip), %xmm10       # rk7 and rk8 in xmm10
+        movdqa  %xmm7, %xmm0
+        pclmulqdq       $0x01, %xmm10, %xmm7
+        pslldq  $4, %xmm7
+        pclmulqdq       $0x11, %xmm10, %xmm7
+
+        pslldq  $4, %xmm7
+        pxor    %xmm0, %xmm7
+        pextrd  $1, %xmm7, %eax
+
+_cleanup:
+        # scale the result back to 16 bits
+        shr     $16, %eax
+        mov     %rcx, %rsp
+        ret
+
+########################################################################
+
+.align 16
+_less_than_128:
+
+        # check if there is enough buffer to be able to fold 16B at a time
+        cmp     $32, arg3
+        jl      _less_than_32
+        movdqa  SHUF_MASK(%rip), %xmm11
+
+        # now if there is, load the constants
+        movdqa  rk1(%rip), %xmm10       # rk1 and rk2 in xmm10
+
+        movd    arg1_low32, %xmm0       # get the initial crc value
+        pslldq  $12, %xmm0      # align it to its correct place
+        movdqu  (arg2), %xmm7   # load the plaintext
+        pshufb  %xmm11, %xmm7   # byte-reflect the plaintext
+        pxor    %xmm0, %xmm7
+
+
+        # update the buffer pointer
+        add     $16, arg2
+
+        # update the counter. subtract 32 instead of 16 to save one
+        # instruction from the loop
+        sub     $32, arg3
+
+        jmp     _16B_reduction_loop
+
+
+.align 16
+_less_than_32:
+        # mov initial crc to the return value. this is necessary for
+        # zero-length buffers.
+        mov     arg1_low32, %eax
+        test    arg3, arg3
+        je      _cleanup
+
+        movdqa  SHUF_MASK(%rip), %xmm11
+
+        movd    arg1_low32, %xmm0       # get the initial crc value
+        pslldq  $12, %xmm0      # align it to its correct place
+
+        cmp     $16, arg3
+        je      _exact_16_left
+        jl      _less_than_16_left
+
+        movdqu  (arg2), %xmm7   # load the plaintext
+        pshufb  %xmm11, %xmm7   # byte-reflect the plaintext
+        pxor    %xmm0 , %xmm7   # xor the initial crc value
+        add     $16, arg2
+        sub     $16, arg3
+        movdqa  rk1(%rip), %xmm10       # rk1 and rk2 in xmm10
+        jmp     _get_last_two_xmms
+
+
+.align 16
+_less_than_16_left:
+        # use stack space to load data less than 16 bytes, zero-out
+        # the 16B in memory first.
+
+        pxor    %xmm1, %xmm1
+        mov     %rsp, %r11
+        movdqa  %xmm1, (%r11)
+
+        cmp     $4, arg3
+        jl      _only_less_than_4
+
+        # backup the counter value
+        mov     arg3, %r9
+        cmp     $8, arg3
+        jl      _less_than_8_left
+
+        # load 8 Bytes
+        mov     (arg2), %rax
+        mov     %rax, (%r11)
+        add     $8, %r11
+        sub     $8, arg3
+        add     $8, arg2
+_less_than_8_left:
+
+        cmp     $4, arg3
+        jl      _less_than_4_left
+
+        # load 4 Bytes
+        mov     (arg2), %eax
+        mov     %eax, (%r11)
+        add     $4, %r11
+        sub     $4, arg3
+        add     $4, arg2
+_less_than_4_left:
+
+        cmp     $2, arg3
+        jl      _less_than_2_left
+
+        # load 2 Bytes
+        mov     (arg2), %ax
+        mov     %ax, (%r11)
+        add     $2, %r11
+        sub     $2, arg3
+        add     $2, arg2
+_less_than_2_left:
+        cmp     $1, arg3
+        jl      _zero_left
+
+        # load 1 Byte
+        mov     (arg2), %al
+        mov     %al, (%r11)
+_zero_left:
+        movdqa  (%rsp), %xmm7
+        pshufb  %xmm11, %xmm7
+        pxor    %xmm0 , %xmm7   # xor the initial crc value
+
+        # shl r9, 4
+        lea     pshufb_shf_table+16(%rip), %rax
+        sub     %r9, %rax
+        movdqu  (%rax), %xmm0
+        pxor    mask1(%rip), %xmm0
+
+        pshufb  %xmm0, %xmm7
+        jmp     _128_done
+
+.align 16
+_exact_16_left:
+        movdqu  (arg2), %xmm7
+        pshufb  %xmm11, %xmm7
+        pxor    %xmm0 , %xmm7   # xor the initial crc value
+
+        jmp     _128_done
+
+_only_less_than_4:
+        cmp     $3, arg3
+        jl      _only_less_than_3
+
+        # load 3 Bytes
+        mov     (arg2), %al
+        mov     %al, (%r11)
+
+        mov     1(arg2), %al
+        mov     %al, 1(%r11)
+
+        mov     2(arg2), %al
+        mov     %al, 2(%r11)
+
+        movdqa   (%rsp), %xmm7
+        pshufb   %xmm11, %xmm7
+        pxor     %xmm0 , %xmm7  # xor the initial crc value
+
+        psrldq  $5, %xmm7
+
+        jmp     _barrett
+_only_less_than_3:
+        cmp     $2, arg3
+        jl      _only_less_than_2
+
+        # load 2 Bytes
+        mov     (arg2), %al
+        mov     %al, (%r11)
+
+        mov     1(arg2), %al
+        mov     %al, 1(%r11)
+
+        movdqa  (%rsp), %xmm7
+        pshufb  %xmm11, %xmm7
+        pxor    %xmm0 , %xmm7   # xor the initial crc value
+
+        psrldq  $6, %xmm7
+
+        jmp     _barrett
+_only_less_than_2:
+
+        # load 1 Byte
+        mov     (arg2), %al
+        mov     %al, (%r11)
+
+        movdqa  (%rsp), %xmm7
+        pshufb  %xmm11, %xmm7
+        pxor    %xmm0 , %xmm7   # xor the initial crc value
+
+        psrldq  $7, %xmm7
+
+        jmp     _barrett
+
+ENDPROC(crc_t10dif_pcl)
+
+.data
+
+# precomputed constants
+# these constants are precomputed from the poly:
+# 0x8bb70000 (0x8bb7 scaled to 32 bits)
+.align 16
+# Q = 0x18BB70000
+# rk1 = 2^(32*3) mod Q << 32
+# rk2 = 2^(32*5) mod Q << 32
+# rk3 = 2^(32*15) mod Q << 32
+# rk4 = 2^(32*17) mod Q << 32
+# rk5 = 2^(32*3) mod Q << 32
+# rk6 = 2^(32*2) mod Q << 32
+# rk7 = floor(2^64/Q)
+# rk8 = Q
+rk1:
+.quad 0x2d56000000000000
+rk2:
+.quad 0x06df000000000000
+rk3:
+.quad 0x9d9d000000000000
+rk4:
+.quad 0x7cf5000000000000
+rk5:
+.quad 0x2d56000000000000
+rk6:
+.quad 0x1368000000000000
+rk7:
+.quad 0x00000001f65a57f8
+rk8:
+.quad 0x000000018bb70000
+
+rk9:
+.quad 0xceae000000000000
+rk10:
+.quad 0xbfd6000000000000
+rk11:
+.quad 0x1e16000000000000
+rk12:
+.quad 0x713c000000000000
+rk13:
+.quad 0xf7f9000000000000
+rk14:
+.quad 0x80a6000000000000
+rk15:
+.quad 0x044c000000000000
+rk16:
+.quad 0xe658000000000000
+rk17:
+.quad 0xad18000000000000
+rk18:
+.quad 0xa497000000000000
+rk19:
+.quad 0x6ee3000000000000
+rk20:
+.quad 0xe7b5000000000000
+
+
+
+mask1:
+.octa 0x80808080808080808080808080808080
+mask2:
+.octa 0x00000000FFFFFFFFFFFFFFFFFFFFFFFF
+
+SHUF_MASK:
+.octa 0x000102030405060708090A0B0C0D0E0F
+
+pshufb_shf_table:
+# use these values for shift constants for the pshufb instruction
+# different alignments result in values as shown:
+#       DDQ 0x008f8e8d8c8b8a898887868584838281 # shl 15 (16-1) / shr1
+#       DDQ 0x01008f8e8d8c8b8a8988878685848382 # shl 14 (16-3) / shr2
+#       DDQ 0x0201008f8e8d8c8b8a89888786858483 # shl 13 (16-4) / shr3
+#       DDQ 0x030201008f8e8d8c8b8a898887868584 # shl 12 (16-4) / shr4
+#       DDQ 0x04030201008f8e8d8c8b8a8988878685 # shl 11 (16-5) / shr5
+#       DDQ 0x0504030201008f8e8d8c8b8a89888786 # shl 10 (16-6) / shr6
+#       DDQ 0x060504030201008f8e8d8c8b8a898887 # shl 9  (16-7) / shr7
+#       DDQ 0x07060504030201008f8e8d8c8b8a8988 # shl 8  (16-8) / shr8
+#       DDQ 0x0807060504030201008f8e8d8c8b8a89 # shl 7  (16-9) / shr9
+#       DDQ 0x090807060504030201008f8e8d8c8b8a # shl 6  (16-10) / shr10
+#       DDQ 0x0a090807060504030201008f8e8d8c8b # shl 5  (16-11) / shr11
+#       DDQ 0x0b0a090807060504030201008f8e8d8c # shl 4  (16-12) / shr12
+#       DDQ 0x0c0b0a090807060504030201008f8e8d # shl 3  (16-13) / shr13
+#       DDQ 0x0d0c0b0a090807060504030201008f8e # shl 2  (16-14) / shr14
+#       DDQ 0x0e0d0c0b0a090807060504030201008f # shl 1  (16-15) / shr15
+.octa 0x8f8e8d8c8b8a89888786858483828100
+.octa 0x000e0d0c0b0a09080706050403020100
diff --git a/arch/x86/crypto/crct10dif-pclmul_glue.c b/arch/x86/crypto/crct10dif-pclmul_glue.c
new file mode 100644
index 000000000000..7845d7fd54c0
--- /dev/null
+++ b/arch/x86/crypto/crct10dif-pclmul_glue.c
@@ -0,0 +1,151 @@
+/*
+ * Cryptographic API.
+ *
+ * T10 Data Integrity Field CRC16 Crypto Transform using PCLMULQDQ Instructions
+ *
+ * Copyright (C) 2013 Intel Corporation
+ * Author: Tim Chen <tim.c.chen@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ *
+ */
+
+#include <linux/types.h>
+#include <linux/module.h>
+#include <linux/crc-t10dif.h>
+#include <crypto/internal/hash.h>
+#include <linux/init.h>
+#include <linux/string.h>
+#include <linux/kernel.h>
+#include <asm/i387.h>
+#include <asm/cpufeature.h>
+#include <asm/cpu_device_id.h>
+
+asmlinkage __u16 crc_t10dif_pcl(__u16 crc, const unsigned char *buf,
+                                size_t len);
+
+struct chksum_desc_ctx {
+        __u16 crc;
+};
+
+/*
+ * Steps through buffer one byte at at time, calculates reflected
+ * crc using table.
+ */
+
+static int chksum_init(struct shash_desc *desc)
+{
+        struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);
+
+        ctx->crc = 0;
+
+        return 0;
+}
+
+static int chksum_update(struct shash_desc *desc, const u8 *data,
+                         unsigned int length)
+{
+        struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);
+
+        if (irq_fpu_usable()) {
+                kernel_fpu_begin();
+                ctx->crc = crc_t10dif_pcl(ctx->crc, data, length);
+                kernel_fpu_end();
+        } else
+                ctx->crc = crc_t10dif_generic(ctx->crc, data, length);
+        return 0;
+}
+
+static int chksum_final(struct shash_desc *desc, u8 *out)
+{
+        struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);
+
+        *(__u16 *)out = ctx->crc;
+        return 0;
+}
+
+static int __chksum_finup(__u16 *crcp, const u8 *data, unsigned int len,
+                        u8 *out)
+{
+        if (irq_fpu_usable()) {
+                kernel_fpu_begin();
+                *(__u16 *)out = crc_t10dif_pcl(*crcp, data, len);
+                kernel_fpu_end();
+        } else
+                *(__u16 *)out = crc_t10dif_generic(*crcp, data, len);
+        return 0;
+}
+
+static int chksum_finup(struct shash_desc *desc, const u8 *data,
+                        unsigned int len, u8 *out)
+{
+        struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);
+
+        return __chksum_finup(&ctx->crc, data, len, out);
+}
+
+static int chksum_digest(struct shash_desc *desc, const u8 *data,
+                         unsigned int length, u8 *out)
+{
+        struct chksum_desc_ctx *ctx = shash_desc_ctx(desc);
+
+        return __chksum_finup(&ctx->crc, data, length, out);
+}
+
+static struct shash_alg alg = {
+        .digestsize             =       CRC_T10DIF_DIGEST_SIZE,
+        .init           =       chksum_init,
+        .update         =       chksum_update,
+        .final          =       chksum_final,
+        .finup          =       chksum_finup,
+        .digest         =       chksum_digest,
+        .descsize               =       sizeof(struct chksum_desc_ctx),
+        .base                   =       {
+                .cra_name               =       "crct10dif",
+                .cra_driver_name        =       "crct10dif-pclmul",
+                .cra_priority           =       200,
+                .cra_blocksize          =       CRC_T10DIF_BLOCK_SIZE,
+                .cra_module             =       THIS_MODULE,
+        }
+};
+
+static const struct x86_cpu_id crct10dif_cpu_id[] = {
+        X86_FEATURE_MATCH(X86_FEATURE_PCLMULQDQ),
+        {}
+};
+MODULE_DEVICE_TABLE(x86cpu, crct10dif_cpu_id);
+
+static int __init crct10dif_intel_mod_init(void)
+{
+        if (!x86_match_cpu(crct10dif_cpu_id))
+                return -ENODEV;
+
+        return crypto_register_shash(&alg);
+}
+
+static void __exit crct10dif_intel_mod_fini(void)
+{
+        crypto_unregister_shash(&alg);
+}
+
+module_init(crct10dif_intel_mod_init);
+module_exit(crct10dif_intel_mod_fini);
+
+MODULE_AUTHOR("Tim Chen <tim.c.chen@linux.intel.com>");
+MODULE_DESCRIPTION("T10 DIF CRC calculation accelerated with PCLMULQDQ.");
+MODULE_LICENSE("GPL");
+
+MODULE_ALIAS("crct10dif");
+MODULE_ALIAS("crct10dif-pclmul");
diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c
index bccfca68430e..665a730307f2 100644
--- a/arch/x86/ia32/ia32_signal.c
+++ b/arch/x86/ia32/ia32_signal.c
@@ -457,7 +457,7 @@ int ia32_setup_rt_frame(int sig, struct ksignal *ksig,
                 else
                         put_user_ex(0, &frame->uc.uc_flags);
                 put_user_ex(0, &frame->uc.uc_link);
-                err |= __compat_save_altstack(&frame->uc.uc_stack, regs->sp);
+                compat_save_altstack_ex(&frame->uc.uc_stack, regs->sp);
 
                 if (ksig->ka.sa.sa_flags & SA_RESTORER)
                         restorer = ksig->ka.sa.sa_restorer;
diff --git a/arch/x86/ia32/ia32entry.S b/arch/x86/ia32/ia32entry.S
index 474dc1b59f72..4299eb05023c 100644
--- a/arch/x86/ia32/ia32entry.S
+++ b/arch/x86/ia32/ia32entry.S
@@ -452,7 +452,7 @@ ia32_badsys:
 
         CFI_ENDPROC
         
-        .macro PTREGSCALL label, func, arg
+        .macro PTREGSCALL label, func
         ALIGN
 GLOBAL(\label)
         leaq \func(%rip),%rax
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h
index 2dfac58f3b11..b1977bad5435 100644
--- a/arch/x86/include/asm/acpi.h
+++ b/arch/x86/include/asm/acpi.h
@@ -86,6 +86,7 @@ extern int acpi_pci_disabled;
 extern int acpi_skip_timer_override;
 extern int acpi_use_timer_override;
 extern int acpi_fix_pin2_polarity;
+extern int acpi_disable_cmcff;
 
 extern u8 acpi_sci_flags;
 extern int acpi_sci_override_gsi;
@@ -168,6 +169,7 @@ static inline void arch_acpi_set_pdc_bits(u32 *buf)
 
 #define acpi_lapic 0
 #define acpi_ioapic 0
+#define acpi_disable_cmcff 0
 static inline void acpi_noirq_set(void) { }
 static inline void acpi_disable_pci(void) { }
 static inline void disable_acpi(void) { }
diff --git a/arch/x86/include/asm/alternative.h b/arch/x86/include/asm/alternative.h
index 58ed6d96a6ac..0a3f9c9f98d5 100644
--- a/arch/x86/include/asm/alternative.h
+++ b/arch/x86/include/asm/alternative.h
@@ -5,6 +5,7 @@
 #include <linux/stddef.h>
 #include <linux/stringify.h>
 #include <asm/asm.h>
+#include <asm/ptrace.h>
 
 /*
  * Alternative inline assembly for SMP.
@@ -220,20 +221,11 @@ extern void *text_poke_early(void *addr, const void *opcode, size_t len);
  * no thread can be preempted in the instructions being modified (no iret to an
  * invalid instruction possible) or if the instructions are changed from a
  * consistent state to another consistent state atomically.
- * More care must be taken when modifying code in the SMP case because of
- * Intel's errata. text_poke_smp() takes care that errata, but still
- * doesn't support NMI/MCE handler code modifying.
  * On the local CPU you need to be protected again NMI or MCE handlers seeing an
  * inconsistent instruction while you patch.
  */
-struct text_poke_param {
-        void *addr;
-        const void *opcode;
-        size_t len;
-};
-
 extern void *text_poke(void *addr, const void *opcode, size_t len);
-extern void *text_poke_smp(void *addr, const void *opcode, size_t len);
-extern void text_poke_smp_batch(struct text_poke_param *params, int n);
+extern int poke_int3_handler(struct pt_regs *regs);
+extern void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler);
 
 #endif /* _ASM_X86_ALTERNATIVE_H */
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index f8119b582c3c..1d2091a226bc 100644
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -715,4 +715,6 @@ static inline void exiting_ack_irq(void)
         ack_APIC_irq();
 }
 
+extern void ioapic_zap_locks(void);
+
 #endif /* _ASM_X86_APIC_H */
diff --git a/arch/x86/include/asm/asm.h b/arch/x86/include/asm/asm.h
index 1c2d247f65ce..4582e8e1cd1a 100644
--- a/arch/x86/include/asm/asm.h
+++ b/arch/x86/include/asm/asm.h
@@ -3,21 +3,25 @@
 
 #ifdef __ASSEMBLY__
 # define __ASM_FORM(x)  x
+# define __ASM_FORM_RAW(x)     x
 # define __ASM_FORM_COMMA(x) x,
 #else
 # define __ASM_FORM(x)  " " #x " "
+# define __ASM_FORM_RAW(x)     #x
 # define __ASM_FORM_COMMA(x) " " #x ","
 #endif
 
 #ifdef CONFIG_X86_32
 # define __ASM_SEL(a,b) __ASM_FORM(a)
+# define __ASM_SEL_RAW(a,b) __ASM_FORM_RAW(a)
 #else
 # define __ASM_SEL(a,b) __ASM_FORM(b)
+# define __ASM_SEL_RAW(a,b) __ASM_FORM_RAW(b)
 #endif
 
 #define __ASM_SIZE(inst, ...)   __ASM_SEL(inst##l##__VA_ARGS__, \
                                           inst##q##__VA_ARGS__)
-#define __ASM_REG(reg)          __ASM_SEL(e##reg, r##reg)
+#define __ASM_REG(reg)         __ASM_SEL_RAW(e##reg, r##reg)
 
 #define _ASM_PTR        __ASM_SEL(.long, .quad)
 #define _ASM_ALIGN      __ASM_SEL(.balign 4, .balign 8)
diff --git a/arch/x86/include/asm/bitops.h b/arch/x86/include/asm/bitops.h
index 6dfd0195bb55..41639ce8fd63 100644
--- a/arch/x86/include/asm/bitops.h
+++ b/arch/x86/include/asm/bitops.h
@@ -15,6 +15,14 @@
 #include <linux/compiler.h>
 #include <asm/alternative.h>
 
+#if BITS_PER_LONG == 32
+# define _BITOPS_LONG_SHIFT 5
+#elif BITS_PER_LONG == 64
+# define _BITOPS_LONG_SHIFT 6
+#else
+# error "Unexpected BITS_PER_LONG"
+#endif
+
 #define BIT_64(n)                       (U64_C(1) << (n))
 
 /*
@@ -59,7 +67,7 @@
  * restricted to acting on a single-word quantity.
  */
 static __always_inline void
-set_bit(unsigned int nr, volatile unsigned long *addr)
+set_bit(long nr, volatile unsigned long *addr)
 {
         if (IS_IMMEDIATE(nr)) {
                 asm volatile(LOCK_PREFIX "orb %1,%0"
@@ -81,7 +89,7 @@ set_bit(unsigned int nr, volatile unsigned long *addr)
  * If it's called on the same region of memory simultaneously, the effect
  * may be that only one operation succeeds.
  */
-static inline void __set_bit(int nr, volatile unsigned long *addr)
+static inline void __set_bit(long nr, volatile unsigned long *addr)
 {
         asm volatile("bts %1,%0" : ADDR : "Ir" (nr) : "memory");
 }
@@ -97,7 +105,7 @@ static inline void __set_bit(int nr, volatile unsigned long *addr)
  * in order to ensure changes are visible on other processors.
  */
 static __always_inline void
-clear_bit(int nr, volatile unsigned long *addr)
+clear_bit(long nr, volatile unsigned long *addr)
 {
         if (IS_IMMEDIATE(nr)) {
                 asm volatile(LOCK_PREFIX "andb %1,%0"
@@ -118,13 +126,13 @@ clear_bit(int nr, volatile unsigned long *addr)
  * clear_bit() is atomic and implies release semantics before the memory
  * operation. It can be used for an unlock.
  */
-static inline void clear_bit_unlock(unsigned nr, volatile unsigned long *addr)
+static inline void clear_bit_unlock(long nr, volatile unsigned long *addr)
 {
         barrier();
         clear_bit(nr, addr);
 }
 
-static inline void __clear_bit(int nr, volatile unsigned long *addr)
+static inline void __clear_bit(long nr, volatile unsigned long *addr)
 {
         asm volatile("btr %1,%0" : ADDR : "Ir" (nr));
 }
@@ -141,7 +149,7 @@ static inline void __clear_bit(int nr, volatile unsigned long *addr)
  * No memory barrier is required here, because x86 cannot reorder stores past
  * older loads. Same principle as spin_unlock.
  */
-static inline void __clear_bit_unlock(unsigned nr, volatile unsigned long *addr)
+static inline void __clear_bit_unlock(long nr, volatile unsigned long *addr)
 {
         barrier();
         __clear_bit(nr, addr);
@@ -159,7 +167,7 @@ static inline void __clear_bit_unlock(unsigned nr, volatile unsigned long *addr)
  * If it's called on the same region of memory simultaneously, the effect
  * may be that only one operation succeeds.
  */
-static inline void __change_bit(int nr, volatile unsigned long *addr)
+static inline void __change_bit(long nr, volatile unsigned long *addr)
 {
         asm volatile("btc %1,%0" : ADDR : "Ir" (nr));
 }
@@ -173,7 +181,7 @@ static inline void __change_bit(int nr, volatile unsigned long *addr)
  * Note that @nr may be almost arbitrarily large; this function is not
  * restricted to acting on a single-word quantity.
  */
-static inline void change_bit(int nr, volatile unsigned long *addr)
+static inline void change_bit(long nr, volatile unsigned long *addr)
 {
         if (IS_IMMEDIATE(nr)) {
                 asm volatile(LOCK_PREFIX "xorb %1,%0"
@@ -194,7 +202,7 @@ static inline void change_bit(int nr, volatile unsigned long *addr)
  * This operation is atomic and cannot be reordered.
  * It also implies a memory barrier.
  */
-static inline int test_and_set_bit(int nr, volatile unsigned long *addr)
+static inline int test_and_set_bit(long nr, volatile unsigned long *addr)
 {
         int oldbit;
 
@@ -212,7 +220,7 @@ static inline int test_and_set_bit(int nr, volatile unsigned long *addr)
  * This is the same as test_and_set_bit on x86.
  */
 static __always_inline int
-test_and_set_bit_lock(int nr, volatile unsigned long *addr)
+test_and_set_bit_lock(long nr, volatile unsigned long *addr)
 {
         return test_and_set_bit(nr, addr);
 }
@@ -226,7 +234,7 @@ test_and_set_bit_lock(int nr, volatile unsigned long *addr)
  * If two examples of this operation race, one can appear to succeed
  * but actually fail.  You must protect multiple accesses with a lock.
  */
-static inline int __test_and_set_bit(int nr, volatile unsigned long *addr)
+static inline int __test_and_set_bit(long nr, volatile unsigned long *addr)
 {
         int oldbit;
 
@@ -245,7 +253,7 @@ static inline int __test_and_set_bit(int nr, volatile unsigned long *addr)
  * This operation is atomic and cannot be reordered.
  * It also implies a memory barrier.
  */
-static inline int test_and_clear_bit(int nr, volatile unsigned long *addr)
+static inline int test_and_clear_bit(long nr, volatile unsigned long *addr)
 {
         int oldbit;
 
@@ -272,7 +280,7 @@ static inline int test_and_clear_bit(int nr, volatile unsigned long *addr)
  * accessed from a hypervisor on the same CPU if running in a VM: don't change
  * this without also updating arch/x86/kernel/kvm.c
  */
-static inline int __test_and_clear_bit(int nr, volatile unsigned long *addr)
+static inline int __test_and_clear_bit(long nr, volatile unsigned long *addr)
 {
         int oldbit;
 
@@ -284,7 +292,7 @@ static inline int __test_and_clear_bit(int nr, volatile unsigned long *addr)
 }
 
 /* WARNING: non atomic and it can be reordered! */
-static inline int __test_and_change_bit(int nr, volatile unsigned long *addr)
+static inline int __test_and_change_bit(long nr, volatile unsigned long *addr)
 {
         int oldbit;
 
@@ -304,7 +312,7 @@ static inline int __test_and_change_bit(int nr, volatile unsigned long *addr)
  * This operation is atomic and cannot be reordered.
  * It also implies a memory barrier.
  */
-static inline int test_and_change_bit(int nr, volatile unsigned long *addr)
+static inline int test_and_change_bit(long nr, volatile unsigned long *addr)
 {
         int oldbit;
 
@@ -315,13 +323,13 @@ static inline int test_and_change_bit(int nr, volatile unsigned long *addr)
         return oldbit;
 }
 
-static __always_inline int constant_test_bit(unsigned int nr, const volatile unsigned long *addr)
+static __always_inline int constant_test_bit(long nr, const volatile unsigned long *addr)
 {
-        return ((1UL << (nr % BITS_PER_LONG)) &
-                (addr[nr / BITS_PER_LONG])) != 0;
+        return ((1UL << (nr & (BITS_PER_LONG-1))) &
+                (addr[nr >> _BITOPS_LONG_SHIFT])) != 0;
 }
 
-static inline int variable_test_bit(int nr, volatile const unsigned long *addr)
+static inline int variable_test_bit(long nr, volatile const unsigned long *addr)
 {
         int oldbit;
 
diff --git a/arch/x86/include/asm/checksum_32.h b/arch/x86/include/asm/checksum_32.h
index 46fc474fd819..f50de6951738 100644
--- a/arch/x86/include/asm/checksum_32.h
+++ b/arch/x86/include/asm/checksum_32.h
@@ -49,9 +49,15 @@ static inline __wsum csum_partial_copy_from_user(const void __user *src,
                                                  int len, __wsum sum,
                                                  int *err_ptr)
 {
+        __wsum ret;
+
         might_sleep();
-        return csum_partial_copy_generic((__force void *)src, dst,
-                                         len, sum, err_ptr, NULL);
+        stac();
+        ret = csum_partial_copy_generic((__force void *)src, dst,
+                                        len, sum, err_ptr, NULL);
+        clac();
+
+        return ret;
 }
 
 /*
@@ -176,10 +182,16 @@ static inline __wsum csum_and_copy_to_user(const void *src,
                                            int len, __wsum sum,
                                            int *err_ptr)
 {
+        __wsum ret;
+
         might_sleep();
-        if (access_ok(VERIFY_WRITE, dst, len))
-                return csum_partial_copy_generic(src, (__force void *)dst,
-                                                 len, sum, NULL, err_ptr);
+        if (access_ok(VERIFY_WRITE, dst, len)) {
+                stac();
+                ret = csum_partial_copy_generic(src, (__force void *)dst,
+                                                len, sum, NULL, err_ptr);
+                clac();
+                return ret;
+        }
 
         if (len)
                 *err_ptr = -EFAULT;
diff --git a/arch/x86/include/asm/checksum_64.h b/arch/x86/include/asm/checksum_64.h
index 9bfdc41629ec..e6fd8a026c7b 100644
--- a/arch/x86/include/asm/checksum_64.h
+++ b/arch/x86/include/asm/checksum_64.h
@@ -133,7 +133,7 @@ extern __wsum csum_partial(const void *buff, int len, __wsum sum);
 
 
 /* Do not call this directly. Use the wrappers below */
-extern __wsum csum_partial_copy_generic(const void *src, const void *dst,
+extern __visible __wsum csum_partial_copy_generic(const void *src, const void *dst,
                                         int len, __wsum sum,
                                         int *src_err_ptr, int *dst_err_ptr);
 
diff --git a/arch/x86/include/asm/cpufeature.h b/arch/x86/include/asm/cpufeature.h
index 47538a61c91b..d3f5c63078d8 100644
--- a/arch/x86/include/asm/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
@@ -366,9 +366,10 @@ extern bool __static_cpu_has_safe(u16 bit);
  */
 static __always_inline __pure bool __static_cpu_has(u16 bit)
 {
-#if __GNUC__ > 4 || __GNUC_MINOR__ >= 5
+#ifdef CC_HAVE_ASM_GOTO
 
 #ifdef CONFIG_X86_DEBUG_STATIC_CPU_HAS
+
                 /*
                  * Catch too early usage of this before alternatives
                  * have run.
@@ -384,6 +385,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
                          ".previous\n"
                          /* skipping size check since replacement size = 0 */
                          : : "i" (X86_FEATURE_ALWAYS) : : t_warn);
+
 #endif
 
                 asm goto("1: jmp %l[t_no]\n"
@@ -406,7 +408,9 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
                 warn_pre_alternatives();
                 return false;
 #endif
-#else /* GCC_VERSION >= 40500 */
+
+#else /* CC_HAVE_ASM_GOTO */
+
                 u8 flag;
                 /* Open-coded due to __stringify() in ALTERNATIVE() */
                 asm volatile("1: movb $0,%0\n"
@@ -427,7 +431,8 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
                              ".previous\n"
                              : "=qm" (flag) : "i" (bit));
                 return flag;
-#endif
+
+#endif /* CC_HAVE_ASM_GOTO */
 }
 
 #define static_cpu_has(bit)                                     \
@@ -441,7 +446,7 @@ static __always_inline __pure bool __static_cpu_has(u16 bit)
 
 static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
 {
-#if __GNUC__ > 4 || __GNUC_MINOR__ >= 5
+#ifdef CC_HAVE_ASM_GOTO
 /*
  * We need to spell the jumps to the compiler because, depending on the offset,
  * the replacement jump can be bigger than the original jump, and this we cannot
@@ -475,7 +480,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
                 return false;
         t_dynamic:
                 return __static_cpu_has_safe(bit);
-#else /* GCC_VERSION >= 40500 */
+#else
                 u8 flag;
                 /* Open-coded due to __stringify() in ALTERNATIVE() */
                 asm volatile("1: movb $2,%0\n"
@@ -511,7 +516,7 @@ static __always_inline __pure bool _static_cpu_has_safe(u16 bit)
                              : "=qm" (flag)
                              : "i" (bit), "i" (X86_FEATURE_ALWAYS));
                 return (flag == 2 ? __static_cpu_has_safe(bit) : flag);
-#endif
+#endif /* CC_HAVE_ASM_GOTO */
 }
 
 #define static_cpu_has_safe(bit)                                \
diff --git a/arch/x86/include/asm/dma-contiguous.h b/arch/x86/include/asm/dma-contiguous.h
index c09241659971..b4b38bacb404 100644
--- a/arch/x86/include/asm/dma-contiguous.h
+++ b/arch/x86/include/asm/dma-contiguous.h
@@ -4,7 +4,6 @@
 #ifdef __KERNEL__
 
 #include <linux/types.h>
-#include <asm-generic/dma-contiguous.h>
 
 static inline void
 dma_contiguous_early_fixup(phys_addr_t base, unsigned long size) { }
diff --git a/arch/x86/include/asm/e820.h b/arch/x86/include/asm/e820.h
index cccd07fa5e3a..779c2efe2e97 100644
--- a/arch/x86/include/asm/e820.h
+++ b/arch/x86/include/asm/e820.h
@@ -29,7 +29,7 @@ extern void e820_setup_gap(void);
 extern int e820_search_gap(unsigned long *gapstart, unsigned long *gapsize,
                         unsigned long start_addr, unsigned long long end_addr);
 struct setup_data;
-extern void parse_e820_ext(struct setup_data *data);
+extern void parse_e820_ext(u64 phys_addr, u32 data_len);
 
 #if defined(CONFIG_X86_64) || \
         (defined(CONFIG_X86_32) && defined(CONFIG_HIBERNATION))
diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h
index e4ac559c4a24..92b3bae08b74 100644
--- a/arch/x86/include/asm/hw_irq.h
+++ b/arch/x86/include/asm/hw_irq.h
@@ -26,56 +26,56 @@
 #include <asm/sections.h>
 
 /* Interrupt handlers registered during init_IRQ */
-extern void apic_timer_interrupt(void);
-extern void x86_platform_ipi(void);
-extern void kvm_posted_intr_ipi(void);
-extern void error_interrupt(void);
-extern void irq_work_interrupt(void);
-
-extern void spurious_interrupt(void);
-extern void thermal_interrupt(void);
-extern void reschedule_interrupt(void);
-
-extern void invalidate_interrupt(void);
-extern void invalidate_interrupt0(void);
-extern void invalidate_interrupt1(void);
-extern void invalidate_interrupt2(void);
-extern void invalidate_interrupt3(void);
-extern void invalidate_interrupt4(void);
-extern void invalidate_interrupt5(void);
-extern void invalidate_interrupt6(void);
-extern void invalidate_interrupt7(void);
-extern void invalidate_interrupt8(void);
-extern void invalidate_interrupt9(void);
-extern void invalidate_interrupt10(void);
-extern void invalidate_interrupt11(void);
-extern void invalidate_interrupt12(void);
-extern void invalidate_interrupt13(void);
-extern void invalidate_interrupt14(void);
-extern void invalidate_interrupt15(void);
-extern void invalidate_interrupt16(void);
-extern void invalidate_interrupt17(void);
-extern void invalidate_interrupt18(void);
-extern void invalidate_interrupt19(void);
-extern void invalidate_interrupt20(void);
-extern void invalidate_interrupt21(void);
-extern void invalidate_interrupt22(void);
-extern void invalidate_interrupt23(void);
-extern void invalidate_interrupt24(void);
-extern void invalidate_interrupt25(void);
-extern void invalidate_interrupt26(void);
-extern void invalidate_interrupt27(void);
-extern void invalidate_interrupt28(void);
-extern void invalidate_interrupt29(void);
-extern void invalidate_interrupt30(void);
-extern void invalidate_interrupt31(void);
-
-extern void irq_move_cleanup_interrupt(void);
-extern void reboot_interrupt(void);
-extern void threshold_interrupt(void);
-
-extern void call_function_interrupt(void);
-extern void call_function_single_interrupt(void);
+extern asmlinkage void apic_timer_interrupt(void);
+extern asmlinkage void x86_platform_ipi(void);
+extern asmlinkage void kvm_posted_intr_ipi(void);
+extern asmlinkage void error_interrupt(void);
+extern asmlinkage void irq_work_interrupt(void);
+
+extern asmlinkage void spurious_interrupt(void);
+extern asmlinkage void thermal_interrupt(void);
+extern asmlinkage void reschedule_interrupt(void);
+
+extern asmlinkage void invalidate_interrupt(void);
+extern asmlinkage void invalidate_interrupt0(void);
+extern asmlinkage void invalidate_interrupt1(void);
+extern asmlinkage void invalidate_interrupt2(void);
+extern asmlinkage void invalidate_interrupt3(void);
+extern asmlinkage void invalidate_interrupt4(void);
+extern asmlinkage void invalidate_interrupt5(void);
+extern asmlinkage void invalidate_interrupt6(void);
+extern asmlinkage void invalidate_interrupt7(void);
+extern asmlinkage void invalidate_interrupt8(void);
+extern asmlinkage void invalidate_interrupt9(void);
+extern asmlinkage void invalidate_interrupt10(void);
+extern asmlinkage void invalidate_interrupt11(void);
+extern asmlinkage void invalidate_interrupt12(void);
+extern asmlinkage void invalidate_interrupt13(void);
+extern asmlinkage void invalidate_interrupt14(void);
+extern asmlinkage void invalidate_interrupt15(void);
+extern asmlinkage void invalidate_interrupt16(void);
+extern asmlinkage void invalidate_interrupt17(void);
+extern asmlinkage void invalidate_interrupt18(void);
+extern asmlinkage void invalidate_interrupt19(void);
+extern asmlinkage void invalidate_interrupt20(void);
+extern asmlinkage void invalidate_interrupt21(void);
+extern asmlinkage void invalidate_interrupt22(void);
+extern asmlinkage void invalidate_interrupt23(void);
+extern asmlinkage void invalidate_interrupt24(void);
+extern asmlinkage void invalidate_interrupt25(void);
+extern asmlinkage void invalidate_interrupt26(void);
+extern asmlinkage void invalidate_interrupt27(void);
+extern asmlinkage void invalidate_interrupt28(void);
+extern asmlinkage void invalidate_interrupt29(void);
+extern asmlinkage void invalidate_interrupt30(void);
+extern asmlinkage void invalidate_interrupt31(void);
+
+extern asmlinkage void irq_move_cleanup_interrupt(void);
+extern asmlinkage void reboot_interrupt(void);
+extern asmlinkage void threshold_interrupt(void);
+
+extern asmlinkage void call_function_interrupt(void);
+extern asmlinkage void call_function_single_interrupt(void);
 
 #ifdef CONFIG_TRACING
 /* Interrupt handlers registered during init_IRQ */
@@ -172,22 +172,18 @@ extern atomic_t irq_mis_count;
 extern void eisa_set_level_irq(unsigned int irq);
 
 /* SMP */
-extern void smp_apic_timer_interrupt(struct pt_regs *);
-extern void smp_spurious_interrupt(struct pt_regs *);
-extern void smp_x86_platform_ipi(struct pt_regs *);
-extern void smp_error_interrupt(struct pt_regs *);
+extern __visible void smp_apic_timer_interrupt(struct pt_regs *);
+extern __visible void smp_spurious_interrupt(struct pt_regs *);
+extern __visible void smp_x86_platform_ipi(struct pt_regs *);
+extern __visible void smp_error_interrupt(struct pt_regs *);
 #ifdef CONFIG_X86_IO_APIC
 extern asmlinkage void smp_irq_move_cleanup_interrupt(void);
 #endif
 #ifdef CONFIG_SMP
-extern void smp_reschedule_interrupt(struct pt_regs *);
-extern void smp_call_function_interrupt(struct pt_regs *);
-extern void smp_call_function_single_interrupt(struct pt_regs *);
-#ifdef CONFIG_X86_32
-extern void smp_invalidate_interrupt(struct pt_regs *);
-#else
-extern asmlinkage void smp_invalidate_interrupt(struct pt_regs *);
-#endif
+extern __visible void smp_reschedule_interrupt(struct pt_regs *);
+extern __visible void smp_call_function_interrupt(struct pt_regs *);
+extern __visible void smp_call_function_single_interrupt(struct pt_regs *);
+extern __visible void smp_invalidate_interrupt(struct pt_regs *);
 #endif
 
 extern void (*__initconst interrupt[NR_VECTORS-FIRST_EXTERNAL_VECTOR])(void);
diff --git a/arch/x86/include/asm/hypervisor.h b/arch/x86/include/asm/hypervisor.h
index 2d4b5e6107cd..e42f758a0fbd 100644
--- a/arch/x86/include/asm/hypervisor.h
+++ b/arch/x86/include/asm/hypervisor.h
@@ -33,7 +33,7 @@ struct hypervisor_x86 {
         const char      *name;
 
         /* Detection routine */
-        bool            (*detect)(void);
+        uint32_t        (*detect)(void);
 
         /* Adjust CPU feature bits (run once per CPU) */
         void            (*set_cpu_features)(struct cpuinfo_x86 *);
diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h
index 57873beb3292..0ea10f27d613 100644
--- a/arch/x86/include/asm/irq.h
+++ b/arch/x86/include/asm/irq.h
@@ -33,7 +33,7 @@ extern void (*x86_platform_ipi_callback)(void);
 extern void native_init_IRQ(void);
 extern bool handle_irq(unsigned irq, struct pt_regs *regs);
 
-extern unsigned int do_IRQ(struct pt_regs *regs);
+extern __visible unsigned int do_IRQ(struct pt_regs *regs);
 
 /* Interrupt vector management */
 extern DECLARE_BITMAP(used_vectors, NR_VECTORS);
diff --git a/arch/x86/include/asm/jump_label.h b/arch/x86/include/asm/jump_label.h
index 3a16c1483b45..64507f35800c 100644
--- a/arch/x86/include/asm/jump_label.h
+++ b/arch/x86/include/asm/jump_label.h
@@ -3,18 +3,23 @@
 
 #ifdef __KERNEL__
 
+#include <linux/stringify.h>
 #include <linux/types.h>
 #include <asm/nops.h>
 #include <asm/asm.h>
 
 #define JUMP_LABEL_NOP_SIZE 5
 
-#define STATIC_KEY_INITIAL_NOP ".byte 0xe9 \n\t .long 0\n\t"
+#ifdef CONFIG_X86_64
+# define STATIC_KEY_INIT_NOP P6_NOP5_ATOMIC
+#else
+# define STATIC_KEY_INIT_NOP GENERIC_NOP5_ATOMIC
+#endif
 
 static __always_inline bool arch_static_branch(struct static_key *key)
 {
         asm goto("1:"
-                STATIC_KEY_INITIAL_NOP
+                ".byte " __stringify(STATIC_KEY_INIT_NOP) "\n\t"
                 ".pushsection __jump_table,  \"aw\" \n\t"
                 _ASM_ALIGN "\n\t"
                 _ASM_PTR "1b, %l[l_yes], %c0 \n\t"
diff --git a/arch/x86/include/asm/kprobes.h b/arch/x86/include/asm/kprobes.h
index 5a6d2873f80e..9454c167629f 100644
--- a/arch/x86/include/asm/kprobes.h
+++ b/arch/x86/include/asm/kprobes.h
@@ -49,10 +49,10 @@ typedef u8 kprobe_opcode_t;
 #define flush_insn_slot(p)      do { } while (0)
 
 /* optinsn template addresses */
-extern kprobe_opcode_t optprobe_template_entry;
-extern kprobe_opcode_t optprobe_template_val;
-extern kprobe_opcode_t optprobe_template_call;
-extern kprobe_opcode_t optprobe_template_end;
+extern __visible kprobe_opcode_t optprobe_template_entry;
+extern __visible kprobe_opcode_t optprobe_template_val;
+extern __visible kprobe_opcode_t optprobe_template_call;
+extern __visible kprobe_opcode_t optprobe_template_end;
 #define MAX_OPTIMIZED_LENGTH (MAX_INSN_SIZE + RELATIVE_ADDR_SIZE)
 #define MAX_OPTINSN_SIZE                                \
         (((unsigned long)&optprobe_template_end -       \
@@ -62,7 +62,7 @@ extern kprobe_opcode_t optprobe_template_end;
 extern const int kretprobe_blacklist_size;
 
 void arch_remove_kprobe(struct kprobe *p);
-void kretprobe_trampoline(void);
+asmlinkage void kretprobe_trampoline(void);
 
 /* Architecture specific copy of original instruction*/
 struct arch_specific_insn {
diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index f87f7fcefa0a..c76ff74a98f2 100644
--- a/arch/x86/include/asm/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
@@ -286,6 +286,7 @@ struct kvm_mmu {
         u64 *pae_root;
         u64 *lm_root;
         u64 rsvd_bits_mask[2][4];
+        u64 bad_mt_xwr;
 
         /*
          * Bitmap: bit set = last pte in walk
@@ -323,6 +324,7 @@ struct kvm_pmu {
         u64 global_ovf_ctrl;
         u64 counter_bitmask[2];
         u64 global_ctrl_mask;
+        u64 reserved_bits;
         u8 version;
         struct kvm_pmc gp_counters[INTEL_PMC_MAX_GENERIC];
         struct kvm_pmc fixed_counters[INTEL_PMC_MAX_FIXED];
@@ -511,6 +513,14 @@ struct kvm_vcpu_arch {
          * instruction.
          */
         bool write_fault_to_shadow_pgtable;
+
+        /* set at EPT violation at this point */
+        unsigned long exit_qualification;
+
+        /* pv related host specific info */
+        struct {
+                bool pv_unhalted;
+        } pv;
 };
 
 struct kvm_lpage_info {
@@ -802,8 +812,8 @@ extern u32  kvm_min_guest_tsc_khz;
 extern u32  kvm_max_guest_tsc_khz;
 
 enum emulation_result {
-        EMULATE_DONE,       /* no further processing */
-        EMULATE_DO_MMIO,      /* kvm_run filled with mmio request */
+        EMULATE_DONE,         /* no further processing */
+        EMULATE_USER_EXIT,    /* kvm_run ready for userspace exit */
         EMULATE_FAIL,         /* can't emulate this instruction */
 };
 
diff --git a/arch/x86/include/asm/kvm_para.h b/arch/x86/include/asm/kvm_para.h
index 427afcbf3d55..1df115909758 100644
--- a/arch/x86/include/asm/kvm_para.h
+++ b/arch/x86/include/asm/kvm_para.h
@@ -85,26 +85,20 @@ static inline long kvm_hypercall4(unsigned int nr, unsigned long p1,
         return ret;
 }
 
-static inline bool kvm_para_available(void)
+static inline uint32_t kvm_cpuid_base(void)
 {
-        unsigned int eax, ebx, ecx, edx;
-        char signature[13];
-
         if (boot_cpu_data.cpuid_level < 0)
-                return false;   /* So we don't blow up on old processors */
+                return 0;       /* So we don't blow up on old processors */
 
-        if (cpu_has_hypervisor) {
-                cpuid(KVM_CPUID_SIGNATURE, &eax, &ebx, &ecx, &edx);
-                memcpy(signature + 0, &ebx, 4);
-                memcpy(signature + 4, &ecx, 4);
-                memcpy(signature + 8, &edx, 4);
-                signature[12] = 0;
+        if (cpu_has_hypervisor)
+                return hypervisor_cpuid_base("KVMKVMKVM\0\0\0", 0);
 
-                if (strcmp(signature, "KVMKVMKVM") == 0)
-                        return true;
-        }
+        return 0;
+}
 
-        return false;
+static inline bool kvm_para_available(void)
+{
+        return kvm_cpuid_base() != 0;
 }
 
 static inline unsigned int kvm_arch_para_features(void)
diff --git a/arch/x86/include/asm/mce.h b/arch/x86/include/asm/mce.h
index 29e3093bbd21..cbe6b9e404ce 100644
--- a/arch/x86/include/asm/mce.h
+++ b/arch/x86/include/asm/mce.h
@@ -32,11 +32,20 @@
 #define MCI_STATUS_PCC   (1ULL<<57)  /* processor context corrupt */
 #define MCI_STATUS_S     (1ULL<<56)  /* Signaled machine check */
 #define MCI_STATUS_AR    (1ULL<<55)  /* Action required */
-#define MCACOD            0xffff     /* MCA Error Code */
+
+/*
+ * Note that the full MCACOD field of IA32_MCi_STATUS MSR is
+ * bits 15:0.  But bit 12 is the 'F' bit, defined for corrected
+ * errors to indicate that errors are being filtered by hardware.
+ * We should mask out bit 12 when looking for specific signatures
+ * of uncorrected errors - so the F bit is deliberately skipped
+ * in this #define.
+ */
+#define MCACOD            0xefff     /* MCA Error Code */
 
 /* Architecturally defined codes from SDM Vol. 3B Chapter 15 */
 #define MCACOD_SCRUB    0x00C0  /* 0xC0-0xCF Memory Scrubbing */
-#define MCACOD_SCRUBMSK 0xfff0
+#define MCACOD_SCRUBMSK 0xeff0  /* Skip bit 12 ('F' bit) */
 #define MCACOD_L3WB     0x017A  /* L3 Explicit Writeback */
 #define MCACOD_DATA     0x0134  /* Data Load */
 #define MCACOD_INSTR    0x0150  /* Instruction Fetch */
@@ -188,6 +197,9 @@ extern void register_mce_write_callback(ssize_t (*)(struct file *filp,
                                     const char __user *ubuf,
                                     size_t usize, loff_t *off));
 
+/* Disable CMCI/polling for MCA bank claimed by firmware */
+extern void mce_disable_bank(int bank);
+
 /*
  * Exception handler
  */
diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h
index cdbf36776106..be12c534fd59 100644
--- a/arch/x86/include/asm/mmu_context.h
+++ b/arch/x86/include/asm/mmu_context.h
@@ -45,22 +45,28 @@ static inline void switch_mm(struct mm_struct *prev, struct mm_struct *next,
                 /* Re-load page tables */
                 load_cr3(next->pgd);
 
-                /* stop flush ipis for the previous mm */
+                /* Stop flush ipis for the previous mm */
                 cpumask_clear_cpu(cpu, mm_cpumask(prev));
 
-                /*
-                 * load the LDT, if the LDT is different:
-                 */
+                /* Load the LDT, if the LDT is different: */
                 if (unlikely(prev->context.ldt != next->context.ldt))
                         load_LDT_nolock(&next->context);
         }
 #ifdef CONFIG_SMP
-        else {
+          else {
                 this_cpu_write(cpu_tlbstate.state, TLBSTATE_OK);
                 BUG_ON(this_cpu_read(cpu_tlbstate.active_mm) != next);
 
-                if (!cpumask_test_and_set_cpu(cpu, mm_cpumask(next))) {
-                        /* We were in lazy tlb mode and leave_mm disabled
+                if (!cpumask_test_cpu(cpu, mm_cpumask(next))) {
+                        /*
+                         * On established mms, the mm_cpumask is only changed
+                         * from irq context, from ptep_clear_flush() while in
+                         * lazy tlb mode, and here. Irqs are blocked during
+                         * schedule, protecting us from simultaneous changes.
+                         */
+                        cpumask_set_cpu(cpu, mm_cpumask(next));
+                        /*
+                         * We were in lazy tlb mode and leave_mm disabled
                          * tlb flush IPI delivery. We must reload CR3
                          * to make sure to use no freed page tables.
                          */
diff --git a/arch/x86/include/asm/mutex_64.h b/arch/x86/include/asm/mutex_64.h
index 2c543fff241b..e7e6751648ed 100644
--- a/arch/x86/include/asm/mutex_64.h
+++ b/arch/x86/include/asm/mutex_64.h
@@ -16,6 +16,20 @@
  *
  * Atomically decrements @v and calls <fail_fn> if the result is negative.
  */
+#ifdef CC_HAVE_ASM_GOTO
+static inline void __mutex_fastpath_lock(atomic_t *v,
+                                         void (*fail_fn)(atomic_t *))
+{
+        asm volatile goto(LOCK_PREFIX "   decl %0\n"
+                          "   jns %l[exit]\n"
+                          : : "m" (v->counter)
+                          : "memory", "cc"
+                          : exit);
+        fail_fn(v);
+exit:
+        return;
+}
+#else
 #define __mutex_fastpath_lock(v, fail_fn)                       \
 do {                                                            \
         unsigned long dummy;                                    \
@@ -32,6 +46,7 @@ do {								\
                      : "rax", "rsi", "rdx", "rcx",              \
                        "r8", "r9", "r10", "r11", "memory");     \
 } while (0)
+#endif
 
 /**
  *  __mutex_fastpath_lock_retval - try to take the lock by moving the count
@@ -56,6 +71,20 @@ static inline int __mutex_fastpath_lock_retval(atomic_t *count)
  *
  * Atomically increments @v and calls <fail_fn> if the result is nonpositive.
  */
+#ifdef CC_HAVE_ASM_GOTO
+static inline void __mutex_fastpath_unlock(atomic_t *v,
+                                           void (*fail_fn)(atomic_t *))
+{
+        asm volatile goto(LOCK_PREFIX "   incl %0\n"
+                          "   jg %l[exit]\n"
+                          : : "m" (v->counter)
+                          : "memory", "cc"
+                          : exit);
+        fail_fn(v);
+exit:
+        return;
+}
+#else
 #define __mutex_fastpath_unlock(v, fail_fn)                     \
 do {                                                            \
         unsigned long dummy;                                    \
@@ -72,6 +101,7 @@ do {								\
                      : "rax", "rsi", "rdx", "rcx",              \
                        "r8", "r9", "r10", "r11", "memory");     \
 } while (0)
+#endif
 
 #define __mutex_slowpath_needs_to_unlock()      1
 
diff --git a/arch/x86/include/asm/page_32_types.h b/arch/x86/include/asm/page_32_types.h
index ef17af013475..f48b17df4224 100644
--- a/arch/x86/include/asm/page_32_types.h
+++ b/arch/x86/include/asm/page_32_types.h
@@ -15,6 +15,8 @@
  */
 #define __PAGE_OFFSET           _AC(CONFIG_PAGE_OFFSET, UL)
 
+#define __START_KERNEL_map      __PAGE_OFFSET
+
 #define THREAD_SIZE_ORDER       1
 #define THREAD_SIZE             (PAGE_SIZE << THREAD_SIZE_ORDER)
 
diff --git a/arch/x86/include/asm/page_64_types.h b/arch/x86/include/asm/page_64_types.h
index 6c896fbe21db..43dcd804ebd5 100644
--- a/arch/x86/include/asm/page_64_types.h
+++ b/arch/x86/include/asm/page_64_types.h
@@ -32,11 +32,6 @@
  */
 #define __PAGE_OFFSET           _AC(0xffff880000000000, UL)
 
-#define __PHYSICAL_START        ((CONFIG_PHYSICAL_START +               \
-                                  (CONFIG_PHYSICAL_ALIGN - 1)) &        \
-                                 ~(CONFIG_PHYSICAL_ALIGN - 1))
-
-#define __START_KERNEL          (__START_KERNEL_map + __PHYSICAL_START)
 #define __START_KERNEL_map      _AC(0xffffffff80000000, UL)
 
 /* See Documentation/x86/x86_64/mm.txt for a description of the memory map. */
diff --git a/arch/x86/include/asm/page_types.h b/arch/x86/include/asm/page_types.h
index 54c97879195e..f97fbe3abb67 100644
--- a/arch/x86/include/asm/page_types.h
+++ b/arch/x86/include/asm/page_types.h
@@ -33,6 +33,11 @@
         (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \
          VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
 
+#define __PHYSICAL_START        ALIGN(CONFIG_PHYSICAL_START, \
+                                      CONFIG_PHYSICAL_ALIGN)
+
+#define __START_KERNEL          (__START_KERNEL_map + __PHYSICAL_START)
+
 #ifdef CONFIG_X86_64
 #include <asm/page_64_types.h>
 #else
diff --git a/arch/x86/include/asm/paravirt_types.h b/arch/x86/include/asm/paravirt_types.h
index 04ac40e192eb..aab8f671b523 100644
--- a/arch/x86/include/asm/paravirt_types.h
+++ b/arch/x86/include/asm/paravirt_types.h
@@ -389,7 +389,8 @@ extern struct pv_lock_ops pv_lock_ops;
 
 /* Simple instruction patching code. */
 #define DEF_NATIVE(ops, name, code)                                     \
-        extern const char start_##ops##_##name[], end_##ops##_##name[]; \
+        extern const char start_##ops##_##name[] __visible,             \
+                          end_##ops##_##name[] __visible;               \
         asm("start_" #ops "_" #name ": " code "; end_" #ops "_" #name ":")
 
 unsigned paravirt_patch_nop(void);
diff --git a/arch/x86/include/asm/pci.h b/arch/x86/include/asm/pci.h
index d9e9e6c7ed32..7d7443283a9d 100644
--- a/arch/x86/include/asm/pci.h
+++ b/arch/x86/include/asm/pci.h
@@ -100,29 +100,6 @@ static inline void early_quirks(void) { }
 extern void pci_iommu_alloc(void);
 
 #ifdef CONFIG_PCI_MSI
-/* MSI arch specific hooks */
-static inline int x86_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
-{
-        return x86_msi.setup_msi_irqs(dev, nvec, type);
-}
-
-static inline void x86_teardown_msi_irqs(struct pci_dev *dev)
-{
-        x86_msi.teardown_msi_irqs(dev);
-}
-
-static inline void x86_teardown_msi_irq(unsigned int irq)
-{
-        x86_msi.teardown_msi_irq(irq);
-}
-static inline void x86_restore_msi_irqs(struct pci_dev *dev, int irq)
-{
-        x86_msi.restore_msi_irqs(dev, irq);
-}
-#define arch_setup_msi_irqs x86_setup_msi_irqs
-#define arch_teardown_msi_irqs x86_teardown_msi_irqs
-#define arch_teardown_msi_irq x86_teardown_msi_irq
-#define arch_restore_msi_irqs x86_restore_msi_irqs
 /* implemented in arch/x86/kernel/apic/io_apic. */
 struct msi_desc;
 int native_setup_msi_irqs(struct pci_dev *dev, int nvec, int type);
@@ -130,16 +107,9 @@ void native_teardown_msi_irq(unsigned int irq);
 void native_restore_msi_irqs(struct pci_dev *dev, int irq);
 int setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc,
                   unsigned int irq_base, unsigned int irq_offset);
-/* default to the implementation in drivers/lib/msi.c */
-#define HAVE_DEFAULT_MSI_TEARDOWN_IRQS
-#define HAVE_DEFAULT_MSI_RESTORE_IRQS
-void default_teardown_msi_irqs(struct pci_dev *dev);
-void default_restore_msi_irqs(struct pci_dev *dev, int irq);
 #else
 #define native_setup_msi_irqs           NULL
 #define native_teardown_msi_irq         NULL
-#define default_teardown_msi_irqs       NULL
-#define default_restore_msi_irqs        NULL
 #endif
 
 #define PCI_DMA_BUS_IS_PHYS (dma_ops->is_phys)
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h
index 1c00631164c2..3d1999458709 100644
--- a/arch/x86/include/asm/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
@@ -22,7 +22,8 @@
  * ZERO_PAGE is a global shared page that is always zero: used
  * for zero-mapped memory areas etc..
  */
-extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)];
+extern unsigned long empty_zero_page[PAGE_SIZE / sizeof(unsigned long)]
+        __visible;
 #define ZERO_PAGE(vaddr) (virt_to_page(empty_zero_page))
 
 extern spinlock_t pgd_lock;
@@ -314,21 +315,6 @@ static inline pmd_t pmd_mksoft_dirty(pmd_t pmd)
         return pmd_set_flags(pmd, _PAGE_SOFT_DIRTY);
 }
 
-static inline pte_t pte_swp_mksoft_dirty(pte_t pte)
-{
-        return pte_set_flags(pte, _PAGE_SWP_SOFT_DIRTY);
-}
-
-static inline int pte_swp_soft_dirty(pte_t pte)
-{
-        return pte_flags(pte) & _PAGE_SWP_SOFT_DIRTY;
-}
-
-static inline pte_t pte_swp_clear_soft_dirty(pte_t pte)
-{
-        return pte_clear_flags(pte, _PAGE_SWP_SOFT_DIRTY);
-}
-
 static inline pte_t pte_file_clear_soft_dirty(pte_t pte)
 {
         return pte_clear_flags(pte, _PAGE_SOFT_DIRTY);
@@ -445,6 +431,7 @@ pte_t *populate_extra_pte(unsigned long vaddr);
 
 #ifndef __ASSEMBLY__
 #include <linux/mm_types.h>
+#include <linux/mmdebug.h>
 #include <linux/log2.h>
 
 static inline int pte_none(pte_t pte)
@@ -863,6 +850,24 @@ static inline void update_mmu_cache_pmd(struct vm_area_struct *vma,
 {
 }
 
+static inline pte_t pte_swp_mksoft_dirty(pte_t pte)
+{
+        VM_BUG_ON(pte_present(pte));
+        return pte_set_flags(pte, _PAGE_SWP_SOFT_DIRTY);
+}
+
+static inline int pte_swp_soft_dirty(pte_t pte)
+{
+        VM_BUG_ON(pte_present(pte));
+        return pte_flags(pte) & _PAGE_SWP_SOFT_DIRTY;
+}
+
+static inline pte_t pte_swp_clear_soft_dirty(pte_t pte)
+{
+        VM_BUG_ON(pte_present(pte));
+        return pte_clear_flags(pte, _PAGE_SWP_SOFT_DIRTY);
+}
+
 #include <asm-generic/pgtable.h>
 #endif  /* __ASSEMBLY__ */
 
diff --git a/arch/x86/include/asm/pgtable_types.h b/arch/x86/include/asm/pgtable_types.h
index f4843e031131..0ecac257fb26 100644
--- a/arch/x86/include/asm/pgtable_types.h
+++ b/arch/x86/include/asm/pgtable_types.h
@@ -75,6 +75,9 @@
  * with swap entry format. On x86 bits 6 and 7 are *not* involved
  * into swap entry computation, but bit 6 is used for nonlinear
  * file mapping, so we borrow bit 7 for soft dirty tracking.
+ *
+ * Please note that this bit must be treated as swap dirty page
+ * mark if and only if the PTE has present bit clear!
  */
 #ifdef CONFIG_MEM_SOFT_DIRTY
 #define _PAGE_SWP_SOFT_DIRTY    _PAGE_PSE
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h
index 24cf5aefb704..987c75ecc334 100644
--- a/arch/x86/include/asm/processor.h
+++ b/arch/x86/include/asm/processor.h
@@ -412,7 +412,7 @@ union irq_stack_union {
         };
 };
 
-DECLARE_PER_CPU_FIRST(union irq_stack_union, irq_stack_union);
+DECLARE_PER_CPU_FIRST(union irq_stack_union, irq_stack_union) __visible;
 DECLARE_INIT_PER_CPU(irq_stack_union);
 
 DECLARE_PER_CPU(char *, irq_stack_ptr);
@@ -942,33 +942,19 @@ extern int set_tsc_mode(unsigned int val);
 
 extern u16 amd_get_nb_id(int cpu);
 
-struct aperfmperf {
-        u64 aperf, mperf;
-};
-
-static inline void get_aperfmperf(struct aperfmperf *am)
+static inline uint32_t hypervisor_cpuid_base(const char *sig, uint32_t leaves)
 {
-        WARN_ON_ONCE(!boot_cpu_has(X86_FEATURE_APERFMPERF));
-
-        rdmsrl(MSR_IA32_APERF, am->aperf);
-        rdmsrl(MSR_IA32_MPERF, am->mperf);
-}
+        uint32_t base, eax, signature[3];
 
-#define APERFMPERF_SHIFT 10
+        for (base = 0x40000000; base < 0x40010000; base += 0x100) {
+                cpuid(base, &eax, &signature[0], &signature[1], &signature[2]);
 
-static inline
-unsigned long calc_aperfmperf_ratio(struct aperfmperf *old,
-                                    struct aperfmperf *new)
-{
-        u64 aperf = new->aperf - old->aperf;
-        u64 mperf = new->mperf - old->mperf;
-        unsigned long ratio = aperf;
-
-        mperf >>= APERFMPERF_SHIFT;
-        if (mperf)
-                ratio = div64_u64(aperf, mperf);
+                if (!memcmp(sig, signature, 12) &&
+                    (leaves == 0 || ((eax - base) >= leaves)))
+                        return base;
+        }
 
-        return ratio;
+        return 0;
 }
 
 extern unsigned long arch_align_stack(unsigned long sp);
diff --git a/arch/x86/include/asm/pvclock.h b/arch/x86/include/asm/pvclock.h
index 109a9dd5d454..be8269b00e2a 100644
--- a/arch/x86/include/asm/pvclock.h
+++ b/arch/x86/include/asm/pvclock.h
@@ -93,7 +93,6 @@ unsigned __pvclock_read_cycles(const struct pvclock_vcpu_time_info *src,
 
 struct pvclock_vsyscall_time_info {
         struct pvclock_vcpu_time_info pvti;
-        u32 migrate_count;
 } __attribute__((__aligned__(SMP_CACHE_BYTES)));
 
 #define PVTI_SIZE sizeof(struct pvclock_vsyscall_time_info)
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h
index b7bf3505e1ec..347555492dad 100644
--- a/arch/x86/include/asm/setup.h
+++ b/arch/x86/include/asm/setup.h
@@ -6,6 +6,8 @@
 
 #define COMMAND_LINE_SIZE 2048
 
+#include <linux/linkage.h>
+
 #ifdef __i386__
 
 #include <linux/pfn.h>
@@ -108,11 +110,11 @@ void *extend_brk(size_t size, size_t align);
 extern void probe_roms(void);
 #ifdef __i386__
 
-void __init i386_start_kernel(void);
+asmlinkage void __init i386_start_kernel(void);
 
 #else
-void __init x86_64_start_kernel(char *real_mode);
-void __init x86_64_start_reservations(char *real_mode_data);
+asmlinkage void __init x86_64_start_kernel(char *real_mode);
+asmlinkage void __init x86_64_start_reservations(char *real_mode_data);
 
 #endif /* __i386__ */
 #endif /* _SETUP */
diff --git a/arch/x86/include/asm/special_insns.h b/arch/x86/include/asm/special_insns.h
index 2f4d924fe6c9..645cad2c95ff 100644
--- a/arch/x86/include/asm/special_insns.h
+++ b/arch/x86/include/asm/special_insns.h
@@ -101,7 +101,7 @@ static inline void native_wbinvd(void)
         asm volatile("wbinvd": : :"memory");
 }
 
-extern void native_load_gs_index(unsigned);
+extern asmlinkage void native_load_gs_index(unsigned);
 
 #ifdef CONFIG_PARAVIRT
 #include <asm/paravirt.h>
diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h
index 8963bfeea82a..bf156ded74b5 100644
--- a/arch/x86/include/asm/spinlock.h
+++ b/arch/x86/include/asm/spinlock.h
@@ -62,6 +62,11 @@ static inline void __ticket_unlock_kick(arch_spinlock_t *lock,
 
 #endif /* CONFIG_PARAVIRT_SPINLOCKS */
 
+static __always_inline int arch_spin_value_unlocked(arch_spinlock_t lock)
+{
+        return lock.tickets.head == lock.tickets.tail;
+}
+
 /*
  * Ticket locks are conceptually two parts, one indicating the current head of
  * the queue, and the other indicating the current tail. The lock is acquired
diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h
index 4ec45b3abba1..d7f3b3b78ac3 100644
--- a/arch/x86/include/asm/switch_to.h
+++ b/arch/x86/include/asm/switch_to.h
@@ -2,8 +2,8 @@
 #define _ASM_X86_SWITCH_TO_H
 
 struct task_struct; /* one of the stranger aspects of C forward declarations */
-struct task_struct *__switch_to(struct task_struct *prev,
-                                struct task_struct *next);
+__visible struct task_struct *__switch_to(struct task_struct *prev,
+                                           struct task_struct *next);
 struct tss_struct;
 void __switch_to_xtra(struct task_struct *prev_p, struct task_struct *next_p,
                       struct tss_struct *tss);
diff --git a/arch/x86/include/asm/sync_bitops.h b/arch/x86/include/asm/sync_bitops.h
index 9d09b4073b60..05af3b31d522 100644
--- a/arch/x86/include/asm/sync_bitops.h
+++ b/arch/x86/include/asm/sync_bitops.h
@@ -26,9 +26,9 @@
  * Note that @nr may be almost arbitrarily large; this function is not
  * restricted to acting on a single-word quantity.
  */
-static inline void sync_set_bit(int nr, volatile unsigned long *addr)
+static inline void sync_set_bit(long nr, volatile unsigned long *addr)
 {
-        asm volatile("lock; btsl %1,%0"
+        asm volatile("lock; bts %1,%0"
                      : "+m" (ADDR)
                      : "Ir" (nr)
                      : "memory");
@@ -44,9 +44,9 @@ static inline void sync_set_bit(int nr, volatile unsigned long *addr)
  * you should call smp_mb__before_clear_bit() and/or smp_mb__after_clear_bit()
  * in order to ensure changes are visible on other processors.
  */
-static inline void sync_clear_bit(int nr, volatile unsigned long *addr)
+static inline void sync_clear_bit(long nr, volatile unsigned long *addr)
 {
-        asm volatile("lock; btrl %1,%0"
+        asm volatile("lock; btr %1,%0"
                      : "+m" (ADDR)
                      : "Ir" (nr)
                      : "memory");
@@ -61,9 +61,9 @@ static inline void sync_clear_bit(int nr, volatile unsigned long *addr)
  * Note that @nr may be almost arbitrarily large; this function is not
  * restricted to acting on a single-word quantity.
  */
-static inline void sync_change_bit(int nr, volatile unsigned long *addr)
+static inline void sync_change_bit(long nr, volatile unsigned long *addr)
 {
-        asm volatile("lock; btcl %1,%0"
+        asm volatile("lock; btc %1,%0"
                      : "+m" (ADDR)
                      : "Ir" (nr)
                      : "memory");
@@ -77,11 +77,11 @@ static inline void sync_change_bit(int nr, volatile unsigned long *addr)
  * This operation is atomic and cannot be reordered.
  * It also implies a memory barrier.
  */
-static inline int sync_test_and_set_bit(int nr, volatile unsigned long *addr)
+static inline int sync_test_and_set_bit(long nr, volatile unsigned long *addr)
 {
         int oldbit;
 
-        asm volatile("lock; btsl %2,%1\n\tsbbl %0,%0"
+        asm volatile("lock; bts %2,%1\n\tsbbl %0,%0"
                      : "=r" (oldbit), "+m" (ADDR)
                      : "Ir" (nr) : "memory");
         return oldbit;
@@ -95,11 +95,11 @@ static inline int sync_test_and_set_bit(int nr, volatile unsigned long *addr)
  * This operation is atomic and cannot be reordered.
  * It also implies a memory barrier.
  */
-static inline int sync_test_and_clear_bit(int nr, volatile unsigned long *addr)
+static inline int sync_test_and_clear_bit(long nr, volatile unsigned long *addr)
 {
         int oldbit;
 
-        asm volatile("lock; btrl %2,%1\n\tsbbl %0,%0"
+        asm volatile("lock; btr %2,%1\n\tsbbl %0,%0"
                      : "=r" (oldbit), "+m" (ADDR)
                      : "Ir" (nr) : "memory");
         return oldbit;
@@ -113,11 +113,11 @@ static inline int sync_test_and_clear_bit(int nr, volatile unsigned long *addr)
  * This operation is atomic and cannot be reordered.
  * It also implies a memory barrier.
  */
-static inline int sync_test_and_change_bit(int nr, volatile unsigned long *addr)
+static inline int sync_test_and_change_bit(long nr, volatile unsigned long *addr)
 {
         int oldbit;
 
-        asm volatile("lock; btcl %2,%1\n\tsbbl %0,%0"
+        asm volatile("lock; btc %2,%1\n\tsbbl %0,%0"
                      : "=r" (oldbit), "+m" (ADDR)
                      : "Ir" (nr) : "memory");
         return oldbit;
diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h
index 2e188d68397c..aea284b41312 100644
--- a/arch/x86/include/asm/syscall.h
+++ b/arch/x86/include/asm/syscall.h
@@ -20,7 +20,8 @@
 #include <asm/thread_info.h>    /* for TS_COMPAT */
 #include <asm/unistd.h>
 
-extern const unsigned long sys_call_table[];
+typedef void (*sys_call_ptr_t)(void);
+extern const sys_call_ptr_t sys_call_table[];
 
 /*
  * Only the low 32 bits of orig_ax are meaningful, so we return int.
diff --git a/arch/x86/include/asm/syscalls.h b/arch/x86/include/asm/syscalls.h
index 2917a6452c49..592a6a672e07 100644
--- a/arch/x86/include/asm/syscalls.h
+++ b/arch/x86/include/asm/syscalls.h
@@ -24,7 +24,7 @@ asmlinkage long sys_iopl(unsigned int);
 asmlinkage int sys_modify_ldt(int, void __user *, unsigned long);
 
 /* kernel/signal.c */
-long sys_rt_sigreturn(void);
+asmlinkage long sys_rt_sigreturn(void);
 
 /* kernel/tls.c */
 asmlinkage long sys_set_thread_area(struct user_desc __user *);
@@ -34,7 +34,7 @@ asmlinkage long sys_get_thread_area(struct user_desc __user *);
 #ifdef CONFIG_X86_32
 
 /* kernel/signal.c */
-unsigned long sys_sigreturn(void);
+asmlinkage unsigned long sys_sigreturn(void);
 
 /* kernel/vm86_32.c */
 asmlinkage long sys_vm86old(struct vm86_struct __user *);
@@ -44,7 +44,7 @@ asmlinkage long sys_vm86(unsigned long, unsigned long);
 
 /* X86_64 only */
 /* kernel/process_64.c */
-long sys_arch_prctl(int, unsigned long);
+asmlinkage long sys_arch_prctl(int, unsigned long);
 
 /* kernel/sys_x86_64.c */
 asmlinkage long sys_mmap(unsigned long, unsigned long, unsigned long,
diff --git a/arch/x86/include/asm/sysfb.h b/arch/x86/include/asm/sysfb.h
new file mode 100644
index 000000000000..2aeb3e25579c
--- /dev/null
+++ b/arch/x86/include/asm/sysfb.h
@@ -0,0 +1,98 @@
+#ifndef _ARCH_X86_KERNEL_SYSFB_H
+#define _ARCH_X86_KERNEL_SYSFB_H
+
+/*
+ * Generic System Framebuffers on x86
+ * Copyright (c) 2012-2013 David Herrmann <dh.herrmann@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ */
+
+#include <linux/kernel.h>
+#include <linux/platform_data/simplefb.h>
+#include <linux/screen_info.h>
+
+enum {
+        M_I17,          /* 17-Inch iMac */
+        M_I20,          /* 20-Inch iMac */
+        M_I20_SR,       /* 20-Inch iMac (Santa Rosa) */
+        M_I24,          /* 24-Inch iMac */
+        M_I24_8_1,      /* 24-Inch iMac, 8,1th gen */
+        M_I24_10_1,     /* 24-Inch iMac, 10,1th gen */
+        M_I27_11_1,     /* 27-Inch iMac, 11,1th gen */
+        M_MINI,         /* Mac Mini */
+        M_MINI_3_1,     /* Mac Mini, 3,1th gen */
+        M_MINI_4_1,     /* Mac Mini, 4,1th gen */
+        M_MB,           /* MacBook */
+        M_MB_2,         /* MacBook, 2nd rev. */
+        M_MB_3,         /* MacBook, 3rd rev. */
+        M_MB_5_1,       /* MacBook, 5th rev. */
+        M_MB_6_1,       /* MacBook, 6th rev. */
+        M_MB_7_1,       /* MacBook, 7th rev. */
+        M_MB_SR,        /* MacBook, 2nd gen, (Santa Rosa) */
+        M_MBA,          /* MacBook Air */
+        M_MBA_3,        /* Macbook Air, 3rd rev */
+        M_MBP,          /* MacBook Pro */
+        M_MBP_2,        /* MacBook Pro 2nd gen */
+        M_MBP_2_2,      /* MacBook Pro 2,2nd gen */
+        M_MBP_SR,       /* MacBook Pro (Santa Rosa) */
+        M_MBP_4,        /* MacBook Pro, 4th gen */
+        M_MBP_5_1,      /* MacBook Pro, 5,1th gen */
+        M_MBP_5_2,      /* MacBook Pro, 5,2th gen */
+        M_MBP_5_3,      /* MacBook Pro, 5,3rd gen */
+        M_MBP_6_1,      /* MacBook Pro, 6,1th gen */
+        M_MBP_6_2,      /* MacBook Pro, 6,2th gen */
+        M_MBP_7_1,      /* MacBook Pro, 7,1th gen */
+        M_MBP_8_2,      /* MacBook Pro, 8,2nd gen */
+        M_UNKNOWN       /* placeholder */
+};
+
+struct efifb_dmi_info {
+        char *optname;
+        unsigned long base;
+        int stride;
+        int width;
+        int height;
+        int flags;
+};
+
+#ifdef CONFIG_EFI
+
+extern struct efifb_dmi_info efifb_dmi_list[];
+void sysfb_apply_efi_quirks(void);
+
+#else /* CONFIG_EFI */
+
+static inline void sysfb_apply_efi_quirks(void)
+{
+}
+
+#endif /* CONFIG_EFI */
+
+#ifdef CONFIG_X86_SYSFB
+
+bool parse_mode(const struct screen_info *si,
+                struct simplefb_platform_data *mode);
+int create_simplefb(const struct screen_info *si,
+                    const struct simplefb_platform_data *mode);
+
+#else /* CONFIG_X86_SYSFB */
+
+static inline bool parse_mode(const struct screen_info *si,
+                              struct simplefb_platform_data *mode)
+{
+        return false;
+}
+
+static inline int create_simplefb(const struct screen_info *si,
+                                  const struct simplefb_platform_data *mode)
+{
+        return -EINVAL;
+}
+
+#endif /* CONFIG_X86_SYSFB */
+
+#endif /* _ARCH_X86_KERNEL_SYSFB_H */
diff --git a/arch/x86/include/asm/tlbflush.h b/arch/x86/include/asm/tlbflush.h
index cf512003e663..e6d90babc245 100644
--- a/arch/x86/include/asm/tlbflush.h
+++ b/arch/x86/include/asm/tlbflush.h
@@ -62,6 +62,7 @@ static inline void __flush_tlb_all(void)
 
 static inline void __flush_tlb_one(unsigned long addr)
 {
+        count_vm_event(NR_TLB_LOCAL_FLUSH_ONE);
         __flush_tlb_single(addr);
 }
 
@@ -84,14 +85,38 @@ static inline void __flush_tlb_one(unsigned long addr)
 
 #ifndef CONFIG_SMP
 
-#define flush_tlb() __flush_tlb()
-#define flush_tlb_all() __flush_tlb_all()
-#define local_flush_tlb() __flush_tlb()
+/* "_up" is for UniProcessor.
+ *
+ * This is a helper for other header functions.  *Not* intended to be called
+ * directly.  All global TLB flushes need to either call this, or to bump the
+ * vm statistics themselves.
+ */
+static inline void __flush_tlb_up(void)
+{
+        count_vm_event(NR_TLB_LOCAL_FLUSH_ALL);
+        __flush_tlb();
+}
+
+static inline void flush_tlb_all(void)
+{
+        count_vm_event(NR_TLB_LOCAL_FLUSH_ALL);
+        __flush_tlb_all();
+}
+
+static inline void flush_tlb(void)
+{
+        __flush_tlb_up();
+}
+
+static inline void local_flush_tlb(void)
+{
+        __flush_tlb_up();
+}
 
 static inline void flush_tlb_mm(struct mm_struct *mm)
 {
         if (mm == current->active_mm)
-                __flush_tlb();
+                __flush_tlb_up();
 }
 
 static inline void flush_tlb_page(struct vm_area_struct *vma,
@@ -105,14 +130,14 @@ static inline void flush_tlb_range(struct vm_area_struct *vma,
                                    unsigned long start, unsigned long end)
 {
         if (vma->vm_mm == current->active_mm)
-                __flush_tlb();
+                __flush_tlb_up();
 }
 
 static inline void flush_tlb_mm_range(struct mm_struct *mm,
            unsigned long start, unsigned long end, unsigned long vmflag)
 {
         if (mm == current->active_mm)
-                __flush_tlb();
+                __flush_tlb_up();
 }
 
 static inline void native_flush_tlb_others(const struct cpumask *cpumask,
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h
index 095b21507b6a..d35f24e231cd 100644
--- a/arch/x86/include/asm/topology.h
+++ b/arch/x86/include/asm/topology.h
@@ -124,9 +124,6 @@ extern const struct cpumask *cpu_coregroup_mask(int cpu);
 #define topology_core_id(cpu)                   (cpu_data(cpu).cpu_core_id)
 #define topology_core_cpumask(cpu)              (per_cpu(cpu_core_map, cpu))
 #define topology_thread_cpumask(cpu)            (per_cpu(cpu_sibling_map, cpu))
-
-/* indicates that pointers to the topology cpumask_t maps are valid */
-#define arch_provides_topology_pointers         yes
 #endif
 
 static inline void arch_fix_phys_package_id(int num, u32 slot)
diff --git a/arch/x86/include/asm/traps.h b/arch/x86/include/asm/traps.h
index 88eae2aec619..7036cb60cd87 100644
--- a/arch/x86/include/asm/traps.h
+++ b/arch/x86/include/asm/traps.h
@@ -6,11 +6,7 @@
 #include <asm/debugreg.h>
 #include <asm/siginfo.h>                        /* TRAP_TRACE, ... */
 
-#ifdef CONFIG_X86_32
-#define dotraplinkage
-#else
-#define dotraplinkage asmlinkage
-#endif
+#define dotraplinkage __visible
 
 asmlinkage void divide_error(void);
 asmlinkage void debug(void);
diff --git a/arch/x86/include/asm/tsc.h b/arch/x86/include/asm/tsc.h
index c91e8b9d588b..235be70d5bb4 100644
--- a/arch/x86/include/asm/tsc.h
+++ b/arch/x86/include/asm/tsc.h
@@ -49,6 +49,7 @@ extern void tsc_init(void);
 extern void mark_tsc_unstable(char *reason);
 extern int unsynchronized_tsc(void);
 extern int check_tsc_unstable(void);
+extern int check_tsc_disabled(void);
 extern unsigned long native_calibrate_tsc(void);
 
 extern int tsc_clocksource_reliable;
diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h
index 5ee26875baea..5838fa911aa0 100644
--- a/arch/x86/include/asm/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
@@ -153,16 +153,19 @@ __typeof__(__builtin_choose_expr(sizeof(x) > sizeof(0UL), 0ULL, 0UL))
  * Careful: we have to cast the result to the type of the pointer
  * for sign reasons.
  *
- * The use of %edx as the register specifier is a bit of a
+ * The use of _ASM_DX as the register specifier is a bit of a
  * simplification, as gcc only cares about it as the starting point
  * and not size: for a 64-bit value it will use %ecx:%edx on 32 bits
  * (%ecx being the next register in gcc's x86 register sequence), and
  * %rdx on 64 bits.
+ *
+ * Clang/LLVM cares about the size of the register, but still wants
+ * the base register for something that ends up being a pair.
  */
 #define get_user(x, ptr)                                                \
 ({                                                                      \
         int __ret_gu;                                                   \
-        register __inttype(*(ptr)) __val_gu asm("%edx");                \
+        register __inttype(*(ptr)) __val_gu asm("%"_ASM_DX);            \
         __chk_user_ptr(ptr);                                            \
         might_fault();                                                  \
         asm volatile("call __get_user_%P3"                              \
diff --git a/arch/x86/include/asm/vmx.h b/arch/x86/include/asm/vmx.h
index f3e01a2cbaa1..966502d4682e 100644
--- a/arch/x86/include/asm/vmx.h
+++ b/arch/x86/include/asm/vmx.h
@@ -387,6 +387,7 @@ enum vmcs_field {
 #define VMX_EPT_EXTENT_INDIVIDUAL_ADDR          0
 #define VMX_EPT_EXTENT_CONTEXT                  1
 #define VMX_EPT_EXTENT_GLOBAL                   2
+#define VMX_EPT_EXTENT_SHIFT                    24
 
 #define VMX_EPT_EXECUTE_ONLY_BIT                (1ull)
 #define VMX_EPT_PAGE_WALK_4_BIT                 (1ull << 6)
@@ -394,6 +395,7 @@ enum vmcs_field {
 #define VMX_EPTP_WB_BIT                         (1ull << 14)
 #define VMX_EPT_2MB_PAGE_BIT                    (1ull << 16)
 #define VMX_EPT_1GB_PAGE_BIT                    (1ull << 17)
+#define VMX_EPT_INVEPT_BIT                      (1ull << 20)
 #define VMX_EPT_AD_BIT                              (1ull << 21)
 #define VMX_EPT_EXTENT_CONTEXT_BIT              (1ull << 25)
 #define VMX_EPT_EXTENT_GLOBAL_BIT               (1ull << 26)
diff --git a/arch/x86/include/asm/vvar.h b/arch/x86/include/asm/vvar.h
index de656ac2af41..d76ac40da206 100644
--- a/arch/x86/include/asm/vvar.h
+++ b/arch/x86/include/asm/vvar.h
@@ -35,7 +35,7 @@
 
 #define DEFINE_VVAR(type, name)                                         \
         type name                                                       \
-        __attribute__((section(".vvar_" #name), aligned(16)))
+        __attribute__((section(".vvar_" #name), aligned(16))) __visible
 
 #define VVAR(name) (*vvaraddr_ ## name)
 
diff --git a/arch/x86/include/asm/xen/hypervisor.h b/arch/x86/include/asm/xen/hypervisor.h
index 125f344f06a9..d866959e5685 100644
--- a/arch/x86/include/asm/xen/hypervisor.h
+++ b/arch/x86/include/asm/xen/hypervisor.h
@@ -40,21 +40,7 @@ extern struct start_info *xen_start_info;
 
 static inline uint32_t xen_cpuid_base(void)
 {
-        uint32_t base, eax, ebx, ecx, edx;
-        char signature[13];
-
-        for (base = 0x40000000; base < 0x40010000; base += 0x100) {
-                cpuid(base, &eax, &ebx, &ecx, &edx);
-                *(uint32_t *)(signature + 0) = ebx;
-                *(uint32_t *)(signature + 4) = ecx;
-                *(uint32_t *)(signature + 8) = edx;
-                signature[12] = 0;
-
-                if (!strcmp("XenVMMXenVMM", signature) && ((eax - base) >= 2))
-                        return base;
-        }
-
-        return 0;
+        return hypervisor_cpuid_base("XenVMMXenVMM", 2);
 }
 
 #ifdef CONFIG_XEN
diff --git a/arch/x86/include/asm/xor_avx.h b/arch/x86/include/asm/xor_avx.h
index 7ea79c5fa1f2..492b29802f57 100644
--- a/arch/x86/include/asm/xor_avx.h
+++ b/arch/x86/include/asm/xor_avx.h
@@ -167,12 +167,12 @@ static struct xor_block_template xor_block_avx = {
 
 #define AVX_XOR_SPEED \
 do { \
-        if (cpu_has_avx) \
+        if (cpu_has_avx && cpu_has_osxsave) \
                 xor_speed(&xor_block_avx); \
 } while (0)
 
 #define AVX_SELECT(FASTEST) \
-        (cpu_has_avx ? &xor_block_avx : FASTEST)
+        (cpu_has_avx && cpu_has_osxsave ? &xor_block_avx : FASTEST)
 
 #else
 
diff --git a/arch/x86/include/uapi/asm/vmx.h b/arch/x86/include/uapi/asm/vmx.h
index d651082c7cf7..0e79420376eb 100644
--- a/arch/x86/include/uapi/asm/vmx.h
+++ b/arch/x86/include/uapi/asm/vmx.h
@@ -65,6 +65,7 @@
 #define EXIT_REASON_EOI_INDUCED         45
 #define EXIT_REASON_EPT_VIOLATION       48
 #define EXIT_REASON_EPT_MISCONFIG       49
+#define EXIT_REASON_INVEPT              50
 #define EXIT_REASON_PREEMPTION_TIMER    52
 #define EXIT_REASON_WBINVD              54
 #define EXIT_REASON_XSETBV              55
@@ -106,12 +107,13 @@
         { EXIT_REASON_APIC_ACCESS,           "APIC_ACCESS" }, \
         { EXIT_REASON_EPT_VIOLATION,         "EPT_VIOLATION" }, \
         { EXIT_REASON_EPT_MISCONFIG,         "EPT_MISCONFIG" }, \
+        { EXIT_REASON_INVEPT,                "INVEPT" }, \
+        { EXIT_REASON_PREEMPTION_TIMER,      "PREEMPTION_TIMER" }, \
         { EXIT_REASON_WBINVD,                "WBINVD" }, \
         { EXIT_REASON_APIC_WRITE,            "APIC_WRITE" }, \
         { EXIT_REASON_EOI_INDUCED,           "EOI_INDUCED" }, \
         { EXIT_REASON_INVALID_STATE,         "INVALID_STATE" }, \
         { EXIT_REASON_INVD,                  "INVD" }, \
-        { EXIT_REASON_INVPCID,               "INVPCID" }, \
-        { EXIT_REASON_PREEMPTION_TIMER,      "PREEMPTION_TIMER" }
+        { EXIT_REASON_INVPCID,               "INVPCID" }
 
 #endif /* _UAPIVMX_H */
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index 88d99ea77723..a5408b965c9d 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -103,6 +103,9 @@ obj-$(CONFIG_X86_CHECK_BIOS_CORRUPTION) += check.o
 obj-$(CONFIG_SWIOTLB)                   += pci-swiotlb.o
 obj-$(CONFIG_OF)                        += devicetree.o
 obj-$(CONFIG_UPROBES)                   += uprobes.o
+obj-y                                   += sysfb.o
+obj-$(CONFIG_X86_SYSFB)                 += sysfb_simplefb.o
+obj-$(CONFIG_EFI)                       += sysfb_efi.o
 
 obj-$(CONFIG_PERF_EVENTS)               += perf_regs.o
 obj-$(CONFIG_TRACING)                   += tracepoint.o
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index 2627a81253ee..40c76604199f 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -67,6 +67,7 @@ EXPORT_SYMBOL(acpi_pci_disabled);
 int acpi_lapic;
 int acpi_ioapic;
 int acpi_strict;
+int acpi_disable_cmcff;
 
 u8 acpi_sci_flags __initdata;
 int acpi_sci_override_gsi __initdata;
@@ -141,16 +142,8 @@ static u32 irq_to_gsi(int irq)
 }
 
 /*
- * Temporarily use the virtual area starting from FIX_IO_APIC_BASE_END,
- * to map the target physical address. The problem is that set_fixmap()
- * provides a single page, and it is possible that the page is not
- * sufficient.
- * By using this area, we can map up to MAX_IO_APICS pages temporarily,
- * i.e. until the next __va_range() call.
- *
- * Important Safety Note:  The fixed I/O APIC page numbers are *subtracted*
- * from the fixed base.  That's why we start at FIX_IO_APIC_BASE_END and
- * count idx down while incrementing the phys address.
+ * This is just a simple wrapper around early_ioremap(),
+ * with sanity checks for phys == 0 and size == 0.
  */
 char *__init __acpi_map_table(unsigned long phys, unsigned long size)
 {
@@ -160,6 +153,7 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size)
 
         return early_ioremap(phys, size);
 }
+
 void __init __acpi_unmap_table(char *map, unsigned long size)
 {
         if (!map || !size)
@@ -199,7 +193,7 @@ static void acpi_register_lapic(int id, u8 enabled)
 {
         unsigned int ver = 0;
 
-        if (id >= (MAX_LOCAL_APIC-1)) {
+        if (id >= MAX_LOCAL_APIC) {
                 printk(KERN_INFO PREFIX "skipped apicid that is too big\n");
                 return;
         }
@@ -1120,6 +1114,7 @@ int mp_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity)
         int ioapic;
         int ioapic_pin;
         struct io_apic_irq_attr irq_attr;
+        int ret;
 
         if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
                 return gsi;
@@ -1149,7 +1144,9 @@ int mp_register_gsi(struct device *dev, u32 gsi, int trigger, int polarity)
         set_io_apic_irq_attr(&irq_attr, ioapic, ioapic_pin,
                              trigger == ACPI_EDGE_SENSITIVE ? 0 : 1,
                              polarity == ACPI_ACTIVE_HIGH ? 0 : 1);
-        io_apic_set_pci_routing(dev, gsi_to_irq(gsi), &irq_attr);
+        ret = io_apic_set_pci_routing(dev, gsi_to_irq(gsi), &irq_attr);
+        if (ret < 0)
+                gsi = INT_MIN;
 
         return gsi;
 }
@@ -1626,6 +1623,10 @@ static int __init parse_acpi(char *arg)
         /* "acpi=copy_dsdt" copys DSDT */
         else if (strcmp(arg, "copy_dsdt") == 0) {
                 acpi_gbl_copy_dsdt_locally = 1;
+        }
+        /* "acpi=nocmcff" disables FF mode for corrected errors */
+        else if (strcmp(arg, "nocmcff") == 0) {
+                acpi_disable_cmcff = 1;
         } else {
                 /* Core will printk when we return error. */
                 return -EINVAL;
diff --git a/arch/x86/kernel/alternative.c b/arch/x86/kernel/alternative.c
index c15cf9a25e27..15e8563e5c24 100644
--- a/arch/x86/kernel/alternative.c
+++ b/arch/x86/kernel/alternative.c
@@ -11,6 +11,7 @@
 #include <linux/memory.h>
 #include <linux/stop_machine.h>
 #include <linux/slab.h>
+#include <linux/kdebug.h>
 #include <asm/alternative.h>
 #include <asm/sections.h>
 #include <asm/pgtable.h>
@@ -596,97 +597,93 @@ void *__kprobes text_poke(void *addr, const void *opcode, size_t len)
         return addr;
 }
 
-/*
- * Cross-modifying kernel text with stop_machine().
- * This code originally comes from immediate value.
- */
-static atomic_t stop_machine_first;
-static int wrote_text;
+static void do_sync_core(void *info)
+{
+        sync_core();
+}
 
-struct text_poke_params {
-        struct text_poke_param *params;
-        int nparams;
-};
+static bool bp_patching_in_progress;
+static void *bp_int3_handler, *bp_int3_addr;
 
-static int __kprobes stop_machine_text_poke(void *data)
+int poke_int3_handler(struct pt_regs *regs)
 {
-        struct text_poke_params *tpp = data;
-        struct text_poke_param *p;
-        int i;
+        /* bp_patching_in_progress */
+        smp_rmb();
 
-        if (atomic_xchg(&stop_machine_first, 0)) {
-                for (i = 0; i < tpp->nparams; i++) {
-                        p = &tpp->params[i];
-                        text_poke(p->addr, p->opcode, p->len);
-                }
-                smp_wmb();      /* Make sure other cpus see that this has run */
-                wrote_text = 1;
-        } else {
-                while (!wrote_text)
-                        cpu_relax();
-                smp_mb();       /* Load wrote_text before following execution */
-        }
+        if (likely(!bp_patching_in_progress))
+                return 0;
 
-        for (i = 0; i < tpp->nparams; i++) {
-                p = &tpp->params[i];
-                flush_icache_range((unsigned long)p->addr,
-                                   (unsigned long)p->addr + p->len);
-        }
-        /*
-         * Intel Archiecture Software Developer's Manual section 7.1.3 specifies
-         * that a core serializing instruction such as "cpuid" should be
-         * executed on _each_ core before the new instruction is made visible.
-         */
-        sync_core();
-        return 0;
-}
+        if (user_mode_vm(regs) || regs->ip != (unsigned long)bp_int3_addr)
+                return 0;
+
+        /* set up the specified breakpoint handler */
+        regs->ip = (unsigned long) bp_int3_handler;
+
+        return 1;
 
-/**
- * text_poke_smp - Update instructions on a live kernel on SMP
- * @addr: address to modify
- * @opcode: source of the copy
- * @len: length to copy
- *
- * Modify multi-byte instruction by using stop_machine() on SMP. This allows
- * user to poke/set multi-byte text on SMP. Only non-NMI/MCE code modifying
- * should be allowed, since stop_machine() does _not_ protect code against
- * NMI and MCE.
- *
- * Note: Must be called under get_online_cpus() and text_mutex.
- */
-void *__kprobes text_poke_smp(void *addr, const void *opcode, size_t len)
-{
-        struct text_poke_params tpp;
-        struct text_poke_param p;
-
-        p.addr = addr;
-        p.opcode = opcode;
-        p.len = len;
-        tpp.params = &p;
-        tpp.nparams = 1;
-        atomic_set(&stop_machine_first, 1);
-        wrote_text = 0;
-        /* Use __stop_machine() because the caller already got online_cpus. */
-        __stop_machine(stop_machine_text_poke, (void *)&tpp, cpu_online_mask);
-        return addr;
 }
 
 /**
- * text_poke_smp_batch - Update instructions on a live kernel on SMP
- * @params: an array of text_poke parameters
- * @n: the number of elements in params.
+ * text_poke_bp() -- update instructions on live kernel on SMP
+ * @addr:       address to patch
+ * @opcode:     opcode of new instruction
+ * @len:        length to copy
+ * @handler:    address to jump to when the temporary breakpoint is hit
  *
- * Modify multi-byte instruction by using stop_machine() on SMP. Since the
- * stop_machine() is heavy task, it is better to aggregate text_poke requests
- * and do it once if possible.
+ * Modify multi-byte instruction by using int3 breakpoint on SMP.
+ * We completely avoid stop_machine() here, and achieve the
+ * synchronization using int3 breakpoint.
  *
- * Note: Must be called under get_online_cpus() and text_mutex.
+ * The way it is done:
+ *      - add a int3 trap to the address that will be patched
+ *      - sync cores
+ *      - update all but the first byte of the patched range
+ *      - sync cores
+ *      - replace the first byte (int3) by the first byte of
+ *        replacing opcode
+ *      - sync cores
+ *
+ * Note: must be called under text_mutex.
  */
-void __kprobes text_poke_smp_batch(struct text_poke_param *params, int n)
+void *text_poke_bp(void *addr, const void *opcode, size_t len, void *handler)
 {
-        struct text_poke_params tpp = {.params = params, .nparams = n};
+        unsigned char int3 = 0xcc;
+
+        bp_int3_handler = handler;
+        bp_int3_addr = (u8 *)addr + sizeof(int3);
+        bp_patching_in_progress = true;
+        /*
+         * Corresponding read barrier in int3 notifier for
+         * making sure the in_progress flags is correctly ordered wrt.
+         * patching
+         */
+        smp_wmb();
+
+        text_poke(addr, &int3, sizeof(int3));
 
-        atomic_set(&stop_machine_first, 1);
-        wrote_text = 0;
-        __stop_machine(stop_machine_text_poke, (void *)&tpp, cpu_online_mask);
+        on_each_cpu(do_sync_core, NULL, 1);
+
+        if (len - sizeof(int3) > 0) {
+                /* patch all but the first byte */
+                text_poke((char *)addr + sizeof(int3),
+                          (const char *) opcode + sizeof(int3),
+                          len - sizeof(int3));
+                /*
+                 * According to Intel, this core syncing is very likely
+                 * not necessary and we'd be safe even without it. But
+                 * better safe than sorry (plus there's not only Intel).
+                 */
+                on_each_cpu(do_sync_core, NULL, 1);
+        }
+
+        /* patch the first byte */
+        text_poke(addr, opcode, sizeof(int3));
+
+        on_each_cpu(do_sync_core, NULL, 1);
+
+        bp_patching_in_progress = false;
+        smp_wmb();
+
+        return addr;
 }
+
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
index 3048ded1b598..59554dca96ec 100644
--- a/arch/x86/kernel/amd_nb.c
+++ b/arch/x86/kernel/amd_nb.c
@@ -20,6 +20,7 @@ const struct pci_device_id amd_nb_misc_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_10H_NB_MISC) },
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F3) },
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_M10H_F3) },
+        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F3) },
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F3) },
         {}
 };
@@ -27,6 +28,7 @@ EXPORT_SYMBOL(amd_nb_misc_ids);
 
 static const struct pci_device_id amd_nb_link_ids[] = {
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },
+        { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_M30H_NB_F4) },
         { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_16H_NB_F4) },
         {}
 };
@@ -81,13 +83,20 @@ int amd_cache_northbridges(void)
                         next_northbridge(misc, amd_nb_misc_ids);
                 node_to_amd_nb(i)->link = link =
                         next_northbridge(link, amd_nb_link_ids);
-        }
+        }
 
+        /* GART present only on Fam15h upto model 0fh */
         if (boot_cpu_data.x86 == 0xf || boot_cpu_data.x86 == 0x10 ||
-            boot_cpu_data.x86 == 0x15)
+            (boot_cpu_data.x86 == 0x15 && boot_cpu_data.x86_model < 0x10))
                 amd_northbridges.flags |= AMD_NB_GART;
 
         /*
+         * Check for L3 cache presence.
+         */
+        if (!cpuid_edx(0x80000006))
+                return 0;
+
+        /*
          * Some CPU families support L3 Cache Index Disable. There are some
          * limitations because of E382 and E388 on family 0x10.
          */
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c
index eca89c53a7f5..a7eb82d9b012 100644
--- a/arch/x86/kernel/apic/apic.c
+++ b/arch/x86/kernel/apic/apic.c
@@ -913,7 +913,7 @@ static void local_apic_timer_interrupt(void)
  * [ if a single-CPU system runs an SMP kernel then we call the local
  *   interrupt as well. Thus we cannot inline the local irq ... ]
  */
-void __irq_entry smp_apic_timer_interrupt(struct pt_regs *regs)
+__visible void __irq_entry smp_apic_timer_interrupt(struct pt_regs *regs)
 {
         struct pt_regs *old_regs = set_irq_regs(regs);
 
@@ -932,7 +932,7 @@ void __irq_entry smp_apic_timer_interrupt(struct pt_regs *regs)
         set_irq_regs(old_regs);
 }
 
-void __irq_entry smp_trace_apic_timer_interrupt(struct pt_regs *regs)
+__visible void __irq_entry smp_trace_apic_timer_interrupt(struct pt_regs *regs)
 {
         struct pt_regs *old_regs = set_irq_regs(regs);
 
@@ -1946,14 +1946,14 @@ static inline void __smp_spurious_interrupt(void)
                 "should never happen.\n", smp_processor_id());
 }
 
-void smp_spurious_interrupt(struct pt_regs *regs)
+__visible void smp_spurious_interrupt(struct pt_regs *regs)
 {
         entering_irq();
         __smp_spurious_interrupt();
         exiting_irq();
 }
 
-void smp_trace_spurious_interrupt(struct pt_regs *regs)
+__visible void smp_trace_spurious_interrupt(struct pt_regs *regs)
 {
         entering_irq();
         trace_spurious_apic_entry(SPURIOUS_APIC_VECTOR);
@@ -2002,14 +2002,14 @@ static inline void __smp_error_interrupt(struct pt_regs *regs)
 
 }
 
-void smp_error_interrupt(struct pt_regs *regs)
+__visible void smp_error_interrupt(struct pt_regs *regs)
 {
         entering_irq();
         __smp_error_interrupt(regs);
         exiting_irq();
 }
 
-void smp_trace_error_interrupt(struct pt_regs *regs)
+__visible void smp_trace_error_interrupt(struct pt_regs *regs)
 {
         entering_irq();
         trace_error_apic_entry(ERROR_APIC_VECTOR);
diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index 9ed796ccc32c..e63a5bd2a78f 100644
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -1534,6 +1534,11 @@ void intel_ir_io_apic_print_entries(unsigned int apic,
         }
 }
 
+void ioapic_zap_locks(void)
+{
+        raw_spin_lock_init(&ioapic_lock);
+}
+
 __apicdebuginit(void) print_IO_APIC(int ioapic_idx)
 {
         union IO_APIC_reg_00 reg_00;
@@ -3375,12 +3380,15 @@ int io_apic_setup_irq_pin_once(unsigned int irq, int node,
 {
         unsigned int ioapic_idx = attr->ioapic, pin = attr->ioapic_pin;
         int ret;
+        struct IO_APIC_route_entry orig_entry;
 
         /* Avoid redundant programming */
         if (test_bit(pin, ioapics[ioapic_idx].pin_programmed)) {
-                pr_debug("Pin %d-%d already programmed\n",
-                         mpc_ioapic_id(ioapic_idx), pin);
-                return 0;
+                pr_debug("Pin %d-%d already programmed\n", mpc_ioapic_id(ioapic_idx), pin);
+                orig_entry = ioapic_read_entry(attr->ioapic, pin);
+                if (attr->trigger == orig_entry.trigger && attr->polarity == orig_entry.polarity)
+                        return 0;
+                return -EBUSY;
         }
         ret = io_apic_setup_irq_pin(irq, node, attr);
         if (!ret)
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c
index 53a4e2744846..3ab03430211d 100644
--- a/arch/x86/kernel/apm_32.c
+++ b/arch/x86/kernel/apm_32.c
@@ -392,7 +392,7 @@ static struct cpuidle_device apm_cpuidle_device;
 /*
  * Local variables
  */
-static struct {
+__visible struct {
         unsigned long   offset;
         unsigned short  segment;
 } apm_bios_entry;
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 08a089043ccf..903a264af981 100644
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -66,8 +66,8 @@ static inline int wrmsrl_amd_safe(unsigned msr, unsigned long long val)
  *      performance at the same time..
  */
 
-extern void vide(void);
-__asm__(".align 4\nvide: ret");
+extern __visible void vide(void);
+__asm__(".globl vide\n\t.align 4\nvide: ret");
 
 static void init_amd_k5(struct cpuinfo_x86 *c)
 {
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c
index 25eb2747b063..2793d1f095a2 100644
--- a/arch/x86/kernel/cpu/common.c
+++ b/arch/x86/kernel/cpu/common.c
@@ -1076,7 +1076,7 @@ struct desc_ptr debug_idt_descr = { NR_VECTORS * 16 - 1,
                                     (unsigned long) debug_idt_table };
 
 DEFINE_PER_CPU_FIRST(union irq_stack_union,
-                     irq_stack_union) __aligned(PAGE_SIZE);
+                     irq_stack_union) __aligned(PAGE_SIZE) __visible;
 
 /*
  * The following four percpu variables are hot.  Align current_task to
@@ -1093,7 +1093,7 @@ EXPORT_PER_CPU_SYMBOL(kernel_stack);
 DEFINE_PER_CPU(char *, irq_stack_ptr) =
         init_per_cpu_var(irq_stack_union.irq_stack) + IRQ_STACK_SIZE - 64;
 
-DEFINE_PER_CPU(unsigned int, irq_count) = -1;
+DEFINE_PER_CPU(unsigned int, irq_count) __visible = -1;
 
 DEFINE_PER_CPU(struct task_struct *, fpu_owner_task);
 
diff --git a/arch/x86/kernel/cpu/hypervisor.c b/arch/x86/kernel/cpu/hypervisor.c
index 87279212d318..36ce402a3fa5 100644
--- a/arch/x86/kernel/cpu/hypervisor.c
+++ b/arch/x86/kernel/cpu/hypervisor.c
@@ -25,11 +25,6 @@
 #include <asm/processor.h>
 #include <asm/hypervisor.h>
 
-/*
- * Hypervisor detect order.  This is specified explicitly here because
- * some hypervisors might implement compatibility modes for other
- * hypervisors and therefore need to be detected in specific sequence.
- */
 static const __initconst struct hypervisor_x86 * const hypervisors[] =
 {
 #ifdef CONFIG_XEN_PVHVM
@@ -49,15 +44,19 @@ static inline void __init
 detect_hypervisor_vendor(void)
 {
         const struct hypervisor_x86 *h, * const *p;
+        uint32_t pri, max_pri = 0;
 
         for (p = hypervisors; p < hypervisors + ARRAY_SIZE(hypervisors); p++) {
                 h = *p;
-                if (h->detect()) {
+                pri = h->detect();
+                if (pri != 0 && pri > max_pri) {
+                        max_pri = pri;
                         x86_hyper = h;
-                        printk(KERN_INFO "Hypervisor detected: %s\n", h->name);
-                        break;
                 }
         }
+
+        if (max_pri)
+                printk(KERN_INFO "Hypervisor detected: %s\n", x86_hyper->name);
 }
 
 void init_hypervisor(struct cpuinfo_x86 *c)
diff --git a/arch/x86/kernel/cpu/mcheck/mce-internal.h b/arch/x86/kernel/cpu/mcheck/mce-internal.h
index 5b7d4fa5d3b7..09edd0b65fef 100644
--- a/arch/x86/kernel/cpu/mcheck/mce-internal.h
+++ b/arch/x86/kernel/cpu/mcheck/mce-internal.h
@@ -25,15 +25,18 @@ int mce_severity(struct mce *a, int tolerant, char **msg);
 struct dentry *mce_get_debugfs_dir(void);
 
 extern struct mce_bank *mce_banks;
+extern mce_banks_t mce_banks_ce_disabled;
 
 #ifdef CONFIG_X86_MCE_INTEL
 unsigned long mce_intel_adjust_timer(unsigned long interval);
 void mce_intel_cmci_poll(void);
 void mce_intel_hcpu_update(unsigned long cpu);
+void cmci_disable_bank(int bank);
 #else
 # define mce_intel_adjust_timer mce_adjust_timer_default
 static inline void mce_intel_cmci_poll(void) { }
 static inline void mce_intel_hcpu_update(unsigned long cpu) { }
+static inline void cmci_disable_bank(int bank) { }
 #endif
 
 void mce_timer_kick(unsigned long interval);
diff --git a/arch/x86/kernel/cpu/mcheck/mce.c b/arch/x86/kernel/cpu/mcheck/mce.c
index 87a65c939bcd..b3218cdee95f 100644
--- a/arch/x86/kernel/cpu/mcheck/mce.c
+++ b/arch/x86/kernel/cpu/mcheck/mce.c
@@ -97,6 +97,15 @@ DEFINE_PER_CPU(mce_banks_t, mce_poll_banks) = {
         [0 ... BITS_TO_LONGS(MAX_NR_BANKS)-1] = ~0UL
 };
 
+/*
+ * MCA banks controlled through firmware first for corrected errors.
+ * This is a global list of banks for which we won't enable CMCI and we
+ * won't poll. Firmware controls these banks and is responsible for
+ * reporting corrected errors through GHES. Uncorrected/recoverable
+ * errors are still notified through a machine check.
+ */
+mce_banks_t mce_banks_ce_disabled;
+
 static DEFINE_PER_CPU(struct work_struct, mce_work);
 
 static void (*quirk_no_way_out)(int bank, struct mce *m, struct pt_regs *regs);
@@ -1935,6 +1944,25 @@ static struct miscdevice mce_chrdev_device = {
         &mce_chrdev_ops,
 };
 
+static void __mce_disable_bank(void *arg)
+{
+        int bank = *((int *)arg);
+        __clear_bit(bank, __get_cpu_var(mce_poll_banks));
+        cmci_disable_bank(bank);
+}
+
+void mce_disable_bank(int bank)
+{
+        if (bank >= mca_cfg.banks) {
+                pr_warn(FW_BUG
+                        "Ignoring request to disable invalid MCA bank %d.\n",
+                        bank);
+                return;
+        }
+        set_bit(bank, mce_banks_ce_disabled);
+        on_each_cpu(__mce_disable_bank, &bank, 1);
+}
+
 /*
  * mce=off Disables machine check
  * mce=no_cmci Disables CMCI
diff --git a/arch/x86/kernel/cpu/mcheck/mce_intel.c b/arch/x86/kernel/cpu/mcheck/mce_intel.c
index d56405309dc1..4cfe0458ca66 100644
--- a/arch/x86/kernel/cpu/mcheck/mce_intel.c
+++ b/arch/x86/kernel/cpu/mcheck/mce_intel.c
@@ -203,6 +203,10 @@ static void cmci_discover(int banks)
                 if (test_bit(i, owned))
                         continue;
 
+                /* Skip banks in firmware first mode */
+                if (test_bit(i, mce_banks_ce_disabled))
+                        continue;
+
                 rdmsrl(MSR_IA32_MCx_CTL2(i), val);
 
                 /* Already owned by someone else? */
@@ -271,6 +275,19 @@ void cmci_recheck(void)
         local_irq_restore(flags);
 }
 
+/* Caller must hold the lock on cmci_discover_lock */
+static void __cmci_disable_bank(int bank)
+{
+        u64 val;
+
+        if (!test_bit(bank, __get_cpu_var(mce_banks_owned)))
+                return;
+        rdmsrl(MSR_IA32_MCx_CTL2(bank), val);
+        val &= ~MCI_CTL2_CMCI_EN;
+        wrmsrl(MSR_IA32_MCx_CTL2(bank), val);
+        __clear_bit(bank, __get_cpu_var(mce_banks_owned));
+}
+
 /*
  * Disable CMCI on this CPU for all banks it owns when it goes down.
  * This allows other CPUs to claim the banks on rediscovery.
@@ -280,20 +297,12 @@ void cmci_clear(void)
         unsigned long flags;
         int i;
         int banks;
-        u64 val;
 
         if (!cmci_supported(&banks))
                 return;
         raw_spin_lock_irqsave(&cmci_discover_lock, flags);
-        for (i = 0; i < banks; i++) {
-                if (!test_bit(i, __get_cpu_var(mce_banks_owned)))
-                        continue;
-                /* Disable CMCI */
-                rdmsrl(MSR_IA32_MCx_CTL2(i), val);
-                val &= ~MCI_CTL2_CMCI_EN;
-                wrmsrl(MSR_IA32_MCx_CTL2(i), val);
-                __clear_bit(i, __get_cpu_var(mce_banks_owned));
-        }
+        for (i = 0; i < banks; i++)
+                __cmci_disable_bank(i);
         raw_spin_unlock_irqrestore(&cmci_discover_lock, flags);
 }
 
@@ -327,6 +336,19 @@ void cmci_reenable(void)
                 cmci_discover(banks);
 }
 
+void cmci_disable_bank(int bank)
+{
+        int banks;
+        unsigned long flags;
+
+        if (!cmci_supported(&banks))
+                return;
+
+        raw_spin_lock_irqsave(&cmci_discover_lock, flags);
+        __cmci_disable_bank(bank);
+        raw_spin_unlock_irqrestore(&cmci_discover_lock, flags);
+}
+
 static void intel_init_cmci(void)
 {
         int banks;
diff --git a/arch/x86/kernel/cpu/mshyperv.c b/arch/x86/kernel/cpu/mshyperv.c
index 8f4be53ea04b..71a39f3621ba 100644
--- a/arch/x86/kernel/cpu/mshyperv.c
+++ b/arch/x86/kernel/cpu/mshyperv.c
@@ -27,20 +27,23 @@
 struct ms_hyperv_info ms_hyperv;
 EXPORT_SYMBOL_GPL(ms_hyperv);
 
-static bool __init ms_hyperv_platform(void)
+static uint32_t  __init ms_hyperv_platform(void)
 {
         u32 eax;
         u32 hyp_signature[3];
 
         if (!boot_cpu_has(X86_FEATURE_HYPERVISOR))
-                return false;
+                return 0;
 
         cpuid(HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS,
               &eax, &hyp_signature[0], &hyp_signature[1], &hyp_signature[2]);
 
-        return eax >= HYPERV_CPUID_MIN &&
-                eax <= HYPERV_CPUID_MAX &&
-                !memcmp("Microsoft Hv", hyp_signature, 12);
+        if (eax >= HYPERV_CPUID_MIN &&
+            eax <= HYPERV_CPUID_MAX &&
+            !memcmp("Microsoft Hv", hyp_signature, 12))
+                return HYPERV_CPUID_VENDOR_AND_MAX_FUNCTIONS;
+
+        return 0;
 }
 
 static cycle_t read_hv_clock(struct clocksource *arg)
diff --git a/arch/x86/kernel/cpu/mtrr/generic.c b/arch/x86/kernel/cpu/mtrr/generic.c
index d4cdfa67509e..ce2d0a2c3e4f 100644
--- a/arch/x86/kernel/cpu/mtrr/generic.c
+++ b/arch/x86/kernel/cpu/mtrr/generic.c
@@ -683,6 +683,7 @@ static void prepare_set(void) __acquires(set_atomicity_lock)
         }
 
         /* Flush all TLBs via a mov %cr3, %reg; mov %reg, %cr3 */
+        count_vm_event(NR_TLB_LOCAL_FLUSH_ALL);
         __flush_tlb();
 
         /* Save MTRR state */
@@ -696,6 +697,7 @@ static void prepare_set(void) __acquires(set_atomicity_lock)
 static void post_set(void) __releases(set_atomicity_lock)
 {
         /* Flush TLBs (no need to flush caches - they are disabled) */
+        count_vm_event(NR_TLB_LOCAL_FLUSH_ALL);
         __flush_tlb();
 
         /* Intel (P6) standard MTRRs */
diff --git a/arch/x86/kernel/cpu/perf_event.c b/arch/x86/kernel/cpu/perf_event.c
index a7c7305030cc..a9c606bb4945 100644
--- a/arch/x86/kernel/cpu/perf_event.c
+++ b/arch/x86/kernel/cpu/perf_event.c
@@ -1883,8 +1883,9 @@ static struct pmu pmu = {
 
 void arch_perf_update_userpage(struct perf_event_mmap_page *userpg, u64 now)
 {
-        userpg->cap_usr_time = 0;
-        userpg->cap_usr_rdpmc = x86_pmu.attr_rdpmc;
+        userpg->cap_user_time = 0;
+        userpg->cap_user_time_zero = 0;
+        userpg->cap_user_rdpmc = x86_pmu.attr_rdpmc;
         userpg->pmc_width = x86_pmu.cntval_bits;
 
         if (!boot_cpu_has(X86_FEATURE_CONSTANT_TSC))
@@ -1893,10 +1894,15 @@ void arch_perf_update_userpage(struct perf_event_mmap_page *userpg, u64 now)
         if (!boot_cpu_has(X86_FEATURE_NONSTOP_TSC))
                 return;
 
-        userpg->cap_usr_time = 1;
+        userpg->cap_user_time = 1;
         userpg->time_mult = this_cpu_read(cyc2ns);
         userpg->time_shift = CYC2NS_SCALE_FACTOR;
         userpg->time_offset = this_cpu_read(cyc2ns_offset) - now;
+
+        if (sched_clock_stable && !check_tsc_disabled()) {
+                userpg->cap_user_time_zero = 1;
+                userpg->time_zero = this_cpu_read(cyc2ns_offset);
+        }
 }
 
 /*
diff --git a/arch/x86/kernel/cpu/perf_event.h b/arch/x86/kernel/cpu/perf_event.h
index 97e557bc4c91..cc16faae0538 100644
--- a/arch/x86/kernel/cpu/perf_event.h
+++ b/arch/x86/kernel/cpu/perf_event.h
@@ -641,6 +641,8 @@ extern struct event_constraint intel_core2_pebs_event_constraints[];
 
 extern struct event_constraint intel_atom_pebs_event_constraints[];
 
+extern struct event_constraint intel_slm_pebs_event_constraints[];
+
 extern struct event_constraint intel_nehalem_pebs_event_constraints[];
 
 extern struct event_constraint intel_westmere_pebs_event_constraints[];
diff --git a/arch/x86/kernel/cpu/perf_event_amd.c b/arch/x86/kernel/cpu/perf_event_amd.c
index 4cbe03287b08..beeb7cc07044 100644
--- a/arch/x86/kernel/cpu/perf_event_amd.c
+++ b/arch/x86/kernel/cpu/perf_event_amd.c
@@ -347,8 +347,7 @@ static struct amd_nb *amd_alloc_nb(int cpu)
         struct amd_nb *nb;
         int i;
 
-        nb = kmalloc_node(sizeof(struct amd_nb), GFP_KERNEL | __GFP_ZERO,
-                          cpu_to_node(cpu));
+        nb = kzalloc_node(sizeof(struct amd_nb), GFP_KERNEL, cpu_to_node(cpu));
         if (!nb)
                 return NULL;
 
diff --git a/arch/x86/kernel/cpu/perf_event_intel.c b/arch/x86/kernel/cpu/perf_event_intel.c
index a45d8d4ace10..f31a1655d1ff 100644
--- a/arch/x86/kernel/cpu/perf_event_intel.c
+++ b/arch/x86/kernel/cpu/perf_event_intel.c
@@ -81,7 +81,8 @@ static struct event_constraint intel_nehalem_event_constraints[] __read_mostly =
 
 static struct extra_reg intel_nehalem_extra_regs[] __read_mostly =
 {
-        INTEL_EVENT_EXTRA_REG(0xb7, MSR_OFFCORE_RSP_0, 0xffff, RSP_0),
+        /* must define OFFCORE_RSP_X first, see intel_fixup_er() */
+        INTEL_UEVENT_EXTRA_REG(0x01b7, MSR_OFFCORE_RSP_0, 0xffff, RSP_0),
         INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(0x100b),
         EVENT_EXTRA_END
 };
@@ -123,6 +124,7 @@ static struct event_constraint intel_ivb_event_constraints[] __read_mostly =
         INTEL_UEVENT_CONSTRAINT(0x0148, 0x4), /* L1D_PEND_MISS.PENDING */
         INTEL_UEVENT_CONSTRAINT(0x0279, 0xf), /* IDQ.EMTPY */
         INTEL_UEVENT_CONSTRAINT(0x019c, 0xf), /* IDQ_UOPS_NOT_DELIVERED.CORE */
+        INTEL_UEVENT_CONSTRAINT(0x02a3, 0xf), /* CYCLE_ACTIVITY.CYCLES_LDM_PENDING */
         INTEL_UEVENT_CONSTRAINT(0x04a3, 0xf), /* CYCLE_ACTIVITY.CYCLES_NO_EXECUTE */
         INTEL_UEVENT_CONSTRAINT(0x05a3, 0xf), /* CYCLE_ACTIVITY.STALLS_L2_PENDING */
         INTEL_UEVENT_CONSTRAINT(0x06a3, 0xf), /* CYCLE_ACTIVITY.STALLS_LDM_PENDING */
@@ -143,8 +145,9 @@ static struct event_constraint intel_ivb_event_constraints[] __read_mostly =
 
 static struct extra_reg intel_westmere_extra_regs[] __read_mostly =
 {
-        INTEL_EVENT_EXTRA_REG(0xb7, MSR_OFFCORE_RSP_0, 0xffff, RSP_0),
-        INTEL_EVENT_EXTRA_REG(0xbb, MSR_OFFCORE_RSP_1, 0xffff, RSP_1),
+        /* must define OFFCORE_RSP_X first, see intel_fixup_er() */
+        INTEL_UEVENT_EXTRA_REG(0x01b7, MSR_OFFCORE_RSP_0, 0xffff, RSP_0),
+        INTEL_UEVENT_EXTRA_REG(0x01bb, MSR_OFFCORE_RSP_1, 0xffff, RSP_1),
         INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(0x100b),
         EVENT_EXTRA_END
 };
@@ -162,16 +165,27 @@ static struct event_constraint intel_gen_event_constraints[] __read_mostly =
         EVENT_CONSTRAINT_END
 };
 
+static struct event_constraint intel_slm_event_constraints[] __read_mostly =
+{
+        FIXED_EVENT_CONSTRAINT(0x00c0, 0), /* INST_RETIRED.ANY */
+        FIXED_EVENT_CONSTRAINT(0x003c, 1), /* CPU_CLK_UNHALTED.CORE */
+        FIXED_EVENT_CONSTRAINT(0x013c, 2), /* CPU_CLK_UNHALTED.REF */
+        FIXED_EVENT_CONSTRAINT(0x0300, 2), /* pseudo CPU_CLK_UNHALTED.REF */
+        EVENT_CONSTRAINT_END
+};
+
 static struct extra_reg intel_snb_extra_regs[] __read_mostly = {
-        INTEL_EVENT_EXTRA_REG(0xb7, MSR_OFFCORE_RSP_0, 0x3f807f8fffull, RSP_0),
-        INTEL_EVENT_EXTRA_REG(0xbb, MSR_OFFCORE_RSP_1, 0x3f807f8fffull, RSP_1),
+        /* must define OFFCORE_RSP_X first, see intel_fixup_er() */
+        INTEL_UEVENT_EXTRA_REG(0x01b7, MSR_OFFCORE_RSP_0, 0x3f807f8fffull, RSP_0),
+        INTEL_UEVENT_EXTRA_REG(0x01bb, MSR_OFFCORE_RSP_1, 0x3f807f8fffull, RSP_1),
         INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(0x01cd),
         EVENT_EXTRA_END
 };
 
 static struct extra_reg intel_snbep_extra_regs[] __read_mostly = {
-        INTEL_EVENT_EXTRA_REG(0xb7, MSR_OFFCORE_RSP_0, 0x3fffff8fffull, RSP_0),
-        INTEL_EVENT_EXTRA_REG(0xbb, MSR_OFFCORE_RSP_1, 0x3fffff8fffull, RSP_1),
+        /* must define OFFCORE_RSP_X first, see intel_fixup_er() */
+        INTEL_UEVENT_EXTRA_REG(0x01b7, MSR_OFFCORE_RSP_0, 0x3fffff8fffull, RSP_0),
+        INTEL_UEVENT_EXTRA_REG(0x01bb, MSR_OFFCORE_RSP_1, 0x3fffff8fffull, RSP_1),
         INTEL_UEVENT_PEBS_LDLAT_EXTRA_REG(0x01cd),
         EVENT_EXTRA_END
 };
@@ -882,6 +896,140 @@ static __initconst const u64 atom_hw_cache_event_ids
  },
 };
 
+static struct extra_reg intel_slm_extra_regs[] __read_mostly =
+{
+        /* must define OFFCORE_RSP_X first, see intel_fixup_er() */
+        INTEL_UEVENT_EXTRA_REG(0x01b7, MSR_OFFCORE_RSP_0, 0x768005ffffull, RSP_0),
+        INTEL_UEVENT_EXTRA_REG(0x02b7, MSR_OFFCORE_RSP_1, 0x768005ffffull, RSP_1),
+        EVENT_EXTRA_END
+};
+
+#define SLM_DMND_READ           SNB_DMND_DATA_RD
+#define SLM_DMND_WRITE          SNB_DMND_RFO
+#define SLM_DMND_PREFETCH       (SNB_PF_DATA_RD|SNB_PF_RFO)
+
+#define SLM_SNP_ANY             (SNB_SNP_NONE|SNB_SNP_MISS|SNB_NO_FWD|SNB_HITM)
+#define SLM_LLC_ACCESS          SNB_RESP_ANY
+#define SLM_LLC_MISS            (SLM_SNP_ANY|SNB_NON_DRAM)
+
+static __initconst const u64 slm_hw_cache_extra_regs
+                                [PERF_COUNT_HW_CACHE_MAX]
+                                [PERF_COUNT_HW_CACHE_OP_MAX]
+                                [PERF_COUNT_HW_CACHE_RESULT_MAX] =
+{
+ [ C(LL  ) ] = {
+        [ C(OP_READ) ] = {
+                [ C(RESULT_ACCESS) ] = SLM_DMND_READ|SLM_LLC_ACCESS,
+                [ C(RESULT_MISS)   ] = SLM_DMND_READ|SLM_LLC_MISS,
+        },
+        [ C(OP_WRITE) ] = {
+                [ C(RESULT_ACCESS) ] = SLM_DMND_WRITE|SLM_LLC_ACCESS,
+                [ C(RESULT_MISS)   ] = SLM_DMND_WRITE|SLM_LLC_MISS,
+        },
+        [ C(OP_PREFETCH) ] = {
+                [ C(RESULT_ACCESS) ] = SLM_DMND_PREFETCH|SLM_LLC_ACCESS,
+                [ C(RESULT_MISS)   ] = SLM_DMND_PREFETCH|SLM_LLC_MISS,
+        },
+ },
+};
+
+static __initconst const u64 slm_hw_cache_event_ids
+                                [PERF_COUNT_HW_CACHE_MAX]
+                                [PERF_COUNT_HW_CACHE_OP_MAX]
+                                [PERF_COUNT_HW_CACHE_RESULT_MAX] =
+{
+ [ C(L1D) ] = {
+        [ C(OP_READ) ] = {
+                [ C(RESULT_ACCESS) ] = 0,
+                [ C(RESULT_MISS)   ] = 0x0104, /* LD_DCU_MISS */
+        },
+        [ C(OP_WRITE) ] = {
+                [ C(RESULT_ACCESS) ] = 0,
+                [ C(RESULT_MISS)   ] = 0,
+        },
+        [ C(OP_PREFETCH) ] = {
+                [ C(RESULT_ACCESS) ] = 0,
+                [ C(RESULT_MISS)   ] = 0,
+        },
+ },
+ [ C(L1I ) ] = {
+        [ C(OP_READ) ] = {
+                [ C(RESULT_ACCESS) ] = 0x0380, /* ICACHE.ACCESSES */
+                [ C(RESULT_MISS)   ] = 0x0280, /* ICACGE.MISSES */
+        },
+        [ C(OP_WRITE) ] = {
+                [ C(RESULT_ACCESS) ] = -1,
+                [ C(RESULT_MISS)   ] = -1,
+        },
+        [ C(OP_PREFETCH) ] = {
+                [ C(RESULT_ACCESS) ] = 0,
+                [ C(RESULT_MISS)   ] = 0,
+        },
+ },
+ [ C(LL  ) ] = {
+        [ C(OP_READ) ] = {
+                /* OFFCORE_RESPONSE.ANY_DATA.LOCAL_CACHE */
+                [ C(RESULT_ACCESS) ] = 0x01b7,
+                /* OFFCORE_RESPONSE.ANY_DATA.ANY_LLC_MISS */
+                [ C(RESULT_MISS)   ] = 0x01b7,
+        },
+        [ C(OP_WRITE) ] = {
+                /* OFFCORE_RESPONSE.ANY_RFO.LOCAL_CACHE */
+                [ C(RESULT_ACCESS) ] = 0x01b7,
+                /* OFFCORE_RESPONSE.ANY_RFO.ANY_LLC_MISS */
+                [ C(RESULT_MISS)   ] = 0x01b7,
+        },
+        [ C(OP_PREFETCH) ] = {
+                /* OFFCORE_RESPONSE.PREFETCH.LOCAL_CACHE */
+                [ C(RESULT_ACCESS) ] = 0x01b7,
+                /* OFFCORE_RESPONSE.PREFETCH.ANY_LLC_MISS */
+                [ C(RESULT_MISS)   ] = 0x01b7,
+        },
+ },
+ [ C(DTLB) ] = {
+        [ C(OP_READ) ] = {
+                [ C(RESULT_ACCESS) ] = 0,
+                [ C(RESULT_MISS)   ] = 0x0804, /* LD_DTLB_MISS */
+        },
+        [ C(OP_WRITE) ] = {
+                [ C(RESULT_ACCESS) ] = 0,
+                [ C(RESULT_MISS)   ] = 0,
+        },
+        [ C(OP_PREFETCH) ] = {
+                [ C(RESULT_ACCESS) ] = 0,
+                [ C(RESULT_MISS)   ] = 0,
+        },
+ },
+ [ C(ITLB) ] = {
+        [ C(OP_READ) ] = {
+                [ C(RESULT_ACCESS) ] = 0x00c0, /* INST_RETIRED.ANY_P */
+                [ C(RESULT_MISS)   ] = 0x0282, /* ITLB.MISSES */
+        },
+        [ C(OP_WRITE) ] = {
+                [ C(RESULT_ACCESS) ] = -1,
+                [ C(RESULT_MISS)   ] = -1,
+        },
+        [ C(OP_PREFETCH) ] = {
+                [ C(RESULT_ACCESS) ] = -1,
+                [ C(RESULT_MISS)   ] = -1,
+        },
+ },
+ [ C(BPU ) ] = {
+        [ C(OP_READ) ] = {
+                [ C(RESULT_ACCESS) ] = 0x00c4, /* BR_INST_RETIRED.ANY */
+                [ C(RESULT_MISS)   ] = 0x00c5, /* BP_INST_RETIRED.MISPRED */
+        },
+        [ C(OP_WRITE) ] = {
+                [ C(RESULT_ACCESS) ] = -1,
+                [ C(RESULT_MISS)   ] = -1,
+        },
+        [ C(OP_PREFETCH) ] = {
+                [ C(RESULT_ACCESS) ] = -1,
+                [ C(RESULT_MISS)   ] = -1,
+        },
+ },
+};
+
 static inline bool intel_pmu_needs_lbr_smpl(struct perf_event *event)
 {
         /* user explicitly requested branch sampling */
@@ -1301,11 +1449,11 @@ static void intel_fixup_er(struct perf_event *event, int idx)
 
         if (idx == EXTRA_REG_RSP_0) {
                 event->hw.config &= ~INTEL_ARCH_EVENT_MASK;
-                event->hw.config |= 0x01b7;
+                event->hw.config |= x86_pmu.extra_regs[EXTRA_REG_RSP_0].event;
                 event->hw.extra_reg.reg = MSR_OFFCORE_RSP_0;
         } else if (idx == EXTRA_REG_RSP_1) {
                 event->hw.config &= ~INTEL_ARCH_EVENT_MASK;
-                event->hw.config |= 0x01bb;
+                event->hw.config |= x86_pmu.extra_regs[EXTRA_REG_RSP_1].event;
                 event->hw.extra_reg.reg = MSR_OFFCORE_RSP_1;
         }
 }
@@ -2176,6 +2324,22 @@ __init int intel_pmu_init(void)
                 pr_cont("Atom events, ");
                 break;
 
+        case 55: /* Atom 22nm "Silvermont" */
+        case 77: /* Avoton "Silvermont" */
+                memcpy(hw_cache_event_ids, slm_hw_cache_event_ids,
+                        sizeof(hw_cache_event_ids));
+                memcpy(hw_cache_extra_regs, slm_hw_cache_extra_regs,
+                       sizeof(hw_cache_extra_regs));
+
+                intel_pmu_lbr_init_atom();
+
+                x86_pmu.event_constraints = intel_slm_event_constraints;
+                x86_pmu.pebs_constraints = intel_slm_pebs_event_constraints;
+                x86_pmu.extra_regs = intel_slm_extra_regs;
+                x86_pmu.er_flags |= ERF_HAS_RSP_1;
+                pr_cont("Silvermont events, ");
+                break;
+
         case 37: /* 32 nm nehalem, "Clarkdale" */
         case 44: /* 32 nm nehalem, "Gulftown" */
         case 47: /* 32 nm Xeon E7 */
diff --git a/arch/x86/kernel/cpu/perf_event_intel_ds.c b/arch/x86/kernel/cpu/perf_event_intel_ds.c
index 3065c57a63c1..ab3ba1c1b7dd 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_ds.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_ds.c
@@ -224,7 +224,7 @@ static int alloc_pebs_buffer(int cpu)
         if (!x86_pmu.pebs)
                 return 0;
 
-        buffer = kmalloc_node(PEBS_BUFFER_SIZE, GFP_KERNEL | __GFP_ZERO, node);
+        buffer = kzalloc_node(PEBS_BUFFER_SIZE, GFP_KERNEL, node);
         if (unlikely(!buffer))
                 return -ENOMEM;
 
@@ -262,7 +262,7 @@ static int alloc_bts_buffer(int cpu)
         if (!x86_pmu.bts)
                 return 0;
 
-        buffer = kmalloc_node(BTS_BUFFER_SIZE, GFP_KERNEL | __GFP_ZERO, node);
+        buffer = kzalloc_node(BTS_BUFFER_SIZE, GFP_KERNEL, node);
         if (unlikely(!buffer))
                 return -ENOMEM;
 
@@ -295,7 +295,7 @@ static int alloc_ds_buffer(int cpu)
         int node = cpu_to_node(cpu);
         struct debug_store *ds;
 
-        ds = kmalloc_node(sizeof(*ds), GFP_KERNEL | __GFP_ZERO, node);
+        ds = kzalloc_node(sizeof(*ds), GFP_KERNEL, node);
         if (unlikely(!ds))
                 return -ENOMEM;
 
@@ -517,6 +517,32 @@ struct event_constraint intel_atom_pebs_event_constraints[] = {
         EVENT_CONSTRAINT_END
 };
 
+struct event_constraint intel_slm_pebs_event_constraints[] = {
+        INTEL_UEVENT_CONSTRAINT(0x0103, 0x1), /* REHABQ.LD_BLOCK_ST_FORWARD_PS */
+        INTEL_UEVENT_CONSTRAINT(0x0803, 0x1), /* REHABQ.LD_SPLITS_PS */
+        INTEL_UEVENT_CONSTRAINT(0x0204, 0x1), /* MEM_UOPS_RETIRED.L2_HIT_LOADS_PS */
+        INTEL_UEVENT_CONSTRAINT(0x0404, 0x1), /* MEM_UOPS_RETIRED.L2_MISS_LOADS_PS */
+        INTEL_UEVENT_CONSTRAINT(0x0804, 0x1), /* MEM_UOPS_RETIRED.DTLB_MISS_LOADS_PS */
+        INTEL_UEVENT_CONSTRAINT(0x2004, 0x1), /* MEM_UOPS_RETIRED.HITM_PS */
+        INTEL_UEVENT_CONSTRAINT(0x00c0, 0x1), /* INST_RETIRED.ANY_PS */
+        INTEL_UEVENT_CONSTRAINT(0x00c4, 0x1), /* BR_INST_RETIRED.ALL_BRANCHES_PS */
+        INTEL_UEVENT_CONSTRAINT(0x7ec4, 0x1), /* BR_INST_RETIRED.JCC_PS */
+        INTEL_UEVENT_CONSTRAINT(0xbfc4, 0x1), /* BR_INST_RETIRED.FAR_BRANCH_PS */
+        INTEL_UEVENT_CONSTRAINT(0xebc4, 0x1), /* BR_INST_RETIRED.NON_RETURN_IND_PS */
+        INTEL_UEVENT_CONSTRAINT(0xf7c4, 0x1), /* BR_INST_RETIRED.RETURN_PS */
+        INTEL_UEVENT_CONSTRAINT(0xf9c4, 0x1), /* BR_INST_RETIRED.CALL_PS */
+        INTEL_UEVENT_CONSTRAINT(0xfbc4, 0x1), /* BR_INST_RETIRED.IND_CALL_PS */
+        INTEL_UEVENT_CONSTRAINT(0xfdc4, 0x1), /* BR_INST_RETIRED.REL_CALL_PS */
+        INTEL_UEVENT_CONSTRAINT(0xfec4, 0x1), /* BR_INST_RETIRED.TAKEN_JCC_PS */
+        INTEL_UEVENT_CONSTRAINT(0x00c5, 0x1), /* BR_INST_MISP_RETIRED.ALL_BRANCHES_PS */
+        INTEL_UEVENT_CONSTRAINT(0x7ec5, 0x1), /* BR_INST_MISP_RETIRED.JCC_PS */
+        INTEL_UEVENT_CONSTRAINT(0xebc5, 0x1), /* BR_INST_MISP_RETIRED.NON_RETURN_IND_PS */
+        INTEL_UEVENT_CONSTRAINT(0xf7c5, 0x1), /* BR_INST_MISP_RETIRED.RETURN_PS */
+        INTEL_UEVENT_CONSTRAINT(0xfbc5, 0x1), /* BR_INST_MISP_RETIRED.IND_CALL_PS */
+        INTEL_UEVENT_CONSTRAINT(0xfec5, 0x1), /* BR_INST_MISP_RETIRED.TAKEN_JCC_PS */
+        EVENT_CONSTRAINT_END
+};
+
 struct event_constraint intel_nehalem_pebs_event_constraints[] = {
         INTEL_PLD_CONSTRAINT(0x100b, 0xf),      /* MEM_INST_RETIRED.* */
         INTEL_EVENT_CONSTRAINT(0x0f, 0xf),    /* MEM_UNCORE_RETIRED.* */
@@ -558,6 +584,7 @@ struct event_constraint intel_snb_pebs_event_constraints[] = {
         INTEL_EVENT_CONSTRAINT(0xd0, 0xf),    /* MEM_UOP_RETIRED.* */
         INTEL_EVENT_CONSTRAINT(0xd1, 0xf),    /* MEM_LOAD_UOPS_RETIRED.* */
         INTEL_EVENT_CONSTRAINT(0xd2, 0xf),    /* MEM_LOAD_UOPS_LLC_HIT_RETIRED.* */
+        INTEL_EVENT_CONSTRAINT(0xd3, 0xf),    /* MEM_LOAD_UOPS_LLC_MISS_RETIRED.* */
         INTEL_UEVENT_CONSTRAINT(0x02d4, 0xf), /* MEM_LOAD_UOPS_MISC_RETIRED.LLC_MISS */
         EVENT_CONSTRAINT_END
 };
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.c b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
index 1fb6c72717bd..4118f9f68315 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.c
@@ -6,6 +6,8 @@ static struct intel_uncore_type **pci_uncores = empty_uncore;
 /* pci bus to socket mapping */
 static int pcibus_to_physid[256] = { [0 ... 255] = -1, };
 
+static struct pci_dev *extra_pci_dev[UNCORE_SOCKET_MAX][UNCORE_EXTRA_PCI_DEV_MAX];
+
 static DEFINE_RAW_SPINLOCK(uncore_box_lock);
 
 /* mask of cpus that collect uncore events */
@@ -45,6 +47,24 @@ DEFINE_UNCORE_FORMAT_ATTR(filter_band0, filter_band0, "config1:0-7");
 DEFINE_UNCORE_FORMAT_ATTR(filter_band1, filter_band1, "config1:8-15");
 DEFINE_UNCORE_FORMAT_ATTR(filter_band2, filter_band2, "config1:16-23");
 DEFINE_UNCORE_FORMAT_ATTR(filter_band3, filter_band3, "config1:24-31");
+DEFINE_UNCORE_FORMAT_ATTR(match_rds, match_rds, "config1:48-51");
+DEFINE_UNCORE_FORMAT_ATTR(match_rnid30, match_rnid30, "config1:32-35");
+DEFINE_UNCORE_FORMAT_ATTR(match_rnid4, match_rnid4, "config1:31");
+DEFINE_UNCORE_FORMAT_ATTR(match_dnid, match_dnid, "config1:13-17");
+DEFINE_UNCORE_FORMAT_ATTR(match_mc, match_mc, "config1:9-12");
+DEFINE_UNCORE_FORMAT_ATTR(match_opc, match_opc, "config1:5-8");
+DEFINE_UNCORE_FORMAT_ATTR(match_vnw, match_vnw, "config1:3-4");
+DEFINE_UNCORE_FORMAT_ATTR(match0, match0, "config1:0-31");
+DEFINE_UNCORE_FORMAT_ATTR(match1, match1, "config1:32-63");
+DEFINE_UNCORE_FORMAT_ATTR(mask_rds, mask_rds, "config2:48-51");
+DEFINE_UNCORE_FORMAT_ATTR(mask_rnid30, mask_rnid30, "config2:32-35");
+DEFINE_UNCORE_FORMAT_ATTR(mask_rnid4, mask_rnid4, "config2:31");
+DEFINE_UNCORE_FORMAT_ATTR(mask_dnid, mask_dnid, "config2:13-17");
+DEFINE_UNCORE_FORMAT_ATTR(mask_mc, mask_mc, "config2:9-12");
+DEFINE_UNCORE_FORMAT_ATTR(mask_opc, mask_opc, "config2:5-8");
+DEFINE_UNCORE_FORMAT_ATTR(mask_vnw, mask_vnw, "config2:3-4");
+DEFINE_UNCORE_FORMAT_ATTR(mask0, mask0, "config2:0-31");
+DEFINE_UNCORE_FORMAT_ATTR(mask1, mask1, "config2:32-63");
 
 static u64 uncore_msr_read_counter(struct intel_uncore_box *box, struct perf_event *event)
 {
@@ -281,7 +301,7 @@ static struct attribute *snbep_uncore_cbox_formats_attr[] = {
 };
 
 static struct attribute *snbep_uncore_pcu_formats_attr[] = {
-        &format_attr_event.attr,
+        &format_attr_event_ext.attr,
         &format_attr_occ_sel.attr,
         &format_attr_edge.attr,
         &format_attr_inv.attr,
@@ -301,6 +321,24 @@ static struct attribute *snbep_uncore_qpi_formats_attr[] = {
         &format_attr_edge.attr,
         &format_attr_inv.attr,
         &format_attr_thresh8.attr,
+        &format_attr_match_rds.attr,
+        &format_attr_match_rnid30.attr,
+        &format_attr_match_rnid4.attr,
+        &format_attr_match_dnid.attr,
+        &format_attr_match_mc.attr,
+        &format_attr_match_opc.attr,
+        &format_attr_match_vnw.attr,
+        &format_attr_match0.attr,
+        &format_attr_match1.attr,
+        &format_attr_mask_rds.attr,
+        &format_attr_mask_rnid30.attr,
+        &format_attr_mask_rnid4.attr,
+        &format_attr_mask_dnid.attr,
+        &format_attr_mask_mc.attr,
+        &format_attr_mask_opc.attr,
+        &format_attr_mask_vnw.attr,
+        &format_attr_mask0.attr,
+        &format_attr_mask1.attr,
         NULL,
 };
 
@@ -356,13 +394,16 @@ static struct intel_uncore_ops snbep_uncore_msr_ops = {
         SNBEP_UNCORE_MSR_OPS_COMMON_INIT(),
 };
 
+#define SNBEP_UNCORE_PCI_OPS_COMMON_INIT()                      \
+        .init_box       = snbep_uncore_pci_init_box,            \
+        .disable_box    = snbep_uncore_pci_disable_box,         \
+        .enable_box     = snbep_uncore_pci_enable_box,          \
+        .disable_event  = snbep_uncore_pci_disable_event,       \
+        .read_counter   = snbep_uncore_pci_read_counter
+
 static struct intel_uncore_ops snbep_uncore_pci_ops = {
-        .init_box       = snbep_uncore_pci_init_box,
-        .disable_box    = snbep_uncore_pci_disable_box,
-        .enable_box     = snbep_uncore_pci_enable_box,
-        .disable_event  = snbep_uncore_pci_disable_event,
-        .enable_event   = snbep_uncore_pci_enable_event,
-        .read_counter   = snbep_uncore_pci_read_counter,
+        SNBEP_UNCORE_PCI_OPS_COMMON_INIT(),
+        .enable_event   = snbep_uncore_pci_enable_event,        \
 };
 
 static struct event_constraint snbep_uncore_cbox_constraints[] = {
@@ -726,6 +767,61 @@ static struct intel_uncore_type *snbep_msr_uncores[] = {
         NULL,
 };
 
+enum {
+        SNBEP_PCI_QPI_PORT0_FILTER,
+        SNBEP_PCI_QPI_PORT1_FILTER,
+};
+
+static int snbep_qpi_hw_config(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct hw_perf_event *hwc = &event->hw;
+        struct hw_perf_event_extra *reg1 = &hwc->extra_reg;
+        struct hw_perf_event_extra *reg2 = &hwc->branch_reg;
+
+        if ((hwc->config & SNBEP_PMON_CTL_EV_SEL_MASK) == 0x38) {
+                reg1->idx = 0;
+                reg1->reg = SNBEP_Q_Py_PCI_PMON_PKT_MATCH0;
+                reg1->config = event->attr.config1;
+                reg2->reg = SNBEP_Q_Py_PCI_PMON_PKT_MASK0;
+                reg2->config = event->attr.config2;
+        }
+        return 0;
+}
+
+static void snbep_qpi_enable_event(struct intel_uncore_box *box, struct perf_event *event)
+{
+        struct pci_dev *pdev = box->pci_dev;
+        struct hw_perf_event *hwc = &event->hw;
+        struct hw_perf_event_extra *reg1 = &hwc->extra_reg;
+        struct hw_perf_event_extra *reg2 = &hwc->branch_reg;
+
+        if (reg1->idx != EXTRA_REG_NONE) {
+                int idx = box->pmu->pmu_idx + SNBEP_PCI_QPI_PORT0_FILTER;
+                struct pci_dev *filter_pdev = extra_pci_dev[box->phys_id][idx];
+                WARN_ON_ONCE(!filter_pdev);
+                if (filter_pdev) {
+                        pci_write_config_dword(filter_pdev, reg1->reg,
+                                                (u32)reg1->config);
+                        pci_write_config_dword(filter_pdev, reg1->reg + 4,
+                                                (u32)(reg1->config >> 32));
+                        pci_write_config_dword(filter_pdev, reg2->reg,
+                                                (u32)reg2->config);
+                        pci_write_config_dword(filter_pdev, reg2->reg + 4,
+                                                (u32)(reg2->config >> 32));
+                }
+        }
+
+        pci_write_config_dword(pdev, hwc->config_base, hwc->config | SNBEP_PMON_CTL_EN);
+}
+
+static struct intel_uncore_ops snbep_uncore_qpi_ops = {
+        SNBEP_UNCORE_PCI_OPS_COMMON_INIT(),
+        .enable_event           = snbep_qpi_enable_event,
+        .hw_config              = snbep_qpi_hw_config,
+        .get_constraint         = uncore_get_constraint,
+        .put_constraint         = uncore_put_constraint,
+};
+
 #define SNBEP_UNCORE_PCI_COMMON_INIT()                          \
         .perf_ctr       = SNBEP_PCI_PMON_CTR0,                  \
         .event_ctl      = SNBEP_PCI_PMON_CTL0,                  \
@@ -755,17 +851,18 @@ static struct intel_uncore_type snbep_uncore_imc = {
 };
 
 static struct intel_uncore_type snbep_uncore_qpi = {
-        .name           = "qpi",
-        .num_counters   = 4,
-        .num_boxes      = 2,
-        .perf_ctr_bits  = 48,
-        .perf_ctr       = SNBEP_PCI_PMON_CTR0,
-        .event_ctl      = SNBEP_PCI_PMON_CTL0,
-        .event_mask     = SNBEP_QPI_PCI_PMON_RAW_EVENT_MASK,
-        .box_ctl        = SNBEP_PCI_PMON_BOX_CTL,
-        .ops            = &snbep_uncore_pci_ops,
-        .event_descs    = snbep_uncore_qpi_events,
-        .format_group   = &snbep_uncore_qpi_format_group,
+        .name                   = "qpi",
+        .num_counters           = 4,
+        .num_boxes              = 2,
+        .perf_ctr_bits          = 48,
+        .perf_ctr               = SNBEP_PCI_PMON_CTR0,
+        .event_ctl              = SNBEP_PCI_PMON_CTL0,
+        .event_mask             = SNBEP_QPI_PCI_PMON_RAW_EVENT_MASK,
+        .box_ctl                = SNBEP_PCI_PMON_BOX_CTL,
+        .num_shared_regs        = 1,
+        .ops                    = &snbep_uncore_qpi_ops,
+        .event_descs            = snbep_uncore_qpi_events,
+        .format_group           = &snbep_uncore_qpi_format_group,
 };
 
 
@@ -807,43 +904,53 @@ static struct intel_uncore_type *snbep_pci_uncores[] = {
 static DEFINE_PCI_DEVICE_TABLE(snbep_uncore_pci_ids) = {
         { /* Home Agent */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_HA),
-                .driver_data = SNBEP_PCI_UNCORE_HA,
+                .driver_data = UNCORE_PCI_DEV_DATA(SNBEP_PCI_UNCORE_HA, 0),
         },
         { /* MC Channel 0 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_IMC0),
-                .driver_data = SNBEP_PCI_UNCORE_IMC,
+                .driver_data = UNCORE_PCI_DEV_DATA(SNBEP_PCI_UNCORE_IMC, 0),
         },
         { /* MC Channel 1 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_IMC1),
-                .driver_data = SNBEP_PCI_UNCORE_IMC,
+                .driver_data = UNCORE_PCI_DEV_DATA(SNBEP_PCI_UNCORE_IMC, 1),
         },
         { /* MC Channel 2 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_IMC2),
-                .driver_data = SNBEP_PCI_UNCORE_IMC,
+                .driver_data = UNCORE_PCI_DEV_DATA(SNBEP_PCI_UNCORE_IMC, 2),
         },
         { /* MC Channel 3 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_IMC3),
-                .driver_data = SNBEP_PCI_UNCORE_IMC,
+                .driver_data = UNCORE_PCI_DEV_DATA(SNBEP_PCI_UNCORE_IMC, 3),
         },
         { /* QPI Port 0 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_QPI0),
-                .driver_data = SNBEP_PCI_UNCORE_QPI,
+                .driver_data = UNCORE_PCI_DEV_DATA(SNBEP_PCI_UNCORE_QPI, 0),
         },
         { /* QPI Port 1 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_QPI1),
-                .driver_data = SNBEP_PCI_UNCORE_QPI,
+                .driver_data = UNCORE_PCI_DEV_DATA(SNBEP_PCI_UNCORE_QPI, 1),
         },
         { /* R2PCIe */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_R2PCIE),
-                .driver_data = SNBEP_PCI_UNCORE_R2PCIE,
+                .driver_data = UNCORE_PCI_DEV_DATA(SNBEP_PCI_UNCORE_R2PCIE, 0),
         },
         { /* R3QPI Link 0 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_R3QPI0),
-                .driver_data = SNBEP_PCI_UNCORE_R3QPI,
+                .driver_data = UNCORE_PCI_DEV_DATA(SNBEP_PCI_UNCORE_R3QPI, 0),
         },
         { /* R3QPI Link 1 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_UNC_R3QPI1),
-                .driver_data = SNBEP_PCI_UNCORE_R3QPI,
+                .driver_data = UNCORE_PCI_DEV_DATA(SNBEP_PCI_UNCORE_R3QPI, 1),
+        },
+        { /* QPI Port 0 filter  */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x3c86),
+                .driver_data = UNCORE_PCI_DEV_DATA(UNCORE_EXTRA_PCI_DEV,
+                                                   SNBEP_PCI_QPI_PORT0_FILTER),
+        },
+        { /* QPI Port 0 filter  */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x3c96),
+                .driver_data = UNCORE_PCI_DEV_DATA(UNCORE_EXTRA_PCI_DEV,
+                                                   SNBEP_PCI_QPI_PORT1_FILTER),
         },
         { /* end: all zeroes */ }
 };
@@ -1256,71 +1363,71 @@ static struct intel_uncore_type *ivt_pci_uncores[] = {
 static DEFINE_PCI_DEVICE_TABLE(ivt_uncore_pci_ids) = {
         { /* Home Agent 0 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe30),
-                .driver_data = IVT_PCI_UNCORE_HA,
+                .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_HA, 0),
         },
         { /* Home Agent 1 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe38),
-                .driver_data = IVT_PCI_UNCORE_HA,
+                .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_HA, 1),
         },
         { /* MC0 Channel 0 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xeb4),
-                .driver_data = IVT_PCI_UNCORE_IMC,
+                .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_IMC, 0),
         },
         { /* MC0 Channel 1 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xeb5),
-                .driver_data = IVT_PCI_UNCORE_IMC,
+                .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_IMC, 1),
         },
         { /* MC0 Channel 3 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xeb0),
-                .driver_data = IVT_PCI_UNCORE_IMC,
+                .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_IMC, 2),
         },
         { /* MC0 Channel 4 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xeb1),
-                .driver_data = IVT_PCI_UNCORE_IMC,
+                .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_IMC, 3),
         },
         { /* MC1 Channel 0 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xef4),
-                .driver_data = IVT_PCI_UNCORE_IMC,
+                .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_IMC, 4),
         },
         { /* MC1 Channel 1 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xef5),
-                .driver_data = IVT_PCI_UNCORE_IMC,
+                .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_IMC, 5),
         },
         { /* MC1 Channel 3 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xef0),
-                .driver_data = IVT_PCI_UNCORE_IMC,
+                .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_IMC, 6),
         },
         { /* MC1 Channel 4 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xef1),
-                .driver_data = IVT_PCI_UNCORE_IMC,
+                .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_IMC, 7),
         },
         { /* QPI0 Port 0 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe32),
-                .driver_data = IVT_PCI_UNCORE_QPI,
+                .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_QPI, 0),
         },
         { /* QPI0 Port 1 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe33),
-                .driver_data = IVT_PCI_UNCORE_QPI,
+                .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_QPI, 1),
         },
         { /* QPI1 Port 2 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe3a),
-                .driver_data = IVT_PCI_UNCORE_QPI,
+                .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_QPI, 2),
         },
         { /* R2PCIe */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe34),
-                .driver_data = IVT_PCI_UNCORE_R2PCIE,
+                .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_R2PCIE, 0),
         },
         { /* R3QPI0 Link 0 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe36),
-                .driver_data = IVT_PCI_UNCORE_R3QPI,
+                .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_R3QPI, 0),
         },
         { /* R3QPI0 Link 1 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe37),
-                .driver_data = IVT_PCI_UNCORE_R3QPI,
+                .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_R3QPI, 1),
         },
         { /* R3QPI1 Link 2 */
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xe3e),
-                .driver_data = IVT_PCI_UNCORE_R3QPI,
+                .driver_data = UNCORE_PCI_DEV_DATA(IVT_PCI_UNCORE_R3QPI, 2),
         },
         { /* end: all zeroes */ }
 };
@@ -2599,14 +2706,14 @@ static void uncore_pmu_init_hrtimer(struct intel_uncore_box *box)
         box->hrtimer.function = uncore_pmu_hrtimer;
 }
 
-struct intel_uncore_box *uncore_alloc_box(struct intel_uncore_type *type, int cpu)
+static struct intel_uncore_box *uncore_alloc_box(struct intel_uncore_type *type, int node)
 {
         struct intel_uncore_box *box;
         int i, size;
 
         size = sizeof(*box) + type->num_shared_regs * sizeof(struct intel_uncore_extra_reg);
 
-        box = kmalloc_node(size, GFP_KERNEL | __GFP_ZERO, cpu_to_node(cpu));
+        box = kzalloc_node(size, GFP_KERNEL, node);
         if (!box)
                 return NULL;
 
@@ -2701,7 +2808,7 @@ uncore_get_event_constraint(struct intel_uncore_box *box, struct perf_event *eve
                         return c;
         }
 
-        if (event->hw.config == ~0ULL)
+        if (event->attr.config == UNCORE_FIXED_EVENT)
                 return &constraint_fixed;
 
         if (type->constraints) {
@@ -2924,7 +3031,7 @@ static int uncore_validate_group(struct intel_uncore_pmu *pmu,
         struct intel_uncore_box *fake_box;
         int ret = -EINVAL, n;
 
-        fake_box = uncore_alloc_box(pmu->type, smp_processor_id());
+        fake_box = uncore_alloc_box(pmu->type, NUMA_NO_NODE);
         if (!fake_box)
                 return -ENOMEM;
 
@@ -3005,7 +3112,9 @@ static int uncore_pmu_event_init(struct perf_event *event)
                  */
                 if (pmu->type->single_fixed && pmu->pmu_idx > 0)
                         return -EINVAL;
-                hwc->config = ~0ULL;
+
+                /* fixed counters have event field hardcoded to zero */
+                hwc->config = 0ULL;
         } else {
                 hwc->config = event->attr.config & pmu->type->event_mask;
                 if (pmu->type->ops->hw_config) {
@@ -3167,17 +3276,25 @@ static bool pcidrv_registered;
 /*
  * add a pci uncore device
  */
-static int uncore_pci_add(struct intel_uncore_type *type, struct pci_dev *pdev)
+static int uncore_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 {
         struct intel_uncore_pmu *pmu;
         struct intel_uncore_box *box;
-        int i, phys_id;
+        struct intel_uncore_type *type;
+        int phys_id;
 
         phys_id = pcibus_to_physid[pdev->bus->number];
         if (phys_id < 0)
                 return -ENODEV;
 
-        box = uncore_alloc_box(type, 0);
+        if (UNCORE_PCI_DEV_TYPE(id->driver_data) == UNCORE_EXTRA_PCI_DEV) {
+                extra_pci_dev[phys_id][UNCORE_PCI_DEV_IDX(id->driver_data)] = pdev;
+                pci_set_drvdata(pdev, NULL);
+                return 0;
+        }
+
+        type = pci_uncores[UNCORE_PCI_DEV_TYPE(id->driver_data)];
+        box = uncore_alloc_box(type, NUMA_NO_NODE);
         if (!box)
                 return -ENOMEM;
 
@@ -3185,21 +3302,11 @@ static int uncore_pci_add(struct intel_uncore_type *type, struct pci_dev *pdev)
          * for performance monitoring unit with multiple boxes,
          * each box has a different function id.
          */
-        for (i = 0; i < type->num_boxes; i++) {
-                pmu = &type->pmus[i];
-                if (pmu->func_id == pdev->devfn)
-                        break;
-                if (pmu->func_id < 0) {
-                        pmu->func_id = pdev->devfn;
-                        break;
-                }
-                pmu = NULL;
-        }
-
-        if (!pmu) {
-                kfree(box);
-                return -EINVAL;
-        }
+        pmu = &type->pmus[UNCORE_PCI_DEV_IDX(id->driver_data)];
+        if (pmu->func_id < 0)
+                pmu->func_id = pdev->devfn;
+        else
+                WARN_ON_ONCE(pmu->func_id != pdev->devfn);
 
         box->phys_id = phys_id;
         box->pci_dev = pdev;
@@ -3217,9 +3324,22 @@ static int uncore_pci_add(struct intel_uncore_type *type, struct pci_dev *pdev)
 static void uncore_pci_remove(struct pci_dev *pdev)
 {
         struct intel_uncore_box *box = pci_get_drvdata(pdev);
-        struct intel_uncore_pmu *pmu = box->pmu;
-        int cpu, phys_id = pcibus_to_physid[pdev->bus->number];
+        struct intel_uncore_pmu *pmu;
+        int i, cpu, phys_id = pcibus_to_physid[pdev->bus->number];
+
+        box = pci_get_drvdata(pdev);
+        if (!box) {
+                for (i = 0; i < UNCORE_EXTRA_PCI_DEV_MAX; i++) {
+                        if (extra_pci_dev[phys_id][i] == pdev) {
+                                extra_pci_dev[phys_id][i] = NULL;
+                                break;
+                        }
+                }
+                WARN_ON_ONCE(i >= UNCORE_EXTRA_PCI_DEV_MAX);
+                return;
+        }
 
+        pmu = box->pmu;
         if (WARN_ON_ONCE(phys_id != box->phys_id))
                 return;
 
@@ -3240,12 +3360,6 @@ static void uncore_pci_remove(struct pci_dev *pdev)
         kfree(box);
 }
 
-static int uncore_pci_probe(struct pci_dev *pdev,
-                            const struct pci_device_id *id)
-{
-        return uncore_pci_add(pci_uncores[id->driver_data], pdev);
-}
-
 static int __init uncore_pci_init(void)
 {
         int ret;
@@ -3385,7 +3499,7 @@ static int uncore_cpu_prepare(int cpu, int phys_id)
                         if (pmu->func_id < 0)
                                 pmu->func_id = j;
 
-                        box = uncore_alloc_box(type, cpu);
+                        box = uncore_alloc_box(type, cpu_to_node(cpu));
                         if (!box)
                                 return -ENOMEM;
 
diff --git a/arch/x86/kernel/cpu/perf_event_intel_uncore.h b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
index 47b3d00c9d89..a80ab71a883d 100644
--- a/arch/x86/kernel/cpu/perf_event_intel_uncore.h
+++ b/arch/x86/kernel/cpu/perf_event_intel_uncore.h
@@ -12,6 +12,15 @@
 #define UNCORE_PMC_IDX_FIXED            UNCORE_PMC_IDX_MAX_GENERIC
 #define UNCORE_PMC_IDX_MAX              (UNCORE_PMC_IDX_FIXED + 1)
 
+#define UNCORE_PCI_DEV_DATA(type, idx)  ((type << 8) | idx)
+#define UNCORE_PCI_DEV_TYPE(data)       ((data >> 8) & 0xff)
+#define UNCORE_PCI_DEV_IDX(data)        (data & 0xff)
+#define UNCORE_EXTRA_PCI_DEV            0xff
+#define UNCORE_EXTRA_PCI_DEV_MAX        2
+
+/* support up to 8 sockets */
+#define UNCORE_SOCKET_MAX               8
+
 #define UNCORE_EVENT_CONSTRAINT(c, n) EVENT_CONSTRAINT(c, n, 0xff)
 
 /* SNB event control */
@@ -108,6 +117,7 @@
                                 (SNBEP_PMON_CTL_EV_SEL_MASK | \
                                  SNBEP_PCU_MSR_PMON_CTL_OCC_SEL_MASK | \
                                  SNBEP_PMON_CTL_EDGE_DET | \
+                                 SNBEP_PMON_CTL_EV_SEL_EXT | \
                                  SNBEP_PMON_CTL_INVERT | \
                                  SNBEP_PCU_MSR_PMON_CTL_TRESH_MASK | \
                                  SNBEP_PCU_MSR_PMON_CTL_OCC_INVERT | \
diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c
index 7076878404ec..628a059a9a06 100644
--- a/arch/x86/kernel/cpu/vmware.c
+++ b/arch/x86/kernel/cpu/vmware.c
@@ -93,7 +93,7 @@ static void __init vmware_platform_setup(void)
  * serial key should be enough, as this will always have a VMware
  * specific string when running under VMware hypervisor.
  */
-static bool __init vmware_platform(void)
+static uint32_t __init vmware_platform(void)
 {
         if (cpu_has_hypervisor) {
                 unsigned int eax;
@@ -102,12 +102,12 @@ static bool __init vmware_platform(void)
                 cpuid(CPUID_VMWARE_INFO_LEAF, &eax, &hyper_vendor_id[0],
                       &hyper_vendor_id[1], &hyper_vendor_id[2]);
                 if (!memcmp(hyper_vendor_id, "VMwareVMware", 12))
-                        return true;
+                        return CPUID_VMWARE_INFO_LEAF;
         } else if (dmi_available && dmi_name_in_serial("VMware") &&
                    __vmware_platform())
-                return true;
+                return 1;
 
-        return false;
+        return 0;
 }
 
 /*
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
index 74467feb4dc5..e0e0841eef45 100644
--- a/arch/x86/kernel/crash.c
+++ b/arch/x86/kernel/crash.c
@@ -128,7 +128,9 @@ void native_machine_crash_shutdown(struct pt_regs *regs)
         cpu_emergency_svm_disable();
 
         lapic_shutdown();
-#if defined(CONFIG_X86_IO_APIC)
+#ifdef CONFIG_X86_IO_APIC
+        /* Prevent crash_kexec() from deadlocking on ioapic_lock. */
+        ioapic_zap_locks();
         disable_IO_APIC();
 #endif
 #ifdef CONFIG_HPET_TIMER
diff --git a/arch/x86/kernel/devicetree.c b/arch/x86/kernel/devicetree.c
index 69eb2fa25494..376dc7873447 100644
--- a/arch/x86/kernel/devicetree.c
+++ b/arch/x86/kernel/devicetree.c
@@ -52,8 +52,7 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 align)
 }
 
 #ifdef CONFIG_BLK_DEV_INITRD
-void __init early_init_dt_setup_initrd_arch(unsigned long start,
-                                            unsigned long end)
+void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
 {
         initrd_start = (unsigned long)__va(start);
         initrd_end = (unsigned long)__va(end);
diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index d32abeabbda5..174da5fc5a7b 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -658,15 +658,18 @@ __init void e820_setup_gap(void)
  * boot_params.e820_map, others are passed via SETUP_E820_EXT node of
  * linked list of struct setup_data, which is parsed here.
  */
-void __init parse_e820_ext(struct setup_data *sdata)
+void __init parse_e820_ext(u64 phys_addr, u32 data_len)
 {
         int entries;
         struct e820entry *extmap;
+        struct setup_data *sdata;
 
+        sdata = early_memremap(phys_addr, data_len);
         entries = sdata->len / sizeof(struct e820entry);
         extmap = (struct e820entry *)(sdata->data);
         __append_e820_map(extmap, entries);
         sanitize_e820_map(e820.map, ARRAY_SIZE(e820.map), &e820.nr_map);
+        early_iounmap(sdata, data_len);
         printk(KERN_INFO "e820: extended physical RAM map:\n");
         e820_print_map("extended");
 }
diff --git a/arch/x86/kernel/early-quirks.c b/arch/x86/kernel/early-quirks.c
index 63bdb29b2549..b3cd3ebae077 100644
--- a/arch/x86/kernel/early-quirks.c
+++ b/arch/x86/kernel/early-quirks.c
@@ -12,6 +12,7 @@
 #include <linux/pci.h>
 #include <linux/acpi.h>
 #include <linux/pci_ids.h>
+#include <drm/i915_drm.h>
 #include <asm/pci-direct.h>
 #include <asm/dma.h>
 #include <asm/io_apic.h>
@@ -216,6 +217,157 @@ static void __init intel_remapping_check(int num, int slot, int func)
 
 }
 
+/*
+ * Systems with Intel graphics controllers set aside memory exclusively
+ * for gfx driver use.  This memory is not marked in the E820 as reserved
+ * or as RAM, and so is subject to overlap from E820 manipulation later
+ * in the boot process.  On some systems, MMIO space is allocated on top,
+ * despite the efforts of the "RAM buffer" approach, which simply rounds
+ * memory boundaries up to 64M to try to catch space that may decode
+ * as RAM and so is not suitable for MMIO.
+ *
+ * And yes, so far on current devices the base addr is always under 4G.
+ */
+static u32 __init intel_stolen_base(int num, int slot, int func)
+{
+        u32 base;
+
+        /*
+         * For the PCI IDs in this quirk, the stolen base is always
+         * in 0x5c, aka the BDSM register (yes that's really what
+         * it's called).
+         */
+        base = read_pci_config(num, slot, func, 0x5c);
+        base &= ~((1<<20) - 1);
+
+        return base;
+}
+
+#define KB(x)   ((x) * 1024)
+#define MB(x)   (KB (KB (x)))
+#define GB(x)   (MB (KB (x)))
+
+static size_t __init gen3_stolen_size(int num, int slot, int func)
+{
+        size_t stolen_size;
+        u16 gmch_ctrl;
+
+        gmch_ctrl = read_pci_config_16(0, 0, 0, I830_GMCH_CTRL);
+
+        switch (gmch_ctrl & I855_GMCH_GMS_MASK) {
+        case I855_GMCH_GMS_STOLEN_1M:
+                stolen_size = MB(1);
+                break;
+        case I855_GMCH_GMS_STOLEN_4M:
+                stolen_size = MB(4);
+                break;
+        case I855_GMCH_GMS_STOLEN_8M:
+                stolen_size = MB(8);
+                break;
+        case I855_GMCH_GMS_STOLEN_16M:
+                stolen_size = MB(16);
+                break;
+        case I855_GMCH_GMS_STOLEN_32M:
+                stolen_size = MB(32);
+                break;
+        case I915_GMCH_GMS_STOLEN_48M:
+                stolen_size = MB(48);
+                break;
+        case I915_GMCH_GMS_STOLEN_64M:
+                stolen_size = MB(64);
+                break;
+        case G33_GMCH_GMS_STOLEN_128M:
+                stolen_size = MB(128);
+                break;
+        case G33_GMCH_GMS_STOLEN_256M:
+                stolen_size = MB(256);
+                break;
+        case INTEL_GMCH_GMS_STOLEN_96M:
+                stolen_size = MB(96);
+                break;
+        case INTEL_GMCH_GMS_STOLEN_160M:
+                stolen_size = MB(160);
+                break;
+        case INTEL_GMCH_GMS_STOLEN_224M:
+                stolen_size = MB(224);
+                break;
+        case INTEL_GMCH_GMS_STOLEN_352M:
+                stolen_size = MB(352);
+                break;
+        default:
+                stolen_size = 0;
+                break;
+        }
+
+        return stolen_size;
+}
+
+static size_t __init gen6_stolen_size(int num, int slot, int func)
+{
+        u16 gmch_ctrl;
+
+        gmch_ctrl = read_pci_config_16(num, slot, func, SNB_GMCH_CTRL);
+        gmch_ctrl >>= SNB_GMCH_GMS_SHIFT;
+        gmch_ctrl &= SNB_GMCH_GMS_MASK;
+
+        return gmch_ctrl << 25; /* 32 MB units */
+}
+
+typedef size_t (*stolen_size_fn)(int num, int slot, int func);
+
+static struct pci_device_id intel_stolen_ids[] __initdata = {
+        INTEL_I915G_IDS(gen3_stolen_size),
+        INTEL_I915GM_IDS(gen3_stolen_size),
+        INTEL_I945G_IDS(gen3_stolen_size),
+        INTEL_I945GM_IDS(gen3_stolen_size),
+        INTEL_VLV_M_IDS(gen3_stolen_size),
+        INTEL_VLV_D_IDS(gen3_stolen_size),
+        INTEL_PINEVIEW_IDS(gen3_stolen_size),
+        INTEL_I965G_IDS(gen3_stolen_size),
+        INTEL_G33_IDS(gen3_stolen_size),
+        INTEL_I965GM_IDS(gen3_stolen_size),
+        INTEL_GM45_IDS(gen3_stolen_size),
+        INTEL_G45_IDS(gen3_stolen_size),
+        INTEL_IRONLAKE_D_IDS(gen3_stolen_size),
+        INTEL_IRONLAKE_M_IDS(gen3_stolen_size),
+        INTEL_SNB_D_IDS(gen6_stolen_size),
+        INTEL_SNB_M_IDS(gen6_stolen_size),
+        INTEL_IVB_M_IDS(gen6_stolen_size),
+        INTEL_IVB_D_IDS(gen6_stolen_size),
+        INTEL_HSW_D_IDS(gen6_stolen_size),
+        INTEL_HSW_M_IDS(gen6_stolen_size),
+};
+
+static void __init intel_graphics_stolen(int num, int slot, int func)
+{
+        size_t size;
+        int i;
+        u32 start;
+        u16 device, subvendor, subdevice;
+
+        device = read_pci_config_16(num, slot, func, PCI_DEVICE_ID);
+        subvendor = read_pci_config_16(num, slot, func,
+                                       PCI_SUBSYSTEM_VENDOR_ID);
+        subdevice = read_pci_config_16(num, slot, func, PCI_SUBSYSTEM_ID);
+
+        for (i = 0; i < ARRAY_SIZE(intel_stolen_ids); i++) {
+                if (intel_stolen_ids[i].device == device) {
+                        stolen_size_fn stolen_size =
+                                (stolen_size_fn)intel_stolen_ids[i].driver_data;
+                        size = stolen_size(num, slot, func);
+                        start = intel_stolen_base(num, slot, func);
+                        if (size && start) {
+                                /* Mark this space as reserved */
+                                e820_add_region(start, size, E820_RESERVED);
+                                sanitize_e820_map(e820.map,
+                                                  ARRAY_SIZE(e820.map),
+                                                  &e820.nr_map);
+                        }
+                        return;
+                }
+        }
+}
+
 #define QFLAG_APPLY_ONCE        0x1
 #define QFLAG_APPLIED           0x2
 #define QFLAG_DONE              (QFLAG_APPLY_ONCE|QFLAG_APPLIED)
@@ -251,6 +403,8 @@ static struct chipset early_qrk[] __initdata = {
           PCI_BASE_CLASS_BRIDGE, 0, intel_remapping_check },
         { PCI_VENDOR_ID_INTEL, 0x3406, PCI_CLASS_BRIDGE_HOST,
           PCI_BASE_CLASS_BRIDGE, 0, intel_remapping_check },
+        { PCI_VENDOR_ID_INTEL, PCI_ANY_ID, PCI_CLASS_DISPLAY_VGA, PCI_ANY_ID,
+          QFLAG_APPLY_ONCE, intel_graphics_stolen },
         {}
 };
 
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S
index 2cfbc3a3a2dd..f0dcb0ceb6a2 100644
--- a/arch/x86/kernel/entry_32.S
+++ b/arch/x86/kernel/entry_32.S
@@ -1176,6 +1176,9 @@ ftrace_restore_flags:
 #else /* ! CONFIG_DYNAMIC_FTRACE */
 
 ENTRY(mcount)
+        cmpl $__PAGE_OFFSET, %esp
+        jb ftrace_stub          /* Paging not enabled yet? */
+
         cmpl $0, function_trace_stop
         jne  ftrace_stub
 
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S
index 1b69951a81e2..b077f4cc225a 100644
--- a/arch/x86/kernel/entry_64.S
+++ b/arch/x86/kernel/entry_64.S
@@ -487,21 +487,6 @@ ENDPROC(native_usergs_sysret64)
         TRACE_IRQS_OFF
         .endm
 
-ENTRY(save_rest)
-        PARTIAL_FRAME 1 (REST_SKIP+8)
-        movq 5*8+16(%rsp), %r11 /* save return address */
-        movq_cfi rbx, RBX+16
-        movq_cfi rbp, RBP+16
-        movq_cfi r12, R12+16
-        movq_cfi r13, R13+16
-        movq_cfi r14, R14+16
-        movq_cfi r15, R15+16
-        movq %r11, 8(%rsp)      /* return address */
-        FIXUP_TOP_OF_STACK %r11, 16
-        ret
-        CFI_ENDPROC
-END(save_rest)
-
 /* save complete stack frame */
         .pushsection .kprobes.text, "ax"
 ENTRY(save_paranoid)
diff --git a/arch/x86/kernel/head32.c b/arch/x86/kernel/head32.c
index 138463a24877..06f87bece92a 100644
--- a/arch/x86/kernel/head32.c
+++ b/arch/x86/kernel/head32.c
@@ -29,7 +29,7 @@ static void __init i386_default_early_setup(void)
         reserve_ebda_region();
 }
 
-void __init i386_start_kernel(void)
+asmlinkage void __init i386_start_kernel(void)
 {
         sanitize_boot_params(&boot_params);
 
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 55b67614ed94..1be8e43b669e 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -137,7 +137,7 @@ static void __init copy_bootdata(char *real_mode_data)
         }
 }
 
-void __init x86_64_start_kernel(char * real_mode_data)
+asmlinkage void __init x86_64_start_kernel(char * real_mode_data)
 {
         int i;
 
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S
index 5dd87a89f011..81ba27679f18 100644
--- a/arch/x86/kernel/head_32.S
+++ b/arch/x86/kernel/head_32.S
@@ -409,6 +409,7 @@ enable_paging:
 /*
  * Check if it is 486
  */
+        movb $4,X86                     # at least 486
         cmpl $-1,X86_CPUID
         je is486
 
@@ -436,7 +437,6 @@ enable_paging:
         movl %edx,X86_CAPABILITY
 
 is486:
-        movb $4,X86
         movl $0x50022,%ecx      # set AM, WP, NE and MP
         movl %cr0,%eax
         andl $0x80000011,%eax   # Save PG,PE,ET
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c
index 3a8185c042a2..22d0687e7fda 100644
--- a/arch/x86/kernel/irq.c
+++ b/arch/x86/kernel/irq.c
@@ -177,7 +177,7 @@ u64 arch_irq_stat(void)
  * SMP cross-CPU interrupts have their own specific
  * handlers).
  */
-unsigned int __irq_entry do_IRQ(struct pt_regs *regs)
+__visible unsigned int __irq_entry do_IRQ(struct pt_regs *regs)
 {
         struct pt_regs *old_regs = set_irq_regs(regs);
 
@@ -215,7 +215,7 @@ void __smp_x86_platform_ipi(void)
                 x86_platform_ipi_callback();
 }
 
-void smp_x86_platform_ipi(struct pt_regs *regs)
+__visible void smp_x86_platform_ipi(struct pt_regs *regs)
 {
         struct pt_regs *old_regs = set_irq_regs(regs);
 
@@ -229,7 +229,7 @@ void smp_x86_platform_ipi(struct pt_regs *regs)
 /*
  * Handler for POSTED_INTERRUPT_VECTOR.
  */
-void smp_kvm_posted_intr_ipi(struct pt_regs *regs)
+__visible void smp_kvm_posted_intr_ipi(struct pt_regs *regs)
 {
         struct pt_regs *old_regs = set_irq_regs(regs);
 
@@ -247,7 +247,7 @@ void smp_kvm_posted_intr_ipi(struct pt_regs *regs)
 }
 #endif
 
-void smp_trace_x86_platform_ipi(struct pt_regs *regs)
+__visible void smp_trace_x86_platform_ipi(struct pt_regs *regs)
 {
         struct pt_regs *old_regs = set_irq_regs(regs);
 
diff --git a/arch/x86/kernel/irq_work.c b/arch/x86/kernel/irq_work.c
index 636a55e4a13c..1de84e3ab4e0 100644
--- a/arch/x86/kernel/irq_work.c
+++ b/arch/x86/kernel/irq_work.c
@@ -22,14 +22,14 @@ static inline void __smp_irq_work_interrupt(void)
         irq_work_run();
 }
 
-void smp_irq_work_interrupt(struct pt_regs *regs)
+__visible void smp_irq_work_interrupt(struct pt_regs *regs)
 {
         irq_work_entering_irq();
         __smp_irq_work_interrupt();
         exiting_irq();
 }
 
-void smp_trace_irq_work_interrupt(struct pt_regs *regs)
+__visible void smp_trace_irq_work_interrupt(struct pt_regs *regs)
 {
         irq_work_entering_irq();
         trace_irq_work_entry(IRQ_WORK_VECTOR);
diff --git a/arch/x86/kernel/jump_label.c b/arch/x86/kernel/jump_label.c
index 2889b3d43882..ee11b7dfbfbb 100644
--- a/arch/x86/kernel/jump_label.c
+++ b/arch/x86/kernel/jump_label.c
@@ -24,20 +24,71 @@ union jump_code_union {
         } __attribute__((packed));
 };
 
+static void bug_at(unsigned char *ip, int line)
+{
+        /*
+         * The location is not an op that we were expecting.
+         * Something went wrong. Crash the box, as something could be
+         * corrupting the kernel.
+         */
+        pr_warning("Unexpected op at %pS [%p] (%02x %02x %02x %02x %02x) %s:%d\n",
+               ip, ip, ip[0], ip[1], ip[2], ip[3], ip[4], __FILE__, line);
+        BUG();
+}
+
 static void __jump_label_transform(struct jump_entry *entry,
                                    enum jump_label_type type,
-                                   void *(*poker)(void *, const void *, size_t))
+                                   void *(*poker)(void *, const void *, size_t),
+                                   int init)
 {
         union jump_code_union code;
+        const unsigned char *ideal_nop = ideal_nops[NOP_ATOMIC5];
 
         if (type == JUMP_LABEL_ENABLE) {
+                /*
+                 * We are enabling this jump label. If it is not a nop
+                 * then something must have gone wrong.
+                 */
+                if (unlikely(memcmp((void *)entry->code, ideal_nop, 5) != 0))
+                        bug_at((void *)entry->code, __LINE__);
+
                 code.jump = 0xe9;
                 code.offset = entry->target -
                                 (entry->code + JUMP_LABEL_NOP_SIZE);
-        } else
+        } else {
+                /*
+                 * We are disabling this jump label. If it is not what
+                 * we think it is, then something must have gone wrong.
+                 * If this is the first initialization call, then we
+                 * are converting the default nop to the ideal nop.
+                 */
+                if (init) {
+                        const unsigned char default_nop[] = { STATIC_KEY_INIT_NOP };
+                        if (unlikely(memcmp((void *)entry->code, default_nop, 5) != 0))
+                                bug_at((void *)entry->code, __LINE__);
+                } else {
+                        code.jump = 0xe9;
+                        code.offset = entry->target -
+                                (entry->code + JUMP_LABEL_NOP_SIZE);
+                        if (unlikely(memcmp((void *)entry->code, &code, 5) != 0))
+                                bug_at((void *)entry->code, __LINE__);
+                }
                 memcpy(&code, ideal_nops[NOP_ATOMIC5], JUMP_LABEL_NOP_SIZE);
+        }
 
-        (*poker)((void *)entry->code, &code, JUMP_LABEL_NOP_SIZE);
+        /*
+         * Make text_poke_bp() a default fallback poker.
+         *
+         * At the time the change is being done, just ignore whether we
+         * are doing nop -> jump or jump -> nop transition, and assume
+         * always nop being the 'currently valid' instruction
+         *
+         */
+        if (poker)
+                (*poker)((void *)entry->code, &code, JUMP_LABEL_NOP_SIZE);
+        else
+                text_poke_bp((void *)entry->code, &code, JUMP_LABEL_NOP_SIZE,
+                             (void *)entry->code + JUMP_LABEL_NOP_SIZE);
 }
 
 void arch_jump_label_transform(struct jump_entry *entry,
@@ -45,15 +96,38 @@ void arch_jump_label_transform(struct jump_entry *entry,
 {
         get_online_cpus();
         mutex_lock(&text_mutex);
-        __jump_label_transform(entry, type, text_poke_smp);
+        __jump_label_transform(entry, type, NULL, 0);
         mutex_unlock(&text_mutex);
         put_online_cpus();
 }
 
+static enum {
+        JL_STATE_START,
+        JL_STATE_NO_UPDATE,
+        JL_STATE_UPDATE,
+} jlstate __initdata_or_module = JL_STATE_START;
+
 __init_or_module void arch_jump_label_transform_static(struct jump_entry *entry,
                                       enum jump_label_type type)
 {
-        __jump_label_transform(entry, type, text_poke_early);
+        /*
+         * This function is called at boot up and when modules are
+         * first loaded. Check if the default nop, the one that is
+         * inserted at compile time, is the ideal nop. If it is, then
+         * we do not need to update the nop, and we can leave it as is.
+         * If it is not, then we need to update the nop to the ideal nop.
+         */
+        if (jlstate == JL_STATE_START) {
+                const unsigned char default_nop[] = { STATIC_KEY_INIT_NOP };
+                const unsigned char *ideal_nop = ideal_nops[NOP_ATOMIC5];
+
+                if (memcmp(ideal_nop, default_nop, 5) != 0)
+                        jlstate = JL_STATE_UPDATE;
+                else
+                        jlstate = JL_STATE_NO_UPDATE;
+        }
+        if (jlstate == JL_STATE_UPDATE)
+                __jump_label_transform(entry, type, text_poke_early, 1);
 }
 
 #endif
diff --git a/arch/x86/kernel/kprobes/common.h b/arch/x86/kernel/kprobes/common.h
index 2e9d4b5af036..c6ee63f927ab 100644
--- a/arch/x86/kernel/kprobes/common.h
+++ b/arch/x86/kernel/kprobes/common.h
@@ -82,14 +82,9 @@ extern void synthesize_reljump(void *from, void *to);
 extern void synthesize_relcall(void *from, void *to);
 
 #ifdef  CONFIG_OPTPROBES
-extern int arch_init_optprobes(void);
 extern int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter);
 extern unsigned long __recover_optprobed_insn(kprobe_opcode_t *buf, unsigned long addr);
 #else   /* !CONFIG_OPTPROBES */
-static inline int arch_init_optprobes(void)
-{
-        return 0;
-}
 static inline int setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
 {
         return 0;
diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c
index 211bce445522..79a3f9682871 100644
--- a/arch/x86/kernel/kprobes/core.c
+++ b/arch/x86/kernel/kprobes/core.c
@@ -661,7 +661,7 @@ static void __used __kprobes kretprobe_trampoline_holder(void)
 /*
  * Called from kretprobe_trampoline
  */
-static __used __kprobes void *trampoline_handler(struct pt_regs *regs)
+__visible __used __kprobes void *trampoline_handler(struct pt_regs *regs)
 {
         struct kretprobe_instance *ri = NULL;
         struct hlist_head *head, empty_rp;
@@ -1068,7 +1068,7 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
 
 int __init arch_init_kprobes(void)
 {
-        return arch_init_optprobes();
+        return 0;
 }
 
 int __kprobes arch_trampoline_kprobe(struct kprobe *p)
diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c
index 76dc6f095724..898160b42e43 100644
--- a/arch/x86/kernel/kprobes/opt.c
+++ b/arch/x86/kernel/kprobes/opt.c
@@ -88,9 +88,7 @@ static void __kprobes synthesize_set_arg1(kprobe_opcode_t *addr, unsigned long v
         *(unsigned long *)addr = val;
 }
 
-static void __used __kprobes kprobes_optinsn_template_holder(void)
-{
-        asm volatile (
+asm (
                         ".global optprobe_template_entry\n"
                         "optprobe_template_entry:\n"
 #ifdef CONFIG_X86_64
@@ -129,7 +127,6 @@ static void __used __kprobes kprobes_optinsn_template_holder(void)
 #endif
                         ".global optprobe_template_end\n"
                         "optprobe_template_end:\n");
-}
 
 #define TMPL_MOVE_IDX \
         ((long)&optprobe_template_val - (long)&optprobe_template_entry)
@@ -371,31 +368,6 @@ int __kprobes arch_prepare_optimized_kprobe(struct optimized_kprobe *op)
         return 0;
 }
 
-#define MAX_OPTIMIZE_PROBES 256
-static struct text_poke_param *jump_poke_params;
-static struct jump_poke_buffer {
-        u8 buf[RELATIVEJUMP_SIZE];
-} *jump_poke_bufs;
-
-static void __kprobes setup_optimize_kprobe(struct text_poke_param *tprm,
-                                            u8 *insn_buf,
-                                            struct optimized_kprobe *op)
-{
-        s32 rel = (s32)((long)op->optinsn.insn -
-                        ((long)op->kp.addr + RELATIVEJUMP_SIZE));
-
-        /* Backup instructions which will be replaced by jump address */
-        memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
-               RELATIVE_ADDR_SIZE);
-
-        insn_buf[0] = RELATIVEJUMP_OPCODE;
-        *(s32 *)(&insn_buf[1]) = rel;
-
-        tprm->addr = op->kp.addr;
-        tprm->opcode = insn_buf;
-        tprm->len = RELATIVEJUMP_SIZE;
-}
-
 /*
  * Replace breakpoints (int3) with relative jumps.
  * Caller must call with locking kprobe_mutex and text_mutex.
@@ -403,37 +375,38 @@ static void __kprobes setup_optimize_kprobe(struct text_poke_param *tprm,
 void __kprobes arch_optimize_kprobes(struct list_head *oplist)
 {
         struct optimized_kprobe *op, *tmp;
-        int c = 0;
+        u8 insn_buf[RELATIVEJUMP_SIZE];
 
         list_for_each_entry_safe(op, tmp, oplist, list) {
+                s32 rel = (s32)((long)op->optinsn.insn -
+                        ((long)op->kp.addr + RELATIVEJUMP_SIZE));
+
                 WARN_ON(kprobe_disabled(&op->kp));
-                /* Setup param */
-                setup_optimize_kprobe(&jump_poke_params[c],
-                                      jump_poke_bufs[c].buf, op);
+
+                /* Backup instructions which will be replaced by jump address */
+                memcpy(op->optinsn.copied_insn, op->kp.addr + INT3_SIZE,
+                       RELATIVE_ADDR_SIZE);
+
+                insn_buf[0] = RELATIVEJUMP_OPCODE;
+                *(s32 *)(&insn_buf[1]) = rel;
+
+                text_poke_bp(op->kp.addr, insn_buf, RELATIVEJUMP_SIZE,
+                             op->optinsn.insn);
+
                 list_del_init(&op->list);
-                if (++c >= MAX_OPTIMIZE_PROBES)
-                        break;
         }
-
-        /*
-         * text_poke_smp doesn't support NMI/MCE code modifying.
-         * However, since kprobes itself also doesn't support NMI/MCE
-         * code probing, it's not a problem.
-         */
-        text_poke_smp_batch(jump_poke_params, c);
 }
 
-static void __kprobes setup_unoptimize_kprobe(struct text_poke_param *tprm,
-                                              u8 *insn_buf,
-                                              struct optimized_kprobe *op)
+/* Replace a relative jump with a breakpoint (int3).  */
+void __kprobes arch_unoptimize_kprobe(struct optimized_kprobe *op)
 {
+        u8 insn_buf[RELATIVEJUMP_SIZE];
+
         /* Set int3 to first byte for kprobes */
         insn_buf[0] = BREAKPOINT_INSTRUCTION;
         memcpy(insn_buf + 1, op->optinsn.copied_insn, RELATIVE_ADDR_SIZE);
-
-        tprm->addr = op->kp.addr;
-        tprm->opcode = insn_buf;
-        tprm->len = RELATIVEJUMP_SIZE;
+        text_poke_bp(op->kp.addr, insn_buf, RELATIVEJUMP_SIZE,
+                     op->optinsn.insn);
 }
 
 /*
@@ -444,34 +417,11 @@ extern void arch_unoptimize_kprobes(struct list_head *oplist,
                                     struct list_head *done_list)
 {
         struct optimized_kprobe *op, *tmp;
-        int c = 0;
 
         list_for_each_entry_safe(op, tmp, oplist, list) {
-                /* Setup param */
-                setup_unoptimize_kprobe(&jump_poke_params[c],
-                                        jump_poke_bufs[c].buf, op);
+                arch_unoptimize_kprobe(op);
                 list_move(&op->list, done_list);
-                if (++c >= MAX_OPTIMIZE_PROBES)
-                        break;
         }
-
-        /*
-         * text_poke_smp doesn't support NMI/MCE code modifying.
-         * However, since kprobes itself also doesn't support NMI/MCE
-         * code probing, it's not a problem.
-         */
-        text_poke_smp_batch(jump_poke_params, c);
-}
-
-/* Replace a relative jump with a breakpoint (int3).  */
-void __kprobes arch_unoptimize_kprobe(struct optimized_kprobe *op)
-{
-        u8 buf[RELATIVEJUMP_SIZE];
-
-        /* Set int3 to first byte for kprobes */
-        buf[0] = BREAKPOINT_INSTRUCTION;
-        memcpy(buf + 1, op->optinsn.copied_insn, RELATIVE_ADDR_SIZE);
-        text_poke_smp(op->kp.addr, buf, RELATIVEJUMP_SIZE);
 }
 
 int  __kprobes
@@ -491,22 +441,3 @@ setup_detour_execution(struct kprobe *p, struct pt_regs *regs, int reenter)
         }
         return 0;
 }
-
-int __kprobes arch_init_optprobes(void)
-{
-        /* Allocate code buffer and parameter array */
-        jump_poke_bufs = kmalloc(sizeof(struct jump_poke_buffer) *
-                                 MAX_OPTIMIZE_PROBES, GFP_KERNEL);
-        if (!jump_poke_bufs)
-                return -ENOMEM;
-
-        jump_poke_params = kmalloc(sizeof(struct text_poke_param) *
-                                   MAX_OPTIMIZE_PROBES, GFP_KERNEL);
-        if (!jump_poke_params) {
-                kfree(jump_poke_bufs);
-                jump_poke_bufs = NULL;
-                return -ENOMEM;
-        }
-
-        return 0;
-}
diff --git a/arch/x86/kernel/kvm.c b/arch/x86/kernel/kvm.c
index 56e2fa4a8b13..697b93af02dd 100644
--- a/arch/x86/kernel/kvm.c
+++ b/arch/x86/kernel/kvm.c
@@ -500,11 +500,9 @@ void __init kvm_guest_init(void)
 #endif
 }
 
-static bool __init kvm_detect(void)
+static uint32_t __init kvm_detect(void)
 {
-        if (!kvm_para_available())
-                return false;
-        return true;
+        return kvm_cpuid_base();
 }
 
 const struct hypervisor_x86 x86_hyper_kvm __refconst = {
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c
index cd6de64cc480..1b10af835c31 100644
--- a/arch/x86/kernel/paravirt.c
+++ b/arch/x86/kernel/paravirt.c
@@ -62,11 +62,6 @@ void __init default_banner(void)
                pv_info.name);
 }
 
-/* Simple instruction patching code. */
-#define DEF_NATIVE(ops, name, code)                                     \
-        extern const char start_##ops##_##name[], end_##ops##_##name[]; \
-        asm("start_" #ops "_" #name ": " code "; end_" #ops "_" #name ":")
-
 /* Undefined instruction for dealing with missing ops pointers. */
 static const unsigned char ud2a[] = { 0x0f, 0x0b };
 
@@ -324,7 +319,7 @@ struct pv_time_ops pv_time_ops = {
         .steal_clock = native_steal_clock,
 };
 
-struct pv_irq_ops pv_irq_ops = {
+__visible struct pv_irq_ops pv_irq_ops = {
         .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl),
         .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl),
         .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable),
@@ -336,7 +331,7 @@ struct pv_irq_ops pv_irq_ops = {
 #endif
 };
 
-struct pv_cpu_ops pv_cpu_ops = {
+__visible struct pv_cpu_ops pv_cpu_ops = {
         .cpuid = native_cpuid,
         .get_debugreg = native_get_debugreg,
         .set_debugreg = native_set_debugreg,
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c
index 83369e5a1d27..c83516be1052 100644
--- a/arch/x86/kernel/process.c
+++ b/arch/x86/kernel/process.c
@@ -36,7 +36,7 @@
  * section. Since TSS's are completely CPU-local, we want them
  * on exact cacheline boundaries, to eliminate cacheline ping-pong.
  */
-DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
+__visible DEFINE_PER_CPU_SHARED_ALIGNED(struct tss_struct, init_tss) = INIT_TSS;
 
 #ifdef CONFIG_X86_64
 static DEFINE_PER_CPU(unsigned char, is_idle);
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c
index f8adefca71dc..884f98f69354 100644
--- a/arch/x86/kernel/process_32.c
+++ b/arch/x86/kernel/process_32.c
@@ -247,7 +247,7 @@ EXPORT_SYMBOL_GPL(start_thread);
  * the task-switch, and shows up in ret_from_fork in entry.S,
  * for example.
  */
-__notrace_funcgraph struct task_struct *
+__visible __notrace_funcgraph struct task_struct *
 __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
 {
         struct thread_struct *prev = &prev_p->thread,
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
index 05646bab4ca6..bb1dc51bab05 100644
--- a/arch/x86/kernel/process_64.c
+++ b/arch/x86/kernel/process_64.c
@@ -52,7 +52,7 @@
 
 asmlinkage extern void ret_from_fork(void);
 
-DEFINE_PER_CPU(unsigned long, old_rsp);
+asmlinkage DEFINE_PER_CPU(unsigned long, old_rsp);
 
 /* Prints also some state that isn't saved in the pt_regs */
 void __show_regs(struct pt_regs *regs, int all)
@@ -274,7 +274,7 @@ void start_thread_ia32(struct pt_regs *regs, u32 new_ip, u32 new_sp)
  * Kprobes not supported here. Set the probe on schedule instead.
  * Function graph tracer not supported too.
  */
-__notrace_funcgraph struct task_struct *
+__visible __notrace_funcgraph struct task_struct *
 __switch_to(struct task_struct *prev_p, struct task_struct *next_p)
 {
         struct thread_struct *prev = &prev_p->thread;
diff --git a/arch/x86/kernel/pvclock.c b/arch/x86/kernel/pvclock.c
index 2cb9470ea85b..a16bae3f83b3 100644
--- a/arch/x86/kernel/pvclock.c
+++ b/arch/x86/kernel/pvclock.c
@@ -128,46 +128,7 @@ void pvclock_read_wallclock(struct pvclock_wall_clock *wall_clock,
         set_normalized_timespec(ts, now.tv_sec, now.tv_nsec);
 }
 
-static struct pvclock_vsyscall_time_info *pvclock_vdso_info;
-
-static struct pvclock_vsyscall_time_info *
-pvclock_get_vsyscall_user_time_info(int cpu)
-{
-        if (!pvclock_vdso_info) {
-                BUG();
-                return NULL;
-        }
-
-        return &pvclock_vdso_info[cpu];
-}
-
-struct pvclock_vcpu_time_info *pvclock_get_vsyscall_time_info(int cpu)
-{
-        return &pvclock_get_vsyscall_user_time_info(cpu)->pvti;
-}
-
 #ifdef CONFIG_X86_64
-static int pvclock_task_migrate(struct notifier_block *nb, unsigned long l,
-                                void *v)
-{
-        struct task_migration_notifier *mn = v;
-        struct pvclock_vsyscall_time_info *pvti;
-
-        pvti = pvclock_get_vsyscall_user_time_info(mn->from_cpu);
-
-        /* this is NULL when pvclock vsyscall is not initialized */
-        if (unlikely(pvti == NULL))
-                return NOTIFY_DONE;
-
-        pvti->migrate_count++;
-
-        return NOTIFY_DONE;
-}
-
-static struct notifier_block pvclock_migrate = {
-        .notifier_call = pvclock_task_migrate,
-};
-
 /*
  * Initialize the generic pvclock vsyscall state.  This will allocate
  * a/some page(s) for the per-vcpu pvclock information, set up a
@@ -181,17 +142,12 @@ int __init pvclock_init_vsyscall(struct pvclock_vsyscall_time_info *i,
 
         WARN_ON (size != PVCLOCK_VSYSCALL_NR_PAGES*PAGE_SIZE);
 
-        pvclock_vdso_info = i;
-
         for (idx = 0; idx <= (PVCLOCK_FIXMAP_END-PVCLOCK_FIXMAP_BEGIN); idx++) {
                 __set_fixmap(PVCLOCK_FIXMAP_BEGIN + idx,
                              __pa(i) + (idx*PAGE_SIZE),
                              PAGE_KERNEL_VVAR);
         }
 
-
-        register_task_migration_notifier(&pvclock_migrate);
-
         return 0;
 }
 #endif
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c
index 563ed91e6faa..e643e744e4d8 100644
--- a/arch/x86/kernel/reboot.c
+++ b/arch/x86/kernel/reboot.c
@@ -352,12 +352,28 @@ static struct dmi_system_id __initdata reboot_dmi_table[] = {
         },
         {       /* Handle problems with rebooting on the Precision M6600. */
                 .callback = set_pci_reboot,
-                .ident = "Dell OptiPlex 990",
+                .ident = "Dell Precision M6600",
                 .matches = {
                         DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
                         DMI_MATCH(DMI_PRODUCT_NAME, "Precision M6600"),
                 },
         },
+        {       /* Handle problems with rebooting on the Dell PowerEdge C6100. */
+                .callback = set_pci_reboot,
+                .ident = "Dell PowerEdge C6100",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
+                },
+        },
+        {       /* Some C6100 machines were shipped with vendor being 'Dell'. */
+                .callback = set_pci_reboot,
+                .ident = "Dell PowerEdge C6100",
+                .matches = {
+                        DMI_MATCH(DMI_SYS_VENDOR, "Dell"),
+                        DMI_MATCH(DMI_PRODUCT_NAME, "C6100"),
+                },
+        },
         { }
 };
 
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index f8ec57815c05..f0de6294b955 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -206,9 +206,9 @@ EXPORT_SYMBOL(boot_cpu_data);
 
 
 #if !defined(CONFIG_X86_PAE) || defined(CONFIG_X86_64)
-unsigned long mmu_cr4_features;
+__visible unsigned long mmu_cr4_features;
 #else
-unsigned long mmu_cr4_features = X86_CR4_PAE;
+__visible unsigned long mmu_cr4_features = X86_CR4_PAE;
 #endif
 
 /* Boot loader ID and version as integers, for the benefit of proc_dointvec */
@@ -426,25 +426,23 @@ static void __init reserve_initrd(void)
 static void __init parse_setup_data(void)
 {
         struct setup_data *data;
-        u64 pa_data;
+        u64 pa_data, pa_next;
 
         pa_data = boot_params.hdr.setup_data;
         while (pa_data) {
-                u32 data_len, map_len;
+                u32 data_len, map_len, data_type;
 
                 map_len = max(PAGE_SIZE - (pa_data & ~PAGE_MASK),
                               (u64)sizeof(struct setup_data));
                 data = early_memremap(pa_data, map_len);
                 data_len = data->len + sizeof(struct setup_data);
-                if (data_len > map_len) {
-                        early_iounmap(data, map_len);
-                        data = early_memremap(pa_data, data_len);
-                        map_len = data_len;
-                }
+                data_type = data->type;
+                pa_next = data->next;
+                early_iounmap(data, map_len);
 
-                switch (data->type) {
+                switch (data_type) {
                 case SETUP_E820_EXT:
-                        parse_e820_ext(data);
+                        parse_e820_ext(pa_data, data_len);
                         break;
                 case SETUP_DTB:
                         add_dtb(pa_data);
@@ -452,8 +450,7 @@ static void __init parse_setup_data(void)
                 default:
                         break;
                 }
-                pa_data = data->next;
-                early_iounmap(data, map_len);
+                pa_data = pa_next;
         }
 }
 
@@ -1070,7 +1067,7 @@ void __init setup_arch(char **cmdline_p)
 
         cleanup_highmap();
 
-        memblock.current_limit = ISA_END_ADDRESS;
+        memblock_set_current_limit(ISA_END_ADDRESS);
         memblock_x86_fill();
 
         /*
@@ -1103,7 +1100,7 @@ void __init setup_arch(char **cmdline_p)
 
         setup_real_mode();
 
-        memblock.current_limit = get_max_mapped();
+        memblock_set_current_limit(get_max_mapped());
         dma_contiguous_reserve(0);
 
         /*
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
index cf913587d4dd..9e5de6813e1f 100644
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@ -358,7 +358,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
                 else
                         put_user_ex(0, &frame->uc.uc_flags);
                 put_user_ex(0, &frame->uc.uc_link);
-                err |= __save_altstack(&frame->uc.uc_stack, regs->sp);
+                save_altstack_ex(&frame->uc.uc_stack, regs->sp);
 
                 /* Set up to return from userspace.  */
                 restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn);
@@ -423,7 +423,7 @@ static int __setup_rt_frame(int sig, struct ksignal *ksig,
                 else
                         put_user_ex(0, &frame->uc.uc_flags);
                 put_user_ex(0, &frame->uc.uc_link);
-                err |= __save_altstack(&frame->uc.uc_stack, regs->sp);
+                save_altstack_ex(&frame->uc.uc_stack, regs->sp);
 
                 /* Set up to return from userspace.  If provided, use a stub
                    already in userspace.  */
@@ -490,7 +490,7 @@ static int x32_setup_rt_frame(struct ksignal *ksig,
                 else
                         put_user_ex(0, &frame->uc.uc_flags);
                 put_user_ex(0, &frame->uc.uc_link);
-                err |= __compat_save_altstack(&frame->uc.uc_stack, regs->sp);
+                compat_save_altstack_ex(&frame->uc.uc_stack, regs->sp);
                 put_user_ex(0, &frame->uc.uc__pad0);
 
                 if (ksig->ka.sa.sa_flags & SA_RESTORER) {
@@ -533,7 +533,7 @@ static int x32_setup_rt_frame(struct ksignal *ksig,
  * Do a signal return; undo the signal stack.
  */
 #ifdef CONFIG_X86_32
-unsigned long sys_sigreturn(void)
+asmlinkage unsigned long sys_sigreturn(void)
 {
         struct pt_regs *regs = current_pt_regs();
         struct sigframe __user *frame;
@@ -562,7 +562,7 @@ badframe:
 }
 #endif /* CONFIG_X86_32 */
 
-long sys_rt_sigreturn(void)
+asmlinkage long sys_rt_sigreturn(void)
 {
         struct pt_regs *regs = current_pt_regs();
         struct rt_sigframe __user *frame;
@@ -728,7 +728,7 @@ static void do_signal(struct pt_regs *regs)
  * notification of userspace execution resumption
  * - triggered by the TIF_WORK_MASK flags
  */
-void
+__visible void
 do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags)
 {
         user_exit();
diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c
index cdaa347dfcad..7c3a5a61f2e4 100644
--- a/arch/x86/kernel/smp.c
+++ b/arch/x86/kernel/smp.c
@@ -256,7 +256,7 @@ static inline void __smp_reschedule_interrupt(void)
         scheduler_ipi();
 }
 
-void smp_reschedule_interrupt(struct pt_regs *regs)
+__visible void smp_reschedule_interrupt(struct pt_regs *regs)
 {
         ack_APIC_irq();
         __smp_reschedule_interrupt();
@@ -271,7 +271,7 @@ static inline void smp_entering_irq(void)
         irq_enter();
 }
 
-void smp_trace_reschedule_interrupt(struct pt_regs *regs)
+__visible void smp_trace_reschedule_interrupt(struct pt_regs *regs)
 {
         /*
          * Need to call irq_enter() before calling the trace point.
@@ -295,14 +295,14 @@ static inline void __smp_call_function_interrupt(void)
         inc_irq_stat(irq_call_count);
 }
 
-void smp_call_function_interrupt(struct pt_regs *regs)
+__visible void smp_call_function_interrupt(struct pt_regs *regs)
 {
         smp_entering_irq();
         __smp_call_function_interrupt();
         exiting_irq();
 }
 
-void smp_trace_call_function_interrupt(struct pt_regs *regs)
+__visible void smp_trace_call_function_interrupt(struct pt_regs *regs)
 {
         smp_entering_irq();
         trace_call_function_entry(CALL_FUNCTION_VECTOR);
@@ -317,14 +317,14 @@ static inline void __smp_call_function_single_interrupt(void)
         inc_irq_stat(irq_call_count);
 }
 
-void smp_call_function_single_interrupt(struct pt_regs *regs)
+__visible void smp_call_function_single_interrupt(struct pt_regs *regs)
 {
         smp_entering_irq();
         __smp_call_function_single_interrupt();
         exiting_irq();
 }
 
-void smp_trace_call_function_single_interrupt(struct pt_regs *regs)
+__visible void smp_trace_call_function_single_interrupt(struct pt_regs *regs)
 {
         smp_entering_irq();
         trace_call_function_single_entry(CALL_FUNCTION_SINGLE_VECTOR);
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c
index aecc98a93d1b..6cacab671f9b 100644
--- a/arch/x86/kernel/smpboot.c
+++ b/arch/x86/kernel/smpboot.c
@@ -653,6 +653,7 @@ static void announce_cpu(int cpu, int apicid)
 {
         static int current_node = -1;
         int node = early_cpu_to_node(cpu);
+        int max_cpu_present = find_last_bit(cpumask_bits(cpu_present_mask), NR_CPUS);
 
         if (system_state == SYSTEM_BOOTING) {
                 if (node != current_node) {
@@ -661,7 +662,7 @@ static void announce_cpu(int cpu, int apicid)
                         current_node = node;
                         pr_info("Booting Node %3d, Processors ", node);
                 }
-                pr_cont(" #%d%s", cpu, cpu == (nr_cpu_ids - 1) ? " OK\n" : "");
+                pr_cont(" #%4d%s", cpu, cpu == max_cpu_present ? " OK\n" : "");
                 return;
         } else
                 pr_info("Booting Node %d Processor %d APIC 0x%x\n",
diff --git a/arch/x86/kernel/syscall_32.c b/arch/x86/kernel/syscall_32.c
index 147fcd4941c4..e9bcd57d8a9e 100644
--- a/arch/x86/kernel/syscall_32.c
+++ b/arch/x86/kernel/syscall_32.c
@@ -15,7 +15,7 @@ typedef asmlinkage void (*sys_call_ptr_t)(void);
 
 extern asmlinkage void sys_ni_syscall(void);
 
-const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {
+__visible const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {
         /*
          * Smells like a compiler bug -- it doesn't work
          * when the & below is removed.
diff --git a/arch/x86/kernel/syscall_64.c b/arch/x86/kernel/syscall_64.c
index 5c7f8c20da74..4ac730b37f0b 100644
--- a/arch/x86/kernel/syscall_64.c
+++ b/arch/x86/kernel/syscall_64.c
@@ -4,6 +4,7 @@
 #include <linux/sys.h>
 #include <linux/cache.h>
 #include <asm/asm-offsets.h>
+#include <asm/syscall.h>
 
 #define __SYSCALL_COMMON(nr, sym, compat) __SYSCALL_64(nr, sym, compat)
 
@@ -19,11 +20,9 @@
 
 #define __SYSCALL_64(nr, sym, compat) [nr] = sym,
 
-typedef void (*sys_call_ptr_t)(void);
-
 extern void sys_ni_syscall(void);
 
-const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {
+asmlinkage const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {
         /*
          * Smells like a compiler bug -- it doesn't work
          * when the & below is removed.
diff --git a/arch/x86/kernel/sysfb.c b/arch/x86/kernel/sysfb.c
new file mode 100644
index 000000000000..193ec2ce46c7
--- /dev/null
+++ b/arch/x86/kernel/sysfb.c
@@ -0,0 +1,74 @@
+/*
+ * Generic System Framebuffers on x86
+ * Copyright (c) 2012-2013 David Herrmann <dh.herrmann@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ */
+
+/*
+ * Simple-Framebuffer support for x86 systems
+ * Create a platform-device for any available boot framebuffer. The
+ * simple-framebuffer platform device is already available on DT systems, so
+ * this module parses the global "screen_info" object and creates a suitable
+ * platform device compatible with the "simple-framebuffer" DT object. If
+ * the framebuffer is incompatible, we instead create a legacy
+ * "vesa-framebuffer", "efi-framebuffer" or "platform-framebuffer" device and
+ * pass the screen_info as platform_data. This allows legacy drivers
+ * to pick these devices up without messing with simple-framebuffer drivers.
+ * The global "screen_info" is still valid at all times.
+ *
+ * If CONFIG_X86_SYSFB is not selected, we never register "simple-framebuffer"
+ * platform devices, but only use legacy framebuffer devices for
+ * backwards compatibility.
+ *
+ * TODO: We set the dev_id field of all platform-devices to 0. This allows
+ * other x86 OF/DT parsers to create such devices, too. However, they must
+ * start at offset 1 for this to work.
+ */
+
+#include <linux/err.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/platform_data/simplefb.h>
+#include <linux/platform_device.h>
+#include <linux/screen_info.h>
+#include <asm/sysfb.h>
+
+static __init int sysfb_init(void)
+{
+        struct screen_info *si = &screen_info;
+        struct simplefb_platform_data mode;
+        struct platform_device *pd;
+        const char *name;
+        bool compatible;
+        int ret;
+
+        sysfb_apply_efi_quirks();
+
+        /* try to create a simple-framebuffer device */
+        compatible = parse_mode(si, &mode);
+        if (compatible) {
+                ret = create_simplefb(si, &mode);
+                if (!ret)
+                        return 0;
+        }
+
+        /* if the FB is incompatible, create a legacy framebuffer device */
+        if (si->orig_video_isVGA == VIDEO_TYPE_EFI)
+                name = "efi-framebuffer";
+        else if (si->orig_video_isVGA == VIDEO_TYPE_VLFB)
+                name = "vesa-framebuffer";
+        else
+                name = "platform-framebuffer";
+
+        pd = platform_device_register_resndata(NULL, name, 0,
+                                               NULL, 0, si, sizeof(*si));
+        return IS_ERR(pd) ? PTR_ERR(pd) : 0;
+}
+
+/* must execute after PCI subsystem for EFI quirks */
+device_initcall(sysfb_init);
diff --git a/arch/x86/kernel/sysfb_efi.c b/arch/x86/kernel/sysfb_efi.c
new file mode 100644
index 000000000000..b285d4e8c68e
--- /dev/null
+++ b/arch/x86/kernel/sysfb_efi.c
@@ -0,0 +1,214 @@
+/*
+ * Generic System Framebuffers on x86
+ * Copyright (c) 2012-2013 David Herrmann <dh.herrmann@gmail.com>
+ *
+ * EFI Quirks Copyright (c) 2006 Edgar Hucek <gimli@dark-green.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ */
+
+/*
+ * EFI Quirks
+ * Several EFI systems do not correctly advertise their boot framebuffers.
+ * Hence, we use this static table of known broken machines and fix up the
+ * information so framebuffer drivers can load corectly.
+ */
+
+#include <linux/dmi.h>
+#include <linux/err.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/pci.h>
+#include <linux/screen_info.h>
+#include <video/vga.h>
+#include <asm/sysfb.h>
+
+enum {
+        OVERRIDE_NONE = 0x0,
+        OVERRIDE_BASE = 0x1,
+        OVERRIDE_STRIDE = 0x2,
+        OVERRIDE_HEIGHT = 0x4,
+        OVERRIDE_WIDTH = 0x8,
+};
+
+struct efifb_dmi_info efifb_dmi_list[] = {
+        [M_I17] = { "i17", 0x80010000, 1472 * 4, 1440, 900, OVERRIDE_NONE },
+        [M_I20] = { "i20", 0x80010000, 1728 * 4, 1680, 1050, OVERRIDE_NONE }, /* guess */
+        [M_I20_SR] = { "imac7", 0x40010000, 1728 * 4, 1680, 1050, OVERRIDE_NONE },
+        [M_I24] = { "i24", 0x80010000, 2048 * 4, 1920, 1200, OVERRIDE_NONE }, /* guess */
+        [M_I24_8_1] = { "imac8", 0xc0060000, 2048 * 4, 1920, 1200, OVERRIDE_NONE },
+        [M_I24_10_1] = { "imac10", 0xc0010000, 2048 * 4, 1920, 1080, OVERRIDE_NONE },
+        [M_I27_11_1] = { "imac11", 0xc0010000, 2560 * 4, 2560, 1440, OVERRIDE_NONE },
+        [M_MINI]= { "mini", 0x80000000, 2048 * 4, 1024, 768, OVERRIDE_NONE },
+        [M_MINI_3_1] = { "mini31", 0x40010000, 1024 * 4, 1024, 768, OVERRIDE_NONE },
+        [M_MINI_4_1] = { "mini41", 0xc0010000, 2048 * 4, 1920, 1200, OVERRIDE_NONE },
+        [M_MB] = { "macbook", 0x80000000, 2048 * 4, 1280, 800, OVERRIDE_NONE },
+        [M_MB_5_1] = { "macbook51", 0x80010000, 2048 * 4, 1280, 800, OVERRIDE_NONE },
+        [M_MB_6_1] = { "macbook61", 0x80010000, 2048 * 4, 1280, 800, OVERRIDE_NONE },
+        [M_MB_7_1] = { "macbook71", 0x80010000, 2048 * 4, 1280, 800, OVERRIDE_NONE },
+        [M_MBA] = { "mba", 0x80000000, 2048 * 4, 1280, 800, OVERRIDE_NONE },
+        /* 11" Macbook Air 3,1 passes the wrong stride */
+        [M_MBA_3] = { "mba3", 0, 2048 * 4, 0, 0, OVERRIDE_STRIDE },
+        [M_MBP] = { "mbp", 0x80010000, 1472 * 4, 1440, 900, OVERRIDE_NONE },
+        [M_MBP_2] = { "mbp2", 0, 0, 0, 0, OVERRIDE_NONE }, /* placeholder */
+        [M_MBP_2_2] = { "mbp22", 0x80010000, 1472 * 4, 1440, 900, OVERRIDE_NONE },
+        [M_MBP_SR] = { "mbp3", 0x80030000, 2048 * 4, 1440, 900, OVERRIDE_NONE },
+        [M_MBP_4] = { "mbp4", 0xc0060000, 2048 * 4, 1920, 1200, OVERRIDE_NONE },
+        [M_MBP_5_1] = { "mbp51", 0xc0010000, 2048 * 4, 1440, 900, OVERRIDE_NONE },
+        [M_MBP_5_2] = { "mbp52", 0xc0010000, 2048 * 4, 1920, 1200, OVERRIDE_NONE },
+        [M_MBP_5_3] = { "mbp53", 0xd0010000, 2048 * 4, 1440, 900, OVERRIDE_NONE },
+        [M_MBP_6_1] = { "mbp61", 0x90030000, 2048 * 4, 1920, 1200, OVERRIDE_NONE },
+        [M_MBP_6_2] = { "mbp62", 0x90030000, 2048 * 4, 1680, 1050, OVERRIDE_NONE },
+        [M_MBP_7_1] = { "mbp71", 0xc0010000, 2048 * 4, 1280, 800, OVERRIDE_NONE },
+        [M_MBP_8_2] = { "mbp82", 0x90010000, 1472 * 4, 1440, 900, OVERRIDE_NONE },
+        [M_UNKNOWN] = { NULL, 0, 0, 0, 0, OVERRIDE_NONE }
+};
+
+#define choose_value(dmivalue, fwvalue, field, flags) ({        \
+                typeof(fwvalue) _ret_ = fwvalue;                \
+                if ((flags) & (field))                          \
+                        _ret_ = dmivalue;                       \
+                else if ((fwvalue) == 0)                        \
+                        _ret_ = dmivalue;                       \
+                _ret_;                                          \
+        })
+
+static int __init efifb_set_system(const struct dmi_system_id *id)
+{
+        struct efifb_dmi_info *info = id->driver_data;
+
+        if (info->base == 0 && info->height == 0 && info->width == 0 &&
+            info->stride == 0)
+                return 0;
+
+        /* Trust the bootloader over the DMI tables */
+        if (screen_info.lfb_base == 0) {
+#if defined(CONFIG_PCI)
+                struct pci_dev *dev = NULL;
+                int found_bar = 0;
+#endif
+                if (info->base) {
+                        screen_info.lfb_base = choose_value(info->base,
+                                screen_info.lfb_base, OVERRIDE_BASE,
+                                info->flags);
+
+#if defined(CONFIG_PCI)
+                        /* make sure that the address in the table is actually
+                         * on a VGA device's PCI BAR */
+
+                        for_each_pci_dev(dev) {
+                                int i;
+                                if ((dev->class >> 8) != PCI_CLASS_DISPLAY_VGA)
+                                        continue;
+                                for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
+                                        resource_size_t start, end;
+
+                                        start = pci_resource_start(dev, i);
+                                        if (start == 0)
+                                                break;
+                                        end = pci_resource_end(dev, i);
+                                        if (screen_info.lfb_base >= start &&
+                                            screen_info.lfb_base < end) {
+                                                found_bar = 1;
+                                        }
+                                }
+                        }
+                        if (!found_bar)
+                                screen_info.lfb_base = 0;
+#endif
+                }
+        }
+        if (screen_info.lfb_base) {
+                screen_info.lfb_linelength = choose_value(info->stride,
+                        screen_info.lfb_linelength, OVERRIDE_STRIDE,
+                        info->flags);
+                screen_info.lfb_width = choose_value(info->width,
+                        screen_info.lfb_width, OVERRIDE_WIDTH,
+                        info->flags);
+                screen_info.lfb_height = choose_value(info->height,
+                        screen_info.lfb_height, OVERRIDE_HEIGHT,
+                        info->flags);
+                if (screen_info.orig_video_isVGA == 0)
+                        screen_info.orig_video_isVGA = VIDEO_TYPE_EFI;
+        } else {
+                screen_info.lfb_linelength = 0;
+                screen_info.lfb_width = 0;
+                screen_info.lfb_height = 0;
+                screen_info.orig_video_isVGA = 0;
+                return 0;
+        }
+
+        printk(KERN_INFO "efifb: dmi detected %s - framebuffer at 0x%08x "
+                         "(%dx%d, stride %d)\n", id->ident,
+                         screen_info.lfb_base, screen_info.lfb_width,
+                         screen_info.lfb_height, screen_info.lfb_linelength);
+
+        return 1;
+}
+
+#define EFIFB_DMI_SYSTEM_ID(vendor, name, enumid)               \
+        {                                                       \
+                efifb_set_system,                               \
+                name,                                           \
+                {                                               \
+                        DMI_MATCH(DMI_BIOS_VENDOR, vendor),     \
+                        DMI_MATCH(DMI_PRODUCT_NAME, name)       \
+                },                                              \
+                &efifb_dmi_list[enumid]                         \
+        }
+
+static const struct dmi_system_id efifb_dmi_system_table[] __initconst = {
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac4,1", M_I17),
+        /* At least one of these two will be right; maybe both? */
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac5,1", M_I20),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac5,1", M_I20),
+        /* At least one of these two will be right; maybe both? */
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "iMac6,1", M_I24),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac6,1", M_I24),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac7,1", M_I20_SR),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac8,1", M_I24_8_1),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac10,1", M_I24_10_1),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "iMac11,1", M_I27_11_1),
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "Macmini1,1", M_MINI),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "Macmini3,1", M_MINI_3_1),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "Macmini4,1", M_MINI_4_1),
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook1,1", M_MB),
+        /* At least one of these two will be right; maybe both? */
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook2,1", M_MB),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook2,1", M_MB),
+        /* At least one of these two will be right; maybe both? */
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBook3,1", M_MB),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook3,1", M_MB),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook4,1", M_MB),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook5,1", M_MB_5_1),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook6,1", M_MB_6_1),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBook7,1", M_MB_7_1),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookAir1,1", M_MBA),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookAir3,1", M_MBA_3),
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro1,1", M_MBP),
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro2,1", M_MBP_2),
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro2,2", M_MBP_2_2),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro2,1", M_MBP_2),
+        EFIFB_DMI_SYSTEM_ID("Apple Computer, Inc.", "MacBookPro3,1", M_MBP_SR),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro3,1", M_MBP_SR),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro4,1", M_MBP_4),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro5,1", M_MBP_5_1),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro5,2", M_MBP_5_2),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro5,3", M_MBP_5_3),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro6,1", M_MBP_6_1),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro6,2", M_MBP_6_2),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro7,1", M_MBP_7_1),
+        EFIFB_DMI_SYSTEM_ID("Apple Inc.", "MacBookPro8,2", M_MBP_8_2),
+        {},
+};
+
+__init void sysfb_apply_efi_quirks(void)
+{
+        if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI ||
+            !(screen_info.capabilities & VIDEO_CAPABILITY_SKIP_QUIRKS))
+                dmi_check_system(efifb_dmi_system_table);
+}
diff --git a/arch/x86/kernel/sysfb_simplefb.c b/arch/x86/kernel/sysfb_simplefb.c
new file mode 100644
index 000000000000..22513e96b012
--- /dev/null
+++ b/arch/x86/kernel/sysfb_simplefb.c
@@ -0,0 +1,95 @@
+/*
+ * Generic System Framebuffers on x86
+ * Copyright (c) 2012-2013 David Herrmann <dh.herrmann@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
+ */
+
+/*
+ * simple-framebuffer probing
+ * Try to convert "screen_info" into a "simple-framebuffer" compatible mode.
+ * If the mode is incompatible, we return "false" and let the caller create
+ * legacy nodes instead.
+ */
+
+#include <linux/err.h>
+#include <linux/init.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <linux/platform_data/simplefb.h>
+#include <linux/platform_device.h>
+#include <linux/screen_info.h>
+#include <asm/sysfb.h>
+
+static const char simplefb_resname[] = "BOOTFB";
+static const struct simplefb_format formats[] = SIMPLEFB_FORMATS;
+
+/* try parsing x86 screen_info into a simple-framebuffer mode struct */
+__init bool parse_mode(const struct screen_info *si,
+                       struct simplefb_platform_data *mode)
+{
+        const struct simplefb_format *f;
+        __u8 type;
+        unsigned int i;
+
+        type = si->orig_video_isVGA;
+        if (type != VIDEO_TYPE_VLFB && type != VIDEO_TYPE_EFI)
+                return false;
+
+        for (i = 0; i < ARRAY_SIZE(formats); ++i) {
+                f = &formats[i];
+                if (si->lfb_depth == f->bits_per_pixel &&
+                    si->red_size == f->red.length &&
+                    si->red_pos == f->red.offset &&
+                    si->green_size == f->green.length &&
+                    si->green_pos == f->green.offset &&
+                    si->blue_size == f->blue.length &&
+                    si->blue_pos == f->blue.offset &&
+                    si->rsvd_size == f->transp.length &&
+                    si->rsvd_pos == f->transp.offset) {
+                        mode->format = f->name;
+                        mode->width = si->lfb_width;
+                        mode->height = si->lfb_height;
+                        mode->stride = si->lfb_linelength;
+                        return true;
+                }
+        }
+
+        return false;
+}
+
+__init int create_simplefb(const struct screen_info *si,
+                           const struct simplefb_platform_data *mode)
+{
+        struct platform_device *pd;
+        struct resource res;
+        unsigned long len;
+
+        /* don't use lfb_size as it may contain the whole VMEM instead of only
+         * the part that is occupied by the framebuffer */
+        len = mode->height * mode->stride;
+        len = PAGE_ALIGN(len);
+        if (len > si->lfb_size << 16) {
+                printk(KERN_WARNING "sysfb: VRAM smaller than advertised\n");
+                return -EINVAL;
+        }
+
+        /* setup IORESOURCE_MEM as framebuffer memory */
+        memset(&res, 0, sizeof(res));
+        res.flags = IORESOURCE_MEM;
+        res.name = simplefb_resname;
+        res.start = si->lfb_base;
+        res.end = si->lfb_base + len - 1;
+        if (res.end <= res.start)
+                return -EINVAL;
+
+        pd = platform_device_register_resndata(NULL, "simple-framebuffer", 0,
+                                               &res, 1, mode, sizeof(*mode));
+        if (IS_ERR(pd))
+                return PTR_ERR(pd);
+
+        return 0;
+}
diff --git a/arch/x86/kernel/tboot.c b/arch/x86/kernel/tboot.c
index addf7b58f4e8..91a4496db434 100644
--- a/arch/x86/kernel/tboot.c
+++ b/arch/x86/kernel/tboot.c
@@ -301,6 +301,15 @@ static int tboot_sleep(u8 sleep_state, u32 pm1a_control, u32 pm1b_control)
         return 0;
 }
 
+static int tboot_extended_sleep(u8 sleep_state, u32 val_a, u32 val_b)
+{
+        if (!tboot_enabled())
+                return 0;
+
+        pr_warning("tboot is not able to suspend on platforms with reduced hardware sleep (ACPIv5)");
+        return -ENODEV;
+}
+
 static atomic_t ap_wfs_count;
 
 static int tboot_wait_for_aps(int num_aps)
@@ -422,6 +431,7 @@ static __init int tboot_late_init(void)
 #endif
 
         acpi_os_set_prepare_sleep(&tboot_sleep);
+        acpi_os_set_prepare_extended_sleep(&tboot_extended_sleep);
         return 0;
 }
 
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c
index 1b23a1c92746..8c8093b146ca 100644
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@ -58,6 +58,7 @@
 #include <asm/mce.h>
 #include <asm/fixmap.h>
 #include <asm/mach_traps.h>
+#include <asm/alternative.h>
 
 #ifdef CONFIG_X86_64
 #include <asm/x86_init.h>
@@ -327,6 +328,9 @@ dotraplinkage void __kprobes notrace do_int3(struct pt_regs *regs, long error_co
             ftrace_int3_handler(regs))
                 return;
 #endif
+        if (poke_int3_handler(regs))
+                return;
+
         prev_state = exception_enter();
 #ifdef CONFIG_KGDB_LOW_LEVEL_TRAP
         if (kgdb_ll_trap(DIE_INT3, "int3", regs, error_code, X86_TRAP_BP,
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
index 6ff49247edf8..930e5d48f560 100644
--- a/arch/x86/kernel/tsc.c
+++ b/arch/x86/kernel/tsc.c
@@ -89,6 +89,12 @@ int check_tsc_unstable(void)
 }
 EXPORT_SYMBOL_GPL(check_tsc_unstable);
 
+int check_tsc_disabled(void)
+{
+        return tsc_disabled;
+}
+EXPORT_SYMBOL_GPL(check_tsc_disabled);
+
 #ifdef CONFIG_X86_TSC
 int __init notsc_setup(char *str)
 {
diff --git a/arch/x86/kernel/x86_init.c b/arch/x86/kernel/x86_init.c
index 5f24c71accaa..8ce0072cd700 100644
--- a/arch/x86/kernel/x86_init.c
+++ b/arch/x86/kernel/x86_init.c
@@ -107,6 +107,8 @@ struct x86_platform_ops x86_platform = {
 };
 
 EXPORT_SYMBOL_GPL(x86_platform);
+
+#if defined(CONFIG_PCI_MSI)
 struct x86_msi_ops x86_msi = {
         .setup_msi_irqs         = native_setup_msi_irqs,
         .compose_msi_msg        = native_compose_msi_msg,
@@ -116,6 +118,28 @@ struct x86_msi_ops x86_msi = {
         .setup_hpet_msi         = default_setup_hpet_msi,
 };
 
+/* MSI arch specific hooks */
+int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
+{
+        return x86_msi.setup_msi_irqs(dev, nvec, type);
+}
+
+void arch_teardown_msi_irqs(struct pci_dev *dev)
+{
+        x86_msi.teardown_msi_irqs(dev);
+}
+
+void arch_teardown_msi_irq(unsigned int irq)
+{
+        x86_msi.teardown_msi_irq(irq);
+}
+
+void arch_restore_msi_irqs(struct pci_dev *dev, int irq)
+{
+        x86_msi.restore_msi_irqs(dev, irq);
+}
+#endif
+
 struct x86_io_apic_ops x86_io_apic_ops = {
         .init                   = native_io_apic_init_mappings,
         .read                   = native_io_apic_read,
diff --git a/arch/x86/kvm/cpuid.c b/arch/x86/kvm/cpuid.c
index a20ecb5b6cbf..b110fe6c03d4 100644
--- a/arch/x86/kvm/cpuid.c
+++ b/arch/x86/kvm/cpuid.c
@@ -413,7 +413,8 @@ static int do_cpuid_ent(struct kvm_cpuid_entry2 *entry, u32 function,
                              (1 << KVM_FEATURE_CLOCKSOURCE2) |
                              (1 << KVM_FEATURE_ASYNC_PF) |
                              (1 << KVM_FEATURE_PV_EOI) |
-                             (1 << KVM_FEATURE_CLOCKSOURCE_STABLE_BIT);
+                             (1 << KVM_FEATURE_CLOCKSOURCE_STABLE_BIT) |
+                             (1 << KVM_FEATURE_PV_UNHALT);
 
                 if (sched_info_on())
                         entry->eax |= (1 << KVM_FEATURE_STEAL_TIME);
diff --git a/arch/x86/kvm/emulate.c b/arch/x86/kvm/emulate.c
index 2bc1e81045b0..ddc3f3d2afdb 100644
--- a/arch/x86/kvm/emulate.c
+++ b/arch/x86/kvm/emulate.c
@@ -2025,6 +2025,17 @@ static int em_ret_far(struct x86_emulate_ctxt *ctxt)
         return rc;
 }
 
+static int em_ret_far_imm(struct x86_emulate_ctxt *ctxt)
+{
+        int rc;
+
+        rc = em_ret_far(ctxt);
+        if (rc != X86EMUL_CONTINUE)
+                return rc;
+        rsp_increment(ctxt, ctxt->src.val);
+        return X86EMUL_CONTINUE;
+}
+
 static int em_cmpxchg(struct x86_emulate_ctxt *ctxt)
 {
         /* Save real source value, then compare EAX against destination. */
@@ -3763,7 +3774,8 @@ static const struct opcode opcode_table[256] = {
         G(ByteOp, group11), G(0, group11),
         /* 0xC8 - 0xCF */
         I(Stack | SrcImmU16 | Src2ImmByte, em_enter), I(Stack, em_leave),
-        N, I(ImplicitOps | Stack, em_ret_far),
+        I(ImplicitOps | Stack | SrcImmU16, em_ret_far_imm),
+        I(ImplicitOps | Stack, em_ret_far),
         D(ImplicitOps), DI(SrcImmByte, intn),
         D(ImplicitOps | No64), II(ImplicitOps, em_iret, iret),
         /* 0xD0 - 0xD7 */
diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index afc11245827c..5439117d5c4c 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -79,16 +79,6 @@ static inline void apic_set_reg(struct kvm_lapic *apic, int reg_off, u32 val)
         *((u32 *) (apic->regs + reg_off)) = val;
 }
 
-static inline int apic_test_and_set_vector(int vec, void *bitmap)
-{
-        return test_and_set_bit(VEC_POS(vec), (bitmap) + REG_POS(vec));
-}
-
-static inline int apic_test_and_clear_vector(int vec, void *bitmap)
-{
-        return test_and_clear_bit(VEC_POS(vec), (bitmap) + REG_POS(vec));
-}
-
 static inline int apic_test_vector(int vec, void *bitmap)
 {
         return test_bit(VEC_POS(vec), (bitmap) + REG_POS(vec));
@@ -331,10 +321,10 @@ void kvm_apic_update_irr(struct kvm_vcpu *vcpu, u32 *pir)
 }
 EXPORT_SYMBOL_GPL(kvm_apic_update_irr);
 
-static inline int apic_test_and_set_irr(int vec, struct kvm_lapic *apic)
+static inline void apic_set_irr(int vec, struct kvm_lapic *apic)
 {
         apic->irr_pending = true;
-        return apic_test_and_set_vector(vec, apic->regs + APIC_IRR);
+        apic_set_vector(vec, apic->regs + APIC_IRR);
 }
 
 static inline int apic_search_irr(struct kvm_lapic *apic)
@@ -681,32 +671,28 @@ static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode,
                 if (unlikely(!apic_enabled(apic)))
                         break;
 
+                result = 1;
+
                 if (dest_map)
                         __set_bit(vcpu->vcpu_id, dest_map);
 
-                if (kvm_x86_ops->deliver_posted_interrupt) {
-                        result = 1;
+                if (kvm_x86_ops->deliver_posted_interrupt)
                         kvm_x86_ops->deliver_posted_interrupt(vcpu, vector);
-                } else {
-                        result = !apic_test_and_set_irr(vector, apic);
-
-                        if (!result) {
-                                if (trig_mode)
-                                        apic_debug("level trig mode repeatedly "
-                                                "for vector %d", vector);
-                                goto out;
-                        }
+                else {
+                        apic_set_irr(vector, apic);
 
                         kvm_make_request(KVM_REQ_EVENT, vcpu);
                         kvm_vcpu_kick(vcpu);
                 }
-out:
                 trace_kvm_apic_accept_irq(vcpu->vcpu_id, delivery_mode,
-                                trig_mode, vector, !result);
+                                          trig_mode, vector, false);
                 break;
 
         case APIC_DM_REMRD:
-                apic_debug("Ignoring delivery mode 3\n");
+                result = 1;
+                vcpu->arch.pv.pv_unhalted = 1;
+                kvm_make_request(KVM_REQ_EVENT, vcpu);
+                kvm_vcpu_kick(vcpu);
                 break;
 
         case APIC_DM_SMI:
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c
index 9e9285ae9b94..dce0df8150df 100644
--- a/arch/x86/kvm/mmu.c
+++ b/arch/x86/kvm/mmu.c
@@ -132,8 +132,8 @@ module_param(dbg, bool, 0644);
         (PAGE_MASK & ~((1ULL << (PAGE_SHIFT + (((level) - 1) \
                                             * PT32_LEVEL_BITS))) - 1))
 
-#define PT64_PERM_MASK (PT_PRESENT_MASK | PT_WRITABLE_MASK | PT_USER_MASK \
-                        | PT64_NX_MASK)
+#define PT64_PERM_MASK (PT_PRESENT_MASK | PT_WRITABLE_MASK | shadow_user_mask \
+                        | shadow_x_mask | shadow_nx_mask)
 
 #define ACC_EXEC_MASK    1
 #define ACC_WRITE_MASK   PT_WRITABLE_MASK
@@ -331,11 +331,6 @@ static int is_large_pte(u64 pte)
         return pte & PT_PAGE_SIZE_MASK;
 }
 
-static int is_dirty_gpte(unsigned long pte)
-{
-        return pte & PT_DIRTY_MASK;
-}
-
 static int is_rmap_spte(u64 pte)
 {
         return is_shadow_present_pte(pte);
@@ -2052,12 +2047,18 @@ static void shadow_walk_next(struct kvm_shadow_walk_iterator *iterator)
         return __shadow_walk_next(iterator, *iterator->sptep);
 }
 
-static void link_shadow_page(u64 *sptep, struct kvm_mmu_page *sp)
+static void link_shadow_page(u64 *sptep, struct kvm_mmu_page *sp, bool accessed)
 {
         u64 spte;
 
+        BUILD_BUG_ON(VMX_EPT_READABLE_MASK != PT_PRESENT_MASK ||
+                        VMX_EPT_WRITABLE_MASK != PT_WRITABLE_MASK);
+
         spte = __pa(sp->spt) | PT_PRESENT_MASK | PT_WRITABLE_MASK |
-               shadow_user_mask | shadow_x_mask | shadow_accessed_mask;
+               shadow_user_mask | shadow_x_mask;
+
+        if (accessed)
+                spte |= shadow_accessed_mask;
 
         mmu_spte_set(sptep, spte);
 }
@@ -2574,14 +2575,6 @@ static void nonpaging_new_cr3(struct kvm_vcpu *vcpu)
         mmu_free_roots(vcpu);
 }
 
-static bool is_rsvd_bits_set(struct kvm_mmu *mmu, u64 gpte, int level)
-{
-        int bit7;
-
-        bit7 = (gpte >> 7) & 1;
-        return (gpte & mmu->rsvd_bits_mask[bit7][level-1]) != 0;
-}
-
 static pfn_t pte_prefetch_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn,
                                      bool no_dirty_log)
 {
@@ -2594,26 +2587,6 @@ static pfn_t pte_prefetch_gfn_to_pfn(struct kvm_vcpu *vcpu, gfn_t gfn,
         return gfn_to_pfn_memslot_atomic(slot, gfn);
 }
 
-static bool prefetch_invalid_gpte(struct kvm_vcpu *vcpu,
-                                  struct kvm_mmu_page *sp, u64 *spte,
-                                  u64 gpte)
-{
-        if (is_rsvd_bits_set(&vcpu->arch.mmu, gpte, PT_PAGE_TABLE_LEVEL))
-                goto no_present;
-
-        if (!is_present_gpte(gpte))
-                goto no_present;
-
-        if (!(gpte & PT_ACCESSED_MASK))
-                goto no_present;
-
-        return false;
-
-no_present:
-        drop_spte(vcpu->kvm, spte);
-        return true;
-}
-
 static int direct_pte_prefetch_many(struct kvm_vcpu *vcpu,
                                     struct kvm_mmu_page *sp,
                                     u64 *start, u64 *end)
@@ -2710,7 +2683,7 @@ static int __direct_map(struct kvm_vcpu *vcpu, gpa_t v, int write,
                                               iterator.level - 1,
                                               1, ACC_ALL, iterator.sptep);
 
-                        link_shadow_page(iterator.sptep, sp);
+                        link_shadow_page(iterator.sptep, sp, true);
                 }
         }
         return emulate;
@@ -2808,7 +2781,7 @@ exit:
         return ret;
 }
 
-static bool page_fault_can_be_fast(struct kvm_vcpu *vcpu, u32 error_code)
+static bool page_fault_can_be_fast(u32 error_code)
 {
         /*
          * Do not fix the mmio spte with invalid generation number which
@@ -2861,7 +2834,7 @@ static bool fast_page_fault(struct kvm_vcpu *vcpu, gva_t gva, int level,
         bool ret = false;
         u64 spte = 0ull;
 
-        if (!page_fault_can_be_fast(vcpu, error_code))
+        if (!page_fault_can_be_fast(error_code))
                 return false;
 
         walk_shadow_page_lockless_begin(vcpu);
@@ -3209,6 +3182,7 @@ void kvm_mmu_sync_roots(struct kvm_vcpu *vcpu)
         mmu_sync_roots(vcpu);
         spin_unlock(&vcpu->kvm->mmu_lock);
 }
+EXPORT_SYMBOL_GPL(kvm_mmu_sync_roots);
 
 static gpa_t nonpaging_gva_to_gpa(struct kvm_vcpu *vcpu, gva_t vaddr,
                                   u32 access, struct x86_exception *exception)
@@ -3478,6 +3452,7 @@ void kvm_mmu_flush_tlb(struct kvm_vcpu *vcpu)
         ++vcpu->stat.tlb_flush;
         kvm_make_request(KVM_REQ_TLB_FLUSH, vcpu);
 }
+EXPORT_SYMBOL_GPL(kvm_mmu_flush_tlb);
 
 static void paging_new_cr3(struct kvm_vcpu *vcpu)
 {
@@ -3501,18 +3476,6 @@ static void paging_free(struct kvm_vcpu *vcpu)
         nonpaging_free(vcpu);
 }
 
-static inline void protect_clean_gpte(unsigned *access, unsigned gpte)
-{
-        unsigned mask;
-
-        BUILD_BUG_ON(PT_WRITABLE_MASK != ACC_WRITE_MASK);
-
-        mask = (unsigned)~ACC_WRITE_MASK;
-        /* Allow write access to dirty gptes */
-        mask |= (gpte >> (PT_DIRTY_SHIFT - PT_WRITABLE_SHIFT)) & PT_WRITABLE_MASK;
-        *access &= mask;
-}
-
 static bool sync_mmio_spte(struct kvm *kvm, u64 *sptep, gfn_t gfn,
                            unsigned access, int *nr_present)
 {
@@ -3530,16 +3493,6 @@ static bool sync_mmio_spte(struct kvm *kvm, u64 *sptep, gfn_t gfn,
         return false;
 }
 
-static inline unsigned gpte_access(struct kvm_vcpu *vcpu, u64 gpte)
-{
-        unsigned access;
-
-        access = (gpte & (PT_WRITABLE_MASK | PT_USER_MASK)) | ACC_EXEC_MASK;
-        access &= ~(gpte >> PT64_NX_SHIFT);
-
-        return access;
-}
-
 static inline bool is_last_gpte(struct kvm_mmu *mmu, unsigned level, unsigned gpte)
 {
         unsigned index;
@@ -3549,6 +3502,11 @@ static inline bool is_last_gpte(struct kvm_mmu *mmu, unsigned level, unsigned gp
         return mmu->last_pte_bitmap & (1 << index);
 }
 
+#define PTTYPE_EPT 18 /* arbitrary */
+#define PTTYPE PTTYPE_EPT
+#include "paging_tmpl.h"
+#undef PTTYPE
+
 #define PTTYPE 64
 #include "paging_tmpl.h"
 #undef PTTYPE
@@ -3563,6 +3521,8 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu,
         int maxphyaddr = cpuid_maxphyaddr(vcpu);
         u64 exb_bit_rsvd = 0;
 
+        context->bad_mt_xwr = 0;
+
         if (!context->nx)
                 exb_bit_rsvd = rsvd_bits(63, 63);
         switch (context->root_level) {
@@ -3618,7 +3578,40 @@ static void reset_rsvds_bits_mask(struct kvm_vcpu *vcpu,
         }
 }
 
-static void update_permission_bitmask(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu)
+static void reset_rsvds_bits_mask_ept(struct kvm_vcpu *vcpu,
+                struct kvm_mmu *context, bool execonly)
+{
+        int maxphyaddr = cpuid_maxphyaddr(vcpu);
+        int pte;
+
+        context->rsvd_bits_mask[0][3] =
+                rsvd_bits(maxphyaddr, 51) | rsvd_bits(3, 7);
+        context->rsvd_bits_mask[0][2] =
+                rsvd_bits(maxphyaddr, 51) | rsvd_bits(3, 6);
+        context->rsvd_bits_mask[0][1] =
+                rsvd_bits(maxphyaddr, 51) | rsvd_bits(3, 6);
+        context->rsvd_bits_mask[0][0] = rsvd_bits(maxphyaddr, 51);
+
+        /* large page */
+        context->rsvd_bits_mask[1][3] = context->rsvd_bits_mask[0][3];
+        context->rsvd_bits_mask[1][2] =
+                rsvd_bits(maxphyaddr, 51) | rsvd_bits(12, 29);
+        context->rsvd_bits_mask[1][1] =
+                rsvd_bits(maxphyaddr, 51) | rsvd_bits(12, 20);
+        context->rsvd_bits_mask[1][0] = context->rsvd_bits_mask[0][0];
+
+        for (pte = 0; pte < 64; pte++) {
+                int rwx_bits = pte & 7;
+                int mt = pte >> 3;
+                if (mt == 0x2 || mt == 0x3 || mt == 0x7 ||
+                                rwx_bits == 0x2 || rwx_bits == 0x6 ||
+                                (rwx_bits == 0x4 && !execonly))
+                        context->bad_mt_xwr |= (1ull << pte);
+        }
+}
+
+static void update_permission_bitmask(struct kvm_vcpu *vcpu,
+                struct kvm_mmu *mmu, bool ept)
 {
         unsigned bit, byte, pfec;
         u8 map;
@@ -3636,12 +3629,16 @@ static void update_permission_bitmask(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu
                         w = bit & ACC_WRITE_MASK;
                         u = bit & ACC_USER_MASK;
 
-                        /* Not really needed: !nx will cause pte.nx to fault */
-                        x |= !mmu->nx;
-                        /* Allow supervisor writes if !cr0.wp */
-                        w |= !is_write_protection(vcpu) && !uf;
-                        /* Disallow supervisor fetches of user code if cr4.smep */
-                        x &= !(smep && u && !uf);
+                        if (!ept) {
+                                /* Not really needed: !nx will cause pte.nx to fault */
+                                x |= !mmu->nx;
+                                /* Allow supervisor writes if !cr0.wp */
+                                w |= !is_write_protection(vcpu) && !uf;
+                                /* Disallow supervisor fetches of user code if cr4.smep */
+                                x &= !(smep && u && !uf);
+                        } else
+                                /* Not really needed: no U/S accesses on ept  */
+                                u = 1;
 
                         fault = (ff && !x) || (uf && !u) || (wf && !w);
                         map |= fault << bit;
@@ -3676,7 +3673,7 @@ static int paging64_init_context_common(struct kvm_vcpu *vcpu,
         context->root_level = level;
 
         reset_rsvds_bits_mask(vcpu, context);
-        update_permission_bitmask(vcpu, context);
+        update_permission_bitmask(vcpu, context, false);
         update_last_pte_bitmap(vcpu, context);
 
         ASSERT(is_pae(vcpu));
@@ -3706,7 +3703,7 @@ static int paging32_init_context(struct kvm_vcpu *vcpu,
         context->root_level = PT32_ROOT_LEVEL;
 
         reset_rsvds_bits_mask(vcpu, context);
-        update_permission_bitmask(vcpu, context);
+        update_permission_bitmask(vcpu, context, false);
         update_last_pte_bitmap(vcpu, context);
 
         context->new_cr3 = paging_new_cr3;
@@ -3768,7 +3765,7 @@ static int init_kvm_tdp_mmu(struct kvm_vcpu *vcpu)
                 context->gva_to_gpa = paging32_gva_to_gpa;
         }
 
-        update_permission_bitmask(vcpu, context);
+        update_permission_bitmask(vcpu, context, false);
         update_last_pte_bitmap(vcpu, context);
 
         return 0;
@@ -3800,6 +3797,33 @@ int kvm_init_shadow_mmu(struct kvm_vcpu *vcpu, struct kvm_mmu *context)
 }
 EXPORT_SYMBOL_GPL(kvm_init_shadow_mmu);
 
+int kvm_init_shadow_ept_mmu(struct kvm_vcpu *vcpu, struct kvm_mmu *context,
+                bool execonly)
+{
+        ASSERT(vcpu);
+        ASSERT(!VALID_PAGE(vcpu->arch.mmu.root_hpa));
+
+        context->shadow_root_level = kvm_x86_ops->get_tdp_level();
+
+        context->nx = true;
+        context->new_cr3 = paging_new_cr3;
+        context->page_fault = ept_page_fault;
+        context->gva_to_gpa = ept_gva_to_gpa;
+        context->sync_page = ept_sync_page;
+        context->invlpg = ept_invlpg;
+        context->update_pte = ept_update_pte;
+        context->free = paging_free;
+        context->root_level = context->shadow_root_level;
+        context->root_hpa = INVALID_PAGE;
+        context->direct_map = false;
+
+        update_permission_bitmask(vcpu, context, true);
+        reset_rsvds_bits_mask_ept(vcpu, context, execonly);
+
+        return 0;
+}
+EXPORT_SYMBOL_GPL(kvm_init_shadow_ept_mmu);
+
 static int init_kvm_softmmu(struct kvm_vcpu *vcpu)
 {
         int r = kvm_init_shadow_mmu(vcpu, vcpu->arch.walk_mmu);
@@ -3847,7 +3871,7 @@ static int init_kvm_nested_mmu(struct kvm_vcpu *vcpu)
                 g_context->gva_to_gpa = paging32_gva_to_gpa_nested;
         }
 
-        update_permission_bitmask(vcpu, g_context);
+        update_permission_bitmask(vcpu, g_context, false);
         update_last_pte_bitmap(vcpu, g_context);
 
         return 0;
@@ -3923,8 +3947,8 @@ static bool need_remote_flush(u64 old, u64 new)
                 return true;
         if ((old ^ new) & PT64_BASE_ADDR_MASK)
                 return true;
-        old ^= PT64_NX_MASK;
-        new ^= PT64_NX_MASK;
+        old ^= shadow_nx_mask;
+        new ^= shadow_nx_mask;
         return (old & ~new & PT64_PERM_MASK) != 0;
 }
 
@@ -4182,7 +4206,7 @@ int kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gva_t cr2, u32 error_code,
         switch (er) {
         case EMULATE_DONE:
                 return 1;
-        case EMULATE_DO_MMIO:
+        case EMULATE_USER_EXIT:
                 ++vcpu->stat.mmio_exits;
                 /* fall through */
         case EMULATE_FAIL:
@@ -4390,23 +4414,19 @@ void kvm_mmu_invalidate_mmio_sptes(struct kvm *kvm)
         /*
          * The very rare case: if the generation-number is round,
          * zap all shadow pages.
-         *
-         * The max value is MMIO_MAX_GEN - 1 since it is not called
-         * when mark memslot invalid.
          */
-        if (unlikely(kvm_current_mmio_generation(kvm) >= (MMIO_MAX_GEN - 1))) {
+        if (unlikely(kvm_current_mmio_generation(kvm) >= MMIO_MAX_GEN)) {
                 printk_ratelimited(KERN_INFO "kvm: zapping shadow pages for mmio generation wraparound\n");
                 kvm_mmu_invalidate_zap_all_pages(kvm);
         }
 }
 
-static int mmu_shrink(struct shrinker *shrink, struct shrink_control *sc)
+static unsigned long
+mmu_shrink_scan(struct shrinker *shrink, struct shrink_control *sc)
 {
         struct kvm *kvm;
         int nr_to_scan = sc->nr_to_scan;
-
-        if (nr_to_scan == 0)
-                goto out;
+        unsigned long freed = 0;
 
         raw_spin_lock(&kvm_lock);
 
@@ -4441,25 +4461,37 @@ static int mmu_shrink(struct shrinker *shrink, struct shrink_control *sc)
                         goto unlock;
                 }
 
-                prepare_zap_oldest_mmu_page(kvm, &invalid_list);
+                if (prepare_zap_oldest_mmu_page(kvm, &invalid_list))
+                        freed++;
                 kvm_mmu_commit_zap_page(kvm, &invalid_list);
 
 unlock:
                 spin_unlock(&kvm->mmu_lock);
                 srcu_read_unlock(&kvm->srcu, idx);
 
+                /*
+                 * unfair on small ones
+                 * per-vm shrinkers cry out
+                 * sadness comes quickly
+                 */
                 list_move_tail(&kvm->vm_list, &vm_list);
                 break;
         }
 
         raw_spin_unlock(&kvm_lock);
+        return freed;
 
-out:
+}
+
+static unsigned long
+mmu_shrink_count(struct shrinker *shrink, struct shrink_control *sc)
+{
         return percpu_counter_read_positive(&kvm_total_used_mmu_pages);
 }
 
 static struct shrinker mmu_shrinker = {
-        .shrink = mmu_shrink,
+        .count_objects = mmu_shrink_count,
+        .scan_objects = mmu_shrink_scan,
         .seeks = DEFAULT_SEEKS * 10,
 };
 
diff --git a/arch/x86/kvm/mmu.h b/arch/x86/kvm/mmu.h
index 5b59c573aba7..77e044a0f5f7 100644
--- a/arch/x86/kvm/mmu.h
+++ b/arch/x86/kvm/mmu.h
@@ -71,6 +71,8 @@ enum {
 
 int handle_mmio_page_fault_common(struct kvm_vcpu *vcpu, u64 addr, bool direct);
 int kvm_init_shadow_mmu(struct kvm_vcpu *vcpu, struct kvm_mmu *context);
+int kvm_init_shadow_ept_mmu(struct kvm_vcpu *vcpu, struct kvm_mmu *context,
+                bool execonly);
 
 static inline unsigned int kvm_mmu_available_pages(struct kvm *kvm)
 {
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h
index 7769699d48a8..ad75d77999d0 100644
--- a/arch/x86/kvm/paging_tmpl.h
+++ b/arch/x86/kvm/paging_tmpl.h
@@ -23,6 +23,13 @@
  * so the code in this file is compiled twice, once per pte size.
  */
 
+/*
+ * This is used to catch non optimized PT_GUEST_(DIRTY|ACCESS)_SHIFT macro
+ * uses for EPT without A/D paging type.
+ */
+extern u64 __pure __using_nonexistent_pte_bit(void)
+               __compiletime_error("wrong use of PT_GUEST_(DIRTY|ACCESS)_SHIFT");
+
 #if PTTYPE == 64
         #define pt_element_t u64
         #define guest_walker guest_walker64
@@ -32,6 +39,10 @@
         #define PT_LVL_OFFSET_MASK(lvl) PT64_LVL_OFFSET_MASK(lvl)
         #define PT_INDEX(addr, level) PT64_INDEX(addr, level)
         #define PT_LEVEL_BITS PT64_LEVEL_BITS
+        #define PT_GUEST_ACCESSED_MASK PT_ACCESSED_MASK
+        #define PT_GUEST_DIRTY_MASK PT_DIRTY_MASK
+        #define PT_GUEST_DIRTY_SHIFT PT_DIRTY_SHIFT
+        #define PT_GUEST_ACCESSED_SHIFT PT_ACCESSED_SHIFT
         #ifdef CONFIG_X86_64
         #define PT_MAX_FULL_LEVELS 4
         #define CMPXCHG cmpxchg
@@ -49,7 +60,26 @@
         #define PT_INDEX(addr, level) PT32_INDEX(addr, level)
         #define PT_LEVEL_BITS PT32_LEVEL_BITS
         #define PT_MAX_FULL_LEVELS 2
+        #define PT_GUEST_ACCESSED_MASK PT_ACCESSED_MASK
+        #define PT_GUEST_DIRTY_MASK PT_DIRTY_MASK
+        #define PT_GUEST_DIRTY_SHIFT PT_DIRTY_SHIFT
+        #define PT_GUEST_ACCESSED_SHIFT PT_ACCESSED_SHIFT
         #define CMPXCHG cmpxchg
+#elif PTTYPE == PTTYPE_EPT
+        #define pt_element_t u64
+        #define guest_walker guest_walkerEPT
+        #define FNAME(name) ept_##name
+        #define PT_BASE_ADDR_MASK PT64_BASE_ADDR_MASK
+        #define PT_LVL_ADDR_MASK(lvl) PT64_LVL_ADDR_MASK(lvl)
+        #define PT_LVL_OFFSET_MASK(lvl) PT64_LVL_OFFSET_MASK(lvl)
+        #define PT_INDEX(addr, level) PT64_INDEX(addr, level)
+        #define PT_LEVEL_BITS PT64_LEVEL_BITS
+        #define PT_GUEST_ACCESSED_MASK 0
+        #define PT_GUEST_DIRTY_MASK 0
+        #define PT_GUEST_DIRTY_SHIFT __using_nonexistent_pte_bit()
+        #define PT_GUEST_ACCESSED_SHIFT __using_nonexistent_pte_bit()
+        #define CMPXCHG cmpxchg64
+        #define PT_MAX_FULL_LEVELS 4
 #else
         #error Invalid PTTYPE value
 #endif
@@ -69,6 +99,7 @@ struct guest_walker {
         pt_element_t prefetch_ptes[PTE_PREFETCH_NUM];
         gpa_t pte_gpa[PT_MAX_FULL_LEVELS];
         pt_element_t __user *ptep_user[PT_MAX_FULL_LEVELS];
+        bool pte_writable[PT_MAX_FULL_LEVELS];
         unsigned pt_access;
         unsigned pte_access;
         gfn_t gfn;
@@ -80,6 +111,40 @@ static gfn_t gpte_to_gfn_lvl(pt_element_t gpte, int lvl)
         return (gpte & PT_LVL_ADDR_MASK(lvl)) >> PAGE_SHIFT;
 }
 
+static inline void FNAME(protect_clean_gpte)(unsigned *access, unsigned gpte)
+{
+        unsigned mask;
+
+        /* dirty bit is not supported, so no need to track it */
+        if (!PT_GUEST_DIRTY_MASK)
+                return;
+
+        BUILD_BUG_ON(PT_WRITABLE_MASK != ACC_WRITE_MASK);
+
+        mask = (unsigned)~ACC_WRITE_MASK;
+        /* Allow write access to dirty gptes */
+        mask |= (gpte >> (PT_GUEST_DIRTY_SHIFT - PT_WRITABLE_SHIFT)) &
+                PT_WRITABLE_MASK;
+        *access &= mask;
+}
+
+static bool FNAME(is_rsvd_bits_set)(struct kvm_mmu *mmu, u64 gpte, int level)
+{
+        int bit7 = (gpte >> 7) & 1, low6 = gpte & 0x3f;
+
+        return (gpte & mmu->rsvd_bits_mask[bit7][level-1]) |
+                ((mmu->bad_mt_xwr & (1ull << low6)) != 0);
+}
+
+static inline int FNAME(is_present_gpte)(unsigned long pte)
+{
+#if PTTYPE != PTTYPE_EPT
+        return is_present_gpte(pte);
+#else
+        return pte & 7;
+#endif
+}
+
 static int FNAME(cmpxchg_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,
                                pt_element_t __user *ptep_user, unsigned index,
                                pt_element_t orig_pte, pt_element_t new_pte)
@@ -103,6 +168,42 @@ static int FNAME(cmpxchg_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu *mmu,
         return (ret != orig_pte);
 }
 
+static bool FNAME(prefetch_invalid_gpte)(struct kvm_vcpu *vcpu,
+                                  struct kvm_mmu_page *sp, u64 *spte,
+                                  u64 gpte)
+{
+        if (FNAME(is_rsvd_bits_set)(&vcpu->arch.mmu, gpte, PT_PAGE_TABLE_LEVEL))
+                goto no_present;
+
+        if (!FNAME(is_present_gpte)(gpte))
+                goto no_present;
+
+        /* if accessed bit is not supported prefetch non accessed gpte */
+        if (PT_GUEST_ACCESSED_MASK && !(gpte & PT_GUEST_ACCESSED_MASK))
+                goto no_present;
+
+        return false;
+
+no_present:
+        drop_spte(vcpu->kvm, spte);
+        return true;
+}
+
+static inline unsigned FNAME(gpte_access)(struct kvm_vcpu *vcpu, u64 gpte)
+{
+        unsigned access;
+#if PTTYPE == PTTYPE_EPT
+        access = ((gpte & VMX_EPT_WRITABLE_MASK) ? ACC_WRITE_MASK : 0) |
+                ((gpte & VMX_EPT_EXECUTABLE_MASK) ? ACC_EXEC_MASK : 0) |
+                ACC_USER_MASK;
+#else
+        access = (gpte & (PT_WRITABLE_MASK | PT_USER_MASK)) | ACC_EXEC_MASK;
+        access &= ~(gpte >> PT64_NX_SHIFT);
+#endif
+
+        return access;
+}
+
 static int FNAME(update_accessed_dirty_bits)(struct kvm_vcpu *vcpu,
                                              struct kvm_mmu *mmu,
                                              struct guest_walker *walker,
@@ -114,22 +215,43 @@ static int FNAME(update_accessed_dirty_bits)(struct kvm_vcpu *vcpu,
         gfn_t table_gfn;
         int ret;
 
+        /* dirty/accessed bits are not supported, so no need to update them */
+        if (!PT_GUEST_DIRTY_MASK)
+                return 0;
+
         for (level = walker->max_level; level >= walker->level; --level) {
                 pte = orig_pte = walker->ptes[level - 1];
                 table_gfn = walker->table_gfn[level - 1];
                 ptep_user = walker->ptep_user[level - 1];
                 index = offset_in_page(ptep_user) / sizeof(pt_element_t);
-                if (!(pte & PT_ACCESSED_MASK)) {
+                if (!(pte & PT_GUEST_ACCESSED_MASK)) {
                         trace_kvm_mmu_set_accessed_bit(table_gfn, index, sizeof(pte));
-                        pte |= PT_ACCESSED_MASK;
+                        pte |= PT_GUEST_ACCESSED_MASK;
                 }
-                if (level == walker->level && write_fault && !is_dirty_gpte(pte)) {
+                if (level == walker->level && write_fault &&
+                                !(pte & PT_GUEST_DIRTY_MASK)) {
                         trace_kvm_mmu_set_dirty_bit(table_gfn, index, sizeof(pte));
-                        pte |= PT_DIRTY_MASK;
+                        pte |= PT_GUEST_DIRTY_MASK;
                 }
                 if (pte == orig_pte)
                         continue;
 
+                /*
+                 * If the slot is read-only, simply do not process the accessed
+                 * and dirty bits.  This is the correct thing to do if the slot
+                 * is ROM, and page tables in read-as-ROM/write-as-MMIO slots
+                 * are only supported if the accessed and dirty bits are already
+                 * set in the ROM (so that MMIO writes are never needed).
+                 *
+                 * Note that NPT does not allow this at all and faults, since
+                 * it always wants nested page table entries for the guest
+                 * page tables to be writable.  And EPT works but will simply
+                 * overwrite the read-only memory to set the accessed and dirty
+                 * bits.
+                 */
+                if (unlikely(!walker->pte_writable[level - 1]))
+                        continue;
+
                 ret = FNAME(cmpxchg_gpte)(vcpu, mmu, ptep_user, index, orig_pte, pte);
                 if (ret)
                         return ret;
@@ -170,7 +292,7 @@ retry_walk:
         if (walker->level == PT32E_ROOT_LEVEL) {
                 pte = mmu->get_pdptr(vcpu, (addr >> 30) & 3);
                 trace_kvm_mmu_paging_element(pte, walker->level);
-                if (!is_present_gpte(pte))
+                if (!FNAME(is_present_gpte)(pte))
                         goto error;
                 --walker->level;
         }
@@ -179,7 +301,7 @@ retry_walk:
         ASSERT((!is_long_mode(vcpu) && is_pae(vcpu)) ||
                (mmu->get_cr3(vcpu) & CR3_NONPAE_RESERVED_BITS) == 0);
 
-        accessed_dirty = PT_ACCESSED_MASK;
+        accessed_dirty = PT_GUEST_ACCESSED_MASK;
         pt_access = pte_access = ACC_ALL;
         ++walker->level;
 
@@ -204,7 +326,8 @@ retry_walk:
                         goto error;
                 real_gfn = gpa_to_gfn(real_gfn);
 
-                host_addr = gfn_to_hva(vcpu->kvm, real_gfn);
+                host_addr = gfn_to_hva_prot(vcpu->kvm, real_gfn,
+                                            &walker->pte_writable[walker->level - 1]);
                 if (unlikely(kvm_is_error_hva(host_addr)))
                         goto error;
 
@@ -215,17 +338,17 @@ retry_walk:
 
                 trace_kvm_mmu_paging_element(pte, walker->level);
 
-                if (unlikely(!is_present_gpte(pte)))
+                if (unlikely(!FNAME(is_present_gpte)(pte)))
                         goto error;
 
-                if (unlikely(is_rsvd_bits_set(&vcpu->arch.mmu, pte,
-                                              walker->level))) {
+                if (unlikely(FNAME(is_rsvd_bits_set)(mmu, pte,
+                                                     walker->level))) {
                         errcode |= PFERR_RSVD_MASK | PFERR_PRESENT_MASK;
                         goto error;
                 }
 
                 accessed_dirty &= pte;
-                pte_access = pt_access & gpte_access(vcpu, pte);
+                pte_access = pt_access & FNAME(gpte_access)(vcpu, pte);
 
                 walker->ptes[walker->level - 1] = pte;
         } while (!is_last_gpte(mmu, walker->level, pte));
@@ -248,13 +371,15 @@ retry_walk:
         walker->gfn = real_gpa >> PAGE_SHIFT;
 
         if (!write_fault)
-                protect_clean_gpte(&pte_access, pte);
+                FNAME(protect_clean_gpte)(&pte_access, pte);
         else
                 /*
-                 * On a write fault, fold the dirty bit into accessed_dirty by
-                 * shifting it one place right.
+                 * On a write fault, fold the dirty bit into accessed_dirty.
+                 * For modes without A/D bits support accessed_dirty will be
+                 * always clear.
                  */
-                accessed_dirty &= pte >> (PT_DIRTY_SHIFT - PT_ACCESSED_SHIFT);
+                accessed_dirty &= pte >>
+                        (PT_GUEST_DIRTY_SHIFT - PT_GUEST_ACCESSED_SHIFT);
 
         if (unlikely(!accessed_dirty)) {
                 ret = FNAME(update_accessed_dirty_bits)(vcpu, mmu, walker, write_fault);
@@ -279,6 +404,25 @@ error:
         walker->fault.vector = PF_VECTOR;
         walker->fault.error_code_valid = true;
         walker->fault.error_code = errcode;
+
+#if PTTYPE == PTTYPE_EPT
+        /*
+         * Use PFERR_RSVD_MASK in error_code to to tell if EPT
+         * misconfiguration requires to be injected. The detection is
+         * done by is_rsvd_bits_set() above.
+         *
+         * We set up the value of exit_qualification to inject:
+         * [2:0] - Derive from [2:0] of real exit_qualification at EPT violation
+         * [5:3] - Calculated by the page walk of the guest EPT page tables
+         * [7:8] - Derived from [7:8] of real exit_qualification
+         *
+         * The other bits are set to 0.
+         */
+        if (!(errcode & PFERR_RSVD_MASK)) {
+                vcpu->arch.exit_qualification &= 0x187;
+                vcpu->arch.exit_qualification |= ((pt_access & pte) & 0x7) << 3;
+        }
+#endif
         walker->fault.address = addr;
         walker->fault.nested_page_fault = mmu != vcpu->arch.walk_mmu;
 
@@ -293,6 +437,7 @@ static int FNAME(walk_addr)(struct guest_walker *walker,
                                         access);
 }
 
+#if PTTYPE != PTTYPE_EPT
 static int FNAME(walk_addr_nested)(struct guest_walker *walker,
                                    struct kvm_vcpu *vcpu, gva_t addr,
                                    u32 access)
@@ -300,6 +445,7 @@ static int FNAME(walk_addr_nested)(struct guest_walker *walker,
         return FNAME(walk_addr_generic)(walker, vcpu, &vcpu->arch.nested_mmu,
                                         addr, access);
 }
+#endif
 
 static bool
 FNAME(prefetch_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
@@ -309,14 +455,14 @@ FNAME(prefetch_gpte)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp,
         gfn_t gfn;
         pfn_t pfn;
 
-        if (prefetch_invalid_gpte(vcpu, sp, spte, gpte))
+        if (FNAME(prefetch_invalid_gpte)(vcpu, sp, spte, gpte))
                 return false;
 
         pgprintk("%s: gpte %llx spte %p\n", __func__, (u64)gpte, spte);
 
         gfn = gpte_to_gfn(gpte);
-        pte_access = sp->role.access & gpte_access(vcpu, gpte);
-        protect_clean_gpte(&pte_access, gpte);
+        pte_access = sp->role.access & FNAME(gpte_access)(vcpu, gpte);
+        FNAME(protect_clean_gpte)(&pte_access, gpte);
         pfn = pte_prefetch_gfn_to_pfn(vcpu, gfn,
                         no_dirty_log && (pte_access & ACC_WRITE_MASK));
         if (is_error_pfn(pfn))
@@ -446,7 +592,7 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
                         goto out_gpte_changed;
 
                 if (sp)
-                        link_shadow_page(it.sptep, sp);
+                        link_shadow_page(it.sptep, sp, PT_GUEST_ACCESSED_MASK);
         }
 
         for (;
@@ -466,7 +612,7 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
 
                 sp = kvm_mmu_get_page(vcpu, direct_gfn, addr, it.level-1,
                                       true, direct_access, it.sptep);
-                link_shadow_page(it.sptep, sp);
+                link_shadow_page(it.sptep, sp, PT_GUEST_ACCESSED_MASK);
         }
 
         clear_sp_write_flooding_count(it.sptep);
@@ -727,6 +873,7 @@ static gpa_t FNAME(gva_to_gpa)(struct kvm_vcpu *vcpu, gva_t vaddr, u32 access,
         return gpa;
 }
 
+#if PTTYPE != PTTYPE_EPT
 static gpa_t FNAME(gva_to_gpa_nested)(struct kvm_vcpu *vcpu, gva_t vaddr,
                                       u32 access,
                                       struct x86_exception *exception)
@@ -745,6 +892,7 @@ static gpa_t FNAME(gva_to_gpa_nested)(struct kvm_vcpu *vcpu, gva_t vaddr,
 
         return gpa;
 }
+#endif
 
 /*
  * Using the cached information from sp->gfns is safe because:
@@ -785,15 +933,15 @@ static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp)
                                           sizeof(pt_element_t)))
                         return -EINVAL;
 
-                if (prefetch_invalid_gpte(vcpu, sp, &sp->spt[i], gpte)) {
+                if (FNAME(prefetch_invalid_gpte)(vcpu, sp, &sp->spt[i], gpte)) {
                         vcpu->kvm->tlbs_dirty++;
                         continue;
                 }
 
                 gfn = gpte_to_gfn(gpte);
                 pte_access = sp->role.access;
-                pte_access &= gpte_access(vcpu, gpte);
-                protect_clean_gpte(&pte_access, gpte);
+                pte_access &= FNAME(gpte_access)(vcpu, gpte);
+                FNAME(protect_clean_gpte)(&pte_access, gpte);
 
                 if (sync_mmio_spte(vcpu->kvm, &sp->spt[i], gfn, pte_access,
                       &nr_present))
@@ -830,3 +978,7 @@ static int FNAME(sync_page)(struct kvm_vcpu *vcpu, struct kvm_mmu_page *sp)
 #undef gpte_to_gfn
 #undef gpte_to_gfn_lvl
 #undef CMPXCHG
+#undef PT_GUEST_ACCESSED_MASK
+#undef PT_GUEST_DIRTY_MASK
+#undef PT_GUEST_DIRTY_SHIFT
+#undef PT_GUEST_ACCESSED_SHIFT
diff --git a/arch/x86/kvm/pmu.c b/arch/x86/kvm/pmu.c
index c53e797e7369..5c4f63151b4d 100644
--- a/arch/x86/kvm/pmu.c
+++ b/arch/x86/kvm/pmu.c
@@ -160,7 +160,7 @@ static void stop_counter(struct kvm_pmc *pmc)
 
 static void reprogram_counter(struct kvm_pmc *pmc, u32 type,
                 unsigned config, bool exclude_user, bool exclude_kernel,
-                bool intr)
+                bool intr, bool in_tx, bool in_tx_cp)
 {
         struct perf_event *event;
         struct perf_event_attr attr = {
@@ -173,6 +173,10 @@ static void reprogram_counter(struct kvm_pmc *pmc, u32 type,
                 .exclude_kernel = exclude_kernel,
                 .config = config,
         };
+        if (in_tx)
+                attr.config |= HSW_IN_TX;
+        if (in_tx_cp)
+                attr.config |= HSW_IN_TX_CHECKPOINTED;
 
         attr.sample_period = (-pmc->counter) & pmc_bitmask(pmc);
 
@@ -226,7 +230,9 @@ static void reprogram_gp_counter(struct kvm_pmc *pmc, u64 eventsel)
 
         if (!(eventsel & (ARCH_PERFMON_EVENTSEL_EDGE |
                                 ARCH_PERFMON_EVENTSEL_INV |
-                                ARCH_PERFMON_EVENTSEL_CMASK))) {
+                                ARCH_PERFMON_EVENTSEL_CMASK |
+                                HSW_IN_TX |
+                                HSW_IN_TX_CHECKPOINTED))) {
                 config = find_arch_event(&pmc->vcpu->arch.pmu, event_select,
                                 unit_mask);
                 if (config != PERF_COUNT_HW_MAX)
@@ -239,7 +245,9 @@ static void reprogram_gp_counter(struct kvm_pmc *pmc, u64 eventsel)
         reprogram_counter(pmc, type, config,
                         !(eventsel & ARCH_PERFMON_EVENTSEL_USR),
                         !(eventsel & ARCH_PERFMON_EVENTSEL_OS),
-                        eventsel & ARCH_PERFMON_EVENTSEL_INT);
+                        eventsel & ARCH_PERFMON_EVENTSEL_INT,
+                        (eventsel & HSW_IN_TX),
+                        (eventsel & HSW_IN_TX_CHECKPOINTED));
 }
 
 static void reprogram_fixed_counter(struct kvm_pmc *pmc, u8 en_pmi, int idx)
@@ -256,7 +264,7 @@ static void reprogram_fixed_counter(struct kvm_pmc *pmc, u8 en_pmi, int idx)
                         arch_events[fixed_pmc_events[idx]].event_type,
                         !(en & 0x2), /* exclude user */
                         !(en & 0x1), /* exclude kernel */
-                        pmi);
+                        pmi, false, false);
 }
 
 static inline u8 fixed_en_pmi(u64 ctrl, int idx)
@@ -408,7 +416,7 @@ int kvm_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
                 } else if ((pmc = get_gp_pmc(pmu, index, MSR_P6_EVNTSEL0))) {
                         if (data == pmc->eventsel)
                                 return 0;
-                        if (!(data & 0xffffffff00200000ull)) {
+                        if (!(data & pmu->reserved_bits)) {
                                 reprogram_gp_counter(pmc, data);
                                 return 0;
                         }
@@ -450,6 +458,7 @@ void kvm_pmu_cpuid_update(struct kvm_vcpu *vcpu)
         pmu->counter_bitmask[KVM_PMC_GP] = 0;
         pmu->counter_bitmask[KVM_PMC_FIXED] = 0;
         pmu->version = 0;
+        pmu->reserved_bits = 0xffffffff00200000ull;
 
         entry = kvm_find_cpuid_entry(vcpu, 0xa, 0);
         if (!entry)
@@ -478,6 +487,12 @@ void kvm_pmu_cpuid_update(struct kvm_vcpu *vcpu)
         pmu->global_ctrl = ((1 << pmu->nr_arch_gp_counters) - 1) |
                 (((1ull << pmu->nr_arch_fixed_counters) - 1) << INTEL_PMC_IDX_FIXED);
         pmu->global_ctrl_mask = ~pmu->global_ctrl;
+
+        entry = kvm_find_cpuid_entry(vcpu, 7, 0);
+        if (entry &&
+            (boot_cpu_has(X86_FEATURE_HLE) || boot_cpu_has(X86_FEATURE_RTM)) &&
+            (entry->ebx & (X86_FEATURE_HLE|X86_FEATURE_RTM)))
+                pmu->reserved_bits ^= HSW_IN_TX|HSW_IN_TX_CHECKPOINTED;
 }
 
 void kvm_pmu_init(struct kvm_vcpu *vcpu)
diff --git a/arch/x86/kvm/vmx.c b/arch/x86/kvm/vmx.c
index 064d0be67ecc..a1216de9ffda 100644
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
@@ -373,6 +373,7 @@ struct nested_vmx {
          * we must keep them pinned while L2 runs.
          */
         struct page *apic_access_page;
+        u64 msr_ia32_feature_control;
 };
 
 #define POSTED_INTR_ON  0
@@ -711,10 +712,10 @@ static void nested_release_page_clean(struct page *page)
         kvm_release_page_clean(page);
 }
 
+static unsigned long nested_ept_get_cr3(struct kvm_vcpu *vcpu);
 static u64 construct_eptp(unsigned long root_hpa);
 static void kvm_cpu_vmxon(u64 addr);
 static void kvm_cpu_vmxoff(void);
-static void vmx_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3);
 static int vmx_set_tss_addr(struct kvm *kvm, unsigned int addr);
 static void vmx_set_segment(struct kvm_vcpu *vcpu,
                             struct kvm_segment *var, int seg);
@@ -1039,12 +1040,16 @@ static inline bool nested_cpu_has2(struct vmcs12 *vmcs12, u32 bit)
                 (vmcs12->secondary_vm_exec_control & bit);
 }
 
-static inline bool nested_cpu_has_virtual_nmis(struct vmcs12 *vmcs12,
-        struct kvm_vcpu *vcpu)
+static inline bool nested_cpu_has_virtual_nmis(struct vmcs12 *vmcs12)
 {
         return vmcs12->pin_based_vm_exec_control & PIN_BASED_VIRTUAL_NMIS;
 }
 
+static inline int nested_cpu_has_ept(struct vmcs12 *vmcs12)
+{
+        return nested_cpu_has2(vmcs12, SECONDARY_EXEC_ENABLE_EPT);
+}
+
 static inline bool is_exception(u32 intr_info)
 {
         return (intr_info & (INTR_INFO_INTR_TYPE_MASK | INTR_INFO_VALID_MASK))
@@ -2155,6 +2160,7 @@ static u32 nested_vmx_pinbased_ctls_low, nested_vmx_pinbased_ctls_high;
 static u32 nested_vmx_exit_ctls_low, nested_vmx_exit_ctls_high;
 static u32 nested_vmx_entry_ctls_low, nested_vmx_entry_ctls_high;
 static u32 nested_vmx_misc_low, nested_vmx_misc_high;
+static u32 nested_vmx_ept_caps;
 static __init void nested_vmx_setup_ctls_msrs(void)
 {
         /*
@@ -2190,14 +2196,17 @@ static __init void nested_vmx_setup_ctls_msrs(void)
          * If bit 55 of VMX_BASIC is off, bits 0-8 and 10, 11, 13, 14, 16 and
          * 17 must be 1.
          */
+        rdmsr(MSR_IA32_VMX_EXIT_CTLS,
+                nested_vmx_exit_ctls_low, nested_vmx_exit_ctls_high);
         nested_vmx_exit_ctls_low = VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR;
         /* Note that guest use of VM_EXIT_ACK_INTR_ON_EXIT is not supported. */
+        nested_vmx_exit_ctls_high &=
 #ifdef CONFIG_X86_64
-        nested_vmx_exit_ctls_high = VM_EXIT_HOST_ADDR_SPACE_SIZE;
-#else
-        nested_vmx_exit_ctls_high = 0;
+                VM_EXIT_HOST_ADDR_SPACE_SIZE |
 #endif
-        nested_vmx_exit_ctls_high |= VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR;
+                VM_EXIT_LOAD_IA32_PAT | VM_EXIT_SAVE_IA32_PAT;
+        nested_vmx_exit_ctls_high |= (VM_EXIT_ALWAYSON_WITHOUT_TRUE_MSR |
+                                      VM_EXIT_LOAD_IA32_EFER);
 
         /* entry controls */
         rdmsr(MSR_IA32_VMX_ENTRY_CTLS,
@@ -2205,8 +2214,12 @@ static __init void nested_vmx_setup_ctls_msrs(void)
         /* If bit 55 of VMX_BASIC is off, bits 0-8 and 12 must be 1. */
         nested_vmx_entry_ctls_low = VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR;
         nested_vmx_entry_ctls_high &=
-                VM_ENTRY_LOAD_IA32_PAT | VM_ENTRY_IA32E_MODE;
-        nested_vmx_entry_ctls_high |= VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR;
+#ifdef CONFIG_X86_64
+                VM_ENTRY_IA32E_MODE |
+#endif
+                VM_ENTRY_LOAD_IA32_PAT;
+        nested_vmx_entry_ctls_high |= (VM_ENTRY_ALWAYSON_WITHOUT_TRUE_MSR |
+                                       VM_ENTRY_LOAD_IA32_EFER);
 
         /* cpu-based controls */
         rdmsr(MSR_IA32_VMX_PROCBASED_CTLS,
@@ -2241,6 +2254,22 @@ static __init void nested_vmx_setup_ctls_msrs(void)
                 SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES |
                 SECONDARY_EXEC_WBINVD_EXITING;
 
+        if (enable_ept) {
+                /* nested EPT: emulate EPT also to L1 */
+                nested_vmx_secondary_ctls_high |= SECONDARY_EXEC_ENABLE_EPT;
+                nested_vmx_ept_caps = VMX_EPT_PAGE_WALK_4_BIT |
+                         VMX_EPTP_WB_BIT | VMX_EPT_INVEPT_BIT;
+                nested_vmx_ept_caps &= vmx_capability.ept;
+                /*
+                 * Since invept is completely emulated we support both global
+                 * and context invalidation independent of what host cpu
+                 * supports
+                 */
+                nested_vmx_ept_caps |= VMX_EPT_EXTENT_GLOBAL_BIT |
+                        VMX_EPT_EXTENT_CONTEXT_BIT;
+        } else
+                nested_vmx_ept_caps = 0;
+
         /* miscellaneous data */
         rdmsr(MSR_IA32_VMX_MISC, nested_vmx_misc_low, nested_vmx_misc_high);
         nested_vmx_misc_low &= VMX_MISC_PREEMPTION_TIMER_RATE_MASK |
@@ -2282,8 +2311,11 @@ static int vmx_get_vmx_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata)
 
         switch (msr_index) {
         case MSR_IA32_FEATURE_CONTROL:
-                *pdata = 0;
-                break;
+                if (nested_vmx_allowed(vcpu)) {
+                        *pdata = to_vmx(vcpu)->nested.msr_ia32_feature_control;
+                        break;
+                }
+                return 0;
         case MSR_IA32_VMX_BASIC:
                 /*
                  * This MSR reports some information about VMX support. We
@@ -2346,8 +2378,8 @@ static int vmx_get_vmx_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata)
                                         nested_vmx_secondary_ctls_high);
                 break;
         case MSR_IA32_VMX_EPT_VPID_CAP:
-                /* Currently, no nested ept or nested vpid */
-                *pdata = 0;
+                /* Currently, no nested vpid support */
+                *pdata = nested_vmx_ept_caps;
                 break;
         default:
                 return 0;
@@ -2356,14 +2388,24 @@ static int vmx_get_vmx_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 *pdata)
         return 1;
 }
 
-static int vmx_set_vmx_msr(struct kvm_vcpu *vcpu, u32 msr_index, u64 data)
+static int vmx_set_vmx_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
 {
+        u32 msr_index = msr_info->index;
+        u64 data = msr_info->data;
+        bool host_initialized = msr_info->host_initiated;
+
         if (!nested_vmx_allowed(vcpu))
                 return 0;
 
-        if (msr_index == MSR_IA32_FEATURE_CONTROL)
-                /* TODO: the right thing. */
+        if (msr_index == MSR_IA32_FEATURE_CONTROL) {
+                if (!host_initialized &&
+                                to_vmx(vcpu)->nested.msr_ia32_feature_control
+                                & FEATURE_CONTROL_LOCKED)
+                        return 0;
+                to_vmx(vcpu)->nested.msr_ia32_feature_control = data;
                 return 1;
+        }
+
         /*
          * No need to treat VMX capability MSRs specially: If we don't handle
          * them, handle_wrmsr will #GP(0), which is correct (they are readonly)
@@ -2494,7 +2536,7 @@ static int vmx_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)
                         return 1;
                 /* Otherwise falls through */
         default:
-                if (vmx_set_vmx_msr(vcpu, msr_index, data))
+                if (vmx_set_vmx_msr(vcpu, msr_info))
                         break;
                 msr = find_msr_entry(vmx, msr_index);
                 if (msr) {
@@ -5297,14 +5339,27 @@ static int handle_ept_violation(struct kvm_vcpu *vcpu)
                 return 0;
         }
 
+        /*
+         * EPT violation happened while executing iret from NMI,
+         * "blocked by NMI" bit has to be set before next VM entry.
+         * There are errata that may cause this bit to not be set:
+         * AAK134, BY25.
+         */
+        if (exit_qualification & INTR_INFO_UNBLOCK_NMI)
+                vmcs_set_bits(GUEST_INTERRUPTIBILITY_INFO, GUEST_INTR_STATE_NMI);
+
         gpa = vmcs_read64(GUEST_PHYSICAL_ADDRESS);
         trace_kvm_page_fault(gpa, exit_qualification);
 
         /* It is a write fault? */
         error_code = exit_qualification & (1U << 1);
+        /* It is a fetch fault? */
+        error_code |= (exit_qualification & (1U << 2)) << 2;
         /* ept page table is present? */
         error_code |= (exit_qualification >> 3) & 0x1;
 
+        vcpu->arch.exit_qualification = exit_qualification;
+
         return kvm_mmu_page_fault(vcpu, gpa, error_code, NULL, 0);
 }
 
@@ -5438,7 +5493,8 @@ static int handle_invalid_guest_state(struct kvm_vcpu *vcpu)
 
                 err = emulate_instruction(vcpu, EMULTYPE_NO_REEXECUTE);
 
-                if (err == EMULATE_DO_MMIO) {
+                if (err == EMULATE_USER_EXIT) {
+                        ++vcpu->stat.mmio_exits;
                         ret = 0;
                         goto out;
                 }
@@ -5567,8 +5623,47 @@ static void nested_free_all_saved_vmcss(struct vcpu_vmx *vmx)
                 free_loaded_vmcs(&vmx->vmcs01);
 }
 
+/*
+ * The following 3 functions, nested_vmx_succeed()/failValid()/failInvalid(),
+ * set the success or error code of an emulated VMX instruction, as specified
+ * by Vol 2B, VMX Instruction Reference, "Conventions".
+ */
+static void nested_vmx_succeed(struct kvm_vcpu *vcpu)
+{
+        vmx_set_rflags(vcpu, vmx_get_rflags(vcpu)
+                        & ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
+                            X86_EFLAGS_ZF | X86_EFLAGS_SF | X86_EFLAGS_OF));
+}
+
+static void nested_vmx_failInvalid(struct kvm_vcpu *vcpu)
+{
+        vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
+                        & ~(X86_EFLAGS_PF | X86_EFLAGS_AF | X86_EFLAGS_ZF |
+                            X86_EFLAGS_SF | X86_EFLAGS_OF))
+                        | X86_EFLAGS_CF);
+}
+
 static void nested_vmx_failValid(struct kvm_vcpu *vcpu,
-                                 u32 vm_instruction_error);
+                                        u32 vm_instruction_error)
+{
+        if (to_vmx(vcpu)->nested.current_vmptr == -1ull) {
+                /*
+                 * failValid writes the error number to the current VMCS, which
+                 * can't be done there isn't a current VMCS.
+                 */
+                nested_vmx_failInvalid(vcpu);
+                return;
+        }
+        vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
+                        & ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
+                            X86_EFLAGS_SF | X86_EFLAGS_OF))
+                        | X86_EFLAGS_ZF);
+        get_vmcs12(vcpu)->vm_instruction_error = vm_instruction_error;
+        /*
+         * We don't need to force a shadow sync because
+         * VM_INSTRUCTION_ERROR is not shadowed
+         */
+}
 
 /*
  * Emulate the VMXON instruction.
@@ -5583,6 +5678,8 @@ static int handle_vmon(struct kvm_vcpu *vcpu)
         struct kvm_segment cs;
         struct vcpu_vmx *vmx = to_vmx(vcpu);
         struct vmcs *shadow_vmcs;
+        const u64 VMXON_NEEDED_FEATURES = FEATURE_CONTROL_LOCKED
+                | FEATURE_CONTROL_VMXON_ENABLED_OUTSIDE_SMX;
 
         /* The Intel VMX Instruction Reference lists a bunch of bits that
          * are prerequisite to running VMXON, most notably cr4.VMXE must be
@@ -5611,6 +5708,13 @@ static int handle_vmon(struct kvm_vcpu *vcpu)
                 skip_emulated_instruction(vcpu);
                 return 1;
         }
+
+        if ((vmx->nested.msr_ia32_feature_control & VMXON_NEEDED_FEATURES)
+                        != VMXON_NEEDED_FEATURES) {
+                kvm_inject_gp(vcpu, 0);
+                return 1;
+        }
+
         if (enable_shadow_vmcs) {
                 shadow_vmcs = alloc_vmcs();
                 if (!shadow_vmcs)
@@ -5628,6 +5732,7 @@ static int handle_vmon(struct kvm_vcpu *vcpu)
         vmx->nested.vmxon = true;
 
         skip_emulated_instruction(vcpu);
+        nested_vmx_succeed(vcpu);
         return 1;
 }
 
@@ -5712,6 +5817,7 @@ static int handle_vmoff(struct kvm_vcpu *vcpu)
                 return 1;
         free_nested(to_vmx(vcpu));
         skip_emulated_instruction(vcpu);
+        nested_vmx_succeed(vcpu);
         return 1;
 }
 
@@ -5768,48 +5874,6 @@ static int get_vmx_mem_address(struct kvm_vcpu *vcpu,
         return 0;
 }
 
-/*
- * The following 3 functions, nested_vmx_succeed()/failValid()/failInvalid(),
- * set the success or error code of an emulated VMX instruction, as specified
- * by Vol 2B, VMX Instruction Reference, "Conventions".
- */
-static void nested_vmx_succeed(struct kvm_vcpu *vcpu)
-{
-        vmx_set_rflags(vcpu, vmx_get_rflags(vcpu)
-                        & ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
-                            X86_EFLAGS_ZF | X86_EFLAGS_SF | X86_EFLAGS_OF));
-}
-
-static void nested_vmx_failInvalid(struct kvm_vcpu *vcpu)
-{
-        vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
-                        & ~(X86_EFLAGS_PF | X86_EFLAGS_AF | X86_EFLAGS_ZF |
-                            X86_EFLAGS_SF | X86_EFLAGS_OF))
-                        | X86_EFLAGS_CF);
-}
-
-static void nested_vmx_failValid(struct kvm_vcpu *vcpu,
-                                        u32 vm_instruction_error)
-{
-        if (to_vmx(vcpu)->nested.current_vmptr == -1ull) {
-                /*
-                 * failValid writes the error number to the current VMCS, which
-                 * can't be done there isn't a current VMCS.
-                 */
-                nested_vmx_failInvalid(vcpu);
-                return;
-        }
-        vmx_set_rflags(vcpu, (vmx_get_rflags(vcpu)
-                        & ~(X86_EFLAGS_CF | X86_EFLAGS_PF | X86_EFLAGS_AF |
-                            X86_EFLAGS_SF | X86_EFLAGS_OF))
-                        | X86_EFLAGS_ZF);
-        get_vmcs12(vcpu)->vm_instruction_error = vm_instruction_error;
-        /*
-         * We don't need to force a shadow sync because
-         * VM_INSTRUCTION_ERROR is not shadowed
-         */
-}
-
 /* Emulate the VMCLEAR instruction */
 static int handle_vmclear(struct kvm_vcpu *vcpu)
 {
@@ -5972,8 +6036,8 @@ static void copy_shadow_to_vmcs12(struct vcpu_vmx *vmx)
         unsigned long field;
         u64 field_value;
         struct vmcs *shadow_vmcs = vmx->nested.current_shadow_vmcs;
-        unsigned long *fields = (unsigned long *)shadow_read_write_fields;
-        int num_fields = max_shadow_read_write_fields;
+        const unsigned long *fields = shadow_read_write_fields;
+        const int num_fields = max_shadow_read_write_fields;
 
         vmcs_load(shadow_vmcs);
 
@@ -6002,12 +6066,11 @@ static void copy_shadow_to_vmcs12(struct vcpu_vmx *vmx)
 
 static void copy_vmcs12_to_shadow(struct vcpu_vmx *vmx)
 {
-        unsigned long *fields[] = {
-                (unsigned long *)shadow_read_write_fields,
-                (unsigned long *)shadow_read_only_fields
+        const unsigned long *fields[] = {
+                shadow_read_write_fields,
+                shadow_read_only_fields
         };
-        int num_lists =  ARRAY_SIZE(fields);
-        int max_fields[] = {
+        const int max_fields[] = {
                 max_shadow_read_write_fields,
                 max_shadow_read_only_fields
         };
@@ -6018,7 +6081,7 @@ static void copy_vmcs12_to_shadow(struct vcpu_vmx *vmx)
 
         vmcs_load(shadow_vmcs);
 
-        for (q = 0; q < num_lists; q++) {
+        for (q = 0; q < ARRAY_SIZE(fields); q++) {
                 for (i = 0; i < max_fields[q]; i++) {
                         field = fields[q][i];
                         vmcs12_read_any(&vmx->vcpu, field, &field_value);
@@ -6248,6 +6311,74 @@ static int handle_vmptrst(struct kvm_vcpu *vcpu)
         return 1;
 }
 
+/* Emulate the INVEPT instruction */
+static int handle_invept(struct kvm_vcpu *vcpu)
+{
+        u32 vmx_instruction_info, types;
+        unsigned long type;
+        gva_t gva;
+        struct x86_exception e;
+        struct {
+                u64 eptp, gpa;
+        } operand;
+        u64 eptp_mask = ((1ull << 51) - 1) & PAGE_MASK;
+
+        if (!(nested_vmx_secondary_ctls_high & SECONDARY_EXEC_ENABLE_EPT) ||
+            !(nested_vmx_ept_caps & VMX_EPT_INVEPT_BIT)) {
+                kvm_queue_exception(vcpu, UD_VECTOR);
+                return 1;
+        }
+
+        if (!nested_vmx_check_permission(vcpu))
+                return 1;
+
+        if (!kvm_read_cr0_bits(vcpu, X86_CR0_PE)) {
+                kvm_queue_exception(vcpu, UD_VECTOR);
+                return 1;
+        }
+
+        vmx_instruction_info = vmcs_read32(VMX_INSTRUCTION_INFO);
+        type = kvm_register_read(vcpu, (vmx_instruction_info >> 28) & 0xf);
+
+        types = (nested_vmx_ept_caps >> VMX_EPT_EXTENT_SHIFT) & 6;
+
+        if (!(types & (1UL << type))) {
+                nested_vmx_failValid(vcpu,
+                                VMXERR_INVALID_OPERAND_TO_INVEPT_INVVPID);
+                return 1;
+        }
+
+        /* According to the Intel VMX instruction reference, the memory
+         * operand is read even if it isn't needed (e.g., for type==global)
+         */
+        if (get_vmx_mem_address(vcpu, vmcs_readl(EXIT_QUALIFICATION),
+                        vmx_instruction_info, &gva))
+                return 1;
+        if (kvm_read_guest_virt(&vcpu->arch.emulate_ctxt, gva, &operand,
+                                sizeof(operand), &e)) {
+                kvm_inject_page_fault(vcpu, &e);
+                return 1;
+        }
+
+        switch (type) {
+        case VMX_EPT_EXTENT_CONTEXT:
+                if ((operand.eptp & eptp_mask) !=
+                                (nested_ept_get_cr3(vcpu) & eptp_mask))
+                        break;
+        case VMX_EPT_EXTENT_GLOBAL:
+                kvm_mmu_sync_roots(vcpu);
+                kvm_mmu_flush_tlb(vcpu);
+                nested_vmx_succeed(vcpu);
+                break;
+        default:
+                BUG_ON(1);
+                break;
+        }
+
+        skip_emulated_instruction(vcpu);
+        return 1;
+}
+
 /*
  * The exit handlers return 1 if the exit was handled fully and guest execution
  * may resume.  Otherwise they set the kvm_run parameter to indicate what needs
@@ -6292,6 +6423,7 @@ static int (*const kvm_vmx_exit_handlers[])(struct kvm_vcpu *vcpu) = {
         [EXIT_REASON_PAUSE_INSTRUCTION]       = handle_pause,
         [EXIT_REASON_MWAIT_INSTRUCTION]       = handle_invalid_op,
         [EXIT_REASON_MONITOR_INSTRUCTION]     = handle_invalid_op,
+        [EXIT_REASON_INVEPT]                  = handle_invept,
 };
 
 static const int kvm_vmx_max_exit_handlers =
@@ -6518,6 +6650,7 @@ static bool nested_vmx_exit_handled(struct kvm_vcpu *vcpu)
         case EXIT_REASON_VMPTRST: case EXIT_REASON_VMREAD:
         case EXIT_REASON_VMRESUME: case EXIT_REASON_VMWRITE:
         case EXIT_REASON_VMOFF: case EXIT_REASON_VMON:
+        case EXIT_REASON_INVEPT:
                 /*
                  * VMX instructions trap unconditionally. This allows L1 to
                  * emulate them for its L2 guest, i.e., allows 3-level nesting!
@@ -6550,7 +6683,20 @@ static bool nested_vmx_exit_handled(struct kvm_vcpu *vcpu)
                 return nested_cpu_has2(vmcs12,
                         SECONDARY_EXEC_VIRTUALIZE_APIC_ACCESSES);
         case EXIT_REASON_EPT_VIOLATION:
+                /*
+                 * L0 always deals with the EPT violation. If nested EPT is
+                 * used, and the nested mmu code discovers that the address is
+                 * missing in the guest EPT table (EPT12), the EPT violation
+                 * will be injected with nested_ept_inject_page_fault()
+                 */
+                return 0;
         case EXIT_REASON_EPT_MISCONFIG:
+                /*
+                 * L2 never uses directly L1's EPT, but rather L0's own EPT
+                 * table (shadow on EPT) or a merged EPT table that L0 built
+                 * (EPT on EPT). So any problems with the structure of the
+                 * table is L0's fault.
+                 */
                 return 0;
         case EXIT_REASON_PREEMPTION_TIMER:
                 return vmcs12->pin_based_vm_exec_control &
@@ -6638,7 +6784,7 @@ static int vmx_handle_exit(struct kvm_vcpu *vcpu)
 
         if (unlikely(!cpu_has_virtual_nmis() && vmx->soft_vnmi_blocked &&
             !(is_guest_mode(vcpu) && nested_cpu_has_virtual_nmis(
-                                        get_vmcs12(vcpu), vcpu)))) {
+                                        get_vmcs12(vcpu))))) {
                 if (vmx_interrupt_allowed(vcpu)) {
                         vmx->soft_vnmi_blocked = 0;
                 } else if (vmx->vnmi_blocked_time > 1000000000LL &&
@@ -7326,6 +7472,48 @@ static void vmx_set_supported_cpuid(u32 func, struct kvm_cpuid_entry2 *entry)
                 entry->ecx |= bit(X86_FEATURE_VMX);
 }
 
+static void nested_ept_inject_page_fault(struct kvm_vcpu *vcpu,
+                struct x86_exception *fault)
+{
+        struct vmcs12 *vmcs12;
+        nested_vmx_vmexit(vcpu);
+        vmcs12 = get_vmcs12(vcpu);
+
+        if (fault->error_code & PFERR_RSVD_MASK)
+                vmcs12->vm_exit_reason = EXIT_REASON_EPT_MISCONFIG;
+        else
+                vmcs12->vm_exit_reason = EXIT_REASON_EPT_VIOLATION;
+        vmcs12->exit_qualification = vcpu->arch.exit_qualification;
+        vmcs12->guest_physical_address = fault->address;
+}
+
+/* Callbacks for nested_ept_init_mmu_context: */
+
+static unsigned long nested_ept_get_cr3(struct kvm_vcpu *vcpu)
+{
+        /* return the page table to be shadowed - in our case, EPT12 */
+        return get_vmcs12(vcpu)->ept_pointer;
+}
+
+static int nested_ept_init_mmu_context(struct kvm_vcpu *vcpu)
+{
+        int r = kvm_init_shadow_ept_mmu(vcpu, &vcpu->arch.mmu,
+                        nested_vmx_ept_caps & VMX_EPT_EXECUTE_ONLY_BIT);
+
+        vcpu->arch.mmu.set_cr3           = vmx_set_cr3;
+        vcpu->arch.mmu.get_cr3           = nested_ept_get_cr3;
+        vcpu->arch.mmu.inject_page_fault = nested_ept_inject_page_fault;
+
+        vcpu->arch.walk_mmu              = &vcpu->arch.nested_mmu;
+
+        return r;
+}
+
+static void nested_ept_uninit_mmu_context(struct kvm_vcpu *vcpu)
+{
+        vcpu->arch.walk_mmu = &vcpu->arch.mmu;
+}
+
 /*
  * prepare_vmcs02 is called when the L1 guest hypervisor runs its nested
  * L2 guest. L1 has a vmcs for L2 (vmcs12), and this function "merges" it
@@ -7388,7 +7576,7 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)
                 vmcs12->guest_interruptibility_info);
         vmcs_write32(GUEST_SYSENTER_CS, vmcs12->guest_sysenter_cs);
         kvm_set_dr(vcpu, 7, vmcs12->guest_dr7);
-        vmcs_writel(GUEST_RFLAGS, vmcs12->guest_rflags);
+        vmx_set_rflags(vcpu, vmcs12->guest_rflags);
         vmcs_writel(GUEST_PENDING_DBG_EXCEPTIONS,
                 vmcs12->guest_pending_dbg_exceptions);
         vmcs_writel(GUEST_SYSENTER_ESP, vmcs12->guest_sysenter_esp);
@@ -7508,15 +7696,24 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)
         vcpu->arch.cr0_guest_owned_bits &= ~vmcs12->cr0_guest_host_mask;
         vmcs_writel(CR0_GUEST_HOST_MASK, ~vcpu->arch.cr0_guest_owned_bits);
 
-        /* Note: IA32_MODE, LOAD_IA32_EFER are modified by vmx_set_efer below */
-        vmcs_write32(VM_EXIT_CONTROLS,
-                vmcs12->vm_exit_controls | vmcs_config.vmexit_ctrl);
-        vmcs_write32(VM_ENTRY_CONTROLS, vmcs12->vm_entry_controls |
+        /* L2->L1 exit controls are emulated - the hardware exit is to L0 so
+         * we should use its exit controls. Note that VM_EXIT_LOAD_IA32_EFER
+         * bits are further modified by vmx_set_efer() below.
+         */
+        vmcs_write32(VM_EXIT_CONTROLS, vmcs_config.vmexit_ctrl);
+
+        /* vmcs12's VM_ENTRY_LOAD_IA32_EFER and VM_ENTRY_IA32E_MODE are
+         * emulated by vmx_set_efer(), below.
+         */
+        vmcs_write32(VM_ENTRY_CONTROLS,
+                (vmcs12->vm_entry_controls & ~VM_ENTRY_LOAD_IA32_EFER &
+                        ~VM_ENTRY_IA32E_MODE) |
                 (vmcs_config.vmentry_ctrl & ~VM_ENTRY_IA32E_MODE));
 
-        if (vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_PAT)
+        if (vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_PAT) {
                 vmcs_write64(GUEST_IA32_PAT, vmcs12->guest_ia32_pat);
-        else if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT)
+                vcpu->arch.pat = vmcs12->guest_ia32_pat;
+        } else if (vmcs_config.vmentry_ctrl & VM_ENTRY_LOAD_IA32_PAT)
                 vmcs_write64(GUEST_IA32_PAT, vmx->vcpu.arch.pat);
 
 
@@ -7538,6 +7735,11 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)
                 vmx_flush_tlb(vcpu);
         }
 
+        if (nested_cpu_has_ept(vmcs12)) {
+                kvm_mmu_unload(vcpu);
+                nested_ept_init_mmu_context(vcpu);
+        }
+
         if (vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_EFER)
                 vcpu->arch.efer = vmcs12->guest_ia32_efer;
         else if (vmcs12->vm_entry_controls & VM_ENTRY_IA32E_MODE)
@@ -7565,6 +7767,20 @@ static void prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)
         kvm_set_cr3(vcpu, vmcs12->guest_cr3);
         kvm_mmu_reset_context(vcpu);
 
+        /*
+         * L1 may access the L2's PDPTR, so save them to construct vmcs12
+         */
+        if (enable_ept) {
+                vmcs_write64(GUEST_PDPTR0, vmcs12->guest_pdptr0);
+                vmcs_write64(GUEST_PDPTR1, vmcs12->guest_pdptr1);
+                vmcs_write64(GUEST_PDPTR2, vmcs12->guest_pdptr2);
+                vmcs_write64(GUEST_PDPTR3, vmcs12->guest_pdptr3);
+                __clear_bit(VCPU_EXREG_PDPTR,
+                                (unsigned long *)&vcpu->arch.regs_avail);
+                __clear_bit(VCPU_EXREG_PDPTR,
+                                (unsigned long *)&vcpu->arch.regs_dirty);
+        }
+
         kvm_register_write(vcpu, VCPU_REGS_RSP, vmcs12->guest_rsp);
         kvm_register_write(vcpu, VCPU_REGS_RIP, vmcs12->guest_rip);
 }
@@ -7887,6 +8103,22 @@ static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)
         vmcs12->guest_pending_dbg_exceptions =
                 vmcs_readl(GUEST_PENDING_DBG_EXCEPTIONS);
 
+        /*
+         * In some cases (usually, nested EPT), L2 is allowed to change its
+         * own CR3 without exiting. If it has changed it, we must keep it.
+         * Of course, if L0 is using shadow page tables, GUEST_CR3 was defined
+         * by L0, not L1 or L2, so we mustn't unconditionally copy it to vmcs12.
+         *
+         * Additionally, restore L2's PDPTR to vmcs12.
+         */
+        if (enable_ept) {
+                vmcs12->guest_cr3 = vmcs_read64(GUEST_CR3);
+                vmcs12->guest_pdptr0 = vmcs_read64(GUEST_PDPTR0);
+                vmcs12->guest_pdptr1 = vmcs_read64(GUEST_PDPTR1);
+                vmcs12->guest_pdptr2 = vmcs_read64(GUEST_PDPTR2);
+                vmcs12->guest_pdptr3 = vmcs_read64(GUEST_PDPTR3);
+        }
+
         vmcs12->vm_entry_controls =
                 (vmcs12->vm_entry_controls & ~VM_ENTRY_IA32E_MODE) |
                 (vmcs_read32(VM_ENTRY_CONTROLS) & VM_ENTRY_IA32E_MODE);
@@ -7948,6 +8180,8 @@ static void prepare_vmcs12(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12)
 static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,
                                    struct vmcs12 *vmcs12)
 {
+        struct kvm_segment seg;
+
         if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_EFER)
                 vcpu->arch.efer = vmcs12->host_ia32_efer;
         else if (vmcs12->vm_exit_controls & VM_EXIT_HOST_ADDR_SPACE_SIZE)
@@ -7982,7 +8216,9 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,
         vcpu->arch.cr4_guest_owned_bits = ~vmcs_readl(CR4_GUEST_HOST_MASK);
         kvm_set_cr4(vcpu, vmcs12->host_cr4);
 
-        /* shadow page tables on either EPT or shadow page tables */
+        if (nested_cpu_has_ept(vmcs12))
+                nested_ept_uninit_mmu_context(vcpu);
+
         kvm_set_cr3(vcpu, vmcs12->host_cr3);
         kvm_mmu_reset_context(vcpu);
 
@@ -8001,23 +8237,61 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,
         vmcs_writel(GUEST_SYSENTER_EIP, vmcs12->host_ia32_sysenter_eip);
         vmcs_writel(GUEST_IDTR_BASE, vmcs12->host_idtr_base);
         vmcs_writel(GUEST_GDTR_BASE, vmcs12->host_gdtr_base);
-        vmcs_writel(GUEST_TR_BASE, vmcs12->host_tr_base);
-        vmcs_writel(GUEST_GS_BASE, vmcs12->host_gs_base);
-        vmcs_writel(GUEST_FS_BASE, vmcs12->host_fs_base);
-        vmcs_write16(GUEST_ES_SELECTOR, vmcs12->host_es_selector);
-        vmcs_write16(GUEST_CS_SELECTOR, vmcs12->host_cs_selector);
-        vmcs_write16(GUEST_SS_SELECTOR, vmcs12->host_ss_selector);
-        vmcs_write16(GUEST_DS_SELECTOR, vmcs12->host_ds_selector);
-        vmcs_write16(GUEST_FS_SELECTOR, vmcs12->host_fs_selector);
-        vmcs_write16(GUEST_GS_SELECTOR, vmcs12->host_gs_selector);
-        vmcs_write16(GUEST_TR_SELECTOR, vmcs12->host_tr_selector);
-
-        if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_PAT)
+
+        if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_PAT) {
                 vmcs_write64(GUEST_IA32_PAT, vmcs12->host_ia32_pat);
+                vcpu->arch.pat = vmcs12->host_ia32_pat;
+        }
         if (vmcs12->vm_exit_controls & VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL)
                 vmcs_write64(GUEST_IA32_PERF_GLOBAL_CTRL,
                         vmcs12->host_ia32_perf_global_ctrl);
 
+        /* Set L1 segment info according to Intel SDM
+            27.5.2 Loading Host Segment and Descriptor-Table Registers */
+        seg = (struct kvm_segment) {
+                .base = 0,
+                .limit = 0xFFFFFFFF,
+                .selector = vmcs12->host_cs_selector,
+                .type = 11,
+                .present = 1,
+                .s = 1,
+                .g = 1
+        };
+        if (vmcs12->vm_exit_controls & VM_EXIT_HOST_ADDR_SPACE_SIZE)
+                seg.l = 1;
+        else
+                seg.db = 1;
+        vmx_set_segment(vcpu, &seg, VCPU_SREG_CS);
+        seg = (struct kvm_segment) {
+                .base = 0,
+                .limit = 0xFFFFFFFF,
+                .type = 3,
+                .present = 1,
+                .s = 1,
+                .db = 1,
+                .g = 1
+        };
+        seg.selector = vmcs12->host_ds_selector;
+        vmx_set_segment(vcpu, &seg, VCPU_SREG_DS);
+        seg.selector = vmcs12->host_es_selector;
+        vmx_set_segment(vcpu, &seg, VCPU_SREG_ES);
+        seg.selector = vmcs12->host_ss_selector;
+        vmx_set_segment(vcpu, &seg, VCPU_SREG_SS);
+        seg.selector = vmcs12->host_fs_selector;
+        seg.base = vmcs12->host_fs_base;
+        vmx_set_segment(vcpu, &seg, VCPU_SREG_FS);
+        seg.selector = vmcs12->host_gs_selector;
+        seg.base = vmcs12->host_gs_base;
+        vmx_set_segment(vcpu, &seg, VCPU_SREG_GS);
+        seg = (struct kvm_segment) {
+                .base = vmcs12->host_tr_base,
+                .limit = 0x67,
+                .selector = vmcs12->host_tr_selector,
+                .type = 11,
+                .present = 1
+        };
+        vmx_set_segment(vcpu, &seg, VCPU_SREG_TR);
+
         kvm_set_dr(vcpu, 7, 0x400);
         vmcs_write64(GUEST_IA32_DEBUGCTL, 0);
 }
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
index d21bce505315..e5ca72a5cdb6 100644
--- a/arch/x86/kvm/x86.c
+++ b/arch/x86/kvm/x86.c
@@ -682,17 +682,6 @@ int kvm_set_cr3(struct kvm_vcpu *vcpu, unsigned long cr3)
                  */
         }
 
-        /*
-         * Does the new cr3 value map to physical memory? (Note, we
-         * catch an invalid cr3 even in real-mode, because it would
-         * cause trouble later on when we turn on paging anyway.)
-         *
-         * A real CPU would silently accept an invalid cr3 and would
-         * attempt to use it - with largely undefined (and often hard
-         * to debug) behavior on the guest side.
-         */
-        if (unlikely(!gfn_to_memslot(vcpu->kvm, cr3 >> PAGE_SHIFT)))
-                return 1;
         vcpu->arch.cr3 = cr3;
         __set_bit(VCPU_EXREG_CR3, (ulong *)&vcpu->arch.regs_avail);
         vcpu->arch.mmu.new_cr3(vcpu);
@@ -850,7 +839,8 @@ static u32 msrs_to_save[] = {
 #ifdef CONFIG_X86_64
         MSR_CSTAR, MSR_KERNEL_GS_BASE, MSR_SYSCALL_MASK, MSR_LSTAR,
 #endif
-        MSR_IA32_TSC, MSR_IA32_CR_PAT, MSR_VM_HSAVE_PA
+        MSR_IA32_TSC, MSR_IA32_CR_PAT, MSR_VM_HSAVE_PA,
+        MSR_IA32_FEATURE_CONTROL
 };
 
 static unsigned num_msrs_to_save;
@@ -1457,6 +1447,29 @@ static void pvclock_update_vm_gtod_copy(struct kvm *kvm)
 #endif
 }
 
+static void kvm_gen_update_masterclock(struct kvm *kvm)
+{
+#ifdef CONFIG_X86_64
+        int i;
+        struct kvm_vcpu *vcpu;
+        struct kvm_arch *ka = &kvm->arch;
+
+        spin_lock(&ka->pvclock_gtod_sync_lock);
+        kvm_make_mclock_inprogress_request(kvm);
+        /* no guest entries from this point */
+        pvclock_update_vm_gtod_copy(kvm);
+
+        kvm_for_each_vcpu(i, vcpu, kvm)
+                set_bit(KVM_REQ_CLOCK_UPDATE, &vcpu->requests);
+
+        /* guest entries allowed */
+        kvm_for_each_vcpu(i, vcpu, kvm)
+                clear_bit(KVM_REQ_MCLOCK_INPROGRESS, &vcpu->requests);
+
+        spin_unlock(&ka->pvclock_gtod_sync_lock);
+#endif
+}
+
 static int kvm_guest_time_update(struct kvm_vcpu *v)
 {
         unsigned long flags, this_tsc_khz;
@@ -3806,6 +3819,7 @@ long kvm_arch_vm_ioctl(struct file *filp,
                 delta = user_ns.clock - now_ns;
                 local_irq_enable();
                 kvm->arch.kvmclock_offset = delta;
+                kvm_gen_update_masterclock(kvm);
                 break;
         }
         case KVM_GET_CLOCK: {
@@ -4955,6 +4969,97 @@ static bool retry_instruction(struct x86_emulate_ctxt *ctxt,
 static int complete_emulated_mmio(struct kvm_vcpu *vcpu);
 static int complete_emulated_pio(struct kvm_vcpu *vcpu);
 
+static int kvm_vcpu_check_hw_bp(unsigned long addr, u32 type, u32 dr7,
+                                unsigned long *db)
+{
+        u32 dr6 = 0;
+        int i;
+        u32 enable, rwlen;
+
+        enable = dr7;
+        rwlen = dr7 >> 16;
+        for (i = 0; i < 4; i++, enable >>= 2, rwlen >>= 4)
+                if ((enable & 3) && (rwlen & 15) == type && db[i] == addr)
+                        dr6 |= (1 << i);
+        return dr6;
+}
+
+static void kvm_vcpu_check_singlestep(struct kvm_vcpu *vcpu, int *r)
+{
+        struct kvm_run *kvm_run = vcpu->run;
+
+        /*
+         * Use the "raw" value to see if TF was passed to the processor.
+         * Note that the new value of the flags has not been saved yet.
+         *
+         * This is correct even for TF set by the guest, because "the
+         * processor will not generate this exception after the instruction
+         * that sets the TF flag".
+         */
+        unsigned long rflags = kvm_x86_ops->get_rflags(vcpu);
+
+        if (unlikely(rflags & X86_EFLAGS_TF)) {
+                if (vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP) {
+                        kvm_run->debug.arch.dr6 = DR6_BS | DR6_FIXED_1;
+                        kvm_run->debug.arch.pc = vcpu->arch.singlestep_rip;
+                        kvm_run->debug.arch.exception = DB_VECTOR;
+                        kvm_run->exit_reason = KVM_EXIT_DEBUG;
+                        *r = EMULATE_USER_EXIT;
+                } else {
+                        vcpu->arch.emulate_ctxt.eflags &= ~X86_EFLAGS_TF;
+                        /*
+                         * "Certain debug exceptions may clear bit 0-3.  The
+                         * remaining contents of the DR6 register are never
+                         * cleared by the processor".
+                         */
+                        vcpu->arch.dr6 &= ~15;
+                        vcpu->arch.dr6 |= DR6_BS;
+                        kvm_queue_exception(vcpu, DB_VECTOR);
+                }
+        }
+}
+
+static bool kvm_vcpu_check_breakpoint(struct kvm_vcpu *vcpu, int *r)
+{
+        struct kvm_run *kvm_run = vcpu->run;
+        unsigned long eip = vcpu->arch.emulate_ctxt.eip;
+        u32 dr6 = 0;
+
+        if (unlikely(vcpu->guest_debug & KVM_GUESTDBG_USE_HW_BP) &&
+            (vcpu->arch.guest_debug_dr7 & DR7_BP_EN_MASK)) {
+                dr6 = kvm_vcpu_check_hw_bp(eip, 0,
+                                           vcpu->arch.guest_debug_dr7,
+                                           vcpu->arch.eff_db);
+
+                if (dr6 != 0) {
+                        kvm_run->debug.arch.dr6 = dr6 | DR6_FIXED_1;
+                        kvm_run->debug.arch.pc = kvm_rip_read(vcpu) +
+                                get_segment_base(vcpu, VCPU_SREG_CS);
+
+                        kvm_run->debug.arch.exception = DB_VECTOR;
+                        kvm_run->exit_reason = KVM_EXIT_DEBUG;
+                        *r = EMULATE_USER_EXIT;
+                        return true;
+                }
+        }
+
+        if (unlikely(vcpu->arch.dr7 & DR7_BP_EN_MASK)) {
+                dr6 = kvm_vcpu_check_hw_bp(eip, 0,
+                                           vcpu->arch.dr7,
+                                           vcpu->arch.db);
+
+                if (dr6 != 0) {
+                        vcpu->arch.dr6 &= ~15;
+                        vcpu->arch.dr6 |= dr6;
+                        kvm_queue_exception(vcpu, DB_VECTOR);
+                        *r = EMULATE_DONE;
+                        return true;
+                }
+        }
+
+        return false;
+}
+
 int x86_emulate_instruction(struct kvm_vcpu *vcpu,
                             unsigned long cr2,
                             int emulation_type,
@@ -4975,6 +5080,16 @@ int x86_emulate_instruction(struct kvm_vcpu *vcpu,
 
         if (!(emulation_type & EMULTYPE_NO_DECODE)) {
                 init_emulate_ctxt(vcpu);
+
+                /*
+                 * We will reenter on the same instruction since
+                 * we do not set complete_userspace_io.  This does not
+                 * handle watchpoints yet, those would be handled in
+                 * the emulate_ops.
+                 */
+                if (kvm_vcpu_check_breakpoint(vcpu, &r))
+                        return r;
+
                 ctxt->interruptibility = 0;
                 ctxt->have_exception = false;
                 ctxt->perm_ok = false;
@@ -5031,17 +5146,18 @@ restart:
                 inject_emulated_exception(vcpu);
                 r = EMULATE_DONE;
         } else if (vcpu->arch.pio.count) {
-                if (!vcpu->arch.pio.in)
+                if (!vcpu->arch.pio.in) {
+                        /* FIXME: return into emulator if single-stepping.  */
                         vcpu->arch.pio.count = 0;
-                else {
+                } else {
                         writeback = false;
                         vcpu->arch.complete_userspace_io = complete_emulated_pio;
                 }
-                r = EMULATE_DO_MMIO;
+                r = EMULATE_USER_EXIT;
         } else if (vcpu->mmio_needed) {
                 if (!vcpu->mmio_is_write)
                         writeback = false;
-                r = EMULATE_DO_MMIO;
+                r = EMULATE_USER_EXIT;
                 vcpu->arch.complete_userspace_io = complete_emulated_mmio;
         } else if (r == EMULATION_RESTART)
                 goto restart;
@@ -5050,10 +5166,12 @@ restart:
 
         if (writeback) {
                 toggle_interruptibility(vcpu, ctxt->interruptibility);
-                kvm_set_rflags(vcpu, ctxt->eflags);
                 kvm_make_request(KVM_REQ_EVENT, vcpu);
                 vcpu->arch.emulate_regs_need_sync_to_vcpu = false;
                 kvm_rip_write(vcpu, ctxt->eip);
+                if (r == EMULATE_DONE)
+                        kvm_vcpu_check_singlestep(vcpu, &r);
+                kvm_set_rflags(vcpu, ctxt->eflags);
         } else
                 vcpu->arch.emulate_regs_need_sync_to_vcpu = true;
 
@@ -5347,7 +5465,7 @@ static struct notifier_block pvclock_gtod_notifier = {
 int kvm_arch_init(void *opaque)
 {
         int r;
-        struct kvm_x86_ops *ops = (struct kvm_x86_ops *)opaque;
+        struct kvm_x86_ops *ops = opaque;
 
         if (kvm_x86_ops) {
                 printk(KERN_ERR "kvm: already loaded the other module\n");
@@ -5495,6 +5613,23 @@ int kvm_hv_hypercall(struct kvm_vcpu *vcpu)
         return 1;
 }
 
+/*
+ * kvm_pv_kick_cpu_op:  Kick a vcpu.
+ *
+ * @apicid - apicid of vcpu to be kicked.
+ */
+static void kvm_pv_kick_cpu_op(struct kvm *kvm, unsigned long flags, int apicid)
+{
+        struct kvm_lapic_irq lapic_irq;
+
+        lapic_irq.shorthand = 0;
+        lapic_irq.dest_mode = 0;
+        lapic_irq.dest_id = apicid;
+
+        lapic_irq.delivery_mode = APIC_DM_REMRD;
+        kvm_irq_delivery_to_apic(kvm, 0, &lapic_irq, NULL);
+}
+
 int kvm_emulate_hypercall(struct kvm_vcpu *vcpu)
 {
         unsigned long nr, a0, a1, a2, a3, ret;
@@ -5528,6 +5663,10 @@ int kvm_emulate_hypercall(struct kvm_vcpu *vcpu)
         case KVM_HC_VAPIC_POLL_IRQ:
                 ret = 0;
                 break;
+        case KVM_HC_KICK_CPU:
+                kvm_pv_kick_cpu_op(vcpu->kvm, a0, a1);
+                ret = 0;
+                break;
         default:
                 ret = -KVM_ENOSYS;
                 break;
@@ -5689,29 +5828,6 @@ static void process_nmi(struct kvm_vcpu *vcpu)
         kvm_make_request(KVM_REQ_EVENT, vcpu);
 }
 
-static void kvm_gen_update_masterclock(struct kvm *kvm)
-{
-#ifdef CONFIG_X86_64
-        int i;
-        struct kvm_vcpu *vcpu;
-        struct kvm_arch *ka = &kvm->arch;
-
-        spin_lock(&ka->pvclock_gtod_sync_lock);
-        kvm_make_mclock_inprogress_request(kvm);
-        /* no guest entries from this point */
-        pvclock_update_vm_gtod_copy(kvm);
-
-        kvm_for_each_vcpu(i, vcpu, kvm)
-                set_bit(KVM_REQ_CLOCK_UPDATE, &vcpu->requests);
-
-        /* guest entries allowed */
-        kvm_for_each_vcpu(i, vcpu, kvm)
-                clear_bit(KVM_REQ_MCLOCK_INPROGRESS, &vcpu->requests);
-
-        spin_unlock(&ka->pvclock_gtod_sync_lock);
-#endif
-}
-
 static void vcpu_scan_ioapic(struct kvm_vcpu *vcpu)
 {
         u64 eoi_exit_bitmap[4];
@@ -5950,6 +6066,7 @@ static int __vcpu_run(struct kvm_vcpu *vcpu)
                                 kvm_apic_accept_events(vcpu);
                                 switch(vcpu->arch.mp_state) {
                                 case KVM_MP_STATE_HALTED:
+                                        vcpu->arch.pv.pv_unhalted = false;
                                         vcpu->arch.mp_state =
                                                 KVM_MP_STATE_RUNNABLE;
                                 case KVM_MP_STATE_RUNNABLE:
@@ -6061,6 +6178,8 @@ static int complete_emulated_mmio(struct kvm_vcpu *vcpu)
 
         if (vcpu->mmio_cur_fragment == vcpu->mmio_nr_fragments) {
                 vcpu->mmio_needed = 0;
+
+                /* FIXME: return into emulator if single-stepping.  */
                 if (vcpu->mmio_is_write)
                         return 1;
                 vcpu->mmio_read_completed = 1;
@@ -6249,7 +6368,12 @@ int kvm_arch_vcpu_ioctl_get_mpstate(struct kvm_vcpu *vcpu,
                                     struct kvm_mp_state *mp_state)
 {
         kvm_apic_accept_events(vcpu);
-        mp_state->mp_state = vcpu->arch.mp_state;
+        if (vcpu->arch.mp_state == KVM_MP_STATE_HALTED &&
+                                        vcpu->arch.pv.pv_unhalted)
+                mp_state->mp_state = KVM_MP_STATE_RUNNABLE;
+        else
+                mp_state->mp_state = vcpu->arch.mp_state;
+
         return 0;
 }
 
@@ -6770,6 +6894,7 @@ int kvm_arch_vcpu_init(struct kvm_vcpu *vcpu)
         BUG_ON(vcpu->kvm == NULL);
         kvm = vcpu->kvm;
 
+        vcpu->arch.pv.pv_unhalted = false;
         vcpu->arch.emulate_ctxt.ops = &emulate_ops;
         if (!irqchip_in_kernel(kvm) || kvm_vcpu_is_bsp(vcpu))
                 vcpu->arch.mp_state = KVM_MP_STATE_RUNNABLE;
@@ -7019,6 +7144,15 @@ out_free:
         return -ENOMEM;
 }
 
+void kvm_arch_memslots_updated(struct kvm *kvm)
+{
+        /*
+         * memslots->generation has been incremented.
+         * mmio generation may have reached its maximum value.
+         */
+        kvm_mmu_invalidate_mmio_sptes(kvm);
+}
+
 int kvm_arch_prepare_memory_region(struct kvm *kvm,
                                 struct kvm_memory_slot *memslot,
                                 struct kvm_userspace_memory_region *mem,
@@ -7079,11 +7213,6 @@ void kvm_arch_commit_memory_region(struct kvm *kvm,
          */
         if ((change != KVM_MR_DELETE) && (mem->flags & KVM_MEM_LOG_DIRTY_PAGES))
                 kvm_mmu_slot_remove_write_access(kvm, mem->slot);
-        /*
-         * If memory slot is created, or moved, we need to clear all
-         * mmio sptes.
-         */
-        kvm_mmu_invalidate_mmio_sptes(kvm);
 }
 
 void kvm_arch_flush_shadow_all(struct kvm *kvm)
@@ -7103,6 +7232,7 @@ int kvm_arch_vcpu_runnable(struct kvm_vcpu *vcpu)
                 !vcpu->arch.apf.halted)
                 || !list_empty_careful(&vcpu->async_pf.done)
                 || kvm_apic_has_events(vcpu)
+                || vcpu->arch.pv.pv_unhalted
                 || atomic_read(&vcpu->arch.nmi_queued) ||
                 (kvm_arch_interrupt_allowed(vcpu) &&
                  kvm_cpu_has_interrupt(vcpu));
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c
index 6a22c19da663..bdf8532494fe 100644
--- a/arch/x86/lguest/boot.c
+++ b/arch/x86/lguest/boot.c
@@ -7,8 +7,7 @@
  * kernel and insert a module (lg.ko) which allows us to run other Linux
  * kernels the same way we'd run processes.  We call the first kernel the Host,
  * and the others the Guests.  The program which sets up and configures Guests
- * (such as the example in Documentation/virtual/lguest/lguest.c) is called the
- * Launcher.
+ * (such as the example in tools/lguest/lguest.c) is called the Launcher.
  *
  * Secondly, we only run specially modified Guests, not normal kernels: setting
  * CONFIG_LGUEST_GUEST to "y" compiles this file into the kernel so it knows
@@ -1057,6 +1056,12 @@ static void lguest_load_sp0(struct tss_struct *tss,
 }
 
 /* Let's just say, I wouldn't do debugging under a Guest. */
+static unsigned long lguest_get_debugreg(int regno)
+{
+        /* FIXME: Implement */
+        return 0;
+}
+
 static void lguest_set_debugreg(int regno, unsigned long value)
 {
         /* FIXME: Implement */
@@ -1304,6 +1309,7 @@ __init void lguest_init(void)
         pv_cpu_ops.load_tr_desc = lguest_load_tr_desc;
         pv_cpu_ops.set_ldt = lguest_set_ldt;
         pv_cpu_ops.load_tls = lguest_load_tls;
+        pv_cpu_ops.get_debugreg = lguest_get_debugreg;
         pv_cpu_ops.set_debugreg = lguest_set_debugreg;
         pv_cpu_ops.clts = lguest_clts;
         pv_cpu_ops.read_cr0 = lguest_read_cr0;
diff --git a/arch/x86/lib/csum-wrappers_64.c b/arch/x86/lib/csum-wrappers_64.c
index 25b7ae8d058a..7609e0e421ec 100644
--- a/arch/x86/lib/csum-wrappers_64.c
+++ b/arch/x86/lib/csum-wrappers_64.c
@@ -6,6 +6,7 @@
  */
 #include <asm/checksum.h>
 #include <linux/module.h>
+#include <asm/smap.h>
 
 /**
  * csum_partial_copy_from_user - Copy and checksum from user space.
@@ -52,8 +53,10 @@ csum_partial_copy_from_user(const void __user *src, void *dst,
                         len -= 2;
                 }
         }
+        stac();
         isum = csum_partial_copy_generic((__force const void *)src,
                                 dst, len, isum, errp, NULL);
+        clac();
         if (unlikely(*errp))
                 goto out_err;
 
@@ -82,6 +85,8 @@ __wsum
 csum_partial_copy_to_user(const void *src, void __user *dst,
                           int len, __wsum isum, int *errp)
 {
+        __wsum ret;
+
         might_sleep();
 
         if (unlikely(!access_ok(VERIFY_WRITE, dst, len))) {
@@ -105,8 +110,11 @@ csum_partial_copy_to_user(const void *src, void __user *dst,
         }
 
         *errp = 0;
-        return csum_partial_copy_generic(src, (void __force *)dst,
-                                         len, isum, NULL, errp);
+        stac();
+        ret = csum_partial_copy_generic(src, (void __force *)dst,
+                                        len, isum, NULL, errp);
+        clac();
+        return ret;
 }
 EXPORT_SYMBOL(csum_partial_copy_to_user);
 
diff --git a/arch/x86/lib/usercopy_64.c b/arch/x86/lib/usercopy_64.c
index 906fea315791..c905e89e19fe 100644
--- a/arch/x86/lib/usercopy_64.c
+++ b/arch/x86/lib/usercopy_64.c
@@ -68,7 +68,7 @@ EXPORT_SYMBOL(copy_in_user);
  * Since protection fault in copy_from/to_user is not a normal situation,
  * it is not necessary to optimize tail handling.
  */
-unsigned long
+__visible unsigned long
 copy_user_handle_tail(char *to, char *from, unsigned len, unsigned zerorest)
 {
         char c;
diff --git a/arch/x86/lib/x86-opcode-map.txt b/arch/x86/lib/x86-opcode-map.txt
index 5d7e51f3fd28..533a85e3a07e 100644
--- a/arch/x86/lib/x86-opcode-map.txt
+++ b/arch/x86/lib/x86-opcode-map.txt
@@ -1,10 +1,8 @@
 # x86 Opcode Maps
 #
 # This is (mostly) based on following documentations.
-# - Intel(R) 64 and IA-32 Architectures Software Developer's Manual Vol.2
-#   (#325383-040US, October 2011)
-# - Intel(R) Advanced Vector Extensions Programming Reference
-#   (#319433-011,JUNE 2011).
+# - Intel(R) 64 and IA-32 Architectures Software Developer's Manual Vol.2C
+#   (#326018-047US, June 2013)
 #
 #<Opcode maps>
 # Table: table-name
@@ -29,6 +27,7 @@
 #  - (F3): the last prefix is 0xF3
 #  - (F2): the last prefix is 0xF2
 #  - (!F3) : the last prefix is not 0xF3 (including non-last prefix case)
+#  - (66&F2): Both 0x66 and 0xF2 prefixes are specified.
 
 Table: one byte opcode
 Referrer:
@@ -246,8 +245,8 @@ c2: RETN Iw (f64)
 c3: RETN
 c4: LES Gz,Mp (i64) | VEX+2byte (Prefix)
 c5: LDS Gz,Mp (i64) | VEX+1byte (Prefix)
-c6: Grp11 Eb,Ib (1A)
-c7: Grp11 Ev,Iz (1A)
+c6: Grp11A Eb,Ib (1A)
+c7: Grp11B Ev,Iz (1A)
 c8: ENTER Iw,Ib
 c9: LEAVE (d64)
 ca: RETF Iw
@@ -293,8 +292,8 @@ ef: OUT DX,eAX
 # 0xf0 - 0xff
 f0: LOCK (Prefix)
 f1:
-f2: REPNE (Prefix)
-f3: REP/REPE (Prefix)
+f2: REPNE (Prefix) | XACQUIRE (Prefix)
+f3: REP/REPE (Prefix) | XRELEASE (Prefix)
 f4: HLT
 f5: CMC
 f6: Grp3_1 Eb (1A)
@@ -326,7 +325,8 @@ AVXcode: 1
 0a:
 0b: UD2 (1B)
 0c:
-0d: NOP Ev | GrpP
+# AMD's prefetch group. Intel supports prefetchw(/1) only.
+0d: GrpP
 0e: FEMMS
 # 3DNow! uses the last imm byte as opcode extension.
 0f: 3DNow! Pq,Qq,Ib
@@ -729,12 +729,12 @@ dc: VAESENC Vdq,Hdq,Wdq (66),(v1)
 dd: VAESENCLAST Vdq,Hdq,Wdq (66),(v1)
 de: VAESDEC Vdq,Hdq,Wdq (66),(v1)
 df: VAESDECLAST Vdq,Hdq,Wdq (66),(v1)
-f0: MOVBE Gy,My | MOVBE Gw,Mw (66) | CRC32 Gd,Eb (F2)
-f1: MOVBE My,Gy | MOVBE Mw,Gw (66) | CRC32 Gd,Ey (F2)
+f0: MOVBE Gy,My | MOVBE Gw,Mw (66) | CRC32 Gd,Eb (F2) | CRC32 Gd,Eb (66&F2)
+f1: MOVBE My,Gy | MOVBE Mw,Gw (66) | CRC32 Gd,Ey (F2) | CRC32 Gd,Ew (66&F2)
 f2: ANDN Gy,By,Ey (v)
 f3: Grp17 (1A)
 f5: BZHI Gy,Ey,By (v) | PEXT Gy,By,Ey (F3),(v) | PDEP Gy,By,Ey (F2),(v)
-f6: MULX By,Gy,rDX,Ey (F2),(v)
+f6: ADCX Gy,Ey (66) | ADOX Gy,Ey (F3) | MULX By,Gy,rDX,Ey (F2),(v)
 f7: BEXTR Gy,Ey,By (v) | SHLX Gy,Ey,By (66),(v) | SARX Gy,Ey,By (F3),(v) | SHRX Gy,Ey,By (F2),(v)
 EndTable
 
@@ -861,8 +861,8 @@ EndTable
 
 GrpTable: Grp7
 0: SGDT Ms | VMCALL (001),(11B) | VMLAUNCH (010),(11B) | VMRESUME (011),(11B) | VMXOFF (100),(11B)
-1: SIDT Ms | MONITOR (000),(11B) | MWAIT (001)
-2: LGDT Ms | XGETBV (000),(11B) | XSETBV (001),(11B) | VMFUNC (100),(11B)
+1: SIDT Ms | MONITOR (000),(11B) | MWAIT (001),(11B) | CLAC (010),(11B) | STAC (011),(11B)
+2: LGDT Ms | XGETBV (000),(11B) | XSETBV (001),(11B) | VMFUNC (100),(11B) | XEND (101)(11B) | XTEST (110)(11B)
 3: LIDT Ms
 4: SMSW Mw/Rv
 5:
@@ -880,15 +880,21 @@ EndTable
 GrpTable: Grp9
 1: CMPXCHG8B/16B Mq/Mdq
 6: VMPTRLD Mq | VMCLEAR Mq (66) | VMXON Mq (F3) | RDRAND Rv (11B)
-7: VMPTRST Mq | VMPTRST Mq (F3)
+7: VMPTRST Mq | VMPTRST Mq (F3) | RDSEED Rv (11B)
 EndTable
 
 GrpTable: Grp10
 EndTable
 
-GrpTable: Grp11
-# Note: the operands are given by group opcode
-0: MOV
+# Grp11A and Grp11B are expressed as Grp11 in Intel SDM
+GrpTable: Grp11A
+0: MOV Eb,Ib
+7: XABORT Ib (000),(11B)
+EndTable
+
+GrpTable: Grp11B
+0: MOV Eb,Iz
+7: XBEGIN Jz (000),(11B)
 EndTable
 
 GrpTable: Grp12
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c
index 654be4ae3047..3aaeffcfd67a 100644
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@@ -842,23 +842,15 @@ do_sigbus(struct pt_regs *regs, unsigned long error_code, unsigned long address,
         force_sig_info_fault(SIGBUS, code, address, tsk, fault);
 }
 
-static noinline int
+static noinline void
 mm_fault_error(struct pt_regs *regs, unsigned long error_code,
                unsigned long address, unsigned int fault)
 {
-        /*
-         * Pagefault was interrupted by SIGKILL. We have no reason to
-         * continue pagefault.
-         */
-        if (fatal_signal_pending(current)) {
-                if (!(fault & VM_FAULT_RETRY))
-                        up_read(&current->mm->mmap_sem);
-                if (!(error_code & PF_USER))
-                        no_context(regs, error_code, address, 0, 0);
-                return 1;
+        if (fatal_signal_pending(current) && !(error_code & PF_USER)) {
+                up_read(&current->mm->mmap_sem);
+                no_context(regs, error_code, address, 0, 0);
+                return;
         }
-        if (!(fault & VM_FAULT_ERROR))
-                return 0;
 
         if (fault & VM_FAULT_OOM) {
                 /* Kernel mode? Handle exceptions or die: */
@@ -866,7 +858,7 @@ mm_fault_error(struct pt_regs *regs, unsigned long error_code,
                         up_read(&current->mm->mmap_sem);
                         no_context(regs, error_code, address,
                                    SIGSEGV, SEGV_MAPERR);
-                        return 1;
+                        return;
                 }
 
                 up_read(&current->mm->mmap_sem);
@@ -884,7 +876,6 @@ mm_fault_error(struct pt_regs *regs, unsigned long error_code,
                 else
                         BUG();
         }
-        return 1;
 }
 
 static int spurious_fault_check(unsigned long error_code, pte_t *pte)
@@ -1011,9 +1002,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
         unsigned long address;
         struct mm_struct *mm;
         int fault;
-        int write = error_code & PF_WRITE;
-        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE |
-                                        (write ? FAULT_FLAG_WRITE : 0);
+        unsigned int flags = FAULT_FLAG_ALLOW_RETRY | FAULT_FLAG_KILLABLE;
 
         tsk = current;
         mm = tsk->mm;
@@ -1083,6 +1072,7 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
         if (user_mode_vm(regs)) {
                 local_irq_enable();
                 error_code |= PF_USER;
+                flags |= FAULT_FLAG_USER;
         } else {
                 if (regs->flags & X86_EFLAGS_IF)
                         local_irq_enable();
@@ -1109,6 +1099,9 @@ __do_page_fault(struct pt_regs *regs, unsigned long error_code)
                 return;
         }
 
+        if (error_code & PF_WRITE)
+                flags |= FAULT_FLAG_WRITE;
+
         /*
          * When running in the kernel we expect faults to occur only to
          * addresses in user space.  All other faults represent errors in
@@ -1187,9 +1180,17 @@ good_area:
          */
         fault = handle_mm_fault(mm, vma, address, flags);
 
-        if (unlikely(fault & (VM_FAULT_RETRY|VM_FAULT_ERROR))) {
-                if (mm_fault_error(regs, error_code, address, fault))
-                        return;
+        /*
+         * If we need to retry but a fatal signal is pending, handle the
+         * signal first. We do not need to release the mmap_sem because it
+         * would already be released in __lock_page_or_retry in mm/filemap.c.
+         */
+        if (unlikely((fault & VM_FAULT_RETRY) && fatal_signal_pending(current)))
+                return;
+
+        if (unlikely(fault & VM_FAULT_ERROR)) {
+                mm_fault_error(regs, error_code, address, fault);
+                return;
         }
 
         /*
diff --git a/arch/x86/mm/hugetlbpage.c b/arch/x86/mm/hugetlbpage.c
index 7e73e8c69096..9d980d88b747 100644
--- a/arch/x86/mm/hugetlbpage.c
+++ b/arch/x86/mm/hugetlbpage.c
@@ -59,6 +59,10 @@ follow_huge_pmd(struct mm_struct *mm, unsigned long address,
         return NULL;
 }
 
+int pmd_huge_support(void)
+{
+        return 0;
+}
 #else
 
 struct page *
@@ -77,6 +81,10 @@ int pud_huge(pud_t pud)
         return !!(pud_val(pud) & _PAGE_PSE);
 }
 
+int pmd_huge_support(void)
+{
+        return 1;
+}
 #endif
 
 /* x86_64 also uses this file */
diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index 2ec29ac78ae6..04664cdb7fda 100644
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -78,8 +78,8 @@ __ref void *alloc_low_pages(unsigned int num)
         return __va(pfn << PAGE_SHIFT);
 }
 
-/* need 4 4k for initial PMD_SIZE, 4k for 0-ISA_END_ADDRESS */
-#define INIT_PGT_BUF_SIZE       (5 * PAGE_SIZE)
+/* need 3 4k for initial PMD_SIZE,  3 4k for 0-ISA_END_ADDRESS */
+#define INIT_PGT_BUF_SIZE       (6 * PAGE_SIZE)
 RESERVE_BRK(early_pgt_alloc, INIT_PGT_BUF_SIZE);
 void  __init early_alloc_pgt_buf(void)
 {
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c
index 0215e2c563ef..799580cabc78 100644
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@ -487,7 +487,7 @@ __early_ioremap(resource_size_t phys_addr, unsigned long size, pgprot_t prot)
         unsigned long offset;
         resource_size_t last_addr;
         unsigned int nrpages;
-        enum fixed_addresses idx0, idx;
+        enum fixed_addresses idx;
         int i, slot;
 
         WARN_ON(system_state != SYSTEM_BOOTING);
@@ -540,8 +540,7 @@ __early_ioremap(resource_size_t phys_addr, unsigned long size, pgprot_t prot)
         /*
          * Ok, go for it..
          */
-        idx0 = FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*slot;
-        idx = idx0;
+        idx = FIX_BTMAP_BEGIN - NR_FIX_BTMAPS*slot;
         while (nrpages > 0) {
                 early_set_fixmap(idx, phys_addr, prot);
                 phys_addr += PAGE_SIZE;
diff --git a/arch/x86/mm/srat.c b/arch/x86/mm/srat.c
index cdd0da9dd530..266ca912f62e 100644
--- a/arch/x86/mm/srat.c
+++ b/arch/x86/mm/srat.c
@@ -146,6 +146,7 @@ int __init
 acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
 {
         u64 start, end;
+        u32 hotpluggable;
         int node, pxm;
 
         if (srat_disabled())
@@ -154,7 +155,8 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
                 goto out_err_bad_srat;
         if ((ma->flags & ACPI_SRAT_MEM_ENABLED) == 0)
                 goto out_err;
-        if ((ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE) && !save_add_info())
+        hotpluggable = ma->flags & ACPI_SRAT_MEM_HOT_PLUGGABLE;
+        if (hotpluggable && !save_add_info())
                 goto out_err;
 
         start = ma->base_address;
@@ -174,9 +176,10 @@ acpi_numa_memory_affinity_init(struct acpi_srat_mem_affinity *ma)
 
         node_set(node, numa_nodes_parsed);
 
-        printk(KERN_INFO "SRAT: Node %u PXM %u [mem %#010Lx-%#010Lx]\n",
-               node, pxm,
-               (unsigned long long) start, (unsigned long long) end - 1);
+        pr_info("SRAT: Node %u PXM %u [mem %#010Lx-%#010Lx]%s\n",
+                node, pxm,
+                (unsigned long long) start, (unsigned long long) end - 1,
+                hotpluggable ? " hotplug" : "");
 
         return 0;
 out_err_bad_srat:
diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c
index 282375f13c7e..ae699b3bbac8 100644
--- a/arch/x86/mm/tlb.c
+++ b/arch/x86/mm/tlb.c
@@ -103,6 +103,7 @@ static void flush_tlb_func(void *info)
         if (f->flush_mm != this_cpu_read(cpu_tlbstate.active_mm))
                 return;
 
+        count_vm_event(NR_TLB_REMOTE_FLUSH_RECEIVED);
         if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_OK) {
                 if (f->flush_end == TLB_FLUSH_ALL)
                         local_flush_tlb();
@@ -130,6 +131,7 @@ void native_flush_tlb_others(const struct cpumask *cpumask,
         info.flush_start = start;
         info.flush_end = end;
 
+        count_vm_event(NR_TLB_REMOTE_FLUSH);
         if (is_uv_system()) {
                 unsigned int cpu;
 
@@ -149,6 +151,7 @@ void flush_tlb_current_task(void)
 
         preempt_disable();
 
+        count_vm_event(NR_TLB_LOCAL_FLUSH_ALL);
         local_flush_tlb();
         if (cpumask_any_but(mm_cpumask(mm), smp_processor_id()) < nr_cpu_ids)
                 flush_tlb_others(mm_cpumask(mm), mm, 0UL, TLB_FLUSH_ALL);
@@ -211,16 +214,19 @@ void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start,
         act_entries = mm->total_vm > tlb_entries ? tlb_entries : mm->total_vm;
 
         /* tlb_flushall_shift is on balance point, details in commit log */
-        if ((end - start) >> PAGE_SHIFT > act_entries >> tlb_flushall_shift)
+        if ((end - start) >> PAGE_SHIFT > act_entries >> tlb_flushall_shift) {
+                count_vm_event(NR_TLB_LOCAL_FLUSH_ALL);
                 local_flush_tlb();
-        else {
+        } else {
                 if (has_large_page(mm, start, end)) {
                         local_flush_tlb();
                         goto flush_all;
                 }
                 /* flush range by one by one 'invlpg' */
-                for (addr = start; addr < end;  addr += PAGE_SIZE)
+                for (addr = start; addr < end;  addr += PAGE_SIZE) {
+                        count_vm_event(NR_TLB_LOCAL_FLUSH_ONE);
                         __flush_tlb_single(addr);
+                }
 
                 if (cpumask_any_but(mm_cpumask(mm),
                                 smp_processor_id()) < nr_cpu_ids)
@@ -256,6 +262,7 @@ void flush_tlb_page(struct vm_area_struct *vma, unsigned long start)
 
 static void do_flush_tlb_all(void *info)
 {
+        count_vm_event(NR_TLB_REMOTE_FLUSH_RECEIVED);
         __flush_tlb_all();
         if (this_cpu_read(cpu_tlbstate.state) == TLBSTATE_LAZY)
                 leave_mm(smp_processor_id());
@@ -263,6 +270,7 @@ static void do_flush_tlb_all(void *info)
 
 void flush_tlb_all(void)
 {
+        count_vm_event(NR_TLB_REMOTE_FLUSH);
         on_each_cpu(do_flush_tlb_all, NULL, 1);
 }
 
diff --git a/arch/x86/oprofile/nmi_int.c b/arch/x86/oprofile/nmi_int.c
index 48768df2471a..6890d8498e0b 100644
--- a/arch/x86/oprofile/nmi_int.c
+++ b/arch/x86/oprofile/nmi_int.c
@@ -403,7 +403,7 @@ static void nmi_cpu_down(void *dummy)
                 nmi_cpu_shutdown(dummy);
 }
 
-static int nmi_create_files(struct super_block *sb, struct dentry *root)
+static int nmi_create_files(struct dentry *root)
 {
         unsigned int i;
 
@@ -420,14 +420,14 @@ static int nmi_create_files(struct super_block *sb, struct dentry *root)
                         continue;
 
                 snprintf(buf,  sizeof(buf), "%d", i);
-                dir = oprofilefs_mkdir(sb, root, buf);
-                oprofilefs_create_ulong(sb, dir, "enabled", &counter_config[i].enabled);
-                oprofilefs_create_ulong(sb, dir, "event", &counter_config[i].event);
-                oprofilefs_create_ulong(sb, dir, "count", &counter_config[i].count);
-                oprofilefs_create_ulong(sb, dir, "unit_mask", &counter_config[i].unit_mask);
-                oprofilefs_create_ulong(sb, dir, "kernel", &counter_config[i].kernel);
-                oprofilefs_create_ulong(sb, dir, "user", &counter_config[i].user);
-                oprofilefs_create_ulong(sb, dir, "extra", &counter_config[i].extra);
+                dir = oprofilefs_mkdir(root, buf);
+                oprofilefs_create_ulong(dir, "enabled", &counter_config[i].enabled);
+                oprofilefs_create_ulong(dir, "event", &counter_config[i].event);
+                oprofilefs_create_ulong(dir, "count", &counter_config[i].count);
+                oprofilefs_create_ulong(dir, "unit_mask", &counter_config[i].unit_mask);
+                oprofilefs_create_ulong(dir, "kernel", &counter_config[i].kernel);
+                oprofilefs_create_ulong(dir, "user", &counter_config[i].user);
+                oprofilefs_create_ulong(dir, "extra", &counter_config[i].extra);
         }
 
         return 0;
diff --git a/arch/x86/oprofile/op_model_amd.c b/arch/x86/oprofile/op_model_amd.c
index b2b94438ff05..50d86c0e9ba4 100644
--- a/arch/x86/oprofile/op_model_amd.c
+++ b/arch/x86/oprofile/op_model_amd.c
@@ -454,16 +454,16 @@ static void init_ibs(void)
         printk(KERN_INFO "oprofile: AMD IBS detected (0x%08x)\n", ibs_caps);
 }
 
-static int (*create_arch_files)(struct super_block *sb, struct dentry *root);
+static int (*create_arch_files)(struct dentry *root);
 
-static int setup_ibs_files(struct super_block *sb, struct dentry *root)
+static int setup_ibs_files(struct dentry *root)
 {
         struct dentry *dir;
         int ret = 0;
 
         /* architecture specific files */
         if (create_arch_files)
-                ret = create_arch_files(sb, root);
+                ret = create_arch_files(root);
 
         if (ret)
                 return ret;
@@ -479,26 +479,26 @@ static int setup_ibs_files(struct super_block *sb, struct dentry *root)
         ibs_config.max_cnt_op = 250000;
 
         if (ibs_caps & IBS_CAPS_FETCHSAM) {
-                dir = oprofilefs_mkdir(sb, root, "ibs_fetch");
-                oprofilefs_create_ulong(sb, dir, "enable",
+                dir = oprofilefs_mkdir(root, "ibs_fetch");
+                oprofilefs_create_ulong(dir, "enable",
                                         &ibs_config.fetch_enabled);
-                oprofilefs_create_ulong(sb, dir, "max_count",
+                oprofilefs_create_ulong(dir, "max_count",
                                         &ibs_config.max_cnt_fetch);
-                oprofilefs_create_ulong(sb, dir, "rand_enable",
+                oprofilefs_create_ulong(dir, "rand_enable",
                                         &ibs_config.rand_en);
         }
 
         if (ibs_caps & IBS_CAPS_OPSAM) {
-                dir = oprofilefs_mkdir(sb, root, "ibs_op");
-                oprofilefs_create_ulong(sb, dir, "enable",
+                dir = oprofilefs_mkdir(root, "ibs_op");
+                oprofilefs_create_ulong(dir, "enable",
                                         &ibs_config.op_enabled);
-                oprofilefs_create_ulong(sb, dir, "max_count",
+                oprofilefs_create_ulong(dir, "max_count",
                                         &ibs_config.max_cnt_op);
                 if (ibs_caps & IBS_CAPS_OPCNT)
-                        oprofilefs_create_ulong(sb, dir, "dispatched_ops",
+                        oprofilefs_create_ulong(dir, "dispatched_ops",
                                                 &ibs_config.dispatched_ops);
                 if (ibs_caps & IBS_CAPS_BRNTRGT)
-                        oprofilefs_create_ulong(sb, dir, "branch_target",
+                        oprofilefs_create_ulong(dir, "branch_target",
                                                 &ibs_config.branch_target);
         }
 
diff --git a/arch/x86/pci/acpi.c b/arch/x86/pci/acpi.c
index d641897a1f4e..b30e937689d6 100644
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
@@ -568,13 +568,8 @@ struct pci_bus *pci_acpi_scan_root(struct acpi_pci_root *root)
          */
         if (bus) {
                 struct pci_bus *child;
-                list_for_each_entry(child, &bus->children, node) {
-                        struct pci_dev *self = child->self;
-                        if (!self)
-                                continue;
-
-                        pcie_bus_configure_settings(child, self->pcie_mpss);
-                }
+                list_for_each_entry(child, &bus->children, node)
+                        pcie_bus_configure_settings(child);
         }
 
         if (bus && node != -1) {
diff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c
index 94919e307f8e..db6b1ab43255 100644
--- a/arch/x86/pci/i386.c
+++ b/arch/x86/pci/i386.c
@@ -210,6 +210,8 @@ static void pcibios_allocate_bridge_resources(struct pci_dev *dev)
                 r = &dev->resource[idx];
                 if (!r->flags)
                         continue;
+                if (r->parent)  /* Already allocated */
+                        continue;
                 if (!r->start || pci_claim_resource(dev, idx) < 0) {
                         /*
                          * Something is wrong with the region.
@@ -318,6 +320,8 @@ static void pcibios_allocate_dev_rom_resource(struct pci_dev *dev)
         r = &dev->resource[PCI_ROM_RESOURCE];
         if (!r->flags || !r->start)
                 return;
+        if (r->parent) /* Already allocated */
+                return;
 
         if (pci_claim_resource(dev, PCI_ROM_RESOURCE) < 0) {
                 r->end -= r->start;
diff --git a/arch/x86/pci/mmconfig-shared.c b/arch/x86/pci/mmconfig-shared.c
index 082e88129712..5596c7bdd327 100644
--- a/arch/x86/pci/mmconfig-shared.c
+++ b/arch/x86/pci/mmconfig-shared.c
@@ -700,7 +700,7 @@ int pci_mmconfig_insert(struct device *dev, u16 seg, u8 start, u8 end,
         if (!(pci_probe & PCI_PROBE_MMCONF) || pci_mmcfg_arch_init_failed)
                 return -ENODEV;
 
-        if (start > end)
+        if (start > end || !addr)
                 return -EINVAL;
 
         mutex_lock(&pci_mmcfg_lock);
@@ -716,11 +716,6 @@ int pci_mmconfig_insert(struct device *dev, u16 seg, u8 start, u8 end,
                 return -EEXIST;
         }
 
-        if (!addr) {
-                mutex_unlock(&pci_mmcfg_lock);
-                return -EINVAL;
-        }
-
         rc = -EBUSY;
         cfg = pci_mmconfig_alloc(seg, start, end, addr);
         if (cfg == NULL) {
diff --git a/arch/x86/pci/mrst.c b/arch/x86/pci/mrst.c
index 6eb18c42a28a..903fded50786 100644
--- a/arch/x86/pci/mrst.c
+++ b/arch/x86/pci/mrst.c
@@ -23,11 +23,11 @@
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <linux/dmi.h>
+#include <linux/acpi.h>
+#include <linux/io.h>
+#include <linux/smp.h>
 
-#include <asm/acpi.h>
 #include <asm/segment.h>
-#include <asm/io.h>
-#include <asm/smp.h>
 #include <asm/pci_x86.h>
 #include <asm/hw_irq.h>
 #include <asm/io_apic.h>
@@ -43,7 +43,7 @@
 #define PCI_FIXED_BAR_4_SIZE    0x14
 #define PCI_FIXED_BAR_5_SIZE    0x1c
 
-static int pci_soc_mode = 0;
+static int pci_soc_mode;
 
 /**
  * fixed_bar_cap - return the offset of the fixed BAR cap if found
@@ -141,7 +141,8 @@ static int pci_device_update_fixed(struct pci_bus *bus, unsigned int devfn,
  */
 static bool type1_access_ok(unsigned int bus, unsigned int devfn, int reg)
 {
-        /* This is a workaround for A0 LNC bug where PCI status register does
+        /*
+         * This is a workaround for A0 LNC bug where PCI status register does
          * not have new CAP bit set. can not be written by SW either.
          *
          * PCI header type in real LNC indicates a single function device, this
@@ -154,7 +155,7 @@ static bool type1_access_ok(unsigned int bus, unsigned int devfn, int reg)
                                 || devfn == PCI_DEVFN(0, 0)
                                 || devfn == PCI_DEVFN(3, 0)))
                 return 1;
-        return 0; /* langwell on others */
+        return 0; /* Langwell on others */
 }
 
 static int pci_read(struct pci_bus *bus, unsigned int devfn, int where,
@@ -172,7 +173,8 @@ static int pci_write(struct pci_bus *bus, unsigned int devfn, int where,
 {
         int offset;
 
-        /* On MRST, there is no PCI ROM BAR, this will cause a subsequent read
+        /*
+         * On MRST, there is no PCI ROM BAR, this will cause a subsequent read
          * to ROM BAR return 0 then being ignored.
          */
         if (where == PCI_ROM_ADDRESS)
@@ -210,7 +212,8 @@ static int mrst_pci_irq_enable(struct pci_dev *dev)
 
         pci_read_config_byte(dev, PCI_INTERRUPT_PIN, &pin);
 
-        /* MRST only have IOAPIC, the PCI irq lines are 1:1 mapped to
+        /*
+         * MRST only have IOAPIC, the PCI irq lines are 1:1 mapped to
          * IOAPIC RTE entries, so we just enable RTE for the device.
          */
         irq_attr.ioapic = mp_find_ioapic(dev->irq);
@@ -235,7 +238,7 @@ struct pci_ops pci_mrst_ops = {
  */
 int __init pci_mrst_init(void)
 {
-        printk(KERN_INFO "Intel MID platform detected, using MID PCI ops\n");
+        pr_info("Intel MID platform detected, using MID PCI ops\n");
         pci_mmcfg_late_init();
         pcibios_enable_irq = mrst_pci_irq_enable;
         pci_root_ops = pci_mrst_ops;
@@ -244,17 +247,21 @@ int __init pci_mrst_init(void)
         return 1;
 }
 
-/* Langwell devices are not true pci devices, they are not subject to 10 ms
- * d3 to d0 delay required by pci spec.
+/*
+ * Langwell devices are not true PCI devices; they are not subject to 10 ms
+ * d3 to d0 delay required by PCI spec.
  */
 static void pci_d3delay_fixup(struct pci_dev *dev)
 {
-        /* PCI fixups are effectively decided compile time. If we have a dual
-           SoC/non-SoC kernel we don't want to mangle d3 on non SoC devices */
-        if (!pci_soc_mode)
-            return;
-        /* true pci devices in lincroft should allow type 1 access, the rest
-         * are langwell fake pci devices.
+        /*
+         * PCI fixups are effectively decided compile time. If we have a dual
+         * SoC/non-SoC kernel we don't want to mangle d3 on non-SoC devices.
+         */
+        if (!pci_soc_mode)
+                return;
+        /*
+         * True PCI devices in Lincroft should allow type 1 access, the rest
+         * are Langwell fake PCI devices.
          */
         if (type1_access_ok(dev->bus->number, dev->devfn, PCI_DEVICE_ID))
                 return;
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 90f6ed127096..c7e22ab29a5a 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -912,10 +912,13 @@ void __init efi_enter_virtual_mode(void)
 
         for (p = memmap.map; p < memmap.map_end; p += memmap.desc_size) {
                 md = p;
-                if (!(md->attribute & EFI_MEMORY_RUNTIME) &&
-                    md->type != EFI_BOOT_SERVICES_CODE &&
-                    md->type != EFI_BOOT_SERVICES_DATA)
-                        continue;
+                if (!(md->attribute & EFI_MEMORY_RUNTIME)) {
+#ifdef CONFIG_X86_64
+                        if (md->type != EFI_BOOT_SERVICES_CODE &&
+                            md->type != EFI_BOOT_SERVICES_DATA)
+#endif
+                                continue;
+                }
 
                 size = md->num_pages << EFI_PAGE_SHIFT;
                 end = md->phys_addr + size;
diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
index 47fe66fe61f1..3ca5957b7a34 100644
--- a/arch/x86/platform/mrst/mrst.c
+++ b/arch/x86/platform/mrst/mrst.c
@@ -20,7 +20,7 @@
 #include <linux/intel_pmic_gpio.h>
 #include <linux/spi/spi.h>
 #include <linux/i2c.h>
-#include <linux/i2c/pca953x.h>
+#include <linux/platform_data/pca953x.h>
 #include <linux/gpio_keys.h>
 #include <linux/input.h>
 #include <linux/platform_device.h>
diff --git a/arch/x86/power/cpu.c b/arch/x86/power/cpu.c
index 1cf5b300305e..424f4c97a44d 100644
--- a/arch/x86/power/cpu.c
+++ b/arch/x86/power/cpu.c
@@ -25,10 +25,10 @@
 #include <asm/cpu.h>
 
 #ifdef CONFIG_X86_32
-unsigned long saved_context_ebx;
-unsigned long saved_context_esp, saved_context_ebp;
-unsigned long saved_context_esi, saved_context_edi;
-unsigned long saved_context_eflags;
+__visible unsigned long saved_context_ebx;
+__visible unsigned long saved_context_esp, saved_context_ebp;
+__visible unsigned long saved_context_esi, saved_context_edi;
+__visible unsigned long saved_context_eflags;
 #endif
 struct saved_context saved_context;
 
diff --git a/arch/x86/power/hibernate_64.c b/arch/x86/power/hibernate_64.c
index a0fde91c16cf..304fca20d96e 100644
--- a/arch/x86/power/hibernate_64.c
+++ b/arch/x86/power/hibernate_64.c
@@ -20,26 +20,26 @@
 #include <asm/suspend.h>
 
 /* References to section boundaries */
-extern const void __nosave_begin, __nosave_end;
+extern __visible const void __nosave_begin, __nosave_end;
 
 /* Defined in hibernate_asm_64.S */
-extern int restore_image(void);
+extern asmlinkage int restore_image(void);
 
 /*
  * Address to jump to in the last phase of restore in order to get to the image
  * kernel's text (this value is passed in the image header).
  */
-unsigned long restore_jump_address;
+unsigned long restore_jump_address __visible;
 
 /*
  * Value of the cr3 register from before the hibernation (this value is passed
  * in the image header).
  */
-unsigned long restore_cr3;
+unsigned long restore_cr3 __visible;
 
-pgd_t *temp_level4_pgt;
+pgd_t *temp_level4_pgt __visible;
 
-void *relocated_restore_code;
+void *relocated_restore_code __visible;
 
 static void *alloc_pgt_page(void *context)
 {
diff --git a/arch/x86/tools/gen-insn-attr-x86.awk b/arch/x86/tools/gen-insn-attr-x86.awk
index e6773dc8ac41..093a892026f9 100644
--- a/arch/x86/tools/gen-insn-attr-x86.awk
+++ b/arch/x86/tools/gen-insn-attr-x86.awk
@@ -68,7 +68,7 @@ BEGIN {
 
         lprefix1_expr = "\\((66|!F3)\\)"
         lprefix2_expr = "\\(F3\\)"
-        lprefix3_expr = "\\((F2|!F3)\\)"
+        lprefix3_expr = "\\((F2|!F3|66\\&F2)\\)"
         lprefix_expr = "\\((66|F2|F3)\\)"
         max_lprefix = 4
 
@@ -83,6 +83,8 @@ BEGIN {
         prefix_num["Operand-Size"] = "INAT_PFX_OPNDSZ"
         prefix_num["REPNE"] = "INAT_PFX_REPNE"
         prefix_num["REP/REPE"] = "INAT_PFX_REPE"
+        prefix_num["XACQUIRE"] = "INAT_PFX_REPNE"
+        prefix_num["XRELEASE"] = "INAT_PFX_REPE"
         prefix_num["LOCK"] = "INAT_PFX_LOCK"
         prefix_num["SEG=CS"] = "INAT_PFX_CS"
         prefix_num["SEG=DS"] = "INAT_PFX_DS"
diff --git a/arch/x86/um/os-Linux/prctl.c b/arch/x86/um/os-Linux/prctl.c
index 9d34eddb517f..96eb2bd28832 100644
--- a/arch/x86/um/os-Linux/prctl.c
+++ b/arch/x86/um/os-Linux/prctl.c
@@ -4,7 +4,7 @@
  */
 
 #include <sys/ptrace.h>
-#include <linux/ptrace.h>
+#include <asm/ptrace.h>
 
 int os_arch_prctl(int pid, int code, unsigned long *addr)
 {
diff --git a/arch/x86/vdso/vclock_gettime.c b/arch/x86/vdso/vclock_gettime.c
index c74436e687bf..72074d528400 100644
--- a/arch/x86/vdso/vclock_gettime.c
+++ b/arch/x86/vdso/vclock_gettime.c
@@ -85,15 +85,18 @@ static notrace cycle_t vread_pvclock(int *mode)
         cycle_t ret;
         u64 last;
         u32 version;
-        u32 migrate_count;
         u8 flags;
         unsigned cpu, cpu1;
 
 
         /*
-         * When looping to get a consistent (time-info, tsc) pair, we
-         * also need to deal with the possibility we can switch vcpus,
-         * so make sure we always re-fetch time-info for the current vcpu.
+         * Note: hypervisor must guarantee that:
+         * 1. cpu ID number maps 1:1 to per-CPU pvclock time info.
+         * 2. that per-CPU pvclock time info is updated if the
+         *    underlying CPU changes.
+         * 3. that version is increased whenever underlying CPU
+         *    changes.
+         *
          */
         do {
                 cpu = __getcpu() & VGETCPU_CPU_MASK;
@@ -104,8 +107,6 @@ static notrace cycle_t vread_pvclock(int *mode)
 
                 pvti = get_pvti(cpu);
 
-                migrate_count = pvti->migrate_count;
-
                 version = __pvclock_read_cycles(&pvti->pvti, &ret, &flags);
 
                 /*
@@ -117,8 +118,7 @@ static notrace cycle_t vread_pvclock(int *mode)
                 cpu1 = __getcpu() & VGETCPU_CPU_MASK;
         } while (unlikely(cpu != cpu1 ||
                           (pvti->pvti.version & 1) ||
-                          pvti->pvti.version != version ||
-                          pvti->migrate_count != migrate_count));
+                          pvti->pvti.version != version));
 
         if (unlikely(!(flags & PVCLOCK_TSC_STABLE_BIT)))
                 *mode = VCLOCK_NONE;
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index f091c80974c4..fa6ade76ef3f 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -1724,15 +1724,12 @@ static void __init xen_hvm_guest_init(void)
         xen_hvm_init_mmu_ops();
 }
 
-static bool __init xen_hvm_platform(void)
+static uint32_t __init xen_hvm_platform(void)
 {
         if (xen_pv_domain())
-                return false;
-
-        if (!xen_cpuid_base())
-                return false;
+                return 0;
 
-        return true;
+        return xen_cpuid_base();
 }
 
 bool xen_hvm_need_lapic(void)
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h
index 86782c5d7e2a..95f8c6142328 100644
--- a/arch/x86/xen/xen-ops.h
+++ b/arch/x86/xen/xen-ops.h
@@ -105,9 +105,9 @@ static inline void __init xen_init_apic(void)
 /* Declare an asm function, along with symbols needed to make it
    inlineable */
 #define DECL_ASM(ret, name, ...)                \
-        ret name(__VA_ARGS__);                  \
-        extern char name##_end[];               \
-        extern char name##_reloc[]              \
+        __visible ret name(__VA_ARGS__);        \
+        extern char name##_end[] __visible;     \
+        extern char name##_reloc[] __visible
 
 DECL_ASM(void, xen_irq_enable_direct, void);
 DECL_ASM(void, xen_irq_disable_direct, void);
@@ -115,11 +115,11 @@ DECL_ASM(unsigned long, xen_save_fl_direct, void);
 DECL_ASM(void, xen_restore_fl_direct, unsigned long);
 
 /* These are not functions, and cannot be called normally */
-void xen_iret(void);
-void xen_sysexit(void);
-void xen_sysret32(void);
-void xen_sysret64(void);
-void xen_adjust_exception_frame(void);
+__visible void xen_iret(void);
+__visible void xen_sysexit(void);
+__visible void xen_sysret32(void);
+__visible void xen_sysret64(void);
+__visible void xen_adjust_exception_frame(void);
 
 extern int xen_panic_handler_init(void);
 
diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 7ea6451a3a33..8d24dcb7cdac 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -7,7 +7,6 @@ config XTENSA
         select HAVE_IDE
         select GENERIC_ATOMIC64
         select GENERIC_CLOCKEVENTS
-        select HAVE_GENERIC_HARDIRQS
         select VIRT_TO_BUS
         select GENERIC_IRQ_SHOW
         select GENERIC_CPU_DEVICES
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
index 136224b74d4f..81250ece3062 100644
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@ -55,10 +55,10 @@ ifneq ($(CONFIG_LD_NO_RELAX),)
 LDFLAGS := --no-relax
 endif
 
-ifeq ($(shell echo -e __XTENSA_EB__ | $(CC) -E - | grep -v "\#"),1)
+ifeq ($(shell echo __XTENSA_EB__ | $(CC) -E - | grep -v "\#"),1)
 CHECKFLAGS += -D__XTENSA_EB__
 endif
-ifeq ($(shell echo -e __XTENSA_EL__ | $(CC) -E - | grep -v "\#"),1)
+ifeq ($(shell echo __XTENSA_EL__ | $(CC) -E - | grep -v "\#"),1)
 CHECKFLAGS += -D__XTENSA_EL__
 endif
 
diff --git a/arch/xtensa/boot/Makefile b/arch/xtensa/boot/Makefile
index 64ffc4b53df6..ca20a892021b 100644
--- a/arch/xtensa/boot/Makefile
+++ b/arch/xtensa/boot/Makefile
@@ -12,7 +12,7 @@
 KBUILD_CFLAGS   += -fno-builtin -Iarch/$(ARCH)/boot/include
 HOSTFLAGS       += -Iarch/$(ARCH)/boot/include
 
-BIG_ENDIAN      := $(shell echo -e __XTENSA_EB__ | $(CC) -E - | grep -v "\#")
+BIG_ENDIAN      := $(shell echo __XTENSA_EB__ | $(CC) -E - | grep -v "\#")
 
 export ccflags-y
 export BIG_ENDIAN
diff --git a/arch/xtensa/configs/common_defconfig b/arch/xtensa/configs/common_defconfig
index a182a4e6d688..f6000fe05119 100644
--- a/arch/xtensa/configs/common_defconfig
+++ b/arch/xtensa/configs/common_defconfig
@@ -8,7 +8,6 @@ CONFIG_XTENSA=y
 # CONFIG_UID16 is not set
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_HAVE_DEC_LOCK=y
-CONFIG_GENERIC_HARDIRQS=y
 
 #
 # Code maturity level options
diff --git a/arch/xtensa/configs/iss_defconfig b/arch/xtensa/configs/iss_defconfig
index 77c52f80187a..4f233204faf9 100644
--- a/arch/xtensa/configs/iss_defconfig
+++ b/arch/xtensa/configs/iss_defconfig
@@ -9,7 +9,6 @@ CONFIG_XTENSA=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_HARDIRQS=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_NO_IOPORT=y
diff --git a/arch/xtensa/configs/s6105_defconfig b/arch/xtensa/configs/s6105_defconfig
index 4799c6a526b5..d929f77a0360 100644
--- a/arch/xtensa/configs/s6105_defconfig
+++ b/arch/xtensa/configs/s6105_defconfig
@@ -9,7 +9,6 @@ CONFIG_XTENSA=y
 CONFIG_RWSEM_XCHGADD_ALGORITHM=y
 CONFIG_GENERIC_FIND_NEXT_BIT=y
 CONFIG_GENERIC_HWEIGHT=y
-CONFIG_GENERIC_HARDIRQS=y
 # CONFIG_ARCH_HAS_ILOG2_U32 is not set
 # CONFIG_ARCH_HAS_ILOG2_U64 is not set
 CONFIG_NO_IOPORT=y
diff --git a/arch/xtensa/include/asm/regs.h b/arch/xtensa/include/asm/regs.h
index b24de6717020..4ba9f516b0e2 100644
--- a/arch/xtensa/include/asm/regs.h
+++ b/arch/xtensa/include/asm/regs.h
@@ -82,6 +82,7 @@
 #define PS_CALLINC_SHIFT        16
 #define PS_CALLINC_MASK         0x00030000
 #define PS_OWB_SHIFT            8
+#define PS_OWB_WIDTH            4
 #define PS_OWB_MASK             0x00000F00
 #define PS_RING_SHIFT           6
 #define PS_RING_MASK            0x000000C0
diff --git a/arch/xtensa/include/asm/timex.h b/arch/xtensa/include/asm/timex.h
index 69f901713fb6..27fa3c170662 100644
--- a/arch/xtensa/include/asm/timex.h
+++ b/arch/xtensa/include/asm/timex.h
@@ -35,13 +35,7 @@
 # error "Bad timer number for Linux configurations!"
 #endif
 
-#ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
 extern unsigned long ccount_freq;
-#define CCOUNT_PER_JIFFY (ccount_freq / HZ)
-#else
-#define CCOUNT_PER_JIFFY (CONFIG_XTENSA_CPU_CLOCK*(1000000UL/HZ))
-#endif
-
 
 typedef unsigned long long cycles_t;
 
diff --git a/arch/xtensa/kernel/align.S b/arch/xtensa/kernel/align.S
index aa2e87b8566a..d4cef6039a5c 100644
--- a/arch/xtensa/kernel/align.S
+++ b/arch/xtensa/kernel/align.S
@@ -146,9 +146,9 @@
  *   a0:        trashed, original value saved on stack (PT_AREG0)
  *   a1:        a1
  *   a2:        new stack pointer, original in DEPC
- *   a3:        dispatch table
+ *   a3:        a3
  *   depc:      a2, original value saved on stack (PT_DEPC)
- *   excsave_1: a3
+ *   excsave_1: dispatch table
  *
  *   PT_DEPC >= VALID_DOUBLE_EXCEPTION_ADDRESS: double exception, DEPC
  *           <  VALID_DOUBLE_EXCEPTION_ADDRESS: regular exception
@@ -171,7 +171,6 @@ ENTRY(fast_unaligned)
         s32i    a8, a2, PT_AREG8
 
         rsr     a0, depc
-        xsr     a3, excsave1
         s32i    a0, a2, PT_AREG2
         s32i    a3, a2, PT_AREG3
 
diff --git a/arch/xtensa/kernel/coprocessor.S b/arch/xtensa/kernel/coprocessor.S
index 647657484866..a482df5df2b2 100644
--- a/arch/xtensa/kernel/coprocessor.S
+++ b/arch/xtensa/kernel/coprocessor.S
@@ -32,9 +32,9 @@
  *   a0:        trashed, original value saved on stack (PT_AREG0)
  *   a1:        a1
  *   a2:        new stack pointer, original in DEPC
- *   a3:        dispatch table
+ *   a3:        a3
  *   depc:      a2, original value saved on stack (PT_DEPC)
- *   excsave_1: a3
+ *   excsave_1: dispatch table
  *
  *   PT_DEPC >= VALID_DOUBLE_EXCEPTION_ADDRESS: double exception, DEPC
  *           <  VALID_DOUBLE_EXCEPTION_ADDRESS: regular exception
@@ -225,9 +225,9 @@ ENDPROC(coprocessor_restore)
  *   a0:        trashed, original value saved on stack (PT_AREG0)
  *   a1:        a1
  *   a2:        new stack pointer, original in DEPC
- *   a3:        dispatch table
+ *   a3:        a3
  *   depc:      a2, original value saved on stack (PT_DEPC)
- *   excsave_1: a3
+ *   excsave_1: dispatch table
  *
  *   PT_DEPC >= VALID_DOUBLE_EXCEPTION_ADDRESS: double exception, DEPC
  *           <  VALID_DOUBLE_EXCEPTION_ADDRESS: regular exception
@@ -245,7 +245,6 @@ ENTRY(fast_coprocessor)
 
         /* Save remaining registers a1-a3 and SAR */
 
-        xsr     a3, excsave1
         s32i    a3, a2, PT_AREG3
         rsr     a3, sar
         s32i    a1, a2, PT_AREG1
diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
index 9298742f0fd0..de1dfa18d0a1 100644
--- a/arch/xtensa/kernel/entry.S
+++ b/arch/xtensa/kernel/entry.S
@@ -31,8 +31,6 @@
 /* Unimplemented features. */
 
 #undef KERNEL_STACK_OVERFLOW_CHECK
-#undef PREEMPTIBLE_KERNEL
-#undef ALLOCA_EXCEPTION_IN_IRAM
 
 /* Not well tested.
  *
@@ -92,9 +90,9 @@
  *   a0:        trashed, original value saved on stack (PT_AREG0)
  *   a1:        a1
  *   a2:        new stack pointer, original value in depc
- *   a3:        dispatch table
+ *   a3:        a3
  *   depc:      a2, original value saved on stack (PT_DEPC)
- *   excsave1:  a3
+ *   excsave1:  dispatch table
  *
  *   PT_DEPC >= VALID_DOUBLE_EXCEPTION_ADDRESS: double exception, DEPC
  *           <  VALID_DOUBLE_EXCEPTION_ADDRESS: regular exception
@@ -110,9 +108,8 @@
 
 ENTRY(user_exception)
 
-        /* Save a2, a3, and depc, restore excsave_1 and set SP. */
+        /* Save a1, a2, a3, and set SP. */
 
-        xsr     a3, excsave1
         rsr     a0, depc
         s32i    a1, a2, PT_AREG1
         s32i    a0, a2, PT_AREG2
@@ -238,9 +235,9 @@ ENDPROC(user_exception)
  *   a0:        trashed, original value saved on stack (PT_AREG0)
  *   a1:        a1
  *   a2:        new stack pointer, original in DEPC
- *   a3:        dispatch table
+ *   a3:        a3
  *   depc:      a2, original value saved on stack (PT_DEPC)
- *   excsave_1: a3
+ *   excsave_1: dispatch table
  *
  *   PT_DEPC >= VALID_DOUBLE_EXCEPTION_ADDRESS: double exception, DEPC
  *           <  VALID_DOUBLE_EXCEPTION_ADDRESS: regular exception
@@ -256,9 +253,8 @@ ENDPROC(user_exception)
 
 ENTRY(kernel_exception)
 
-        /* Save a0, a2, a3, DEPC and set SP. */
+        /* Save a1, a2, a3, and set SP. */
 
-        xsr     a3, excsave1            # restore a3, excsave_1
         rsr     a0, depc                # get a2
         s32i    a1, a2, PT_AREG1
         s32i    a0, a2, PT_AREG2
@@ -409,7 +405,7 @@ common_exception:
          * exception handler and call the exception handler.
          */
 
-        movi    a4, exc_table
+        rsr     a4, excsave1
         mov     a6, a1                  # pass stack frame
         mov     a7, a0                  # pass EXCCAUSE
         addx4   a4, a0, a4
@@ -423,28 +419,15 @@ common_exception:
         .global common_exception_return
 common_exception_return:
 
-#ifdef CONFIG_TRACE_IRQFLAGS
-        l32i    a4, a1, PT_DEPC
-        /* Double exception means we came here with an exception
-         * while PS.EXCM was set, i.e. interrupts disabled.
-         */
-        bgeui   a4, VALID_DOUBLE_EXCEPTION_ADDRESS, 1f
-        l32i    a4, a1, PT_EXCCAUSE
-        bnei    a4, EXCCAUSE_LEVEL1_INTERRUPT, 1f
-        /* We came here with an interrupt means interrupts were enabled
-         * and we'll reenable them on return.
-         */
-        movi    a4, trace_hardirqs_on
-        callx4  a4
 1:
-#endif
+        rsil    a2, LOCKLEVEL
 
         /* Jump if we are returning from kernel exceptions. */
 
-1:      l32i    a3, a1, PT_PS
-        _bbci.l a3, PS_UM_BIT, 4f
-
-        rsil    a2, 0
+        l32i    a3, a1, PT_PS
+        GET_THREAD_INFO(a2, a1)
+        l32i    a4, a2, TI_FLAGS
+        _bbci.l a3, PS_UM_BIT, 6f
 
         /* Specific to a user exception exit:
          * We need to check some flags for signal handling and rescheduling,
@@ -453,9 +436,6 @@ common_exception_return:
          * Note that we don't disable interrupts here. 
          */
 
-        GET_THREAD_INFO(a2,a1)
-        l32i    a4, a2, TI_FLAGS
-
         _bbsi.l a4, TIF_NEED_RESCHED, 3f
         _bbsi.l a4, TIF_NOTIFY_RESUME, 2f
         _bbci.l a4, TIF_SIGPENDING, 5f
@@ -465,6 +445,7 @@ common_exception_return:
 
         /* Call do_signal() */
 
+        rsil    a2, 0
         movi    a4, do_notify_resume    # int do_notify_resume(struct pt_regs*)
         mov     a6, a1
         callx4  a4
@@ -472,10 +453,24 @@ common_exception_return:
 
 3:      /* Reschedule */
 
+        rsil    a2, 0
         movi    a4, schedule    # void schedule (void)
         callx4  a4
         j       1b
 
+#ifdef CONFIG_PREEMPT
+6:
+        _bbci.l a4, TIF_NEED_RESCHED, 4f
+
+        /* Check current_thread_info->preempt_count */
+
+        l32i    a4, a2, TI_PRE_COUNT
+        bnez    a4, 4f
+        movi    a4, preempt_schedule_irq
+        callx4  a4
+        j       1b
+#endif
+
 5:
 #ifdef CONFIG_DEBUG_TLB_SANITY
         l32i    a4, a1, PT_DEPC
@@ -483,7 +478,24 @@ common_exception_return:
         movi    a4, check_tlb_sanity
         callx4  a4
 #endif
-4:      /* Restore optional registers. */
+6:
+4:
+#ifdef CONFIG_TRACE_IRQFLAGS
+        l32i    a4, a1, PT_DEPC
+        /* Double exception means we came here with an exception
+         * while PS.EXCM was set, i.e. interrupts disabled.
+         */
+        bgeui   a4, VALID_DOUBLE_EXCEPTION_ADDRESS, 1f
+        l32i    a4, a1, PT_EXCCAUSE
+        bnei    a4, EXCCAUSE_LEVEL1_INTERRUPT, 1f
+        /* We came here with an interrupt means interrupts were enabled
+         * and we'll reenable them on return.
+         */
+        movi    a4, trace_hardirqs_on
+        callx4  a4
+1:
+#endif
+        /* Restore optional registers. */
 
         load_xtregs_opt a1 a2 a4 a5 a6 a7 PT_XTREGS_OPT
 
@@ -570,29 +582,6 @@ user_exception_exit:
 
 kernel_exception_exit:
 
-#ifdef PREEMPTIBLE_KERNEL
-
-#ifdef CONFIG_PREEMPT
-
-        /*
-         * Note: We've just returned from a call4, so we have
-         * at least 4 addt'l regs.
-         */
-
-        /* Check current_thread_info->preempt_count */
-
-        GET_THREAD_INFO(a2)
-        l32i    a3, a2, TI_PREEMPT
-        bnez    a3, 1f
-
-        l32i    a2, a2, TI_FLAGS
-
-1:
-
-#endif
-
-#endif
-
         /* Check if we have to do a movsp.
          *
          * We only have to do a movsp if the previous window-frame has
@@ -829,176 +818,63 @@ ENDPROC(unrecoverable_exception)
  *
  *  The ALLOCA handler is entered when user code executes the MOVSP
  *  instruction and the caller's frame is not in the register file.
- *  In this case, the caller frame's a0..a3 are on the stack just
- *  below sp (a1), and this handler moves them.
  *
- *  For "MOVSP <ar>,<as>" without destination register a1, this routine
- *  simply moves the value from <as> to <ar> without moving the save area.
+ * This algorithm was taken from the Ross Morley's RTOS Porting Layer:
+ *
+ *    /home/ross/rtos/porting/XtensaRTOS-PortingLayer-20090507/xtensa_vectors.S
+ *
+ * It leverages the existing window spill/fill routines and their support for
+ * double exceptions. The 'movsp' instruction will only cause an exception if
+ * the next window needs to be loaded. In fact this ALLOCA exception may be
+ * replaced at some point by changing the hardware to do a underflow exception
+ * of the proper size instead.
+ *
+ * This algorithm simply backs out the register changes started by the user
+ * excpetion handler, makes it appear that we have started a window underflow
+ * by rotating the window back and then setting the old window base (OWB) in
+ * the 'ps' register with the rolled back window base. The 'movsp' instruction
+ * will be re-executed and this time since the next window frames is in the
+ * active AR registers it won't cause an exception.
+ *
+ * If the WindowUnderflow code gets a TLB miss the page will get mapped
+ * the the partial windeowUnderflow will be handeled in the double exception
+ * handler.
  *
  * Entry condition:
  *
  *   a0:        trashed, original value saved on stack (PT_AREG0)
  *   a1:        a1
  *   a2:        new stack pointer, original in DEPC
- *   a3:        dispatch table
+ *   a3:        a3
  *   depc:      a2, original value saved on stack (PT_DEPC)
- *   excsave_1: a3
+ *   excsave_1: dispatch table
  *
  *   PT_DEPC >= VALID_DOUBLE_EXCEPTION_ADDRESS: double exception, DEPC
  *           <  VALID_DOUBLE_EXCEPTION_ADDRESS: regular exception
  */
 
-#if XCHAL_HAVE_BE
-#define _EXTUI_MOVSP_SRC(ar)    extui ar, ar, 4, 4
-#define _EXTUI_MOVSP_DST(ar)    extui ar, ar, 0, 4
-#else
-#define _EXTUI_MOVSP_SRC(ar)    extui ar, ar, 0, 4
-#define _EXTUI_MOVSP_DST(ar)    extui ar, ar, 4, 4
-#endif
-
 ENTRY(fast_alloca)
+        rsr     a0, windowbase
+        rotw    -1
+        rsr     a2, ps
+        extui   a3, a2, PS_OWB_SHIFT, PS_OWB_WIDTH
+        xor     a3, a3, a4
+        l32i    a4, a6, PT_AREG0
+        l32i    a1, a6, PT_DEPC
+        rsr     a6, depc
+        wsr     a1, depc
+        slli    a3, a3, PS_OWB_SHIFT
+        xor     a2, a2, a3
+        wsr     a2, ps
+        rsync
 
-        /* We shouldn't be in a double exception. */
-
-        l32i    a0, a2, PT_DEPC
-        _bgeui  a0, VALID_DOUBLE_EXCEPTION_ADDRESS, .Lunhandled_double
-
-        rsr     a0, depc                # get a2
-        s32i    a4, a2, PT_AREG4        # save a4 and
-        s32i    a0, a2, PT_AREG2        # a2 to stack
-
-        /* Exit critical section. */
-
-        movi    a0, 0
-        s32i    a0, a3, EXC_TABLE_FIXUP
-
-        /* Restore a3, excsave_1 */
-
-        xsr     a3, excsave1            # make sure excsave_1 is valid for dbl.
-        rsr     a4, epc1                # get exception address
-        s32i    a3, a2, PT_AREG3        # save a3 to stack
-
-#ifdef ALLOCA_EXCEPTION_IN_IRAM
-#error  iram not supported
-#else
-        /* Note: l8ui not allowed in IRAM/IROM!! */
-        l8ui    a0, a4, 1               # read as(src) from MOVSP instruction
-#endif
-        movi    a3, .Lmovsp_src
-        _EXTUI_MOVSP_SRC(a0)            # extract source register number
-        addx8   a3, a0, a3
-        jx      a3
-
-.Lunhandled_double:
-        wsr     a0, excsave1
-        movi    a0, unrecoverable_exception
-        callx0  a0
-
-        .align 8
-.Lmovsp_src:
-        l32i    a3, a2, PT_AREG0;       _j 1f;  .align 8
-        mov     a3, a1;                 _j 1f;  .align 8
-        l32i    a3, a2, PT_AREG2;       _j 1f;  .align 8
-        l32i    a3, a2, PT_AREG3;       _j 1f;  .align 8
-        l32i    a3, a2, PT_AREG4;       _j 1f;  .align 8
-        mov     a3, a5;                 _j 1f;  .align 8
-        mov     a3, a6;                 _j 1f;  .align 8
-        mov     a3, a7;                 _j 1f;  .align 8
-        mov     a3, a8;                 _j 1f;  .align 8
-        mov     a3, a9;                 _j 1f;  .align 8
-        mov     a3, a10;                _j 1f;  .align 8
-        mov     a3, a11;                _j 1f;  .align 8
-        mov     a3, a12;                _j 1f;  .align 8
-        mov     a3, a13;                _j 1f;  .align 8
-        mov     a3, a14;                _j 1f;  .align 8
-        mov     a3, a15;                _j 1f;  .align 8
-
-1:
-
-#ifdef ALLOCA_EXCEPTION_IN_IRAM
-#error  iram not supported
-#else
-        l8ui    a0, a4, 0               # read ar(dst) from MOVSP instruction
-#endif
-        addi    a4, a4, 3               # step over movsp
-        _EXTUI_MOVSP_DST(a0)            # extract destination register
-        wsr     a4, epc1                # save new epc_1
-
-        _bnei   a0, 1, 1f               # no 'movsp a1, ax': jump
-
-        /* Move the save area. This implies the use of the L32E
-         * and S32E instructions, because this move must be done with
-         * the user's PS.RING privilege levels, not with ring 0
-         * (kernel's) privileges currently active with PS.EXCM
-         * set. Note that we have stil registered a fixup routine with the
-         * double exception vector in case a double exception occurs.
-         */
-
-        /* a0,a4:avail a1:old user stack a2:exc. stack a3:new user stack. */
-
-        l32e    a0, a1, -16
-        l32e    a4, a1, -12
-        s32e    a0, a3, -16
-        s32e    a4, a3, -12
-        l32e    a0, a1, -8
-        l32e    a4, a1, -4
-        s32e    a0, a3, -8
-        s32e    a4, a3, -4
-
-        /* Restore stack-pointer and all the other saved registers. */
-
-        mov     a1, a3
-
-        l32i    a4, a2, PT_AREG4
-        l32i    a3, a2, PT_AREG3
-        l32i    a0, a2, PT_AREG0
-        l32i    a2, a2, PT_AREG2
-        rfe
-
-        /*  MOVSP <at>,<as>  was invoked with <at> != a1.
-         *  Because the stack pointer is not being modified,
-         *  we should be able to just modify the pointer
-         *  without moving any save area.
-         *  The processor only traps these occurrences if the
-         *  caller window isn't live, so unfortunately we can't
-         *  use this as an alternate trap mechanism.
-         *  So we just do the move.  This requires that we
-         *  resolve the destination register, not just the source,
-         *  so there's some extra work.
-         *  (PERHAPS NOT REALLY NEEDED, BUT CLEANER...)
-         */
-
-        /* a0 dst-reg, a1 user-stack, a2 stack, a3 value of src reg. */
-
-1:      movi    a4, .Lmovsp_dst
-        addx8   a4, a0, a4
-        jx      a4
-
-        .align 8
-.Lmovsp_dst:
-        s32i    a3, a2, PT_AREG0;       _j 1f;  .align 8
-        mov     a1, a3;                 _j 1f;  .align 8
-        s32i    a3, a2, PT_AREG2;       _j 1f;  .align 8
-        s32i    a3, a2, PT_AREG3;       _j 1f;  .align 8
-        s32i    a3, a2, PT_AREG4;       _j 1f;  .align 8
-        mov     a5, a3;                 _j 1f;  .align 8
-        mov     a6, a3;                 _j 1f;  .align 8
-        mov     a7, a3;                 _j 1f;  .align 8
-        mov     a8, a3;                 _j 1f;  .align 8
-        mov     a9, a3;                 _j 1f;  .align 8
-        mov     a10, a3;                _j 1f;  .align 8
-        mov     a11, a3;                _j 1f;  .align 8
-        mov     a12, a3;                _j 1f;  .align 8
-        mov     a13, a3;                _j 1f;  .align 8
-        mov     a14, a3;                _j 1f;  .align 8
-        mov     a15, a3;                _j 1f;  .align 8
-
-1:      l32i    a4, a2, PT_AREG4
-        l32i    a3, a2, PT_AREG3
-        l32i    a0, a2, PT_AREG0
-        l32i    a2, a2, PT_AREG2
-        rfe
-
+        _bbci.l a4, 31, 4f
+        rotw    -1
+        _bbci.l a8, 30, 8f
+        rotw    -1
+        j       _WindowUnderflow12
+8:      j       _WindowUnderflow8
+4:      j       _WindowUnderflow4
 ENDPROC(fast_alloca)
 
 /*
@@ -1015,9 +891,9 @@ ENDPROC(fast_alloca)
  *   a0:        trashed, original value saved on stack (PT_AREG0)
  *   a1:        a1
  *   a2:        new stack pointer, original in DEPC
- *   a3:        dispatch table
+ *   a3:        a3
  *   depc:      a2, original value saved on stack (PT_DEPC)
- *   excsave_1: a3
+ *   excsave_1: dispatch table
  */
 
 ENTRY(fast_syscall_kernel)
@@ -1064,7 +940,6 @@ ENTRY(fast_syscall_unrecoverable)
 
         l32i    a0, a2, PT_AREG0        # restore a0
         xsr     a2, depc                # restore a2, depc
-        rsr     a3, excsave1
 
         wsr     a0, excsave1
         movi    a0, unrecoverable_exception
@@ -1086,10 +961,10 @@ ENDPROC(fast_syscall_unrecoverable)
  *   a0:        a2 (syscall-nr), original value saved on stack (PT_AREG0)
  *   a1:        a1
  *   a2:        new stack pointer, original in a0 and DEPC
- *   a3:        dispatch table, original in excsave_1
+ *   a3:        a3
  *   a4..a15:   unchanged
  *   depc:      a2, original value saved on stack (PT_DEPC)
- *   excsave_1: a3
+ *   excsave_1: dispatch table
  *
  *   PT_DEPC >= VALID_DOUBLE_EXCEPTION_ADDRESS: double exception, DEPC
  *           <  VALID_DOUBLE_EXCEPTION_ADDRESS: regular exception
@@ -1122,8 +997,6 @@ ENDPROC(fast_syscall_unrecoverable)
 
 ENTRY(fast_syscall_xtensa)
 
-        xsr     a3, excsave1            # restore a3, excsave1
-
         s32i    a7, a2, PT_AREG7        # we need an additional register
         movi    a7, 4                   # sizeof(unsigned int)
         access_ok a3, a7, a0, a2, .Leac # a0: scratch reg, a2: sp
@@ -1186,9 +1059,9 @@ ENDPROC(fast_syscall_xtensa)
  *   a0:        trashed, original value saved on stack (PT_AREG0)
  *   a1:        a1
  *   a2:        new stack pointer, original in DEPC
- *   a3:        dispatch table
+ *   a3:        a3
  *   depc:      a2, original value saved on stack (PT_DEPC)
- *   excsave_1: a3
+ *   excsave_1: dispatch table
  *
  * Note: We assume the stack pointer is EXC_TABLE_KSTK in the fixup handler.
  */
@@ -1197,15 +1070,16 @@ ENTRY(fast_syscall_spill_registers)
 
         /* Register a FIXUP handler (pass current wb as a parameter) */
 
+        xsr     a3, excsave1
         movi    a0, fast_syscall_spill_registers_fixup
         s32i    a0, a3, EXC_TABLE_FIXUP
         rsr     a0, windowbase
         s32i    a0, a3, EXC_TABLE_PARAM
+        xsr     a3, excsave1            # restore a3 and excsave_1
 
-        /* Save a3 and SAR on stack. */
+        /* Save a3, a4 and SAR on stack. */
 
         rsr     a0, sar
-        xsr     a3, excsave1            # restore a3 and excsave_1
         s32i    a3, a2, PT_AREG3
         s32i    a4, a2, PT_AREG4
         s32i    a0, a2, PT_AREG5        # store SAR to PT_AREG5
@@ -1259,14 +1133,14 @@ fast_syscall_spill_registers_fixup:
          * in WS, so that the exception handlers save them to the task stack.
          */
 
-        rsr     a3, excsave1    # get spill-mask
+        xsr     a3, excsave1    # get spill-mask
         slli    a2, a3, 1       # shift left by one
 
         slli    a3, a2, 32-WSBITS
         src     a2, a2, a3      # a1 = xxwww1yyxxxwww1yy......
         wsr     a2, windowstart # set corrected windowstart
 
-        movi    a3, exc_table
+        rsr     a3, excsave1
         l32i    a2, a3, EXC_TABLE_DOUBLE_SAVE   # restore a2
         l32i    a3, a3, EXC_TABLE_PARAM # original WB (in user task)
 
@@ -1303,7 +1177,7 @@ fast_syscall_spill_registers_fixup:
 
         /* Jump to the exception handler. */
 
-        movi    a3, exc_table
+        rsr     a3, excsave1
         rsr     a0, exccause
         addx4   a0, a0, a3                      # find entry in table
         l32i    a0, a0, EXC_TABLE_FAST_USER     # load handler
@@ -1320,6 +1194,7 @@ fast_syscall_spill_registers_fixup_return:
         xsr     a3, excsave1
         movi    a2, fast_syscall_spill_registers_fixup
         s32i    a2, a3, EXC_TABLE_FIXUP
+        s32i    a0, a3, EXC_TABLE_DOUBLE_SAVE
         rsr     a2, windowbase
         s32i    a2, a3, EXC_TABLE_PARAM
         l32i    a2, a3, EXC_TABLE_KSTK
@@ -1331,11 +1206,6 @@ fast_syscall_spill_registers_fixup_return:
         wsr     a3, windowbase
         rsync
 
-        /* Restore a3 and return. */
-
-        movi    a3, exc_table
-        xsr     a3, excsave1
-
         rfde
 
 
@@ -1522,9 +1392,8 @@ ENTRY(_spill_registers)
 
         movi    a0, 0
 
-        movi    a3, exc_table
+        rsr     a3, excsave1
         l32i    a1, a3, EXC_TABLE_KSTK
-        wsr     a3, excsave1
 
         movi    a4, (1 << PS_WOE_BIT) | LOCKLEVEL
         wsr     a4, ps
@@ -1568,9 +1437,9 @@ ENDPROC(fast_second_level_miss_double_kernel)
  *   a0:        trashed, original value saved on stack (PT_AREG0)
  *   a1:        a1
  *   a2:        new stack pointer, original in DEPC
- *   a3:        dispatch table
+ *   a3:        a3
  *   depc:      a2, original value saved on stack (PT_DEPC)
- *   excsave_1: a3
+ *   excsave_1: dispatch table
  *
  *   PT_DEPC >= VALID_DOUBLE_EXCEPTION_ADDRESS: double exception, DEPC
  *           <  VALID_DOUBLE_EXCEPTION_ADDRESS: regular exception
@@ -1578,9 +1447,10 @@ ENDPROC(fast_second_level_miss_double_kernel)
 
 ENTRY(fast_second_level_miss)
 
-        /* Save a1. Note: we don't expect a double exception. */
+        /* Save a1 and a3. Note: we don't expect a double exception. */
 
         s32i    a1, a2, PT_AREG1
+        s32i    a3, a2, PT_AREG3
 
         /* We need to map the page of PTEs for the user task.  Find
          * the pointer to that page.  Also, it's possible for tsk->mm
@@ -1602,9 +1472,6 @@ ENTRY(fast_second_level_miss)
         l32i    a0, a1, TASK_MM         # tsk->mm
         beqz    a0, 9f
 
-
-        /* We deliberately destroy a3 that holds the exception table. */
-
 8:      rsr     a3, excvaddr            # fault address
         _PGD_OFFSET(a0, a3, a1)
         l32i    a0, a0, 0               # read pmdval
@@ -1655,7 +1522,7 @@ ENTRY(fast_second_level_miss)
 
         /* Exit critical section. */
 
-4:      movi    a3, exc_table           # restore a3
+4:      rsr     a3, excsave1
         movi    a0, 0
         s32i    a0, a3, EXC_TABLE_FIXUP
 
@@ -1663,8 +1530,8 @@ ENTRY(fast_second_level_miss)
 
         l32i    a0, a2, PT_AREG0
         l32i    a1, a2, PT_AREG1
+        l32i    a3, a2, PT_AREG3
         l32i    a2, a2, PT_DEPC
-        xsr     a3, excsave1
 
         bgeui   a2, VALID_DOUBLE_EXCEPTION_ADDRESS, 1f
 
@@ -1751,11 +1618,8 @@ ENTRY(fast_second_level_miss)
 
 2:      /* Invalid PGD, default exception handling */
 
-        movi    a3, exc_table
         rsr     a1, depc
-        xsr     a3, excsave1
         s32i    a1, a2, PT_AREG2
-        s32i    a3, a2, PT_AREG3
         mov     a1, a2
 
         rsr     a2, ps
@@ -1775,9 +1639,9 @@ ENDPROC(fast_second_level_miss)
  *   a0:        trashed, original value saved on stack (PT_AREG0)
  *   a1:        a1
  *   a2:        new stack pointer, original in DEPC
- *   a3:        dispatch table
+ *   a3:        a3
  *   depc:      a2, original value saved on stack (PT_DEPC)
- *   excsave_1: a3
+ *   excsave_1: dispatch table
  *
  *   PT_DEPC >= VALID_DOUBLE_EXCEPTION_ADDRESS: double exception, DEPC
  *           <  VALID_DOUBLE_EXCEPTION_ADDRESS: regular exception
@@ -1785,17 +1649,17 @@ ENDPROC(fast_second_level_miss)
 
 ENTRY(fast_store_prohibited)
 
-        /* Save a1 and a4. */
+        /* Save a1 and a3. */
 
         s32i    a1, a2, PT_AREG1
-        s32i    a4, a2, PT_AREG4
+        s32i    a3, a2, PT_AREG3
 
         GET_CURRENT(a1,a2)
         l32i    a0, a1, TASK_MM         # tsk->mm
         beqz    a0, 9f
 
 8:      rsr     a1, excvaddr            # fault address
-        _PGD_OFFSET(a0, a1, a4)
+        _PGD_OFFSET(a0, a1, a3)
         l32i    a0, a0, 0
         beqz    a0, 2f
 
@@ -1804,39 +1668,37 @@ ENTRY(fast_store_prohibited)
          * and is not PAGE_NONE. See pgtable.h for possible PTE layouts.
          */
 
-        _PTE_OFFSET(a0, a1, a4)
-        l32i    a4, a0, 0               # read pteval
+        _PTE_OFFSET(a0, a1, a3)
+        l32i    a3, a0, 0               # read pteval
         movi    a1, _PAGE_CA_INVALID
-        ball    a4, a1, 2f
-        bbci.l  a4, _PAGE_WRITABLE_BIT, 2f
+        ball    a3, a1, 2f
+        bbci.l  a3, _PAGE_WRITABLE_BIT, 2f
 
         movi    a1, _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_HW_WRITE
-        or      a4, a4, a1
+        or      a3, a3, a1
         rsr     a1, excvaddr
-        s32i    a4, a0, 0
+        s32i    a3, a0, 0
 
         /* We need to flush the cache if we have page coloring. */
 #if (DCACHE_WAY_SIZE > PAGE_SIZE) && XCHAL_DCACHE_IS_WRITEBACK
         dhwb    a0, 0
 #endif
         pdtlb   a0, a1
-        wdtlb   a4, a0
+        wdtlb   a3, a0
 
         /* Exit critical section. */
 
         movi    a0, 0
+        rsr     a3, excsave1
         s32i    a0, a3, EXC_TABLE_FIXUP
 
         /* Restore the working registers, and return. */
 
-        l32i    a4, a2, PT_AREG4
+        l32i    a3, a2, PT_AREG3
         l32i    a1, a2, PT_AREG1
         l32i    a0, a2, PT_AREG0
         l32i    a2, a2, PT_DEPC
 
-        /* Restore excsave1 and a3. */
-
-        xsr     a3, excsave1
         bgeui   a2, VALID_DOUBLE_EXCEPTION_ADDRESS, 1f
 
         rsr     a2, depc
@@ -1853,11 +1715,8 @@ ENTRY(fast_store_prohibited)
 
 2:      /* If there was a problem, handle fault in C */
 
-        rsr     a4, depc        # still holds a2
-        xsr     a3, excsave1
-        s32i    a4, a2, PT_AREG2
-        s32i    a3, a2, PT_AREG3
-        l32i    a4, a2, PT_AREG4
+        rsr     a3, depc        # still holds a2
+        s32i    a3, a2, PT_AREG2
         mov     a1, a2
 
         rsr     a2, ps
diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c
index 42a8bba0b0ea..946fb8d06c8b 100644
--- a/arch/xtensa/kernel/setup.c
+++ b/arch/xtensa/kernel/setup.c
@@ -170,8 +170,7 @@ static int __init parse_tag_fdt(const bp_tag_t *tag)
 
 __tagtable(BP_TAG_FDT, parse_tag_fdt);
 
-void __init early_init_dt_setup_initrd_arch(unsigned long start,
-                unsigned long end)
+void __init early_init_dt_setup_initrd_arch(u64 start, u64 end)
 {
         initrd_start = (void *)__va(start);
         initrd_end = (void *)__va(end);
@@ -585,8 +584,8 @@ c_show(struct seq_file *f, void *slot)
                      "bogomips\t: %lu.%02lu\n",
                      XCHAL_BUILD_UNIQUE_ID,
                      XCHAL_HAVE_BE ?  "big" : "little",
-                     CCOUNT_PER_JIFFY/(1000000/HZ),
-                     (CCOUNT_PER_JIFFY/(10000/HZ)) % 100,
+                     ccount_freq/1000000,
+                     (ccount_freq/10000) % 100,
                      loops_per_jiffy/(500000/HZ),
                      (loops_per_jiffy/(5000/HZ)) % 100);
 
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
index 24bb0c1776ba..9af3dd88ad7e 100644
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -29,9 +29,7 @@
 #include <asm/timex.h>
 #include <asm/platform.h>
 
-#ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
 unsigned long ccount_freq;              /* ccount Hz */
-#endif
 
 static cycle_t ccount_read(struct clocksource *cs)
 {
@@ -129,8 +127,10 @@ void __init time_init(void)
         platform_calibrate_ccount();
         printk("%d.%02d MHz\n", (int)ccount_freq/1000000,
                         (int)(ccount_freq/10000)%100);
+#else
+        ccount_freq = CONFIG_XTENSA_CPU_CLOCK*1000000UL;
 #endif
-        clocksource_register_hz(&ccount_clocksource, CCOUNT_PER_JIFFY * HZ);
+        clocksource_register_hz(&ccount_clocksource, ccount_freq);
 
         ccount_timer.evt.cpumask = cpumask_of(0);
         ccount_timer.evt.irq = irq_create_mapping(NULL, LINUX_TIMER_INT);
@@ -164,7 +164,7 @@ irqreturn_t timer_interrupt (int irq, void *dev_id)
 #ifndef CONFIG_GENERIC_CALIBRATE_DELAY
 void calibrate_delay(void)
 {
-        loops_per_jiffy = CCOUNT_PER_JIFFY;
+        loops_per_jiffy = ccount_freq / HZ;
         printk("Calibrating delay loop (skipped)... "
                "%lu.%02lu BogoMIPS preset\n",
                loops_per_jiffy/(1000000/HZ),
diff --git a/arch/xtensa/kernel/vectors.S b/arch/xtensa/kernel/vectors.S
index f9e175382aa9..cb8fd44caabc 100644
--- a/arch/xtensa/kernel/vectors.S
+++ b/arch/xtensa/kernel/vectors.S
@@ -78,6 +78,7 @@ ENTRY(_UserExceptionVector)
         s32i    a0, a2, PT_DEPC         # mark it as a regular exception
         addx4   a0, a0, a3              # find entry in table
         l32i    a0, a0, EXC_TABLE_FAST_USER     # load handler
+        xsr     a3, excsave1            # restore a3 and dispatch table
         jx      a0
 
 ENDPROC(_UserExceptionVector)
@@ -104,6 +105,7 @@ ENTRY(_KernelExceptionVector)
         s32i    a0, a2, PT_DEPC         # mark it as a regular exception
         addx4   a0, a0, a3              # find entry in table
         l32i    a0, a0, EXC_TABLE_FAST_KERNEL   # load handler address
+        xsr     a3, excsave1            # restore a3 and dispatch table
         jx      a0
 
 ENDPROC(_KernelExceptionVector)
@@ -168,7 +170,7 @@ ENDPROC(_KernelExceptionVector)
  *
  *      a0:        DEPC
  *      a1:        a1
- *      a2:        trashed, original value in EXC_TABLE_DOUBLE_A2
+ *      a2:        trashed, original value in EXC_TABLE_DOUBLE_SAVE
  *      a3:        exctable
  *      depc:      a0
  *      excsave_1: a3
@@ -204,47 +206,46 @@ ENDPROC(_KernelExceptionVector)
 
         .section .DoubleExceptionVector.text, "ax"
         .begin literal_prefix .DoubleExceptionVector
+        .globl _DoubleExceptionVector_WindowUnderflow
+        .globl _DoubleExceptionVector_WindowOverflow
 
 ENTRY(_DoubleExceptionVector)
 
-        /* Deliberately destroy excsave (don't assume it's value was valid). */
-
-        wsr     a3, excsave1            # save a3
+        xsr     a3, excsave1
+        s32i    a2, a3, EXC_TABLE_DOUBLE_SAVE
 
         /* Check for kernel double exception (usually fatal). */
 
-        rsr     a3, ps
-        _bbci.l a3, PS_UM_BIT, .Lksp
+        rsr     a2, ps
+        _bbci.l a2, PS_UM_BIT, .Lksp
 
         /* Check if we are currently handling a window exception. */
         /* Note: We don't need to indicate that we enter a critical section. */
 
         xsr     a0, depc                # get DEPC, save a0
 
-        movi    a3, WINDOW_VECTORS_VADDR
-        _bltu   a0, a3, .Lfixup
-        addi    a3, a3, WINDOW_VECTORS_SIZE
-        _bgeu   a0, a3, .Lfixup
+        movi    a2, WINDOW_VECTORS_VADDR
+        _bltu   a0, a2, .Lfixup
+        addi    a2, a2, WINDOW_VECTORS_SIZE
+        _bgeu   a0, a2, .Lfixup
 
         /* Window overflow/underflow exception. Get stack pointer. */
 
-        mov     a3, a2
-        /* This explicit literal and the following references to it are made
-         * in order to fit DoubleExceptionVector.literals into the available
-         * 16-byte gap before DoubleExceptionVector.text in the absence of
-         * link time relaxation. See kernel/vmlinux.lds.S
-         */
-        .literal .Lexc_table, exc_table
-        l32r    a2, .Lexc_table
-        l32i    a2, a2, EXC_TABLE_KSTK
+        l32i    a2, a3, EXC_TABLE_KSTK
 
         /* Check for overflow/underflow exception, jump if overflow. */
 
-        _bbci.l a0, 6, .Lovfl
-
-        /* a0: depc, a1: a1, a2: kstk, a3: a2, depc: a0, excsave: a3  */
+        _bbci.l a0, 6, _DoubleExceptionVector_WindowOverflow
 
-        /* Restart window underflow exception.
+        /*
+         * Restart window underflow exception.
+         * Currently:
+         *      depc = orig a0,
+         *      a0 = orig DEPC,
+         *      a2 = new sp based on KSTK from exc_table
+         *      a3 = excsave_1
+         *      excsave_1 = orig a3
+         *
          * We return to the instruction in user space that caused the window
          * underflow exception. Therefore, we change window base to the value
          * before we entered the window underflow exception and prepare the
@@ -252,10 +253,11 @@ ENTRY(_DoubleExceptionVector)
          * by changing depc (in a0).
          * Note: We can trash the current window frame (a0...a3) and depc!
          */
-
+_DoubleExceptionVector_WindowUnderflow:
+        xsr     a3, excsave1
         wsr     a2, depc                # save stack pointer temporarily
         rsr     a0, ps
-        extui   a0, a0, PS_OWB_SHIFT, 4
+        extui   a0, a0, PS_OWB_SHIFT, PS_OWB_WIDTH
         wsr     a0, windowbase
         rsync
 
@@ -263,28 +265,57 @@ ENTRY(_DoubleExceptionVector)
 
         xsr     a2, depc                # save a2 and get stack pointer
         s32i    a0, a2, PT_AREG0
-
-        wsr     a3, excsave1            # save a3
-        l32r    a3, .Lexc_table
-
+        xsr     a3, excsave1
         rsr     a0, exccause
         s32i    a0, a2, PT_DEPC         # mark it as a regular exception
         addx4   a0, a0, a3
+        xsr     a3, excsave1
         l32i    a0, a0, EXC_TABLE_FAST_USER
         jx      a0
 
-.Lfixup:/* Check for a fixup handler or if we were in a critical section. */
+        /*
+         * We only allow the ITLB miss exception if we are in kernel space.
+         * All other exceptions are unexpected and thus unrecoverable!
+         */
+
+#ifdef CONFIG_MMU
+        .extern fast_second_level_miss_double_kernel
+
+.Lksp:  /* a0: a0, a1: a1, a2: a2, a3: trashed, depc: depc, excsave: a3 */
+
+        rsr     a3, exccause
+        beqi    a3, EXCCAUSE_ITLB_MISS, 1f
+        addi    a3, a3, -EXCCAUSE_DTLB_MISS
+        bnez    a3, .Lunrecoverable
+1:      movi    a3, fast_second_level_miss_double_kernel
+        jx      a3
+#else
+.equ    .Lksp,  .Lunrecoverable
+#endif
+
+        /* Critical! We can't handle this situation. PANIC! */
 
-        /* a0: depc, a1: a1, a2: a2, a3: trashed, depc: a0, excsave1: a3 */
+        .extern unrecoverable_exception
 
-        l32r    a3, .Lexc_table
-        s32i    a2, a3, EXC_TABLE_DOUBLE_SAVE   # temporary variable
+.Lunrecoverable_fixup:
+        l32i    a2, a3, EXC_TABLE_DOUBLE_SAVE
+        xsr     a0, depc
+
+.Lunrecoverable:
+        rsr     a3, excsave1
+        wsr     a0, excsave1
+        movi    a0, unrecoverable_exception
+        callx0  a0
+
+.Lfixup:/* Check for a fixup handler or if we were in a critical section. */
+
+        /* a0: depc, a1: a1, a2: trash, a3: exctable, depc: a0, excsave1: a3 */
 
         /* Enter critical section. */
 
         l32i    a2, a3, EXC_TABLE_FIXUP
         s32i    a3, a3, EXC_TABLE_FIXUP
-        beq     a2, a3, .Lunrecoverable_fixup   # critical!
+        beq     a2, a3, .Lunrecoverable_fixup   # critical section
         beqz    a2, .Ldflt                      # no handler was registered
 
         /* a0: depc, a1: a1, a2: trash, a3: exctable, depc: a0, excsave: a3 */
@@ -293,58 +324,145 @@ ENTRY(_DoubleExceptionVector)
 
 .Ldflt: /* Get stack pointer. */
 
-        l32i    a3, a3, EXC_TABLE_DOUBLE_SAVE
-        addi    a2, a3, -PT_USER_SIZE
-
-.Lovfl: /* Jump to default handlers. */
+        l32i    a2, a3, EXC_TABLE_DOUBLE_SAVE
+        addi    a2, a2, -PT_USER_SIZE
 
-        /* a0: depc, a1: a1, a2: kstk, a3: a2, depc: a0, excsave: a3 */
+        /* a0: depc, a1: a1, a2: kstk, a3: exctable, depc: a0, excsave: a3 */
 
-        xsr     a3, depc
         s32i    a0, a2, PT_DEPC
-        s32i    a3, a2, PT_AREG0
+        l32i    a0, a3, EXC_TABLE_DOUBLE_SAVE
+        xsr     a0, depc
+        s32i    a0, a2, PT_AREG0
 
-        /* a0: avail, a1: a1, a2: kstk, a3: avail, depc: a2, excsave: a3 */
+        /* a0: avail, a1: a1, a2: kstk, a3: exctable, depc: a2, excsave: a3 */
 
-        l32r    a3, .Lexc_table
         rsr     a0, exccause
         addx4   a0, a0, a3
+        xsr     a3, excsave1
         l32i    a0, a0, EXC_TABLE_FAST_USER
         jx      a0
 
         /*
-         * We only allow the ITLB miss exception if we are in kernel space.
-         * All other exceptions are unexpected and thus unrecoverable!
+         * Restart window OVERFLOW exception.
+         * Currently:
+         *      depc = orig a0,
+         *      a0 = orig DEPC,
+         *      a2 = new sp based on KSTK from exc_table
+         *      a3 = EXCSAVE_1
+         *      excsave_1 = orig a3
+         *
+         * We return to the instruction in user space that caused the window
+         * overflow exception. Therefore, we change window base to the value
+         * before we entered the window overflow exception and prepare the
+         * registers to return as if we were coming from a regular exception
+         * by changing DEPC (in a0).
+         *
+         * NOTE: We CANNOT trash the current window frame (a0...a3), but we
+         * can clobber depc.
+         *
+         * The tricky part here is that overflow8 and overflow12 handlers
+         * save a0, then clobber a0.  To restart the handler, we have to restore
+         * a0 if the double exception was past the point where a0 was clobbered.
+         *
+         * To keep things simple, we take advantage of the fact all overflow
+         * handlers save a0 in their very first instruction.  If DEPC was past
+         * that instruction, we can safely restore a0 from where it was saved
+         * on the stack.
+         *
+         * a0: depc, a1: a1, a2: kstk, a3: exc_table, depc: a0, excsave1: a3
          */
+_DoubleExceptionVector_WindowOverflow:
+        extui   a2, a0, 0, 6    # get offset into 64-byte vector handler
+        beqz    a2, 1f          # if at start of vector, don't restore
 
-#ifdef CONFIG_MMU
-        .extern fast_second_level_miss_double_kernel
+        addi    a0, a0, -128
+        bbsi    a0, 8, 1f       # don't restore except for overflow 8 and 12
+        bbsi    a0, 7, 2f
 
-.Lksp:  /* a0: a0, a1: a1, a2: a2, a3: trashed, depc: depc, excsave: a3 */
+        /*
+         * Restore a0 as saved by _WindowOverflow8().
+         *
+         * FIXME:  we really need a fixup handler for this L32E,
+         * for the extremely unlikely case where the overflow handler's
+         * reference thru a0 gets a hardware TLB refill that bumps out
+         * the (distinct, aliasing) TLB entry that mapped its prior
+         * references thru a9, and where our reference now thru a9
+         * gets a 2nd-level miss exception (not hardware TLB refill).
+         */
 
-        rsr     a3, exccause
-        beqi    a3, EXCCAUSE_ITLB_MISS, 1f
-        addi    a3, a3, -EXCCAUSE_DTLB_MISS
-        bnez    a3, .Lunrecoverable
-1:      movi    a3, fast_second_level_miss_double_kernel
-        jx      a3
-#else
-.equ    .Lksp,  .Lunrecoverable
-#endif
+        l32e    a2, a9, -16
+        wsr     a2, depc        # replace the saved a0
+        j       1f
 
-        /* Critical! We can't handle this situation. PANIC! */
+2:
+        /*
+         * Restore a0 as saved by _WindowOverflow12().
+         *
+         * FIXME:  we really need a fixup handler for this L32E,
+         * for the extremely unlikely case where the overflow handler's
+         * reference thru a0 gets a hardware TLB refill that bumps out
+         * the (distinct, aliasing) TLB entry that mapped its prior
+         * references thru a13, and where our reference now thru a13
+         * gets a 2nd-level miss exception (not hardware TLB refill).
+         */
 
-        .extern unrecoverable_exception
+        l32e    a2, a13, -16
+        wsr     a2, depc        # replace the saved a0
+1:
+        /*
+         * Restore WindowBase while leaving all address registers restored.
+         * We have to use ROTW for this, because WSR.WINDOWBASE requires
+         * an address register (which would prevent restore).
+         *
+         * Window Base goes from 0 ... 7 (Module 8)
+         * Window Start is 8 bits; Ex: (0b1010 1010):0x55 from series of call4s
+         */
+
+        rsr     a0, ps
+        extui   a0, a0, PS_OWB_SHIFT, PS_OWB_WIDTH
+        rsr     a2, windowbase
+        sub     a0, a2, a0
+        extui   a0, a0, 0, 3
 
-.Lunrecoverable_fixup:
         l32i    a2, a3, EXC_TABLE_DOUBLE_SAVE
-        xsr     a0, depc
+        xsr     a3, excsave1
+        beqi    a0, 1, .L1pane
+        beqi    a0, 3, .L3pane
 
-.Lunrecoverable:
-        rsr     a3, excsave1
-        wsr     a0, excsave1
-        movi    a0, unrecoverable_exception
-        callx0  a0
+        rsr     a0, depc
+        rotw    -2
+
+        /*
+         * We are now in the user code's original window frame.
+         * Process the exception as a user exception as if it was
+         * taken by the user code.
+         *
+         * This is similar to the user exception vector,
+         * except that PT_DEPC isn't set to EXCCAUSE.
+         */
+1:
+        xsr     a3, excsave1
+        wsr     a2, depc
+        l32i    a2, a3, EXC_TABLE_KSTK
+        s32i    a0, a2, PT_AREG0
+        rsr     a0, exccause
+
+        s32i    a0, a2, PT_DEPC
+
+        addx4   a0, a0, a3
+        l32i    a0, a0, EXC_TABLE_FAST_USER
+        xsr     a3, excsave1
+        jx      a0
+
+.L1pane:
+        rsr     a0, depc
+        rotw    -1
+        j       1b
+
+.L3pane:
+        rsr     a0, depc
+        rotw    -3
+        j       1b
 
         .end literal_prefix
 
diff --git a/arch/xtensa/kernel/xtensa_ksyms.c b/arch/xtensa/kernel/xtensa_ksyms.c
index d8507f812f46..74a60c7e085e 100644
--- a/arch/xtensa/kernel/xtensa_ksyms.c
+++ b/arch/xtensa/kernel/xtensa_ksyms.c
@@ -25,6 +25,7 @@
 #include <asm/io.h>
 #include <asm/page.h>
 #include <asm/pgalloc.h>
+#include <asm/ftrace.h>
 #ifdef CONFIG_BLK_DEV_FD
 #include <asm/floppy.h>
 #endif
diff --git a/arch/xtensa/mm/fault.c b/arch/xtensa/mm/fault.c
index 4b7bc8db170f..70fa7bc42b4a 100644
--- a/arch/xtensa/mm/fault.c
+++ b/arch/xtensa/mm/fault.c
@@ -72,6 +72,8 @@ void do_page_fault(struct pt_regs *regs)
                address, exccause, regs->pc, is_write? "w":"", is_exec? "x":"");
 #endif
 
+        if (user_mode(regs))
+                flags |= FAULT_FLAG_USER;
 retry:
         down_read(&mm->mmap_sem);
         vma = find_vma(mm, address);